4323 files changed, 579476 insertions, 457697 deletions

diff --git a/.document b/.document
index 8a05d61beb..fb27ba325d 100644
--- a/.document
+++ b/.document
@@ -10,13 +10,17 @@
 prelude.rb
 
 # the lib/ directory (which has its own .document file)
-
 lib
 
-
 # and some of the ext/ directory (which has its own .document file)
-
 ext
 
 # rdoc files
-doc/*.rdoc
+ChangeLog
+
+NEWS
+
+README.md
+README.ja.md
+
+doc
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000000..67abf4b978
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,16 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+tab_width = 8
+indent_style = tab
+indent_size = 4
+
+[**.bat]
+end_of_line = crlf
+
+[**.rb]
+indent_style = space
+indent_size = 2
diff --git a/.gdbinit b/.gdbinit
index 2a38da8892..d31ccaa7df 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -1,80 +1,34 @@
-define rp
+define hook-run
+  set $color_type = 0
+  set $color_highlite = 0
+  set $color_end = 0
+end
+
+define ruby_gdb_init
+  if !$color_type
+    set $color_type = "\033[31m"
+  end
+  if !$color_highlite
+    set $color_highlite = "\033[36m"
+  end
+  if !$color_end
+    set $color_end = "\033[m"
+  end
   if ruby_dummy_gdb_enums.special_consts
   end
+end
+
+# set prompt \033[36m(gdb)\033[m\040
+
+define rp
+  ruby_gdb_init
   if (VALUE)($arg0) & RUBY_FIXNUM_FLAG
     printf "FIXNUM: %ld\n", (long)($arg0) >> 1
   else
   if ((VALUE)($arg0) & ~(~(VALUE)0<<RUBY_SPECIAL_SHIFT)) == RUBY_SYMBOL_FLAG
     set $id = (($arg0) >> RUBY_SPECIAL_SHIFT)
-    if $id == '!' || $id == '+' || $id == '-' || $id == '*' || $id == '/' || $id == '%' || $id == '<' || $id == '>' || $id == '`'
-      printf "SYMBOL(:%c)\n", $id
-    else
-    if $id == idDot2
-      echo SYMBOL(:..)\n
-    else
-    if $id == idDot3
-      echo SYMBOL(:...)\n
-    else
-    if $id == idUPlus
-      echo SYMBOL(:+@)\n
-    else
-    if $id == idUMinus
-      echo SYMBOL(:-@)\n
-    else
-    if $id == idPow
-      echo SYMBOL(:**)\n
-    else
-    if $id == idCmp
-      echo SYMBOL(:<=>)\n
-    else
-    if $id == idLTLT
-      echo SYMBOL(:<<)\n
-    else
-    if $id == idLE
-      echo SYMBOL(:<=)\n
-    else
-    if $id == idGE
-      echo SYMBOL(:>=)\n
-    else
-    if $id == idEq
-      echo SYMBOL(:==)\n
-    else
-    if $id == idEqq
-      echo SYMBOL(:===)\n
-    else
-    if $id == idNeq
-      echo SYMBOL(:!=)\n
-    else
-    if $id == idEqTilde
-      echo SYMBOL(:=~)\n
-    else
-    if $id == idNeqTilde
-      echo SYMBOL(:!~)\n
-    else
-    if $id == idAREF
-      echo SYMBOL(:[])\n
-    else
-    if $id == idASET
-      echo SYMBOL(:[]=)\n
-    else
-      printf "SYMBOL(%ld)\n", $id
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
-    end
+    printf "%sSYMBOL%s: ", $color_type, $color_end
+    rp_id $id
   else
   if ($arg0) == RUBY_Qfalse
     echo false\n
@@ -89,77 +43,52 @@ define rp
     echo undef\n
   else
   if (VALUE)($arg0) & RUBY_IMMEDIATE_MASK
-    echo immediate\n
+    if ((VALUE)($arg0) & RUBY_FLONUM_MASK) == RUBY_FLONUM_FLAG
+      printf "%sFLONUM%s: %g\n", $color_type, $color_end, (double)rb_float_value($arg0)
+    else
+      echo immediate\n
+    end
   else
   set $flags = ((struct RBasic*)($arg0))->flags
+  if ($flags & RUBY_FL_PROMOTED) == RUBY_FL_PROMOTED
+    printf "[PROMOTED] "
+  end
   if ($flags & RUBY_T_MASK) == RUBY_T_NONE
-    printf "T_NONE: "
+    printf "%sT_NONE%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_NIL
-    printf "T_NIL: "
+    printf "%sT_NIL%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_OBJECT
-    printf "T_OBJECT: "
+    printf "%sT_OBJECT%s: ", $color_type, $color_end
     print (struct RObject *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
-    printf "T_CLASS%s: ", ($flags & RUBY_FL_SINGLETON) ? "*" : ""
-    print (struct RClass *)($arg0)
+    printf "%sT_CLASS%s%s: ", $color_type, ($flags & RUBY_FL_SINGLETON) ? "*" : "", $color_end
+    rp_class $arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_ICLASS
-    printf "T_ICLASS: "
-    print (struct RClass *)($arg0)
+    printf "%sT_ICLASS%s: ", $color_type, $color_end
+    rp_class $arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_MODULE
-    printf "T_MODULE: "
-    print (struct RClass *)($arg0)
+    printf "%sT_MODULE%s: ", $color_type, $color_end
+    rp_class $arg0
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_FLOAT
-    printf "T_FLOAT: %.16g ", (((struct RFloat*)($arg0))->float_value)
+    printf "%sT_FLOAT%s: %.16g ", $color_type, $color_end, (((struct RFloat*)($arg0))->float_value)
     print (struct RFloat *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_STRING
-    printf "T_STRING: "
-    set print address off
-    output (char *)(($flags & RUBY_FL_USER1) ? \
-	    ((struct RString*)($arg0))->as.heap.ptr : \
-	    ((struct RString*)($arg0))->as.ary)
-    set print address on
-    printf " bytesize:%ld ", ($flags & RUBY_FL_USER1) ? \
-            ((struct RString*)($arg0))->as.heap.len : \
-            (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
-    if !($flags & RUBY_FL_USER1)
-      printf "(embed) "
-    else
-      if ($flags & RUBY_FL_USER2)
-        printf "(shared) "
-      end
-      if ($flags & RUBY_FL_USER3)
-        printf "(assoc) "
-      end
-    end
-    printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
-    if ($flags & RUBY_ENC_CODERANGE_MASK) == 0
-      printf "coderange:unknown "
-    else
-    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_7BIT
-      printf "coderange:7bit "
-    else
-    if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_VALID
-      printf "coderange:valid "
-    else
-      printf "coderange:broken "
-    end
-    end
-    end
-    print (struct RString *)($arg0)
+    printf "%sT_STRING%s: ", $color_type, $color_end
+    rp_string $arg0 $flags
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_REGEXP
     set $regsrc = ((struct RRegexp*)($arg0))->src
     set $rsflags = ((struct RBasic*)$regsrc)->flags
-    printf "T_REGEXP: "
+    printf "%sT_REGEXP%s: ", $color_type, $color_end
     set print address off
     output (char *)(($rsflags & RUBY_FL_USER1) ? \
 	    ((struct RString*)$regsrc)->as.heap.ptr : \
@@ -183,7 +112,7 @@ define rp
   if ($flags & RUBY_T_MASK) == RUBY_T_ARRAY
     if ($flags & RUBY_FL_USER1)
       set $len = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
-      printf "T_ARRAY: len=%ld ", $len
+      printf "%sT_ARRAY%s: len=%ld ", $color_type, $color_end, $len
       printf "(embed) "
       if ($len == 0)
 	printf "{(empty)} "
@@ -193,7 +122,7 @@ define rp
       end
     else
       set $len = ((struct RArray*)($arg0))->as.heap.len
-      printf "T_ARRAY: len=%ld ", $len
+      printf "%sT_ARRAY%s: len=%ld ", $color_type, $color_end, $len
       if ($flags & RUBY_FL_USER2)
 	printf "(shared) shared="
 	output/x ((struct RArray*)($arg0))->as.heap.aux.shared
@@ -211,18 +140,18 @@ define rp
     print (struct RArray *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_FIXNUM
-    printf "T_FIXNUM: "
+    printf "%sT_FIXNUM%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_HASH
-    printf "T_HASH: ",
+    printf "%sT_HASH%s: ", $color_type, $color_end,
     if ((struct RHash *)($arg0))->ntbl
       printf "len=%ld ", ((struct RHash *)($arg0))->ntbl->num_entries
     end
     print (struct RHash *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_STRUCT
-    printf "T_STRUCT: len=%ld ", \
+    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)
@@ -232,7 +161,7 @@ define rp
           ((struct RStruct *)($arg0))->as.heap.ptr)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_BIGNUM
-    printf "T_BIGNUM: sign=%d len=%ld ", \
+    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) : \
@@ -246,59 +175,93 @@ define rp
           ((struct RBignum*)($arg0))->as.heap.digits)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_RATIONAL
-    printf "T_RATIONAL: "
+    printf "%sT_RATIONAL%s: ", $color_type, $color_end
     print (struct RRational *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_COMPLEX
-    printf "T_COMPLEX: "
+    printf "%sT_COMPLEX%s: ", $color_type, $color_end
     print (struct RComplex *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_FILE
-    printf "T_FILE: "
+    printf "%sT_FILE%s: ", $color_type, $color_end
     print (struct RFile *)($arg0)
     output *((struct RFile *)($arg0))->fptr
     printf "\n"
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_TRUE
-    printf "T_TRUE: "
+    printf "%sT_TRUE%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_FALSE
-    printf "T_FALSE: "
+    printf "%sT_FALSE%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_DATA
     if ((struct RTypedData *)($arg0))->typed_flag == 1
-      printf "T_DATA(%s): ", ((struct RTypedData *)($arg0))->type->wrap_struct_name
+      printf "%sT_DATA%s(%s): ", $color_type, $color_end, ((struct RTypedData *)($arg0))->type->wrap_struct_name
       print (struct RTypedData *)($arg0)
     else
-      printf "T_DATA: "
+      printf "%sT_DATA%s: ", $color_type, $color_end
       print (struct RData *)($arg0)
     end
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_MATCH
-    printf "T_MATCH: "
+    printf "%sT_MATCH%s: ", $color_type, $color_end
     print (struct RMatch *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_SYMBOL
-    printf "T_SYMBOL: "
-    print (struct RBasic *)($arg0)
+    printf "%sT_SYMBOL%s: ", $color_type, $color_end
+    print (struct RSymbol *)($arg0)
+    set $id_type = ((struct RSymbol *)($arg0))->id & RUBY_ID_SCOPE_MASK
+    if $id_type == RUBY_ID_LOCAL
+      printf "l"
+    else
+    if $id_type == RUBY_ID_INSTANCE
+      printf "i"
+    else
+    if $id_type == RUBY_ID_GLOBAL
+      printf "G"
+    else
+    if $id_type == RUBY_ID_ATTRSET
+      printf "a"
+    else
+    if $id_type == RUBY_ID_CONST
+      printf "C"
+    else
+    if $id_type == RUBY_ID_CLASS
+      printf "c"
+    else
+      printf "j"
+    end
+    end
+    end
+    end
+    end
+    end
+    set $id_fstr = ((struct RSymbol *)($arg0))->fstr
+    rp_string $id_fstr
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_UNDEF
-    printf "T_UNDEF: "
+    printf "%sT_UNDEF%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   else
+  if ($flags & RUBY_T_MASK) == RUBY_T_IMEMO
+    printf "%sT_IMEMO%s(", $color_type, $color_end
+    output (enum imemo_type)(($flags>>RUBY_FL_USHIFT)&imemo_mask)
+    printf "): "
+    rp_imemo $arg0
+  else
   if ($flags & RUBY_T_MASK) == RUBY_T_NODE
-    printf "T_NODE("
+    printf "%sT_NODE%s(", $color_type, $color_end
     output (enum node_type)(($flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
     printf "): "
     print *(NODE *)($arg0)
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_ZOMBIE
-    printf "T_ZOMBIE: "
+    printf "%sT_ZOMBIE%s: ", $color_type, $color_end
     print (struct RData *)($arg0)
   else
-    printf "unknown: "
+    printf "%sunknown%s: ", $color_type, $color_end
     print (struct RBasic *)($arg0)
   end
   end
@@ -332,11 +295,229 @@ define rp
   end
   end
   end
+  end
 end
 document rp
   Print a Ruby's VALUE.
 end
 
+define rp_id
+  set $id = (ID)$arg0
+  if $id == '!' || $id == '+' || $id == '-' || $id == '*' || $id == '/' || $id == '%' || $id == '<' || $id == '>' || $id == '`'
+    printf "(:%c)\n", $id
+  else
+  if $id == idDot2
+    printf "(:..)\n"
+  else
+  if $id == idDot3
+    printf "(:...)\n"
+  else
+  if $id == idUPlus
+    printf "(:+@)\n"
+  else
+  if $id == idUMinus
+    printf "(:-@)\n"
+  else
+  if $id == idPow
+    printf "(:**)\n"
+  else
+  if $id == idCmp
+    printf "(:<=>)\n"
+  else
+  if $id == idLTLT
+    printf "(:<<)\n"
+  else
+  if $id == idLE
+    printf "(:<=)\n"
+  else
+  if $id == idGE
+    printf "(:>=)\n"
+  else
+  if $id == idEq
+    printf "(:==)\n"
+  else
+  if $id == idEqq
+    printf "(:===)\n"
+  else
+  if $id == idNeq
+    printf "(:!=)\n"
+  else
+  if $id == idEqTilde
+    printf "(:=~)\n"
+  else
+  if $id == idNeqTilde
+    printf "(:!~)\n"
+  else
+  if $id == idAREF
+    printf "(:[])\n"
+  else
+  if $id == idASET
+    printf "(:[]=)\n"
+  else
+    if $id <= tLAST_OP_ID
+      printf "O"
+    else
+      set $id_type = $id & RUBY_ID_SCOPE_MASK
+      if $id_type == RUBY_ID_LOCAL
+        printf "l"
+      else
+      if $id_type == RUBY_ID_INSTANCE
+        printf "i"
+      else
+      if $id_type == RUBY_ID_GLOBAL
+        printf "G"
+      else
+      if $id_type == RUBY_ID_ATTRSET
+        printf "a"
+      else
+      if $id_type == RUBY_ID_CONST
+        printf "C"
+      else
+      if $id_type == RUBY_ID_CLASS
+        printf "c"
+      else
+        printf "j"
+      end
+      end
+      end
+      end
+      end
+      end
+    end
+    printf "(%ld): ", $id
+    set $str = lookup_id_str($id)
+    if $str
+      rp_string $str
+    else
+      echo undef\n
+    end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+end
+document rp_id
+  Print an ID.
+end
+
+define output_string
+  set $flags = ((struct RBasic*)($arg0))->flags
+  printf "%s", (char *)(($flags & RUBY_FL_USER1) ? \
+	    ((struct RString*)($arg0))->as.heap.ptr : \
+	    ((struct RString*)($arg0))->as.ary)
+end
+
+define rp_string
+  set $flags = ((struct RBasic*)($arg0))->flags
+  set print address off
+  output (char *)(($flags & RUBY_FL_USER1) ? \
+	    ((struct RString*)($arg0))->as.heap.ptr : \
+	    ((struct RString*)($arg0))->as.ary)
+  set print address on
+  printf " bytesize:%ld ", ($flags & RUBY_FL_USER1) ? \
+          ((struct RString*)($arg0))->as.heap.len : \
+          (($flags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+  if !($flags & RUBY_FL_USER1)
+    printf "(embed) "
+  else
+    if ($flags & RUBY_FL_USER2)
+      printf "(shared) "
+    end
+    if ($flags & RUBY_FL_USER3)
+      printf "(assoc) "
+    end
+  end
+  printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
+  if ($flags & RUBY_ENC_CODERANGE_MASK) == 0
+    printf "coderange:unknown "
+  else
+  if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_7BIT
+    printf "coderange:7bit "
+  else
+  if ($flags & RUBY_ENC_CODERANGE_MASK) == RUBY_ENC_CODERANGE_VALID
+    printf "coderange:valid "
+  else
+    printf "coderange:broken "
+  end
+  end
+  end
+  print (struct RString *)($arg0)
+end
+document rp_string
+  Print the content of a String.
+end
+
+define rp_class
+  printf "(struct RClass *) %p", (void*)$arg0
+  if ((struct RClass *)($arg0))->ptr.origin_ != $arg0
+    printf " -> %p", ((struct RClass *)($arg0))->ptr.origin_
+  end
+  printf "\n"
+  rb_classname $arg0
+  print *(struct RClass *)($arg0)
+  print *((struct RClass *)($arg0))->ptr
+end
+document rp_class
+  Print the content of a Class/Module.
+end
+
+define rp_imemo
+  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
+  else
+  if $flags == imemo_svar
+    printf "(struct vm_svar *) %p\n", (void*)$arg0
+    print *(struct vm_svar *)$arg0
+  else
+  if $flags == imemo_throw_data
+    printf "(struct vm_throw_data *) %p\n", (void*)$arg0
+    print *(struct vm_throw_data *)$arg0
+  else
+  if $flags == imemo_ifunc
+    printf "(struct vm_ifunc *) %p\n", (void*)$arg0
+    print *(struct vm_ifunc *)$arg0
+  else
+  if $flags == imemo_memo
+    printf "(struct MEMO *) %p\n", (void*)$arg0
+    print *(struct MEMO *)$arg0
+  else
+  if $flags == imemo_ment
+    printf "(rb_method_entry_t *) %p\n", (void*)$arg0
+    print *(rb_method_entry_t *)$arg0
+  else
+  if $flags == imemo_iseq
+    printf "(rb_iseq_t *) %p\n", (void*)$arg0
+    print *(rb_iseq_t *)$arg0
+  else
+    printf "(struct RIMemo *) %p\n", (void*)$arg0
+    print *(struct RIMemo *)$arg0
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+end
+document rp_imemo
+  Print the content of a memo
+end
+
 define nd_type
   print (enum node_type)((((NODE*)($arg0))->flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
 end
@@ -361,260 +542,266 @@ end
 # Print members of ruby node.
 
 define nd_head
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_alen
-  printf "u2.argc: "
+  printf "%su2.argc%s: ", $color_highlite, $color_end
   p ($arg0).u2.argc
 end
 
 define nd_next
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_cond
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_body
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_else
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_orig
-  printf "u3.value: "
+  printf "%su3.value%s: ", $color_highlite, $color_end
   rp ($arg0).u3.value
 end
 
 
 define nd_resq
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_ensr
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_1st
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_2nd
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 
 define nd_stts
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 
 define nd_entry
-  printf "u3.entry: "
+  printf "%su3.entry%s: ", $color_highlite, $color_end
   p ($arg0).u3.entry
 end
 
 define nd_vid
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_cflag
-  printf "u2.id: "
+  printf "%su2.id%s: ", $color_highlite, $color_end
   p ($arg0).u2.id
 end
 
 define nd_cval
-  printf "u3.value: "
+  printf "%su3.value%s: ", $color_highlite, $color_end
   rp ($arg0).u3.value
 end
 
 
 define nd_cnt
-  printf "u3.cnt: "
+  printf "%su3.cnt%s: ", $color_highlite, $color_end
   p ($arg0).u3.cnt
 end
 
 define nd_tbl
-  printf "u1.tbl: "
+  printf "%su1.tbl%s: ", $color_highlite, $color_end
   p ($arg0).u1.tbl
 end
 
 
 define nd_var
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_ibdy
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_iter
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_value
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_aid
-  printf "u3.id: "
+  printf "%su3.id%s: ", $color_highlite, $color_end
   p ($arg0).u3.id
 end
 
 
 define nd_lit
-  printf "u1.value: "
+  printf "%su1.value%s: ", $color_highlite, $color_end
   rp ($arg0).u1.value
 end
 
 
 define nd_frml
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_rest
-  printf "u2.argc: "
+  printf "%su2.argc%s: ", $color_highlite, $color_end
   p ($arg0).u2.argc
 end
 
 define nd_opt
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 
 define nd_recv
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_mid
-  printf "u2.id: "
+  printf "%su2.id%s: ", $color_highlite, $color_end
   p ($arg0).u2.id
 end
 
 define nd_args
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_noex
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_defn
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_old
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_new
-  printf "u2.id: "
+  printf "%su2.id%s: ", $color_highlite, $color_end
   p ($arg0).u2.id
 end
 
 
 define nd_cfnc
-  printf "u1.cfunc: "
+  printf "%su1.cfunc%s: ", $color_highlite, $color_end
   p ($arg0).u1.cfunc
 end
 
 define nd_argc
-  printf "u2.argc: "
+  printf "%su2.argc%s: ", $color_highlite, $color_end
   p ($arg0).u2.argc
 end
 
 
 define nd_cname
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_super
-  printf "u3.node: "
+  printf "%su3.node%s: ", $color_highlite, $color_end
   rp ($arg0).u3.node
 end
 
 
 define nd_modl
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_clss
-  printf "u1.value: "
+  printf "%su1.value%s: ", $color_highlite, $color_end
   rp ($arg0).u1.value
 end
 
 
 define nd_beg
-  printf "u1.node: "
+  printf "%su1.node%s: ", $color_highlite, $color_end
   rp ($arg0).u1.node
 end
 
 define nd_end
-  printf "u2.node: "
+  printf "%su2.node%s: ", $color_highlite, $color_end
   rp ($arg0).u2.node
 end
 
 define nd_state
-  printf "u3.state: "
+  printf "%su3.state%s: ", $color_highlite, $color_end
   p ($arg0).u3.state
 end
 
 define nd_rval
-  printf "u2.value: "
+  printf "%su2.value%s: ", $color_highlite, $color_end
   rp ($arg0).u2.value
 end
 
 
 define nd_nth
-  printf "u2.argc: "
+  printf "%su2.argc%s: ", $color_highlite, $color_end
   p ($arg0).u2.argc
 end
 
 
 define nd_tag
-  printf "u1.id: "
+  printf "%su1.id%s: ", $color_highlite, $color_end
   p ($arg0).u1.id
 end
 
 define nd_tval
-  printf "u2.value: "
+  printf "%su2.value%s: ", $color_highlite, $color_end
   rp ($arg0).u2.value
 end
 
+define nd_tree
+  set $buf = (struct RString *)rb_str_buf_new(0)
+  call dump_node((VALUE)($buf), rb_str_new(0, 0), 0, ($arg0))
+  printf "%s\n", $buf->as.heap.ptr
+end
+
 define rb_p
   call rb_p($arg0)
 end
@@ -625,18 +812,18 @@ define rb_numtable_entry
   set $rb_numtable_key = 0
   set $rb_numtable_rec = 0
   if $rb_numtable_tbl->entries_packed
-    set $rb_numtable_p = $rb_numtable_tbl->bins
-    while $rb_numtable_p && $rb_numtable_p < $rb_numtable_tbl->bins+$rb_numtable_tbl->num_entries
-      if (st_data_t)$rb_numtable_p[0] == $rb_numtable_id
-	set $rb_numtable_key = (st_data_t)$rb_numtable_p[0]
-	set $rb_numtable_rec = (st_data_t)$rb_numtable_p[1]
+    set $rb_numtable_p = $rb_numtable_tbl->as.packed.bins
+    while $rb_numtable_p && $rb_numtable_p < $rb_numtable_tbl->as.packed.bins+$rb_numtable_tbl->num_entries
+      if $rb_numtable_p.k == $rb_numtable_id
+	set $rb_numtable_key = $rb_numtable_p.k
+	set $rb_numtable_rec = $rb_numtable_p.v
 	set $rb_numtable_p = 0
       else
-	set $rb_numtable_p = $rb_numtable_p + 2
+	set $rb_numtable_p = $rb_numtable_p + 1
       end
     end
   else
-    set $rb_numtable_p = $rb_numtable_tbl->bins[$rb_numtable_id % $rb_numtable_tbl->num_bins]
+    set $rb_numtable_p = $rb_numtable_tbl->as.big.bins[st_numhash($rb_numtable_id) % $rb_numtable_tbl->num_bins]
     while $rb_numtable_p
       if $rb_numtable_p->key == $rb_numtable_id
 	set $rb_numtable_key = $rb_numtable_p->key
@@ -650,12 +837,9 @@ define rb_numtable_entry
 end
 
 define rb_id2name
-  rb_numtable_entry global_symbols.id_str (ID)$arg0
-  if $rb_numtable_rec
-    rp $rb_numtable_rec
-  else
-    echo undef\n
-  end
+  ruby_gdb_init
+  printf "%sID%s: ", $color_type, $color_end
+  rp_id $arg0
 end
 document rb_id2name
   Print the name of id
@@ -666,10 +850,10 @@ define rb_method_entry
   set $rb_method_entry_id = (ID)$arg1
   set $rb_method_entry_me = (rb_method_entry_t *)0
   while !$rb_method_entry_me && $rb_method_entry_klass
-    rb_numtable_entry $rb_method_entry_klass->m_tbl $rb_method_entry_id
+    rb_numtable_entry $rb_method_entry_klass->m_tbl_wrapper->tbl $rb_method_entry_id
     set $rb_method_entry_me = (rb_method_entry_t *)$rb_numtable_rec
     if !$rb_method_entry_me
-      set $rb_method_entry_klass = (struct RClass *)$rb_method_entry_klass->ptr->super
+      set $rb_method_entry_klass = (struct RClass *)RCLASS_SUPER($rb_method_entry_klass)
     end
   end
   if $rb_method_entry_me
@@ -684,9 +868,25 @@ document rb_method_entry
 end
 
 define rb_classname
-  call classname($arg0)
-  rb_p $
-  print *(struct RClass*)($arg0)
+  # up to 128bit int
+  set $rb_classname_permanent = "0123456789ABCDEF"
+  set $rb_classname = classname($arg0, $rb_classname_permanent)
+  if $rb_classname != RUBY_Qnil
+    rp $rb_classname
+  else
+    echo anonymous class/module\n
+  end
+end
+
+define rb_ancestors
+  set $rb_ancestors_module = $arg0
+  while $rb_ancestors_module
+    rp_class $rb_ancestors_module
+    set $rb_ancestors_module = RCLASS_SUPER($rb_ancestors_module)
+  end
+end
+document rb_ancestors
+  Print ancestors.
 end
 
 define rb_backtrace
@@ -694,7 +894,7 @@ define rb_backtrace
 end
 
 define iseq
-  if dummy_gdb_enums.special_consts
+  if ruby_dummy_gdb_enums.special_consts
   end
   if ($arg0)->type == ISEQ_ELEMENT_NONE
     echo [none]\n
@@ -727,31 +927,284 @@ end
 
 define rb_ps_vm
   print $ps_vm = (rb_vm_t*)$arg0
-  set $ps_threads = (st_table*)$ps_vm->living_threads
-  if $ps_threads->entries_packed
-    set $ps_threads_i = 0
-    while $ps_threads_i < $ps_threads->num_entries
-      set $ps_threads_key = (st_data_t)$ps_threads->bins[$ps_threads_i * 2]
-      set $ps_threads_val = (st_data_t)$ps_threads->bins[$ps_threads_i * 2 + 1]
-      rb_ps_thread $ps_threads_key $ps_threads_val
-      set $ps_threads_i = $ps_threads_i + 1
-    end
-  else
-    set $ps_threads_ptr = (st_table_entry*)$ps_threads->head
-    while $ps_threads_ptr
-      set $ps_threads_key = (st_data_t)$ps_threads_ptr->key
-      set $ps_threads_val = (st_data_t)$ps_threads_ptr->record
-      rb_ps_thread $ps_threads_key $ps_threads_val
-      set $ps_threads_ptr = (st_table_entry*)$ps_threads_ptr->fore
+  set $ps_thread_ln = $ps_vm->living_threads.n.next
+  set $ps_thread_ln_last = $ps_vm->living_threads.n.prev
+  while 1
+    set $ps_thread_th = (rb_thread_t *)$ps_thread_ln
+    set $ps_thread = (VALUE)($ps_thread_th->self)
+    rb_ps_thread $ps_thread
+    if $ps_thread_ln == $ps_thread_ln_last
+      loop_break
     end
+    set $ps_thread_ln = $ps_thread_ln->next
   end
 end
 document rb_ps_vm
 Dump all threads in a (rb_vm_t*) and their callstacks
 end
 
+define print_lineno
+  set $cfp = $arg0
+  set $iseq = $cfp->iseq
+  set $pos = $cfp->pc - $iseq->body->iseq_encoded
+  if $pos != 0
+    set $pos = $pos - 1
+  end
+
+  set $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
+    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
+      set $i = $i + 1
+      if $table[$i].position == $pos
+        loop_break
+      end
+    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 0
+    end
+    end
+  end
+end
+
+define output_id
+  set $id = $arg0
+  # rb_id_to_serial
+  if $id > tLAST_OP_ID
+    set $serial = (rb_id_serial_t)($id >> RUBY_ID_SCOPE_SHIFT)
+  else
+    set $serial = (rb_id_serial_t)$id
+  end
+  if $serial && $serial <= global_symbols.last_id
+    set $idx = $serial / ID_ENTRY_UNIT
+    set $ids = (struct RArray *)global_symbols.ids
+    set $flags = $ids->basic.flags
+    if ($flags & RUBY_FL_USER1)
+      set $idsptr = $ids->as.ary
+      set $idslen = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
+    else
+      set $idsptr = $ids->as.heap.ptr
+      set $idslen = $ids->as.heap.len
+    end
+    if $idx < $idslen
+      set $t = 0
+      set $ary = (struct RArray *)$idsptr[$idx]
+      if $ary != RUBY_Qnil
+        set $flags = $ary->basic.flags
+        if ($flags & RUBY_FL_USER1)
+          set $aryptr = $ary->as.ary
+          set $arylen = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
+        else
+          set $aryptr = $ary->as.heap.ptr
+          set $arylen = $ary->as.heap.len
+        end
+        set $result = $aryptr[($serial % ID_ENTRY_UNIT) * ID_ENTRY_SIZE + $t]
+        output_string $result
+      end
+    end
+  end
+end
+
 define rb_ps_thread
   set $ps_thread = (struct RTypedData*)$arg0
-  set $ps_thread_id = $arg1
-  print $ps_thread_th = (rb_thread_t*)$ps_thread->data
+  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->cfp
+  set $cfpend = (rb_control_frame_t *)($ps_thread_th->stack + $ps_thread_th->stack_size)-1
+  while $cfp < $cfpend
+    if $cfp->iseq
+      if $cfp->pc
+        set $location = $cfp->iseq->body->location
+        output_string $location.path
+        printf ":"
+        print_lineno $cfp
+        printf ":in `"
+        output_string $location.label
+        printf "'\n"
+      else
+        printf "???.rb:???:in `???'\n"
+      end
+    else
+      # if VM_FRAME_TYPE($cfp->flag) == VM_FRAME_MAGIC_CFUNC
+      set $ep = $cfp->ep
+      if ($ep[0] & 0xffff0001) == 0x55550001
+        #define VM_ENV_FLAG_LOCAL 0x02
+        #define VM_ENV_PREV_EP(ep)   GC_GUARDED_PTR_REF(ep[VM_ENV_DATA_INDEX_SPECVAL])
+        set $me = 0
+        set $env_specval = $ep[-1]
+        set $env_me_cref = $ep[-2]
+        while ($env_specval & 0x02) != 0
+          check_method_entry $env_me_cref 0
+          if $me != 0
+            loop_break
+          end
+          set $ep = $ep[0]
+          set $env_specval = $ep[-1]
+          set $env_me_cref = $ep[-2]
+        end
+        if $me == 0
+          check_method_entry $env_me_cref 1
+        end
+        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 `"
+        output_id $mid
+        printf "'\n"
+      else
+        printf "unknown_frame:???:in `???'\n"
+      end
+    end
+    set $cfp = $cfp + 1
+  end
+end
+
+define rb_count_objects
+  set $objspace = ruby_current_vm->objspace
+  set $counts_00 = 0
+  set $counts_01 = 0
+  set $counts_02 = 0
+  set $counts_03 = 0
+  set $counts_04 = 0
+  set $counts_05 = 0
+  set $counts_06 = 0
+  set $counts_07 = 0
+  set $counts_08 = 0
+  set $counts_09 = 0
+  set $counts_0a = 0
+  set $counts_0b = 0
+  set $counts_0c = 0
+  set $counts_0d = 0
+  set $counts_0e = 0
+  set $counts_0f = 0
+  set $counts_10 = 0
+  set $counts_11 = 0
+  set $counts_12 = 0
+  set $counts_13 = 0
+  set $counts_14 = 0
+  set $counts_15 = 0
+  set $counts_16 = 0
+  set $counts_17 = 0
+  set $counts_18 = 0
+  set $counts_19 = 0
+  set $counts_1a = 0
+  set $counts_1b = 0
+  set $counts_1c = 0
+  set $counts_1d = 0
+  set $counts_1e = 0
+  set $counts_1f = 0
+  set $total = 0
+  set $i = 0
+  while $i < $objspace->heap_pages.allocated_pages
+    printf "\rcounting... %d/%d", $i, $objspace->heap_pages.allocated_pages
+    set $page = $objspace->heap_pages.sorted[$i]
+    set $p = $page->start
+    set $pend = $p + $page->total_slots
+    while $p < $pend
+      set $flags = $p->as.basic.flags & 0x1f
+      eval "set $counts_%02x = $counts_%02x + 1", $flags, $flags
+      set $p = $p + 1
+    end
+    set $total = $total + $page->total_slots
+    set $i = $i + 1
+  end
+  printf "\rTOTAL: %d, FREE: %d\n", $total, $counts_00
+  printf "T_OBJECT: %d\n", $counts_01
+  printf "T_CLASS: %d\n", $counts_02
+  printf "T_MODULE: %d\n", $counts_03
+  printf "T_FLOAT: %d\n", $counts_04
+  printf "T_STRING: %d\n", $counts_05
+  printf "T_REGEXP: %d\n", $counts_06
+  printf "T_ARRAY: %d\n", $counts_07
+  printf "T_HASH: %d\n", $counts_08
+  printf "T_STRUCT: %d\n", $counts_09
+  printf "T_BIGNUM: %d\n", $counts_0a
+  printf "T_FILE: %d\n", $counts_0b
+  printf "T_DATA: %d\n", $counts_0c
+  printf "T_MATCH: %d\n", $counts_0d
+  printf "T_COMPLEX: %d\n", $counts_0e
+  printf "T_RATIONAL: %d\n", $counts_0f
+  #printf "UNKNOWN_10: %d\n", $counts_10
+  printf "T_NIL: %d\n", $counts_11
+  printf "T_TRUE: %d\n", $counts_12
+  printf "T_FALSE: %d\n", $counts_13
+  printf "T_SYMBOL: %d\n", $counts_14
+  printf "T_FIXNUM: %d\n", $counts_15
+  printf "T_UNDEF: %d\n", $counts_16
+  #printf "UNKNOWN_17: %d\n", $counts_17
+  #printf "UNKNOWN_18: %d\n", $counts_18
+  #printf "UNKNOWN_19: %d\n", $counts_19
+  printf "T_IMEMO: %d\n", $counts_1a
+  printf "T_NODE: %d\n", $counts_1b
+  printf "T_ICLASS: %d\n", $counts_1c
+  printf "T_ZOMBIE: %d\n", $counts_1d
+  #printf "UNKNOWN_1E: %d\n", $counts_1e
+  printf "T_MASK: %d\n", $counts_1f
+end
+document rb_count_objects
+  Counts all objects grouped by type.
+end
+
+# Details: https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/MachineInstructionsTraceWithGDB
+define trace_machine_instructions
+  set logging on
+  set height 0
+  set width 0
+  display/i $pc
+  while !$exit_code
+    info line *$pc
+    si
+  end
+end
+
+define SDR
+  call rb_vmdebug_stack_dump_raw_current()
+end
+
+define rbi
+  if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_LABEL
+    p *(LABEL*)$arg0
+  else
+  if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_INSN
+    p *(INSN*)$arg0
+  else
+  if ((LINK_ELEMENT*)$arg0)->type == ISEQ_ELEMENT_ADJUST
+    p *(ADJUST*)$arg0
+  else
+    print *$arg0
+  end
+  end
+  end
+end
+
+define dump_node
+  set $str = rb_parser_dump_tree($arg0, 0)
+  set $flags = ((struct RBasic*)($str))->flags
+  printf "%s", (char *)(($flags & RUBY_FL_USER1) ? \
+                        ((struct RString*)$str)->as.heap.ptr : \
+                        ((struct RString*)$str)->as.ary)
 end
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..d9785fad00
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+*.gemspec diff=ruby
+*.rb diff=ruby
+bin/* diff=ruby
+tool/update-deps diff=ruby
+tool/make-snapshot diff=ruby
diff --git a/.gitignore b/.gitignore
index 57557c9c2e..9757768786 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,25 @@
 *-*-*.def
+*-*-*.exp
+*-*-*.lib
 *.a
 *.bak
+*.bc
 *.dSYM
+*.dmyh
 *.dylib
+*.elc
+*.i
 *.inc
 *.log
 *.o
+*.obj
 *.orig
+*.pdb
 *.rej
+*.s
 *.sav
 *.swp
+*.yarb
 *~
 .*-*
 .*.list
@@ -21,19 +31,27 @@
 .ppack
 .svn
 Makefile
+Makefile.old
+cygruby*.def
 extconf.h
 y.output
 y.tab.c
 
 # /
+/*-fake.rb
+/*.dll
+/*.exe
+/*.res
 /*.pc
+/*.rc
 /*_prelude.c
 /COPYING.LIB
-/ChangeLog-1.8.0
+/ChangeLog-*
 /ChangeLog.pre-alpha
 /ChangeLog.pre1_1
 /Doxyfile
 /GNUmakefile
+/GNUmakefile.old
 /README.atheos
 /README.fat-patch
 /README.v6
@@ -42,6 +60,7 @@ y.tab.c
 /autom4te*.cache
 /automake
 /beos
+/bmlog-*
 /breakpoints.gdb
 /config.cache
 /config.h
@@ -49,13 +68,19 @@ y.tab.c
 /config.status
 /config.status.lineno
 /configure
+/coverage/simplecov
+/coverage/simplecov-html
+/coverage/doclie
+/coverage/.last_run.json
+/coverage/.resultset.json*
+/coverage/assets
+/coverage/index.html
 /doc/capi
 /enc.mk
-/enc/trans/*.c
 /encdb.h
 /exts.mk
 /goruby
-/id.h
+/id.[ch]
 /largefile.h
 /lex.c
 /libruby*.*
@@ -72,6 +97,7 @@ y.tab.c
 /ppack
 /prelude.c
 /preview
+/probes.h
 /rbconfig.rb
 /rename2.h
 /repack
@@ -79,34 +105,55 @@ y.tab.c
 /riscos
 /rubicon
 /ruby
+/ruby-runner
+/ruby-runner.h
 /ruby-man.rd.gz
+/sizes.c
 /test.rb
 /tmp
 /transdb.h
 /uncommon.mk
+/verconf.h
+/verconf.mk
 /web
 /yasmdata.rb
 
 # /benchmark/
 /benchmark/bmx_*.rb
+/benchmark/fasta.output.*
+/benchmark/wc.input
+
+/enc/*.def
+/enc/*.exp
+/enc/*.lib
+/enc/unicode/data
 
 # /enc/trans/
 /enc/trans/*.c
+/enc/trans/*.def
+/enc/trans/*.exp
+/enc/trans/*.lib
+/enc/trans/.time
 
 # /ext/
 /ext/extinit.c
 
-# /ext/dl/
-/ext/dl/*.func
+# /ext/-test-/win32/dln/
+/ext/-test-/win32/dln/dlntest.exp
+/ext/-test-/win32/dln/dlntest.lib
 
 # /ext/dl/callback/
-/ext/dl/callback/*.func
 /ext/dl/callback/callback-*.c
 /ext/dl/callback/callback.c
 
-# /ext/iconv/
-/ext/iconv/config.charset
-/ext/iconv/iconv.rb
+# /ext/etc/
+/ext/etc/constdefs.h
+
+# /ext/fiddle/
+/ext/fiddle/libffi-*
+
+# /ext/rbconfig/
+/ext/rbconfig/sizeof/sizes.c
 
 # /ext/ripper/
 /ext/ripper/eventids1.c
@@ -120,12 +167,17 @@ y.tab.c
 /ext/socket/constdefs.h
 /ext/socket/constdefs.c
 
-# /ext/tk/
-/ext/tk/config_list
+# /gems
+/gems/*.gem
 
 # /spec/
 /spec/mspec
 /spec/rubyspec
 
+# /tool/
+/tool/config.guess
+/tool/config.sub
+
 # /win32/
 /win32/*.ico
+/win32/.time
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..24ce0c9113
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,102 @@
+# Copyright (C) 2011 Urabe, Shyouhei.  All rights reserved.
+#
+# This file is  a part of the programming language  Ruby.  Permission is hereby
+# granted,  to either  redistribute  or  modify this  file,  provided that  the
+# conditions  mentioned in  the file  COPYING are  met.  Consult  the  file for
+# details.
+
+# This is  a Travis-CI  build configuration file.   The list  of configurations
+# available is located in
+#
+#     http://about.travis-ci.org/docs/user/build-configuration/
+#
+# and as Ruby itself is a project written in C language,
+#
+#     http://about.travis-ci.org/docs/user/languages/c/
+#
+# is also a good place to look at.
+
+# Language specification.
+language: c
+sudo: false
+
+# Compilers.  Several  compilers are  provided in Travis,  so we try  them all.
+# The value set here is visible via $CC environment variable.
+compiler:
+  - gcc
+
+os:
+  - linux
+
+# Dependencies.  Some  header files are missing  in a Travis' worker  VM, so we
+# have  to install  them.  The  "1.9.1" here  is OK.   It is  the  most adopted
+# version string  for Debian/Ubuntu, and  no dependencies have been  changed so
+# far since the 1.9.1 release.
+before_install:
+  - "CONFIG_FLAG="
+  - "JOBS='-j 4'"
+
+# Script is where the test runs.  Note  we just do "make test", not other tests
+# like  test-all, test-rubyspec.   This is  because  they take  too much  time,
+# enough for Travis to shut down the VM as being stalled.
+before_script:
+  - "uname -a"
+  - "uname -r"
+  - "rm -fr .ext autom4te.cache"
+  - "echo $TERM"
+  - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files"
+  - "autoconf"
+  - "mkdir config_1st config_2nd"
+  - "./configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG"
+  - "cp -pr config.status .ext/include config_1st"
+  - "make reconfig"
+  - "cp -pr config.status .ext/include config_2nd"
+  - "diff -ru config_1st config_2nd"
+  - "make after-update BASERUBY=ruby"
+  - "make -s $JOBS"
+  - "make update-rubyspec"
+script:
+  - "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
+    - /^feature\//
+    - /^bug\//
+
+# We want to be notified when something happens.
+notifications:
+  irc:
+    channels:
+      - "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}"
+
+  # 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
+# coding: utf-8-unix
+# indent-tabs-mode: nil
+# tab-width: 4
+# fill-column: 79
+# default-justification: full
+# End:
diff --git a/BSDL b/BSDL
index 82725534fa..a009caefea 100644
--- a/BSDL
+++ b/BSDL
@@ -1,4 +1,4 @@
-Copyright (C) 1993-2010 Yukihiro Matsumoto. All rights reserved.
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..ffdf2dd4b8
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,4 @@
+Please see the [official issue tracker] and wiki [HowToContribute].
+
+[official issue tracker]: https://bugs.ruby-lang.org
+[HowToContribute]: https://bugs.ruby-lang.org/projects/ruby/wiki/HowToContribute
diff --git a/COPYING b/COPYING
index a1f19ff99d..426810a7fb 100644
--- a/COPYING
+++ b/COPYING
@@ -44,9 +44,9 @@ You can redistribute it and/or modify it under either the terms of the
      For the list of those files and their copying conditions, see the
      file LEGAL.
 
-  5. The scripts and library files supplied as input to or produced as 
+  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, 
+     copyright of the software, but belong to whomever generated them,
      and may be sold commercially, and may be aggregated with this
      software.
 
diff --git a/COPYING.ja b/COPYING.ja
index 5b5b91c149..e50d01c8d1 100644
--- a/COPYING.ja
+++ b/COPYING.ja
@@ -1,51 +1,51 @@
-$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(B2-clause BSDL
-$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G$-$^$9(B
-2-clause BSDL$B$K$D$$$F$O(BBSDL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
+本プログラム�フリーソフトウェア��．2-clause BSDL
+���以下�示��件�本プログラムを��布����
+2-clause BSDL�����BSDLファイルを�照��下��．
 
-  1. $BJ#@=$O@)8B$J$/<+M3$G$9!%(B
+  1. 複製�制���自由��．
 
-  2. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$N%=!<%9$r(B
-     $B<+M3$KJQ99$G$-$^$9!%(B
+  2. 以下��件���れ�を満��時�本プログラム�ソースを
+     自由�変更����．
 
-     (a) $B%M%C%H%K%e!<%:$K%]%9%H$7$?$j!$:n<T$KJQ99$rAwIU$9$k(B
-         $B$J$I$NJ}K!$G!$JQ99$r8x3+$9$k!%(B
+     (a) �ットニューズ��スト��り，作者�変更を�付�る
+         ���方法�，変更を公開�る．
 
-     (b) $BJQ99$7$?K\%W%m%0%i%`$r<+J,$N=jB0$9$kAH?%FbIt$@$1$G(B
-         $B;H$&!%(B
+     (b) 変更��本プログラムを自分�所属�る組織内部���
+         使�．
 
-     (c) $BJQ99E@$rL@<($7$?$&$(!$%=%U%H%&%'%"$NL>A0$rJQ99$9$k!%(B
-         $B$=$N%=%U%H%&%'%"$rG[I[$9$k;~$K$OJQ99A0$NK\%W%m%0%i(B
-         $B%`$bF1;~$KG[I[$9$k!%$^$?$OJQ99A0$NK\%W%m%0%i%`$N%=!<(B
-         $B%9$NF~<jK!$rL@<($9$k!%(B
+     (c) 変更点を明示����，ソフトウェア���を変更�る．
+         ��ソフトウェアを�布�る時��変更��本プログラ
+         ムも�時��布�る．���変更��本プログラム�ソー
+         ス�入手法を明示�る．
 
-     (d) $B$=$NB>$NJQ99>r7o$r:n<T$H9g0U$9$k!%(B
+     (d) ��他�変更�件を作者����る．
 
-  3. $B0J2<$N>r7o$N$$$:$l$+$rK~$?$9;~$KK\%W%m%0%i%`$r%3%s%Q%$(B
-     $B%k$7$?%*%V%8%'%/%H%3!<%I$d<B9T7A<0$G$bG[I[$G$-$^$9!%(B
+  3. 以下��件���れ�を満��時�本プログラムをコンパイ
+     ル��オブジェクトコードや実行形��も�布����．
 
-     (a) $B%P%$%J%j$r<u$1<h$C$??M$,%=!<%9$rF~<j$G$-$k$h$&$K!$(B
-         $B%=!<%9$NF~<jK!$rL@<($9$k!%(B
+     (a) �イナリを�����人�ソースを入手��るよ��，
+         ソース�入手法を明示�る．
 
-     (b) $B5!3#2DFI$J%=!<%9%3!<%I$rE:IU$9$k!%(B
+     (b) 機械�読�ソースコードを添付�る．
 
-     (c) $BJQ99$r9T$C$?%P%$%J%j$OL>A0$rJQ99$7$?$&$(!$%*%j%8%J(B
-         $B%k$N%=!<%9%3!<%I$NF~<jK!$rL@<($9$k!%(B
+     (c) 変更を行���イナリ���を変更����，オリジナ
+         ル�ソースコード�入手法を明示�る．
 
-     (d) $B$=$NB>$NG[I[>r7o$r:n<T$H9g0U$9$k!%(B
+     (d) ��他��布�件を作者����る．
 
-  4. $BB>$N%W%m%0%i%`$X$N0zMQ$O$$$+$J$kL\E*$G$"$l<+M3$G$9!%$?(B
-     $B$@$7!$K\%W%m%0%i%`$K4^$^$l$kB>$N:n<T$K$h$k%3!<%I$O!$$=(B
-     $B$l$>$l$N:n<T$N0U8~$K$h$k@)8B$,2C$($i$l$k>l9g$,$"$j$^$9!%(B
+  4. 他�プログラム��引用����る目的��れ自由��．�
+     ��，本プログラム���れる他�作者�よるコード�，�
+     れ�れ�作者����よる制��加�られる場���り��．
 
-     $B$=$l$i%U%!%$%k$N0lMw$H$=$l$>$l$NG[I[>r7o$J$I$KIU$$$F$O(B
-     LEGAL$B%U%!%$%k$r;2>H$7$F$/$@$5$$!%(B
+     �れらファイル�一覧��れ�れ��布�件���付���
+     LEGALファイルを�照������．
 
-  5. $BK\%W%m%0%i%`$X$NF~NO$H$J$k%9%/%j%W%H$*$h$S!$K\%W%m%0%i(B
-     $B%`$+$i$N=PNO$N8"Mx$OK\%W%m%0%i%`$N:n<T$G$O$J$/!$$=$l$>(B
-     $B$l$NF~=PNO$r@8@.$7$??M$KB0$7$^$9!%$^$?!$K\%W%m%0%i%`$K(B
-     $BAH$_9~$^$l$k$?$a$N3HD%%i%$%V%i%j$K$D$$$F$bF1MM$G$9!%(B
+  5. 本プログラム��入力��るスクリプト�よ�，本プログラ
+     ム�ら�出力�権利�本プログラム�作者����，�れ�
+     れ�入出力を生���人�属���．��，本プログラム�
+     組�込�れる���拡張ライブラリ����も�様��．
 
-  6. $BK\%W%m%0%i%`$OL5J]>Z$G$9!%:n<T$OK\%W%m%0%i%`$r%5%]!<%H(B
-     $B$9$k0U;V$O$"$j$^$9$,!$%W%m%0%i%`<+?H$N%P%0$"$k$$$OK\%W(B
-     $B%m%0%i%`$N<B9T$J$I$+$iH/@8$9$k$$$+$J$kB;32$KBP$7$F$b@U(B
-     $BG$$r;}$A$^$;$s!%(B
+  6. 本プログラム�無�証��．作者�本プログラムをサ�ート
+     �る�志��り���，プログラム自身��グ�る��本プ
+     ログラム�実行���ら発生�る���る�害�対��も責
+     任を����ん．
diff --git a/ChangeLog b/ChangeLog
index d9f47d1fb7..1fd1fd9ac1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13630 +1,8047 @@
-Sat Sep 17 23:34:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep  9 22:43:29 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* parse.y (parser_data_type): inherit the core type in ripper so
-	  that checks in core would work.  [ruby-core:39591] [Bug #5331]
+	* gems/bundled_gems: sort lines.
 
-Fri Sep 23 14:15:01 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+Fri Sep  9 17:59:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_asn1.c
-	  ext/openssl/ossl_pkey.c: Remove unused variables.
+	* 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 23 06:54:44 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+Fri Sep  9 13:50:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r33315 from trunk.
+	* doc/extension.rdoc, doc/extension.ja.rdoc: fix file name.
+	  pointed out by @takkanm in the RubyKaigi talk.
 
-	* test/openssl/test_ssl_session.rb: execute test_session_exts_read
-	  only for OpenSSL versions >= 0.9.8k. Thanks, Eric Wong, for
-	  reporting this.
-	  [Bug #4961] [ruby-core:37726]
+Fri Sep  9 13:14:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Fri Sep 23 12:18:52 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+	* News: Announcing update to Unicode version 9.0.0 [ci skip]
 
-	* backport r33311 from trunk.
+Fri Sep  9 10:10:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/openssl/test_ssl_session.rb: ensure server calls callbacks in
-	  test_ctx_server_session_cb. Thanks to Eric Wong for the patch.
-	  [Bug #5336] [ruby-core:39619]
+	* variable.c (rb_const_search): warn with the actual class/module
+	  name which defines the deprecated constant.
 
-Thu Sep 22 19:45:22 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* variable.c (rb_const_search): raise with the actual class/module
+	  name which defines the private constant.
 
-	* thread_pthread.c (ubf_select): activate timer thread when interrupt
-	  blocking thread.
-	  A patch created by Koichi Sasada. [ruby-core:39634] [Bug #5343]
-	  to cover race condition, timer thread periodically send SIGVTARLM to
-	  threads in signal thread list. so you should activate timer thread
-	  when interrupt a thread.
+Thu Sep  8 17:47:18 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-Wed Sep 21 16:57:03 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* 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]
 
-	* test/io/wait/test_io_wait.rb (TestIOWait#setup): of course, the
-	  behavior of mingw is just same with mswin.
+Thu Sep  8 17:40:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Sep 17 22:21:26 2011  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.
 
-	* vm.c (rb_vm_make_env_object, rb_vm_get_sourceline): export as a
-	  workaround for ruby-debug19 for the time being.
-	  [ruby-core:38972] [Bug #5193]
+Thu Sep  8 16:47:03 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-Fri Sep 16 01:08:19 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval.c (rb_mod_s_used_modules): rename Module.used_refinements to
+	  Module.used_modules.  [Feature #7418] [ruby-core:49805]
 
-	* NEWS: cosmetic changes.
+Thu Sep  8 14:21:48 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Wed Sep 14 12:39:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* 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]
 
-	* configure.in: do not use gcc-4.2 as the default compiler.
+Thu Sep  8 13:41:46 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* NEWS: describe the issue about Xcode.
+	* insns.def (setclassvariable, setconstant): warn when self is a
+	  refinement.  [Bug #10103] [ruby-core:64143]
 
-Wed Sep 14 11:46:30 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Thu Sep  8 11:29:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* thread.c (rb_fd_rcopy): added an argument guard.
-	  Patch by NAKAMURA Usaku. [Bug #5306] [ruby-core:39435]
+	* hash.c (rb_hash_transform_values, rb_hash_transform_values_bang):
+	  Rename map_v to transform_values.
+	  [Feature #12512] [ruby-core:76095]
 
-Tue Sep 13 09:28:58 2011  Koichi Sasada  <ko1@atdot.net>
+	* test/ruby/test_hash.rb: ditto.
 
-	* NEWS: wrote about rb_reserved_fd_p() and objspace.
+Thu Sep  8 10:08:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Mon Sep 12 20:47:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* {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
 
-	* thread.c (rb_thread_select): fix a typo to initialize efds
-	  properly.  [Bug #5299] [ruby-core:39380]
+Thu Sep  8 07:23:34 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Mon Sep 12 20:41:20 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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
 
-	* thread.c (rb_thread_select): fix to ignore an argument
-	  modification of rb_thread_fd_select().
-	  based on a patch by Eric Wong. [Bug #5306] [ruby-core:39435]
-	* thread.c (rb_fd_rcopy): New. for reverse fd copy.
+Thu Sep  8 01:12:47 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* test/-ext-/old_thread_select/test_old_thread_select.rb
-	(test_old_select_false_positive): test for bug5306.
+	* eval.c (rb_mod_s_used_refinements): new method
+	  Module.used_refinements.  based on the patch by Charlie
+	  Somerville.  [Feature #7418] [ruby-core:49805]
 
-	* ext/-test-/old_thread_select/old_thread_select.c (fdset2array):
-	  New. convert fdsets to array.
-	* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
-	  return 'read', 'write', 'except' argument of rb_thread_select()
-	  to ruby script.
+Wed Sep  7 17:50:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Sep  6 13:15:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/util.h (setenv): remove POSIX-noncompliant
+	  definition with 2 arguments.
 
-	* encoding.c (load_encoding): predefined encoding names are safe.
-	  [ruby-dev:44469] [Bug #5279]
+Wed Sep  7 17:35:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* transcode.c (load_transcoder_entry): ditto.
+	* unicode/8.0.0/casefold.h, name2ctype.h, unicode/data/8.0.0:
+	  removing directories/files related to Unicode version 8.0.0
 
-Fri Sep  9 16:02:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Sep  7 17:21:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* insns.def (concatstrings): don't use initial ASCII-8BIT string.
-	  [ruby-core:38635] [Bug #5126]
+	* lib/timeout.rb (Timeout#timeout): add custom error message
+	  argument.  [Feature #11650]
 
-Thu Sep  8 21:17:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Sep  7 17:13:05 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/nkf/nkf-utf8/nkf.c: import nkf 2.1.2 (be9c280)
-	  Bump version number/release date only.
+	* common.mk: Updated Unicode version to 9.0.0 [Feature #12513]
 
-Wed Sep  7 23:42:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* unicode/9.0.0/casefold.h, name2ctype.h, unicode/data/9.0.0:
+	  new directories/files for Unicode version 9.0.0
 
-	* io.c (argf_next_argv): open in default text mode.
-	  [ruby-core:39234] [Bug #5268]
+Wed Sep  7 16:00:45 2016  Tanaka Akira  <akr@fsij.org>
 
-Mon Sep  5 15:06:55 2011  NARUSE, Yui  <naruse@ruby-lang.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.
 
-	* test/rubygems/test_gem_security.rb
-	  (test_class_build_self_signed_cert): reset opt[:trust_dir] to apply
-	  temporary Gem.user_home.
+Wed Sep  7 14:56:59 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-Sun Sep  4 00:56:58 2011  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]
 
-	* backport r33177 from trunk.
+	* test/csv/test_row.rb: add test for above.
 
-	* test/ruby/test_fiber.rb (TestFiber#test_no_valid_cfp):
-	  add a test. Unlike TestThread#test_no_valid_cfp,
-	  this test succeeds even if win32ole is required (see r33153).
+	* test/csv/test_table.rb: ditto.
 
-Fri Sep  2 21:11:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Sep  7 14:50:01 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* io.c (validate_enc_binmode, prep_stdio): default to text mode on
-	  dosish platforms.  [ruby-core:38822] [Bug #5164]
+	* gems/bundled_gems: update to power_assert 0.3.1.
 
-	* transcode.c (rb_econv_prepare_options): keep default ecflags
-	  unchanged if no options.
+Wed Sep  7 12:16:09 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Fri Sep  2 14:36:47 2011  Nobuyoshi Nakada  <nobu@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
 
-	* vm_insnhelper.c (vm_search_const_defined_class): search
-	  ancestors only when global scope.  [ruby-core:39227] [Bug #5264]
+Wed Sep  7 11:51:06 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Fri Sep  2 09:58:08 2011  Nobuyoshi Nakada  <nobu@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
 
-	* parse.y (parser_tokadd_string, parser_yylex): ignore a backslash
-	  which prefixes an non-ascii character, which has no escape
-	  syntax.  [ruby-core:39222] [Ruby 1.9 - Bug #5262]
+Tue Sep  6 09:23:06 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Thu Sep  1 17:31:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rdoc/rdoc.gemspec: partly reverted for default gem installer.
+	  upstream configuration is not working on ruby core repository.
 
-	* insns.def (defineclass), vm_insnhelper.c (vm_get_cvar_base): see
-	  also inherited constants for classes without superclass and
-	  modules.  [ruby-core:37698] [Bug #3423]
+Mon Sep  5 19:35:22 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Thu Sep  1 14:11:16 2011  NAKAMURA Usaku  <usa@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
 
-	* test/ruby/test_thread.rb (TestThread#test_no_valid_cfp): skip when
-	  win32ole is required.  in such case, win32ole redefines
-	  Thread#initialize, and the block argument becomes to be not the top
-	  of the thread, then this testcase always fails.
+Sun Sep  4 00:17:55 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
 
-Wed Aug 31 16:02:45 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* proc.c: [DOC] fix Object#define_singleton_method and
+	  main.define_method return value. [ci skip]
 
-	* ext/json: Merge json gem v1.5.4 (3dab4c5a6a97fac03dac).
+Sat Sep  3 11:28:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 31 13:19:31 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* 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
 
-	* numeric.c (flo_round): Avoid overflow by optimizing for trivial
-	  cases
-	  [Bug #5227]
+Fri Sep  2 16:06:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 31 06:45:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* internal.h (MEMO_V1_SET, MEMO_V2_SET): fix typos.  use the macro
+	  parameter, not the local variable.
 
-	* configure.in: fix r32835. $withval can't be used outer AC_ARG_WITH().
+Fri Sep  2 00:55:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 31 05:29:03 2011  NAKAMURA Usaku  <usa@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.
 
-	* win32/win32.c (rb_w32_select_with_thread): and my typo. we all must
-	  be more careful.
+Thu Sep  1 14:24:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 31 05:28:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/extmk.rb (gems): move dirty hacks for bundled gems from
+	  mkmf.rb.
 
-	* thread.c (rb_thread_select): critical typo in r33117.
+	* lib/mkmf.rb (create_makefile): yield all configuration strings.
 
-Wed Aug 31 05:28:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 31 17:39:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/-ext-/old_thread_select/test_old_thread_select.rb
-	  (TestOldThreadSelect#test_old_select_read_timeout): if the machine
-	  is fast enough, the time used by code around IO.select may be smaller
-	  than Time implement threshold.
+	* 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 05:27:59 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 31 15:36:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/-test-/old_thread_select/old_thread_select.c (old_thread_select):
-	  typo.
+	* ext/extmk.rb: move TARGET_SO_DIR stuffs to mkmf.rb.
 
-	* test/-ext-/old_thread_select/test_old_thread_select.rb
-	  (TestOldThreadSelect#test_old_select_signal_safe): use SIGINT instead
-	  of SIGUSR1 because the former is general and the latter is platform
-	  dependent.
+	* 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 05:26:30 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Aug 31 01:56:55 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* win32/win32.c, include/ruby/intern.h (rb_w32_fd_copy): implement
-	  for rb_thread_select() in thread.c.  the use of rb_fd_copy() is
-	  introduced in r33117.
-	  [Bug #5229] [ruby-core:39102]
+	* doc/extension.ja.rdoc: [DOC] Fix a typo. [ci skip]
 
-	* thread.c (rb_thread_select): must call rb_fd_init() before using
-	  rb_fdset_t.  see the implementations of rb_fd_init()s if you want to
-	  know the reason.
+Wed Aug 31 00:52:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Aug 30 11:25:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* ext/extmk.rb: make the gems target directory under the expanded
+	  name.  [ruby-core:77102] [Bug #12714]
 
-	* ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1).
-	  [Bug #5173] [ruby-core:38866]
+Tue Aug 30 15:27:27 2016  Kouhei Yanagita  <yanagi@shakenbu.org>
 
-Tue Aug 30 09:53:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* ext/json/lib/json/add/ostruct.rb (OpenStruct.json_create):
+	  Correct documentation, fix the name of values.  [Fix GH-1421]
 
-	* cont.c (fiber_entry): fix stack allocation failure on Debian
-	  GNU/kFreeBSD.
-	  Patch by Lucas Nussbaum <lucas at lucas-nussbaum dot net>.
-	  [Bug #5241] [ruby-core:39147]
+Tue Aug 30 14:53:34 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Aug 30 09:52:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* backport r33117 from trunk.
-	
-	* thread.c (rb_thread_select): rewrite by using
-	  rb_thread_fd_select(). old one is EINTR unsafe.
-	  Patch by Eric Wong. [Bug #5229] [ruby-core:39102]
-	
-	* test/-ext-/old_thread_select/test_old_thread_select.rb:
-	  a testcase for rb_thread_select().
-	* ext/-test-/old_thread_select/old_thread_select.c: ditto.
-	* ext/-test-/old_thread_select/depend: ditto.
-	* ext/-test-/old_thread_select/extconf.rb: ditto.
+Tue Aug 30 03:38:35 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Aug 30 09:16:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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]
 
-	* configure.in: fix a build failure on GNU Hurd.
-	  Patch by Samuel Thibault <sthibault at debian dot org>. Thank you!
-	  [Bug #5250] [ruby-core:39185]
+Sat Aug 27 10:26:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Aug 28 15:38:17 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* array.c (rb_ary_concat_multi): take multiple arguments.  based
+	  on the patch by Satoru Horie.  [Feature #12333]
 
-	* backport r33106 from trunk.
+	* string.c (rb_str_concat_multi, rb_str_prepend_multi): ditto.
 
-	* ext/date/date_parse.c (date_zone_to_diff): keep a temporary string
-	  stored in variable while the contents buffer is beeing used.
+Thu Aug 25 00:42:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/date/date_parse.c (date_zone_to_diff): get rid of out of bounds
-	  memory read. [ruby-dev:44409] [Bug #5213]
+	* win32/file.c (append_wstr): remove a codepage argument, and use
+	  INVALID_CODE_PAGE for conversion by econv.
 
-Sun Aug 28 05:29:50 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+	* win32/file.c (append_wstr): exclude the terminator from the
+	  result length when input len == -1.
 
-	* backport r33102 from trunk.
+Wed Aug 24 22:41:30 2016  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/minitest/*: Imported minitest 2.5.1 (r6596)
-	* test/minitest/*: ditto
+	* gc.c (gc_reset_malloc_info): Remove too much ";".
 
-Sat Aug 27 20:54:54 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+Wed Aug 24 20:07:57 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* backport r33099 from trunk.
+	* 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]
 
-	* vm.c (rb_vm_rewrite_dfp_in_errinfo): change return type
-	  to suppress a warning.
+Wed Aug 24 16:56:26 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* vm_core.h: ditto.
+	* .gdbinit: follow r55766's VM change.
 
-Sat Aug 27 19:03:44 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+Wed Aug 24 12:57:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r33096 from trunk.
+	* 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]
 
-	* proc.c (proc_new): force to rewrite errinfo when calling Proc.new in ensure.
-	  [Bug #5234] [ruby-core:39125]
+Tue Aug 23 10:34:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm.c (rb_vm_rewrite_dfp_in_errinfo): new function.
+	* test/psych/test_psych.rb (test_load_file_with_fallback): fix
+	  Tempfile leak.  https://github.com/tenderlove/psych/pull/288
 
-	* vm.c (vm_make_env_each): changed accordingly.
+Tue Aug 23 10:15:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm_core.h: ditto.
+	* string.c (rb_fs_setter): check and convert $; value at
+	  assignment.
 
-	* bootstraptest/test_flow.rb: add tests for above.
+Tue Aug 23 02:09:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Aug 27 08:59:12 2011  Eric Hodel  <drbrain@segment7.net>
+	* string.c (rb_str_split_m): show $; name in error message when it
+	  is a wrong object.
 
-	* NEWS:  Update version of rake to 0.9.2.2.
+Mon Aug 22 16:29:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Aug 27 08:44:58 2011  Eric Hodel  <drbrain@segment7.net>
+	* 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]
 
-	* backport r33087 from trunk
+Mon Aug 22 14:35:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc:  Import RDoc 3.9.4.  Typo and grammar fixes by Luke Gruber.
-	  [Ruby 1.9 - Bug #5203]
+	* man/irb.1: remove useless -width option.
+	  [ruby-dev:49767] [Bug #12692]
 
-Sat Aug 27 07:53:34 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Aug 22 09:02:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r33087 from trunk.
+	* iseq.c (Init_ISeq): undefine allocator of InstructionSequence,
+	  to get rid of segfaults at method call on uninitialized object.
 
-	* lib/open-uri.rb:  Fix indentation of OpenURI::OpenRead#open.  Use ++
-	  instead of `' for method arguments in open-uri.rb
+Sat Aug 21 05:47:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Sat Aug 27 07:22:07 2011  Eric Hodel  <drbrain@segment7.net>
+	* enum.c (enum_sort): prevent wasteful array duplication.
 
-	* backport r33086 from trunk.
+Sat Aug 20 11:20:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/pathname/lib/pathname.rb:  Fix typos and grammar mistakes.  Patch
-	  by Luke Gruber.  [#5203]
-	* ext/pty/lib/expect.rb:  ditto
-	* lib/mathn.rb:  ditto
-	* lib/net/http.rb:  ditto
-	* lib/open-uri.rb:  ditto
-	* lib/ostruct.rb:  ditto
-	* lib/tempfile.rb:  ditto
-	* lib/thread.rb:  ditto
-	* lib/weakref.rb:  ditto
-	* sample/webrick/httpproxy.rb:  ditto
+	* rubystub.c: generalize win32/stub.c.
 
-Fri Aug 26 10:10:37 2011  Eric Hodel  <drbrain@segment7.net>
+Fri Aug 19 11:39:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r33074 from trunk.
+	* parse.y (primary): allow parenthesised statement as a method
+	  argument.  [Feature #12686]
 
-	* lib/rubygems:  Update to RubyGems 1.8.10.  Fixes security issue in
-	  creating ruby-format gemspecs.  Fixes Gem.dir not being at the front
-	  of Gem.path to fix uninstall and cleanup commands.  Fixes gem
-	  uninstall stopping on the first missing gem.
+Fri Aug 19 09:12:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 24 09:49:10 2011  Koichi Sasada  <ko1@atdot.net>
+	* vm.c (vm_set_main_stack): TOPLEVEL_BINDING must be built.
+	  http://www.viva64.com/en/b/0414/#ID0EQ1CI  [ruby-core:76973]
 
-	* backport r33045 from trunk.
+Fri Aug 19 01:00:53 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* insns.def (defined): fix to checking class variable.
-	  A patch by Magnus Holm <judofyr@gmail.com>.  Thanks!
+	* proc.c (mnew_missing): Remove an unused argument.
+	  After r51126 rid is not used.
 
-Fri Aug 26 08:21:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Thu Aug 18 09:26:52 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* test/ruby/test_variable.rb: add a test for above.
+	* gems/bundled_gems: bump to test-unit-3.2.1
 
-Thu Aug 25 09:43:16 2011  Eric Hodel  <drbrain@segment7.net>
+Thu Aug 18 02:36:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r33066 from trunk.
+	* tool/rbinstall.rb: skip gems which failed to build extensions.
+	  [ruby-dev:49764] [Bug #12683]
 
-	* ext/openssl/lib/openssl/bn.rb:  Hide copyright info from RDoc.
-	* ext/openssl/lib/openssl/digest.rb:  ditto
-	* ext/openssl/lib/openssl/cipher.rb:  ditto
+Wed Aug 17 23:35:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Aug 25 09:25:48 2011  Eric Hodel  <drbrain@segment7.net>
+	* gems/bundled_gems (tk): bump up to 0.1.1.
 
-	* backport r33065 from trunk.
+Wed Aug 17 23:14:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_digest.c:  Document OpenSSL::Digest::digest and add
-	  an example to OpenSSL::Digest.  Patch by Sylvain Daubert.
-	  [Ruby 1.9 - Bug #5166]
-	* ext/openssl/lib/openssl/digest.rb (module OpenSSL):  ditto
+	* ext/extmk.rb: build gem extensions into separate directories
 
-Thu Aug 25 08:19:43 2011  Koichi Sasada  <ko1@atdot.net>
+	* tool/rbinstall.rb: install pre-built gem extension files gem
+	  extension directories.  [ruby-core:76931] [Bug #12681]
 
-	* vm.c (vm_make_env_each): work around to solve Bug #2729.
-	  fixes: Bug #2729
-	  a patch from Kazuki Tsujimoto <kazuki@callcc.net>
-	  This problem is caused by changing dfp (dynamic env pointer)
-	  from saved dfp.  Saved dfp is pointed env in VM stack.  However,
-	  the dfp can be moved because VM copies env from VM stack to
-	  the heap.  At this copying, dfp was also changed.  To solve this
-	  problem, I'll try to change throw mechanism (not save target dfp,
-	  but save target cfp).
+Tue Aug 16 21:04:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bootstraptest/test_flow.rb: add a test for above.
+	* common.mk (UNICODE_HDR_DIR): separate unicode header files from
+	  unicode data files.  [ruby-core:76879] [Bug #12677]
 
-Thu Aug 25 08:04:08 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+Tue Aug 16 11:17:51 2016  Koichi ITO  <koic.ito@gmail.com>
 
-	* numeric.c (int_round): Fix Integer#round [ruby-core:39096]
+	* lib/net/http/header.rb: Fix typo. [ci skip][fix GH-1407]
+	* transcode.c: ditto.
 
-Thu Aug 25 06:51:08 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Aug 16 11:02:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/psych/lib/psych.rb: Fixing psych version number.
+	* tool/make-snapshot (package): save generated header files from
+	  unicode data.  [ruby-core:76879] [Bug #12677]
 
-Thu Aug 25 06:11:35 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Mon Aug 15 20:31:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/psych/lib/psych/nodes/node.rb: default `to_yaml` encoding to be
-	  UTF-8.
-	* test/psych/test_encoding.rb: test yaml dump encoding.
+	* node.c (dump_array): show nd_alen field in NODE_ARRAY only in
+	  the first node.  it is nd_end in the rest nodes.
 
-Wed Aug 24 08:53:06 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Aug 15 16:41:32 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* backport r33043 from trunk.
+	* appveyor.yml: Update libressl version to 2.3.7.
 
-	* lib/rdoc:  Update to RDoc 3.9.3.  Fixes RDoc with `ruby -Ku`.  Allows
-	  HTTPS image paths to be turned into <img> tags.  Prevents special
-	  markup inside <tt> from being processed.
+Mon Aug 15 11:46:50 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 24 07:57:43 2011  Eric Hodel  <drbrain@segment7.net>
+	* ext/extmk.rb (extmake): extension libraries in gems cannot link
+	  statically.
 
-	* backport r33040 from trunk.
+Sun Aug 14 22:35:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rubygems:  Update to RubyGems 1.8.9.  Fixes uninstalling multiple
-	  gems and gem cleanup.
+	* id_table.c (hash_table_extend): should not shrink the table than
+	  the previous capacity.  [ruby-core:76534] [Bug #12614]
 
-Wed Aug 24 06:45:20 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+Sun Aug 14 18:51:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r33036 from trunk.
+	* gems/bundled_gems: add gemified tk 0.1.0.
+	  this needs `extract-gems` to build.
 
-	* lib/minitest/*: Imported minitest 2.5.0 (r6557)
-	* test/minitest/*: ditto
+Sun Aug 14 14:54:14 2016  Kouhei Sutou  <kou@cozmixng.org>
 
-Tue Aug 23 15:23:56 2011  Eric Hodel  <drbrain@segment7.net>
+	* object.c (InitVM_Object): Update referenced document path.
 
-	* backport r33027 from trunk.
+Sat Aug 13 23:08:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* load.c (rb_f_require):  Improve documentation of Kernel#require.
-	  [Ruby 1.9 - Bug #5210]
+	* numeric.c (num_funcall0, num_funcall1): get rid of infinite
+	  recursion in fallback methods of Numeric.
 
-Tue Aug 23 15:11:48 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+Sat Aug 13 11:10:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r33023 from trunk.
+	* parse.y (command_asgn, arg): fix syntax errors with chained
+	  assignment with op assign.  [Bug #12669]
 
-	* ext/zlib/zlib.c (gzfile_read_header): Ensure that each section of
-	  gzip header is readable to avoid SEGV.
+Sat Aug 13 10:52:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/zlib/test_zlib.rb (test_corrupted_header): Test it.
+	* parse.y (stmt, arg): rescue modifier in command op assignment
+	  should be limited to rhs only.  [ruby-core:75621] [Bug #12402]
 
-Mon Aug 22 23:43:33 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+Sat Aug 13 07:51:40 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
-	* backport r33021 from trunk.
+	* ext/win32ole/win32ole.c (ole_val2variant): fix integer conversion in
+	  cygwin64.
 
-	* sprintf.c (rb_str_format): add RB_GC_GUARD to prevent temporary
-	  strings from GC.
+Fri Aug 12 21:05:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun Aug 21 17:58:38 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+	* 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]
 
-	* backport r33019 from trunk.
+Fri Aug 12 12:50:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* iseq.c (iseq_s_disasm): remove variable which is no longer used
-	  since r33013.
+	* error.c (rb_syntax_error_append): fix newline in syntax error
+	  message to the beginning, not after file name and line number.
+	  [Feature #11951]
 
-Sun Aug 21 14:20:58 2011  Naohisa Goto  <ngotogenome@gmail.com>
+Thu Aug 11 16:24:23 2016  Ferdinand Niedermann  <nerdinand@nerdinand.com>
 
-	* configure.in: use LD_LIBRARY_PATH_64 on 64-bit Solaris.
+	* compar.c (cmp_clamp): Introduce Comparable#clamp.  [Feature #10594]
 
-Sun Aug 21 11:13:54 2011  Naohisa Goto  <ngotogenome@gmail.com>
+Thu Aug 11 03:16:59 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-	* backport r32895 from trunk.
+	* lib/prime.rb: Optimize prime?
+	  Adapted from patch by Jabari Zakiya [#12665]
 
-	* ext/fiddle/conversions.c (generic_to_value): ffi_arg and ffi_sarg
-	  should be used to handle shorter return value. fix [Bug #3861]
-	  [ruby-core:32504]
+	* test/test_prime.rb: Improve test
 
-	* ext/fiddle/closure.c (callback): ditto
+Wed Aug 10 22:37:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/fiddle/conversions.h (fiddle_generic): ditto
+	* parse.y (command_rhs, arg_rhs): introduce new rules to reduce
+	  repeated rules with rescue modifier.
 
-	* ext/fiddle/conversions.c (value_to_generic): char, short and int
-	  are strictly distinguished on big-endian CPU, e.g. sparc64.
+Wed Aug 10 17:26:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Aug 20 13:28:32 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+	* parse.y (command_asgn): rescue modifier in command assignment
+	  should be limited to rhs only.  [ruby-core:75621] [Bug #12402]
 
-	* backport r33013 from trunk.
+Wed Aug 10 15:35:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* iseq.c (iseq_s_disasm): fix a bug that may cause SEGV.
+	* ext/win32/resolv/resolv.c: needs windows.h for iphlpapi.h on
+	  cygwin.  [ruby-core:76791] [Bug #12663]
 
-	* test/ruby/test_method.rb (test_body): add a test for the above change.
+	* ext/win32/resolv/resolv.c (w32error_make_error): use
+	  Win32::Resolv::Error, an alias of Win32::Registry::Error.
 
-Sat Aug 20 10:43:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug  9 17:50:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* ext/stringio/stringio.c (strio_read): return new string if nil
-	  is explicitly given as a buffer ([Bug #5207]), otherwise set the
-	  encoding.  also removed dead code.
+	* hash.c (rb_hash_map_v, rb_hash_map_v_bang): implement Hash#map_v and
+	  Hash#map_v! [Feature #12512] [ruby-core:76095]
 
-Fri Aug 19 14:25:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_hash.rb: add tests for above change.
 
-	* process.c (proc_spawn_v, proc_spawn): should not wait the
-	  spawned process.
+Tue Aug  9 16:09:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* process.c (proc_spawn_v): fix missing argument, and try with
-	  /bin/sh only if failed with ENOEXEC.
+	* vm_insnhelper.c (vm_getivar): use always_inline because
+	  gcc7 doesn't inline this without always_inline.
 
-Fri Aug 19 14:12:57 2011  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Aug  9 15:41:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* backport r33007 from trunk.
+	* ext/tk: Tk is removed from stdlib.  [Feature #8539]
+	  https://github.com/ruby/tk is the new upstream.
 
-	* lib/net/imap.rb (idle): raises a Net::IMAP::Error when the
-	  connection is closed.  based on the patch by Hugo Barauna.
-	  [Bug #5190] [ruby-core:38930]
+Tue Aug  9 00:12:31 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Fri Aug 19 11:28:58 2011  Shugo Maeda  <shugo@ruby-lang.org>
+	* doc/maintainers.rdoc: Remove moved file section.
 
-	* backport r33001 from trunk.
+Mon Aug  8 20:56:46 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
-	* lib/net/imap.rb (msg_att): accepts extra space before ')'.
-	  based on the patch by art lussos.  [Bug #5163] [ruby-core:38820]
+	* 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]
 
-Wed Aug 17 15:27:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+Mon Aug  8 12:51:12 2016  Zarko Todorovski <zarko@ca.ibm.com>
 
-	* backport r32996 from trunk.
+	* internal.h (RBASIC_CLEAR_CLASS): Reroute ANSI C's strict
+	  aliasing rule.
+	  [ruby-core:74427][Bug #12191][ruby-core:76747][Bug #12657]
 
-	* ext/bigdecimal/bigdecimal.c (cannot_be_coerced_into_BigDecimal):
-	  add a new function for raising error when an object cannot coerce
-	  into BigDecimal.  [Bug #5172]
+Sun Aug  7 18:08:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimalValueWithPrec): use
-	  cannot_be_coerced_into_BigDecimal function.
+	* object.c (InitVM_Object): deprecate toplevel constants TRUE,
+	  FALSE, and NIL.  [Feature #12574]
 
-	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): ditto.
+Sun Aug  7 06:48:21 2016  Eric Wong  <e@80x24.org>
 
-	* ext/bigdecimal/bigdecimal.c (BigMath_s_log): ditto.
+	* 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]
 
-	* test/bigdecimal/test_bigdecimal.rb: test for the avobe changes.
+Sat Aug  6 09:35:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/bigdecimal/testbase.rb (under_gc_stress): add a new utility
-	  method to run tests under the condition of GC.stress = true.
+	* id_table.h (rb_id_table_iterator_result): add dummy sentinel
+	  member because C standard prohibits a trailing comma.
 
-Wed Aug 17 10:16:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+Sat Aug  6 00:39:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r32994 from trunk.
+	* hash.c (env_enc_str_new): make string for an environment
+	  variable name or value.
 
-	* rational.c (nurat_coerce): Rational#coerce should converts itself
-	  into Complex if the argument is a Complex with non-zero imaginary
-	  part.  [Bug #5020] [ruby-dev:44088]
+	* hash.c (env_name_new): make environment value string with the
+	  encoding for its name.
 
-	* test/ruby/test_rational.rb (test_coerce): test for the above change.
+Fri Aug  5 23:18:35 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed Aug 17 06:33:19 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+	* hash.c (env_str_new): taint the string.  get rid of a test failure
+	  introduced at r55811.
 
-	* backport r32992 from trunk.
+Fri Aug  5 17:04:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_x509cert.c: Add class documentation for
-	  OpenSSL::X509::Certificate.
+	* hash.c (w32_getenv): call rb_w32_getenv and rb_w32_ugetenv via
+	  this pointer without further comparisons.
 
-Wed Aug 17 05:02:25 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+Thu Aug  4 11:54:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r32987 from trunk.
+	* hash.c (env_assoc): the encoding of the value should be the
+	  locale, as well as other methods, [], fetch, values, etc.
 
-	* ext/openssl/ossl_pkey.c: corrected docs, OpenSSL::PKey::DH does
-	  *not* support #sign/verify.
+Wed Aug  3 21:31:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Aug 16 18:56:54 2011  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]
 
-	* vm.c (ruby_threadptr_data_type): rename to hide.
-	  [ruby-core:38972]
+Wed Aug  3 17:15:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Aug 16 18:52:08 2011  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]
 
-	* win32/mkexports.rb (Exports::Mswin#each_export): exclude Init_
-	  and _threadptr_ functions, as well as mingw.
+Wed Aug  3 10:47:07 2016  Koichi Sasada  <ko1@atdot.net>
 
-Tue Aug 16 09:38:37 2011  Eric Hodel  <drbrain@segment7.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.
 
-	* backport r32981 and r32982 from trunk.
+	* vm_core.h: introduce rb_obj_is_iseq().
 
-	* ext/dl:  Add documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #5192]
+	* cont.c, vm.c: VM_FRAME_MAGIC_DUMMY with
+	  VM_FRAME_FLAG_CFRAME.
 
-	* ext/.document (fiddle):  Remove duplicate entry
+Wed Aug  3 09:25:16 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/fiddle:  Complete documentation of Fiddle.  Patch by Vincent
-	  Batts.  [#5192]
+	* vm_core.h: rename macros and make them inline functions.
 
-Tue Aug 16 08:00:15 2011  Eric Hodel  <drbrain@segment7.net>
+	  * rename VM_FRAME_TYPE_FINISH_P() to VM_FRAME_FINISHED_P().
+	  * rename VM_FRAME_TYPE_BMETHOD_P() to VM_FRAME_BMETHOD_P().
 
-	* backport r32977 from trunk
+Wed Aug 03 09:15:02 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/socket:  Make Socket documentation appear.  Add documentation for
-	  Socket, TCPServer, SOCKSSocket.  Patch by Sylvain Daubert.
-	  [Ruby 1.9 - Feature #5182]
+	* vm_core.h: introduce VM_FRAME_FLAG_CFRAME to represent cfp->iseq
+	  type.
 
-Mon Aug 15 10:16:55 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-	* backport r32973 from trunk.
+Tue Aug  2 21:42:40 2016  Chia-sheng Chen  <qitar888@gmail.com>
 
-	* ext/openssl/ossl_ssl.c: Support disabling OpenSSL compression.
+	* math.c (tanh): make faster by the extract form if three
+	  hyperbolic functions are unavailable.  [Feature #12647]
 
-	* test/openssl/test_ssl.rb: Add a test for it.
-	  Thanks to Eric Wong for the patch.
-	  [Ruby 1.9 - Feature #5183] [ruby-core:38911]
+Tue Aug  2 12:37:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Aug 13 22:17:27 2011  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]
 
-	* tool/mkconfig.rb: do not make the entries related to sitedir and
-	  verdordir if disabled by --without options.  [ruby-core:38922]
-	  [Bug #5187]
+Tue Aug  2 04:07:29 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Aug 13 17:06:57 2011  Tadayoshi Funaba  <tadf@dotrb.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]
 
-	* ext/date/date_core.c: [ruby-core:38861]
+Mon Aug  1 21:39:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Aug 13 16:59:51 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* ext/extmk.rb: [EXPERIMENTAL] build extension libraries in
+	  extracted gems.
 
-	* test/date/test_*.rb: added tests.
+Mon Aug  1 16:07:18 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
-Sat Aug 13 09:36:19 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* include/ruby/ruby.h (struct RStruct): no longer.
 
-	* ext/date/date_parse.c (parse_ddd_cb): fix r32896. RB_GC_GUARD
-	  insertion position was mistaken. [ruby-dev:44337] [Bug #5152]
+	* internal.h (struct RStruct): moved here.
 
-Sat Aug 13 09:26:24 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* 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.
 
-	* ext/psych/lib/psych/core_ext.rb: Make Kernel#y private.
-	  [ruby-core:38913]
+Mon Aug  1 14:50:06 2016  Jeremy Evans <code@jeremyevans.net>
 
-	* test/psych/test_yaml.rb: corresponding test.
+	* object.c (rb_obj_clone2): Allow Object#clone to take freeze:
+	  false keyword argument to not freeze the clone.
+	  [ruby-core:75017][Feature #12300]
 
-Sat Aug 13 09:15:16 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/ruby/test_object.rb (TestObject): test for it.
 
-	* ext/date/date_core.c (date_strftime_alloc): followed the change
-	  of r32885.
+Mon Aug  1 12:16:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* NEWS: followed the above change.
+	* ext/json/*, test/json/json_parser_test.rb: Update json-2.0.2.
 
-Sat Aug 13 08:49:05 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Jul 31 16:17:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/date/date_core.c: [ruby-core:38855].
+	* ext/win32/resolv/resolv.c (get_dns_server_list): [Win32] get DNS
+	  servers only for connected network devices by GetNetworkParams
+	  API.  [Bug #12604]
 
-Sat Aug 13 03:41:37 2011  Eric Hodel  <drbrain@segment7.net>
+Sat Jul 30 12:13:26 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* backport r32953 from trunk.
+	* string.c (String#downcase), NEWS: Mentioned that case mapping for all
+	  of ISO-8859-1~16 is now supported. [ci skip]
 
-	* lib/uri/common.rb:  Fix documentation of URI::Parser.new.  Patch by
-	  Steve Klabnik.  [Ruby 1.9 - Bug #5177]
+Sat Jul 30 12:00:01 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sat Aug 13 02:19:57 2011  Eric Hodel  <drbrain@segment7.net>
+	* enc/iso_8859_2.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-2, by Yushiro Ishii.
 
-	* backport r32950 from trunk.
+Fri Jul 29 20:57:12 2016  chuanshuo  <lilijreey@126.com>
 
-	* ext/digest/digest.c:  Add documentation for the Digest module.  Patch
-	  by Sylvain Daubert.  [Ruby 1.9 - Bug #5167]
+	* *.c: rename rb_funcall2 to rb_funcallv, except for extensions
+	  which are/will be/may be gems.  [Fix GH-1406]
 
-Fri Aug  5 13:32:43 2011  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Jul 29 10:51:34 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* backport r32856 from trunk.
+	* proc.c (env_write): remove unused function.
 
-	* lib/xmlrpc/client.rb, lib/xmlrpc/server.rb: should use
-	  String#bytesize instead of String#size.
+Fri Jul 29 10:49:52 2016  Koichi Sasada  <ko1@atdot.net>
 
-Fri Aug 12 13:53:03 2011  Narihiro Nakamura  <narihiro@netlab.jp>
+	* 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
 
-	* backport r32894 from trunk.
+Fri Jul 29 04:23:08 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* gc.c (gc_lazy_sweep): if sweep target slots are not found, we
-	  try heap_increment() because it might be able to expand the
-	  heap. [Bug #5127] [ruby-dev:44285]
+	* vm_core.h (VM_ENV_LOCAL_P): return truthy (0 or not) value.
 
-	* gc.c (gc_clear_mark_on_sweep_slots): if a sweeping was
-	  interrupted, we expand the heap if at all possible.
+	* vm.c (rb_vm_make_proc_lambda): use VM_ENV_ESCAPED_P() macro.
 
-Fri Aug 12 12:28:17 2011  Eric Hodel  <drbrain@segment7.net>
+Fri Jul 29 03:49:04 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rake:  Update to Rake 0.9.2.2.  Prevent pollution of toplevel
-	  namespace by Commands.  Remove unused variable and debugging
-	  statement in tests.
+	* vm.c, internal.h: remove RubyVM::Env class and all of env objects
+	  are imemo objects (imemo_env).
 
-Fri Aug 12 09:00:24 2011  Eric Hodel  <drbrain@segment7.net>
+	* NEWS: describe this change. I believe nobody touch these objects
+	  because there are no method defined.
 
-	* backport r32941 from trunk
+	* vm_core.h: remove the following definitions.
+	  * rb_cEnv decl.
+	  * GetEnvPtr() because Env is no longer T_DATA object.
 
-	* lib/rubygems:  Import RubyGems 1.8.8.  Fixes encoding of YAML gemspec
-	  from gems.  Github Issue #149
+	* vm_core.h (rb_env_t): fix layout for imemo values.
 
-Fri Aug 12 03:24:35 2011  Eric Hodel  <drbrain@segment7.net>
+	* vm_core.h (vm_assert_env): added.
 
-	* backport r32935 from trunk
+	* vm_core.h (vm_env_new): added.
 
-	* lib/rdoc:  Import RDoc 3.9.2.  Fixes TIDYLINK for HTML output.
+Thu Jul 28 19:53:21 2016  Koichi Sasada  <ko1@atdot.net>
 
-Tue Aug  2 22:04:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* vm_core.h: revisit the structure of frame, block and env.
+	  [Bug #12628]
 
-	* backport r32815 from trunk.
+	  This patch introduce many changes.
 
-	* gc.c (init_heap): allocate sigaltstack after heaps are allocated.
-	  [ruby-dev:44315] [Bug #5139]
+	  * Introduce concept of "Block Handler (BH)" to represent
+	    passed blocks.
 
-	* vm.c (thread_free): use free because objspace is not ready.
+	  * 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.
 
-	* vm.c (th_init): use malloc because objspace is not ready.
+	  * rename `rb_block_t` to `struct rb_block`.
 
-Thu Aug 11 19:04:38 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+	  * Make Proc, Binding and RubyVM::Env objects wb-protected.
 
-	* backport r32931 from trunk.
+	  Check [Bug #12628] for more details.
 
-	* variable.c (autoload_delete): An autoload entry is still in a
-	  RCLASS_IV_TBL, not in a RCLASS_CONST_TBL, so take back the table
-	  changed in r29600. And an autoload entry keeps not a
-	  rb_const_entry_t but a NODE so remove rb_const_entry_t thing added
-	  in r29602.
+Thu Jul 28 15:05:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Aug 11 15:07:36 2011  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
 
-	* lib/mkmf.rb (link_command): use LIBRUBYARG in rbconfig for
-	  unbundled extensions.  [ruby-core:38802] [Bug #5147]
+	* include/ruby/ruby.h (rb_mul_size_overflow): ditto for use of
+	  int128.
 
-	* lib/mkmf.rb (init_mkmf): revert r32902.  [ruby-core:38903]
+Wed Jul 27 10:32:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Wed Aug 10 19:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* enc/windows_1253.c: Remove dead code found by Coverity Scan.
 
-	* backport r32903 from trunk.
+Tue Jul 26 22:43:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* complex.c (nucomp_rationalize): calls rationalize of real part if
-	  imaginary part is exactly zero.  The patch is made by Marc-Andre
-	  Lafortune.  fixes [Bug #5178] [ruby-core:38885]
+	* gc.c (run_finalizer): make saved running finalizer state
+	  volatile to ensure not to be clobbered by longjmp.
 
-	* test/ruby/test_complex.rb (test_rationalize): add a test for the
-	  above change.
+Tue Jul 26 19:26:00 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* complex.c (nucomp_to_r): fix RDoc comment.  The patch is made by
-	  Marc-Andre Lafortune.
+	* vm_insnhelper.c: introduce rb_vm_pop_frame() and use it
+	  instead of setting rb_thread_t::cfp directly.
 
-Wed Aug 10 14:11:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_insnhelper.c (vm_pop_frame): return the result of
+	  finish frame or not.
 
-	* lib/mkmf.rb (init_mkmf): set $LIBRUBYARG regardless of shared
-	  option.  [ruby-core:38802] [Bug #5147]
+Tue Jul 26 19:06:39 2016  Koichi Sasada  <ko1@atdot.net>
 
-Wed Aug 10 02:57:01 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* gc.c (rb_raw_obj_info): support to show Proc obj.
 
-	* lib/net/http.rb: come back autoload. OpenSSL constant is used
-	  some places, so it leads mistakes like HTTP.start.
+Tue Jul 26 18:55:55 2016  Koichi Sasada  <ko1@atdot.net>
 
-Tue Aug  9 22:57:45 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* 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.
 
-	* ext/date/date_parse.c (date_zone_to_diff): add RB_GC_GUARD.
-	  [ruby-dev:44337] [Bug #5152]
+Tue Jul 26 16:33:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/date/data_parse.c (parse_ddd_cb): ditto.
+	* enc/windows_1257.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1257, by Sho Koike.
 
-Tue Aug  9 12:20:33 2011  Naohisa Goto  <ngotogenome@gmail.com>
+Tue Jul 26 16:19:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* test/fiddle/helper.rb (libc_so, libm_so): Solaris support added.
-	  [ruby-core:38853] [Bug #5168]
+	* enc/windows_1250.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1250, by Sho Koike.
 
-	* test/dl/test_base.rb (libc_so, libm_so): on Solaris, remove libc
-	  and libm version numbers for detecting default libc and libm.
+	* ChangeLog: Fixed order of previous two entries.
 
-Tue Aug  9 10:49:52 2011  Igor Zubkov  <igor.zubkov@gmail.com>
+Tue Jul 26 15:54:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* array.c: Fix typo. https://github.com/ruby/ruby/pull/36
+	* enc/windows_1253.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1253, by Takumi Koyama.
 
-Mon Aug  8 00:10:45 2011  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 26 15:30:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* test/test_syslog.rb (TestSyslog#test_log): Do not be too
-	  specific about the log line format.  Fixes #5081.
+	* enc/windows_1251.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1251, by Shunsuke Sato.
 
-Sun Aug  7 23:39:44 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Tue Jul 26 13:04:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* time.c (rb_strftime_alloc): raise ERANGE if width is too large.
-	  Patch by Nobuyoshi Nakada. [Bug #4457] [ruby-dev:43285]
+	* test/ruby/enc/test_case_comprehensive.rb: Add explicit skip test for
+	  availability of Unicode data files.
 
-	* test/ruby/test_time.rb (class TestTime): add a test for the
-	  above change.
+Mon Jul 25 21:33:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Aug  7 14:15:10 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+	* range.c (check_step_domain): check step argument domain by <=>
+	  method, instead of < and >.
 
-	* backport r32876 from trunk.
+Mon Jul 25 21:11:32 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* ext/objspace/objspace.c: fix typos in a document.
+	* doc/maintainers.rdoc: fix filenames.
 
-Sun Aug  7 04:42:36 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Jul 25 16:59:00 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* marshal.c (w_object):  Fix exception message when _dump_data
-	  is not defined on a T_DATA object.
+	* debug.c (ruby_debug_printf): use rb_raw_obj_info()
+	  instead of rb_inspect() because it is more robust way
+	  to see object internal.
 
-Sat Aug  6 06:14:20 2011  Eric Hodel  <drbrain@segment7.net>
+Sun Jul 24 16:33:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/rdoc:  Update to 3.9.1.  Fixes === lines in verbatim sections.
-	  Fixes :nodoc: on class aliases.  Fixes :stopdoc: creating references
-	  to Object.  Fixes spacing when class comments are merged in ri.
-	  Fixes `ri []` crash.  Fixes bug report URL when rdoc crashes.  Adds
-	  :doc: and :nodoc: to allow hiding of implementation details in ruby.
-	  Makes `rdoc` and `ri` gem-aware.
+	* 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].
 
-Sat Aug  6 03:19:45 2011  Eric Hodel  <drbrain@segment7.net>
+Sun Jul 24 12:53:42 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* lib/rubygems:  Import RubyGems 1.8.7:
-	  Added missing require for `gem uninstall --format-executable`.
+	* doc/maintainers.rdoc: xmlrpc is bundled gem from Ruby 2.4.
 
-	  The correct name of the executable being uninstalled is now displayed
-	  with --format-executable.
+Sun Jul 24 12:07:39 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	  Fixed `gem unpack uninstalled_gem` default version picker.
+	* doc/maintainers.rdoc: Update OpenSSL maintainer.
 
-	  RubyGems no longer claims a nonexistent gem can be uninstalled.
+Sat Jul 23 22:43:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	  `gem which` no longer claims directories are requirable files.
+	* internal.h (Check_Type): inline check for the object type.
 
-	  `gem cleanup` continues cleaning up gems if one can't be uninstalled
-	  due to permissions.  Issue #82.
+Sat Jul 23 04:06:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	  Gem repository directories are no longer created world-writable.
-	  Patch by Sakuro OZAWA.  [Ruby 1.9 - Bug #4930]
+	* include/ruby/ruby.h (RTEST, NIL_P): use RUBY prefixed name in
+	  macros.
 
-Fri Aug  5 23:08:39 2011  Naohisa Goto  <ngotogenome@gmail.com>
+Sat Jul 23 01:41:29 2016  Eric Wong  <e@80x24.org>
 
-	* backport r32845 from trunk.
+	* 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]
 
-	* configure.in: when Solaris cc, use $(CC) to link shared libs.
+Fri Jul 22 19:55:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Aug  5 22:16:20 2011  Naohisa Goto  <ngotogenome@gmail.com>
+	* vm.c (vm_set_main_stack): remove unnecessary check.  toplevel
+	  binding must be initialized.  [Bug #12611] (N1)
 
-	* numeric.c (rb_infinity, rb_nan): use WORDS_BIGENDIAN to get endian.
-	  fix [Bug #5160] [ruby-dev:44356]
+	* win32/win32.c (w32_symlink): fix return type.  [Bug #12611] (N3)
 
-Fri Aug  5 15:57:10 2011  Naohisa Goto  <ngotogenome@gmail.com>
+	* string.c (rb_str_split_m): simplify the condition.
+	  [Bug #12611](N4)
 
-	* complex.c (f_signbit): fix compile error in gcc4 on Solaris with
-	  CFLAGS="-std=gnu99".  [ruby-dev:44355] fix [Bug #5159]
+Fri Jul 22 17:13:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* math.c: ditto.
+	* 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].
 
-Thu Aug  5 10:09:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* test/ruby/test_string.rb (test_dump): Add tests for above.
 
-	* backport r32846 from trunk.
+Fri Jul 22 10:35:35 2016  Kouhei Sutou  <kou@cozmixng.org>
 
-	* thread_pthread.c (native_cond_signal): retry to call pthread_cond_signal
-	  and pthread_cond_broadcast if they return EAGAIN in
-	  native_cond_signal and native_cond_broadcast, respectively.
-	  It is for the pthread implementation of Mac OS X 10.7 (Lion).
-	  fixes #5155.  [ruby-dev:44342].
+	* 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!!!
 
-	* thread_pthread.c (native_cond_broadcast): ditto.
+Fri Jul 22 10:32:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* thread_pthread.c (struct cached_thread_entry): stop using
-	  pthread_cond_t and its functions directly.
+	* template/unicode_norm_gen.tmpl: Remove
+	  UnicodeNormalize::UNICODE_VERSION at origin [Feature #12546].
 
-	* thread_pthread.c (register_cached_thread_and_wait): ditto.
+Fri Jul 22 09:23:51 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* thread_pthread.c (use_cached_thread): ditto.
+	* LEGAL: Added entries for files under the USD license.
+	  [Bug #12598][ruby-core:76428][ci skip]
 
-Fri Aug  5 07:35:00 2011  Luis Lavena  <luislavena@gmail.com>
+Fri Jul 22 09:19:57 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* lib/rubygems/installer.rb (class Gem): Correct path check on Windows
-	  Possible fix for [Ruby 1.9 - Bug #5111]
+	* LEGAL: Added entry for `lib/rdoc/generator/template/darkfish/css/fonts.css`
+	  [Misc #12550][ruby-core:76255][ci skip]
 
-	* test/rubygems/test_gem_installer.rb (load Gem): ditto
-	  Backported from trunk r32804
+Fri Jul 22 06:28:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Aug  5 07:00:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (run_finalizer): push and exec tag just once, instead of
+	  protecting for each finalizer.
 
-	* test/io/console/test_io_console.rb (test_noctty): daemon() on
-	  Fedora Rawhide seems not to detach the controlling terminal,
-	  when the argument noclose is non-zero.  ref: [Bug #5135]
+	* gc.c (gc_start_internal, rb_gc_start): set finalizing flag
+	  whenever calling deferred finalizers not to recurse.
 
-Wed Aug  4 02:35:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+Thu Jul 21 22:26:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* configure.in: use build_os variable for checking C and C++ compilers
-	  matching.
+	* missing/strl{cat,cpy}.c: Update latest upstream files.
+	  [Misc #12205][ruby-core:74487]
+	* LEGAL: Update license for missing/strl{cat,cpy}.c.
 
-	* configure.in: use clang++ if clang is used.
+Thu Jul 21 21:53:30 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Thu Aug  4 02:21:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* LEGAL: added file list with Public domain license.
+	  [ruby-core:76254][Bug #12549]
 
-	* lib/mkmf.rb (link_command): use static library only for bundled
-	  extensions.  [Bug #5147]
+Wed Jul 20 17:44:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug  3 00:11:08 2011  Tanaka Akira  <akr@fsij.org>
+	* enumerator.c (lazy_uniq): new method Enumerator::Lazy#uniq.
+	  [Feature #11090]
 
-	* lib/prettyprint.rb: update document.  [ruby-core:36776]
+	* enum.c (enum_uniq): new method Enumerable#uniq.
+	  [Feature #11090]
 
+Wed Jul 20 17:35:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Aug  2 20:10:16 2011  Shota Fukumori  <sorah@tubusu.net>
+	* hash.c (rb_hash_add_new_element): add new element or do nothing
+	  if it is contained already.
 
-	* test/testunit/test_parallel.rb: pass "--ruby" option to
-	  test/testunit/tests_for_parallel/runner.rb. [Bug #5132] [ruby-dev:44303]
-	  Backported from trunk r32812.
+	* array.c (ary_add_hash, ary_add_hash_by): use
+	  rb_hash_add_new_element.
 
-Tue Aug  2 12:03:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul 19 18:21:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* hash.c (recursive_hash): hash value of emptied hash should be
-	  equal to an empty hash.  [ruby-core:38650]
+	* lib/unicode_normalize/tables.rb: Remove
+	  UnicodeNormalize::UNICODE_VERSION (#12546).
 
-Tue Aug  2 11:42:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul 19 15:38:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (rb_enc_symname2_p): :! is valid symbol.  [Bug #5136]
+	* variable.c (rb_local_constants_i): exclude private constants
+	  when excluding inherited constants too.  [Bug #12345]
 
-Tue Aug  2 03:26:02 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Jul 17 23:42:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* test/rake/test_rake_directory_task.rb (TestRakeDirectoryTask#
-	  test_directory_win32): fixed wrong test.
-	  backported r32670 from trunk.
+	* numeric.c (num_finite_p, num_infinite_p): Add Numeric#finite? and
+	  Numeric#infinite?  [Feature #12039] [ruby-core:73618]
 
-Mon Aug  1 15:45:23 2011  Eric Hodel  <drbrain@segment7.net>
+	* complex.c (rb_complex_finite_p): Add Complex#finite?
 
-	* test/rake/test_rake_functional.rb:  Don't assume the binary name of
-	  ruby is "ruby".  [Ruby 1.9 - Bug #5114]
-	* test/rake/helper.rb:  ditto
+	* complex.c (rb_complex_infinite_p): Add Complex#infinite?
 
-Mon Aug  1 05:21:42 2011  TAKANO Mitsuhiro (takano32)  <tak@no32.tk>
+	* test/ruby/test_bignum.rb: Add test for Integer#finite? and
+	  Integer#infinite?
 
-	* cont.c (cont_save_thread): fix missing semicolon.
+	* test/ruby/test_fixnum.rb: ditto.
 
-Sun Jul 31 22:57:16 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+	* test/ruby/test_rational.rb: Add test for Rational#finite? and
+	  Rational#infinite?
 
-	* enc/Makefile.in (ECHO1): Same as the recent fix in common.mk.
-	  ":" in a make variable replacement cause a syntax error with
-	  /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
+	* test/ruby/test_complex.rb: Add test for Complex#finite? and
+	  Complex#infinite?
 
-Sun Jul 31 22:44:08 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+Sun Jul 17 20:59:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in: fix typos.
+	* common.mk, enc/depend (casefold.h, name2ctype.h): move to
+	  unicode data directory per version.
 
-Sun Jul 31 21:19:51 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Sat Jul 16 06:26:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (configuration:ECHO1): Same as the recent fix in
-	  common.mk.
-	  ":" in a make variable replacement cause a syntax error with
-	  /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
+	* 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.
 
-Sun Jul 31 21:16:02 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Fri Jul 15 22:05:13 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* complex.c (f_signbit): gcc4 on Solaris DOES have signbit but does
-	  not have it on header.
+	* string.c (str_buf_cat): Fix potential integer overflow of capa.
+	  In addition, termlen is used instead of +1.
 
-	* math.c: ditto.
+Fri Jul 15 21:30:38 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-Sun Jul 31 21:09:04 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+	* string.c (str_buf_cat): Fix capa size for embed string.
+	  Fix bug in r55547. [Bug #12536]
 
-	* common.mk (node_name.inc): Use $(Q) for consistency.
+Fri Jul 15 18:13:15 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* Makefile.in (INSNS): ditto.
+	* gems/bundled_gems: update latest gems.
 
-Sun Jul 31 20:39:12 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Fri Jul 15 17:08:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk (ECHO1): nmake does not allow parenthesis in make variable
-	  replacement.
+	* 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
 
-Sun Jul 31 20:21:36 2011  "Yuki Sonoda (Yugui)"  <yugui@yugui.jp>
+Fri Jul 15 09:53:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk (ECHO1): ":" in a make variable replacement cause a syntax
-	  error with /usr/ccs/bin/make on Solaris.  Uses $(NULLCMD) instead.
+	* enc/unicode/case-folding.rb, tool/enc-unicode.rb: check if
+	  Unicode versions are consistent with each other.
 
-	* configure.in (NULLCMD): new check.
+Fri Jul 15 08:25:15 2016  Jeremy Evans <code@jeremyevans.net>
 
-	* Makefile.in (NULLCMD): Reflects checking in configure.
+	* 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
 
-	* win32/Makefile.sub (NULLCMD): new assignment.
+Thu Jul 14 17:26:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Jul 31 11:31:07 2011  Kazuki Tsujimoto  <kazuki@callcc.net>
+	* Makefile.in (enc/unicode/name2ctype.h): remove stale recipe,
+	  which did not support Unicode age properties.
 
-	* backport r32768 from trunk.
+	* common.mk (enc/unicode/name2ctype.h): update by --header option
+	  of tool/enc-unicode.rb.  enc/unicode/name2ctype.kwd file has not
+	  been used.
 
-	* vm.c: check if cfp is valid. [Bug #5083] [ruby-dev:44208]
+	* common.mk (enc/unicode/name2ctype.kwd): rule to create from
+	  Unicode data files, used only when the target does not exist.
 
-Sat Jul 31 01:23:45 2011  Kenta Murata  <mrkn@mrkn.jp>
+Thu Jul 14 13:10:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* backport r32762 from trunk.
+	* 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.
 
-	* test/bigdecimal/test_bigdecimal.rb (test_version): removed.
+Thu Jul 14 12:48:47 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Sat Jul 30 23:51:44 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* ext/json/**/*.rb: merge original files from upstream repository.
+	  It only fixes styles of frozen string literal.
 
-	* lib/cmath.rb (cbrt): should return a real number if possible.
+Wed Jul 13 22:23:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Sat Jul 30 23:48:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/json/json_common_interface_test.rb: use assert_raise instead of
+	  assert_raises.
 
-	* ext/date/date_core.c: an issue that is same as  [ruby-dev:44071].
+Wed Jul 13 22:14:23 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/date/date_strftime.c: identical to [ruby-dev:44112].
+	* test/lib/test/unit.rb: added test files with `_test` suffix for json
+	  upstream.
+	* test/json: merge original test files from json upstream.
 
-Sat Jul 30 23:19:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 13 18:09:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* defs/default_gems: separate from tool/rbinstall.rb.
+	* enc/iso_8859_9.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-9, by Kazuki Iijima.
 
-Sat Jul 30 23:14:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enc/iso_8859_9.c: Exclude dotless i/I with dot from case-insensitive
+	  matching because they are not a case pair.
 
-	* io.c (rb_io_each_byte): rbuf can be refreshed during yield.
-	  [Bug #5119]
+	* test/ruby/enc/test_iso_8859.rb: Make test coverage for ISO-8859-9
+	  a bit more complete.
 
-Sat Jul 30 22:35:50 2011  Naohisa Goto  <ngotogenome@gmail.com>
+Wed Jul 13 17:21:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* strftime.c (NEEDS): avoid SEGV due to integer overflow in
-	  sparc-solaris2.10 and i686-linux.  fix [Bug #4456] [ruby-dev:43284]
+	* enc/windows_1252.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for Windows-1252, by Serina Tai.
 
-Sat Jul 30 14:27:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
 
-	* backport r32754 from trunk.
+Wed Jul 13 16:19:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_version): version 1.1.0.
+	* enc/iso_8859_7.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-7, by Kosuke Kurihara.
 
-	* ext/bigdecimal/bigdecimal.gemspec: turn into a default gem.
+	* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
 
-	* tool/rbinstall.rb: ditto.
+Wed Jul 13 16:08:08 2016  Koichi Sasada  <ko1@atdot.net>
 
-Sat Jul 30 13:52:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* 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]
 
-	* ext/bigdecimal/lib/bigdecimal/util.rb (Rational#to_d):
-	  revive zero and implicit precision support as a deprecated feature.
+	* test/ruby/test_gc.rb: add a test.
 
-	* test/bigdecimal/test_bigdecimal_util.rb: modify a test for the above
-	  change.
-
-	* NEWS: describes the above change.
-
-Sat Jul 30 10:58:10 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm.c (th_init): preallocate alternative stack.
-	  NoMemoryError is better than rb_bug, of course.
-	  Patch by Eric Wong. [ruby-core:38572][ruby-core:38594].
-
-	* signal.c (rb_register_sigaltstack): ditto.
-
-	* vm_core.h: moved ALT_STACK_SIZE definition from signal.c.
-
-	* vm.c (thread_free): use xfree() instead of free().
-
-Sat Jul 30 07:20:49 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/lib/socket.rb (udp_server_sockets): unused variable
-	  removed.
-	  patch by Jeremy Evans.  [ruby-core:38600]
-
-Fri Jul 29 23:56:32 2011  Tanaka Akira  <akr@fsij.org>
-
-	* lib/securerandom.rb: call OpenSSL::Random.seed at the
-	  SecureRandom.random_bytes call.
-	  based on the patch by Masahiro Tomita.  [ruby-dev:44270]
-
-Fri Jul 29 20:48:39 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: fix typos.
-
-Fri Jul 29 20:28:56 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: use whitespaces as a separator.
-
-Fri Jul 29 18:59:07 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: add documents for constants.
-	  patch by Eric Hodel.  [ruby-core:37853] [Bug #4989]
-
-Mon Jul 25 23:51:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* backport r32671 from trunk.
-
-	* proc.c: pre-allocate the unlinked_method_entry_list_entry struct to
-	  avoid memory allocation during GC.  based on a patch from Eric Wong.
-	  [ruby-core:38498]
-
-Mon Jul 25 22:36:11 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* backport r32669 from trunk.
-
-	* proc.c (struct METHOD), gc.c (gc_marks), vm_method.c
-	  (rb_gc_mark_unlinked_live_method_entries): fix SEGV bug.
-	  rb_method_entry_t was free'd even when the method is still on the
-	  stack if it is BMETHOD (i.e., Method#call).  This is because
-	  rb_method_entry_t is embedded in struct METHOD.  This commit
-	  separates them and marks the live method entries.
-	  See [ruby-core:38449] in detail.  fix [Bug #5047] [ruby-core:38171]
-
-Thu Jul 28 23:36:28 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* ext/fiddle/closure.c (callback): use rb_ary_tmp_new() instead of
-	  xmalloc() to allocate an array for arguments of callback procedure,
-	  to prevent arguments from being swept by GC. [ruby-core:38546]
-	  [Bug #4929]
-
-Thu Jul 28 22:51:27 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32723 from trunk.
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_initialize): Avoid possible
-	  SEGV from AES encryption/decryption. Processing data by
-	  Cipher#update without initializing key (meaningless usage of Cipher
-	  object since we don't offer a way to export a key) could cause SEGV.
-
-	  In OpenSSL, 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. See
-	  #2768.
-
-	* test/openssl/test_cipher.rb: test it.
-
-Thu Jul 28 04:53:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/delegate.rb:  Move file-level documentation to the appropriate
-	  classes.
-
-Thu Jul 28 00:33:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/fileutils/test_fileutils.rb: add OpenBSD case.
-	  patched by Jeremy Evans [ruby-core:38530] see #5097
-
-	* test/ruby/test_process.rb: ditto.
-
-Wed Jul 27 17:59:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/missing.h: define __syscall if the platform has
-	  __syscall in the library but doesn't define it in headers
-	  for example Mac OS X.
-
-Wed Jul 27 15:39:14 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* object.c:  Add usage documentation for BasicObject.  Based on patch
-	  by Thomas Sawyer.  [Ruby 1.9 - Bug #5067]
-
-Wed Jul 27 12:24:17 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/uninstaller.rb:  Add missing require and update
-	  messaging to avoid confusion with uninstall --format-executable.
-	  [Ruby 1.9 - Bug #4062]
-
-Wed Jul 27 10:47:57 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems:  Update to RubyGems 1.8.6.1.
-
-Wed Jul 27 10:04:06 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32690 from trunk.
-
-	* test/openssl/test_pkcs12.rb: Add test and intermediate certificates.
-	  [ Ruby 1.9 - Feature #3793 ] [ruby-core:32088]
-
-Sat Jul 27 01:26:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* NEWS: add changes of bigdecimal and bigdecimal/util.
-
-Wed Jul 27 01:13:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (Rational#to_d):
-	  zero or negative precision is error.  fixes #5098.
-	  [ruby-dev:44210]
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (Float#to_d): modified for
-	  specifying precision.  fixes #5098.  [ruby-dev:44210]
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (Integer#to_d): added
-	  for symmetry to BigDecimal() function with an Integer.
-	  fixes #5098.  [ruby-dev:44210]
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb (BigDecimal#to_d): added
-	  for adapting other Numeric subclasses.  [ruby-dev:44245]
-
-	* test/bigdecimal/test_bigdecimal_util.rb: add tests for the above
-	  changes.
-
-Wed Jul 27 00:54:38 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bigdecimal/bigdecimal.c (VpDup) a new function for duplicating
-	  a BigDecimal.
-
-	* bigdecimal/bigdecimal.c (BigDecimal_new): support generating a new
-	  BigDecimal from another BigDecimal using BigDecimal global function
-	  or constructor.  [ruby-dev:44245]
-
-Mon Jul 25 22:24:09 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32666 from trunk.
-
-	* lib/xmlrpc/client.rb: Fix possible HTTP header formatting failure by
-	  'Basic' header. Long username caused the base64 String truncation in
-	  HTTP header which is not allowed. See #5046.
-
-	* test/xmlrpc/test_webrick_server.rb: test it.
-
-Mon Jul 25 15:36:07 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/{x509.rb,ssl.rb}: Add deprecation warning
-	  for openssl/{x509,ssl} usage. Users should require "openssl" instead
-	  of "openssl/ssl" and "openssl/x509". Start of transition period
-	  introduced by [ruby-dev:38018].
-
-Mon Jul 25 13:50:33 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32662 from trunk.
-
-	* ext/openssl/lib/openssl/x509.rb: Cosmetic change: move definition
-	  introduced in r30152 to x509-internal.rb.
-
-Mon Jul 25 13:35:20 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32658 from trunk.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): Avoid randomly generated
-	  SSLError from SSLSocket just after invoking SSLSocket#close.
-	  OpenSSL's SSL_shutdown could try to send alert packet and it might
-	  set SSLerr(global error stack) as the result. It causes the next
-	  SSL read/write operation to fail by unrelated reason.
-
-	  By design, we're ignoring any error at SSL_shutdown() so we clear
-	  global error stack after SSL_shutdown is called. See #5039.
-
-Sun Jul 24 20:29:53 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/extconf.rb: refine the recvmsg test.
-
-Sun Jul 24 20:02:31 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/extconf.rb: fix the recvmsg test.
-
-Sun Jul 24 08:42:51 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/extconf.rb: test recvmsg allocates file descriptors for
-	  fd passing even with MSG_PEEK.
-
-	* ext/socket/ancdata.c: use the above test result.
-
-Sun Jul 24 01:24:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/specification.rb:  Restore behavior of
-	  Gem::Specification#loaded.  [Ruby 1.9 - Bug #5032]
-
-Sun Jul 24 01:14:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/rake/test_rake_functional.rb (setup): Use __FILE__ for the base
-	  directory. Current directory is not the top source directory when
-	  the building process runs on other than there.
-
-	* test/rake/test_rake_rake_test_loader.rb: ditto.
-
-	* test/rake/test_rake_task_argument_parsing.rb
-	  (test_terminal_width_using_hardcoded_80): hardcoded 80 is used
-	  when app.unix? is false.
-
-Sun Jul 24 00:42:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* configure.in: change the default compiler to gcc-4.2 if target os
-	  is OS X 10.7 (Lion).
-
-Sat Jul 23 17:06:25 2011  Tanaka Akira  <akr@fsij.org>
-
-	* io.c (rb_update_max_fd): validate fd.
-
-	* ext/socket/rubysocket.h (rsock_discard_cmsg_resource): add
-	  msg_peek_p argument for the declaration.
-
-	* ext/socket/ancdata.c (discard_cmsg): add msg_peek_p argument.
-	  assume FreeBSD, NetBSD and MacOS X doesn't generate passed fd
-	  when MSG_PEEK.
-	  (rsock_discard_cmsg_resource): add msg_peek_p argument.
-	  (bsock_recvmsg_internal): call rsock_discard_cmsg_resource with
-	  msg_peek_p argument.
-
-	* ext/socket/unixsocket.c (unix_recv_io): call
-	  rsock_discard_cmsg_resource with msg_peek_p argument.
-
-Sat Jul 23 14:38:28 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* test/rake*: Remove dependencies on flexmock and session gems.
-	  [Ruby 1.9 - Bug #4987]
-
-Fri Jul 22 21:46:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_insnhelper.c (vm_call_cfunc): added volatile for a workaround
-	  of cfp consistency error problem on OS X 10.7 (Lion). It's
-	  suspected llvm optimization bug.
-	  [Bug #5076] [ruby-dev:44185]
-
-Fri Jul 22 21:50:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/uri/generic.rb (WFKV_): unroll the loop of regexp.
-
-	* lib/uri/generic.rb (URI.decode_www_form_component): ditto.
-
-Fri Jul 22 21:49:48 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enum.c (enum_inject): remove empty line to notify rdoc
-	  Enumerable#reduce is alias. patched by milki@github.
-	  https://github.com/ruby/ruby/pull/26
-
-Fri Jul 22 21:49:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#each):
-	  Allow HTTP/0.9 request which doesn't has any header or body.
-	  patched by Felix Jodoin. [ruby-core:38040] [Bug #5022]
-
-Fri Jul 22 21:45:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/dl/handle.c (dlhandle_sym): clear previous error with dlerror()
-	  before calling dlsym(). [ruby-dev:44091] [Bug #5021]
-
-Fri Jul 22 19:05:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_enc_symname2_p): get rid of potential out-of-bound
-	  access.
-
-Fri Jul 22 13:55:59 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/http.rb:  Net::HTTP#finish is used to manually close
-	  connections.  [Ruby 1.9 - Bug #5045]
-
-Fri Jul 22 13:51:29 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/readline/readline.c:  Add examples for Readline.completion_proc=.
-	  [Ruby 1.9 - Bug #5057]
-
-Fri Jul 22 13:20:33 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* tool/rbinstall.rb (default gems):  Install executables into the fake
-	  gem dir for Gem.bin_path.  [Ruby 1.9 - Bug #4485]
-
-Fri Jul 22 13:03:12 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32609 from trunk.
-
-	* ext/openssl/ossl_hmac.c: Revert checking return type of
-	  HMAC_Init_ex as it is not compatible with OpenSSL < 1.0.0.
-
-Fri Jul 22 11:22:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32606 from trunk.
-
-	* ext/openssl/ossl_digest.c: Check return value of EVP_DigestInit_ex.
-	* ext/openssl/ossl_hmac.c: Check return value of HMAC_Init_ex.
-	  Thanks, Jared Jennings, for the patch.
-	  [ Ruby 1.9 - Bug #4944 ] [ruby-core:37670]
-
-Fri Jul 22 09:17:43 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32604 from trunk.
-
-	* ext/openssl/ossl_engine.c: Avoid double free of ENGINE reference.
-	* test/openssl/test_engine.rb: Add a test for it.
-	  Thanks to Ippei Obayashi for providing the patch.
-	  [ Ruby 1.9 - Bug #5062 ] [ruby-dev:44173]
-
-Fri Jul 22 06:39:34 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/csv.rb: Do not modify CSV.generate's argument [ruby-core:38356]
-
-Thu Jul 21 20:02:11 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* thread.c (set_trace_func, thread_set_trace_func_m): reset tracing
-	  state when set_trace_func hook is removed.  This is workaround patch
-	  to force to reset tracing state that is broken by continuation call.
-	  a patch from James M. Lawrence.  [Feature #4347] [ruby-core:34998]
-
-	* test/ruby/test_continuation.rb (class TestContinuation): add a test
-	  for above.  a patch from James M. Lawrence.
-
-Thu Jul 21 20:59:59 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/ancdata.c (discard_cmsg): workaround for MacOS X Lion.
-
-
-Thu Jul 21 07:07:57 2011  Tanaka Akira  <akr@fsij.org>
-
-	* backport r32579, r32581, r32587 by akr and r32588 by kazu.
-
-	r32579:
-
-	* io.c (rb_update_max_fd): new function.
-
-	* internal.h (rb_update_max_fd): declare rb_update_max_fd.
-
-	* thread_pthread.c (rb_thread_create_timer_thread): update max fd when
-	  timer thread pipe is created.
-
-	r32581:
-
-	* io.c (UPDATE_MAXFD): removed.
-
-	r32587:
-
-	* include/ruby/intern.h (rb_update_max_fd): declaration moved from
-	  internal.h.
-
-	* file.c: ditto.
-
-	* io.c: call rb_update_max_fd for each new fds.
-
-	* process.c: ditto.
-
-	* random.c: ditto.
-
-	* ruby.c: ditto.
-
-	* ext/io/console/console.c: ditto.
-
-	* ext/openssl/ossl_bio.c: ditto.
-
-	* ext/pty/pty.c: ditto.
-
-	* ext/socket/init.c: ditto.
-
-	* ext/socket/socket.c: ditto.
-
-	* ext/socket/ancdata.c: ditto.
-
-	* ext/socket/unixsocket.c: ditto.
+Wed Jul 13 15:59:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	r32588:
+	* 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.
 
-	* io.c (rb_update_max_fd): remove parentheses. they are not in
-	  macro.
-
-Sun Jul 17 08:07:31 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* backport r32563 from trunk
-
-	* test/openssl/test_ssl_session.rb: add PEM SSL session without TLS
-	  extensions. Use this as the default for the tests to ensure
-	  compatibility with OpenSSL 0.9.7.
-	  [ Ruby 1.9 - Bug #4961 ] [ruby-core:37726]
-
-Sat Jul 16 17:29:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_UNIVERSAL_ARCH): restore arch flag.
-	  Bug #4977
-
-Sat Jul 16 11:18:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak: support to build x64-mswin64 on Windows7 (and Vista,
-	  perhaps).
-	  backported r32521 from trunk
-
-Sat Jul 16 06:31:23 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/uri/common.rb (module): Remove optional parser argument to
-	  Kernel#URI
-	  [ruby-core:38061]
-
-	* lib/uri/generic.rb (module): ditto
-
-Sat Jul 16 01:15:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* time.c (time_dup): used rb_obj_class() instead of CLASS_OF().
-	  The patch is made by Kazuki Tsujimoto. [Bug #5012] [ruby-dev:44071]
-
-	* test/ruby/test_time.rb (TestTime#test_getlocal_dont_share_eigenclass):
-	  added a new test for eigenclass of time object.
-
-Fri Jul 15 19:11:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (bigsub_int): add RB_GC_GUARD.  This patch is made by
-	  Makoto Kishimoto.  fixes #4223 [ruby-dev:42907]
-
-	* bignum.c (bigadd_int): ditto.
-
-Fri Jul 15 09:59:12 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32546 from trunk.
-
-	* ext/digest/sha2/sha2.c (SHA256_Update, SHA512_Update): avoid Bus
-	  Error caused by unalignment access on Sparc-Solaris (and possibly on
-	  other similar environment.) This patch just do memcpy always instead
-	  of checking architecture. I see no perf drop on my 64bit env. For
-	  more details, see #4320.
-
-	* test/digest/test_digest.rb: add test for unalignment access.
-
-
-Thu Jul 14 12:40:07 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* backport r32537 from trunk.
-
-	* ext/openssl/ossl.c (ossl_verify_cb): trap the exception from
-	  verify callback of SSLContext and X509Store and make the
-	  verification fail normally. Raising exception directly from callback
-	  causes orphan resouces in OpenSSL stack. Patched by Ippei Obayashi.
-	  See #4445.
-
-	* test/openssl/test_ssl.rb
-	  (test_exception_in_verify_callback_is_ignored): test it.
-
-Wed Jul 13 08:20:08 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb(Test::Unit::Options#process_args): Fix bug.
-	  Fix process_args didn't return `@option` after r30939. Backported
-	  r32526 from trunk.
-
-Mon Jul 11 23:50:39 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* time.c: can't compile time.c on AIX due to missing declaration for
-	  ffs(). It is declared in strings.h on AIX. backported r32518 from
-	  trunk.
-
-Mon Jul 11 23:47:00 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* thread_pthread.c (get_stack):  need to adjust stack addr for
-	  [Bug #1813] on AIX. backported r32511 from trunk.
-
-Mon Jul 11 15:17:03 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* numeric.c (rb_num2ull): use FIX2LONG instead of FIX2ULONG. see
-	  rb_num2ulong(). fixed the problem of ObjectSpace._id2ref of IL32LLP64
-	  platforms, introduced at r32433.
-	  backported r32512 from trunk.
-
-Sun Jul 10 23:58:55 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* version.h: 1.9.3 is no longer trunk.
-
-Sun Jul 10 23:24:29 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* class.c (rb_mix_module): reverted r31873.
-	  (check_mix_method_i, do_mix_method_i) reverted r31917.
-
-	* test/ruby/test_module.rb (TestModule#test_mix_const): reverted
-	  r31918.
-
-Sun Jul 10 22:50:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal): fix
-	  precision treatment errors.
-
-	* test/bigdecimal/test_bigdecimal.rb: add tests for the above change.
-	  fix precision treatment errors.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): precision argument
-	  should be optional for its compatibility.
-
-Sun Jul 10 22:38:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (var_ref): distinguish vcall from local variable
-	  references.  based on a patch by Michael Edgar michael.j.edgar
-	  AT dartmouth.edu.  Bug #5002
-
-Sun Jul 10 21:51:29 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* internal.h: add comments (cautions).
-
-Sun Jul 10 20:59:38 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: Add new class variable `@@testfile_prefix`.
-	  This is for changing test name prefix. (For testing)
-
-	* test/testunit/tests_for_parallel/ptest_first.rb: Renamed from
-	  test_first.rb
-
-	* test/testunit/tests_for_parallel/ptest_second.rb: Renamed from
-	  test_second.rb
-
-	* test/testunit/tests_for_parallel/ptest_third.rb: Renamed from
-	  test_third.rb
-
-	* test/testunit/tests_for_parallel/ptest_forth.rb: Renamed from
-	  test_forth.rb
-
-	* test/testunit/tests_for_parallel/runner.rb: Remove misc.rb
-
-	* test/testunit/tests_for_parallel/ptest_first.rb: ditto.
-
-	* test/testunit/tests_for_parallel/ptest_second.rb: ditto.
-
-	* test/testunit/tests_for_parallel/ptest_third.rb: ditto.
-
-	* test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
-
-	* test/testunit/tests_for_parallel/misc.rb: Removed because no longer
-	  needed.
-
-	* test/testunit/test_parallel.rb: Fix assertions for above.
-
-Sun Jul 10 16:57:08 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_insnhelper.c (vm_throw): check a class frame.
-	  Fixes Bug #4648.
-	  The patch is contributed by Kazuki Tsujimoto.
-
-	* bootstraptest/test_proc.rb: add tests for above.
-
-Sun Jul 10 17:28:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (mutex_debug): use exit(EXIT_FAILURE) instad of
-	  exit(1).
-	* thread_pthread.c (add_signal_thread_list): ditto.
-	* thread.c (rb_thread_call_with_gvl): ditto.
-	* util.c (Bug): ditto.
-
-Sun Jul 10 15:58:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/json: Merge json gem 1.5.4+ (f7f78896607b6f6226cd).
-	  [Bug #4700]
-
-Sun Jul 10 16:41:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_core.h (typedef struct rb_vm_struct): create a new
-	  'inhibit_thread_createion' field.
-	* thread.c (rb_thread_terminate_all): set inhibit_thread_creation.
-	* thread.c (thread_s_new): don't permit to create new thread
-	  if the VM is under destruction. Otherwise evil finalizer code
-	  can make SEGV. [Bug #4992][ruby-core:37858]
-
-	* bootstraptest/test_objectspace.rb: new test for this fix.
-
-Sun Jul 10 16:06:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* signal.c (sigsegv): use abort() instead of exit() when nested
-	  SEGV was happen. Because unnested SEGV use abort().
-	  [Bug #5013][ruby-dev:44078]
-
-Sun Jul 10 15:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* load.c (rb_f_autoload): prevent to autoload for singleton
-	  classes.  fixes [Bug #4886] [ruby-dev:43816]
-
-	* bootstraptest/test_autoload.rb: add tests for the above change.
+Wed Jul 13 15:19:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Jul 10 15:09:17 2011  Shota Fukumori  <sorah@tubusu.net>
+	* enc/iso_8859_1.c, enc/iso_8859_4.c: Avoid setting modification flag if
+	  there is no modification.
 
-	* lib/test/unit/assertions.rb: Import documentation patch by Justin
-	  Collins. [ruby-core:37225] [Feature #4903]
+Wed Jul 13 14:40:04 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Jul 10 14:57:36 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* enc/iso_8859_5.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-5, by Masaru Onodera.
 
-	* ext/date/date_core.c: canonicalizes nth and sf.
+	* test/ruby/enc/test_case_comprehensive.rb: Fix order of encodings.
 
-Sun Jul 10 14:13:50 2011  Koichi Sasada  <ko1@atdot.net>
+Wed Jul 13 14:28:33 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* internal.h (rb_thread_call_with_gvl, rb_thread_call_without_gvl):
-	  make them visible as experimental C APIs.  fixes Feature #4328.
+	* math.c (rb_math_sqrt): r55646 must use f_signbit.
 
-Sun Jul 10 12:18:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+Wed Jul 13 14:22:50 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): support non-integral
-	  exponent.  fixes [Bug #3271]
+	* iseq.c (Init_ISeq): undef ISeq.translate and ISeq.load_iseq
+	  to prevent calling super classes' methods.
 
-	* ext/bigdecimal/bigdecimal.c (rmpd_power_by_big_decimal): ditto.
+	  Without this patch, you can write workaround like:
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_power_op): add a function to
-	  only use for "**" operator.
+	    class << RubyVM::InstructionSequence
+	      def translate; end
+	      undef translate
+	    end
 
-	* test/bigdecimal/test_bigdecimal.rb: add a bunch of tests for the
-	  above changes.
+	* test/ruby/test_iseq.rb: add a test.
 
-	* ext/bigdecimal/bigdecimal.c (is_integer): add an utility function.
+Wed Jul 13 14:16:03 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/bigdecimal/bigdecimal.c (is_negative): ditto.
+	* vm_method.c (method_entry_get_without_cache): check
+	  undefined method even if ruby_running is FALSE.
 
-	* ext/bigdecimal/bigdecimal.c (is_positive): ditto.
+	  We haven't call "undef"ed methods before ruby_running.
+	  So that this issue does not make troubles.
 
-	* ext/bigdecimal/bigdecimal.c (is_zero): ditto.
+Wed Jul 13 14:15:22 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/bigdecimal/bigdecimal.c (is_one): ditto.
+	* enc/windows_1254.c: Adjust variable/macro names.
 
-	* ext/bigdecimal/bigdecimal.c (is_even): ditto.
+Wed Jul 13 13:19:12 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Jul 10 12:08:39 2011  Yusuke Endoh  <mame@tsg.ne.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.
 
-	* compile.c (when_vals): when a string literal is written on when
-	  clause, skip string creation to make it faster.  [ruby-dev:44068]
-	  [Feature #5000]
+Wed Jul 13 13:08:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Jul 10 11:35:29 2011  Yusuke Endoh  <mame@tsg.ne.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.
 
-	* parse.y (reduce_nodes_gen): NODE_RETURN in rescue body must not be
-	  reduced when there is an else clause.  This caused bizarre behavior
-	  in [Bug #4473] [ruby-core:35629] [ruby-core:37884].
+Wed Jul 13 10:50:12 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Jul 10 09:46:14 2011  Masaya Tarui  <tarui@ruby-lnag.org>
+	* enc/iso_8859_13.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-13, by Kanon Shindo.
 
-	* range.c (range_max): fix behavior with excluded end value.
-	  [Bug #4591]
+Wed Jul 13 10:31:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Jul 10 09:13:18 2011  Eric Hodel  <drbrain@segment7.net>
+	* enc/iso_8859_13.c, enc/windows_1257.c: Split Windows-1257 from
+	  ISO-8859-13 to be able to implement different case conversions.
 
-	* NEWS:  Fix RubyGems version.  [Ruby 1.9 - Bug #5004]
+Wed Jul 13 09:02:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sat Jul  9 20:01:59 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* enc/iso_8859_3.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-3, by Takuya Miyamoto.
 
-	* internal.h: rb_rational_reciprocal is defined in rational.c.
+	* test/ruby/enc/test_case_comprehensive.rb: Extend special treatment
+	  for Turkic.
 
-Sat Jul  9 19:48:31 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* enc/iso_8859_3.c: Exclude dotless i/I with dot from case-insensitive
+	  matching because they are not a case pair.
 
-	* internal.h: added declarations.
-	* complex.c: followed the above change.
+Wed Jul 13 08:40:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sat Jul  9 17:24:41 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/ruby/enc/test_iso_8859.rb: Exclude dotless i/I with dot from
+	  case-insensitive matching because they are not a case pair.
 
-	* NEWS: bigdecimal is not a builtin.
+Tue Jul 12 23:13:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Jul  9 17:17:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* math.c (rb_math_sqrt): [EXPERIMENTAL] move Complex sqrt support
+	  from mathn.rb.
 
-	* ext/date/date_core.c: some improvements for performance.
+Tue Jul 12 01:25:09 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Jul  9 16:56:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in, lib/mkmf.rb, win32/Makefile.sub (CSRCFLAG): make the
+	  compiler option replacable in Makefile.
 
-	* atomic.h (ATOMIC_OR): _InterlockedOr is unavailable in VC6.
+	* win32/Makefile.sub (OUTFLAG, COUTFLAG): ditto.
 
-	* numeric.c (ULLONG_MAX): fallback definition.
+	* win32/Makeile.sub, win32/setup.mak (CC): should not append `-nologo`
+	  option forcely.
 
-Sat Jul  9 15:59:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 11 18:05:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* win32/win32.c (rb_w32_{read,write}): should be signed.
-	  Bug #5001
+	* enc/iso_8859_1.c: Moved test for lowercase characters without
+	  uppercase equivalent.
 
-Sat Jul  9 14:02:20 2011  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+Mon Jul 11 17:49:25 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/cgi/core.rb: fix multipart form parsing bug. [Bug #3866]
+	* 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.
 
-Sat Jul  9 11:41:03 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+Mon Jul 11 16:00:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/matrix.rb: Add Vector#normalize [ruby-dev:43829]
+	* ext/stringio/stringio.c (strio_each, strio_readlines): convert
+	  arguments just once before reading, instead of conversions for
+	  each lines, as r55603.
 
-Sat Jul  9 09:25:06 2011  Eric Hodel  <drbrain@segment7.net>
+Sun Jul 10 19:53:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* enumerator.c:  Remove "enumeration sequenced by".
-	  [Ruby 1.9 - Bug #4757]
+	* enc/iso_8859_10.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-10, by Toya Hosokawa.
 
-Sat Jul  9 09:14:56 2011  Eric Hodel  <drbrain@segment7.net>
+Sun Jul 10 19:33:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* io.c:  Note that methods other than IO#gets may increase IO#lineno.
-	  [Ruby 1.9 - Bug #4902]
+	* 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.
 
-Sat Jul  9 08:39:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 10 17:05:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* common.mk (RUN_OPT): disable gems.
+	* enc/iso_8859_4.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-4, by Kotaro Yoshida.
 
-Sat Jul  9 08:37:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 10 16:17:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* io.c (rb_io_close): close(2) on a fd which is being read by
-	  another thread causes deadlock on Mac OS X 10.5
+	* test/ruby/enc/test_case_comprehensive.rb: Fixed a comment
+	  (message belongs to last commit). [ci skip]
 
-Fri Jul  8 21:20:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Sun Jul 10 14:27:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* addr2line.c: use USE_ELF instead of __ELF__ because Solaris
-	  doesn't define it. USE_ELF is already provided by configure.
-	  patched by Naohisa Goto. [ruby-dev:44066] [Bug #4998]
+	* 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.
 
-	* addr2line.h: ditto.
+Sun Jul 10 08:57:20 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* vm_dump.c: ditto.
+	* thread.c: Fixed implicit conversion error with Apple clang-800.0.31
 
-Fri Jul  8 16:40:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul  9 12:43:09 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/json/parser/parser.rl (convert_encoding): should not modify
-	  the argument.
+	* lib/getoptlong.rb: use false instead of FALSE.
 
-	* ext/json/parser/parser.rl (convert_encoding): no needs to use
-	  force_encoding.
+Fri Jul  8 21:49:28 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-Fri Jul  8 15:53:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time
+	  before calling ppoll(2). [Bug #12575] [ruby-dev:49725]
 
-	* error.c (rb_bug): get rid of segfault after all threads
-	  disposed.
+Fri Jul  8 14:16:48 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-Fri Jul  8 15:01:06 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* vm_args.c (vm_caller_setup_arg_block): call rb_sym_to_proc()
+	  directly to reduce method dispatch overhead.
 
-	* ext/openssl/ossl.h: include openssl/e_os2.h before checking the
-	  defition of OPENSSL_SYS_WIN32.
+Fri Jul  8 08:43:31 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-Fri Jul  8 14:40:39 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* io.c (rb_io_s_read): add description of pipes to the documentation
+	  of IO.read.
 
-	* win32/win32.c (wunlink): reverted a part of r32426. it was mistakenly
-	  mixed.
+Fri Jul  8 03:54:22 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Jul  8 14:29:47 2011  Narihiro Nakamura  <authornari@gmail.com>
+	* 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
 
-	* configure.in: can't subtract void *.
+Fri Jul  8 00:47:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Jul  8 14:33:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* vm_eval.c (yield_under): change prototype to get argc/argv.
 
-	* win32/Makefile.sub (config.h): define GC_MARK_STACKFRAME_WORD.
-	  fixed build problem of r32438.  the value (30) is temporary value.
-	  maybe it's enough by 20~24 according to my observation.
+	* vm_eval.c (specific_eval): change for above.
 
-Fri Jul  8 13:47:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* vm_eval.c (rb_obj_instance_exec): avoid object allocation.
 
-	* thread.c (rb_mutex_unlock_all): folded into
-	  rb_threadptr_unlock_all_locking_mutexes.
-	* thread.c (rb_threadptr_unlock_all_locking_mutexes) ditto.
+	* vm_eval.c (rb_mod_module_exec): ditto.
 
-Fri Jul  8 13:36:02 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Thu Jul  7 20:08:37 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* thread.c (thread_unlock_all_locking_mutexes): rename to
-	  rb_threadptr_unlock_all_locking_mutexes and remove static.
-	* vm_core.h: add rb_threadptr_unlock_all_locking_mutexes declaration.
-	* thread.c (thread_start_func_2): adjust the above rename.
+	* 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]
 
-	* eval.c (ruby_cleanup): call rb_threadptr_unlock_all_locking_mutexes
-	  again after finalizer. [Bug #4988] [ruby-dev:44049]
+Thu Jul  7 16:37:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jul  8 13:06:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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
 
-	* cont.c (FIBER_MACHINE_STACK_ALLOCATION_SIZE): Fiber stack size
-	  don't need to keep multiple number of sizeof(VALUE).
+Thu Jul  7 16:31:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jul  8 11:39:12 2011  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.
 
-	* common.mk (sudo-precheck): true command is not standard on
-	  Windows.
+Wed Jul  6 19:54:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Fri Jul  8 10:39:52 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* enc/iso_8859_14.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-14, by Yutaro Tada.
 
-	* thread_pthread.c (gvl_destroy): fix cond_t leak.
+Wed Jul  6 19:24:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Fri Jul  8 09:17:59 2011  Eric Hodel  <drbrain@segment7.net>
+	* enc/iso_8859_1.c, enc/iso_8859_15.c, enc/iso_8859_16.c:
+	  Align indenting to onigmo convention.
 
-	* gc.c:  Improve documentation
+Wed Jul  6 18:59:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Jul  7 23:35:31 2011  Narihiro Nakamura  <authornari@gmail.com>
+	* enc/iso_8859_15.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-15, by Maho Harada.
 
-	* gc.c: change water_mark value that may call
-	  gc_mark(lev <= GC_LEVEL_MAX) in gc_mark().
-	  In ruby_stack_check(), water_mark is a value that may call some
-	  C function. Fixes Bug #3781
+Wed Jul  6 18:34:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* configure.in: define GC_MARK_STACKFRAME_WORD that approximate
-	  size of gc_mark() and gc_mark_children() stackframes.
+	* enc/iso_8859_16.c, test/ruby/enc/test_case_comprehensive.rb:
+	  Implement non-ASCII case conversion for ISO-8859-16, by Satoshi Kayama.
 
-Thu Jul  7 17:55:05 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jul  6 14:44:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/testunit/test_parallel.rb (TestParallelWorker#teardown): wait
-	  the child process even if the communication pipe is broken.
+	* lib/mkmf.rb (create_makefile): store $headers in LOCAL_HDRS for
+	  depend files.
 
-Thu Jul  7 15:44:42 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/digest/digest_conf.rb (digest_conf): add implementation
+	  specific headers to $header.
 
-	* encoding.c (rb_enc_set_index, rb_enc_associate_index): should
-	  check if frozen.
+	* ext/digest/{md5,rmd160,sha1,sha2}/depend: add LOCAL_HDRS to the
+	  dependencies.
 
-	* parse.y (rb_intern3), ruby.c (process_options, ruby_script):
-	  defer freezing after associating encodings.
+Wed Jul  6 08:59:35 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-Thu Jul  7 15:16:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/net/http/generic_request.rb (write_header): A Request-Line must
+	  not contain CR or LF.
 
-	* numeric.c (rb_num2ull): use own switch sentence.
-	  Current implementation can't convert 18446744073709551615.
+Wed Jul  6 07:11:27 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-Thu Jul  7 06:56:15 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/net/ftp.rb (putline): raise an ArgumentError when
+	  CR or LF is included in a line.
 
-	* cont.c (FIBER_STACK_FLAGS): workaround fix for r32420 on FreeBSD.
+Tue Jul  5 20:49:30 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Thu Jul  7 06:46:12 2011  Eric Hodel  <drbrain@segment7.net>
+	* 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]
 
-	* benchmark/driver.rb:  Add difference column to report that averages
-	  across all runs of a benchmark.  [Ruby 1.9 - Feature #4982]
+Tue Jul  5 19:39:49 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-Thu Jul  7 06:19:38 2011  Eric Hodel  <drbrain@segment7.net>
+	* 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]
 
-	* lib/rubygems.rb:  Reduce requires to improve `make benchmark`.
-	  [#4962]
-	* lib/rubygems/specification.rb:  Delay initialization of rubygems
-	  until require is called.
+	* internal.h: declaration for rb_str_change_terminator_length.
 
-Thu Jul  7 04:31:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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.
 
-	* parse.y (arg): rescue_mod is in inverse order from other
-	  modifiers.  patched by michael.j.edgar AT dartmouth.edu at
-	  [ruby-core:36248].  fixed #4716.
+	* encoding.c (rb_enc_associate_index): rb_str_change_terminator_length
+	  is used, and it should be called whenever the termlen is changed.
 
-Thu Jul  7 00:40:16 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* 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.
 
-	* win32/win32.c (kill): check that the process exited or not before
-	  terminating it. [Bug #4943]
+	* string.c (rb_str_capacity): Use str_capacity.
 
-Wed Jul  6 23:13:19 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jul  5 11:07:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* parse.y (opt_call_args): allow trailing comma after assoc
-	  argument e.g. 'foo(bar:1,)'.  fixed #3456
+	* 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]
 
-Wed Jul  6 22:11:12 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Validate date in
-	  "Date:" header
-
-Wed Jul  6 21:29:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): cleanup pointer arithmetic.
-	  "size/sizeof(VALUE)" is ugly and easy confusing.
-	* cont.c (fiber_initialize_machine_stack_context): ditto.
-
-Wed Jul  6 21:24:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): fix mprotect misuse. A stack
-	  guard page should have PROT_NONE.
-	* cont.c (fiber_initialize_machine_stack_context):
-	  th->machine_stack_maxsize shouldn't be included guard pages size.
-	  [Bug #4983][ruby-dev:44043]
-
-Wed Jul  6 21:23:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): use MAP_STACK if it's provided.
-
-Wed Jul  6 21:22:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): use MAP_FAILED instead of -1.
-
-Wed Jul  6 21:21:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* cont.c (fiber_machine_stack_alloc): remove unnecessary cast.
-
-Wed Jul  6 18:10:13 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Adding space after
-	  comma.
-
-	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Remove variable
-	  `now`. Suppress warning.
-
-Wed Jul  6 12:18:09 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/cgi/test_cgi_header.rb(test_cgi_header_nph): Fix bug depends to
-	  time. The test fails if time past 1 second in line 136-145
-
-Tue Jul  5 15:28:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* pack.c (pack_unpack): ditto.
 
-	* parse.y (parser_here_document): should dispatch heredoc_end
-	  scanner event on an empty here document.  fixed Bug#4543.
+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>
 
-Tue Jul  5 13:49:26 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+Sat Jul  2 18:04:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* addr2line.c: fix r32407 to check HAVE_ALLOCA_H.
+	* 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>
 
-Tue Jul  5 14:05:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Jul  2 04:26:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/webrick/httpauth/digestauth.rb (_authenticate):
-	  Literal texts in HTTP ABNF is case-insensitive (RFC2616 2.1),
-	  and a ample implementation in RFC2617 also ignores the case
-	  of algorithms. So now this ignores those cases.
-	  [ruby-dev:43965] [Feature #4936]
+	* 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]
 
-	* lib/webrick/httpauth/digestauth.rb (initialize):
-	  Because of above, opera_hack is useless and removed.
+Sat Jul  2 03:09:27 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-Tue Jul  5 01:30:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+	* 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]
 
-	* thread_pthread.c (native_sleep): cut the waiting time up to
-	  100,000,000 because Solaris cond_timedwait() return EINVAL if an
-	  argument is greater than current_time + 100,000,000.  This is
-	  considered as a kind of spurious wakeup.  The caller to native_sleep
-	  should care about spurious wakeup.
+Sat Jul  2 02:22:22 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-Tue Jul  5 01:24:26 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+	* 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]
 
-	* cont.c: disable FIBER_USE_NATIVE on Solaris because resuming any
-	  Fiber caused SEGV.  I haven't follow up the issue deeply, but it
-	  works when disabling the feature.
+Fri Jul  1 20:20:20 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-Tue Jul  5 01:22:46 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+	* string.c: Specify termlen as far as possible.
+	  Additional fix for [Bug #12536] [ruby-dev:49699].
 
-	* addr2line.c: include <alloca.h> to fix a build issue on Solaris.
+	* string.c (str_new_static): Specify termlen from the given encoding
+	  when creating a new String object is needed.
 
-Tue Jul  5 00:49:05 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* 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.
 
-	* ext/coverage/coverage.c: resurrect r32071 + add GC guard for
-	  rb_coverages. [ruby-core:37352] [Bug #4927]
-	  [ruby-core:36539] [Feature #4796]
+	* string.c (rb_external_str_new_with_enc): Use encoding by using the
+	  above rb_tainted_str_new_with_enc().
 
-	* test/coverage/test_coverage.rb resurrect r32071.
+Fri Jul  1 19:38:57 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-Mon Jul  4 22:24:46 2011  KOSAKI Motohiro  <kosaki.motohiro@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]
 
-	* thread_pthread.c (get_stack): For NetBSD/FreeBSD, use
-	  pthread_attr_getstack() if possible. and, remove an assumption
-	  of stack growing direction.
+Fri Jul  1 18:20:00 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Jul  4 20:42:31 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+	* .gdbinit (rb_ps_thread): show the detail of cfunc in ruby level
+	  backtrace.
 
-	* ext/coverage/coverage.c: revert r32071.  The commit caused SEGV on
-	  some minor nonfree OS.  I have no means of debugging the bug.  My
-	  personal opinion is that such OS should be unsupported unless there
-	  is an active maintainer.  [ruby-core:37352]
+Fri Jul  1 13:26:39 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* test/coverage/test_coverage.rb: ditto.
+	* 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].
 
-Mon Jul  4 07:14:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Jul  1 12:11:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* thread_pthread.c (get_stack): the return address of get_stack
-	  must be the highest address of the current thread's stack.
+	* .gdbinit (rb_count_objects): added gdb version of count_objects().
 
-Mon Jul  4 06:37:22 2011  Koichi Sasada  <ko1@atdot.net>
+Fri Jul  1 04:32:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* include/ruby/intern.h, thread_pthread.c (rb_reserved_fd_p,
-	  RB_RESERVED_FD_P): added.  This C API is to limit to access
-	  fds which are used by RubyVM internal.  In this version of
-	  CRuby, return 1 if fd is communication pipe.
-	  If your application needs to close all file descriptors to
-	  present resource leak, skip internal fds using this C API.
-	  We also define a macro RB_RESERVED_FD_P(fd).  So you can write
-	    #ifndef RB_RESERVED_FD_P
-	    #define RB_RESERVED_FD_P(fd) 0
-	    #endif
-	  for Ruby 1.9.2 or previous version to write compatible extensions.
-	  See [ruby-core:37727]
+	* .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>`.
 
-	* thread_win32.c (rb_reserved_fd_p): added (return 0 for any fds).
+Thu Jun 30 19:15:13 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* io.c (rb_io_initialize): raise ArgumentError if given fd is reserved by Ruby.
+	* string.c: Fix memory corruptions when using UTF-16/32 strings.
+	  [Bug #12536] [ruby-dev:49699]
 
-Sun Jul  3 23:43:56 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+	* string.c (rb_str_new_with_class): Use TERM_LEN of the "obj".
 
-	* ext/extmk.rb (extmake): suppresses outputs from extconf.rb.
-	  (extmake) warns a failure in extconf.rb.
+	* string.c (rb_str_plus, rb_str_justify): Use str_new0 which is aware
+	  of termlen.
 
-Sun Jul  3 13:44:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (str_shared_replace): Copy +termlen bytes instead of +1.
 
-	* array.c (ary_reject_bang): should not remove elements which are
-	  not yielded.  [Bug #2545]
+	* string.c (rb_str_times): termlen should not be included in capa.
 
-Sun Jul  3 06:10:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* thread_pthread.c (get_stack): pthread_attr_getstack() doesn't
-	  return stack start address, but stack base address. Thus,
-	  we need to add stack size for getting stack start address.
-	  And, we don't have to decrease guard size twice.
-	* thread_pthread.c (thread_start_func_1): don't use inaccurate
-	  stack start guess if native_thread_init_stack() can be used.
-	  [Bug #1813] [ruby-core:24540]
+	* string.c (rb_str_capacity, str_shared_replace, str_buf_cat): ditto.
 
-Sun Jul  3 04:50:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* string.c (rb_str_drop_bytes, rb_str_setbyte, str_byte_substr): ditto.
 
-	* thread_pthread.c (get_stack): add to a care of guard page on Mac
-	  OS X. [Bug #1813] [ruby-core:24540]
-	* signal.c (ruby_signal): SIGBUS use alternative stack too.
-	* signal.c (sigbus): On Mac, thread stack overflow makes SIGBUS
-	  instead of SIGSEGV. thus, added stackoverflow check.
-	* signal.c (default_handler): get rid of compilation warning.
-	* signal.c (Init_signal): ditto.
+Wed Jun 29 22:24:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Sat Jul 02 08:59:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+	* ext/psych/lib/psych_jars.rb: removed needless file required to JRuby.
 
-	* test/openssl/test_ocsp.rb
-	* test/openssl/test_x509_cert.rb: Perform SHA-256 tests only if
-	  supported by the available OpenSSL version. Versions < 0.9.8 don't
-	  support it. [ruby-core:37724]
+Wed Jun 29 22:21:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Sat Jul  2 07:17:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/ossl_ocsp.c: The "reuse" behavior of d2i_ functions does
+	  not work well with OpenSSL 1.0.0t. So avoid it.
 
-	* array.c (rb_ary_reject_bang, rb_ary_delete_if): rejected
-	  elements should be removed.  fixed [Bug #2545]
+Wed Jun 29 15:18:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sat Jul  2 01:57:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* insns.def (opt_succ): optimize like r55515. (but this argument is
+	  constant)
 
-	* NEWS: remove a description of Kernel#respond_to? because it has
-	  been reverted at revision 28564.
+Wed Jun 29 12:41:58 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-Sat Jul  2 00:58:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* test/ruby/test_refinement.rb: skip
+	  test_prepend_after_refine_wb_miss on ARM or MIPS.
+	  [ruby-core:76031] [Bug #12491]
 
-	* NEWS: describe a change of multiplication of Bignum.
+Wed Jun 29 08:45:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jul  1 18:52:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* proc.c (passed_block): convert passed block symbol to proc.
+	  based on the patch by Daisuke Sato in [ruby-dev:49695].
+	  [Bug #12531]
 
-	* benchmark/bm_app_erb.rb: increase loop count. too short
-	  measurement time makes less accuracy.
-	* benchmark/bm_app_factorial.rb: ditto.
-	* benchmark/bm_app_mandelbrot.rb: ditto.
-	* benchmark/bm_app_strconcat.rb: ditto.
+Wed Jun 29 03:34:41 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* benchmark/bm_io_file_create.rb: ditto.
-	* benchmark/bm_io_file_read.rb: ditto.
-	* benchmark/bm_io_file_write.rb: ditto.
+	* 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.
 
-	* benchmark/bm_so_concatenate.rb: ditto.
-	* benchmark/bm_so_lists.rb: ditto.
-	* benchmark/bm_so_matrix.rb: ditto.
-	* benchmark/bm_so_random.rb: ditto.
-	* benchmark/bm_so_sieve.rb: ditto.
+	* bignum.c (rb_big2long): ditto.
 
-	* benchmark/bm_vm_thread_mutex1.rb: ditto.
-	* benchmark/bm_vm_thread_mutex2.rb: ditto.
-	* benchmark/bm_vm_thread_mutex3.rb: ditto.
+	* bignum.c (rb_big2ull): ditto.
 
-	* benchmark/bm_vm1_block.rb: cleanup.
-	* benchmark/bm_vm1_const.rb: cleanup.
-	* benchmark/bm_vm1_ensure.rb: cleanup.
-	* benchmark/bm_vm1_ivar.rb: cleanup.
-	* benchmark/bm_vm1_length.rb: cleanup.
-	* benchmark/bm_vm1_neq.rb: cleanup.
-	* benchmark/bm_vm1_not.rb: cleanup.
-	* benchmark/bm_vm1_rescue.rb: cleanup.
-	* benchmark/bm_vm1_simplereturn.rb: cleanup.
-	* benchmark/bm_vm1_swap.rb: cleanup.
+	* bignum.c (rb_big2ll): ditto.
 
-	* benchmark/bm_vm2_array.rb: cleanup.
-	* benchmark/bm_vm2_case.rb: cleanup.
-	* benchmark/bm_vm2_defined_method.rb: cleanup.
-	* benchmark/bm_vm2_eval.rb: cleanup.
-	* benchmark/bm_vm2_method.rb: cleanup.
-	* benchmark/bm_vm2_mutex.rb: cleanup.
-	* benchmark/bm_vm2_poly_method.rb: cleanup.
-	* benchmark/bm_vm2_poly_method_ov.rb: cleanup.
-	* benchmark/bm_vm2_proc.rb: cleanup.
-	* benchmark/bm_vm2_regexp.rb: cleanup.
-	* benchmark/bm_vm2_send.rb: cleanup.
-	* benchmark/bm_vm2_super.rb: cleanup.
-	* benchmark/bm_vm2_unif1.rb: cleanup.
-	* benchmark/bm_vm2_zsuper.rb: cleanup.
+Tue Jun 28 22:55:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* benchmark/bm_vm_thread_alive_check1.rb: cleanup.
+	* lib/pstore.rb (PStore::CHECKSUM_ALGO): extract the algorithm for
+	  checksum, instead of qualified names for each times.
 
-Fri Jul  1 15:23:00 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+Tue Jun 28 22:29:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/matrix: Add LUP decomposition
+	* bootstraptest/runner.rb: do not use safe navigation operator.
+	  this runner may run on older ruby.  partially revert r53110
+	  (GH-1142 patched by @mlarraz).
 
-Fri Jul  1 15:21:14 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+Tue Jun 28 22:09:09 2016  Akio Tajima <artonx@yahoo.co.jp>
 
-	* lib/matrix.rb: Allow non integer exponents for Matrix#**
+	* lib/fileutils.rb: rescue Errno:EACCES for chown.
+	  [Bug #12520]
 
-Fri Jul  1 15:13:25 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+Tue Jun 28 18:38:09 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* lib/matrix: Add Eigenvalue Decomposition
+	* ext/digest/md5/md5ossl.h: Remove excess semicolons.
+	  Suppress warning on Solaris with Oracle Solaris Studio 12.
+	  [ruby-dev:49692] [Bug #12524]
 
-Fri Jul  1 15:10:22 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* 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.
 
-	* lib/matrix: Add Matrix#round
+Tue Jun 28 15:56:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jul  1 11:41:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* test/ruby/enc/test_case_comprehensive.rb: noting to test if
+	  Unicode data files are available.
+	  [ruby-core:76160] [Bug #12433]
 
-	* string.c (tr_trans): free heap ptr when the str is not embedded.
-	  patched by Eric Wong. [Bug #4956] [ruby-core:37708]
+	* test/test_unicode_normalize.rb: ditto.
 
-Fri Jul  1 11:07:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Tue Jun 28 15:20:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread.c (do_select): fix memory leak.
-	  Patch by Eric Wong. Thank you! [Bug #4953] [ruby-core:37702]
+	* lib/net/http.rb (Net::HTTP#proxy_uri): cache the case no proxy
+	  is used.
 
-Fri Jul  1 08:21:28 2011  Koichi Sasada  <ko1@atdot.net>
+Tue Jun 28 09:56:29 2016  Stefan Schussler  <mail@stefanschuessler.de>
 
-	* vm_insnhelper.c (vm_getivar): check vm state version
-	  to invalidate inline cache (ivar index).
-	  fixes Bug #4926.
+	* object.c (rb_mod_eqq): [DOC] Fix typo in RDoc.  [Fix GH-1393]
 
-	* vm_insnhelper.c (vm_setivar): ditto.
+Tue Jun 28 02:41:32 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Jul  1 08:03:15 2011  Nobuyoshi Nakada  <nobu@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.
 
-	* error.c, thread_pthread.c (WRITE_CONST): suppress warnings
-	  `ignoring return value'.
+	* 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.
 
-Fri Jul  1 06:41:36 2011  Koichi Sasada  <ko1@atdot.net>
+Mon Jun 27 16:58:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread.c (rb_threadptr_check_signal): only wake up main thread.
+	* lib/fileutils.rb (FileUtils#install): accecpt symbolic mode, as
+	  well as chmod.
 
-	* thread.c (rb_threadptr_execute_interrupts_common): check signal
-	  delivery if it is main thread.
-	  fixes [ruby-dev:44005] [Ruby 1.9 - Bug #4950]
+	* lib/fileutils.rb (FileUtils#install): add owner and group
+	  options.
 
-	* bootstraptest/test_fork.rb: add a test for above.
+Mon Jun 27 08:56:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* signal.c (rb_get_next_signal): skip if signal_buff is empty.
-	  (check signal_buff.size first)
+	* compile.c (ADD_TRACE): ignore trace instruction on non-positive
+	  line.
 
-	* vm_core.h: remove unused variable rb_thread_t::exec_signal.
+	* parse.y (coverage): get rid of ArgumentError when the starting
+	  line number is not positive.  [ruby-core:76141] [Bug #12517]
 
-	* thread.c (rb_thread_check_trap_pending): check
-	  rb_signal_buff_size() because rb_thread_t::exec_signal
-	  is no longer available.
+Sun Jun 26 10:20:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jul  1 03:28:25 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/win32/lib/Win32API.rb (Win32API#initialize): Cygwin
+	  2.5.2-1 (perhaps) seems to no longer append ".dll" suffix
+	  implicitly.
 
-	* class.c (Init_class_hierarchy): should name BasicObject
-	  explicitly.
+	* 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].
 
-	* variable.c (rb_const_defined_0): should not check for
-	  superclasses as const_get.
+Sat Jun 25 10:07:52 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Fri Jul  1 03:24:03 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/openssl/test_ocsp.rb: Ignore errors caused by bugs that exist in
+	  LibreSSL >= 2.3.1.
 
-	* ext/date/date_core.c: mathn is still alive (should die soon).
+Sat Jun 25 02:33:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jun 30 23:50:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* 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]
 
-	* misc/ruby-mode.el (ruby-indent-beg-re): Fix broken regular
-	  expression.  Fixes #4546
+Fri Jun 24 17:04:21 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Thu Jun 30 23:43:30 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+	* ext/psych/*, test/psych/*: Update psych 2.1.0
+	  This version fixed [Bug #11988][ruby-core:72850]
 
-	* ext/openssl/ossl.c/.h: Added ossl_x509_name_sk2ary.
-	* ext/openssl/ossl.c: Replaced ossl_x509_ary2k by generic macro to
-	  simplify future conversions.
-	* ext/openssl/ossl_ssl.c: Implement SSLSocket#client_ca.
-	* test/openssl/test_ssl.rb: Add test for SSLSocket#client_ca.
-	  Thanks to Ippei Obayashi for providing the patch!
-	  [ Ruby 1.9 - Feature #4481 ] [ruby-core:35461]
+Fri Jun 24 13:12:41 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Thu Jun 30 22:38:58 2011  Koichi Sasada  <ko1@atdot.net>
+	* 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
 
-	* benchmark/bm_vm2_defined_method.rb: added to measure performance of
-	  bmethod (method defined by define_method()).
+Fri Jun 24 09:17:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jun 30 22:17:04 2011  Koichi Sasada  <ko1@atdot.net>
+	* 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]
 
-	* vm_insnhelper.c (vm_call_bmethod): fix to hook call/return event
-	  for methods defined by define_method().  fixes Bug #4613.
+	* common.mk (enc/unicode/casefold.h): update Unicode files in a
+	  sub-make, not to let the header depend on the files always.
 
-	* thread.c (call_trace_proc): Fix to skip if class is not given (0).
-	  Note that ID and Class object are passed for call/return event
-	  if the called method was defined by define_method().
-	  If you are author of tracer/profiler/debugger, this may be an
-	  important change.  You should check passed class as zero or
-	  non-zero instead of checking the event type.
+	* enc/unicode/case-folding.rb: if gperf is not usable, assume the
+	  existing file is OK.
 
-	* test/ruby/test_settracefunc.rb: add a test for above.
+Tue Jun 21 19:44:54 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Jun 30 21:18:35 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+	* test/ruby/enc/test_regex_casefold.rb: Add Windows-1251, KOI8-R, and
+	  KOI8-U to encodings; definitely removed EUC-JP.
 
-	* configure.in: Add warnflags for XL/C on AIX during configure
-	  to avoid [Bug #3971]. See [ruby-core:32859]
+Tue Jun 21 19:32:23 2016  Mark St.Godard  <markstgodard@gmail.com>
 
-Thu Jun 30 21:16:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* 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]
 
-	* ext/date/date_core.c (m_ajd): refers a constant.
+Tue Jun 21 17:17:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Jun 30 20:54:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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.
 
-	  * ext/io/console/io-console.gemspec: spin-off gem for 1.9.2.
+	* ChangeLog: Fix test_in.rb -> test_io.rb (two instances).
 
-Thu Jun 30 20:36:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Tue Jun 21 16:38:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/date/date_core.c: trivial changes.
+	* string.c (rb_str_casemap): do not put code with side effects
+	  inside RSTRING_PTR() macro which evaluates the argument multiple
+	  times.
 
-Thu Jun 30 20:12:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 21 16:13:45 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/ruby/test_module.rb: tests for [Bug #3422] and [Bug #3423].
+	* string.c (rb_str_casemap): fix memory leak.
 
-Thu Jun 30 20:03:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Tue Jun 21 16:12:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/date/date_core.c: modified doc.
+	* string.c (rb_str_casemap): int is too small for string size.
 
-Thu Jun 30 19:09:19 2011  Koichi Sasada  <ko1@atdot.net>
+Tue Jun 21 15:42:22 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* thread_pthread.c (thread_timer): ignore unknown errno.
-	  (we observed that select(2) was canceled by errno=514 on
-	  boron == Linux/Xen environment)
+	* test/ruby/test_io.rb: Skip test_read_buffer_error on cygwin,
+	  because this test repeatedly hangs.
 
-Thu Jun 30 17:33:25 2011  Koichi Sasada  <ko1@atdot.net>
+Tue Jun 21 15:35:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/objspace/objspace.c (ObjectSpace.count_tdata_objects):
-	  Fix rdoc.  Fixes Bug #3892.
+	* LEGAL: Added filenames and copyrights for some files in
+	  enc/trans/JIS.
 
-	* ext/objspace/objspace.c (ObjectSpace.count_tdata_objects):
-	  Change key type if the klass of a object is zero (internal object).
-	  Read rdoc for details.
+Tue Jun 21 00:56:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* internal.h: export rb_objspace_data_type_name().
+	* 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
 
-Thu Jun 30 17:25:08 2011  Koichi Sasada  <ko1@atdot.net>
+Tue Jun 21 00:22:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread_pthread.c (ping_signal_thread_list, thread_timer):
-	  fix to keep polling state if there are any ping-tasks.
+	* 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().
 
-Thu Jun 30 12:25:34 2011  Koichi Sasada  <ko1@atdot.net>
+Mon Jun 20 18:39:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* thread_pthread.c (rb_thread_create_timer_thread): allocate
-	  machine stack for the timer thread at least 12KB.  FreeBSD 8.2
-	  AMD64 causes machine stack overflow (SIGSEGV) only with
-	  PTHREAD_STACK_MIN (maybe defined as 2KB).
+	* 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.
 
-Thu Jun 30 09:36:37 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Jun 20 13:35:06 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/weakref.rb:  Attach documentation to WeakRef and add missing
-	  documentation
+	* 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]
 
-Thu Jun 30 09:30:14 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Jun 20 12:53:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* lib/yaml.rb:  Document toplevel YAML and YAML::ENGINE to describe
-	  Psych vs Syck engines.
+	* 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]
 
-Thu Jun 30 09:21:52 2011  Eric Hodel  <drbrain@segment7.net>
+Sun Jun 19 21:25:43 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* lib/cmath.rb:  Hide handle_no_method_error from RDoc.
-	* error.c:  Document or hide undocumented error classes.
+	* 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:
 
-Thu Jun 30 07:49:04 2011  Eric Hodel  <drbrain@segment7.net>
+	    # 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
 
-	* hash.c:  Document ENV
+	  Adding OCSP::SingleResponse at the same time allows exposing
+	  OCSP_check_validity(). With this, the code above can be rewritten as:
 
-Thu Jun 30 06:37:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	    basic = res.basic
+	    single = basic.find_response(certid_target)
+	    result = single.check_validity
 
-	* ruby.c (ruby_init_loadpath_safe): ensure RUBYLIB_PREFIX stored
-	  before RUBYLIB, even if MANGLED_PATH is enabled.  fixed #1679.
-	  MANGLED_PATH is disabled by the default and will be removed
-	  completely in the future.
+	* test/openssl/test_ocsp.rb: Test this.
 
-Thu Jun 30 06:32:21 2011  Eric Hodel  <drbrain@segment7.net>
+Sun Jun 19 18:40:19 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* lib/drb/drb.rb:  Hide deprecated toplevel DRb constants.
+	* 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.
 
-Thu Jun 30 06:17:02 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* ext/openssl/ruby_missing.h: Define RB_INTEGER_TYPE_P() if not defined.
+	  openssl gem will be released before Ruby 2.4.0.
 
-	* lib/cmath.rb (CMath.log): second argument: b can be nil.
+Sun Jun 19 18:39:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Thu Jun 30 06:23:28 2011  Eric Hodel  <drbrain@segment7.net>
+	* ext/openssl/ossl_ocsp.c: Implement OCSP::{CertificateId,Request,
+	  BasicResponse,Response}#initialize_copy.
+	  [ruby-core:75504] [Bug #12381]
 
-	* thread.c (ruby_thread_s_pass):  Fix typo.
+	* test/openssl/test_ocsp.rb: Test them.
 
-Thu Jun 30 06:16:53 2011  Eric Hodel  <drbrain@segment7.net>
+Sun Jun 19 18:29:50 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* lib/rdoc:  Update to RDoc 3.8 which contains fixes for documentation
-	  in trunk.
+	* 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]
 
-Thu Jun 30 02:53:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* thread.c (rb_threadptr_execute_interrupts_common): remove
-	  meaningless native_thread_yield(). It never close a race.
+Sun Jun 19 16:55:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Jun 30 02:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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]
 
-	* thread.c (rb_thread_schedule_limits): minor optimization.
-	  eliminate machine context saving when running time is enough small.
+Sun Jun 19 15:01:18 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Jun 30 02:28:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* localeinit.c: Fix filesystem encoding for cygwin to UTF-8 (see
+	  https://cygwin.com/cygwin-ug-net/using-specialnames.html#pathnames-unusual)
 
-	* thread.c (rb_thread_schedule_rec): move interrupt_flag check to
-	  rb_thread_schedule().
-	  And also rename to rb_thread_schedule_limits() and remove
-	  sched_depth argument. It's no longer called recursive.
-	* thread.c (rb_thread_schedule): add to check interrupt_flag as
-	  above explained.
+Sun Jun 19 14:31:07 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* thread.c (rb_threadptr_execute_interrupts_rec): rename to
-	  rb_threadptr_execute_interrupts_common() and remove sched_depth
-	  argument. It's no longer called recursive.
+	* 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]
 
-	* thread.c (rb_thread_sleep): adapt the renaming.
-	* thread.c (rb_threadptr_execute_interrupts): ditto.
-	* thread.c (rb_thread_execute_interrupts): ditto.
+Sun Jun 19 11:19:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jun 30 01:31:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* variable.c (rb_path_to_class): consider the string length
+	  instead of a terminator.
 
-	* thread.c (thread_s_pass): change RDoc description and remove
-	  a sample code. The actual implementation never behave as explained by
-	  an example. It's a documentation bug.
+	* variable.c (rb_path_to_class): search the constant at once
+	  instead of checking if defined and then getting it.
 
-Thu Jun 30 00:54:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat Jun 18 14:01:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* thread.c (rb_thread_stop): change RDoc sample code. The old
-	  example is buggy and may cause deadlock. The patch is
-	  suggested by Heesob Park <phasis@gmail.com>. Thank you!
-	  [Bug #3606][ruby-core:31454]
+	* test/rubygems/test_gem_installer.rb: Fixed broken test with extension
+	  build. https://github.com/rubygems/rubygems/pull/1645
 
-Thu Jun 30 00:49:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat Jun 18 13:59:54 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* thread.c (rb_thread_wakeup): change RDoc sample code. The old
-	  example is buggy and may not display anything by a race.
-	  The patch is suggested by Heesob Park <phasis@gmail.com>.
-	  Thank you! [Bug #3606][ruby-core:31454]
+	* 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
 
-Thu Jun 30 00:43:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat Jun 18 10:13:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread.c (rb_thread_run): change RDoc. The old example is buggy
-	  and may cause deadlock. The patch is suggested by Heesob Park
-	  <phasis@gmail.com>. Thank you! [Bug #3606][ruby-core:31454]
+	* 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]
 
-Thu Jun 30 00:30:15 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+Sat Jun 18 08:52:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/cmath.rb: make same exception for Math. fix [Bug #3137].
+	* ext/stringio/stringio.c (strio_getline): fix pointer index
+	  overflow.  reported by Guido Vranken <guido AT guidovranken.nl>.
 
-Thu Jun 30 00:03:20 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+Thu Jun 16 16:35:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/irb/completion.rb: complement correctly string literal. fix
-	  [Bug #1145].
+	* class.c (Init_class_hierarchy): prevent rb_cObject which is the
+	  class tree root, from GC.  [ruby-dev:49666] [Bug #12492]
 
-Wed Jun 29 23:42:51 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Thu Jun 16 12:17:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/date/date_core.c: avoided using timev.
-	* ext/date/date_strftime.c: ditto.
-	* ext/date/date_tmx.h: ditto.
+	* string.c (tr_trans): adjust buffer size by processed and rest
+	  lengths, instead of doubling repeatedly.
 
-Wed Jun 29 23:17:57 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+Thu Jun 16 11:15:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
+	* string.c (tr_trans): consider terminator length and fix heap
+	  overflow.  reported by Guido Vranken <guido AT guidovranken.nl>.
 
-Wed Jun 29 23:09:14 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+Thu Jun 16 00:02:32 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
+	* 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 29 22:49:10 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+Wed Jun 15 19:52:23 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* lib/irb/cmd/help.rb: support RDoc 3.7. fix [Bug #3760].
+	* 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]
 
-Wed Jun 29 22:04:14 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* test/openssl/test_ocsp.rb: Test sign-verify works.
 
-	* lib/tracer.rb: Tracer.on only if required by -r command-line option.
-	  and consider --disable-gems option.
-	* test/test_tracer.rb: add tests for it.
+Wed Jun 15 01:46:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jun 29 13:55:36 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* numeric.c: [DOC] fix rdoc directive, and an example of negative
+	  value.  [ruby-core:76025] [Bug #12487]
 
-	* variable.c (rb_const_get_0): should not look for superclasses if
-	  the second optional argument is given for #const_get().
-	  fix [Bug #3422] [Bug #3423]
+Wed Jun 15 01:44:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jun 29 12:07:27 2011  Eric Hodel  <drbrain@segment7.net>
+	* tool/mkconfig.rb: provide Unicode Version information as
+	  RbConfig::CONFIG['UNICODE_VERSION'].
+	  [ruby-core:75845] [Feature #12460]
 
-	* math.c:  Attach documentation for Math.
-	* object.c:  Document NIL, TRUE, FALSE.
-	* io.c:  Improve grammar in ARGF comment.  Document STDIN/OUT/ERR.
-	  Document ARGF global constant.
-	* lib/rake:  Hide deprecated toplevel constants from RDoc (import from
-	  rake trunk).
-	* lib/thwait.rb:  Document ThWait.
-	* lib/mathn.rb:  Hide Math redefinition from RDoc
-	* lib/sync.rb:  Add a basic comment for Sync_m, Synchronizer_m, Sync,
-	  Synchronizer.
-	* parse.y:  Document SCRIPT_LINES__.
-	* hash.c:  Document ENV class and global constant.
-	* vm.c:  Document TOPLEVEL_BINDING.
-	* version.c:  Document RUBY_* constants.
-	* ruby.c:  Document DATA and ARGV.
+Wed Jun 15 00:01:18 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Wed Jun 29 10:13:12 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* test/ruby/enc/test_case_comprehensive.rb
+	  (TestComprehensiveCaseFold::read_data): use \A and \z instead of
+	  ^ and $ in regexp.
 
-	* lib/matrix.rb: Matrix.zero can build rectangular matrices.
-	  Vector#r should be called #magnitude
+Tue Jun 14 23:43:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jun 29 10:11:08 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* include/ruby/backward.h (rb_cFixnum, rb_cBignum): remove the
+	  backward compatibility macros, to fail incompatible extension
+	  libraries early.  [Bug #12427]
 
-	* lib/matrix.rb: Add Matrix#diagonal?, hermitian?, normal?,
-	  orthogonal?
-	  permutation?, symmetric?, {lower|upper}triangular?, unitary?, zero?
+Tue Jun 14 22:22:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jun 29 10:09:35 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* strftime.c (rb_strftime_with_timespec): limit the result string
+	  size by the format length, to get rid of unlimited memory use.
 
-	* lib/matrix.rb: Specialize Matrix#find_index to return [row, col]
-	  and accept the same optional argument as #each
+Tue Jun 14 22:11:11 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Wed Jun 29 10:07:32 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* 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]
 
-	* lib/matrix.rb: Matrix#each{_with_index} can iterate over a subset
-	  of the Matrix
+	* test/openssl/test_ocsp.rb: Test these new methods.
 
-Wed Jun 29 06:21:02 2011  Koichi Sasada  <ko1@atdot.net>
+Tue Jun 14 22:07:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread_pthread.c (native_stop_timer_thread): skip to close
-	  communication pipe to avoid timing bug (process termination timing).
-	  The communication pipe will closed by OS.
+	* 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>.
 
-Wed Jun 29 06:09:54 2011  Koichi Sasada  <ko1@atdot.net>
+Tue Jun 14 21:40:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* error.c (rb_async_bug_errno): async-safe bug report function.
-	  In timer thread, signal handler should use it.
-	  The patch is contributed by Eric Wong <normalperson@yhbt.net>.
-	  Refs: [ruby-core:37644] and [ruby-core:37647]
+	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_to_der, ossl_ocspcid_to_der):
+	  Implement #to_der methods for OCSP::BasicResponse and
+	  OCSP::CertificateId.
 
-	* thread_pthread.c: use rb_async_bug_errno().
-	  And replace all fprintf() to write().
+	  (ossl_ocspreq_initialize, ossl_ocspres_initialize): Use GetOCSP*()
+	  instead of raw DATA_PTR().
 
-	* internal.h (rb_async_bug_errno): add decl. of above func.
+	  (ossl_ocspbres_initialize, ossl_ocspcid_initialize): Allow
+	  initializing from DER string.
 
-Tue Jun 28 23:46:08 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+	  (Init_ossl_ocsp): Define new #to_der methods.
 
-	* lib/tracer.rb: count only non-internal libraries in stack trace,
-	  ignoring custom_require.
+	* test/openssl/test_ocsp.rb: Test these changes. Also add missing tests
+	  for OCSP::{Response,Request}#to_der.
 
-Tue Jun 28 21:44:58 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+Tue Jun 14 21:35:00 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* lib/irb/ruby-lex.rb: recognize '\char' in ruby statement.
+	* 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]
 
-Tue Jun 28 20:39:29 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+Mon Jun 14 10:19:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* lib/debug.rb (var_list): Command 'var *' did not work on 1.9(!).
-	  global_variables, local_variables, and instance_variables returns
-	  Symbols from 1.9 and need to stringify before evaling it.
-	  See #4931.
+	* NEWS: describe Integer#digits.
 
-Tue Jun 28 19:23:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Mon Jun 13 21:09:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* signal.c: Now, USE_TRAP_SIGMASK depend on HAVE_PTHREAD_SIGMASK.
-	  The code have already depended on pthread_sigmask since r27464.
+	* thread.c (debug_deadlock_check): show thread lock dependency and
+	  backtrace [Feature #8214] [ruby-dev:47217]
 
-Tue Jun 28 15:09:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* thread.c (thread_status_name): show "sleep_forever" instead of
+	  "sleep" if called from inspect.
 
-	* lib/benchmark.rb: merge eregon/benchmark.
-	  https://github.com/eregon/ruby/tree/benchmark
-	  patched by Benoit Daloze. [ruby-core:37593] [Bug #4940]
+Mon Jun 13 20:50:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/benchmark (Benchmark#bmbm): bmbm should be consistent with bm
-	  for the return value.
+	* parse.y (reg_named_capture_assign_iter): remove named capture
+	  conflict warnings.  it is just annoying rather than useful.
+	  [ruby-core:75416] [Bug #12359]
 
-	* test/benchmark: remove preemptive test instead of skipping
-	  I removed the preemptive test I wrote for Feature #4197.
-	  I'll add it back when the implementation will be able to satisfy it.
+Mon Jun 13 20:04:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* lib/benchmark (Benchmark#bmbm): remove useless explicit call,
-	  #format is an alias of #to_s test/benchmark: add a test for
-	  format of long time.
+	* 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]
 
-	* lib/benchmark: fix label width: always add 1 to ensure there is a
-	  space delimiter even with times over 100s
-	  When I asked for Feature #4197, I wanted to make delimiting spaces
-	  consistent for #bm and #bmbm.
-	  But with times over 100s, the output contains no space between the
-	  label and the first time (user).
-	  Now both ensure there is always a space, even if that means 3 spaces
-	  with times under 10s (because it is formatted as %10.6f)
+	* test/ruby/test_integer.rb: Add tests for the above change.
 
-	* test/benchmark: let labels be a constant
-	  lib/benchmark (Benchmark#realtime): avoid creating an unused Proc
-	  lib/benchmark (Benchmark#benchmark): use ensure clause to restore
-	  STDOUT.sync, as in #bmbm
+	* test/ruby/test_bignum.rb: ditto.
 
-Tue Jun 28 13:41:51 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jun 13 20:34:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread_win32.c (native_stop_timer_thread): fixed commit miss of
-	  r32244.  grep sources before changing the signature of a function.
+	* include/ruby/ruby.h (RUBY_INTEGER_UNIFICATION): macro to tell if
+	  Integer is integrated.  [ruby-core:75718][Bug #12427]
 
-Tue Jun 28 11:49:14 2011  Koichi Sasada  <ko1@atdot.net>
+	* include/ruby/backward.h, internal.h (rb_cFixnum, rb_cBignum):
+	  fallback to rb_cInteger.
 
-	* thread_pthread.c (consume_communication_pipe):
-	  Make "buff" as static.  (Maybe) "buff" can be shared between
-	  any caller (any threads) because no one use the read values.
-	  "buff" (1024 byte) on stack may cause stack overflow on
-	  several environment (we found a crash on FreeBSD).
-	  And remove const value "buff_size", and define CCP_READ_BUFF_SIZE
+	* bignum.c, numeric.c, ext/json/generator/generator.{c,h}: use the
 	  macro.
 
-Tue Jun 28 11:45:30 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rake:  Update rake to fix some bugs and hide deprecated features
-	  from RDoc.
-	* lib/rake/version.rb:  Bump version to 0.9.2.1 to distinguish it from
-	  the released version.
-	* NEWS:  ditto
-
-Tue Jun 28 11:17:28 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc:  Update to RDoc 3.7 (final)
-	* NEWS:  ditto
-
-Tue Jun 28 10:18:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c (rb_daemon): fix wrong #endif position.
-
-Tue Jun 28 07:50:32 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* object.c (Init_Object):  Teach RDoc what Init_class_hierarchy does to
-	  hook up ri for BasicObject, Object, Module and Class.
-
-Tue Jun 28 05:03:32 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* thread.c (rb_thread_local_aref): RDoc fix. Thread#[] example
-	  had a race. See #4480.
-
-Tue Jun 28 01:22:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigMath_s_log): move BigMath.log from
-	  bigdecimal/math.rb.
-
-	* ext/bigdecimal/lib/bigdecimal/math.rb: ditto.
-
-	* test/bigdecimal/test_bigdecimal.rb: move test for BigMath.log from
-	  test/bigdecimal/test_bigmath.rb.
-
-	* test/bigdecimal/test_bigmath.rb: ditto.
-
-Tue Jun 28 01:19:52 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/ruby-lex.rb: fix [Bug #4232].
-
-Tue Jun 28 00:14:13 2011  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: fix [Bug #4409]. add DRbServer#here?.
-
-	* test/drb/test_drb.rb: ditto.
-
-	* test/drb/drbtest.rb: ditto.
-
-	* test/drb/ut_eq.rb: ditto.
-
-Tue Jun 28 00:08:43 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/workspace.rb: fix BUG#4793.
-
-Mon Jun 27 22:06:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (consume_communication_pipe): don't use C99
-	  style variable length array.
-
-Mon Jun 27 22:04:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (consume_communication_pipe): change return
-	  type to void. caller doesn't use it.
-
-Mon Jun 27 21:29:50 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.h (rb_global_vm_lock_struct): add volatile to
-	  gvl->waiting. now thread_timer() access it w/o lock.
-
-Mon Jun 27 21:16:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c: s/__gvl_acquire/gvl_acquire_common/ and
-	  s/__gvl_release/gvl_release_common/.
-
-Mon Jun 27 11:41:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* thread_pthread.c (rb_thread_create_timer_thread):
-	  the type of return value of write(2) is ssize_t.
-
-Mon Jun 27 09:57:02 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c (rb_thread_create_timer_thread):
-	  Fixes missing initialization of oflags.
-
-Mon Jun 27 09:07:42 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* thread_pthread.c: Stop polling in the timer thread when there are
-	  no waiting thread.  If there are 2 or more runnable threads,
-	  the timer thread does polling.  Avoid polling makes power save
-	  for several computers (0.2W per a Ruby process, when I measured).
-	  If outside-event such as signal or Thread#kill was occurred
-	  when the timer thread does not do polling, then wake-up
-	  the timer thread using communication-pipe (the timer thread
-	  waits this communication-pipe with select(2)).
-	  The discussion about this modification can be found from the post
-	  [ruby-core:33456] and other related posts.
-	  Note that Eric Wong and KOSAKI Motohiro give us the huge
-	  contributions for this modification.  Thanks.
-
-	* thread_pthread.c (rb_thread_wakeup_timer_thread): add a function.
-	  This function wakes up the timer thread using communication-pipe.
-
-	* thread.c (rb_thread_stop_timer_thread): add a parameter which
-	  specify closing communication-pipe or not.
-
-	* thread.c (rb_thread_terminate_all): do not stop timer thread here
-	  (ruby_cleanup() terminate timer thread).
-
-	* signal.c: wake up timer thread using
-	  rb_thread_wakeup_timer_thread() from signal handler.
-
-	* eval.c (ruby_cleanup): use rb_thread_stop_timer_thread(1).
-
-	* process.c: use rb_thread_stop_timer_thread(0)
-	  (reuse communication-pipe).
-
-	* thread_win32.c (rb_thread_wakeup_timer_thread): add a dummy
-	  function.
-
-	* vm_core.h: add and fix decl. of functions.
-
-Mon Jun 27 08:01:19 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_parse.c: should use ALLOCA_N.
-
-Mon Jun 27 01:34:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/etc/test_etc.rb (TestEtc#test_get{pw,gr}nam): skip entries
-	  start with + sign, which means NIS.  these are returned in the
-	  case that passwd and group entries in /etc/nsswitch.conf are set
-	  to use "nis" explicitly on Debian.  fixed #3683
-
-Mon Jun 27 00:44:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* parse.y (rb_parser_end_seen_p): fix documentation about return
-	  value. patched by Sho Hashimoto. [Bug #4511]
-
-Mon Jun 27 00:40:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* hash.c (rb_hash_reject): add documentation that Hash#reject
-	  without block returns enumerator.
-	  patched by Michael Edgar [Bug #4847] [ruby-core:36800]
-
-Sun Jun 26 23:49:21 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/test_switch_hitter.rb: added a test.
+Mon Jun 13 16:58:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
- Sun Jun 26 22:21:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/ruby/enc/test_case_comprehensive.rb: Add tests for full Unicode
+	  swapcase.
 
-	* ext/date/date_core.c: refactoring.
+Sun Jun 12 14:48:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Jun 26 18:03:30 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* test/ruby/enc/test_case_comprehensive.rb: Add tests for ASCII-only
+	  swapcase; store calculated values in hashes.
 
-	* parse.y: comma at the end of line is no longer allowed.
-	  A patch from Yukihiro Matsumoto  <matz AT ruby-lang.org>.
-	  (fixed #3456).
+Sun Jun 12 14:05:45 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Sun Jun 26 13:35:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* vm_dump.c (rb_vm_bugreport): change CrashReporter suggestion messages
-	  on Mac. It should be placed after "-- C level backtrace" line.
-	  Suggested by Endoh-san.
+	  (Init_ossl_cipher): Fix doc; OpenSSL::Cipher::AES.new(128, :GCM) can't
+	  work.
 
-	  <before>
-	  -- See Crash Report log file under ~/Library/Logs/CrashReporter or ---------
-	  -- /Library/Logs/CrashReporter, for the more detail of ---------------------
-	  -- C level backtrace information -------------------------------------------
+	* 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.
 
-	<after>
-	  -- C level backtrace information -------------------------------------------
+Sun Jun 12 13:47:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	     See Crash Report log file under ~/Library/Logs/CrashReporter or
-	     /Library/Logs/CrashReporter, for the more detail of.
+	* 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 26 10:08:28 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+Sun Jun 12 09:24:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/extconf.rb
-	* ext/openssl/ossl_missing.h/.c: add ASN1_put_eoc if missing.
+	* 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
 
-	* ext/openssl/ossl_asn1.c: introduce ossl_asn1_object_size and
-	  ossl_asn1_put_object to wrap functionality depending on OpenSSL
-	  version in use.
-	  Fixes	[ Ruby 1.9 - Bug #4916 ] reported by Hiroshi Nakamura.
-	  [ruby-core:37286]
+Sat Jun 11 23:07:32 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sun Jun 26 01:00:15 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* lib/forwardable.rb (_delegator_method): get rid of a warning which
+	  causes test failures introduced at r55376.
 
-	* ext/date/date_core.c (date_strftime_internal): removed meaningless braces.
-	* ext/date/date_core.c (gengo): the value should be int.
+Sat Jun 11 18:37:58 2016  Marcus Stollsteimer  <sto.mar@web.de>
 
-Sat Jun 25 23:45:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* ext/json/lib/*.rb: Removed some comments. Because these are unnecessary
+	  class description. [ci skip][Bug #12255][ruby-core:74835]
 
-	* vm_insnhelper.c (vm_search_superclass): avoid control frame
-	  stack overrun. currently super() in Proc created in a method
-	  defined by Module#define_method raise NoMethodError. [Bug #4881]
-	* test/ruby/test_method.rb t_super_in_proc_from_define_method):
-	  add test for it.
+Sat Jun 11 15:19:38 2016  takiy33  <takiy33@users.noreply.github.com>
 
-Sat Jun 25 23:23:14 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* lib/net/smtp.rb: [DOC] Remove dead link on documentation for
+	  Japanese of SMTP.  [Fix GH-1380]
 
-	* thread.c (sleep_forever): now Kernel#sleep don't wakeup by
-	  signal handler execution. [Bug #4072]
+Sat Jun 11 15:02:45 2016  Grant Hutchins  <github@nertzy.com>
 
-Sat Jun 25 23:14:47 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* string.c (rb_str_oct): [DOC] fix typo, hornored -> honored.
+	  [Fix GH-1379]
 
-	* thread.c (rb_threadptr_check_signal): remove unnecessary th->status
-	  backup. fix race condition which may results unexpected main thread's
-	  status transition. see #4072
+Sat Jun 11 14:04:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jun 24 19:57:30 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+	* ext/objspace/objspace_dump.c: generate valid JSON for dump_all.
 
-	* lib/webrick/httprequest.rb (setup_forwarded_info): Parsing request
-	  header failed when the request is from 2 or more Apache reverse
-	  proxies. It's said that all X-Forwarded-* headers will contain more
-	  than one (comma-separated) value if the original request already
-	  contained one of these headers.  Since we could use these values as
-	  Host header, we choose the initial(first) value. See #4922.
+Sat Jun 11 13:52:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/webrick/test_httprequest.rb (test_forwarded): Test it.
+	* lib/forwardable.rb (_delegator_method): remove __send__ call if
+	  possible, so that more optimizations will be enabled.
 
-Fri Jun 24 17:06:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun 11 11:24:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* process.c (proc_daemon): should not start timer thread
-	  twice.  fixed Bug#4920.
+	* enc/iso_8859.h (SHARP_s): name frequently used codepoint.
 
-Fri Jun 24 15:54:14 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+Sat Jun 11 09:58:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): Try to shutdown SSL
-	  connection more gracefully. Call SSL_shutdown() max 4 times until it
-	  returns 1 (success). Bi-directional SSL close has several states but
-	  SSL_shutdown() kicks only 1 transition per call. Max 4 is from
-	  mod_ssl.c of Apache httpd that says 'max 2x pending + 2x data = 4'.
-	  See #4237.
+	* enc/iso_8859_1.c: Revert to older version of code.
 
-Fri Jun 24 07:24:37 2011  Eric Hodel  <drbrain@segment7.net>
+Sat Jun 11 09:46:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/rake/version.rb:  Fixed VERSION to work with tool/rbinstall.rb
-	* bin/rake:  Import bin/rake from 0.9.2
-	* tool/rbinstall.rb (install):  Rake::VERSION is now in
-	  lib/rake/version.rb.  Fixes `make install`
+	* enc/iso_8859_1.c: Implement non-ASCII case mapping.
 
-Fri Jun 24 07:11:37 2011  Eric Hodel  <drbrain@segment7.net>
+	* test/ruby/enc/test_case_comprehensive.rb: Tests for above.
 
-	* lib/rake: Import Rake 0.9.2
+	* string.c: Add iso-8859-1 to supported encodings.
 
-Fri Jun 24 00:44:15 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Jun 11 09:31:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/date/date_core.c (c_valid_{julian,gregorian}_p): fixed the range of month.
+	* 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.
 
-Fri Jun 24 00:14:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Jun 11 01:38:31 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* ext/date/date_core.c: trivial changes on text.
+	* 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]
 
-Thu Jun 23 22:46:57 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+Fri Jun 10 21:54:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_x509name.c: Add X509::Name#hash_old as a wrapper
-	  for X509_NAME_hash_old in OpenSSL 1.0.0. See #4805
+	* lib/forwardable.rb (Forwardable._delegator_method): extract
+	  method generator and deal with non-module objects.
+	  [ruby-dev:49656] [Bug #12478]
 
-	* test/openssl/test_x509name.rb (test_hash): Make test pass with
-	  OpenSSL 1.0.0.
+Fri Jun 10 17:35:11 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* NEWS: Add it.
+	* string.c: Special-case :ascii option in rb_str_capitalize_bang and
+	  rb_str_swapcase_bang.
 
-Thu Jun 23 19:30:53 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+Fri Jun 10 17:12:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_time): Check
-	  argument type with NUM2LONG if the arg is not a Time object.
-	  See #4919.
+	* string.c: Special-case :ascii option in rb_str_upcase_bang (retry).
 
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_set_timeout): Check
-	  type with NUM2LONG. Time as an arg is not allowed. See #4919.
+Fri Jun 10 14:48:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/openssl/test_ssl_session.rb (test_session_time,
-	  test_session_timeout): Test it.
+	* hash.c (get_env_cstr): ensure NUL-terminated.
+	  [ruby-dev:49655] [Bug #12475]
 
-Wed Jun 23 13:30:30 2011  Shota Fukumori  <sorah@tubusu.net>
+	* string.c (rb_str_fill_terminator): return the pointer to the
+	  NUL-terminated content.
 
-	* signal.c(ruby_atomic_exchange): Fix definition style.
+Thu Jun  9 21:42:00 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Wed Jun 22 22:34:05 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+	* 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]
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_session_new_cb): Return 0 to
-	  OpenSSL from the callback for SSL_CTX_sess_set_get_cb().
-	  Returning 0 means to OpenSSL that the session is still valid
-	  (since we created Ruby Session object) and was not freed by us with
-	  SSL_SESSION_free(). Call SSLContext#remove_session(sess) in
-	  session_get_cb block if you don't want OpenSSL to cache the session
-	  internally.
-	  This potential issue was pointed by Ippei Obayashi. See #4416.
+	* test/openssl/test_asn1.rb (test_decode_enumerated): Test that it
+	  works.
 
-	* test/openssl/test_ssl_session.rb (test_ctx_server_session_cb): Test
-	  it.
+Thu Jun  9 21:10:04 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Wed Jun 22 22:21:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+	* tool/ifchange: fix timestamp error when target without
+	  directory.
 
-	* ext/openssl/ossl_ssl_session.c: Respect T_BIGNUM time values. Patch by
-	  Tomoyuki Chikanaga.
-	  [ Ruby 1.9 - Bug #4919 ] [ruby-dev:43869]
+Thu Jun  9 19:46:22 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Wed Jun 22 21:29:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* ext/socket/depend (SOCK_HEADERS): use $(top_srcdir) instead of
-	  $(topdir). sorry!
+	* test/openssl/test_pair.rb (test_ecdh_curves): Skip if the OpenSSL does
+	  not support ECDH.
 
-Wed Jun 22 19:47:03 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* test/openssl/utils.rb (start_server): Ignore error in
+	  SSLContext#ecdh_curves=.
 
-	* cont.c (cont_capture): add volatile.
-	  On clang -O, it is needed to avoid the optimization.
-	  With this and llvm/clang's recent fix, clang 3.0 can
-	  build ruby-trunk with -O option.
+Thu Jun  9 18:12:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* cont.c (cont_capture): use for-loop.
+	* Makefile.in (un-runnable): fail with proper error message.
+	  [ruby-core:75905] [Bug #12472]
 
-	* array.c (rb_ary_each): add volatile and use it.
+Thu Jun  9 15:32:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm_insnhelper.c (vm_call_cfunc): ditto.
+	* common.mk (RBCONFIG): use ifchange tool to see if the content is
+	  changed and update the timestamp file.
 
-Wed Jun 22 18:20:46 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+	* tool/mkconfig.rb: remove ifchange features.
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_session_remove_cb):
-	  OpenSSL::SSL::SSLContext#session_remove_cb was broken. It wrongly
-	  tried to call the session_*new*_cb callback.
+	* tool/ifchange: make target directory if it does not exist with
+	  its parent directories.
 
-	* test/openssl/test_ssl_session.rb (class OpenSSL): Test it.
+	* win32/ifchange.bat: drop support for command.com used on old
+	  systems.
 
-Wed Jun 22 17:37:49 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+Thu Jun  9 15:03:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* ext/openssl/ossl.h: Introduced OSSL_BIO_reset macro for PEM/DER
-	  fallback scenarios.
+	* 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]
 
-	* ext/openssl/ossl_pkey_dsa.c
-	* ext/openssl/ossl_x509req.c
-	* ext/openssl/ossl_pkey_rsa.c
-	* ext/openssl/ossl_pkey_ec.c
-	* ext/openssl/ossl_ssl_session.c
-	* ext/openssl/ossl_x509crl.c
-	* ext/openssl/ossl_pkey.c
-	* ext/openssl/ossl_pkey_dh.c
-	* ext/openssl/ossl_x509cert.c
-	* ext/openssl/ossl_pkcs7.c: Use OSSL_BIO_reset.
+Wed Jun  8 23:09:51 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* ext/openssl/ossl_ssl.c
-	* ext/openssl/ossl_cipher.c
-	* ext/openssl/ossl_pkey_ec.c
-	* ext/openssl/ossl_pkcs12.c
-	* ext/openssl/ossl_ssl_session.c: Replace rb_raise occurrences by
-	  ossl_raise. This automatically flushes OpenSSL's error queue.
+	* string.c (rb_str_ascii_casemap): fix compile error.
 
-	* ext/openssl/ossl_pkcs7.c: Raise error if DER fallback for parsing
-	  fails.
+Wed Jun  8 22:22:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* test/openssl/test_pkey_ec.rb
-	* test/openssl/test_pkey_dsa.rb
-	* test/openssl/test_pkey_rsa.rb: Add assertions that OpenSSL.errors is
-	  empty.
+	* string.c: Revert previous commit (possibility of endless loop).
 
-	* test/openssl/test_pkey_rsa.rb: Remove initial OpenSSL.errors call in
-	  test_new.
-	  [ Ruby 1.9 - Bug #4885 ] [ruby-core:37134]
+Wed Jun  8 21:57:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Wed Jun 22 15:01:24 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+	* string.c: Special-case :ascii option in rb_str_upcase_bang.
 
-	* ext/openssl/ossl_ssl.c: Use SSL_MODE_RELEASE_BUFFERS if available.
-	  Thanks, Eric Wong, for providing the patch.
-	  [ Ruby 1.9 - Feature #4672 ] [ruby-core:36127]
+Wed Jun  8 21:28:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Wed Jun 22 14:47:53 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+	* string.c: New static function rb_str_ascii_casemap; special-casing
+	  :ascii option in rb_str_upcase_bang and rb_str_downcase_bang.
 
-	* test/openssl/test_buffering.rb
-	* test/openssl/test_pkcs12.rb: Inherit from Test::Unit::TestCase
-	  instead of MiniTest::Unit::TestCase. [ruby-core:37275]
+	* regenc.c: Fix a bug (wrong use of unnecessary slack at end of string).
 
-Wed Jun 22 12:41:03 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+	* regenc.h -> include/ruby/oniguruma.h: Move declaration of
+	  onigenc_ascii_only_case_map so that it is visible in string.c.
 
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der):
-	  OpenSSL::SSL::Session#to_der was broken. Fix buffer handling.
+Wed Jun  8 20:33:44 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* test/openssl/test_ssl_session.rb (test_session): Test it.
+	* 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 22 12:38:52 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+Wed Jun  8 16:03:09 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* test/openssl/test_ssl_session.rb: Split out SSL::Session related
-	  tests from test_ssl.rb
+	* 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.
 
-Wed Jun 22 03:20:52 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Jun  7 21:27:25 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* ext/psych/lib/psych/visitors/to_ruby.rb: Fix cyclic references of
-	  objects.  Thanks to CvX for reporting the bug and a test case.
-	* test/psych/test_object.rb: test for cyclic object references.
+	* 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]
 
-Wed Jun 22 02:39:54 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+Tue Jun  7 21:27:17 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* lib/net/http.rb (Net::HTTP.post_form): Do not ignore query part of
-	  the given URI to post. See #655.
+	* 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]
 
-	* test/net/http/test_http.rb, test/net/http/utils.rb: Test it.
+Tue Jun  7 21:20:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Wed Jun 22 01:28:13 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+	* 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_x509store.rb (test_set_errors): Redhat is
-	  distributing a patched version of OpenSSL that allows multiple CRL
-	  for a key (multi-crl.patch.) Make test pass on such env. See #4122,
-	  #4554.
+	* 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
 
-Tue Jun 21 21:50:37 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+	* 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.
 
-	* lib/webrick/httpresponse.rb (HTTPResponse#setup_header): Close
-	  HTTP/1.1 connection when returning an IO object as response body
-	  without setting HTTPResponse#chunked to true. See #855 no.1.
+	* 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/webrick/test_httpserver.rb: Test it.
+	* test/openssl/utils.rb: Use 1024 bits DSA key for client certificates.
 
-Tue Jun 21 21:27:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* internal.h: move rb_thread_io_blocking_region() declaration
-	  from intern.h to internal.h. It's still experimental API and
-	  need more discussion. [ruby-dev:43698]
-	* include/ruby/intern.h: ditto.
-
-	* ext/socket/rubysocket.h: include internal.h.
-	* ext/socket/depend: add internal.h dependency.
-	* ext/socket/extconf.rb: add $INCFLAGS to topdir.
-
-Tue Jun 21 20:38:47 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (datetime_s_*): canonicalize 24 o'clock.
-
-Tue Jun 21 19:46:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_thread.rb (TestThread#test_priority): enable
-	  this test again. Current GVL respect thread priority rather
-	  than past.
-
-Tue Jun 21 13:25:35 2011  TAKAO Kouji  <kouji@takao7.net>
-
-	* ext/readline/readline.c (readline_getc): applied a patch in
-	  #3827 by by Akio Tajima <artonx AT yahoo.co.jp>. (see #3827)
-
-Tue Jun 21 13:16:31 2011  TAKAO Kouji  <kouji@takao7.net>
-
-	* ext/readline/extconf.rb: fixed bug, specify --disable-libedit
-	  then disable libedit, does not specify then check readline and
-	  libedit if failed checking readline. (fixes #3375)
-
-Mon Jun 20 22:52:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (before_exec): use sig_do_nothing instead of SIG_DFL
-	  for avoiding a race.
-	* process.c (sig_do_nothing): new function.
-
-Mon Jun 20 21:31:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (thread_timer): rename timeout_10ms to
-	  time_quantum. it's no longer 10ms.
-
-Mon Jun 20 18:46:02 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_cipher.c, ext/openssl/lib/openssl/cipher.rb:
-	  Documentation fix by Ippei Obayashi. See #4419.
-
-Mon Jun 20 15:41:33 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* lib/webrick/cookie.rb (WEBrick::Cookie.parse): Revert r31228.
-	  r31228 was for allowing the 'Cookie:' header which did not have no
-	  SP after ';' for separating cookie-pairs but RFC6265 requires single
-	  SP after ';' there.  We allow multiple SPs here for compatibility
-	  with older WEBrick version.
-
-	* test/webrick/test_cookie.rb: Test it.
-
-Sun Jun 19 13:31:26 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* NEWS: Introduce --hide-skip on test/unit.
-
-Sun Jun 19 10:05:16 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit/parallel.rb: Override Test::Unit::TestCase#on_parallel_worker?
-	  only when $0 == __FILE__.
-
-	* lib/test/unit/parallel.rb: Run Test::Unit::Worker.run only when
-	  $0 == __FILE__.
-
-Sat Jun 18 23:59:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (fill_cbuf): finish reading at EOF, and the readconv has
-	  been cleared by another thread while io_fillbuf() is waiting at
-	  select().  a patch in [ruby-core:37197] by Hiroshi Shirosaki
-	  <h.shirosaki AT gmail.com>.  fixed #3840
-
-Sat Jun 18 21:36:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c: remove GVL_DEBUG
-
-Sat Jun 18 21:32:02 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm.c, vm_core.h (rb_vm_stack_to_heap): remove const.
-	  It makes compilations warnings.
-
-Sat Jun 18 18:54:15 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm.c, vm_core.h (rb_vm_stack_to_heap): fix "const" place.
-
-Sat Jun 18 17:23:38 2011  Tanaka Akira  <akr@fsij.org>
-
-	* eval.c, hash.c, load.c, proc.c, range.c, thread.c, time.c: don't
-	  declare internal functions.
-
-	* internal.h, vm_core.h: declare internal functions.
-
-	* array.c: include internal.h.
-
-	* common.mk: update dependency for array.o.
-
-Sat Jun 18 13:39:33 2011  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h: declarations declared in include/ruby/*.h removed.
-
-Sat Jun 18 12:42:17 2011  Tanaka Akira  <akr@fsij.org>
-
-	* method.h, internal.h iseq.h: declare internal functions.
-
-	* compile.c, eval.c, iseq.c, object.c, parse.y, proc.c, process.c,
-	  thread.c, vm.c, vm_eval.c, vm_insnhelper.c, vm_method.c: don't
-	  declare internal functions.
-
-	  Note that rb_method_entry_eq() is defined in vm_method.c but
-	  there was a declaration in proc.c with different const-ness.
-	  Now it is declared in method.h with same const-ness to the
-	  definition.
-
-	* object.c (rb_mod_module_exec): don't declare functions declared in
-	  include/ruby/intern.h.
-
-Sat Jun 18 12:05:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/backward/classext.h: for evil gems.  fixed #4803
-
-Sat Jun 18 11:12:13 2011  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: update dependencies.
-
-Sat Jun 18 11:09:03 2011  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: suppress warnings.
-
-Sat Jun 18 10:22:39 2011  Tanaka Akira  <akr@fsij.org>
-
-	* internal.h: declare more internal functions.
-
-	* iseq.h (rb_method_get_iseq): declared.
-
-	* compile.c, eval.c, eval_error.c, iseq.c, parse.y, proc.c, range.c,
-	  ruby.c, time.c, util.c, vm.c: don't declare internal functions.
-
-	* eval.c, parse.y, thread_pthread.c: non-existing function declarations
+	* 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
 
-Sat Jun 18 08:12:54 2011  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk: dependencies updated.
+	* ext/openssl/ossl_engine.c (ossl_engine_s_cleanup): Add a note to the
+	  RDoc for Engine.cleanup.
 
-	* tool/update-deps: new file to assist update dependencies in
-	  common.mk.
+	* 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.
 
-Sat Jun 18 07:27:27 2011  Tanaka Akira  <akr@fsij.org>
+	* 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.
 
-	* internal.h: declare internal functions here.
+Tue Jun  7 17:49:52 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* node.h: declare NODE dependent internal functions here.
+	* test/ruby/enc/test_case_comprehensive: Change test for encodings
+	  without any non-ASCII case conversions from ASCII-only test
+	  to full test.
 
-	* iseq.h: declare rb_iseq_t dependent internal functions here.
+Tue Jun  7 17:18:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* vm_core.h: declare rb_thread_t dependent internal functions here.
+	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang,
+	  rb_str_swapcase_bang): Switch to use primitive.
 
-	* bignum.c, class.c, compile.c, complex.c, cont.c, dir.c, encoding.c,
-	  enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c, io.c,
-	  iseq.c, load.c, marshal.c, math.c, numeric.c, object.c, parse.y,
-	  proc.c, process.c, range.c, rational.c, re.c, ruby.c, string.c,
-	  thread.c, time.c, transcode.c, variable.c, vm.c,
-	  tool/compile_prelude.rb: don't declare internal functions declared
-	  in above headers.  include above headers if required.
+Tue Jun  7 16:44:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	  Note that rb_thread_mark() was declared as
-	  void rb_thread_mark(rb_thread_t *th) in cont.c but defined as
-	  void rb_thread_mark(void *ptr) in vm.c.  Now it is declared as
-	  the later in internal.h.
+	* string.c (rb_str_downcase_bang): Switch to use primitive except if
+	  conversion can be done ASCII-only.
 
-Sat Jun 18 02:36:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+Tue Jun  7 16:13:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/bigdecimal/bigdecimal.c (VpNewRbClass): fix type of the 2nd
-	  argument.
-
-	* ext/bigdecimal/bigdecimal.h: ditto.
-
-Sat Jun 18 02:30:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): move BigMath.exp from
-	  bigdecimal/math.rb.
-
-	* ext/bigdecimal/lib/bigdecimal/math.rb: ditto.
+	* test/ruby/enc/test_case_comprehensive: Add regression tests for
+	  current ASCII-only case conversion.
 
-	* test/bigdecimal/test_bigdecimal.rb: move test for BigMath.exp from
-	  test/bigdecimal/test_bigmath.rb.
+Tue Jun  7 15:28:38 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* test/bigdecimal/test_bigmath.rb: ditto.
+	* test/ruby/enc/test_case_comprehensive: Fix method name
+	  (generate_casefold_tests -> generate_case_mapping_tests).
 
-Sat Jun 18 00:20:54 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Tue Jun  7 15:05:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/date/date_core.c: do not define wnum[01].
+	* regenc.h/c: Rename onigenc_not_support_case_map to
+	  onigenc_ascii_only_case_map.
 
-Fri Jun 17 18:57:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* regenc.h: Add definition of onigenc_single_byte_ascii_only_case_map.
 
-	* compile.c (iseq_compile_each): fix return value of obj[a,*b]=c.
+	* 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.
 
-Fri Jun 17 13:09:45 2011  Eric Hodel  <drbrain@segment7.net>
+	* 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.
 
-	* ext/curses/curses.c:  Clean up documentation.
+Tue Jun  7 14:57:09 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Fri Jun 17 09:25:14 2011  Eric Hodel  <drbrain@segment7.net>
+	* 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/curses/curses.c:  Document curses constants.  Patch by Vincent
-	  Batts.  [Ruby 1.9 - Bug #4880]
+	* ext/openssl/ossl_ssl.c: Use SSL_CTX_set_{min,max}_proto_version() to
+	  fix the protocol version.
 
-Fri Jun 17 09:11:05 2011  Eric Hodel  <drbrain@segment7.net>
+Tue Jun  7 12:55:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* object.c:  Document Module#method_added and #method_removed.
-	  Patch by Bryce Kerley.  [Ruby 1.9 - Feature #4867]
+	* regenc.c (onigenc_not_support_case_map): Move to end of file;
+	  (onigenc_single_byte_ascii_only_case_map): Add new function.
 
-Fri Jun 17 08:50:16 2011  Eric Hodel  <drbrain@segment7.net>
+Tue Jun  7 09:26:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* io.c:  Improve documentation of IO and File open and new.
-	  Patch by Roger Pack.  [Ruby 1.9 - Bug #4790]
+	* regenc.c (onigenc_not_support_case_map): Rewrite to work correctly
+	  in ASCII range.
 
-Fri Jun 17 07:53:50 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Jun  6 23:00:00 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* lib/csv.rb:  Document #raw_encoding.  Patch by David Czarnecki.
-	  [Ruby 1.9 - Bug #4874]
+	* appveyor.yml: Update libressl version to 2.3.5.
 
-Fri Jun 17 07:46:50 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Jun  6 18:37:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/benchmark.rb:  Document Benchmark::Tms#memberwise.  Patch by
-	  David Czarnecki.  [Ruby 1.9 - Bug #4873]
+	* 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]
 
-Fri Jun 17 07:38:31 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Jun  6 18:36:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/prettyprint.rb:  Improve documentation.  Patch by Ysiad
-	  Ferreiras.  [#4834]
+	* string.c: Added UTF-16BE/LE and UTF-32BE/LE to supported encodings
+	  for Unicode case mapping.
 
-Fri Jun 17 07:23:03 2011  Eric Hodel  <drbrain@segment7.net>
+	* test/ruby/enc/test_case_comprehensive.rb: Tests for above
+	  functionality; fixed an encoding issue in assertion error message.
 
-	* array.c (rb_ary_drop):  Improve documentation.  Patch by Caley Woods.
-	  [Ruby 1.9 - Bug #4858]
+Mon Jun  6 17:29:35 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Fri Jun 17 06:11:31 2011  Eric Hodel  <drbrain@segment7.net>
+	* test/ruby/enc/test_case_comprehensive.rb: Speed up testing for small
+	  encodings by preselecting codepoints.
 
-	* lib/webrick/log.rb:  Improve documentation of BasicLog and Log.
-	  Patch by Olivier Brisse.  [Ruby 1.9 - Bug #4833]
-	* lib/webrick/httpstatus.rb:  Improve documentation of
-	  WEBrick::HTTPStatus.  Patch by Olivier Brisse.
-	  [Ruby 1.9 - Bug #4833]
+Mon Jun  6 17:10:50 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Fri Jun 17 04:48:22 2011  Koichi Sasada  <ko1@atdot.net>
+	* 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]
 
-	* thread_pthread.c, thread_pthread.h: remove unused variables.
-	  (native_thread_data_t::gvl_cond, native_thread_data_t::gvl_next)
+Mon Jun  6 13:37:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Jun 16 14:32:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* string.c Change rb_str_casemap to use encoding primitive
+	  case_map instead of directly calling onigenc_unicode_case_map.
 
-	* time.c (rb_time_new): prevent overflow by "* 1000".
+Mon Jun  6 13:16:46 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Fri Jun 17 03:07:36 2011  Koichi Sasada  <ko1@atdot.net>
+	* test/ruby/enc/test_case_mapping.rb:
+	  Remove :lithuanian guard for Unicode case mapping.
 
-	* benchmark/bm_vm4_thread_create_join.rb,
-	  benchmark/bm_vm4_thread_mutex[1-3].rb: renamed to
-	  bm_thread_* (fix last rename).
+Mon Jun  6 10:39:56 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Fri Jun 17 02:26:47 2011  Koichi Sasada  <ko1@atdot.net>
+	* ext/openssl/openssl_missing.h: Include ruby/config.h. r55285 added
+	  some inline functions but VC does not recognize 'inline' keyword.
 
-	* thread_pthread.c (native_thread_create): fix debug message.
-	  (add last newline)
+Mon Jun  6 09:25:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jun 16 23:40:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* thread.c (thread_start_func_2): report raised exception if
+	  report_on_exception flag is set.  [Feature #6647]
 
-	* thread.c (rb_thread_schedule_rec): fix {UN,}LIKELY macro misuse.
-	* gc.c (rb_newobj): ditto.
-	* vm_insnhelper.c (vm_method_search): ditto.
-
-Thu Jun 16 20:06:15 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/testunit/test_parallel.rb: Fix Regexp for test.
-
-	* test/testunit/tests_for_parallel/test_third.rb: Use
-	  Test::Unit::TestCase#on_parallel_worker? for detecting worker.
-
-	* lib/test/unit/testcase.rb(Test::Unit::TestCase#on_parallel_worker?):
-	  New Method Test::Unit::TestCase#on_parallel_worker? returns true
-	  when a testcase is running on parallel worker.
-	* lib/test/unit/parallel.rb(Test::Unit::TestCase#on_parallel_worker?):
-	  ditto.
+Mon Jun  6 01:36:24 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Thu Jun 16 19:27:12 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+	* ext/openssl/extconf.rb: Check existence of SSL_is_server(). This
+	  function was introduced in OpenSSL 1.0.2.
+	  [ruby-core:75225] [Feature #12324]
 
-	* test/test_securerandom.rb: Add testcase.  This testcase does NOT aim
-	  to test cryptographically strongness and randomness.  It includes
-	  the test for PID recycle issue of OpenSSL described in #4579 but
-	  it's disabled by default.
+	* ext/openssl/openssl_missing.h: Implement SSL_is_server() if missing.
 
-Thu Jun 16 17:55:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* test/ruby/test_io.rb (TestIO#test_copy_stream_socket): fix
-	  test hanging up issue. Patch by CHIKANAGA Tomoyuki.
+	  (ossl_ssl_cipher_to_ary, ossl_sslctx_session_get_cb): Add some
+	  `const`s to suppress warning.
 
-Thu Jun 16 15:17:39 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Jun  6 01:18:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* variable.c (const_missing):  Add simple example of const_missing.
-	  Patch by Anuj Dutta.  [Ruby 1.9 - Bug #4794]
+	* 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]
 
-Thu Jun 16 15:09:29 2011  Eric Hodel  <drbrain@segment7.net>
+Mon Jun  6 00:34:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* lib/monitor.rb:  Improve documentation.  Patch by Sandor Szucs.
-	  [Ruby 1.9 - Bug #4823]
+	* 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]
 
-Thu Jun 16 14:54:09 2011  Eric Hodel  <drbrain@segment7.net>
+	* ext/openssl/openssl_missing.[ch]: Implement them if missing.
 
-	* lib/webrick/utils.rb: Document WEBrick::Utils.  Patch by Olivier
-	  Brisse.  [Ruby 1.9 - Bug #4819]
+	* ext/openssl/ossl*.c: Use these accessor functions.
 
-Thu Jun 16 14:26:46 2011  Eric Hodel  <drbrain@segment7.net>
+	* test/openssl/test_hmac.rb: Add missing test for HMAC#reset.
 
-	* lib/webrick/httpservlet/erbhandler.rb:  Allow the ERB document to
-	  alter the content-type of the response.  [Ruby 1.9 - Bug #4685]
+Mon Jun  6 00:00:13 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Thu Jun 16 14:15:47 2011  Eric Hodel  <drbrain@segment7.net>
+	* 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]
 
-	* lib/timeout.rb: Clarify timeout duration types.  Patch by Alf Mikula.
-	  [Ruby 1.9 - Bug #4791]
-	* lib/net/http.rb: ditto
+	* 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.
 
-Thu Jun 16 13:25:25 2011  Eric Hodel  <drbrain@segment7.net>
+	* 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
 
-	* lib/rdoc*:  Import RDoc 3.7 release candidate
+Sun Jun  5 22:06:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Thu Jun 16 11:35:09 2011  Shugo Maeda  <shugo@ruby-lang.org>
+	* configure.in: Fix the timing to detect the appropriate C++ compiler
+	  in OS X.
 
-	* lib/net/imap.rb (search_response): parses SEARCH responses from
-	  the Yahoo IMAP server correctly.  patched by Mark Nadig.  [Bug #4509]
+Sun Jun  5 21:42:24 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Thu Jun 16 09:12:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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]
 
-	* fix for build on solaris 10.
+	  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.
 
-Thu Jun 16 09:08:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/openssl_missing.h: Implement *_up_ref() if missing.
 
-	* test/io/console/test_io_console.rb (TestIO_Console#test_sync):
-	  fix for daemon process.
-
-Thu Jun 16 07:58:01 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/testunit/test_parallel.rb(test_ignore_tzero): Test for r32109.
-
-	* test/testunit/tests_for_parallel/test_third.rb: Use another way to
-	  detect that test is running on worker. This fixes sometimes
-	  TestParallel failing.
-
-Thu Jun 16 07:20:06 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb(Test::Unit::Runner#_run_parallel): Ignore -j0
-	  because it makes blocking forever by IO.select.
-
-Thu Jun 16 03:08:11 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/testunit/test_parallel.rb (TestParallel::TestParallelWorker#
-	  setup): now can run on Windows, probably.
-
-	* test/testunit/test_parallel.rb (TestParallel::TestParallel#setup):
-	  ditto.
+	* ext/openssl/ossl.c: Don't set locking callbacks if unneeded.
 
-Thu Jun 16 03:00:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* 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().
 
-	* thread.c (do_select): Windows: no need to poll if select(2) is
-	  cancelable.
+Sun Jun  5 21:38:13 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* thread_win32.c (native_fd_select): new function to make select(2)
-	  cancelable.
+	* 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]
 
-	* thread_win32.c (rb_w32_check_interrupt): new function for checking
-	  interrupt.
+	* ext/openssl/ossl_rand.c: Disable Random.pseudo_bytes if
+	  RAND_pseudo_bytes() is unavailable.
 
-	* win32/win32.c (rb_w32_select_with_thread): new function. cancelable
-	  select(2).
-
-	* win32/win32.c (rb_w32_select): use above function internally.
-
-Wed Jun 15 23:30:45 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* gc.c: fix a regression by r31690 on AIX because AIX malloc
-	  return NULL if it's passed 0. But some caller don't expect it.
-	  patch by Yutaka Kanemoto. [ruby-dev:43779]
-	(vm_malloc_prepare): return calculated size.
-	(vm_xmalloc): use above result.
-	(vm_xcalloc): ditto.
-
-Wed Jun 15 23:11:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c: remove BLOCKING_REGION_CORE() macro. It's no longer used
-	  since r32022.
-
-Wed Jun 15 21:00:47 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_config.rb: execute based on the existence of the
-	  OpenSSL module.
-
-Wed Jun 15 12:35:11 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_io.rb (test_copy_stream_socket): wait a child process
-	  before SIGUSR1 handler is removed.
-
-	* test/pathname/test_pathname.rb (define_assertion): use line number
-	  for test method names.
-
-Wed Jun 15 10:37:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (rb_stat_rdev): use DEVT2NUM.
-
-	* file.c (rb_stat_rdev_major): ditto.
-
-	* file.c (rb_stat_rdev_minor): ditto.
-
-Wed Jun 15 05:12:59 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (lib_eventloop_core): revert the last change (it's
-	  the part for ruby_1_8), and use rb_thread_check_ints() when RUBY_VM
-	  is defined.
-
-Wed Jun 15 04:42:47 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm3_thread_*.rb: renamed bm_vm3_thread_*.rb to
-	  benchmark/bm_vm_thread_*.rb.
-
-Wed Jun 15 04:28:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_vm4_thread_pass.rb: rename bm_vm4* to
-	  bm_vm_thread_*. suggested by ko1.
-	* benchmark/bm_vm4_pipe.rb: ditto.
-	* benchmark/bm_vm4_alive_check1.rb: ditto.
-	* benchmark/bm_vm4_pass_flood.rb: ditto.
-
-Wed Jun 15 03:52:50 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_vm4_pass_flood.rb: new benchmark for GVL fairness.
-	* benchmark/bm_vm4_alive_check1.rb: ditto.
-
-Wed Jun 15 01:27:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (gvl_yield): fix live lock issue on 1-2 cpus
-	  system. It's additional fix for r32021.
-	* thread_pthread.c (gvl_init): add switch_wait_cond.
-	* thread_pthread.h (typedef struct rb_global_vm_lock_struct): ditto.
-
-Tue Jun 14 23:16:22 2011  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (show_progress): refine verbose mode.
-	  (exec_test): ditto.
-
-Tue Jun 14 23:02:36 2011  Tanaka Akira  <akr@fsij.org>
-
-	* bootstraptest/runner.rb (show_progress): extracted from assert_check.
-	  (assert_check): use show_progress.
-	  (assert_normal_exit): ditto.
-	  (assert_finish): ditto.
-	  (flunk): ditto.
-
-Tue Jun 14 22:51:42 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/test_*.rb: added tests.
-
-Tue Jun 14 22:09:58 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: renamed some functions.
-	* ext/date/date_core.c: modified doc.
-
-Tue Jun 14 21:26:01 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* cont.c (cont_save_thread): add new utility function.
-	  rb_context_t::saved_thread.machine_stack_start and
-	  machine_stack_end should be cleared immediately after a snapshot of
-	  current thread is stored to saved_thread. [ruby-dev:43680] [Bug #4855]
-	  this change aims to get rid of unnecessary GC mark at machine stack.
-
-Tue Jun 14 19:50:49 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_autoload.rb: remove temporary directory.
-
-Tue Jun 14 11:05:03 2011  Narihiro Nakamura  <narihiro@netlab.jp>
-
-	* gc.c (rb_gc_set_params): call initial_expand_heap if
-	  initial_heap_min_slots is set.
-
-Tue Jun 14 11:02:08 2011  Narihiro Nakamura  <narihiro@netlab.jp>
-
-	* gc.c: use size_t.
-
-Tue Jun 14 01:10:38 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* test/coverage/test_coverage.rb: add a test for restart.  a patch
-	  from Xavier Shay.  [ruby-core:36745]
-
-Tue Jun 14 01:05:10 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* ext/coverage/coverage.c: make it restartable.  [ruby-core:36539]
-
-Mon Jun 13 23:55:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_schedule_rec): call gvl_yield() unconditionally.
-	* thread_pthread.c: remove HAVE_GVL_YIELD macro.
-	* thread_win32.c (gvl_yield): new. this fallback logic was moved from
-	  rb_thread_schedule_rec().
-
-Mon Jun 13 23:50:25 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/io/console/console.c (console_dev): typo.
-
-Mon Jun 13 23:38:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_parse_string): flush delayed token.  based on a
-	  patch by Masaya Tarui in [ruby-dev:43762].  Bug #4544
-
-	* parse.y (yylex): revert r24557.  delayed token at the end of
-	  string should be flushed already by the above change.
-
-Mon Jun 13 23:33:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_dev): console should be
-	  unbuffered.
-
-	* ext/io/console/console.c (console_dev): take care of no-ctty
-	  case.
-
-Mon Jun 13 23:06:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c: rewrite GVL completely. This fix improve some
-	  benchmark dramatically (e.g. vm3_thread_mutex result changed
-	  form 120.601sec to 3.426sec).
-	* thread_win32.c: ditto.
-	* thread_pthread.h: ditto.
-	* vm_core.h: ditto.
-	* thread.c: ditto.
-
-Mon Jun 13 23:11:52 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/socket/test_unix.rb: don't use Thread.abort_on_exception.
-
-Mon Jun 13 23:05:01 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/unixsocket.c (unix_send_io): race condition fixed.
-	  (unix_recv_io): ditto.
-	  fixed by Eric Wong.  [ruby-core:35574]
-
-	* test/socket/test_unix.rb: test added for above problem.
-
-Mon Jun 13 21:41:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_win32.c (native_cond_signal): remove unnecessary rb_bug().
-	  It's additional fix for r32021. [Bug #4696]
-
-Mon Jun 13 20:50:49 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_ec.rb
-	  test/openssl/test_pkey_ec.rb: merge both files into test_pkey_ec.rb.
-	  Removed redundant group instantiation from PKey tests.
-	* test/openssl/utils.rb: only create TEST_PKEY_EC_P256V1 if EC is
+	* test/openssl/test_random.rb: Don't test Random.pseudo_bytes if not
 	  defined.
 
-Mon Jun 13 20:28:24 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/digest.rb: remove MDC2 from test, it is not available
-	  by default in an OpenSSL installation.
-
-Mon Jun 13 20:18:55 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h, vm_insnhelper.h: move decl. of
-	  ruby_vm_global_state_version and related macros
-	  from vm_core.h to vm_insnhelper.h.
-
-	* vm.c (vm_clear_all_cache): added.  This function is called
-	  when ruby_vm_global_state_version overflows.
-	  TODO: vm_clear_all_inline_method_cache() is only place holder.
-	        We need to implement it ASAP.
-
-	* vm_method.c (vm_clear_global_method_cache): added.
-
-Mon Jun 13 19:46:21 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/cmath.rb: add new method Object#real?. fix #3137
-
-Mon Jun 13 18:52:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (is_kind_of_BigDecimal): new function to
-	  examine the whether the object is kind of BigDecimal.
-
-Mon Jun 13 18:49:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): use GetVpValueWithPrec
-	  for Float and Rational arguments.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_new, test_cmp, test_power):
-	  add and modify tests for the above change.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimalCmp): modify coding style to
-	  match ruby's standard.
-
-Mon Jun 13 18:33:04 2011  Tanaka Akira  <akr@fsij.org>
-
-	* lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state
-	  to prevent random number sequence repetition at forked child
-	  process which has same pid.
-	  reported by Eric Wong.  [ruby-core:35765]
-
-Mon Jun 13 17:02:34 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTP#use_ssl?): require 'openssl' only when
-	  https is needed. fixes r31933.
-
-Mon Jun 13 14:35:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* lib/cmath.rb (CMath.cbrt): returns the principal value of the cube
-	  root of the argument.  fix #3676
-
-	* test/test_cmath.rb (test_cbrt_returns_principal_value_of_cube_root):
-	  test for the above change.
-
-Mon Jun 13 14:17:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): fix typo.
-
-Mon Jun 13 13:04:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c: fix error for digests that have no oid
-	(e.g. DSS1).
-	* test/openssl/test_digest.c: add tests for this.
-
-Mon Jun 13 12:51:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/yaml.rb: load psych only when syck is not loaded.
-
-Mon Jun 13 12:23:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-Mon Jun 13 12:23:39 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/psych/lib/psych/deprecated.rb (Object#to_yaml_properties):
-	  undef to_yaml_properties before redefine it.
-
-	* ext/syck/lib/syck/rubytypes.rb: ditto.
-
-Mon Jun 13 11:30:10 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c: allow Digests to be created by sn, ln or
-	  oid.
-	* test/openssl/test_digest.rb: add tests for this.
-	  [Ruby 1.9 - Feature #4412] [ruby-core:35319]
-
-Mon Jun 13 10:54:03 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/pkey_dh.c: corrected documentation.
-	* test/openssl/utils.rb: add test key for DH.
-	* test/openssl/test_pkey_dh.rb: add tests.
-
-Mon Jun 13 10:13:08 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/pkey_dh.c: clarify difference between DH#public_key and
-	DH#pub_key in documentation.
-
-Mon Jun 13 05:50:43 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* NEWS: introduce PKey.read.
-
-Mon Jun 13 05:17:29 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey.c: added PKey.read module function that allows
-	  reading arbitrary public/private keys from DER-/PEM-encoded File or
-	  string instances.
-	* ext/openssl/ossl_pkey_dh.c: improved documentation.
-	* test/openssl/utils.rb: added EC test key.
-	* test/openssl/test_pkey_rsa.rb
-	  test/openssl/test_pkey_dsa.rb: Test PKey.read. Reuse keys from
-	  OpenSSL::TestUtils.
-	* test/openssl/test_pkey_ec.rb: Created test file for EC tests.
-	  Test PKey.read.
-	  [Ruby 1.9 - Feature #4424] [ruby-core:35330]
-
-Mon Jun 13 04:42:24 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (total_i): fix to skip no ruby objects.
-
-Mon Jun 13 03:07:38 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/benchmark/test_benchmark.rb (capture_output):
-	  replace '-' as space. On NetBSD, subtract between two Process.times
-	  after and before the short process may return negative value like:
-	  t0=Process.times; yield; t1=Process.times; p t1.utime-t0.utime
-
-Mon Jun 13 02:40:23 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_dsa.rb: Test for DSA#syssign/sysverify.
-
-Mon Jun 13 01:59:19 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey_dh.c: completed documentation.
-	* ext/openssl/ossl_pkey_dsa.c: corrected examples. Improved parameter
-	  sections.
-
-Mon Jun 13 00:25:10 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey_dsa.c: completed documentation.
-
-Sun Jun 12 23:36:46 2011  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (kill_sub_thread): remove the method. [ruby-core:34185]
-
-Sun Jun 12 21:01:56 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (d_lite_marshal_load): should give converted value.
-
-Sun Jun 12 20:36:30 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: edited doc.
-
-Sun Jun 12 18:12:07 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm3_clearmethodcache.rb: added.
-
-Sun Jun 12 17:40:29 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_method.c (rb_clear_cache*): update only vm state version.
-
-	* vm_method.c (rb_method_entry_get_without_cache, rb_method_entry):
-	  Fill method cache entry with vm state version, and
-	  check current vm state version for method (cache) look up.
-	  This modification speed-up invalidating of global method cache table.
-	  [Ruby 1.9 - Feature #3905] [ruby-core:36908]
-
-Sun Jun 12 16:19:48 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/extconf.rb: fail on Mac OS X. [Bug #4853][ruby-dev:43655]
-
-Sun Jun 12 15:56:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c: remove th->transition_for_lock. It's thread unsafe.
-	  [Bug #4723][ruby-dev:43563]
-
-Sun Jun 12 15:47:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c: introduce spurious wakeup safe deadlock check.
-	  [Bug #4696][ruby-dev:43554]
-
-Sun Jun 12 13:33:52 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* benchmark/bm_vm3_thread_mutex.rb: remove it.
-
-	* benchmark/bm_vm3_thread_mutex[1-3].rb: added 3 benchmarks.
-	    1: one thread with one mutex (no contention).
-	    2: two threads with one mutex (contention).
-	    3: 1000 threads with one mutex (huge number of contention)
-	  Above removed benchmark was type 3.
-	  Therefore, this commit adds type 1 and 2 benchmark.
-
-Sun Jun 12 11:16:59 2011  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: use select() appropriately for sendfile().
-	  Fixed by Eric Wong.  [ruby-core:36150]
-	  (maygvl_copy_stream_wait_readwrite): removed.
-	  (nogvl_copy_stream_sendfile): use nogvl_copy_stream_wait_write and
-	  maygvl_copy_stream_wait_read instead of
-	  maygvl_copy_stream_wait_readwrite.
-
-Sun Jun 12 09:32:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* atomic.h (ATOMIC_OR): _InterlockedOr is not available on mingw.h
-	* gc.c (rb_gc_set_params): VM_OBJSPACE is disabled on mingw.
-
-Sun Jun 12 01:07:09 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: edited doc.
-
-Sat Jun 11 23:18:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_core.h (RUBY_VM_SET_TIMER_INTERRUPT, RUBY_VM_SET_INTERRUPT,
-	  RUBY_VM_SET_FINALIZER_INTERRUPT): use atomic ops for preventing
-	  interrupt_flag bit lost. [Bug #4770][ruby-dev:43467]
-	* thread.c (rb_threadptr_execute_interrupts_rec): ditto.
-	* vm_core.h (typedef struct rb_thread_struct): change type of
-	  interrupt_flag to rb_atomic_t.
-	* atomic.h: move atomic ops definition from signal.c.
-	* signal.c: remove atomic ops definition.
-	* common.mk (gc, signal, thread, cont): add to dependency to atomic.h.
-
-Sat Jun 11 23:23:52 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: edited doc.
-
-Sat Jun 11 23:02:36 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/buffering.rb (module OpenSSL):
-	  Buffering#each_byte should return String in accordance with IO in
-	  1.9.
-
-	* test/openssl/test_buffering.rb (class OpenSSL): add tests for getc
-	  and each_byte.
-
-Sat Jun 11 22:41:37 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* time.c: a correction of doc for strftime (%v).
-
-Sat Jun 11 22:30:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: replaced doc for strftime based on Time's one.
-
-Sat Jun 11 22:07:56 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (datetime_s_{iso8601,rfc3339,xmlschema,rfc2822,httpdate}):
-	  do not take argument comp.
-
-Sat Jun 11 21:58:31 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: added examples.
-
-Sat Jun 11 19:40:45 2011  Narihiro Nakamura  <authornari@gmail.com>
-
-	* gc.c: expand heap if initial_heap_min_slots is bigger than
-	  HEAP_MIN_SLOTS.
-
-Sat Jun 11 19:42:50 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ChangeLog (vim): set shiftwidth to 2.
-
-Sat Jun 11 19:27:06 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_x509req.c: raise RequestError instead of
-	  CertificateError when Request#to_der gets an error from OpenSSL.
-	  Patch from Ippei Obayashi, see #4420. I cannot write a test for
-	  this... Request does not allow to create broken bytes...
-
-Sat Jun 11 19:34:51 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (Date::(ABBR_)?(MONTH|DAY)NAMES): should be usascii.
-
-Sat Jun 11 19:24:33 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: rewrote doc.
-
-Sat Jun 11 19:04:15 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): should run
-	  with 1.8.
-
-Sat Jun 11 18:05:57 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* bootstraptest/runner.rb: should initialize $stress to avoid warnings.
-
-Sat Jun 11 18:02:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_getc): should be 7bit if ascii.  fixes #4557
-
-Sat Jun 11 16:52:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (rb_enc_uint_chr): fix message format. Bug#4869
-
-Sat Jun 11 16:28:25 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/formatters/pretty.rb
-	  (REXML::Formatters::Pretty#write_text),
-	  test/rexml/test_core.rb
-	  (Tester#test_pretty_format_long_text_finite): don't ignore
-	  'width' parameter in pretty formatter. fixes #4498
-	  Reported by Michael Frasca. Thanks!!!
-
-Sat Jun 11 16:11:36 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_core.rb
-	  (Tester#test_pretty_format_long_text_finite): remove needless
-	  assert_nothing_raised.
-
-Sat Jun 11 16:04:03 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/parsers/xpathparser.rb
-	  (REXML::Parsers::XPathParser#parse),
-	  test/rexml/test_elements.rb
-	  (ElementsTester#test_each_with_frozen_condition):
-	  don't modify original XPath. fixes #4161
-	  Reported by Pavel Shved. Thanks!!!
-
-Sat Jun 11 15:53:27 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_elements.rb (ElementsTester): remove needless
-	  prefix from test name.
-
-Sat Jun 11 15:36:36 2011  Martin Duerst  <duerst@it.aoyama.ac.jp>
-	* common.mk: fixed a grammatical error
-
-Sat Jun 11 14:20:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm.c (thread_memsize): don't ignore size of th->local_storage.
-
-Sat Jun 11 10:32:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: should quote arch_hdrdir and libpath for the case
-	  installed prefix contains spaces.
-
-Sat Jun 11 10:20:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* thread_pthread.c (native_cond_timeout): wrap conditionally used
-	  label.
-
-	* thread_pthread.c (native_sleep): remove unused variable.
-
-Sat Jun 11 10:15:50 2011  Tanaka Akira  <akr@fsij.org>
-
-	* thread.c (rb_thread_execute_interrupts): use GetThreadPtr to extract
-	  rb_thread_t from VALUE.
-	  reported by Motohiro KOSAKI.  [ruby-dev:43700]
-
-Sat Jun 11 10:00:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (ruby_process_options): add missing return type.
-
-Fri Jun 10 23:18:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/tk/tcltklib.c (lib_eventloop_core): replace CHECK_INTS with
-	  rb_thread_check_ints(). Because current code can't be compiled.
-
-Fri Jun 10 16:38:13 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* encoding.c (rb_locale_charmap): When ruby process is run as Windows
-	  Service the console codepage is not set, GetConsoleCP returns 0.
-	  So on such environment, use GetACP().
-	  http://blogs.msdn.com/b/michkap/archive/2005/02/08/369197.aspx
-	  patched by Rafal Bigaj [ruby-core:36832] [Bug #4854]
-
-Fri Jun 10 14:34:24 2011  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk: restore TESTRUN_SCRIPT to "$(srcdir)/test.rb".
-	  TESTRUN_SCRIPT is used by "make run", "make gdb" and so on.
-
-Fri Jun 10 13:01:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_module.rb (TestModule#remove_rake_mixins): remove all
-	  module related to Rake.
-
-Fri Jun 10 09:52:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* encoding.c:  Mention that Encoding.compatible? can work with more
-	  than just Strings.
-
-Fri Jun 10 02:25:53 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: updating version to match released gem.
-
-Fri Jun 10 01:06:29 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/bigdecimal (BigDecimal_to_i): Integer#** may return flonum.
-
-Fri Jun 10 00:35:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c (string_to_c_internal): uses rb_reg_nth_match;
-	* rational.c (string_to_r_internal): ditto.
-
-Fri Jun 10 00:25:03 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* gc.c: remove an unused declaration.
-
-Fri Jun 10 00:24:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* rational.c (string_to_r): Rational#** may return flonum.
-
-Thu Jun  9 23:57:53 2011  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: fix IO.copy_stream interrupt handling.
-	  based on the patch by Eric Wong.  [ruby-core:36156]
-
-	* vm_core.h (rb_thread_call_with_gvl): don't declare here.
-
-	* thread.c: include internal.h.
-	  (rb_thread_execute_interrupts): new function.
-
-	* internal.h (rb_thread_execute_interrupts): declared.
-	  (rb_thread_call_with_gvl): declared.
-
-Thu Jun  9 23:34:01 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* gc.c (rb_objspace_call_finalizer): use rb_typeddata_is_kind_of() for
-	  type check to get rid of a double free when main Thread has singleton
-	  class. [ruby-core:36741] [Bug #4828]
-	* thread.c (rb_obj_is_mutex): add a new utility function.
-	* vm.c (rb_obj_is_thread): ditto.
-
-Thu Jun  9 22:53:49 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/ruby/test_thread.rb (TestThread#test_kill_thread_subclass):
-	  add test for Thread.kill with Thread subclass instance.
-
-Thu Jun  9 22:31:47 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/ruby/test_thread.rb (TestThread#test_kill_wrong_argument):
-	  test for [ruby-core:35086].
-	  partially forward porting r31402 from ruby_1_9_2 branch.
+Sun Jun  5 19:06:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Jun  9 18:36:00 2011  Kenta Murata <mrkn@mrkn.jp>
+	* NEWS: Add news about Unicode-wide case mapping for
+	  String/Symbol#upcase/downcase/swapcase/capitalize(!).
 
-	* string.c: Fix the ambiguous description of the behavior of
-	  rb_str_aref_m with a range.  It returns nil when the beginning of
-	  the range is greater than the end of the string rather than the range.
+Sun Jun  5 15:24:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Jun  9 10:57:03 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* test/ruby/enc/test_case_comprehensive.rb:
+	  Remove :lithuanian guard for Unicode case mapping.
 
-	* ext/psych/lib/psych/visitors/to_ruby.rb: Hash subclasses can be read
-	  from YAML files.
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: Hash subclasses can be
-	  dumped to YAML files.
-	* test/psych/test_hash.rb: corresponding test.
+Sun Jun  5 14:46:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Jun  9 09:18:51 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* string.c: Remove :lithuanian guard for Unicode case mapping.
 
-	* ext/psych/lib/psych/visitors/to_ruby.rb: Ruby modules can be loaded
-	  from YAML files.
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby modules can be
-	  dumped to YAML files.
-	* test/psych/test_class.rb: corresponding test.
+Sat Jun  4 10:54:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jun  9 09:05:04 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* missing/crypt.h (struct crypt_data): remove unnecessary member
+	  "initialized".
 
-	* ext/psych/lib/psych/visitors/to_ruby.rb: Ruby classes can be loaded
-	  from YAML files.
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: Ruby classes can be
-	  dumped to YAML files.
-	* test/psych/test_class.rb: corresponding test.
+	* missing/crypt.c (des_setkey_r): nothing to be initialized in
+	  crypt_data.
 
-Wed Jun  8 21:38:57 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* 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.
 
-	* cont.c (root_fiber_alloc): set root fiber's status RUNNING.
-	  in cont_mark() only RUNNING fiber's machine stack is marked.
-	  root fiber's status should be RUNNING at the beginning regardless of
-	  FIBER_USE_NATIVE. [ruby-core:36735] fixes #4827
+Sat Jun  4 10:38:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jun  7 20:50:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* doc/irb/irb.rd: fix typo. patch by Nobuhiro IMAI.
-	  [Bug #4843] [ruby-dev:43639]
-	* doc/irb/irb.rd.ja: ditto.
-	* doc/ChangeLog-YARV: ditto.
+Fri Jun  3 21:27:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jun  7 18:52:55 2011  NAKAMURA Usaku  <usa@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.
 
-	* lib/rubygems/user_interaction.rb (Gem::StreamUI#tty?): IO#tty? of
-	  Windows has been fixed at r29969.
+Fri Jun  3 18:04:37 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* test/rubygems/test_gem_stream_ui.rb: now can run tests.
+	* 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.
 
-Tue Jun  7 18:36:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Jun  3 17:44:25 2016  Reiner Herrmann  <reiner@reiner-h.de>
 
-	* test/rubygems/test_gem.rb (TestGem#{test_self_user_home_userprofile,
-	  test_self_user_home_user_drive_and_path}): should simply ignore
-	  meaningless tests instead of skipping them.
+	* lib/mkmf.rb (create_makefile): sort lists of source and object
+	  files in generated Makefile, unless given by extconf.rb.
+	  [Fix GH-1367]
 
-Tue Jun  7 18:15:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jun  2 21:18:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
-	  should show some messages when skipping tests.
+	* win32/win32.c (get_special_folder): use SHGetPathFromIDListEx if
+	  available instead of old SHGetPathFromIDListW, to check the
+	  buffer size.
 
-Tue Jun  7 13:59:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jun  2 17:05:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/date/date_core.c (date_s_today, datetime_s_now): check the
-	  result of localtime_r().
+	* ruby.c (ruby_init_loadpath_safe): remove MAXPATHLEN restriction
+	  for Windows 10.
 
-Tue Jun  7 13:36:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jun  2 16:51:35 2016  Koichi ITO  <koic.ito@gmail.com>
 
-	* ext/tk/extconf.rb: use $defs not $CPPFLAGS to get rid of
-	  command line escape issues on Windows.  fixed #4835.
+	* 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]
 
-Tue Jun  7 03:18:45 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Thu Jun  2 10:24:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* test/ruby/test_io.rb (TestIO#test_s_{,bin}write): do not create a
-	  file under /tmp. [Bug #4846]
+	* string.c: Raise ArgumentError when invalid string is detected in
+	  case mapping methods.
 
-Mon Jun  6 22:51:43 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* enc/unicode.c: Check for invalid string and signal with negative
+	  length value.
 
-	* cont.c: use #if FIBER_USE_NATIVE instead of #ifdef.
-	  you can suppress use of setcontext for Fiber with compile option
-	  -DFIBER_USE_NATIVE=0
+	* test/ruby/enc/test_case_mapping.rb: Add tests for above.
 
-Mon Jun  6 21:59:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/ruby/test_m17n_comb.rb: Add a message to clarify test failure.
 
-	* test/date/test_switch_hitter.rb: added a test.
+Wed Jun  1 21:41:05 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Mon Jun  6 21:37:45 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* 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/date/date_core.c: added notes.
+	* 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().
 
-Mon Jun  6 21:02:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* ext/openssl/ossl_asn1.h: Add the function prototype for
+	  ossl_time_split().
 
-	* ext/date/date_core.c: flattened format to strftimev.
-	* ext/date/date_core.c (date_strftime_internal): taints run.
+	* 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().
 
-Mon Jun  6 15:10:17 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/openssl/ossl_x509cert.c, ext/openssl/ossl_x509crl.c,
+	  ext/openssl/ossl_x509revoked.c: Use ossl_x509_time_adjust().
 
-	* include/ruby/{defines,missing}.h (rb_infinity, rb_nan): move from
-	  defines.h to missing.h.  (couldn't use RUBY_EXTERN there.)
+Wed Jun  1 15:58:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Jun  6 14:35:48 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in: revert r55237.  replace crypt, not crypt_r, and
+	  check if crypt is broken more.
 
-	* test/rdoc/test_rdoc_markup_pre_process.rb (TestRDocMarkupPreProcess#
-	  {test_include_file,test_include_file_encoding_incompatible}): no
-	  need to write such workaround.  don't hide the bug of ruby. (and the
-	  bug is already fixed.)
+	* missing/crypt.c: move crypt_r.c
 
-Mon Jun  6 14:11:11 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* string.c (rb_str_crypt): use crypt_r if provided by the system.
 
-	* ext/date/date_core.c (valid_jd_sub): need to convert from VALUE to
-	  double.
+Wed Jun  1 14:07:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/date/date_core.c (offset_to_sec): get rid of a compiler warning.
+	* missing/crypt_r.c (a64toi): initialize statically and fix out of
+	  bounds access when salt is not 7bit clean.
 
-Mon Jun  6 14:09:08 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jun  1 11:34:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* include/ruby/defines.h (rb_infinity, rb_nan): export for Windows.
+	* win32/Makefile.sub (MISSING): fixed build error introduced at r55237.
 
-Mon Jun  6 10:54:45 2011  Shota Fukumori  <sorah@tubusu.net>
+Wed Jun  1 09:48:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit.rb(Test::Unit::Runner#puke):
-	  Add overriding from MiniTest::Unit#puke. This reverts minitest's fix
-	  that skip messages are hidden when not verbose mode (-v option).
-	  To hide skip messages, use --hide-skip option instead.
+	* string.c (rb_str_crypt): use reentrant crypt_r.
 
-Mon Jun  6 10:52:13 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Jun  1 09:37:26 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/net/http.rb: don't use autoload.
+	* missing/crypt.c (des_setkey): void function never returns any value.
 
-Mon Jun  6 09:39:43 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Wed Jun  1 09:16:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/psych/parser.c (parse): release event objects to plug memory
-	leak.  Thanks Mark J. Titorenko!
+	* crypt.h: separate header file from missing/crypt.c.
 
-Sun Jun  5 23:26:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* missing/crypt.c (crypt_r, setkey_r, encrypt_r): add reentrant
+	  versions.
 
-	* eval.c: remove rb_thread_stop_timer_thread function declaration.
-	  Instead, include vm_core.h.
-	* process.c: ditto.
+Wed Jun  1 02:25:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Jun  5 21:38:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* missing/crypt.c: fix size macros to use configured values
+	  for platforms long is larger than 32bit.
+	  [ruby-core:75792] [Bug #12446]
 
-	* thread_pthread.c (thread_timer): add to care a spurious wakeup.
-	  When native_cond_timedwait() return 0 by spurious wakeup, we
-	  don't have to neither 1) call timer_thread_function and 2)
-	  exit the timer thread.
+Tue May 31 17:28:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Jun  5 17:50:01 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* lib/optparse.rb (OptionParser::Completion.candidate): get rid of
+	  nil as key names.  [ruby-core:75773] [Bug #12438]
 
-	* ext/date/date_core.c (m_real_cwyear): new.  derived from m_cwyear.
-	* ext/date/date_strftime.c: trivial changes.
+	* lib/optparse.rb (OptionParser#make_switch): char class option
+	  cannot be NoArgument, default to RequiredArgument.
 
-Sun Jun  5 17:22:01 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue May 31 00:30:11 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/tk/config_list.in: add new options for tcltklib.
+	* ext/socket/raddrinfo.c (host_str, port_str): Use StringValueCStr
+	  instead of (Safe)StringValue, to detect NUL byte in the string.
 
-Sun Jun  5 10:06:50 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon May 30 22:02:01 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* ext/date/date_tmx.h: now does not place decoded data.  allows to
-	  access indirectly via functions on demand.
-	* ext/date/date_strftime.c: ditto.
-	* ext/date/date_core.c: ditto.
-	* ext/date/date_core.c ({d|dt}_lite_to_s): use strftime.
+	* 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]
 
-Sun Jun  5 06:22:02 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon May 30 21:15:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* NEWS: wrote about changes of date.
+	* string.c: Document current behavior for other case mapping methods
+	  on String. [ci skip]
 
-Sat Jun  4 16:59:26 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon May 30 20:00:25 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/date/date_core.c (d_lite_inspect): changed the format.
-	* ext/date/date_core.c: refactoring and fixing some bugs.
+	* string.c: Document current situation for String#downcase. [ci skip]
 
-Sat Jun  4 04:04:41 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon May 30 18:29:28 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* test/rubygems/test_gem_commands_which_command.rb:
-	  "missing" exists on ruby's top source directory. [Bug #4815]
+	* 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.
 
-Fri Jun  3 21:48:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	  (ossl_sslctx_setup): Deprecate SSLContext#tmp_ecdh_callback=. Emit a
+	  warning if this is in use.
 
-	* lib/rubygems/test_case.rb: Refix for test-all in separate directory.
-	  r31147 + r31151.
+	  (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().
 
-Fri Jun  3 20:58:47 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	  (Init_ossl_ssl): Define SSLContext#ecdh_curves=.
 
-	* ext/date/date_core.c (d_lite_plus): get rid of compiler warnings.
+	* 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().
 
-Fri Jun  3 20:56:40 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/openssl/openssl_missing.[ch]: Implement EC_curve_nist2nid() if
+	  missing.
 
-	* include/ruby/missing.h, numeric.c (round): moved prototype of round()
-	  from numeric.c to missing.h.  (note: round() is C99 feature, so ruby
-	  provides it if not exist in C runtime.)
+	* test/openssl/test_pair.rb (test_ecdh_callback): Use
+	  EnvUtil.suppress_warning to suppress deprecated warning.
 
-Fri Jun  3 20:42:04 2011  Shota Fukumori  <sorah@tubusu.net>
+	  (test_ecdh_curves): Test that SSLContext#ecdh_curves= works.
 
-	* lib/test/unit/parallel.rb: Keep $stdin, $stdout before run testcase
-	  and restore after run. Because some test break $stdin, $stdout.
-	  Fixes [Bug #4433] [ruby-core:35353]
+	* test/openssl/utils.rb (start_server): Use SSLContext#ecdh_curves=.
 
-Fri Jun  3 19:58:14 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon May 30 16:28:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (io_fflush): windows -- call fsync() only when the FD is tied to
-	  file, because if the FD is pipe, it blocks.
+	* 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
 
-Fri Jun  3 09:27:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon May 30 16:20:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/http.rb (URI::HTTP#request_uri): return nil when the uri
-	  is path-rootless form. Bug #4759
+	* string.c (str_fill_term): return new pointer reallocated by
+	  filling terminator.
 
-Thu Jun  2 23:51:03 2011  James Edward Gray II  <jeg2@ruby-lang.org>
+Mon May 30 14:54:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/csv.rb: Improve the line ending detection algorithm
-	  patch by Alexey).
+	* ext/stringio/stringio.c (enc_subseq): share the return value and
+	  the buffer as possible.
 
-Thu Jun  2 20:05:57 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon May 30 14:50:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (rb_io_s_write, rb_io_s_binwrite): return!!!
+	* string.c (str_substr, rb_str_aref): refactor not to create
+	  unnecessary empty string.
 
-Thu Jun  2 16:29:34 2011  Shota Fukumori  <sorah@tubusu.net>
+	* string.c (str_byte_substr, str_byte_aref): ditto.
 
-	* io.c: Add File.write, File.binwrite. [Feature #1081] [ruby-core:21701]
+Mon May 30 00:09:37 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* test/ruby/test_io.rb: Test for File.write, File.binwrite.
+	* ext/-test-/auto_ext.rb: fixed a heedless bug introduced at r55198.
+	  this change will make RubyCI green.
 
-	* NEWS: News for above.
+Sun May 29 22:58:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu Jun  2 12:33:09 2011  NAKAMURA Usaku  <usa@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_].
 
-	* io.c (io_fflush, rb_io_flush): need to fsync() when ruby calls
-	  internal flush. [ruby-core:36670] [Bug #4813]
+Sun May 29 22:44:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu Jun  2 07:56:24 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* regexec.c (match_at): make compilers optimize harder.
 
-	* ext/tk/tcltklib.c: reduce CPU power required by an eventloop.
+Sun May 29 12:08:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue May 31 21:28:33 2011  Tanaka Akira  <akr@fsij.org>
+	* ext/-test-/auto_ext.rb (auto_ext): utility method to create
+	  extension libraries for tests.
 
-	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring):
-	  redirect stderr to null device.
+Sat May 28 20:40:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jun  2 00:45:26 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* misc/ruby-additional.el (ruby-insert-heredoc-code-block): insert
+	  here document code block for assert_separately mainly.
 
-	* ext/tk/extconf.rb: fix for uninitialized global variables.
-	  [Ruby 1.9 - Bug #4811]
+Sat May 28 20:34:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Wed Jun  1 21:57:08 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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!).
 
-	* thread_pthread.c (native_sleep): fix 1000times calculation error.
-	  this is a regression since r31457. [Bug #4808] [ruby-dev:43606]
+Sat May 28 19:08:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Wed Jun  1 17:19:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* test/ruby/enc/test_case_comprehensive.rb: Add error messages to tests
+	  for data file availability; refactoring.
 
-	* thread_pthread.c: remove unused macro.
+Sat May 28 14:00:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Wed Jun  1 15:42:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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]
 
-	* parse.y (peek_n): new macro to see next nth char.
+	* 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.
 
-Wed Jun  1 15:40:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  (ossl_ssl_setup): Adjust to the changes. Just set the underlying IO to
+	  the SSL.
 
-	* tool/rbinstall.rb (gem): fix for rubygems change.
+	  (ssl_started): Added. Make use of SSL_get_fd(). This returns -1 if not
+	  yet set by SSL_set_fd().
 
-Wed Jun  1 14:07:57 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/*: Imported minitest 2.2.2 (r6281)
-	* test/minitest/*: ditto
-
-Wed Jun  1 12:35:50 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/rubygems*: Import rubygems 1.8.5 (released @ 137c80f)
-	* test/rubygems: Ditto
-
-Wed Jun  1 12:34:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* NEWS: add new features of bigdecimal.
-
-Wed Jun  1 09:41:14 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cgi/util.rb:  Improve documentation.  Patch by Kuba Fietkiewicz.
-	  [Ruby 1.9 - Bug #4775]
-	* lib/cgi/core.rb:  ditto
-
-Wed Jun  1 09:26:05 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mathn.rb:  Improve documentation and attach it to Numeric.
-	  Modified from patch by Anil V.  [Ruby 1.9 - Bug #4762]
-
-Wed Jun  1 09:21:30 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/prime.rb:  Indent examples enough to appear as code sections.
-	  Note that Prime is Enumerable.  [#4762]
-
-Wed Jun  1 07:34:57 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* hash.c (key_i):  Change rdoc from "the first occurrence" to "an
-	  occurrence" since first occurrence is not a specification of
-	  Hash#key.  [Ruby 1.9 - Bug #4760]
-
-Wed Jun  1 07:26:19 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/pty/pty.c (pty_check):  Restore "not reached" comment.
-	  [Ruby 1.9 - Bug #4756]
-
-Wed Jun  1 07:21:40 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/zlib/zlib.c:  Fix document-method declarations for set_sync and
-	  set_comment.  [Ruby 1.9 - Bug #4695]
-
-Wed Jun  1 06:43:13 2011  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* load.c (loaded_feature_path): cut nonsense loop execution to fix
-	  performance bug.
-
-Wed Jun  1 01:16:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_mix_module): implement Module#mix.
-
-Wed Jun  1 01:15:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_encoding_set): should honor already set ecflags since it
-	  might be set by mode option.  fixed #4804
-
-Wed Jun  1 00:34:04 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): remove unused
-	  variable.
-
-Wed Jun  1 00:32:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): support instantiation from
-	  a Float through Rational.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): ditto.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_global_new_float): add a test for
-	  the above changes.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_new_with_float): ditto.
-
-Wed Jun  1 00:07:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_coerce): support coerce with a
-	  Rational.  The precision used for instantiate a BigDecimal from the
-	  given Rational is obtained from the receiver BigDecimal.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_coerce): add a test for the
-	  above change.
-
-Tue May 31 23:49:08 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (offset_to_sec): fixed invalid validation.
-
-Tue May 31 23:43:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): replace the algorithm for
-	  coercing from a Rational to stop requiring "bigdecimal/util.rb".
-	  [ruby-core:34318]
-
-	* ext/bigdecimal/bigdecimal.c (GetVpValue): refactoring.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): support instantiation from a
-	  Rational.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_global_new_with_rational): add a
-	  test for the above change.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_new_with_rational): ditto.
-
-Tue May 31 22:44:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_new): support instantiation a
-	  BigDecimal object from an Integer.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_new_with_integer):
-	  add for testing the above change.
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): replace its body
-	  with a BigDecimal_new call.
-
-	* test/bigdecimal/test_bigdecimal.rb (test_global_new_with_integer):
-	  add for testing the above change.
-
-Tue May 31 22:24:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: use simple/complex mode instead of light/right mode.
-	* test/date/*.rb: followed the above changes.
-
-Tue May 31 21:28:33 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring):
-	  initialize SIGINT handler.
-
-Tue May 31 17:03:24 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* lib/net/http.rb, lib/net/protocol.rb: Allow to configure to wait
-	  server returning '100 continue' response before sending HTTP request
-	  body. See NEWS for more detail. See #3622.
-	  Original patch is made by Eric Hodel <drbrain@segment7.net>.
-
-	* test/net/http/test_http.rb: test it.
-
-	* NEWS: Add new feature.
-
-Tue May 31 14:17:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (rb_io_s_pipe): potential bug. the mode of read IO is set as
-	  DEFAULT_TEXTMODE in call of io_set_encoding(), and of write IO is
-	  also set as it in call of io_new_instance() via rb_protect().
-	  so, if DEFAULT_TEXTMODE is not 0, we should check the result of
-	  extract_binmode() and avoid crush of default IO mode and the result.
-
-Tue May 31 13:00:17 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* strftime.c (rb_strftime_with_timespec): improved style consistency.
-	  constified some variables.
-
-	* test/test_time.rb (TestTime#test_huge_precision): test for #4456.
-
-Tue May 31 12:53:10 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/io/wait/test_io_wait.rb (TestIOWait#{test_nread,test_ready?,
-	  test_wait}: give system some time to process the written data.
-
-Tue May 31 12:40:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (TestIO#test_open_mode): MUST release resources
-	  explicitly. fix problem of r31671
-
-Tue May 31 10:49:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vm_exec.c: remove conditions for clang
-	  because clang version 3.0 (trunk 132165) doesn't need them.
-
-Mon May 30 22:19:33 2011  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring): don't
-	  close stderr.
-
-Mon May 30 20:22:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_signal.rb (TestSignal#test_signal_requiring): small
-	  but critical typo of r31642.  sorry...
-	  [Bug #4798] [ruby-core:36550]
-
-Mon May 30 15:44:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* insns.def (opt_mult): as r31805, volatile it.
-	  Without this, clang -O fails calculation.
-
-	* numeric.c (fix_mul): ditto.
-
-	* rational.c (f_imul): ditto.
-
-Mon May 30 10:26:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (int_pow): make sure to assign the result of x * z.
-	  If xz is optimized out, the value won't overflow.
-
-Sun May 29 23:17:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* re.c (rb_reg_match): fix rdoc of Regexp#=~.
-	  patched by Tsuyoshi Sawada. [Bug #4781]
-
-Sun May 29 23:10:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/https.rb (WEBrick::HTTPRequest#parse_uri):
-	  keep parse_uri as private. patched by okkez. [Bug #4773]
-
-Sun May 29 17:53:03 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* numeric.c: add #include "internal.h" for rb_big_uminus() prototype.
-
-Sun May 29 15:09:05 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_round): fix for negative value.
-
-Sun May 29 02:16:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/net/http/utils.rb (TestNetHTTPUtils#teardown): add nil check.
-
-Sun May 29 00:22:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (before_exec, after_exec): change from macro to function.
-
-Sat May 28 19:30:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (before_exec, after_exec): change SIGPIPE handler to SIG_DFL
-	  before calling execve(). Because r31760 reintroduced an issue that
-	  system() may hang up (i.e. [ruby-dev:12261]).
-	* process.c (save_sigpipe, restore_sigpipe): new.
-
-Sat May 28 16:08:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* signal.c (Init_signal, default_handler): change default SIGPIPE handler
-	  from empty function to SIG_IGN. [ruby-dev:43215]
-	* signal.c (sigpipe): removed.
-
-Sat May 28 03:04:27 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (fill_cbuf): return MORE_CHAR_SUSPENDED when cbuf is not empty.
-
-Sat May 28 02:22:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* string.c (rb_str_bytesize): rb_str_bytesize() should use LONG2NUM().
-	  Patch by Nikolai Weibull. [Bug #4789] [ruby-core:36511]
-
-Sat May 28 02:06:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (fill_cbuf): Fix test-all crash.
-
-Sat May 28 00:58:40 2011  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/ostruct.rb (method_missing): Handle [] and []= correctly.
-	  Based on a patch by Caius Durling, bug #4179 [ruby-core:33792]
-
-Fri May 27 23:56:54 2011  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rexml/test_core.rb (Tester::test_text_frozen): split frozen
-	  string test. refs #4783
-
-Fri May 27 22:46:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (gem): install gemspec of json.  fixed #4784
-
-Fri May 27 22:45:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (validate_enc_binmode): do not clear textmode flag if
-	  default.  fixed #4732
-
-	* io.c (fill_cbuf): finish reading at EOF.
-
-Fri May 27 11:31:51 2011  misfo <tedwardo2@gmail.com>
-
-	* lib/rexml/text.rb (REXML::Text#initialize): prevent an error
-	  when passing a frozen string to REXML::Text.new
-
-	  dup the string passed in instead of cloning so that it's frozen
-	  state is ignored
-
-Fri May 27 08:47:26 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* thread.c (ppoll): typo bug fix.
-
-Fri May 27 08:35:04 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: hang-up at exit before calling Tk.mainloop.
-
-	* ext/tk/lib/tk/extconf.rb: cannot make on MinGW [Ruby 1.9 - Bug #4141].
-
-Thu May 27 00:34:07 2011  James Edward Gray II  <jeg2@ruby-lang.org>
-
-    * lib/csv.rb: Enhance each() to support Enumerator.
-
-Thu May 26 10:32:11 2011  James Edward Gray II  <jeg2@ruby-lang.org>
-
-    * lib/csv.rb: Documentation improvements from Ysiad Ferreiras.
-      [Ruby 1.9 - Bug #4785]
-
-Thu May 26 15:42:02 2011  Cezary Baginski <cezary.baginski@gmail.com>
-
-	* lib/xmlrpc/parser.rb (FaultException): fix to_s and inspect
-
-	* test/xmlrpc/parser.rb: test for the above
-
-Wed May 25 11:54:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/curses/curses.c:  Remove color constants block.
-	  [Ruby 1.9 - Bug #4748]
-
-Wed May 25 09:56:45 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/curses/curses.c:  Add missing documentation for button state, MIN
-	  and MAX comments.  Add Curses. to TABSIZE= and ESCDELAY= methods.
-	  [Ruby 1.9 - Bug #4747]
-
-Wed May 25 09:35:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/benchmark.rb:  Restore nodoc for Benchmark::Job and
-	  Benchmark::Report.  [Ruby 1.9 - Bug #4726]
-
-Wed May 25 09:29:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/pop.rb:  Hide implementation details from RDoc.
-	  [Ruby 1.9 - Bug #4711]
-
-Wed May 25 09:26:29 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/ftp.rb:  Add :nodoc: for private methods.
-	  [Ruby 1.9 - Bug #4710]
-
-Wed May 25 09:19:17 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/zlib/zlib.c:  Fix Document-method declarations.  Improve
-	  Zlib::GzipFile's method catalog.  [Ruby 1.9 - Bug #4695]
-
-Wed May 25 08:22:12 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/erb.rb:  Hide documentation for implementation details of ERB.
-	  [Ruby 1.9 - Bug #4694]
-
-Wed May 25 07:58:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile.{mkdir,rmdir}): revert for backward
-	  compatibility.
-
-Wed May 25 07:13:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* spec/README: update the description.
-
-Wed May 25 07:12:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile.{lock,unlock}_tempfile): refactor.
-
-Tue May 24 17:30:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* spec/README: fix typo.
-	  patched by bowsersenior. https://github.com/ruby/ruby/pull/24
-
-Tue May 24 07:06:34 2011  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: fail to start Tk.mainloop (exit immediately) on
-	  some environment (reported on [ruby-talk:381444]).
-
-	* ext/tk/lib/tk/canvas.rb: support creating a canvas item object from
-	  an item ID number.
-
-	* ext/tk/lib/tk/image.rb: import documents which are pull-requested.
-	  [Ruby 1.9 - Feature #4595]
-
-	* ext/tk/lib/tk/extconf.rb: search directories for 64bit library (e.g.
-	  /usr/lib64), add some new configure options (see README.tcltklib),
-	  and bug fix.
-
-	* ext/tk/lib/tk/README.tcltklib: modify docs for some new configure
-	  options.
-
-Tue May 24 04:01:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/yaml.rb: switch default YAML engine to Psych, old syck engine
-	  may be enabled via YAML::ENGINE.yamler = "syck". [ruby-core:36374]
-
-Mon May 23 09:45:26 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. Forgot to
-	  include this file in the commit r31692. __APPLE__ is not
-	  CASEFOLD_FILESYSTEM again, from this time.
-
-Mon May 23 10:01:02 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Do not parse zero-tagged values as EOC. Do
-	  not let current length become negative for infinite length constructed
-	  values. Support constructed values of length zero. Added tests.
-
-Mon May 23 09:19:53 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/smtp.rb:  Document Net::SMTP::Response.  Patch by J.R. Garcia.
-	  [Ruby 1.9 - Bug #4768]
-
-Mon May 23 09:03:52 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit/parallel.rb: Never Ignore SIGINT. When received
-	Interrupt, immediately puts result and exit. [ruby-dev:43571]
-
-	* lib/test/unit.rb: When received Interrupt, wait results from workers
-	and collect them. [ruby-dev:43571]
-
-Mon May 23 09:08:07 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mathn.rb:  Improve documentation.  Patch by Sandor Szucs.
-	  [Ruby 1.9 - Bug #4767]
-
-Mon May 23 08:45:55 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/ostruct.rb:  Improve documentation.  Patch by Franklin Webber.
-	  [Ruby 1.9 - Bug #4761]
-
-Mon May 23 08:35:24 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* hash.c:  Improve documentation of Hash#key.  Patch by Utkarsh
-	  Kukreti.  [Ruby 1.9 - Bug #4760]
-
-Mon May 23 08:32:59 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* enumerator.c:  Improve documentation.  Patch by Dave Copeland.
-	  [Ruby 1.9 - Bug #4757]
-
-Mon May 23 07:19:45 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* NEWS (openssl): Infinite length support. Different behavior of
-	  Constructive and Primitive constructors.
-
-Mon May 23 06:58:33 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Forbid Constructives whose value is not an
-	  Array to prevent segfault. Added test.
-
-Mon May 23 06:33:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Forbid Constructive without infinite
-	  length. This also prevents a segfault. Added test and improved
-	  documentation.
-
-Mon May 23 05:58:14 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Fix decoding of infinite length values.
-	  Simplified ossl_asn1_decode0 by splitting it into three separate
-	  functions. Add tests.
-	  [Ruby 1.9 - Bug #4374][ruby-core:35123]
-
-Mon May 23 04:03:46 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_initialize): Allow creation of
-	  Constructives with an explicit tag_class parameter without
-	  automatically setting tagging to :EXPLICIT. Fixes a bug when encoding
-	  infinite length primitive values.
-
-Mon May 23 04:03:46 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_cons_to_der): Add an additional
-	  EOC for infinite length Constructives that are supposed to be encoded
-	  with explicit tagging. Also tabify method correctly.
-
-Mon May 23 03:44:39 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1data_to_der): Remove redundant
-	  flag tmp_cons.
-
-Mon May 23 00:35:00 2001  Kenta Murata  <mrkn@mrkn.jp>
-
-	* bignum.c (dump_bignum, bigmul1_balance, big_split, biglsh_bang),
-	  (bigrsh_bang, big_split3, bigmul1_toom3, bigmul0): implement Toom3 (Toom-Cook)
-	  multiplication.
-
-	* include/ruby/defines.h: add format prefixes for BDIGIT and BDIGIT_DBL.
-
-Sun May 22 23:24:02 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Instead of rb_intern use static symbols to
-	  improve performance.
-
-Sun May 22 21:56:51 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Use OpenSSL constants V_ASN1_xxx instead of
-	  hardcoded numbers for initializing class_tag_map.
-
-Sun May 22 21:29:29 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): Revert r30508. See #4255.
-	  Now __APPLE__ is not CASEFOLD_FILESYSTEM again.
-
-	* load.c (loaded_feature_path, rb_feature_p, load_lock): Revert r30508.
-	  See #4255. Make $LOADED_FEATURES scanning case-sensitive again.
-
-Sun May 22 18:59:27 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_asn1.c(ossl_asn1_default_tag): avoid using RCLASS_SUPER
-	  to make it compilable. Plus, tabify and change variable definition style.
-
-Sun May 22 18:26:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (vm_xcalloc): use calloc provided by platforms.
-	  fixes #4754
-
-Sun May 22 11:44:53 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/pty/pty.c:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4756]
-
-Sun May 22 11:26:39 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/timeout.rb:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4755]
-
-Sun May 22 11:21:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/ipaddr.rb:  Improve documentation.  Patch by Sandor Szucs.
-	  [Ruby 1.9 - Bug #4753]
-
-Sun May 22 11:14:40 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/forwardable.rb:  Document def_delegator.  Patch by Sandor Szucs.
-	  [Ruby 1.9 - Bug #4752]
-
-Sun May 22 11:11:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/fileutils.rb:  Document block behavior of FileUtils.cd.  Patch by
-	  Bil Kleb.  [Ruby 1.9 - Bug #4751]
-
-Sun May 22 11:07:47 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/curses/curses.c:  Complete documentation.  Patch by Vincent
-	  Batts.  [Ruby 1.9 - Bug #4748]
-
-Sun May 22 09:29:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
-	  use spawn. it prevent that other tests inherit renamed $0.
-
-Sun May 22 08:57:13 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Default tag lookup in constant time via hash
-	  instead of previous linear algorithm.
-	  [Ruby 1.9 - Feature #4309][ruby-core:34813]
-
-Sun May 22 07:54:16 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c: Explain DSS and DSS1 in documentation.
-
-Sun May 22 07:10:25 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_dsa.rb: Add tests for sign/verify.
-
-Sun May 22 06:07:17 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_x509cert.rb: Merge DSA-related tests from ruby_1_8
-	  branch.
-
-Sun May 22 04:11:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (Init_Thread): add a code comment why the meaningless
-	  line is necessary.
-
-Sun May 22 01:35:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: modified documentation.
-
-Sat May 21 22:46:26 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strftime(date_strftime_with_tmx): "%v" means "%e-%b-%Y".
-
-Sat May 21 22:14:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_extract_modeenc): accept combination hash and
-	  File::Constants. (eg. File.open('yo', :mode => File::WRONLY))
-	  [Feature #4742][ruby-core:36338]
-	* test/ruby/test_io.rb (TestIO#test_open_mode): new test.
-
-Sat May 21 21:44:14 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* test/date/test_switch_hitter.rb: new.
-
-Sat May 21 21:18:29 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_{core,parse}.c: moved nearly all core code from ext/date/lib.
-	* ext/date/lib/{date,date/format}.rb: removed nearly all code.
-
-Sat May 21 02:58:46 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/.document:  Add curses to documented extensions.
-	* ext/curses/curses.c:  Improve documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4747]
-
-Sat May 21 02:51:01 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb:  Improve documentation.  Patch
-	  by Pete Higgins.  [Ruby 1.9 - Bug #4746]
-
-Sat May 21 02:44:10 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/bigdecimal/lib/bigdecimal/jacobian.rb:  Document isEqual.  Patch
-	  by Kuba Fietkiewicz.  [Ruby 1.9 - Bug #4744]
-
-Sat May 21 02:22:34 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/date/lib/date/format.rb:  Document date formats.  Patch by
-	  Clinton Nixon.  [Ruby 1.9 - Bug #4743]
-
-Fri May 20 05:15:19 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
-
-	* gc.c: Fix build on m68k by 'error: too few arguments to
-	  function 'mark_locations_array''.
-
-Fri May 20 04:23:42 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/scanf.rb:  Improve documentation.  Patch by Gabe McArthur.
-	  [Ruby 1.9 - Bug #4735]
-
-Fri May 20 00:58:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/trans/ibm737-tbl.rb: greek code page.  fixes #4738
-
-Thu May 19 14:44:05 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_signal.rb (test_signal_requiring): skip on Windows.
-	  we can send SIGINT only to pid 0 and the process itself.
-
-Thu May 19 09:07:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib: revert r31635-r31638 and untabify with expand(1).
-
-Thu May 19 07:47:26 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_rsa.rb: Add tests for sign/verify.
-
-Thu May 19 07:19:16 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey.c: Add documentation.
-
-Thu May 19 07:06:56 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/benchmark.rb:  Fix indentation.
-	* lib/net/imap.rb:  Fix indentation of regular expressions.
-
-Thu May 19 06:36:11 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/imap.rb:  Fix indentation of EOF for heredoc.
-	* lib/debug.rb (Commands):  Fix indentation of EOHELP for heredoc.
-
-Thu May 19 06:30:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mkmf.rb:  Fix indentation of EOM for heredoc.
-
-Thu May 19 06:16:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib:  Convert tabs to spaces for ruby files per
-	  http://redmine.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]
-
-Thu May 19 06:06:07 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cgi/util.rb:  Improve documentation.  Patch by Clinton Nixon.
-	  [Ruby 1.9 - Bug #4733]
-	* lib/cgi/core.rb:  ditto
-	* lib/cgi/cookie.rb:  ditto
-
-Thu May 19 06:02:21 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/tempfile.rb:  Document Dir.mkdir and Dir.rmdir.  Patch by Clinton
-	  Nixon.  [Ruby 1.9 - Bug #4728]
-
-Thu May 19 05:57:52 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* encoding.c:  Improve documentation for Encoding#default_external and
-	  Encoding#default_internal.
-
-Wed May 18 22:45:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/lib/console/size.rb (IO#console_size): new
-	  method.  (EXPERIMENTAL)
-
-Wed May 18 22:41:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* internal.h: add for internal use only.
-
-Wed May 18 22:36:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (setup_exception): internal exception should be hidden
-
-Wed May 18 20:25:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/timeout.rb (Timeout#timeout): don't leak "execution expired"
-	  exception. [Bug #4283] [ruby-core:34534].
-
-Wed May 18 06:09:24 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cmath.rb:  Add some examples and improve documentation.  Patch by
-	  Sandor Szucs.  [Ruby 1.9 - Bug #4727]
-
-Wed May 18 05:40:31 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/benchmark.rb:  Remove nodoc from Benchmark::Job and
-	  Benchmark::Report.  Patch by Sandor Szucs.  [Ruby 1.9 - Bug #4726]
-
-Wed May 18 05:29:26 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick/compat.rb:  Improve documentation.  Patch by Sandor
-	  Szucs.  [Ruby 1.9 - Bug #4725]
-
-Wed May 18 05:10:35 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/tracer.rb:  Improve documentation.  Patch by Richard Ramsden.
-	  [Ruby 1.9 - Feature #4720]
-
-Wed May 18 04:53:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cmath.rb:  Improve documentation.  Patch by Jason Dew.
-	  [Ruby 1.9 - Feature #4717]
-
-Wed May 18 04:50:24 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/ftp.rb:  Improve documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4710]
-
-Wed May 18 03:14:49 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* test/test_singleton.rb:  Add tests from lib/singleton.rb.  Patch by
-	  Pete Higgins.  [Ruby 1.9 - Bug #4715]
-
-Wed May 18 03:03:07 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/singleton.rb:  Improve documentation.  Patch by Pete Higgins.
-	  [Ruby 1.9 - Bug #4709]
-
-Tue May 17 21:24:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_mutex_lock): remove remove_signal_thread_list() call.
-	  It's meaningless because lock_interrupt doesn't call
-	  add_signal_thread_list().
-
-Tue May 17 20:20:49 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_core.h (rb_thread_struct): add volatile to
-	  transition_for_lock because it is not protected by lock.
-
-Tue May 17 20:08:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* LEGAL (missing/{elf,tgamma,lgamma_r}.c): they've been replaced by
-	  public domain implementations.
-
-	* LEGAL (vsnprintf.c): it has moved to srcdir from missing/.
-
-	* LEGAL (missing/crypt.c): list its original license.
-
-Tue May 17 19:54:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* LEGAL (configure): add missing/setproctitle.c
-
-Tue May 17 19:35:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	Fix FreeBSD test failure.
-
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
-	  use ps -o command instead of ps -o cmd. FreeBSD doesn't support
-	  -o cmd option.
-
-Tue May 17 08:04:26 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c: Add documentation.
-
-Tue May 17 07:14:58 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/http.rb:  Improve documentation of proxy configuration
-	  methods.  Patch by Alf Mikula.  [Ruby 1.9 - Bug #4714]
-
-Tue May 17 07:09:01 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/pop.rb:  Improve documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4711]
-	* lib/net/telnet.rb:  ditto
-
-Tue May 17 07:00:41 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/net/http.rb:  Fix nodoc for Net::HTTP::version_1_1?.  Patch by
-	  Alf Mikula.  [Ruby 1.9 - Bug #4713]
-
-Tue May 17 06:56:26 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/optparse.rb:  Add link to make_switch to improve documentation.
-	  Patch by David Copeland.  [Ruby 1.9 - Bug #4708]
-
-Tue May 17 06:50:40 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/observer.rb:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4707]
-
-Tue May 17 06:42:53 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/logger.rb:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4706]
-
-Tue May 17 06:28:14 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/gserver.rb:  Improve documentation.  Patch by David Copeland.
-	  [Ruby 1.9 - Bug #4705]
-
-Tue May 17 06:21:15 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/cgi.rb: Add toplevel documentation to class CGI
-	* lib/cgi/session.rb: Add overview documentation to CGI::Cookie
-	* lib/cgi/html.rb:  Don't add CGI::TagMaker documentation to CGI.
-	  Patch by David Copeland.  [Ruby 1.9 - Bug #4704]
-	* lib/cgi/core.rb:  Clean up CGI documentation.  Patch by David
-	  Copeland.  [Ruby 1.9 - Bug #4704]
-	* lib/cgi/cookie.rb:  Clean up CGI::Cookie documentation.  Patch by
-	  David Copeland.  [Ruby 1.9 - Bug #4704]
-
-Tue May 17 05:52:30 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/digest: Improve documentation of Digest, Digest::HMAC and
-	  Digest::SHA2.  Patch by Pete Higgins.  [Ruby 1.9 - Bug #4702]
-
-Tue May 17 03:51:42 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/abbrev.rb:  Hide copyright and revision information from RDoc.
-	  Inspired by patch from David Copeland, bug #4703.
-
-Tue May 17 03:33:21 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/timeout.rb (module Timeout):  Hide internal constants.  Patch by
-	  Pete Higgins.  [Ruby 1.9 - Bug #4701]
-
-Mon May 16 11:21:09 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in, win32/Makefile.sub (RUBY_SO_NAME): add CPU as prefix
-	  of RUBY_SO_NAME on x64/ia64 mswin/mingw.
-	  [Feature #4602]
-
-Mon May 16 08:00:05 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc.rb:  Update to RDoc 3.6.1, allows OpenSSL::Digest to be
-	  found.
-
-Mon May 16 05:49:54 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/drb/acl.rb:  Add documentation.
-
-Mon May 16 05:13:20 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_asn1.c: Add documentation.
-
-Mon May 16 00:32:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_signal.rb (TestSignal#test_signal_process_group):
-	  skip if the platform doesn't have :pgroup capability. (i.e. skip
-	  if mswin32)
-
-Sun May 15 23:53:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/intern.h: resurrect old rb_fd_copy().
-	* thread.c (rb_fd_copy): ditto.
-
-Sun May 15 23:45:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/intern.h: remove rb_fd_copy() to rb_fd_dup() and
-	  rb_w32_fdcopy() to rb_w32_fd_dup().
-	* win32/win32.c: ditto.
-	* thread.c: ditto.
-
-Sun May 15 22:26:39 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* signal.c (rb_f_kill): accept '-SIGXXX' style signal with Symbol or
-	  implicit convertion with #to_str. [ruby-dev:43169] fixes #4362
-	* test/ruby/test_signal.rb (test_signal_process_group): add a test
-	  for send signal to process group.
-
-Sun May 15 21:22:35 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* cont.c (cont_init): clear macihne_stack_start/end of saved thread to
-	  prevent mark machine stack of GC'ed Thread. root Fiber is not
-	  initialized by fiber_init().
-	  based on a patch by Serge Balyuk [ruby-core:35891] fixes #4612
-	* test/ruby/test_fiber.rb (test_gc_root_fiber): add test for it.
-
-Sun May 15 21:04:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (econv_init): revert r31353.  [ruby-dev:43512]
-
-Sun May 15 03:39:35 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* ext/zlib/zlib.c:  Improve documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4695]
-
-Sun May 15 03:23:46 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/erb.rb:  Document ERB::Compiler.  Patch by Simon Chiang.
-	  [Ruby 1.9 - Bug #4694]
-
-Sun May 15 00:58:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	fix mswin32 build error.
-
-	* missing/setproctitle.c: add #ifdef HAVE_UNISTD_H.
-	* win32/Makefile.sub (MISSING): add setproctitle.obj
-
-Sat May 14 22:45:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* missing/setproctitle.c: add to include "ruby/util.h".
-
-Sat May 14 19:52:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_set_program_name):
-	  add for $0 test.
-
-Sat May 14 19:50:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* missing/setproctitle.c (compat_init_setproctitle): use
-	  ruby_strdup() instead of strdup().
-
-Sat May 14 19:37:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/missing.h: add setproctitle() declaration.
-	* missing/setproctitle.c: added.
-	* configure.in: add check for missing/setproctitle.c.
-
-	* ruby.c (ruby_process_options): add to call compat_init_setproctitle().
-	* ruby.c (set_arg0): remove all platform specific code. it's
-	  moved to missing/setproctitle.c.
-	* ruby.c (origarg): remove len field. It's no longer used.
-	* ruby.c (get_arglen): removed.
-
-	This patch makes a lot of cleanup set_arg0 related code and fixes
-	[Feature #4689].
-
-Sat May 14 17:42:21 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* process.c (rb_proc_times): improve documentation.
-	  [ruby-core:35785] fixes #4581, reported by Andrew Grimm.
-
-Sat May 14 12:12:54 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_dsa.rb: Add basic tests and tests that
-	  ensure new public key PEM encoding behavior and ensure backward
-	  compatibility.
-	  [Ruby 1.9 - Bug #4422] [ruby-core:35328]
-	* test/openssl/test_pkey_rsa.rb: Remove line with 'puts'.
-
-Sat May 14 12:06:49 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/context.rb (class RDoc):  Fix infinite loop caused by
-	  re-encountering BasicObject.
-
-Sat May 14 10:32:36 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* test/openssl/test_pkey_rsa.rb: Add tests that ensure new public key
-	  encoding behavior and also ensure backward compatibility.
-	  [Ruby 1.9 - Bug #4421] [ruby-core:35327]
-
-Sat May 14 09:50:10 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/yaml/dbm.rb:  Add documentation.  Patch by Justin Collins.
-	  [Ruby 1.9 - Bug #4693]
-	* lib/yaml/store.rb:  ditto
-
-Sat May 14 09:31:43 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc.rb: Updated to RDoc 3.6
-
-Sat May 14 07:30:29 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych.rb: released a new gem, so increasing version.
-
-Sat May 14 05:08:32 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_digest.c
-	* ext/openssl/ossl_pkey.c
-	* ext/openssl/ossl_pkey.h
-	* test/openssl/pkey/test_pkey_rsa.rb
-	  Reverted premature commit. Sorry for the noise!
-
-Sat May 14 05:02:58 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/uri.rb:  Add toplevel documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4690]
-
-Sat May 14 04:19:06 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* NEWS: Describe altered behaviour for RSA and DSA public key
-	  encoding. [Ruby 1.9 - Bug #4421, Bug #4422]
-	  [ruby-core:35327,35328]
-
-Sat May 14 02:57:52 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/ipaddr.rb (unless Socket):  Document valid*? methods.  Patch by
-	  Sebastian Martinez.  [Ruby 1.9 - Feature #4687]
-
-Sat May 14 02:54:04 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rexml/functions.rb:  Add some documentation for REXML::Functions.
-	  Patch by Sebastian Martinez.  [Ruby 1.9 - Feature #4688]
-
-Sat May 14 02:51:42 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/resolv.rb:  Hide private method and state-tracking constants from
-	  RDoc.  Patch by Mark Turner.  [Ruby 1.9 - Feature #4691]
-
-Fri May 13 19:23:21 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* numeric.c (flo_coerce): Add #flo_coerce documentation.
-	  Patch by Sebastian Martinez.
-	  https://github.com/ruby/ruby/pull/21
-
-Fri May 13 18:42:22 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* README.EXT: fix typo.  Patch by William Blackerby.
-	  https://github.com/ruby/ruby/pull/19
-
-	* README.EXT.ja: ditto.
-
-Fri May 13 15:22:34 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_select): check invalid handle before doing
-	  select operations.  see [ruby-dev:43513], [ruby-dev:43535]
-
-Fri May 13 08:34:00 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/rdoc.rb:  Output summary after documentation report.
-	* lib/rdoc/stats/normal.rb:  Don't output information for users when
-	  we're not on a TTY
-
-Fri May 13 07:49:02 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/fileutils.rb:  Hide internal methods from RDoc.  Patch by Darragh
-	  Curran.  [Ruby 1.9 - Bug #4684]
-
-Fri May 13 07:36:23 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/webrick/httpservlet/erbhandler.rb:  Add documentation.
-
-Fri May 13 07:04:33 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mathn.rb:  Fix indentation.  Patch by Jason Dew.
-	  [Ruby 1.9 - Feature #4682]
-
-Fri May 13 06:50:43 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/mathn.rb:  Add documentation.  Patch by Jason Dew.  [Ruby 1.9 -
-	  Feature #4667]
-
-Fri May 13 05:44:19 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/logger.rb (class Logger):  Document Logger#datetime_format.
-	  Patch by Sergio Gil Perez de la Manga.  [Ruby 1.9 - Bug #4678]
-
-Fri May 13 05:39:11 2011  Eric Hodel <drbrain@segment7.net>
-
-	* re.c (Init_Regexp): Document option constants.  Patch by Vincent
-	  Batts.  [Ruby 1.9 - Bug #4677]
-	* lib/uri/common.rb (module URI):  Documentation for URI.  Patch by
-	  Vincent Batts.  [Ruby 1.9- Bug #4677]
-	* lib/uri/ftp.rb (module URI):  ditto
-	* lib/uri/generic.rb (module URI):  ditto
-	* lib/uri/http.rb (module URI):  ditto
-	* lib/uri/https.rb (module URI):  ditto
-	* lib/uri/ldap.rb (module URI):  ditto
-	* lib/uri/ldaps.rb (module URI):  ditto
-	* lib/uri/mailto.rb (module URI):  ditto
-	* process.c (Init_process):  Document Process constants.  Patch by
-	  Vincent Batts.  [Ruby 1.9- Bug #4677]
-
-Fri May 13 05:16:38 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rss/atom.rb (module RSS):  Document URIs.  Patch by Mark Turner.
-	  [Ruby 1.9 - #4671]
-	* lib/rss/rss.rb (module RSS):  Document exception classes.  Patch by
-	  Mark Turner.  [Ruby 1.9 - #4671]
-
-Fri May 13 02:15:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (select_internal): remove unused variable (interrupt_flag).
-
-Thu May 12 18:24:34 2011  Kouhei Sutou  <kou@clear-code.com>
-
-	* configure.in: limit to "T" type for prefix of external symbols
-	  because x86_64-w64-mingw32-gcc on Debian GNU/Linux generates the
-	  following symbol:
-	    0000000068483390 D _GLOBAL__F__conftest_external
-
-	  Approved by nobu.
-
-Thu May 12 14:50:52 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/dl/test_base.rb (Fiddle::LIBC_SO): its always msvc*.dll on
-	  mswin/mingw.
-
-Thu May 12 14:47:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (Logging.postpone): copy only when temporary logfile
+	  (ossl_ssl_data_get_struct): Removed. Now GetSSL() checks that the SSL
 	  exists.
 
-Thu May 12 12:24:22 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
-
-	* ext/openssl/ossl_ssl.c: By trunk@31346, function check of SSLv2 is
-	  executed.
-	  However, the problem is not revised in this.
-	  This adds the control of using function of SSLv2 in made macro by
-	  function check.
-
-Thu May 12 08:10:46 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/set.rb (class Set):  Add nodoc to internal-use methods.  Patch
-	  by Pete Higgins.  [Ruby 1.9 - Bug #4665]
-
-Thu May 12 08:01:14 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey_ec.c: Allow encryption when PEM-encoding
-	  Elliptic Curve private keys.
-	  [ruby-core:35329] [Bug #4423]
-
-Thu May 12 07:54:59 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* object.c (rb_obj_equal):  Add documentation.  Patch by Vincent Batts.
-	  [Ruby 1.9 - Bug #4664]
-	* lib/rexml:  ditto
-	* lib/mkmf.rb:  ditto
-	* ext/socket/lib/socket.rb:  ditto
-
-Thu May 12 07:30:08 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* Various .document files: Update .document files to match files which
-	  have documentation.
-
-Thu May 12 07:18:45 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
-
-	* ext/openssl/ossl_pkey_dsa.c: Use generic X.509 SubjectPublicKeyInfo
-	  format for PEM-encoding DSA public keys.
-	  [ruby-core:35328] [Bug #4422]
-
-Thu May 12 06:27:31 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+	  (ossl_ssl_set_session): Don't call ossl_ssl_setup() here as now the
+	  SSL is already instantiated in #initialize.
 
-	* ext/openssl/ossl_pkey_rsa.c: Use generic X.509 SubjectPublicKeyInfo
-	  format for encoding RSA public keys.
-	  [ruby-core:35327] [Bug #4421]
+	  (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().
 
-Wed May 11 19:45:27 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+	  (Init_ossl_ssl): Add method declarations of SSLSocket#{initialize,
+	  hostname=}.
 
-	* lib/forwardable.rb: support 'delegate :foo => :bar' for to meet
-	  by specification of RDOC.
+	* 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.
 
-Wed May 11 08:36:38 2011  Eric Hodel  <drbrain@segment7.net>
+	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize): No need
+	  to check if the SSL is NULL.
 
-	* lib/webrick: Add documentation for WEBrick::HTTPAuth
+Sat May 28 10:47:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Wed May 11 03:06:35 2011  Eric Hodel  <drbrain@segment7.net>
+	* 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
 
-	* lib/rss.rb: Add documentation for RSS.  Patch by Steve Klabnik.
-	  [Ruby 1.9 - Bug #4663]
+Sat May 28 10:45:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Tue May 10 14:50:32 2011  Shota Fukumori  <sorah@tubusu.net>
+	* 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.
 
-	* lib/test/unit.rb: Add option for hiding skip messages when test
-	  ends. #4657
+Sat May 28 10:39:47 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* test/testunit/test_hideskip.rb, test/testunit/test4test_hideskip.rb:
-	  test for above.
+	* test/ruby/enc/test_case_comprehensive.rb: Converted exception for
+	  unavailable Unicode data files to failed assertion.
 
-Tue May 10 10:53:04 2011  Eric Hodel  <drbrain@segment7.net>
+Sat May 28 10:26:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* common.mk (rdoc): Add rdoc-coverage rule
+	* lib/cgi/util.rb: added missing quote.
+	  [fix GH-1363][ci skip] Patch by @dwaller
 
-Tue May 10 09:13:21 2011  Eric Hodel  <drbrain@segment7.net>
+Fri May 27 17:38:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/webrick: Add Documentation
+	* variable.c (rb_local_constants_i): exclude hidden constants.
+	  [ruby-core:75575] [Bug #12389]
 
-Tue May 10 04:22:09  Eric Hodel  <drbrain@segment7.net>
+Fri May 27 17:09:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/webrick/log.rb: Hide copyright info from ri
-	* lib/webrick/httpstatus.rb: ditto
-	* lib/webrick/htmlutils.rb: ditto
-	* lib/webrick/httpversion.rb: ditto
-	* lib/webrick/version.rb: ditto
-	* lib/webrick/httpauth/userdb.rb: ditto
-	* lib/webrick/httpauth/authenticator.rb: ditto
-	* lib/webrick/accesslog.rb: ditto
+	* 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]
 
-Mon May  9 20:57:13 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Fri May 27 15:07:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/ruby/test_{complex,rational}.rb: added tests.
+	* include/ruby/ruby.h (rb_scan_args): remove nul padding which
+	  caused syntax error if fmt is not a string literal.
 
-Mon May  9 20:29:44 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* include/ruby/ruby.h (rb_scan_args_verify): suppress array-bounds
+	  warnings by old clang.
 
-	* complex.c (string_to_c_internal): a refactoring.
+	* include/ruby/ruby.h (rb_scan_args0): make extractor macros
+	  inline functions, which do not validate the format and are
+	  unnecessary to be expanded.
 
-Mon May  9 18:33:05 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri May 27 01:00:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* string.c: Improve documentation for String#start_with? and
-	  String#end_with?. fixes #4652
-	  patched by Andrew Grimm <andrew.j.grimm at gmail.com>
+	* 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.
 
-Mon May  9 13:49:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* symbol.c (is_special_global_name): ditto.
 
-	* complex.c (string_to_c_internal): support scientific notation.
-	  patched by Tinco Andringa. https://github.com/ruby/ruby/pull/16
-	  [ruby-core:36046][Bug #4655]
+	* symbol.c (rb_enc_symname_type): ditto.
 
-Mon May  9 11:52:48 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri May 27 00:39:40 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* numeric.c (int_ord): remove K&R style.
-	  patched by Daehyub Kim. https://github.com/ruby/ruby/pull/17
+	* include/ruby/ruby.h (rb_scan_args): add nul padding here to
+	  apply to all references.
 
-Sun May  8 22:17:24 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* include/ruby/ruby.h (rb_scan_args_verify): move length mismatch
+	  check outside conditional operators.
 
-	* test/ruby/test_{complex2,complexrational}.rb: use skip.
-	* test/date/*.rb: ditto.
+Thu May 26 14:21:10 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Sun May  8 21:02:31 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* 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]
 
-	* test/ruby/test_{complex2,complexrational}.rb: NEVER SKIP.
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_sign): Ditto. DSA_size() does
+	  not check dsa->q.
 
-Sun May  8 21:01:21 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* 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.
 
-	* test/date/test_date_base.rb: fixed.
+Thu May 26 14:13:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun May  8 20:54:11 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* include/ruby/ruby.h (rb_scan_args_count): verify length with
+	  counting variables together.
 
-	* test/date/*.rb: NEVER SKIP.
+Thu May 26 09:45:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun May  8 20:37:33 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/ruby/enc/test_case_comprehensive.rb: Add set of comprehensive
+	  (across most Unicode characters; later across most character encodings)
+	  tests for case mapping.
 
-	* test/date/*.rb: reverted 31432.
+Thu May 26 05:00:13 2016  Benoit Daloze  <eregontp@gmail.com>
 
-Sun May  8 20:32:43 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* class.c (rb_define_class): Fix documentation.
 
-	* test/date/*.rb: reverted 31483.
+Wed May 25 20:50:12 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun May  8 19:39:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* re.c (unescape_nonascii): scan hex up to only 3 characters.
+	  [Bug #12420] [Bug #12423]
 
-	* thread_pthread.c (native_cond_timedwait): add to care EINTR.
-	* thread_pthread.c (thread_timer): remove EINTR check.
+Wed May 25 19:07:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun May  8 19:04:15 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* enc/unicode.c: Handle DOTLESS_i by hand because it isn't involved in folding.
 
-	* lib/time.rb (xmlschema): avoid passing any negative numbers.
+Wed May 25 18:30:53 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun May  8 18:40:03 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* regparse.c (fetch_token_in_cc): raise error if given octal escaped
+	  character is too big. [Bug #12420] [Bug #12423]
 
-	* ext/date/date_{parse,strptime}.c: introduced some macros.
+Wed May 25 17:45:15 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Sun May  8 17:17:13 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* ext/openssl, test/openssl: Drop OpenSSL < 0.9.8 support.
 
-	* test/date/*.rb: use skip /w messages.
+Wed May 25 17:43:30 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Sun May  8 17:04:55 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* 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.
 
-	* ext/date/lib/date/format.rb (_httpdate): omitted to call zone_to_diff.
+Wed May 25 17:42:58 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Sun May  8 16:56:19 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* 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/date/date_core.c (date_s_test_*): use macros.
+	* ext/openssl/ossl.c: Replace occurrences of HAVE_OPENSSL_FIPS with
+	  OPENSSL_FIPS.
 
-Sun May  8 10:24:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Wed May 25 17:13:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread_pthread.c: cleanup signal_thread_list related ifdef.
-	  1) we don't have to use #ifdef FOO-PLATFORM directly 2) About
-	  half #ifdef didn't care symbian properly.
+	* class.c (rb_scan_args): merge code for n_trail.
 
-Sun May  8 05:19:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Wed May 25 17:11:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/io/wait/test_io_wait.rb: Linux socketpair(2) only support
-	  AF_UNIX, but windows socketpair doesn't support it. we can't
-	  avoid platform check. sigh!
+	* include/ruby/ruby.h (rb_scan_args_validate): move failed
+	  condition to the terminal.  [ruby-core:75714] [Bug #12426]
 
-Sun May  8 00:13:05 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Wed May 25 13:13:37 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/io/wait/test_io_wait.rb: use Socket.pair instead of pipe.
-	  Windows can only treat a socket.
+	* regcomp.c: remove condition for debug output because prelude
+	  doesn't use regexp now.
 
-Sat May  7 22:43:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Wed May 25 13:10:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* thread.c (rb_fd_zero): remove redundant zero fill.
+	* regcomp.c (compile_length_tree): return error code immediately
+	  if compile_length_tree raised error [Bug #12418]
 
-Sat May  7 22:38:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Wed May 25 08:01:39 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* thread.c (rb_fd_init): remove volatile qualifier.
+	* enc/unicode.c: Fix flag error for switch from titlecase to lowercase.
 
-Sat May  7 22:34:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* test/ruby/enc/test_case_mapping.rb: Tests for above error.
 
-	* thread.c (rb_fd_init_copy): new internal api. It provide efficient
-	  copy constructor semantics.
-	* thread.c (do_select): use rb_fd_init_copy().
+Wed May 25 01:13:55 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Sat May  7 15:18:06 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	fix incorrect native_cond_signal call when deadlock was detected.
+	* 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]
 
-	* thread.c (lock_func): decrement cond_waiting if timeout was happen.
+	* test/openssl/test_pkey_ec.rb: Test that EC.generate works.
 
-Sat May  7 18:28:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 25 00:37:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* thread_pthread.c (USE_MONOTONIC_COND): check the availability
-	  more strictly.
+	* 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]
 
-	* thread_pthread.h (rb_thread_cond_t): ditto.
+	* test/openssl/test_pkey_ec.rb: Use EC#generate_key! instead of
+	  EC#generate_key.
 
-Sat May  7 15:15:10 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Wed May 25 00:23:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	fix win32 native_cond_timedwait() makes SIGSEGV.
+	* include/ruby/ruby.h (rb_scan_args_set): check the arity after
+	  adjusting argc for an option hash, for optimization in simpler
+	  cases.
 
-	* thread_win32.h (rb_thread_cond_struct): add prev field instead of
-	  last. (ie cond_event_entry is now using double linked list instead of
-	  single)
-	* thread_win32.c (cond_event_entry): add prev field.
+Wed May 25 00:21:52 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread_win32.c (__cond_timedwait): remove entry properly if timeout
-	  was happen.
+	* configure.in (XCFLAGS): merge flags only for ruby itself from
+	  ruby_cflags.
 
-	* thread_win32.c (native_cond_signal): change for double linked list.
-	* thread_win32.c (native_cond_broadcast): ditto.
-	* thread_win32.c (native_cond_initialize): ditto.
+Tue May 24 22:04:15 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Sat May  7 12:41:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	fix mutex deadlock test hang-up.
+	* 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.
 
-	* thread_win32.c (abs_timespec_to_timeout_ms): fix 1000x calculation
-	  mistake. (ie fix hang-up native_cond_timedwait())
+	* test/openssl/test_cipher.rb: Test that Cipher#key= and #iv= reject
+	  Strings with invalid length.
 
-Sat May  7 03:14:13 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Tue May 24 21:32:21 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	sleep_cond use monotonic time if possible.
+	* 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
 
-	* thread_pthread.c (native_thread_init): change sleep_cond
-	  attribute to monotonic.
-	* thread_pthread.c (native_sleep): use native_cond_timeout().
+	* 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.
 
-	* thread_pthread.c (native_cond_timeout): add overflow care.
-	* thread_win32.c (native_cond_timeout): ditto.
+Tue May 24 18:52:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat May  7 02:49:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-	  fix win32 compile error.
+	* 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.
 
-	* thread_win32.c (RB_CONDATTR_CLOCK_MONOTONIC): define
-	  RB_CONDATTR_CLOCK_MONOTONIC always.
-	* thread_pthread.c (RB_CONDATTR_CLOCK_MONOTONIC): ditto.
+Tue May 24 17:18:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat May  7 02:29:41 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* include/ruby/defines.h (ERRORFUNC, WARNINGFUNC): add fallback
+	  definitions.
 
-	  mutex: deadlock check timeout use monotonic time.
+Tue May 24 16:37:43 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* thread_pthread.c (native_cond_timeout): new internal api.
-	  it calculate a proper time for argument of native_cond_timedwait().
-	* thread_win32.c (native_cond_timeout): ditto.
+	* configure.in (ruby_cflags): separate from optflags [Bug #12409]
+	  -fexcess-precision=standard and -fp-model precise are set to this now.
 
-	* thread_pthread.c (thread_timer): use native_cond_timeout()
-	  instead of get_ts.
-	* thread.c (lock_func): ditto.
+	* configure.in (cflags): use ruby_cflags.
 
-	* thread_pthread.c (get_ts): removed. use native_cond_timeout().
-	* thread.c (init_lock_timeout): ditto.
+Tue May 24 16:20:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat May  7 01:54:21 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* configure.in (ERRORFUNC, WARNINGFUNC): __error__ and __warning__
+	  attributes take a parenthesized string literal.
 
-	* thread_pthread.c (get_ts): add monotonic clock capability.
-	* thread_pthread.c (rb_thread_create_timer_thread): use monotonic
-	  clock if possible.
+Tue May 24 12:35:56 2016  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
-Sat May  7 01:43:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* common.mk: sort lines, and add missing dependencies suggested
+	  by tool/update-deps
 
-	* thread_pthread.h (rb_thread_cond_t): add clockid field. it's
-	  no longer an alias of pthread_cond_t.
-	* thread_pthread.c: adapt new rb_thread_cond_t type.
-	* thread.c (mutex_alloc): ditto.
-	* thread_win32.c (native_cond_initialize): ditto.
-	* configure.in: add check for pthread_cond_attr_setclock() and
-	  clockid_t type.
+Mon May 23 21:33:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri May  6 23:29:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* include/ruby/missing.h (isfinite): move from numeric.c.
 
-	* thread.c (rb_wait_for_single_fd): use ppoll() instead of poll()
-	  if possible. based on a patch from Eric Wong. [ruby-core:36003].
+Mon May 23 21:09:06 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Fri May  6 23:13:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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]
 
-	* configure.in: remove nanosleep check. we no longer use it.
-	  r20124 removed last usage.
+Mon May 23 20:32:16 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Fri May  6 22:35:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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.
 
-	* ext/syck/rubyext.c (mktime_do): extra digits are not used.
+Mon May 23 20:20:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri May  6 17:43:07 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* ext/bigdecimal/bigdecimal.c (isfinite): get rid of a warning on
+	  cygwin. [Bug #12417][ruby-core:75691]
 
-	* ext/syck/rubyext.c (mktime_do): remove unused variable offset.
+Mon May 23 19:41:27 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* ext/syck/syck.h: use #ifdef instead of #if DEBUG.
+	* 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.
 
-Fri May  6 16:27:33 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon May 23 15:52:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/date/date_core.c (DAY_IN_NANOSECONDS): refix: 31438.
-	  check with LONG_MAX and cast as long; without this the calculation
-	  will be done as int and overflow.
+	* ext/bigdecimal/bigdecimal.c (isfinite): isfinite does not always
+	  exist.  fixed build error on Windows introduced at r55123.
 
-Fri May  6 15:01:11 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Mon May 23 13:19:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/syck/rubyext.c (mktime_do): avoid buffer overrun, by
-	  silently ignoring lesser significant digits.  Required buffer
-	  length can be computable so you might at first think of
-	  allocating enough memory space on the fly using alloca().  That
-	  is a wrong idea because when using alloca there is always risk
-	  of integer overflow.  A function that accepts outer-process
-	  resources like this should not blindly trust its inputs.  In
-	  this particular case we just want to generate milliseconds
-	  resolution by strtod() so the string in question needs no more
-	  length than what we originally have.  Ignoring lesser
-	  significant digits should suffice I believe.
+	* 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.
 
-Fri May  6 14:25:53 2011  Tinco Andringa <mail@tinco.nl>
+Mon May 23 12:47:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/syck/rubyext.c (mktime_do): YAML.load time correctly parse
-	  usecs smaller than 1 fixes #4571
+	* 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.
 
-Thu May  5 22:23:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Mon May 23 12:30:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread_pthread.c (native_mutex_reinitialize_atfork): removed
-	  unused macro.
-	* thread_win32.c (native_mutex_reinitialize_atfork): ditto.
+	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider
+	  non-finite float values not to raise FloatDomainError.
+	  [ruby-core:75682] [Bug #12414]
 
-Thu May  5 22:09:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May 23 12:21:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/date/date_core.c (DAY_IN_NANOSECONDS): long long int is not
-	  available on all platforms.
+	* array.c (rb_ary_fill): suppress warnings: 'item' may be used
+	  uninitialized in this function
 
-Thu May  5 17:36:31 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+Mon May 23 07:41:49 2016  Eric Wong  <e@80x24.org>
 
-	* eval.c (frame_func_id): store result of method_entry_of_iseq() to
-	  cfp->me because method_entry_of_iseq() might become expensive.
+	* dir.c (dir_close): update RDoc for 2.3 #close change
+	  [ruby-core:75679] [Bug #12413]
 
-Thu May  5 15:03:51 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+Sun May 22 20:01:21 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* eval.c (frame_func_id): __method__ return different name from
-	  methods defined by Module#define_method with a same block.
-	  [ruby-core:35386] fixes #4606
-	* eval.c (method_entry_of_iseq): new helper function. search control
-	  frame stack for a method entry which has given iseq.
-	* test/ruby/test_method.rb: add tests for #4606
+	* lib/drb/timeridconv.rb: use finalizer trick instead of thread.
 
-Wed May  4 22:13:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* test/drb/ut_timerholder.rb: ditto.
 
-	* benchmark/bm_vm4_pipe.rb: Reduced iterations. Too slow benchmark
-	  is bad.
-	* benchmark/bm_vm4_thread_pass.rb: ditto.
+Sun May 22 17:25:18 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Wed May  4 22:08:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* test/ruby/enc/test_case_options.rb: adjust test class name
+	  to match file name
 
-	* test/date/test_date_base.rb: don't use no message skip().
+Sun May 22 17:24:07 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Wed May  4 21:11:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_io_select2.rb: reduce number of using file
-	  descriptors. because gdb need some fds.
-
-Wed May  4 19:00:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_wait_for_single_fd): Fix wrong return value.
-	* test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb
-	  (TestWaitForSingleFD#test_wait_for_closed_pipe): test for it.
-
-Wed May  4 18:46:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/-test-/wait_for_single_fd: New. for testing
-	  rb_wait_for_single_fd() internal function.
-	  The patch was written by Eric Wong. [ruby-core:35991]
-
-	* test/-ext-/wait_for_single_fd/test_wait_for_single_fd.rb: ditto.
-
-Wed May  4 12:46:25 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_wait_for_single_fd): Added POLLNVAL check.
-	  based on a patch from Eric Wong at [ruby-core:35991].
-
-Wed May  4 11:51:01 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_f_select): remove useless ifdef.
-
-Wed May  4 11:42:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/socket/init.c (wait_connectable): fix error handling code.
-	  RB_WAITFD_OUT is turned on even though an error occur.
-
-Wed May  4 10:12:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/readline/readline.c (readline_event): use rb_wait_for_single_fd().
-	The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-Wed May  4 10:10:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/socket/init.c (wait_connectable): use rb_wait_for_single_fd().
-	  The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
-
-	* ext/socket/init.c (try_wait_connectable, wait_connectable_ensure):
-	  removed.
+	* rename test/ruby/enc/test_casing_options.rb to test_case_options.rb
+	  for consistency
 
-Wed May  4 10:07:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sun May 22 17:06:55 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/io/wait/wait.c (io_wait): use rb_wait_for_single_fd().
-	  The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
+	* transcode.c (enc_arg, str_transcode_enc_args, econv_args):
+	  remove volatile, and add GC guards in callers.
+	  [ruby-core:75664] [Bug #12411]
 
-Wed May  4 10:01:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sun May 22 16:27:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread.c (rb_wait_for_single_fd): new. poll(2) based backend for
-	  rb_wait_for_single_fd().
-	  Now only Linux uses it.
+	* ext/-test-/integer/core_ext.c: move testutil/integer.c.
 
-	The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
+	* test/lib/-test-/integer.rb: extract implementation details from
+	  test/unit/assertions.rb.  [Bug #12408]
 
-Wed May  4 09:56:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sun May 22 14:57:43 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* thread.c (rb_wait_for_single_fd): new.
-	* thread.c (select_single): select(2) based backend for
-	  rb_wait_for_single_fd().
+	* include/ruby/oniguruma.h: Extend OnigEncodingTypeDefine to define a
+	  new encoding primitive 'case_map' for case mapping
 
-	* io.c (make_writeconv): use rb_wait_for_single_fd() instead of
-	  rb_thread_fd_select().
-	* io.c (rb_io_wait_readable): ditto.
-	* thread.c (rb_thread_wait_fd_rw): ditto.
+	* enc/utf-8.c, utf_16be/le.c, utf_32be/le.c:
+	  add onigenc_unicode_case_map as case_map primitive
 
-	* io.c (wait_readable): removed.
-	* thread.c (init_set_fd): new helper function.
-	* include/ruby/io.h (RB_WAITFD_IN, RB_WAITFD_PRI, RB_WAITFD_OUT):
-	  new constant for rb_single_wait_fd().
+	* 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
 
-	The patch was written by Eric Wong. [Ruby 1.9 - Feature #4531]
+Sun May 22 14:45:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Wed May  4 08:04:59 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* regenc.h/c: Define new function onigenc_not_support_case_map
 
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix time dumping so that
-	  Syck can load UTC times that Psych dumps.
+Sun May 22 12:14:06 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed May  4 07:33:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* include/ruby/ruby.h (rb_scan_args): use original rb_scan_args
+	  when fmt is dynamic.
 
-	* thread.c (rb_fd_copy): fix wrong argument.This issue was pointed
-	  out by Eric Wong. [ruby-core:35982]
+Sun May 22 11:41:12 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue May  3 20:29:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* class.c (rb_scan_args): moved to bottom of the file to make the
+	  effect of `#undef rb_scan_args` the minimum.
 
-	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
-	  Skip sticky bit test if the platform is FreeBSD. It doesn't allow to
-	  change sticky bit if a target is regular file.
+	* 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.
 
-Tue May  3 18:23:57 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Sat May 21 22:45:50 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* test/date/test_date.rb (TestDate#test_coerce):
-	  test for [ruby-core:35127].
+	* include/ruby/ruby.h (rb_scan_args): don't use ALWAYS_INLINE with
+	  `inline`.  if gcc needs this duplication, do in ALWAYS_INLINE macro.
 
-Tue May  3 04:27:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat May 21 21:11:56 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* thread.c (rb_thread_select): preserve errno if no error
-	  occurred.
+	* 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.
 
-Tue May  3 03:57:04 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun May 22 02:41:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* include/ruby/intern.h (rb_w32_fdcopy): add prototype.  fixes
-	  #4640
+	* ext/zlib/zlib.c: remove hacky macro introduced at r30437.
 
-Mon May  2 01:02:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* ext/zlib/zlib.c (gzfile_make_header): cast as long (instead of int).
 
-	* lib/fileutils.rb (FileUtils#chmod): accept symbolic mode argument.
-	  The patch was written by takkanm. [ruby-core:26029][Feature #2190]
+	* ext/zlib/zlib.c (gzfile_make_footer): ditto.
 
-	* lib/fileutils.rb (FileUtils#fu_mode): new helper function.
-	* lib/fileutils.rb (FileUtils#symbolic_modes_to_i): ditto.
-	* lib/fileutils.rb (FileUtils#mode_mask): ditto.
-	* lib/fileutils.rb (FileUtils#user_mask): ditto.
+Sat May 21 21:07:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_symbol_mode):
-	  new test for the above symbolic mode.
-	* test/fileutils/test_fileutils.rb (TestFileUtils#test_chmod_R): ditto.
+	* configure.in (ALWAYS_INLINE): force compilers the function inlined.
 
-Mon May  2 00:36:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat May 21 16:16:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* ext/socket/init.c (rsock_connect): add to care EINTR. based
-	  on a patch from Eric Wong at [ruby-core:35621][Bug #4555]
+	* 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]
 
-Sun May  1 01:06:24 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* ext/openssl/lib/openssl/ssl.rb (sysclose): Update doc.
 
-	* thread.c (rb_thread_select): release GVL while waiting select().
+	* test/openssl/test_ssl.rb: Test this.
 
-Sat Apr 30 23:10:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat May 21 14:41:14 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* win32/win32.c (rb_w32_fdcopy): New. This can copy even though
-	  fdset size exceed FD_SETSIZE.
-	* include/ruby/intern.h (rb_fd_copy): use rb_w32_fdcopy()
+	* 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 Apr 30 20:18:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat May 21 14:25:38 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* thread.c (do_select): Change argument type to rb_fdset_t.
-	  Now do_select() is free from unexpected hangup if
-	  HAVE_RB_FD_INIT=1 [Bug #4636]
+	* 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]
 
-	* thread.c (rb_thread_fd_select, rb_thread_wait_fd_rw):
-	  adapt new argument type.
+	* test/openssl/test_pkey_ec.rb (test_check_key): check private? and
+	  public? works correctly.
 
-	* thread.c (rb_thread_select): make dummy implementation.
+Sat May 21 12:40:36 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Sat Apr 30 20:16:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* ext/openssl/lib/openssl/buffering.rb (read_nonblock, readpartial):
+	  Remove impossible EOFError raise. Patch by Zach Anker
+	  <zanker@squareup.com>.  [GH ruby/openssl#23]
 
-	* thread.c (rb_fd_copy): Change function argument. Now
-	  rb_fd_copy() has fully copy semantics.
-	* include/ruby/intern.h: ditto.
+Sat May 21 11:18:42 2016  Evgeni Golov  <evgeni@golov.de>
 
-Sat Apr 30 20:11:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* lib/ipaddr.rb: [DOC] fix documentation of IN6MASK to mention
+	  IPv6.  [Fix GH-1349]
 
-	* include/ruby/intern.h (rb_thread_select): mark as deprecated.
+Sat May 21 11:12:53 2016  Dan Martinez  <dfm@razorwind.org>
 
-	* ext/io/wait/wait.c (wait_readable): use rb_thread_fd_select
-	  instead of rb_thread_select.
-	* ext/socket/init.c (wait_connectable0): ditto.
-	* ext/readline/readline.c (readline_event): ditto.
-	* io.c (rb_io_wait_readable, wait_readable, rb_io_wait_writable,
-	  wait_writable): ditto.
+	* io.c (Init_IO): [DOC] define dummy ARGF instead of ARGF.class to
+	  re-enable the generation of ARGF documentation.  [Fix GH-1358]
 
-Sat Apr 30 20:06:36 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat May 21 11:07:29 2016  0x01f7  <souk.0x01f7@gmail.com>
 
-	* thread.c (do_select): remove useless ifdef. time calculation
-	  is not heavy weight.
+	* doc/syntax/methods.rdoc (Method Names): add proper closing tag.
+	  [Fix GH-1356]
 
-Sat Apr 30 16:48:36 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat May 21 09:26:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* benchmark/bm_io_select3.rb: New.
+	* configure.in (RUBY_CHECK_SETJMP): fix missing macro definition
+	  for the configured result.  fix up r55021.
 
-Sat Apr 30 16:27:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat May 21 00:36:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (copy_stream_body, rb_io_s_copy_stream): move rb_fd_init()
-	  from copy_stream_body to rb_io_s_copy_stream. fds of passing
-	  rb_fd_term() have to be guaranteed initialized.
+	* process.c (rb_execarg_commandline): build command line string
+	  from argument vector in rb_execarg.
+	  [ruby-core:75611] [Bug #12398]
 
-Sat Apr 30 16:13:17 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Fri May 20 23:25:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* benchmark/bm_io_select.rb, benchmark/bm_io_select2.rb: New.
-	  based on a patch from Eric Wong at [Feature #4531]
+	* 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]
 
-Sat Apr 30 03:25:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* ext/openssl/ossl.h: Add function prototype declaration of newly
+	  added ossl_pem_passwd_value().
 
-	* test/io/wait/test_io_wait.rb: New. for testing ext/io/wait.
-	  the patch was written by Eric Wong. [Feature #4531]
+	* ext/openssl/ossl_pkey.c (ossl_pkey_new_from_data): Use
+	  ossl_pem_passwd_value() to validate the password String.
 
-Sat Apr 30 00:34:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/win32.h: remove redundant declaration of
-	  rb_w32_time_subtract().
-
-Sat Apr 30 00:16:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (gvl_init): fix hangup if GVL_SIMPLE_LOCK=1.
-	  We don't have to call mutex_unlock() before initialize it!
-
-Fri Apr 29 13:15:15 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_win32.c (native_cond_timedwait): New. r31373 caused
-	  win32 build failure.
-
-	* thread_win32.c (__cond_timedwait, abs_timespec_to_timeout_ms):
-	  New helper functions.
-
-	* win32/win32.c (rb_w32_time_subtract): rename from subtract and
-	  remove static.
-
-Fri Apr 29 10:43:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/bm_vm4_pipe.rb: Add two new benchmark for GVL
-	  performance. They was written by Koichi Sasada.
-	* benchmark/bm_vm4_thread_pass.rb: ditto.
-
-Fri Apr 29 10:25:31 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_method.c (rb_clear_cache_by_class): Revert r29673. It made
-	  a segmentation fault regression. [Bug #4289][ruby-core:34554].
-
-Fri Apr 29 10:24:51 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (make_writeconv): do not add textmode newline decorator if any
-	  newline decorator is set already.  fixes #4618, fixes #4619
-
-Fri Apr 29 10:17:42 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (lock_func): small cleanup.
-
-Fri Apr 29 10:07:13 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_mutex_lock, lock_func): Avoid busy loop and
-	  performance regression. bm_vm3_thread_mutex.rb performance
-	  change from 109.064sec to 16.331sec. [Feature #4607]
-
-	* thread.c (init_lock_timeout): New helper function.
-
-Thu Apr 28 16:15:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/{win32.c,dir.h} (rb_w32_uopendir): new API to pass UTF-8 path.
-
-	* win32/win32.c (opendir_internal, rb_w32_opendir): extract and merge
-	  common part of rb_w32_opendir() and rb_w32_uopendir().
-
-	* dir.c (do_opendir, glob_helper): encoding.
-
-	* dir.c (dir_initialize, do_opendir): convert path to UTF-8 and call
-	  rb_w32_uopendir() instead of rb_w32_opendir() on Windows.
-	  fixes #4491, reported by Joey Zhou.
-
-Thu Apr 28 15:32:53 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/dl/test_base.rb (DL::LIBC_SO): its always msvc*.dll on
-	  mswin/mingw.
-
-Thu Apr 28 06:07:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/csv.rb (CSV::open): suppress universal newline decorator.
-	  fixes #4603
-
-	* lib/csv.rb (CSV.read): no mode is needed.
-
-Thu Apr 28 06:06:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_extract_modeenc, rb_f_backquote): set default text
-	  mode.  fixes #4619
-
-	* io.c (pipe_open): set universal newline decorator if needed.
-
-Wed Apr 27 11:33:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/trans/emoji_iso2022_kddi.trans: ISO-2022-JP-KDDI doesn't have
-	  CP932 UDA. Another reason is emacs-mule: the implementation of
-	  stateless-iso-2022-jp doesn't support beyond 94x94 (0x7fxx);
-	  but CP932 UDA is in 7Fxx-92xx.
-
-Wed Apr 27 07:42:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (STRIP): use proper toolchain.  based on a patch
-	  from Jon Forums at [ruby-core:35909].  fixes #4617
-
-Wed Apr 27 01:20:59 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (date_zone_to_diff): renamed.
-	* ext/date/date_parse.c: ditto.
-	* ext/date/date_strptime.c: ditto.
-
-Wed Apr 27 01:16:59 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* encoding.c (enc_find): accept Encoding objects.
-
-Wed Apr 27 00:55:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (econv_opts): add newline option.
-
-	* io.c (validate_enc_binmode, rb_io_extract_modeenc): set newline
-	  decorator according to open mode.
-
-	* transcode.c (rb_econv_prepare_options): new function, to prepare
-	  econv options with newline flags.
-
-	* include/ruby/encoding.h (ECONV_NEWLINE_DECORATOR_MASK): add.
-
-Wed Apr 27 00:51:01 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_truncate): fix function.
-
-	* include/ruby/win32.h (ftruncate, truncate, ftello, fseeko): non-64
-	  versions on mingw are useless because they use int32_t.  fixes #4564
-
-Wed Apr 27 00:50:33 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: modified validation methods.
-	* ext/date/lib/date.rb: ditto.
-
-Wed Apr 27 00:00:37 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c (dt_lite_set_tmx): should get df value.
-
-Tue Apr 26 22:34:04 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb (_iso8601): allowed day only civil
-	  date.  disallowed separatorless day only ordinal date.
-
-Mon Apr 25 21:31:36 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
-
-	* ext/openssl/extconf.rb: Should check SSLv2_*method.
-	  openssl compiled with "no-ssl2" the extconf don't fail
-	  when running `make' having this compilation errors.
-	  Patched by Laurent Arnoud. fixes #4562, #4556
-
-Mon Apr 25 20:53:32 2011  Tajima, Akio <artonx@yahoo.co.jp>
-
-	* win32/win32.c (kill): accept 0 only sig is SIGINT #4596
-
-Mon Apr 25 19:59:47 2011  Tajima, Akio <artonx@yahoo.co.jp>
-
-	* win32/win32.c (kill): accept 0 as pid, fixes #4596
-
-Mon Apr 25 16:43:45 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* random.c (random_rand): remove unused variables.
-
-	* struct.c (rb_struct_define_without_accessor): ditto.
-
-	* strftime.c (rb_strftime_with_timespec): ditto.
-
-	* sprintf.c: ditto.
-
-	* time.c (time_asctime): remove useless GetTimeval().
-
-	* thread_pthread.c: cast to (void *) for %p.
-
-Mon Apr 25 11:02:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/ripper/lib/ripper/sexp.rb: fix rdoc around sexp.
-	  patched by Sho Hashimoto. fixes #4599
-
-Mon Apr 25 08:24:04 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* random.c (rb_f_rand, random_s_rand): RDocs for them.
-
-Mon Apr 25 07:18:00 2011  Kenta Murata  <mrkn@mrkn.jp>
-
-	* random.c (random_s_rand, Init_Random): Random.rand should behave as
-	  Random::DEFAULT.rand rather than Kernel#rand.
-
-	* random.c (rand_range, random_rand): rand_range function extracted
-	  from random_rand function.
-
-	* random.c (rb_f_rand): accept a Range argument as Random#rand
-	  [ruby-dev:43427] #4605
-
-Mon Apr 25 03:31:06 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/time.rb: require 'date'.
-	* ext/date/lib/date/format.rb: removed require line.
-
-Mon Apr 25 03:08:39 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb: require 'date'.
-
-Mon Apr 25 03:04:16 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb (_iso8601): added a pattern.
-
-Mon Apr 25 02:51:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/lib/date/format.rb: require 'date_core.so'.
-	  date/format needs methods which are now in date_core.so.
-	  This breaks make rdoc which uses Date._parse from time.rb.
-
-Mon Apr 25 02:47:46 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb (_iso8601): fixed a bug of regex.
-
-Mon Apr 25 02:12:26 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb: an adjustment of regex.
-
-Mon Apr 25 01:58:50 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib/date/format.rb: omitted to call _parse.
-
-Mon Apr 25 01:03:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* string.c (rb_to_id): remove unused variable.
-
-Sun Apr 24 22:19:05 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* complex.c, rational.c: omitted some method calls.
-
-Sun Apr 24 02:57:27 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_parse.c (n2i): takes long.
-
-Sun Apr 24 02:51:06 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_parse.c: reverted.
-
-Sun Apr 24 02:25:23 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/intern.h: pcc can't use __builtin_constant_p.
-
-	* vm_exec.c: change condition.
-
-Sun Apr 24 01:58:01 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/date_core.c (leap_p): suppress warning: parentheses.
-
-	* ext/date/date_core.c (date_s__parse_internal): remove unused
-	  variable "str".
-
-	* ext/date/date_parse.c (parse_ddd_cb): use RSTRING_LENINT.
-
-	* ext/date/date_strftime.c (date_strftime_with_tmx): remove unused
-	  variable.
-
-Sun Apr 24 00:34:23 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_parse.c: removed some unused macros.  use strchr()
-	  instead of index().
-
-Sat Apr 23 21:29:42 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: replacement of implementation of
-	  _parse.  [experimental]
-	* ext/date/date_parse.c: new.
-	* ext/date/lib/date/format.rb: removed ruby version of _parse.
-
-Fri Apr 22 12:04:15 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_sort_bang): fix rdoc.
-	  patched by burningTyger. https://github.com/ruby/ruby/pull/11
-
-Fri Apr 22 11:49:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
-	  XML-RPC's int is 32bit int, and Fixnum also may be beyond 32bit.
-
-	* lib/xmlrpc/create.rb (XMLRPC::Create#conv2value):
-	  XML-RPC doesn't allow Infinity and NaN.
-	  http://www.xmlrpc.com/spec
-
-Fri Apr 22 04:16:14 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/parser.c (parse): strings from psych have proper taint
-	  markings.
-
-	* test/psych/test_tainted.rb: test for string taint
-
-Thu Apr 21 01:30:02 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* random.c (rb_f_srand): fix rdoc: srand(0)'s 0 is a seed.
-	  [ruby-core:35833] fixes #4590
-
-Thu Apr 21 01:01:28 2011  Masaya Tarui  <tarui@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): maximum length of lpCommandLine is
-	  32,768 characters, including the Unicode terminating null character.
-
-Wed Apr 20 21:32:11 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strptime.c (date__strptime_internal): do not
-	  overwrite local variables.
-
-Wed Apr 20 14:41:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_each_line): check string's length when compare
-	  separator and string. [ruby-core:35815] fixes #4586
-
-Wed Apr 20 00:02:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): use position of open paren.
-
-Tue Apr 19 01:00:21 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* test/ruby/test_io.rb (TestIO#test_cross_thread_close_fd):
-	  skip cross thread pipe close if windows
-
-Mon Apr 18 12:15:46 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
-	  avoid float error. [ruby-core:35804]
-
-Sun Apr 17 00:20:14 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_{core,strftime}.c: use struct tmx instead of vtm.
-	* ext/date/date_tmx.h: new.
-
-Sat Apr 16 22:23:52 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strftime.c (date_strftime_wo_timespec): changed
-	  the way of validation of locale modifiers.
-
-Sat Apr 16 21:55:12 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: replacement of implementation of
-	  _strptime.  [experimental]
-	* ext/date/date_strptime.c: new.
-	* ext/date/lib/date/format.rb: removed ruby version of _strptime.
-
-Sat Apr 16 10:18:30 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* vm.c (Init_VM): suppress warning: "OPT_BASIC_OPERATIONS" is not
-	  defined.
-
-Fri Apr 15 23:41:18 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize, ossl_dsa_export):
+	  ditto.
 
-	* ruby.c (proc_options): suppress warning:
-	  "ALLOW_DEFAULT_SOURCE_ENCODING" is not defined.
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize,
+	  ossl_ec_key_to_string): ditto.
 
-Fri Apr 15 15:10:29 2011  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize, ossl_rsa_export):
+	  ditto.
 
-	* lib/uri/generic.rb (#route_from_path): Fix a bug where
-	  URI('http://h/b/').route_to('http://h/b') wrongly returned './'
-	  (should be '../b'). [Bug #4476]
+	* test/openssl/test_pkey_{dsa,ec,rsa}.rb: test this.
 
-Fri Apr 15 14:58:06 2011  Akinori MUSHA  <knu@iDaemons.org>
+Fri May 20 23:45:53 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* lib/fileutils.rb (FileUtils#touch): Fix corrupted output when
-	  mtime is specified in addition to nocreate (and verbose).
-	  ref [ruby-dev:43401]
+	* 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]
 
-Thu Apr 14 23:43:43 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri May 20 22:30:09 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* numeric.c (ruby_float_step): wrong loop condition.
-	  fixes [ruby-core:35753], reported by Joey Zhou.
+	* symbol.h (rb_id2sym): Use HAVE_BUILTIN___BUILTIN_CONSTANT_P
 
-	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
-	  test above change.
+Fri May 20 22:19:00 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Thu Apr 14 22:48:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/date/date_core.c: [DOC] fix typos.
+	  [fix GH-1360] patched by @soundasleep
 
-	* lib/test/unit.rb (Test::Unit::Options#setup_options): set possible
-	  values for completion. no conversion is needed.
+Fri May 20 21:26:58 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* lib/test/unit.rb (Test::Unit::Runner::Worker#initialize): use
-	  positional arguments instead of keyword arguments.
+	* 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
 
-	* lib/test/unit.rb (Test::Unit::Runner#jobs_status): io/console may
-	  not be available. use 80 as the last resort if IO#winsize and
-	  COLUMNS are unavailable.
+Fri May 20 21:17:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit.rb (Test::Unit::Runner::Worker#died): rename using a
-	  verb.
+	* ext/win32ole/win32ole.c (fole_missing): make substring or dup to
+	  share the content if possible.
 
-	* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): check if worker
-	  is signaled and use its exit status.
+Fri May 20 19:48:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit.rb (Test::Unit::Runner::Worker#dead): no longer @in
-	  and @out are separated.
+	* 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.
 
-Thu Apr 14 21:23:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (NEW_CMP_OPT_MEMO): exclude struct cmp_opt_data from
+	  the valid array range.
 
-	* variable.c (rb_autoload_p): search superclasses as same as actual
-	  loading.  fixes [ruby-core:35679]
+	* enum.c (slicewhen_i): exclude inverted too.
 
-Thu Apr 14 21:21:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May 19 21:21:57 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* include/ruby/win32.h (frexp, modf): wrongly declared as pure in
-	  mingw math.h.
+	* re.c (rb_reg_match_m_p): [DOC] fix return value in rdoc.
 
-	* include/ruby/win32.h (ftruncate, truncate): mingw64 misses
-	  prototypes.
+	* test/ruby/test_regexp.rb (TestRegexp#test_match_p): add some
+	  tests from document.
 
-	* win32/win32.c (rb_w32_read): suppress warning.
+Thu May 19 13:22:44 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Thu Apr 14 19:55:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* lib/fileutils.rb (FileUtils#touch): fix corrupted output when
-	  FileUtils.touch(:nocreate => true, :verbose => true) case.
-	  The patch was written by Hiroyuki Iwatsuki. [ruby-dev:43401]
+	* ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto.
 
-Thu Apr 14 16:01:45 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto.
+	  (ossl_x509stctx_verify): ditto.
 
-	* io.c (rb_f_syscall): suppress warning: "HAVE___SYSCALL" is not
-	  defined.
+	* ext/openssl/ossl.h (void ossl_clear_error): add extern declarations
+	  of ossl_store_{ctx_,}ex_verify_cb_idx.
 
-Thu Apr 14 00:41:09 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and
+	  X509_STORE_get_ex_data.
 
-	* thread.c (thread_fd_close_i): IOError exception should be assigned
-	  to rb_thread_t::thrown_errinfo.
+	* 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.
 
-Wed Apr 13 20:12:26 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Thu May 19 13:11:35 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* io.c (rb_io_fdatasync): remove unused variable.
+	* 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).
 
-Tue Apr 12 20:54:12 2011  Tanaka Akira  <akr@fsij.org>
+	* test/openssl/test_x509attr.rb: add tests for OpenSSL::X509::Attribute.
 
-	* include/ruby/st.h: parenthesize macro arguments.
+Thu May 19 12:10:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Apr 12 19:19:50 2011  NARUSE, Yui  <naruse@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]
 
-	* lib/uri/common.rb: avoid race condition. fixes #4572
+Thu May 19 11:37:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Apr 12 18:07:13 2011  TAKAO Kouji  <kouji@takao7.net>
+	* re.c (rb_reg_match_m_p): should return false if no match, as the
+	  document says.  [Feature #8110]
 
-	* ext/readline/extconf.rb: --disable-libedit to disable
-	  libedit. fixes #4550
+Thu May 19 00:17:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Apr 12 10:37:39 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* re.c (reg_names_iter): specify capacify
 
-	* include/ruby/win32.h: VC doesn't have ftruncate() and others, but
-	  ruby needs HAVE_ macros to use our emulation functions.
-	  (fix the problem of 31262)
+Wed May 18 21:29:59 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Apr 12 01:33:00 2011  Luis Lavena  <luislavena@gmail.com>
+	* 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.
 
-	* configure.in: properly evaluate existence of truncate, ftruncate
-	  and ftello for MinGW. [ruby-core:35678]
-	* win32/win32.c: rename truncate, ftruncate and ftello to avoid
-	  redefinitions.
-	* win32/win32.h: ditto.
+Wed May 18 19:33:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Apr 11 21:51:52 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* re.c (rb_reg_match_m_p): Introduce Regexp#match?, which returns
+	  bool and doesn't save backref.
 
-	* io.c: revert r31230. Because it made a regression.
-	  [ruby-core:35631]
+Wed May 18 16:52:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Mon Apr 11 21:49:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* test/ruby/test_io.rb: Added TestIO#test_cross_thread_close_stdio
-	  and TestIO#test_cross_thread_close_fd.
-	  The patch was written by Eric Wong. [ruby-core:35669]
+Wed May 18 16:04:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Apr 11 21:15:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* file.c (rb_group_member): kill 256K of stack usage.
-	  the patch was written by Eric Wong. [ruby-core:35699]
+Wed May 18 14:52:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Apr 11 07:24:13 2011  Eric Hodel  <drbrain@segment7.net>
+	* string.c (rb_str_modify_expand): check integer overflow.
+	  [ruby-core:75592] [Bug #12390]
 
-	* ext/openssl/ossl.c:  Fix typo, document version constants.
+Wed May 18 13:11:44 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun Apr 10 22:23:45 2011  Tanaka Akira  <akr@fsij.org>
+	* re.c (match_ary_subseq): get subseq of match array without creating
+	  temporary array.
 
-	* include/ruby/ruby.h: parenthesize macro arguments.
+	* re.c (match_ary_aref): get element(s) of match array without creating
+	  temporary array.
 
-Sat Apr  9 23:31:47 2011  Shota Fukumori  <sorah@tubusu.net>
+	* re.c (match_aref): Use match_ary_subseq with handling irregulars.
 
-	* ext/stringio/stringio.c (strio_each, strio_readlines):
-	  Use `NUM2LONG` instead of `FIX2INT`. Fixes [ruby-dev:43395].
+	* re.c (match_values_at): Use match_ary_aref.
 
-Sat Apr  9 23:22:27 2011  Shota Fukumori  <sorah@tubusu.net>
+Wed May 18 13:03:07 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* ext/stringio/stringio.c (strio_each):
-	  Fix exception message and don't raise immediately if block is not
-	  given.
-	  Fixes [ruby-dev:43394].
+	* 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]
 
-	* test/stringio/test_stringio.rb (test_each_line_limit_0):
-	  Fix test for above.
+	* ext/openssl/ossl_x509crl.c (ossl_x509crl_verify): ditto.
 
-Sat Apr  9 21:54:15 2011  Shota Fukumori  <sorah@tubusu.net>
+	* ext/openssl/ossl_x509req.c (ossl_x509req_verify): ditto.
 
-	* ext/stringio/stringio.c (strio_each, strio_readlines):
-	  limit must not be zero. Fixes [ruby-dev:43392].
+	* ext/openssl/ossl_x509store.c (ossl_x509stctx_verify): ditto.
 
-	* test/stringio/test_stringio.rb: Add tests for above.
+	* ext/openssl/ossl_pkey_dh.c (dh_generate): clear the OpenSSL error
+	  queue before re-raising exception.
 
-Sat Apr  9 18:01:36 2011  Tanaka Akira  <akr@fsij.org>
+	* ext/openssl/ossl_pkey_dsa.c (dsa_generate): ditto.
 
-	* include/ruby/util.h: parenthesize macro arguments.
+	* ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto.
 
-Fri Apr  8 16:01:56 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* ext/openssl/ossl_ssl.c (ossl_start_ssl): ditto.
 
-	* ext/stringio/stringio.c (strio_getline): check whether str is
-	  a string when str and lim are given.
-	  https://twitter.com/watson1978/status/56225052152168449
+	* test/openssl: check that OpenSSL.errors is empty every time after
+	  running a test case.
 
-Thu Apr  7 20:03:52 2011  Tanaka Akira  <akr@fsij.org>
+Wed May 18 12:07:42 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* include/ruby/io.h: parenthesize macro arguments.
+	* 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().
 
-Wed Apr  6 21:08:31 2011  Tanaka Akira  <akr@fsij.org>
+	* 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.
 
-	* include/ruby/intern.h: parenthesize macro arguments.
+	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id): ditto.
 
-Wed Apr  6 15:12:40 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
 
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize):
-	  pop pushed error after each try of reading. fixes #4550
+	* 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_initialize): ditto.
-
-Wed Apr  6 11:36:44 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize):
-	  pop pushed error after each try of reading. fixes #4550
-
-Tue Apr  5 20:33:43 2011  Tanaka Akira  <akr@fsij.org>
-
-	* include/ruby/encoding.h: parenthesize macro arguments.
-
-Mon Apr  4 22:02:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/io/nonblock/nonblock.c (io_nonblock_set): Avoid F_SETFL if
-	  we're not changing the O_NONBLOCK bit. F_SETFL is an expensive
-	  operation since it needs to affect all processes with the same
-	  file object.
-	  The patch is written by Eric Wong. [ruby-core:35556]
+	* ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
+	  (ossl_ec_group_initialize): ditto.
 
-Mon Apr  4 21:41:26 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* ext/openssl/ossl_ssl.c (ossl_ssl_shutdown): ditto.
 
-	* io.c (rb_io_syswrite): While local FS writes are usually
-	  buffered, the buffers can be full or the file opened with
-	  O_SYNC. IO#syswrite can also be used on blocking IOs
-	  (pipe/socket) just like IO#write.
-	  The patch is written by Eric Wong. [ruby-core:35554]
+Wed May 18 11:53:49 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Mon Apr  4 11:50:40 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* 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/test_tempfile.rb: simply ignore platform dependent testcases
-	  instead of skipping.
+	* test/openssl/test_pkey_ec.rb (test_ec_point_mul): Test that
+	  OpenSSL::PKey::EC::Point#mul works.
 
-Sun Apr  3 22:52:22 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+Wed May 18 11:19:59 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* ext/syslog/syslog.c: improve rdoc.
-	  a patch by Jonas Pfenniger. [ruby-core:35592] fixes #4545
+	* 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.
 
-Sun Apr  3 22:10:09 2011  Tanaka Akira  <akr@fsij.org>
+	* ext/openssl/ossl_bn.c (Init_ossl_bn): Define #== and #hash.
 
-	* ext/zlib/zlib.c: parenthesize macro arguments.
+	* test/openssl/test_bn.rb: Test BN#eql?, #== and #hash
 
-Sun Apr  3 21:33:58 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Wed May 18 10:17:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in: disable fdatasync again on Mac OS X.
-	  [ruby-core:35493][Bug #4500]
+	* 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).
 
-Sun Apr  3 21:16:20 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Wed May 18 09:52:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* io.c (io_reopen): IO#close releases GVL if possible.
-	  close() may block for certain file types (NFS, SO_LINGER
-	  sockets, inotify), so let other threads run. The patch was
-	  created by Eric Wong [ruby-core:35555][Bug #4527]
+	* enum.c (enum_sum, hash_sum, hash_sum_i, enum_sum_i, sum_iter):
+	  Optimize for hashes when each method isn't redefined.
 
-	* io.c (fptr_finalize): ditto.
+Wed May 18 09:14:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* io.c (maygvl_fclose): new.
-	* io.c (nogvl_fclose): ditto.
-	* io.c (maygvl_close): ditto.
-	* io.c (nogvl_close): ditto.
+	* enum.c (enum_sum, int_range_sum): Extract int_range_sum from
+	  enum_sum.
 
-Fri Apr  1 22:25:50 2011  Tanaka Akira  <akr@fsij.org>
+Wed May 18 03:16:06 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/syslog/syslog.c: parenthesize macro arguments.
+	* re.c (match_values_at): fix regression at r55036.
+	  MatchData#values_at accepts Range.
 
-Fri Apr 1 18:53:06 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed May 18 02:02:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/webrick/cookie.rb (WEBrick::Cookie.parse): 'white space is
-	  permitted between tokens' according to RFC2965. Though 'Netscape
-	  spec' does not define the syntax clearly, make it tolerant as a
-	  server. As a real-world example, rest-client gem sends
-	  'Cookie: foo=1;bar=2'
+	* re.c (match_aref): remove useless condition and call rb_fix2int.
+	  rb_reg_nth_match handles negative index.
 
-	* test/webrick/test_cookie.rb (test_parse_non_whitespace): test it.
+Wed May 18 01:57:43 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Apr  1 13:19:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* re.c (match_values_at): MatchData#values_at supports named captures
+	  [Feature #9179]
 
-	* vm_core.h (RUBY_VM_CHECK_INTS_TH): merge a patch by ko1
-	  in [ruby-dev:43373].
+	* re.c (namev_to_backref_number): separated.
 
-Thu Mar 31 23:15:46 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May 18 00:05:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* misc/ruby-mode.el (ruby-brace-to-do-end, ruby-do-end-to-brace):
-	  adjust space between block beginning and block arguments
+	* enum.c (enum_sum): Optimize for a range from int to int.
 
-Thu Mar 31 20:42:05 2011  Tanaka Akira  <akr@fsij.org>
+	* test/ruby/test_enum.rb (test_range_sum): Move from test_range.rb,
+	  and add assertions for some conditions.
 
-	* ext/strscan/strscan.c:  parenthesize macro arguments.
+	* test/ruby/test_enum.rb (test_hash_sum): Move from test_hash.rb.
 
-Thu Mar 31 18:06:12 2011  Shugo Maeda  <shugo@ruby-lang.org>
+	* test/ruby/test_hash.rb, test/ruby/test_range.rb: Remove test_sum.
 
-	* vm_insnhelper.c (vm_get_ev_const): should ignore crefs with
-	  the NODE_FL_CREF_PUSHED_BY_EVAL flag.
+Tue May 17 23:08:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Thu Mar 31 16:49:56 2011  Shugo Maeda  <shugo@ruby-lang.org>
+	* enum.c (enum_sum): [DOC] Write documentation.
 
-	* vm_insnhelper.c (vm_get_ev_const): search root cref properly.
-	  [ruby-dev:43365]
+Tue May 17 22:53:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Thu Mar 31 14:50:25 2011  Shugo Maeda  <shugo@ruby-lang.org>
+	* enum.c (enum_sum): Implement Enumerable#sum.
 
-	* eval.c (rb_mod_s_constants): should ignore crefs with
-	  the NODE_FL_CREF_PUSHED_BY_EVAL flag.
+	* test/ruby/test_enum.rb (test_sum): Test sum for Enumerable.
 
-Wed Mar 30 22:55:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_hash.rb (test_sum): Test sum for Hash.
 
-	* misc/ruby-mode.el (ruby-toggle-block): toggle do/end and {}.
+	* test/ruby/test_range.rb (test_sum): Test sum for Range.
 
-	* misc/ruby-mode.el (ruby-move-to-block): move to opening of
-	  block.
-
-Wed Mar 30 14:35:15 2011  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* vm_insnhelper.h (COPY_CREF): should copy
-	  the NODE_FL_CREF_PUSHED_BY_EVAL flag to hide constants from
-	  methods defined by class_eval.  [ruby-dev:43365]
-
-Wed Mar 30 00:24:53 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/stringio/stringio.c: parenthesize macro arguments.
-
-Tue Mar 29 21:51:31 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* object.c (rb_String): Kernel#String should call to_str before to_s.
-
-Tue Mar 29 10:28:08 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/webrick/test_filehandler.rb
-	  (WEBrick::TestFileHandler#test_short_filename): the cgi doesn't exist
-	  on current directory.
-
-Tue Mar 29 05:19:57 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/raddrinfo.c: parenthesize macro arguments.
-
-Tue Mar 29 00:03:51 2011 Tajima Akio <artonx@yahoo.co.jp>
-
-	* test/webrick/test_filehandler.rb (test_short_filename):
-	  read real short filename by cmd because smb mounted files
-	  have different naming convention.
-
-Mon Mar 28 11:38:08 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/date_core.c (date_s_today): use int for year.
-
-	* ext/date/date_core.c (datetime_s_now): ditto.
-
-Mon Mar 28 11:07:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/extmk.rb: set MFLAGS from MAKEFLAGS when using nmake.
-
-Mon Mar 28 11:07:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (love): all you need is love.
-
-Sun Mar 27 23:16:31 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/ipsocket.c: parenthesize macro arguments.
-
-Sun Mar 27 16:55:34 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode-map): remove unnecessary
-	  binding. fixes
-	  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468952
-
-	* misc/ruby-mode.el: suppress warnings at byte compile.  fixes
-	  http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502926
-
-Sun Mar 27 11:18:35 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: removed unused variables.
-
-Sat Mar 26 15:16:09 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/getaddrinfo.c: parenthesize macro arguments.
-
-Sat Mar 26 05:27:34 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/lib/date/format.rb (DateTime#strftime): removed because
-	  date_core defines it.
-
-Fri Mar 25 21:59:45 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: should not force cast with macros.
-
-Fri Mar 25 21:56:10 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/sdbm/init.c: parenthesize macro arguments.
-
-Fri Mar 25 19:39:40 2011  Ben Walton <bwalton@artsci.utoronto.ca>
-
-	* test/test_syslog.rb:
-	  Skip syslog tests that rely on LOG_PERROR unless it's defined
-
-	  Instead of checking looking at the platform to determine if the tests
-	  relying on LOG_PERROR should be run, look for the definition of the
-	  constant as this will be robust against all platforms as long as the
-	  underlying syslog.c code sets it up correctly.
-
-	  This specifically addresses failures on Solaris 9.
-
-	  Use LOG_PID instead of LOG_PERROR in Syslog.open test
-
-	  LOG_PERROR isn't a POSIX option for syslog, so it fails on platforms
-	  that don't define it.  Solaris 9 and 10 are examples of this.
-
-	  Use LOG_PID instead.
-
-Fri Mar 25 15:42:17 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/sdbm/_sdbm.c (sdbm_open): use size_t.
-
-	* ext/syck/bytecode.c: ditto.
-
-	* ext/sdbm/_sdbm.c (delpair): use ptrdiff_t.
-
-	* ext/sdbm/init.c: use RSTRING_LENINT.
-
-	* ext/dl/handle.c: suppress warning: shorten-64-to-32.
-
-	* ext/strscan/strscan.c: ditto.
-
-	* ext/syck/emitter.c: ditto.
-
-	* ext/syck/implicit.c: ditto.
-
-	* ext/syck/syck.c: ditto.
-
-	* ext/syck/token.c: ditto.
-
-Fri Mar 25 12:14:58 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: import nkf 7f18e30.
-
-Fri Mar 25 11:49:29 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_process.rb (TestProcess#test_no_curdir): skip silently
-	  on Windows, because this tests a platform specific feature and it'll
-	  never be supported on ruby on Windows.
-
-	* test/ruby/test_dir_m17n.rb
-	  (TestDir_M17N#test_filename_extutf8_invalid,
-	  TestDir_M17N#test_filename_as_bytes_extutf8): ditto.
-
-	* test/open-uri/test_open-uri.rb
-	  (TestOpenURI#test_find_proxy_case_sensitive_env): ditto.
-
-	* test/dl/test_handle.rb (DL::TestHandle#test_NEXT,
-	  DL::TestHandle#test_DEFAULT): ditto.
-
-Thu Mar 24 23:06:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm_insnhelper.c (vm_get_ev_const): should not autoload in
-	  defined? mode.
-
-	* variable.c (rb_const_defined_0): fix autoloading base.
-	  [ruby-core:35509]
-
-Thu Mar 24 22:48:43 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/sdbm/_sdbm.c: parenthesize macro arguments.
-
-Thu Mar 24 14:45:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl.c: suppress warning: shorten-64-to-32.
-
-	* ext/openssl/ossl.h: ditto.
-
-	* ext/openssl/ossl_asn1.c: ditto.
-
-	* ext/openssl/ossl_bio.c: ditto.
-
-	* ext/openssl/ossl_bn.c: ditto.
-
-	* ext/openssl/ossl_cipher.c: ditto.
-
-	* ext/openssl/ossl_hmac.c: ditto.
-
-	* ext/openssl/ossl_ns_spki.c: ditto.
-
-	* ext/openssl/ossl_ocsp.c: ditto.
-
-	* ext/openssl/ossl_pkcs5.c: ditto.
-
-	* ext/openssl/ossl_pkey.c: ditto.
-
-	* ext/openssl/ossl_pkey_dh.c: ditto.
-
-	* ext/openssl/ossl_pkey_dsa.c: ditto.
-
-	* ext/openssl/ossl_pkey_ec.c: ditto.
-
-	* ext/openssl/ossl_pkey_rsa.c: ditto.
-
-	* ext/openssl/ossl_rand.c: ditto.
-
-	* ext/openssl/ossl_ssl.c: ditto.
-
-	* ext/openssl/ossl_x509ext.c: ditto.
-
-	* ext/openssl/ossl_x509name.c: ditto.
-
-Thu Mar 24 11:48:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_rand.c (ossl_rand_egd_bytes): use NUM2INT because
-	  the result is used with functions whose argument is int.
-
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_purpose): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_trust): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_purpose): ditto.
-
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_trust): ditto.
-
-Thu Mar 24 11:36:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_x509name.c: id_aref's type is ID.
-
-Thu Mar 24 10:04:35 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/io/console/console.c (console_set_winsize):
-	  suppress warning: shorten-64-to-32.
-
-Thu Mar 24 09:56:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_verify): flags is VALUE,
-	  so it should use NUM2INT.
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): ditto.
-
-Wed Mar 23 21:09:29 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/readline/readline.c: parenthesize macro arguments.
-
-Wed Mar 23 08:07:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_round): fix inaccurate results.
-
-Wed Mar 23 00:12:16 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* win32/win32.c: wait process real termination after reading
-	  exit code. fixes #4518
-
-Tue Mar 22 21:20:10 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/rubygems/test_case.rb: save current dir to @current_dir
-	  before Dir.chdir.
-
-Tue Mar 22 20:10:04 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/psych/parser.c: parenthesize macro arguments.
-
-Tue Mar 22 20:10:01 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ruby_missing.h: parenthesize macro arguments.
-
-Tue Mar 22 13:33:22 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl/lib/openssl/buffering.rb: removed circular require of
-	  openssl.rb.
-
-	* ext/openssl/lib/openssl/*: removed following comment for transition
-	  measures of avoiding circular require. No one claimed about this as
-	  far as I know.
-	  ##
-	  # Should we care what if somebody require this file directly?
-	  # require "openssl"
-
-Tue Mar 22 10:57:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test/runner.rb: set Gem::TestCase's @@project_dir.
-
-	* lib/rubygems/test_case.rb: set Gem::TestCase's @@project_dir only
-	  when it is not defined.
-
-Tue Mar 22 09:38:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (flo_round): use pow instead of while-loop. fixes #4510
-	  patched by Alex Young [ruby-core:35526]
-
-Tue Mar 22 06:47:46 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/date_strftime.c (date_strftime_wo_timespec):
-	  suppress warning: shorten-64-to-32.
-
-Tue Mar 22 06:42:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/date/date_core.c: suppress warning: shorten-64-to-32.
-
-Tue Mar 22 06:41:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/test/unit/parallel.rb: remove unused variable.
-
-Tue Mar 22 06:19:42 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/utf_16le.c: suppress warning: shorten-64-to-32.
-
-	* ext/dbm/dbm.c: ditto.
-
-	* ext/gdbm/gdbm.c: ditto.
-
-	* parse.y (Init_ripper): suppress warning: unused value.
-
-Mon Mar 21 11:21:32 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/test/unit.rb: Refactoring. Unified if and elsif.
-
-Sun Mar 20 23:09:34 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strftime.c: checks duplicated modifiers.
-
-Sun Mar 20 22:32:30 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_strftime.c: removed unused code and arguments.
-
-Sun Mar 20 21:34:49 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: replacement of implementation of
-	  strftime. It has some limitations that is same as Time's
-	  one.  [experimental]
-	* ext/date/date_strftime.c: new.
-	* ext/date/lib/date/format.rb: removed ruby version of strftime.
-
-Sun Mar 20 12:43:12 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509store.c: parenthesize macro arguments.
-
-Sun Mar 20 01:39:48 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* hash.c (ruby_setenv): check env process block size with OS ver.
-	* win32/win32.c: export rb_w32_osver for above patch.
-	* include/ruby/win32.h: declare rb_w32_osver for Win32 Libs.
-
-Sat Mar 19 18:35:05 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* hash.c (ruby_setenv): calculate total env block size for win32.
-	* test/ruby/test_env.rb: add test for above patch.
-
-Sat Mar 19 17:14:46 2011  Tajima Akio <artonx@yahoo.co.jp>
-
-	* hash.c (ruby_setenv): checking with max process environment
-	  block size for Win32. 32767 for 2000/XP, 2003. if failed to
-	  read the block, then checking with 5120 for earlier Windows.
-
-Sat Mar 19 12:30:25 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509revoked.c: parenthesize macro arguments.
-
-Fri Mar 18 20:44:36 2011  Tanaka Akira  <akr@fsij.org>
+Tue May 17 22:11:41 2016  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_x509req.c: parenthesize macro arguments.
+	* 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.
 
-Fri Mar 18 08:48:06 2011  Oleg Shaldybin  <oleg.shaldybin@gmail.com>
+Tue May 17 15:26:10 2016  Tanaka Akira  <akr@fsij.org>
 
-	* lib/fileutils.rb (FileUtils::Entry_#copy_file): updated FileUtils.cp
-	  to still copy file permissions when :preserve is false (as cp does
-	  this even when -p isn't set).
+	* [Feature #12005] Unify Fixnum and Bignum into Integer
 
-Fri Mar 18 00:59:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/ruby.h (rb_class_of): Return rb_cInteger for fixnums.
 
-	* ext/win32ole/extconf.rb (create_docfile): removed.  should not
-	  modify source directory unnecessarily, platform dependent
-	  documentation should be dealt with by rdoc.  [ruby-core:35495]
+	* insns.def (INTEGER_REDEFINED_OP_FLAG): Unified from
+	  FIXNUM_REDEFINED_OP_FLAG and BIGNUM_REDEFINED_OP_FLAG.
 
-Fri Mar 18 00:54:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_core.h: Ditto.
 
-	* include/ruby/ruby.h (rb_funcall_passing_block): add prototype.
-	  a patch by James M. Lawrence at [ruby-core:35501]
+	* vm_insnhelper.c (opt_eq_func): Use INTEGER_REDEFINED_OP_FLAG instead
+	  of FIXNUM_REDEFINED_OP_FLAG.
 
-Wed Mar 17 06:23:31 2011  Tanaka Akira  <akr@fsij.org>
+	* vm.c (vm_redefinition_check_flag): Use rb_cInteger instead of
+	  rb_cFixnum and rb_cBignum.
+	  (C): Use Integer instead of Fixnum and Bignum.
 
-	* ext/openssl/ossl_x509name.c: parenthesize macro arguments.
+	* numeric.c (fix_succ): Removed.
+	  (Init_Numeric): Define Fixnum as Integer.
 
-Wed Mar 16 20:36:56 2011  Tanaka Akira  <akr@fsij.org>
+	* 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 ===.
 
-	* ext/socket/ipsocket.c (init_inetsock_internal): raise an error on
-	  listen(2) failure.
-	  reported by Xavier Shay.  [ruby-core:35505]
+	* error.c (builtin_class_name): Return "Integer" for fixnums.
 
-Wed Mar 16 15:06:21 2011  Eric Hodel  <drbrain@segment7.net>
+	* sprintf.c (ruby__sfvextra): Use rb_cInteger instead of rb_cFixnum.
 
-	* ext/openssl/lib/openssl/buffering.rb (module OpenSSL): #flush should
-	  not change sync mode on exception.
-	* test/openssl/test_buffering.rb: added
+	* ext/-test-/testutil: New directory to test.
+	  Currently it provides utilities for fixnum and bignum.
 
-Wed Mar 16 13:45:28 2011  Eric Hodel  <drbrain@segment7.net>
+	* ext/json/generator/generator.c: Define mInteger_to_json.
 
-	* ext/openssl/lib/openssl/buffering.rb: de-nest Buffering module
+	* lib/mathn.rb (Fixnum#/): Redefinition removed.
 
-	* ext/openssl/lib/openssl/buffering.rb: add RDoc
+Tue May 17 11:58:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Mar 16 08:40:39 2011  Tanaka Akira  <akr@fsij.org>
+	* configure.in (RUBY_CHECK_BUILTIN_SETJMP): declare t as NORETURN
+	  to suppress warnings by -Wsuggest-attribute=noreturn.
+	  [ruby-core:75510] [Bug #12383]
 
-	* ext/openssl/ossl_x509ext.c: parenthesize macro arguments.
-
-Tue Mar 15 18:34:27 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509crl.c: parenthesize macro arguments.
-
-Tue Mar 15 09:49:03 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* test/misc/test_ruby_mode.rb (test_singleton_class): Skip for Pending.
-
-Mon Mar 14 21:20:44 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/ruby/test_require.rb (test_require_too_long_filename):
-	  increase path length, because MAXPATHLEN is defined as 4096 on linux.
-
-	* test/ruby/test_require.rb (test_require_path_home_1): ditto.
-
-	* test/ruby/test_require.rb (test_require_path_home_2): ditto.
-
-Mon Mar 14 19:54:37 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509cert.c: parenthesize macro arguments.
-
-Sun Mar 13 18:11:28 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_x509attr.c: parenthesize macro arguments.
-
-Sun Mar 13 16:07:58 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/pstore.rb: Fix don't raise "nested transaction" when thread_safe
-	  is true. Patch by Masaki Matsushita (Glass_saga). [ruby-dev:43337]
-
-	* test/test_pstore.rb: Test for above.
-	  Patch by Masaki Matsushita (Glass_saga) [ruby-dev:43337]
-
-Sat Mar 12 04:12:41 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_ssl_session.c: parenthesize macro arguments.
-
-Sat Mar 12 02:27:07 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c ({d,dt}_lite_marshal_load): checks the given
-	  argument.
-
-Sat Mar 12 01:26:24 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c: changed some directives.
-
-Sat Mar 12 01:16:02 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/date_core.c, ext/date/lib/*: moved rdoc descriptions.
-
-Sat Mar 12 00:06:24 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* ext/date/lib: moved from lib.
-
-Fri Mar 11 23:32:38 2011  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/delta*: removed undocumented delta.
-
-Fri Mar 11 18:42:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (find_executable0): should exclude directories.
-
-Fri Mar 11 01:40:35 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_getmaxgroups, proc_setmaxgroups): Process#maxgroups
-	  and Process#maxgroups= now raise NotImplementedError if the
-	  platform don't support supplementary groups concept.
-
-Fri Mar 11 01:25:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (get_sc_ngroups_max): return -1 if platform don't
-	  support NGROUPS_MAX.
-
-Thu Mar 10 22:28:15 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_ssl.h: parenthesize macro arguments.
-
-Thu Mar 10 21:59:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* parse.y (parser_encode_length): add exception as UTF8-MAC for
-	  magic comment's emacs newline specifier
-	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
-
-Thu Mar 10 16:00:22 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* parse.y (parser_encode_length): fix typo: the length of
-	  "-dos" and "-mac" is not 5 but 4.
-	  patched by James M. Lawrence [ruby-core:35476] fixes #4489
-
-Thu Mar 10 10:52:01 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_require.rb: setting too long string to ENV causes
-	  Errno::EINVAL on Windows.  long path name errors may causes over
-	  about 1024 bytes, then limit it about 4000 bytes.
-
-Thu Mar 10 10:09:35 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::Runner::Worker#read): fix for the case
-	  when IO#read or IO#gets returns nil.
-
-Thu Mar 10 07:12:03 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/rubygems*: Import rubygems 1.6.2 (release candidate @ 2026fbb5)
-	* test/rubygems: Ditto
-	* test/runner.rb: Added test to load path to fix test requires.
-
-Thu Mar 10 03:00:43 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_ssl.c: parenthesize macro arguments.
-
-Wed Mar  9 23:51:26 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/ruby/test_io_m17n.rb (test_io_new_enc): "sjis" is now an alias
-	  of Windows-31J.
-
-Wed Mar  9 23:06:13 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): fix indent after aref.
-
-Wed Mar  9 12:50:24 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: Rescue exceptions when
-	  people implement the method method. Thanks Lin Jen-Shin.
-	  [ruby-core:35255]
-
-	* test/psych/visitors/test_yaml_tree.rb: test for implementation of
-	  method method.
-
-Wed Mar  9 11:53:31 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/shift_jis.c: Change SJIS as an alias of Windows-31J.
-	  [ruby-dev:43027] fixes #4280
-
-	* enc/shift_jis.c: Add PCK as an alias of Windows-31J.
-
-Wed Mar  9 00:45:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: nmake substitutes all occurrences in macro.
-
-	* ext/extmk.rb: workaround for nmake.
-
-Tue Mar  8 23:49:45 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_setgroups): cleanup.
-
-Tue Mar  8 23:40:30 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/misc/test_ruby_mode.rb: test for ruby-mode.el.
-
-Tue Mar  8 23:27:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (get_sc_ngroups_max): try to use NGROUPS_MAX at first if
-	  _SC_NGROUP_MAX is not defined.
-
-Tue Mar  8 23:10:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): fix for array in block.
-
-Tue Mar  8 21:44:49 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_rand.c: parenthesize macro arguments.
-
-Tue Mar  8 16:45:31 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* hash.c (ruby_setenv): MSDN says that Windows XP or earlier limits
-	  the total size of environment block to 5,120 chars.  and on such
-	  OS, putenv() causes SEGV.  So, ruby should limit the size of an
-	  environment variable to 5,120 bytes for workaround.
-
-Tue Mar  8 15:57:20 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rubygems/test_gem_spec_fetcher.rb
-	  (TestGemSpecFetcher#test_cache_dir_escapes_windows_paths): cache_dir
-	  may have driveletter and `:' for base of cache_dir itself, so need
-	  to skip it for checking.
-
-Tue Mar  8 12:30:06 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-deep-indent-paren-p, ruby-calculate-indent):
-	  do not apply deep-indent inside parens at the beginning of
-	  expressions.
-
-Tue Mar  8 09:32:48 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (configure-ext, build-ext), ext/extmk.rb (extmake):
-	  support parallel-make under ext.
-
-Tue Mar  8 09:25:23 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_setgroups): use getgrnam() if getgrnam_r() is
-	  not available.
-
-	* process.c: RARRAY_LEN() returns long int.
-
-Tue Mar  8 09:07:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_REPLACE_TYPE): enclose in quotes for multiple
-	  type names.
-
-Tue Mar  8 01:43:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c (get_sc_ngroups_max): define to wrap sysconf(3).
-	  this also supports Windows which doesn't have sysconf(3).
-
-	* process.c (maxgroups): use get_sc_ngroups_max.
-
-	* process.c (proc_setmaxgroups): ditto.
-
-Tue Mar  8 01:16:49 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* gc.c (rb_objspace): an initializer must be a constant.
-
-Tue Mar  8 01:11:44 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c (maxgroups): cast because sysconf(3)'s return value is long.
-
-	* process.c (proc_setmaxgroups): ditto.
-
-	* process.c (proc_setgroups): cast because RARRAY_LEN() is long.
-
-Tue Mar  8 00:02:47 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkey_rsa.c: parenthesize macro arguments.
-
-Mon Mar  7 22:59:39 2011  Shota Fukumori  <sorah@tubusu.net>
-
-	* lib/pstore.rb: Delete variable @transaction and fix #4474. Patch by
-	  Masaki Matsushita (Glass_saga).
-
-	* test/test_pstore.rb(test_thread_safe): Add test for #4474.
-
-Mon Mar  7 21:31:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_setgroups): replace getgrnam() with getgrnam_r()
-	  because getgrnam() isn't thread safe.
-
-Mon Mar  7 20:49:12 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_getmaxgroups, proc_setmaxgroups): reflect
-	  platform maxgroups limitation by default instead hardcoded 65536.
-
-Mon Mar  7 17:13:00 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_gc_set_params): allow GC parameter configuration by
-	  environment variables.  based on a patch from funny-falcon at
-	  https://gist.github.com/856296, but honors safe level.
-
-Mon Mar  7 09:05:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c: NUM2RLIM is defined but no getrlimit and setrlimit on
-	  mingw.
-
-Mon Mar  7 08:38:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/date/date_core.c (DateTimeData): should not use bare 'long long'
-	  and 'long double', which are not defined by C89.
-
-	* ext/date/date_core.c (dt_lite_plus): get rid of overflow at casting
-	  down double to integer.
-
-Mon Mar  7 00:21:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_getgroups): get rid of maxgroups dependency.
-	  ngroups can be calculated dynamically.
-
-Sun Mar  6 23:45:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: rlim_t use standard RUBY_REPLACE_TYPE mechanism.
-
-Sun Mar  6 23:26:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (proc_setmaxgroups): added negative value check.
-	  This was suggested by Daniel Berger. Thanks Daniel!
-	  [ruby-core:35426][Bug#4467]
-
-Sun Mar  6 23:18:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (maxgroups, proc_setmaxgroups): increase max groups
-	  limitation up to 65536.
-
-Sun Mar  6 22:20:59 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkey_ec.c: parenthesize macro arguments.
-
-Sun Mar  6 21:49:04 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* sample/list.rb (MyElem#initialize): initialize @head
-	  explicitly. Otherwise -W2 option makes following warning.
-	  "warning: instance variable @head not initialized".
-	  This issue was founded by Andrew Grimm. Thanks Andrew!
-	  [ruby-core:35435][Bug#4471]
-
-Sun Mar  6 05:21:41 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* class.c: fix camelCase to snake_case in documentation code examples.
-	  patched by Andrew Grimm. fixes Bug #4469
-
-	* marshal.c: ditto.
-
-	* proc.c: ditto.
-
-	* sample/biorhythm.rb: ditto.
-
-	* vm_eval.c: ditto.
-
-	* vm_method.c: ditto.
-
-
-Sun Mar  6 03:22:27 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (io_cntl): use rb_thread_io_blocking_region() instead
-	  rb_thread_blocking_region().
-
-Sat Mar  5 22:54:36 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* include/ruby/intern.h: fix a typo of prototype declaration.
-	  rb_mutex_try_lock -> rb_mutex_trylock [ruby-dev:43213]
-
-Sat Mar  5 19:44:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_io.rb (TestIO#test_fcntl_lock): small clean up.
-
-Sat Mar  5 01:33:46 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (io_cntl, nogvl_io_cntl): IO.fcntl() and IO.ioctl()
-	  release GVL during calling kernel interface.
-	  Suggested by Eric Wong. [ruby-core:35417][Bug #4463]
-
-	* test/ruby/test_io.rb (TestIO#test_fcntl_lock): add new test for
-	  IO.fcntl().
-
-Fri Mar  4 23:09:12 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* test/testunit/test_parallel.rb
-	  (test_should_run_all_without_any_leaks): consider that the order of
-	  testcase could change. [ruby-dev:43300] [Bug #4466]
-
-Fri Mar  4 22:01:14 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (io_cntl): change 'cmd' type to int. ioctl and fcntl need to
-	  be passed int.
-	* io.c (rb_io_ctl): ditto.
-
-Fri Mar  4 21:10:40 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: save warnflags. the patch is created by Eric Wong.
-	  [Bug #4465]
-
-Wed Mar  2 21:15:00 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/openssl/ossl_pkey_dsa.c: parenthesize macro arguments.
-
-Thu Mar  3 22:10:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (check_exec_redirect_fd, check_exec_redirect): raise
-	  ArgumentError if fd >= 3 on Windows because the feature is not
-	  supported.
-
-	* test/ruby/test_process.rb (test_execopts_redirect): remove meaningless
-	  argument.
+Tue May 17 10:40:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Mar  3 21:21:42 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in (RUBY_CHECK_SETJMP): needs the header and proper
+	  arguments for builtin setjmp functions.
 
-	* test/ruby/test_process.rb (test_execopts_redirect): redirecting fd
-	  >= 3 is not supported on Windows, so should not specify such options
-	  when calling spawn or others.
+Mon May 16 20:00:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Mar  3 18:59:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* enc/unicode.h: Additional uses of ONIG_CASE_MAPPING compilation switch
 
-	* string.c (rb_str_slice_bang): raise error when the string is frozen.
+Mon May 16 19:46:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Mar  3 14:25:19 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* include/ruby/oniguruma.h: Introducing ONIG_CASE_MAPPING compilation
+	  switch
 
-	* strftime.c (STRFTIME): return 0 and ERANGE when precision is too
-	  large. [ruby-dev:43284] fixes #4456
+	* include/ruby/oniguruma.h, enc/unicode.h: Using ONIG_CASE_MAPPING
+	  compilation switch
 
-Thu Mar  3 00:46:51 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon May 16 19:29:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* addr2line.c (uleb128): cast the value to unsigned long.
+	* gems/bundled_gems: Update xmlrpc-0.1.1. xmlrpc-0.1.0 didn't allow
+	  to install on 2.4.0dev.
 
-	* addr2line.c (fill_lines): print error when lseek fails.
+Mon May 16 13:28:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Mar  3 00:36:29 2011  NARUSE, Yui  <naruse@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]
 
-	* lib/rexml/encoding.rb (REXML::Encoding#encoding=): store @encoding
-	  a String which means the name of the encoding.
-	  this partially revert r29646.
+Mon May 16 11:39:02 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* lib/rexml/document.rb: follow above.
+	* 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.
 
-	* lib/rexml/output.rb: ditto.
+Mon May 16 06:06:21 2016  Eric Wong  <e@80x24.org>
 
-	* lib/rexml/parsers/baseparser.rb: ditto.
+	* proc.c: fix RDoc of Proc#===/call/yield/[]
+	  [Bug #12332]
 
-	* lib/rexml/source.rb: ditto.
+Sun May 15 20:55:31 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/rexml/xmldecl.rb: ditto.
+	* lib/drb/timeridconv.rb: don't use keeper thread. [Bug #12342]
 
-Wed Mar  2 23:19:56 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/drb/ut_timerholder.rb: ditto.
 
-	* string.c (str_byte_substr): return nil for negative length.
+Sun May 15 16:15:25 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Mar  2 21:15:00 2011  Tanaka Akira  <akr@fsij.org>
+	* array.c (rb_ary_entry): extract rb_ary_elt to organize if-conditions
+	  and check whether is embedded at once.
 
-	* ext/openssl/ossl_pkey_dh.c: parenthesize macro arguments.
+Sun May 15 10:57:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Mar  2 14:24:04 2011  Shota Fukumori  <sorah@tubusu.net>
+	* vm_insnhelper.c (vm_get_ev_const): warn deprecated constant even
+	  in the class context.  [ruby-core:75505] [Bug #12382]
 
-	* lib/test/unit/parallel.rb: Fix name from `inclement_io` to
-	  `increment_io`.
+Sun May 15 03:13:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Mar  2 14:06:01 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* iseq.h (struct iseq_compile_data): use struct rb_id_table
+	  instead of st_table.
 
-	* string.c (rb_str_slice_bang): move treatments which is only needed
-	  when the result is not nil.
+	* iseq.c (prepare_iseq_build): don't allocate ivar_cache_table
+	  until it has at least one element.
 
-Wed Mar  2 14:02:29 2011  Shota Fukumori  <sorah@tubusu.net>
+	* iseq.c (compile_data_free): free ivar_cache_table only if it
+	  is allocated.
 
-	* test/testunit/test_parallel.rb(TestParallel#spawn_runner):
-	  Fix outputing empty line in running test.
+	* compile.c (get_ivar_ic_value): allocate if the table is not
+	  allocated yet.
 
-	* test/testunit/tests_for_parallel/test_third.rb: Remove `sleep`
+Sat May 14 09:04:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Mar  1 22:29:10 2011  Tanaka Akira  <akr@fsij.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]
 
-	* ext/openssl/ossl_pkey.h: parenthesize macro arguments.
+Sat May 14 00:16:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Mar  1 22:02:35 2011  Shota Fukumori  <sorah@tubusu.net>
+	* random.c (make_seed_value): append leading-zero-guard and get
+	  rid of making a local copy of the seed.
 
-	* lib/test/unit/parallel.rb: Fix number.
+Fri May 13 08:46:42 2016  cremno  <cremno@mail.ru>
 
-Tue Mar  1 21:48:22 2011  Shota Fukumori  <sorah@tubusu.net>
+	* 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
 
-	* lib/test/unit/parallel.rb: For Windows.
+Fri May 13 03:12:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/testunit/test_parallel.rb(TestParallelWorker#test_quit_in_test):
-	  Fix for above specification change.
-	* test/testunit/test_parallel.rb(TestParallel#spawn_runner):
-	  Fix outputing empty line in running test.
+	* include/ruby/defines.h (GCC_VERSION_SINCE): moved from internal.h.
 
-Tue Mar  1 20:51:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Fri May 13 03:11:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/ruby/test_system.rb (TestSystem#test_system_at):
-	  remove tests for [bug#4396]. because we decided to reject this
-	  ticket.
+	* configure.in (__builtin_constant_p): check.
 
-Tue Mar  1 19:46:19 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* internal.h: Use HAVE_BUILTIN___BUILTIN_CONSTANT_P
 
-	* test/date/{test_date.rb,test_date_attr.rb}: [ruby-dev:43280]
+Fri May 13 03:10:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Mar  1 18:40:38 2011  Ryan Davis  <ryan@YPCMC09457>
+	* configure.in: use alternative keyword
+	  to avoid macros conflicts with them.
 
-	* lib/rubygems*: Import rubygems 1.6.0 (released version @ 58d8a0b9)
-	* test/rubygems: Ditto
+Thu May 12 01:54:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Mar  1 16:22:22 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/mkmf.rb (try_func): get rid of conflict of declarations of
+	  main().  checking local symbol reference does not make sense.
 
-	* win32/win32.c: revert r30987 because it causes some failures in
-	  test-all, especially webrick.
+Thu May 12 00:18:19 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Mar  1 15:59:53 2011  NARUSE, Yui  <naruse@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.
 
-	* string.c (rb_str_byteslice): the resulted encoding should keep
-	  original encoding. this also fixes the encoding when the result
-	  shares internal string. [ruby-core:35376]
+Wed May 11 23:59:47 2016  Masaya Tarui  <tarui@ruby-lang.org>
 
-Tue Mar  1 13:25:00 2011  Kenta Murata <mrkn@mrkn.jp>
+	* vm_insnhelper.c (vm_getivar): describe fast-path explicit
+	  (compiler friendly). [Bug #12274].
 
-	* ext/bigdecimal/bigdecimal.c (VpMemAlloc): CVE-2011-0188.
-	  Fixes a bug reported by Drew Yao <ayao at apple.com>
+Wed May 11 21:30:07 2016  Masaya Tarui  <tarui@ruby-lang.org>
 
-Tue Mar  1 10:34:39 2011  NARUSE, Yui  <naruse@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].
 
-	* string.c (rb_str_byteslice): Add String#byteslice. [ruby-core:35376]
+	* iseq.h (struct iseq_compile_data): introduce instance
+	  variable IC table for sharing.
 
-Tue Mar  1 00:12:49 2011  Tajima Akio <artonx@yahoo.co.jp>
+	* iseq.c (prepare_iseq_build, compile_data_free):
+	  construct/destruct above table.
 
-	* include/ruby/win32.h: define WIN32 if neither _WIN64 nor WIN32
-	  defined. it forces to use push/pop for pack(4) pragma.
+Wed May 11 17:18:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Feb 28 23:52:13 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* util.c (ruby_qsort): use qsort_s if available, for Microsoft
+	  Visual Studio 2005 (msvcr80.dll) and mingw.
 
-	* test/testunit/test_rake_integration.rb (test_with_rake_runner):
-	  use assert_in_out_err for suppress messages.
+Wed May 11 10:33:26 2016  Marcus Stollsteimer  <sto.mar@web.de>
 
-Mon Feb 28 22:48:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* COPYING: Remove trailing-whitespaces.
+	  [ci skip][fix GH-1348]
 
-	* win32/win32.c (rb_w32_spawn): use shell if a commandline contain
-	  double-quote character.
-	* win32/win32.c (is_internal_cmd): similar, use shell if a commandline
-	  contain caret character.
+Tue May 10 21:05:45 2016  Benoit Daloze  <eregontp@gmail.com>
 
-	* test/ruby/test_system.rb (TestSystem#test_system_at): fix
-	  wrong test case. if system() invoke a command by using shell,
-	  system() never return nil. Also, "" quotation must not appear
-	  twice in a command line.
+	* 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]
 
-Mon Feb 28 17:36:57 2011  Tanaka Akira  <akr@fsij.org>
+	* test/ruby/test_class.rb: test for above.
 
-	* ext/openssl/ossl_pkcs7.c: parenthesize macro arguments.
+Tue May 10 14:57:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Feb 28 16:48:42 2011  Tanaka Akira  <akr@fsij.org>
+	* random.c (obj_random_bytes): base on bytes method instead of
+	  rand method, not to call toplevel rand method.
 
-	* ext/openssl/ossl_pkcs12.c: parenthesize macro arguments.
+Tue May 10 13:07:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Feb 28 16:28:15 2011  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
 
-	* string.c (tr_trans): when the hash for multibyte repl is empty,
-	  tr is inverse mode, and a character doesn't much the table, the
-	  character should be replaced by last replacement. Bug #4449
+Mon May  9 10:51:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Feb 28 16:38:56 2011  Tanaka Akira  <akr@fsij.org>
+	* thread.c (rb_thread_atfork_internal): move th to an argument.
 
-	* ext/openssl/ossl_ocsp.c: parenthesize macro arguments.
+	* thread.c (rb_thread_atfork): do not repeat GET_THREAD().
 
-Mon Feb 28 13:02:15 2011  Danial Pearce <github@tigris.id.au>
+Mon May  9 10:46:36 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/tempfile.rb: Fix example file paths in docs for tempfile.
-	  https://github.com/ruby/ruby/pull/5
+	* thread.c (rb_thread_atfork, rb_thread_atfork_before_exec): do
+	  nothing unless working fork is available.
 
-Mon Feb 28 12:56:18 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* thread_sync.c (rb_mutex_abandon_all): define only if working
+	  fork is available.
 
-	* ext/openssl/ossl_cipher.c (ossl_cipher_init): typo fix.
-	  https://github.com/ruby/ruby/pull/8
+	* thread_sync.c (rb_mutex_abandon_keeping_mutexes): ditto.
 
-Mon Feb 28 12:28:13 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* thread_sync.c (rb_mutex_abandon_locking_mutex): ditto.
 
-	* ext/date/date_core.c (datetime_s_now): localtime() and localtime_r()
-	  required time_t pointer as 1st parameter, and tv_sec member of struct
-	  timeval is long.
+	* thread_win32.c (gvl_init): never used.
 
-Mon Feb 28 11:57:40 2011  Shota Fukumori  <sorah@tubusu.net>
+Mon May  9 07:18:06 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* test/testunit/test_parallel.rb: Temporally disable test on Windows.
+	* 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 Feb 28 07:28:35 2011  Shota Fukumori  <sorah@tubusu.net>
+Mon May  9 06:30:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/test/unit.rb(Test::Unit::Runner#after_worker_quit):
-	  method name more be natural English.
+	* include/ruby/ruby.h (CONSTFUNC, PUREFUNC): fixed build errors on
+	  non-gcc build environments introduced at r54952.
 
-	* lib/test/unit.rb(Test::Unit::Runner::Worker.launch):
-	  IO.sync doesn't need. Should use "b" for mode.
+Mon May  9 02:51:51 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun Feb 27 21:59:37 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* gc.c (rb_gc_unprotect_logging): throw rb_memerror when it cannot
+	  allocate memory. This is pointed out by Facebook's Infer.
 
-	* test/ruby/test_system.rb (TestSystem#test_system_redirect_win):
-	  add test for system().
+	* gc.c (gc_prof_setup_new_record): ditto.
 
-Sun Feb 27 18:00:09 2011  Shota Fukumori  <sorah@tubusu.net>
+	* regparse.c (parse_regexp): ditto.
 
-	* lib/test/unit.rb: Refactoring; Worker never use Hash for internal
-	  storage.
+	* util.c (MALLOC): use xmalloc and xfree like above.
 
-	* lib/test/unit.rb: Never use Kernel#spawn. Use IO.popen instead.
+Mon May  9 02:39:16 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun Feb 27 13:16:48 2011  Tanaka Akira  <akr@fsij.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).
 
-	* ext/openssl/ossl_ns_spki.c: parenthesize macro arguments.
+	* vm_eval.c (stack_check): get rb_thread_t* as an argument
+	  to avoid duplicate call of GET_THREAD().
 
-Sat Feb 26 17:07:53 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun May  8 21:01:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/date.rb: [Feature #4257]
+	* 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.
 
-	* ext/date/extconf.rb: new
+Sun May  8 18:51:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/date/date_core.c: new
+	* 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].
 
-Sat Feb 26 16:10:23 2011  Shota Fukumori  <sorah@tubusu.net>
+Sun May  8 08:51:38 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/test/unit.rb: --jobs-status won't puts over 2 lines.
+	* configure.in: add -Wsuggest-attribute=format and suppress warnings.
 
-	* test/testunit/test_parallel.rb: Fix test for above.
+Sun May  8 08:31:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/test/*: refactoring.
+	* configure.in: add -Wsuggest-attribute=noreturn and suppress warnings.
 
-Sat Feb 26 07:10:05 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Sun May  8 08:19:16 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/psych/lib/psych/scalar_scanner.rb: fix parsing timezone's whose
-	  whose format is (+/-)hhmm.  Thanks Goncalo Silva!
+	* configure.in: add -Werror=implicit-int to avoid missing type of
+	  function declaration.
 
-	* test/psych/test_scalar_scanner.rb: test for bug.
+Sat May  7 22:22:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Thu Feb 24 23:02:55 2011  Tanaka Akira  <akr@fsij.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
 
-	* ext/openssl/ossl_hmac.c: parenthesize macro arguments.
+Sat May  7 21:55:12 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Thu Feb 24 22:53:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/webrick/test_ssl_server.rb: Added basic test for `webrick/ssl`
 
-	* common.mk (love): for the birthday.
+Sat May  7 16:22:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Feb 24 22:51:54 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* random.c (int_pair_to_real_inclusive): optimize to multiply
+	  without Bignum.
 
-	* vm.c (ruby_vm_destruct): run vm exit hooks after all objects are
-	  destructed.
+Sat May  7 07:58:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Feb 24 14:40:33 2011  Shota Fukumori  <sorah@tubusu.net>
+	* 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]
 
-	* ChangeLog (vim): Modeline for vim
+Fri May  6 08:16:26 2016  David Silva  <david.silva@digital.cabinet-office.gov.uk>
 
-Thu Feb 24 13:39:25 2011  Shota Fukumori  <sorah@tubusu.net>
+	* 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]
 
-	* common.mk: Use $RUNRUBY for worker process.
+Thu May  5 18:08:31 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* lib/test/unit.rb: Fix bug.
+	* test/ruby/test_complexrational.rb: Remove duplicated raise.
 
-	* lib/test/unit.rb: @options[:ruby](@opts[:ruby]) is now Array.
+Thu May  5 14:41:05 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* test/testunit/parallel.rb: Fix for above.
+	* string.c (rb_str_sub): Fix a special match variable name.
+	  [ci skip]
 
-Thu Feb 24 10:05:55 2011  Shota Fukumori  <sorah@tubusu.net>
+Thu May  5 12:22:17 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/testunit/tests_for_parallel/misc.rb: Fix bug in r30947.
+	* 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.
 
-	* lib/test/unit.rb, lib/test/unit/assertions.rb: For this test.
+Thu May  5 10:49:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Feb 23 23:07:38 2011  Shota Fukumori  <sorah@tubusu.net>
+	* random.c (fill_random_bytes_syscall): use arc4random_buf if
+	  available.
 
-	* test/testunit/test_parallel.rb, test/testunit/parallel/*:
-	  Test for r30939.
+Wed May  4 23:13:58 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* lib/test/unit.rb: For test.
+	* numeric.c (fix_plus): Remove rb_nucomp_add prototype
+	  declaration.
 
-	* lib/test/parallel.rb: For test.
+	* numeric.c (fix_mul): Remove rb_nucomp_mul prototype
+	  declaration.
 
-	* lib/test/unit/testcase.rb: For test.
+	* internal.h (rb_nucomp_add, rb_nucomp_mul): add prototype
+	  declarations.
 
-Wed Feb 23 22:05:13 2011  Tanaka Akira  <akr@fsij.org>
+Wed May  4 18:38:00 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* ext/openssl/ossl_engine.c: parenthesize macro arguments.
+	* lib/net/http/header.rb (Net::HTTPHeader#{each_header,each_name,
+	  each_capitalized_name,each_value,each_capitalized}): Return
+	  sized enumerators.
 
-Tue Feb 22 23:15:17 2011  Shota Fukumori  <sorah@tubusu.net>
+	* test/net/http/test_httpheader.rb: add test for above.
 
-	* lib/test/unit.rb: Fix --ruby option doesn't effect.
+Wed May  4 17:53:15 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* lib/test/unit.rb: Fix typo.
+	* lib/set.rb (Set#{delete_if,keep_if,collect!,reject!,select!,classify,divide},
+	  SortedSet#{delete_if,keep_if}): Return sized enumerators.
 
-Tue Feb 22 21:39:28 2011  Tanaka Akira  <akr@fsij.org>
+	* test/test_set.rb: add test for above.
 
-	* ext/openssl/ossl_digest.c: parenthesize macro arguments.
+Tue May  3 23:25:48 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Tue Feb 22 14:34:26 2011  Shota Fukumori  <sorah@tubusu.net>
+	* numeric.c: [DOC] Update result of 123456789 ** -2.
+	  [ruby-dev:49606] [Bug #12339]
 
-	* lib/test/unit.rb: Fix merging miss.
+Tue May  3 23:13:16 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-Tue Feb 22 12:27:26 2011  Shota Fukumori  <sorah@tubusu.net>
+	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
+	  instead of duplicated undef RCOMPLEX_SET_REAL.
 
-	* lib/test/unit.rb: Add new options; --jobs,-j,--ruby,--jobs-status,
-	  --no-retry.
-	  [Feature #4415] [ruby-dev:43226],[ruby-dev:43222],[ruby-core:35294]
+Tue May  3 22:55:07 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* lib/test/unit/parallel.rb: Used at test/unit --jobs(-j) option.
+	* complex.c (rb_complex_set_imag): Fix to properly set imag
+	  of complex.
 
-	* test/csv/test_serialization.rb: test/unit parallel running ready.
+Tue May  3 22:19:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/rake/test_file_task.rb: test/unit parallel running ready.
+	* configure.in (warnflags): use -std=gnu99 instead of
+	  -std=iso9899:1999. [Feature #12336]
 
-Tue Feb 22 06:09:10 2011  Eric Hodel  <drbrain@segment7.net>
+Tue May  3 22:10:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/syslog/syslog.c: Apply documentation patch from mathew murphy.
-	  [Bug #4149]
+	* 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.
 
-Tue Feb 22 03:09:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* internal.h (rb_popcount64): use __builtin_popcountll because now
+	  it is in fast path.
 
-	* ext/psych/lib/psych.rb: increase Psych to 1.1.0 for help with
-	  debugging.
+Tue May  3 14:19:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Feb 22 03:04:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* parse.y (new_if_gen): set newline flag to NODE_IF to trace all
+	  if/elsif statements.  [ruby-core:67720] [Bug #10763]
 
-	* ext/psych/lib/psych/streaming.rb: refactor streaming methods to a
-	  module.
-	* ext/psych/lib/psych/stream.rb: extracted streaming specific methods
-	  to a module.
-	* ext/psych/lib/psych/json/stream.rb: JSON stream inherits from
-	  JSONTree and includes streaming methods.
-	* ext/psych/lib/psych/visitors/json_tree.rb: JSON does not support
-	  object references, so remove object reference testing when building
-	  JSON trees.
+Tue May  3 05:35:54 2016  Eric Wong  <e@80x24.org>
 
-Tue Feb 22 02:41:51 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* process.c (disable_child_handler_fork_child):
+	  initialize handler for SIGPIPE for !POSIX_SIGNAL
 
-	* ext/psych/lib/psych/visitors/yaml_tree.rb (accept): use Hash#key?
-	  when looking up object references to err on the side of cache
-	  misses.
+Mon May  2 23:03:42 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Mon Feb 21 10:58:39 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* win32/win32.c, include/ruby/win32.h (rb_w32_utruncate): implements new
+	  truncate alternative which accepts UTF-8 path.
 
-	* ext/psych/lib/psych/json/yaml_events.rb: refactoring JSON event
-	  handling methods to a module for reuse.
-	* ext/psych/lib/psych/json/tree_builder.rb: AST builder uses JSON
-	  event methods.
-	* ext/psych/lib/psych/json/stream.rb: stream emitter uses JSON event
-	  methods.
+	* file.c (truncate): use above function.
+	  [Bug #12340]
 
-Mon Feb 21 10:54:29 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Mon May  2 20:59:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/psych/lib/psych/json/stream.rb: do not emit custom tags in maps
-	  or sequences when emitting JSON.
-	* ext/psych/lib/psych/json/tree_builder.rb: do not emit custom tags in
-	  sequences when emitting JSON.
-	* test/psych/json/test_stream.rb: tests for custom stream emits.
-	* test/psych/test_json_tree.rb: tests for JSON emits.
+	* re.c (str_coderange): to avoid function call when the string already
+	  has coderange information.
 
-Mon Feb 21 10:05:10 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* re.c (rb_reg_prepare_enc): add shortcut path when the regexp has
+	  the same encoding of given string.
 
-	* ext/psych/lib/psych/json/ruby_events.rb: DRY up ruby event handling
-	  for JSON.
-	* ext/psych/lib/psych/visitors/json_tree.rb: use ruby events module
-	* ext/psych/lib/psych/json/stream.rb: ditto
+	* re.c (rb_reg_prepare_re): avoid duplicated allocation of
+	  onig_errmsg_buffer.
 
-Mon Feb 21 10:01:01 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* ext/psych/lib/psych/json/stream.rb: fix JSON stream emits to use
-	  double quotes during stream.
-	* test/psych/json/test_stream.rb: tests to reflect changes.
+Mon May  2 12:34:52 2016  Tanaka Akira  <akr@fsij.org>
 
-Mon Feb 21 00:38:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* test/ruby/test_refinement.rb (test_inspect): Use Integer instead of
+	  Fixnum.
 
-	* test/ruby/test_system.rb (TestSystem#test_system_at):
-	  add testcase for bug4396.
+Mon May  2 06:58:38 2016  Tanaka Akira  <akr@fsij.org>
 
-Sun Feb 20 19:59:32 2011  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.
 
-	* ext/openssl/ossl_cipher.c: parenthesize macro arguments.
+Mon May  2 01:27:59 2016  Tanaka Akira  <akr@fsij.org>
 
-Sun Feb 20 16:26:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_numeric.rb (test_step): Use Integer::FIXNUM_MAX.
 
-	* thread.c (exec_recursive): prevent temporary objects from GC.
+Mon May  2 01:15:01 2016  Tanaka Akira  <akr@fsij.org>
 
-	* prevent temporary objects from GC, and should not use
-	  RSTRING_PTR() for function calls since it evaluates the argument
-	  a couple of times.
+	* test/ruby/test_module.rb (test_name): Use Integer instead of Fixnum.
 
-Sun Feb 20 16:22:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May  2 01:00:04 2016  Tanaka Akira  <akr@fsij.org>
 
-	* file.c (rb_file_flock): use rb_thread_io_blocking_region for the
-	  time being.
+	* test/lib/test/unit/assertions.rb (assert_fixnum): Defined.
+	  (assert_bignum): Defined.
 
-Sun Feb 20 05:33:17 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+	* test/ruby/test_bignum.rb: Use assert_bignum.
 
-	* lib/minitest/*.rb: Imported minitest 2.0.2 r6207.
-	* test/minitest/*: ditto
+	* test/ruby/test_integer_comb.rb: Use assert_fixnum and assert_bignum.
 
-Sun Feb 20 02:14:09 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* test/ruby/test_optimization.rb: Ditto.
 
-	* signal.c (sig_trap): avoid pthread_sigmask(xx, &mask, &mask) usage
-	  because FreeBSD don't permit it. If it's used, it behave as
-	  pthread_sigmask(xx, NULL, &mask).
+Mon May  2 00:41:53 2016  Tanaka Akira  <akr@fsij.org>
 
-	* signal.c (init_sigchld): ditto.
+	* vm_trace.c (recalc_remove_ruby_vm_event_flags): Add a cast to
+	  avoid signed integer overflow.
 
-Sun Feb 20 00:46:51 2011  Tanaka Akira  <akr@fsij.org>
+Mon May  2 00:06:04 2016  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_bn.c: parenthesize macro arguments.
+	* test/lib/envutil.rb: Define Integer::{FIXNUM_MIN,FIXNUM_MAX}.
 
-Sat Feb 19 22:37:42 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* test/ruby/test_bignum.rb: Use Integer::{FIXNUM_MIN,FIXNUM_MAX}.
 
-	* vm_insnhelper.c (vm_check_if_namespace): guard temporary object
-	  from GC.
+	* test/ruby/test_bignum.rb: Ditto.
 
-Sat Feb 19 06:36:27 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* test/ruby/test_integer_comb.rb: Ditto.
 
-	* lib/test/unit.rb: partial revert of r30849. [ruby-core:32864]
+	* test/ruby/test_marshal.rb: Ditto.
 
-	* test/testunit/test_rake_integration.rb: adding an integration test
-	  with the rake loader to prevent regressions.
+	* test/ruby/test_optimization.rb: Ditto.
 
-Fri Feb 18 19:31:31 2011  Shugo Maeda  <shugo@ruby-lang.org>
+Sun May  1 23:59:59 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* lib/fileutils.rb (FileUtils::remove_entry_secure): there is a
-	  race condition in the case where the given path is a directory,
-	  and some other user can move that directory, and create a
-	  symlink while this method is executing.
-	  Reported by: Nicholas Jefferson <nicholas at pythonic.com.au>
+	* array.c (rb_ary_sum): fix for mathn
 
-Fri Feb 18 00:28:39 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* test/ruby/test_array.rb (test_sum): ditto.
 
-	* compile.c (get_exception_sym2type): guard temporary object from GC.
+Sun May  1 23:51:54 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Feb 17 23:54:29 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* 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.
 
-	* iseq.c (prepare_iseq_build): initialize iseq_compile_data::err_info
-	  with nil. this fix exception in rb_iseq_load().
+Sun May  1 21:00:07 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Feb 17 22:32:35 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* win32/win32.c: drop Win2K support.
 
-	* test/ruby/test_marshal.rb (test_marshal_dump_extra_iv):
-	  fix a typo of local variable. [Bug #3720] [ruby-dev:42083]
+Sun May  1 20:39:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Feb 17 21:32:53 2011  Tanaka Akira  <akr@fsij.org>
+	* cont.c, hash.c, random.c, win32/win32.c: cleanup some Win9x/ME/NT4
+	  support leftovers.
+	  [fix GH-1328] patched by @cremno
 
-	* ext/openssl/ossl.h: parenthesize macro arguments.
+Sun May  1 07:30:44 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Feb 16 20:37:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* string.c (search_nonascii): use nlz on big endian environments.
 
-	* eval_jump.c (rb_exec_end_proc): changed at_exit and END proc
-	  evaluation order. [Bug #4400] [ruby-core:35237]
-	* eval_jump.c (rb_mark_end_proc): ditto.
+	* internal.h (nlz_intptr): defined.
 
-	* test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_nested_at_exit):
-	  added a test for nested at_exit.
-	* test/ruby/test_beginendblock.rb (TestBeginEndBlock#test_beginendblock):
-	  changed the test to adopt new spec.
+Sun May  1 00:03:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Feb 16 20:17:06 2011  Tanaka Akira  <akr@fsij.org>
+	* configure.in (__builtin_ctz): check.
 
-	* ext/openssl/openssl_missing.h: parenthesize macro arguments.
+	* configure.in (__builtin_ctzll): check.
 
-Tue Feb 15 21:37:45 2011  Tanaka Akira  <akr@fsij.org>
+	* 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.
 
-	* ext/gdbm/gdbm.c: parenthesize macro arguments.
+	* internal.h (rb_popcount64): ditto.
 
-Tue Feb 15 20:34:53 2011  Tanaka Akira  <akr@fsij.org>
+	* internal.h (ntz_int32): defined for ntz_intptr.
 
-	* array.c (ary_join_1): fix array size.
+	* internal.h (ntz_int64): defined for ntz_intptr.
 
-Tue Feb 15 19:43:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* internal.h (ntz_intptr): defined as ntz for uintptr_t.
 
-	* configure.in: fix and resubmit r30621. [ruby-dev:43203]
+	* string.c (search_nonascii): unroll and use ntz.
 
-Tue Feb 15 15:41:30 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Apr 30 21:54:13 2016  Tanaka Akira  <akr@fsij.org>
 
-	* array.c (array_join): copy the encoding of the first element as
-	  an initial encoding.
+	* numeric.c (Init_Numeric): Gather Fixnum method definitions.
 
-	* array.c (array_join_0): ditto.
+Sat Apr 30 21:28:14 2016  Tanaka Akira  <akr@fsij.org>
 
-	* array.c (array_join_1): ditto.
+	* numeric.c (rb_int_div): Define Integer#/.
 
-	* array.c (inspect_ary): ditto.
+	* bignum.c (rb_big_div): Don't define Bignum#/.
 
-	* array.c (array_join_1): add an argument to check the appending is
-	  first one or not.
+	* lib/mathn.rb (Integer#/): Replace Integer#/ instead of Bignum#/.
 
-Tue Feb 15 15:40:53 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Apr 30 21:11:08 2016  Tanaka Akira  <akr@fsij.org>
 
-	* hash.c (inspect_i): copy the encoding of the first key as
-	  an initial encoding.
+	* numeric.c (rb_int_plus): Define Integer#+.
 
-Mon Feb 14 15:00:16 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* bignum.c (rb_big_plus): Don't define Bignum#+.
 
-	* array.c (inspect_ary): don't taint the inspected result of a
-	  recursive array.
+Sat Apr 30 21:01:20 2016  Tanaka Akira  <akr@fsij.org>
 
-Tue Feb 15 15:43:29 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* numeric.c (rb_int_minus): Define Integer#-.
 
-	* encoding.c (rb_enc_compatible): change the rule for empty strings:
-	  remove the special treatment of the US-ASCII encoded empty string.
-	  Now Encoding.compatible? usually respect the encoding of the
-	  receiver.
+	* bignum.c (rb_big_minus): Don't define Bignum#-.
 
-Tue Feb 15 15:39:37 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Apr 30 20:53:33 2016  Tanaka Akira  <akr@fsij.org>
 
-	* string.c (rb_enc_cr_str_buf_cat): remove special treatment of
-	  ASCII-8BIT receivers.
+	* numeric.c (rb_int_mul): Define Integer#*.
 
-	* string.c (str_gsub): set initial encoding of the buffer as the
-	  same of the receiver. [ruby-core:35141]
+	* bignum.c (rb_big_mul): Don't define Bignum#*.
 
-Tue Feb 15 09:49:33 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Apr 30 20:30:44 2016  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_system.rb (TestSystem#test_system_at): use findstr
-	  command instead of find command, because the latter is confusing
-	  another famous Unix command.
+	* numeric.c (rb_int_modulo): Define Integer#%.
 
-Mon Feb 14 23:01:19 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* bignum.c (rb_big_modulo): Don't define Bignum#%.
 
-	* thread.c (rb_thread_io_blocking_region): reset th->waiting_fd
-	  after blocking region, because remaining waiting_fd might
-	  cause unnecessary IOError.
+Sat Apr 30 20:17:08 2016  Tanaka Akira  <akr@fsij.org>
 
-Mon Feb 14 21:06:50 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* numeric.c (int_equal): Define Integer#==.
 
-	* configure.in: revert r30621.  That revision introduced mkmf test
-	  failures and it turned out to be OK to revert. [ruby-dev:43203]
+	* bignum.c (rb_big_eq): Don't define Bignum#==.
 
-Mon Feb 14 21:04:01 2011  Tanaka Akira  <akr@fsij.org>
+Sat Apr 30 19:41:15 2016  Tanaka Akira  <akr@fsij.org>
 
-	* ext/fiddle/conversions.h: parenthesize macro arguments.
+	* numeric.c (int_gt): Define Integer#>.
 
-Mon Feb 14 18:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* bignum.c (rb_big_gt): Don't define Bignum#>.
+	  Renamed from big_gt.
 
-	* win32/setup.mak (USE_RUBYGEMS): fixed r30835. It didn't work on
-	  mswin32 port. If you changed win32/configure.bat, you should change
-	  setup.mak too.
+	* internal.h (rb_big_gt): Declared.
 
-Mon Feb 14 17:28:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Sat Apr 30 19:24:40 2016  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_system.rb (TestSystem#test_system_at):
-	  added test. [ruby-core:35218] (#4393)
+	* numeric.c (int_ge): Define Integer#>=.
 
-Mon Feb 14 13:15:35 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (rb_big_ge): Don't define Bignum#>=.
+	  Renamed from big_ge.
 
-	* win32/win32.c (is_internal_cmd): if the first char of prog is '@',
-	  execute it via shell.  [ruby-core:35218] (#4393)
+	* internal.h (rb_big_ge): Declared.
 
-Mon Feb 14 10:33:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Apr 30 19:20:40 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* lib/test/unit.rb: revert r30863, because it causes too many noise.
+	* doc/standard_library.rdoc: Remove obsoleted classes and modules.
 
-Mon Feb 14 07:34:55 2011  Tanaka Akira  <akr@fsij.org>
+Sat Apr 30 19:09:23 2016  Tanaka Akira  <akr@fsij.org>
 
-	* ext/curses/curses.c: parenthesize macro arguments.
+	* numeric.c (int_lt): Define Integer#<.
 
-Sun Feb 13 19:41:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_lt): Don't define Bignum#<.
+	  Renamed from big_lt.
 
-	* lib/test/unit.rb (Test::Unit::RequireFiles#non_options): skip
-	  test suites failed to load instead of mere messages.
+	* internal.h (rb_big_lt): Declared.
 
-Sun Feb 13 09:56:44 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr 30 18:44:05 2016  Tanaka Akira  <akr@fsij.org>
 
-	* test/openssl/test_config.rb (OpenSSL#test_freeze): fix error
-	  message assertion.
+	* numeric.c (int_le): Define Integer#<=.
 
-	* test/io/nonblock/test_flush.rb (TestIONonblock#flush_test):
-	  return true to finish the test.
+	* bignum.c (rb_big_le): Don't define Bignum#<=.
+	  Renamed from big_le.
 
-	* test/syck/test_string.rb (Syck::TestString#test_non_binary_string):
-	  use assert_not instead of refute, unless required minitest
-	  explicitly.
+	* internal.h (rb_big_le): Declared.
 
-	* test/test_prime.rb (TestPrime::sieve.Integer): ditto.
+Sat Apr 30 18:11:44 2016  Tanaka Akira  <akr@fsij.org>
 
-	* test/xmlrpc/webrick_testing.rb (WEBrick_Testing#start_server):
-	  catch IOError when server socket was closed.
+	* bignum.c (Init_Bignum): Define Integer::GMP_VERSION.
 
-Sun Feb 13 07:39:51 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Apr 30 16:58:18 2016  Tanaka Akira  <akr@fsij.org>
 
-	* enum.c (enum_inject): typo fixed. a patch from Gaku Ueda in
-	  [ruby-core:35216].
+	* numeric.c (int_remainder): Define Integer#remainder.
 
-Sun Feb 13 00:48:47 2011  Tadayoshi Funaba  <tadf@dotrb.org>
+	* bignum.c (rb_big_remainder): Don't define Bignum#remainder.
 
-	* lib/date.rb (Date#===): [ruby-core:35127]
+	* internal.h (rb_big_remainder): Declared.
 
-Sun Feb 13 00:29:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr 30 15:29:24 2016  Tanaka Akira  <akr@fsij.org>
 
-	* lib/test/unit.rb (Test::Unit::Options#process_args): always
-	  return options.
+	* numeric.c (rb_int_uminus): {Fixnum,Bignum}#-@ is unified into
+	  Integer.
 
-	* lib/test/unit.rb (Test::Unit::RequireFiles#non_options): return
-	  if any test case get loaded.
+	* bignum.c (rb_big_uminus): Don't define Bignum#-@.
 
-	* lib/test/unit.rb (Test::Unit::AutoRunner#initialize): do not add
-	  default directory if it is nil.
+Sat Apr 30 14:42:20 2016  Tanaka Akira  <akr@fsij.org>
 
-	* lib/test/unit.rb (Test::Unit::AutoRunner#process_args): return
-	  true if any test cases to run.
+	* numeric.c (rb_int_idiv): {Fixnum,Bignum}#div is unified into
+	  Integer.
 
-Sat Feb 12 23:17:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_idiv): Don't define Bignum#div.
 
-	* lib/test/unit.rb (assert_include): add alias.
+Sat Apr 30 14:25:55 2016  Tanaka Akira  <akr@fsij.org>
 
-Sat Feb 12 14:44:20 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (rb_int_modulo): {Fixnum,Bignum}#modulo is unified into
+	  Integer.
 
-	* thread.c (rb_thread_io_blocking_region): new function to run
-	  blocking region with GIL released, for fd.
+	* bignum.c (rb_big_modulo): Don't define Bignum#modulo.
 
-	* thread.c (rb_thread_fd_close): implement.  [ruby-core:35203]
+Sat Apr 30 14:04:30 2016  Tanaka Akira  <akr@fsij.org>
 
-	* vm.c (th_init): rename from th_init2.
+	* numeric.c (int_divmod): {Fixnum,Bignum}#divmod is unified into
+	  Integer.
 
-Sat Feb 12 14:41:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_divmod): Don't define Bignum#divmod.
 
-	* lib/test/unit.rb (Test::Unit::AutoRunner#initialize): use
-	  default_dir if no test case given.
+Sat Apr 30 13:20:00 2016  Tanaka Akira  <akr@fsij.org>
 
-	* lib/test/unit.rb (Test::Unit::Runner): rename from Test::Unit::Mini.
+	* numeric.c (int_fdiv): {Fixnum,Bignum}#fdiv is unified into
+	  Integer.
 
-	* lib/test/unit.rb (Test::Unit::GlobOption#non_options): run tests
-	  under base directory if no argument given.
+	* bignum.c (rb_big_fdiv): Don't define Bignum#fdiv.
 
-Sat Feb 12 08:03:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_settracefunc.rb (TestSetTraceFunc): ensure to use
-	  method_added hook defined in Module.
+	* numeric.c (rb_int_pow): {Fixnum,Bignum}#** is unified into
+	  Integer.
 
-Sat Feb 12 01:04:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_pow): Don't define Bignum#**.
 
-	* ruby.c (proc_options): enable rubygems if --gem option is given.
+Sat Apr 30 12:28:59 2016  Tanaka Akira  <akr@fsij.org>
 
-	* ruby.c (process_options): load rubygems if it is disabled but
-	  --gem option is given.
+	* bignum.c (rb_big_comp): Renamed from rb_big_neg.
 
-Fri Feb 11 23:27:50 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+	* numeric.c (fix_comp): Renamed from fix_rev.
 
-	* ruby.c (proc_options): add --gem=enabled as an alias of
-	  --enable=gems and --gem=disabled as an alias of --disable=gems.
-	  Gem named "enabled" or "disabled" has already been reserved
-	  legitimately for this purpose.
+Sat Apr 30 12:25:43 2016  Tanaka Akira  <akr@fsij.org>
 
-Fri Feb 11 23:17:04 2011  Tanaka Akira  <akr@fsij.org>
+	* numeric.c (int_comp): {Fixnum,Bignum}#~ is unified into
+	  Integer.
 
-	* ext/dl/cfunc.c: parenthesize macro arguments.
+	* bignum.c (rb_big_neg): Don't define Bignum#~.
 
-Fri Feb 11 21:41:53 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (rb_big_neg): Declared.
 
-	* bin/testrb, test/runner.rb, lib/test/unit.rb: improve backward
-	  compatibility.
+Sat Apr 30 12:07:42 2016  Tanaka Akira  <akr@fsij.org>
 
-Fri Feb 11 19:45:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (int_and): {Fixnum,Bignum}#& is unified into
+	  Integer.
 
-	* eval.c (ruby_cleanup): use rb_ary_free to free internal object.
+	* bignum.c (rb_big_and): Don't define Bignum#&.
 
-	* gc.h (RUBY_FREE_UNLESS_NULL): get rid of double free.
-	  [ruby-core:35192]
+Sat Apr 30 11:56:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Feb 11 16:57:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/thread: removed dummy extension library.  thread_sync.c
+	  provides "thread.rb" already.
 
-	* test/ruby/test_transcode.rb (test_from_cp50221): fix wrong
-	  assertion and move back.
+Sat Apr 30 11:53:48 2016  Tanaka Akira  <akr@fsij.org>
 
-Fri Feb 11 14:33:18 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (int_or): {Fixnum,Bignum}#| is unified into
+	  Integer.
 
-	* lib/test/unit/assertions.rb (assert_no_match): alias for
-	  backward compatibility.
+	* bignum.c (rb_big_or): Don't define Bignum#|.
 
-Fri Feb 11 12:06:48 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr 30 11:18:47 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* ruby.c (add_gems, require_libraries, proc_options): add
-	  --require and --gem options.
+	* vm_trace.c: Fix typos. [ci skip]
 
-Fri Feb 11 12:03:24 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr 30 10:09:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in (rubygems): add --disable-rubygems option.
+	* ext/pty/pty.c (establishShell): honor USER environment variable
+	  and login name over uid, one uid can be shared by some login
+	  names.
 
-Fri Feb 11 11:39:03 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 29 22:40:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* template/fake.rb.in (CROSS_COMPILING): get rid of NameError.
+	* doc/maintainers.rdoc (ext/io/nonblock): still maintained, as
+	  well as ext/io/wait, which is the origin.
 
-Thu Feb 10 23:12:34 2011  Tanaka Akira  <akr@fsij.org>
+Fri Apr 29 21:18:12 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/dl/dl.h: parenthesize macro arguments.
+	* doc/maintainers.rdoc (ext/win32): of course, it's still maintained.
 
-Wed Feb  9 23:11:27 2011  Tanaka Akira  <akr@fsij.org>
+Fri Apr 29 21:03:10 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/pty/pty.c: parenthesize macro arguments.
+	* gems/bundled_gems: Update latest gems, test-unit-3.1.8 and rake-11.1.2.
 
-Tue Feb  8 11:47:11 2011  Loren Sands-Ramshaw  <lorensr@gmail.com>
+Fri Apr 29 20:43:02 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* array.c: documentation clarification in rotate, rotate!,
-	  index, and rindex. [ruby-core:35144]
+	* doc/maintainers.rdoc: Update latest maintainers list on Ruby 2.4
 
-Wed Feb  9 09:45:43 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Apr 29 19:52:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* test/rdoc/test_rdoc_encoding.rb: remove unnecessary (and wrong)
-	  platform-dependent hacks.
+	* doc/maintainers.rdoc: Removed deprecated entries. These are already deleted.
 
-Wed Feb  9 00:47:18 2011  Tanaka Akira  <akr@fsij.org>
+Fri Apr 29 19:48:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/etc/etc.c: parenthesize macro arguments.
+	* doc/maintainers.rdoc: Removed Ruby 1.8 entries. It's not necessary to
+	  Ruby 2.4 or later.
 
-Tue Feb  8 19:38:00 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr 28 17:03:17 2016  Nicholas Maccharoli  <nmaccharoli@gmail.com>
 
-	* misc/ruby-mode.el (ruby-expr-beg): fix for invalid nest errors.
+	* hash.c (rb_hash_update_{block,func}_callback): dry up hash
+	  update callback code.  [Fix GH-1338]
 
-Tue Feb  8 19:22:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Thu Apr 28 16:52:05 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* configure.in (AC_MSG_CHECKING): fixed typo. the patch is
-	  created by Benoit Daloze. Thanks a lot. [Bug #4384][ruby-core:35148]
+	* 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.
 
-Tue Feb  8 16:04:03 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Thu Apr 28 16:33:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (rb_io_s_sysopen): use NUM2MODET() instead NUM2UINT().
+	* lib/optparse.rb: [DOC] fix example code.  base on the code by
+	  Semyon Gaivoronskiy in [ruby-core:75224].  [Bug #12323]
 
-Tue Feb  8 15:59:23 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Thu Apr 28 09:33:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* process.c (rb_run_exec_options_err): use MODET2NUM() instead
-	  LONG2NUM().
+	* 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
 
-Tue Feb  8 13:59:56 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Thu Apr 28 04:49:07 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-	* configure.in: revert r30725. Now we have proper runtime fallback.
-	  Therefore, no need compile time disabling. (see r30762).
+	* 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.
 
-Tue Feb  8 01:00:21 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* math.c (ruby_lgamma_r): handle +0.0, in addition to -0.0.
 
-	* process.c (proc_setgroups): add GC guard to prevent intermediate
-	  variable from GC.
+Thu Apr 28 01:11:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Feb  8 00:56:33 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c: define _DEFAULT_SOURCE because glibc 2.20 deprecates
+	  _BSD_SOURCE.
+	  https://sourceware.org/glibc/wiki/Release/2.20
 
-	* misc/ruby-mode.el (ruby-expr-beg, ruby-in-here-doc-p): tell
-	  singleton class definitions from here documents.
+Thu Apr 28 00:27:55 2016  Tanaka Akira  <akr@fsij.org>
 
-	* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial): keyword
-	  followed by colon is label.
+	* numeric.c (int_xor): {Fixnum,Bignum}#^ is unified into
+	  Integer.
 
-Mon Feb  7 22:56:16 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+	* bignum.c (rb_big_xor): Don't define Bignum#^.
 
-	* lib/benchmark.rb (Benchmark#bmbm): use ensure clause instead of
-	  Object#tap to restore STDOUT.sync.
+Wed Apr 27 20:53:59 2016  Tanaka Akira  <akr@fsij.org>
 
-Mon Feb  7 22:34:20 2011  Tanaka Akira  <akr@fsij.org>
+	* numeric.c (int_aref): {Fixnum,Bignum}#[] is unified into
+	  Integer.
 
-	* lib/net/http.rb (Net::HTTP#connect): support SNI (Server Name
-	  Indication) for HTTPS.  [ruby-dev:43164]
-	  http://stackoverflow.com/questions/4685736/openssl-server-name-indication-support-in-ruby
+	* bignum.c (rb_big_aref): Don't define Bignum#<<.
 
-Mon Feb  7 16:05:32 2011  Eric Hodel  <drbrain@segment7.net>
+	* internal.h (rb_big_aref): Declared.
 
-	* lib/rdoc: Upgrade to RDoc 3.5.3  Fixes [Bug #4376]
+Wed Apr 27 16:10:35 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Feb  7 11:46:59 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* tool/instruction.rb: fix to follow current implementation.
 
-	* common.mk (rdoc): add --encoding=UTF-8; ruby's rdoc must be UTF-8.
+Wed Apr 27 15:47:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Feb  7 10:21:50 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/stringio/stringio.c (strio_s_new): warn if a block is given,
+	  as well as IO.new.
 
-	* test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files):
-	  there is no easy way to create owner unreadable file on Windows.
-	  So, skip the test.
+Wed Apr 27 14:29:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Feb  6 13:48:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/lib/json/common.rb (JSON::MissingUnicodeSupport.iconv):
-	  should not drop rest of the result.  use Iconv.conv instead.
-
-Sun Feb  6 12:46:02 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* string.c (gsub): Ensure result encoding is the same as input
-	  encoding.  [Bug #4340].
-
-Sun Feb  6 12:18:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (words, qwords): dispatch array events.  based on a
-	  patch from Michael Edgar.  [Bug #4365].
-
-Sun Feb  6 12:12:59 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/fileutils/fileasserts.rb (FileAssertions): separate module.
-
-Sun Feb  6 11:29:23 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/dbm/dbm.c: parenthesize macro arguments.
-
-Sat Feb  5 22:01:59 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
-	  revert r30796. r30797 and r30798 are an alternative fix.
-	  [ruby-dev:43174]
-
-Sat Feb  5 21:47:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (mlhs_basic): include mlhs_post for ripper.  a patch
-	  from Michael Edgar at [ruby-core:35078].
-
-Sat Feb  5 21:22:21 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb (assert_block): move from
-	  test/fileutils/fileasserts.rb.
-
-	* test/fileutils/fileasserts.rb (assert_block): pass arguments
-	  as-is.  [ruby-dev:43174]
-
-Sat Feb  5 16:47:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
-	  msg can be passed nil. [Bug #4371] [ruby-dev:43174]
-
-Sat Feb  5 15:18:25 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Upgrade to RDoc 3.5.2
-
-Sat Feb  5 12:05:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_node_init_copy): SyckNode is not
-	  copiable.  [ruby-core:35094]
-
-Sat Feb  5 11:48:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_alloc): leave data ptr
-	  NULL.
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_new, ossl_cipher_initialize):
-	  allocate internal structure.  [ruby-core:35094]
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_copy): ditto.
-
-Sat Feb  5 11:29:10 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/parser/parser.h (GET_PARSER): raise TypeError.
-
-	* ext/json/parser/parser.rl (cParser_initialize): ditto.
-
-	* ext/json/parser/parser.h (GET_PARSER): check if initialized.
-	  [ruby-core:35079]
-
-	* ext/json/parser/parser.rl (cParser_initialize): ditto.
-
-Sat Feb  5 10:09:31 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_get_expanded_load_path): always expand load paths.
-
-Sat Feb  5 09:38:08 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* transcode.c (encoded_dup): extract.
-
-Sat Feb  5 03:37:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::LowMethods): make low level methods
-	  in NoWrite and DryRun to do nothing.  [ruby-dev:43129]
-
-	* test/fileutils/fileasserts.rb: add message arguments.
-
-	* test/fileutils/fileasserts.rb (Test::Unit::Assertions#assert_block):
-	  show the given message.
-
-Sat Feb  5 02:09:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (lex_getline, parser_set_encode): set encoding of lines
-	  in SCRIPT_LINES__ as source encoding.  [ruby-dev:43168]
-
-Sat Feb  5 02:08:37 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (ruby_thread_data_type): add prefix.
-
-Sat Feb  5 00:59:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* vm_core.h (GetThreadPtr): use TypedData_Get_Struct() instead
-	  CoreDataFromValue() because we need type check. Otherwise,
-	  type mismatch can cause segmentation fault crash.
-	  [ruby-core:35086] [Ruby 1.9-Bug#4367]
-
-	* vm.c (thread_data_type): remove static.
-
-Fri Feb  4 19:14:27 2011  Tanaka Akira  <akr@fsij.org>
-
-	* enc/trans/utf8_mac.trans: parenthesize macro arguments.
-
-Fri Feb  4 12:11:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* string.c (str_utf8_nth): fixed a condition of optimized lead
-	  byte counting. [Bug #4366][ruby-dev:43170]
-
-Fri Feb  4 01:50:13 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* string.c (count_utf8_lead_bytes_with_word): wrote function
-	  comments.
-
-Fri Feb  4 00:14:55 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzfile_reader_get_unused): no need to dup
-	  before rb_str_resurrect.
-
-Thu Feb  3 20:04:44 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/curses/curses.c (CHECK): unused macro removed.
-
-Thu Feb  3 18:33:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzfile_reader_get_unused): use rb_str_resurrect
-	  because gz->z.input is hidden string. [ruby-core:35057]
-
-Thu Feb  3 16:34:10 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* enc/shift_jis.c (code_to_mbc): cast as int from the subtraction of
-	  pointers.
-
-	* enc/utf_16le.c (utf16le_mbc_enc_len): use ptrdiff_t.
-
-	* enc/utf_32be.c (utf32be_left_adjust_char_head): ditto.
-
-	* enc/utf_32le.c (utf32le_left_adjust_char_head): ditto.
-
-Thu Feb  3 16:31:43 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/missing.h: don't use HAVE_STDDEF_H because it never
-	  defined by configure though configure.bat defines it.
-
-	* include/ruby/ruby.h: move include stddef.h to defines.h
-
-	* include/ruby/defines.h: ditto.
-
-Wed Feb  2 20:25:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/encoding.h (rb_enc_step_back): cast 4th argument 'n'
-	  as int because Ruby usually treats length value as long but
-	  onigenc_step_back's 4th argument is int.
-
-Thu Feb  3 07:20:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: use Regexp::NOENCODING
-	  rather than magic number.
-
-	* ext/syck/lib/syck/rubytypes.rb: ditto
-
-Thu Feb  3 07:16:11 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* re.c (Init_Regexp): added a constant for ARG_ENCODING_NONE
-	  [ruby-core:35054]
-
-	* test/ruby/test_regexp.rb: corresponding test.
-
-Thu Feb  3 07:02:16 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/to_ruby.rb: ARG_ENCODING_NONE regular
-	  expressions can round trip. [ruby-core:34969]
-
-	* test/psych/test_yaml.rb: test for ARG_ENCODING_NONE regex
-
-	* ext/sych/lib/syck/rubytypes.rb: ARG_ENCODING_NONE regular
-	  expressions can round trip.
-
-	* test/syck/test_yaml.rb: test for ARG_ENCODING_NONE regex
-
-Wed Feb  2 17:09:22 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_fdatasync): Use fsync(2) if the underlying
-	  operating system does not support fdatasync(2).
-
-Wed Feb  2 14:51:08 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/markup/to_tt_only.rb: commit miss
-	* test/rdoc/test_rdoc_markup_to_tt_only.rb: ditto
-	* test/rdoc/test_rdoc_single_class.rb: ditto
-
-Wed Feb  2 09:27:53 2011  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Upgrade to RDoc 3.5.1
-
-Wed Feb  2 00:30:43 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/st.h (st_table): Added comment why we need __extension__.
-
-Tue Feb  1 20:45:44 2011  Tanaka Akira  <akr@fsij.org>
-
-	* enc/encdb.c: parenthesize macro arguments.
-
-Tue Feb  1 15:12:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_require.rb (TestRequire#test_require_with_unc):
-	  use ``127.0.0.1'' instead of ``localhost'' as host name, because
-	  XP or earlier cannot resolv it as NBT hostname.
-
-Tue Feb  1 13:20:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/benchmark/test_benchmark.rb (#capture_bench_output):
-	  Added explicit sleep. Windows have imprecise time support.
-	  Thus Tms.new.Add!{} may be or may be not equal 0. The
-	  test failure started since r30747.
-
-Tue Feb  1 11:03:47 2011  Ryan Davis  <ryan@lust.local>
-
-	* lib/rubygems*: Import rubygems 1.5.0 (released version @ 1fb59d0)
-	* test/rubygems: Ditto
-
-Tue Feb  1 08:01:39 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/io/console/console.c (console_set_winsize): new method to set
-	  console size.  [EXPERIMENTAL]
-
-	* ext/io/console/console.c (console_winsize): use GetWriteFD.
-
-Tue Feb  1 02:28:14 2011  Masaya Tarui  <tarui@ruby-lnag.org>
-
-	* include/ruby/win32.h, win32/win32.c: add rb_w32_inet_ntop.
-	  inet_ntop's minimum supported client is Vista.
-
-Tue Feb  1 00:10:30 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/benchmark.rb: fix benchmark to work with current ruby.
-	  patched by Benoit Daloze [ruby-core:33846] [ruby-dev:43143]
-	  merged from https://github.com/eregon/ruby/commits/benchmark
-
-	*  lib/benchmark (Report#width): update documentation
-	*  lib/benchmark: document the return value of #benchmark and the
-	   :list attribute in Report
-	*  lib/benchmark (Tms#format): rename variables, use String#%
-	   instead of Kernel.format
-	*  lib/benchmark: remove undocumented Benchmark::times (an alias
-	   of Process::times used twice)
-	*  lib/benchmark (#benchmark): use label_width for the caption
-	*  lib/benchmark (Tms#initialize): rename variables
-	*  lib/benchmark: allow title to not be a String and call #to_s
-	*  lib/benchmark (Benchmark#bm): return an Array of the times with
-	   the labels
-	*  lib/benchmark: correct output for Benchmark#bmbm
-	   (remove the extra space)
-	*  lib/benchmark: add a few tests for Benchmark::Tms output
-	*  lib/benchmark: improve style (enumerators, ljust, unused vars)
-	*  lib/benchmark: add spec about output and return value
-	*  lib/benchmark: improve basic style and consistency
-	   no parenthesis for print and use interpolation instead of printf
-	*  lib/benchmark: remove unnecessary conversions and variables
-	*  lib/benchmark: correct indentation
-	*  lib/benchmark: rename the FMTSTR constant and variable to FORMAT
-	*  lib/benchmark: remove useless exception
-
-	*  test/benchmark: remove unused variable warnings
-
-Mon Jan 31 23:27:23 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* node.c (add_id): remove duplicated rb_id2str() call.
-
-Sun Jan 30 17:19:46 2011  Tanaka Akira  <akr@fsij.org>
-
-	* missing/langinfo.c: parenthesize macro arguments.
-
-Mon Jan 31 21:57:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: revert r30698.
-
-Mon Jan 31 21:32:44 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* thread.c (thread_start_func_2): check deadlock condition before
-	  release thread stack. fix memory violation when deadlock detected.
-	  reported by Max Aller. [Bug #4009] [ruby-core:32982]
-
-Mon Jan 31 14:45:47 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* lib/irb/locale.rb (IRB::Locale::#search_file):
-	  Gem might be undefined if --disable-gems. [ruby-core:34990]
-
-Mon Jan 31 12:26:14 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* addr2line.c: suppressed shorten-64-to-32 warnings.
-	* regcomp.c: ditto.
-	* regexec.c: ditto.
-	* regint.h: ditto.
-	* regparse.c: ditto.
-	* regparse.h: ditto.
-	* time.c: ditto.
-	* variable.c: ditto.
-
-Mon Jan 31 04:45:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_uniq_bang): call ARY_SET_LEN(ary, 0) before
-	  ary_resize_capa because ary_resize_capa expects resized length is
-	  smaller than current array length. call rb_ary_unshare before
-	  ary_resize_capa because ary_resize_capa lost the reference to
-	  original shared array. [ruby-core:34997]
-
-Sun Jan 30 17:19:46 2011  Tanaka Akira  <akr@fsij.org>
-
-	* missing/crypt.c: parenthesize macro arguments.
-
-Sun Jan 30 16:40:27 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/rubygems/test_gem_security.rb (TestGemSecurity): valid only
-	  if OpenSSL is available.
-
-	* test/dl/test_dl2.rb (TestDL#test_sin): math functions do not
-	  work on x86_64 due to the design of DL2.
-
-	* test/dl/test_func.rb (DL::TestFunc#test_{sinf,sin): ditto.
-
-Sun Jan 30 16:09:22 2011  Tanaka Akira  <akr@fsij.org>
-
-	* strftime.c (rb_strftime_with_timespec): %G produces 4 digits.
-
-Sun Jan 30 15:13:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/emacs_mule.c (emacsmule_islead): 7bit range is also leading
-	  byte.
-
-Sun Jan 30 13:03:16 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_fetch_m): use useful message for longer key, not a
-	  nonsense id value.
-
-	* string.c (rb_str_ellipsize): new function to ellipsize a string.
-
-	* include/ruby/encoding.h (rb_enc_step_back): new function to step
-	  back n characters.
-
-Sun Jan 30 12:53:38 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enc/emacs_mule.c (emacsmule_islead): fix inverse condition.
-
-Sun Jan 30 09:37:25 2011  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
-
-	* io.c (struct argf): char behaves like an unsigned char
-	  by default on AIX.
-
-Sun Jan 30 08:02:55 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: Mac OS X wrongly reports it has fdatasync(3).
-
-Sun Jan 30 03:29:47 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/openssl/ossl_bn.c (GetBNPtr): add missing nil case.
-	  patched by Martin Bosslet. [ruby-core:34987]
-
-Sun Jan 30 01:02:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* include/ruby/ruby.h: Added NUM2MODET() and MODET2NUM() default
-	  definition.
-	  Because r30686 introduced win32 build failure.
-
-Sat Jan 29 22:16:26 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* array.c (rb_ary_join): [].join.encoding must be US-ASCII.
-	  [ruby-list:47790]
-
-Sat Jan 29 20:22:39 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* benchmark/driver.rb (BenchmarkDriver#measure): Show command line
-	  when abnormal exiting occur.
-
-Sat Jan 29 10:53:16 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* vm_insnhelper.c (vm_get_ev_const): no-scope reference to toplevel
-	  private constant has been prohibited incorrectly.
-
-	* test/ruby/test_module.rb (test_toplevel_private_constant): add a
-	  test for above.
-
-Sat Jan 29 08:43:23 2011  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/rubygems*: Import rubygems 1.5.0 (release candidate @ 09893d9)
-	* test/rubygems: Ditto
-
-Sat Jan 29 02:02:37 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* variable.c (rb_mod_const_of, sv_i): Module#constant should exclude
-	  private constants.  see [ruby-core:32912].
-
-	* test/ruby/test_module.rb (test_constants_with_private_constant): add
-	  a test for above.
-
-Sat Jan 29 01:36:41 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* variable.c (rb_const_set): const_set should preserve constant
-	  visibility.  see [ruby-core:32912].
-
-	* test/ruby/test_module.rb: add a test for above.
-
-Sat Jan 29 01:24:57 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* compile.c (NODE_CLASS, NODE_MODULE), insns.def (defineclass): raise
-	  an exception when "class Foo::Bar" is evaluated and Foo::Bar is
-	  private.  To implement this, define_type of "defineclass" is added
-	  so that the instruction can distinguish whether the class definition
-	  is scoped (class Foo::Bar) or not (class Bar).
-
-	* test/ruby/test_class.rb (test_redefine_private_class),
-	  test/ruby/test_module.rb
-	  (test_define_module_under_private_constant): add tests for above.
-
-Sat Jan 29 01:19:17 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* constant.h, variable.c: to ensure compatibility, rb_const_get_* must
-	  not raise an exception even when the constant is private.  Instead,
-	  rb_public_const_get_* and rb_public_const_defined_* are introduced,
-	  which raise an exception when the referring constant is private.
-	  see [ruby-core:32912].
-
-	* vm_insnhelper.c (vm_get_ev_const): use rb_public_const_get_* instead
-	  of rb_const_get_* to follow the constant visibility when user code
-	  refers a constant.
-
-	* test/ruby/test_marshal.rb (test_marshal_private_class): add a test.
-	  This test had failed because of incompatibility of rb_const_get.
-
-Sat Jan 29 00:30:44 2011  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* variable.c (set_const_visibility): fix typo.  a patch from Tomoyuki
-	  Chikanaga in [ruby-core:32919].
-
-Fri Jan 28 23:20:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create,
-	  TestGDBM2#test_writer_open_notexist): We only need to skip libgdbm
-	  1.8.0, not all 1.8.x. 1.8.1 or later don't have GDBM_WRITER sickness.
-
-Fri Jan 28 21:56:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/dbm/extconf.rb: Added new header places for Fedora13.
-
-Fri Jan 28 21:49:30 2011  Tanaka Akira  <akr@fsij.org>
-
-	* ext/zlib/zlib.c: parenthesize macro arguments.
-
-Fri Jan 28 17:47:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/gdbm/test_gdbm.rb (TestGDBM2#test_writer_open_notexist):
-	  gdbm 1.8.x changed GDBM::WRITER behavior. Thus our testcase need
-	  to be changed too.
-
-Fri Jan 28 17:33:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create): skip
-	  the test if gdbm version is 1.8.x.
-
-Fri Jan 28 16:30:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_require.rb (TestRequire#test_require_too_long_filename):
-	  Added -w option because too long path error don't output a message
-	  by default since r30660. [Bug #4336] [ruby-dev:43134]
-
-Fri Jan 28 16:19:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_require.rb (TestRequire#test_require_path_home_{1,2}):
-	  Added -w option because too long path error don't output a message
-	  by default since r30660. [Bug #4336] [ruby-dev:43134]
-
-Fri Jan 28 16:04:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_require.rb (TestRequire#test_require_path_home_{1,2,3}):
-	  split from test_require_path_home.
-
-Fri Jan 28 13:04:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in (--with-valgrind): Fixed r29683. Now this option
-	  is really default on.
-
-Fri Jan 28 12:05:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: Add #include<sys/stat.h> when struct stat is
-	  tested. Otherwise, incomplete type dereference error will occur.
-
-Fri Jan 28 11:53:19 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: redundant variable names made strange conftest
-	  error. Fixed it.
-
-Fri Jan 28 11:47:00 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_process.rb (TestProcess#test_too_long_path{,2}):
-	  should handle Errno::E2BIG, because this test checks crash of ruby,
-	  not the error type system.
-
-Fri Jan 28 11:23:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_open): Use NUM2MODET() instead NUM2UINT().
-	* io.c (rb_scan_open_args): ditto.
-
-Fri Jan 28 10:58:20 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: Added mode_t type checking.
-	* process.c (rb_exec_arg_addopt): Use NUM2MODET() instead
-	  NUM2LONG because clang makes compile error by this narrowing
-	  conversion.
-	* process.c (rb_run_exec_options_err): ditto.
-
-Fri Jan 28 02:37:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* re.c (rb_reg_raise): add GC guard to prevent intermediate
-	  variable from GC.
-
-Fri Jan 28 02:35:41 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* hash.c (rb_hash_fetch_m): add GC guard to prevent intermediate
-	  variable from GC.
-
-Fri Jan 28 01:33:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_process.rb (TestProcess#test_too_long_path)
-	  TestProcess#test_too_long_path): Reduced string size from 100MB
-	  to 10MB. 100MB may cause no memory error. It isn't intended.
-
-Fri Jan 28 01:27:42 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ruby/test_process.rb (TestProcess#test_too_long_path2):
-	  Factored out from test_too_long_path. A test should only do
-	  one test.
-
-Thu Jan 27 23:29:36 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* st.c (st_foreach): check if unpacked.
-
-Thu Jan 27 23:14:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode-map): remove deprecated binding.
-	  use M-; instead.
-
-Thu Jan 27 21:58:32 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* bignum.c (rb_str_to_inum): get rid of too huge alloca().
-
-Thu Jan 27 21:43:29 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* object.c (rb_str_to_dbl): rewrite again. use ALLOCV instead
-	  rb_str_tmp_new().
-
-Thu Jan 27 21:41:47 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c: get rid of STRNDUPA(). It's dangerous API.
-
-Thu Jan 27 21:31:57 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (rb_w32_aspawn): get rid of too huge alloca().
-	  [Bug #4330] [ruby-core:34898]
-
-Thu Jan 27 20:30:18 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (rb_w32_spawn): get rid of too huge alloca().
-
-Thu Jan 27 18:49:53 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (open_dir_handle): get rid of too huge alloca().
-
-Thu Jan 27 18:34:58 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* file.c (w32_io_info): get rid of too huge alloca().
-	  [Bug #4313] [ruby-core:34830]
-
-Thu Jan 27 18:19:51 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/win32.c (wstati64): get rid of too huge alloca().
-	  [Bug #4316] [ruby-core:34834]
-
-Thu Jan 27 15:11:52 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): get rid of too huge
-	  alloca(). this is the real fix of [ruby-core:34833].
-
-Thu Jan 27 12:46:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (ALLOC_ARGV_WITH_STR): fix void pointer arithmetic.
-
-Thu Jan 27 08:41:40 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_exec_v, rb_proc_exec_n, rb_proc_exec)
-	  (proc_spawn_n, proc_spawn): get rid of too huge alloca().
-	  [ruby-core:34827], [ruby-core:34833]
-
-Thu Jan 27 08:32:17 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (ALLOCV): new API for exception-safe
-	  temporary buffer.  [ruby-core:34844]
-
-	* string.c (rb_alloc_tmp_buffer, rb_free_tmp_buffer):
-	  implementation of the API.
-
-Thu Jan 27 08:22:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln_find.c (dln_find_1): use rb_warning and return immediately
-	  if fname is longer than buffer.
-
-Wed Jan 26 22:57:30 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
-
-	* class.c (clone_method): add GC guard to prevent intermediate
-	  variable from GC. [Bug #4321] [ruby-dev:43107]
+	* error.c (ruby_only_for_internal_use): raise fatal error when
+	  deprecated function only for internal use is called, not just a
+	  warning.
 
-Wed Jan 26 22:45:16 2011  Tanaka Akira  <akr@fsij.org>
+Tue Apr 26 23:42:30 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* template/id.h.tmpl: parenthesize macro arguments.
+	* tool/redmine-backporter.rb (rel): should not raise exceptions even if
+	  the user input is wrong.  only reports the error and continue process.
 
-Wed Jan 26 22:28:49 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+Tue Apr 26 23:35:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate
-	  variable from GC. [Bug #4322] [ruby-dev:43108]
+	* 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]
 
-Wed Jan 26 17:08:59 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Apr 26 21:11:02 2016  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): OpenSSL::ASN1.decode
-	  should reject indefinite length primitive encodings as that is
-	  illegal. Patch by Martin Bosslet. See #4324.
+	* numeric.c (rb_int_lshift): {Fixnum,Bignum}#<< is unified into
+	  Integer.
 
-Wed Jan 26 10:36:28 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* bignum.c (rb_big_lshift): Don't define Bignum#<<.
 
-	* string.c (=~): documentation fix; the return value is nil when
-	  it doesn't match. patched by Andrei Kulakov [ruby-core:34562]
+Tue Apr 26 20:59:40 2016  Tanaka Akira  <akr@fsij.org>
 
-Tue Jan 25 08:41:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (rb_int_rshift): {Fixnum,Bignum}#>> is unified into
+	  Integer.
 
-	* dln_find.c (dln_find_1): omit too long pathnames.
+	* bignum.c (rb_big_rshift): Don't define Bignum#>>.
 
-Tue Jan 25 08:28:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 26 20:46:16 2016  Tanaka Akira  <akr@fsij.org>
 
-	* string.c (rb_str_resize): get rid of out-of-bound access.
+	* numeric.c (int_size): {Fixnum,Bignum}#size is unified into Integer.
 
-Tue Jan 25 07:48:22 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* bignum.c (rb_big_size_m): Don't define Bignum#size.
 
-	* test/ruby/test_thread.rb: remove unused variables.
+	* internal.h (rb_big_size_m): Declared.
 
-Tue Jan 25 07:45:44 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Apr 26 20:09:08 2016  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_thread.rb (TestThread#test_condvar_nolock_2): get
-	  rid of method redefined.
+	* numeric.c (rb_int_bit_length): {Fixnum,Bignum}#bit_length is
+	  unified into Integer.
 
-Tue Jan 25 07:00:52 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_bit_length): Don't define Bignum#bit_length.
 
-	* string.c (rb_string_value_cstr): rb_str_modify can change
-	  RSTRING_PTR.
+	* internal.h (rb_big_bit_length): Declared.
 
-Tue Jan 25 03:24:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Tue Apr 26 19:56:16 2016  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_thread.rb: Added various ConditionVariable tests.
+	* numeric.c (int_abs): Integer#{abs,magnitude} moved from
+	  Fixnum and Bignum.
 
-Mon Jan 24 22:26:33 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* bignum.c (rb_big_abs): Don't define Bignum#{abs,magnitude}.
 
-	* object.c (rb_str_to_dbl): Fix again. use rb_str_tmp_new()
-	  instead ALLOC_N.
+	* internal.h (rb_big_abs): Declared.
 
-Mon Jan 24 21:50:48 2011  Tanaka Akira  <akr@fsij.org>
+Mon Apr 25 14:39:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm_insnhelper.h: parenthesize macro arguments.
+	* ext/rbconfig/sizeof/extconf.rb: just check the existence of each
+	  types, to reduce configuration time, especially cross-compiling.
 
-Mon Jan 24 21:28:34 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* template/sizes.c.tmpl: calculate sizes of checked types at
+	  compilation time.
 
-	* object.c (rb_str_to_dbl): use ALLOC_N instead ALLOCA_N because
-	  ALLOC_N may cause stack overflow.
+Mon Apr 25 11:27:27 2016  Marcus Stollsteimer  <sto.mar@web.de>
 
-Mon Jan 24 21:04:45 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* doc/extension.rdoc: Improvements to english grammars.
+	  [Bug #12246][ruby-core:74792][ci skip]
 
-	* error.c (rb_invalid_str): prevent intermediate variable from GC.
-	  [ruby-core:34820]
+Mon Apr 25 11:17:50 2016  Marcus Stollsteimer  <sto.mar@web.de>
 
-Sun Jan 23 23:01:54 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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`
 
-	* test/io/console/test_io_console.rb: Don't run test if the system
-	  don't support io/console.
+Sun Apr 24 23:29:16 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-Sun Jan 23 22:17:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* configure.in: add missing -lm for AIX.
 
-	* test/fiddle/test_fiddle.rb: Don't run test if the system don't support
-	  fiddle.
+Sun Apr 24 18:33:58 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* test/fiddle/test_function.rb: ditto.
-	* test/fiddle/test_closure.rb: ditto.
+	* vm_insnhelper.c (INLINE): disable r54738 if __NO_INLINE__ is defined.
+	  It caused "undefined reference to `vm_getivar'".
 
-Sun Jan 23 11:39:18 2011  Tanaka Akira  <akr@fsij.org>
+Sun Apr 24 09:32:12 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* vm_exec.h: parenthesize macro arguments.
+	* test/ruby/test_array.rb: Add test cases for Array#sum with
+	  non-numeric objects.
 
-Sun Jan 23 10:33:02 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Apr 24 04:21:27 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* template/fake.rb.in (ruby): suppress warnings.
+	* 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.
 
-Sun Jan 23 08:00:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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.
 
-	* string.c (str_nth_len, str_utf8_nth): return the rest length together.
+	* vm_insnhelper.c (vm_getivar): use `inline` to recommend inline.
+	  Without this vm1_ivar_set is degraded.
 
-	* string.c (rb_str_substr): get rid of measure the length always
-	  to improve performance for huge string.  [ruby-core:34648]
+	  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
 
-Sun Jan 23 00:40:10 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	  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
 
-	* test/test_syslog.rb: Fix to make a lot of test failure if
-	  the platform doesn't support syslog.
+Sat Apr 23 18:01:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sat Jan 22 11:49:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* 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.
 
-	* ext/psych/lib/psych/visitors/to_ruby.rb: fixing merge key support
-	  when multiple merge keys are specified.
+	  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
 
-	* test/psych/test_merge_keys.rb: tests for multi-merge key support
+	  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 Jan 22 11:33:04 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Sat Apr 23 16:11:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys are actually
-	  part of YAML 1.1, so they should be supported.  Remove warning and
-	  merge keys to parent.  [ruby-core:34679]
+	* include/ruby/ruby.h (rb_mul_size_overflow): use UNLIKELY
+	  by user side to improve generality.
 
-	* test/psych/test_merge_keys.rb: test for merge keys
+Sat Apr 23 16:10:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sat Jan 22 10:25:19 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* include/ruby/ruby.h (RB_LIKELY): use prefix in ruby.h.
 
-	* ext/psych/parser.c (parse): add the file name to the exception when
-	  parse errors occur.
+	* intern.h (LIKELY): define with RB_LIKELY.
 
-	* test/psych/test_parser.rb: test for parse error file name
+Sat Apr 23 13:27:25 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-Sat Jan 22 10:12:30 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* NEWS: Add descriptions for Time#to_time updates.
+	  [Bug #12271]
 
-	* ext/psych/parser.c (parse): fix assertion error when reusing a
-	  parser after an exception has been raised
+Sat Apr 23 13:21:24 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* test/psych/test_parser.rb: test for assertion error
+	* NEWS: Add descriptions for DateTime#to_time updates.
+	  [Bug #12189]
 
-Sat Jan 22 04:09:22 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Sat Apr 23 11:21:27 2016  Marcus Stollsteimer  <sto.mar@web.de>
 
-	* ext/psych/lib/psych/nodes/node.rb: Make Psych::Nodes::Node
-	  enumerable.
+	* ext/date/date_core.c (Init_date_core): [DOC] Convert DateTime
+	  documentation to RDoc from Markdown.
+	  [ruby-core:75136] [Bug #12311]
 
-	* ext/psych/lib/psych/visitors/depth_first.rb: Add a depth-first
-	  visitor to enumerate over a YAML AST in a depth-first fashion
+Sat Apr 23 09:03:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/psych/nodes/test_enumerable.rb: test for enumerating nodes
+	* ruby.c: cygwin does not use w32_cmdvector, command line can be
+	  other than UTF-8.  [ruby-dev:49519] [Bug #12184]
 
-	* test/psych/visitors/test_depth_first.rb: test for depth-first
-	  visitor
+Sat Apr 23 01:00:03 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-Sat Jan 22 00:53:42 2011  Tanaka Akira  <akr@fsij.org>
+	* 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.
 
-	* vm_core.h: parenthesize macro arguments.
+Fri Apr 22 21:00:44 2016  Tanaka Akira  <akr@fsij.org>
 
-Fri Jan 21 18:15:09 2011  Nobuyoshi Nakada  <nobu@ruby-lang.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.
 
-	* configure.in: should not use -Werror=* flags while conftests.
+Fri Apr 22 20:18:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Jan 21 09:17:00 2011  Luis Lavena  <luislavena@gmail.com>
+	* include/ruby/ruby.h (rb_mul_size_overflow): added to handle
+	  mul overflow efficiently.
 
-	* configure.in: Fix incorrectly detected x86_64-w64-mingw32 due
-	  canonalization of target_os. Bug #3889 [ruby-core:32634]
+	* include/ruby/ruby.h (rb_alloc_tmp_buffer2): use rb_mul_size_overflow
+	  and avoid division where it can define DSIZE_T.
 
-Thu Jan 20 23:44:00 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* gc.c (xmalloc2_size): moved from ruby.h and use rb_mul_size_overflow.
 
-	* configure.in: Fix rb_cv_va_args_macro was broken. We are using
-	  -Werror=implicit-function-declaration compile option. therefore
-	  we need a function declaration explicitly.
+Fri Apr 22 20:34:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jan 20 23:58:02 2011  Tanaka Akira  <akr@fsij.org>
+	* time.c (time_asctime): [DOC] add ctime example, not only
+	  asctime.  [ruby-core:75126] [Bug #12310]
 
-	* node.h: parenthesize macro arguments.
+Fri Apr 22 18:44:32 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu Jan 20 23:25:28 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* variable.c: use uint32_t instead of long to avoid confusion about
+	  the type of ivtbl->numiv.
 
-	* configure.in: Add '#include <stdlib.h>' to
-	  rb_cv_localtime_overflow test too. It's reported by Tomoyuki
-	  Chikanaga. Thanks.
+Fri Apr 22 15:09:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jan 20 16:11:00 2011  Kenta Murata <mrkn@mrkn.jp>
+	* eval_jump.c (exec_end_procs_chain): restore previous error info
+	  for each end procs.  [ruby-core:75038] [Bug #12302]
 
-	* README.EXT, README.EXT.ja: You shouldn't choose ``conftest.c'' as a
-	  name of a source file.
+Fri Apr 22 15:04:56 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Jan 20 12:15:44 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* 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.
 
-	* configure.in: Add stdlib.h inclusion into rb_cv_negative_time_t
-	  test because it's required for exit(3). The patch is
-	  created by Tomoyuki Chikanaga. [Bug #4287] [ruby-dev:43060]
+Fri Apr 22 14:52:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Jan 20 11:39:41 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* tool/merger.rb: remove temporary file.
 
-	* test/webrick/utils.rb (TestWEBrick::RubyBin): test CGI does not need
-	  to load rubygems.  if it activated, ruby raises LoadError about
-	  rbconfig.rb.
+Fri Apr 22 11:27:03 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Thu Jan 20 09:19:42 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+	* lib/net/http.rb: Improve documentation for SSL requests via GET method.
+	  [fix GH-1325][ci skip] Patch by @jsyeo
 
-	* ext/psych/lib/psych/visitors/json_tree.rb: Fix JSON emit for
-	  DateTime and Time classes.
+Fri Apr 22 10:51:13 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* test/psych/test_json_tree.rb: test for JSON emit
+	* lib/webrick/ssl.rb: Support to add SSLCiphers option.
+	  [fix GH-1321] Patch by @rhadoo
 
-Thu Jan 20 08:02:46 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Fri Apr 22 10:43:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/psych/lib/psych/coder.rb (represent_object): arbitrary objects
-	  may be passed to the Psych::Coder object.
+	* file.c, win32/file.c: Removed obsoleted safe level checks.
+	  [fix GH-1327] Patch by @cremno
 
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: support for visiting
-	  arbitrary objects set on the coder.
+Fri Apr 22 10:01:48 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* test/psych/test_coder.rb: supporting test case.
+	* benchmark/bm_so_meteor_contest.rb: fix a typo.
+	  [fix GH-1330][ci skip] Patch by @sachin21
 
-Thu Jan 20 06:03:17 2011  Tanaka Akira  <akr@fsij.org>
+Fri Apr 22 04:57:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* method.h: parenthesize macro arguments.
+	* gc.c (rb_alloc_tmp_buffer_with_count): added like xmalloc2 to
+	  avoid duplicated check of size.
 
-Wed Jan 19 13:16:05 2011  Eric Hodel  <drbrain@segment7.net>
+	* gc.c (ruby_xmalloc2): added to keep separate layers.
 
-	* lib/rubygems/commands/sources_command.rb: Finish removing code,
-	  (fixes sources command test).
+	* include/ruby/ruby.h (rb_alloc_tmp_buffer2): added to check
+	  the size more statically.
 
-Wed Jan 19 13:04:16 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Fri Apr 22 04:54:40 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* proc.c (proc_call): Add gc guard to avoid segfault. The fix
-	  is created by Tomoyuki Chikanaga. [Bug #4238][ruby-dev:42963]
+	* include/ruby/ruby.h (LIKELY): moved from internal.h.
 
-Wed Jan 19 12:31:28 2011  Eric Hodel <drbrain@segment7.net>
+	* include/ruby/ruby.h (UNLIKELY): ditto.
 
-	* lib/rubygems.rb: Since gem_prelude requires rubygems, enable
-	  custom_require always.
+Thu Apr 21 01:44:19 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Jan 19 12:08:08 2011  Eric Hodel <drbrain@segment7.net>
+	* 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).
 
-	* lib/rubygems/commands/dependency_command.rb: Remove require of
-	  deleted file.
-	* lib/rubygems/commands/fetch_command.rb: ditto
-	* lib/rubygems/commands/setup_command.rb: ditto
-	* lib/rubygems/commands/sources_command.rb: ditto
-	* lib/rubygems/commands/specification_command.rb: ditto
+	* gc.c (objspace_xmalloc0): common xmalloc function.
 
-Wed Jan 19 08:13:59 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+	* gc.c (objspace_xmalloc): introduce its own size check.
 
-	* lib/rubygems*: Import rubygems 1.5.0 (release candidate)
-	* test/rubygems: Ditto
+	* gc.c (objspace_xmalloc2): separated from ruby_xmalloc2 to clarify
+	  the layer who has the responsibility to check the size.
 
-Tue Jan 18 23:31:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+	* gc.c (objspace_xrealloc): remove duplicated size check.
 
-	* parse.y: avoid NULL reference.  [ruby-dev:43067]
+	* gc.c (ruby_xmalloc2): use objspace_xmalloc2.
 
-Wed Jan 19 02:54:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* include/ruby/ruby.h (ruby_xmalloc2_size): follow the size limit
+	  as SSIZE_MAX. Note that ISO C says size_t is unsigned integer.
 
-	* vsnprintf.c (cvt): set first byte of buf to NUL for the case when
-	  no bytes are written to the buf. [ruby-dev:43062]
+Thu Apr 21 12:14:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jan 18 23:04:51 2011  Tanaka Akira  <akr@fsij.org>
+	* configure.in: check if succeeded in creating config.h.
 
-	* gc.h: parenthesize macro arguments.
+	* 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]
 
-Tue Jan 18 18:31:14 2011  Keiju Ishitsuka  <keiju@ishitsuka.com>
+Wed Apr 20 17:33:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/irb/completion.rb: Irb tab completion support for XX::method
-	  forms.
+	* ext/cgi/escape/escape.c (cgiesc_unescape): define unescape
+	  method instead of _unescape, and should pass the optional
+	  argument to the super method.
 
-Tue Jan 18 15:05:55 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/cgi/util.rb (CGI::Util#_unescape): remove intermediate
+	  method.
 
-	* lib/logger.rb: added RDoc document for logging message escape
-	  by Hal Brodigan. See #3869
+Wed Apr 20 15:52:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jan 18 07:53:52 2011  Tanaka Akira  <akr@fsij.org>
+	* error.c (syntax_error_initialize): move the default message,
+	  "compile error", from parse.y.  the default parameter should
+	  belong to the class definition.
 
-	* eval_intern.h: parenthesize macro arguments.
+	* parse.y (yycompile0): use the default parameter.
 
-Tue Jan 18 04:42:44 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Wed Apr 20 10:25:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/psych/lib/psych/parser.rb (Mark): Adding a class to wrap
-	  marker information
+	* compile.c (append_compile_error): use rb_syntax_error_append.
 
-	* ext/psych/parser.c (mark): Add a method to return the mark object
-	  for the parser
+	* error.c (rb_syntax_error_append): append messages into a
+	  SyntaxError exception instance.
 
-	* test/psych/test_parser.rb: tests for the Mark class.
+	* parse.y (yycompile0): make new SyntaxError instance in main
+	  mode, otherwise error_buffer should be a SyntaxError if error
+	  has occurred.
 
-Tue Jan 18 02:46:55 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Apr 19 17:42:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/psych/lib/psych/visitors/json_tree.rb (visit_String): JSON
-	  strings should be dumped with double quotes. [ruby-core:34186]
+	* error.c (err_vcatf): rename, and separate appending message from
+	  creating a string buffer.
 
-	* test/psych/test_json_tree.rb: test for double quotes
+	* error.c (rb_syntax_error_append): merge rb_error_vsprintf and
+	  rb_compile_err_append.
 
-Mon Jan 17 23:36:33 2011  Tanaka Akira  <akr@fsij.org>
+	* parse.y (parser_compile_error): use rb_syntax_error_append.
 
-	* array.c (rb_ary_times): less MEMCPY calls.
+Tue Apr 19 13:46:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Jan 17 22:54:33 2011  Tanaka Akira  <akr@fsij.org>
+	* compile.c (append_compile_error, compile_bug): pass iseq and get
+	  error info and file from it, not by the thread error info.
 
-	* debug.h: parenthesize macro arguments.
+	* error.c (rb_report_bug_valist): take va_list instead of variadic
+	  arguments, and just report the bug but not abort.
 
-Mon Jan 17 21:40:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 19 13:18:12 2016  Naotoshi Seo  <sonots@gmail.com>
 
-	* ruby.c (process_options): revert r30549.
+	* 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
 
-Sun Jan 16 20:55:45 2011  Tanaka Akira  <akr@fsij.org>
+Tue Apr 19 13:12:03 2016  Naotoshi Seo  <sonots@gmail.com>
 
-	* vsnprintf.c: parenthesize macro arguments.
+	* ChangeLog: Fix dates of previous commits
 
-Sat Jan 15 11:57:30 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 19 12:45:03 2016  Naotoshi Seo  <sonots@gmail.com>
 
-	* configure.in (warnflags): add -Werror=implicit-function-declaration
-	  if available.
+	* ChangeLog: Add descriptions for logger updates
+	* NEWS: Add descriptions for logger updates
 
-	* lib/mkmf.rb (init_mkmf): ignore warnings in mkmf tests.
+Tue Apr 19 12:45:02 2016  Naotoshi Seo  <sonots@gmail.com>
 
-	* test/mkmf/base.rb (setup, teardown): restore config values.
+	* lib/logger.rb: Add shift_period_suffix option
 
-	* test/mkmf/test_flags.rb: split from test_find_executable.rb.
+Tue Apr 19 12:45:01 2016  Naotoshi Seo  <sonots@gmail.com>
 
-Sat Jan 15 10:04:14 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/logger.rb: Allow specifying logger parameters in constructor
+	  such as level, progname, datetime_format, formatter.
 
-	* ruby.c (process_options): autoload rubygems.
+Mon Apr 18 16:07:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* tool/compile_prelude.rb (Prelude#initialize): ignore empty
-	  preludes.
+	* 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]
 
-	* ruby.c (ruby_init_prelude): get rid of global namespace
-	  pollution.
+Mon Apr 18 12:56:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Jan 15 09:42:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (flo_truncate): add an optional parameter, digits, as
+	  well as Float#round.  [Feature #12245]
 
-	* include/ruby/io.h: missing prototypes.
+	* numeric.c (int_truncate): add an optional parameter, digits, as
+	  well as Integer#round.  [Feature #12245]
 
-Fri Jan 14 23:25:55 2011  Tanaka Akira  <akr@fsij.org>
+Sun Apr 17 04:18:56 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-	* vm_method.c: parenthesize macro arguments.
+	* tool/redmine-backporter.rb: revisions are strings.
 
-Fri Jan 14 15:32:29 2011  Shugo Maeda  <shugo@ruby-lang.org>
+Sat Apr 16 14:26:49 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* test/net/imap/test_imap.rb: call neither logout nor disconnect
-	  unless connected.  patch by Kazuhiro NISHIYAMA.  [ruby-dev:42860]
+	* ext/date/date_core.c : remove not used f_getlocal macro.
+	  After r54553 f_getlocal macro is not used.
 
-Fri Jan 14 14:56:57 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Apr 16 14:15:24 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* lib/net/imap.rb: use bytesize for binary strings.
-	  patched by Yoshimasa Niwa. [ruby-core:34222]
+	* ext/date/date_core.c : remove not used f_utc6 macro.
+	  After r54169 f_utc6 macro is not used.
 
-Fri Jan 14 14:01:12 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Apr 16 10:00:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* pack.c (pack_unpack): the resulted string of unpack('M') must have
-	  ASCII-8BIT encoding (and ENC_CODERANGE_VALID). [ruby-core:34482]
+	* struct.c (struct_make_members_list, rb_struct_s_def): member
+	  names should be unique. [ruby-core:74971] [Bug #12291]
 
-Fri Jan 14 13:38:58 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* struct.c (struct_make_members_list): extract making member name
+	  list from char* va_list, with creating symbols without
+	  intermediate IDs.
 
-	* ext/zlib/zlib.c (gzfile_check_footer): ISIZE (Input SIZE) in
-	  gzip's header is the size of uncompressed input data modulo 2^32.
-	  [ruby-core:34481] http://www.ietf.org/rfc/rfc1952.txt
+Sat Apr 16 01:33:27 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-Fri Jan 14 11:36:25 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* tool/redmine-backporter.rb: sort revisions.
 
-	* configure.in, win32/Makefile.sub (RUNRUBY): require path should
-	  include "." because rbconfig.rb is there.
+Sat Apr 16 01:16:02 2016  Tanaka Akira  <akr@fsij.org>
 
-Fri Jan 14 10:40:11 2011  Ryan Davis  <ryan@lust.local>
+	* array.c (rb_ary_sum): Don't yield same element twice.
+	  Found by nagachika.
 
-	* gem_prelude.rb: Just require rubygems. Fixes rubygems 1.4.
-	* lib/rubygems.rb: removed all Gem::Quickloader code.
-	* ruby.c: renamed ruby_init_gems to ruby_init_prelude. Set
-	  $disable_rubygems since there is no fine grained mechanism to
-	  skip parts of the prelude. Open to suggestions on how to do this
-	  better.
-	* test/*.rb: Load path isn't set up correctly, so add
-	  --disable-gems as needed to failing tests that are explicitly
-	  testing stderr w/ ==.
+Sat Apr 16 01:03:32 2016  Tanaka Akira  <akr@fsij.org>
 
-Fri Jan 14 07:30:47 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_sum): Fix SEGV by [1/2r, 1].sum.
 
-	* io.c (argf_next_argv): go advance when the next file cannot be
-	  read.  [ruby-core:34446]
+Fri Apr 15 23:52:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Thu Jan 13 20:49:19 2011  Tanaka Akira  <akr@fsij.org>
+	* rational.c (rb_rational_plus): rename from rb_rational_add
+	  to be aligned with rb_fix_plus.
 
-	* vm_insnhelper.c: parenthesize macro arguments.
+	* array.c (rb_ary_sum): ditto.
 
-Thu Jan 13 13:21:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* internal.h: ditto.
 
-	* vm_dump.c: delete dashes to make lines 80 chars, Patched by
-	  Shota Fukumori (sora_h).  [Bug #4275] [ruby-dev:43021]
+Fri Apr 15 23:42:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Thu Jan 13 13:21:00 2011  Kenta Murata  <mrkn@mrkn.jp>
+	* rational.c (rb_rational_add): rename from nurat_add.
 
-	* vm_dump.c: fix misspelling of CrashReporter, Patched by Shota
-	  Fukumori (sora_h).  [Bug #4275] [ruby-dev:43021]
+	* array.c (rb_ary_sum): use rb_rational_add directly.
 
-Thu Jan 13 06:27:29 2011  Ryan Davis  <ryand-ruby@zenspider.com>
+	* test/ruby/test_array.rb (test_sum): add assertions for an array of
+	  Rational values.
 
-	* error.c: Exception#to_s should actually call to_s.
+Fri Apr 15 22:31:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Thu Jan 13 00:32:54 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	* array.c (rb_ary_sum): apply the precision compensated algorithm
+	  for an array in which Rational and Float values are mixed.
 
-	* addr2line.c (get_nth_dirname): decrement the directory index
-	  because the index specifies the index of given included_directories
-	  which is separated by NUL and its index is begun from 1.
-	  Note that 0 specifies the current directory of the compilation.
-	  see also http://www.dwarfstd.org/doc/dwarf-2.0.0.pdf
+	* test/ruby/test_array.rb (test_sum): add assertions for the above
+	  change.
 
-Thu Jan 13 00:06:38 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Fri Apr 15 22:30:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (rb_f_syscall): Add warning messages. [ruby-core:34062]
+	* thread.c (rb_thread_setname): defer setting native thread name
+	  set in initialize until the native thread is created.
+	  [ruby-core:74963] [Bug #12290]
 
-Thu Jan 13 00:00:07 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Fri Apr 15 20:27:16 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* io.c (rb_f_syscall): Some syscall return unsigned or pointer value.
-	  Therefore we should only check the result is -1 or not.
-	  [ruby-core:34062]
+	* lib/irb/ext/save-history.rb: Fix NoMethodError when method is not defined.
 
-Wed Jan 12 23:55:48 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Fri Apr 15 15:38:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* io.c (rb_f_syscall): Add 64bit Linux support. Some syscall takes
-	  long type arguments.
+	* common.mk (benchmark): order options for built-ruby and compare-ruby.
 
-Wed Jan 12 19:37:10 2011  Tanaka Akira  <akr@fsij.org>
+Fri Apr 15 14:14:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* vm_dump.c: parenthesize macro arguments.
+	* test/ruby/test_array.rb (test_sum): add assertions for Rational and
+	  Complex numbers.
 
-Wed Jan 12 19:28:23 2011  Tanaka Akira  <akr@fsij.org>
+Fri Apr 15 10:07:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm.c (thread_free): reset ruby_current_thread if it points the
-	  thread to free.
-	* gc.c (slot_sweep): don't call RUBY_VM_SET_FINALIZER_INTERRUPT if
-	  there is no current thread.
-	  [ruby-dev:43000]
+	* 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.
 
-Wed Jan 12 19:09:29 2011  Tanaka Akira  <akr@fsij.org>
+Fri Apr 15 09:02:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enum.c (sort_by_i): reenter check more strictly.
-	  (sort_by_cmp): ditto.
-	  [ruby-dev:43003] reported by Usaku NAKAMURA.
+	* ext/io/console/console.c (rb_sym2str): fallback definition for
+	  older ruby.  [ruby-core:74953] [Bug #12284]
 
-Wed Jan 12 16:25:12 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Thu Apr 14 21:46:36 2016  Tanaka Akira  <akr@fsij.org>
 
-	* lib/net/http.rb (Net::HTTP#connect): makes it timeout during
-	  SSL handshake too. [ruby-core:34203]
-	  Patch by Marc Slemko.
+	* array.c (rb_ary_sum): Support the optional argument, init, and
+	  block.
 
-	* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_timeout_during_HTTP_session):
-	  test for [ruby-core:34203]
+Thu Apr 14 19:02:41 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/net/http/test_https.rb (TestNetHTTPS#test_timeout_during_SSL_handshake):
-	  ditto.
+	* lib/irb/ext/save-history.rb: suppress warning: method redefined;
+	  discarding old save_history=.
 
-Wed Jan 12 16:24:53 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Thu Apr 14 14:58:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/readline/extconf.rb: new checks for RL_PROMPT_START_IGNORE
-	  and RL_PROMPT_END_IGNORE. [ruby-core:34331]
+	* 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
 
-	* ext/readline/readline.c: enables USE_INSERT_IGNORE_ESCAPE only if
-	  RL_PROMPT_{START,END}_IGNORE are available to get rid of compilation
-	  error with libedit.
+Thu Apr 14 14:28:55 2016  cremno phobia  <cremno@mail.ru>
 
-Wed Jan 12 15:53:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* cont.c (fiber_initialize_machine_stack_context): fix wrong
+	  _MSC_VER check, should be decimal but not hexadecimal.
+	  [ruby-core:74936] [Bug #12279]
 
-	* README.EXT.ja (rb_ensure): typo.
+Wed Apr 13 22:51:38 2016  Tanaka Akira  <akr@fsij.org>
 
-Wed Jan 12 11:33:46 2011  NARUSE, Yui  <naruse@ruby-lang.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.
 
-	* addr2line.c: OpenBSD uses the elf_abi.h header file instead of the
-	  elf.h header file. patched by Jeremy Evans [ruby-core:34384]
+	* enum.c (ary_inject_op): Don't specialize for float numbers.
 
-Wed Jan 12 03:59:36 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+	  [ruby-core:74569] [Feature #12217] proposed by mrkn.
 
-	* test/webrick/test_cgi.rb: Removes usage of deprecated
-	  :RequestHandler option.
-	  patched by Peter Weldon [ruby-core:34010]
+Wed Apr 13 15:56:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/webrick/test_httpproxy.rb: ditto.
+	* numeric.c (flo_ceil): add an optional parameter, digits, as
+	  well as Float#round.  [Feature #12245]
 
-	* test/webrick/test_httpserver.rb: Add a test of the deprecation
-	  behaviour.
+	* numeric.c (flo_floor): add an optional parameter, digits, as
+	  well as Float#round.  [Feature #12245]
 
-Wed Jan 12 08:37:07 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (int_ceil): add an optional parameter, digits, as
+	  well as Integer#round.  [Feature #12245]
 
-	* hash.c (hash_i): return different values for inverse hash.
-	  [ruby-core:34334]
+	* numeric.c (int_floor): add an optional parameter, digits, as
+	  well as Integer#round.  [Feature #12245]
 
-Tue Jan 11 20:32:59 2011  Tanaka Akira  <akr@fsij.org>
+Wed Apr 13 14:47:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* variable.c: parenthesize macro arguments.
+	* file.c (Init_File): add alias File.empty? to File.zero?.
+	  [Feature #9969]
 
-Tue Jan 11 13:06:38 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Apr 13 14:36:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* array.c (rb_ary_resize): should care of embeded array when extending
-	  the array.
+	* parse.y (assign_in_cond): allow multiple assignment in
+	  conditional expression.  [Feature #10617]
 
-	* array.c (rb_ary_resize): need to set capa when changing the real
-	  size of the array.
-	  these are latent bugs.
+Wed Apr 13 14:11:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Jan 10 22:46:43 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_size): add wrapper function of BIGSIZE and
+	  rename the method function with _m suffix.
 
-	* include/ruby/defines.h (CASEFOLD_FILESYSTEM): HFS+ is case
-	  insensitive.
+	* numeric.c (int_round_zero_p): extracted from rb_int_round.
+	  optimize for Bignum, and convert VALUE returned by Numeric#size
+	  to long.
 
-	* load.c (loaded_feature_path, rb_feature_p, load_lock): on a
-	  case-insensitive filesystem, loaded features search should
-	  ignore case.  [ruby-core:34297]
+Wed Apr 13 12:00:08 2016  Koichi Sasada  <ko1@atdot.net>
 
-Mon Jan 10 21:34:12 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_basicinstructions.rb: add a test to check access
+	  instance variables on special const objects.
 
-	* common.mk (showflags): show LD commands.
+	  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).
 
-Mon Jan 10 14:32:55 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 12 20:40:35 2016  Kaneko Yuichiro  <spiketeika@gmail.com>
 
-	* test/ruby/test_method.rb (TestMethod#test_define_method): method
-	  transplanting between class and module is impossible.
+	* ext/date/date_core.c (time_to_time): should preserve timezone
+	  info.  [ruby-core:74889] [Bug #12271]
 
-Mon Jan 10 13:51:17 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 12 11:51:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* misc/rdoc-mode.el (rdoc-mode): show trailing whitespace.
+	* compile.c (new_label_body): initialize bit fields, since
+	  compile_data_alloc does not clear the memory.  [Bug #12082]
 
-Mon Jan 10 11:22:02 2011  Tanaka Akira  <akr@fsij.org>
+Mon Apr 11 20:18:43 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* util.c: parenthesize macro arguments.
+	* vm_backtrace.c (frame2klass): filter only for imemo_ment.
+	  T_IMEMO/imemo_iseq can be passed here.
 
-Mon Jan 10 07:41:31 2011  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Mon Apr 11 17:43:04 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* misc/README: mention rdoc-mode.el and ruby-style.el.
+	* compile.c (iseq_optimize): disable tail call optimization in
+	  rescued, rescue, and ensure blocks.
+	  [ruby-core:73871] [Bug #12082]
 
-Sun Jan  9 20:37:21 2011  Tanaka Akira  <akr@fsij.org>
+Mon Apr 11 06:54:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* transcode.c: parenthesize macro arguments.
+	* file.c (apply2files): apply to a VALUE vector instead of a
+	  temporary array.
 
-Sun Jan  9 16:31:53 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Sun Apr 10 20:54:16 2016  Joe Swatosh  <joe.swatosh@gmail.com>
 
-	* io.c (Kernel.#syscall): implemented on LP64/LLP64 environments too.
-	  also uses __syscall if available for *BSD on 64bit architecture.
-	  [ruby-core:34062]
+	* ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix
+	  API names.  [ruby-core:74863] [Bug #12264]
 
-Sun Jan  9 16:31:34 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Sun Apr 10 17:47:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/irb/locale.rb (IRB::Locale::LOCALE_NAME_RE):
-	  some platform has a locale without territory but with
+	* 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.
-	  (#each_sub_locale): ditto.
-
-Sun Jan  9 14:47:50 2011  TAKAO Kouji  <kouji@takao7.net>
-
-	* ext/readline/readline.c: apply a patch from Nobuyoshi Nakada.
-	  fixed #3616 [ruby-core:31484] IRB + readline incorrectly counts
-	  non-printing characters in prompt
-
-Sat Jan  8 21:47:26 2011  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_sort_by): use rb_ary_resize.
-	  (ary_cutoff): removed.
-
-Sat Jan  8 21:24:17 2011  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (swapf): compilation condition simplified.
-	  (swapd): ditto.
-
-Sat Jan  8 20:51:25 2011  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (swapd): remove duplicated code.
-
-Sat Jan  8 19:28:55 2011  Tanaka Akira  <akr@fsij.org>
-
-	* thread.c: parenthesize macro arguments.
-
-Fri Jan  7 23:07:40 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (configuration): backref needs to capture.
-
-Fri Jan  7 21:57:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-mode-variables), misc/ruby-style.el:
-	  show trailing whitespace.
-
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): highlight
-	  regexp after open bracket.  [ruby-core:34183]
-
-Fri Jan  7 00:37:35 2011  Tanaka Akira  <akr@fsij.org>
-
-	* string.c: parenthesize macro arguments.
-
-Thu Jan  6 22:42:02 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (bigmul1_karatsuba): avoid overflow that make assertion
-	  fail in certain case.  this patch is contributed from Ray Chason
-	  <chasonr at gmail.com> in personal communication.
-
-Thu Jan  6 20:55:49 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): ignore rest from first dot from
-	  TARGET to generate init function name.
-	  this is followup of r30464.
-
-Thu Jan  6 11:27:01 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/json/tree_builder.rb (start_mapping): tags
-	  should not be included in JSON mapping
-
-Thu Jan  6 09:23:33 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/net/protocol.rb (eof?): BufferedIO should proxy eof? to the
-	  underlying IO object.
-
-Thu Jan  6 09:12:31 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/mkmf.rb (configuration): fixing gsub when multiple error flags
-	  are passed to GCC.
-
-Thu Jan  6 05:25:49 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_modify): export.
-
-Thu Jan  6 05:14:41 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (get_strio, strio_set_string)
-	  (strio_reopen): check if frozen.  [ruby-core:33648]
-
-Thu Jan  6 05:10:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_resize): new utility function.  [ruby-dev:42912]
-
-Thu Jan  6 05:03:26 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln.c (init_funcname_len): ignore rest from first dot.
-	  [ruby-dev:41774]
-
-Thu Jan  6 02:55:48 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/yaml_tree.rb: use YAML 1.0 output
-	  format for serializing nil values.  Thanks Eric Hodel!
-
-	* test/psych/test_nil.rb: test for nil values
-
-Wed Jan  5 14:21:34 2011  Mark Dodwell  <hi@mkdynamic.co.uk>
-
-	* string.c: fix rdoc typo.
-	  https://github.com/shyouhei/ruby/pull/3
-
-Wed Jan  5 14:06:01 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/rdoc/test_rdoc_options.rb (TestRDocOptions#test_check_files):
-	  skip on Windows because chmod 0 doesn't mean unreadable by owner.
-
-Wed Jan  5 13:56:54 2011  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/net/http.rb (Net::HTTP#get): A header hash given should not
-	  be modified.
-
-Wed Jan  5 12:10:08 2011  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/dl/{cfunc.c,dl.h,handle.c}, ext/fiddle/fiddle.{h,c}: Use _WIN32
-	  rather than checking for windows.h.  Thanks Jon Forums!
-	  [ruby-core:33977]
-
-Sat Jan  1 17:02:50 2011  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* lib/irb/locale.rb (IRB::Locale#search_file): make it possible
-	  to load a localization from a gem.
-	  (IRB::Locale#lc_path): obsoleted because of the change of #search_file
-	  (IRB::Locale#each_localized_path): new private method, based on
-	  lc_path
-	  (IRB::Locale#find): follows the change of #search_file.
-	  (IRB::Locale#load): removed duplicate with #find.
-
-Sat Jan  1 11:44:42 2011  Tanaka Akira  <akr@fsij.org>
-
-	* strftime.c: parenthesize macro arguments.
-
-Sat Jan  1 11:10:29 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c: take care of platforms where long is bigger
-	  than int.
-
-Sat Jan  1 11:03:58 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* NEWS (optparse): shell completion support.
-
-	* misc/README (rb_optparse.{bash,zsh}): for shell completion.
-
-	* include/ruby/intern.h (VALUE rb_ary_print_on): I have never seen
-	  this function anywhere.
-
-Sat Jan  1 04:20:11 2011  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_write_console): don't raise exception when
-	  the conversion is for writing to console.
-	  Patched by Heesob Park [ruby-core:33999]
-
-Fri Dec 31 12:02:06 2010  Tanaka Akira  <akr@fsij.org>
-
-	* enum.c (enum_sort_by): use less temporary objects.
-
-Fri Dec 31 11:46:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in (warnflags), lib/mkmf.rb (configuration): turn
-	  warnings into errors only for bundled extensions.
-	  [ruby-core:33815]
+Sat Apr  9 10:03:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Dec 31 11:15:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* load.c (rb_f_load): raise with the original path name before
+	  encoding conversion.
 
-	* ext/zlib/zlib.c (sizeof): zlib.h mistakenly assumes the result
-	  of sizeof to be int, not size_t.
+Sat Apr  9 02:05:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Dec 31 10:27:34 2010  Tanaka Akira  <akr@fsij.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.
 
-	* st.c: parenthesize macro arguments.
+	* bignum.c (rb_str_to_inum): preserve encoding of the argument in
+	  error messages, and no longer needs to copy non-terminated
+	  strings.
 
-Fri Dec 31 03:23:26 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* bignum.c (rb_str2big_{poweroftwo,normal,karatsuba,gmp}): ditto.
 
-	* vsnprintf.c (BSD__uqtoa): Fix overflow when long != quad_t.
-	  patched by Peter Weldon <peter.weldon AT null.net>
-	  [ruby-core:33985]
+Thu Apr  7 19:04:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Dec 31 03:00:34 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* doc/regexp.rdoc (comments): [DOC] terminators cannot appear in
+	  comments.  [ruby-core:74838] [Bug #12256]
 
-	* Makefile.in: remove unnecessary semicolons.
+Thu Apr  7 11:24:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Dec 30 23:09:47 2010  wanabe  <s.wanabe@gmail.com>
+	* ext/tk/tkutil/tkutil.c (cbsubst_initialize): fix out-of-bound
+	  access when no arguments given.  `p Tk::Event.new` crashed.
 
-	* vm.c (vm_define_method): guard iseq from GC while method definition.
-	  [ruby-dev:42832]
+Fri Apr  1 01:26:00 2016  Benoit Daloze  <eregontp@gmail.com>
 
-Thu Dec 30 20:18:32 2010  KOSAKI Motohiro  <kosaki.motohiro@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]
 
-	* win32/Makefile.sub: ditto.
+	* ext/coverage/coverage.c (rb_coverages): remove unused static state.
 
-Thu Dec 30 20:57:09 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* thread.c: Moved and renamed coverage_clear_result_i to reset_coverage_i.
 
-	* Makefile.in: Check V=1 argument if run "make clean" or similar.
+	* test/coverage/test_coverage.rb: improve precision of tests.
 
-Thu Dec 30 20:41:50 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+Wed Apr  6 22:41:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* Makefile.in: Kill ugly line continuation.
+	* configure.in (rb_cv_lgamma_r_m0): fix the condition for
+	  lgamma_r(-0.0).  [Bug #12249]
 
-Thu Dec 30 11:49:40 2010  Tanaka Akira  <akr@fsij.org>
+Wed Apr  6 17:38:42 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* sprintf.c: parenthesize macro arguments.
+	* tool/downloader.rb (RubyGems.download): follow the change of the
+	  rubygems ssl_certs directory tree introduced by previous commit.
 
-Wed Dec 29 21:20:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr  6 15:00:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* io.c (maygvl_copy_stream_wait_readwrite): define if USE_SENDFILE
+	* 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 Dec 29 20:37:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr  6 14:13:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/extmk.rb: strip current directory prefix.
+	* configure.in (rb_cv_lgamma_r_m0): check if lgamma_r(-0.0)
+	  returns negative infinity.  [Bug #12249]
 
-	* enc/depend (clean): remove name2ctype.h when out-of-place build.
+	* math.c (ruby_lgamma_r): define by the configured result.
 
-	* win32/Makefile.sub (clean-enc): pass V to inferior make.
+Wed Apr  6 10:56:15 2016  Anton Davydov  <antondavydov.o@gmail.com>
 
-Wed Dec 29 18:23:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* re.c (rb_reg_expr_str): need to escape if the coderange is invalid.
-
-Wed Dec 29 10:06:51 2010  Tanaka Akira  <akr@fsij.org>
-
-	* signal.c: parenthesize macro arguments.
-
-Wed Dec 29 07:22:15 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rake/rdoctask.rb: Deprecate in favor of rdoc/task.
-
-Wed Dec 29 07:07:06 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Import RDoc 3.1
-
-Tue Dec 28 18:36:38 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* error.c, include/ruby/intern.h (rb_compile_error_with_enc): new
-	  function to raise syntax error, with source encoding'ed message.
-
-	* parse.y (compile_error): use above function.
-	  [ruby-core:33951] (#4217)
-
-Tue Dec 28 07:37:38 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ruby.c: parenthesize macro arguments.
-
-Tue Dec 28 07:17:11 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add ARGF.write and so on.
-
-Tue Dec 28 07:12:38 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add new magic-comment. (warn-indent) [ruby-core:25442]
-
-Tue Dec 28 04:32:37 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/fiddle/extconf.rb: check for windows.h while building fiddle.
-	  Thanks Jon Forums! [ruby-core:33923]
-
-Tue Dec 28 01:45:12 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: Add Zlib.deflate and Zlib.inflate.
-	  [ruby-dev:42833]
-
-Mon Dec 27 21:22:33 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/configure.bat: Remove obsoleted coding rule. Now, we
-	  don't support to build on Windows 95/98 and Me.
-
-Mon Dec 27 18:27:13 2010  Tanaka Akira  <akr@fsij.org>
-
-	* re.c: parenthesize macro arguments.
-
-Mon Dec 27 15:22:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/README.win32: note to need NT based OS to build ruby.
-
-Mon Dec 27 12:14:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (EXTMK_ARGS): specify to pass macro V, because nmake
-	  doesn't pass it via MAKEFLAGS.
-
-Mon Dec 27 10:33:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/zlib/zlib.c (Init_zlib): Add Zlib.deflate and Zlib.inflate.
-	  [ruby-dev:42833]
-
-Mon Dec 27 07:38:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* misc/rb_optparse.zsh: add compdef for generator.
-
-Mon Dec 27 07:32:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/optparse.rb (OptionParser#compsys): escape brackets too.
-	  [ruby-dev:42754]
-
-Mon Dec 27 01:30:08 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: add IF_NAMESIZE.
-	  add a default for INET6_ADDRSTRLEN.
-
-Sun Dec 26 23:49:47 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* win32/Makefile.sub: suppress a strange error message when RMALL
-	  found no such file.
-	* win32/rmall.bat: new.
-
-Sun Dec 26 21:23:23 2010    <kosaki.motohiro@gmail.com>
-
-	* win32/Makefile.sub: fix 'nmake clean-enc' breakage since r28322.
-
-Sun Dec 26 22:25:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/ripper/depend (ripper.y): fix messages with nmake.
-	  [ruby-dev:42896]
-
-Sun Dec 26 22:24:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (file_expand_path): get rid of warnings caused by
-	  -Wdeclaration-after-statement on cygwin.
-
-Sun Dec 26 20:28:34 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* process.c (before_exec): add small comment.
-
-Sun Dec 26 20:52:21 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/mkconstants.rb: define INET_ADDRSTRLEN as 16 if not
-	  available.  fix compilation error on mswin32-60.  reported by nobu.
-
-Sun Dec 26 19:37:37 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c: define IFNAMSIZ if not available.
-	  fix compilation error on mingw32.  reported by nobu.
-
-Sun Dec 26 12:16:29 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths::HOMEDIR): no exception if
-	  HOME is not set.  [ruby-core:33867]
-
-Sun Dec 26 11:39:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt): missing ripper rule.  i.e., `a::B ||= c 1'.
-	  http://twitter.com/#!/wannabe53/status/18797576396472321
-	  http://twitter.com/#!/wannabe53/status/18798416150663168
-
-Sun Dec 26 11:15:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/with_different_ofs.rb (DifferentOFS): should not affect
-	  original classes.
-
-Sun Dec 26 09:35:07 2010  Tanaka Akira  <akr@fsij.org>
-
-	* rational.c: parenthesize macro arguments.
-
-Sun Dec 26 09:22:19 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c (rb_if_indextoname): new function to abstract
-	  environments without if_indextoname.
-	  (inspect_ipv6_multicast_if): new function to inspect
-	  IPV6_MULTICAST_IF.
-	  Socket::Option.new(:INET6, :IPV6, :MULTICAST_IF,
-	  [2].pack("I!")).inspect is
-	  "#<Socket::Option: INET6 IPV6 MULTICAST_IF eth0>".
-
-Sun Dec 26 04:31:15 2010  Luis Lavena  <luislavena@gmail.com>
-
-	* ext/dl/win32/registry.rb: Corrected RegCreateKeyExA signature.
-	  Patch by Rafal Michalski [ruby-core:33874] [Ruby 1.9-Bug#4203]
-
-Sun Dec 26 02:31:58 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (advice_arg_check): Change argument check.
-	  Now, an unsupported advice makes NotImplementedError.
-	  [ruby-dev:42887] [Ruby 1.9-Feature#4204]
-
-Sun Dec 26 03:00:53 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/socket/extconf.rb: Fix build error which was introduced r30372.
-
-Sun Dec 26 01:37:10 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/extconf.rb: check the existence of if_indextoname().
-
-	* ext/socket/option.c: yesterday's akr's commits destroyed the build of
-	  some unrelated platforms (such as Windows).
-
-Sat Dec 25 23:29:11 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c (inspect_ipv4_add_drop_membership): new function
-	  to inspect struct ip_mreq and struct ip_mreqn for
-	  IP_ADD_MEMBERSHIP and IP_DROP_MEMBERSHIP.
-	  Socket::Option.new(:INET, :IP, :ADD_MEMBERSHIP,
-	  [239,255,99,81, 0,0,0,0].pack("CCCCCCCC")).inspect is now
-	  "#<Socket::Option: INET IP ADD_MEMBERSHIP 239.255.99.81 0.0.0.0>".
-	  (inspect_ipv4_multicast_if): new function to inspect struct in_addr
-	  and struct ip_mreqn for IP_MULTICAST_IF.
-	  Socket::Option.new(:INET, :IP, :MULTICAST_IF,
-	  [192,168,0,7].pack("CCCC")).inspect is now
-	  "#<Socket::Option: INET IP MULTICAST_IF 192.168.0.7>".
-
-	* ext/socket/extconf.rb: check struct ip_mreq and struct ip_mreqn.
-
-Sat Dec 25 22:49:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/csv: DifferentOFS needs to be include in each classes.
-
-	* test/digest/test_digest_extend.rb (TestDigestExtend#setup):
-	  should not depend on the result of previous tests
-
-	* test/with_different_ofs.rb (DifferentOFS::WithDifferentOFS): give
-	  name.
-
-	* test/with_different_ofs.rb (DifferentOFS): test suite for test
-	  suites affected by $,.
-
-	* test/digest/test_digest_extend.rb (TestDigestExtend): should not
-	  assume $, invariant.
-
-	* test/csv/test_data_converters.rb, test/csv/test_table.rb: don't
-	  call setup within tests.
-
-Sat Dec 25 20:01:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (pipe_open): Added rb_thread_atfork(). We must reinitialize
-	  GVL at new process creation.
-
-Sat Dec 25 18:26:55 2010  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/option.c (inspect_ipv6_mreq): new function to inspect
-	  struct ipv6_mreq for IPV6_JOIN_GROUP and IPV6_LEAVE_GROUP.
-	  Socket::Option.new(:INET6, :IPV6, :JOIN_GROUP,
-	  [0xff12,0,0,0,0,0,0,1, 2].pack("nnnnnnnnI!")).inspect is now
-	  "#<Socket::Option: INET6 IPV6 JOIN_GROUP ff12::1 eth0>".
-
-	* ext/socket/extconf.rb: check struct ipv6_mreq.
-
-Sat Dec 25 18:04:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/csv.rb (CSV.foreach): 'rb' mode is defaulted in open.
-
-	* lib/csv.rb (CSV#init_separators): cannonicalize encoding options
-	  as Encoding objects.
-
-Sat Dec 25 18:30:34 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (rb_thread_atfork): Add small comment why we need
-	  reset random seed.
-
-Sat Dec 25 17:33:55 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/csv/base.rb (TestCSV.with_different_ofs): give name to
-	  anonymous classes.
-
-	* lib/csv.rb (CSV#init_separators): use IO#gets with length
-	  parameter to get rid of wrong convertion.
-
-	* lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding
-
-	* lib/csv.rb, test/csv: should not assume $, invariant.
-
-Sat Dec 25 16:08:06 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* signal.c: change rb_atomic_t definition from uchar to uint.
-
-Sat Dec 25 15:04:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/csv/test_encodings.rb (TestEncodings#setup): fix evil test
-	  suite writing to the source directory.
-
-Sat Dec 25 15:08:08 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/pty/pty.c (chfunc): Added rb_thread_atfork_before_exec().
-	  We must reinitialize GVL at new process creation. Otherwise
-	  we may meet an insane deadlock. [Bug#4121][ruby-dev:42686]
-
-Sat Dec 25 14:27:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_extract_encoding_option): accept Encoding object as
-	  encoding: optional argument.  [ruby-dev:42884]
-
-Sat Dec 25 13:37:55 2010  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/*.rb: Imported minitest 2.0.2 r6093.
-
-Sat Dec 25 13:05:59 2010  Tanaka Akira  <akr@fsij.org>
-
-	* random.c: parenthesize macro arguments.
-
-Sat Dec 25 12:48:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* load.c (rb_f_require_relative): don't omit return type.
-
-Sat Dec 25 11:06:00 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* load.c (rb_f_require_relative): Add documentation.
-
-Sat Dec 25 11:02:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzreader_gets): support optional length
-	  parameter.
-
-	* ext/zlib/zlib.c (gzfile_read, gzfile_readpartial): length should
-	  be long.
-
-Sat Dec 25 10:51:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/json/generator/generator.{c,h} (fbuffer_free_only_buffer):
-	  unused.
-
-	* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): add casts.
-
-Fri Dec 24 08:46:04 2010  Tanaka Akira  <akr@fsij.org>
-
-	* process.c: parenthesize macro arguments.
-
-Thu Dec 23 19:17:14 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* test/net/imap/cacert.pem: updated because it has been expired.
-
-	* test/net/imap/server.crt: signed again because CA cert was expired.
-
-Thu Dec 23 11:16:52 2010  Tanaka Akira  <akr@fsij.org>
-
-	* parse.y: parenthesize macro arguments.
-
-Thu Dec 23 11:00:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_check_type): check for type from extensions for ruby
-	  1.8.  see [ruby-core:33797].
-
-Thu Dec 23 08:12:59 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/net/smtp.rb: refactoring Net::SMTP#esmtp= to use an
-	  attr_accessor
-
-Thu Dec 23 06:35:41 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/net/smtp.rb: Net::SMTP should close the SSL connection if the
-	  connection verification fails.
-
-Thu Dec 23 01:47:58 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: remove #object_id. [ruby-dev:42840]
-
-Wed Dec 22 08:56:39 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add Module#private_constant and Module#public_constant.
-	  [ruby-dev:39685][ruby-core:32698]
-
-Wed Dec 22 07:59:23 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add IO#advise. [ruby-core:33110] [Ruby 1.9-Feature#4038]
-
-Tue Dec 21 23:45:31 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (Init_GC): move back object_id to Kernel. [ruby-dev:42840]
-
-Tue Dec 21 12:45:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (target_archs): remove temporary objects.
-
-	* enc/Makefile.in, enc/depend (clean): remove work directories.
-
-Tue Dec 21 07:39:12 2010  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c: parenthesize macro arguments.
-
-Tue Dec 21 06:25:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/rexml/test_contrib.rb (ContribTester#test_pos): should not
-	  use fixed path name for tests.  [ruby-dev:42827]
-
-	* test/rexml/test_sax.rb (SAX2Tester#test_socket): should not use
-	  fixed port for tests.  [ruby-dev:42828]
-
-Tue Dec 21 06:10:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (setup_args), vm.c (invoke_block_from_c),
-	  vm_insnhelper.c (caller_setup_args): reverted r30241 and r30243
-	  except for the test.
-
-Tue Dec 21 01:41:42 2010  Masaya Tarui  <tarui@ruby-lnag.org>
-
-	* io.c : add an extra byte to buffer for the specification of read
-	  in Windows. see [ruby-core:33460] and r29980. and, we have to
-	  discuss how to do this one byte.
-
-Tue Dec 21 01:18:06 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* error.c: Fix build error for win32. This regression was
-	  introduced by r30271.
-
-Tue Dec 21 00:59:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (thread_cleanup_func): Moved interrupted_lock
-	  destroying code from native_thread_destroy() to
-	  thread_cleanup_func() because it's platform independent logic.
-
-	* thread_win32.c (native_thread_destroy): ditto.
-	* thread_pthread.c (native_thread_destroy): ditto.
-
-Tue Dec 21 00:46:20 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread.c (thread_cleanup_func): Don't touch native threading
-	  resource at fork. Sadly this is purely bandaid. We need to
-	  implement proper fix later. [Bug #4169] [ruby-core:33767]
-
-Tue Dec 21 00:22:44 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* error.c (exit_success_p): Check status code more carefully.
-	  status code may have garbage in upper bit.
-
-Mon Dec 20 23:12:37 2010  Tanaka Akira  <akr@fsij.org>
-
-	* node.c: parenthesize macro arguments.
-
-Mon Dec 20 20:04:41 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* NEWS: add #__id__ and #object_id. [ruby-dev:42778]
-
-Mon Dec 20 20:03:21 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* thread_pthread.c (native_thread_destroy): Fixed gvl_cond leak.
-
-Mon Dec 20 13:49:05 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* NEWS: Add item for RDoc 3.0.1
-
-	* lib/rdoc: Import RDoc 3.0.1, remove require for perl parser.
-
-Mon Dec 20 12:15:32 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Import RDoc 3.0.
-
-Mon Dec 20 01:55:03 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (Init_IO): Added O_DIRECT. This feature was proposed by
-	  Run Paint Run Run.
-	  [Feature #4015] [ruby-core:33018]
-
-Sun Dec 19 19:15:23 2010  Tanaka Akira  <akr@fsij.org>
-
-	* marshal.c: parenthesize macro arguments.
-
-Sat Dec 18 21:52:37 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* vsnprintf.c (BSD_vfprintf): suppress warning: "_WIN32" is not
-	  defined.
-
-Sat Dec 18 16:02:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (setup_args), vm.c (invoke_block_from_c),
-	  vm_insnhelper.c (caller_setup_args): fix of r30241. lambda block
-	  should check argument number.
-
-Sat Dec 18 14:42:29 2010  Tanaka Akira  <akr@fsij.org>
-
-	* load.c: parenthesize macro arguments.
-
-Sat Dec 18 10:07:04 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (setup_args, iseq_compile_each): optimize AMPER LAMBDA
-	  combination as block.
-
-Fri Dec 17 22:07:16 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (Init_GC): move #__id__ and #object_id to BasicObject.
-	  [ruby-dev:42778]
-
-Fri Dec 17 19:35:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/mkmf/base.rb (TestMkmf::FakeLog): capture output from mkmf.
-
-	* test/mkmf/test_find_executable.rb (test_find_executable):
-	  suppress meaningless differences for chkbuild.
-
-Fri Dec 17 13:26:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak (BASERUBY): quit with an error when BASERUBY was not
-	  able to set, just like configure.in does. [ruby-dev:42782]
-
-Fri Dec 17 07:04:09 2010  Tanaka Akira  <akr@fsij.org>
-
-	* iseq.c: parenthesize macro arguments.
-
-Fri Dec 17 04:18:37 2010  Eric Hodel  <drbrain@segment7.net>
-
-	* transcode.c (str_encode): Alter comment for better wording and ri
-	  output.
-
-Fri Dec 17 00:05:40 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c (rb_io_advise): New API. IO#advise() allows to tell the
-	  ruby runtime how it expects to use a file handle. This feature
-	  can be improved a performance some situations.
-	  Note: This feature is mainly developed by Run Paint Run Run.
-	  Thank you! [ruby-core:33110] [Ruby 1.9-Feature#4038]
-
-	* io.c (do_io_advise): Helper function.
-	* io.c (io_advise_sym_to_const): ditto.
-
-Thu Dec 16 23:29:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/rbinstall.rb (bin-comm): use transformed name.
-	  [ruby-dev:42777]
-
-Thu Dec 16 21:52:07 2010  Tanaka Akira  <akr@fsij.org>
-
-	* io.c: parenthesize macro arguments.
-
-Thu Dec 16 21:46:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/mkconfig.rb (RbConfig): honor ARCHFLAGS and RC_ARCHS to
-	  override embedded ARCH_FLAG value on universal-darwin.
-
-Thu Dec 16 19:50:12 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/{configure.bat,setup.mak,Makefile.sub} (PROGRAM_PREFIX,
-	  PROGRAM_SUFFIX): unite the differences of the names of macros of
-	  prefix and suffix.
-	  reported by HANEDA Norikatsu. [ruby-dev:42775]
-
-Thu Dec 16 08:04:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.h (RNode): match the type of flags to RBasic, and renamed
-	  nd_file as nd_reserved.
-
-	* iseq.c (set_relation), vm_insnhelper.c (vm_cref_push): nd_file
-	  is always zero-cleared.
-
-Thu Dec 16 07:22:30 2010  Ryan Davis  <ryand-ruby@zenspider.com>
-
-	* lib/minitest/unit.rb: Imported minitest 2.0.1 r6079.
-
-Wed Dec 15 20:45:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/test/unit.rb (process_args): need to setup @help to print options.
-
-Wed Dec 15 11:19:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/zlib/test_zlib.rb (test_to_io): forgotten to fix with r30201.
-
-Wed Dec 15 11:07:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (simple_sendfile): enable on Mac OS X.
-
-	* io.c (nogvl_copy_stream_sendfile): moved precheck of copy length.
-
-	* io.c (nogvl_copy_stream_sendfile): should wait for both of
-	  read/write fds.
-
-Wed Dec 15 07:11:55 2010  Tanaka Akira  <akr@fsij.org>
-
-	* hash.c: parenthesize macro arguments.
-
-Wed Dec 15 04:02:00 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
-	  fix compile error when !HAVE_X509V3_SET_NCONF. Thanks
-	  Chikanaga-san. [ruby-dev:42761] [Ruby 1.9-Bug#4158]
-
-Wed Dec 15 03:41:31 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* test/ripper/test_parser_events.rb (TestRipper#test_block_variables):
-	  Limit address space 100MB instead 100KB. Quite frankly, This
-	  margin is too narrow to contain ruby. [ruby-dev:42763] [Bug#4159]
-
-Tue Dec 14 23:53:52 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (simple_sendfile): improve linux compatibility on FreeBSD,
-	  and now it works. But without cpuset -l 0, it still gets stuck.
-
-Tue Dec 14 20:31:33 2010  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c: parenthesize macro arguments.
-
-Tue Dec 14 18:31:48 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/test/unit.rb: help messages.
-
-Tue Dec 14 18:19:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* common.mk (help): there is no reason to use the abbreviation for here.
-
-Tue Dec 14 15:03:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (test_reopen, test_reinitialize): should close
-	  the temporary files.
-
-Tue Dec 14 14:24:15 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (make_tempfile): change the prefix from 'foo'
-	  to 'test_io' because the old one is meaningless and inconvenient.
-
-	* test/ruby/test_io.rb (test_binmode_after_closed): the temporary file
-	  maked by make_temfile is already closed.
-
-Tue Dec 14 13:52:19 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (test_flush_in_finalizer[12]): should close
-	  temporary file because it's only used for taking pathname and
-	  unlinking the file after the end of the test (in GC phase).
-
-Tue Dec 14 13:34:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzfile_s_open): should close the IO if some error
-	  occurs in initializing.
-
-Tue Dec 14 13:04:16 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTPRequest#send_request_body_data):
-	  set binmode to tempfile.
-
-Tue Dec 14 12:55:46 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/zlib/test_zlib.rb (*): should close files associated with zlib.
-
-Tue Dec 14 11:30:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_argf.rb (test_inplace_rename_impossible): unlink
-	  the renamed temporary file on no_safe_rename platforms.
-
-	* test/ruby/test_argf.rb (test_readlines_limit_0,
-	  test_each_line_limit_0): should close argf because the associated
-	  Tempfile object cannot unlink the temporary file when it's gc'ed
-	  on some platforms (Windows, etc.)
-
-Tue Dec 14 11:27:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/minitest/unit.rb (Minitest::Unit#_run_suite): split test
-	  name and its time. Thiw allows to know test's name when you are
-	  running tests and meet a test which spends long time at realtime.
-
-Tue Dec 14 11:25:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* configure.in: Add -Werror=declaration-after-statement to default
-	  warning flag. If you are using GCC, this flag is useful to
-	  prevent breaking VC build.
-
-Tue Dec 14 10:25:57 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): how many gcc-c99isms
-	  must a man mend; before he can build with VC? r30178
-
-Mon Dec 13 21:26:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (simple_sendfile): disable the use of sendfile(2) on
-	  FreeBSD. It blocks on TestIO#test_copy_stream_socket.
-
-Mon Dec 13 18:35:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c: define USE_SENDFILE on FreeBSD or DragonFly BSD.
-	  Remove Mac OS X because its argument is different from them.
-
-Mon Dec 13 12:00:09 2010  Tanaka Akira  <akr@fsij.org>
-
-	* file.c: parenthesize macro arguments.
-
-Mon Dec 13 11:21:14 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (simple_sendfile): added for BSD version of sendfile(2).
-
-Mon Dec 13 09:50:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTPRequest#set_form): Added to support
-	  both application/x-www-form-urlencoded and multipart/form-data.
-	  There is a similar API, Net::HTTPRequest#set_form_data, but
-	  to keep its compatibility this is newly added. [ruby-dev:42729]
-
-Sun Dec 12 23:45:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (iseq_compile_each): fix for __goto__ and __label__
-	  where were totally broken.
-
-Sun Dec 12 22:45:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (ID_H_INCLUDES): now id.h depends on vm_opts.h.
-
-Sun Dec 12 20:42:47 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* template/id.h.tmpl: suppress all warning: "SUPPORT_JOKE" is not
-	  defined.  [ruby-dev:42730]
-
-Sun Dec 12 20:35:07 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* misc/rb_optparse.zsh: update how to install.
-
-	* misc/rb_optparse.zsh: avoid error when setopt noclobber.
-
-	* lib/optparse.rb: fix typo. pointed out at
-	  <http://d.hatena.ne.jp/nagachika/20101207>.
-
-Sun Dec 12 13:27:35 2010  Tanaka Akira  <akr@fsij.org>
-
-	* eval_error.c: parenthesize macro arguments.
-
-Sun Dec 12 11:53:24 2010  Tanaka Akira  <akr@fsij.org>
-
-	* error.c: parenthesize macro arguments.
-
-Sun Dec 12 04:01:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* string.c (rb_str_inspect): fix: extra back slash is added when
-	  the string is dummy encoding and includes \x22 or \x5C.
-
-Sun Dec 12 02:42:24 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/openssl/ossl_asn1.c: indefinite length BER to DER encoding is
-	  properly supported.  Thanks Martin Bosslet! [ruby-core:33082]
+	* lib/logger.rb (Logger#level=): remove unnecessary local
+	  variable.
 
-Sat Dec 11 17:43:34 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* lib/logger.rb (Logger#initialize, Logger#reopen): [DOC] mention
+	  the default values.  cherrypicked from [GH-1319].
 
-	* ext/bigdecimal/bigdecimal.h: suppress "warning: 'VPrint' declared
-	  'static' but never defined".
+Wed Apr  6 10:17:53 2016  cremno phobia  <cremno@mail.ru>
 
-Sat Dec 11 09:24:57 2010  Tanaka Akira  <akr@fsij.org>
+	* math.c (ruby_lgamma_r): missing/lgamma_r.c is used on Windows,
+	  since msvcrt does not provide it.
 
-	* encoding.c: parenthesize macro arguments.
+	* missing/lgamma_r.c (lgamma_r): fix lgamma(-0.0).
+	  [ruby-core:74823] [Bug #12249]
 
-Sat Dec 11 08:12:48 2010  Eric Hodel  <drbrain@segment7.net>
+Wed Apr  6 01:22:55 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/openssl/ossl.c, ext/openssl/ossl_pkey_rsa.c: Document RSA, RSA
-	  encryption/decryption and PKCS #5 encryption/decryption.
+	* math.c (ruby_lgamma_r): mswin's lgamma_r also seems to be wrong.
+	  cf. [Bug #12249]
 
-Sat Dec 11 06:23:41 2010  Eric Hodel  <drbrain@segment7.net>
+Wed Apr  6 00:53:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_x509name.c: include Comparable to provide #==.
-	  Document OpenSSL::X509::Name#<=>.  [Ruby 1.9-Feature#4116]
+	* math.c (ruby_lgamma_r): fix lgamma(-0.0) on mingw and OSX.
 
-Sat Dec 11 05:48:28 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* math.c (ruby_tgamma): fix tgamma(-0.0) on mingw.
+	  [ruby-core:74817] [Bug #12249]
 
-	* ext/tk/lib/multi-tk.rb: infinite loop on method_missing at loading.
-	  [ruby-dev:42716] [Ruby 1.9-Bug#4129]
+Tue Apr  5 14:50:28 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: when no eventloop is running, ruby freezes at
-	  exit.
+	* ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
+	  [Bug #12202] [ruby-core:74802]
 
-Sat Dec 11 02:23:15 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+Tue Apr  5 00:06:44 2016  Aeris  <aeris@imirhil.fr>
 
-	* ext/openssl/extconf.rb: try pkgconfig first, then fall back to
-	  normal have_library, etc.  Thanks Erik Hollensbe. [ruby-core:32406]
+	* 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]
 
-Fri Dec 10 22:33:39 2010  Tanaka Akira  <akr@fsij.org>
+	* ext/openssl/extconf.rb: Check for SSL_get_server_tmp_key.
 
-	* dln_find.c: parenthesize macro arguments.
+Mon Apr  4 23:37:05 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Dec 10 20:05:42 2010  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]
 
-	* template/id.h.tmpl (ruby_method_ids): suppress warnings.
-	  [ruby-dev:42730]
+Mon Apr  4 17:43:45 2016  Koichi Sasada  <ko1@atdot.net>
 
-Fri Dec 10 18:29:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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
 
-	* ruby.c (ruby_init_loadpath_safe): relatively called non-shared
-	  binary cannot be found in PATH, so use given pathname.
+	  These values are same as Ruby 2.0.0.
 
-Fri Dec 10 18:28:40 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  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)
 
-	* cygwin/GNUmakefile.in (SCRIPTPROGRAMS): ignore backup files and etc.
+	  You can change these values by environment variables
+	  if you feel wrong.
 
-	* cygwin/GNUmakefile.in (scriptbin): set executable bit.
+Mon Apr  4 17:36:52 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* tool/rbinstall.rb (install_recursive): always skip default ignored
-	  files.  if block is given, call it instead of calling install.
+	* gc.c (get_envparam_double): take an upper_bound.
 
-	* tool/rbinstall.rb (bin-comm): use install_recursive.
+	  And also take an accept_zero flag which allow to accept zero
+	  even if lower_bound is set.
 
-Fri Dec 10 18:12:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (ruby_gc_set_params): fix parameters.
 
-	* test/mkmf/base.rb (TestMkmf#config_value): extract macro value from
-	  config.h.
+	  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.
 
-	* test/mkmf/test_sizeof.rb (TestMkmf::TestSizeof#test_sizeof_builtin),
-	  (TestMkmf::TestSizeof#test_sizeof_struct): more tests.
+	  Also set lower/upper bound of RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO to
+	  RUBY_GC_HEAP_FREE_SLOTS_MIN/MAX_RATIO.
 
-	* lib/mkmf.rb (check_signedness): should use the prelude code.
-	  [ruby-dev:42731]
+Mon Apr  4 16:41:32 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/mkmf.rb (Logging.log_close): separate from Logging.logfile.
+	* vm.c (Init_VM): should pass tokens.
 
-	* test/mkmf/base.rb (TestMkmf::MKMFLOG): show mkmf.log at failures.
+Sun Apr  3 09:34:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/mkmf/base.rb (TestMkmf#teardown): close log file for each tests.
+	* numeric.c (flodivmod): round division if it is a finite number
+	  and module is required.
 
-Fri Dec 10 11:36:43 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* numeric.c (dbl2ival): do not round here.
 
-	* compile.c (enum): remove a comma at end of enumerator list.
+	* numeric.c (flo_ceil): use dbl2ival.
 
-	* constant.h (rb_const_flag_t): ditto.
+	* numeric.c (flo_round): round explicitly.
 
-	* iseq.h (enum catch_type): ditto.
+Sat Apr  2 15:24:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* iseq.h (enum defined_type): ditto.
+	* include/ruby/intern.h (rb_check_arity): returns argc.
 
-	* vm_core.h (enum iseq_type): ditto.
+Fri Apr  1 20:58:33 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* vm_core.h (enum vm_special_object_type): ditto.
+	* 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.
 
-Fri Dec 10 10:47:53 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* enc/unicode.c: Code using the above data.
 
-	* sprintf.c (_HAVE_SANE_QUAD_): Don't forget LP64, r30156.
+	* test/ruby/enc/test_case_mapping.rb: Tests for the above.
 
-Fri Dec 10 10:37:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Apr  1 14:55:28 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* sprintf.c (_HAVE_SANE_QUAD_): if a certain platform has LONG_LONG in
-	  8 byte, it might be sane quad. [ruby-core:33634]
+	* 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]
 
-Fri Dec 10 10:07:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* 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.
 
-	* lib/net/http.rb: remove version 1.1 features.
+	* tool/vcs.rb (detect): remove code duplication
 
-Fri Dec 10 02:18:02 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+Fri Apr  1 04:50:44 2016  Eric Wong  <e@80x24.org>
 
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_cleanup): removing C
-	  implementation of `cleanup`.
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc):
+	  enable SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER by default
+	  [Bug #12126]
 
-	* ext/openssl/lib/openssl/x509.rb: adding ruby implementation of
-	  `cleanup`.  OpenSSL::X509::StoreContext#cleanup is deprecated since
-	  reusing the underlying struct doesn't make sense. [ruby-dev:42546]
+Fri Apr  1 01:13:55 2016  Benoit Daloze  <eregontp@gmail.com>
 
-Thu Dec  9 20:14:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c (update_coverage): Do not track coverage in loaded files
+	  after Coverage.result. Avoids out-of-bounds access. [Bug #12237]
 
-	* parse.y (lvar_defined_gen, shadowing_lvar_gen, dvar_defined): no
-	  warnings for unused method and block arguments.
-	  [ruby-dev:42718] [ruby-dev:42724]
+	* ext/coverage/coverage.c (coverage_clear_result_i): document.
 
-Thu Dec  9 19:25:49 2010  Tanaka Akira  <akr@fsij.org>
+Thu Mar 31 19:16:16 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* dln.c: parenthesize macro arguments.
+	* gc.c: need to set initial value of GC_HEAP_FREE_SLOTS_GOAL_RATIO.
 
-Thu Dec  9 18:51:06 2010  Tanaka Akira  <akr@fsij.org>
+Thu Mar 31 17:50:27 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/webrick/accesslog.rb (WEBrick::AccessLog#format): support
-	  %{remote}p for logging remote (client) port number.
-	  [ruby-dev:42670]
+	* gc.c: change additional allocation policy.
 
-Thu Dec  9 11:00:30 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  Introduce new environment variable
+	  RUBY_GC_HEAP_FREE_SLOTS_GOAL_RATIO (goal_ratio) to calculate the
+	  ratio of additional memory.
 
-	* array.c (rb_ary_dup): should copy contents only.  no instance
-	  variable, no class would be copied.  it would affect methods
-	  #sort, #reject, #transpose, #uniq, #compact, and #shuffle.
-	  [ruby-core:33640]
+	  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
 
-	* array.c (rb_ary_reverse_m): ditto.
+	  This addition can allocate too much.
 
-	* array.c (rb_ary_rotate_m): ditto.
+	  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.
 
-Wed Dec  8 21:38:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	  If you want to prepare many free slots, increase this ratio.
 
-	* ext/dl/lib/dl/struct.rb: clean a warning: assigned but unused
-	  variable. patched by Kouhei Yanagita. [ruby-dev:42722]
+	  If this variable is 0, then simply multiply
+	  RUBY_GC_HEAP_GROWTH_FACTOR.
 
-	* ext/dl/lib/dl/import.rb: ditto.
+	* gc.c (get_envparam_double): enable to accept 0.
 
-Wed Dec  8 21:36:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar 31 17:48:25 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* parse.y (shadowing_lvar_gen): fix line number.  [ruby-dev:42718]
+	* gc.c (gc_marks_finish): fix syntax error.
 
-Wed Dec  8 20:37:11 2010  Tanaka Akira  <akr@fsij.org>
+Thu Mar 31 16:49:36 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* dir.c: parenthesize macro arguments.
+	* gc.c: simplify allocate/free detecting logic at the end of marking.
 
-Tue Dec  7 22:37:15 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+	  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.
 
-	* io.c (io_read): duplicate string if shared. [ruby-dev:42719]
+	  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.
 
-Tue Dec  7 22:31:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  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.
 
-	* lib/optparse.rb (OptionParser::Officious): separate completion
-	  options from --help.  [ruby-dev:42690]
+	  Because of this fix, heap_pages_swept_slots is no longer needed.
 
-	* lib/optparse.rb (OptionParser::Completion#candidate),
-	  (OptionParser::Switch#compsys): remove unused variables.
+	* gc.c (rb_objspace_t::heap_pages): restruct the objspace global
+	  status.
 
-Tue Dec  7 22:05:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  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)
 
-	* transcode.c (transcode_loop): call default handler of the given
-	  hash, method, proc or [] method as fallback.  [ruby-dev:42692]
+	* gc.c (heap_pages_free_unused_pages): unlink tomb heap pages
+	  because tomb heap should have only freeable pages.
 
-Tue Dec  7 21:59:37 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* gc.c (heap_extend_pages): add parameters for future extension.
 
-	* lib/rexml/light/node.rb: remove circular require.
+Thu Mar 31 16:43:02 2016  Koichi Sasada  <ko1@atdot.net>
 
-Tue Dec  7 21:56:01 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* 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)).
 
-	* test/rexml/test_light.rb: really suppress a warning.
+	  Before this change, these values are hard coded.
 
-Tue Dec  7 21:51:57 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* gc.c (ruby_gc_params_t): ditto.
 
-	* test/rexml/test_light.rb: suppress a warning.
+	* gc.c (ruby_gc_set_params): ditto.
 
-Tue Dec  7 21:14:03 2010  Tanaka Akira  <akr@fsij.org>
+Thu Mar 31 15:59:17 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* debug.c: parenthesize macro arguments.
+	* gc.c (gc_verify_heap_page): check the number of zombies.
 
-Tue Dec  7 21:06:38 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* gc.c (gc_verify_heap_pages): check also tomb heap.
 
-	* lib/rexml/doctype.rb, test/rexml/test_doctype.rb: suppress warnings.
-	  [ruby-core:33305]
-	  Reported by Aaron Patterson. Thanks!!!
+Thu Mar 31 15:48:18 2016  Koichi Sasada  <ko1@atdot.net>
 
-Tue Dec  7 18:56:52 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* gc.c (gc_page_sweep): return free slots count.
 
-	* ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
-	  patched by Kouhei Yanagita [ruby-dev:42696]
+	* gc.c (gc_sweep_step): use returned free slots count.
 
-Tue Dec  7 20:32:11 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* gc.c (gc_sweep_step): change variable name `next'
+	  to `next_sweep_page'.
 
-	* test/rexml/test_doctype.rb: add Accessor to test case name.
+Thu Mar 31 11:33:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Dec  7 20:31:02 2010  Kouhei Sutou  <kou@clear-code.com>
+	* ext/date/date_core.c (d_lite_strftime, dt_lite_strftime): [DOC]
+	  fix indent not to be a big sole verbatim.
 
-	* test/rexml/test_doctype.rb: Doctype -> DocType.
+Thu Mar 31 11:18:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Dec  7 20:29:23 2010  Kouhei Sutou  <kou@clear-code.com>
+	* ext/date/date_core.c (Init_date_core): [DOC] fix misplaced doc
+	  of DateTime.  [ruby-core:74729] [Bug #12233]
 
-	* test/rexml/test_doctype_mixin.rb: rename to ...
-	* test/rexml/test_doctype.rb: ... this to remove needless name.
+Thu Mar 31 03:41:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Dec  7 17:03:16 2010  Shugo Maeda  <shugo@ruby-lang.org>
+	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 69f7e74dde.
+	  fix indent.
 
-	* lib/net/imap.rb (xlist): supported the XLIST command, which is an
-	  extension by Apple and Google.  patch by Geoff Youngs.
-	  [ruby-core:33521]
+Wed Mar 30 16:33:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Dec  7 08:00:44 2010  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]
 
-	* configure.in, win32/Makefile.sub (WERRORFLAG): flag to treat
-	  warnings as errors.
+Wed Mar 30 09:46:01 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* lib/mkmf.rb (Logging.postpone): yield log file object.
+	* 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
 
-	* lib/mkmf.rb (xsystem): add options, :werror only right now.
+Wed Mar 30 01:56:06 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/mkmf.rb (with_werror): check as if warnings are errors.
+	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
+	  patched by Anton Sivakov [Bug #12201] [Bug #12202]
 
-	* lib/mkmf.rb (convertible_int): make declaration conflict
-	  warnings errors not to pass wrong type.  [ruby-dev:42684]
+Wed Mar 30 01:54:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/mkmf.rb (COMMON_MACROS): get rid of conflicts.
+	* tool/redmine-backporter.rb: add given revision to current changesets
+	  on associating the revision to the related ticket.
 
-	* win32/Makefile.sub (WARNFLAGS): make declaration conflict
-	  warnings errors if possible.
+Wed Mar 30 01:53:17 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun Dec  7 21:16:10 2010  Tanaka Akira  <akr@fsij.org>
+	* tool/merger.rb: update revision.h before merge.
 
-	* cont.c: parenthesize macro arguments.
+Tue Mar 29 19:33:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Dec  7 00:27:14 2010  Masaya Tarui  <tarui@ruby-lnag.org>
+	* addr2line.c: define toupper for its use. fix r54391.
 
-	* win32/win32.c (rb_w32_read): fixed more for readline,
-	  and so on. [ruby-core:33511]
+Tue Mar 29 19:23:46 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Dec  6 23:18:22 2010  Nobuyoshi Nakada  <nobu@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.
 
-	* test/mkmf/base.rb (TestMkmf#setup): run quietly.
+	* include/ruby/ruby.h (rb_isascii): use inline function to clarify
+	  the logic.
 
-	* test/mkmf/test_find_executable.rb (test_find_executable): use
-	  configured results.
+Tue Mar 29 18:56:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* common.mk (test-build): test for build process.
+	* tool/redmine-backporter.rb (backport): show merger.rb's path.
 
-Mon Dec  6 22:47:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* tool/redmine-backporter.rb (show): show current issue again if no
+	  ticket number is given.
 
-	* lib/optparse.rb (OptionParser#candidate): skip separators.
+	* tool/redmine-backporter.rb (rel): show error message if current
+	  bugs.ruby-lang.org doesn't support the API.
 
-	* sample/optparse/opttest.rb: should not override --help.
-	  [ruby-dev:42690]
+Tue Mar 29 18:54:34 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Dec  6 19:00:48 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* tool/merger.rb: support to backport header as backport identifier.
+	  Now you can specify by 'merge revision(s) 49254: [Backport #10738]'.
 
-	* misc/rb_optparse.zsh: fix typos.
+Tue Mar 29 16:53:44 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Mon Dec  6 18:59:04 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* enc/unicode/case-folding.rb, casefold.h: Tweaked handling of 6
+	  special cases in CaseUnfold_11_Table.
 
-	* NEWS: add new encodings.
+	* enc/unicode.c: Adjustments for above.
 
-Mon Dec  6 18:56:42 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* 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.
 
-	* test/ruby/test_string.rb (TestString#test_scan): add a test for
-	  [ruby-core:33338] #4087.
+Tue Mar 29 13:31:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Mon Dec  6 18:55:36 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* enc/unicode.c: Cleaned up some comments.
 
-	* test/uri/test_common.rb (TestCommon#test_encode_www_form): add
-	  tests for r30015.
+Tue Mar 29 13:24:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Mon Dec  6 10:39:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* enc/unicode/case-folding.rb, casefold.h: Removing data for idempotent
+	  titlecasing.
 
-	* lib/uri/common.rb (URI::Parser#initialize_pattern):
-	  refix for restrict the pattern.
+	* enc/unicode.c: Adjust code to data removal.
 
-Mon Dec  6 09:45:11 2010  Eric Hodel  <drbrain@segment7.net>
+Tue Mar 29 12:45:18 2016  Laurent Arnoud  <laurent@spkdev.net>
 
-	* ext/openssl (OpenSSL): add toplevel documentation
-	* ext/openssl/ossl_ssl.c (SSLContext, SSLSocket: add additional
-	  documentation
-	* ext/openssl: move "let rdoc know about mOSSL" comments so they don't
-	  show up in output
+	* 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.
 
-Mon Dec  6 09:16:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Tue Mar 29 06:40:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/uri/common.rb (URI::Parser#initialize_pattern):
-	  workaround fix pattern of hostname for RFC 3986. [ruby-dev:42672]
+	* error.c (rb_compile_err_append): rb_thread_t::base_block is no
+	  longer used.
 
-Mon Dec  6 09:14:38 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* iseq.c (rb_iseq_compile_with_option): ditto, no protection is
+	  needed.
 
-	* lib/mkmf.rb (check_signedness): rename unused variable prelude.
+Tue Mar 29 06:39:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Dec  5 17:56:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (struct parser_params): move parse_in_eval flag from
+	  rb_thread_t.
 
-	* class.c (make_metaclass): fix probable typo.  builtin type flag
-	  cannot be used with FL_TEST.
+	* parse.y (rb_parser_set_context): set parsing context, not only
+	  mild error flag.
 
-Sun Dec  5 12:09:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* iseq.c (rb_iseq_compile_with_option): the parser now refers no
+	  thread local states to be restored.
 
-	* lib/irb/init.rb (IRB.parse_opts): fix typo. [ruby-core:33574]
+	* vm_eval.c (eval_string_with_cref): ditto.
 
-Sun Dec  5 11:27:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 28 21:24:02 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* ruby.c (load_file_internal): decrement for ungotten line.
-	  [ruby-dev:42680]
+	* numeric.c (int_pos_p): fix typos.
 
-Sun Dec  5 10:32:11 2010  Tanaka Akira  <akr@fsij.org>
+Mon Mar 28 14:54:49 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* complex.c: parenthesize macro arguments.
+	* enc/unicode.c: Refactoring in preparation for data reduction for
+	  titlecase.
 
-Sat Dec  4 11:39:17 2010  Eric Hodel  <drbrain@segment7.net>
+Mon Mar 28 14:36:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/openssl/ossl_x509ext.c (initialize): add documentation.
+	* enc/unicode.c: Minor refactoring for I WITH DOT ABOVE.
 
-Sat Dec  4 11:21:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 28 14:26:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* hash.c (rb_hash_update_by): new API for Hash#update.
+	* enc/unicode.c: Removed code now covered by data from table.
 
-Sat Dec  4 11:18:10 2010  Tanaka Akira  <akr@fsij.org>
+Mon Mar 28 11:49:21 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* class.c: parenthesize macro arguments.
+	* enc/unicode.c: Adding comments. [ci skip]
 
-Sat Dec  4 11:07:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 28 11:30:23 2016  Shinichi Maeshima  <netwillnet@gmail.com>
 
-	* vm_core.h (rb_vm_inc_const_missing_count): missing prototype.
+	* 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.
 
-Sat Dec  4 08:50:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 28 11:26:31 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/iconv/iconv.c (Init_iconv): no warnings if $VERBOSE is nil.
+	* 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
 
-Sat Dec  4 08:25:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 28 11:02:31 2016  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* vm_insnhelper.c (vm_call_method): revert r30064 and r30071,
-	  because of [ruby-core:26761]. Bug#4106 rejected.
+	* 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]
 
-Sat Dec  4 07:46:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar 28 08:19:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (String#tr_cpp): substitute * with P like as
-	  autoconf.
+	* sprintf.c (rb_str_format): refactor floating point format of
+	  Rational by using generic Integer functions.
 
-Fri Dec  3 22:36:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* sprintf.c (rb_str_format): fix buffer overflow, length must be
+	  greater than precision.  reported by William Bowling <will AT
+	  wbowling.info>.
 
-	* vm_insnhelper.c (vm_call_method): protected methods should be
-	  checked against the real class.
+Sun Mar 27 12:13:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Dec  3 20:23:31 2010  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.
 
-	* lib/mkmf.rb (convertible_int): define printf format prefix too.
+Sat Mar 26 10:55:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (convertible_int): detect convertible integer type.
-	  port RUBY_REPLACE_INT from configure.in.
+	* numeric.c (rb_int2str): conversion function to String for
+	  generic Integer.
 
-	* lib/mkmf.rb (check_sizeof): should return integer always.
+	* numeric.c (rb_int_round): rounding function for generic
+	  Integers.
 
-Fri Dec  3 12:54:48 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* numeric.c (rb_int_{uminus,plus,minus,mul,idiv,modulo}): basic
+	  arithmetic functions for generic Integers.
 
-	* win32/Makefile.sub (RCFLAGS): VC10 and after only. fixed the problem
-	  of r30015. [ruby-core:33530]
+	* numeric.c (FIXNUM_{POSITIVE,NEGATIVE,ZERO}_P): predict macros
+	  only for Fixnum.
 
-Fri Dec  3 12:41:52 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Sat Mar 26 06:34:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* gc.c (rb_objspace_free): With our "lazy-sweep" GC engine, it is
-	  possible for an object to survive until its surrounding object
-	  space is about to be freed.  Those objects, if any, remains
-	  leaked for the rest of a process life.  This is problematic
-	  because for instance a T_DATA object may have its own destructor
-	  to terminate something.
+	* localeinit.c (rb_locale_charmap_index): fix prototype.
+	  patched by Andreas Schwab [Bug #12218]
 
-	* vm.c (ruby_vm_destruct): ruby_current_vm termination should be
-	  somewhere after rb_objspace_free for above reason.
+Fri Mar 25 16:40:48 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Fri Dec  3 12:17:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/enc/test_case_mapping.rb: Additional tests title case;
+	  some not yet activated.
 
-	* vm_insnhelper.c (vm_call_method): protected singleton methods should
-	  be visible from same real class methods.  [ruby-core:33506]
+Fri Mar 25 13:38:11 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-Fri Dec  3 07:08:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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/stringio/stringio.c (strio_getline): round upto next char
-	  boundary.  [ruby-dev:42674]
+	* ext/openssl/ossl_ssl.c: update #ifdef(s) as above.
 
-Fri Dec  3 06:52:46 2010  Tanaka Akira  <akr@fsij.org>
+	* test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.
 
-	* compile.c: parenthesize macro arguments.
+Fri Mar 25 11:08:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Dec  3 04:08:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
+	  missing mandatory arguments.  [ruby-core:74540] [Bug #12215]
 
-	* encoding.c (enc_alias_internal): use st_insert2 and change return
-	  value to int.
+Fri Mar 25 01:50:58 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* encoding.c (enc_alias): follow enc_alias_internal.
+	* thread_pthread.c (reserve_stack): fix reserving position where
+	  the stack growing bottom to top. [Bug #12118]
 
-Fri Dec  3 01:52:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Mar 25 01:10:42 2016  Sebastian Schuberth  <sschuberth@gmail.com>
 
-	* encoding.c (enc_alias_internal): use xfree instead of free.
+	* 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 Dec  2 23:52:26 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Thu Mar 24 22:38:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* NEWS: entry for ruby_vm_at_exit().
+	* strftime.c (FMT, FMTV): remove recursive-assignments to get rid
+	  of undefined behavior.  [ruby-core:74532] [Bug #12213]
 
-	* eval.c (ruby_cleanup): bug fix around at_exit (1) timing was
-	  wrong. (2) execution order was opposite.
+Thu Mar 24 17:44:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Dec  2 23:05:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* strftime.c (FMT_PADDING): extract format for padding.
 
-	* win32/Makefile.sub (RCFLAGS): -nologo switch is only available in
-	  newer versions of rc.exe. fixed the problem of r30012.
+	* strftime.c (FMT_PRECISION): extract precision formula.
 
-Thu Dec  2 21:28:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* strftime.c (FMTV): append formatted string to expand the result.
 
-	* ext/json/lib/json/add/rails.rb: removed.
+Thu Mar 24 14:20:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Dec  2 21:22:05 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* strftime.c (STRFTIME): deal with case conversion flags for
+	  recursive formats.
 
-	* encoding.c (enc_alias_internal): free the copied key and
-	  return NULL when given key is already registered.
+Thu Mar 24 12:43:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* encoding.c (enc_alias): call set_encoding_const only when the
-	  alias is not registered yet.
+	* ext/date/date_core.c (dt_lite_iso8601): strftimev() always
+	  returns a String, so append them directly.
 
-Thu Dec  2 19:58:24 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* 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.
 
-	* vm.c (ruby_vm_at_exit): new API.  This enables extension libs to
-	  hook a VM termination.  Right now, because the VM we have is
-	  process global, most extensions do not deallocate resources and
-	  leave them to Operating System's reaping userland processes.  But
-	  in a future we plan to have multiple VMs to run simultaneously in
-	  a single process (MVM project).  At that stage we can no longer
-	  rely on OSes and have to manage every resources to be reclaimed
-	  properly.  So it is.  For a forward-compatibility reason this API
-	  is introduced now, encouraging you to be as gentle as you can for
-	  your resources; that is, tidy up your room.
+	* ext/date/date_core.c (mk_inspect_raw, mk_inspect): inspect by
+	  "%+"PRIsVALUE, to prevent intermediate strings from GC.
 
-	* include/ruby/vm.h: ditto.
+Thu Mar 24 11:43:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm_core.h (rb_vm_struct): new field.
+	* strftime.c (rb_strftime_with_timespec): remove unnecessary
+	  check, as `s` equals to `endp` when recursed STRFTIME resized
+	  the capacity same as the size.
 
-	* vm.c (vm_init2): initialize above new field.
+Wed Mar 23 21:48:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* eval.c (ruby_cleanup): trigger those hooks.
+	* enum.c (ary_inject_op): put subtract operation out of if-clause.
 
-Thu Dec  2 17:00:44 2010  Tanaka Akira  <akr@fsij.org>
+Wed Mar 23 21:38:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* bignum.c: parenthesize macro arguments.
+	* enum.c (ary_inject_op): Use Kahan's compensated summation algorithm
+	  for summing up float values.
 
-Thu Dec  2 15:31:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Mar 23 20:56:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (rb_w32_read): more fix. [ruby-core:33513]
+	* strftime.c (rb_strftime_with_timespec): append formatted results
+	  to the given string with expanding, and also deal with NUL chars.
 
-Thu Dec  2 13:41:43 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* strftime.c (rb_strftime, rb_strftime_timespec): return formatted
+	  string, not the length put in the given buffer.
 
-	* win32/win32.c (rb_w32_read): workaround for console reading troubles.
-	  fixed [ruby-core:33511]
+	* time.c (rb_strftime_alloc): no longer needs to retry with
+	  reallocating buffers.
 
-Thu Dec  2 13:10:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* time.c (time_strftime): no longer needs to split by NUL chars.
 
-	* lib/uri/common.rb (URI.encode_www_form):
-	  split key-value when the value is Array like object.
+Wed Mar 23 14:23:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu Dec  2 10:39:39 2010  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...)
 
-	* lib/net/http.rb (Net::HTTP#set_form_data):
-	  use URI.encode_www_form for application/x-www-form-urlencoded.
+Wed Mar 23 11:44:53 2016  cremno  <cremno@mail.ru>
 
-Thu Dec  2 10:38:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* marshal.c (r_long): cast to `signed char`, which is used
+	  already, instead of SIGN_EXTEND_CHAR.
 
-	* ext/extmk.rb: remove $makeflags.defined?, it should be $mflags.
+	* parse.y: SIGN_EXTEND_CHAR is no longer used.  [Fix GH-1302]
 
-Thu Dec  2 10:19:47 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Mar 23 11:38:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/Makefile.sub (rc): suppress meaningless message.
+	* 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]
 
-Thu Dec  2 10:09:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Mar 23 10:39:38 2016  Koichi ITO  <koic.ito@gmail.com>
 
-	* ext/json/generator/extconf.rb: remove the lines which set -O3
-	  when -O option is not set.
-	  Note that -O3 doesn't always exist.
+	* variable.c: Added documentation about order of `Module#constants`
+	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]
 
-	* ext/json/parser/extconf.rb: ditto.
+Tue Mar 22 21:08:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Dec  2 10:01:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* include/ruby/oniguruma.h: Additional flag for characters that are titlecase.
 
-	* ext/extmk.rb: define $makeflags.defined? like $mflags.
+	* enc/unicode/case-folding.rb, casefold.h: Using above flag in data.
 
-Thu Dec  2 07:20:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enc/unicode.c: Marking capitalized character as unmodified if it is
+	  already titlecase.
 
-	* lib/test/unit.rb (Test::Unit::GCStressOption): --gc-stress
-	  option.
+	* test/ruby/enc/test_case_mapping.rb: Tests for above functionality.
 
-	* lib/test/unit.rb (Test::Unit::Mini#_run_suites): show the result
-	  even when interrupted on the way.
+Tue Mar 22 14:18:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Dec  2 07:08:38 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (lambda_body, parser_yylex): warn mismatched indentation
+	  of lambda block.
 
-	* ext/io/console/console.c (setattr): should retry on EINTR.
-	  [ruby-dev:42666]
+Tue Mar 22 11:36:49 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Dec  2 02:30:50 2010  Eric Hodel  <drbrain@segment7.net>
+	* time.c (wmul): wrong condition.
+	  fixed many test failures on 32bit and LLP64 platforms.
 
-	* lib/net/http.rb: fixed positional wording to match revised order.
+Tue Mar 22 10:31:34 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Dec  2 01:24:39 2010  NARUSE, Yui  <naruse@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.
 
-	* ext/json/lib/json/common.rb: don't use iconv on 1.9.
-	  patched by Shota Fukumori [ruby-core:33164]
+Tue Mar 22 10:24:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Dec  2 01:02:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* time.c (divmodv): void function never returns any value.
 
-	* ext/json: Update github/flori/json from 1.4.2+ to
-	  e22b2f2bdfe6a9b0. this fixes some bugs.
+Tue Mar 22 10:11:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Dec  2 00:05:44 2010  NARUSE, Yui  <naruse@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.
 
-	* lib/net/http.rb: improve rdoc.
-	  This change the order of chapter because such overview should
-	  begin with simple examples.
-	  patched by Eric Hodel [ruby-core:33469]
+Tue Mar 22 03:45:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Dec  1 22:01:49 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* time.c (MUL_OVERFLOW_FIXWV_P): defined for FIXWV.
 
-	* numeric.c (Init_Numeric): fixed a potential bug when using bccwin32
-	  ruby with Microsoft's dll, though we already gave up of supporting
-	  bccwin32. [ruby-core:33503]
+	* time.c (wmul): use MUL_OVERFLOW_FIXWV_P and only switch.
 
-Wed Dec  1 21:43:21 2010  Tanaka Akira  <akr@fsij.org>
+	* time.c (wmul): use mul which has Fixnum optimization.
 
-	* array.c: parenthesize macro arguments.
+	* time.c (rb_time_magnify): If WIDEVALUE_IS_WIDER, wmul() has the same
+	  optimized logic, else mul() has also the similar logic for Fixnum.
 
-Wed Dec  1 21:41:57 2010  Tanaka Akira  <akr@fsij.org>
+	* time.c (rb_time_unmagnify): almost ditto.
 
-	* test/socket/test_addrinfo.rb: extract Errno::EADDRINUSE as a method.
+Tue Mar 22 03:10:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/socket/test_socket.rb: ditto.
+	* time.c (divmodv): add the case both arguments are Fixnum.
 
-Wed Dec  1 15:08:32 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* time.c (wquo): use quo which has Fixnum optimization.
 
-	* test/openssl/test_ssl.rb (test_not_started_session): non socket
-	  argument of SSLSocket.new is not supported on Windows.
+	* time.c (wdivmod0): added for WIDEVALUE_IS_WIDER.
 
-Wed Dec  1 14:36:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (wdivmod): use wdivmod0 and divmodv.
+	  divmodv has Fixnum optimization.
 
-	* string.c (rb_memhash): zero-filled strings should return
-	  different values.  [ruby-core:33500]
+	* time.c (wdiv): use wdivmod0 and div to avoid the use of divmodv which
+	  calls id_quo whose return value is array.
 
-Wed Dec  1 14:27:49 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+	* time.c (wmod): use wdivmod0 and mod to avoid the use of divmodv which
+	  calls id_quo whose return value is array.
 
-	* lib/minitest/*.rb: Imported minitest 2.0.0 r5952.
-	* test/minitest/*.rb: ditto.
-	* lib/test/unit.rb: Compatibility fix for minitest changes.
+Mon Mar 21 22:32:50 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Dec  1 10:16:41 2010  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.
 
-	* string.c (rb_str_inspect): fix typo (not 0xFD but 0xFE).
+Mon Mar 21 22:15:11 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Dec  1 09:28:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* time.c (mod): Add Fixnum case.
 
-	* addr2line.c: Follow .gnu_debuglink section.
-	  A user of distribution provided ruby will see line
-	  info if s/he has a debug package for ruby.
-	  patched by Shinichiro Hamaji [ruby-dev:42655]
+	* 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.
 
-Wed Dec  1 01:29:15 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Mar 21 22:09:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c (rb_str_inspect): inspect as a dummy encoding string
-	  when a UTF-16/32 (not BE/LE) string does not have a BOM.
-	  Unicode and some RFCs say that a string labeled as UTF-16/32
-	  doesn't have a BOM, it should be considered big endian.
-	  But many Windows programs generates little endian UTF-16
-	  strings without a BOM. So String#inspect treats a string
-	  labeled UTF-16/32 without a BOM as a dummy encoding string.
-	  patched by Martin Duerst. [ruby-core:33461]
+	* internal.h (rb_fix_mul_fix): multiply converted values, not
+	  object VALUEs.
 
-Tue Nov 30 17:04:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Mar 21 20:18:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* addr2line.c (parse_debug_line_cu): ignore DW_LNE_set_discriminator.
-	  To ignore, it needs to read a single unsigned LEB128 integer.
+	* common.mk (TEST_EXCLUDES, EXCLUDE_TESTFRAMEWORK): use full spell
+	  long option.
 
-Tue Nov 30 16:29:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL): suppress path name
+	  conversions by msys2.  [ruby-dev:49525] [Bug #12199]
 
-	* vm_dump.c: undef HAVE_BACKTRACE when the OS is FreeBSD (in other
-	  words backtrace() is libexecinfo) and it is optimized.
-	  This temporary hack may be also applied to other libexecinfo
-	  environments.
+Mon Mar 21 19:09:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Nov 30 16:23:23 2010  NARUSE, Yui  <naruse@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]
 
-	* lib/net/http.rb: improve rdoc.
-	  patched by Eric Hodel ref #4100
+Mon Mar 21 18:55:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Nov 30 12:23:52 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* node.c (rb_gc_mark_node): NODE_MATCH2 can have nd_args, u3,
+	  since r54100.
 
-	* win32/win32.c (rb_w32_read): read only 1 byte at once on console.
-	  workaround of Windows bug. see [ruby-core:33460].
-	  this is not the final solution.
+Sun Mar 20 21:17:13 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Nov 30 11:39:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* internal.h (rb_int128t2big): declare only when HAVE_INT128_T.
+	  fixed a compile error with VC++ introduced at r54203.
 
-	* lib/net/http.rb: improve rdoc.
-	  patched by mathew murphy [ruby-core:33472] ref #4100
+Sun Mar 20 20:10:14 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Nov 30 05:03:44 2010  Eric Hodel  <drbrain@segment7.net>
+	* 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.
 
-	* lib/uri/common.rb (encode_www_form, encode_www_form_component):
-	  Improve English in documentation.
+	* internal.h (DL2NUM): defined if DLONG is defined.
 
-	* ext/openssl/ossl_ssl.c (ssl_version=, ciphers=): Document
-	  #ssl_version=, add documentation for #ciphers=.
+	* internal.h (rb_fix_mul_fix): defined for `Fixnum * Fixnum`.
 
-Mon Nov 29 22:55:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* insns.def (opt_mul): use rb_fix_mul_fix().
 
-	* lib/uri/common.rb (URI::WFKV_): get rid of backtrack explosion
-	  by nested repeat operators.  [ruby-core:33464]
+	* numeric.c (fix_mul): ditto.
 
-Mon Nov 29 22:53:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (mul): ditto.
 
-	* win32/Makefile.sub (scriptbin.mk): fix generated rules.
+Sun Mar 20 18:53:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (rb_w32_write_console): fix argument type.
+	* 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.
 
-Mon Nov 29 21:12:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Mar 20 18:44:52 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* misc/ruby-mode.el (ruby-forward-sexp): stop after literal hash
-	  key labels.
+	* time.c (add): remove FIXABLE() which is in LONG2NUM().
 
-	* misc/ruby-mode.el (ruby-font-lock-keywords): highlight literal
-	  hash key labels as symbols.
+	* time.c (sub): ditto.
 
-Mon Nov 29 18:31:31 2010  Martin Duerst  <duerst@it.aoyama.ac.jp>
+	* time.c (mul): ditto.
 
-	* test/ruby/test_transcode.rb (test_unicode_public_review_issue_121):
-	  - Removed commented-out options that are no longer under discussion.
-	  - Added two more tests for forthcomming clarifications.
+Sun Mar 20 04:46:02 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Nov 29 14:31:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (rb_big_cmp): reduce the code.
 
-	* win32/win32.c (rb_w32_isatty): use GetConsoleMode() to determine the
-	  fd is console or not, just like rb_w32_write_console(). [experimental]
+	* bignum.c (rb_big_eq): If normalized bignum is still bignum,
+	  it must be larger than fixnum.
 
-Mon Nov 29 14:19:40 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Mar 20 00:58:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* include/ruby/win32.h (rb_w32_write_console): wrong prototype.
+	* 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.
 
-Mon Nov 29 14:10:55 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* internal.h (rb_big_odd_p, rb_big_even_p): ditto.
 
-	* win32/win32.c (rb_w32_write_console): fixed indentation.
+Sat Mar 19 21:56:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Nov 28 22:13:39 2010  Koichi Sasada  <ko1@atdot.net>
+	* 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.
 
-	* thread_pthread.c (NATIVE_MUTEX_LOCK_DEBUG): move and use it.
+Sat Mar 19 21:53:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ChangeLog: fix my timezone.
+	* numeric.c (fix_cmp): invert the result as the comparison is
+	  inverted.
 
-Mon Nov 28 21:58:58 2010  Koichi Sasada  <ko1@atdot.net>
+Sat Mar 19 18:32:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* thread_pthread.c: remove pthread_atfork().
+	* numeric.c (int_to_f): raise NotImplementedError when a receiver
+	  class is unknown.
 
-Mon Nov 28 21:54:22 2010  Koichi Sasada  <ko1@atdot.net>
+	* test/-ext-/integer/test_my_integer.rb (test_my_integer_to_f): modify
+	  a test for the above change.
 
-	* thread_pthread.c (native_cond_*): Check return code.
-	  (Some OSes except Linux return error code).
+Sat Mar 19 18:21:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Sun Nov 28 21:46:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (Bignum#<=>): remove it because they are unified with
+	  Integer#<=>.
 
-	* thread_pthread.c (thread_start_func_1): initialize native thread
-	  data immediately before starting.
+	* numeric.c (Integer#<=>, Fixnum#<=>): move <=> method from Fixnum to
+	  Integer.
 
-Sun Nov 28 14:56:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (int_cmp): add this method for Integer#<=>.
 
-	* io.c (struct argf): make lineno long, and reorder members.
+	* test/-ext-/integer/test_my_integer.rb (test_my_integer_cmp): add a
+	  test to examine Integer#<=> for unknown subclasses.
 
-Sun Nov 28 14:55:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Mar 19 14:46:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread_win32.c (gvl_release, gvl_init): suppress warnings.
+	* iseq.c (rb_iseq_compile_with_option): make the parser in mild
+	  error.
 
-Sun Nov 28 14:48:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* load.c (rb_load_internal0): ditto.
 
-	* thread_pthread.c (gvl_release, gvl_init): suppress warnings.
+	* parse.y (yycompile0): return the error message within the error
+	  to be raised.  [Feature #11951]
 
-	* vm_core.h (rb_vm_gvl_destroy): add prototype.
+	* parse.y (parser_compile_error): accumulate error messages in the
+	  error_buffer.
 
-Sun Nov 28 14:46:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Mar 19 03:57:13 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* thread_pthread.c (gvl_reinit): register atfork handler only in
-	  the parent process, to get rid of dead lock.
+	* time.c (LOCALTIME): organize #ifdefs.
 
-Sun Nov 28 12:23:57 2010  Koichi Sasada  <ko1@atdot.net>
+	* time.c (GMTIME): define only ifndef HAVE_STRUCT_TM_TM_GMTOFF.
 
-	* thread.c, vm_core.h: make gvl_acquire/release/init/destruct
-	  APIs to modularize GVL implementation.
+Sat Mar 19 03:53:31 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* thread_pthread.c, thread_pthread.h: Two GVL implementations.
-	  (1) Simple locking GVL which is same as existing GVL.
-	  (2) Wake-up queued threads.  The wake-up order is simple FIFO.
-	     (We can make several queues to support exact priorities, however
-	      this causes some issues such as priority inversion and so on.)
-	      This impl. prevents spin-loop (*1) caused on SMP environments.
-	  *1: Only one Ruby thread acquires GVL again and again.
-	      Bug #2359 [ruby-core:26694]
+	* configure.in (rb_cv_member_struct_tm_tm_gmtoff): For Linux (glibc)
+	  define _BSD_SOURCE for time.h to define struct tm.tm_gmtoff.
 
-	* thread_win32.c, thread_win32.h: Using simple lock
-	  not by CRITICAL_SECTION but by Mutex.
-	  Bug #3890 [ruby-dev:42315]
+	* time.c: define _BSD_SOURCE at the top.
 
-	* vm.c (ruby_vm_destruct): ditto.
+Sat Mar 19 03:00:50 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-Sun Nov 28 04:40:00 2010  Luis Lavena  <luislavena@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.
 
-	* io.c (io_fwrite): use rb_w32_write_console under Windows.
+Fri Mar 19 00:00:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* win32/win32.c (rb_w32_write_console): added to write to write
-	  Unicode using WriteConsoleW for stdout/stderr. [ruby-core:33166]
+	* bignum.c (rb_big_to_f, Bignum#to_f): removed them because they are
+	  unified with int_to_f and Integer#to_f.
 
-Sun Nov 28 03:58:47 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* numeric.c (int_to_f): treat Bignum values directly.
 
-	* lib/net/http.rb: improve rdoc.
-	  patched by Mike Perham [ruby-core:33433]
+Fri Mar 18 23:41:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Sat Nov 27 19:12:10 2010  Tanaka Akira  <akr@fsij.org>
+	* 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.
 
-	* time.c: parenthesize macro arguments.
+	* numeric.c (Integer#to_f, Fixnum#to_f): move to_f method from Fixnum
+	  to Integer.
 
-Sat Nov 27 18:08:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/-test-/integer/my_integer.c: define helper class for testing
+	  to_f method for a subclass of Integer.
 
-	* time.c (leap_year_v_p): fixed typo.  [ruby-dev:42631]
+	* ext/-test-/integer/extconf.rb: ditto.
 
-Sat Nov 27 17:57:08 2010  Tanaka Akira  <akr@fsij.org>
+	* ext/-test-/integer/init.c: ditto.
 
-	* resolv.rb (Resolv::DNS): use the same DNS server when retry using
-	  TCP.  reported by Julian Mehnle.  [ruby-core:32970]
+	* test/-ext-/integer/test_my_integer.rb: examine to_f method for a
+	  subclass of Integer.
 
-Sat Nov 27 15:45:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar 18 22:32:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* vm_dump.c (rb_vm_bugreport): see CrashReport log on Mac OS X.
+	* include/ruby/intern.h (rb_big_hash): Move to internal.h.
 
-	* configure.in: link addr2line only for ELF.
+	* internal.h: ditto.
 
-Sat Nov 27 13:58:55 2010  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Mar 18 22:10:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* lib/optparse.rb (OptionParser#candidate): : was missing.  Thanks,
-	  Shota Fukumori.  [ruby-dev:42634]
+	* bignum.c (Bignum#eql?): remove its definition because it is unified
+	  with Numeric#eql?.
 
-Sat Nov 27 12:07:05 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* numeric.c (num_eql): treat Bignum values directly.
 
-	* man/ruby.1: Ruby man page from Arthur Gunn in [ruby-core:33412]
+Fri Mar 18 21:57:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Sat Nov 27 11:29:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_to_s, Bignum#to_s): remove its definition because
+	  it is unified with Integer#to_s.
 
-	* lib/optparse.rb (OptionParser#candidate): get rid of 1.9 syntax
-	  so that BASERUBY can be 1.8.
+	* numeric.c (int_to_s): treat Bignum values directly.
 
-Sat Nov 27 08:16:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar 18 21:30:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* addr2line.c (rb_dump_backtrace_with_lines): should close fd on
-	  edge case.
+	* numeric.c (int_to_s): Move from fix_to_s.
 
-Fri Nov 26 13:33:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* numeric.c (Integer#to_s): Move from Fixnum#to_s.
 
-	* addr2line.c: apply a patch from shinichiro.h.
+Fri Mar 18 16:22:24 2016  Victor Nawothnig  <Victor.Nawothnig@gmail.com>
 
-Fri Nov 26 12:21:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* 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]
 
-	* addr2line.c: added to show source filename and line number of
-	  functions in backtrace. [ruby-dev:42625]
-	  a patch from shinichiro.h <shinichiro.hamaji AT gmail.com>
+Fri Mar 18 12:25:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* addr2line.h: ditto.
+	* gc.c (tick): fix missing close parenthesis.  [Fix GH-1291]
 
-	* common.mk: add addr2line.$(OBJEXT).
+Fri Mar 18 10:24:12 2016  Naotoshi Seo  <sonots@gmail.com>
 
-	* configure.in: check dl_iterate_phdr.
+	* ext/date/date_core.c (datetime_to_time): preserve timezone info
+	  [Bug #12189] [Fix GH-1295]
 
-	* vm_dump.c (rb_vm_bugreport): use rb_dump_backtrace_with_lines in
-	  addr2line.c when the binary is ELF.
+Fri Mar 18 10:17:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-Fri Nov 26 12:12:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* bignum.c (rb_big_hash): make it public function to be available in
+	  other source files, and remove documentation comment for Bignum#hash.
 
-	* regcomp.c (setup_tree): restart setup_tree() for a node whose
-	  AnchorNode's type is ANCHOR_PREC_BEHIND or ANCHOR_PREC_BEHIND_NOT
-	  and divide_look_behind_alternatives() divided it to NT_ALT or
-	  NT_LIST. [ruby-core:33370]
+	* bignum.c (Bignum#hash): remove its definition because it is unified
+	  with Object#hash.
 
-Fri Nov 26 11:40:11 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* include/ruby/intern.h (rb_big_hash): add a prototype declaration.
 
-	* vm_dump.c (dump_thread): get only required rights of the target
-	  thread because THREAD_ALL_ACCESS causes an access error on XP.
-	  reported by Masaya TARUI via IRC.
+	* hash.c (any_hash): treat Bignum values directly.
 
-Fri Nov 26 11:09:07 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Mar 18 02:35:12 2016  Naotoshi Seo  <sonots@gmail.com>
 
-	* vm_dump.c (dump_thread): show the displacement from the beginning
-	  of the symbol.
+	* 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 Nov 26 10:48:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Mar 18 02:17:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* vm_dump.c (dump_thread): follow the output of glibc.
-	  see [ruby-dev:42627]
+	* numeric.c (fix_zero_p, fix_even_p, fix_odd_p): remove needless
+	  functions.
 
-Fri Nov 26 09:48:45 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Mar 18 02:15:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* re.c (rb_reg_initialize_str): should succeed the taint status from
-	  the origin. [ruby-core:33338]
+	* numeric.c (int_even_p): treat Fixnum and Bignum values directly.
 
-Fri Nov 26 09:32:37 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Mar 18 02:07:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* vm_dump.c (dump_thread): seems to be necessary the 3rd argument of
-	  SymGetLineFromAddr64(), even though MSDN says it can be zero.
+	* bignum.c (Bignum#even?, Bignum#odd?): remove definitions
+	  because they are unified with Integer#even? and Integer#odd?.
 
-Fri Nov 26 09:03:38 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* numeric.c (Fixnum#zero?, Fixnum#even?, Fixnum#odd?): remove
+	  definitions because they are unified with Numeric#zero?,
+	  Integer#even?, and Integer#odd?.
 
-	* regcomp.c (onig_is_prelude): added to check whether ruby is still
-	  in prelude (or other boot processes) or not.
+	* numeric.c (num_zero_p, int_odd_p): treat Fixnum and
+	  Bignum values directly.
 
-	* regcomp.c (optimize_node_left): use onig_is_prelude for printing.
+	* test/ruby/test_integer.rb (test_odd_p_even_p): remove meaningless
+	  test case.
 
-	* regcomp.c (set_optimize_info_from_tree): ditto.
+Fri Mar 18 01:51:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* regcomp.c (onig_compile): ditto.
+	* bignum.c (rb_big_even_p, rb_big_odd_p): make them public functions
+	  to be available in other source files.
 
-	* regcomp.c (print_compiled_byte_code_list): print its address.
+	* include/ruby/intern.h (rb_big_even_p, rb_big_odd_p): add prototype
+	  declarations.
 
-	* regcomp.c (print_indent_tree): print its contents tree of
-	    ANCHOR_PREC_READ(_NOT) and ANCHOR_PREC_BEHIND(_NOT).
+Fri Mar 18 00:25:56 2016  Tanaka Akira  <akr@fsij.org>
 
-Thu Nov 25 23:10:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* enum.c (ary_inject_op): Implement the specialized code for sum of
+	  float numbers.
 
-	* regcomp.c (print_distance_range): use PRIuSIZE.
+Fri Mar 18 00:15:05 2016  Yusuke Endoh  <mame@ruby-lang.org>
 
-	* regcomp.c (print_optimize_info): use %ld because the type of
-	  calculated value of integers is long.
+	* numeric.c (num_step): use rb_equal for zero check. rb_num_coerce_cmp
+	  created an object which caused extra overhead.
 
-	* regexec.c (onig_print_compiled_byte_code): add prototype.
+Thu Mar 17 22:21:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* regexec.c (match_at): add 2nd argument.
+	* include/ruby/ruby.h (RB_GC_GUARD_PTR): remove intermediate
+	  macro, and expand for each RB_GC_GUARD.  [Fix GH-1293]
 
-Thu Nov 25 10:29:55 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Mar 17 22:08:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/callback/mkcallback.rb (gencallback): shouldn't assume that
-	  VALUE is the same size with long.
+	* compile.c (iseq_specialized_instruction): move specialization
+	  for opt_newarray_max/min from translation phase.
 
-Thu Nov 25 10:03:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Mar 17 21:52:09 2016  Yusuke Endoh  <mame@ruby-lang.org>
 
-	* test/win32ole/test_err_in_callback.rb (teardown): remove tmp file
-	  only when it exists.
+	* array.c, enum.c: make rdoc format consistent.
 
-Thu Nov 25 01:38:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Mar 17 21:47:57 2016  Yusuke Endoh  <mame@ruby-lang.org>
 
-	* enc/trans/big5-hkscs-tbl.rb: Update table as HKSCS-2008.
-	  patched by oCameLo oTnTh [ruby-core:33256]
+	* NEWS: add Array#max, #min, and the optimization.  [Feature #12172]
 
-	* enc/big5.c: add alias Big5-HKSCS:2008 to Big5-HKSCS.
+Thu Mar 17 21:45:02 2016  Yusuke Endoh  <mame@ruby-lang.org>
 
-Wed Nov 24 15:18:07 2010  NAKAMURA Usaku  <usa@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]
 
-	* vsnprintf (BSD_vfprintf): use QUADINT macro only when _HAVE_SANE_QUAD_
-	  macro is defined.
+	* insns.def (opt_newarray_max, opt_newarray_min): added.
 
-Wed Nov 24 12:47:16 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Mar 17 21:35:52 2016  Yusuke Endoh  <mame@ruby-lang.org>
 
-	* vsnprintf (BSD_vfprintf): added VC++ compatible size specifications
-	  (I, I32, I64).
+	* array.c (rb_ary_max, rb_ary_min): implement Array#max and min with
+	  arguments.  replace super call with rb_nmin_run.
 
-Wed Nov 24 11:19:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* enum.c (nmin_run): exported (as rb_nmin_run).
 
-	* string.c (rb_str_inspect): treat UTF-16 and UTF-32 as BE or LE.
+	* internal.h: added a prototype for rb_nmin_run.
 
-Wed Nov 24 06:35:32 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Mar 17 21:24:52 2016  Yusuke Endoh  <mame@ruby-lang.org>
 
-	* enc/trans/utf_16_32.trans: add the UTF-32 converter.
+	* array.c (rb_ary_max, rb_ary_min): implement a block by itself instead
+	  of delegating Enumerable#max/min.
 
-Wed Nov 24 05:40:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Mar 17 21:09:34 2016  Yusuke Endoh  <mame@ruby-lang.org>
 
-Wed Nov 24 06:13:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_max, rb_ary_min): Array#max and Array#min added.
+	  [Feature #12172]
 
-	* win32/win32.c (filecp, wstr_to_mbstr, mbstr_to_wstr):
-	  refactored.
+	* internal.h (OPTIMIZED_CMP): moved from enum.c so that array.c can
+	  use it.
 
-Wed Nov 24 05:40:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* test/ruby/test_array.rb (test_max, test_min): tests for Array#max
+	  and Array#min.
 
-	* enc/trans/utf_16_32.trans: add a converter from UTF-8 to UTF-16.
+	* test/ruby/test_enum.rb (test_max, test_min): revised a bit to test
+	  Enumerable#max and #min explicitly.
 
-Wed Nov 24 03:21:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Mar 17 21:02:42 2016  Yusuke Endoh  <mame@ruby-lang.org>
 
-	* enc/trans/utf_16_32.trans: raise error on unpaired upper
-	  surrogates.
+	* internal.c: struct cmp_opt_data added for refactoring out a data
+	  structure for CMP_OPTIMIZABLE
 
-Wed Nov 24 01:40:23 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* array.c (struct ary_sort_data): use struct cmp_opt_data.
 
-	* enc/utf_16_32.h: add UTF-16 and UTF-32 as a dummy encoding.
+	* enum.c (struct min_t, max_t, min_max_t): use struct cmp_opt_data.
 
-	* enc/trans/utf_16_32.trans: add a converter from UTF-16 to UTF-8.
+Thu Mar 17 20:55:21 2016  Tanaka Akira  <akr@fsij.org>
 
-Tue Nov 23 21:59:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enum.c (ary_inject_op): Extracted from enum_inject.
 
-	* win32/win32.c (wlink, rb_w32_getppid): use typedef instead of
-	  repeating complicated function prototypes.
+Thu Mar 17 18:39:04 2016  Tanaka Akira  <akr@fsij.org>
 
-Tue Nov 23 18:54:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enum.c (enum_inject): Implement the specialized code for sum of
+	  integers including Bignums.
 
-	* vm.c (rb_thread_mark): should mark self in control
-	  frames.  [ruby-core:33289]
+	* internal.h (rb_fix_plus): Declared to be usable from enum_inject.
 
-Tue Nov 23 07:57:31 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+	* numeric.c (rb_fix_plus): Defined.
 
-	* lib/date/delta/parser.{ry,rb}: fixed a bug of token scanner.
+Thu Mar 17 17:20:28 2016  Anton Davydov  <antondavydov.o@gmail.com>
 
-Tue Nov 23 07:29:24 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+	* thread_sync.c: [DOC] Update documentation for Queue class
+	  description.  [Fix GH-1292]
 
-	* complex.c, rational.c ({nucomp,nurat}_expt): added a check.
+Thu Mar 17 17:14:51 2016  Dinar Valeev  <dvaleev@suse.com>
 
-Tue Nov 23 07:27:27 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+	* gc.c (tick): Use __builtin_ppc_get_timebase for POWER arch.
+	  [Fix GH-1291]
 
-	* lib/date.rb (daynum): should be private.
+Thu Mar 17 11:51:48 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Nov 23 07:22:54 2010  Nobuyoshi Nakada  <nobu@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
 
-	* ChangeLog (change-log-indent-text): hanging indent.
+Thu Mar 17 12:09:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Tue Nov 23 06:30:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enc/unicode.c: Fixed two macro definitions.
+	* test/ruby/enc/test_case_mapping.rb: Test cases that detected
+	  the above bugs.
 
-	* configure.in (SITE_DIR, VENDOR_DIR),
-	  version.c (ruby_initial_load_paths): exclude directories that
-	  are configured without them from $LOAD_PATH. [ruby-core:33267]
+Thu Mar 17 11:36:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in (rubylibprefix): No ruby, No libprefix.
+	* ext/socket/option.c (inspect_tcpi_msec): more accurate condition
+	  for TCPI msec member inspection function.
+	  [ruby-core:74388] [Bug #12185]
 
-Tue Nov 23 01:05:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Mar 17 08:13:43 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-	* vsnprintf.c (BSD_vfprintf): don't output floating point
-	  when the precision is 0. [ruby-dev:42615]
+	* 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).
 
-Mon Nov 22 21:30:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar 17 07:17:36 2016  Eric Hodel  <drbrain@segment7.net>
 
-	* string.c (rb_str_inspect): fix for ascii-compatible external
-	  encoding and different encoding string.  [ruby-core:33283]
+	* marshal.c (r_object0):  raise ArgumentError when linking to undefined
+	  object.
 
-Mon Nov 22 18:45:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar 17 00:45:00 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* lib/mkmf.rb (create_makefile): should not duplicate rules.
-	  bug fix of r29842.
+	* test/ruby/test_bignum.rb: Make sure to use Bignum values in the tests.
 
-Mon Nov 22 18:04:40 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Mar 16 23:10:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enc/big5.c: split CP950 from Big5.
+	* defs/keywords (alias, undef): symbol literals are allowed.
 
-	* enc/big5.c: split CP951 from Big5-HKSCS.
+	* parse.y (parse_percent): should parse symbol literals for alias
+	  and undef.  [ruby-dev:47681] [Bug #8851]
 
-	* enc/trans/big5.trans: import conversion table of Big5, Big5-HKSCS,
-	  CP950, and CP951 from ICU. they need fallback conversions.
-	  ref [ruby-core:33256]
-	  http://source.icu-project.org/repos/icu/data/trunk/charset/data/ucm/
+Wed Mar 16 21:39:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* tool/transcode-tblgen.rb (import_ucm): add to import ucm files.
+	* enc/trans/JIS: update Unicode's notice. [Bug #11844]
 
-Mon Nov 22 18:33:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 16 20:03:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c (rb_str_inspect): append for each chars instead of bulk
-	  copy if encoding conversion is needed.  [ruby-core:33283]
+	* proc.c (proc_binding): proc from symbol can not make a binding.
+	  [ruby-core:74100] [Bug #12137]
 
-Mon Nov 22 14:22:45 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Mar 16 18:42:45 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* time.c (time_zone): use rb_locale_str_new_cstr to set encoding
-	  as locale and convert its content to internal encoding.
-	  [ruby-core:33278]
+	* test/ruby/enc/test_case_mapping.rb: Fixed and activated a test for Cherokee.
 
-Mon Nov 22 11:58:11 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Mar 16 17:58:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* string.c (rb_str_concat): set ENC_CODERANGE_VALID when the
-	  receiver is 7BIT and the argument is non ASCII.
+	* test/ruby/enc/test_case_mapping.rb: Fixed a logical error.
 
-Mon Nov 22 01:48:58 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Mar 16 17:57:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/date.rb: some improvements for performance.
+	* test/ruby/enc/test_case_mapping.rb: Adding tests for Cherokee.
+	  One test not yet working.
+	  (with Kimihito Matsui)
 
-Sat Nov 20 07:45:50 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+Wed Mar 16 15:44:05 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/mkmf.rb: adding compilation support for ObjC/ObjC++ extensions.
-	  Thanks Scott Gonyea! [ruby-core:33260]
+	* test/ruby/enc/test_case_mapping.rb: Adding tests for actual Unicode
+	  case mapping. Fixing some aliasing issues.
+	  (with Kimihito Matsui)
 
-Sat Nov 20 01:57:55 2010  Akio Tajima  <artonx@yahoo.co.jp>
+Tue Mar 15 21:38:28 2016  Tanaka Akira  <akr@fsij.org>
 
-	* common.mk: add dependency(insns.inc) to compile.obj
+	* enum.c (enum_inject): Consider redefinition of Fixnum#+.
+	  [ruby-dev:49510] [Bug#12178] Reported by usa.
 
-Fri Nov 19 23:05:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 15 20:32:57 2016  Tanaka Akira  <akr@fsij.org>
 
-	* win32/Makefile.sub (insns_rules.mk): remove extra backslash.
+	* enum.c (enum_inject): Implement the specialized code for :+ operator
+	  for Fixnums.
 
-	* cygwin/GNUmakefile.in, win32/Makefile.sub (clean): rc files are
-	  made at compile time, so should be removed by clean.
+Tue Mar 15 20:21:01 2016  Tanaka Akira  <akr@fsij.org>
 
-Fri Nov 19 22:09:46 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* enum.c (enum_inject): Implement the specialized code for self is an
+	  array and a symbol operator is given.
 
-	* test/rexml/test_core.rb
-	  (Tester#test_pretty_format_long_text_finite): skip a test that
-	  uses long string on small memory system. [ruby-dev:42599]
+Tue Mar 15 16:29:51 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Fri Nov 19 21:07:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enc/unicode.c: Eliminating common code.
+	  (with Kimihito Matsui)
 
-	* lib/optparse.rb: shell completion support for zsh.  based on
-	  <http://d.hatena.ne.jp/rubikitch/20071002/zshcomplete>
+Tue Mar 15 16:17:09 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/optparse.rb: shell completion support for bash.
+	* enc/unicode.c: Expansion of some code repetition in preparation for
+	  elimination of common code pieces.
+	  (with Kimihito Matsui)
 
-Fri Nov 19 00:00:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 15 13:49:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* cygwin/GNUmakefile.in (SCRIPTPROGRAMS): no needs on cygwin.
+	* enc/unicode.c: Additional macros and code to use mapping data in
+	  CaseMappingSpecials array.
+	  (with Kimihito Matsui)
 
-	* win32/Makefile.sub (scriptbin): create script binaries.
+Tue Mar 15 13:41:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Nov 18 23:21:23 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* internal.h (rb_gc_mark_global_tbl): should be private,
+	  but was accidentally exported.
 
-	* lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap):
-	  REXML::Formatters::Pretty#wrap used a recursive method call to
-	  format text.  This switches it to use an iterative approach.
-	  [ruby-core:33245]
-	  Patch by Jeremy Evans. Thanks!!!
+Tue Mar 15 12:51:06 2016  Marcus Stollsteimer  <sto.mar@web.de>
 
-	* test/rexml/test_core.rb: add a test for it.
+	* doc/extension.ja.rdoc: Fix RDoc markup in doc/extension*.rdoc.
+	  [ci skip][Bug #12143][ruby-core:74143]
+	* doc/extension.rdoc: ditto.
 
-Thu Nov 18 22:58:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 15 09:56:41 2016  Ian Lunderskov  <ian.lunderskov@gmail.com>
 
-	* include/ruby/io.h (rb_io_buffer_t): extract from rb_io_t.
+	* time.c: Minor typo in Time#dst? documentation.
+	  [ci skip][fix GH-1290]
 
-Thu Nov 18 07:37:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 15 04:36:41 2016  Charles Oliver Nutter  <headius@headius.com>
 
-	* Makefile.in (reconfig): force reconfigure with previous options.
+	* test/ruby/test_rubyoptions.rb (test_disable): add tests for
+	  --disable-gems and --disable-did_you_mean.
 
-	* common.mk (showconfig): show configure flags, like as
-	  `config.status --config' generated by recent autoconf.
+Tue Mar 15 03:35:04 2016  Eric Hodel  <drbrain@segment7.net>
 
-Thu Nov 18 07:16:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.
 
-	* missing/langinfo.c (strncasecmp): get rid of redefinition.
+Tue Mar 15 01:22:27 2016  Charles Oliver Nutter  <headius@headius.com>
 
-Thu Nov 18 00:02:17 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+	* test/ruby/test_rubyoptions.rb: make version matching support
+	  JRuby's version output.
 
-	* lib/csv.rb: Upgrading output encoding with ASCII content
-	  as needed.  [ruby-core:33229]
+Mon Mar 14 19:05:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Nov 17 23:19:21 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (big2str_2bdigits): reduce div instruction.
 
-	* win32/configure.bat: remove quotes from arguments to be quoted.
+Mon Mar 14 18:39:53 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/mkmf.rb (create_makefile): use forward slashes in messages.
+	* include/ruby/oniguruma.h, enc/unicode.c: Adjusting flag assignments
+	  and macros to work with unified CaseMappingSpecials array.
+	  (with Kimihito Matsui)
 
-	* lib/mkmf.rb (create_makefile): make extension libraries messages
-	  brief.
+Mon Mar 14 16:53:37 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/Makefile.sub (MAKEDIRS): should not include silent flag.
+	* 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.
 
-	* common.mk (ext/ripper/ripper.c, ext/json/parser/parser.c): pass
-	  Q and ECHO.  [ruby-core:33226]
+	* parse.y (reg_named_capture_assign_gen): build just assignment
+	  nodes for the optimization.
 
-Wed Nov 17 16:09:52 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Mon Mar 14 16:02:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/test_tracer.rb: new test case.
-	  minimal regression test for r29280.
+	* file.c (ruby_is_fd_loadable): now return -1 if loadable but
+	  may block.
 
-Wed Nov 17 16:04:23 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+	* ruby.c (open_load_file): wait to read by the result of
+	  ruby_is_fd_loadable, without fstat.
 
-	* test/ruby/envutil.rb (Test::Unit::Assersions#assert_warn):
-	  new assertion to assert that a particular warning message is
-	  displayed.
-	  forward port from branches/ruby_1_9_2@29795.
+Mon Mar 14 13:38:38 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Nov 17 15:16:48 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* numeric.c (fix2str): improve r54092 like rb_int2big().
 
-	* regint.h (OnigOpInfoType): constify name.
+Mon Mar 14 10:02:23 2016  Eric Wong  <e@80x24.org>
 
-	* regcomp.c (op2name): constify return value.
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe
+	  [ruby-core:73803] [Bug #12069]
 
-	* regcomp.c (onig_print_compiled_byte_code): use PRIuPTR and
-	  uintptr_t to clean warnings.
+Sun Mar 13 09:43:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* regcomp.c (print_indent_tree): use PRIxPTR and intptr_t.
+	* include/ruby/win32.h (O_SHARE_DELETE): change to fit Fixnum
+	  limit.  [ruby-core:74285] [Bug #12171]
 
-	* regexec.c (match_at): use PRIdPTR and intptr_t.
+Sun Mar 13 09:15:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Nov 17 09:49:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* numeric.c (rb_fix2str): fix edge case, accidentally generated
+	  wrong Fixnum from LONG_MIN.
 
-	* enc/shift_jis.c (property_name_to_ctype): fix memory leak.
+Sat Mar 12 09:50:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enc/euc_jp.c (property_name_to_ctype): ditto.
+	* 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]
 
-Wed Nov 17 08:54:04 2010  James Edward Gray II  <jeg2@ruby-lang.org>
+Sat Mar 12 02:44:48 2016  Tanaka Akira  <akr@fsij.org>
 
-	* lib/csv.rb: Upgrading output encoding as needed.  [ruby-core:33135]
+	* test/lib/test/unit.rb: describe !/REGEXP/ in the help message.
 
-Tue Nov 16 22:30:39 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+Fri Mar 11 17:03:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm_insnhelper.c (vm_throw): remove fear of undefined behavior :-)
-	  Coverity Scan found this bug.
+	* test/lib/test/unit.rb (Options#non_options): make regexp name
+	  options prefixed with "!" negative filters.
 
-Tue Nov 16 09:33:00 2010  Kenta Murata <mrkn@mrkn.jp>
+	* common.mk (TEST_EXCLUDES): use negative filter to exclude memory
+	  leak tests.  -x option excludes test files, not test methods.
 
-	* ext/bigdecimal/lib/bigdecimal/util.rb (to_digits): avoid unused
-	  variables warning, reported by Aaron Patterson.
+Fri Mar 11 16:11:27 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Tue Nov 16 06:39:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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)
 
-	* pack.c (PACK_ITEM_ADJUST): return nil not result array and yield
-	  values if block is given.  [ruby-core:33193]
+Thu Mar 10 17:34:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Nov 16 00:21:20 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+	* iseq.c (prepare_iseq_build): enable coverage by coverage_enabled
+	  option, not by parse_in_eval flag in the thread context.
 
-	* regparse.c (and_cclass, or_cclass): fix memory leak.  Coverity Scan
-	  found this bug.  [ruby-dev:42579]
+	* iseq.h (rb_compile_option_struct): add coverage_enabled flag.
 
-Tue Nov 16 00:07:32 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+	* parse.y (yycompile0): set coverage_enabled flag if coverage
+	  array is made.
 
-	* gc.c (assign_heap_slot): fix fear of memory leak and memory
-	  violation.  Coverity Scan found this bug.
+Thu Mar 10 15:19:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Nov 15 23:54:45 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+	* node.c (dump_option): nd_compile_option is a hidden hash object,
+	  cannot call inspect on it.
 
-	* eval_intern.h (CHECK_STACK_OVERFLOW): it was not intended to add
-	  size_t to a pointer typed VALUE*.  Coverity Scan found this defect.
+Thu Mar 10 09:49:54 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-Mon Nov 15 23:41:21 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+	* 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.
 
-	* compile.c (iseq_set_exception_local_table, iseq_set_local_table,
-	  rb_iseq_build_from_ary): fix type inconsistency (which is benign
-	  because sizeof(ID) == sizeof(ID*), though).  Coverity Scan found
-	  these bugs.
+Wed Mar  9 16:48:45 2016  Koichi Sasada  <ko1@atdot.net>
 
-Mon Nov 15 22:47:27 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+	* benchmark/driver.rb: fix my last commit (syntax error).
 
-	* vm_eval.c (rb_funcall): ensure va_end after va_init_list.  Coverity
-	  Scan found this bug.
+Wed Mar  9 16:41:44 2016  Koichi Sasada  <ko1@atdot.net>
 
-Mon Nov 15 08:36:12 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+	* benchmark/driver.rb: fix output messages.
 
-	* lib/racc/parser.rb (do_parse, yyparse): using class eval to define
-	  method and avoid __send__.
+	* benchmark/memory_wrapper.rb: use respond_to? because
+	  member? does not work well.
 
-Mon Nov 15 06:43:48 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+Wed Mar  9 16:20:25 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* etc/openssl/ossl_ssl.c (ossl_ssl_get_cert): raise exception if
-	  pointer is invalid.  Thanks Ippei Obayashi! [ruby-dev:42573]
+	* 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.
 
-Sun Nov 14 17:57:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* benchmark/memory_wrapper.rb: ditto.
 
-	* enc/Makefile.in (distclean): should not remove sources which are
-	  distributed in tarball.
+Wed Mar  9 15:04:22 2016  Koichi Sasada  <ko1@atdot.net>
 
-Sun Nov 14 16:48:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* benchmark/bm_vm3_gc_old_full.rb: add GC.start benchmark.
 
-	* parse.y (parser_set_token_info): turn on/off with directives.
-	  [ruby-core:25442]
+	* benchmark/bm_vm3_gc_old_immediate.rb: ditto.
 
-Sun Nov 14 12:05:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* benchmark/bm_vm3_gc_old_lazy.rb: ditto.
 
-	* io.c (argf_readlines): forward to current_file for arguments
-	  check.  http://twitter.com/nagachika/status/3634254856589312
+Wed Mar  9 14:59:11 2016  Koichi Sasada  <ko1@atdot.net>
 
-Sun Nov 14 08:48:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* benchmark/driver.rb: exit benchmarking if a benchmark process
+	  receives signals.
 
-	* win32/setup.mak (-basic-vars-, -runtime-): suppress trailing
-	  space and compiler command line.
+Wed Mar  9 13:22:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Nov 14 04:22:32 2010  Alexander Zavorine  <alexandre.zavorine@nokia.com>
+	* test/lib/memory_status.rb: make Memory::Status independent of
+	  MiniTest::Skip.
 
-	* symbian/setup (config.h): Added HAVE_LABS and HAVE_LLABS to config.h.
+	* test/lib/test/unit/assertions.rb (assert_no_memory_leak): skip
+	  if Memory::Status is not available.
 
-	* symbian/configure.bat: Changed packaging version in line with API
-	  style 3 versioning.
+Wed Mar  9 09:19:55 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-Sat Nov 13 16:37:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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.
 
-	* common.mk (showflags, help): emit messages at once.
+Wed Mar  9 03:35:22 2016  Charles Oliver Nutter  <headius@headius.com>
 
-	* win32/Makefile.sub (MSG, EOM): remove surrounding quotes by %~I.
+	* test/ruby/test_require.rb (test_require_with_loaded_features_pop):
+	  Only remove PATH so threads don't accidentally double-pop.
 
-Sat Nov 13 01:31:30 2010  Akio Tajima <artonx@yahoo.co.jp>
+Wed Mar  9 00:29:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/Makefile.sub: reorder variable End Of Message (don't display it)
+	* vm_method.c (rb_alias): the original name should be properly
+	  available method_added method, set the name before calling the
+	  hook.
 
-Fri Nov 12 20:52:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar  9 00:07:03 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk (showflags, help): use caret to quote leading spaces on
-	  Windows.
+	* lib/logger.rb (Logger::LogDevice#initialize): define using
+	  keyword arguments.
 
-	* Makefile.in, common.mk, cygwin/GNUmakefile.in, enc/depend,
-	  ext/ripper/depend, lib/mkmf.rb, win32/Makefile.sub: caddle up.
+Tue Mar  8 23:37:07 2016  Charles Oliver Nutter  <headius@headius.com>
 
-Fri Nov 12 16:35:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* 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.
 
-	* configure.in: support C level backtrace information on FreeBSD.
-	  When devel/libexecinfo is installed on FreeBSD, now ruby
-	  can show C level backtrace information.
-	  http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/libexecinfo/
+Tue Mar  8 17:20:21 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Nov 12 09:58:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* intern.h (rb_divmod): assume compilers `/` and `%` comply C99
+	  and reduce branching. If a compiler doesn't comply, add #ifdefs.
 
-	* win32/setup.mak: use findstr.exe instead of find.exe, because all
-	  target build platforms should have findstr.exe, and, find.exe often
-	  means another command such as cygwin's.
+	* intern.h (rb_div): added for Ruby's behavior.
 
-Fri Nov 12 00:30:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* intern.h (rb_mod): added for Ruby's behavior.
 
-	* win32/Makefile.sub (config.h): need PRI_LL_PREFIX.
+	* insns.def (opt_div): use rb_div.
 
-Thu Nov 11 23:38:32 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* insns.def (opt_mod): use rb_mod.
 
-	* configure.in: ANSI C-conforming const and volatile are mandatory
+	* numeric.c (fixdivmod): removed.
 
-	* configure.in (AC_C_CONST, AC_C_INLINE, AC_C_VOLATILE): check
-	  before used in other checks.
+	* numeric.c (fix_divide): use rb_div.
 
-	* configure.in (RUBY_CHECK_PRINTF_PREFIX): should not break from
-	  RUBY_WERROR_FLAG, so that ac_c_werror_flag gets restored.
+	* numeric.c (fix_mod): use rb_mod.
 
-Thu Nov 11 23:04:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (fix_divmod): use rb_divmod.
 
-	* ext/iconv/iconv.c (warn_deprecated): show caller position.
+Tue Mar  8 17:53:09 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu Nov 11 23:03:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* insns.def (opt_mod): show its method name on ZeroDivisionError.
+	  [Bug #12158]
 
-	* io.c (argf_close): untie tied io before closing.
+Tue Mar  8 17:33:38 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* io.c (argf_write): add ARGF.write and so on.
+	* win32/win32.c (rb_w32_write_console): now no need to check
+	  ERROR_CALL_NOT_IMPLEMENTED because it is for old Win9X.
 
-	* io.c (argf_read_nonblock): add ARGF.read_nonblock.
+Tue Mar  8 16:54:29 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Nov 11 21:49:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (rb_w32_write_console): stop the VT100 emulation if the
+	  console supports it natively.
 
-	* lib/rdoc/stats.rb (RDoc#print): get rid of NaN.
+Tue Mar  8 08:13:01 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-Thu Nov 11 21:47:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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).
 
-	* common.mk (SHOWFLAGS): show compile flags.
+Tue Mar  8 00:42:22 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* common.mk: hide long command lines by default.  verbose-mode is
-	  turned on by V=1 as before.
-	  http://jarp.does.notwork.org/diary/200605b.html#200605121
+	* ruby.c (warn_cr_in_shebang): meaningless check on DOSISH platforms.
+	  fixed a test failure introduced at r53998.
 
-Thu Nov 11 21:32:09 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar  8 00:27:53 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-	* lib/mkmf.rb (try_func): accept variable address.
+	* ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo.
+	  [ruby-core:72513] [Bug #11893] The patch provided by Akira Matsuda.
 
-	* ext/win32ole/extconf.rb: libuuid is needed on cygwin.
 
-Thu Nov 11 21:24:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar  8 00:25:08 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-	* file.c (file_expand_path): use cygwin_conv_path on cygwin 1.7 or
-	  later.
+	* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.
+	  [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda.
 
-	* ruby.c (push_include_cygwin): ditto.
 
-Thu Nov 11 20:49:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar  8 00:21:58 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-	* include/ruby/ruby.h (PRI_LL_PREFIX): format type specifier for
-	  LONG_LONG may vary on platforms.
+	* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
+	  [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
 
-Thu Nov 11 20:45:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in (SYMBOL_PREFIX): separate from EXPORT_PREFIX.
+Tue Mar  8 00:11:47 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-	* win32/mkexports.rb (Exports#each_export): use SYMBOL_PREFIX.
+	* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
+	  [Bug #11886] The patch provided by Akira Matsuda.
 
-Wed Nov 10 07:20:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/sample/*.rb: ditto.
 
-	* cygwin/GNUmakefile.in (scriptbin): make executable file from
-	  scripts with stub.
+Mon Mar  7 13:32:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ruby.c (load_file_internal): assume xflag for exe file as well
-	  as no-shebang file.
+	* class.c (rb_define_class, rb_define_class_id_under): raise
+	  ArgumentError if super is 0, deprecated behavior which has been
+	  warned long time.
 
-	* tool/rbinstall.rb: install script programs.
+Mon Mar  7 13:28:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/mkexports.rb (Exports#initialize): alias ruby_sysinit for
-	  stub.
+	* internal.h: move function declarations for class internals from
+	  include/ruby/intern.h.
 
-	* win32/stub.c: stub for scripts.  [EXPERIMENTAL]
+Mon Mar  7 10:58:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Nov  9 21:57:45 2010  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.
 
-	* dln.c (init_funcname): allocate and build initialization
-	  funciton name at once.
+	* internal.h (rb_write_error_str): export.
 
-Tue Nov  9 21:14:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Mar  7 01:38:41 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-	* configure.in (AC_FUNC_GETPGRP, AC_FUNC_SETPGRP): no need when
-	  not used.
+	* 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.
 
-	* configure.in (EXPORT_PREFIX): check generic prefix.
+Sun Mar  6 22:43:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Nov  9 13:24:33 2010  NARUSE, Yui  <naruse@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.
 
-	* regenc.c (onigenc_minimum_property_name_to_ctype):
-	  \p{...} should be case insensitive. [ruby-core:33000]
+Sat Mar  5 09:50:58 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-	* regenc.c (onigenc_property_list_add_property):
-	  ditto.
+	* 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.
 
-	* enc/euc_jp.c (init_property_list, property_name_to_ctype):
-	  to lowercase property names.
+Sat Mar  5 09:17:54 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-	* enc/shift_jis.c (init_property_list, property_name_to_ctype):
+	* 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.
 
-Tue Nov  9 13:29:36 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (overlapped_socket_io): get rid of a warning of 64bit
-	  mingw.
-
-Tue Nov  9 10:44:19 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* util.c (ruby_strtod): this code uses FPU's rounding system.
-	  But x86's FPU calculates double precision floating-point
-	  numbers in 80bit precision, so it fails to round the value.
-	  So ensure the value is assigned a variable. [ruby-dev:42551]
-	  see also [ruby-math:00802]
-	  http://www.shudo.net/java-grandprix99/strictfp/
-
-Tue Nov  9 07:30:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (rb_syserr_new): new function to make SystemCallError
-	  instance without errno.  [EXPERIMENTAL]
-
-	* error.c (rb_syserr_fail, rb_mod_syserr_fail): ditto.
-
-Tue Nov  9 05:54:57 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* lib/*.rb: Remove unused variable warnings.
-	  Patch by Run Paint [ruby-core:30991]
-
-	* lib/rubygems/*, lib/rdoc/*.rb, lib/rake/*.rb: ditto
-
-Mon Nov  8 18:26:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* util.c (ruby_hdtoa): fix type cast and bufsize.
-
-Mon Nov  8 15:40:56 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): fix precision specifier doesn't
-	  work well on %f. [ruby-dev:42552]
-
-Mon Nov  8 14:41:40 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (get_wsa_extension_function): typos.
-
-Mon Nov  8 13:41:33 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Mar  5 07:36:27 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-	* tool/enc-unicode.rb,
-	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
-	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
-	  Add Age property to regexp. [ruby-core:33019]
-	  patched by Ammar Ali, tested by Run Paint Run Run
+	* 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.
 
-Mon Nov  8 12:16:39 2010  Ben Walton  <bwalton@artsci.utoronto.ca>
+Sat Mar  5 07:14:10 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-	* configure.in: support -h for solaris linker when gcc not used
+	* 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.
 
-Mon Nov  8 11:47:39 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Mar  5 03:07:40 2016  Rei Odaira  <Rei.Odaira@gmail.com>
 
-	* win32/win32.c (finish_overlapped_socket): refactoring.
+	* thread_pthread.c (getstack): __pi_stacksize returned by
+	  pthread_getthrds_np() is wrong on AIX. Use
+	  __pi_stackend - __pi_stackaddr instead.
 
-Mon Nov  8 11:02:21 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Mar  4 19:19:42 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/win32.c (get_proc_address): refactoring.
+	* gc.c: use 2 bits with unsigned int for rb_objspace::flags::mode
+	  because it always returns 0 to 2 (non-negative value).
 
-	* win32/win32.c (get_wsa_exetinsion_function): refactoring.
+Fri Mar  4 18:42:08 2016  Koichi Sasada  <ko1@atdot.net>
 
-Mon Nov  8 09:45:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* gc.c: rename "enum gc_stat" to "enum gc_mode"
+	  because there is a same name (no related) function gc_stat().
 
-	* enc/trans/gbk-tbl.rb: Add euro sign. [ruby-core:33094]
-	  CP936, which is de facto definition of GBK, has it.
-	  http://msdn.microsoft.com/en-us/goglobal/cc305153.aspx
+	  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.
 
-Mon Nov  8 07:26:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Change rb_objspace::flags::mode from 2 bits to 3 bits because VC++
+	  returns negative enum value with 2 bits.
 
-	* configure.in: check only the first symbol to get rid of
-	  duplication.  [ruby-core:33084] #4031
+	* 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).
 
-Sun Nov  7 10:13:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_mode_set): same macro for setter.
 
-	* configure.in (NM): check on all platforms.  #4031
+Fri Mar  4 09:28:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Sun Nov  7 06:16:33 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+	* 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
 
-	* test/openssl/test_ocsp.rb: adding test for r29699.  Thanks Elise
-	  Huard! [ruby-core:32460]
+Thu Mar  3 14:09:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Nov  6 07:33:08 2010  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]
 
-	* configure.in (rb_cv_export_prefix): check for prefixed
-	  underscore of exported symbols
+Wed Mar  2 16:28:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* tool/rbinstall.rb (bin-comm): prepend prolog shell script if
-	  necessary.
+	* vm_eval.c (method_missing): call by found method entry and get
+	  rid of searching the same method entry twice.
 
-	* configure.in (LIBRUBY_RELATIVE): use rpath token expansion.
+	* vm_eval.c (vm_call0_body): calling method_missing method is
+	  method_missing().
 
-Sat Nov  6 07:24:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar  2 15:13:33 2016  herwinw  <herwin@quarantainenet.nl>
 
-	* template/ruby.pc.in (arch, sitearch): reordered.
+	* 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.
 
-	* configure.in: keep failed file.
+Wed Mar  2 15:08:33 2016  herwinw  <herwin@quarantainenet.nl>
 
-Sat Nov  6 07:03:49 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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.
 
-	* process.c (rb_fork_err): save errinfo before fdopen.
+Tue Mar  1 11:25:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Nov  6 00:43:58 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+	* lib/fileutils.rb: use keyword arguments instead of option
+	  hashes.
 
-	* ext/openssl/ossl_ocsp.c (ossl_ocspcid_initialize): an optional
-	  parameter may be used to specify the OpenSSL::OCSP::CertificateId on
-	  initialization.  Thanks Elise Huard! [ruby-core:32460]
+Mon Feb 29 16:50:20 2016  hanachin  <hanachin@gmail.com>
 
-Fri Nov  5 12:23:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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]
 
-	* test/ruby/test_{process,system}.rb (test_fallback_to_sh):
-	  meaningless and wrong tests where /bin/sh does not exist.
+Mon Feb 29 16:31:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* process.c (proc_spawn_v): should spawn, not exec.
+	* 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.
 
-Fri Nov  5 01:21:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 28 23:13:49 2016  C.J. Collier  <cjcollier@linuxfoundation.org>
 
-	* process.c (proc_exec_v, proc_spawn_v): try to execute with sh if
-	  no shebang.  [ruby-core:32745] [EXPERIMENTAL]
+	* configure.in: Add summary to end of configure output.
+	  [Fix GH-1275]
 
-Fri Nov  5 00:39:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 28 20:23:36 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* io.c (rb_io_readlines, rb_io_each_line): limit must not be zero.
-	  a patch from Tomoyuki Chikanaga at [ruby-dev:42538].  #4024
+	* lib/drb/drb.rb (error_print): Add verbose failure messages and
+	  avoid infamous DRb::DRbConnError. [Feature #12101]
 
-Fri Nov  5 00:14:15 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+Sun Feb 28 13:40:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/fiddle/extconf.rb: fixing ffi library location on windows.
-	  Thanks Usa! [ruby-core:32930]
+	* error.c (nometh_err_initialize): add private_call? parameter.
 
-Thu Nov  4 20:04:44 2010  Koichi Sasada  <ko1@atdot.net>
+	* 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]
 
-	* gc.c (rb_newobj): force garbage_collect() if GC.stress == true.
-
-Thu Nov  4 19:48:22 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* ChangeLog: missed to write a last ChangeLog.
-
-	* gc.c (gc_finalize_deferred): removed.
-
-	* gc.c (rb_gc_finalize_deferred): Do not invoke a free_unused_heaps().
-
-Thu Nov  4 19:45:27 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (run_final): do not need argument obj.
-
-Thu Nov  4 19:26:10 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (before_gc_sweep): fix commit miss.
-
-Thu Nov  4 19:20:46 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (after_gc_sweep, before_gc_sweep):
-	  invoke rb_sweep_method_entry() as soon as possible.
-
-Thu Nov  4 19:13:58 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (after_gc_sweep, slot_sweep): finalizers should be invoked
-	  as soon as possible.
-
-Thu Nov  4 10:30:40 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* configure.in (--with-valgrind): Now this option is default on.
-	  You can still explicitly disable this feature by specifying
-	  --without-valgrind.
-
-Thu Nov  4 02:06:16 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* cont.c (fiber_t_alloc): raise an error when fiber is going to be
-	  initialized twice.  [ruby-dev:42524]
-
-Thu Nov  4 02:04:25 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* cont.c (rb_fiber_resume): raise an "double resume" error when root
-	  fiber is going to be resumed.  [ruby-dev:42523]
-
-Wed Nov  3 14:17:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/ostruct.rb (OpenStruct#delete_field): also undefine
-	  accessor methods.  [ruby-core:33010]
-
-Wed Nov  3 14:13:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_enc_cr_str_buf_cat): concatenation of valid
-	  encoding string and invalid encoding string should result
-	  invalid encoding.  [ruby-core:33027]
-
-Wed Nov  3 08:58:59 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c, vm.c, vm_core.h: remove USE_VALUE_CACHE option.
-
-Wed Nov  3 07:47:25 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/ruby-lex.rb (RubyLex#identify_string): parse multiple
-	  regex options.  a patch from Heesob Park in [ruby-core:32988].
-
-Wed Nov  3 07:33:57 2010  Tanaka Akira  <akr@fsij.org>
-
-	* vm_method.c (rb_clear_cache_by_class): just return if the class has
-	  no method.  reported by Eric Wong.  [ruby-core:32689]
-
-Tue Nov  2 22:50:25 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/visitor.rb (initialize): push accessor
-	  methods to subclass that actually uses them.
-
-Tue Nov  2 22:47:08 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* ext/psych/lib/psych/visitors/visitor.rb (accept): switch to
-	  a dispatch cache rather than case / when statement.
-
-Tue Nov  2 21:46:52 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* NEWS: fix a typo.
-
-Tue Nov  2 20:10:32 2010  Tajima Akio <artonx@yahoo.co.jp>
-
-	* test/rake/test_tasks.rb: clear env var which is used by the test.
-	  [ruby-dev:42508]
-
-Tue Nov  2 00:25:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/extconf.rb: win64 is just same with win32 about socket.
-	  notice: but wince is not same.
-
-Mon Nov  1 21:25:57 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* main.c: <stdlib.h> is needed, to introduce the getenv(3)
-	  prototype declaration.  Without it a C compiler shall infer
-	  the getenv type as "int getenv(...);", but this is totally
-	  wrong, especially when your machine's sizeof(int) and
-	  sizeof(char*) differs.  On such environment a return value
-	  of getenv(3), which is in fact a char*, might first casted
-	  into a int (loses data here), and then casted back to char*
-	  by automatic integral promotion to fit to the prototype of
-	  ruby_set_debug_option().
-
-Sun Oct 31 23:27:09 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (finalizer_table, objspace->final.table):
-	  Create finalizer_table at Init_heap().
-	  Remove all null checks of finalizer_table.
-
-	* gc.c (mark_tbl): skip if no table entries.
-
-	* gc.c (slot_swee): remove useless need_call_final check.
-
-Sun Oct 31 22:32:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (rb_objspace_free): finalizers should be called separately
-	  from freeing objspace.  [ruby-dev:42479]
-
-Sun Oct 31 22:24:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (ruby_cleanup): free current VM and its objspace even
-	  when exiting by SystemExit.
-
-Sun Oct 31 22:10:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* compile.c (new_child_iseq): adjust argument types.
-
-	* iseq.c (prepare_iseq_build, rb_iseq_new),
-	  (rb_iseq_new_with_bopt_and_opt, rb_iseq_new_with_opt),
-	  (rb_iseq_new_with_bopt): ditto.
-
-	* compile.c (iseq_set_exception_table): suppress warnings.
-
-	* insns.def (putspecialobject, defined): ditto.
-
-	* iseq.c (iseq_load): ditto.
-
-Sun Oct 31 09:30:51 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_core.h: some refactoring.
-	  - move decl. of rb_compile_option_struct to iseq.h.
-	  - define enum iseq_type.
-	  - define enum vm_special_object_type.
-
-	* compile.c: some refactoring.
-	  - apply above changes.
-	  - (struct iseq_link_element): change value of type.
-	  - remove unused decl.
-	  - fix comment.
-	  - rename iseq_build_body and iseq_build_exception to
-	    iseq_build_from_ary_body and iseq_build_from_ary_exception.
-
-	* iseq.h: define enum catch_type and enum defined_type.
-
-	* insns.def: apply above changes.
-
-	* iseq.c: define ISEQ_MAJOR_VERSION and ISEQ_MINOR_VERSION.
-
-Sat Oct 30 23:38:59 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/encoding.rb: untabify.
-
-Sat Oct 30 21:06:37 2010  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/encoding.rb: use Ruby native encoding mechanism.
-	  [ruby-dev:42464]
-	* lib/rexml/encodings/: remove.
-
-	* lib/rexml/document.rb, lib/rexml/formatters/default.rb,
-	  lib/rexml/output.rb, lib/rexml/parseexception.rb,
-	  lib/rexml/parsers/baseparser.rb, lib/rexml/source.rb,
-	  lib/rexml/xmldecl.rb: use Ruby's native Encoding object.
-
-	* test/rexml/, test/rss/: follow the above encoding changes.
-
-	* NEWS: add REXML's incompatible change about encoding.
-
-Sat Oct 30 17:23:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_strtod): get rid of overflow/underflow as possible.
-
-Sat Oct 30 14:37:39 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ruby_pc): erase runtime-defined variables and
-	  check if generated pc file is valid.
-
-	* template/ruby.pc.in (DEFFILE): need for mingw.
-
-	* template/ruby.pc.in (LIBRUBY): fix the order.
-
-Sat Oct 30 11:33:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/Makefile.sub (ruby_pc): ignore missing variables.
-
-	* template/ruby.pc.in: add missing variables for mswin.
-
-Sat Oct 30 10:24:35 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
-
-	* object.c: Make BasicObject.new accept no parameter.
-	  Revert of r26135 [ruby-core:27080], as per [ruby-core:32952].
-
-Sat Oct 30 09:40:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c: use constants in id.h.
-
-Sat Oct 30 09:08:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/fiddle/closure.c (fiddle_closure): embed cif not reference
-	  so that the content surely get initialized.  [ruby-dev:42480]
-
-Sat Oct 30 07:01:53 2010  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv-replace.rb: suppress warning.
-
-	* lib/open-uri.rb: ditto.
-
-Sat Oct 30 06:32:52 2010  Tanaka Akira  <akr@fsij.org>
-
-	* test/pathname/test_pathname.rb (TestPathname#test_grpowned?): the
-	  group of the created file is inherited from the parent
-	  directory on BSDs and MacOS X.  Linux also inherit the group if
-	  the setgid bit of the directory is set.  It causes the test fail.
-	  fixed by Shota Fukumori.  [ruby-dev:42458]
-
-Sat Oct 30 05:58:54 2010  Tanaka Akira  <akr@fsij.org>
-
-	* lib/resolv.rb: retry via TCP if UDP reply is truncated.
-	  fixed by Julian Mehnle.  [ruby-core:32407]
-
-Sat Oct 30 00:35:13 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* iseq.c (iseq_s_compile): fix optional argument.
-	  a patch from Yutaka HARA [ruby-core:32953] [Ruby 1.9-Bug#4001]
-
-Sat Oct 30 00:24:42 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (memsize_of): take care of
-	  T_CLASS/const_tbl.
-	  a patch from nagachika <nagachika00@gmail.com> [ruby-dev:42490]
-
-Fri Oct 29 23:32:36 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* test/profile_test_all.rb: added.
-	  You can use test-all profiler with the following command:
-	    RUBY_TEST_ALL_PROFILE=true make test-all
-	  This command generates ./test_all_profile and you can analyze
-	  which tests consume memories.
-
-	* test/runner.rb: ditto.
-
-Fri Oct 29 10:02:03 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/enc-unicode.rb,
-	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
-	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
-	  Add 'Unknown' Script.
-	  patched by Run Paint Run Run. [ruby-core:32937] #3998
-
-Fri Oct 29 05:13:34 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (ObjectSpace.memsize_of_all): rename
-	  ObjectSpace.total_memsize_of_all_objects() to
-	  ObjectSpace.memsize_of_all([klass]).
-	  Accept Class object to filter the objects.
-
-	* test/objspace/test_objspace.rb: fix test for above change.
-
-Fri Oct 29 03:04:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_dump): fix expected length. [ruby-core:32935]
-
-Thu Oct 28 23:31:39 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (before_gc_sweep, run_final): fix decrement timing of final_num.
-
-Thu Oct 28 20:11:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* tool/enc-unicode.rb,
-	  enc/unicode/name2ctype.h, enc/unicode/name2ctype.h.blt,
-	  enc/unicode/name2ctype.kwd, enc/unicode/name2ctype.src:
-	  Update Oniguruma for Unicode 6.
-	  patched by Run Paint Run Run. [ruby-core:32923] #3989
-
-Thu Oct 28 20:06:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* include/ruby/oniguruma.h (ONIGENC_CTYPE_SPECIAL_MASK):
-	  change mask from 128 to 256. [ruby-core:32931]
-
-Thu Oct 28 12:06:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/httprequest.rb (read_request_line): extend max
-	  length to 2083. This is from Internet Explorer's max uri
-	  length. http://support.microsoft.com/kb/208427 [ruby-core:32924]
-
-Thu Oct 28 04:00:08 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (GC.stat): added.  [ruby-dev:38607]
-
-	* test/ruby/test_gc.rb: add a test for above.
-
-Thu Oct 28 03:13:06 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* ext/objspace/objspace.c (memsize_of): fix rdoc.
-
-	* ext/objspace/objspace.c (total_memsize_of_all_objects): added.
-
-	* test/objspace/test_objspace.rb:
-	  - add a test for ObjectSpace.total_memsize_of_all_objects.
-	  - add two tests for ObjectSpace.memsize_of (for nil and Fixnum).
-
-Wed Oct 27 23:55:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (Init_iconv): warn deprecated use.
-
-Wed Oct 27 18:50:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bignum.c (rb_big2long, rb_big2ulong): rb2ulong() returns VALUE, but
-	  its real range is ulong. So, if the size of VALUE is bigger than
-	  ulong, upper bits are always zero even if the actual value is
-	  negative.
-	  fixed #3490
-
-Wed Oct 27 18:27:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (TestIO#pipe): should close write end of pipe
-	  before closing read end, to get rid of timing problem.
-
-	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-
-Wed Oct 27 18:14:27 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_getppid): support Win64.
-
-Wed Oct 27 15:07:19 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* thread_win32.c (w32_error): should get error no only once, because
-	  the result of the second getting will indicate the error of the
-	  first FormatMessage() call.
-
-Wed Oct 27 13:51:25 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_io.rb (TestIO#pipe): need to propagate exceptions
-	  in read/write thread. fix r29541.
-
-	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-
-Wed Oct 27 12:05:40 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* class.c (clone_const): need to return value. fix r29602.
-
-Wed Oct 27 11:58:58 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/ruby.h (NUM2LONG_internal): add cast to get rid of a
-	  non GCC compiler warning. this is intentional type conversion.
-
-Wed Oct 27 09:25:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* cont.c: apply documentation patch by Run Paint Run Run.
-	  [ruby-core:32915]
-
-Wed Oct 27 02:12:10 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* object.c (Init_Object), constant.h, variable.c
-	  (rb_mod_private_constant, rb_mod_public_constant,
-	  set_const_visibility, rb_const_get_0): add Module#public_constant
-	  and private_constant.  [ruby-dev:39685][ruby-core:32698]
-
-	* test/ruby/test_module.rb: add tests for above.
-
-Wed Oct 27 02:02:54 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* class.c, constant.h, gc.c, method.h, object.c, variable.c,
-	  vm_insnhelper.c: use struct rb_constant_entry_t as entry of
-	  RCLASS_CONST_TBL.  RCLASS_CONST_TBL has contained VALUE of constant
-	  directly.  Now instead rb_const_entry_t is contained in
-	  RCLASS_CONST_TBL,  rb_const_entry_t is managed by malloc, and
-	  have not only the value itself but also visibility flag.
-	  This is another preparation for private constant (see
-	  [ruby-dev:39685][ruby-core:32698]).
-
-Wed Oct 27 01:56:34 2010  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* class.c, gc.c, object.c, variable.c, vm_insnhelper.c,
-	  include/ruby/ruby.h: separate RCLASS_CONST_TBL from RCLASS_IV_TBL.
-	  RCLASS_IV_TBL has contained not only instance variable table but
-	  also constant table.  Now the two table are separated to
-	  RCLASS_CONST_TBL and RCLASS_IV_TBL.  This is a preparation for
-	  private constant (see [ruby-dev:39685][ruby-core:32698]).
-
-Tue Oct 26 18:51:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/scanf.rb (extract_float): allow 2.e+2 style.
-	  [ruby-dev:42452] #3978
-
-Tue Oct 26 18:09:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (ASFLAGS): needs INCFLAGS.
-
-	* configure.in (rb_cv_dynamic_alloca): check if extra source for
-	  dynamic size alloca.
-
-	* missing/x86_64-chkstk.s (___chkstk): necessary for alloca of
-	  amd64-mingw32msvc-gcc on Ubuntu.
-
-	* thread_win32.c (ruby_alloca_chkstk): check stack overflow
-
-Tue Oct 26 18:04:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* template/ruby.pc.in (Libs): needs DLDFLAGS.
-
-Tue Oct 26 12:47:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (pkgconfig-data): moved from Makefile.in.
-
-	* tool/rbinstall.rb: install pc file only if non-empty.
-	  [ruby-core:32901] #3983
-
-	* win32/Makefile.sub (ruby_pc): create pc file.
-
-Tue Oct 26 09:13:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_gcc_atomic_builtins): check for atomic
-	  builtins, all are not available in Apple derivative gcc.
-
-Tue Oct 26 00:29:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (pkgconfig-data): create pkg-config metadata file.
-
-	* tool/rbinstall.rb: install pkg-config metadata file.
-
-	* template/ruby.pc.in: template of pkg-config metadata file.
-
-Mon Oct 25 16:38:07 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* signal.c  (rb_atomic_t): GCC (of  at least  recent versions)
-	  has  ubiquitous  support  for  atomic operations.   On  that
-	  compiler a C program can  issue a memory barrier using these
-	  dedicated  instructions.  According to  the GCC  manual they
-	  cargo culted  this feature form  the Itanium ABI  so chances
-	  are that  other compilers  could also support  this feature.
-	  But so far GCC is the  only compiler that I know to have it.
-	  Also note that this works on non-Itanium machines.
-
-Mon Oct 25 06:21:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): prec digits fractal part should be
-	  appended to 0 if prec is given.  [ruby-dev:42453] #3979
-
-Mon Oct 25 02:57:21 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* common.mk (run.gdb): Quit gdb on 'make gdb' when
-	  no signals are received.
-
-Mon Oct 25 00:25:23 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: some corrections of documentation.
-
-Sun Oct 24 17:14:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c, gc.c, hash.c, object.c, string.c, struct.c,
-	  transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
-	  replace calls to rb_error_frozen() with rb_check_frozen().  a
-	  patch from Run Paint Run Run at [ruby-core:32014]
-
-	* include/ruby/intern.h (rb_check_frozen): optimize.
-	  [ruby-core:32878]
-
-Sun Oct 24 15:16:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb (Test::Unit::Mini#run): abort if interrupted.
-
-	* lib/test/unit.rb (Test::Unit::Mini#run_test_suites): show the
-	  result even when interrupted on the way.
-
-	* lib/test/unit.rb (Test::Unit::Mini#run_test_suites): ensure
-	  output sync mode to be restored.
-
-Sun Oct 24 14:11:16 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vm.c (vm_define_method): defined method is run with the default
-	  public visibility regardless the visibility context of definition.
-	  [ruby-core:30638]
-
-Sun Oct 24 12:08:54 2010  Aaron Patterson <aaron@tenderlovemaking.com>
-
-	* lib/test/unit.rb: make test/unit play nicely with the rake test
-	  loader. [ruby-core:32864]
-
-Sun Oct 24 00:25:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_rubyoptions.rb (test_segv_test): follow up the
-	  change at r29556.
-
-Sat Oct 23 14:39:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: $extmk should be true for test/runner.
-
-Sat Oct 23 10:55:37 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* vm_dump.c (rb_vm_bugreport): fix to add bug outputs.
-	  - loaded script ($0)
-	  - loaded features ($")
-	  - process memory map on Linux (/proc/self/maps)
-
-	* vm_dump.c (rb_vmdebug_stack_dump_raw): fix header message.
-
-Fri Oct 22 14:50:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
-	  assertion message must not be nil.
-
-Fri Oct 22 13:59:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
-	  treat nil case. Please run test-all before commit such change.
-
-Thu Oct 21 23:58:14 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* gc.c (gc_lazy_sweep): Variable declarations should be at
-	  the head of block.
-
-Thu Oct 21 23:56:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (objspace_each_objects, rb_objspace_each_objects): use
-	  struct.
-
-	* gc.c (objspace_each_objects): fix return with no value.
-
-Thu Oct 21 23:47:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (dir_initialize): remove useless intermediate variable.
-
-Thu Oct 21 16:07:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_f_select): change rdoc.
-	  patched by Eito Katagiri [ruby-core:31805]
-
-Thu Oct 21 15:55:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/webrick/httpauth/digestauth.rb
-	  (WEBrick::HTTPAuth::ProxyDigestAuth#check_uri): privated.
-	  [ruby-dev:42344]
-
-Thu Oct 21 15:50:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c (rb_f_select): add correct rdoc.
-	  patched by Dave Thomas [ruby-core:32467]
-
-Thu Oct 21 15:42:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/telnet.rb (Net::Telnet#close): added.
-	  patched by Erik Hollensbe [ruby-dev:42260] #3830
-
-Thu Oct 21 13:08:00 2010  Narihiro Nakamura  <authornari@gmail.com>
-
-	* gc.c (rb_objspace_each_objects): don't lazy sweep in
-	  rb_objspace_each_objects. [Bug #3940] [ruby-dev:42369]
-
-Thu Oct 21 00:05:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_io.rb (TestIO#pipe): get rid of deadlock on pipe.
-	  a patch from Tomoyuki Chikanaga at [ruby-dev:42435].  #3970
-
-	* test/ruby/test_io_m17n.rb (TestIO_M17N#pipe): ditto.
-
-Wed Oct 20 23:54:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/dbm/dbm.c: rdoc based on a patch by mathew meta AT
-	  pobox.com, at [ruby-core:32853].
-
-Wed Oct 20 10:47:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* util.c (ruby_strtod): reject 0x1.p+0. [ruby-dev:42432] #3966
-
-Wed Oct 20 10:00:57 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): print floating point on "%#a".
-	  [ruby-dev:42431] Bug#3965
-
-Tue Oct 19 19:30:11 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): clear ALT flag for %a.
-	  [ruby-core:32841] [ruby-core:32848]
-
-Tue Oct 19 12:19:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): fix over-count of field size.
-
-Tue Oct 19 03:08:52 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* vsnprintf.c (BSD_vfprintf): use HEXPREFIX flag for prefix of %a.
-	  [ruby-core:32841]
-
-Mon Oct 18 13:18:01 2010  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/digest/digest.c (rb_digest_class_init): Define
-	  Digest::Class.new(). [Feature #3954]
-
-Mon Oct 18 12:58:40 2010  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (pack_pack): refine the document.  [ruby-dev:42397]
-	  (pack_unpack): ditto.
-
-Mon Oct 18 10:19:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* lib/net/http.rb (transport_request): @socket may be nil.
-	  patched by Egbert Eich [ruby-core:32829]
-
-Mon Oct 18 09:57:28 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* sprintf.c (BSD_vfprintf): wrong padding around prefix and
-	  floating point with %a. [ruby-dev:42403] Bug #3956
-
-Sun Oct 17 22:36:33 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/delta.rb: added an rdoc tag.
-
-Sun Oct 17 10:47:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_mod_remove_const): update rdoc.
-	  [ruby-core:31957]
-
-Sun Oct 17 10:40:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* class.c (rb_define_{class,module}_id_under): register to be
-	  marked, which probably are defined and used internally.
-
-Sat Oct 16 11:10:55 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
-	  according to GB2312. [Bug #3937] [ruby-core:32758]
-
-Sat Oct 16 10:54:57 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (CPP): already used in .c.i rule.
-
-	* cygwin/GNUmakefile.in (DLLWRAP, WINDRES): add --driver-name and
-	  --preprocessor options explicitly.  [ruby-core:32776]
-
-Sat Oct 16 10:06:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/sdbm/_sdbm.c (SEEDUPS, BADMESS): make settable using command
-	  line options.
-
-	* ext/sdbm/_sdbm.c (makroom): suppress unused result warning.
-
-	* ext/sdbm/extconf.rb: disable BADMESS, a library should not emit
-	  messages directly.
-
-Sat Oct 16 08:39:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dln.c (dln_strerror): get English message first, instead of
-	  system default. see [ruby-dev:42358].
-
-Sat Oct 16 00:08:00 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* hash.c (rb_hash_aref): skip calling "default" method
-	  if it is not needed, for speed-up.
-
-Fri Oct 15 23:36:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (NUM2DEVT, DEVT2NUM, PRI_DEVT_PREFIX): fallback to
-	  unsigned int.
-
-Fri Oct 15 22:54:46 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_hresult2msg): get English message first,
-	  instead of system default. [ruby-core:32765]
-
-Fri Oct 15 22:47:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* include/ruby/ruby.h (VALUE): prefer long over uintptr_t,
-	  FIX2LONG expects VALUE to be long at least.
-
-	* include/ruby/ruby.h (FIX2LONG): parenthesize the argument.
-
-Fri Oct 15 20:30:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (dev_t): use RUBY_REPLACE_TYPE.
-
-	* file.c (rb_stat_inspect): use PRI_DEVT_PREFIX.
-
-Fri Oct 15 17:26:57 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* pack.c (pack_pack): simplify comparison of explicit_endian
-	  as pointed by nobu.
-
-	* pack.c (pack_unpack): ditto.
-
-Fri Oct 15 16:40:37 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* pack.c (pack_pack): fix more than one modifiers appear in the
-	  format string. [ruby-core:32793]
-
-	* pack.c (pack_unpack): ditto.
-
-Thu Oct 14 23:20:42 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* test/win32ole/test_folderitem2_invokeverb.rb: refactoring.
-
-Thu Oct 14 22:18:29 2010  Koichi Sasada  <ko1@atdot.net>
-
-	* insns.def, iseq.c, vm_insnhelper.c: rename variable name
-	  (ip -> iseq).
-
-Thu Oct 14 20:41:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* pack.c (pack_pack): support endian modifiers: < and >.
-	  [ruby-dev:42376] Feature #3491
-
-	* pack.c (pack_unpack): ditto.
-
-Thu Oct 14 20:50:51 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (reg_get_val): expand environment in
-	  the pathname. [Bug #3907]
-
-Thu Oct 14 07:35:07 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* file.c (DEVT2NUM): added. Size of dev_t is depend on the
-	  environment even if POSIX defines dev_t as unsigned integer.
-	  For example, OpenVMS, 64bit Solaris 9, and NetBSD 6 defines
-	  dev_t as 64bit unsigned integer.
-
-	* file.c (rb_stat_dev): use DEVT2NUM.
-
-	* file.c (rb_stat_dev_major): dev_t is not long. major(3)'s return
-	  value is int.
-
-	* file.c (rb_stat_dev_minor): dev_t is not long. minor(3)'s return
-	  value is int.
-
-	* configure.in: check size of dev_t.
-
-Thu Oct 14 07:22:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (rb_ary_and, rb_ary_or), class.c (rb_mod_init_copy),
-	  gc.c (undefine_final), time.c (time_mload): get rid of
-	  type-punning casts.
-
-Thu Oct 14 04:16:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* numeric.c (ruby_float_step): fix Numeric#step with infinity unit
-	  doesn't works well. [ruby-core:32779]
-
-Wed Oct 13 23:16:46 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* tool/enc-unicode.rb: get rid of lots of warnings.
-
-	* iseq.c (insn_operand_intern, rb_iseq_disasm): fix format specifiers.
-
-	* vm.c (thread_free): ditto.
+	* vm_eval.c (make_no_method_exception): append private_call?
+	  argument.
 
-	* numeric.c (check_uint): get rid of overflow on LLP64 platforms.
+	* vm_insnhelper.c (ci_missing_reason): copy FCALL flag.
 
-	* insns.def (opt_case_dispatch): use st_data_t.
+Sun Feb 28 10:19:47 2016  Ryan T. Hosford  <tad.hosford@gmail.com>
 
-Wed Oct 13 22:32:34 2010  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+	* array.c (rb_ary_and): clarify that set intersection returns the
+	  unique elements common to both arrays.
 
-	* lib/cgi/util.rb (CGI::unescape): bugfix to unescape the multibyte
-	  string. Thanks nobu and tDiary dev members. [Bug #3909]
+	* array.c (rb_ary_or): clarify that union preserves the order from
+	  the given arrays.
 
-Wed Oct 13 21:13:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Feb 27 17:05:29 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* numeric.c (int_chr): raise error when the value is negative.
+	* enc/unicode/case-folding.rb, casefold.h: Reducing size of TitleCase
+	  table by eliminating duplicates.
+	  (with Kimihito Matsui)
 
-Wed Oct 13 19:24:08 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Fri Feb 26 14:40:48 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm.c (ruby_vm_destruct): This function type was wrong; correct to the prototype.
+	* 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]
 
-Wed Oct 13 14:58:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Feb 26 14:39:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* numeric.c (rb_num_to_uint): fix 32bit logic.
+	* 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]
 
-Wed Oct 13 12:53:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Feb 26 12:25:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* numeric.c (rb_num_to_uint): added to check the range of arguments.
-	  Mainly for negative value with NUM2UINT on 32bit environment.
+	* 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]
 
-	* string.c (rb_str_concat): use rb_num_to_uint.
+Fri Feb 26 11:21:41 2016  herwinw  <herwin@quarantainenet.nl>
 
-Wed Oct 13 12:10:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* 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.
 
-	* thread_win32.c (w32_error): get English message first, instead
-	  of system default. see [ruby-core:32765].
-	  [experimental]
+Fri Feb 26 11:10:19 2016  Rick Salevsky  <rsalevsky@suse.com>
 
-Wed Oct 13 11:04:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/tmpdir.rb: Unify to coding-style for method definition.
+	  [fix GH-1252]
 
-	* debug.c (ruby_set_debug_option): define always for binary
-	  compatibility with debug env enabled binary.
+Fri Feb 26 11:02:04 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* signal.c (ruby_enable_coredump): ditto.
+	* README.md: update markdown syntax for anchor tag.
+	  [fix GH-1265] Patch by @lukBarros
 
-Wed Oct 13 10:52:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Feb 26 10:52:29 2016  Alex Boyd  <alex@opengroove.org>
 
-	* include/ruby/ruby.h (ruby_executable_node): missing prototype.
+	* lib/irb.rb: avoid to needless truncation when using back_trace_limit option.
+	  [fix GH-1205][ruby-core:72773][Bug #11969]
 
-Wed Oct 13 05:23:04 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Feb 26 08:11:58 2016  Aaron Patterson <tenderlove@ruby-lang.org>
 
-	* missing/strchr.c: add strlen's prototype.
+	* 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.
 
-	* missing/strstr.c: ditto.
+Thu Feb 25 19:04:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Wed Oct 13 00:21:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enc/unicode/case-folding.rb: Adding possibility for debugging output
+	  for TitleCase table in casefold.h.
+	  (with Kimihito Matsui)
 
-	* ext/syck/rubyext.c (struct mktime_arg): constified.
+Wed Feb 24 22:31:13 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/syck/rubyext.c (mktime_do, mktime_r, rb_syck_mktime): fix
-	  function signatures.
+	* 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 Oct 13 00:18:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb 24 21:03:04 2016  Tanaka Akira  <akr@fsij.org>
 
-	* st.c (MurmurMagic): get rid of literal overflow.
+	* random.c (limited_rand): Add a specialized path for when the limit fits
+	  in 32 bit.
 
-	* configure.in (RUBY_CHECK_PRINTF_PREFIX): check for printf format
-	  specifier if possible.
+Tue Feb 23 21:52:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Tue Oct 12 23:58:19 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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)
 
-	* win32/win32.c (rb_w32_open_osfhandle, rb_w32_wopen, rb_w32_pipe):
-	  use uintptr_t instead of long for win64.
+Tue Feb 23 15:21:14 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* win32/win32.c (socketpair_internal): suppress warnings.
+	* enc/unicode/case-folding.rb, casefold.h: Reading casing data from
+	  SpecialCasing.txt.
+	  (with Kimihito Matsui)
 
-	* win32/win32.c (ftruncate): use HANDLE instead of long for win64.
+Mon Feb 22 18:33:55 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* vsnprintf.c (BSD_vfprintf): fix cast.
+	* enc/unicode/case-folding.rb, casefold.h: Adding flag for title-case,
+	  not yet operational.
+	  (with Kimihito Matsui)
 
-	* numeric.c (rb_num2fix): result of rb_num2long is SIGNED_VALUE.
+Mon Feb 22 18:17:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
-	  (syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
-	  (run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
-	  (rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
-	  iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
-	  thread.c (rb_thread_local_aref),
-	  variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
-	  (rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
-	  vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
-	  ext/iconv/iconv.c (map_charset): use st_data_t.
+	* enc/unicode/case-folding.rb, casefold.h: Fixed bug that avoided inclusion
+	  of compatibility characters in upper-/lower-case mappings.
+	  (with Kimihito Matsui)
 
-	* compile.c (iseq_build_body), insns.def (getglobal, setglobal),
-	  iseq.c (iseq_load, iseq_data_to_ary), util.c (valid_filename):
-	  use VALUE.
+Sun Feb 21 13:57:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* gc.c (obj_free, rb_objspace_call_finalizer): fix truncating
-	  cast.
+	* cgi/escape/escape.c: Optimize CGI.unescape performance by C ext
+	  for ASCII-compatible encodings.  [Fix GH-1250]
 
-	* gc.c (mark_current_machine_context): suppress warnings.
+Sun Feb 21 13:56:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* compile.c (iseq_compile_each): fix truncating cast.
+	* cgi/escape/escape.c: Optimize CGI.unescapeHTML performance by C
+	  ext for ASCII-compatible encodings.  [Fix GH-1242]
 
-	* cont.c (fiber_setcontext): missing variable definition.
+Sat Feb 20 15:38:16 2016  Eric Wong  <e@80x24.org>
 
-Tue Oct 12 19:25:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* doc/extension.rdoc: update paths for defs/ directory
 
-	* error.c (exc_to_s): use OBJ_INFECT.
+Sat Feb 20 14:44:15 2016  Lucas Buchala  <lucasbuchala@gmail.com>
 
-	* error.c (name_err_to_s): ditto.
+	* vm_eval.c (rb_mod_module_eval): [DOC] Fix documentation
+	  signature for Module#module_eval.  [Fix GH-1258]
 
-	* error.c (name_err_mesg_to_str): ditto.
+Sat Feb 20 14:40:44 2016  Adam O'Connor  <northband@gmail.com>
 
-	* error.c (syserr_initialize): ditto.
+	* README.md: a few grammatical changes to the main Ruby README.md.
+	  [Fix GH-1259]
 
-Tue Oct 12 19:07:55 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Feb 20 13:04:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* error.c (syserr_initialize): taint message if mesg is given
-	  and it is tainted.
+	* 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]
 
-Tue Oct 12 18:25:43 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Feb 20 01:53:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
-	  may be a Bignum. On 64bit for errors. [ruby-dev:42366]
+	* object.c (rb_mod_const_get): make error message at uninterned
+	  string consistent with symbols.  [ruby-dev:49498] [Bug #12089]
 
-Tue Oct 12 18:25:04 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Feb 19 23:37:52 2016  Masahiro Tomita  <tommy@tmtm.org>
 
-	* string.c (rb_str_concat): use unsigned int for GB18030.
+	* lib/find.rb (Find#find): raise with the given path name if it
+	  does not exist.  [ruby-dev:49497] [Bug #12087]
 
-Tue Oct 12 17:53:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Feb 19 12:44:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* numeric (check_uint): the mask must refer to VALUE.
+	* enc/unicode.c: Activated use of case mapping data in CaseUnfold_11 array.
+	  (with Kimihito Matsui)
 
-Tue Oct 12 17:47:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Feb 19 11:08:32 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* numeric (check_uint): set MSB for negative value.
+	* ext/extmk.rb: add cygwin case, nothing excluded.
+	  [ruby-core:73806] [Bug#12071]
 
-	* numeric (rb_num2uint): return value's type of rb_num2ulong
-	  is VALUE.
+Thu Feb 18 21:32:15 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* numeric (int_chr): variable i can't be negative.
+	* man/irb.1: fix output in EXAMPLES.
 
-Tue Oct 12 16:04:37 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Feb 18 21:05:47 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (rb_w32_strerror): get English message first, instead
-	  of system default. see [ruby-dev:42358].
-	  [experimental]
+	* string.c (sym_match_m): delegate to String#match but not
+	  String#=~.  [ruby-core:72864] [Bug #11991]
 
-Tue Oct 12 15:52:35 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Feb 18 14:15:38 2016  Shota Fukumori  <her@sorah.jp>
 
-	* win32/win32.c (rb_w32_strerror): unmap some range of errno for
-	  workaround of VC10's strerror() and sys_nerr problem.
-	  based on a patch from Akio Tajima, [ruby-dev:42355].
+	* re.c: Add MatchData#named_captures
+	  [Feature #11999] [ruby-core:72897]
 
-Tue Oct 12 15:36:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* test/ruby/test_regexp.rb(test_match_data_named_captures): Test for above.
 
-	* io.c (rb_io_ungetc): use unsigned int for GB18030.
+	* NEWS: News about MatchData#named_captures.
 
-Tue Oct 12 15:14:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Feb 17 21:41:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (rb_io_putc): support multibyte characters.
-	  [ruby-core:30697]
+	* defs/id.def (predefined): add idLASTLINE and idBACKREF for $_
+	  and $~ respectively.
 
-Tue Oct 12 15:10:31 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* parse.y: use idLASTLINE and idBACKREF instead of rb_intern.
 
-	* numeric.c (rb_enc_uint_chr): split from int_chr.
+Wed Feb 17 20:23:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* numeric.c (int_chr): use rb_enc_uint_chr.
+	* string.c (rb_str_init): fix segfault and memory leak, consider
+	  wide char encoding terminator.
 
-	* include/ruby/encoding.h (rb_enc_uint_chr): added.
+Wed Feb 17 12:14:59 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Oct 12 14:04:41 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* string.c (rb_str_init): introduce String.new(capacity: size)
+	  [Feature #12024]
 
-	* numeric.c (int_chr): a codepoint of Ruby M17N must be 32bit
-	  unsigned int; GB18030 uses MSB. Also note that OnigCodePoint
-	  is defined as unsigned int.
+Tue Feb 16 19:10:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Tue Oct 12 12:20:54 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* enc/unicode/case-folding.rb, casefold.h: Used only first element
+	  (rather than all) of target in CaseUnfold_11 array.
+	  (with Kimihito Matsui)
 
-	* vm_dump.c (dump_thread): foolish mistake.
+Tue Feb 16 18:24:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Oct 12 10:39:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c (compare_with_zero): fix variable name, rb_cmperr
+	  requires VALUEs but not an ID.
 
-	* configure.in (RUBY_MINGW32): canonicalize only on mingw.
+Tue Feb 16 17:34:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Oct 11 20:20:23 2010  NARUSE, Yui  <naruse@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]
 
-	* lib/net/http.rb (HTTP.get): specify ASCII-8BIT as the result
-	  encoding of Zlib::GzipReader.
-	  http://hibari.2ch.net/test/read.cgi/tech/1281473294/271
+Tue Feb 16 09:51:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Oct 11 17:42:54 2010  NARUSE, Yui  <naruse@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
 
-	* error.c (syserr_initialize): use mesg's encoding when locale
-	  encoding is US-ASCII. If locale encoding is not US-ASCII,
-	  assume err has non ASCII characters. [ruby-dev:42358]
+Tue Feb 16 04:42:13 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Oct 11 14:03:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* insns.def (opt_plus): simply use LONG2NUM() instead of wrongly
+	  complex overflow case.
 
-	* error.c (syserr_initialize): set the encoding of Errno::*#message
-	  as locale. [ruby-dev:42358]
+	* insns.def (opt_sub): ditto.
 
-Mon Oct 11 06:38:27 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Tue Feb 16 02:49:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/stringio/stringio.c (strio_set_encoding):
-	  StringIO#set_encoding can get 2nd argument and optional hash
-	  for API compatibility to IO. [ruby-dev:42356]
+	* 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 Oct 11 06:11:30 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Feb 15 15:44:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (rb_io_set_encoding): use rb_funcall2 when the io is not
-	  a T_FILE. [ruby-dev:42356]
+	* parse.y (parse_ident): allow keyword arguments just after a
+	  method where the same name local variable is defined.
+	  [ruby-core:73816] [Bug#12073]
 
-Sun Oct 10 18:42:23 2010  Akinori MUSHA  <knu@iDaemons.org>
+Mon Feb 15 14:43:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/set.rb (Set#replace): Apply a bit of optimization.
+	* enc/unicode/case-folding.rb: Added debugging option
+	  (with Kimihito Matsui)
 
-Sun Oct 10 10:20:07 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 14 17:31:50 2016  Lars Kanis  <lars@greiz-reinsdorf.de>
 
-	* configure.in (RUBY_MINGW32): canonicalize as like mswin version.
+	* 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 Oct 10 05:33:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 14 16:18:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm_core.h (rb_signal_buff_size, rb_signal_exec): moved
-	  declarations from thread.c.
+	* eval.c (setup_exception): set the cause only if it is explicitly
+	  given or not set yet.  [Bug #12068]
 
-Sat Oct  9 16:54:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 13 21:44:58 2016  Tanaka Akira  <akr@fsij.org>
 
-	* configure.in (RSHIFT): quote to get rid of argument expansion
-	  for autoconf 2.68.
+	* hash.c (rb_hash_invert): [DOC] more examples.
 
-Sat Oct  9 11:00:06 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 13 17:30:49 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread.c (thread_reset_event_flags, exec_event_hooks): ignore
-	  hooks marked as removed.
+	* lib/uri/generic.rb (URI::Generic#find_proxy): support CIDR in
+	  no_proxy.  [ruby-core:73769] [Feature#12062]
 
-	* thread.c (thread_exec_event_hooks): remove hooks to be removed.
+Sat Feb 13 17:11:58 2016  Fabian Wiesel  <fabian.wiesel@sap.com>
 
-	* thread.c (rb_threadptr_remove_event_hook, rb_remove_event_hook):
-	  defer removing hooks if running the hooks.  [ruby-dev:42350]
+	* 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]
 
-Sat Oct  9 10:51:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Feb 12 12:20:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* thread.c (rb_threadptr_exec_event_hooks): suppress each event
-	  hooks separately.
+	* error.c (name_err_initialize, nometh_err_initialize): [DOC] fix
+	  argument positions.  optional parameters except for the message
+	  are placed at the last.
 
-	* thread.c (thread_suppress_tracing): split from
-	  ruby_suppress_tracing, accepting thread pointer and event mask.
+Fri Feb 12 11:49:49 2016  Anthony Dmitriyev  <antstorm@gmail.com>
 
-Sat Oct  9 08:16:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* net/ftp.rb: add NullSocket#closed? to fix closing not opened
+	  connection.  [Fix GH-1232]
 
-	* thread.c (rb_threadptr_remove_event_hook): fix typo.
+Fri Feb 12 11:17:38 2016  Bogdan  <bogdanvlviv@gmail.com>
 
-Fri Oct  8 10:52:25 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* re.c (rb_reg_initialize_m): [DOC] fix missing right bracket.
+	  [Fix GH-1243]
 
-	* common.mk (RBCONFIG): depends on version.h due to
-	  RUBY_PATCHLEVEL.  [ruby-core:32709]
+Thu Feb 11 14:57:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Oct  8 00:24:54 2010  James Edward Gray II  <jeg2@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.
 
-	* lib/csv.rb: Fixing documentation typos.  [ruby-core:32712]
+Thu Feb 11 06:26:18 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu Oct  7 09:14:28 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* configure.in (RUBY_DEFINT): use Parameter Expansion.
 
-	* vm_exec.c (vm_exec_core):  Treat clang as non gcc on this
-	  context: It has __asm__ but doesn't works well.
+Thu Feb 11 05:33:24 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Oct  6 12:28:22 2010  Tanaka Akira  <akr@fsij.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)
 
-	* lib/uri/generic.rb (URI::Generic#hostname): new method.
-	  (URI::Generic#hostname=): ditto.
+Wed Feb 10 12:03:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/open-uri.rb: use URI#hostname
+	* configure.in (ARFLAGS): check if deterministic mode flag is
+	  effective, which is on by default on Ubuntu.
 
-	* lib/net/http.rb: ditto.
+Tue Feb  9 16:36:23 2016  Naotoshi Seo  <sonots@gmail.com>
 
-	  reported by Adam Majer.  [ruby-core:32056]
+	* lib/logger.rb: Remove block from Logger.add as it's not needed
+	  patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054]
 
-Wed Oct  6 11:52:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb  9 14:32:23 2016  Zachary Scott  <zzak@ruby-lang.org>
 
-	* io.c (fptr_finalize): write_mutex might have been destroyed
-	  already in finalization phase, as the order of finalizers is not
-	  guaranteed.  rb_mutex_t should be used in place of Mutex object
-	  in the future.
+	* ext/zlib/zlib.c: Document mtime header behavior with patch by @schneems
+	  Fixes [GH-1129]: https://github.com/ruby/ruby/pull/1129
 
-Tue Oct  5 22:17:02 2010  wanabe  <s.wanabe@gmail.com>
+Tue Feb  9 13:52:49 2016  Zachary Scott  <zzak@ruby-lang.org>
 
-	* win32/mkexports.rb: revert r29320 and r29402.
+	* re.c: Remove deprecated kcode argument from Regexp.new and compile
+	  patch provided by Dylan Pulliam [Bug #11495]
 
-Mon Oct  4 12:43:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Feb  8 21:26:19 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* parse.y (regexp): dregexp has literal string only at the head
-	  and successors are array.  [ruby-core:32682]
+	* enc/unicode/case-folding.rb, enc/unicode/casefold.h: Flags for
+	  upper/lower conversion added (titlecase and SpecialCasing still missing)
+	  (with Kimihito Matsui)
 
-Mon Oct  4 10:22:21 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Feb  8 20:43:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* random.c (rand_init): This checks the value is in 32bit or not,
-	  so use int32_t, not int.
+	* string.c, enc/unicode.c: Disassociating ONIGENC_CASE_FOLD flag from
+	  ONIGENC_CASE_DOWNCASE.
+	  (with Kimihito Matsui)
 
-Mon Oct  4 09:47:39 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Feb  8 13:00:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* random.c (rand_init): remove useless assignment.
+	* enc/unicode.c: Shortened macros for enc/unicode/casefold.h to
+	  single-letter; use flags in casefold.h for logic.
 
-	* re.c (update_char_offset): remove unused variable.
+	* enc/unicode/case-folding.rb: Added flag for case folding.
+	  Changed parameter passing.
 
-	* re.c (read_escaped_byte): ditto.
+	* enc/unicode/casefold.h: New flags added.
+	  (with Kimihito Matsui)
 
-Mon Oct  4 09:30:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Feb  8 10:30:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/lib/openssl/bn.rb (Integer#to_bn): OpenSSL::BN.new
-	  accepts only Strings, so call Integer#to_s(16).
-	  16 is for an optimization. [ruby-dev:42336]
+	* ruby.c (feature_option): raise a runtime error if ambiguous
+	  feature name is given, in the future.  [Bug #12050]
 
-Mon Oct  4 07:57:51 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Mon Feb  8 09:43:57 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* cont.c (fiber_memsize): Return size.
-	  Before this change, fiber_memsize always returns 0.
+	* 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.
 
-Mon Oct  4 07:16:55 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Sun Feb  7 22:10:08 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* enc/unicode.c (onigenc_unicode_property_name_to_ctype):
-	  remove useless assignment.
+	* common.mk: Added two more precondition files for enc/unicode/casefold.h
 
-	* vm.c (vm_make_proc_from_block): ditto.
+	* enc/unicode.c: Added shortening macros for enc/unicode/casefold.h
 
-	* variable.c (rb_ivar_count): ditto.
+	* 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)
 
-Mon Oct  4 06:40:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Sun Feb  7 14:12:32 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* Makefile.in (clean-rdoc): Don't use \ in variable expansion.
-	  BSD make treats it as an escape character.
+	* enc/unicode/case-folding.rb: Fixing parameter passing.
+	  (with Kimihito Matsui)
 
-Mon Oct  4 00:01:53 2010  wanabe  <s.wanabe@gmail.com>
+Sun Feb  7 11:44:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* tool/config.sub: revert r29320, r29324, r29347, r29354, r29365
-	  to automake-1.11.1. [ruby-core:32634]
+	* enc/unicode/case-folding.rb: New classes CaseMapping/CaseMappingDummy
+	  to pass as parameters; not yet implemented or used.
+	  (with Kimihito Matsui)
 
-	* win32/mkexports.rb: no longer use 'mingw64'. a patch from Luis Lavena
-	  at [ruby-core:32678].
+Sun Feb  7 11:16:00 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Oct  3 20:36:37 2010  Akio Tajima (arton)  <artonx@yahoo.co.jp>
+	* common.mk: using new option in recipe for enc/unicode/casefold.h
 
-	* test/win32ole/test_folderitem2_invokeverb.rb: Change creating
-	  shortcut verb to 'Link' [Bug #3339]
+	* enc/unicode/case-folding.rb: Correctly specify argument to new option.
+	  (with Kimihito Matsui)
 
-Sun Oct  3 19:44:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb  7 10:43:27 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* configure.in (Makefile): get rid of duplicated ruby target when
-	  already there it was.
+	(this commit message applies to the previous commit)
+	* common.mk: explicit recipe for enc/unicode/casefold.h
 
-Sat Oct  2 22:59:32 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+	* enc/unicode/case-folding.rb: Adding -m option to prepare for using
+	  multiple data files.
+	  (with Kimihito Matsui)
 
-	* test/win32ole/test_thread.rb: add for win32ole with Thread.
+Sat Feb  6 22:30:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Oct  1 17:03:00 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* lib/cgi/util.rb (escapeHTML, unescapeHTML): consider
+	  ASCII-incompatible encodings.  [Fix GH-1239]
 
-	* test/webrick/test_httpproxy.rb (TestWEBrickHTTPProxy::test_upstream_proxy):
-	  My machine fails this test at this line, saying 503 service unavailable.
+Sat Feb  6 15:18:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Sep 30 16:11:08 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/ruby/enc/test_regex_casefold.rb: Added data-based testing for
+	  String#downcase :fold.
 
-	* win32/win32.c (rb_w32_getenv): should return NULL if specified name
-	  is empty. a patch from Heesob Park at [ruby-core:32650]
+	* enc/unicode.c: Fixed a range error (lowest non-ASCII character affected
+	  by case operations is U+00B5, MICRO SIGN)
 
-Thu Sep 30 15:18:23 2010  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/ruby/enc/test_case_mapping.rb: Explicit test for case folding of
+	  MICRO SIGN to Greek mu.
+	  (with Kimihito Matsui)
 
-	* parse.y (command_asgn): allow command_call to be right hand side
-	  expression of chained assignment.  [ruby-dev:42313]
+Sat Feb  6 14:51:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Sep 30 10:55:38 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* 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)
 
-	* hash.c (ruby_setenv): workaround for old Windows. a patch from
-	  Heesob Park. [ruby-core:32353]
+Sat Feb  6 14:37:16 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Sep 30 09:29:06 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* 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)
 
-	* lib/uri/common.rb (URI.encode_www_form): change treatment of
-	  undefined value in given array as latest internet draft for
-	  application/www-form-urlencoded.
-	  http://tools.ietf.org/html/draft-hoehrmann-urlencoded-01
+Fri Feb  5 20:08:59 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Thu Sep 30 09:34:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/ruby/enc/test_case_mapping.rb: added tests for :ascii option.
+	  (with Kimihito Matsui)
 
-	* vm_dump.c (dump_thread): fixed wrong type of return value of
-	  SymGetModuleBase64(). [ruby-dev:42306]
+Fri Feb  5 12:22:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Sep 29 21:04:05 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* insns.def (opt_mult): Use int128_t for overflow detection.
 
-	* test/ruby/test_rubyoptions.rb (TestRubyOptions::test_script_from_stdin):
-	  As usual, PTY is not always available.
+	* bignum.c (rb_uint128t2big): added for opt_mult.
 
-Wed Sep 29 18:38:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_uint128t2big): added for rb_uint128t2big..
 
-	* tool/config.sub (x64): regularize only for pc vendor, and strip
-	  useless 64 suffix.
+	* configure.in: define int128_t, uint128_t and related MACROs.
+	  Initially introduced by r41379 but reverted by r50749.
 
-Wed Sep 29 17:53:02 2010  Kenta Murata <mrkn@mrkn.jp>
+Thu Feb  4 21:05:17 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/bigdecimal/bigdecimal.c (BIGDECIMAL_ENABLE_VPRINT):
-	  VPrint is usually disabled.  It's only used in debugging.
+	* enc/unicode.c: Activated :ascii flag for ASCII-only case conversion
+	  (with Kimihito Matsui)
 
-Wed Sep 29 17:41:34 2010  Kenta Murata <mrkn@mrkn.jp>
+Thu Feb  4 17:38:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_limit):
-	  return the result of a block.
+	* re.c (reg_set_source): make source string frozen without
+	  copying.
 
-	* test/bigdecimal/test_bigdecimal.rb (test_save_limit):
-	  add a test for the above change.
+	* re.c (rb_reg_initialize_m): refactor initialization with
+	  encoding.
 
-Wed Sep 29 16:18:03 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Feb  4 15:35:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm_dump.c (dump_thread): remove unused optional arguments.
+	* string.c (rb_fstring_enc_new, rb_fstring_enc_cstr): functions to
+	  make fstring with encoding.
 
-Wed Sep 29 13:26:30 2010  Kenta Murata <mrkn@mrkn.jp>
+Thu Feb  4 14:42:29 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_rounding_mode):
-	  return the result of a block.
+	* common.mk: Added Unicode data file SpecialCasing.txt to be additionally
+	  downloaded (with Kimihito Matsui)
 
-	* test/bigdecimal/test_bigdecimal.rb (test_save_rounding_mode):
-	  add a test for the above change.
+Thu Feb  4 12:39:08 2016  joker1007  <kakyoin.hierophant@gmail.com>
 
-	* test/bigdecimal/test_bigdecimal.rb (test_save_exception_mode):
-	  add a test for the return value of BigDecimal.save_exception_mode.
+	* cgi/escape/escape.c: Optimize CGI.escape performance by C ext
+	  for ASCII-compatible encodings.  [Fix GH-1238]
 
-Wed Sep 29 12:45:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Feb  4 11:53:56 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_div2, BigDecimal_add2,
-	  BigDecimal_sub2, BigDecimal_mult2, VpLimitRound): remove meaningless
-	  casts to get rid of compiler warnings.
+	* common.mk: Introduce two variables (UNICODE_DATA_DIR and
+	  UNICODE_SRC_DATA_DIR) to eliminate repetitions.
 
-Wed Sep 29 12:35:13 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb  3 12:13:20 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/bigdecimal/bigdecimal.c (VPrint, VpToString): fix format.
+	* string.c (str_new_frozen): if the given string is embeddedable
+	  but not embedded, embed a new copied string. [Bug #11946]
 
-Wed Sep 29 12:31:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb  3 08:25:38 2016  boshan  <boshan@subsplash.com>
 
-	* lib/rdoc/known_classes.rb (RDoc::KNOWN_CLASSES): add Encoding.
+	* ext/openssl/ossl_pkey.c (Init_ossl_pkey): [DOC] Fix typo
+	  "encrypted" to "decrypted".  [Fix GH-1235]
 
-Tue Sep 28 20:50:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb  3 08:21:32 2016  Seiei Miyagi  <hanachin@gmail.com>
 
-	* tool/config.sub (x64): regularize same as mswin.
+	* 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]
 
-Tue Sep 28 20:06:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Feb  3 02:33:39 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* vm_dump.c (rb_vm_bugreport): add windows support.
-	  based on patches from Peter Weldon at [ruby-core:32551]
+	* 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
 
-Mon Sep 27 23:30:34 2010  Koichi Sasada  <ko1@atdot.net>
+Tue Feb  2 13:02:03 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* insns.def (opt_case_dispatch), vm_insnhelper.c:
-	  execute the procedures of "when" clauses by bytecode
-	  instead of st_foreach() when the object does not hit
-	  prepared hash.  [ruby-dev:42304]
+	* re.c: Introduce RREGEXP_PTR.
+	  patch by dbussink.
+	  partially merge https://github.com/ruby/ruby/pull/497
 
-Mon Sep 27 15:54:03 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* include/ruby/ruby.h: ditto.
 
-	* test/net/http/test_https.rb: As always, localhost is not
-	  guaranteed to be resolved as 127.0.0.1.  But a SSL
-	  certificate needs a socket to listen on a specific address
-	  where a CN resolves to.  On situations where localhost is
-	  not 127.0.0.1, these tests are not possible.
+	* gc.c: ditto.
 
-Mon Sep 27 15:25:05 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* ext/strscan/strscan.c: ditto.
 
-	* test/net/imap/test_imap.rb: resurrection of r29259.
-	  this change depends on minitest 1.7.1.
+	* parse.y: ditto.
 
-	* lib/test/unit/assertions.rb: ditto.
+	* string.c: ditto.
 
-Sun Sep 26 22:59:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb  2 09:08:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* tool/config.sub (x86_64-pc-mingw64): regularize.
+	* lib/rubygems/specification.rb: `coding` is effective only first
+	  line except shebang.
 
-Sun Sep 26 22:21:07 2010  wanabe  <s.wanabe@gmail.com>
+	* lib/rubygems/package.rb, lib/rubygems/package/*: ditto.
 
-	* ext/openssl/ossl_hmac.c (ossl_hmac_hexdigest, ossl_hmac_s_hexdigest),
-	  ext/openssl/ossl_pkey_ec.c (ossl_ec_group_set_seed),
-	  ext/openssl/ossl_ssl_session.c (ossl_ssl_session_to_der),
-	  ext/openssl/ossl_pkcs7.c (numberof): suppress warnings.
-	  [ruby-core:31932]
+Mon Feb  1 21:41:58 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Sun Sep 26 10:25:24 2010  Nobuyoshi Nakada  <nobu@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
 
-	* tool/config.{guess,sub}: updated to automake-1.11.1.
+Sun Jan 31 12:33:13 2016  Dan Kreiger  <dan@dankreiger.com>
 
-Sat Sep 25 22:48:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/drb/ut_large.rb (multiply, avg, median): add additional
+	  math operations to DRbLarge.  [Fix GH-1086]
 
-	* configure.in (LIBRUBY_DLDFLAGS): fix quoting.
+Sun Jan 31 12:19:15 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-Sat Sep 25 10:30:37 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_file_exhaustive.rb (test_lstat): Add lacking test
+	  for File#lstat.  [Fix GH-1231]
 
-	* configure.in (LIBRUBY_DLDFLAGS): use -unexported_symbol only
-	  when available.  http://trac.macports.org/ticket/26341
+Sun Jan 31 12:15:33 2016  Prayag Verma  <prayag.verma@gmail.com>
 
-Sat Sep 25 10:05:49 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+	* doc/standard_library.rdoc: fix typo  [Fix GH-1230]
+	  Spelling mistakes -
+	  outputing > outputting
+	  publich > publish
 
-	* configure.in: Always add -mieee for Renesas SH4.
-	  Thanks, Nobuhiro Iwamatsu. [Feature #3874] [ruby-core:32548]
+Sat Jan 30 15:18:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Sep 25 01:34:41 2010  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]
 
-	* Makefile.in (install-cross): target to install cross-compiling
-	  stuff.
+Fri Jan 29 17:40:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep 24 23:44:59 2010  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.
 
-	* string.c (sym_call), vm.c (invoke_block_from_c),
-	  vm_insnhelper.c (vm_yield_with_cfunc): pass given block.
-	  [ruby-core:32075]
+	* win32/win32.c (w32_readlink): ditto, including NUL-terminator.
 
-	* vm_eval.c (rb_funcall_passing_block): new function to call
-	  method with passing given block.
+Fri Jan 29 17:07:27 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri Sep 24 15:50:43 2010  NARUSE, Yui  <naruse@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]
 
-	* string.c (rb_str_to_i): fix rdoc: String#to_i raises an
-	  exception when base is invalid. [ruby-core:31685]
+	* win32/win32.c (rb_w32_read_reparse_point): check the reparse point is
+	  a volume mount point or not.
 
-Fri Sep 24 15:28:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* win32/file.c (rb_readlink): follow above change (but this pass won't
+	  be used).
 
-	* string.c (rb_str_rindex): use rb_enc_prev_char instead of repeated
-	  str_nth.
-	  patched by Michael Selig [ruby-core:32498]
+Fri Jan 29 16:17:07 2016  Lucas Buchala  <lucasbuchala@gmail.com>
 
-Fri Sep 24 14:19:12 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* enum.c (enum_take_while, enum_drop_while): rename block
+	  parameter to obj, since they are generic objects.  [Fix GH-1226]
 
-	* test/test_pty.rb: Same as 229281; existence of PTY class do not
-	  guarantee a successful pty operation.
+Fri Jan 29 14:15:26 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep 24 06:25:55 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+	* lib/erb.rb (ERB::Compiler#detect_magic_comment): allow
+	  frozen-string-literal in comment as well as encoding.
 
-	* lib/minitest/*.rb: Imported minitest 1.7.2 r5879.
-	* test/minitest/*.rb: ditto.
+	* 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.
 
-Thu Sep 23 23:09:08 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jan 29 11:13:33 2016  Jeremy Evans  <code@jeremyevans.net>
 
-	* vm_insnhelper.c (vm_get_cref0): cref is stacked only in normal
-	  iseqs, so check if it is the case first.
+	* 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]
 
-Thu Sep 23 23:08:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jan 29 10:44:56 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* tool/config.sub: mingw64 should use x86_64.  [ruby-core:32514]
+	* 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 Sep 23 21:40:40 2010  wanabe  <s.wanabe@gmail.com>
+Thu Jan 28 17:31:43 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/socket/raddrinfo.c (init_addrinfo, inspect_sockaddr): suppress
-	  warnings.  see [ruby-core:31932].
+	* ext/socket/socket.c (sock_gethostname): support unlimited size
+	  hostname.
 
-Thu Sep 23 19:27:57 2010  wanabe  <s.wanabe@gmail.com>
+Wed Jan 27 21:03:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* thread_win32.c (w32_wait_events, w32_close_handle): suppress warnings.
-	  see [ruby-core:31932].
+	* test/-ext-/string/test_capacity.rb: Added missing library.
 
-Thu Sep 23 18:54:39 2010  wanabe  <s.wanabe@gmail.com>
+Wed Jan 27 18:53:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* tool/config.sub: add mingw64.
+	* enc/unicode.c: Fixed bit mask in macro OnigCodePointCount
 
-	* win32/mkexports.rb (Exports::Mingw64): added.
+Wed Jan 27 17:54:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* win32/mkexports.rb (Exports::Mingw32): renamed from Exports::Mingw.
+	* enc/unicode.c: Protect code point count by macro, in order to
+	  be able to use the remaining bits for flags.
+	  (with Kimihito Matsui)
 
-Thu Sep 23 09:01:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jan 27 16:34:35 2016  boshan  <boshan@subsplash.com>
 
-	* vm_insnhelper.c (vm_cref_push): no outer cref is needed for proc
-	  from method.  Bug #3786, Bug #3860, [ruby-core:32501]
+	* 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 Sep 22 17:12:01 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Wed Jan 27 16:25:54 2016  Koichi ITO  <koic.ito@gmail.com>
 
-	* test/openssl/utils.rb (OpenSSL#silent): always restore $VERBOSE.
-	  [ruby-dev:42285]
+	* 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]
 
-Wed Sep 22 16:59:40 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Tue Jan 26 19:36:15 2016  Aggelos Avgerinos  <evaggelos.avgerinos@gmail.com>
 
-	* test/test_prime.rb (TestPrime#test_new): the warning expected have
-	  not been displayed when $VERBOSE == nil. Patch by Shota Fukumori
-	  a.k.a. sora_h. [ruby-dev:42272]
-	  Recovers $stderr even if StringIO.new fails. Reported by unak.
+	* array.c (permute0, rpermute0): [DOC] Substitute indexes ->
+	  indices in documentation for consistency.  [Fix GH-1222]
 
-Wed Sep 22 01:55:48 2010  Koichi Sasada  <ko1@atdot.net>
+Tue Jan 26 15:21:37 2016  Eric Wong  <e@80x24.org>
 
-	* bootstraptest/test_method.rb: fix last commit.
+	* 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
 
-Wed Sep 22 01:49:52 2010  Koichi Sasada  <ko1@atdot.net>
+Tue Jan 26 15:14:01 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
-	* bootstraptest/test_method.rb: add a test for [ruby-core:30534].
+	* 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]
 
-Wed Sep 22 00:52:44 2010  WATANABE Hirofumi  <eban@ruby-lang.org>
+Tue Jan 26 14:26:46 2016  Eric Wong  <e@80x24.org>
 
-	* lib/rdoc/ri/store.rb (save_cache): remove duplicate entries.
+	* signal.c (sig_list): use fstring for hash key
+	* test/ruby/test_signal.rb (test_signal_list_dedupe_keys): added
 
-Wed Sep 22 00:00:05 2010  Tanaka Akira  <akr@fsij.org>
+Tue Jan 26 13:08:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_f_pathname): Pathname() translated
-	  from pathname.rb.
+	* signal.c (rb_f_kill): should immediately deliver reserved
+	  signals SIGILL and SIGFPE, not only SIGSEGV and SIGBUS.
 
-Tue Sep 21 22:18:30 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jan 26 07:57:28 2016  Joseph Tibbertsma  <josephtibbertsma@gmail.com>
 
-	* tool/mkconfig.rb: fixed build problem on mswin64 introduced in r29278.
+	* gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
+	  [Fix GH-1221]
 
-Tue Sep 21 02:42:35 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Mon Jan 25 17:26:54 2016  Eric Wong  <e@80x24.org>
 
-	* test/pathname/test_pathname.rb (TestPathname#test_mkdir): fix typo.
+	* ruby_assert.h (RUBY_ASSERT_WHEN): fix reference to macro name
+	* vm_core.h: include ruby_assert.h before using
+	  [ruby-core:73371]
 
-Mon Sep 20 23:23:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan 25 15:55:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* dir.c (bracket): get rid of scanning at the end of the pattern
-	  string, not to raise an exception while globbing command line.
-	  [ruby-core:32478]
+	* symbol.c (sym_check_asciionly): more informative error message
+	  with the encoding name and the inspected content.
+	  [ruby-core:73398] [Feature #12016]
 
-Mon Sep 20 11:25:49 2010  Tanaka Akira  <akr@fsij.org>
+Mon Jan 25 09:38:26 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/pathname/pathname.c (Init_pathname): Pathname#=~ undefinition
-	  translated from pathname.rb.
+	* test/ruby/test_string.rb: added testcase for next!, succ and succ!
+	  [fix GH-1213] Patch by @K0mAtoru
 
-Mon Sep 20 02:34:11 2010  Kenta Murata  <mrkn@mrkn.jp>
+Mon Jan 25 09:32:25 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/bigdecimal/bigdecimal.c (check_rounding_mode, BigDecimal_mode):
-	  raise ArgumentError instead of TypeError passing invalid modes.
+	* lib/webrick/httpservlet/filehandler.rb: fix documentation for namespace.
+	  [fix GH-1219][ci skip] Patch by @leafac
 
-	* test/bigdecimal/test_bigdecimal.rb (test_mode, test_round):
-	  change against the above modifications.
+Sun Jan 24 19:34:23 2016  Eric Wong  <e@80x24.org>
 
-Sun Sep 19 22:08:39 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+	* vm_insnhelper.c (vm_check_if_namespace): tiny size reduction
 
-	* lib/mkmf.rb (try_link): rdoc
-	  (try_compile): ditto
-	  (try_cpp): ditto
-	  (try_func): ditto
-	  (try_var): ditto
-	  (try_run): ditto
-	  (egrep_cpp): ditto
+Sun Jan 24 18:12:36 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Sep 19 20:43:33 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+	* common.mk: Simplifying Unicode data file download logic to make
+	  it more reliable (including additional fix not in r53633) [Bug #12007]
 
-	* configure.in (--disable-install-doc): disables capi too, in addition
-	  to rdoc.
-	  (--disable-install-rdoc): a new option for disabling only rdoc.
-	  (--disable-install-capi): a new option for disabling only capi.
+Sun Jan 24 16:54:11 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Sep 19 20:37:45 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+	* 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]
 
-	* common.mk (clean): removes all documents on cleaning.o
-	  (CAPIOUT): new variable.
-	  (clean-capi, distclean-capi, realclean-capi): new targets
+Sat Jan 23 22:30:59 2016  K0mA  <mctj1218@gmail.com>
 
-	* Makefile.in (clean-capi, distclean-capi, realclean-capi): ditto.
+	* test/ruby/test_array.rb (test_keep_if): Add test for
+	  Array#keep_if separate from Array#select!  [Fix GH-1218]
 
-	* win32/Makefile.sub (clean-capi, distclean-capi, realclean-capi):
-	  ditto.
+Sat Jan 23 20:54:26 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Sun Sep 19 13:44:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* common.mk: revert r53633. It broke rubyci and travis.
+	  https://travis-ci.org/ruby/ruby/builds/104259623
 
-	* configure.in (LIBRUBY_SO): fix an oversight of replace
-	  RUBY_INSTALL_NAME with RUBY_SO_NAME.  a patch from Jeremy Evans
-	  at [ruby-core:32474].
+Sat Jan 23 20:10:29 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-Sun Sep 19 07:48:20 2010  Tanaka Akira  <akr@fsij.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]
 
-	* ext/pathname/pathname.c (path_unlink): Pathname#unlink and
-	  Pathname#delete translated from pathname.rb.
+Sat Jan 23 18:37:37 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Sep 19 06:06:07 2010  Kenta Murata  <mrkn@mrkn.jp>
+	* ChangeLog: Fixing wrong time on previous commit, and adding
+	  previous commit message to svn [ci skip]
 
-	* ext/bigdecimal/bigdecimal.c (check_rounding_mode): added for
-	  converting symbol to rounding mode number.
+Sat Jan 23 18:30:30 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_mode, BigDecimal_round):
-	  support to specify rounding mode by symbol.
+	* common.mk: Simplifying Unicode data file download logic to make
+	  it more reliable [Bug #12007]
 
-	* test/bigdecimal/test_bigdecimal.rb (test_mode, test_round):
-	  add tests for above changes.
+Sat Jan 23 16:29:42 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Sun Sep 19 05:14:35 2010  Kenta Murata  <mrkn@mrkn.jp>
+	* tool/downloader.rb: Fixed a logical error, improved documentation
 
-	* ext/bigdecimal/bigdecimal.c: fix rounding algorithms for half-down
-	  and half-even.  This change is based on the patch created by Matthew
-	  Willson, the reporter of this bug.  [Bug #3803] [ruby-core:32136]
+Sat Jan 23 11:42:43 2016  Peter Suschlik  <ps@neopoly.de>
 
-	* test/bigdecimal/test_bigdecimal.rb: add tests for above changes.
+	* README.md: Use SVG Travis badge over PNG for better quality and
+	  device support.  [Fix GH-1214] [Fix GH-1216]
 
-Sat Sep 18 20:09:51 2010  Tanaka Akira  <akr@fsij.org>
+Sat Jan 23 11:29:16 2016  Pascal Betz  <pascal.betz@simplificator.com>
 
-	* ext/pathname/pathname.c (path_each_entry): Pathname#each_entry
-	  translated from pathname.rb.
+	* lib/csv.rb: Update documentation of CSV header converter for
+	  r45498, [GH-575].  [Fix GH-1215]
 
-Fri Sep 17 23:44:07 2010  Kouhei Sutou  <kou@cozmixng.org>
+Fri Jan 22 17:36:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rexml/xpath_parser.rb, test/rexml/test_xpath.rb:
-	  add missing method availability check. [ruby-core:32447]
-	  Reported by Wiebe Cazemier. Thanks!!!
+	* vm_core.h (VM_ASSERT): use RUBY_ASSERT instead of rb_bug.
 
-Fri Sep 17 23:23:26 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* error.c (rb_assert_failure): assertion with stack dump.
 
-	* test/rexml/test_sax.rb: don't use thread and sleep to avoid slow test.
+	* ruby_assert.h (RUBY_ASSERT): new header for the assertion.
 
-Fri Sep 17 23:10:44 2010  Kouhei Sutou  <kou@cozmixng.org>
+Fri Jan 22 00:25:57 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/rexml/test_core.rb: enable.
+	* regparse.c (fetch_name_with_level): allow non word characters
+	  at the first character.  [Feature #11949]
 
-Fri Sep 17 22:46:02 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* regparse.c (fetch_name): ditto.
 
-	* test/rexml/: untabify.
+Thu Jan 21 17:34:01 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Sep 17 22:29:56 2010  Kouhei Sutou  <kou@cozmixng.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
 
-	* test/rexml/: fix fixture data path. All REXML tests are worked.
+Thu Jan 21 16:37:50 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Sep 17 22:15:15 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* Makefile.in (update-rubyspec): fix r53208 like r53451.
 
-	* test/rexml/test_listener.rb: remove needless codes.
+Wed Jan 20 20:58:25 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri Sep 17 22:12:23 2010  Kouhei Sutou  <kou@cozmixng.org>
+	* common.mk, Makefile.in: update-config_files is only for Unix
+	  platforms.
 
-	* test/rexml/: import REXML tests from
-	  http://www.germane-software.com/repos/rexml/trunk/test/.
-	  Many tests are failed temporary. I'll fix them quickly. Sorry.
+Wed Jan 20 17:13:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep 17 16:48:49 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* tool/extlibs.rb: add --cache option to change cache directory.
 
-	* test/io/console/test_io_console.rb (TestIO_Console::helper):
-	  PTY.open is not guaranteed to work.  On my machine opening a
-	  pty is prohibited via process control group.  On those cases
-	  exceptions shall occur, and that doesn't mean our fault.
-	  Skip those tests on such situations.
+Tue Jan 19 17:03:40 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Fri Sep 17 08:30:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* common.mk: Added Unicode data file CaseFolding.txt to be additionally
+	  downloaded (with Kimihito Matsui)
 
-	* lib/tracer.rb: count only non-internal libraries in stack trace,
-	  ignoring custom_require.  [ruby-core:31858]
+Tue Jan 19 10:09:58 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
 
-Fri Sep 17 02:18:41 2010  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/shell.rb (Shell.debug_output_exclusive_unlock): remove
+	  because Mutex#exclusive_unlock was already deleted. [fix GH-1185]
 
-	* tool/mkconfig.rb: Fix build with m4 1.4.15 generating duplicate
-	  lines in config.status.  According to nobu, the mswin32 port may
-	  depend on the piece of code in question, so the behavior is left
-	  unchanged on mswin32.
+Tue Jan 19 09:38:27 2016  Nick Cox  <nick@nickcox.me>
 
-Thu Sep 16 23:47:59 2010  Tanaka Akira  <akr@fsij.org>
+	* vm_method.c: fix grammar in respond_to? warning.
+	  [fix GH-1047]
 
-	* ext/pathname/pathname.c (path_opendir): Pathname#opendir translated
-	  from pathname.rb.
+Mon Jan 18 14:37:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Sep 16 21:40:37 2010  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]
 
-	* lib/test/unit.rb (Test::Unit::GlobOption): merged RejectOption.
+Mon Jan 18 12:04:34 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* test/runner.rb: utilize GlobOption.
+	* test/ruby/test_string.rb: Added extra testcase for test_rstrip_bang
+	  and test_lstrip_bang. [fix GH-1178] Patch by @Matrixbirds
 
-Thu Sep 16 21:31:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan 18 11:47:27 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* lib/rdoc/ri/driver.rb (RDoc::RI::Driver.setup_options)
-	  (RDoc::RI::Driver.fixup_options): split from process_args.
-	  libraries should not parse ARGV inside, since it's a task of
-	  applications, not libraries.
+	* string.c: fix a typo. [fix GH-1202][ci skip] Patch by @sunboshan
 
-Thu Sep 16 21:02:30 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jan 17 21:15:30 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rdoc/ri/paths.rb (RDoc::RI::Paths.each): HOMEDIR can be nil
-	  if $HOME is unset.
+	* configure.in: improve ICC (Intel C Compiler) support.
 
-Thu Sep 16 14:50:42 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* configure.in (CXX): The name of icc's c++ compiler is `icpc`.
 
-	* test/ruby/test_file_exhaustive.rb (TestFileExhaustive::test_expand_path):
-	  ENV["HOME"] might not be set.  On those cases without it an
-	  exception raises here, which effectively disables later
-	  tests on this method.
+	* configure.in (warnings): Add `-diag-disable=2259` to suppress
+	  noisy warnings: "non-pointer conversion from "..." to "..." may
+	  lose significant bits".
 
-Thu Sep 16 08:30:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in (optflags): Add `-fp-model precise` like -fno-fast-math.
 
-	* sprintf.c (rb_f_sprintf): fix rdoc.  pointed out by Tomoyuki
-	  Chikanaga at [ruby-core:32395], and a patch from Daniel
-	  Bovensiepen at [ruby-core:32403].
+	* lib/mkmf.rb: icc supports -Werror=division-by-zero
+	  and -Werror=deprecated-declarations, but doesn't support
+	  -Wdivision-by-zero and -Wdeprecated-declarations.
 
-Thu Sep 16 08:27:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jan 17 20:40:10 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/etc/extconf.rb: use expanded sysconfdir with empty DESTDIR.
-	  [ruby-core:32394]
+	* 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)
 
-Thu Sep 16 06:07:24 2010  Tanaka Akira  <akr@fsij.org>
+Sun Jan 17 20:10:10 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated
-	  from pathname.rb.
+	* enc/unicode.c: Fixed a logical error and some comments.
+	* test/ruby/enc/test_case_mapping.rb: Made tests more general.
+	  (with Kimihito Matsui)
 
-Thu Sep 16 00:36:25 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Sun Jan 17 17:41:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/readline/extconf.rb: Remove Readline 6 check because
-	  Ruby's license is now GPLv3 compatible. [ruby-core:28736]
+	* 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)
 
-Thu Sep 16 00:26:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Sun Jan 17 15:30:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* COPYING: change Ruby's License from a dual license with GPLv2
-	  to a dual license with 2-clause BSDL.
-	  [ruby-dev:42166] [ruby-core:31971]
-	  [ruby-dev:39167] [ruby-core:25272]
+	* 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]
 
-	* COPYING.ja: ditto.
+Sun Jan 17 14:43:01 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-	* BSDL: added. this is from The FreeBSD License.
+	* 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
 
-Wed Sep 15 21:07:06 2010  Tanaka Akira  <akr@fsij.org>
+Sun Jan 17 14:42:25 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-	* ext/pathname/pathname.c (path_mkdir): Pathname#mkdir translated
-	  from pathname.rb.
+	* 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
 
-Wed Sep 15 13:37:00 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Sun Jan 17 14:40:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/net/imap/test_imap.rb: "localhost" not guaranteed to
-	  resolve to "127.0.0.1".  On my machine it is "::1" instead.
-	  The problem is, you have to connect to the imaps server via
-	  the canonical name written in a server certificate, and that
-	  of the server.cert is "localhost".  So you have to listen to
-	  the address of what "localhost" resolves to.  I think this
-	  situation cannot be resolved in a handy manner because the
-	  test "test_imaps_post_connection_check" is actually
-	  expecting to connect to a server via an address other than
-	  the CN.  On my machine several assertions won't pass because
-	  the test cannot connect to the server.
+	* ext/socket/option.c (check_size): extract a macro to check
+	  binary data size, with a consistent message.
 
-Wed Sep 15 09:12:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/option.c (sockopt_byte): fix error message,
+	  sizeof(int) differs from sizeof(unsigned char) in general.
 
-	* io.c (rb_io_puts): fix for wide char encoding strings.
-	  [ruby-dev:42212]
+Sat Jan 16 21:16:21 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Sep 15 07:27:52 2010  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]
 
-	* string.c (rb_str_format_m): mentioned about Hash argument.  a patch
-	  from Daniel Bovensiepen at [ruby-core:32386].
+Sat Jan 16 17:24:24 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* sprintf.c (get_hash): ditto, and fix typo.
+	* 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)
 
-Wed Sep 15 07:22:20 2010  Tanaka Akira  <akr@fsij.org>
+Sat Jan 16 16:47:14 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_entries): Pathname#entries translated
-	  from pathname.rb.
+	* ext/openssl/lib/openssl/pkey.rb: Added 2048 bit DH parameter.
+	* test/openssl/test_pkey_dh.rb: ditto.
 
-Wed Sep 15 02:13:44 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+Sat Jan 16 10:51:19 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/fiddle/closure.c : Don't use FFI closure alloc on OpenBSD.
-	  Thanks Jeremy Evans! [ruby-core:32384]
+	* enc/unicode.c: fix implicit conversion error with clang. fixup r53548.
+	* string.c: ditto.
 
-Tue Sep 14 20:17:48 2010  Tanaka Akira  <akr@fsij.org>
+Sat Jan 16 10:31:00 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_s_getwd): Pathname.getwd and
-	  Pathname.pwd translated from pathname.rb.
+	* 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.
 
-Tue Sep 14 05:13:04 2010  Tanaka Akira  <akr@fsij.org>
+Sat Jan 16 10:23:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/pathname/pathname.c (path_s_glob): Pathname.glob translated
-	  from pathname.rb.
+	* 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)
 
-Tue Sep 14 01:24:51 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+Fri Jan 15 20:20:20 2016  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* ext/socket/raddrinfo.c (ruby_getaddrinfo__aix): suppress a
-	  warning.
+	* 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.
 
-Mon Sep 13 20:48:30 2010  Tanaka Akira  <akr@fsij.org>
+Fri Jan 15 16:12:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_zero_p): Pathname#zero? translated
-	  from pathname.rb.
+	* parse.y (string1): reset heredoc indent for each string literal
+	  so that concatenated string would not be dedented.
+	  [ruby-core:72857] [Bug #11990]
 
-Mon Sep 13 19:56:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan 14 20:01:00 2016  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/socket/rubysocket.h (__DARWIN_ALIGNBYTES): workaround of a
-	  bug in system header of darwin 9.  [ruby-core:32341]
+	* 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
 
-Mon Sep 13 18:11:55 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jan 14 17:36:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (try_do): fix typo.  a patch from Peter Weldon
-	  at [ruby-core:32327].
+	* variable.c (rb_f_global_variables): add matched back references
+	  only, as well as defined? operator.
 
-Mon Sep 13 10:12:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Jan 14 16:12:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* util.c (ruby_strtod): reject Float('0x0.').
-	  [ruby-dev:42239] Bug #3820
+	* sprintf.c (rb_str_format): format exact number more exactly.
 
-Mon Sep 13 09:23:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Jan 14 15:08:43 2016  Tony Arcieri  <bascule@gmail.com>
 
-	* ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison
-	  with rb_scan_args. Before this fix, OpenSSL::BN#prime?
-	  is fully broken. [ruby-dev:42225]
+	* Remove 512-bit DH group. It's affected by LogJam Attack.
+	  https://weakdh.org/
+	  [fix GH-1196][Bug #11968][ruby-core:72766]
 
-Mon Sep 13 06:45:24 2010  Tanaka Akira  <akr@fsij.org>
+Thu Jan 14 11:44:29 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_writable_real_p):
-	  Pathname#writable_real? translated from pathname.rb.
+	* variable.c (rb_f_global_variables): add $1..$9 only if $~ is
+	  set.  fix the condition removed at r14014.
 
-Sun Sep 12 21:21:50 2010  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Jan 13 17:21:45 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* lib/date.rb: [ruby-core:32096]  Thanks Colin Bartlett.
+	* .travis.yml: removed commented-out code.
 
-Sun Sep 12 19:30:27 2010  Tanaka Akira  <akr@fsij.org>
+Wed Jan 13 17:14:54 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_world_writable_p):
-	  Pathname#world_writable? translated from pathname.rb.
+	* .travis.yml: removed osx code. follow up with r53517
 
-Sun Sep 12 09:16:06 2010  Tanaka Akira  <akr@fsij.org>
+Wed Jan 13 16:56:19 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_writable_p): Pathname#writable?
-	  translated from pathname.rb.
+	* iseq.c (rb_iseq_mark): mark parent iseq to prevent dynamically
+	  generated iseq by eval from GC.  [ruby-core:72620] [Bug #11928]
 
-Sun Sep 12 08:36:15 2010  Tanaka Akira  <akr@fsij.org>
+Wed Jan 13 03:42:58 2016  Eric Wong  <e@80x24.org>
 
-	* process.c (rlimit_resource_name2int): support more limits:
-	  RLIMIT_MSGQUEUE, RLIMIT_NICE, RLIMIT_RTPRIO, RLIMIT_RTTIME and
-	  RLIMIT_SIGPENDING.
-	  (Init_process): ditto.
-	  patch by Run Paint Run Run.  [ruby-core:32262]
+	* 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]
 
-Sun Sep 12 04:27:13 2010  Tanaka Akira  <akr@fsij.org>
+Wed Jan 13 00:37:12 2016  Satoshi Ohmori  <sachin21dev@gmail.com>
 
-	* process.c (rlimit_resource_name2int): use STRCASECMP to avoid
-	  ALLOCA_N.
+	* man/ruby.1: fix double word typo.  [Fix GH-1194]
 
-Sat Sep 11 16:47:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jan 12 21:01:09 2016  Benoit Daloze  <eregontp@gmail.com>
 
-	* hash.c (ruby_setenv): raise if putenv and SetEnvironmentVariable
-	  failed, because of the restriction of the size on Windows.
-	  based on a patch from Peter Weldon at [ruby-core:32304].  fix:
-	  Bug#3812, [ruby-core:32250]
+	* common.mk: update URL and name for the Ruby spec suite.
 
-Sat Sep 11 15:19:57 2010  Eric Hodel  <drbrain@segment7.net>
+Tue Jan 12 19:52:19 2016  sorah (Shota Fukumori)  <her@sorah.jp>
 
-	* lib/webrick/httpauth/digestauth.rb (WEBrick::Config::DigestAuth):
-	  Add documentation
+	* lib/forwardable.rb: Convert given accessors to String.
 
-	* lib/webrick/config.rb (WEBrick::Config::DigestAuth): Add
-	  documentation
+	  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.
 
-Sat Sep 11 12:32:05 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	      def_delegator Foo, :some_method
 
-	* include/ruby/intern.h (rb_set_kcode, rb_get_kcode): removed
-	  zombie prototype declarations.  a patch from Eric Hodel
-	  at [ruby-core:32305].
+	  This change is to revert unexpected incompatibility. But this behavior
+	  may change in the future.
 
-Sat Sep 11 06:53:12 2010  Tanaka Akira  <akr@fsij.org>
+Mon Jan 12 18:41:41 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/pathname/pathname.c (path_symlink_p): Pathname#symlink?
-	  translated from pathname.rb.
+	* string.c: made a variable name more grammatically correct
 
-Fri Sep 10 23:03:43 2010  Tanaka Akira  <akr@fsij.org>
+Mon Jan 12 18:34:34 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* ext/pathname/pathname.c (path_sticky_p): Pathname#sticky? translated
-	  from pathname.rb.
+	* string.c: minor grammar fix [ci skip]
 
-Fri Sep 10 19:11:13 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Jan 12 16:09:09 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#continue): add
-	  method for generating HTTP/1.1 100 continue response if the client
-	  expects it, otherwise does nothing.  Patch by Brian Candler.
-	  ref #855.
+	* test/ruby/enc/test_casing_options.rb: Tests for option
+	  parsing/checking for upcase/downcase/capitalize/swapcase
+	  (see r53503; with Kimihito Matsui)
 
-	* test/webrick/test_httprequest.rb: test added.
+Mon Jan 12 16:03:03 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Fri Sep 10 17:49:34 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* string.c: Added option parsing/checking for upcase/downcase/
+	  capitalize/swapcase (with Kimihito Matsui)
 
-	* ext/openssl/lib/openssl/x509-internal.rb: removed unused local
-	  variable.
+Mon Jan 11 21:28:28 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-	* test/openssl/*: less warnings while test running with -w.
+	* include/ruby/oniguruma.h: Added flags needed for upcase/downcase
+	  Unicode addition (with Kimihito Matsui)
 
-Fri Sep 10 16:49:20 2010  Akinori MUSHA  <knu@iDaemons.org>
+Mon Jan 11 09:50:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* class.c (rb_scan_args): Add support for optional keyword
-	  argument hash. [ruby-dev:42221] [ruby-dev:38048]
+	* configure.in: check if the API version number is consistent with
+	  the program version number.
 
-	* README.EXT, README.EXT.ja: Update documentation accordingly.
+Sun Jan 10 20:57:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* dir.c (dir_initialize): Make use of the new rb_scan_args()
-	  feature.
+	* 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]
 
-	* io.c (rb_io_s_popen, rb_scan_open_args, rb_io_initialize)
-	  (rb_io_s_pipe, open_key_args, io_s_foreach, io_s_readlines)
-	  (rb_io_s_read, rb_io_set_encoding): Ditto.
+Sun Jan 10 15:45:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* transcode.c (str_transcode, econv_args)
-	  (econv_primitive_convert): Ditto.
+	* 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.
 
-	* ext/zlib/zlib.c (rb_gzreader_initialize): Ditto.
+Sun Jan 10 13:41:36 2016  Eric Wong  <e@80x24.org>
 
-Fri Sep 10 10:33:18 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* io.c (rb_deferr): remove long obsolete global
 
-	* random.c (rb_genrand_ulong_limited): renamed from
-	  rb_rand_internal and now this is public API.
+Sun Jan 10 09:14:42 2016  Eric Wong  <e@80x24.org>
 
-	* include/ruby/ruby.h (rb_genrand_ulong_limited): added.
+	* 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]
 
-	* bignum.c (big_sparse_p): use rb_genrand_ulong_limited.
+Sat Jan  9 23:19:14 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-Fri Sep 10 13:07:22 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* test/ruby/test_hash.rb (test_try_convert): Add test for
+	  Hash.try_convert.  [Fix GH-1190]
 
-	* ext/digest/lib/digest.rb: removed unused exception variable
-	  assignment to avoid a warning.
+Sat Jan  9 23:15:25 2016  Jon Moss  <maclover7@users.noreply.github.com>
 
-Fri Sep 10 07:29:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/ossl.c: Add missing variables to documentation
+	  examples.  [Fix GH-1189]
 
-	* ext/etc/etc.c (etc_systmpdir): assume system default tmpdir
-	  safe.  [ruby-dev:42089]
+Sat Jan  9 18:25:57 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep 10 07:03:23 2010  Tanaka Akira  <akr@fsij.org>
+	* symbol.h (is_attrset_id): ASET is an attrset ID.  fix
+	  unexpected safe call instead of an ordinary ASET.
 
-	* ext/pathname/pathname.c (path_size_p): Pathname#size? translated from
-	  pathname.rb.
+Sat Jan  9 10:44:33 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep 10 02:15:29 2010  Tanaka Akira  <akr@fsij.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.
 
-	* ext/socket/option.c (inspect_peercred): support OpenBSD-current.
-	  patch by Jeremy Evans.  [ruby-core:32240]
+Sat Jan  9 07:13:33 2016  Koichi Sasada  <ko1@atdot.net>
 
-Thu Sep  9 23:25:53 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c: rename PAGE_* to HEAP_PAGE_* because PAGE_SIZE is used
+	  in Mac OS X.
 
-	* vm.c (vm_backtrace_each): skip allocator frames which have no
-	  name.  [ruby-core:32231]
+	* test/ruby/test_gc.rb: catch up this fix.
 
-Thu Sep  9 22:39:08 2010  Tanaka Akira  <akr@fsij.org>
+Sat Jan  9 05:45:40 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/pathname/pathname.c (path_size): Pathname#size translated from
-	  pathname.rb.
+	* gc.c: PAGE_BITMAP_PLANES (the number of bitmap) is 4, not 3.
 
-Thu Sep  9 22:34:48 2010  wanabe  <s.wanabe@gmail.com>
+Sat Jan  9 05:42:57 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* compile.c (case_when_optimizable_literal): When float value can be
-	  treated as integer, add to table hash of case that way.
-	  based on a patch from Ikuo KOBORI. [ruby-dev:42038]
+	* gc.c: rename constant names HEAP_* to PAGE_*.
 
-	* insns.def (opt_case_dispatch): ditto.
+	  Keys of GC::INTERNAL_CONSTANTS are also renamed.
 
-	* test/ruby/test_case.rb: add tests.
+	* test/ruby/test_gc.rb: catch up this fix.
 
-Thu Sep  9 17:15:15 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Jan  8 22:30:06 2016  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/net/http/test_https.rb (test_identity_verify_failure): follows
-	  the SSL hostname check error message of openssl.
+	* doc/regexp.rdoc: [DOC] Elaborate on the \G anchor. [ci skip]
 
-Thu Sep  9 10:44:46 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Jan  8 19:49:27 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* test/ruby/test_env.rb (test_aset): OpenBSD acts like NetBSD in
-	  that it ignores characters after = in ENV.
-	  patched by Jeremy Evans [ruby-core:32184]
+	* gc.c: remove heap_page::body. Instead of this field,
+	  heap_page::start field works well.
 
-Thu Sep  9 09:02:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Jan  8 19:31:52 2016  Koichi Sasada  <ko1@atdot.net>
 
-	* tool/rbinstall.rb (install?): gemspec filename should include
-	  its version. patched by Luis Lavena [ruby-core:32165]
+	* gc.c: rename rb_heap_t::page_length to rb_heap_t::total_pages.
 
-Wed Sep  8 22:46:31 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	  `page_length' is not clear (we may understand with length of
+	  a page).
 
-	* ext/openssl/ossl_ssl.c (ssl_get_error): Thread context switch was
-	  blocked on Windows while blocking call for SSLSocket.  Need to
-	  convert errno for letting rb_io_wait_readable detect EWOULDBLOCK.
-	  Patch by arton. ref #3794.
+Fri Jan  8 17:07:14 2016  Koichi Sasada  <ko1@atdot.net>
 
-Wed Sep  8 20:56:57 2010  Tanaka Akira  <akr@fsij.org>
+	* 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.
 
-	* ext/pathname/pathname.c (path_setgid_p): Pathname#setgid? translated
-	  from pathname.rb.
+	  Also type of heap_page::(total|free|final)_slots are changed from
+	  int to short. 2B is enough for them.
 
-Wed Sep  8 06:25:41 2010  Tanaka Akira  <akr@fsij.org>
+Fri Jan  8 09:33:59 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_setuid_p): Pathname#setuid? translated
-	  from pathname.rb.
+	* iseq.c (rb_iseq_compile_with_option): move variable initialization
+	  code to avoid maybe-uninitialized warnings by gcc 4.8.
 
-Tue Sep  7 21:03:35 2010  Tanaka Akira  <akr@fsij.org>
+Fri Jan  8 00:03:22 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_readable_real_p):
-	  Pathname#readable_real?  translated from pathname.rb.
+	* enum.c (enum_min, enum_max): do the same optimization as r53454.
 
-Mon Sep  6 23:07:25 2010  Tanaka Akira  <akr@fsij.org>
+Thu Jan  7 22:32:21 2016  Kenta Murata  <mrkn@mrkn.jp>
 
-	* ext/pathname/pathname.c (path_world_readable_p):
-	  Pathname#world_readable?  translated from pathname.rb.
+	* ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
+	  and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++.
+	  [ruby-core:72736] [Bug #11962]
 
-Mon Sep  6 11:03:13 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Jan  7 22:02:21 2016  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* Fixed wrong check of missing functions. Patch by Adrian Quark.
-	  ref #3400
-	  The patch contains following comment:
-	    This patch should avoid unnecessary incompatibility with future
-	    versions of Openssl.  Changes suggested by bmaher_at_amazon.com.
+	* enum.c (enum_minmax): optimize object comparison in
+	  Enumerable#minmax.
 
-Mon Sep  6 10:46:55 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Jan  7 14:49:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* Fixed exception message for SSL post connection check failure. Patch
-	  by Paul Betteridge. ref [Bug #3704]
+	* thread.c (rb_thread_pending_interrupt_p): no pending interrupt
+	  before initialization.
 
-Mon Sep  6 10:31:59 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* thread.c (thread_raise_m, rb_thread_kill): uninitialized thread
+	  cannot interrupt.  [ruby-core:72732] [Bug #11959]
 
-	* ext/readline/readline.c (readline_s_get_line_buffer):
-	  Readline.line_buffer should return locale string.
-	  [ruby-dev:42184] #3791
+Thu Jan  7 11:34:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Sep  6 09:47:24 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* include/ruby/backward.h (ruby_show_copyright_to_die): for source
+	  code backward compatibility.
 
-	* util.c (ruby_strtod): check there is at least 1 digit after
-	  "0x" before ".". [ruby-dev:42183] #3790
+	* ruby.c (process_options): return Qtrue to exit the process
+	  successfully.
 
-Mon Sep  6 09:44:50 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* version.c (ruby_show_copyright): no longer exit.
 
-	* util.c (ruby_strtod): check integer overflow.
-	  [ruby-dev:42180] #3789
+Wed Jan  6 17:22:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Sep  6 06:17:21 2010  Tanaka Akira  <akr@fsij.org>
+	* lib/optparse.rb (OptionParser#order!): add `into` optional
+	  keyword argument to store the results.  [Feature #11191]
 
-	* ext/pathname/pathname.c (path_readable_p): Pathname#readable?
-	  translated from pathname.rb.
+Tue Jan  5 21:44:37 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Sun Sep  5 23:02:34 2010  Tanaka Akira  <akr@fsij.org>
+	* ChangeLog: fix wrong class name.
 
-	* ext/pathname/pathname.c (path_owned_p): Pathname#owned?
-	  translated from pathname.rb.
+Tue Jan  5 21:43:50 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-Sat Sep  4 23:48:47 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_string.rb(test_chr): added test for String#chr
+	  [fix GH-1179]
 
-	* file.c (rb_file_s_readlink): symlink target should be in
-	  filesystem encoding.
+Tue Jan  5 21:32:26 2016  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-Sat Sep  4 10:40:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_numeric.rb (test_nonzero_p): added test for Numeric#nonzero?
+	  [fix GH-1187]
 
-	* load.c (ruby_init_ext): export for golfers.
+Tue Jan  5 11:47:23 2016  Damir Gaynetdinov  <damir.gaynetdinov@gmail.com>
 
-	* vm_core.h (rb_iseq_eval, rb_iseq_compile_with_option): ditto.
+	* doc/marshal.rdoc: Clarify object references example, that the
+	  reference is same object.  [Fix GH-1156]
 
-Sun May 23 17:29:41 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Tue Jan  5 05:06:51 2016  Eric Wong  <e@80x24.org>
 
-	* common.mk (capi): uses a timestamp file to get rid of
-	  generating twice.
+	* ext/stringio/stringio.c (strio_binmode): implement to set encoding
+	* test/stringio/test_stringio.rb (test_binmode): new test
+	  [ruby-core:72699] [Bug #11945]
 
-Fri Jun 18 01:33:21 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Mon Jan  4 15:44:37 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
 
-	* enc/Makefile.in (realclean): has been missing. necessary
-	  for make realclean-enc.
+	* variable.c (rb_mod_deprecate_constant): [DOC] added
+	  documentation for Module#deprecate_constant. [ci skip]
 
-Fri Sep  3 23:51:26 2010  Tanaka Akira  <akr@fsij.org>
+Mon Jan  4 15:36:38 2016  Sho Hashimoto  <sho-h@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_socket_p): Pathname#socket?
-	  translated from pathname.rb.
+	* thread_sync.c: [DOC] remove SizedQueue#close argument.
+	  [ci skip]
 
-Fri Sep  3 06:40:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jan  4 10:14:24 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* ext/pty/pty.c (chfunc): pass through exceptions.
+	* test/coverage/test_coverage.rb: ignored test when enabled to coverage.
+	  It lead to crash with `make test-all`.
 
-	* io.c (rb_io_bufwrite, rb_io_bufread): added.
+Mon Jan  4 08:10:44 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* process.c (rb_fork_err): protect from exceptions.
+	* insns.def (opt_case_dispatch): Move a comment to the
+	  appropriate position.
+	  [ci skip]
 
-Fri Sep  3 06:16:07 2010  Tanaka Akira  <akr@fsij.org>
+Sun Jan  3 23:55:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_pipe_p): Pathname#pipe?
-	  translated from pathname.rb.
+	* lib/rubygems/security.rb (DIGEST_ALGORITHM, KEY_ALGORITHM):
+	  should check same name as the used constants.
+	  [ruby-core:72674] [Bug #11940]
 
-Fri Sep  3 06:14:40 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jan  3 19:22:01 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/pty/pty.c (chfunc): restore errno from SystemCallError and
-	  propagate proper exception to the parent.  [ruby-dev:41965]
+	* aclocal.m4: add fallback file for non-aclocal environments.
+	  [ruby-core:72683] [Bug #11942]
 
-Thu Sep  2 22:10:38 2010  Tanaka Akira  <akr@fsij.org>
+Sun Jan  3 13:56:49 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_file_p): Pathname#file?
-	  translated from pathname.rb.
+	* 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]
 
-Thu Sep  2 09:12:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Jan  3 12:12:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): don't forget to free
-	  memory.
+	* acinclude.m4: rename aclocal.m4, which should be generated by
+	  aclocal.  [ruby-core:72675] [Bug #11941]
 
-Thu Sep  2 09:01:13 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Jan  2 21:07:55 2016  Eric Wong  <e@80x24.org>
 
-	* win32/win32.c (CreateChild): unicodize.
+	* thread_sync.c (queue_do_pop): avoid cast with Qfalse
+	  (rb_szqueue_push): ditto, use queue_sleep wrapper
 
-	* win32/win32.c (rb_w32_spawn, rb_w32_aspawn): convert arguments of
-	  CreateChild() from ACP to WideChar.
+Sat Jan  2 16:16:14 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-Thu Sep  2 06:53:43 2010  Tanaka Akira  <akr@fsij.org>
+	* lib/erb.rb: Allow ERB subclass to add token easily.
+	  [Feature #11936]
 
-	* ext/pathname/pathname.c (path_directory_p): Pathname#directory?
-	  translated from pathname.rb.
+	* test/erb/test_erb.rb: ditto.
 
-Wed Sep  1 22:03:41 2010  Tanaka Akira  <akr@fsij.org>
+Sat Jan  2 14:44:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_grpowned_p): Pathname#grpowned?
-	  translated from pathname.rb.
+	* parse.y (regexp): set_yylval_num sets u1, should use nd_tag
+	  instead of nd_state.  [ruby-core:72638] [Bug #11932]
 
-Wed Sep  1 17:39:02 2010  Ryan Davis  <ryand-ruby@zenspider.com>
+Sat Jan  2 02:27:22 2016  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-	* lib/minitest/*.rb: Imported minitest 1.7.1 r5835.
-	* test/minitest/*.rb: ditto.
+	* lib/ostruct.rb: Fix case of frozen object with initializer.
+	  Bug revealed by RubySpec [ruby-core:72639]
 
-Wed Sep  1 16:50:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Fri Jan  1 22:01:52 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* string.c (tr_setup_table): optimized. don't create hash objects
-	  when given pattern is ASCII only.
+	* NEWS: mention CSV's liberal_parsing option.
 
-	* string.c (tr_find): ditto.
+Fri Jan  1 19:38:23 2016  okkez  <okkez000@gmail.com>
 
-Wed Sep  1 14:35:29 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* doc/NEWS-2.3.0: fix double words typo.
+	  [ci skip][fix GH-1183]
 
-	* array.c (rb_ary_rotate_m): fix typo of rdoc.
-	  patched by Andrei Kulakov [ruby-core:31975]
+Fri Jan  1 15:28:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Sep  1 14:33:36 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* compile.c (remove_unreachable_chunk): decrease count of
+	  call_info in removed instructions.  fix up r53402.
 
-	* enum.c (enum_zip): fix typo of rdoc.
-	  patched by Andrei Kulakov [ruby-core:31974]
+Fri Jan  1 12:05:53 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Sep  1 12:56:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* compile.c (remove_unreachable_chunk): remove unreferred label
+	  to optimize away unreachable chunk.
 
-	* thread.c (ruby_suppress_tracing): restore the state and invoke
-	  the func with normal state.  a patch from Satoshi Shiba <shiba
-	  AT rvm.jp> at [ruby-dev:42162].  [ruby-core:31783]
+Fri Jan  1 11:42:57 2016  James Edward Gray II  <james@graysoftinc.com>
 
-Tue Aug 31 21:10:23 2010  Tanaka Akira  <akr@fsij.org>
+	* lib/csv.rb (CSV): Add a liberal_parsing option.
+	  Patch by Braden Anderson. [#11839]
+	* test/csv/test_features.rb:  test liberal_parsing
 
-	* ext/pathname/pathname.c (path_exist_p): Pathname#exist? translated
-	  from pathname.rb.
+Fri Jan  1 10:27:28 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Aug 31 17:32:34 2010  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* tool/mkconfig.rb (RbConfig): prefix SDKROOT to oldincludedir
+	  not includedir, the latter is outside the ruby installation.
+	  [ruby-core:72496] [Bug #11881]
 
-	* ext/tk/stubs.c: fix [Bug #3771] "VC++ can't make ext/tk with enabling
-	  stubs". Thanks, Akio Tajima [ruby-dev:42159].
+Fri Jan  1 08:53:02 2016  Yuki Kurihara  <co000ri@gmail.com>
 
-Tue Aug 31 03:42:14 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* 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]
 
-	* string.c (tr_setup_table): fix bug in r29146.
-	  Initialize table even if cflag is 0; tr_find see whether
-	  del is empty or not.
+Fri Jan  1 05:06:20 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c (tr_find): nodel can't be NULL; if NULL, it means
-	  it is not specified.
+	* parse.y (parser_here_document): update indent for each line in
+	  indented here document with single-quotes.
+	  [ruby-core:72479] [Bug #11871]
 
-Mon Aug 30 21:29:21 2010  Tanaka Akira  <akr@fsij.org>
+Fri Jan  1 03:26:44 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_executable_real_p):
-	  Pathname#executable_real? translated from pathname.rb.
+	* lib/ostruct.rb (freeze): define deferred accessors before
+	  freezing to get rid of an error when just reading frozen
+	  OpenStruct.
 
-Mon Aug 30 15:00:13 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Dec 31 14:36:45 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-	* string.c (tr_setup_table): initialize negating table when
-	  negating string is given. [ruby-core:31851]
+	* lib/ostruct.rb: Fix new_ostruct_member to correctly avoid
+	  redefinition [#11901]
 
-	* string.c (tr_find): add a sentence for the time when
-	  target characters include negating one.
+Thu Dec 31 02:45:12 2015  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* string.c (rb_str_count): move definition.
+	* 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
 
-Mon Aug 30 07:32:41 2010  Tanaka Akira  <akr@fsij.org>
+Thu Dec 31 02:20:00 2015  Benoit Daloze  <eregontp@gmail.com>
 
-	* ext/pathname/pathname.c (path_executable_p): Pathname#executable?
-	  translated from pathname.rb.
+	* common.mk (help): Fix typo.
 
-Sun Aug 29 23:54:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Dec 30 20:53:09 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* lib/rdoc/parser/ruby.rb (RDoc#parse_call_parameters): don't
-	  include assignment.  [Bug #3759], [ruby-dev:42154]
+	* lib/net/http/responses.rb: Added new response class for 451 status code.
+	* lib/net/http.rb: documentation for HTTPUnavailableForLegalReasons
 
-	* lib/rdoc/parser/ruby.rb (RDoc#parse_class): ignore non-constant
-	  name singleton class.  [Bug #3759], [ruby-dev:42154]
+Wed Dec 30 20:45:45 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Sun Aug 29 23:25:18 2010  Nobuyoshi Nakada  <nobu@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
 
-	* file.c (rb_get_path_check): clarify error message for
-	  ASCII-incompatible path name.
+Wed Dec 30 20:25:52 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-Sun Aug 29 16:02:54 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* doc/syntax/calling_methods.rdoc: fix old operator for safe navigation
+	  operator. [ci skip][fix GH-1182] Patch by @dougo
 
-	* common.mk (node_name.inc): remove command option -n and give
-	  file as stdin, because IronRuby 1.1 still doesn't support it.
-	  So now we can use ir.exe as BASERUBY.
+Wed Dec 30 16:43:23 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-	* tool/node_name.rb: read stdin with while gets.
+	* test/ruby/test_string.rb (test_ord): Add test for String#ord.
+	  [Fix GH-1181]
 
-Sun Aug 29 13:22:43 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Dec 30 11:28:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* vm.c (rb_thread_method_id_and_class): curried proc has no
-	  method.  [ruby-core:31871]
+	* 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.
 
-Sun Aug 29 12:51:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/forwardable.rb (def_single_delegator): ditto.
 
-	* load.c (rb_provide_feature): clarify error message for frozen
-	  $LOADED_FEATURES.  based on a patch from Run Paint Run Run at
-	  [ruby-core:31913].
+Wed Dec 30 11:18:42 2015  Elliot Winkler  <elliot.winkler@gmail.com>
 
-Sun Aug 29 12:19:58 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/forwardable.rb (def_instance_delegator) fix delegating to
+	  'args' and 'block', clashing with local variables in generated
+	  methods.  [ruby-core:72579] [Bug #11916]
 
-	* load.c (load_failed): should honor encoding.  [ruby-core:31915]
+	* lib/forwardable.rb (def_single_delegator): ditto.
 
-Sun Aug 29 09:35:10 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed Dec 30 09:58:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk (clean): exclude *.inc. [ruby-dev:41931]
+	* object.c (rb_class_inherited_p): search the corresponding
+	  ancestor to prepended module from prepending class itself.
+	  [ruby-core:72493] [Bug #11878]
 
-	* common.mk (distclean): include *.inc.
+Wed Dec 30 09:20:00 2015  Yuki Kurihara  <co000ri@gmail.com>
 
-	* common.mk (help): change description about clean and distclean.
+	* test/stringio/test_io.rb (test_flag): add assertion for error when
+	  text and binary mode are mixed.
+	  [ruby-dev:49465] [Feature #11921]
 
-Sat Aug 29 06:34:52 2010  Tanaka Akira  <akr@fsij.org>
+Wed Dec 30 08:43:59 2015  Yuki Kurihara  <co000ri@gmail.com>
 
-	* ext/pathname/pathname.c (path_chardev_p): Pathname#chardev?
-	  translated from pathname.rb.
+	* test/stringio/test_stringio.rb (test_initialize): add test for
+	  StringIO#initialize.  [ruby-core:72585] [Feature #11920]
 
-Sat Aug 28 17:39:33 2010  Kenta Murata  <mrkn@mrkn.jp>
+Wed Dec 30 05:19:24 2015  Eric Wong  <e@80x24.org>
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_exception_mode,
-	  BigDecimal_save_rounding_mode, BigDecimal_save_limit): added.
+	* 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]
 
-	* test/bigdecimal/test_bigdecimal.rb: added tests for the above
-	  features.
+Wed Dec 30 04:10:13 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-Sat Aug 28 08:11:05 2010  Tanaka Akira  <akr@fsij.org>
+	* thread_pthread.c (rb_thread_create_timer_thread): destroy attr even
+	  if pthread_create() failed.
 
-	* ext/pathname/pathname.c (path_blockdev_p): Pathname#blockdev?
-	  translated from pathname.rb.
+Wed Dec 30 02:55:09 2015  Eric Wong  <e@80x24.org>
 
-Fri Aug 27 16:20:01 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* thread_pthread.c (setup_communication_pipe): delay setting owner
+	  (rb_thread_create_timer_thread): until thread creation succeeds
+	  [ruby-core:72590] [Bug #11922]
 
-	* string.c (rb_str_prepend): new method by Shota Fukumori (sora_h)
-	  [Feature #3765]
+Tue Dec 29 19:12:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Aug 27 15:24:20 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ruby.c (proc_options): -W command line option should be able to
+	  override -w in RUBYOPT environment variable.
 
-	* math.c (math_atan2): you should know that M_PI is not the feature
-	  of C90.
-	  fixed build failure caused by r29115.
+Tue Dec 29 17:54:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Aug 27 15:26:33 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval.c (ignored_block): warn if a block is given to `using`,
+	  which is probably for `Module.new`.
 
-	* file.c (null_device): move from io.c.
+Tue Dec 29 12:48:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Aug 27 12:47:44 2010  Kenta Murata  <mrkn@mrkn.jp>
+	* lib/ostruct.rb (OpenStruct): make respond_to? working on
+	  just-allocated objects for workaround of Psych.
+	  [ruby-core:72501] [Bug #11884]
 
-	* math.c (math_atan2): change the behavior when x and y are zero.
-	  [ruby-dev:42090] [Bug #3736] [ruby-dev:42116]
+Tue Dec 29 10:35:00 2015  Kenta Murata  <mrkn@mrkn.jp>
 
-	* test/ruby/test_math.rb (test_atan2): add tests for the above
-	  changes.
+	* test/mkmf/test_have_func.rb (test_have_func):
+	  Add assertion to examine the existence of HAVE_RUBY_INIT.
 
-Fri Aug 27 12:26:23 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/mkmf/test_have_func.rb (test_not_have_func):
+	  Add assertion to examine the absence of HAVE_RUBY_INIT.
 
-	* object.c (rb_obj_class): remove mention of obsolete method.
-	  a patch from Run Paint Run Run at [ruby-core:31842].
+Tue Dec 29 06:50:42 2015  Eric Wong  <e@80x24.org>
 
-Fri Aug 27 12:25:03 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread_sync.c: static classes
 
-	* io.c (null_device): the name of null device.  [ruby-dev:41791]
+Tue Dec 29 05:30:30 2015  Eric Wong  <e@80x24.org>
 
-Fri Aug 27 07:57:34 2010  Nobuyoshi Nakada  <nobu@ruby-lang.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]
 
-	* array.c (rb_ary_shuffle_bang): bail out from modification during
-	  shuffle.
+Mon Dec 28 14:55:57 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-	* array.c (rb_ary_sample): ditto.
+	* test/ruby/test_string.rb (TestString#test_rstrip_bang): Add test
+	  for String#rstrip!.  [Fix GH-1176]
 
-Fri Aug 27 05:11:51 2010  Tanaka Akira  <akr@fsij.org>
+Mon Dec 28 09:18:53 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-	* ext/pathname/pathname.c (path_sysopen): Pathname#sysopen translated
-	  from pathname.rb.
+	* test/ruby/test_string.rb (TestString#test_lstrip_bang): Add test
+	  for String#lstrip!.  [Fix GH-1176]
 
-Thu Aug 26 22:53:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Dec 27 23:32:26 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
-	* array.c (rb_ary_shuffle): rdoc fix.  argument name was missing.
-	  a patch from Run Paint Run Run at [ruby-core:31848].
+	* ext/win32ole/win32ole.c (ole_variant2val): refactoring.
 
-Thu Aug 26 21:49:46 2010  Tanaka Akira  <akr@fsij.org>
+Sun Dec 27 21:14:42 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/pathname/pathname.c (path_readlines): Pathname#readlines
-	  translated from pathname.rb.
+	* process.c (rb_execarg_parent_start1): need to convert the encoding to
+	  ospath's one.
 
-Thu Aug 26 10:37:00 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Sun Dec 27 20:54:22 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* regint.h (OnigStackIndex): the type should be intptr_t.
-	  Original Oniguruma assumes the size of long and that of void *
-	  are equal, but it's not true on LLP64 platform: mswin64.
-	  originally patched by shintaro kuwamoto [ruby-dev:42133]
+	* process.c: use rb_w32_uchdir() instead of plain chdir() on Windows.
+	  reported by naruse via twitter.
 
-Thu Aug 26 10:38:11 2010  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+	* process.c (rb_execarg_addopt): need to convert the encoding to
+	  ospath's one.
 
-	* test/dl/test_base.rb: AIX does not have dynamically loadable lib[cm].
+Sun Dec 27 20:00:31 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* test/fiddle/helper.rb: AIX does not have dynamically loadable lib[cm].
+	* enc/x_emoji.h: fix dead-link.
 
-Thu Aug 26 09:49:50 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Dec 27 19:55:55 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
-	* array.c (rb_ary_shuffle_bang): check number of argument.
+	* doc/NEWS-2.3.0: fix a typo.
 
-Tue Aug 26 09:11:40 2010  Kenta Murata  <mrkn@mrkn.jp>
+Sun Dec 27 18:08:15 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
-	  rmpd_set_thread_local_exception_mode, VpGetException,
-	  VpSetException): thread-local exception mode.
+	* 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]
 
-	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
-	  rmpd_set_thread_local_precision_limit, VpGetPrecLimit,
-	  VpSetPrecLimit): thread-local precision limit.
+Sun Dec 27 15:14:20 2015  Eric Wong  <e@80x24.org>
 
-	* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
-	  rmpd_set_thread_local_rounding_mode, VpGetRoundMode,
-	  VpSetRoundMode, VpException, VpInternalRound):
-	  thread-local rounding mode.
+	* io.c (io_getpartial): remove unused kwarg from template
+	* test/ruby/test_io.rb (test_readpartial_bad_args): new
+	  [Bug #11885]
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_mode, BigDecimal_round,
-	  VpIsRoundMode, VpGetRoundMode, VpSetRoundMode, VpActiveRound,
-	  VpMidRound, VpLeftRound), ext/bigdecimal/bigdecimal.h:
-	  use unsigned short for rounding mode.
+Sun Dec 27 11:50:53 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-	* test/bigdecimal/test_bigdecimal.rb (test_mode): add test for
-	  setting rounding mode.
+	* 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]
 
-	* test/bigdecimal/test_bigdecimal.rb (test_thread_local_mode):
-	  add test for setting mode thread-locally.
+Sun Dec 27 11:47:46 2015  Kuniaki IGARASHI  <igaiga@gmail.com>
 
-Thu Aug 26 07:29:54 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* 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]
 
-	* array.c (rb_ary_{shuffle_bang,sample}): use Random class object.
+Sun Dec 27 11:03:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* random.c (try_get_rnd): use default_rand for Random as same as
-	  singleton methods.
+	* parse.y (show_bitstack): trace stack_type value if yydebug.
 
-	* random.c (rb_random_real): check the range of result.
+Sun Dec 27 10:03:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Aug 25 22:11:11 2010  Tanaka Akira  <akr@fsij.org>
+	* enc/depend (enc, trans): fix version dependency, shared object
+	  files depend on the RUBY_SO_NAME value for runtime link.
 
-	* ext/pathname/pathname.c (path_binread): Pathname#binread translated
-	  from pathname.rb.
+Sun Dec 27 09:47:20 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
-Wed Aug 25 03:42:43 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/win32ole/win32ole.c (ole_vstr2wc, ole_variant2val): fix blank
+	  string conversion.
+	  [Bug #11880]
+	  Thanks Akio Tajima for the patch!
 
-	* ext/dl/cfunc.c (rb_dlcfunc_call): workaround for VC9 for x64.
-	  reported by kuwamoto shintaro in [ruby-dev:42125].
+Sun Dec 27 09:34:53 2015  craft4coder  <yooobuntu@163.com>
 
-Tue Aug 24 23:28:50 2010  Yusuke Endoh  <mame@tsg.ne.jp>
+	* doc/extension.rdoc: [DOC] `nul` should be uppercase.
+	  change 'nul' => 'NUL'.  [Fix GH-1172]
 
-	* .gitignore: updated.
+Sat Dec 26 18:29:01 2015  Kouhei Sutou  <kou@cozmixng.org>
 
-Tue Aug 24 22:07:28 2010  Tanaka Akira  <akr@fsij.org>
+	* lib/xmlrpc/client.rb: Support SSL options in async methods of
+	  XMLRPC::Client.
+	  [Bug #11489]
+	  Reported by Aleksandar Kostadinov. Thanks!!!
 
-	* ext/pathname/pathname.c (path_read): Pathname#read translated from
-	  pathname.rb.
+Sat Dec 26 11:26:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Aug 24 10:11:04 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* miniinit.c (Init_enc): add some common aliases of built-in
+	  encodings.  [ruby-core:72481] [Bug #11872]
 
-	* configure.in: read API version from include/ruby/version.h.
+Fri Dec 25 22:43:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* {bcc,win}32/setup.mak (-version-): ditto.
+	* configure.in: extract RUBY_RELEASE_DAY at generating Makefile.
 
-	* version.h (RUBY_LIB_VERSION): use API version numbers.
+	* version.h (RUBY_RELEASE_DATE): construct from RUBY_RELEASE_YEAR,
+	  RUBY_RELEASE_MONTH, and RUBY_RELEASE_DAY.
 
-Tue Aug 24 07:07:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Dec 25 21:33:06 2015  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* array.c (rb_ary_shuffle_bang, rb_ary_sample): add optional
-	  argument random.  [ruby-dev:41923] [EXPERIMENTAL]
+	* version.h (RUBY_VERSION): 2.4.0 development has started.
 
-	* random.c (rb_random_{int32,real,bytes}): fallback to normal
-	  method invocation.
+Fri Dec 25 14:12:12 2015  Martin Duerst  <duerst@it.aoyama.ac.jp>
 
-Tue Aug 24 06:08:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* doc/ChangeLog-2.3.0, ext/tk/lib/tkextlib/SUPPORT_STATUS,
+	  include/ruby/version.h: minor grammar fixes [ci skip]
 
-	* include/ruby/version.h (RUBY_API_VERSION_*): renamed and moved
-	  from version.h.  [ruby-dev:42103]
+Fri Dec 25 08:23:22 2015  Tadashi Saito  <tad.a.digger@gmail.com>
 
-Tue Aug 24 05:58:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* compile.c, cont.c, doc, man: fix common misspelling.
+	  [ruby-core:72466] [Bug #11870]
 
-	* ChangeLog: flushed.  [ruby-dev:42050]
 
+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
 
diff --git a/GPL b/GPL
index 5b6e7c66c2..d159169d10 100644
--- a/GPL
+++ b/GPL
@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    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.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
diff --git a/KNOWNBUGS.rb b/KNOWNBUGS.rb
index 5c0e4d5156..35a8e75876 100644
--- a/KNOWNBUGS.rb
+++ b/KNOWNBUGS.rb
@@ -1,16 +1,7 @@
 #
-# This test file concludes tests which point out known bugs.
+# IMPORTANT: Always keep the first 7 lines (comments),
+# even if this file is otherwise empty.
+#
+# This test file includes tests which point out known bugs.
 # So all tests will cause failure.
 #
-
-assert_normal_exit %q{
-  open("tst-remove-load.rb", "w") {|f|
-    f << <<-'End'
-      module Kernel
-        remove_method :load
-      end
-      raise
-    End
-  }
-  load "tst-remove-load.rb"
-}, '[ruby-dev:40234] [ruby-core:27959]', :timeout => 1
diff --git a/LEGAL b/LEGAL
index 0086b83665..cd1cce2de1 100644
--- a/LEGAL
+++ b/LEGAL
@@ -5,6 +5,37 @@ 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
+
+  These files are licensed under the CC0.
+
+    http://creativecommons.org/choose/zero/
+
+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
+    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.
+
 include/ruby/oniguruma.h:
 regcomp.c:
 regenc.[ch]:
@@ -56,9 +87,77 @@ 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, 
+   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:
+
+ 	Copyright (C) 2001 earthian@tama.or.jp, All Rights Reserved.
+ 	Copyright (C) 2001 I'O, All Rights Reserved.
+ 	Copyright (C) 2006 Project X0213, All Rights Reserved.
+ 	You can use, modify, distribute this table freely.
+
+enc/trans/JIS/UCS@BMP%JISX0213-1.src:
+enc/trans/JIS/UCS@BMP%JISX0213-2.src:
+enc/trans/JIS/UCS@SIP%JISX0213-1.src:
+enc/trans/JIS/UCS@SIP%JISX0213-2.src:
+
+ 	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:
 
   This file is free software.
@@ -98,7 +197,7 @@ tool/config.sub:
 
 parse.c:
 
-  This file is licensed under the GPL, but is incorporated into Ruby and 
+  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.
 
@@ -148,7 +247,6 @@ util.c (partly):
     REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
     OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
 
-util.c (partly):
 win32/win32.[ch]:
 
   You can apply the Artistic License to these files. (or GPL,
@@ -194,11 +292,11 @@ random.c
     This is a faster version by taking Shawn Cokus's optimization,
     Matthe Bellew's simplification, Isaku Wada's real version.
 
-    Before using, initialize the state by using init_genrand(seed) 
+    Before using, initialize the state by using init_genrand(seed)
     or init_by_array(init_key, key_length).
 
     Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-    All rights reserved.                          
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -211,8 +309,8 @@ random.c
 	 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 
+      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
@@ -232,6 +330,36 @@ random.c
     http://www.math.keio.ac.jp/matumoto/emt.html
     email: matumoto@math.keio.ac.jp
 
+vm_dump.c:procstat_vm
+
+  This file is under the new-style BSD license.
+
+    Copyright (c) 2007 Robert N. M. Watson
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    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.
+
+    $FreeBSD: head/usr.bin/procstat/procstat_vm.c 261780 2014-02-11 21:57:37Z jhb $
+
 vsnprintf.c:
 
   This file is under the old-style BSD license.  Note that the
@@ -272,7 +400,10 @@ vsnprintf.c:
     From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
     paragraph 3 above is now null and void.
 
-st.[ch]:
+st.c:
+strftime.c:
+include/ruby/st.h:
+missing/acosh.c:
 missing/alloca.c:
 missing/dup2.c:
 missing/erf.c:
@@ -284,10 +415,14 @@ 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.
 
@@ -363,32 +498,21 @@ missing/setproctitle.c
 missing/strlcat.c
 missing/strlcpy.c
 
-  These files are under the new-style BSD license.
+  These files are under an ISC-style license.
 
-   Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-   All rights reserved.
+    Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
 
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions
-   are met:
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-   3. The name of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-   THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+    Permission to use, copy, modify, and distribute this software for any
+    purpose with or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 missing/langinfo.c
 
@@ -469,6 +593,28 @@ ext/digest/sha2/sha2.[ch]:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
+ext/json/generator/generator.c:
+
+    Copyright 2001-2004 Unicode, Inc.
+
+    Disclaimer
+
+    This source code is provided as is by Unicode, Inc. No claims are
+    made as to fitness for any particular purpose. No warranties of any
+    kind are expressed or implied. The recipient agrees to determine
+    applicability of information provided. If this file has been
+    purchased on magnetic or optical media from Unicode, Inc., the
+    sole remedy for any claim will be exchange of defective media
+    within 90 days of receipt.
+
+    Limitations on Rights to Redistribute This Code
+
+    Unicode, Inc. hereby grants the right to freely use the information
+    supplied in this file in the creation of products supporting the
+    Unicode Standard, and to make copies of this file in any form
+    for internal or external distribution as long as this notice
+    remains attached.
+
 ext/nkf/nkf-utf8/config.h:
 ext/nkf/nkf-utf8/nkf.c:
 ext/nkf/nkf-utf8/utf8tbl.c:
@@ -477,7 +623,7 @@ ext/nkf/nkf-utf8/utf8tbl.c:
   copyrighted semi-public-domain software.
 
     Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
-       Everyone is permitted to do anything on this program 
+       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.
@@ -528,7 +674,13 @@ ext/win32ole/win32ole.c:
 
     Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
     <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
- 
+
     You may distribute under the terms of either the GNU General Public
     License or the Artistic License, as specified in the README file
     of the Perl distribution.
+
+lib/rdoc/generator/template/darkfish/css/fonts.css:
+
+  This file is licensed under the SIL Open Font License.
+
+    http://scripts.sil.org/OFL
diff --git a/Makefile.in b/Makefile.in
index bcdaf5f7a9..9c8748aa4d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,25 +1,35 @@
 SHELL = /bin/sh
 NULLCMD = @NULLCMD@
+n=$(NULLCMD)
+ECHO1 = $(V:1=$n)
 RUNCMD = $(SHELL)
+CDPATH = .
 CHDIR = @CHDIR@
 exec = exec
 NULL = /dev/null
+PATH_SEPARATOR = @PATH_SEPARATOR@
 
 #### Start of system configuration section. ####
 
 srcdir = @srcdir@
 top_srcdir = $(srcdir)
 hdrdir = $(srcdir)/include
+PLATFORM_DIR = @PLATFORM_DIR@
 
 CC = @CC@
 CPP = @CPP@
+LD = @LD@
 YACC = bison
 PURIFY =
 AUTOCONF = autoconf
+ACLOCAL = aclocal
+CONFIGURE = @CONFIGURE@
 @SET_MAKE@
 MKFILES = @MAKEFILES@
 BASERUBY = @BASERUBY@
+HAVE_BASERUBY = @HAVE_BASERUBY@
 TEST_RUNNABLE = @TEST_RUNNABLE@
+CROSS_COMPILING = @CROSS_COMPILING@
 DOXYGEN = @DOXYGEN@
 
 prefix = @prefix@
@@ -33,6 +43,7 @@ datadir = @datadir@
 arch = @arch@
 sitearch = @sitearch@
 sitedir = @sitedir@
+archlibdir = @archlibdir@
 ruby_version = @ruby_version@
 
 TESTUI = console
@@ -42,46 +53,60 @@ DOCTARGETS = @RDOCTARGET@ @CAPITARGET@
 
 EXTOUT = @EXTOUT@
 arch_hdrdir = $(EXTOUT)/include/$(arch)
-VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/enc:$(srcdir)/missing
+VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing
 
 empty =
+CC_VERSION = @CC_VERSION@
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
 ARCH_FLAG = @ARCH_FLAG@
-CFLAGS = @CFLAGS@
+CFLAGS_NO_ARCH = @CFLAGS@
+CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
 cflags = @cflags@
 optflags = @optflags@
 debugflags = @debugflags@
-warnflags = @warnflags@
-INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)
+warnflags = @warnflags@ @strict_warnflags@
+cppflags = @cppflags@
 XCFLAGS = @XCFLAGS@
 CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
-EXTLDFLAGS = 
+EXTLDFLAGS = @EXTLDFLAGS@
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
-EXTLIBS = 
+EXTLIBS =
 LIBS = @LIBS@ $(EXTLIBS)
 MISSING = @LIBOBJS@ @ALLOCA@
 LDSHARED = @LIBRUBY_LDSHARED@
-DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(EXTLDFLAGS) $(ARCH_FLAG)
+DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
 SOLIBS = @SOLIBS@
 MAINLIBS = @MAINLIBS@
 ARCHMINIOBJS = @MINIOBJS@
+DLNOBJ = @DLNOBJ@
+ENCOBJS = @ENCOBJS@
+EXTOBJS = @EXTOBJS@
 BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@
 BUILTIN_TRANSSRCS = @BUILTIN_TRANSSRCS@
 BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@
+POSTLINK = @POSTLINK@
 
 RUBY_BASE_NAME=@RUBY_BASE_NAME@
 RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@
 RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@
 RUBY_SO_NAME=@RUBY_SO_NAME@
 EXEEXT = @EXEEXT@
+LIBEXT = @LIBEXT@
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 RUBY = $(RUBY_INSTALL_NAME)
 MINIRUBY = @MINIRUBY@\
 	$(MINIRUBYOPT)
-RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) -- $(RUN_OPTS)
+# RUNRUBY_COMMAND:: runruby.rb or baseruby. do not append options directly
+RUNRUBY_COMMAND = @RUNRUBY_COMMAND@
+# RUNRUBY:: run ruby with RUN_OPTS which is passed to ruby
+RUNRUBY = @RUNRUBY@ $(RUN_OPTS)
+# RUNRUBY_DEBUGGER:: debugging option for runruby.rb
+RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
 XRUBY = @XRUBY@
+BTESTRUBY = @BTESTRUBY@\
+	$(MINIRUBYOPT)
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -89,14 +114,14 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 XRUBY_LIBDIR = @XRUBY_LIBDIR@
 XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
 XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
-
-DEFAULT_PRELUDES = $(@USE_RUBYGEMS@_GEM_PRELUDE)
+BOOTSTRAPRUBY = @BOOTSTRAPRUBY@
 
 #### End of system configuration section. ####
 
 MAJOR=	@MAJOR@
 MINOR=	@MINOR@
 TEENY=	@TEENY@
+RUBY_PROGRAM_VERSION = @RUBY_PROGRAM_VERSION@
 
 LIBRUBY_A     = @LIBRUBY_A@
 LIBRUBY_SO    = @LIBRUBY_SO@
@@ -105,6 +130,21 @@ LIBRUBY	      = @LIBRUBY@
 LIBRUBYARG    = @LIBRUBYARG@
 LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
+LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@
+LIBRUBY_A_OBJS = @LIBRUBY_A_OBJS@
+
+DTRACE_REBUILD_OBJS = $(DTRACE_REBUILD:yes=$(DTRACE_DEPENDENT_OBJS))
+
+DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
+			eval.$(OBJEXT) \
+			gc.$(OBJEXT) \
+			hash.$(OBJEXT) \
+			load.$(OBJEXT) \
+			object.$(OBJEXT) \
+			parse.$(OBJEXT) \
+			string.$(OBJEXT) \
+			symbol.$(OBJEXT) \
+			vm.$(OBJEXT)
 
 THREAD_MODEL  = @THREAD_MODEL@
 
@@ -112,6 +152,7 @@ PREP          = @PREP@
 ARCHFILE      = @ARCHFILE@
 SETUP         =
 EXTSTATIC     = @EXTSTATIC@
+ENCSTATIC     = @ENCSTATIC@
 SET_LC_MESSAGES = env LC_MESSAGES=C
 
 MAKEDIRS      = @MKDIR_P@
@@ -123,7 +164,7 @@ RMDIRS        = @RMDIRS@
 RMALL         = @RMALL@
 NM            = @NM@
 AR            = @AR@
-ARFLAGS       = rcu
+ARFLAGS       = @ARFLAGS@
 RANLIB        = @RANLIB@
 AS            = @AS@
 ASFLAGS       = @ASFLAGS@ $(INCFLAGS)
@@ -133,6 +174,11 @@ OBJDUMP       = @OBJDUMP@
 OBJCOPY       = @OBJCOPY@
 VCS           = @VCS@
 VCSUP         = @VCSUP@
+DTRACE        = @DTRACE@
+DTRACE_EXT    = @DTRACE_EXT@
+DTRACE_OBJ    = @DTRACE_OBJ@
+DTRACE_REBUILD= @DTRACE_REBUILD@
+DTRACE_GLOMMED_OBJ = $(DTRACE_REBUILD:yes=ruby-glommed.$(OBJEXT))
 
 OBJEXT        = @OBJEXT@
 ASMEXT        = S
@@ -142,19 +188,29 @@ SYMBOL_PREFIX = @SYMBOL_PREFIX@
 
 INSTALLED_LIST= .installed.list
 
-MKMAIN_CMD    = mkmain.sh
+NEWLINE_C     = enc/trans/newline.c
+MINIPRELUDE_C = miniprelude.c
+PRELUDE_C     = prelude.c
+RBCONFIG      = .rbconfig.time
 
 SRC_FILE      = $<
+OS_SRC_FILE   = $<
+DEST_FILE     = $@
+OS_DEST_FILE  = $@
 
 MESSAGE_BEGIN = @for line in
 MESSAGE_END = ; do echo "$$line"; done
+ECHO_BEGIN = @sep=''; for word in
+ECHO_END = ; do echo @ECHO_N@ "$$sep'$$word'@ECHO_C@"; sep=' '; done; echo
+
+DESTDIR       = @DESTDIR@
 
 configure_args = @configure_args@
 #### End of variables
 
-all:
+.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
 
-.DEFAULT: all
+all:
 
 # Prevent GNU make v3 from overflowing arg limit on SysV.
 .NOEXPORT:
@@ -162,12 +218,13 @@ all:
 miniruby$(EXEEXT):
 		@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
+		$(Q) $(POSTLINK)
 
 # We must `rm' the library each time this rule is invoked because "updating" a
 # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
@@ -175,27 +232,37 @@ $(PROGRAM):
 $(LIBRUBY_A):
 		@$(RM) $@
 		$(ECHO) linking static-library $@
-		$(Q) $(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
+		$(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(INITOBJS)
 		@-$(RANLIB) $@ 2> /dev/null || true
+		$(ECHO) verifying static-library $@
+		@$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT)
+		@$(RM) conftest$(EXEEXT) conftest.c
 
 $(LIBRUBY_SO):
 		@-$(PRE_LIBRUBY_UPDATE)
 		$(ECHO) linking shared-library $@
-		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
-		-$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)*_threadptr_*' $@
-		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
+		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
+		-$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)ruby_static_id_*' \
+			-L '$(SYMBOL_PREFIX)*_threadptr_*' $@
+		$(Q) $(POSTLINK)
+		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link rescue nil; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true
 
-fake: $(arch)-fake.rb
-$(arch)-fake.rb: config.status $(srcdir)/template/fake.rb.in
-		@./config.status --file=$@:$(srcdir)/template/fake.rb.in
-		@chmod +x $@
-
 ruby_pc = @ruby_pc@
 $(ruby_pc):
 		@./config.status --file=$@:$(srcdir)/template/ruby.pc.in
 
+ruby-runner.h: template/ruby-runner.h.in
+		@./config.status --file=$@:$(srcdir)/template/$(@F).in
+
+ruby-runner$(EXEEXT): ruby-runner.c ruby-runner.h
+	$(Q) $(PURIFY) $(CC) $(CFLAGS) $(CPPFLAGS) -DRUBY_INSTALL_NAME=$(RUBY_INSTALL_NAME) $(LDFLAGS) $(LIBS) $(OUTFLAG)$@ $<
+
+$(RBCONFIG): $(PREP)
+
+rbconfig.rb: $(RBCONFIG)
+
 install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
 	$(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE)
 	$(ECHO) installing cross-compiling stuff
@@ -215,33 +282,42 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi
 
 Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
 
-$(MKFILES): config.status
-		MAKE=$(MAKE) $(SHELL) ./config.status
-		@{ \
+$(MKFILES): config.status $(srcdir)/version.h
+		@[ -f $@ ] && mv $@ $@.old
+		MAKE=$(MAKE) $(SHELL) ./config.status $@
+		@cmp $@ $@.old > /dev/null 2>&1 && echo $@ unchanged && exit 0; \
+		{ \
 		    echo "all:; -@rm -f conftest.mk"; \
 		    echo "conftest.mk: .force; @echo AUTO_REMAKE"; \
 		    echo ".force:"; \
 		} > conftest.mk || exit 1; \
 		$(MAKE) -f conftest.mk | grep '^AUTO_REMAKE$$' >/dev/null 2>&1 || \
-		{ echo "Makefile updated, restart."; exit 1; }
+		{ echo "$@ updated, restart."; exit 1; }
 
 uncommon.mk: $(srcdir)/common.mk
 		sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
 
 .PHONY: reconfig
-reconfig-args = $(srcdir)/configure $(configure_args)
+reconfig-args = $(srcdir)/$(CONFIGURE) $(configure_args)
 config.status-args = ./config.status --recheck
-reconfig-exec-0 = exec 3>&1; exit `exec 4>&1; { "$$@" 3>&- 4>&-; echo $$? 1>&4; } | fgrep -v '(cached)' 1>&3`
+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
+reconfig config.status:	$(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
+			$(srcdir)/include/ruby/version.h
 	@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
 	set $(SHELL) $($@-args); $(reconfig-exec-$(V))
 
-$(srcdir)/configure: $(srcdir)/configure.in
-	$(CHDIR) $(srcdir) && exec $(AUTOCONF)
+$(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4
+	$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
+
+$(srcdir)/aclocal.m4:
+	$(CHDIR) $(srcdir) && \
+	type $(ACLOCAL) >/dev/null 2>&1 && exec $(ACLOCAL); \
+	touch $(@F)
 
 incs: id.h
+all-incs: probes.h
 
 # Things which should be considered:
 # * with gperf v.s. without gperf
@@ -257,27 +333,26 @@ lex.c: defs/keywords
 	  $(CP) $(srcdir)/lex.c.blt $@; \
 	else \
 	  [ $(Q) ] && echo generating $@ || set -x; \
-	  gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && \
+	  gperf -C -P -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? \
+	  | sed 's/(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
+	  > $@.tmp && \
 	  $(MV) $@.tmp $@ && \
 	  $(CP) $? $(srcdir)/defs/lex.c.src && \
 	  $(CP) $@ $(srcdir)/lex.c.blt; \
 	fi
 
-NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p
+JIS_PROPS_OPTIONS = -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property
 
-enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
+enc/jis/props.h: enc/jis/props.kwd
 	$(MAKEDIRS) $(@D)
 	@set +e; \
 	if cmp -s $(?:.kwd=.src) $?; then \
 	  set -x; \
 	  $(CP) $(?:.kwd=.h.blt) $@; \
 	else \
-	  trap '$(RM) $@-1.h $@-2.h' 0 && \
 	  set -x; \
-	  sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \
-	  gperf $(NAME2CTYPE_OPTIONS) < $? > $@-2.h && \
-	  diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
-	  $(MV) $@.tmp $@ && \
+	  gperf $(JIS_PROPS_OPTIONS) $? | \
+	  sed 's/(int)(long)&((\([a-zA-Z_0-9 ]*[a-zA-Z_0-9]\) *\*)0)->\([a-zA-Z0-9_]*\),/(char)offsetof(\1, \2),/g' > $@ && \
 	  $(CP) $? $(?:.kwd=.src) && \
 	  $(CP) $@ $(?:.kwd=.h.blt); \
 	fi
@@ -296,23 +371,53 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
 
 .c.i:
 	@$(ECHO) preprocessing $<
-	$(Q) $(CPP) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
+	$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
+
+.d.h:
+	@$(ECHO) translating probes $<
+	$(Q) $(DTRACE) -o $@.tmp -h -C $(INCFLAGS) -s $<
+	$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/RUBY_PROBES_H/' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
+	$(Q) $(RM) $@.tmp
+
+.dmyh.h:
+	@$(ECHO) making dummy $(DEST_FILE)
+	$(Q)echo '#include "$(*F).dmyh"' > $@
+
+probes.stamp: $(DTRACE_REBUILD_OBJS)
+	$(Q) if test -f $@ -o -f probes.$(OBJEXT); then \
+	  $(RM) $(DTRACE_REBUILD_OBJS) $@; \
+	  $(ECHO0) "rebuilding objects which were modified by \"dtrace -G\""; \
+	  $(MAKE) $(DTRACE_REBUILD_OBJS); \
+	fi
+	$(Q) touch $@
+
+probes.@OBJEXT@: $(srcdir)/probes.d $(DTRACE_REBUILD:yes=probes.stamp)
+	@$(ECHO) processing probes in object files
+	$(Q) $(RM) $@
+	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS)
+
+# DTrace static library hacks described here:
+# http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
+ruby-glommed.$(OBJEXT):
+	@$(ECHO) generating a glommed object with DTrace probes for static library
+	$(Q) $(LD) -r -o $@ $(OBJS)
 
 clean-local::
-	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output
+	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
+		enc/encinit.c enc/encinit.$(OBJEXT)
 	-$(Q)$(RM) $(pkgconfig_DATA)
 
 distclean-local::
 	$(Q)$(RM) ext/config.cache $(RBCONFIG) Doxyfile
 	-$(Q)$(RM) run.gdb
-	-$(Q)$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h
+	-$(Q)$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h verconf.h
 	-$(Q)$(RMDIRS) $(arch_hdrdir)/ruby 2> /dev/null || true
 
 clean-ext distclean-ext realclean-ext::
 	@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
 	test "$$#" = 0 && set .; \
 	set dummy `\
-	    find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
+	    find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$::' | sort; \
 	`; shift; \
 	cd ..; \
 	for dir do \
@@ -323,58 +428,106 @@ clean-ext 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:
-	-$(Q)$(RMDIRS) $(EXTOUT) 2> /dev/null || true
 
 clean-enc distclean-enc realclean-enc:
 	@test -f "$(ENC_MK)" || exit 0; \
 	echo $(@:-enc=ing) encodings; \
-	exec $(MAKE) -f $(ENC_MK) $(MFLAGS) $(@:-enc=)
-
-clean-rdoc distclean-rdoc realclean-rdoc:
-	@echo $(@:-rdoc=ing) rdoc
-	$(Q)$(RMALL) $(RDOCOUT)
-clean-capi distclean-capi realclean-capi:
-	@echo $(@:-capi=ing) capi
-	$(Q)$(RMALL) $(CAPIOUT)
-
+	exec $(MAKE) $(MAKE_ENC) $(@:-enc=)
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
 	$(ECHO) compiling $@
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
 
-up::
+enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
+
+update-src::
 	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
 
+update-download:: update-config_files
+
+after-update:: common-srcs
+
 update-mspec:
 	@$(CHDIR) $(srcdir); \
 	if [ -d spec/mspec ]; then \
-	  cd spec/mspec; \
 	  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 \
-	  cd spec/rubyspec; \
 	  echo updating rubyspec ...; \
+	  $(Q1:0=:) set -x; \
+	  cd spec/rubyspec && \
 	  exec git pull; \
 	else \
 	  echo retrieving rubyspec ...; \
+	  $(Q1:0=:) set -x; \
 	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
 	fi
+	$(Q)cd $(srcdir)/spec/rubyspec && exec git --no-pager log -1 --oneline
 
 test-rubyspec-precheck:
 	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
 
+update-doclie:
+	@$(CHDIR) $(srcdir); \
+	if [ -d coverage/doclie ]; then \
+	  echo updating doclie ...; \
+	  $(Q1:0=:) set -x; \
+	  cd coverage/doclie && \
+	  git fetch && \
+	  exec git checkout $(DOCLIE_GIT_REF); \
+	else \
+	  echo retrieving doclie ...; \
+	  $(Q1:0=:) set -x; \
+	  exec git clone --branch $(DOCLIE_GIT_REF) $(DOCLIE_GIT_URL) coverage/doclie; \
+	fi
+
+update-simplecov-html:
+	@$(CHDIR) $(srcdir); \
+	if [ -d coverage/simplecov-html ]; then \
+	  echo updating simplecov-html ...; \
+	  $(Q1:0=:) set -x; \
+	  cd coverage/simplecov-html && \
+	  git fetch && \
+	  exec git checkout $(SIMPLECOV_HTML_GIT_REF); \
+	else \
+	  echo retrieving simplecov-html ...; \
+	  exec git clone --branch $(SIMPLECOV_HTML_GIT_REF) $(SIMPLECOV_HTML_GIT_URL) coverage/simplecov-html; \
+	fi
+
+update-simplecov:
+	@$(CHDIR) $(srcdir); \
+	if [ -d coverage/simplecov ]; then \
+	  echo updating simplecov ...; \
+	  $(Q1:0=:) set -x; \
+	  cd coverage/simplecov && \
+	  git fetch && \
+	  exec git checkout $(SIMPLECOV_GIT_REF); \
+	else \
+	  echo retrieving simplecov ...; \
+	  $(Q1:0=:) set -x; \
+	  exec git clone --branch $(SIMPLECOV_GIT_REF) $(SIMPLECOV_GIT_URL) coverage/simplecov; \
+	fi
+
+update-coverage: update-simplecov update-simplecov-html update-doclie
+
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc
 
@@ -382,4 +535,15 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \
 	  $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \
 	  $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
+	$(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
+
+verconf.h: $(RBCONFIG)
+
+loadpath: verconf.h
+	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
+	sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \
+	    -e '/^ /!d;s/ *"\\0"$$//;s/" *"//g'
+
+un-runnable:
+	$(ECHO) cannot make runnable, configure with --enable-load-relative.
+	$(Q) exit 1
diff --git a/NEWS b/NEWS
index 30fec33fdd..986db329b3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,341 +1,211 @@
-# -*- rd -*-
-= NEWS
+# -*- 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.
+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 1.9.2 release
-=== License
+== Changes since the 2.3.0 release
 
-* Ruby's License is changed from a dual license with GPLv2
-  to a dual license with 2-clause BSDL.
+=== Language changes
 
-=== Known platform dependent issues
-==== OS X Lion
+* Multiple assignment in conditional expression is now allowed.
+  [Feature #10617]
 
-* You have to configure ruby with '--with-gcc=gcc-4.2' if you're using
-  Xcode 4.1, or, if you're using Xcode 4.2, you have to configure ruby
-  with '--with-gcc=clang'.
+=== Core classes updates (outstanding ones only)
 
-=== C API updates
+* Array
 
-* rb_scan_args() is enhanced with support for option hash argument
-  extraction.
-
-* ruby_vm_at_exit() added.  This enables extension libs to hook a VM
-  termination.
-
-* rb_reserved_fd_p() added.  If you want to close all file descriptors,
-  check using this API.  [ruby-core:37759]
-
-=== Library updates (outstanding ones only)
-
-* builtin classes
-
-  * ARGF
-    * new methods:
-      * ARGF.print
-      * ARGF.printf
-      * ARGF.putc
-      * ARGF.puts
-      * ARGF.read_nonblock
-      * ARGF.to_write_io
-      * ARGF.write
+  * 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
-    * extended method:
-      * Array#pack supports endian modifiers
+  * Array#sum  [Feature #12217]
+    This is different from Enumerable#sum in that Array#sum doesn't depend on
+    the definition of each method.
 
-  * Bignum
-    * Multiplication algorithm for Bignums with a large number of digits over
-      150 BDIGITs is changed in order to reduce its calculation time.
-      Now such large Bignums are multiplied by using Toom-3 algorithm.
+* Comparable
 
-  * Encoding
-    * new encodings:
-      * CP950
-      * CP951
-      * UTF-16
-      * UTF-32
-    * change alias:
-      * SJIS is Windows-31J
+  * Comparable#clamp.  [Feature #10594]
 
-  * File
-    * new constant:
-      * File::NULL
-        name of NULL device.
-      * File::DIRECT
-        name of O_DIRECT.
+* Dir
 
-  * IO
-    * extended method:
-      * IO#putc supports multibyte characters
-    * new methods:
-      * IO#advise
-      * IO.write(name, string, [offset] )
-        Write `string` to file `name`.
-        Opposite with File.read.
-      * IO.binwrite(name, string, [offset] )
-        binary version of IO.write.
+  * Dir.empty?.  [Feature #10121]
 
-  * Kernel
-    * move #__id__ to BasicObject.
-    * extended method:
-      * Kernel#rand supports range argument
+* Enumerable
 
-  * Module
-    * new methods:
-      * Module#private_constant
-      * Module#public_constant
+  * Enumerable#sum  [Feature #12217]
+  * Enumerable#uniq  [Feature #11090]
 
-  * Random
-    * extended method:
-      * Random.rand supports range argument
+* Enumerator::Lazy
 
-  * String
-    * extended method:
-      * String#unpack supports endian modifiers
-    * new method:
-      * String#prepend
-      * String#byteslice
+  * Enumerator::Lazy#uniq  [Feature #11090]
 
-  * Time
-    * extended method:
-      * Time#strftime supports %:z and %::z.
-
-  * Process
-    * Process#maxgroups and Process#maxgroups= now raise NotImplementedError if
-      the platform don't support supplementary groups concept.
-
-* bigdecimal
-
-  * BigDecimal#power and BigDecimal#** support non-integral exponent.
-
-  * Kernel.BigDecimal and BigDecimal.new now accept instances of Integer,
-    Rational, Float, and BigDecimal.  If you pass a Rational or a Float to
-    them, you must specify the precision to produce the digits of a BigDecimal.
-
-  * The behavior of BigDecimal#coerce with a Rational is changed.  It uses
-    the precision of the receiver BigDecimal to produce the digits of a
-    BigDecimal from the given Rational.
-
-* bigdecimal/util
-
-  * BigDecimal#to_d and Integer#to_d are added.
-
-  * Float#to_d accepts a precision.
-
-  * Rational#to_d raises ArgumentError when passing zero or negative
-    precision.
-
-  * Rational#to_d
-
-    * Zero and an implicit precision is deprecated.
-      This feature is removed at the next release of bigdecimal.
-
-    * A negative precision isn't supported.
-      Be careful it is an incompatible change.
-
-* date
-
-  * Accepts flonum explicitly with limitations.
-    * If the given offset is flonum, DateTime assumes its precision is
-      at most second.
-
-      DateTime.new(2001,2,3,0,0,0,3.0/24) ==
-      DateTime.new(2001,2,3,0,0,0,'+03:00')
-        #=> true
-
-    * If the given operand for -/+ is flonum, DateTime assumes its
-      precision is at most nanosecond.
-
-      DateTime.new(2001,2,3) + 0.5 == DateTime.new(2001,2,3,12)
-        #=> true
-
-    * Precision of offset is always at most second.
-
-      Rational('0.5') == Rational('0.500001')  #=> false
-      DateTime.new(2001,2,3,0,0,0,Rational('0.5')) ==
-      DateTime.new(2001,2,3,0,0,0,Rational('0.500001'))
-        #=> true
-
-  * Ignores long offset and far reform day (with warning).
-
-    * Now accepts only:
-
-      -1<=offset<=1 (-24:00..+24:00)
-      2298874<=start<=2426355 or -/+oo
-        (proleptic Gregorian/Julian mean -/+oo)
-
-  * A method strftime cannot produce huge output (same as Time's one).
-
-    * Even though Date/DateTime can handle far dates, the following causes
-      an exception.
-
-      DateTime.new(1<<10000).strftime('%Y')  # Errno::ERANGE
-
-  * Changed the format of inspect.
-  * Changed the format of marshal (but, can load old dumps).
-
-* io/console
-  * new methods:
-    * IO#noecho {|io| }
-    * IO#echo=
-    * IO#echo?
-    * IO#raw {|io| }
-    * IO#raw!
-    * IO#getch
-    * IO#winsize
-    * IO.console
-
-* json
-  * updated to v1.5.4.
-
-* matrix
-  * new classes:
-    * Matrix::EigenvalueDecomposition
-    * Matrix::LUPDecomposition
-  * new methods:
-    * Matrix#diagonal?
-    * Matrix#eigen
-    * Matrix#eigensystem
-    * Matrix#hermitian?
-    * Matrix#lower_triangular?
-    * Matrix#lup
-    * Matrix#lup_decomposition
-    * Matrix#normal?
-    * Matrix#orthogonal?
-    * Matrix#permutation?
-    * Matrix#round
-    * Matrix#symmetric?
-    * Matrix#unitary?
-    * Matrix#upper_triangular?
-    * Matrix#zero?
-    * Vector#magnitude, #norm
-    * Vector#normalize
-  * extended methods:
-    * Matrix#each and #each_with_index can iterate on a subset of the elements
-    * Matrix#find_index returns [row, column] and can iterate on a subset
-      of the elements
-    * Matrix#** implements Numeric exponents (using the eigensystem)
-    * Matrix.zero can build rectangular matrices
-
-* minitest
-  * Minitest has been updated to version 2.2.2.
-  * For full details, see https://github.com/seattlerb/minitest/blob/master/History.txt
-
-* net/http
-  * SNI (Server Name Indication) supported for HTTPS.
-
-  * Allow to configure to wait server returning '100 continue' response
-    before sending HTTP request body. Set Net::HTTP#continue_timeout AND pass
-    'expect' => '100-continue' to a extra HTTP header.
-
-    For example, the following code sends HTTP header and waits for getting
-    '100 continue' response before sending HTTP request body. When 0.5 [sec]
-    timeout occurs or the server send '100 continue', the client sends HTTP
-    request body.
-      http.continue_timeout = 0.5
-      http.request_post('/continue', 'body=BODY', 'expect' => '100-continue')
-
-  * new method:
-    * Net::HTTPRequest#set_form): Added to support
-      both application/x-www-form-urlencoded and multipart/form-data.
-
-* objspace
-  * new method:
-    * ObjectSpace::memsize_of_all
-
-* openssl
-  * PKey::RSA and PKey::DSA now use the generic X.509 encoding scheme
-    (e.g. used in a X.509 certificate's Subject Public Key Info) when
-    exporting public keys to DER or PEM. Backward compatibility is
-    ensured by (already existing) fallbacks during creation.
-  * OpenSSL::ASN1::Constructive#new and OpenSSL::ASN1::Primitive#new
-    (and the constructors of their sub-classes) will no longer force
-    tagging to be set to :EXPLICIT when tag and/or tag_class are passed
-    as parameters. tagging must be set explicitly.
-  * Support for infinite length encodings via infinite_length attribute.
-  * OpenSSL::PKey.read( file | string [, pwd] ) allows to read arbitrary
-    public/private keys in DER-/PEM-encoded form with an optional password
-    for encrypted PEM encodings.
-  * Add new method OpenSSL::X509::Name#hash_old as a wrapper of
-    X509_NAME_hash_old() defined from OpenSSL 1.0.0. It returns OpenSSL 0.9.8
-    compatible hash value.
+* File
 
-* optparse
-  * support for bash/zsh completion.
-
-* Rake
-  * Rake has been upgraded from 0.8.7 to 0.9.2.2.  For full release notes see
-    https://github.com/jimweirich/rake/blob/master/CHANGES
-
-* RDoc
-  * RDoc has been upgraded to version 3.9.4.  For full release notes see
-    http://docs.seattlerb.org/rdoc/History_txt.html
-
-* rexml
-  * Support Ruby native encoding mechanism and iconv dependency is dropped.
-
-* RubyGems
-  * RubyGems has been upgraded to version 1.8.10. For full release notes see
-    http://rubygems.rubyforge.org/rubygems-update/History_txt.html
-
-* stringio
-  * extended method:
-    * StringIO#set_encoding can get 2nd argument and optional hash.
-
-* test/unit
-  * New arguments:
-    * -j N, --jobs=N: Allow run N testcases at once.
-    * --jobs-status: Show status of jobs when parallel running.
-    * --no-retry: Don't retry testcases which failed when parallel running.
-    * --ruby=RUBY: path to ruby for job(worker) process. optional.
-    * --hide-skip: Hide skip messages. You'll see the number of skips at end of
-      test result.
-
-* uri
-  * new methods:
-    * URI::Generic#hostname
-    * URI::Generic#hostname=
-
-* webrick
-  * new method:
-    * WEBrick::HTTPRequest#continue for generating '100 continue' response.
-  * new logging directive:
-    * %{remote}p for remote (client) port number.
-
-* yaml
-  * The default YAML engine is now Psych. You may downgrade to syck by setting
-    YAML::ENGINE.yamler = 'syck'.
-
-* zlib
-  * new methods:
-    * Zlib.deflate
-    * Zlib.inflate
-
-* FileUtils
-  * extended method:
-    * FileUtils#chmod supports symbolic mode argument.
+  * File.empty?.  [Feature #9969]
 
-=== Language changes
+* Float
+
+  * Float#ceil, Float#floor, and Float#truncate now take an optional
+    digits, as well as Float#round.  [Feature #12245]
+
+* Hash
+
+  * Hash#transform_values and Hash#transform_values!  [Feature #12512]
+
+* Integer
+
+  * Integer#ceil, Integer#floor, and Integer#truncate now take an optional
+    digits, as well as Integer#round.  [Feature #12245]
+
+  * Fixnum and Bignum are unified into Integer  [Feature #12005]
+
+  * Integer#digits for extracting columns of place-value notation [Feature #12447]
+
+* 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]
+
+* Regexp
+
+  * Regexp#match? [Feature #8110]
+    This returns bool and doesn't save backref.
+
+* Regexp/String: Updated Unicode version from 8.0.0 to 9.0.0 [Feature #12513]
+
+* RubyVM::Env
+
+  * RubyVM::Env was removed.
+
+* String
 
-* Regexps now support Unicode 6.0. (new characters and scripts)
+  * 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]
 
-* [experimental] Regexps now support Age property.
-  Unlike Perl, current implementation takes interpretation of the
-  interpretation of UTS #18.
-  http://www.unicode.org/reports/tr18/
+  * String.new(capacity: size) [Feature #12024]
 
-* Turning on/off indentation warnings with directives.
-  ("# -*- warn-indent: true -*-" / "# -*- warn-indent: false -*-")
+* Symbol
+
+  * Symbol#match now returns MatchData.  [Bug #11991]
+
+  * Symbol#upcase, Symbol#downcase, Symbol#capitalize, and Symbol#swapcase now
+    work for all of Unicode. See the documentation of String#downcase
+    for details. [Feature #10085]
+
+* Thread
+
+  * Thread#report_on_exception and Thread.report_on_exception
+    [Feature #6647]
+
+=== Stdlib updates (outstanding ones only)
+
+* CSV
+
+  * Add a liberal_parsing option. [Feature #11839]
+
+* Logger
+
+	* Allow specifying logger parameters in constructor such
+	  as level, progname, datetime_format, formatter. [Feature #12224]
+	* Add shift_period_suffix option. [Feature #10772]
+
+* OpenSSL
+
+  * 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]
+
+* optparse
+
+  * Add an into option. [Feature #11191]
 
 === Compatibility issues (excluding feature bug fixes)
 
-  * Rational#to_d
+* 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)
+
+* DateTime
+
+  * DateTime#to_time now preserves timezone.  [Bug #12189]
+
+* 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.
+
+=== C API updates
+
+* ruby_show_version() will no longer exits the process, if
+  RUBY_SHOW_COPYRIGHT_TO_DIE is set to 0.  This will be the default in
+  the future.
+
+=== Supported platform changes
+
+* FreeBSD < 4 is no longer supported
+
+=== Implementation improvements
+
+* In some condition, `[x, y].max` and `[x, y].min` are optimized
+  so that a temporal array is not created.  The concrete condition is
+  an implementation detail: currently, the array literal must have no
+  splat, must have at least one expression but literal, the length must
+  be <= 0x100, and Array#max and min must not be redefined.  It will work
+  in most casual and real-life use case where it is written with intent
+  to `Math.max(x, y)`.
 
-    See above.
+* Thread deadlock detection now shows their backtrace and dependency. [Feature #8214]
diff --git a/README b/README
deleted file mode 100644
index 3d2e636e4d..0000000000
--- a/README
+++ /dev/null
@@ -1,140 +0,0 @@
-* What's Ruby
-
-Ruby is the interpreted scripting language for quick and
-easy object-oriented programming.  It has many features to
-process text files and to do system management tasks (as in
-Perl).  It is simple, straight-forward, and extensible.
-
-
-* Features of Ruby
-
-  + Simple Syntax
-  + *Normal* Object-Oriented features(ex. class, method calls)
-  + *Advanced* Object-Oriented features(ex. Mix-in, Singleton-method)
-  + Operator Overloading
-  + Exception Handling
-  + Iterators and Closures
-  + Garbage Collection
-  + Dynamic Loading of Object files(on some architecture)
-  + Highly Portable (works on many Unix-like/POSIX compatible platforms
-    as well as Windows, Mac OS X, BeOS etc.)
-    cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatforms
-
-
-* How to get Ruby
-
-The Ruby distribution files can be found in 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 http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-There are some other branches under development.  Try the following
-command and see the list of branches:
-
-  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
-
-
-* Ruby home-page
-
-The URL of the Ruby home-page is:
-
-   http://www.ruby-lang.org/
-
-
-* Mailing list
-
-There is a mailing list to talk about Ruby.
-To subscribe this list, please send the following phrase
-
-	subscribe YourFirstName YourFamilyName
-e.g.
-        subscribe Joseph Smith
-
-in the mail body (not subject) to the address <ruby-talk-ctl@ruby-lang.org>.
-
-
-* How to compile and install
-
-This is what you need to do to compile and install Ruby:
-
-  1. If ./configure does not exist or is older than configure.in,
-     run autoconf to (re)generate configure.
-
-  2. 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 override them.
-
-  3. Edit defines.h if you need.  Usually this step will not be needed.
-
-  4. Remove comment mark(#) before the module names from ext/Setup (or
-     add module names if not present), if you want to link modules
-     statically.
-
-     If you don't want to compile non static extension modules
-     (probably on architectures which does not allow dynamic loading),
-     remove comment mark from the line "#option nodynamic" in
-     ext/Setup.
-
-  5. Run make.
-
-  6. Optionally, run 'make test' to check whether the compiled Ruby
-     interpreter works well.  If you see the message "test succeeded",
-     your ruby works as it should (hopefully).
-
-  7. Run 'make install'
-
-     This command will create following directories and install files
-     onto them.
-
-       * ${DESTDIR}${prefix}/bin
-       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib
-       * ${DESTDIR}${prefix}/lib/ruby
-       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/share/man/man1
-       * ${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system
-
-     If Ruby's API version is `x.y.z', the ((|${MAJOR}|)) is `x', the
-     ((|${MINOR}|)) is `y', and the ((|${TEENY}|)) is `z'.
-
-     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.
-
-If you fail to compile ruby, please send the detailed error report with
-the error log and machine/OS type, to help others.
-
-
-* Copying
-
-See the file COPYING.
-
-
-* The Author
-
-Feel free to send comments and bug reports to the author.  Here is the 
-author's latest mail address:
-
-  matz@netlab.jp
-
--------------------------------------------------------
-created at: Thu Aug  3 11:57:36 JST 1995
-Local variables:
-mode: indented-text
-end:
diff --git a/README.EXT b/README.EXT
index de63f54699..48b8d964c4 100644
--- a/README.EXT
+++ b/README.EXT
@@ -1,1469 +1 @@
-.\" README.EXT -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
-
-This document explains how to make extension libraries for Ruby.
-
-1. Basic knowledge
-
-In C, variables have types and data do not have types.  In contrast,
-Ruby variables do not have a static type, and data themselves have
-types, so data will need to be converted between the languages.
-
-Data in Ruby are represented by the C type `VALUE'.  Each VALUE data
-has its data-type.
-
-To retrieve C data from a VALUE, you need to:
-
- (1) Identify the VALUE's data type
- (2) Convert the VALUE into C data
-
-Converting to the wrong data type may cause serious problems.
-
-
-1.1 Data-types
-
-The Ruby interpreter has the following data types:
-
-	T_NIL		nil
-	T_OBJECT	ordinary object
-	T_CLASS		class
-	T_MODULE	module
-	T_FLOAT		floating point number
-	T_STRING	string
-	T_REGEXP	regular expression
-	T_ARRAY		array
-	T_HASH		associative array
-	T_STRUCT	(Ruby) structure
-	T_BIGNUM	multi precision integer
-	T_FIXNUM	Fixnum(31bit or 63bit integer)
-	T_COMPLEX       complex number
-	T_RATIONAL      rational number
-	T_FILE		IO
-	T_TRUE		true
-	T_FALSE		false
-	T_DATA		data
-	T_SYMBOL        symbol
-
-In addition, there are several other types used internally:
-
-	T_ICLASS
-	T_MATCH
-	T_UNDEF
-	T_NODE
-	T_ZOMBIE
-
-Most of the types are represented by C structures.
-
-1.2 Check Data Type of the VALUE
-
-The macro TYPE() defined in ruby.h shows the data type of the VALUE.
-TYPE() returns the constant number T_XXXX described above.  To handle
-data types, your code will look something like this:
-
-  switch (TYPE(obj)) {
-    case T_FIXNUM:
-      /* process Fixnum */
-      break;
-    case T_STRING:
-      /* process String */
-      break;
-    case T_ARRAY:
-      /* process Array */
-      break;
-    default:
-      /* raise exception */
-      rb_raise(rb_eTypeError, "not valid value");
-      break;
-  }
-
-There is the data-type check function
-
-  void Check_Type(VALUE value, int type)
-
-which raises an exception if the VALUE does not have the type
-specified.
-
-There are also faster check macros for fixnums and nil.
-
-  FIXNUM_P(obj)
-  NIL_P(obj)
-
-1.3 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.
-The equivalent C constants are: Qnil, Qfalse, Qtrue.
-Note that Qfalse is false in C also (i.e. 0), but not Qnil.
-
-The T_FIXNUM data is a 31bit or 63bit length fixed integer.
-This size is depend on the size of long: if long is 32bit then
-T_FIXNUM is 31bit, if long is 64bit then T_FIXNUM is 63bit.
-T_FIXNUM can be converted to a C integer by using the
-FIX2INT() macro or FIX2LONG().  Though you have to check that the
-data is really FIXNUM before using them, they are faster.  FIX2LONG()
-never raises exceptions, but FIX2INT() raises RangeError if the
-result is bigger or smaller than the size of int.
-There are also NUM2INT() and NUM2LONG() which converts any Ruby
-numbers into C integers.  These macros includes a type check,
-so an exception will be raised if the conversion failed.  NUM2DBL()
-can be used to retrieve the double float value in the same way.
-
-You can use the macros
-StringValue() and StringValuePtr() to get a char* from a VALUE.
-StringValue(var) replaces var's value with the result of "var.to_str()".
-StringValuePtr(var) does same replacement and returns char*
-representation of var.  These macros will skip the replacement if var
-is a String.  Notice that the macros take only the lvalue as their
-argument, to change the value of var in place.
-
-You can also use the macro named StringValueCStr(). This is just
-like StringValuePtr(), but always add nul character at the end of
-the result. If the result contains nul character, this macro causes
-the ArgumentError exception.
-StringValuePtr() doesn't guarantee the existence of a nul at the end
-of the result, and the result may contain nul.
-
-Other data types have corresponding C structures, e.g. struct RArray
-for T_ARRAY etc. The VALUE of the type which has the corresponding
-structure can be cast to retrieve the pointer to the struct.  The
-casting macro will be of the form RXXXX for each data type; for
-instance, RARRAY(obj).  See "ruby.h".
-
-There are some accessing macros for structure members, for example
-`RSTRING_LEN(str)' to get the size of the Ruby String object.  The
-allocated region can be accessed by `RSTRING_PTR(str)'.  For arrays,
-use `RARRAY_LEN(ary)' and `RARRAY_PTR(ary)' respectively.
-
-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.
-
-1.4 Convert C data into VALUE
-
-To convert C data to Ruby values:
-
-  * FIXNUM
-
-    left shift 1 bit, and turn on LSB.
-
-  * Other pointer values
-
-    cast to VALUE.
-
-You can determine whether a VALUE is pointer or not by checking its LSB.  
-
-Notice Ruby does not allow arbitrary pointer values to be a VALUE.  They
-should be pointers to the structures which Ruby knows about.  The known
-structures are defined in <ruby.h>.
-
-To convert C numbers to Ruby values, use these macros.
-
-  INT2FIX()	for integers within 31bits.
-  INT2NUM()	for arbitrary sized integer.
-
-INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM
-range, but is a bit slower.
-
-1.5 Manipulating Ruby data
-
-As I already mentioned, it is not recommended to modify an object's
-internal structure.  To manipulate objects, use the functions supplied
-by the Ruby interpreter. Some (not all) of the useful functions are
-listed below:
-
- String functions
-
-  rb_str_new(const char *ptr, long len)
-
-    Creates a new Ruby string.
-
-  rb_str_new2(const char *ptr)
-  rb_str_new_cstr(const char *ptr)
-
-    Creates a new Ruby string from a C string.  This is equivalent to
-    rb_str_new(ptr, strlen(ptr)).
-
-  rb_tainted_str_new(const char *ptr, long len)
-
-    Creates a new tainted Ruby string.  Strings from external data
-    sources should be tainted.
-
-  rb_tainted_str_new2(const char *ptr)
-  rb_tainted_str_new_cstr(const char *ptr)
-
-    Creates a new tainted Ruby string from a C string.
-
-  rb_sprintf(const char *format, ...)
-  rb_vsprintf(const char *format, va_list ap)
-
-    Creates a new Ruby string with printf(3) format.
-
-  rb_str_cat(VALUE str, const char *ptr, long len)
-
-    Appends len bytes of data from ptr to the Ruby string.
-
-  rb_str_cat2(VALUE str, const char* ptr)
-
-    Appends C string ptr to Ruby string str.  This function is
-    equivalent to rb_str_cat(str, ptr, strlen(ptr)).
-
-  rb_str_catf(VALUE str, const char* format, ...)
-  rb_str_vcatf(VALUE str, const char* format, va_list ap)
-
-    Appends C string format and successive arguments to Ruby string
-    str according to a printf-like format.  These functions are
-    equivalent to rb_str_cat2(str, rb_sprintf(format, ...)) and
-    rb_str_cat2(str, rb_vsprintf(format, ap)), respectively.
-
-  rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
-  
-    Creates a new Ruby string with the specified encoding.
-     
-  rb_usascii_str_new(const char *ptr, long len)
-  rb_usascii_str_new_cstr(const char *ptr)
-
-    Creates a new Ruby string with encoding US-ASCII.
-
-  rb_str_resize(VALUE str, long len)
-
-    Resizes Ruby string to len bytes.  If str is not modifiable, this
-    function raises an exception.  The length of str must be set in
-    advance.  If len is less than the old length the content beyond
-    len bytes is discarded, else if len is greater than the old length
-    the content beyond the old length bytes will not be preserved but
-    will be garbage.  Note that RSTRING_PTR(str) may change by calling
-    this function.
-
-  rb_str_set_len(VALUE str, long len)
-
-    Sets the length of Ruby string.  If str is not modifiable, this
-    function raises an exception.  This function preserves the content
-    upto len bytes, regardless RSTRING_LEN(str).  len must not exceed
-    the capacity of str.
-
- Array functions
-
-  rb_ary_new()
-
-    Creates an array with no elements.
-
-  rb_ary_new2(long len)
-
-    Creates an array with no elements, allocating internal buffer
-    for len elements.
-
-  rb_ary_new3(long n, ...)
-
-    Creates an n-element array from the arguments.
-
-  rb_ary_new4(long n, VALUE *elts)
-
-    Creates an n-element array from a C array.
-
-  rb_ary_to_ary(VALUE obj)
-
-    Converts the object into an array.
-    Equivalent to Object#to_ary.
-
- There are many functions to operate an array.
- They may dump core if other types are given.
-
-  rb_ary_aref(argc, VALUE *argv, VALUE ary)
-
-    Equivaelent to Array#[].
-
-  rb_ary_entry(VALUE ary, long offset)
-
-    ary[offset]
-
-  rb_ary_subseq(VALUE ary, long beg, long len)
-
-    ary[beg, len]
-
-  rb_ary_push(VALUE ary, VALUE val)
-  rb_ary_pop(VALUE ary)
-  rb_ary_shift(VALUE ary)
-  rb_ary_unshift(VALUE ary, VALUE val)
-
-
-2. Extending Ruby with C
-
-2.1 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:
-
- * Classes, Modules
- * Methods, Singleton Methods
- * Constants
-
-2.1.1 Class/module definition
-
-To define a class or module, use the functions below:
-
-  VALUE rb_define_class(const char *name, VALUE super)
-  VALUE rb_define_module(const char *name)
-
-These functions return the newly created class or module.  You may
-want to save this reference into a variable to use later.
-
-To define nested classes or modules, use the functions below:
-
-  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
-  VALUE rb_define_module_under(VALUE outer, const char *name)
-
-2.1.2 Method/singleton method definition
-
-To define methods or singleton methods, use these functions:
-
-  void rb_define_method(VALUE klass, const char *name, 
-		        VALUE (*func)(), int argc)
-
-  void rb_define_singleton_method(VALUE object, const char *name, 
-			          VALUE (*func)(), int argc)
-
-The `argc' represents the number of the arguments to the C function,
-which must be less than 17.  But I doubt you'll need that many.
-
-If `argc' is negative, it specifies the calling sequence, not number of
-the arguments.  
-
-If argc is -1, the function will be called as:
-
-  VALUE func(int argc, VALUE *argv, VALUE obj)
-
-where argc is the actual number of arguments, argv is the C array of
-the arguments, and obj is the receiver.
-
-If argc is -2, the arguments are passed in a Ruby array. The function
-will be called like:
-
-  VALUE func(VALUE obj, VALUE args)
-
-where obj is the receiver, and args is the Ruby array containing
-actual arguments.
-
-There are some more functions to define methods. One takes an ID
-as the name of method to be defined. See 2.2.2 for IDs.
-
-  void rb_define_method_id(VALUE klass, ID name, 
-                           VALUE (*func)(ANYARGS), int argc)
-
-There are two functions to define private/protected methods:
-
-  void rb_define_private_method(VALUE klass, const char *name, 
-			        VALUE (*func)(), int argc)
-  void rb_define_protected_method(VALUE klass, const char *name, 
-			          VALUE (*func)(), int argc)
-
-At last, rb_define_module_function defines a module functions,
-which are private AND singleton methods of the module.
-For example, sqrt is the module function defined in Math module.
-It can be called in the following way:
-
-  Math.sqrt(4)
-
-or
-
-  include Math
-  sqrt(4)
-
-To define module functions, use:
-
-  void rb_define_module_function(VALUE module, const char *name, 
-				 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)(), int argc)
-
-To define an alias for the method,
-
-  void rb_define_alias(VALUE module, const char* new, const char* old);
-
-To define a reader/writer for an attribute,
-
-  void rb_define_attr(VALUE klass, const char *name, int read, int write)
-
-To define and undefine the `allocate' class method,
-
-  void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
-  void rb_undef_alloc_func(VALUE klass);
-
-func has to take the klass as the argument and return a newly
-allocated instance.  This instance should be as empty as possible,
-without any expensive (including external) resources.
-
-2.1.3 Constant definition
-
-We have 2 functions to define constants:
-
-  void rb_define_const(VALUE klass, const char *name, VALUE val)
-  void rb_define_global_const(const char *name, VALUE val)
-
-The former is to define a constant under specified class/module.  The
-latter is to define a global constant.
-
-2.2 Use Ruby features from C
-
-There are several ways to invoke Ruby's features from C code.
-
-2.2.1 Evaluate Ruby Programs in a String
-
-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:
-
-  VALUE rb_eval_string(const char *str)
-
-Evaluation is done under the current context, thus current local variables
-of the innermost method (which is defined by Ruby) can be accessed.
-
-Note that the evaluation can raise an exception. There is a safer 
-function:
-
-  VALUE rb_eval_string_protect(const char *str, int *state)
-
-It returns nil when an error occur. Moreover, *state is zero if str was
-successfully evaluated, or nonzero otherwise.
-
-
-2.2.2 ID or Symbol
-
-You can invoke methods directly, without parsing the string.  First I
-need to explain about ID.  ID is the integer number to represent
-Ruby's identifiers such as variable names.  The Ruby data type
-corresponding to ID is Symbol.  It can be accessed from Ruby in the
-form:
-
- :Identifier
-or
- :"any kind of string"
-
-You can get the ID value from a string within C code by using
-
-  rb_intern(const char *name)
-
-You can retrieve ID from Ruby object (Symbol or String) given as an
-argument by using
-
-  rb_to_id(VALUE symbol)
-
-You can convert C ID to Ruby Symbol by using
-
-  VALUE ID2SYM(ID id)
-
-and to convert Ruby Symbol object to ID, use
-
-  ID SYM2ID(VALUE symbol)
-
-2.2.3 Invoke Ruby method from C
-
-To invoke methods directly, you can use the function below
-
-  VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
-
-This function invokes a method on the recv, with the method name
-specified by the symbol mid.
-
-2.2.4 Accessing the variables and constants
-
-You can access class variables and instance variables using access
-functions.  Also, global variables can be shared between both
-environments.  There's no way to access Ruby's local variables.
-
-The functions to access/modify instance variables are below:
-
-  VALUE rb_ivar_get(VALUE obj, ID id)
-  VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
-
-id must be the symbol, which can be retrieved by rb_intern().
-
-To access the constants of the class/module:
-
-  VALUE rb_const_get(VALUE obj, ID id)
-
-See 2.1.3 for defining new constant.
-
-3. Information sharing between Ruby and C
-
-3.1 Ruby constants that C can be accessed from C
-
-As stated in section 1.3,
-the following Ruby constants can be referred from C.
-
-  Qtrue
-  Qfalse
-
-Boolean values.  Qfalse is false in C also (i.e. 0).
-
-  Qnil
-
-Ruby nil in C scope.
-
-3.2 Global variables shared between C and Ruby
-
-Information can be shared between the two environments using shared global
-variables.  To define them, you can use functions listed below:
-
-  void rb_define_variable(const char *name, VALUE *var)
-
-This function defines the variable which is shared by both environments.
-The value of the global variable pointed to by `var' can be accessed
-through Ruby's global variable named `name'.
-
-You can define read-only (from Ruby, of course) variables using the
-function below.
-
-  void rb_define_readonly_variable(const char *name, VALUE *var)
-
-You can defined hooked variables.  The accessor functions (getter and
-setter) are called on access to the hooked variables.
-
-  void rb_define_hooked_variable(const char *name, VALUE *var,
-				 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()
-works just like rb_define_variable().
-
-The prototypes of the getter and setter functions are as follows:
-
-  VALUE (*getter)(ID id, VALUE *var);
-  void (*setter)(VALUE val, ID id, VALUE *var);
-
-
-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)())
-
-The prototypes of the getter and setter functions are as follows:
-
-  VALUE (*getter)(ID id);
-  void (*setter)(VALUE val, ID id);
-
-
-3.3 Encapsulate C data into a Ruby object
-
-To wrap and objectify a C pointer as a Ruby object (so called
-DATA), use Data_Wrap_Struct().
-
-  Data_Wrap_Struct(klass, mark, free, ptr)
-
-Data_Wrap_Struct() returns a created DATA object.  The klass argument
-is the class for the DATA object.  The mark argument is the function
-to mark Ruby objects pointed by this data.  The free argument is the
-function to free the pointer allocation.  If this is -1, the pointer
-will be just freed.  The functions mark and free will be called from
-garbage collector.
-
-These mark / free functions are invoked during GC execution.  No
-object allocations are allowed during it, so do not allocate ruby
-objects inside them.
-
-You can allocate and wrap the structure in one step.
-
-  Data_Make_Struct(klass, type, mark, free, sval)
-
-This macro returns an allocated Data object, wrapping the pointer to
-the structure, which is also allocated.  This macro works like:
-
-  (sval = ALLOC(type), Data_Wrap_Struct(klass, mark, free, sval))
-
-Arguments klass, mark, and free work like their counterparts in
-Data_Wrap_Struct().  A pointer to the allocated structure will be
-assigned to sval, which should be a pointer of the type specified.
-
-To retrieve the C pointer from the Data object, use the macro
-Data_Get_Struct().
-
-  Data_Get_Struct(obj, type, sval)
-
-A pointer to the structure will be assigned to the variable sval.
-
-See the example below for details. 
-
-4. Example - Creating dbm extension
-
-OK, here's the example of making an extension library.  This is the
-extension to access DBMs.  The full source is included in the ext/
-directory in the Ruby's source tree.
-
-(1) make the directory
-
-  % mkdir ext/dbm
-
-Make a directory for the extension library under ext directory.
-
-(2) design the library
-
-You need to design the library features, before making it.
-
-(3) write C code.
-
-You need to write C code for your extension library.  If your library
-has only one source file, choosing ``LIBRARY.c'' as a file name is
-preferred.  On the other hand, in case your library has multiple source
-files, avoid choosing ``LIBRARY.c'' for a file name.  It may conflict
-with an intermediate file ``LIBRARY.o'' on some platforms.
-Note that some functions in mkmf library described below generate
-a file ``conftest.c'' for checking with compilation.  You shouldn't
-choose ``conftest.c'' as a name of a source file.
-
-Ruby will execute the initializing function named ``Init_LIBRARY'' in
-the library.  For example, ``Init_dbm()'' will be executed when loading
-the library.
-
-Here's the example of an initializing function.
-
---
-void
-Init_dbm(void)
-{
-    /* define DBM class */
-    cDBM = rb_define_class("DBM", rb_cObject);
-    /* DBM includes Enumerate module */
-    rb_include_module(cDBM, rb_mEnumerable);
-
-    /* DBM has class method open(): arguments are received as C array */
-    rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
-
-    /* DBM instance method close(): no args */
-    rb_define_method(cDBM, "close", fdbm_close, 0);
-    /* DBM instance method []: 1 argument */
-    rb_define_method(cDBM, "[]", fdbm_fetch, 1);
-		:
-
-    /* ID for a instance variable to store DBM data */
-    id_dbm = rb_intern("dbm");
-}
---
-
-The dbm extension wraps the dbm struct in the C environment using 
-Data_Make_Struct.
-
---
-struct dbmdata {
-    int  di_size;
-    DBM *di_dbm;
-};
-
-
-obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
---
-
-This code wraps the dbmdata structure into a Ruby object.  We avoid
-wrapping DBM* directly, because we want to cache size information.
-
-To retrieve the dbmdata structure from a Ruby object, we define the
-following macro:
-
---
-#define GetDBM(obj, dbmp) {\
-    Data_Get_Struct(obj, struct dbmdata, dbmp);\
-    if (dbmp->di_dbm == 0) closed_dbm();\
-}
---
-
-This sort of complicated macro does the retrieving and close checking for
-the DBM.
-
-There are three kinds of way to receive method arguments.  First,
-methods with a fixed number of arguments receive arguments like this:
-
---
-static VALUE
-fdbm_delete(VALUE obj, VALUE keystr)
-{
-	:
-}
---
-
-The first argument of the C function is the self, the rest are the
-arguments to the method.
-
-Second, methods with an arbitrary number of arguments receive
-arguments like this:
-
---
-static VALUE
-fdbm_s_open(int argc, VALUE *argv, VALUE klass)
-{
-	:
-    if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-	mode = 0666;		/* default value */
-    }
-	:
-}
---
-
-The first argument is the number of method arguments, the second
-argument is the C array of the method arguments, and the third
-argument is the receiver of the method.
-
-You can use the function rb_scan_args() to check and retrieve the
-arguments.  The third argument is a string that specifies how to
-capture method arguments and assign them to the following VALUE
-references.
-
-
-The following is an example of a method that takes arguments by Ruby's
-array:
-
---
-static VALUE
-thread_initialize(VALUE thread, VALUE args)
-{
-	:
-}
---
-
-The first argument is the receiver, the second one is the Ruby array
-which contains the arguments to the method.
-
-** Notice
-
-GC should know about global variables which refer to Ruby's objects, but
-are not exported to the Ruby world.  You need to protect them by
-
-  void rb_global_variable(VALUE *var)
-
-(4) prepare extconf.rb
-
-If the file named extconf.rb exists, it will be executed to generate
-Makefile.
-
-extconf.rb is the file for checking compilation conditions etc.  You
-need to put
-
-  require 'mkmf'
-
-at the top of the file.  You can use the functions below to check
-various conditions.
-
-  have_library(lib, func): check whether library containing function exists.
-  have_func(func, header): check whether function exists
-  have_header(header): check whether header file exists
-  create_makefile(target): generate Makefile
-
-The value of the variables below will affect the Makefile.
-
-  $CFLAGS: included in CFLAGS make variable (such as -O)
-  $CPPFLAGS: included in CPPFLAGS make variable (such as -I, -D)
-  $LDFLAGS: included in LDFLAGS make variable (such as -L)
-  $objs: list of object file names
-
-Normally, the object files list is automatically generated by searching
-source files, but you must define them explicitly if any sources will
-be generated while building.
-
-If a compilation condition is not fulfilled, you should not call
-``create_makefile''.  The Makefile will not be generated, compilation will
-not be done.
-
-(5) prepare depend (optional)
-
-If the file named depend exists, Makefile will include that file to
-check dependencies.  You can make this file by invoking
-
-  % gcc -MM *.c > depend
-
-It's harmless.  Prepare it.
-
-(6) generate Makefile
-
-Try generating the Makefile by:
-
-  ruby extconf.rb
-
-If the library should be installed under vendor_ruby directory
-instead of site_ruby directory, use --vendor option as follows.
-
-  ruby extconf.rb --vendor
-
-You don't need this step if you put the extension library under the ext
-directory of the ruby source tree.  In that case, compilation of the
-interpreter will do this step for you.
-
-(7) make
-
-Type
-
-  make
-
-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.
-
-(8) 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.
-
-(9) 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
-
-ruby language core
-
-  class.c         : classes and modules
-  error.c         : exception classes and exception mechanism
-  gc.c            : memory management
-  load.c          : library loading
-  object.c        : objects
-  variable.c      : variables and constants
-
-ruby syntax parser
-  parse.y
-    -> parse.c    : automatically generated
-  keywords        : reserved keywords
-    -> lex.c      : automatically generated
-
-ruby evaluator (a.k.a. YARV)
-  compile.c
-  eval.c
-  eval_error.c
-  eval_jump.c
-  eval_safe.c
-  insns.def           : definition of VM instructions
-  iseq.c              : implementation of VM::ISeq
-  thread.c            : thread management and context swiching
-  thread_win32.c      : thread implementation
-  thread_pthread.c    : ditto
-  vm.c
-  vm_dump.c
-  vm_eval.c
-  vm_exec.c
-  vm_insnhelper.c
-  vm_method.c
-
-  opt_insns_unif.def  : instruction unification
-  opt_operand.def     : definitions for optimization
-
-    -> insn*.inc      : automatically generated
-    -> opt*.inc       : automatically generated
-    -> vm.inc         : automatically generated
-
-regular expression engine (oniguruma)
-  regex.c
-  regcomp.c
-  regenc.c
-  regerror.c
-  regexec.c
-  regparse.c
-  regsyntax.c
-
-utility functions
-
-  debug.c       : debug symbols for C debuggger
-  dln.c         : dynamic loading
-  st.c          : general purpose hash table
-  strftime.c    : formatting times
-  util.c        : misc utilities
-
-ruby interpreter implementation
-
-  dmyext.c
-  dmydln.c 
-  dmyencoding.c
-  id.c
-  inits.c
-  main.c
-  ruby.c
-  version.c
-
-  gem_prelude.rb
-  prelude.rb
-
-
-class library
-
-  array.c       : Array
-  bignum.c      : Bignum
-  compar.c      : Comparable
-  complex.c     : Complex
-  cont.c        : Fiber, Continuation
-  dir.c         : Dir
-  enum.c        : Enumerable
-  enumerator.c  : Enumerator
-  file.c        : File
-  hash.c        : Hash
-  io.c          : IO
-  marshal.c     : Marshal
-  math.c        : Math
-  numeric.c     : Numeric, Integer, Fixnum, Float
-  pack.c        : Array#pack, String#unpack
-  proc.c        : Binding, Proc
-  process.c     : Process
-  random.c      : random number
-  range.c       : Range
-  rational.c    : Rational
-  re.c          : Regexp, MatchData
-  signal.c      : Signal
-  sprintf.c     : 
-  string.c      : String
-  struct.c      : Struct
-  time.c        : Time
-
-  defs/known_errors.def  : Errno::* exception classes
-    -> known_errors.inc  : automatically generated
-
-multilingualization
-  encoding.c    : Encoding
-  transcode.c   : Encoding::Converter
-  enc/*.c       : encoding classes
-  enc/trans/*   : codepoint mapping tables
-
-goruby interpreter implementation
-  
-  goruby.c
-  golf_prelude.rb     : goruby specific libraries.
-    -> golf_prelude.c : automatically generated
-
-
-Appendix B. Ruby extension API reference
-
-** Types
-
- VALUE
-
-The type for the Ruby object.  Actual structures are defined in ruby.h,
-such as struct RString, etc.  To refer the values in structures, use
-casting macros like RSTRING(obj).
-
-** Variables and constants
-
- Qnil
-
-const: nil object
-
- Qtrue
-
-const: true object(default true value)
-
- Qfalse
-
-const: false object
-
-** C pointer wrapping
-
- Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
-
-Wrap a C pointer into a Ruby object.  If object has references to other
-Ruby objects, they should be marked by using the mark function during
-the GC process.  Otherwise, mark should be 0.  When this object is no
-longer referred by anywhere, the pointer will be discarded by free
-function.
-
- Data_Make_Struct(klass, type, mark, free, sval)
-
-This macro allocates memory using malloc(), assigns it to the variable
-sval, and returns the DATA encapsulating the pointer to memory region.
-
- Data_Get_Struct(data, type, sval)
-
-This macro retrieves the pointer value from DATA, and assigns it to
-the variable sval. 
-
-** Checking data types
-
-TYPE(value)
-FIXNUM_P(value)
-NIL_P(value)
-void Check_Type(VALUE value, int type)
-void Check_SafeStr(VALUE value)
-
-** Data type conversion
-
-FIX2INT(value), INT2FIX(i)
-FIX2LONG(value), LONG2FIX(l)
-NUM2INT(value), INT2NUM(i)
-NUM2UINT(value), UINT2NUM(ui)
-NUM2LONG(value), LONG2NUM(l)
-NUM2ULONG(value), ULONG2NUM(ul)
-NUM2LL(value), LL2NUM(ll)
-NUM2ULL(value), ULL2NUM(ull)
-NUM2OFFT(value), OFFT2NUM(off)
-NUM2SIZET(value), SIZET2NUM(size)
-NUM2SSIZET(value), SSIZET2NUM(ssize)
-NUM2DBL(value)
-rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
-rb_str_new2(s)
-
-** defining class/module
-
- VALUE rb_define_class(const char *name, VALUE super)
-
-Defines a new Ruby class as a subclass of super.
-
- VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
-
-Creates a new Ruby class as a subclass of super, under the module's
-namespace.
-
- VALUE rb_define_module(const char *name)
-
-Defines a new Ruby module.
-
- VALUE rb_define_module_under(VALUE module, const char *name)
-
-Defines a new Ruby module under the module's namespace.
-
- void rb_include_module(VALUE klass, VALUE module)
-
-Includes module into class.  If class already includes it, just
-ignored.
-
- void rb_extend_object(VALUE object, VALUE module)
-
-Extend the object with the module's attributes.
-
-** Defining Global Variables
-
- void rb_define_variable(const char *name, VALUE *var)
-
-Defines a global variable which is shared between C and Ruby.  If name
-contains a character which is not allowed to be part of the symbol,
-it can't be seen from Ruby programs.
-
- void rb_define_readonly_variable(const char *name, VALUE *var)
-
-Defines a read-only global variable.  Works just like
-rb_define_variable(), except the defined variable is read-only.
-
- void rb_define_virtual_variable(const char *name,
-				 VALUE (*getter)(), VALUE (*setter)())
-
-Defines a virtual variable, whose behavior is defined by a pair of C
-functions.  The getter function is called when the variable is
-referenced.  The setter function is called when the variable is set to a
-value.  The prototype for getter/setter functions are:
-
-	VALUE getter(ID id)
-	void setter(VALUE val, ID id)
-
-The getter function must return the value for the access.
-
- void rb_define_hooked_variable(const char *name, VALUE *var,
-				VALUE (*getter)(), VALUE (*setter)())
-
-Defines hooked variable.  It's a virtual variable with a C variable.  
-The getter is called as
-
-	VALUE getter(ID id, VALUE *var)
-
-returning a new value.  The setter is called as
-
-	void setter(VALUE val, ID id, VALUE *var)
-
-GC requires C global variables which hold Ruby values to be marked.
-
- void rb_global_variable(VALUE *var)
-
-Tells GC to protect these variables.
-
-** Constant Definition
-
- void rb_define_const(VALUE klass, const char *name, VALUE val)
-
-Defines a new constant under the class/module.
-
- void rb_define_global_const(const char *name, VALUE val)
-
-Defines a global constant.  This is just the same as
-
-     rb_define_const(cKernal, name, val)
-
-** Method Definition
-
- 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
-3 arguments: argc, argv, and self.  if argc is -2, the function will
-receive 2 arguments, self and args, where args is a Ruby array of
-the method arguments.
-
- 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)(), int argc)
-
-Defines a singleton method.  Arguments are same as rb_define_method().
-
- rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
-
-Retrieve argument from argc and argv to given VALUE references
-according to the format string.  The format can be described in ABNF
-as follows:
-
---
-scan-arg-spec  := param-arg-spec [option-hash-arg-spec] [block-arg-spec]
-
-param-arg-spec := pre-arg-spec [post-arg-spec] / post-arg-spec / pre-opt-post-arg-spec
-pre-arg-spec   := num-of-leading-mandatory-args [num-of-optional-args]
-post-arg-spec  := sym-for-variable-length-args [num-of-trailing-mandatory-args]
-pre-opt-post-arg-spec := num-of-leading-mandatory-args num-of-optional-args num-of-trailing-mandatory-args
-option-hash-arg-spec := sym-for-option-hash-arg
-block-arg-spec := sym-for-block-arg
-
-num-of-leading-mandatory-args  := DIGIT ; The number of leading
-                                        ; mandatory arguments
-num-of-optional-args           := DIGIT ; The number of optional
-                                        ; arguments
-sym-for-variable-length-args   := "*"   ; Indicates that variable
-                                        ; length arguments are
-                                        ; captured as a ruby array
-num-of-trailing-mandatory-args := DIGIT ; The number of trailing
-                                        ; mandatory arguments
-sym-for-option-hash-arg        := ":"   ; Indicates that an option
-                                        ; hash is captured if the last
-                                        ; argument is a hash or can be
-                                        ; converted to a hash with
-                                        ; #to_hash.  When the last
-                                        ; argument is nil, it is
-                                        ; captured if it is not
-                                        ; ambiguous to take it as
-                                        ; empty option hash; i.e. '*'
-                                        ; is not specified and
-                                        ; arguments are given more
-                                        ; than sufficient.
-sym-for-block-arg              := "&"   ; Indicates that an iterator
-                                        ; block should be captured if
-                                        ; given
---
-
-For example, "12" means that the method requires at least one
-argument, and at most receives three (1+2) arguments.  So, the format
-string must be followed by three variable references, which are to be
-assigned to captured arguments.  For omitted arguments, variables are
-set to Qnil.  NULL can be put in place of a variable reference, which
-means the corresponding captured argument(s) should be just dropped.
-
-The number of given arguments, excluding an option hash or iterator
-block, is returned.
-
-** Invoking Ruby method
-
- VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
-
-Invokes a method.  To retrieve mid from a method name, use rb_intern().
-
- VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
-
-Invokes a method, passing arguments by an array of values.
-
- VALUE rb_eval_string(const char *str)
-
-Compiles and executes the string as a Ruby program.
-
- ID rb_intern(const char *name)
-
-Returns ID corresponding to the name.
-
- char *rb_id2name(ID id)
-
-Returns the name corresponding ID.
-
- char *rb_class2name(VALUE klass)
-
-Returns the name of the class.
-
- int rb_respond_to(VALUE object, ID id)
-
-Returns true if the object responds to the message specified by id.
-
-** Instance Variables
-
- VALUE rb_iv_get(VALUE obj, const char *name)
-
-Retrieve the value of the instance variable.  If the name is not
-prefixed by `@', that variable shall be inaccessible from Ruby.
-
- VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
-
-Sets the value of the instance variable.
-
-** Control Structure
-
- VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv,
-		     VALUE (*func) (ANYARGS), VALUE data2)
-
-Calls a method on the recv, with the method name specified by the
-symbol mid, with argc arguments in argv, supplying func as the
-block. When func is called as the block, it will receive the value
-from yield as the first argument, and data2 as the second argument.
-When yielded with multiple values (in C, rb_yield_values(),
-rb_yield_values2() and rb_yield_splat()), data2 is packed as an Array,
-whereas yielded values can be gotten via argc/argv of the third/fourth
-arguments.
-
- [OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
-
-Calls the function func1, supplying func2 as the block.  func1 will be
-called with the argument arg1.  func2 receives the value from yield as
-the first argument, arg2 as the second argument.
- 
-When rb_iterate is used in 1.9, func1 has to call some Ruby-level method.
-This function is obsolete since 1.9; use rb_block_call instead.
-
- VALUE rb_yield(VALUE val)
-
-Evaluates the block with value val.
-
- 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 argument.  The
-return value of rb_rescue() is the return value from func1 if no
-exception occurs, from func2 otherwise.
-
- VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
-
-Calls the function func1 with arg1 as the argument, then calls func2
-with arg2 if execution terminated.  The return value from
-rb_ensure() is that of func1 when no exception occured.
-
- VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state)
-
-Calls the function func with arg as the argument.  If no exception
-occured 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.
-
- void rb_jump_tag(int state)
-
-Continues the exception caught by rb_protect() and rb_eval_string_protect().
-state must be the returned value from those functions.  This function
-never return to the caller.
-
-** Exceptions and Errors
-
- void rb_warn(const char *fmt, ...)
-
-Prints a warning message according to a printf-like format.
-
- void rb_warning(const char *fmt, ...)
-
-Prints a warning message according to a printf-like format, if
-$VERBOSE is true.
-
-void rb_raise(rb_eRuntimeError, const char *fmt, ...)
-
-Raises RuntimeError.  The fmt is a format string just like printf().
-
- void rb_raise(VALUE exception, const char *fmt, ...)
-
-Raises a class exception.  The fmt is a format string just like printf().
-
- void rb_fatal(const char *fmt, ...)
-
-Raises a fatal error, terminates the interpreter.  No exception handling
-will be done for fatal errors, but ensure blocks will be executed.
-
- void rb_bug(const char *fmt, ...)
-
-Terminates the interpreter immediately.  This function should be
-called under the situation caused by the bug in the interpreter.  No
-exception handling nor ensure execution will be done.
-
-** Initialize and Start the Interpreter
-
-The embedding API functions are below (not needed for extension libraries):
-
- void ruby_init()
-
-Initializes the interpreter.
-
- void ruby_options(int argc, char **argv)
-
-Process command line arguments for the interpreter.
-
- void ruby_run()
-
-Starts execution of the interpreter.
-
- void ruby_script(char *name)
-
-Specifies the name of the script ($0).
-
-** Hooks for the Interpreter Events
-
- void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events, VALUE data)
-
-Adds a hook function for the specified interpreter events.
-events should be Or'ed value of:
-
-	RUBY_EVENT_LINE
-	RUBY_EVENT_CLASS
-	RUBY_EVENT_END
-	RUBY_EVENT_CALL
-	RUBY_EVENT_RETURN
-	RUBY_EVENT_C_CALL
-	RUBY_EVENT_C_RETURN
-	RUBY_EVENT_RAISE
-	RUBY_EVENT_ALL
-
-The definition of rb_event_hook_func_t is below:
-
- typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
- 				      VALUE self, ID id, VALUE klass)
-
-The third argument `data' to rb_add_event_hook() is passed to the hook
-function as the second argument, which was the pointer to the current
-NODE in 1.8.  See RB_EVENT_HOOKS_HAVE_CALLBACK_DATA below.
-
- int rb_remove_event_hook(rb_event_hook_func_t func)
-
-Removes the specified hook function.
-
-** Macros for the Compatibilities
-
-Some macros to check API compatibilities are available by default.
-
- NORETURN_STYLE_NEW
-
-Means that NORETURN macro is functional style instead of prefix.
-
- HAVE_RB_DEFINE_ALLOC_FUNC
-
-Means that function rb_define_alloc_func() is provided, that means the
-allocation framework is used.  This is same as the result of
-have_func("rb_define_alloc_func", "ruby.h").
-
- HAVE_RB_REG_NEW_STR
-
-Means that function rb_reg_new_str() is provided, that creates Regexp
-object from String object.  This is same as the result of
-have_func("rb_reg_new_str", "ruby.h").
-
- HAVE_RB_IO_T
-
-Means that type rb_io_t is provided.
-
- USE_SYMBOL_AS_METHOD_NAME
-
-Means that Symbols will be returned as method names, e.g.,
-Module#methods, #singleton_methods and so on.
-
- HAVE_RUBY_*_H
-
-Defined in ruby.h and means correspoinding header is available.  For
-instance, when HAVE_RUBY_ST_H is defined you should use ruby/st.h not
-mere st.h.
-
- 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 in extconf.rb
-
-These functions are available in extconf.rb:
-
- have_macro(macro, headers)
-
-Checks whether macro is defined with header.  Returns true if the macro
-is defined.
-
- have_library(lib, func)
-
-Checks whether the library exists, containing the specified function.
-Returns true if the library exists.
-
- find_library(lib, func, path...)
-
-Checks whether a library which contains the specified function exists in
-path.  Returns true if the library exists.
-
- have_func(func, header)
-
-Checks whether func exists with header.  Returns true if the function
-exists.  To check functions in an additional library, you need to
-check that library first using have_library().
-
- have_var(var, header)
-
-Checks whether var exists with header.  Returns true if the variable
-exists.  To check variables in an additional library, you need to
-check that library first using have_library().
-
- have_header(header)
-
-Checks whether header exists.  Returns true if the header file exists.
-
- find_header(header, path...)
-
-Checks whether header exists in path.  Returns true if the header file
-exists.
-
- have_struct_member(type, member, header)
-
-Checks whether type has member with header.  Returns true if the type
-is defined and has the member.
-
- have_type(type, header, opt)
-
-Checks whether type is defined with header.  Returns true if the type
-is defined.
-
- check_sizeof(type, header)
-
-Checks the size of type in char with header.  Returns the size if the
-type is defined, otherwise nil.
-
- create_makefile(target)
-
-Generates the Makefile for the extension library.  If you don't invoke
-this method, the compilation will not be done.
-
- find_executable(bin, path)
-
-Finds command in path, which is File::PATH_SEPARATOR-separated list of
-directories.  If path is nil or omitted, environment variable PATH
-will be used.  Returns the path name of the command if it is found,
-otherwise nil.
-
- with_config(withval[, default=nil])
-
-Parses the command line options and returns the value specified by
---with-<withval>.
-
- enable_config(config, *defaults)
- disable_config(config, *defaults)
-
-Parses the command line options for boolean.  Returns true if
---enable-<config> is given, or false if --disable-<config> is given.
-Otherwise, yields defaults to the given block and returns the result
-if it is called with a block, or returns defaults.
-
- dir_config(target[, default_dir])
- dir_config(target[, default_include, default_lib])
-
-Parses the command line options and adds the directories specified by
---with-<target>-dir, --with-<target>-include, and/or --with-<target>-lib
-to $CFLAGS and/or $LDFLAGS.  --with-<target>-dir=/path is equivalent to
---with-<target>-include=/path/include --with-<target>-lib=/path/lib.
-Returns an array of the added directories ([include_dir, lib_dir]).
-
- pkg_config(pkg)
-
-Obtains the information for pkg by pkg-config command.  The actual
-command name can be overridden by --with-pkg-config command line
-option.
-
-/*
- * Local variables:
- * fill-column: 70
- * end:
- */
+Moved to doc/extension.rdoc
diff --git a/README.EXT.ja b/README.EXT.ja
index f2d7609ff5..f884ecbb0e 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -1,1570 +1 @@
-.\" README.EXT.ja -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
-
-Ruby¤Î³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Îºî¤êÊý¤òÀâÌÀ¤·¤Þ¤¹¡¥
-
-1¡¥´ðÁÃÃμ±
-
-C¤ÎÊÑ¿ô¤Ë¤Ï·¿¤¬¤¢¤ê¡¤¥Ç¡¼¥¿¤Ë¤Ï·¿¤¬¤¢¤ê¤Þ¤»¤ó¡¥¤Ç¤¹¤«¤é¡¤¤¿
-¤È¤¨¤Ð¥Ý¥¤¥ó¥¿¤òint¤ÎÊÑ¿ô¤ËÂåÆþ¤¹¤ë¤È¡¤¤½¤ÎÃͤÏÀ°¿ô¤È¤·¤Æ¼è
-¤ê°·¤ï¤ì¤Þ¤¹¡¥µÕ¤ËRuby¤ÎÊÑ¿ô¤Ë¤Ï·¿¤¬¤Ê¤¯¡¤¥Ç¡¼¥¿¤Ë·¿¤¬¤¢¤ê¤Þ
-¤¹¡¥¤³¤Î°ã¤¤¤Î¤¿¤á¡¤C¤ÈRuby¤ÏÁê¸ß¤ËÊÑ´¹¤·¤Ê¤±¤ì¤Ð¡¤¤ª¸ß¤¤¤Î
-¥Ç¡¼¥¿¤ò¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó¡¥
-
-Ruby¤Î¥Ç¡¼¥¿¤ÏVALUE¤È¤¤¤¦C¤Î·¿¤Çɽ¸½¤µ¤ì¤Þ¤¹¡¥VALUE·¿¤Î¥Ç¡¼
-¥¿¤Ï¤½¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤ò¼«Ê¬¤ÇÃΤäƤ¤¤Þ¤¹¡¥¤³¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤È
-¤¤¤¦¤Î¤Ï¥Ç¡¼¥¿(¥ª¥Ö¥¸¥§¥¯¥È)¤Î¼ÂºÝ¤Î¹½Â¤¤ò°ÕÌ£¤·¤Æ¤¤¤Æ¡¤Ruby
-¤Î¥¯¥é¥¹¤È¤Ï¤Þ¤¿°ã¤Ã¤¿¤â¤Î¤Ç¤¹¡¥
-
-VALUE¤«¤éC¤Ë¤È¤Ã¤Æ°ÕÌ£¤Î¤¢¤ë¥Ç¡¼¥¿¤ò¼è¤ê½Ð¤¹¤¿¤á¤Ë¤Ï
-
- (1) VALUE¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤òÃΤë
- (2) VALUE¤òC¤Î¥Ç¡¼¥¿¤ËÊÑ´¹¤¹¤ë
-
-¤ÎξÊý¤¬É¬ÍפǤ¹¡¥(1)¤ò˺¤ì¤ë¤È´Ö°ã¤Ã¤¿¥Ç¡¼¥¿¤ÎÊÑ´¹¤¬¹Ô¤ï¤ì
-¤Æ¡¤ºÇ°­¥×¥í¥°¥é¥à¤¬core dump¤·¤Þ¤¹¡¥
-
-1.1 ¥Ç¡¼¥¿¥¿¥¤¥×
-
-Ruby¤Ë¤Ï¥æ¡¼¥¶¤¬»È¤¦²ÄǽÀ­¤Î¤¢¤ë°Ê²¼¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹¡¥
-
-	T_NIL		nil
-	T_OBJECT	Ä̾ï¤Î¥ª¥Ö¥¸¥§¥¯¥È
-	T_CLASS		¥¯¥é¥¹
-	T_MODULE	¥â¥¸¥å¡¼¥ë
-	T_FLOAT		ÉâÆ°¾®¿ôÅÀ¿ô
-	T_STRING	ʸ»úÎó
-	T_REGEXP	Àµµ¬É½¸½
-	T_ARRAY		ÇÛÎó
-	T_HASH		Ï¢ÁÛÇÛÎó
-	T_STRUCT	(Ruby¤Î)¹½Â¤ÂÎ
-	T_BIGNUM	¿ÇÜĹÀ°¿ô
-	T_FIXNUM	Fixnum(31bit¤Þ¤¿¤Ï63bitĹÀ°¿ô)
-	T_COMPLEX	Ê£ÁÇ¿ô
-	T_RATIONAL	Í­Íý¿ô
-	T_FILE		Æþ½ÐÎÏ
-	T_TRUE		¿¿
-	T_FALSE		µ¶
-	T_DATA		¥Ç¡¼¥¿
-	T_SYMBOL	¥·¥ó¥Ü¥ë
-
-¤½¤Î¾¤ËÆâÉô¤ÇÍøÍѤµ¤ì¤Æ¤¤¤ë°Ê²¼¤Î¥¿¥¤¥×¤¬¤¢¤ê¤Þ¤¹¡¥
-
-	T_ICLASS
-	T_MATCH
-	T_UNDEF
-	T_NODE
-	T_ZOMBIE
-
-¤Û¤È¤ó¤É¤Î¥¿¥¤¥×¤ÏC¤Î¹½Â¤ÂΤǼÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-
-1.2 VALUE¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤ò¥Á¥§¥Ã¥¯¤¹¤ë
-
-ruby.h¤Ç¤ÏTYPE()¤È¤¤¤¦¥Þ¥¯¥í¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Æ¡¤VALUE¤Î¥Ç¡¼¥¿
-¥¿¥¤¥×¤òÃΤ뤳¤È¤¬½ÐÍè¤Þ¤¹¡¥TYPE()¥Þ¥¯¥í¤Ï¾å¤Ç¾Ò²ð¤·¤¿T_XXXX
-¤Î·Á¼°¤ÎÄê¿ô¤òÊÖ¤·¤Þ¤¹¡¥VALUE¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤Ë±þ¤¸¤Æ½èÍý¤¹¤ë
-¾ì¹ç¤Ë¤Ï¡¤TYPE()¤ÎÃͤÇʬ´ô¤¹¤ë¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡¥
-
-  switch (TYPE(obj)) {
-    case T_FIXNUM:
-      /* FIXNUM¤Î½èÍý */
-      break;
-    case T_STRING:
-      /* ʸ»úÎó¤Î½èÍý */
-      break;
-    case T_ARRAY:
-      /* ÇÛÎó¤Î½èÍý */
-      break;
-    default:
-      /* Îã³°¤òȯÀ¸¤µ¤»¤ë */
-      rb_raise(rb_eTypeError, "not valid value");
-      break;
-  }
-
-¤½¤ì¤È¥Ç¡¼¥¿¥¿¥¤¥×¤ò¥Á¥§¥Ã¥¯¤·¤Æ¡¤Àµ¤·¤¯¤Ê¤±¤ì¤ÐÎã³°¤òȯÀ¸¤¹
-¤ë´Ø¿ô¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-
-  void Check_Type(VALUE value, int type)
-
-¤³¤Î´Ø¿ô¤Ïvalue¤¬type¤Ç̵¤±¤ì¤Ð¡¤Îã³°¤òȯÀ¸¤µ¤»¤Þ¤¹¡¥°ú¿ô¤È
-¤·¤ÆÍ¿¤¨¤é¤ì¤¿VALUE¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤¬Àµ¤·¤¤¤«¤É¤¦¤«¥Á¥§¥Ã¥¯¤¹
-¤ë¤¿¤á¤Ë¤Ï¡¤¤³¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
-
-FIXNUM¤ÈNIL¤Ë´Ø¤·¤Æ¤Ï¤è¤ê¹â®¤ÊȽÊÌ¥Þ¥¯¥í¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-
-  FIXNUM_P(obj)
-  NIL_P(obj)
-
-1.3 VALUE¤òC¤Î¥Ç¡¼¥¿¤ËÊÑ´¹¤¹¤ë
-
-¥Ç¡¼¥¿¥¿¥¤¥×¤¬T_NIL¡¤T_FALSE¡¤T_TRUE¤Ç¤¢¤ë»þ¡¤¥Ç¡¼¥¿¤Ï¤½¤ì¤¾
-¤ìnil¡¤false¡¤true¤Ç¤¹¡¥¤³¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Ï¤Ò¤È
-¤Ä¤º¤Ä¤·¤«Â¸ºß¤·¤Þ¤»¤ó¡¥
-
-¥Ç¡¼¥¿¥¿¥¤¥×¤¬T_FIXNUM¤Î»þ¡¤¤³¤ì¤Ï31bit¤Þ¤¿¤Ï63bit¤Î¥µ¥¤¥º¤ò
-»ý¤ÄÀ°¿ô¤Ç¤¹¡¥long¤Î¥µ¥¤¥º¤¬32bit¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤¢¤ì¤Ð
-31bit¤Ë¡¤long¤Î¥µ¥¤¥º¤¬64bit¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤¢¤ì¤Ð63bit
-¤Ë¤Ê¤ê¤Þ¤¹. FIXNUM ¤ò C ¤ÎÀ°¿ô¤ËÊÑ´¹¤¹¤ë¤¿¤á¤Ë¤Ï¥Þ¥¯¥í
-¡ÖFIX2INT()¡×¤Þ¤¿¤Ï¡ÖFIX2LONG()¡×¤ò»È¤¤¤Þ¤¹¡¥¤³¤ì¤é¤Î¥Þ¥¯¥í
-¤ò»ÈÍѤ¹¤ëºÝ¤Ë¤Ï»öÁ°¤Ë¥Ç¡¼¥¿¥¿¥¤¥×¤¬FIXNUM¤Ç¤¢¤ë¤³¤È¤ò³Îǧ¤¹
-¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¤¬¡¤Èæ³ÓŪ¹â®¤ËÊÑ´¹¤ò¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥¤Þ
-¤¿¡¤¡ÖFIX2LONG()¡×¤ÏÎã³°¤òȯÀ¸¤·¤Þ¤»¤ó¤¬¡¤¡ÖFIX2INT()¡×¤ÏÊÑ
-´¹·ë²Ì¤¬int¤Î¥µ¥¤¥º¤Ë¼ý¤Þ¤é¤Ê¤¤¾ì¹ç¤Ë¤ÏÎã³°¤òȯÀ¸¤·¤Þ¤¹¡¥
-¤½¤ì¤«¤é¡¤FIXNUM¤Ë¸Â¤é¤ºRuby¤Î¥Ç¡¼¥¿¤òÀ°¿ô¤ËÊÑ´¹¤¹¤ë
-¡ÖNUM2INT()¡×¤ª¤è¤Ó¡ÖNUM2LONG()¡×¤È¤¤¤¦¥Þ¥¯¥í¤¬¤¢¤ê¤Þ¤¹¡¥¤³
-¤ì¤é¤Î¥Þ¥¯¥í¤Ï¥Þ¥¯¥í¤Ï¥Ç¡¼¥¿¥¿¥¤¥×¤Î¥Á¥§¥Ã¥¯Ìµ¤·¤Ç»È¤¨¤Þ¤¹
-(À°¿ô¤ËÊÑ´¹¤Ç¤­¤Ê¤¤¾ì¹ç¤Ë¤ÏÎã³°¤¬È¯À¸¤¹¤ë)¡¥Æ±Íͤ˥Á¥§¥Ã¥¯Ìµ
-¤Ç»È¤¨¤ëÊÑ´¹¥Þ¥¯¥í¤Ïdouble¤ò¼è¤ê½Ð¤¹¡ÖNUM2DBL()¡×¤¬¤¢¤ê¤Þ¤¹¡¥
-
-char* ¤ò¼è¤ê½Ð¤¹¾ì¹ç¡¤ StringValue() ¤È StringValuePtr() 
-¤ò»È¤¤¤Þ¤¹¡¥
-StringValue(var) ¤Ï var ¤¬ String 
-¤Ç¤¢¤ì¤Ð²¿¤â¤»¤º¡¤¤½¤¦¤Ç¤Ê¤±¤ì¤Ð var ¤ò var.to_str() ¤Î·ë²Ì
-¤ËÃÖ¤­´¹¤¨¤ë¥Þ¥¯¥í¡¤StringValuePtr(var) ¤ÏƱÍÍ¤Ë var ¤ò
-String ¤ËÃÖ¤­´¹¤¨¤Æ¤«¤é var ¤Î¥Ð¥¤¥ÈÎóɽ¸½¤ËÂФ¹¤ë char* ¤ò
-ÊÖ¤¹¥Þ¥¯¥í¤Ç¤¹¡¥var ¤ÎÆâÍƤòľÀÜÃÖ¤­´¹¤¨¤ë½èÍý¤¬Æþ¤ë¤Î¤Ç¡¤
-var ¤Ï lvalue ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
-¤Þ¤¿¡¤StringValuePtr() ¤ËÎà»÷¤·¤¿ StringValueCStr() ¤È¤¤¤¦¥Þ
-¥¯¥í¤â¤¢¤ê¤Þ¤¹¡¥StringValueCStr(var) ¤Ï var ¤ò String ¤ËÃÖ¤­
-´¹¤¨¤Æ¤«¤é var ¤Îʸ»úÎóɽ¸½¤ËÂФ¹¤ë char* ¤òÊÖ¤·¤Þ¤¹¡¥ÊÖ¤µ¤ì
-¤ëʸ»úÎó¤ÎËöÈø¤Ë¤Ï nul ʸ»ú¤¬Éղ䵤ì¤Þ¤¹¡¥¤Ê¤ª¡¤ÅÓÃæ¤Ë nul
-ʸ»ú¤¬´Þ¤Þ¤ì¤ë¾ì¹ç¤Ï ArgumentError ¤¬È¯À¸¤·¤Þ¤¹¡¥
-°ìÊý¡¤StringValuePtr() ¤Ç¤Ï¡¤ËöÈø¤Ë nul ʸ»ú¤¬¤¢¤ëÊݾڤϤʤ¯¡¤
-ÅÓÃæ¤Ë nul ʸ»ú¤¬´Þ¤Þ¤ì¤Æ¤¤¤ë²ÄǽÀ­¤â¤¢¤ê¤Þ¤¹¡¥
-
-¤½¤ì°Ê³°¤Î¥Ç¡¼¥¿¥¿¥¤¥×¤ÏÂбþ¤¹¤ëC¤Î¹½Â¤ÂΤ¬¤¢¤ê¤Þ¤¹¡¥Âбþ¤¹
-¤ë¹½Â¤ÂΤΤ¢¤ëVALUE¤Ï¤½¤Î¤Þ¤Þ¥­¥ã¥¹¥È(·¿ÊÑ´¹)¤¹¤ì¤Ð¹½Â¤ÂΤÎ
-¥Ý¥¤¥ó¥¿¤ËÊÑ´¹¤Ç¤­¤Þ¤¹¡¥
-
-¹½Â¤ÂΤϡÖstruct RXxxxx¡×¤È¤¤¤¦Ì¾Á°¤Çruby.h¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ
-¤¹¡¥Î㤨¤Ðʸ»úÎó¤Ï¡Östruct RString¡×¤Ç¤¹¡¥¼ÂºÝ¤Ë»È¤¦²ÄǽÀ­¤¬
-¤¢¤ë¤Î¤Ïʸ»úÎó¤ÈÇÛÎ󤯤餤¤À¤È»×¤¤¤Þ¤¹¡¥
-
-ruby.h¤Ç¤Ï¹½Â¤ÂΤإ­¥ã¥¹¥È¤¹¤ë¥Þ¥¯¥í¤â¡ÖRXXXXX()¡×(Á´ÉôÂçʸ
-»ú¤Ë¤·¤¿¤â¤Î)¤È¤¤¤¦Ì¾Á°¤ÇÄ󶡤µ¤ì¤Æ¤¤¤Þ¤¹(Îã: RSTRING())¡¥
-
-¹½Â¤ÂΤ«¤é¥Ç¡¼¥¿¤ò¼è¤ê½Ð¤¹¥Þ¥¯¥í¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡¥Ê¸»úÎó
-str¤ÎŤµ¤òÆÀ¤ë¤¿¤á¤Ë¤Ï¡ÖRSTRING_LEN(str)¡×¤È¤·¡¤Ê¸»úÎóstr¤ò
-char*¤È¤·¤ÆÆÀ¤ë¤¿¤á¤Ë¤Ï¡ÖRSTRING_PTR(str)¡×¤È¤·¤Þ¤¹¡¥ÇÛÎó¤Î
-¾ì¹ç¤Ë¤Ï¡¤¤½¤ì¤¾¤ì¡ÖRARRAY_LEN(ary)¡×¡¤¡ÖRARRAY_PTR(ary)¡×¤È
-¤Ê¤ê¤Þ¤¹¡¥
-
-Ruby¤Î¹½Â¤ÂΤòľÀÜ¥¢¥¯¥»¥¹¤¹¤ë»þ¤Ëµ¤¤ò¤Ä¤±¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¤³
-¤È¤Ï¡¤ÇÛÎó¤äʸ»úÎó¤Î¹½Â¤ÂΤÎÃæ¿È¤Ï»²¾È¤¹¤ë¤À¤±¤Ç¡¤Ä¾ÀÜÊѹ¹¤·
-¤Ê¤¤¤³¤È¤Ç¤¹¡¥Ä¾ÀÜÊѹ¹¤·¤¿¾ì¹ç¡¤¥ª¥Ö¥¸¥§¥¯¥È¤ÎÆâÍƤÎÀ°¹çÀ­¤¬
-¤È¤ì¤Ê¤¯¤Ê¤Ã¤Æ¡¤»×¤ï¤Ì¥Ð¥°¤Î¸¶°ø¤Ë¤Ê¤ê¤Þ¤¹¡¥
-
-1.4 C¤Î¥Ç¡¼¥¿¤òVALUE¤ËÊÑ´¹¤¹¤ë
-
-VALUE¤Î¼ÂºÝ¤Î¹½Â¤¤Ï
-
-  * FIXNUM¤Î¾ì¹ç
-
-    1bitº¸¥·¥Õ¥È¤·¤Æ¡¤LSB¤òΩ¤Æ¤ë¡¥
-
-  * ¤½¤Î¾¤Î¥Ý¥¤¥ó¥¿¤Î¾ì¹ç
-
-    ¤½¤Î¤Þ¤ÞVALUE¤Ë¥­¥ã¥¹¥È¤¹¤ë¡¥
-
-¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥¤è¤Ã¤Æ¡¤LSB¤ò¥Á¥§¥Ã¥¯¤¹¤ì¤ÐVALUE¤¬FIXNUM¤«¤É
-¤¦¤«¤ï¤«¤ë¤ï¤±¤Ç¤¹(¥Ý¥¤¥ó¥¿¤ÎLSB¤¬Î©¤Ã¤Æ¤¤¤Ê¤¤¤³¤È¤ò²¾Äꤷ¤Æ
-¤¤¤ë)¡¥
-
-¤Ç¤¹¤«¤é¡¤FIXNUM°Ê³°¤ÎRuby¤Î¥ª¥Ö¥¸¥§¥¯¥È¤Î¹½Â¤ÂΤÏñ¤ËVALUE
-¤Ë¥­¥ã¥¹¥È¤¹¤ë¤À¤±¤ÇVALUE¤ËÊÑ´¹½ÐÍè¤Þ¤¹¡¥¤¿¤À¤·¡¤Ç¤°Õ¤Î¹½Â¤
-ÂΤ¬VALUE¤Ë¥­¥ã¥¹¥È½ÐÍè¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥¥­¥ã¥¹¥È¤¹¤ë¤Î
-¤ÏRuby¤ÎÃΤäƤ¤¤ë¹½Â¤ÂÎ(ruby.h¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ëstruct RXxxx
-¤Î¤â¤Î)¤À¤±¤Ç¤¹¡¥
-
-FIXNUM¤Ë´Ø¤·¤Æ¤ÏÊÑ´¹¥Þ¥¯¥í¤ò·Ðͳ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥C¤ÎÀ°¿ô
-¤«¤éVALUE¤ËÊÑ´¹¤¹¤ë¥Þ¥¯¥í¤Ï°Ê²¼¤Î¤â¤Î¤¬¤¢¤ê¤Þ¤¹¡¥É¬Íפ˱þ¤¸
-¤Æ»È¤¤Ê¬¤±¤Æ¤¯¤À¤µ¤¤¡¥
-
-  INT2FIX()	¤â¤È¤ÎÀ°¿ô¤¬31bit¤Þ¤¿¤Ï63bit°ÊÆâ¤Ë¼ý¤Þ¤ë¼«¿®
-		¤¬¤¢¤ë»þ
-  INT2NUM()	Ǥ°Õ¤ÎÀ°¿ô¤«¤éVALUE¤Ø
-
-INT2NUM()¤ÏÀ°¿ô¤¬FIXNUM¤ÎÈϰϤ˼ý¤Þ¤é¤Ê¤¤¾ì¹ç¡¤Bignum¤ËÊÑ´¹
-¤·¤Æ¤¯¤ì¤Þ¤¹(¤¬¡¤¾¯¤·ÃÙ¤¤)¡¥
-
-1.5 Ruby¤Î¥Ç¡¼¥¿¤òÁàºî¤¹¤ë
-
-ÀèÄø¤â½Ò¤Ù¤¿Ä̤ꡤRuby¤Î¹½Â¤ÂΤò¥¢¥¯¥»¥¹¤¹¤ë»þ¤ËÆâÍƤι¹¿·¤ò
-¹Ô¤¦¤³¤È¤Ï´«¤á¤é¤ì¤Þ¤»¤ó¡¥¤Ç¡¤Ruby¤Î¥Ç¡¼¥¿¤òÁàºî¤¹¤ë»þ¤Ë¤Ï
-Ruby¤¬ÍÑ°Õ¤·¤Æ¤¤¤ë´Ø¿ô¤òÍѤ¤¤Æ¤¯¤À¤µ¤¤¡¥
-
-¤³¤³¤Ç¤Ï¤â¤Ã¤È¤â»È¤ï¤ì¤ë¤Ç¤¢¤í¤¦Ê¸»úÎó¤ÈÇÛÎó¤ÎÀ¸À®/Áàºî¤ò¹Ô
-¤¤´Ø¿ô¤ò¤¢¤²¤Þ¤¹(Á´Éô¤Ç¤Ï¤Ê¤¤¤Ç¤¹)¡¥
-
- ʸ»úÎó¤ËÂФ¹¤ë´Ø¿ô
-
-  rb_str_new(const char *ptr, long len)
-
-    ¿·¤·¤¤Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥
-
-  rb_str_new2(const char *ptr)
-  rb_str_new_cstr(const char *ptr)
-
-    C¤Îʸ»úÎ󤫤éRuby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥¤³¤Î´Ø¿ô¤Îµ¡Ç½¤Ï
-    rb_str_new(ptr, strlen(ptr))¤ÈƱÅù¤Ç¤¢¤ë¡¥
-
-  rb_tainted_str_new(const char *ptr, long len)
-
-    ±øÀ÷¥Þ¡¼¥¯¤¬Éղ䵤줿¿·¤·¤¤Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥³°Éô
-    ¤«¤é¤Î¥Ç¡¼¥¿¤Ë´ð¤Å¤¯Ê¸»úÎó¤Ë¤Ï±øÀ÷¥Þ¡¼¥¯¤¬Éղ䵤ì¤ë¤Ù¤­
-    ¤Ç¤¢¤ë¡¥
-
-  rb_tainted_str_new2(const char *ptr)
-  rb_tainted_str_new_cstr(const char *ptr)
-
-    C¤Îʸ»úÎ󤫤é±øÀ÷¥Þ¡¼¥¯¤¬Éղ䵤줿Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥
-
-  rb_sprintf(const char *format, ...)
-  rb_vsprintf(const char *format, va_list ap)
-
-    C¤Îʸ»úÎóformat¤È³¤¯°ú¿ô¤òprintf(3)¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤·¤¿¤¬¤Ã¤Æ
-    À°·Á¤·¡¤Ruby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë¡¥
-
-  rb_str_cat(VALUE str, const char *ptr, long len)
-
-    Ruby¤Îʸ»úÎóstr¤Ëlen¥Ð¥¤¥È¤Îʸ»úÎóptr¤òÄɲ乤롥
-
-  rb_str_cat2(VALUE str, const char* ptr)
-
-    Ruby¤Îʸ»úÎóstr¤ËC¤Îʸ»úÎóptr¤òÄɲ乤롥¤³¤Î´Ø¿ô¤Îµ¡Ç½¤Ï
-    rb_str_cat(str, ptr, strlen(ptr))¤ÈƱÅù¤Ç¤¢¤ë¡¥
-
-  rb_str_catf(VALUE str, const char* format, ...)
-  rb_str_vcatf(VALUE str, const char* format, va_list ap)
-
-    C¤Îʸ»úÎóformat¤È³¤¯°ú¿ô¤òprintf(3)¤Î¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë¤·¤¿¤¬¤Ã¤Æ
-    À°·Á¤·¡¤Ruby¤Îʸ»úÎóstr¤ËÄɲ乤롥¤³¤Î´Ø¿ô¤Îµ¡Ç½¤Ï¡¤¤½¤ì¤¾¤ì
-    rb_str_cat2(str, rb_sprintf(format, ...)) ¤ä
-    rb_str_cat2(str, rb_vsprintf(format, ap)) ¤ÈƱÅù¤Ç¤¢¤ë¡¥
-
-  rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
-  
-    »ØÄꤵ¤ì¤¿¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤ÇRuby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë.
-     
-  rb_usascii_str_new(const char *ptr, long len)
-  rb_usascii_str_new_cstr(const char *ptr)
-
-    ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¤¬US-ASCII¤ÎRuby¤Îʸ»úÎó¤òÀ¸À®¤¹¤ë.
-
-  rb_str_resize(VALUE str, long len)
-
-    Ruby¤Îʸ»úÎó¤Î¥µ¥¤¥º¤òlen¥Ð¥¤¥È¤ËÊѹ¹¤¹¤ë¡¥str¤ÎŤµ¤ÏÁ°
-    °Ê¤Æ¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤¡¥len¤¬¸µ¤ÎŤµ¤è¤ê¤âû
-    ¤¤»þ¤Ï¡¤len¥Ð¥¤¥È¤ò±Û¤¨¤¿Éôʬ¤ÎÆâÍƤϼΤƤé¤ì¤ë¡¥len¤¬¸µ
-    ¤ÎŤµ¤è¤ê¤âŤ¤»þ¤Ï¡¤¸µ¤ÎŤµ¤ò±Û¤¨¤¿Éôʬ¤ÎÆâÍƤÏÊݸ¤µ
-    ¤ì¤Ê¤¤¤Ç¥´¥ß¤Ë¤Ê¤ë¤À¤í¤¦¡¥¤³¤Î´Ø¿ô¤Î¸Æ¤Ó½Ð¤·¤Ë¤è¤Ã¤Æ
-    RSTRING_PTR(str)¤¬Êѹ¹¤µ¤ì¤ë¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤ËÃí°Õ¡¥
-
-  rb_str_set_len(VALUE str, long len)
-
-    Ruby¤Îʸ»úÎó¤Î¥µ¥¤¥º¤òlen¥Ð¥¤¥È¤Ë¥»¥Ã¥È¤¹¤ë¡¥str¤¬Êѹ¹²Ä
-    ǽ¤Ç¤Ê¤±¤ì¤ÐÎã³°¤¬È¯À¸¤¹¤ë¡¥RSTRING_LEN(str)¤È¤Ï̵´Ø·¸¤Ë¡¤
-    len¥Ð¥¤¥È¤Þ¤Ç¤ÎÆâÍƤÏÊݸ¤µ¤ì¤ë¡¥len¤Ïstr¤ÎÍÆÎ̤ò±Û¤¨¤Æ¤¤
-    ¤Æ¤Ï¤Ê¤é¤Ê¤¤¡¥
-
-
- ÇÛÎó¤ËÂФ¹¤ë´Ø¿ô
-
-  rb_ary_new()
-
-    Í×ÁǤ¬0¤ÎÇÛÎó¤òÀ¸À®¤¹¤ë¡¥
-
-  rb_ary_new2(long len)
-
-    Í×ÁǤ¬0¤ÎÇÛÎó¤òÀ¸À®¤¹¤ë¡¥lenÍ×ÁÇʬ¤ÎÎΰè¤ò¤¢¤é¤«¤¸¤á³ä¤ê
-    Åö¤Æ¤Æ¤ª¤¯¡¥
-
-  rb_ary_new3(long n, ...)
-
-    °ú¿ô¤Ç»ØÄꤷ¤¿nÍ×ÁǤò´Þ¤àÇÛÎó¤òÀ¸À®¤¹¤ë¡¥
-
-  rb_ary_new4(long n, VALUE *elts)
-
-    ÇÛÎó¤ÇÍ¿¤¨¤¿nÍ×ÁǤÎÇÛÎó¤òÀ¸À®¤¹¤ë¡¥
-
-  rb_ary_to_ary(VALUE obj)
-
-    ¥ª¥Ö¥¸¥§¥¯¥È¤òÇÛÎó¤ËÊÑ´¹¤¹¤ë.
-    Object#to_ary¤ÈƱÅù¤Ç¤¢¤ë.
-
- ¾¤Ë¤âÇÛÎó¤òÁàºî¤¹¤ë´Ø¿ô¤¬Â¿¿ô¤¢¤ë. ¤³¤ì¤é¤Ï
- °ú¿ôary¤ËÇÛÎó¤òÅϤµ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤. ¤µ¤â¤Ê¤¤¤È
- ¥³¥¢¤òÅǤ¯.
-
-  rb_ary_aref(argc, VALUE *argv, VALUE ary)
-
-    Array#[]¤ÈƱÅù.
-
-  rb_ary_entry(VALUE ary, long offset)
-
-    ary[offset]
-
-  rb_ary_subseq(VALUE ary, long beg, long len)
-
-    ary[beg, len]
-
-  rb_ary_push(VALUE ary, VALUE val)
-  rb_ary_pop(VALUE ary)
-  rb_ary_shift(VALUE ary)
-  rb_ary_unshift(VALUE ary, VALUE val)
-
-2¡¥Ruby¤Îµ¡Ç½¤ò»È¤¦
-
-¸¶ÍýŪ¤ËRuby¤Ç½ñ¤±¤ë¤³¤È¤ÏC¤Ç¤â½ñ¤±¤Þ¤¹¡¥Ruby¤½¤Î¤â¤Î¤¬C¤Çµ­
-½Ò¤µ¤ì¤Æ¤¤¤ë¤ó¤Ç¤¹¤«¤é¡¤ÅöÁ³¤È¤¤¤¨¤ÐÅöÁ³¤Ê¤ó¤Ç¤¹¤±¤É¡¥¤³¤³¤Ç
-¤ÏRuby¤Î³ÈÄ¥¤Ë»È¤¦¤³¤È¤¬Â¿¤¤¤À¤í¤¦¤Èͽ¬¤µ¤ì¤ëµ¡Ç½¤òÃæ¿´¤Ë¾Ò
-²ð¤·¤Þ¤¹¡¥
-
-2.1 Ruby¤Ëµ¡Ç½¤òÄɲ乤ë
-
-Ruby¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ë´Ø¿ô¤ò»È¤¨¤ÐRuby¥¤¥ó¥¿¥×¥ê¥¿¤Ë¿·¤·¤¤µ¡Ç½
-¤òÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹¡¥Ruby¤Ç¤Ï°Ê²¼¤Îµ¡Ç½¤òÄɲ乤ë´Ø¿ô¤¬
-Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-
- * ¥¯¥é¥¹¡¤¥â¥¸¥å¡¼¥ë
- * ¥á¥½¥Ã¥É¡¤Æðۥ᥽¥Ã¥É¤Ê¤É
- * Äê¿ô
-
-¤Ç¤Ï½ç¤Ë¾Ò²ð¤·¤Þ¤¹¡¥
-
-2.1.1 ¥¯¥é¥¹/¥â¥¸¥å¡¼¥ëÄêµÁ
-
-¥¯¥é¥¹¤ä¥â¥¸¥å¡¼¥ë¤òÄêµÁ¤¹¤ë¤¿¤á¤Ë¤Ï¡¤°Ê²¼¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
-
-  VALUE rb_define_class(const char *name, VALUE super)
-  VALUE rb_define_module(const char *name)
-
-¤³¤ì¤é¤Î´Ø¿ô¤Ï¿·¤·¤¯ÄêµÁ¤µ¤ì¤¿¥¯¥é¥¹¤ä¥â¥¸¥å¡¼¥ë¤òÊÖ¤·¤Þ¤¹¡¥
-¥á¥½¥Ã¥É¤äÄê¿ô¤ÎÄêµÁ¤Ë¤³¤ì¤é¤ÎÃͤ¬É¬ÍפʤΤǡ¤¤Û¤È¤ó¤É¤Î¾ì¹ç
-¤ÏÌá¤êÃͤòÊÑ¿ô¤Ë³ÊǼ¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ë¤Ç¤·¤ç¤¦¡¥
-
-¥¯¥é¥¹¤ä¥â¥¸¥å¡¼¥ë¤ò¾¤Î¥¯¥é¥¹¤ÎÆâÉô¤Ë¥Í¥¹¥È¤·¤ÆÄêµÁ¤¹¤ë»þ¤Ë
-¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
-
-  VALUE rb_define_class_under(VALUE outer, const char *name, VALUE super)
-  VALUE rb_define_module_under(VALUE outer, const char *name)
-
-2.1.2 ¥á¥½¥Ã¥É/Æðۥ᥽¥Ã¥ÉÄêµÁ
-
-¥á¥½¥Ã¥É¤äÆðۥ᥽¥Ã¥É¤òÄêµÁ¤¹¤ë¤Ë¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
-
-  void rb_define_method(VALUE klass, const char *name, 
-		        VALUE (*func)(), int argc)
-
-  void rb_define_singleton_method(VALUE object, const char *name, 
-			          VALUE (*func)(), int argc)
-
-
-Ç°¤Î¤¿¤áÀâÌÀ¤¹¤ë¤È¡ÖÆðۥ᥽¥Ã¥É¡×¤È¤Ï¡¤¤½¤ÎÆÃÄê¤Î¥ª¥Ö¥¸¥§¥¯
-¥È¤ËÂФ·¤Æ¤À¤±Í­¸ú¤Ê¥á¥½¥Ã¥É¤Ç¤¹¡¥Ruby¤Ç¤Ï¤è¤¯Smalltalk¤Ë¤ª
-¤±¤ë¥¯¥é¥¹¥á¥½¥Ã¥É¤È¤·¤Æ¡¤¥¯¥é¥¹¤ËÂФ¹¤ëÆðۥ᥽¥Ã¥É¤¬»È¤ï¤ì
-¤Þ¤¹¡¥
-
-¤³¤ì¤é¤Î´Ø¿ô¤Î argc¤È¤¤¤¦°ú¿ô¤ÏC¤Î´Ø¿ô¤ØÅϤµ¤ì¤ë°ú¿ô¤Î¿ô(¤È
-·Á¼°)¤ò·è¤á¤Þ¤¹¡¥argc¤¬0°Ê¾å¤Î»þ¤Ï´Ø¿ô¤Ë°ú¤­ÅϤ¹°ú¿ô¤Î¿ô¤ò°Õ
-Ì£¤·¤Þ¤¹¡¥16¸Ä°Ê¾å¤Î°ú¿ô¤Ï»È¤¨¤Þ¤»¤ó(¤¬¡¤Íפê¤Þ¤»¤ó¤è¤Í¡¤¤½
-¤ó¤Ê¤Ë)¡¥¼ÂºÝ¤Î´Ø¿ô¤Ë¤ÏÀèƬ¤Î°ú¿ô¤È¤·¤Æself¤¬Í¿¤¨¤é¤ì¤Þ¤¹¤Î
-¤Ç¡¤»ØÄꤷ¤¿¿ô¤è¤ê1¿¤¤°ú¿ô¤ò»ý¤Ä¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡¥
-
-argc¤¬Éé¤Î»þ¤Ï°ú¿ô¤Î¿ô¤Ç¤Ï¤Ê¤¯¡¤·Á¼°¤ò»ØÄꤷ¤¿¤³¤È¤Ë¤Ê¤ê¤Þ¤¹¡¥
-argc¤¬-1¤Î»þ¤Ï°ú¿ô¤òÇÛÎó¤ËÆþ¤ì¤ÆÅϤµ¤ì¤Þ¤¹¡¥argc¤¬-2¤Î»þ¤Ï°ú
-¿ô¤ÏRuby¤ÎÇÛÎó¤È¤·¤ÆÅϤµ¤ì¤Þ¤¹¡¥
-
-¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë´Ø¿ô¤Ï¤Þ¤À¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹. ¤Ò¤È¤Ä¤Ï¥á¥½¥Ã¥É
-̾¤È¤·¤ÆID¤ò¼è¤ê¤Þ¤¹. ID¤Ë¤Ä¤¤¤Æ¤Ï2.2.2¤ò»²¾È.
-
-  void rb_define_method_id(VALUE klass, ID name, 
-                           VALUE (*func)(ANYARGS), int argc)
-
-private/protected¤Ê¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¤Õ¤¿¤Ä¤Î´Ø¿ô¤¬¤¢¤ê¤Þ¤¹.
-
-  void rb_define_private_method(VALUE klass, const char *name, 
-				VALUE (*func)(), int argc)
-  void rb_define_protected_method(VALUE klass, const char *name, 
-			          VALUE (*func)(), int argc)
-
-private¥á¥½¥Ã¥É¤È¤Ï´Ø¿ô·Á¼°¤Ç¤·¤«¸Æ¤Ó½Ð¤¹¤³¤È¤Î½ÐÍè¤Ê¤¤¥á¥½¥Ã
-¥É¤Ç¤¹¡¥
-
-ºÇ¸å¤Ë¡¤ rb_define_module´Ø¿ô¤Ï¥â¥¸¥å¡¼¥ë´Ø¿ô¤òÄêµÁ¤·¤Þ¤¹¡¥
-¥â¥¸¥å¡¼¥ë´Ø¿ô¤È¤Ï¥â¥¸¥å¡¼¥ë¤ÎÆðۥ᥽¥Ã¥É¤Ç¤¢¤ê¡¤Æ±»þ¤Ë
-private¥á¥½¥Ã¥É¤Ç¤â¤¢¤ë¤â¤Î¤Ç¤¹¡¥Îã¤ò¤¢¤²¤ë¤ÈMath¥â¥¸¥å¡¼¥ë
-¤Îsqrt()¤Ê¤É¤¬¤¢¤²¤é¤ì¤Þ¤¹¡¥¤³¤Î¥á¥½¥Ã¥É¤Ï
-
-  Math.sqrt(4)
-
-¤È¤¤¤¦·Á¼°¤Ç¤â
-
-  include Math
-  sqrt(4)
-
-¤È¤¤¤¦·Á¼°¤Ç¤â»È¤¨¤Þ¤¹¡¥¥â¥¸¥å¡¼¥ë´Ø¿ô¤òÄêµÁ¤¹¤ë´Ø¿ô¤Ï°Ê²¼¤Î
-Ä̤ê¤Ç¤¹¡¥
-
-  void rb_define_module_function(VALUE module, const char *name, 
-		                 VALUE (*func)(), int argc)
-
-´Ø¿ôŪ¥á¥½¥Ã¥É(Kernel¥â¥¸¥å¡¼¥ë¤Îprivate method)¤òÄêµÁ¤¹¤ë¤¿
-¤á¤Î´Ø¿ô¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
-
-  void rb_define_global_function(const char *name, VALUE (*func)(), int argc)
-
-
-¥á¥½¥Ã¥É¤ÎÊÌ̾¤òÄêµÁ¤¹¤ë¤¿¤á¤Î´Ø¿ô¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
-
-  void rb_define_alias(VALUE module, const char* new, const char* old);
-
-°À­¤Î¼èÆÀ¡¦ÀßÄê¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¤Ë¤Ï
-
-  void rb_define_attr(VALUE klass, const char *name, int read, int write)
-
-¥¯¥é¥¹¥á¥½¥Ã¥Éallocate¤òÄêµÁ¤·¤¿¤êºï½ü¤·¤¿¤ê¤¹¤ë¤¿¤á¤Î´Ø¿ô¤Ï
-°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
-
-  void rb_define_alloc_func(VALUE klass, VALUE (*func)(VALUE klass));
-  void rb_undef_alloc_func(VALUE klass);
-
-func¤Ï¥¯¥é¥¹¤ò°ú¿ô¤È¤·¤Æ¼õ¤±¼è¤Ã¤Æ¡¤¿·¤·¤¯³ä¤êÅö¤Æ¤é¤ì¤¿¥¤¥ó
-¥¹¥¿¥ó¥¹¤òÊÖ¤µ¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡¥¤³¤Î¥¤¥ó¥¹¥¿¥ó¥¹¤Ï¡¤³°Éô¥ê
-¥½¡¼¥¹¤Ê¤É¤ò´Þ¤Þ¤Ê¤¤¡¤¤Ç¤­¤ë¤À¤±¡Ö¶õ¡×¤Î¤Þ¤Þ¤Ë¤·¤Æ¤ª¤¤¤¿¤Û¤¦
-¤¬¤è¤¤¤Ç¤·¤ç¤¦¡¥
-
-2.1.3 Äê¿ôÄêµÁ
-
-³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤¬É¬ÍפÊÄê¿ô¤Ï¤¢¤é¤«¤¸¤áÄêµÁ¤·¤Æ¤ª¤¤¤¿Êý¤¬Îɤ¤
-¤Ç¤·¤ç¤¦¡¥Äê¿ô¤òÄêµÁ¤¹¤ë´Ø¿ô¤ÏÆó¤Ä¤¢¤ê¤Þ¤¹¡¥
-
-  void rb_define_const(VALUE klass, const char *name, VALUE val)
-  void rb_define_global_const(const char *name, VALUE val)
-
-Á°¼Ô¤ÏÆÃÄê¤Î¥¯¥é¥¹/¥â¥¸¥å¡¼¥ë¤Ë°¤¹¤ëÄê¿ô¤òÄêµÁ¤¹¤ë¤â¤Î¡¤¸å
-¼Ô¤Ï¥°¥í¡¼¥Ð¥ë¤ÊÄê¿ô¤òÄêµÁ¤¹¤ë¤â¤Î¤Ç¤¹¡¥
-
-2.2 Ruby¤Îµ¡Ç½¤òC¤«¤é¸Æ¤Ó½Ð¤¹
-
-´û¤Ë¡Ø1.5 Ruby¤Î¥Ç¡¼¥¿¤òÁàºî¤¹¤ë¡Ù¤Ç°ìÉô¾Ò²ð¤·¤¿¤è¤¦¤Ê´Ø¿ô¤ò
-»È¤¨¤Ð¡¤Ruby¤Îµ¡Ç½¤ò¼Â¸½¤·¤Æ¤¤¤ë´Ø¿ô¤òľÀܸƤӽФ¹¤³¤È¤¬½ÐÍè
-¤Þ¤¹¡¥
-
-# ¤³¤Î¤è¤¦¤Ê´Ø¿ô¤Î°ìÍ÷ɽ¤Ï¤¤¤Þ¤Î¤È¤³¤í¤¢¤ê¤Þ¤»¤ó¡¥¥½¡¼¥¹¤ò¸«
-# ¤ë¤·¤«¤Ê¤¤¤Ç¤¹¤Í¡¥
-
-¤½¤ì°Ê³°¤Ë¤âRuby¤Îµ¡Ç½¤ò¸Æ¤Ó½Ð¤¹ÊýË¡¤Ï¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹¡¥
-
-2.2.1 Ruby¤Î¥×¥í¥°¥é¥à¤òeval¤¹¤ë
-
-C¤«¤éRuby¤Îµ¡Ç½¤ò¸Æ¤Ó½Ð¤¹¤â¤Ã¤È¤â´Êñ¤ÊÊýË¡¤È¤·¤Æ¡¤Ê¸»úÎó¤Ç
-Í¿¤¨¤é¤ì¤¿Ruby¤Î¥×¥í¥°¥é¥à¤òɾ²Á¤¹¤ë°Ê²¼¤Î´Ø¿ô¤¬¤¢¤ê¤Þ¤¹¡¥
-
-  VALUE rb_eval_string(const char *str)
-
-¤³¤Îɾ²Á¤Ï¸½ºß¤Î´Ä¶­¤Ç¹Ô¤ï¤ì¤Þ¤¹¡¥¤Ä¤Þ¤ê¡¤¸½ºß¤Î¥í¡¼¥«¥ëÊÑ¿ô
-¤Ê¤É¤ò¼õ¤±·Ñ¤®¤Þ¤¹¡¥
-
-ɾ²Á¤ÏÎã³°¤òȯÀ¸¤¹¤ë¤«¤â¤·¤ì¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Þ¤·¤ç¤¦. ¤è¤ê°ÂÁ´
-¤Ê´Ø¿ô¤â¤¢¤ê¤Þ¤¹.
-
-  VALUE rb_eval_string_protect(const char *str, int *state)
-
-¤³¤Î´Ø¿ô¤Ï¥¨¥é¡¼¤¬È¯À¸¤¹¤ë¤Ènil¤òÊÖ¤·¤Þ¤¹¡¥¤½¤·¤Æ¡¤À®¸ù»þ¤Ë¤Ï
-*state¤Ï¥¼¥í¤Ë¡¤¤µ¤â¤Ê¤¯¤ÐÈó¥¼¥í¤Ë¤Ê¤ê¤Þ¤¹¡¥
-
-
-2.2.2 ID¤Þ¤¿¤Ï¥·¥ó¥Ü¥ë
-
-C¤«¤éʸ»úÎó¤ò·Ðͳ¤»¤º¤ËRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤³¤È¤â¤Ç¤­¤Þ
-¤¹¡¥¤½¤ÎÁ°¤Ë¡¤Ruby¥¤¥ó¥¿¥×¥ê¥¿Æâ¤Ç¥á¥½¥Ã¥É¤äÊÑ¿ô̾¤ò»ØÄꤹ¤ë
-»þ¤Ë»È¤ï¤ì¤Æ¤¤¤ëID¤Ë¤Ä¤¤¤ÆÀâÌÀ¤·¤Æ¤ª¤­¤Þ¤·¤ç¤¦¡¥
-
-ID¤È¤ÏÊÑ¿ô̾¡¤¥á¥½¥Ã¥É̾¤òɽ¤¹À°¿ô¤Ç¤¹¡¥Ruby¤ÎÃæ¤Ç¤Ï
-
- :¼±ÊÌ»Ò
-¤Þ¤¿¤Ï
- :"Ǥ°Õ¤Îʸ»úÎó"
-
-¤Ç¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡¥C¤«¤é¤³¤ÎÀ°¿ô¤òÆÀ¤ë¤¿¤á¤Ë¤Ï´Ø¿ô
-
-  rb_intern(const char *name)
-
-¤ò»È¤¤¤Þ¤¹¡¥Ruby¤«¤é°ú¿ô¤È¤·¤ÆÍ¿¤¨¤é¤ì¤¿¥·¥ó¥Ü¥ë(¤Þ¤¿¤Ïʸ»ú
-Îó)¤òID¤ËÊÑ´¹¤¹¤ë¤Ë¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
-
-  rb_to_id(VALUE symbol)
-
-2.2.3 C¤«¤éRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹
-
-C¤«¤éʸ»úÎó¤ò·Ðͳ¤»¤º¤ËRuby¤Î¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¤¿¤á¤Ë¤Ï°Ê²¼
-¤Î´Ø¿ô¤ò»È¤¤¤Þ¤¹¡¥
-
-  VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
-
-¤³¤Î´Ø¿ô¤Ï¥ª¥Ö¥¸¥§¥¯¥Èrecv¤Îmid¤Ç»ØÄꤵ¤ì¤ë¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð
-¤·¤Þ¤¹¡¥¤½¤Î¾¤Ë°ú¿ô¤Î»ØÄê¤Î»ÅÊý¤¬°ã¤¦°Ê²¼¤Î´Ø¿ô¤â¤¢¤ê¤Þ¤¹¡¥
-
-  VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
-  VALUE rb_apply(VALUE recv, ID mid, VALUE args)
-
-apply¤Ë¤Ï°ú¿ô¤È¤·¤ÆRuby¤ÎÇÛÎó¤òÍ¿¤¨¤Þ¤¹¡¥
-
-2.2.4 ÊÑ¿ô/Äê¿ô¤ò»²¾È/¹¹¿·¤¹¤ë
-
-C¤«¤é´Ø¿ô¤ò»È¤Ã¤Æ»²¾È¡¦¹¹¿·¤Ç¤­¤ë¤Î¤Ï¡¤Äê¿ô¡¤¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ
-¿ô¤Ç¤¹¡¥Âç°èÊÑ¿ô¤Ï°ìÉô¤Î¤â¤Î¤ÏC¤ÎÂç°èÊÑ¿ô¤È¤·¤Æ¥¢¥¯¥»¥¹¤Ç¤­
-¤Þ¤¹¡¥¥í¡¼¥«¥ëÊÑ¿ô¤ò»²¾È¤¹¤ëÊýË¡¤Ï¸ø³«¤·¤Æ¤¤¤Þ¤»¤ó¡¥
-
-¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô¤ò»²¾È¡¦¹¹¿·¤¹¤ë´Ø¿ô¤Ï°Ê²¼¤ÎÄÌ
-¤ê¤Ç¤¹¡¥
-
-  VALUE rb_ivar_get(VALUE obj, ID id)
-  VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
-
-id¤Ïrb_intern()¤ÇÆÀ¤é¤ì¤ë¤â¤Î¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡¥
-
-Äê¿ô¤ò»²¾È¤¹¤ë¤Ë¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡¥
-
-  VALUE rb_const_get(VALUE obj, ID id)
-
-Äê¿ô¤ò¿·¤·¤¯ÄêµÁ¤¹¤ë¤¿¤á¤Ë¤Ï¡Ø2.1.3 Äê¿ôÄêµÁ¡Ù¤Ç¾Ò²ð¤µ
-¤ì¤Æ¤¤¤ë´Ø¿ô¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡¥
-
-3¡¥Ruby¤ÈC¤È¤Î¾ðÊó¶¦Í­
-
-C¸À¸ì¤ÈRuby¤Î´Ö¤Ç¾ðÊó¤ò¶¦Í­¤¹¤ëÊýË¡¤Ë¤Ä¤¤¤Æ²òÀ⤷¤Þ¤¹¡¥
-
-3.1 C¤«¤é»²¾È¤Ç¤­¤ëRuby¤ÎÄê¿ô
-
-°Ê²¼¤ÎRuby¤ÎÄê¿ô¤ÏC¤Î¥ì¥Ù¥ë¤«¤é»²¾È¤Ç¤­¤Þ¤¹¡¥
-
-  Qtrue
-  Qfalse
-
-    ¿¿µ¶ÃÍ¡¥Qfalse¤ÏC¸À¸ì¤Ç¤âµ¶¤È¤ß¤Ê¤µ¤ì¤Þ¤¹(¤Ä¤Þ¤ê0)¡¥
-
-  Qnil
-
-    C¸À¸ì¤«¤é¸«¤¿¡Önil¡×¡¥
-
-3.2 C¤ÈRuby¤Ç¶¦Í­¤µ¤ì¤ëÂç°èÊÑ¿ô
-
-C¤ÈRuby¤ÇÂç°èÊÑ¿ô¤ò»È¤Ã¤Æ¾ðÊó¤ò¶¦Í­¤Ç¤­¤Þ¤¹¡¥¶¦Í­¤Ç¤­¤ëÂç°è
-ÊÑ¿ô¤Ë¤Ï¤¤¤¯¤Ä¤«¤Î¼ïÎब¤¢¤ê¤Þ¤¹¡¥¤½¤Î¤Ê¤«¤Ç¤â¤Ã¤È¤âÎɤ¯»È¤ï
-¤ì¤ë¤È»×¤ï¤ì¤ë¤Î¤Ïrb_define_variable()¤Ç¤¹¡¥
-
-  void rb_define_variable(const char *name, VALUE *var)
-
-¤³¤Î´Ø¿ô¤ÏRuby¤ÈC¤È¤Ç¶¦Í­¤¹¤ëÂç°èÊÑ¿ô¤òÄêµÁ¤·¤Þ¤¹¡¥ÊÑ¿ô̾¤¬
-`$'¤Ç»Ï¤Þ¤é¤Ê¤¤»þ¤Ë¤Ï¼«Æ°Åª¤ËÄɲ䵤ì¤Þ¤¹¡¥¤³¤ÎÊÑ¿ô¤ÎÃͤòÊÑ
-¹¹¤¹¤ë¤È¼«Æ°Åª¤ËRuby¤ÎÂбþ¤¹¤ëÊÑ¿ô¤ÎÃͤâÊѤï¤ê¤Þ¤¹¡¥
-
-¤Þ¤¿Ruby¦¤«¤é¤Ï¹¹¿·¤Ç¤­¤Ê¤¤ÊÑ¿ô¤â¤¢¤ê¤Þ¤¹¡¥¤³¤Îread only¤Î
-ÊÑ¿ô¤Ï°Ê²¼¤Î´Ø¿ô¤ÇÄêµÁ¤·¤Þ¤¹¡¥
-
-  void rb_define_readonly_variable(const char *name, VALUE *var)
-
-¤³¤ì¤éÊÑ¿ô¤Î¾¤Ëhook¤ò¤Ä¤±¤¿Âç°èÊÑ¿ô¤òÄêµÁ¤Ç¤­¤Þ¤¹¡¥hookÉÕ¤­
-¤ÎÂç°èÊÑ¿ô¤Ï°Ê²¼¤Î´Ø¿ô¤òÍѤ¤¤ÆÄêµÁ¤·¤Þ¤¹¡¥hookÉÕ¤­Âç°èÊÑ¿ô¤Î
-Ãͤλ²¾È¤äÀßÄê¤Ïhook¤Ç¹Ô¤¦É¬Íפ¬¤¢¤ê¤Þ¤¹¡¥
-
-  void rb_define_hooked_variable(const char *name, VALUE *var,
-				 VALUE (*getter)(), void (*setter)())
-
-¤³¤Î´Ø¿ô¤ÏC¤Î´Ø¿ô¤Ë¤è¤Ã¤Æhook¤Î¤Ä¤±¤é¤ì¤¿Âç°èÊÑ¿ô¤òÄêµÁ¤·¤Þ
-¤¹¡¥ÊÑ¿ô¤¬»²¾È¤µ¤ì¤¿»þ¤Ë¤Ï´Ø¿ôgetter¤¬¡¤ÊÑ¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì
-¤¿»þ¤Ë¤Ï´Ø¿ôsetter¤¬¸Æ¤Ð¤ì¤ë¡¥hook¤ò»ØÄꤷ¤Ê¤¤¾ì¹ç¤Ïgetter¤ä
-setter¤Ë0¤ò»ØÄꤷ¤Þ¤¹¡¥
-# getter¤âsetter¤â0¤Ê¤é¤Ðrb_define_variable()¤ÈƱ¤¸¤Ë¤Ê¤ë¡¥
-
-getter¤Èsetter¤Î»ÅÍͤϼ¡¤ÎÄ̤ê¤Ç¤¹¡¥
-
-  VALUE (*getter)(ID id, VALUE *var);
-  void (*setter)(VALUE val, ID id, VALUE *var);
-
-
-¤½¤ì¤«¤é¡¤Âбþ¤¹¤ëC¤ÎÊÑ¿ô¤ò»ý¤¿¤Ê¤¤Ruby¤ÎÂç°èÊÑ¿ô¤òÄêµÁ¤¹¤ë
-¤³¤È¤â¤Ç¤­¤Þ¤¹. ¤½¤ÎÊÑ¿ô¤ÎÃͤϥե寴ؿô¤Î¤ß¤Ë¤è¤Ã¤Æ¼èÆÀ¡¦ÀßÄê
-¤µ¤ì¤Þ¤¹.
-
-  void rb_define_virtual_variable(const char *name,
-				  VALUE (*getter)(), void (*setter)())
-
-¤³¤Î´Ø¿ô¤Ë¤è¤Ã¤ÆÄêµÁ¤µ¤ì¤¿Ruby¤ÎÂç°èÊÑ¿ô¤¬»²¾È¤µ¤ì¤¿»þ¤Ë¤Ï
-getter¤¬¡¤ÊÑ¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì¤¿»þ¤Ë¤Ïsetter¤¬¸Æ¤Ð¤ì¤Þ¤¹¡¥
-
-getter¤Èsetter¤Î»ÅÍͤϰʲ¼¤ÎÄ̤ê¤Ç¤¹¡¥
-
-  (*getter)(ID id);
-  (*setter)(VALUE val, ID id);
-
-3.3 C¤Î¥Ç¡¼¥¿¤òRuby¥ª¥Ö¥¸¥§¥¯¥È¤Ë¤¹¤ë
-
-C¤ÎÀ¤³¦¤ÇÄêµÁ¤µ¤ì¤¿¥Ç¡¼¥¿(¹½Â¤ÂÎ)¤òRuby¤Î¥ª¥Ö¥¸¥§¥¯¥È¤È¤·¤Æ
-¼è¤ê°·¤¤¤¿¤¤¾ì¹ç¤¬¤¢¤ê¤¨¤Þ¤¹¡¥¤³¤Î¤è¤¦¤Ê¾ì¹ç¤Ë¤Ï¡¤Data¤È¤¤¤¦
-Ruby¥ª¥Ö¥¸¥§¥¯¥È¤ËC¤Î¹½Â¤ÂÎ(¤Ø¤Î¥Ý¥¤¥ó¥¿)¤ò¤¯¤ë¤à¤³¤È¤ÇRuby
-¥ª¥Ö¥¸¥§¥¯¥È¤È¤·¤Æ¼è¤ê°·¤¨¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡¥
-
-Data¥ª¥Ö¥¸¥§¥¯¥È¤òÀ¸À®¤·¤Æ¹½Â¤ÂΤòRuby¥ª¥Ö¥¸¥§¥¯¥È¤Ë¥«¥×¥»¥ë
-²½¤¹¤ë¤¿¤á¤Ë¤Ï¡¤°Ê²¼¤Î¥Þ¥¯¥í¤ò»È¤¤¤Þ¤¹¡¥
-
-  Data_Wrap_Struct(klass, mark, free, ptr)
-
-¤³¤Î¥Þ¥¯¥í¤ÎÌá¤êÃͤÏÀ¸À®¤µ¤ì¤¿Data¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¹¡¥
-
-klass¤Ï¤³¤ÎData¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¯¥é¥¹¤Ç¤¹¡¥ptr¤Ï¥«¥×¥»¥ë²½¤¹¤ë
-C¤Î¹½Â¤ÂΤؤΥݥ¤¥ó¥¿¤Ç¤¹¡¥mark¤Ï¤³¤Î¹½Â¤ÂΤ¬Ruby¤Î¥ª¥Ö¥¸¥§
-¥¯¥È¤Ø¤Î»²¾È¤¬¤¢¤ë»þ¤Ë»È¤¦´Ø¿ô¤Ç¤¹¡¥¤½¤Î¤è¤¦¤Ê»²¾È¤ò´Þ¤Þ¤Ê¤¤
-»þ¤Ë¤Ï0¤ò»ØÄꤷ¤Þ¤¹¡¥
-
-# ¤½¤Î¤è¤¦¤Ê»²¾È¤Ï´«¤á¤é¤ì¤Þ¤»¤ó¡¥
-
-free¤Ï¤³¤Î¹½Â¤ÂΤ¬¤â¤¦ÉÔÍפˤʤä¿»þ¤Ë¸Æ¤Ð¤ì¤ë´Ø¿ô¤Ç¤¹¡¥¤³¤Î
-´Ø¿ô¤¬¥¬¡¼¥Ù¡¼¥¸¥³¥ì¥¯¥¿¤«¤é¸Æ¤Ð¤ì¤Þ¤¹¡¥¤³¤ì¤¬-1¤Î¾ì¹ç¤Ï¡¤Ã±
-½ã¤Ë³«Êü¤µ¤ì¤Þ¤¹¡¥
-
-mark¤ª¤è¤Ófree´Ø¿ô¤ÏGC¼Â¹ÔÃæ¤Ë¸Æ¤Ó½Ð¤µ¤ì¤Þ¤¹.
-¤Ê¤ª, GC¼Â¹ÔÃæ¤ÏRuby¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¢¥í¥±¡¼¥·¥ç¥ó¤Ï¶Ø»ß¤µ¤ì¤Þ
-¤¹. ¤è¤Ã¤Æ, mark¤ª¤è¤Ófree´Ø¿ô¤ÇRuby¥ª¥Ö¥¸¥§¥¯¥È¤Î¥¢¥í¥±¡¼¥·
-¥ç¥ó¤Ï¹Ô¤ï¤Ê¤¤¤Ç¤¯¤À¤µ¤¤.
-
-C¤Î¹½Â¤ÂΤγäÅö¤ÈData¥ª¥Ö¥¸¥§¥¯¥È¤ÎÀ¸À®¤òƱ»þ¤Ë¹Ô¤¦¥Þ¥¯¥í¤È
-¤·¤Æ°Ê²¼¤Î¤â¤Î¤¬Ä󶡤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-
-  Data_Make_Struct(klass, type, mark, free, sval)
-
-¤³¤Î¥Þ¥¯¥í¤ÎÌá¤êÃͤÏÀ¸À®¤µ¤ì¤¿Data¥ª¥Ö¥¸¥§¥¯¥È¤Ç¤¹¡¥
-
-klass, mark, free¤ÏData_Wrap_Struct¤ÈƱ¤¸Æ¯¤­¤ò¤·¤Þ¤¹¡¥type
-¤Ï³ä¤êÅö¤Æ¤ëC¹½Â¤ÂΤη¿¤Ç¤¹¡¥³ä¤êÅö¤Æ¤é¤ì¤¿¹½Â¤ÂΤÏÊÑ¿ôsval
-¤ËÂåÆþ¤µ¤ì¤Þ¤¹¡¥¤³¤ÎÊÑ¿ô¤Î·¿¤Ï (type*) ¤Ç¤¢¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
-
-Data¥ª¥Ö¥¸¥§¥¯¥È¤«¤é¥Ý¥¤¥ó¥¿¤ò¼è¤ê½Ð¤¹¤Î¤Ï°Ê²¼¤Î¥Þ¥¯¥í¤òÍѤ¤
-¤Þ¤¹¡¥
-
-  Data_Get_Struct(obj, type, sval)
-
-C¤Î¹½Â¤ÂΤؤΥݥ¤¥ó¥¿¤ÏÊÑ¿ôsval¤ËÂåÆþ¤µ¤ì¤Þ¤¹¡¥
-
-¤³¤ì¤é¤ÎData¤Î»È¤¤Êý¤Ï¤Á¤ç¤Ã¤Èʬ¤«¤ê¤Ë¤¯¤¤¤Î¤Ç¡¤¸å¤ÇÀâÌÀ¤¹¤ë
-ÎãÂê¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
-4¡¥ÎãÂê - dbm¥Ñ¥Ã¥±¡¼¥¸¤òºî¤ë
-
-¤³¤³¤Þ¤Ç¤ÎÀâÌÀ¤Ç¤È¤ê¤¢¤¨¤º³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ïºî¤ì¤ë¤Ï¤º¤Ç¤¹¡¥
-Ruby¤Îext¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¹¤Ç¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ëdbm¥é¥¤¥Ö¥é¥ê¤òÎã¤Ë
-¤·¤ÆÃʳ¬Åª¤ËÀâÌÀ¤·¤Þ¤¹¡¥
-
-(1) ¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤ë
-
-  % mkdir ext/dbm
-
-Ruby 1.1¤«¤é¤ÏǤ°Õ¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¥À¥¤¥Ê¥ß¥Ã¥¯¥é¥¤¥Ö¥é¥ê¤òºî
-¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤·¤¿¡¥Ruby¤ËÀÅŪ¤Ë¥ê¥ó¥¯¤¹¤ë¾ì¹ç¤Ë
-¤ÏRuby¤òŸ³«¤·¤¿¥Ç¥£¥ì¥¯¥È¥ê¤Î²¼¡¤ext¥Ç¥£¥ì¥¯¥È¥ê¤ÎÃæ¤Ë³ÈÄ¥
-¥é¥¤¥Ö¥é¥êÍѤΥǥ£¥ì¥¯¥È¥ê¤òºî¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥Ì¾Á°¤ÏŬÅö¤Ë
-Áª¤ó¤Ç¹½¤¤¤Þ¤»¤ó¡¥
-
-(2) À߷פ¹¤ë
-
-¤Þ¤¢¡¤ÅöÁ³¤Ê¤ó¤Ç¤¹¤±¤É¡¤¤É¤¦¤¤¤¦µ¡Ç½¤ò¼Â¸½¤¹¤ë¤«¤É¤¦¤«¤Þ¤ºÀß
-·×¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥¤É¤ó¤Ê¥¯¥é¥¹¤ò¤Ä¤¯¤ë¤«¡¤¤½¤Î¥¯¥é¥¹¤Ë¤Ï
-¤É¤ó¤Ê¥á¥½¥Ã¥É¤¬¤¢¤ë¤«¡¤¥¯¥é¥¹¤¬Ä󶡤¹¤ëÄê¿ô¤Ê¤É¤Ë¤Ä¤¤¤ÆÀß·×
-¤·¤Þ¤¹¡¥
-
-(3) C¥³¡¼¥É¤ò½ñ¤¯
-
-³ÈÄ¥¥é¥¤¥Ö¥é¥êËÜÂΤȤʤëC¸À¸ì¤Î¥½¡¼¥¹¤ò½ñ¤­¤Þ¤¹¡¥C¸À¸ì¤Î¥½¡¼
-¥¹¤¬¤Ò¤È¤Ä¤Î»þ¤Ë¤Ï¡Ö¥é¥¤¥Ö¥é¥ê̾.c¡×¤òÁª¤Ö¤ÈÎɤ¤¤Ç¤·¤ç¤¦¡¥C
-¸À¸ì¤Î¥½¡¼¥¹¤¬Ê£¿ô¤Î¾ì¹ç¤Ë¤ÏµÕ¤Ë¡Ö¥é¥¤¥Ö¥é¥ê̾.c¡×¤È¤¤¤¦¥Õ¥¡
-¥¤¥ë̾¤ÏÈò¤±¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤È¥â¥¸¥å¡¼
-¥ëÀ¸À®»þ¤ËÃæ´ÖŪ¤ËÀ¸À®¤µ¤ì¤ë¡Ö¥é¥¤¥Ö¥é¥ê̾.o¡×¤È¤¤¤¦¥Õ¥¡¥¤¥ë
-¤È¤¬¾×Æͤ¹¤ë¤«¤é¤Ç¤¹¡¥¤Þ¤¿¡¤¸å½Ò¤¹¤ë mkmf ¥é¥¤¥Ö¥é¥ê¤Î¤¤¤¯¤Ä
-¤«¤Î´Ø¿ô¤¬¥³¥ó¥Ñ¥¤¥ë¤òÍפ¹¤ë¥Æ¥¹¥È¤Î¤¿¤á¤Ë¡Öconftest.c¡×¤È¤¤
-¤¦¥Õ¥¡¥¤¥ë̾¤ò»ÈÍѤ¹¤ë¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡¥¥½¡¼¥¹¥Õ¥¡¥¤¥ë
-̾¤È¤·¤Æ¡Öconftest.c¡×¤ò»ÈÍѤ·¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó¡¥
-
-Ruby¤Ï³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ò¥í¡¼¥É¤¹¤ë»þ¤Ë¡ÖInit_¥é¥¤¥Ö¥é¥ê̾¡×¤È
-¤¤¤¦´Ø¿ô¤ò¼«Æ°Åª¤Ë¼Â¹Ô¤·¤Þ¤¹¡¥dbm¥é¥¤¥Ö¥é¥ê¤Î¾ì¹ç¡ÖInit_dbm¡×
-¤Ç¤¹¡¥¤³¤Î´Ø¿ô¤ÎÃæ¤Ç¥¯¥é¥¹¡¤¥â¥¸¥å¡¼¥ë¡¤¥á¥½¥Ã¥É¡¤Äê¿ô¤Ê¤É¤Î
-ÄêµÁ¤ò¹Ô¤¤¤Þ¤¹¡¥dbm.c¤«¤é°ìÉô°úÍѤ·¤Þ¤¹¡¥
-
---
-void
-Init_dbm(void)
-{
-    /* DBM¥¯¥é¥¹¤òÄêµÁ¤¹¤ë */
-    cDBM = rb_define_class("DBM", rb_cObject);
-    /* DBM¤ÏEnumerate¥â¥¸¥å¡¼¥ë¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë */
-    rb_include_module(cDBM, rb_mEnumerable);
-
-    /* DBM¥¯¥é¥¹¤Î¥¯¥é¥¹¥á¥½¥Ã¥Éopen(): °ú¿ô¤ÏC¤ÎÇÛÎó¤Ç¼õ¤±¤ë */
-    rb_define_singleton_method(cDBM, "open", fdbm_s_open, -1);
-
-    /* DBM¥¯¥é¥¹¤Î¥á¥½¥Ã¥Éclose(): °ú¿ô¤Ï¤Ê¤· */
-    rb_define_method(cDBM, "close", fdbm_close, 0);
-    /* DBM¥¯¥é¥¹¤Î¥á¥½¥Ã¥É[]: °ú¿ô¤Ï1¸Ä */
-    rb_define_method(cDBM, "[]", fdbm_fetch, 1);
-		:
-
-    /* DBM¥Ç¡¼¥¿¤ò³ÊǼ¤¹¤ë¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô̾¤Î¤¿¤á¤ÎID */
-    id_dbm = rb_intern("dbm");
-}
---
-
-DBM¥é¥¤¥Ö¥é¥ê¤Ïdbm¤Î¥Ç¡¼¥¿¤ÈÂбþ¤¹¤ë¥ª¥Ö¥¸¥§¥¯¥È¤Ë¤Ê¤ë¤Ï¤º¤Ç
-¤¹¤«¤é¡¤C¤ÎÀ¤³¦¤Îdbm¤òRuby¤ÎÀ¤³¦¤Ë¼è¤ê¹þ¤àɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
-
-
-dbm.c¤Ç¤ÏData_Make_Struct¤ò°Ê²¼¤Î¤è¤¦¤Ë»È¤Ã¤Æ¤¤¤Þ¤¹¡¥
-
---
-struct dbmdata {
-    int  di_size;
-    DBM *di_dbm;
-};
-
-
-obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
---
-
-¤³¤³¤Ç¤Ïdbmstruct¹½Â¤ÂΤؤΥݥ¤¥ó¥¿¤òData¤Ë¥«¥×¥»¥ë²½¤·¤Æ¤¤
-¤Þ¤¹¡¥DBM*¤òľÀÜ¥«¥×¥»¥ë²½¤·¤Ê¤¤¤Î¤Ïclose()¤·¤¿»þ¤Î½èÍý¤ò¹Í
-¤¨¤Æ¤Î¤³¤È¤Ç¤¹¡¥
-
-Data¥ª¥Ö¥¸¥§¥¯¥È¤«¤édbmstruct¹½Â¤ÂΤΥݥ¤¥ó¥¿¤ò¼è¤ê½Ð¤¹¤¿¤á
-¤Ë°Ê²¼¤Î¥Þ¥¯¥í¤ò»È¤Ã¤Æ¤¤¤Þ¤¹¡¥
-
---
-#define GetDBM(obj, dbmp) {\
-    Data_Get_Struct(obj, struct dbmdata, dbmp);\
-    if (dbmp->di_dbm == 0) closed_dbm();\
-}
---
-
-¤Á¤ç¤Ã¤ÈÊ£»¨¤Ê¥Þ¥¯¥í¤Ç¤¹¤¬¡¤Íפ¹¤ë¤Ëdbmdata¹½Â¤ÂΤΥݥ¤¥ó¥¿
-¤Î¼è¤ê½Ð¤·¤È¡¤close¤µ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¤Î¥Á¥§¥Ã¥¯¤ò¤Þ¤È¤á¤Æ¤¤
-¤ë¤À¤±¤Ç¤¹¡¥
-
-DBM¥¯¥é¥¹¤Ë¤Ï¤¿¤¯¤µ¤ó¥á¥½¥Ã¥É¤¬¤¢¤ê¤Þ¤¹¤¬¡¤Ê¬Îह¤ë¤È3¼ïÎà¤Î
-°ú¿ô¤Î¼õ¤±Êý¤¬¤¢¤ê¤Þ¤¹¡¥¤Ò¤È¤Ä¤Ï°ú¿ô¤Î¿ô¤¬¸ÇÄê¤Î¤â¤Î¤Ç¡¤Îã¤È
-¤·¤Æ¤Ïdelete¥á¥½¥Ã¥É¤¬¤¢¤ê¤Þ¤¹¡¥delete¥á¥½¥Ã¥É¤ò¼ÂÁõ¤·¤Æ¤¤¤ë
-fdbm_delete()¤Ï¤³¤Î¤è¤¦¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
-
---
-static VALUE
-fdbm_delete(VALUE obj, VALUE keystr)
-{
-	:
-}
---
-
-°ú¿ô¤Î¿ô¤¬¸ÇÄê¤Î¥¿¥¤¥×¤ÏÂè1°ú¿ô¤¬self¡¤Âè2°ú¿ô°Ê¹ß¤¬¥á¥½¥Ã¥É
-¤Î°ú¿ô¤È¤Ê¤ê¤Þ¤¹¡¥
-
-°ú¿ô¤Î¿ô¤¬ÉÔÄê¤Î¤â¤Î¤ÏC¤ÎÇÛÎó¤Ç¼õ¤±¤ë¤â¤Î¤ÈRuby¤ÎÇÛÎó¤Ç¼õ¤±
-¤ë¤â¤Î¤È¤¬¤¢¤ê¤Þ¤¹¡¥dbm¥é¥¤¥Ö¥é¥ê¤ÎÃæ¤Ç¡¤C¤ÎÇÛÎó¤Ç¼õ¤±¤ë¤â¤Î
-¤ÏDBM¤Î¥¯¥é¥¹¥á¥½¥Ã¥É¤Ç¤¢¤ëopen()¤Ç¤¹¡¥¤³¤ì¤ò¼ÂÁõ¤·¤Æ¤¤¤ë´Ø
-¿ôfdbm_s_open()¤Ï¤³¤¦¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡¥
-
---
-static VALUE
-fdbm_s_open(int argc, VALUE *argv, VALUE klass)
-{
-	:
-    if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-	mode = 0666;		/* default value */
-    }
-	:
-}
---
-
-¤³¤Î¥¿¥¤¥×¤Î´Ø¿ô¤ÏÂè1°ú¿ô¤¬Í¿¤¨¤é¤ì¤¿°ú¿ô¤Î¿ô¡¤Âè2°ú¿ô¤¬Í¿¤¨
-¤é¤ì¤¿°ú¿ô¤ÎÆþ¤Ã¤Æ¤¤¤ëÇÛÎó¤Ë¤Ê¤ê¤Þ¤¹¡¥self¤ÏÂè3°ú¿ô¤È¤·¤ÆÍ¿
-¤¨¤é¤ì¤Þ¤¹¡¥
-
-¤³¤ÎÇÛÎó¤ÇÍ¿¤¨¤é¤ì¤¿°ú¿ô¤ò²òÀϤ¹¤ë¤¿¤á¤Î´Ø¿ô¤¬open()¤Ç¤â»È¤ï
-¤ì¤Æ¤¤¤ërb_scan_args()¤Ç¤¹¡¥Âè3°ú¿ô¤Ë»ØÄꤷ¤¿¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë½¾
-¤¤¡¤Âè4ÊÑ¿ô°Ê¹ß¤Ë»ØÄꤷ¤¿VALUE¤Ø¤Î»²¾È¤ËÃͤòÂåÆþ¤·¤Æ¤¯¤ì¤Þ
-¤¹¡¥
-
-
-°ú¿ô¤òRuby¤ÎÇÛÎó¤È¤·¤Æ¼õ¤±¼è¤ë¥á¥½¥Ã¥É¤ÎÎã¤Ë¤Ï
-Thread#initialize¤¬¤¢¤ê¤Þ¤¹¡¥¼ÂÁõ¤Ï¤³¤¦¤Ç¤¹¡¥
-
---
-static VALUE
-thread_initialize(VALUE thread, VALUE args)
-{
-	:
-}
---
-
-Âè1°ú¿ô¤Ïself¡¤Âè2°ú¿ô¤ÏRuby¤ÎÇÛÎó¤Ç¤¹¡¥
-
-** Ãí°Õ»ö¹à
-
-Ruby¤È¶¦Í­¤Ï¤·¤Ê¤¤¤¬Ruby¤Î¥ª¥Ö¥¸¥§¥¯¥È¤ò³ÊǼ¤¹¤ë²ÄǽÀ­¤Î¤¢¤ë
-C¤ÎÂç°èÊÑ¿ô¤Ï°Ê²¼¤Î´Ø¿ô¤ò»È¤Ã¤ÆRuby¥¤¥ó¥¿¥×¥ê¥¿¤ËÊÑ¿ô¤Î¸ºß
-¤ò¶µ¤¨¤Æ¤¢¤²¤Æ¤¯¤À¤µ¤¤¡¥¤Ç¤Ê¤¤¤ÈGC¤Ç¥È¥é¥Ö¥ë¤òµ¯¤³¤·¤Þ¤¹¡¥
-
-  void rb_global_variable(VALUE *var)
-
-(4) extconf.rb¤òÍÑ°Õ¤¹¤ë
-
-Makefile¤òºî¤ë¾ì¹ç¤Î¿÷·¿¤Ë¤Ê¤ëextconf.rb¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤òºî¤ê
-¤Þ¤¹¡¥extconf.rb¤Ï¥é¥¤¥Ö¥é¥ê¤Î¥³¥ó¥Ñ¥¤¥ë¤ËɬÍפʾò·ï¤Î¥Á¥§¥Ã
-¥¯¤Ê¤É¤ò¹Ô¤¦¤³¤È¤¬ÌÜŪ¤Ç¤¹¡¥¤Þ¤º¡¤
-
-  require 'mkmf'
-
-¤òextconf.rb¤ÎÀèƬ¤ËÃÖ¤­¤Þ¤¹¡¥extconf.rb¤ÎÃæ¤Ç¤Ï°Ê²¼¤ÎRuby´Ø
-¿ô¤ò»È¤¦¤³¤È¤¬½ÐÍè¤Þ¤¹¡¥
-
-  have_library(lib, func): ¥é¥¤¥Ö¥é¥ê¤Î¸ºß¥Á¥§¥Ã¥¯
-  have_func(func, header): ´Ø¿ô¤Î¸ºß¥Á¥§¥Ã¥¯
-  have_header(header): ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤Î¸ºß¥Á¥§¥Ã¥¯
-  create_makefile(target): Makefile¤ÎÀ¸À®
-
-°Ê²¼¤ÎÊÑ¿ô¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡¥
-
-  $CFLAGS: ¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-O¤Ê¤É)
-  $CPPFLAGS: ¥×¥ê¥×¥í¥»¥Ã¥µ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-I¤ä-D¤Ê¤É)
-  $LDFLAGS: ¥ê¥ó¥¯»þ¤ËÄɲÃŪ¤Ë»ØÄꤹ¤ë¥Õ¥é¥°(-L¤Ê¤É)
-  $objs: ¥ê¥ó¥¯¤µ¤ì¤ë¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë̾¤Î¥ê¥¹¥È
-
-¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë¤Î¥ê¥¹¥È¤Ï¡¤Ä̾ï¤Ï¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤ò¸¡º÷¤·
-¤Æ¼«Æ°Åª¤ËÀ¸À®¤µ¤ì¤Þ¤¹¤¬¡¤make¤ÎÅÓÃæ¤Ç¥½¡¼¥¹¤òÀ¸À®¤¹¤ë¤è¤¦¤Ê
-¾ì¹ç¤ÏÌÀ¼¨Åª¤Ë»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡¥
-
-¥é¥¤¥Ö¥é¥ê¤ò¥³¥ó¥Ñ¥¤¥ë¤¹¤ë¾ò·ï¤¬Â·¤ï¤º¡¤¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥³¥ó
-¥Ñ¥¤¥ë¤·¤Ê¤¤»þ¤Ë¤Ïcreate_makefile¤ò¸Æ¤Ð¤Ê¤±¤ì¤ÐMakefile¤ÏÀ¸
-À®¤µ¤ì¤º¡¤¥³¥ó¥Ñ¥¤¥ë¤â¹Ô¤ï¤ì¤Þ¤»¤ó¡¥
-
-(5) depend¤òÍÑ°Õ¤¹¤ë
-
-¤â¤·¡¤¥Ç¥£¥ì¥¯¥È¥ê¤Ëdepend¤È¤¤¤¦¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹¤ì¤Ð¡¤
-Makefile¤¬°Í¸´Ø·¸¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤¯¤ì¤Þ¤¹¡¥
-
-  % gcc -MM *.c > depend
-
-¤Ê¤É¤Çºî¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡¥¤¢¤Ã¤Æ»¤Ï̵¤¤¤Ç¤·¤ç¤¦¡¥
-
-(6) Makefile¤òÀ¸À®¤¹¤ë
-
-Makefile¤ò¼ÂºÝ¤ËÀ¸À®¤¹¤ë¤¿¤á¤Ë¤Ï
-
-  ruby extconf.rb
-
-¤È¤·¤Þ¤¹¡¥extconf.rb¤Ë require 'mkmf' ¤Î¹Ô¤¬¤Ê¤¤¾ì¹ç¤Ë¤Ï¥¨¥é¡¼
-¤Ë¤Ê¤ê¤Þ¤¹¤Î¤Ç¡¤°ú¿ô¤òÄɲä·¤Æ
-
-  ruby -r mkmf extconf.rb
-
-¤È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
-site_ruby ¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤¯¡¤
-vendor_ruby ¥Ç¥£¥ì¥¯¥È¥ê¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¾ì¹ç¤Ë¤Ï
-°Ê²¼¤Î¤è¤¦¤Ë --vendor ¥ª¥×¥·¥ç¥ó¤ò²Ã¤¨¤Æ¤¯¤À¤µ¤¤¡¥
-
-  ruby extconf.rb --vendor
-
-¥Ç¥£¥ì¥¯¥È¥ê¤òext°Ê²¼¤ËÍÑ°Õ¤·¤¿¾ì¹ç¤Ë¤ÏRubyÁ´ÂΤÎmake¤Î»þ¤Ë
-¼«Æ°Åª¤ËMakefile¤¬À¸À®¤µ¤ì¤Þ¤¹¤Î¤Ç¡¤¤³¤Î¥¹¥Æ¥Ã¥×¤ÏÉÔÍפǤ¹¡¥
-
-(7) make¤¹¤ë
-
-ưŪ¥ê¥ó¥¯¥é¥¤¥Ö¥é¥ê¤òÀ¸À®¤¹¤ë¾ì¹ç¤Ë¤Ï¤½¤Î¾ì¤Çmake¤·¤Æ¤¯¤À¤µ
-¤¤¡¥É¬ÍפǤ¢¤ì¤Ð make install ¤Ç¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡¥
-
-ext°Ê²¼¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤òÍÑ°Õ¤·¤¿¾ì¹ç¤Ï¡¤Ruby¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç
-make¤ò¼Â¹Ô¤¹¤ë¤ÈMakefile¤òÀ¸À®¤«¤émake¡¤É¬Íפˤè¤Ã¤Æ¤Ï¤½¤Î¥â
-¥¸¥å¡¼¥ë¤ÎRuby¤Ø¤Î¥ê¥ó¥¯¤Þ¤Ç¼«Æ°Åª¤Ë¼Â¹Ô¤·¤Æ¤¯¤ì¤Þ¤¹¡¥
-extconf.rb¤ò½ñ¤­´¹¤¨¤ë¤Ê¤É¤·¤ÆMakefile¤ÎºÆÀ¸À®¤¬É¬Íפʻþ¤Ï¤Þ
-¤¿Ruby¥Ç¥£¥ì¥¯¥È¥ê¤Çmake¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
-³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ïmake install¤ÇRuby¥é¥¤¥Ö¥é¥ê¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Î
-²¼¤Ë¥³¥Ô¡¼¤µ¤ì¤Þ¤¹¡¥¤â¤·³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤È¶¨Ä´¤·¤Æ»È¤¦Ruby¤Çµ­
-½Ò¤µ¤ì¤¿¥×¥í¥°¥é¥à¤¬¤¢¤ê¡¤Ruby¥é¥¤¥Ö¥é¥ê¤ËÃÖ¤­¤¿¤¤¾ì¹ç¤Ë¤Ï¡¤
-³ÈÄ¥¥é¥¤¥Ö¥é¥êÍѤΥǥ£¥ì¥¯¥È¥ê¤Î²¼¤Ë lib ¤È¤¤¤¦¥Ç¥£¥ì¥¯¥È¥ê
-¤òºî¤ê¡¤¤½¤³¤Ë ³ÈÄ¥»Ò .rb ¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤¤¤Æ¤ª¤±¤ÐƱ»þ¤Ë¥¤¥ó
-¥¹¥È¡¼¥ë¤µ¤ì¤Þ¤¹¡¥
-
-(8) ¥Ç¥Ð¥Ã¥°
-
-¤Þ¤¢¡¤¥Ç¥Ð¥Ã¥°¤·¤Ê¤¤¤ÈÆ°¤«¤Ê¤¤¤Ç¤·¤ç¤¦¤Í¡¥ext/Setup¤Ë¥Ç¥£¥ì
-¥¯¥È¥ê̾¤ò½ñ¤¯¤ÈÀÅŪ¤Ë¥ê¥ó¥¯¤¹¤ë¤Î¤Ç¥Ç¥Ð¥Ã¥¬¤¬»È¤¨¤ë¤è¤¦¤Ë¤Ê
-¤ê¤Þ¤¹¡¥¤½¤Îʬ¥³¥ó¥Ñ¥¤¥ë¤¬ÃÙ¤¯¤Ê¤ê¤Þ¤¹¤±¤É¡¥
-
-(9) ¤Ç¤­¤¢¤¬¤ê
-
-¸å¤Ï¤³¤Ã¤½¤ê»È¤¦¤Ê¤ê¡¤¹­¤¯¸ø³«¤¹¤ë¤Ê¤ê¡¤Çä¤ë¤Ê¤ê¡¤¤´¼«Í³¤Ë¤ª
-»È¤¤¤¯¤À¤µ¤¤¡¥Ruby¤Îºî¼Ô¤Ï³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë´Ø¤·¤Æ°ìÀڤθ¢Íø¤ò
-¼çÄ¥¤·¤Þ¤»¤ó¡¥
-
-Appendix A. Ruby¤Î¥½¡¼¥¹¥³¡¼¥É¤ÎʬÎà
-
-Ruby¤Î¥½¡¼¥¹¤Ï¤¤¤¯¤Ä¤«¤ËʬÎह¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡¥¤³¤Î¤¦¤Á¥¯¥é
-¥¹¥é¥¤¥Ö¥é¥ê¤ÎÉôʬ¤Ï´ðËÜŪ¤Ë³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤ÈƱ¤¸ºî¤êÊý¤Ë¤Ê¤Ã
-¤Æ¤¤¤Þ¤¹¡¥¤³¤ì¤é¤Î¥½¡¼¥¹¤Ïº£¤Þ¤Ç¤ÎÀâÌÀ¤Ç¤Û¤È¤ó¤ÉÍý²ò¤Ç¤­¤ë¤È
-»×¤¤¤Þ¤¹¡¥
-
-Ruby¸À¸ì¤Î¥³¥¢
-
-  class.c         : ¥¯¥é¥¹¤È¥â¥¸¥å¡¼¥ë
-  error.c         : Îã³°¥¯¥é¥¹¤ÈÎã³°µ¡¹½
-  gc.c            : µ­²±Îΰè´ÉÍý
-  load.c          : ¥é¥¤¥Ö¥é¥ê¤Î¥í¡¼¥É
-  object.c        : ¥ª¥Ö¥¸¥§¥¯¥È
-  variable.c      : ÊÑ¿ô¤ÈÄê¿ô
-
-Ruby¤Î¹½Ê¸²òÀÏ´ï
-  parse.y         : »ú¶ç²òÀÏ´ï¤È¹½Ê¸ÄêµÁ
-    -> parse.c    : ¼«Æ°À¸À®
-  keywords        : ͽÌó¸ì
-    -> lex.c      : ¼«Æ°À¸À®
-
-Ruby¤Îɾ²Á´ï (Ä̾ÎYARV)
-  compile.c
-  eval.c
-  eval_error.c
-  eval_jump.c
-  eval_safe.c
-  insns.def           : ²¾ÁÛµ¡³£¸ì¤ÎÄêµÁ
-  iseq.c              : VM::ISeq¤Î¼ÂÁõ
-  thread.c            : ¥¹¥ì¥Ã¥É´ÉÍý¤È¥³¥ó¥Æ¥­¥¹¥ÈÀÚ¤êÂؤ¨
-  thread_win32.c      : ¥¹¥ì¥Ã¥É¼ÂÁõ
-  thread_pthread.c    : Ʊ¾å
-  vm.c
-  vm_dump.c
-  vm_eval.c
-  vm_exec.c
-  vm_insnhelper.c
-  vm_method.c
-
-  opt_insns_unif.def  : Ì¿ÎáÍ»¹ç
-  opt_operand.def     : ºÇŬ²½¤Î¤¿¤á¤ÎÄêµÁ
-
-    -> insn*.inc      : ¼«Æ°À¸À®
-    -> opt*.inc       : ¼«Æ°À¸À®
-    -> vm.inc         : ¼«Æ°À¸À®
-
-Àµµ¬É½¸½¥¨¥ó¥¸¥ó (µ´¼Ö)
-  regex.c
-  regcomp.c
-  regenc.c
-  regerror.c
-  regexec.c
-  regparse.c
-  regsyntax.c
-
-¥æ¡¼¥Æ¥£¥ê¥Æ¥£´Ø¿ô
-
-  debug.c       : C¥Ç¥Ð¥Ã¥¬ÍѤΥǥХå°¥·¥ó¥Ü¥ë
-  dln.c         : ưŪ¥í¡¼¥Ç¥£¥ó¥°
-  st.c          : ÈÆÍѥϥå·¥åɽ
-  strftime.c    : »þ¹ïÀ°·Á
-  util.c        : ¤½¤Î¾¤Î¥æ¡¼¥Æ¥£¥ê¥Æ¥£
-
-Ruby¥³¥Þ¥ó¥É¤Î¼ÂÁõ
-
-  dmyext.c
-  dmydln.c
-  dmyencoding.c
-  id.c
-  inits.c
-  main.c
-  ruby.c
-  version.c
-
-  gem_prelude.rb
-  prelude.rb
-
-¥¯¥é¥¹¥é¥¤¥Ö¥é¥ê
-
-  array.c       : Array
-  bignum.c      : Bignum
-  compar.c      : Comparable
-  complex.c     : Complex
-  cont.c        : Fiber, Continuation
-  dir.c         : Dir
-  enum.c        : Enumerable
-  enumerator.c  : Enumerator
-  file.c        : File
-  hash.c        : Hash
-  io.c          : IO
-  marshal.c     : Marshal
-  math.c        : Math
-  numeric.c     : Numeric, Integer, Fixnum, Float
-  pack.c        : Array#pack, String#unpack
-  proc.c        : Binding, Proc
-  process.c     : Process
-  random.c      : Íð¿ô
-  range.c       : Range
-  rational.c    : Rational
-  re.c          : Regexp, MatchData
-  signal.c      : Signal
-  sprintf.c     : 
-  string.c      : String
-  struct.c      : Struct
-  time.c        : Time
-
-  defs/known_errors.def  : Îã³°¥¯¥é¥¹ Errno::*
-    -> known_errors.inc  : ¼«Æ°À¸À®
-
-¿¸À¸ì²½
-  encoding.c    : Encoding
-  transcode.c   : Encoding::Converter
-  enc/*.c       : ¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°¥¯¥é¥¹·²
-  enc/trans/*   : ¥³¡¼¥É¥Ý¥¤¥ó¥ÈÂбþɽ
-
-goruby¥³¥Þ¥ó¥É¤Î¼ÂÁõ
-  
-  goruby.c
-  golf_prelude.rb      : goruby¸ÇÍ­¤Î¥é¥¤¥Ö¥é¥ê
-    -> golf_prelude.c  : ¼«Æ°À¸À®
-
-
-Appendix B. ³ÈÄ¥ÍÑ´Ø¿ô¥ê¥Õ¥¡¥ì¥ó¥¹
-
-C¸À¸ì¤«¤éRuby¤Îµ¡Ç½¤òÍøÍѤ¹¤ëAPI¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¢¤ë¡¥
-
-** ·¿
-
-VALUE
-
-  Ruby¥ª¥Ö¥¸¥§¥¯¥È¤òɽ¸½¤¹¤ë·¿¡¥É¬Íפ˱þ¤¸¤Æ¥­¥ã¥¹¥È¤·¤ÆÍѤ¤¤ë¡¥
-  ÁȤ߹þ¤ß·¿¤òɽ¸½¤¹¤ëC¤Î·¿¤Ïruby.h¤Ëµ­½Ò¤·¤Æ¤¢¤ëR¤Ç»Ï¤Þ¤ë¹½Â¤
-  ÂΤǤ¢¤ë¡¥VALUE·¿¤ò¤³¤ì¤é¤Ë¥­¥ã¥¹¥È¤¹¤ë¤¿¤á¤ËR¤Ç»Ï¤Þ¤ë¹½Â¤ÂÎ
-  ̾¤òÁ´¤ÆÂçʸ»ú¤Ë¤·¤¿Ì¾Á°¤Î¥Þ¥¯¥í¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤ë¡¥
-
-** ÊÑ¿ô¡¦Äê¿ô
-
-Qnil
-
-  Äê¿ô: nil¥ª¥Ö¥¸¥§¥¯¥È
-
-Qtrue
-
-  Äê¿ô: true¥ª¥Ö¥¸¥§¥¯¥È(¿¿¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ)
-
-Qfalse
-
-  Äê¿ô: false¥ª¥Ö¥¸¥§¥¯¥È
-
-** C¥Ç¡¼¥¿¤Î¥«¥×¥»¥ë²½
-
-Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
-
-  C¤ÎǤ°Õ¤Î¥Ý¥¤¥ó¥¿¤ò¥«¥×¥»¥ë²½¤·¤¿Ruby¥ª¥Ö¥¸¥§¥¯¥È¤òÊÖ¤¹¡¥¤³
-  ¤Î¥Ý¥¤¥ó¥¿¤¬Ruby¤«¤é¥¢¥¯¥»¥¹¤µ¤ì¤Ê¤¯¤Ê¤Ã¤¿»þ¡¤free¤Ç»ØÄꤷ¤¿
-  ´Ø¿ô¤¬¸Æ¤Ð¤ì¤ë¡¥¤Þ¤¿¡¤¤³¤Î¥Ý¥¤¥ó¥¿¤Î»Ø¤¹¥Ç¡¼¥¿¤¬Â¾¤ÎRuby¥ª¥Ö
-  ¥¸¥§¥¯¥È¤ò»Ø¤·¤Æ¤¤¤ë¾ì¹ç¡¤mark¤Ë»ØÄꤹ¤ë´Ø¿ô¤Ç¥Þ¡¼¥¯¤¹¤ëɬÍ×
-  ¤¬¤¢¤ë¡¥
-
-Data_Make_Struct(klass, type, mark, free, sval)
-
-  type·¿¤Î¥á¥â¥ê¤òmalloc¤·¡¤ÊÑ¿ôsval¤ËÂåÆþ¤·¤¿¸å¡¤¤½¤ì¤ò¥«¥×¥»
-  ¥ë²½¤·¤¿¥Ç¡¼¥¿¤òÊÖ¤¹¥Þ¥¯¥í¡¥
-
-Data_Get_Struct(data, type, sval)
-
-  data¤«¤étype·¿¤Î¥Ý¥¤¥ó¥¿¤ò¼è¤ê½Ð¤·ÊÑ¿ôsval¤ËÂåÆþ¤¹¤ë¥Þ¥¯¥í¡¥
-
-** ·¿¥Á¥§¥Ã¥¯
-
-TYPE(value)
-FIXNUM_P(value)
-NIL_P(value)
-void Check_Type(VALUE value, int type)
-void Check_SafeStr(VALUE value)
-
-** ·¿ÊÑ´¹
-
-FIX2INT(value), INT2FIX(i)
-FIX2LONG(value), LONG2FIX(l)
-NUM2INT(value), INT2NUM(i)
-NUM2UINT(value), UINT2NUM(ui)
-NUM2LONG(value), LONG2NUM(l)
-NUM2ULONG(value), ULONG2NUM(ul)
-NUM2LL(value), LL2NUM(ll)
-NUM2ULL(value), ULL2NUM(ull)
-NUM2OFFT(value), OFFT2NUM(off)
-NUM2SIZET(value), SIZET2NUM(size)
-NUM2SSIZET(value), SSIZET2NUM(ssize)
-NUM2DBL(value)
-rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
-rb_str_new2(s)
-
-** ¥¯¥é¥¹/¥â¥¸¥å¡¼¥ëÄêµÁ
-
-VALUE rb_define_class(const char *name, VALUE super)
-
-  super¤Î¥µ¥Ö¥¯¥é¥¹¤È¤·¤Æ¿·¤·¤¤Ruby¥¯¥é¥¹¤òÄêµÁ¤¹¤ë¡¥
-
-VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
-
-  super¤Î¥µ¥Ö¥¯¥é¥¹¤È¤·¤Æ¿·¤·¤¤Ruby¥¯¥é¥¹¤òÄêµÁ¤·¡¤module¤Î
-  Äê¿ô¤È¤·¤ÆÄêµÁ¤¹¤ë¡¥
-
-VALUE rb_define_module(const char *name)
-
-  ¿·¤·¤¤Ruby¥â¥¸¥å¡¼¥ë¤òÄêµÁ¤¹¤ë¡¥
-
-VALUE rb_define_module_under(VALUE module, const char *name)
-
-  ¿·¤·¤¤Ruby¥â¥¸¥å¡¼¥ë¤òÄêµÁ¤·¡¤module¤ÎÄê¿ô¤È¤·¤ÆÄêµÁ¤¹¤ë¡¥
-
-void rb_include_module(VALUE klass, VALUE module)
-
-  ¥â¥¸¥å¡¼¥ë¤ò¥¤¥ó¥¯¥ë¡¼¥É¤¹¤ë¡¥class¤¬¤¹¤Ç¤Ëmodule¤ò¥¤¥ó¥¯
-  ¥ë¡¼¥É¤·¤Æ¤¤¤ë»þ¤Ë¤Ï²¿¤â¤·¤Ê¤¤(¿½Å¥¤¥ó¥¯¥ë¡¼¥É¤Î¶Ø»ß)¡¥
-
-void rb_extend_object(VALUE object, VALUE module)
-
-  ¥ª¥Ö¥¸¥§¥¯¥È¤ò¥â¥¸¥å¡¼¥ë(¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¥á¥½¥Ã¥É)¤Ç³ÈÄ¥¤¹¤ë¡¥
-
-** Âç°èÊÑ¿ôÄêµÁ
-
-void rb_define_variable(const char *name, VALUE *var)
-
-  Ruby¤ÈC¤È¤Ç¶¦Í­¤¹¤ë¥°¥í¡¼¥Ð¥ëÊÑ¿ô¤òÄêµÁ¤¹¤ë¡¥ÊÑ¿ô̾¤¬`$'¤Ç
-  »Ï¤Þ¤é¤Ê¤¤»þ¤Ë¤Ï¼«Æ°Åª¤ËÄɲ䵤ì¤ë¡¥name¤È¤·¤ÆRuby¤Î¼±ÊÌ»Ò
-  ¤È¤·¤Æµö¤µ¤ì¤Ê¤¤Ê¸»ú(Î㤨¤Ð` ')¤ò´Þ¤à¾ì¹ç¤Ë¤ÏRuby¥×¥í¥°¥é
-  ¥à¤«¤é¤Ï¸«¤¨¤Ê¤¯¤Ê¤ë¡¥
-
-void rb_define_readonly_variable(const char *name, VALUE *var)
-
-  Ruby¤ÈC¤È¤Ç¶¦Í­¤¹¤ëread only¤Î¥°¥í¡¼¥Ð¥ëÊÑ¿ô¤òÄêµÁ¤¹¤ë¡¥
-  read only¤Ç¤¢¤ë¤³¤È°Ê³°¤Ïrb_define_variable()¤ÈƱ¤¸¡¥
-
-void rb_define_virtual_variable(const char *name,
-				VALUE (*getter)(), void (*setter)())
-
-  ´Ø¿ô¤Ë¤è¤Ã¤Æ¼Â¸½¤µ¤ì¤ëRubyÊÑ¿ô¤òÄêµÁ¤¹¤ë¡¥ÊÑ¿ô¤¬»²¾È¤µ¤ì¤¿
-  »þ¤Ë¤Ïgetter¤¬¡¤ÊÑ¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì¤¿»þ¤Ë¤Ïsetter¤¬¸Æ¤Ð¤ì
-  ¤ë¡¥
-
-void rb_define_hooked_variable(const char *name, VALUE *var,
-			       VALUE (*getter)(), void (*setter)())
-
-  ´Ø¿ô¤Ë¤è¤Ã¤Æhook¤Î¤Ä¤±¤é¤ì¤¿¥°¥í¡¼¥Ð¥ëÊÑ¿ô¤òÄêµÁ¤¹¤ë¡¥ÊÑ¿ô
-  ¤¬»²¾È¤µ¤ì¤¿»þ¤Ë¤Ïgetter¤¬¡¤´Ø¿ô¤ËÃͤ¬¥»¥Ã¥È¤µ¤ì¤¿»þ¤Ë¤Ï
-  setter¤¬¸Æ¤Ð¤ì¤ë¡¥getter¤äsetter¤Ë0¤ò»ØÄꤷ¤¿»þ¤Ë¤Ïhook¤ò
-  »ØÄꤷ¤Ê¤¤¤Î¤ÈƱ¤¸»ö¤Ë¤Ê¤ë¡¥
-
-void rb_global_variable(VALUE *var)
-
-  GC¤Î¤¿¤á¡¤Ruby¥×¥í¥°¥é¥à¤«¤é¤Ï¥¢¥¯¥»¥¹¤µ¤ì¤Ê¤¤¤¬, Ruby¥ª¥Ö
-  ¥¸¥§¥¯¥È¤ò´Þ¤àÂç°èÊÑ¿ô¤ò¥Þ¡¼¥¯¤¹¤ë¡¥
-
-** Äê¿ô
-
-void rb_define_const(VALUE klass, const char *name, VALUE val)
-
-  Äê¿ô¤òÄêµÁ¤¹¤ë¡¥
-
-void rb_define_global_const(const char *name, VALUE val)
-
-  Âç°èÄê¿ô¤òÄêµÁ¤¹¤ë¡¥
-
-     rb_define_const(rb_cObject, name, val)
-
-  ¤ÈƱ¤¸°ÕÌ£¡¥
-
-** ¥á¥½¥Ã¥ÉÄêµÁ
-
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
-
-  ¥á¥½¥Ã¥É¤òÄêµÁ¤¹¤ë¡¥argc¤Ïself¤ò½ü¤¯°ú¿ô¤Î¿ô¡¥argc¤¬-1¤Î»þ, 
-  ´Ø¿ô¤Ë¤Ï°ú¿ô¤Î¿ô(self¤ò´Þ¤Þ¤Ê¤¤)¤òÂè1°ú¿ô, °ú¿ô¤ÎÇÛÎó¤òÂè2
-  °ú¿ô¤È¤¹¤ë·Á¼°¤ÇÍ¿¤¨¤é¤ì¤ë(Âè3°ú¿ô¤Ïself)¡¥argc¤¬-2¤Î»þ, 
-  Âè1°ú¿ô¤¬self, Âè2°ú¿ô¤¬args(args¤Ï°ú¿ô¤ò´Þ¤àRuby¤ÎÇÛÎó)¤È
-  ¤¤¤¦·Á¼°¤ÇÍ¿¤¨¤é¤ì¤ë¡¥
- 
-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)(), int argc)
-
-  Æðۥ᥽¥Ã¥É¤òÄêµÁ¤¹¤ë¡¥°ú¿ô¤Ïrb_define_method()¤ÈƱ¤¸¡¥
-
-rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
-
-  argc, argv·Á¼°¤ÇÍ¿¤¨¤é¤ì¤¿»ØÄꤵ¤ì¤¿¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë½¾¤Ã¤Æ°ú
-  ¿ô¤òʬ²ò¤·¡¤Â³¤¯VALUE¤Ø¤Î»²¾È¤Ë¥»¥Ã¥È¤·¤Þ¤¹¡¥¤³¤Î¥Õ¥©¡¼¥Þ¥Ã
-  ¥È¤Ï¡¤ABNF¤Çµ­½Ò¤¹¤ë¤È°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡¥
-
---
-scan-arg-spec  := param-arg-spec [option-hash-arg-spec] [block-arg-spec]
-
-param-arg-spec := pre-arg-spec [post-arg-spec] / post-arg-spec / pre-opt-post-arg-spec
-pre-arg-spec   := num-of-leading-mandatory-args [num-of-optional-args]
-post-arg-spec  := sym-for-variable-length-args [num-of-trailing-mandatory-args]
-pre-opt-post-arg-spec := num-of-leading-mandatory-args num-of-optional-args num-of-trailing-mandatory-args
-option-hash-arg-spec := sym-for-option-hash-arg
-block-arg-spec := sym-for-block-arg
-
-num-of-leading-mandatory-args  := DIGIT ; ÀèƬ¤ËÃÖ¤«¤ì¤ë¾ÊάÉÔǽ¤Ê°ú¿ô¤Î¿ô
-num-of-optional-args           := DIGIT ; ³¤¤¤ÆÃÖ¤«¤ì¤ë¾Êά²Äǽ¤Ê°ú¿ô¤Î¿ô
-sym-for-variable-length-args   := "*"   ; ³¤¤¤ÆÃÖ¤«¤ì¤ë²ÄÊÑĹ°ú¿ô¤ò
-                                        ; Ruby¤ÎÇÛÎó¤Ç¼èÆÀ¤¹¤ë¤¿¤á¤Î»ØÄê
-num-of-trailing-mandatory-args := DIGIT ; ½ªÃ¼¤ËÃÖ¤«¤ì¤ë¾ÊάÉÔǽ¤Ê°ú¿ô¤Î¿ô
-sym-for-option-hash-arg        := ":"   ; ¥ª¥×¥·¥ç¥ó¥Ï¥Ã¥·¥å¤ò¼èÆÀ¤¹¤ë
-                                        ; ¤¿¤á¤Î»ØÄê; ¾ÊάÉÔǽ¤Ê°ú¿ô¤Î
-                                        ; ¿ô¤è¤ê¤â¿¤¯¤Î°ú¿ô¤¬»ØÄꤵ¤ì¡¤
-                                        ; ºÇ¸å¤Î°ú¿ô¤¬¥Ï¥Ã¥·¥å¡Ê¤Þ¤¿¤Ï
-                                        ; #to_hash¤ÇÊÑ´¹²Äǽ¡Ë¤Î¾ì¹ç¤Ë
-                                        ; ¼èÆÀ¤µ¤ì¤ë¡¥ºÇ¸å¤Î°ú¿ô¤¬nil¤Î
-                                        ; ¾ì¹ç¡¤²ÄÊÑĹ°ú¿ô»ØÄ꤬¤Ê¤¯¡¤
-                                        ; ¾ÊάÉÔǽ°ú¿ô¤Î¿ô¤è¤ê¤â¿¤¯¤Î
-                                        ; °ú¿ô¤¬»ØÄꤵ¤ì¤¿¾ì¹ç¤Ë¼èÆÀ¤µ¤ì¤ë
-sym-for-block-arg              := "&"   ; ¥¤¥Æ¥ì¡¼¥¿¥Ö¥í¥Ã¥¯¤ò¼èÆÀ¤¹¤ë¤¿¤á¤Î
-                                        ; »ØÄê
---
-
-  ¥Õ¥©¡¼¥Þ¥Ã¥È¤¬"12"¤Î¾ì¹ç¡¤°ú¿ô¤ÏºÇÄã1¤Ä¤Ç¡¤3¤Ä(1+2)¤Þ¤Çµö¤µ
-  ¤ì¤ë¤È¤¤¤¦°ÕÌ£¤Ë¤Ê¤ê¤Þ¤¹¡¥½¾¤Ã¤Æ¡¤¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤Ë³¤¤
-  ¤Æ3¤Ä¤ÎVALUE¤Ø¤Î»²¾È¤òÃÖ¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡¥¤½¤ì¤é¤Ë¤Ï¼èÆÀ¤·¤¿
-  ÊÑ¿ô¤¬¥»¥Ã¥È¤µ¤ì¤Þ¤¹¡¥ÊÑ¿ô¤Ø¤Î»²¾È¤ÎÂå¤ï¤ê¤ËNULL¤ò»ØÄꤹ¤ë
-  ¤³¤È¤â¤Ç¤­¡¤¤½¤Î¾ì¹ç¤Ï¼èÆÀ¤·¤¿°ú¿ô¤ÎÃͤϼΤƤé¤ì¤Þ¤¹¡¥¤Ê¤ª¡¤
-  ¾Êά²Äǽ°ú¿ô¤¬¾Êά¤µ¤ì¤¿»þ¤ÎÊÑ¿ô¤ÎÃͤÏnil(C¸À¸ì¤Î¥ì¥Ù¥ë¤Ç¤Ï
-  Qnil)¤Ë¤Ê¤ê¤Þ¤¹¡¥
-
-  ÊÖ¤êÃͤÏÍ¿¤¨¤é¤ì¤¿°ú¿ô¤Î¿ô¤Ç¤¹¡¥¥ª¥×¥·¥ç¥ó¥Ï¥Ã¥·¥å¤ª¤è¤Ó¥¤
-  ¥Æ¥ì¡¼¥¿¥Ö¥í¥Ã¥¯¤Ï¿ô¤¨¤Þ¤»¤ó¡¥
-
-** Ruby¥á¥½¥Ã¥É¸Æ¤Ó½Ð¤·
-
-VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
-
-  ¥á¥½¥Ã¥É¸Æ¤Ó½Ð¤·¡¥Ê¸»úÎ󤫤émid¤òÆÀ¤ë¤¿¤á¤Ë¤Ïrb_intern()¤ò
-  »È¤¦¡¥
-
-VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
-
-  ¥á¥½¥Ã¥É¸Æ¤Ó½Ð¤·¡¥°ú¿ô¤òargc, argv·Á¼°¤ÇÅϤ¹¡¥
-
-VALUE rb_eval_string(const char *str)
-
-  ʸ»úÎó¤òRuby¥¹¥¯¥ê¥×¥È¤È¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¡¦¼Â¹Ô¤¹¤ë¡¥
-
-ID rb_intern(const char *name)
-
-  ʸ»úÎó¤ËÂбþ¤¹¤ëID¤òÊÖ¤¹¡¥
-
-char *rb_id2name(ID id)
-
-  ID¤ËÂбþ¤¹¤ëʸ»úÎó¤òÊÖ¤¹(¥Ç¥Ð¥Ã¥°ÍÑ)¡¥
-
-char *rb_class2name(VALUE klass)
-
-  ¥¯¥é¥¹¤Î̾Á°¤òÊÖ¤¹(¥Ç¥Ð¥Ã¥°ÍÑ)¡¥¥¯¥é¥¹¤¬Ì¾Á°¤ò»ý¤¿¤Ê¤¤»þ¤Ë
-  ¤Ï, ÁÄÀè¤òÁ̤äÆ̾Á°¤ò»ý¤Ä¥¯¥é¥¹¤Î̾Á°¤òÊÖ¤¹¡¥
-
-int rb_respond_to(VALUE obj, ID id)
-
-  obj¤¬id¤Ç¼¨¤µ¤ì¤ë¥á¥½¥Ã¥É¤ò»ý¤Ä¤«¤É¤¦¤«¤òÊÖ¤¹¡¥
-
-** ¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô
-
-VALUE rb_iv_get(VALUE obj, const char *name)
-
-  obj¤Î¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô¤ÎÃͤòÆÀ¤ë¡¥`@'¤Ç»Ï¤Þ¤é¤Ê¤¤¥¤¥ó¥¹¥¿¥ó
-  ¥¹ÊÑ¿ô¤Ï Ruby¥×¥í¥°¥é¥à¤«¤é¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¡Ö±£¤ì¤¿¡×¥¤¥ó
-  ¥¹¥¿¥ó¥¹ÊÑ¿ô¤Ë¤Ê¤ë¡¥Äê¿ô¤ÏÂçʸ»ú¤Î̾Á°¤ò»ý¤Ä¥¯¥é¥¹(¤Þ¤¿¤Ï
-  ¥â¥¸¥å¡¼¥ë)¤Î¥¤¥ó¥¹¥¿¥ó¥¹ÊÑ¿ô¤È¤·¤Æ¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¡¥
-
-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)
-
-  func¤ò¥Ö¥í¥Ã¥¯¤È¤·¤ÆÀßÄꤷ¡¤obj¤ò¥ì¥·¡¼¥Ð¡¤argc¤Èargv¤ò°ú¿ô
-  ¤È¤·¤Æmid¥á¥½¥Ã¥É¤ò¸Æ¤Ó½Ð¤¹¡¥func¤ÏÂè°ì°ú¿ô¤Ëyield¤µ¤ì¤¿ÃÍ¡¤
-  ÂèÆó°ú¿ô¤Ëdata2¤ò¼õ¤±¼è¤ë¡¥Ê£¿ô¤ÎÃͤ¬yield¤µ¤ì¤¿¾ì¹ç(C¤Ç¤Ï
-  rb_yield_values()¤Èrb_yield_values2(), rb_yield_splat())¡¤
-  data2¤ÏArray¤È¤·¤Æ¥Ñ¥Ã¥¯¤µ¤ì¤Æ¤¤¤ë¡¥Âè»°, Âè»Í°ú¿ô¤Îargc¤È
-  argv¤Ë¤è¤Ã¤Æyield¤µ¤ì¤¿Ãͤò¼è¤ê½Ð¤¹¤³¤È¤¬¤Ç¤­¤ë¡¥
-
-[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
-
-  func2¤ò¥Ö¥í¥Ã¥¯¤È¤·¤ÆÀßÄꤷ, func1¤ò¥¤¥Æ¥ì¡¼¥¿¤È¤·¤Æ¸Æ¤Ö¡¥ 
-  func1¤Ë¤Ï arg1¤¬°ú¿ô¤È¤·¤ÆÅϤµ¤ì, func2¤Ë¤ÏÂè1°ú¿ô¤Ë¥¤¥Æ¥ì¡¼
-  ¥¿¤«¤éÍ¿¤¨¤é¤ì¤¿ÃÍ, Âè2°ú¿ô¤Ëarg2¤¬ÅϤµ¤ì¤ë¡¥
- 
-  1.9¤Çrb_iterate¤ò»È¤¦¾ì¹ç¤Ï, func1¤ÎÃæ¤ÇRuby¥ì¥Ù¥ë¤Î¥á¥½¥Ã¥É
-  ¤ò¸Æ¤Ó½Ð¤µ¤Ê¤±¤ì¤Ð¤Ê¤é¤Ê¤¤.
-  1.9¤Çobsolete¤È¤Ê¤Ã¤¿. Âå¤ï¤ê¤Ërb_block_call¤¬ÍÑ°Õ¤µ¤ì¤¿.
-
-VALUE rb_yield(VALUE val)
-
-  val¤òÃͤȤ·¤Æ¥¤¥Æ¥ì¡¼¥¿¥Ö¥í¥Ã¥¯¤ò¸Æ¤Ó½Ð¤¹¡¥
-
-VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
-
-  ´Ø¿ôfunc1¤òarg1¤ò°ú¿ô¤Ë¸Æ¤Ó½Ð¤¹¡¥func1¤Î¼Â¹ÔÃæ¤ËÎã³°¤¬È¯À¸
-  ¤·¤¿»þ¤Ë¤Ï func2¤òarg2¤ò°ú¿ô¤È¤·¤Æ¸Æ¤Ö¡¥Ìá¤êÃͤÏÎã³°¤¬È¯À¸
-  ¤·¤Ê¤«¤Ã¤¿»þ¤Ïfunc1¤ÎÌá¤êÃÍ, Îã³°¤¬È¯À¸¤·¤¿»þ¤Ë¤Ïfunc2¤ÎÌá
-  ¤êÃͤǤ¢¤ë¡¥
-
-VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
-
-  ´Ø¿ôfunc1¤òarg1¤ò°ú¿ô¤È¤·¤Æ¼Â¹Ô¤·, ¼Â¹Ô½ªÎ»¸å(¤¿¤È¤¨Îã³°¤¬
-  ȯÀ¸¤·¤Æ¤â) func2¤òarg2¤ò°ú¿ô¤È¤·¤Æ¼Â¹Ô¤¹¤ë¡¥Ìá¤êÃͤÏfunc1
-  ¤ÎÌá¤êÃͤǤ¢¤ë(Îã³°¤¬È¯À¸¤·¤¿»þ¤ÏÌá¤é¤Ê¤¤)¡¥
-
-VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state)
-
-  ´Ø¿ôfunc¤òarg¤ò°ú¿ô¤È¤·¤Æ¼Â¹Ô¤·, Îã³°¤¬È¯À¸¤·¤Ê¤±¤ì¤Ð¤½¤ÎÌá
-  ¤êÃͤòÊÖ¤¹¡¥Îã³°¤¬È¯À¸¤·¤¿¾ì¹ç¤Ï, *state¤ËÈó0¤ò¥»¥Ã¥È¤·¤Æ
-  Qnil¤òÊÖ¤¹¡¥
-
-void rb_jump_tag(int state)
-
-  rb_protect()¤ärb_eval_string_protect()¤ÇÊ᪤µ¤ì¤¿Îã³°¤òºÆ
-  Á÷¤¹¤ë¡¥state¤Ï¤½¤ì¤é¤Î´Ø¿ô¤«¤éÊÖ¤µ¤ì¤¿ÃͤǤʤ±¤ì¤Ð¤Ê¤é¤Ê¤¤¡¥
-  ¤³¤Î´Ø¿ô¤ÏľÀܤθƤӽФ·¸µ¤ËÌá¤é¤Ê¤¤¡¥
-
-** Îã³°¡¦¥¨¥é¡¼
-
-void rb_warning(const char *fmt, ...)
-
-  rb_verbose»þ¤Ëɸ½à¥¨¥é¡¼½ÐÎϤ˷ٹð¾ðÊó¤òɽ¼¨¤¹¤ë¡¥°ú¿ô¤Ï
-  printf()¤ÈƱ¤¸¡¥
-
-void rb_raise(rb_eRuntimeError, const char *fmt, ...)
-
-  RuntimeErrorÎã³°¤òȯÀ¸¤µ¤»¤ë¡¥°ú¿ô¤Ïprintf()¤ÈƱ¤¸¡¥
-
-void rb_raise(VALUE exception, const char *fmt, ...)
-
-  exception¤Ç»ØÄꤷ¤¿Îã³°¤òȯÀ¸¤µ¤»¤ë¡¥fmt°Ê²¼¤Î°ú¿ô¤Ï
-  printf()¤ÈƱ¤¸¡¥
-
-void rb_fatal(const char *fmt, ...)
-
-  Ã×̿ŪÎã³°¤òȯÀ¸¤µ¤»¤ë¡¥Ä̾ï¤ÎÎã³°½èÍý¤Ï¹Ô¤Ê¤ï¤ì¤º, ¥¤¥ó¥¿¡¼
-  ¥×¥ê¥¿¤¬½ªÎ»¤¹¤ë(¤¿¤À¤·ensure¤Ç»ØÄꤵ¤ì¤¿¥³¡¼¥É¤Ï½ªÎ»Á°¤Ë
-  ¼Â¹Ô¤µ¤ì¤ë)¡¥
-
-void rb_bug(const char *fmt, ...)
-
-  ¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ê¤É¥×¥í¥°¥é¥à¤Î¥Ð¥°¤Ç¤·¤«È¯À¸¤¹¤ë¤Ï¤º¤Î¤Ê¤¤
-  ¾õ¶·¤Î»þ¸Æ¤Ö¡¥¥¤¥ó¥¿¡¼¥×¥ê¥¿¤Ï¥³¥¢¥À¥ó¥×¤·Ä¾¤Á¤Ë½ªÎ»¤¹¤ë¡¥
-  Îã³°½èÍý¤Ï°ìÀڹԤʤï¤ì¤Ê¤¤¡¥
-
-** Ruby¤Î½é´ü²½¡¦¼Â¹Ô
-
-Ruby¤ò¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤ËËä¤á¹þ¤à¾ì¹ç¤Ë¤Ï°Ê²¼¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹
-¤ò»È¤¦¡¥Ä̾ï¤Î³ÈÄ¥¥é¥¤¥Ö¥é¥ê¤Ë¤ÏɬÍפʤ¤¡¥
-
-void ruby_init()
-
-  Ruby¥¤¥ó¥¿¥×¥ê¥¿¤Î½é´ü²½¤ò¹Ô¤Ê¤¦¡¥
-
-void ruby_options(int argc, char **argv)
-
-  Ruby¥¤¥ó¥¿¥×¥ê¥¿¤Î¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤Î½èÍý¤ò¹Ô¤Ê¤¦¡¥
-
-void ruby_run()
-
-  Ruby¥¤¥ó¥¿¥×¥ê¥¿¤ò¼Â¹Ô¤¹¤ë¡¥
-
-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)
-
-»ØÄꤵ¤ì¤¿¥¤¥ó¥¿¥×¥ê¥¿¤Î¥¤¥Ù¥ó¥È¤ËÂФ¹¤ë¥Õ¥Ã¥¯´Ø¿ô¤òÄɲä·¤Þ¤¹¡¥
-events¤Ï°Ê²¼¤ÎÃͤÎor¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó:
-
-	RUBY_EVENT_LINE
-	RUBY_EVENT_CLASS
-	RUBY_EVENT_END
-	RUBY_EVENT_CALL
-	RUBY_EVENT_RETURN
-	RUBY_EVENT_C_CALL
-	RUBY_EVENT_C_RETURN
-	RUBY_EVENT_RAISE
-	RUBY_EVENT_ALL
-
-rb_event_hook_func_t¤ÎÄêµÁ¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹:
-
- typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
- 				      VALUE self, ID id, VALUE klass)
-
-rb_add_event_hook() ¤ÎÂè3°ú¿ô data ¤Ï¡¤¥Õ¥Ã¥¯´Ø¿ô¤ÎÂè2°ú¿ô¤È
-¤·¤ÆÅϤµ¤ì¤Þ¤¹¡¥¤³¤ì¤Ï1.8¤Ç¤Ï¸½ºß¤ÎNODE¤Ø¤Î¥Ý¥¤¥ó¥¿¤Ç¤·¤¿¡¥°Ê
-²¼¤Î RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ¤â»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
- int rb_remove_event_hook(rb_event_hook_func_t func)
-
-»ØÄꤵ¤ì¤¿¥Õ¥Ã¥¯´Ø¿ô¤òºï½ü¤·¤Þ¤¹¡¥
-
-** ¸ß´¹À­¤Î¤¿¤á¤Î¥Þ¥¯¥í
-
-API¤Î¸ß´¹À­¤ò¥Á¥§¥Ã¥¯¤¹¤ë¤¿¤á¤Ë°Ê²¼¤Î¥Þ¥¯¥í¤¬¥Ç¥Õ¥©¥ë¥È¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤Þ¤¹¡¥
-
-NORETURN_STYLE_NEW
-
-  NORETURN ¥Þ¥¯¥í¤¬´Ø¿ô·¿¥Þ¥¯¥í¤È¤·¤ÆÄêµÁ¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-
-HAVE_RB_DEFINE_ALLOC_FUNC
-
-  rb_define_alloc_func() ´Ø¿ô¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È¡¤¤Ä¤Þ¤ê
-  allocation framework ¤¬»È¤ï¤ì¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-  have_func("rb_define_alloc_func", "ruby.h")
-  ¤Î·ë²Ì¤ÈƱ¤¸¡¥
-
-HAVE_RB_REG_NEW_STR
-
-  String¥ª¥Ö¥¸¥§¥¯¥È¤«¤éRegexp¥ª¥Ö¥¸¥§¥¯¥È¤òºî¤ë
-  rb_reg_new_str() ´Ø¿ô¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-  have_func("rb_reg_new_str", "ruby.h").
-  ¤Î·ë²Ì¤ÈƱ¤¸¡¥
-
-HAVE_RB_IO_T
-
-  rb_io_t ·¿¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-
-USE_SYMBOL_AS_METHOD_NAME
-
-  ¥á¥½¥Ã¥É̾¤òÊÖ¤¹¥á¥½¥Ã¥É¡¤Module#methods, #singleton_methods
-  ¤Ê¤É¤¬Symbol¤òÊÖ¤¹¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-
-HAVE_RUBY_*_H
-
-  ruby.h ¤ÇÄêµÁ¤µ¤ì¤Æ¤¤¤ë¡¥Âбþ¤¹¤ë¥Ø¥Ã¥À¤¬Ä󶡤µ¤ì¤Æ¤¤¤ë¤³¤È
-  ¤ò°ÕÌ£¤¹¤ë¡¥¤¿¤È¤¨¤Ð¡¤HAVE_RUBY_ST_H ¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï
-  ñ¤Ê¤ë st.h ¤Ç¤Ï¤Ê¤¯ ruby/st.h ¤ò»ÈÍѤ¹¤ë¡¥
-
-RB_EVENT_HOOKS_HAVE_CALLBACK_DATA
-
-  rb_add_event_hook() ¤¬¥Õ¥Ã¥¯´Ø¿ô¤ËÅϤ¹ data ¤òÂè3°ú¿ô¤È¤·¤Æ
-  ¼õ¤±¼è¤ë¤³¤È¤ò°ÕÌ£¤¹¤ë¡¥
-
-Appendix C. extconf.rb¤Ç»È¤¨¤ë´Ø¿ô¤¿¤Á
-
-extconf.rb¤ÎÃæ¤Ç¤ÏÍøÍѲÄǽ¤Ê¥³¥ó¥Ñ¥¤¥ë¾ò·ï¥Á¥§¥Ã¥¯¤Î´Ø¿ô¤Ï°Ê
-²¼¤ÎÄ̤ê¤Ç¤¢¤ë¡¥
-
-have_macro(macro, headers)
-
-  ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ¥Þ¥¯¥ímacro¤¬ÄêµÁ¤µ
-  ¤ì¤Æ¤¤¤ë¤«¤É¤¦¤«¥Á¥§¥Ã¥¯¤¹¤ë¡¥¥Þ¥¯¥í¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë»þtrue
-  ¤òÊÖ¤¹¡¥
-
-have_library(lib, func)
-
-  ´Ø¿ôfunc¤òÄêµÁ¤·¤Æ¤¤¤ë¥é¥¤¥Ö¥é¥êlib¤Î¸ºß¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡¥
-  ¥é¥¤¥Ö¥é¥ê¤¬Â¸ºß¤¹¤ë»þ¡¤true¤òÊÖ¤¹¡¥
-
-find_library(lib, func, path...)
-
-  ´Ø¿ôfunc¤òÄêµÁ¤·¤Æ¤¤¤ë¥é¥¤¥Ö¥é¥êlib¤Î¸ºß¤ò -Lpath ¤òÄɲÃ
-  ¤·¤Ê¤¬¤é¥Á¥§¥Ã¥¯¤¹¤ë¡¥¥é¥¤¥Ö¥é¥ê¤¬¸«ÉÕ¤«¤Ã¤¿»þ¡¤true¤òÊÖ¤¹¡¥
-
-have_func(func, header)
-
-  ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ´Ø¿ôfunc¤Î¸ºß¤ò¥Á¥§
-  ¥Ã¥¯¤¹¤ë¡¥func¤¬É¸½à¤Ç¤Ï¥ê¥ó¥¯¤µ¤ì¤Ê¤¤¥é¥¤¥Ö¥é¥êÆâ¤Î¤â¤Î¤Ç
-  ¤¢¤ë»þ¤Ë¤ÏÀè¤Ëhave_library¤Ç¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤ª
-  ¤¯»ö¡¥´Ø¿ô¤¬Â¸ºß¤¹¤ë»þtrue¤òÊÖ¤¹¡¥
-
-have_var(var, header)
-
-  ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤ÆÊÑ¿ôvar¤Î¸ºß¤ò¥Á¥§¥Ã
-  ¥¯¤¹¤ë¡¥var¤¬É¸½à¤Ç¤Ï¥ê¥ó¥¯¤µ¤ì¤Ê¤¤¥é¥¤¥Ö¥é¥êÆâ¤Î¤â¤Î¤Ç¤¢
-  ¤ë»þ¤Ë¤ÏÀè¤Ëhave_library¤Ç¤½¤Î¥é¥¤¥Ö¥é¥ê¤ò¥Á¥§¥Ã¥¯¤·¤Æ¤ª¤¯
-  »ö¡¥ÊÑ¿ô¤¬Â¸ºß¤¹¤ë»þtrue¤òÊÖ¤¹¡¥
-
-have_header(header)
-
-  ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤Î¸ºß¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡¥¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤¬Â¸ºß¤¹
-  ¤ë»þtrue¤òÊÖ¤¹¡¥
-
-find_header(header, path...)
-
-  ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤Î¸ºß¤ò -Ipath ¤òÄɲ䷤ʤ¬¤é¥Á¥§¥Ã¥¯
-  ¤¹¤ë¡¥¥Ø¥Ã¥À¥Õ¥¡¥¤¥ë¤¬¸«ÉÕ¤«¤Ã¤¿»þ¡¤true¤òÊÖ¤¹¡¥
-
-have_struct_member(type, member, header)
-
-  ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ·¿type¤Ë¥á¥ó¥Ðmember
-  ¤¬Â¸ºß¤¹¤ë¤«¤ò¥Á¥§¥Ã¥¯¤¹¤ë¡¥type¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤Æ¡¤member¤ò
-  »ý¤Ä¤¹¤ë»þtrue¤òÊÖ¤¹¡¥
-
-have_type(type, header, opt)
-
-  ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ·¿type¤¬Â¸ºß¤¹¤ë¤«¤ò
-  ¥Á¥§¥Ã¥¯¤¹¤ë¡¥type¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë»þtrue¤òÊÖ¤¹¡¥
-
-check_sizeof(type, header)
-
-  ¥Ø¥Ã¥À¥Õ¥¡¥¤¥ëheader¤ò¥¤¥ó¥¯¥ë¡¼¥É¤·¤Æ·¿type¤Îcharñ°Ì¥µ¥¤
-  ¥º¤òÄ´¤Ù¤ë¡¥type¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë»þ¤½¤Î¥µ¥¤¥º¤òÊÖ¤¹¡¥ÄêµÁ¤µ
-  ¤ì¤Æ¤¤¤Ê¤¤¤È¤­¤Ïnil¤òÊÖ¤¹¡¥
-
-create_makefile(target)
-
-  ³ÈÄ¥¥é¥¤¥Ö¥é¥êÍѤÎMakefile¤òÀ¸À®¤¹¤ë¡¥¤³¤Î´Ø¿ô¤ò¸Æ¤Ð¤Ê¤±¤ì
-  ¤Ð¤½¤Î¥é¥¤¥Ö¥é¥ê¤Ï¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤Ê¤¤¡¥target¤Ï¥â¥¸¥å¡¼¥ë̾
-  ¤òɽ¤¹¡¥
-
-find_executable(command, path)
-
-  ¥³¥Þ¥ó¥Écommand¤òFile::PATH_SEPARATOR¤Ç¶èÀÚ¤é¤ì¤¿¥Ñ¥¹Ì¾¤Î
-  ¥ê¥¹¥Èpath¤«¤éõ¤¹¡¥path¤¬nil¤Þ¤¿¤Ï¾Êά¤µ¤ì¤¿¾ì¹ç¤Ï¡¤´Ä¶­
-  ÊÑ¿ôPATH¤ÎÃͤò»ÈÍѤ¹¤ë¡¥¼Â¹Ô²Äǽ¤Ê¥³¥Þ¥ó¥É¤¬¸«¤Ä¤«¤Ã¤¿¾ì¹ç
-  ¤Ï¥Ñ¥¹¤ò´Þ¤à¥Õ¥¡¥¤¥ë̾¡¤¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¾ì¹ç¤Ïnil¤òÊÖ¤¹¡¥
-
-with_config(withval[, default=nil])
-
-  ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î--with-<withval>¤Ç»ØÄꤵ¤ì¤¿¥ª¥×¥·¥ç¥óÃÍ
-  ¤òÆÀ¤ë¡¥
-
-enable_config(config, *defaults)
-disable_config(config, *defaults)
-
-  ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î--enable-<config>¤Þ¤¿¤Ï
-  --disable-<config>¤Ç»ØÄꤵ¤ì¤¿¿¿µ¶ÃͤòÆÀ¤ë¡¥
-  --enable-<config>¤¬»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ïtrue¡¤
-  --disable-<config>¤¬»ØÄꤵ¤ì¤Æ¤¤¤¿¾ì¹ç¤Ïfalse¤òÊÖ¤¹¡¥
-  ¤É¤Á¤é¤â»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ï¡¤¥Ö¥í¥Ã¥¯¤Ä¤­¤Ç¸Æ¤Ó½Ð¤µ¤ì¤Æ
-  ¤¤¤ë¾ì¹ç¤Ï*defaults¤òyield¤·¤¿·ë²Ì¡¤¥Ö¥í¥Ã¥¯¤Ê¤·¤Ê¤é
-  *defaults¤òÊÖ¤¹¡¥
-
-dir_config(target[, default_dir])
-dir_config(target[, default_include, default_lib])
-
-  ¥³¥Þ¥ó¥É¥é¥¤¥ó¾å¤Î--with-<target>-dir, --with-<target>-include,
-  --with-<target>-lib¤Î¤¤¤º¤ì¤«¤Ç»ØÄꤵ¤ì¤ë¥Ç¥£¥ì¥¯¥È¥ê¤ò
-  $CFLAGS ¤ä $LDFLAGS ¤ËÄɲ乤롥--with-<target>-dir=/path¤Ï
-  --with-<target>-include=/path/include --with-<target>-lib=/path/lib
-  ¤ÈÅù²Á¤Ç¤¢¤ë¡¥Äɲ䵤줿 include ¥Ç¥£¥ì¥¯¥È¥ê¤È lib ¥Ç¥£¥ì
-  ¥¯¥È¥ê¤ÎÇÛÎó¤òÊÖ¤¹¡¥ ([include_dir, lib_dir])
-
-pkg_config(pkg)
-
-  pkg-config¥³¥Þ¥ó¥É¤«¤é¥Ñ¥Ã¥±¡¼¥¸pkg¤Î¾ðÊó¤òÆÀ¤ë¡¥ 
-  pkg-config¤Î¼ÂºÝ¤Î¥³¥Þ¥ó¥É̾¤Ï¡¤--with-pkg-config¥³¥Þ¥ó¥É
-  ¥é¥¤¥ó¥ª¥×¥·¥ç¥ó¤Ç»ØÄê²Äǽ¡¥
-
-/*
- * Local variables:
- * fill-column: 60
- * end:
- */
+doc/extension.ja.rdoc�移動����
diff --git a/README.ja b/README.ja
deleted file mode 100644
index dd7f67ca59..0000000000
--- a/README.ja
+++ /dev/null
@@ -1,185 +0,0 @@
-* Ruby¤È¤Ï
-
-Ruby¤Ï¥·¥ó¥×¥ë¤«¤Ä¶¯ÎϤʥª¥Ö¥¸¥§¥¯¥È»Ø¸þ¥¹¥¯¥ê¥×¥È¸À¸ì¤Ç¤¹¡¥
-Ruby¤ÏºÇ½é¤«¤é½ã¿è¤Ê¥ª¥Ö¥¸¥§¥¯¥È»Ø¸þ¸À¸ì¤È¤·¤ÆÀ߷פµ¤ì¤Æ¤¤¤Þ
-¤¹¤«¤é¡¤¥ª¥Ö¥¸¥§¥¯¥È»Ø¸þ¥×¥í¥°¥é¥ß¥ó¥°¤ò¼ê·Ú¤Ë¹Ô¤¦»ö¤¬½ÐÍè¤Þ
-¤¹¡¥¤â¤Á¤í¤óÄ̾ï¤Î¼ê³¤­·¿¤Î¥×¥í¥°¥é¥ß¥ó¥°¤â²Äǽ¤Ç¤¹¡¥
-
-Ruby¤Ï¥Æ¥­¥¹¥È½èÍý´Ø·¸¤ÎǽÎϤʤɤËÍ¥¤ì¡¤Perl¤ÈƱ¤¸¤¯¤é¤¤¶¯ÎÏ
-¤Ç¤¹¡¥¤µ¤é¤Ë¥·¥ó¥×¥ë¤Êʸˡ¤È¡¤Îã³°½èÍý¤ä¥¤¥Æ¥ì¡¼¥¿¤Ê¤É¤Îµ¡¹½
-¤Ë¤è¤Ã¤Æ¡¤¤è¤êʬ¤«¤ê¤ä¤¹¤¤¥×¥í¥°¥é¥ß¥ó¥°¤¬½ÐÍè¤Þ¤¹¡¥
-
-
-* Ruby¤ÎÆÃĹ
-
-  + ¥·¥ó¥×¥ë¤Êʸˡ
-  + ÉáÄ̤Υª¥Ö¥¸¥§¥¯¥È»Ø¸þµ¡Ç½(¥¯¥é¥¹¡¤¥á¥½¥Ã¥É¥³¡¼¥ë¤Ê¤É)
-  + Æüì¤Ê¥ª¥Ö¥¸¥§¥¯¥È»Ø¸þµ¡Ç½(Mixin, Æðۥ᥽¥Ã¥É¤Ê¤É)
-  + ±é»»»Ò¥ª¡¼¥Ð¡¼¥í¡¼¥É
-  + Îã³°½èÍýµ¡Ç½
-  + ¥¤¥Æ¥ì¡¼¥¿¤È¥¯¥í¡¼¥¸¥ã
-  + ¥¬¡¼¥Ù¡¼¥¸¥³¥ì¥¯¥¿
-  + ¥À¥¤¥Ê¥ß¥Ã¥¯¥í¡¼¥Ç¥£¥ó¥° (¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤è¤ë)
-  + °Ü¿¢À­¤¬¹â¤¤¡¥Â¿¤¯¤ÎUnix-like/POSIX¸ß´¹¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¾å¤Ç
-    Æ°¤¯¤À¤±¤Ç¤Ê¤¯¡¤Windows¡¤ Mac OS X¡¤BeOS¤Ê¤É¤Î¾å¤Ç¤âÆ°¤¯
-    cf. http://redmine.ruby-lang.org/wiki/ruby-19/SupportedPlatformsJa
-
-* Æþ¼êË¡
-
-** FTP¤Ç
-
-°Ê²¼¤Î¾ì½ê¤Ë¤ª¤¤¤Æ¤¢¤ê¤Þ¤¹¡¥
-
-  ftp://ftp.ruby-lang.org/pub/ruby/
-
-** Subversion¤Ç
-
-³«È¯Àèü¤Î¥½¡¼¥¹¥³¡¼¥É¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¼èÆÀ¤Ç¤­¤Þ¤¹¡¥
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
-
-¾¤Ë³«È¯Ãæ¤Î¥Ö¥é¥ó¥Á¤Î°ìÍ÷¤Ï¼¡¤Î¥³¥Þ¥ó¥É¤Ç¸«¤é¤ì¤Þ¤¹¡¥
-
-  $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
-
-
-* ¥Û¡¼¥à¥Ú¡¼¥¸
-
-Ruby¤Î¥Û¡¼¥à¥Ú¡¼¥¸¤ÎURL¤Ï
-
-   http://www.ruby-lang.org/
-
-¤Ç¤¹¡¥
-
-
-* ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È
-
-Ruby¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬¤¢¤ê¤Þ¤¹¡£»²²Ã´õ˾¤ÎÊý¤Ï
-
-   ruby-list-ctl@ruby-lang.org
-
-¤Þ¤ÇËÜʸ¤Ë
-
-   subscribe YourFirstName YourFamilyName
-   
-¤È½ñ¤¤¤ÆÁ÷¤Ã¤Æ²¼¤µ¤¤¡£ 
-
-Ruby³«È¯¼Ô¸þ¤±¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤â¤¢¤ê¤Þ¤¹¡£¤³¤Á¤é¤Ç¤Ïruby¤Î¥Ð
-¥°¡¢¾­Íè¤Î»ÅÍͳÈÄ¥¤Ê¤É¼ÂÁõ¾å¤ÎÌäÂê¤Ë¤Ä¤¤¤ÆµÄÏÀ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-»²²Ã´õ˾¤ÎÊý¤Ï
-
-   ruby-dev-ctl@ruby-lang.org
-
-¤Þ¤Çruby-list¤ÈƱÍͤÎÊýË¡¤Ç¥á¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£ 
-
-Ruby³ÈÄ¥¥â¥¸¥å¡¼¥ë¤Ë¤Ä¤¤¤ÆÏ䷹礦ruby-ext¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤È
-¿ô³Ø´Ø·¸¤ÎÏÃÂê¤Ë¤Ä¤¤¤ÆÏ䷹礦ruby-math¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤È
-±Ñ¸ì¤ÇÏ䷹礦ruby-talk¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤â¤¢¤ê¤Þ¤¹¡£»²²ÃÊýË¡
-¤Ï¤É¤ì¤âƱ¤¸¤Ç¤¹¡£ 
-
-
-* ¥³¥ó¥Ñ¥¤¥ë¡¦¥¤¥ó¥¹¥È¡¼¥ë
-
-°Ê²¼¤Î¼ê½ç¤Ç¹Ô¤Ã¤Æ¤¯¤À¤µ¤¤¡¥
-
-  1. ¤â¤·configure¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤é¤Ê¤¤¡¢¤â¤·¤¯¤Ï
-     configure.in¤è¤ê¸Å¤¤¤è¤¦¤Ê¤é¡¢autoconf¤ò¼Â¹Ô¤·¤Æ
-     ¿·¤·¤¯configure¤òÀ¸À®¤¹¤ë
-
-  2. configure¤ò¼Â¹Ô¤·¤ÆMakefile¤Ê¤É¤òÀ¸À®¤¹¤ë
-
-     ´Ä¶­¤Ë¤è¤Ã¤Æ¤Ï¥Ç¥Õ¥©¥ë¥È¤ÎC¥³¥ó¥Ñ¥¤¥éÍÑ¥ª¥×¥·¥ç¥ó¤¬ÉÕ¤­
-     ¤Þ¤¹¡¥configure¥ª¥×¥·¥ç¥ó¤Ç optflags=.. warnflags=.. Åù
-     ¤Ç¾å½ñ¤­¤Ç¤­¤Þ¤¹¡¥
-
-  3. (ɬÍפʤé¤Ð)defines.h¤òÊÔ½¸¤¹¤ë
-
-     ¿ʬ¡¤É¬Í×̵¤¤¤È»×¤¤¤Þ¤¹¡¥
-
-  4. (ɬÍפʤé¤Ð)ext/Setup¤ËÀÅŪ¤Ë¥ê¥ó¥¯¤¹¤ë³ÈÄ¥¥â¥¸¥å¡¼¥ë¤ò
-     »ØÄꤹ¤ë
-
-     ext/Setup¤Ëµ­½Ò¤·¤¿¥â¥¸¥å¡¼¥ë¤ÏÀÅŪ¤Ë¥ê¥ó¥¯¤µ¤ì¤Þ¤¹¡¥
-
-     ¥À¥¤¥Ê¥ß¥Ã¥¯¥í¡¼¥Ç¥£¥ó¥°¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¥¢¡¼¥­¥Æ¥¯
-     ¥Á¥ã¤Ç¤ÏSetup¤Î1¹ÔÌܤΡÖoption nodynamic¡×¤È¤¤¤¦¹Ô¤Î¥³
-     ¥á¥ó¥È¤ò³°¤¹É¬Íפ¬¤¢¤ê¤Þ¤¹¡¥¤Þ¤¿¡¤¤³¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ç
-     ³ÈÄ¥¥â¥¸¥å¡¼¥ë¤òÍøÍѤ¹¤ë¤¿¤á¤Ë¤Ï¡¤¤¢¤é¤«¤¸¤áÀÅŪ¤Ë¥ê¥ó
-     ¥¯¤·¤Æ¤ª¤¯É¬Íפ¬¤¢¤ê¤Þ¤¹¡¥
-
-  5. make¤ò¼Â¹Ô¤·¤Æ¥³¥ó¥Ñ¥¤¥ë¤¹¤ë
-
-  6. make test¤Ç¥Æ¥¹¥È¤ò¹Ô¤¦¡¥
-
-     ¡Ötest succeeded¡×¤Èɽ¼¨¤µ¤ì¤ì¤ÐÀ®¸ù¤Ç¤¹¡¥¤¿¤À¤·¥Æ¥¹¥È
-     ¤ËÀ®¸ù¤·¤Æ¤â´°àú¤À¤ÈÊݾڤµ¤ì¤Æ¤¤¤ëÌõ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡¥
-
-  7. make install
-
-     °Ê²¼¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤Ã¤Æ¡¤¤½¤³¤Ë¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼
-     ¥ë¤·¤Þ¤¹¡¥
-
-       * ${DESTDIR}${prefix}/bin
-       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib
-       * ${DESTDIR}${prefix}/lib/ruby
-       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}
-       * ${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}
-       * ${DESTDIR}${prefix}/share/man/man1
-       * ${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system
-
-     Ruby¤ÎAPI¥Ð¡¼¥¸¥ç¥ó¤¬`x.y.z'¤Ç¤¢¤ì¤Ð¡¤((|${MAJOR}|))¤Ï
-     `x'¤Ç¡¤((|${MINOR}|))¤Ï`y'¡¤((|${TEENY}|))¤Ï`z'¤Ç¤¹¡¥
-
-     Ãí°Õ: API¥Ð¡¼¥¸¥ç¥ó¤Îteeny¤Ï¡¤Ruby¥×¥í¥°¥é¥à¤Î¥Ð¡¼¥¸¥ç
-     ¥ó¤È¤Ï°Û¤Ê¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¡¥
-
-     root¤Çºî¶È¤¹¤ëɬÍפ¬¤¢¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¡¥
-
-¤â¤·¡¤¥³¥ó¥Ñ¥¤¥ë»þ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¤Ë¤Ï¥¨¥é¡¼¤Î¥í¥°¤È¥Þ
-¥·¥ó¡¤OS¤Î¼ïÎà¤ò´Þ¤à¤Ç¤­¤ë¤À¤±¾Ü¤·¤¤¥ì¥Ý¡¼¥È¤òºî¼Ô¤ËÁ÷¤Ã¤Æ¤¯
-¤À¤µ¤ë¤È¾¤ÎÊý¤Î¤¿¤á¤Ë¤â¤Ê¤ê¤Þ¤¹¡¥
-
-
-* °Ü¿¢
-
-UNIX¤Ç¤¢¤ì¤Ðconfigure¤¬¤Û¤È¤ó¤É¤Îº¹°Û¤òµÛ¼ý¤·¤Æ¤¯¤ì¤ë¤Ï¤º¤Ç
-¤¹¤¬¡¤»×¤ï¤Ì¸«Íî¤È¤·¤¬¤¢¤Ã¤¿¾ì¹ç(¤¢¤ë¤Ë°ã¤¤¤Ê¤¤)¡¤ºî¼Ô¤Ë¤½¤Î
-¤³¤È¤ò¥ì¥Ý¡¼¥È¤¹¤ì¤Ð¡¤²ò·è¤Ç¤­¤ë¤«¤âÃΤì¤Þ¤»¤ó¡¥
-
-¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤Ë¤â¤Ã¤È¤â°Í¸¤¹¤ë¤Î¤ÏGCÉô¤Ç¤¹¡¥Ruby¤ÎGC¤ÏÂоÝ
-¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬setjmp()¤Þ¤¿¤Ïgetcontext()¤Ë¤è¤Ã¤ÆÁ´¤Æ¤Î¥ì
-¥¸¥¹¥¿¤òjmp_buf¤äucontext_t¤Ë³ÊǼ¤¹¤ë¤³¤È¤È¡¤jmp_buf¤ä
-ucontext_t¤È¥¹¥¿¥Ã¥¯¤¬32bit¥¢¥é¥¤¥ó¥á¥ó¥È¤µ¤ì¤Æ¤¤¤ë¤³¤È¤ò²¾Äê
-¤·¤Æ¤¤¤Þ¤¹¡¥ÆäËÁ°¼Ô¤¬À®Î©¤·¤Ê¤¤¾ì¹ç¤ÎÂбþ¤ÏÈó¾ï¤Ëº¤Æñ¤Ç¤·¤ç
-¤¦¡¥¸å¼Ô¤Î²ò·è¤ÏÈæ³ÓŪ´Êñ¤Ç¡¤gc.c¤Ç¥¹¥¿¥Ã¥¯¤ò¥Þ¡¼¥¯¤·¤Æ¤¤¤ë
-Éôʬ¤Ë¥¢¥é¥¤¥ó¥á¥ó¥È¤Î¥Ð¥¤¥È¿ô¤À¤±¤º¤é¤·¤Æ¥Þ¡¼¥¯¤¹¤ë¥³¡¼¥É¤ò
-Äɲ乤ë¤À¤±¤ÇºÑ¤ß¤Þ¤¹¡¥¡Ödefined(__mc68000__)¡×¤Ç³ç¤é¤ì¤Æ¤¤
-¤ëÉôʬ¤ò»²¹Í¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡¥
-
-¥ì¥¸¥¹¥¿¥¦¥£¥ó¥É¥¦¤ò»ý¤ÄCPU¤Ç¤Ï¡¤¥ì¥¸¥¹¥¿¥¦¥£¥ó¥É¥¦¤ò¥¹¥¿¥Ã
-¥¯¤Ë¥Õ¥é¥Ã¥·¥å¤¹¤ë¥¢¥»¥ó¥Ö¥é¥³¡¼¥É¤òÄɲ乤ëɬÍפ¬¤¢¤ë¤«¤âÃÎ
-¤ì¤Þ¤»¤ó¡¥
-
-
-* ÇÛÉÛ¾ò·ï
-
-COPYING.ja¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-
-
-* Ãø¼Ô
-
-¥³¥á¥ó¥È¡¤¥Ð¥°¥ì¥Ý¡¼¥È¤½¤Î¾¤Ï matz@netlab.jp ¤Þ¤Ç¡¥
--------------------------------------------------------
-created at: Thu Aug  3 11:57:36 JST 1995
-Local variables:
-mode: indented-text
-end:
diff --git a/README.ja.md b/README.ja.md
new file mode 100644
index 0000000000..9d6131e416
--- /dev/null
+++ b/README.ja.md
@@ -0,0 +1,171 @@
+# Ruby��
+
+Ruby�シンプル��強力�オブジェクト指�スクリプト言語��． Ruby�純粋�オブジェクト指�言語���設計�れ��る��，
+オブジェクト指�プログラミングを手軽�行�事�出���．も��ん普通�手続�型�プログラミングも�能��．
+
+Ruby�テキスト処�関係�能力���優れ，Perl����ら�強力��．�ら�シンプル�文法�，
+例外処�やイテレータ���機構�よ��，より分�りや��プログラミング�出���．
+
+## Ruby�特長
+
+*   シンプル�文法
+*   普通�オブジェクト指�機能(クラス，メソッドコール��)
+*   特殊�オブジェクト指�機能(Mixin, 特異メソッド��)
+*   演算�オー�ーロード
+*   例外処�機能
+*   イテレータ�クロージャ
+*   ガーベージコレクタ
+*   ダイナミックローディング (アーキテク�ャ�よる)
+*   移�性�高�．多��Unix-like/POSIX互�プラットフォーム上�動������，Windows， Mac OS
+    X，BeOS���上�も動� cf.
+    http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatformsJa
+
+
+## 入手法
+
+### FTP�
+
+以下�場所�����り��．
+
+ftp://ftp.ruby-lang.org/pub/ruby/
+
+### Subversion�
+
+開発先端�ソースコード�次�コマンド��得����．
+
+    $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+
+他�開発中�ブラン��一覧�次�コマンド�見られ��．
+
+    $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
+
+### Git�
+
+Subversion�ミラーをGitHub�公開�����． 以下�コマンド�リ�ジトリを�得����．
+
+    $ git clone git://github.com/ruby/ruby.git
+
+## ホームページ
+
+Ruby�ホームページ�URL�
+
+http://www.ruby-lang.org/
+
+��．
+
+## メーリングリスト
+
+Ruby�メーリングリスト��り��．�加希望�方�
+
+mailto:ruby-list-request@ruby-lang.org
+
+��本文�
+
+    subscribe
+
+�書�����下��．
+
+Ruby開発者��メーリングリストも�り��．��ら��ruby��グ，将��仕様拡張��実装上��題����議論�れ����． �加希望�方�
+
+mailto:ruby-dev-request@ruby-lang.org
+
+��ruby-list��様�方法�メール������．
+
+Ruby拡張モジュール����話���ruby-extメーリングリスト�数学関係�話題����話���ruby-mathメーリングリスト�
+英語�ruby����話���ruby-talkメーリングリストも�り��．�加方法��れも����．
+
+## コンパイル・インストール
+
+以下�手順�行������．
+
+1.  も� `configure` ファイル�見��ら��，も��� `configure.in` より��よ��ら， `autoconf` を実行��
+    新�� `configure` を生��る
+
+2.  `configure` を実行�� `Makefile` ��を生��る
+
+    環境�よ���デフォルト�Cコンパイラ用オプション�付���． `configure` オプション� `optflags=..`
+    `warnflags=..` 等�上書�����．
+
+3.  (必��ら�)`defines.h` を編集�る
+
+    多分，必�無������．
+
+4.  (必��ら�)`ext/Setup` ��的�リンク�る拡張モジュールを指定�る
+
+    `ext/Setup` �記述��モジュール��的�リンク�れ��．
+
+    ダイナミックローディングをサ�ート�����アーキテク�ャ�� `Setup` �1行目�「`option nodynamic`����行�コ
+    メントを外�必���り��．��，��アーキテク�ャ�拡張モジュールを利用�る����，�ら����的�リンクを����必���り��．
+
+5.  `make` を実行��コンパイル�る
+
+6.  `make check`�テストを行�．
+
+    「`check succeeded`��表示�れれ��功��．���テスト��功��も完璧���証�れ��る訳���り��ん．
+
+7.  `make install`
+
+    以下�ディレクトリを作��，���ファイルをインストー ル���．
+
+    *   `${DESTDIR}${prefix}/bin`
+    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib`
+    *   `${DESTDIR}${prefix}/lib/ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/share/man/man1`
+    *   `${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system`
+
+
+    Ruby�API�ージョン�'*x.y.z*'��れ�，`${MAJOR}`�
+    '*x*'�，`${MINOR}`�'*y*'，`${TEENY}`�'*z*'��．
+
+    **注�**: API�ージョン� `teeny` �，Rubyプログラム��ージョン��異�る����り��．
+
+    `root` �作業�る必���る�も�れ��ん．
+
+
+も�，コンパイル時�エラー�発生��場���エラー�ログ�マシン，OS�種類を�む��る��詳��レ�ートを作者����下�る�他�方����も�り��．
+
+## 移�
+
+UNIX��れ� `configure` ���ん��差異を�����れる�����，���見�������場�(�る事�多�)，作者���
+��を報告�れ�，解決��る�能性��り��．
+
+アーキテク�ャ�も��も�存�る��GC部��．Ruby�GC�対象
+�アーキテク�ャ�`setjmp()`���`getcontext()`�よ��全��レジスタを `jmp_buf` や `ucontext_t`
+�格��る���， `jmp_buf` や `ucontext_t` �スタック�32bitアラインメント�れ��る��を仮定
+�����．特��者��立���場��対応��常�困難��ょ�． 後者�解決�比較的簡��， `gc.c` �スタックをマーク���る
+部分�アラインメント��イト数���ら��マーク�るコードを追加�る���済���．`defined(__mc68000__)`�括られ��
+る部分を�考�������．
+
+レジスタウィンドウを��CPU��，レジスタウィンドウをスタック�フラッシュ�るアセンブラコードを追加�る必���る�も�れ��ん．
+
+## �布�件
+
+[COPYING.ja](COPYING.ja) ファイルを�照������．
+
+## フィード�ック
+
+Ruby�関�る質�� Ruby-Talk（英語）や Ruby-List（日本語） (https://www.ruby-lang.org/ja/community/mailing-lists) や，
+stackoverflow (http://ja.stackoverflow.com/) ���Webサイト�投稿������．
+
+�グ報告� http://bugs.ruby-lang.org ���付�����．
+
+
+## 著者
+
+Ruby�オリジナル版�，1995年���も�ゆ�����よ��設計・開発�れ���．
+
+<mailto:matz@ruby-lang.org>
+
+---
+created at: Thu Aug  3 11:57:36 JST 1995
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..f79ba9c718
--- /dev/null
+++ b/README.md
@@ -0,0 +1,167 @@
+[![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)
+
+# What's Ruby
+
+Ruby is the interpreted scripting language for quick and easy object-oriented
+programming.  It has many features to process text files and to do system
+management tasks (as in Perl).  It is simple, straight-forward, and
+extensible.
+
+## Features of Ruby
+
+*   Simple Syntax
+*   **Normal** Object-oriented Features (e.g. class, method calls)
+*   **Advanced** Object-oriented Features (e.g. Mix-in, Singleton-method)
+*   Operator Overloading
+*   Exception Handling
+*   Iterators and Closures
+*   Garbage Collection
+*   Dynamic Loading of Object Files (on some architectures)
+*   Highly Portable (works on many Unix-like/POSIX compatible platforms as
+    well as Windows, Mac OS X, BeOS, etc.) cf.
+    http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatforms
+
+
+## How to get Ruby
+
+For a complete list of ways to install Ruby, including using third-party tools
+like rvm, see:
+
+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 http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
+
+Or if you are using git then use the following command:
+
+    $ git clone git://github.com/ruby/ruby.git
+
+There are some other branches under development.  Try the following command
+to see the list of 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 git://github.com/ruby/ruby.git
+
+## Ruby home page
+
+The URL of the Ruby home page is:
+
+http://www.ruby-lang.org/
+
+## Mailing list
+
+There is a mailing list to talk about Ruby. To subscribe to this list, please
+send the following phrase:
+
+    subscribe
+
+in the mail body (not subject) to the address
+<mailto:ruby-talk-request@ruby-lang.org>.
+
+## 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 instead of this document.
+
+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
+    override them.
+
+4.  Edit `defines.h` if you need. Usually this step will not be needed.
+
+5.  Remove comment mark(`#`) before the module names from `ext/Setup` (or add
+    module names if not present), if you want to link modules statically.
+
+    If you don't want to compile non static extension modules (probably on
+    architectures which do not allow dynamic loading), remove comment mark
+    from the line "`#option nodynamic`" in `ext/Setup`.
+
+    Usually this step will not be needed.
+
+6.  Run `make`.
+
+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.  Run '`make install`'
+
+    This command will create the following directories and install files into
+    them.
+
+    *   `${DESTDIR}${prefix}/bin`
+    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib`
+    *   `${DESTDIR}${prefix}/lib/ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}`
+    *   `${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}`
+    *   `${DESTDIR}${prefix}/share/man/man1`
+    *   `${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system`
+
+
+    If Ruby's API version is '*x.y.z*', the `${MAJOR}` is '*x*', the
+    `${MINOR}` is '*y*', and the `${TEENY}` is '*z*'.
+
+    **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.
+
+
+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
+external libraries and/or headers, then you will need to run '`make distclean-ext`'
+to remove old configuration after installing them in such case.
+
+## Copying
+
+See the file [COPYING](COPYING).
+
+## Feedback
+
+Questions about the Ruby language can be asked on the Ruby-Talk mailing list
+(http://www.ruby-lang.org/en/community/mailing-lists) or on websites like
+(http://stackoverflow.com).
+
+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
+
+See the file [CONTRIBUTING.md](CONTRIBUTING.md)
+
+
+## The Author
+
+Ruby was originally designed and developed by Yukihiro Matsumoto (Matz) in
+1995.
+
+<mailto:matz@ruby-lang.org>
diff --git a/ToDo b/ToDo
deleted file mode 100644
index 7e5ef523a8..0000000000
--- a/ToDo
+++ /dev/null
@@ -1,124 +0,0 @@
-Language Spec.
-
-- Class#allocate - basicNew
-- class Foo::Bar<Baz .. end, module Boo::Bar .. end
-- raise exception by `` error
-- a +1 to be a+1, not a(+1).
-- clarify evaluation order of operator argument (=~, .., ...)
-- :symbol => value hash in the form of {symbol: value, ...} ??
-* operator !! for rescue. ???
-* objectify characters
-* ../... outside condition invokes operator method too.
-* ... inside condition turns off just before right condition.???
-* package or access control for global variables??
-* named arguments like foo(nation:="german") or foo(nation: "german").
-* method to retrieve argument information (needs new C API)
-* multiple return values, yield values.  maybe incompatible ???
-* cascading method invocation ???
-* def Class#method .. end ??
-* def Foo::Bar::baz() .. end ??
-* I18N (or M17N) script/string/regexp
-* discourage use of symbol variables (e.g. $/, etc.) in manual
-* discourage use of Perlish features by giving warnings.
-* non confusing in-block local variable (is it possible?)
-  + remove scope by block
-  + variables appears within block may have independent values.
-* Regexp: make /o thread safe.
-* decide whether begin with rescue or ensure make do..while loop.
-* unify == and eql? again
-* to_i returns nil if str contains no digit.
-* jar like combined library package. -> RubyGems?
-* method combination, e.g. before, after, around, etc.
-* .. or something like defadvice in Emacs.
-* property - for methods, or for objects in general.
-* "in" modifier, to annotate, or to encourage assertion.
-* selector namespace - something like generic-flet in CLOS, to help RubyBehavior
-* private instance variable (as in Python?) @_foo in class Foo => @_Foo_foo
-* warn/error "bare word" method, like "foo",  you should type "foo()"
-
-Hacking Interpreter
-
-- generational GC
-* non-blocking open (e.g. for named pipe) for thread
-* avoid blocking with gethostbyname/gethostbyaddr (use fork ???)
-* objectify interpreters ???
-* remove rb_eval() recursions
-* syntax tree -> bytecode ???
-* scrambled script, or script filter
-* setuid ruby
-* performance tune for in-block (dynamic) local variables.
-* give warnings to assign magic variables.
-* export rb_io_{addstr,printf,puts,print}
-* autoload should work with threads [ruby-talk:4589]
-* remove stdio dependency from IOs.
-* warn for inconsistent local variable usage (lv m and method m at the same time). 
-* MicroRuby
-* Built-in Interactive Ruby.
-* Parser API
-* trap every method invocation, which can be enabled by e.g. trap_call :method.
-* unify Errno exceptions of same errno, or new exception comparison scheme.
-* 2.times{|i| if i==0 then a = 15 else puts eval("a") end} should print nil.
-* Thread#max_stack_size attribute (possible??)
-
-Standard Libraries
-
-- Module#define_method which takes a name and a body (block, proc or method).
-- Enume#inject
-- Array#fetch
-- IO::for_fd
-- Process::waitall [ruby-talk:4557]
-- Process::Status
-- File::lchown, File::lchmod; xxx - still need work for non existing platforms
-- move Time::times to Process.
-- Enumerable#sort_by for Schwartzian transformation
-- fork_and_kill_other_threads.
-- signal list (Signal::trap, Signal::list).
-- move NameError under StandardError.
-- Integer#to_s(base)
-- Hash::new{default}
-- hash etc. should handle self referenceing array/hash
-- Array#select(n1,n2...) works like Array#indexes(n1,n2...)
-- use Mersenne Twister RNG for random.
-- deprecate Array#indexes, and Array#indices.
-- remove dependency on MAXPATHLEN.
-- String#scanf(?)
-* Object#fmt(?)
-* Time::strptime
-* Integer[num], Float[num];  Fixnum[num]?
-* method to retrieve non-number trailer for to_i/to_f.
-* Stream or Port, abstract superclass of IO ?
-* String#{pred,prev}, String#downto
-* optional stepsize argument for succ()
-* Ruby module -- Ruby::Version, Ruby::Interpreter
-* introduce Boolean class; super of TrueClass, FalseClass
-* synchronized method - synchronized{...}, synchronized :foo, :bar
-* Array#&, Array#| to allow duplication. ???
-* way to specify immortal (fork endurance) thread;
-* or raise ForkException to every thread but fork caller.
-* new user-defined marshal scheme. _dump(dumper), _load(restorer)
-* library to load per-user profile seeking .ruby_profile or ruby.ini file.
-* warning framework (warn, warning for Ruby level)
-* marshal should not depend on sprintf (works bad with locale).
-* ternary arg pow: a.pow(b,c) == a**b%c
-* new caller(), e.g. call_stack; needs better name.
-* pointer share mechanism similar to one in String for Array.
-* require "1.6" etc. by /usr/lib/ruby/1.6/1.6.rb ;-)
-* save both "feature names" and "normalized path" in $"
-* implement Mutex_m (or MutexMixin) using Mutex.
-
-Extension Libraries
-
-* ptk.rb pTk wrapper that is compatible to tk.rb
-* Berkeley DB extension
-* BitVector
-* thread-safe fcgi
-
-Ruby Libraries
-
-- urllib.rb, nttplib.rb, etc.
-* format like perl's
-
-Tools
-
-* freeze or undump to bundle everything
-* bundle using zlib
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
new file mode 100644
index 0000000000..56e944be8f
--- /dev/null
+++ b/aclocal.m4
@@ -0,0 +1,15 @@
+# generated automatically by aclocal 1.15 -*- Autoconf -*-
+
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+m4_include([acinclude.m4])
diff --git a/addr2line.c b/addr2line.c
index 219d1d4b47..a20e5000c4 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -1,6 +1,6 @@
 /**********************************************************************
 
-  addr2line.h -
+  addr2line.c -
 
   $Author$
 
@@ -9,6 +9,7 @@
 **********************************************************************/
 
 #include "ruby/config.h"
+#include "ruby/missing.h"
 #include "addr2line.h"
 
 #include <stdio.h>
@@ -16,14 +17,10 @@
 
 #ifdef USE_ELF
 
-#ifdef __OpenBSD__
-#include <elf_abi.h>
-#else
-#include <elf.h>
-#endif
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/mman.h>
@@ -31,15 +28,33 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#if defined(HAVE_ALLOCA_H)
-#include <alloca.h>
+#ifdef __OpenBSD__
+#include <elf_abi.h>
+#else
+#include <elf.h>
 #endif
 
-#ifdef HAVE_DL_ITERATE_PHDR
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
+/* Make alloca work the best possible way.  */
+#ifdef __GNUC__
+# ifndef alloca
+#  define alloca __builtin_alloca
 # endif
-# include <link.h>
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+#pragma alloca
+#  else
+#   ifndef alloca		/* predefined by HP cc +Olibcalls */
+void *alloca();
+#   endif
+#  endif /* AIX */
+# endif	/* HAVE_ALLOCA_H */
+#endif /* __GNUC__ */
+
+#ifdef HAVE_DLADDR
+# include <dlfcn.h>
 #endif
 
 #define DW_LNS_copy                     0x01
@@ -68,23 +83,45 @@
 #  define ElfW(x) Elf32##_##x
 # endif
 #endif
+#ifndef ELF_ST_TYPE
+# if SIZEOF_VOIDP == 8
+#  define ELF_ST_TYPE ELF64_ST_TYPE
+# else
+#  define ELF_ST_TYPE ELF32_ST_TYPE
+# endif
+#endif
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
+int kprintf(const char *fmt, ...);
 
 typedef struct {
     const char *dirname;
     const char *filename;
+    const char *path; /* object path */
     int line;
 
+    uintptr_t base_addr;
+    uintptr_t saddr;
+    const char *sname; /* function name */
+} line_info_t;
+typedef struct obj_info obj_info_t;
+struct obj_info {
+    const char *path; /* object path */
     int fd;
     void *mapped;
     size_t mapped_size;
-    unsigned long base_addr;
-} line_info_t;
+    uintptr_t base_addr;
+    obj_info_t *next;
+};
 
 /* Avoid consuming stack as this module may be used from signal handler */
 static char binary_filename[PATH_MAX];
 
 static unsigned long
-uleb128(char **p) {
+uleb128(char **p)
+{
     unsigned long r = 0;
     int s = 0;
     for (;;) {
@@ -100,7 +137,8 @@ uleb128(char **p) {
 }
 
 static long
-sleb128(char **p) {
+sleb128(char **p)
+{
     long r = 0;
     int s = 0;
     for (;;) {
@@ -130,7 +168,7 @@ get_nth_dirname(unsigned long dir, char *p)
 	while (*p) p++;
 	p++;
 	if (!*p) {
-	    fprintf(stderr, "Unexpected directory number %lu in %s\n",
+	    kprintf("Unexpected directory number %lu in %s\n",
 		    dir, binary_filename);
 	    return "";
 	}
@@ -150,7 +188,7 @@ fill_filename(int file, char *include_directories, char *filenames,
 	filename = p;
 	if (!*p) {
 	    /* Need to output binary file name? */
-	    fprintf(stderr, "Unexpected file number %d in %s\n",
+	    kprintf("Unexpected file number %d in %s\n",
 		    file, binary_filename);
 	    return;
 	}
@@ -169,34 +207,15 @@ fill_filename(int file, char *include_directories, char *filenames,
     }
 }
 
-static int
-get_path_from_symbol(const char *symbol, const char **p, size_t *len)
-{
-    if (symbol[0] == '0') {
-	/* libexecinfo */
-	*p   = strchr(symbol, '/');
-	if (*p == NULL) return 0;
-	*len = strlen(*p);
-    }
-    else {
-	/* glibc */
-	const char *q;
-	*p   = symbol;
-	q   = strchr(symbol, '(');
-	if (q == NULL) return 0;
-	*len = q - symbol;
-    }
-    return 1;
-}
-
 static void
-fill_line(int num_traces, void **traces,
-	  unsigned long addr, int file, int line,
-	  char *include_directories, char *filenames, line_info_t *lines)
+fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line,
+	  char *include_directories, char *filenames,
+	  obj_info_t *obj, line_info_t *lines, int offset)
 {
     int i;
-    for (i = 0; i < num_traces; i++) {
-	unsigned long a = (unsigned long)traces[i] - lines[i].base_addr;
+    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) {
@@ -207,27 +226,27 @@ fill_line(int num_traces, void **traces,
 }
 
 static void
-parse_debug_line_cu(int num_traces, void **traces,
-		    char **debug_line, line_info_t *lines)
+parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
+		obj_info_t *obj, line_info_t *lines, int offset)
 {
     char *p, *cu_end, *cu_start, *include_directories, *filenames;
     unsigned long unit_length;
     int default_is_stmt, line_base;
     unsigned int header_length, minimum_instruction_length, line_range,
 		 opcode_base;
-    unsigned char *standard_opcode_lengths;
+    /* unsigned char *standard_opcode_lengths; */
 
     /* The registers. */
     unsigned long addr = 0;
     unsigned int file = 1;
     unsigned int line = 1;
-    unsigned int column = 0;
+    /* 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;
+    /* int basic_block = 0; */
+    /* int end_sequence = 0; */
+    /* int prologue_end = 0; */
+    /* int epilogue_begin = 0; */
+    /* unsigned int isa = 0; */
 
     p = *debug_line;
 
@@ -254,7 +273,7 @@ parse_debug_line_cu(int num_traces, void **traces,
     is_stmt = default_is_stmt = *(unsigned char *)p;
     p++;
 
-    line_base = *(char *)p;
+    line_base = *(signed char *)p;
     p++;
 
     line_range = *(unsigned char *)p;
@@ -263,7 +282,7 @@ parse_debug_line_cu(int num_traces, void **traces,
     opcode_base = *(unsigned char *)p;
     p++;
 
-    standard_opcode_lengths = (unsigned char *)p - 1;
+    /* standard_opcode_lengths = (unsigned char *)p - 1; */
     p += opcode_base - 1;
 
     include_directories = p;
@@ -282,8 +301,9 @@ parse_debug_line_cu(int num_traces, void **traces,
 #define FILL_LINE()						    \
     do {							    \
 	fill_line(num_traces, traces, addr, file, line,		    \
-		  include_directories, filenames, lines);	    \
-	basic_block = prologue_end = epilogue_begin = 0;	    \
+		  include_directories, filenames,		    \
+		  obj, lines, offset);				    \
+	/*basic_block = prologue_end = epilogue_begin = 0;*/	    \
     } while (0)
 
     while (p < cu_end) {
@@ -306,13 +326,13 @@ parse_debug_line_cu(int num_traces, void **traces,
 	    file = (unsigned int)uleb128(&p);
 	    break;
 	case DW_LNS_set_column:
-	    column = (unsigned int)uleb128(&p);
+	    /*column = (unsigned int)*/(void)uleb128(&p);
 	    break;
 	case DW_LNS_negate_stmt:
 	    is_stmt = !is_stmt;
 	    break;
 	case DW_LNS_set_basic_block:
-	    basic_block = 1;
+	    /*basic_block = 1; */
 	    break;
 	case DW_LNS_const_add_pc:
 	    a = ((255 - opcode_base) / line_range) *
@@ -324,35 +344,35 @@ parse_debug_line_cu(int num_traces, void **traces,
 	    addr += a;
 	    break;
 	case DW_LNS_set_prologue_end:
-	    prologue_end = 1;
+	    /* prologue_end = 1; */
 	    break;
 	case DW_LNS_set_epilogue_begin:
-	    epilogue_begin = 1;
+	    /* epilogue_begin = 1; */
 	    break;
 	case DW_LNS_set_isa:
-	    isa = (unsigned int)uleb128(&p);
+	    /* isa = (unsigned int)*/(void)uleb128(&p);
 	    break;
 	case 0:
 	    a = *(unsigned char *)p++;
 	    op = *p++;
 	    switch (op) {
 	    case DW_LNE_end_sequence:
-		end_sequence = 1;
+		/* end_sequence = 1; */
 		FILL_LINE();
 		addr = 0;
 		file = 1;
 		line = 1;
-		column = 0;
+		/* column = 0; */
 		is_stmt = default_is_stmt;
-		end_sequence = 0;
-		isa = 0;
+		/* end_sequence = 0; */
+		/* isa = 0; */
 		break;
 	    case DW_LNE_set_address:
 		addr = *(unsigned long *)p;
 		p += sizeof(unsigned long);
 		break;
 	    case DW_LNE_define_file:
-		fprintf(stderr, "Unsupported operation in %s\n",
+		kprintf("Unsupported operation in %s\n",
 			binary_filename);
 		break;
 	    case DW_LNE_set_discriminator:
@@ -360,7 +380,7 @@ parse_debug_line_cu(int num_traces, void **traces,
 		uleb128(&p);
 		break;
 	    default:
-		fprintf(stderr, "Unknown extended opcode: %d in %s\n",
+		kprintf("Unknown extended opcode: %d in %s\n",
 			op, binary_filename);
 	    }
 	    break;
@@ -381,32 +401,41 @@ parse_debug_line_cu(int num_traces, void **traces,
 
 static void
 parse_debug_line(int num_traces, void **traces,
-		 char *debug_line, unsigned long size, line_info_t *lines)
+		 char *debug_line, unsigned long size,
+		 obj_info_t *obj, line_info_t *lines, int offset)
 {
     char *debug_line_end = debug_line + size;
     while (debug_line < debug_line_end) {
-	parse_debug_line_cu(num_traces, traces, &debug_line, lines);
+	parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset);
     }
     if (debug_line != debug_line_end) {
-	fprintf(stderr, "Unexpected size of .debug_line in %s\n",
+	kprintf("Unexpected size of .debug_line in %s\n",
 		binary_filename);
     }
 }
 
 /* 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);
+
 static void
-fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
-	   line_info_t *current_line, line_info_t *lines);
+append_obj(obj_info_t **objp) {
+    obj_info_t *newobj = calloc(1, sizeof(obj_info_t));
+    if (*objp) (*objp)->next = newobj;
+    *objp = newobj;
+}
 
 static void
-follow_debuglink(char *debuglink, int num_traces, void **traces, char **syms,
-		 line_info_t *current_line, line_info_t *lines)
+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";
     char *p, *subdir;
+    obj_info_t *o1 = *objp, *o2;
 
     p = strrchr(binary_filename, '/');
     if (!p) {
@@ -417,22 +446,22 @@ follow_debuglink(char *debuglink, int num_traces, void **traces, char **syms,
     subdir = (char *)alloca(strlen(binary_filename) + 1);
     strcpy(subdir, binary_filename);
     strcpy(binary_filename, global_debug_dir);
-    strncat(binary_filename, subdir,
-	    PATH_MAX - strlen(binary_filename) - 1);
-    strncat(binary_filename, debuglink,
-	    PATH_MAX - strlen(binary_filename) - 1);
-
-    munmap(current_line->mapped, current_line->mapped_size);
-    close(current_line->fd);
-    fill_lines(num_traces, traces, syms, 0, current_line, lines);
+    strlcat(binary_filename, subdir, PATH_MAX);
+    strlcat(binary_filename, debuglink, PATH_MAX);
+
+    append_obj(objp);
+    o2 = *objp;
+    o2->base_addr = o1->base_addr;
+    o2->path = o1->path;
+    fill_lines(num_traces, traces, 0, objp, lines, offset);
 }
 
 /* read file and fill lines */
-static void
-fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
-	   line_info_t *current_line, line_info_t *lines)
+static uintptr_t
+fill_lines(int num_traces, void **traces, int check_debuglink,
+	   obj_info_t **objp, line_info_t *lines, int offset)
 {
-    int i;
+    int i, j;
     char *shstr;
     char *section_name;
     ElfW(Ehdr) *ehdr;
@@ -441,42 +470,53 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
     int fd;
     off_t filesize;
     char *file;
+    ElfW(Shdr) *symtab_shdr = NULL, *strtab_shdr = NULL;
+    ElfW(Shdr) *dynsym_shdr = NULL, *dynstr_shdr = NULL;
+    obj_info_t *obj = *objp;
+    uintptr_t dladdr_fbase = 0;
 
     fd = open(binary_filename, O_RDONLY);
     if (fd < 0) {
-	return;
+	goto fail;
     }
     filesize = lseek(fd, 0, SEEK_END);
     if (filesize < 0) {
 	int e = errno;
 	close(fd);
-	fprintf(stderr, "lseek: %s\n", strerror(e));
-	return;
+	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, filesize, PROT_READ, MAP_SHARED, fd, 0);
+    file = (char *)mmap(NULL, (size_t)filesize, PROT_READ, MAP_SHARED, fd, 0);
     if (file == MAP_FAILED) {
 	int e = errno;
 	close(fd);
-	fprintf(stderr, "mmap: %s\n", strerror(e));
-	return;
+	kprintf("mmap: %s\n", strerror(e));
+	goto fail;
     }
 
-    current_line->fd = fd;
-    current_line->mapped = file;
-    current_line->mapped_size = filesize;
-
-    for (i = 0; i < num_traces; i++) {
-	const char *path;
-	size_t len;
-	if (get_path_from_symbol(syms[i], &path, &len) &&
-		!strncmp(path, binary_filename, len)) {
-	    lines[i].line = -1;
-	}
+    ehdr = (ElfW(Ehdr) *)file;
+    if (memcmp(ehdr->e_ident, "\177ELF", 4) != 0) {
+	/*
+	 * Huh? Maybe filename was overridden by setproctitle() and
+	 * it match non-elf file.
+	 */
+	close(fd);
+	goto fail;
     }
 
-    ehdr = (ElfW(Ehdr) *)file;
+    obj->fd = fd;
+    obj->mapped = file;
+    obj->mapped_size = (size_t)filesize;
+
     shdr = (ElfW(Shdr) *)(file + ehdr->e_shoff);
 
     shstr_shdr = shdr + ehdr->e_shstrndx;
@@ -484,11 +524,88 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
 
     for (i = 0; i < ehdr->e_shnum; i++) {
 	section_name = shstr + shdr[i].sh_name;
-	if (!strcmp(section_name, ".debug_line")) {
-	    debug_line_shdr = shdr + i;
+	switch (shdr[i].sh_type) {
+	  case SHT_STRTAB:
+	    if (!strcmp(section_name, ".strtab")) {
+		strtab_shdr = shdr + i;
+	    }
+	    else if (!strcmp(section_name, ".dynstr")) {
+		dynstr_shdr = shdr + i;
+	    }
+	    break;
+	  case SHT_SYMTAB:
+	    /* if (!strcmp(section_name, ".symtab")) */
+	    symtab_shdr = shdr + i;
+	    break;
+	  case SHT_DYNSYM:
+	    /* if (!strcmp(section_name, ".dynsym")) */
+	    dynsym_shdr = shdr + i;
+	    break;
+	  case SHT_PROGBITS:
+	    if (!strcmp(section_name, ".debug_line")) {
+		debug_line_shdr = shdr + i;
+	    }
+	    else if (!strcmp(section_name, ".gnu_debuglink")) {
+		gnu_debuglink_shdr = shdr + i;
+	    }
 	    break;
-	} else if (!strcmp(section_name, ".gnu_debuglink")) {
-	    gnu_debuglink_shdr = shdr + i;
+	}
+    }
+
+    if (offset == -1) {
+	/* main executable */
+	offset = 0;
+	if (dynsym_shdr && dynstr_shdr) {
+	    char *strtab = file + dynstr_shdr->sh_offset;
+	    ElfW(Sym) *symtab = (ElfW(Sym) *)(file + dynsym_shdr->sh_offset);
+	    int symtab_count = (int)(dynsym_shdr->sh_size / sizeof(ElfW(Sym)));
+	    for (j = 0; j < symtab_count; j++) {
+		ElfW(Sym) *sym = &symtab[j];
+		Dl_info info;
+		void *h, *s;
+		if (ELF_ST_TYPE(sym->st_info) != STT_FUNC || sym->st_size <= 0) continue;
+		h = dlopen(NULL, RTLD_NOW|RTLD_LOCAL);
+		if (!h) continue;
+		s = dlsym(h, strtab + sym->st_name);
+		if (!s) continue;
+		if (dladdr(s, &info)) {
+		    dladdr_fbase = (uintptr_t)info.dli_fbase;
+		    break;
+		}
+	    }
+	    if (ehdr->e_type == ET_EXEC) {
+		obj->base_addr = 0;
+	    }
+	    else {
+		/* PIE (position-independent executable) */
+		obj->base_addr = dladdr_fbase;
+	    }
+	}
+    }
+
+    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;
+	    }
 	}
     }
 
@@ -497,114 +614,592 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
 	   let's check .gnu_debuglink section instead. */
 	if (gnu_debuglink_shdr && check_debuglink) {
 	    follow_debuglink(file + gnu_debuglink_shdr->sh_offset,
-			     num_traces, traces, syms,
-			     current_line, lines);
+			     num_traces, traces,
+			     objp, lines, offset);
 	}
-	return;
+	goto finish;
     }
 
     parse_debug_line(num_traces, traces,
 		     file + debug_line_shdr->sh_offset,
 		     debug_line_shdr->sh_size,
-		     lines);
+		     obj, lines, offset);
+finish:
+    return dladdr_fbase;
+fail:
+    return (uintptr_t)-1;
 }
 
-#ifdef HAVE_DL_ITERATE_PHDR
-
-typedef struct {
-    int num_traces;
-    char **syms;
-    line_info_t *lines;
-} fill_base_addr_state_t;
-
-static int
-fill_base_addr(struct dl_phdr_info *info, size_t size, void *data)
+#define HAVE_MAIN_EXE_PATH
+#if defined(__FreeBSD__)
+# include <sys/sysctl.h>
+#endif
+/* ssize_t main_exe_path(void)
+ *
+ * store the path of the main executable to `binary_filename`,
+ * and returns strlen(binary_filename).
+ * it is NUL terminated.
+ */
+#if defined(__linux__)
+ssize_t
+main_exe_path(void)
 {
-    int i;
-    fill_base_addr_state_t *st = (fill_base_addr_state_t *)data;
-    for (i = 0; i < st->num_traces; i++) {
-	const char *path;
-	size_t len;
-	size_t name_len = strlen(info->dlpi_name);
-
-	if (get_path_from_symbol(st->syms[i], &path, &len) &&
-		(len == name_len || (len > name_len && path[len-name_len-1] == '/')) &&
-		!strncmp(path+len-name_len, info->dlpi_name, name_len)) {
-	    st->lines[i].base_addr = info->dlpi_addr;
-	}
+# define PROC_SELF_EXE "/proc/self/exe"
+    ssize_t len = readlink(PROC_SELF_EXE, binary_filename, PATH_MAX);
+    binary_filename[len] = 0;
+    return len;
+}
+#elif defined(__FreeBSD__)
+ssize_t
+main_exe_path(void)
+{
+    int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
+    size_t len = PATH_MAX;
+    int err = sysctl(mib, 4, binary_filename, &len, NULL, 0);
+    if (err) {
+	kprintf("Can't get the path of ruby");
+	return -1;
     }
-    return 0;
+    len--; /* sysctl sets strlen+1 */
+    return len;
 }
-
-#endif /* HAVE_DL_ITERATE_PHDR */
+#else
+#undef HAVE_MAIN_EXE_PATH
+#endif
 
 void
-rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
+rb_dump_backtrace_with_lines(int num_traces, void **traces)
 {
     int i;
     /* async-signal unsafe */
-    line_info_t *lines = (line_info_t *)calloc(num_traces,
-					       sizeof(line_info_t));
-
-    /* Note that line info of shared objects might not be shown
-       if we don't have dl_iterate_phdr */
-#ifdef HAVE_DL_ITERATE_PHDR
-    fill_base_addr_state_t fill_base_addr_state;
-
-    fill_base_addr_state.num_traces = num_traces;
-    fill_base_addr_state.syms = syms;
-    fill_base_addr_state.lines = lines;
-    /* maybe async-signal unsafe */
-    dl_iterate_phdr(fill_base_addr, &fill_base_addr_state);
-#endif /* HAVE_DL_ITERATE_PHDR */
-
-    for (i = 0; i < num_traces; i++) {
-	const char *path;
-	size_t len;
-	if (lines[i].line) {
-	    continue;
-	}
-
-	if (!get_path_from_symbol(syms[i], &path, &len)) {
-	    continue;
+    line_info_t *lines = (line_info_t *)calloc(num_traces, sizeof(line_info_t));
+    obj_info_t *obj = NULL;
+    /* 2 is NULL + main executable */
+    void **dladdr_fbases = (void **)calloc(num_traces+2, sizeof(void *));
+#ifdef HAVE_MAIN_EXE_PATH
+    char *main_path = NULL; /* used on printing backtrace */
+    ssize_t len;
+    if ((len = main_exe_path()) > 0) {
+	main_path = (char *)alloca(len + 1);
+	if (main_path) {
+	    uintptr_t addr;
+	    memcpy(main_path, binary_filename, len+1);
+	    append_obj(&obj);
+	    obj->path = main_path;
+	    addr = fill_lines(num_traces, traces, 1, &obj, lines, -1);
+	    if (addr != (uintptr_t)-1) {
+		dladdr_fbases[0] = (void *)addr;
+	    }
 	}
-
-	strncpy(binary_filename, path, len);
-	binary_filename[len] = '\0';
-
-	fill_lines(num_traces, trace, syms, 1, &lines[i], lines);
     }
+#endif
 
-    /* fprintf may not be async-signal safe */
+    /* fill source lines by reading dwarf */
     for (i = 0; i < num_traces; i++) {
-	line_info_t *line = &lines[i];
-
-	if (line->line > 0) {
-	    fprintf(stderr, "%s ", syms[i]);
-	    if (line->filename) {
-		if (line->dirname && line->dirname[0]) {
-		    fprintf(stderr, "%s/", line->dirname);
+	Dl_info info;
+	if (lines[i].line) continue;
+	if (dladdr(traces[i], &info)) {
+	    const char *path;
+	    void **p;
+
+	    /* skip symbols which is in already checked objects */
+	    /* if the binary is strip-ed, this may effect */
+	    for (p=dladdr_fbases; *p; p++) {
+		if (*p == info.dli_fbase) {
+		    lines[i].path = info.dli_fname;
+		    lines[i].sname = info.dli_sname;
+		    goto next_line;
 		}
-		fprintf(stderr, "%s", line->filename);
-	    } else {
-		fprintf(stderr, "???");
 	    }
-	    fprintf(stderr, ":%d\n", line->line);
-	} else {
-	    fprintf(stderr, "%s\n", syms[i]);
+	    *p = info.dli_fbase;
+
+	    append_obj(&obj);
+	    obj->base_addr = (uintptr_t)info.dli_fbase;
+	    path = info.dli_fname;
+	    obj->path = path;
+	    lines[i].path = path;
+	    strcpy(binary_filename, path);
+	    fill_lines(num_traces, traces, 1, &obj, lines, i);
 	}
+next_line:
+	continue;
     }
 
+    /* output */
     for (i = 0; i < num_traces; i++) {
 	line_info_t *line = &lines[i];
-	if (line->fd) {
-	    munmap(line->mapped, line->mapped_size);
-	    close(line->fd);
+	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 (line->sname && strcmp("main", line->sname) == 0)
+	    break;
+    }
+
+    /* free */
+    while (obj) {
+	obj_info_t *o = obj;
+	obj = o->next;
+	if (o->fd) {
+	    munmap(o->mapped, o->mapped_size);
+	    close(o->fd);
+	}
+	free(o);
     }
     free(lines);
+    free(dladdr_fbases);
 }
 
+/* From FreeBSD's lib/libstand/printf.c */
+/*-
+ * Copyright (c) 1986, 1988, 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)subr_prf.c	8.3 (Berkeley) 1/21/94
+ */
+
+#include <stdarg.h>
+#define MAXNBUF (sizeof(intmax_t) * CHAR_BIT + 1)
+static inline int toupper(int c) { return ('A' <= c && c <= 'Z') ? (c&0x5f) : c; }
+#define    hex2ascii(hex)  (hex2ascii_data[hex])
+char const hex2ascii_data[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+static 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);
+
+static void putce(int c)
+{
+    char s[1];
+    ssize_t ret;
+
+    s[0] = (char)c;
+    ret = write(2, s, 1);
+    (void)ret;
+}
+
+int
+kprintf(const char *fmt, ...)
+{
+	va_list ap;
+	int retval;
+
+	va_start(ap, fmt);
+	retval = kvprintf(fmt, putce, NULL, 10, ap);
+	va_end(ap);
+	return retval;
+}
+
+/*
+ * Put a NUL-terminated ASCII number (base <= 36) in a buffer in reverse
+ * order; return an optional length and a pointer to the last character
+ * written in the buffer (i.e., the first character of the string).
+ * The buffer pointed to by `nbuf' must have length >= MAXNBUF.
+ */
+static char *
+ksprintn(char *nbuf, uintmax_t num, int base, int *lenp, int upper)
+{
+	char *p, c;
+
+	p = nbuf;
+	*p = '\0';
+	do {
+		c = hex2ascii(num % base);
+		*++p = upper ? toupper(c) : c;
+	} while (num /= base);
+	if (lenp)
+		*lenp = (int)(p - nbuf);
+	return (p);
+}
+
+/*
+ * Scaled down version of printf(3).
+ *
+ * Two additional formats:
+ *
+ * The format %b is supported to decode error registers.
+ * Its usage is:
+ *
+ *	printf("reg=%b\n", regval, "<base><arg>*");
+ *
+ * where <base> is the output base expressed as a control character, e.g.
+ * \10 gives octal; \20 gives hex.  Each arg is a sequence of characters,
+ * the first of which gives the bit number to be inspected (origin 1), and
+ * the next characters (up to a control character, i.e. a character <= 32),
+ * give the name of the register.  Thus:
+ *
+ *	kvprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
+ *
+ * would produce output:
+ *
+ *	reg=3<BITTWO,BITONE>
+ *
+ * XXX:  %D  -- Hexdump, takes pointer and separator string:
+ *		("%6D", ptr, ":")   -> XX:XX:XX:XX:XX:XX
+ *		("%*D", len, ptr, " " -> XX XX XX XX ...
+ */
+static int
+kvprintf(char const *fmt, void (*func)(int), void *arg, int radix, va_list ap)
+{
+#define PCHAR(c) {int cc=(c); if (func) (*func)(cc); else *d++ = cc; retval++; }
+	char nbuf[MAXNBUF];
+	char *d;
+	const char *p, *percent, *q;
+	unsigned char *up;
+	int ch, n;
+	uintmax_t num;
+	int base, lflag, qflag, tmp, width, ladjust, sharpflag, neg, sign, dot;
+	int cflag, hflag, jflag, tflag, zflag;
+	int dwidth, upper;
+	char padc;
+	int stop = 0, retval = 0;
+
+	num = 0;
+	if (!func)
+		d = (char *) arg;
+	else
+		d = NULL;
+
+	if (fmt == NULL)
+		fmt = "(fmt null)\n";
+
+	if (radix < 2 || radix > 36)
+		radix = 10;
+
+	for (;;) {
+		padc = ' ';
+		width = 0;
+		while ((ch = (unsigned char)*fmt++) != '%' || stop) {
+			if (ch == '\0')
+				return (retval);
+			PCHAR(ch);
+		}
+		percent = fmt - 1;
+		qflag = 0; lflag = 0; ladjust = 0; sharpflag = 0; neg = 0;
+		sign = 0; dot = 0; dwidth = 0; upper = 0;
+		cflag = 0; hflag = 0; jflag = 0; tflag = 0; zflag = 0;
+reswitch:	switch (ch = (unsigned char)*fmt++) {
+		case '.':
+			dot = 1;
+			goto reswitch;
+		case '#':
+			sharpflag = 1;
+			goto reswitch;
+		case '+':
+			sign = 1;
+			goto reswitch;
+		case '-':
+			ladjust = 1;
+			goto reswitch;
+		case '%':
+			PCHAR(ch);
+			break;
+		case '*':
+			if (!dot) {
+				width = va_arg(ap, int);
+				if (width < 0) {
+					ladjust = !ladjust;
+					width = -width;
+				}
+			} else {
+				dwidth = va_arg(ap, int);
+			}
+			goto reswitch;
+		case '0':
+			if (!dot) {
+				padc = '0';
+				goto reswitch;
+			}
+		case '1': case '2': case '3': case '4':
+		case '5': case '6': case '7': case '8': case '9':
+				for (n = 0;; ++fmt) {
+					n = n * 10 + ch - '0';
+					ch = *fmt;
+					if (ch < '0' || ch > '9')
+						break;
+				}
+			if (dot)
+				dwidth = n;
+			else
+				width = n;
+			goto reswitch;
+		case 'b':
+			num = (unsigned int)va_arg(ap, int);
+			p = va_arg(ap, char *);
+			for (q = ksprintn(nbuf, num, *p++, NULL, 0); *q;)
+				PCHAR(*q--);
+
+			if (num == 0)
+				break;
+
+			for (tmp = 0; *p;) {
+				n = *p++;
+				if (num & (1 << (n - 1))) {
+					PCHAR(tmp ? ',' : '<');
+					for (; (n = *p) > ' '; ++p)
+						PCHAR(n);
+					tmp = 1;
+				} else
+					for (; *p > ' '; ++p)
+						continue;
+			}
+			if (tmp)
+				PCHAR('>');
+			break;
+		case 'c':
+			PCHAR(va_arg(ap, int));
+			break;
+		case 'D':
+			up = va_arg(ap, unsigned char *);
+			p = va_arg(ap, char *);
+			if (!width)
+				width = 16;
+			while(width--) {
+				PCHAR(hex2ascii(*up >> 4));
+				PCHAR(hex2ascii(*up & 0x0f));
+				up++;
+				if (width)
+					for (q=p;*q;q++)
+						PCHAR(*q);
+			}
+			break;
+		case 'd':
+		case 'i':
+			base = 10;
+			sign = 1;
+			goto handle_sign;
+		case 'h':
+			if (hflag) {
+				hflag = 0;
+				cflag = 1;
+			} else
+				hflag = 1;
+			goto reswitch;
+		case 'j':
+			jflag = 1;
+			goto reswitch;
+		case 'l':
+			if (lflag) {
+				lflag = 0;
+				qflag = 1;
+			} else
+				lflag = 1;
+			goto reswitch;
+		case 'n':
+			if (jflag)
+				*(va_arg(ap, intmax_t *)) = retval;
+			else if (qflag)
+				*(va_arg(ap, int64_t *)) = retval;
+			else if (lflag)
+				*(va_arg(ap, long *)) = retval;
+			else if (zflag)
+				*(va_arg(ap, size_t *)) = retval;
+			else if (hflag)
+				*(va_arg(ap, short *)) = retval;
+			else if (cflag)
+				*(va_arg(ap, char *)) = retval;
+			else
+				*(va_arg(ap, int *)) = retval;
+			break;
+		case 'o':
+			base = 8;
+			goto handle_nosign;
+		case 'p':
+			base = 16;
+			sharpflag = (width == 0);
+			sign = 0;
+			num = (uintptr_t)va_arg(ap, void *);
+			goto number;
+		case 'q':
+			qflag = 1;
+			goto reswitch;
+		case 'r':
+			base = radix;
+			if (sign)
+				goto handle_sign;
+			goto handle_nosign;
+		case 's':
+			p = va_arg(ap, char *);
+			if (p == NULL)
+				p = "(null)";
+			if (!dot)
+				n = (int)strlen (p);
+			else
+				for (n = 0; n < dwidth && p[n]; n++)
+					continue;
+
+			width -= n;
+
+			if (!ladjust && width > 0)
+				while (width--)
+					PCHAR(padc);
+			while (n--)
+				PCHAR(*p++);
+			if (ladjust && width > 0)
+				while (width--)
+					PCHAR(padc);
+			break;
+		case 't':
+			tflag = 1;
+			goto reswitch;
+		case 'u':
+			base = 10;
+			goto handle_nosign;
+		case 'X':
+			upper = 1;
+		case 'x':
+			base = 16;
+			goto handle_nosign;
+		case 'y':
+			base = 16;
+			sign = 1;
+			goto handle_sign;
+		case 'z':
+			zflag = 1;
+			goto reswitch;
+handle_nosign:
+			sign = 0;
+			if (jflag)
+				num = va_arg(ap, uintmax_t);
+			else if (qflag)
+				num = va_arg(ap, uint64_t);
+			else if (tflag)
+				num = va_arg(ap, ptrdiff_t);
+			else if (lflag)
+				num = va_arg(ap, unsigned long);
+			else if (zflag)
+				num = va_arg(ap, size_t);
+			else if (hflag)
+				num = (unsigned short)va_arg(ap, int);
+			else if (cflag)
+				num = (unsigned char)va_arg(ap, int);
+			else
+				num = va_arg(ap, unsigned int);
+			goto number;
+handle_sign:
+			if (jflag)
+				num = va_arg(ap, intmax_t);
+			else if (qflag)
+				num = va_arg(ap, int64_t);
+			else if (tflag)
+				num = va_arg(ap, ptrdiff_t);
+			else if (lflag)
+				num = va_arg(ap, long);
+			else if (zflag)
+				num = va_arg(ap, ssize_t);
+			else if (hflag)
+				num = (short)va_arg(ap, int);
+			else if (cflag)
+				num = (char)va_arg(ap, int);
+			else
+				num = va_arg(ap, int);
+number:
+			if (sign && (intmax_t)num < 0) {
+				neg = 1;
+				num = -(intmax_t)num;
+			}
+			p = ksprintn(nbuf, num, base, &n, upper);
+			tmp = 0;
+			if (sharpflag && num != 0) {
+				if (base == 8)
+					tmp++;
+				else if (base == 16)
+					tmp += 2;
+			}
+			if (neg)
+				tmp++;
+
+			if (!ladjust && padc == '0')
+				dwidth = width - tmp;
+			width -= tmp + imax(dwidth, n);
+			dwidth -= n;
+			if (!ladjust)
+				while (width-- > 0)
+					PCHAR(' ');
+			if (neg)
+				PCHAR('-');
+			if (sharpflag && num != 0) {
+				if (base == 8) {
+					PCHAR('0');
+				} else if (base == 16) {
+					PCHAR('0');
+					PCHAR('x');
+				}
+			}
+			while (dwidth-- > 0)
+				PCHAR('0');
+
+			while (*p)
+				PCHAR(*p--);
+
+			if (ladjust)
+				while (width-- > 0)
+					PCHAR(' ');
+
+			break;
+		default:
+			while (percent < fmt)
+				PCHAR(*percent++);
+			/*
+			 * Since we ignore an formatting argument it is no
+			 * longer safe to obey the remaining formatting
+			 * arguments as the arguments will no longer match
+			 * the format specs.
+			 */
+			stop = 1;
+			break;
+		}
+	}
+#undef PCHAR
+}
 #else /* defined(USE_ELF) */
 #error not supported
 #endif
diff --git a/addr2line.h b/addr2line.h
index 3782d89e07..d99f010934 100644
--- a/addr2line.h
+++ b/addr2line.h
@@ -14,7 +14,7 @@
 #ifdef USE_ELF
 
 void
-rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms);
+rb_dump_backtrace_with_lines(int num_traces, void **traces);
 
 #endif /* USE_ELF */
 
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000000..2cda4817a6
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,37 @@
+---
+shallow_clone: true
+platform: x64
+install:
+  - SET
+  - '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" amd64'
+  - SET PATH=\usr\local\bin;C:\Ruby22-x64\bin;C:\Ruby21-x64\Devkit\mingw\bin;%PATH%;C:\msys64\usr\bin
+  - ruby --version
+  - 'cl'
+  - SET
+  - mkdir \usr\local\bin
+  - mkdir \usr\local\include
+  - mkdir \usr\local\lib
+  - ps: Start-FileDownload 'http://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-2.3.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 64b1890ae1..4e60177121 100644
--- a/array.c
+++ b/array.c
@@ -11,42 +11,24 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/util.h"
 #include "ruby/st.h"
-#include "ruby/encoding.h"
-#include "internal.h"
+#include "probes.h"
+#include "id.h"
 
 #ifndef ARRAY_DEBUG
 # define NDEBUG
 #endif
-#include <assert.h>
-
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
+#include "ruby_assert.h"
 
 VALUE rb_cArray;
 
-static ID id_cmp;
+static ID id_cmp, id_div, id_power;
 
 #define ARY_DEFAULT_SIZE 16
 #define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
 
-void
-rb_mem_clear(register VALUE *mem, register long size)
-{
-    while (size--) {
-	*mem++ = Qnil;
-    }
-}
-
-static inline void
-memfill(register VALUE *mem, register long size, register VALUE val)
-{
-    while (size--) {
-	*mem++ = val;
-    }
-}
-
 # define ARY_SHARED_P(ary) \
     (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
      FL_TEST((ary),ELTS_SHARED)!=0)
@@ -61,11 +43,11 @@ memfill(register VALUE *mem, register long size, register VALUE val)
     (assert(ARY_EMBED_P(a)), \
      (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
 	 (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
+#define ARY_HEAP_SIZE(a) (assert(!ARY_EMBED_P(a)), assert(ARY_OWNS_HEAP_P(a)), RARRAY(a)->as.heap.aux.capa * sizeof(VALUE))
 
 #define ARY_OWNS_HEAP_P(a) (!FL_TEST((a), ELTS_SHARED|RARRAY_EMBED_FLAG))
 #define FL_SET_EMBED(a) do { \
     assert(!ARY_SHARED_P(a)); \
-    assert(!OBJ_FROZEN(a)); \
     FL_SET((a), RARRAY_EMBED_FLAG); \
 } while (0)
 #define FL_UNSET_EMBED(ary) FL_UNSET((ary), RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK)
@@ -126,15 +108,18 @@ memfill(register VALUE *mem, register long size, register VALUE val)
 
 #define ARY_SHARED(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared)
 #define ARY_SET_SHARED(ary, value) do { \
-    assert(!ARY_EMBED_P(ary)); \
-    assert(ARY_SHARED_P(ary)); \
-    assert(ARY_SHARED_ROOT_P(value)); \
-    RARRAY(ary)->as.heap.aux.shared = (value); \
+    const VALUE _ary_ = (ary); \
+    const VALUE _value_ = (value); \
+    assert(!ARY_EMBED_P(_ary_)); \
+    assert(ARY_SHARED_P(_ary_)); \
+    assert(ARY_SHARED_ROOT_P(_value_)); \
+    RB_OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared, _value_); \
 } while (0)
 #define RARRAY_SHARED_ROOT_FLAG FL_USER5
 #define ARY_SHARED_ROOT_P(ary) (FL_TEST((ary), RARRAY_SHARED_ROOT_FLAG))
 #define ARY_SHARED_NUM(ary) \
     (assert(ARY_SHARED_ROOT_P(ary)), RARRAY(ary)->as.heap.aux.capa)
+#define ARY_SHARED_OCCUPIED(ary) (ARY_SHARED_NUM(ary) == 1)
 #define ARY_SET_SHARED_NUM(ary, value) do { \
     assert(ARY_SHARED_ROOT_P(ary)); \
     RARRAY(ary)->as.heap.aux.capa = (value); \
@@ -144,6 +129,74 @@ memfill(register VALUE *mem, register long size, register VALUE val)
     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))
+
+void
+rb_mem_clear(register VALUE *mem, register long size)
+{
+    while (size--) {
+	*mem++ = Qnil;
+    }
+}
+
+static void
+ary_mem_clear(VALUE ary, long beg, long size)
+{
+    RARRAY_PTR_USE(ary, ptr, {
+	rb_mem_clear(ptr + beg, size);
+    });
+}
+
+static inline void
+memfill(register VALUE *mem, register long size, register VALUE val)
+{
+    while (size--) {
+	*mem++ = val;
+    }
+}
+
+static void
+ary_memfill(VALUE ary, long beg, long size, VALUE val)
+{
+    RARRAY_PTR_USE(ary, ptr, {
+	memfill(ptr + beg, size, val);
+	RB_OBJ_WRITTEN(ary, Qundef, val);
+    });
+}
+
+static void
+ary_memcpy0(VALUE ary, long beg, long argc, const VALUE *argv, VALUE buff_owner_ary)
+{
+#if 1
+    assert(!ARY_SHARED_P(buff_owner_ary));
+
+    if (argc > (int)(128/sizeof(VALUE)) /* is magic number (cache line size) */) {
+	rb_gc_writebarrier_remember(buff_owner_ary);
+	RARRAY_PTR_USE(ary, ptr, {
+	    MEMCPY(ptr+beg, argv, VALUE, argc);
+	});
+    }
+    else {
+	int i;
+	RARRAY_PTR_USE(ary, ptr, {
+	    for (i=0; i<argc; i++) {
+		RB_OBJ_WRITE(buff_owner_ary, &ptr[i+beg], argv[i]);
+	    }
+	});
+    }
+#else
+    /* giveup write barrier (traditional way) */
+    RARRAY_PTR(buff_owner_ary);
+    MEMCPY(RARRAY_PTR(ary)+beg, argv, VALUE, argc);
+#endif
+}
+
+static void
+ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv)
+{
+    ary_memcpy0(ary, beg, argc, argv, ary);
+}
+
 static void
 ary_resize_capa(VALUE ary, long capacity)
 {
@@ -160,23 +213,35 @@ ary_resize_capa(VALUE ary, long capacity)
             ARY_SET_HEAP_LEN(ary, len);
         }
         else {
-            REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, (capacity));
+	    SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, capacity, RARRAY(ary)->as.heap.aux.capa);
         }
         ARY_SET_CAPA(ary, (capacity));
     }
     else {
         if (!ARY_EMBED_P(ary)) {
             long len = RARRAY_LEN(ary);
-            VALUE *ptr = RARRAY_PTR(ary);
-            if (len > capacity) len = capacity;
-            MEMCPY(RARRAY(ary)->as.ary, ptr, VALUE, len);
+	    const VALUE *ptr = RARRAY_CONST_PTR(ary);
+
+	    if (len > capacity) len = capacity;
+            MEMCPY((VALUE *)RARRAY(ary)->as.ary, ptr, VALUE, len);
             FL_SET_EMBED(ary);
             ARY_SET_LEN(ary, len);
-            xfree(ptr);
+	    ruby_xfree((VALUE *)ptr);
         }
     }
 }
 
+static inline void
+ary_shrink_capa(VALUE ary)
+{
+    long capacity = ARY_HEAP_LEN(ary);
+    long old_capa = RARRAY(ary)->as.heap.aux.capa;
+    assert(!ARY_SHARED_P(ary));
+    assert(old_capa >= capacity);
+    if (old_capa > capacity)
+	REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, capacity);
+}
+
 static void
 ary_double_capa(VALUE ary, long min)
 {
@@ -245,8 +310,6 @@ static inline void
 rb_ary_modify_check(VALUE ary)
 {
     rb_check_frozen(ary);
-    if (!OBJ_UNTRUSTED(ary) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
 }
 
 void
@@ -254,26 +317,88 @@ rb_ary_modify(VALUE ary)
 {
     rb_ary_modify_check(ary);
     if (ARY_SHARED_P(ary)) {
-        long len = RARRAY_LEN(ary);
+	long shared_len, len = RARRAY_LEN(ary);
+	VALUE shared = ARY_SHARED(ary);
         if (len <= RARRAY_EMBED_LEN_MAX) {
-            VALUE *ptr = ARY_HEAP_PTR(ary);
-            VALUE shared = ARY_SHARED(ary);
+	    const VALUE *ptr = ARY_HEAP_PTR(ary);
             FL_UNSET_SHARED(ary);
             FL_SET_EMBED(ary);
-            MEMCPY(ARY_EMBED_PTR(ary), ptr, VALUE, len);
+	    MEMCPY((VALUE *)ARY_EMBED_PTR(ary), ptr, VALUE, len);
             rb_ary_decrement_share(shared);
             ARY_SET_EMBED_LEN(ary, len);
         }
+	else if (ARY_SHARED_OCCUPIED(shared) && len > ((shared_len = RARRAY_LEN(shared))>>1)) {
+	    long shift = RARRAY_CONST_PTR(ary) - RARRAY_CONST_PTR(shared);
+	    FL_UNSET_SHARED(ary);
+	    ARY_SET_PTR(ary, RARRAY_CONST_PTR(shared));
+	    ARY_SET_CAPA(ary, shared_len);
+	    RARRAY_PTR_USE(ary, ptr, {
+		MEMMOVE(ptr, ptr+shift, VALUE, len);
+	    });
+	    FL_SET_EMBED(shared);
+	    rb_ary_decrement_share(shared);
+	}
         else {
             VALUE *ptr = ALLOC_N(VALUE, len);
-            MEMCPY(ptr, RARRAY_PTR(ary), VALUE, len);
+            MEMCPY(ptr, RARRAY_CONST_PTR(ary), VALUE, len);
             rb_ary_unshare(ary);
             ARY_SET_CAPA(ary, len);
             ARY_SET_PTR(ary, ptr);
         }
+
+	rb_gc_writebarrier_remember(ary);
+    }
+}
+
+static VALUE
+ary_ensure_room_for_push(VALUE ary, long add_len)
+{
+    long old_len = RARRAY_LEN(ary);
+    long new_len = old_len + add_len;
+    long capa;
+
+    if (old_len > ARY_MAX_SIZE - add_len) {
+	rb_raise(rb_eIndexError, "index %ld too big", new_len);
+    }
+    if (ARY_SHARED_P(ary)) {
+	if (new_len > RARRAY_EMBED_LEN_MAX) {
+	    VALUE shared = ARY_SHARED(ary);
+	    if (ARY_SHARED_OCCUPIED(shared)) {
+		if (RARRAY_CONST_PTR(ary) - RARRAY_CONST_PTR(shared) + new_len <= RARRAY_LEN(shared)) {
+		    rb_ary_modify_check(ary);
+		    return shared;
+		}
+		else {
+		    /* if array is shared, then it is likely it participate in push/shift pattern */
+		    rb_ary_modify(ary);
+		    capa = ARY_CAPA(ary);
+		    if (new_len > capa - (capa >> 6)) {
+			ary_double_capa(ary, new_len);
+		    }
+		    return ary;
+		}
+	    }
+	}
+    }
+    rb_ary_modify(ary);
+    capa = ARY_CAPA(ary);
+    if (new_len > capa) {
+	ary_double_capa(ary, new_len);
     }
+
+    return ary;
 }
 
+/*
+ *  call-seq:
+ *      ary.freeze -> ary
+ *
+ *  Calls Object#freeze on +ary+ to prevent any further
+ *  modification. A RuntimeError will be raised if a modification
+ *  attempt is made.
+ *
+ */
+
 VALUE
 rb_ary_freeze(VALUE ary)
 {
@@ -284,8 +409,8 @@ rb_ary_freeze(VALUE ary)
  *  call-seq:
  *     ary.frozen?  -> true or false
  *
- *  Return <code>true</code> if this array is frozen (or temporarily frozen
- *  while being sorted).
+ *  Return +true+ if this array is frozen (or temporarily frozen
+ *  while being sorted). See also Object#frozen?
  */
 
 static VALUE
@@ -295,21 +420,47 @@ rb_ary_frozen_p(VALUE ary)
     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
+   something does modify the array it will pay the cost of copying
+   it.  If Array#pop or Array#shift has been called, the array will
+   be still shared with the snapshot, but the array length will
+   differ. */
+VALUE
+rb_ary_shared_with_p(VALUE ary1, VALUE ary2)
+{
+    if (!ARY_EMBED_P(ary1) && ARY_SHARED_P(ary1) &&
+	!ARY_EMBED_P(ary2) && ARY_SHARED_P(ary2) &&
+	RARRAY(ary1)->as.heap.aux.shared == RARRAY(ary2)->as.heap.aux.shared &&
+	RARRAY(ary1)->as.heap.len == RARRAY(ary2)->as.heap.len) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
 static VALUE
 ary_alloc(VALUE klass)
 {
-    NEWOBJ(ary, struct RArray);
-    OBJSETUP(ary, klass, T_ARRAY);
-    FL_SET_EMBED((VALUE)ary);
-    ARY_SET_EMBED_LEN((VALUE)ary, 0);
-
+    NEWOBJ_OF(ary, struct RArray, klass, T_ARRAY | RARRAY_EMBED_FLAG | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0));
+    /* Created array is:
+     *   FL_SET_EMBED((VALUE)ary);
+     *   ARY_SET_EMBED_LEN((VALUE)ary, 0);
+     */
     return (VALUE)ary;
 }
 
 static VALUE
+empty_ary_alloc(VALUE klass)
+{
+    RUBY_DTRACE_CREATE_HOOK(ARRAY, 0);
+    return ary_alloc(klass);
+}
+
+static VALUE
 ary_new(VALUE klass, long capa)
 {
-    VALUE ary;
+    VALUE ary,*ptr;
 
     if (capa < 0) {
 	rb_raise(rb_eArgError, "negative array size (or size too big)");
@@ -317,10 +468,14 @@ ary_new(VALUE klass, long capa)
     if (capa > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
+
+    RUBY_DTRACE_CREATE_HOOK(ARRAY, capa);
+
     ary = ary_alloc(klass);
     if (capa > RARRAY_EMBED_LEN_MAX) {
+	ptr = ALLOC_N(VALUE, capa);
         FL_UNSET_EMBED(ary);
-        ARY_SET_PTR(ary, ALLOC_N(VALUE, capa));
+        ARY_SET_PTR(ary, ptr);
         ARY_SET_CAPA(ary, capa);
         ARY_SET_HEAP_LEN(ary, 0);
     }
@@ -329,22 +484,19 @@ ary_new(VALUE klass, long capa)
 }
 
 VALUE
-rb_ary_new2(long capa)
+rb_ary_new_capa(long capa)
 {
     return ary_new(rb_cArray, capa);
 }
 
-
 VALUE
 rb_ary_new(void)
 {
     return rb_ary_new2(RARRAY_EMBED_LEN_MAX);
 }
 
-#include <stdarg.h>
-
 VALUE
-rb_ary_new3(long n, ...)
+(rb_ary_new_from_args)(long n, ...)
 {
     va_list ar;
     VALUE ary;
@@ -354,7 +506,7 @@ rb_ary_new3(long n, ...)
 
     va_start(ar, n);
     for (i=0; i<n; i++) {
-	RARRAY_PTR(ary)[i] = va_arg(ar, VALUE);
+	ARY_SET(ary, i, va_arg(ar, VALUE));
     }
     va_end(ar);
 
@@ -363,13 +515,13 @@ rb_ary_new3(long n, ...)
 }
 
 VALUE
-rb_ary_new4(long n, const VALUE *elts)
+rb_ary_new_from_values(long n, const VALUE *elts)
 {
     VALUE ary;
 
     ary = rb_ary_new2(n);
     if (n > 0 && elts) {
-	MEMCPY(RARRAY_PTR(ary), elts, VALUE, n);
+	ary_memcpy(ary, 0, n, elts);
 	ARY_SET_LEN(ary, n);
     }
 
@@ -382,11 +534,20 @@ rb_ary_tmp_new(long capa)
     return ary_new(0, capa);
 }
 
+VALUE
+rb_ary_tmp_new_fill(long capa)
+{
+    VALUE ary = ary_new(0, capa);
+    ary_memfill(ary, 0, capa, Qnil);
+    ARY_SET_LEN(ary, capa);
+    return ary;
+}
+
 void
 rb_ary_free(VALUE ary)
 {
     if (ARY_OWNS_HEAP_P(ary)) {
-	xfree(ARY_HEAP_PTR(ary));
+	ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
     }
 }
 
@@ -420,18 +581,19 @@ ary_make_shared(VALUE ary)
 	return ary;
     }
     else if (OBJ_FROZEN(ary)) {
-	ary_resize_capa(ary, ARY_HEAP_LEN(ary));
+	ary_shrink_capa(ary);
 	FL_SET_SHARED_ROOT(ary);
 	ARY_SET_SHARED_NUM(ary, 1);
 	return ary;
     }
     else {
-	NEWOBJ(shared, struct RArray);
-	OBJSETUP(shared, 0, T_ARRAY);
+	long capa = ARY_CAPA(ary), len = RARRAY_LEN(ary);
+	NEWOBJ_OF(shared, struct RArray, 0, T_ARRAY | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0));
         FL_UNSET_EMBED(shared);
 
-        ARY_SET_LEN((VALUE)shared, RARRAY_LEN(ary));
-        ARY_SET_PTR((VALUE)shared, RARRAY_PTR(ary));
+	ARY_SET_LEN((VALUE)shared, capa);
+	ARY_SET_PTR((VALUE)shared, RARRAY_CONST_PTR(ary));
+	ary_mem_clear((VALUE)shared, len, capa - len);
 	FL_SET_SHARED_ROOT(shared);
 	ARY_SET_SHARED_NUM((VALUE)shared, 1);
 	FL_SET_SHARED(ary);
@@ -441,14 +603,15 @@ ary_make_shared(VALUE ary)
     }
 }
 
-
 static VALUE
 ary_make_substitution(VALUE ary)
 {
-    if (RARRAY_LEN(ary) <= RARRAY_EMBED_LEN_MAX) {
-        VALUE subst = rb_ary_new2(RARRAY_LEN(ary));
-        MEMCPY(ARY_EMBED_PTR(subst), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
-        ARY_SET_EMBED_LEN(subst, RARRAY_LEN(ary));
+    long len = RARRAY_LEN(ary);
+
+    if (len <= RARRAY_EMBED_LEN_MAX) {
+	VALUE subst = rb_ary_new2(len);
+	ary_memcpy(subst, 0, len, RARRAY_CONST_PTR(ary));
+        ARY_SET_EMBED_LEN(subst, len);
         return subst;
     }
     else {
@@ -478,10 +641,9 @@ rb_check_array_type(VALUE ary)
  *  call-seq:
  *     Array.try_convert(obj) -> array or nil
  *
- *  Try to convert <i>obj</i> into an array, using +to_ary+ method.
- *  Returns converted array or +nil+ if <i>obj</i> cannot be converted
- *  for any reason. This method can be used to check if an argument is an
- *  array.
+ *  Tries to convert +obj+ into an array, using +to_ary+ method.  Returns the
+ *  converted array or +nil+ if +obj+ cannot be converted for any reason.
+ *  This method can be used to check if an argument is an array.
  *
  *     Array.try_convert([1])   #=> [1]
  *     Array.try_convert("1")   #=> nil
@@ -502,40 +664,58 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary)
 
 /*
  *  call-seq:
- *     Array.new(size=0, obj=nil)
+ *     Array.new(size=0, default=nil)
  *     Array.new(array)
  *     Array.new(size) {|index| block }
  *
- *  Returns a new array. In the first form, the new array is
- *  empty. In the second it is created with _size_ copies of _obj_
- *  (that is, _size_ references to the same
- *  _obj_). The third form creates a copy of the array
- *  passed as a parameter (the array is generated by calling
- *  to_ary  on the parameter). In the last form, an array
- *  of the given size is created. Each element in this array is
- *  calculated by passing the element's index to the given block and
- *  storing the return value.
- *
- *     Array.new
- *     Array.new(2)
- *     Array.new(5, "A")
- *
- *     # only one copy of the object is created
+ *  Returns a new array.
+ *
+ *  In the first form, if no arguments are sent, the new array will be empty.
+ *  When a +size+ and an optional +default+ are sent, an array is created with
+ *  +size+ copies of +default+.  Take notice that all elements will reference the
+ *  same object +default+.
+ *
+ *  The second form creates a copy of the array passed as a parameter (the
+ *  array is generated by calling to_ary on the parameter).
+ *
+ *    first_array = ["Matz", "Guido"]
+ *
+ *    second_array = Array.new(first_array) #=> ["Matz", "Guido"]
+ *
+ *    first_array.equal? second_array       #=> false
+ *
+ *  In the last form, an array of the given size is created.  Each element in
+ *  this array is created by passing the element's index to the given block
+ *  and storing the return value.
+ *
+ *    Array.new(3){ |index| index ** 2 }
+ *    # => [0, 1, 4]
+ *
+ *  == Common gotchas
+ *
+ *  When sending the second parameter, the same object will be used as the
+ *  value for all the array elements:
+ *
  *     a = Array.new(2, Hash.new)
+ *     # => [{}, {}]
+ *
  *     a[0]['cat'] = 'feline'
- *     a
+ *     a # => [{"cat"=>"feline"}, {"cat"=>"feline"}]
+ *
  *     a[1]['cat'] = 'Felix'
- *     a
+ *     a # => [{"cat"=>"Felix"}, {"cat"=>"Felix"}]
+ *
+ *  Since all the Array elements store the same hash, changes to one of them
+ *  will affect them all.
+ *
+ *  If multiple copies are what you want, you should use the block
+ *  version which uses the result of that block each time an element
+ *  of the array needs to be initialized:
  *
- *     # here multiple copies are created
  *     a = Array.new(2) { Hash.new }
  *     a[0]['cat'] = 'feline'
- *     a
+ *     a # => [{"cat"=>"feline"}, {}]
  *
- *     squares = Array.new(5) {|i| i*i}
- *     squares
- *
- *     copy = Array.new(squares)
  */
 
 static VALUE
@@ -546,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) && RARRAY_PTR(ary)) {
-	    xfree(RARRAY_PTR(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);
@@ -567,12 +747,14 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
     }
 
     len = NUM2LONG(size);
+    /* NUM2LONG() may call size.to_int, ary can be frozen, modified, etc */
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative array size");
     }
     if (len > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
+    /* recheck after argument conversion */
     rb_ary_modify(ary);
     ary_resize_capa(ary, len);
     if (rb_block_given_p()) {
@@ -587,27 +769,26 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 	}
     }
     else {
-	memfill(RARRAY_PTR(ary), len, val);
+	ary_memfill(ary, 0, len, val);
 	ARY_SET_LEN(ary, len);
     }
     return ary;
 }
 
-
 /*
-* Returns a new array populated with the given objects.
-*
-*   Array.[]( 1, 'a', /^A/ )
-*   Array[ 1, 'a', /^A/ ]
-*   [ 1, 'a', /^A/ ]
-*/
+ * Returns a new array populated with the given objects.
+ *
+ *   Array.[]( 1, 'a', /^A/ ) # => [1, "a", /^A/]
+ *   Array[ 1, 'a', /^A/ ]    # => [1, "a", /^A/]
+ *   [ 1, 'a', /^A/ ]         # => [1, "a", /^A/]
+ */
 
 static VALUE
 rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
 {
     VALUE ary = ary_new(klass, argc);
     if (argc > 0 && argv) {
-        MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
+        ary_memcpy(ary, 0, argc, argv);
         ARY_SET_LEN(ary, argc);
     }
 
@@ -617,11 +798,13 @@ rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
 void
 rb_ary_store(VALUE ary, long idx, VALUE val)
 {
+    long len = RARRAY_LEN(ary);
+
     if (idx < 0) {
-	idx += RARRAY_LEN(ary);
+	idx += len;
 	if (idx < 0) {
 	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
-		     idx - RARRAY_LEN(ary), -RARRAY_LEN(ary));
+		     idx - len, -len);
 	}
     }
     else if (idx >= ARY_MAX_SIZE) {
@@ -632,15 +815,14 @@ rb_ary_store(VALUE ary, long idx, VALUE val)
     if (idx >= ARY_CAPA(ary)) {
 	ary_double_capa(ary, idx);
     }
-    if (idx > RARRAY_LEN(ary)) {
-	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary),
-		     idx-RARRAY_LEN(ary) + 1);
+    if (idx > len) {
+	ary_mem_clear(ary, len, idx - len + 1);
     }
 
-    if (idx >= RARRAY_LEN(ary)) {
+    if (idx >= len) {
 	ARY_SET_LEN(ary, idx + 1);
     }
-    RARRAY_PTR(ary)[idx] = val;
+    ARY_SET(ary, idx, val);
 }
 
 static VALUE
@@ -652,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);
-        MEMCPY(ARY_EMBED_PTR(result), RARRAY_PTR(ary) + offset, VALUE, len);
+	ary_memcpy(result, 0, len, RARRAY_CONST_PTR(ary) + offset);
         ARY_SET_EMBED_LEN(result, len);
         return result;
     }
@@ -661,7 +843,7 @@ 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_PTR(ary));
+        ARY_SET_PTR(result, RARRAY_CONST_PTR(ary));
         ARY_SET_LEN(result, RARRAY_LEN(ary));
         rb_ary_set_shared(result, shared);
 
@@ -684,28 +866,28 @@ enum ary_take_pos_flags
 };
 
 static VALUE
-ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
+ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
 {
     VALUE nv;
     long n;
+    long len;
     long offset = 0;
 
     rb_scan_args(argc, argv, "1", &nv);
     n = NUM2LONG(nv);
-    if (n > RARRAY_LEN(ary)) {
-	n = RARRAY_LEN(ary);
+    len = RARRAY_LEN(ary);
+    if (n > len) {
+	n = len;
     }
     else if (n < 0) {
 	rb_raise(rb_eArgError, "negative array size");
     }
     if (last) {
-	offset = RARRAY_LEN(ary) - n;
+	offset = len - n;
     }
     return ary_make_partial(ary, rb_cArray, offset, n);
 }
 
-static VALUE rb_ary_push_1(VALUE ary, VALUE item);
-
 /*
  *  call-seq:
  *     ary << obj            -> ary
@@ -722,20 +904,22 @@ static VALUE rb_ary_push_1(VALUE ary, VALUE item);
 VALUE
 rb_ary_push(VALUE ary, VALUE item)
 {
-    rb_ary_modify(ary);
-    return rb_ary_push_1(ary, item);
+    long idx = RARRAY_LEN(ary);
+    VALUE target_ary = ary_ensure_room_for_push(ary, 1);
+    RARRAY_PTR_USE(ary, ptr, {
+	RB_OBJ_WRITE(target_ary, &ptr[idx], item);
+    });
+    ARY_SET_LEN(ary, idx + 1);
+    return ary;
 }
 
-static VALUE
-rb_ary_push_1(VALUE ary, VALUE item)
+VALUE
+rb_ary_cat(VALUE ary, const VALUE *argv, long len)
 {
-    long idx = RARRAY_LEN(ary);
-
-    if (idx >= ARY_CAPA(ary)) {
-	ary_double_capa(ary, idx);
-    }
-    RARRAY_PTR(ary)[idx] = item;
-    ARY_SET_LEN(ary, idx + 1);
+    long oldlen = RARRAY_LEN(ary);
+    VALUE target_ary = ary_ensure_room_for_push(ary, len);
+    ary_memcpy0(ary, oldlen, len, argv, target_ary);
+    ARY_SET_LEN(ary, oldlen + len);
     return ary;
 }
 
@@ -743,23 +927,22 @@ rb_ary_push_1(VALUE ary, VALUE item)
  *  call-seq:
  *     ary.push(obj, ... )   -> ary
  *
- *  Append---Pushes the given object(s) on to the end of this array. This
+ *  Append --- Pushes the given object(s) on to the end of this array. This
  *  expression returns the array itself, so several appends
- *  may be chained together.
+ *  may be chained together. See also Array#pop for the opposite
+ *  effect.
  *
  *     a = [ "a", "b", "c" ]
  *     a.push("d", "e", "f")
  *             #=> ["a", "b", "c", "d", "e", "f"]
+ *     [1, 2, 3].push(4).push(5)
+ *             #=> [1, 2, 3, 4, 5]
  */
 
 static VALUE
 rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
 {
-    rb_ary_modify(ary);
-    while (argc--) {
-	rb_ary_push_1(ary, *argv++);
-    }
-    return ary;
+    return rb_ary_cat(ary, argv, argc);
 }
 
 VALUE
@@ -767,16 +950,17 @@ rb_ary_pop(VALUE ary)
 {
     long n;
     rb_ary_modify_check(ary);
-    if (RARRAY_LEN(ary) == 0) return Qnil;
+    n = RARRAY_LEN(ary);
+    if (n == 0) return Qnil;
     if (ARY_OWNS_HEAP_P(ary) &&
-	RARRAY_LEN(ary) * 3 < ARY_CAPA(ary) &&
+	n * 3 < ARY_CAPA(ary) &&
 	ARY_CAPA(ary) > ARY_DEFAULT_SIZE)
     {
-	ary_resize_capa(ary, RARRAY_LEN(ary) * 2);
+	ary_resize_capa(ary, n * 2);
     }
-    n = RARRAY_LEN(ary)-1;
+    --n;
     ARY_SET_LEN(ary, n);
-    return RARRAY_PTR(ary)[n];
+    return RARRAY_AREF(ary, n);
 }
 
 /*
@@ -785,10 +969,11 @@ rb_ary_pop(VALUE ary)
  *     ary.pop(n) -> new_ary
  *
  *  Removes the last element from +self+ and returns it, or
- *  <code>nil</code> if the array is empty.
+ *  +nil+ if the array is empty.
  *
- *  If a number _n_ is given, returns an array of the last n elements
- *  (or less) just like <code>array.slice!(-n, n)</code> does.
+ *  If a number +n+ is given, returns an array of the last +n+ elements
+ *  (or less) just like <code>array.slice!(-n, n)</code> does. See also
+ *  Array#push for the opposite effect.
  *
  *     a = [ "a", "b", "c", "d" ]
  *     a.pop     #=> "d"
@@ -815,23 +1000,26 @@ VALUE
 rb_ary_shift(VALUE ary)
 {
     VALUE top;
+    long len = RARRAY_LEN(ary);
 
     rb_ary_modify_check(ary);
-    if (RARRAY_LEN(ary) == 0) return Qnil;
-    top = RARRAY_PTR(ary)[0];
+    if (len == 0) return Qnil;
+    top = RARRAY_AREF(ary, 0);
     if (!ARY_SHARED_P(ary)) {
-	if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
-	    MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
+	if (len < ARY_DEFAULT_SIZE) {
+	    RARRAY_PTR_USE(ary, ptr, {
+		MEMMOVE(ptr, ptr+1, VALUE, len-1);
+	    }); /* WB: no new reference */
             ARY_INCREASE_LEN(ary, -1);
 	    return top;
 	}
         assert(!ARY_EMBED_P(ary)); /* ARY_EMBED_LEN_MAX < ARY_DEFAULT_SIZE */
 
-	RARRAY_PTR(ary)[0] = Qnil;
+	ARY_SET(ary, 0, Qnil);
 	ary_make_shared(ary);
     }
-    else if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
-	RARRAY_PTR(ary)[0] = Qnil;
+    else if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
+	RARRAY_PTR_USE(ary, ptr, ptr[0] = Qnil);
     }
     ARY_INCREASE_PTR(ary, 1);		/* shift ptr */
     ARY_INCREASE_LEN(ary, -1);
@@ -844,12 +1032,14 @@ rb_ary_shift(VALUE ary)
  *     ary.shift    -> obj or nil
  *     ary.shift(n) -> new_ary
  *
- *  Returns the first element of +self+ and removes it (shifting all
- *  other elements down by one). Returns <code>nil</code> if the array
+ *  Removes the first element of +self+ and returns it (shifting all
+ *  other elements down by one). Returns +nil+ if the array
  *  is empty.
  *
- *  If a number _n_ is given, returns an array of the first n elements
- *  (or less) just like <code>array.slice!(0, n)</code> does.
+ *  If a number +n+ is given, returns an array of the first +n+ elements
+ *  (or less) just like <code>array.slice!(0, n)</code> does. With +ary+
+ *  containing only the remainder elements, not including what was shifted to
+ *  +new_ary+. See also Array#unshift for the opposite effect.
  *
  *     args = [ "-m", "-q", "filename" ]
  *     args.shift     #=> "-m"
@@ -874,25 +1064,93 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
     result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
     n = RARRAY_LEN(result);
     if (ARY_SHARED_P(ary)) {
-	if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) {
-	    rb_mem_clear(RARRAY_PTR(ary), n);
+	if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
+	  setup_occupied_shared:
+	    ary_mem_clear(ary, 0, n);
 	}
         ARY_INCREASE_PTR(ary, n);
     }
     else {
-	MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+n, VALUE, RARRAY_LEN(ary)-n);
+	if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
+	    RARRAY_PTR_USE(ary, ptr, {
+		MEMMOVE(ptr, ptr+n, VALUE, RARRAY_LEN(ary)-n);
+	    }); /* WB: no new reference */
+	}
+	else {
+	    ary_make_shared(ary);
+	    goto setup_occupied_shared;
+	}
     }
     ARY_INCREASE_LEN(ary, -n);
 
     return result;
 }
 
+static VALUE
+ary_ensure_room_for_unshift(VALUE ary, int argc)
+{
+    long len = RARRAY_LEN(ary);
+    long new_len = len + argc;
+    long capa;
+    const VALUE *head, *sharedp;
+
+    if (len > ARY_MAX_SIZE - argc) {
+	rb_raise(rb_eIndexError, "index %ld too big", new_len);
+    }
+
+    if (ARY_SHARED_P(ary)) {
+	VALUE shared = ARY_SHARED(ary);
+	capa = RARRAY_LEN(shared);
+	if (ARY_SHARED_OCCUPIED(shared) && capa > new_len) {
+	    head = RARRAY_CONST_PTR(ary);
+	    sharedp = RARRAY_CONST_PTR(shared);
+	    goto makeroom_if_need;
+	}
+    }
+
+    rb_ary_modify(ary);
+    capa = ARY_CAPA(ary);
+    if (capa - (capa >> 6) <= new_len) {
+	ary_double_capa(ary, new_len);
+    }
+
+    /* use shared array for big "queues" */
+    if (new_len > ARY_DEFAULT_SIZE * 4) {
+	/* make a room for unshifted items */
+	capa = ARY_CAPA(ary);
+	ary_make_shared(ary);
+
+	head = sharedp = RARRAY_CONST_PTR(ary);
+	goto makeroom;
+      makeroom_if_need:
+	if (head - sharedp < argc) {
+	    long room;
+	  makeroom:
+	    room = capa - new_len;
+	    room -= room >> 4;
+	    MEMMOVE((VALUE *)sharedp + argc + room, head, VALUE, len);
+	    head = sharedp + argc + room;
+	}
+	ARY_SET_PTR(ary, head - argc);
+	assert(ARY_SHARED_OCCUPIED(ARY_SHARED(ary)));
+	return ARY_SHARED(ary);
+    }
+    else {
+	/* sliding items */
+	RARRAY_PTR_USE(ary, ptr, {
+	    MEMMOVE(ptr + argc, ptr, VALUE, len);
+	});
+
+	return ary;
+    }
+}
+
 /*
  *  call-seq:
  *     ary.unshift(obj, ...)  -> ary
  *
- *  Prepends objects to the front of +self+,
- *  moving other elements upwards.
+ *  Prepends objects to the front of +self+, moving other elements upwards.
+ *  See also Array#shift for the opposite effect.
  *
  *     a = [ "b", "c", "d" ]
  *     a.unshift("a")   #=> ["a", "b", "c", "d"]
@@ -902,19 +1160,17 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
 static VALUE
 rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
 {
-    long len;
+    long len = RARRAY_LEN(ary);
+    VALUE target_ary;
 
-    rb_ary_modify(ary);
-    if (argc == 0) return ary;
-    if (ARY_CAPA(ary) <= (len = RARRAY_LEN(ary)) + argc) {
-	ary_double_capa(ary, len + argc);
+    if (argc == 0) {
+	rb_ary_modify_check(ary);
+	return ary;
     }
 
-    /* sliding items */
-    MEMMOVE(RARRAY_PTR(ary) + argc, RARRAY_PTR(ary), VALUE, len);
-    MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
-    ARY_INCREASE_LEN(ary, argc);
-
+    target_ary = ary_ensure_room_for_unshift(ary, argc);
+    ary_memcpy0(ary, 0, argc, argv, target_ary);
+    ARY_SET_LEN(ary, len + argc);
     return ary;
 }
 
@@ -928,32 +1184,41 @@ rb_ary_unshift(VALUE ary, VALUE item)
 static inline VALUE
 rb_ary_elt(VALUE ary, long offset)
 {
-    if (RARRAY_LEN(ary) == 0) return Qnil;
-    if (offset < 0 || RARRAY_LEN(ary) <= offset) {
+    long len = RARRAY_LEN(ary);
+    if (len == 0) return Qnil;
+    if (offset < 0 || len <= offset) {
 	return Qnil;
     }
-    return RARRAY_PTR(ary)[offset];
+    return RARRAY_AREF(ary, offset);
 }
 
 VALUE
 rb_ary_entry(VALUE ary, long offset)
 {
+    long len = RARRAY_LEN(ary);
+    const VALUE *ptr = RARRAY_CONST_PTR(ary);
+    if (len == 0) return Qnil;
     if (offset < 0) {
-	offset += RARRAY_LEN(ary);
+        offset += len;
+        if (offset < 0) return Qnil;
+    }
+    else if (len <= offset) {
+        return Qnil;
     }
-    return rb_ary_elt(ary, offset);
+    return ptr[offset];
 }
 
 VALUE
 rb_ary_subseq(VALUE ary, long beg, long len)
 {
     VALUE klass;
+    long alen = RARRAY_LEN(ary);
 
-    if (beg > RARRAY_LEN(ary)) return Qnil;
+    if (beg > alen) return Qnil;
     if (beg < 0 || len < 0) return Qnil;
 
-    if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
-	len = RARRAY_LEN(ary) - beg;
+    if (alen < len || alen < beg + len) {
+	len = alen - beg;
     }
     klass = rb_obj_class(ary);
     if (len == 0) return ary_new(klass, 0);
@@ -970,13 +1235,16 @@ rb_ary_subseq(VALUE ary, long beg, long len)
  *     ary.slice(start, length)  -> new_ary or nil
  *     ary.slice(range)          -> new_ary or nil
  *
- *  Element Reference---Returns the element at _index_,
- *  or returns a subarray starting at _start_ and
- *  continuing for _length_ elements, or returns a subarray
- *  specified by _range_.
- *  Negative indices count backward from the end of the
- *  array (-1 is the last element). Returns +nil+ if the index
- *  (or starting index) are out of range.
+ *  Element Reference --- Returns the element at +index+, or returns a
+ *  subarray starting at the +start+ index and continuing for +length+
+ *  elements, or returns a subarray specified by +range+ of indices.
+ *
+ *  Negative indices count backward from the end of the array (-1 is the last
+ *  element).  For +start+ and +range+ cases the starting index is just before
+ *  an element.  Additionally, an empty array is returned when the starting
+ *  index for an element range is at the end of the array.
+ *
+ *  Returns +nil+ if the index (or starting index) are out of range.
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a[2] +  a[0] + a[1]    #=> "cab"
@@ -988,13 +1256,14 @@ rb_ary_subseq(VALUE ary, long beg, long len)
  *     a[-3, 3]               #=> [ "c", "d", "e" ]
  *     # special cases
  *     a[5]                   #=> nil
+ *     a[6, 1]                #=> nil
  *     a[5, 1]                #=> []
  *     a[5..10]               #=> []
  *
  */
 
 VALUE
-rb_ary_aref(int argc, VALUE *argv, VALUE ary)
+rb_ary_aref(int argc, const VALUE *argv, VALUE ary)
 {
     VALUE arg;
     long beg, len;
@@ -1008,7 +1277,7 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
 	return rb_ary_subseq(ary, beg, len);
     }
     if (argc != 1) {
-	rb_scan_args(argc, argv, "11", 0, 0);
+	rb_scan_args(argc, argv, "11", NULL, NULL);
     }
     arg = argv[0];
     /* special case - speeding up */
@@ -1031,16 +1300,16 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary)
  *  call-seq:
  *     ary.at(index)   ->   obj  or nil
  *
- *  Returns the element at _index_. A
- *  negative index counts from the end of +self+.  Returns +nil+
- *  if the index is out of range. See also <code>Array#[]</code>.
+ *  Returns the element at +index+. A negative index counts from the end of
+ *  +self+. Returns +nil+ if the index is out of range. See also
+ *  Array#[].
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.at(0)     #=> "a"
  *     a.at(-1)    #=> "e"
  */
 
-static VALUE
+VALUE
 rb_ary_at(VALUE ary, VALUE pos)
 {
     return rb_ary_entry(ary, NUM2LONG(pos));
@@ -1052,8 +1321,9 @@ rb_ary_at(VALUE ary, VALUE pos)
  *     ary.first(n)  ->   new_ary
  *
  *  Returns the first element, or the first +n+ elements, of the array.
- *  If the array is empty, the first form returns <code>nil</code>, and the
- *  second form returns an empty array.
+ *  If the array is empty, the first form returns +nil+, and the
+ *  second form returns an empty array. See also Array#last for
+ *  the opposite effect.
  *
  *     a = [ "q", "r", "s", "t" ]
  *     a.first     #=> "q"
@@ -1065,7 +1335,7 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
 	if (RARRAY_LEN(ary) == 0) return Qnil;
-	return RARRAY_PTR(ary)[0];
+	return RARRAY_AREF(ary, 0);
     }
     else {
 	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
@@ -1078,7 +1348,9 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
  *     ary.last(n)  ->  new_ary
  *
  *  Returns the last element(s) of +self+. If the array is empty,
- *  the first form returns <code>nil</code>.
+ *  the first form returns +nil+.
+ *
+ *  See also Array#first for the opposite effect.
  *
  *     a = [ "w", "x", "y", "z" ]
  *     a.last     #=> "z"
@@ -1086,11 +1358,12 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
  */
 
 VALUE
-rb_ary_last(int argc, VALUE *argv, VALUE ary)
+rb_ary_last(int argc, const VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
-	if (RARRAY_LEN(ary) == 0) return Qnil;
-	return RARRAY_PTR(ary)[RARRAY_LEN(ary)-1];
+	long len = RARRAY_LEN(ary);
+	if (len == 0) return Qnil;
+	return RARRAY_AREF(ary, len-1);
     }
     else {
 	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
@@ -1100,21 +1373,24 @@ rb_ary_last(int argc, VALUE *argv, VALUE ary)
 /*
  *  call-seq:
  *     ary.fetch(index)                    -> obj
- *     ary.fetch(index, default )          -> obj
- *     ary.fetch(index) {|index| block }   -> obj
+ *     ary.fetch(index, default)           -> obj
+ *     ary.fetch(index) { |index| block }  -> obj
+ *
+ *  Tries to return the element at position +index+, but throws an IndexError
+ *  exception if the referenced +index+ lies outside of the array bounds.  This
+ *  error can be prevented by supplying a second argument, which will act as a
+ *  +default+ value.
  *
- *  Tries to return the element at position <i>index</i>. If the index
- *  lies outside the array, the first form throws an
- *  <code>IndexError</code> exception, the second form returns
- *  <i>default</i>, and the third form returns the value of invoking
- *  the block, passing in the index. Negative values of <i>index</i>
- *  count from the end of the array.
+ *  Alternatively, if a block is given it will only be executed when an
+ *  invalid +index+ is referenced.  Negative values of +index+ count from the
+ *  end of the array.
  *
  *     a = [ 11, 22, 33, 44 ]
  *     a.fetch(1)               #=> 22
  *     a.fetch(-1)              #=> 44
  *     a.fetch(4, 'cat')        #=> "cat"
- *     a.fetch(4) { |i| i*i }   #=> 16
+ *     a.fetch(100) { |i| puts "#{i} is out of bounds" }
+ *                              #=> "100 is out of bounds"
  */
 
 static VALUE
@@ -1142,103 +1418,134 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
 	}
 	return ifnone;
     }
-    return RARRAY_PTR(ary)[idx];
+    return RARRAY_AREF(ary, idx);
 }
 
 /*
  *  call-seq:
- *     ary.index(obj)           ->  int or nil
- *     ary.index {|item| block} ->  int or nil
- *     ary.index                ->  an_enumerator
+ *     ary.find_index(obj)             ->  int or nil
+ *     ary.find_index { |item| block } ->  int or nil
+ *     ary.find_index                  ->  Enumerator
+ *     ary.index(obj)             ->  int or nil
+ *     ary.index { |item| block } ->  int or nil
+ *     ary.index                  ->  Enumerator
  *
- *  Returns the index of the first object in +self+ such that the object is
- *  <code>==</code> to <i>obj</i>. If a block is given instead of an
- *  argument, returns index of first object for which <em>block</em> is true.
- *  Returns <code>nil</code> if no match is found.
- *  See also <code>Array#rindex</code>.
+ *  Returns the _index_ of the first object in +ary+ such that the object is
+ *  <code>==</code> to +obj+.
  *
- *  If neither block nor argument is given, an enumerator is returned instead.
+ *  If a block is given instead of an argument, returns the _index_ of the
+ *  first object for which the block returns +true+.  Returns +nil+ if no
+ *  match is found.
  *
- *     a = [ "a", "b", "c" ]
- *     a.index("b")        #=> 1
- *     a.index("z")        #=> nil
- *     a.index{|x|x=="b"}  #=> 1
+ *  See also Array#rindex.
+ *
+ *  An Enumerator is returned if neither a block nor argument is given.
  *
- *  This is an alias of <code>#find_index</code>.
+ *     a = [ "a", "b", "c" ]
+ *     a.index("b")              #=> 1
+ *     a.index("z")              #=> nil
+ *     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);
 	for (i=0; i<RARRAY_LEN(ary); i++) {
-	    if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
+	    if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
 		return LONG2NUM(i);
 	    }
 	}
 	return Qnil;
     }
-    rb_scan_args(argc, argv, "1", &val);
+    rb_check_arity(argc, 0, 1);
+    val = argv[0];
     if (rb_block_given_p())
 	rb_warn("given block not used");
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	if (rb_equal(RARRAY_PTR(ary)[i], 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;
 }
 
 /*
  *  call-seq:
- *     ary.rindex(obj)           ->  int or nil
- *     ary.rindex {|item| block} ->  int or nil
- *     ary.rindex                ->  an_enumerator
+ *     ary.rindex(obj)             ->  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 <i>obj</i>. If a block is given instead of an
- *  argument, returns index of first object for which <em>block</em> is
- *  true, starting from the last object.
- *  Returns <code>nil</code> if no match is found.
- *  See also <code>Array#index</code>.
+ *  Returns the _index_ of the last object in +self+ <code>==</code> to +obj+.
  *
- *  If neither block nor argument is given, an enumerator is returned instead.
+ *  If a block is given instead of an argument, returns the _index_ of the
+ *  first object for which the block returns +true+, starting from the last
+ *  object.
+ *
+ *  Returns +nil+ if no match is found.
+ *
+ *  See also Array#index.
+ *
+ *  If neither block nor argument is given, an Enumerator is returned instead.
  *
  *     a = [ "a", "b", "b", "b", "c" ]
- *     a.rindex("b")        #=> 3
- *     a.rindex("z")        #=> nil
- *     a.rindex{|x|x=="b"}  #=> 3
+ *     a.rindex("b")             #=> 3
+ *     a.rindex("z")             #=> nil
+ *     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);
+    long i = RARRAY_LEN(ary), len;
 
     if (argc == 0) {
 	RETURN_ENUMERATOR(ary, 0, 0);
 	while (i--) {
-	    if (RTEST(rb_yield(RARRAY_PTR(ary)[i])))
+	    if (RTEST(rb_yield(RARRAY_AREF(ary, i))))
 		return LONG2NUM(i);
-	    if (i > RARRAY_LEN(ary)) {
-		i = RARRAY_LEN(ary);
+	    if (i > (len = RARRAY_LEN(ary))) {
+		i = len;
 	    }
 	}
 	return Qnil;
     }
-    rb_scan_args(argc, argv, "1", &val);
+    rb_check_arity(argc, 0, 1);
+    val = argv[0];
     if (rb_block_given_p())
 	rb_warn("given block not used");
+    ptr = RARRAY_CONST_PTR(ary);
     while (i--) {
-	if (rb_equal(RARRAY_PTR(ary)[i], val))
+	VALUE e = ptr[i];
+	switch (rb_equal_opt(e, val)) {
+	  case Qundef:
+	    if (!rb_equal(e, val)) break;
+	  case Qtrue:
 	    return LONG2NUM(i);
-	if (i > RARRAY_LEN(ary)) {
-	    i = RARRAY_LEN(ary);
+	  case Qfalse:
+	    continue;
+	}
+	if (i > (len = RARRAY_LEN(ary))) {
+	    i = len;
 	}
+	ptr = RARRAY_CONST_PTR(ary);
     }
     return Qnil;
 }
@@ -1253,63 +1560,83 @@ rb_ary_to_ary(VALUE obj)
 }
 
 static void
-rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
+rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen)
 {
-    long rlen;
+    long olen;
+    long rofs;
 
     if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
+    olen = RARRAY_LEN(ary);
     if (beg < 0) {
-	beg += RARRAY_LEN(ary);
+	beg += olen;
 	if (beg < 0) {
 	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
-		     beg - RARRAY_LEN(ary), -RARRAY_LEN(ary));
+		     beg - olen, -olen);
 	}
     }
-    if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
-	len = RARRAY_LEN(ary) - beg;
+    if (olen < len || olen < beg + len) {
+	len = olen - beg;
     }
 
-    if (rpl == Qundef) {
-	rlen = 0;
-    }
-    else {
-	rpl = rb_ary_to_ary(rpl);
-	rlen = RARRAY_LEN(rpl);
+    {
+	const VALUE *optr = RARRAY_CONST_PTR(ary);
+	rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1;
     }
-    rb_ary_modify(ary);
-    if (beg >= RARRAY_LEN(ary)) {
+
+    if (beg >= olen) {
+	VALUE target_ary;
 	if (beg > ARY_MAX_SIZE - rlen) {
 	    rb_raise(rb_eIndexError, "index %ld too big", beg);
 	}
+	target_ary = ary_ensure_room_for_push(ary, rlen-len); /* len is 0 or negative */
 	len = beg + rlen;
-	if (len >= ARY_CAPA(ary)) {
-	    ary_double_capa(ary, len);
-	}
-	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary));
+	ary_mem_clear(ary, olen, beg - olen);
 	if (rlen > 0) {
-	    MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
+	    if (rofs != -1) rptr = RARRAY_CONST_PTR(ary) + rofs;
+	    ary_memcpy0(ary, beg, rlen, rptr, target_ary);
 	}
 	ARY_SET_LEN(ary, len);
     }
     else {
 	long alen;
 
-	alen = RARRAY_LEN(ary) + rlen - len;
+	if (olen - len > ARY_MAX_SIZE - rlen) {
+	    rb_raise(rb_eIndexError, "index %ld too big", olen + rlen - len);
+	}
+	rb_ary_modify(ary);
+	alen = olen + rlen - len;
 	if (alen >= ARY_CAPA(ary)) {
 	    ary_double_capa(ary, alen);
 	}
 
 	if (len != rlen) {
-	    MEMMOVE(RARRAY_PTR(ary) + beg + rlen, RARRAY_PTR(ary) + beg + len,
-		    VALUE, RARRAY_LEN(ary) - (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) {
-	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
+	    if (rofs != -1) rptr = RARRAY_CONST_PTR(ary) + rofs;
+	    MEMMOVE(RARRAY_PTR(ary) + beg, rptr, VALUE, rlen);
 	}
     }
 }
 
+void
+rb_ary_set_len(VALUE ary, long len)
+{
+    long capa;
+
+    rb_ary_modify_check(ary);
+    if (ARY_SHARED_P(ary)) {
+	rb_raise(rb_eRuntimeError, "can't set length of shared ");
+    }
+    if (len > (capa = (long)ARY_CAPA(ary))) {
+	rb_bug("probable buffer overflow: %ld for %ld", len, capa);
+    }
+    ARY_SET_LEN(ary, len);
+}
+
 /*!
  * expands or shrinks \a ary to \a len elements.
  * expanded region will be filled with Qnil.
@@ -1333,8 +1660,8 @@ rb_ary_resize(VALUE ary, long len)
 	if (len >= ARY_CAPA(ary)) {
 	    ary_double_capa(ary, len);
 	}
-	rb_mem_clear(RARRAY_PTR(ary) + olen, len - olen);
-        ARY_SET_LEN(ary, len);
+	ary_mem_clear(ary, olen, len - olen);
+	ARY_SET_LEN(ary, len);
     }
     else if (ARY_EMBED_P(ary)) {
         ARY_SET_EMBED_LEN(ary, len);
@@ -1343,12 +1670,12 @@ rb_ary_resize(VALUE ary, long len)
 	VALUE tmp[RARRAY_EMBED_LEN_MAX];
 	MEMCPY(tmp, ARY_HEAP_PTR(ary), VALUE, len);
 	ary_discard(ary);
-	MEMCPY(ARY_EMBED_PTR(ary), tmp, VALUE, len);
+	MEMCPY((VALUE *)ARY_EMBED_PTR(ary), tmp, VALUE, len); /* WB: no new reference */
         ARY_SET_EMBED_LEN(ary, len);
     }
     else {
 	if (olen > len + ARY_DEFAULT_SIZE) {
-	    REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, 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);
@@ -1362,16 +1689,21 @@ rb_ary_resize(VALUE ary, long len)
  *     ary[start, length] = obj or other_ary or nil  ->  obj or other_ary or nil
  *     ary[range]         = obj or other_ary or nil  ->  obj or other_ary or nil
  *
- *  Element Assignment---Sets the element at _index_,
- *  or replaces a subarray starting at _start_ and
- *  continuing for _length_ elements, or replaces a subarray
- *  specified by _range_.  If indices are greater than
- *  the current capacity of the array, the array grows
- *  automatically. A negative indices will count backward
- *  from the end of the array. Inserts elements if _length_ is
- *  zero. An +IndexError+ is raised if a negative index points
- *  past the beginning of the array. See also
- *  <code>Array#push</code>, and <code>Array#unshift</code>.
+ *  Element Assignment --- Sets the element at +index+, or replaces a subarray
+ *  from the +start+ index for +length+ elements, or replaces a subarray
+ *  specified by the +range+ of indices.
+ *
+ *  If indices are greater than the current capacity of the array, the array
+ *  grows automatically.  Elements are inserted into the array at +start+ if
+ *  +length+ is zero.
+ *
+ *  Negative indices will count backward from the end of the array.  For
+ *  +start+ and +range+ cases the starting index is just before an element.
+ *
+ *  An IndexError is raised if a negative index points past the beginning of
+ *  the array.
+ *
+ *  See also Array#push, and Array#unshift.
  *
  *     a = Array.new
  *     a[4] = "4";                 #=> [nil, nil, nil, nil, "4"]
@@ -1382,23 +1714,23 @@ rb_ary_resize(VALUE ary, long len)
  *     a[-1]   = "Z"               #=> ["A", "Z"]
  *     a[1..-1] = nil              #=> ["A", nil]
  *     a[1..-1] = []               #=> ["A"]
+ *     a[0, 0] = [ 1, 2 ]          #=> [1, 2, "A"]
+ *     a[3, 0] = "B"               #=> [1, 2, "A", "B"]
  */
 
 static VALUE
 rb_ary_aset(int argc, VALUE *argv, VALUE ary)
 {
     long offset, beg, len;
+    VALUE rpl;
 
     if (argc == 3) {
 	rb_ary_modify_check(ary);
 	beg = NUM2LONG(argv[0]);
 	len = NUM2LONG(argv[1]);
-	rb_ary_splice(ary, beg, len, argv[2]);
-	return argv[2];
-    }
-    if (argc != 2) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
+	goto range;
     }
+    rb_check_arity(argc, 2, 2);
     rb_ary_modify_check(ary);
     if (FIXNUM_P(argv[0])) {
 	offset = FIX2LONG(argv[0]);
@@ -1406,8 +1738,11 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary)
     }
     if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) {
 	/* check if idx is Range */
-	rb_ary_splice(ary, beg, len, argv[1]);
-	return argv[1];
+      range:
+	rpl = rb_ary_to_ary(argv[argc-1]);
+	rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR(rpl), RARRAY_LEN(rpl));
+	RB_GC_GUARD(rpl);
+	return argv[argc-1];
     }
 
     offset = NUM2LONG(argv[0]);
@@ -1420,8 +1755,12 @@ fixnum:
  *  call-seq:
  *     ary.insert(index, obj...)  -> ary
  *
- *  Inserts the given values before the element with the given index
- *  (which may be negative).
+ *  Inserts the given values before the element with the given +index+.
+ *
+ *  Negative indices count backwards from the end of the array, where +-1+ is
+ *  the last element. If a negative index is used, the given values will be
+ *  inserted after that element, so using an index of +-1+ will insert the
+ *  values at the end of the array.
  *
  *     a = %w{ a b c d }
  *     a.insert(2, 99)         #=> ["a", "b", 99, "c", "d"]
@@ -1433,9 +1772,7 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
 {
     long pos;
 
-    if (argc < 1) {
-	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
-    }
+    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
     rb_ary_modify_check(ary);
     if (argc == 1) return ary;
     pos = NUM2LONG(argv[0]);
@@ -1445,19 +1782,28 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
     if (pos < 0) {
 	pos++;
     }
-    rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
+    rb_ary_splice(ary, pos, 0, argv + 1, argc - 1);
     return ary;
 }
 
+static VALUE
+rb_ary_length(VALUE ary);
+
+static VALUE
+ary_enum_length(VALUE ary, VALUE args, VALUE eobj)
+{
+    return rb_ary_length(ary);
+}
+
 /*
  *  call-seq:
- *     ary.each {|item| block }   -> ary
- *     ary.each                   -> an_enumerator
+ *     ary.each { |item| block }  -> ary
+ *     ary.each                   -> Enumerator
  *
- *  Calls <i>block</i> once for each element in +self+, passing that
- *  element as a parameter.
+ *  Calls the given block once for each element in +self+, passing that element
+ *  as a parameter.  Returns the array itself.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned.
  *
  *     a = [ "a", "b", "c" ]
  *     a.each {|x| print x, " -- " }
@@ -1468,28 +1814,26 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary)
  */
 
 VALUE
-rb_ary_each(VALUE array)
+rb_ary_each(VALUE ary)
 {
     long i;
-    volatile VALUE ary = array;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	rb_yield(RARRAY_PTR(ary)[i]);
+	rb_yield(RARRAY_AREF(ary, i));
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     ary.each_index {|index| block }  -> ary
- *     ary.each_index                   -> an_enumerator
- *
- *  Same as <code>Array#each</code>, but passes the index of the element
- *  instead of the element itself.
+ *     ary.each_index { |index| block }  -> ary
+ *     ary.each_index                    -> Enumerator
  *
- *  If no block is given, an enumerator is returned instead.
+ *  Same as Array#each, but passes the +index+ of the element instead of the
+ *  element itself.
  *
+ *  An Enumerator is returned if no block is given.
  *
  *     a = [ "a", "b", "c" ]
  *     a.each_index {|x| print x, " -- " }
@@ -1503,7 +1847,7 @@ static VALUE
 rb_ary_each_index(VALUE ary)
 {
     long i;
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
 	rb_yield(LONG2NUM(i));
@@ -1513,11 +1857,10 @@ rb_ary_each_index(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reverse_each {|item| block }   -> ary
- *     ary.reverse_each                   -> an_enumerator
+ *     ary.reverse_each { |item| block }  -> ary
+ *     ary.reverse_each                   -> Enumerator
  *
- *  Same as <code>Array#each</code>, but traverses +self+ in reverse
- *  order.
+ *  Same as Array#each, but traverses +self+ in reverse order.
  *
  *     a = [ "a", "b", "c" ]
  *     a.reverse_each {|x| print x, " " }
@@ -1532,12 +1875,14 @@ rb_ary_reverse_each(VALUE ary)
 {
     long len;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     len = RARRAY_LEN(ary);
     while (len--) {
-	rb_yield(RARRAY_PTR(ary)[len]);
-	if (RARRAY_LEN(ary) < len) {
-	    len = RARRAY_LEN(ary);
+	long nlen;
+	rb_yield(RARRAY_AREF(ary, len));
+	nlen = RARRAY_LEN(ary);
+	if (nlen < len) {
+	    len = nlen;
 	}
     }
     return ary;
@@ -1550,6 +1895,7 @@ rb_ary_reverse_each(VALUE ary)
  *  Returns the number of elements in +self+. May be zero.
  *
  *     [ 1, 2, 3, 4, 5 ].length   #=> 5
+ *     [].length                  #=> 0
  */
 
 static VALUE
@@ -1563,7 +1909,7 @@ rb_ary_length(VALUE ary)
  *  call-seq:
  *     ary.empty?   -> true or false
  *
- *  Returns <code>true</code> if +self+ contains no elements.
+ *  Returns +true+ if +self+ contains no elements.
  *
  *     [].empty?   #=> true
  */
@@ -1579,16 +1925,17 @@ rb_ary_empty_p(VALUE ary)
 VALUE
 rb_ary_dup(VALUE ary)
 {
-    VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
-    MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
-    ARY_SET_LEN(dup, RARRAY_LEN(ary));
+    long len = RARRAY_LEN(ary);
+    VALUE dup = rb_ary_new2(len);
+    ary_memcpy(dup, 0, len, RARRAY_CONST_PTR(ary));
+    ARY_SET_LEN(dup, len);
     return dup;
 }
 
 VALUE
 rb_ary_resurrect(VALUE ary)
 {
-    return rb_ary_new4(RARRAY_LEN(ary), RARRAY_PTR(ary));
+    return rb_ary_new4(RARRAY_LEN(ary), RARRAY_CONST_PTR(ary));
 }
 
 extern VALUE rb_output_fs;
@@ -1619,14 +1966,13 @@ ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
     long i;
     VALUE val;
 
-    if (max > 0) rb_enc_copy(result, RARRAY_PTR(ary)[0]);
+    if (max > 0) rb_enc_copy(result, RARRAY_AREF(ary, 0));
     for (i=0; i<max; i++) {
-	val = RARRAY_PTR(ary)[i];
+	val = RARRAY_AREF(ary, i);
 	if (i > 0 && !NIL_P(sep))
 	    rb_str_buf_append(result, sep);
 	rb_str_buf_append(result, val);
 	if (OBJ_TAINTED(val)) OBJ_TAINT(result);
-	if (OBJ_UNTRUSTED(val)) OBJ_TAINT(result);
     }
 }
 
@@ -1639,13 +1985,13 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 	if (i > 0 && !NIL_P(sep))
 	    rb_str_buf_append(result, sep);
 
-	val = RARRAY_PTR(ary)[i];
-	switch (TYPE(val)) {
-	  case T_STRING:
+	val = RARRAY_AREF(ary, i);
+	if (RB_TYPE_P(val, T_STRING)) {
 	  str_join:
 	    rb_str_buf_append(result, val);
-	    break;
-	  case T_ARRAY:
+	    *first = FALSE;
+	}
+	else if (RB_TYPE_P(val, T_ARRAY)) {
 	    obj = val;
 	  ary_join:
 	    if (val == ary) {
@@ -1660,8 +2006,8 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 		args[3] = (VALUE)first;
 		rb_exec_recursive(recursive_join, obj, (VALUE)args);
 	    }
-	    break;
-	  default:
+	}
+	else {
 	    tmp = rb_check_string_type(val);
 	    if (!NIL_P(tmp)) {
 		val = tmp;
@@ -1688,19 +2034,17 @@ rb_ary_join(VALUE ary, VALUE sep)
 {
     long len = 1, i;
     int taint = FALSE;
-    int untrust = FALSE;
     VALUE val, tmp, result;
 
     if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0);
-    if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = TRUE;
-    if (OBJ_UNTRUSTED(ary) || OBJ_UNTRUSTED(sep)) untrust = TRUE;
+    if (OBJ_TAINTED(ary)) taint = TRUE;
 
     if (!NIL_P(sep)) {
 	StringValue(sep);
 	len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
     }
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	val = RARRAY_PTR(ary)[i];
+	val = RARRAY_AREF(ary, i);
 	tmp = rb_check_string_type(val);
 
 	if (NIL_P(tmp) || tmp != val) {
@@ -1708,7 +2052,6 @@ rb_ary_join(VALUE ary, VALUE sep)
 	    result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10);
 	    rb_enc_associate(result, rb_usascii_encoding());
 	    if (taint) OBJ_TAINT(result);
-	    if (untrust) OBJ_UNTRUST(result);
 	    ary_join_0(ary, sep, i, result);
 	    first = i == 0;
 	    ary_join_1(ary, ary, sep, i, result, &first);
@@ -1720,7 +2063,6 @@ rb_ary_join(VALUE ary, VALUE sep)
 
     result = rb_str_buf_new(len);
     if (taint) OBJ_TAINT(result);
-    if (untrust) OBJ_UNTRUST(result);
     ary_join_0(ary, sep, RARRAY_LEN(ary), result);
 
     return result;
@@ -1728,10 +2070,12 @@ rb_ary_join(VALUE ary, VALUE sep)
 
 /*
  *  call-seq:
- *     ary.join(sep=$,)    -> str
+ *     ary.join(separator=$,)    -> str
  *
  *  Returns a string created by converting each element of the array to
- *  a string, separated by <i>sep</i>.
+ *  a string, separated by the given +separator+.
+ *  If the +separator+ is +nil+, it uses current $,.
+ *  If both the +separator+ and $, are nil, it uses empty string.
  *
  *     [ "a", "b", "c" ].join        #=> "abc"
  *     [ "a", "b", "c" ].join("-")   #=> "a-b-c"
@@ -1752,32 +2096,31 @@ static VALUE
 inspect_ary(VALUE ary, VALUE dummy, int recur)
 {
     int tainted = OBJ_TAINTED(ary);
-    int untrust = OBJ_UNTRUSTED(ary);
     long i;
     VALUE s, str;
 
     if (recur) return rb_usascii_str_new_cstr("[...]");
     str = rb_str_buf_new2("[");
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	s = rb_inspect(RARRAY_PTR(ary)[i]);
+	s = rb_inspect(RARRAY_AREF(ary, i));
 	if (OBJ_TAINTED(s)) tainted = TRUE;
-	if (OBJ_UNTRUSTED(s)) untrust = TRUE;
 	if (i > 0) rb_str_buf_cat2(str, ", ");
 	else rb_enc_copy(str, s);
 	rb_str_buf_append(str, s);
     }
     rb_str_buf_cat2(str, "]");
     if (tainted) OBJ_TAINT(str);
-    if (untrust) OBJ_UNTRUST(str);
     return str;
 }
 
 /*
  *  call-seq:
- *     ary.to_s -> string
  *     ary.inspect  -> string
+ *     ary.to_s     -> string
  *
  *  Creates a string representation of +self+.
+ *
+ *     [ "a", "b", "c" ].to_s     #=> "[\"a\", \"b\", \"c\"]"
  */
 
 static VALUE
@@ -1797,8 +2140,9 @@ rb_ary_to_s(VALUE ary)
  *  call-seq:
  *     ary.to_a     -> ary
  *
- *  Returns +self+. If called on a subclass of Array, converts
- *  the receiver to an Array object.
+ *  Returns +self+.
+ *
+ *  If called on a subclass of Array, converts the receiver to an Array object.
  */
 
 static VALUE
@@ -1814,6 +2158,38 @@ rb_ary_to_a(VALUE ary)
 
 /*
  *  call-seq:
+ *     ary.to_h     -> hash
+ *
+ *  Returns the result of interpreting <i>ary</i> as an array of
+ *  <tt>[key, value]</tt> pairs.
+ *
+ *     [[:foo, :bar], [1, 2]].to_h
+ *       # => {:foo => :bar, 1 => 2}
+ */
+
+static VALUE
+rb_ary_to_h(VALUE ary)
+{
+    long i;
+    VALUE hash = rb_hash_new();
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	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)",
+		     rb_obj_class(elt), i);
+	}
+	if (RARRAY_LEN(key_value_pair) != 2) {
+	    rb_raise(rb_eArgError, "wrong array length at %ld (expected 2, was %ld)",
+		i, RARRAY_LEN(key_value_pair));
+	}
+	rb_hash_aset(hash, RARRAY_AREF(key_value_pair, 0), RARRAY_AREF(key_value_pair, 1));
+    }
+    return hash;
+}
+
+/*
+ *  call-seq:
  *     ary.to_ary -> ary
  *
  *  Returns +self+.
@@ -1826,8 +2202,7 @@ rb_ary_to_ary_m(VALUE ary)
 }
 
 static void
-ary_reverse(p1, p2)
-    VALUE *p1, *p2;
+ary_reverse(VALUE *p1, VALUE *p2)
 {
     while (p1 < p2) {
 	VALUE tmp = *p1;
@@ -1839,13 +2214,15 @@ ary_reverse(p1, p2)
 VALUE
 rb_ary_reverse(VALUE ary)
 {
-    VALUE *p1, *p2;
+    VALUE *p2;
+    long len = RARRAY_LEN(ary);
 
     rb_ary_modify(ary);
-    if (RARRAY_LEN(ary) > 1) {
-	p1 = RARRAY_PTR(ary);
-	p2 = p1 + RARRAY_LEN(ary) - 1;	/* points last item */
-	ary_reverse(p1, p2);
+    if (len > 1) {
+	RARRAY_PTR_USE(ary, p1, {
+	    p2 = p1 + len - 1;	/* points last item */
+	    ary_reverse(p1, p2);
+	}); /* WB: no new reference */
     }
     return ary;
 }
@@ -1869,7 +2246,7 @@ rb_ary_reverse_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.reverse -> new_ary
+ *     ary.reverse    -> new_ary
  *
  *  Returns a new array containing +self+'s elements in reverse order.
  *
@@ -1884,8 +2261,8 @@ rb_ary_reverse_m(VALUE ary)
     VALUE dup = rb_ary_new2(len);
 
     if (len > 0) {
-	VALUE *p1 = RARRAY_PTR(ary);
-	VALUE *p2 = RARRAY_PTR(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));
@@ -1921,11 +2298,13 @@ rb_ary_rotate(VALUE ary, long cnt)
 
 /*
  *  call-seq:
- *     ary.rotate!(cnt=1) -> ary
+ *     ary.rotate!(count=1)   -> ary
+ *
+ *  Rotates +self+ in place so that the element at +count+ comes first, and
+ *  returns +self+.
  *
- *  Rotates +self+ in place so that the element at +cnt+ comes first,
- *  and returns +self+.  If +cnt+ is negative then it rotates in
- *  the opposite direction.
+ *  If +count+ is negative then it rotates in the opposite direction, starting
+ *  from the end of the array where +-1+ is the last element.
  *
  *     a = [ "a", "b", "c", "d" ]
  *     a.rotate!        #=> ["b", "c", "d", "a"]
@@ -1950,11 +2329,13 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     ary.rotate(cnt=1) -> new_ary
+ *     ary.rotate(count=1)    -> new_ary
  *
- *  Returns new array by rotating +self+ so that the element at
- *  +cnt+ in +self+ is the first element of the new array. If +cnt+
- *  is negative then it rotates in the opposite direction.
+ *  Returns a new array by rotating +self+ so that the element at +count+ is
+ *  the first element of the new array.
+ *
+ *  If +count+ is negative then it rotates in the opposite direction, starting
+ *  from the end of +self+ where +-1+ is the last element.
  *
  *     a = [ "a", "b", "c", "d" ]
  *     a.rotate         #=> ["b", "c", "d", "a"]
@@ -1966,7 +2347,8 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
 static VALUE
 rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE rotated, *ptr, *ptr2;
+    VALUE rotated;
+    const VALUE *ptr;
     long len, cnt = 1;
 
     switch (argc) {
@@ -1979,11 +2361,10 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
     rotated = rb_ary_new2(len);
     if (len > 0) {
 	cnt = rotate_count(cnt, len);
-	ptr = RARRAY_PTR(ary);
-	ptr2 = RARRAY_PTR(rotated);
+	ptr = RARRAY_CONST_PTR(ary);
 	len -= cnt;
-	MEMCPY(ptr2, ptr + cnt, VALUE, len);
-	MEMCPY(ptr2 + len, ptr, VALUE, cnt);
+	ary_memcpy(rotated, 0, len, ptr + cnt);
+	ary_memcpy(rotated, len, cnt, ptr);
     }
     ARY_SET_LEN(rotated, RARRAY_LEN(ary));
     return rotated;
@@ -1991,26 +2372,9 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 
 struct ary_sort_data {
     VALUE ary;
-    int opt_methods;
-    int opt_inited;
+    struct cmp_opt_data cmp_opt;
 };
 
-enum {
-    sort_opt_Fixnum,
-    sort_opt_String,
-    sort_optimizable_count
-};
-
-#define STRING_P(s) (TYPE(s) == T_STRING && CLASS_OF(s) == rb_cString)
-
-#define SORT_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(sort_opt_,type))
-#define SORT_OPTIMIZABLE(data, type) \
-    (((data)->opt_inited & SORT_OPTIMIZABLE_BIT(type)) ? \
-     ((data)->opt_methods & SORT_OPTIMIZABLE_BIT(type)) : \
-     (((data)->opt_inited |= SORT_OPTIMIZABLE_BIT(type)), \
-      rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \
-      ((data)->opt_methods |= SORT_OPTIMIZABLE_BIT(type))))
-
 static VALUE
 sort_reentered(VALUE ary)
 {
@@ -2042,16 +2406,16 @@ sort_2(const void *ap, const void *bp, void *dummy)
     VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
     int n;
 
-    if (FIXNUM_P(a) && FIXNUM_P(b) && SORT_OPTIMIZABLE(data, Fixnum)) {
+    if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, Fixnum)) {
 	if ((long)a > (long)b) return 1;
 	if ((long)a < (long)b) return -1;
 	return 0;
     }
-    if (STRING_P(a) && STRING_P(b) && SORT_OPTIMIZABLE(data, String)) {
+    if (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, String)) {
 	return rb_str_cmp(a, b);
     }
 
-    retval = rb_funcall(a, id_cmp, 1, b);
+    retval = rb_funcallv(a, id_cmp, 1, &b);
     n = rb_cmpint(retval, a, b);
     sort_reentered(data->ary);
 
@@ -2061,17 +2425,22 @@ 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+. Comparisons for
- *  the sort will be done using the <code><=></code> operator or using
- *  an optional code block. The block implements a comparison between
- *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- *  <code>Enumerable#sort_by</code>.
+ *  Sorts +self+ in place.
+ *
+ *  Comparisons for the sort will be done using the <code><=></code> operator
+ *  or using an optional code block.
+ *
+ *  The block must implement a comparison between +a+ and +b+ and return
+ *  an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+
+ *  are equivalent, or an integer greater than 0 when +a+ follows +b+.
+ *
+ *  See also Enumerable#sort_by.
  *
  *     a = [ "d", "a", "e", "c", "b" ]
  *     a.sort!                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort! {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
+ *     a.sort! { |x,y| y <=> x }  #=> ["e", "d", "c", "b", "a"]
  */
 
 VALUE
@@ -2082,29 +2451,29 @@ rb_ary_sort_bang(VALUE ary)
     if (RARRAY_LEN(ary) > 1) {
 	VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
 	struct ary_sort_data data;
+	long len = RARRAY_LEN(ary);
 
-	RBASIC(tmp)->klass = 0;
+	RBASIC_CLEAR_CLASS(tmp);
 	data.ary = tmp;
-	data.opt_methods = 0;
-	data.opt_inited = 0;
-	ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
-		   rb_block_given_p()?sort_1:sort_2, &data);
-
+	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);
+	}); /* WB: no new reference */
+	rb_ary_modify(ary);
         if (ARY_EMBED_P(tmp)) {
-            assert(ARY_EMBED_P(tmp));
             if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
                 rb_ary_unshare(ary);
+		FL_SET_EMBED(ary);
             }
-            FL_SET_EMBED(ary);
-            MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp));
+	    ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp));
             ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
         }
         else {
-            assert(!ARY_EMBED_P(tmp));
-            if (ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
-                assert(!ARY_EMBED_P(ary));
+            if (!ARY_EMBED_P(ary) && ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
                 FL_UNSET_SHARED(ary);
-                ARY_SET_CAPA(ary, ARY_CAPA(tmp));
+                ARY_SET_CAPA(ary, RARRAY_LEN(tmp));
             }
             else {
                 assert(!ARY_SHARED_P(tmp));
@@ -2116,11 +2485,11 @@ rb_ary_sort_bang(VALUE ary)
                     rb_ary_unshare(ary);
                 }
                 else {
-                    xfree(ARY_HEAP_PTR(ary));
+		    ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
                 }
-                ARY_SET_PTR(ary, RARRAY_PTR(tmp));
-                ARY_SET_HEAP_LEN(ary, RARRAY_LEN(tmp));
-                ARY_SET_CAPA(ary, ARY_CAPA(tmp));
+                ARY_SET_PTR(ary, RARRAY_CONST_PTR(tmp));
+                ARY_SET_HEAP_LEN(ary, len);
+                ARY_SET_CAPA(ary, RARRAY_LEN(tmp));
             }
             /* tmp was lost ownership for the ptr */
             FL_UNSET(tmp, FL_FREEZE);
@@ -2129,7 +2498,7 @@ rb_ary_sort_bang(VALUE ary)
             FL_SET(tmp, FL_FREEZE);
 	}
         /* tmp will be GC'ed. */
-        RBASIC(tmp)->klass = rb_cArray;
+        RBASIC_SET_CLASS_RAW(tmp, rb_cArray); /* rb_cArray must be marked */
     }
     return ary;
 }
@@ -2137,17 +2506,23 @@ rb_ary_sort_bang(VALUE 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+.
+ *
+ *  Comparisons for the sort will be done using the <code><=></code> operator
+ *  or using an optional code block.
  *
- *  Returns a new array created by sorting +self+. Comparisons for
- *  the sort will be done using the <code><=></code> operator or using
- *  an optional code block. The block implements a comparison between
- *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- *  <code>Enumerable#sort_by</code>.
+ *  The block must implement a comparison between +a+ and +b+ and return
+ *  an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+
+ *  are equivalent, or an integer greater than 0 when +a+ follows +b+.
+ *
+ *
+ *  See also Enumerable#sort_by.
  *
  *     a = [ "d", "a", "e", "c", "b" ]
  *     a.sort                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
+ *     a.sort { |x,y| y <=> x }  #=> ["e", "d", "c", "b", "a"]
  */
 
 VALUE
@@ -2158,22 +2533,148 @@ rb_ary_sort(VALUE ary)
     return ary;
 }
 
+static VALUE rb_ary_bsearch_index(VALUE ary);
+
+/*
+ *  call-seq:
+ *     ary.bsearch {|x| block }  -> elem
+ *
+ *  By using binary search, finds a value from this array which meets
+ *  the given condition in O(log n) where n is the size of the array.
+ *
+ *  You can use this method in two use cases: a find-minimum mode and
+ *  a find-any mode.  In either case, the elements of the array must be
+ *  monotone (or sorted) with respect to the block.
+ *
+ *  In find-minimum mode (this is a good choice for typical use case),
+ *  the block must return true or false, and there must be an index i
+ *  (0 <= i <= ary.size) so that:
+ *
+ *  - the block returns false for any element whose index is less than
+ *    i, and
+ *  - the block returns true for any element whose index is greater
+ *    than or equal to i.
+ *
+ *  This method returns the i-th element.  If i is equal to ary.size,
+ *  it returns nil.
+ *
+ *     ary = [0, 4, 7, 10, 12]
+ *     ary.bsearch {|x| x >=   4 } #=> 4
+ *     ary.bsearch {|x| x >=   6 } #=> 7
+ *     ary.bsearch {|x| x >=  -1 } #=> 0
+ *     ary.bsearch {|x| x >= 100 } #=> nil
+ *
+ *  In find-any mode (this behaves like libc's bsearch(3)), the block
+ *  must return a number, and there must be two indices i and j
+ *  (0 <= i <= j <= ary.size) so that:
+ *
+ *  - the block returns a positive number for ary[k] if 0 <= k < i,
+ *  - the block returns zero for ary[k] if i <= k < j, and
+ *  - the block returns a negative number for ary[k] if
+ *    j <= k < ary.size.
+ *
+ *  Under this condition, this method returns any element whose index
+ *  is within i...j.  If i is equal to j (i.e., there is no element
+ *  that satisfies the block), this method returns nil.
+ *
+ *     ary = [0, 4, 7, 10, 12]
+ *     # try to find v such that 4 <= v < 8
+ *     ary.bsearch {|x| 1 - x / 4 } #=> 4 or 7
+ *     # try to find v such that 8 <= v < 10
+ *     ary.bsearch {|x| 4 - x / 2 } #=> nil
+ *
+ *  You must not mix the two modes at a time; the block must always
+ *  return either true/false, or always return a number.  It is
+ *  undefined which value is actually picked up at each iteration.
+ */
+
+static VALUE
+rb_ary_bsearch(VALUE ary)
+{
+    VALUE index_result = rb_ary_bsearch_index(ary);
+
+    if (FIXNUM_P(index_result)) {
+	return rb_ary_entry(ary, FIX2LONG(index_result));
+    }
+    return index_result;
+}
+
+/*
+ *  call-seq:
+ *     ary.bsearch_index {|x| block }  -> int or nil
+ *
+ *  By using binary search, finds an index of a value from this array which
+ *  meets the given condition in O(log n) where n is the size of the array.
+ *
+ *  It supports two modes, depending on the nature of the block and they are
+ *  exactly the same as in the case of #bsearch method with the only difference
+ *  being that this method returns the index of the element instead of the
+ *  element itself. For more details consult the documentation for #bsearch.
+ */
+
+static VALUE
+rb_ary_bsearch_index(VALUE ary)
+{
+    long low = 0, high = RARRAY_LEN(ary), mid;
+    int smaller = 0, satisfied = 0;
+    VALUE v, val;
+
+    RETURN_ENUMERATOR(ary, 0, 0);
+    while (low < high) {
+	mid = low + ((high - low) / 2);
+	val = rb_ary_entry(ary, mid);
+	v = rb_yield(val);
+	if (FIXNUM_P(v)) {
+	    if (v == INT2FIX(0)) return INT2FIX(mid);
+	    smaller = (SIGNED_VALUE)v < 0; /* Fixnum preserves its sign-bit */
+	}
+	else if (v == Qtrue) {
+	    satisfied = 1;
+	    smaller = 1;
+	}
+	else if (v == Qfalse || v == Qnil) {
+	    smaller = 0;
+	}
+	else if (rb_obj_is_kind_of(v, rb_cNumeric)) {
+	    const VALUE zero = INT2FIX(0);
+	    switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, zero)) {
+	      case 0: return INT2FIX(mid);
+	      case 1: smaller = 1; break;
+	      case -1: smaller = 0;
+	    }
+	}
+	else {
+	    rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE
+		     " (must be numeric, true, false or nil)",
+		     rb_obj_class(v));
+	}
+	if (smaller) {
+	    high = mid;
+	}
+	else {
+	    low = mid + 1;
+	}
+    }
+    if (!satisfied) return Qnil;
+    return INT2FIX(low);
+}
+
 
 static VALUE
-sort_by_i(VALUE i)
+sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, dummy))
 {
     return rb_yield(i);
 }
 
 /*
  *  call-seq:
- *     ary.sort_by! {| obj | block }    -> ary
- *     ary.sort_by!                     -> an_enumerator
+ *     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.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned instead.
  *
  */
 
@@ -2182,7 +2683,7 @@ rb_ary_sort_by_bang(VALUE ary)
 {
     VALUE sorted;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_modify(ary);
     sorted = rb_block_call(ary, rb_intern("sort_by"), 0, 0, sort_by_i, 0);
     rb_ary_replace(ary, sorted);
@@ -2192,20 +2693,23 @@ rb_ary_sort_by_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.collect {|item| block }  -> new_ary
- *     ary.map     {|item| block }  -> new_ary
- *     ary.collect                  -> an_enumerator
- *     ary.map                      -> an_enumerator
+ *     ary.collect { |item| block }  -> new_ary
+ *     ary.map     { |item| block }  -> new_ary
+ *     ary.collect                   -> Enumerator
+ *     ary.map                       -> Enumerator
  *
- *  Invokes <i>block</i> once for each element of +self+. Creates a
- *  new array containing the values returned by the block.
- *  See also <code>Enumerable#collect</code>.
+ *  Invokes the given block once for each element of +self+.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  Creates a new array containing the values returned by the block.
+ *
+ *  See also Enumerable#collect.
+ *
+ *  If no block is given, an Enumerator is returned instead.
  *
  *     a = [ "a", "b", "c", "d" ]
- *     a.collect {|x| x + "!" }   #=> ["a!", "b!", "c!", "d!"]
- *     a                          #=> ["a", "b", "c", "d"]
+ *     a.collect { |x| x + "!" }         #=> ["a!", "b!", "c!", "d!"]
+ *     a.map.with_index { |x, i| x * i } #=> ["", "b", "cc", "ddd"]
+ *     a                                 #=> ["a", "b", "c", "d"]
  */
 
 static VALUE
@@ -2214,10 +2718,10 @@ rb_ary_collect(VALUE ary)
     long i;
     VALUE collect;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    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_PTR(ary)[i]));
+	rb_ary_push(collect, rb_yield(RARRAY_AREF(ary, i)));
     }
     return collect;
 }
@@ -2227,18 +2731,21 @@ rb_ary_collect(VALUE ary)
  *  call-seq:
  *     ary.collect! {|item| block }   -> ary
  *     ary.map!     {|item| block }   -> ary
- *     ary.collect                    -> an_enumerator
- *     ary.map                        -> an_enumerator
+ *     ary.collect!                   -> Enumerator
+ *     ary.map!                       -> Enumerator
+ *
+ *  Invokes the given block once for each element of +self+, replacing the
+ *  element with the value returned by the block.
  *
- *  Invokes the block once for each element of +self+, replacing the
- *  element with the value returned by _block_.
- *  See also <code>Enumerable#collect</code>.
+ *  See also Enumerable#collect.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned instead.
  *
  *     a = [ "a", "b", "c", "d" ]
- *     a.collect! {|x| x + "!" }
- *     a             #=>  [ "a!", "b!", "c!", "d!" ]
+ *     a.map! {|x| x + "!" }
+ *     a #=>  [ "a!", "b!", "c!", "d!" ]
+ *     a.collect!.with_index {|x, i| x[0...i] }
+ *     a #=>  ["", "b", "c!", "d!"]
  */
 
 static VALUE
@@ -2246,16 +2753,16 @@ rb_ary_collect_bang(VALUE ary)
 {
     long i;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_modify(ary);
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i]));
+	rb_ary_store(ary, i, rb_yield(RARRAY_AREF(ary, i)));
     }
     return ary;
 }
 
 VALUE
-rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VALUE, long))
+rb_get_values_at(VALUE obj, long olen, int argc, const VALUE *argv, VALUE (*func) (VALUE, long))
 {
     VALUE result = rb_ary_new2(argc);
     long beg, len, i, j;
@@ -2266,15 +2773,13 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL
 	    continue;
 	}
 	/* check if idx is Range */
-	switch (rb_range_beg_len(argv[i], &beg, &len, olen, 0)) {
-	  case Qfalse:
-	    break;
-	  case Qnil:
-	    continue;
-	  default:
-	    for (j=0; j<len; j++) {
-		rb_ary_push(result, (*func)(obj, j+beg));
+	if (rb_range_beg_len(argv[i], &beg, &len, olen, 1)) {
+	    long end = olen < beg+len ? olen : beg+len;
+	    for (j = beg; j < end; j++) {
+		rb_ary_push(result, (*func)(obj, j));
 	    }
+	    if (beg + len > j)
+		rb_ary_resize(result, RARRAY_LEN(result) + (beg + len) - j);
 	    continue;
 	}
 	rb_ary_push(result, (*func)(obj, NUM2LONG(argv[i])));
@@ -2284,18 +2789,20 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL
 
 /*
  *  call-seq:
- *     ary.values_at(selector,... )  -> new_ary
+ *     ary.values_at(selector, ...)  -> new_ary
+ *
+ *  Returns an array containing the elements in +self+ corresponding to the
+ *  given +selector+(s).
+ *
+ *  The selectors may be either integer indices or ranges.
  *
- *  Returns an array containing the elements in
- *  +self+ corresponding to the given selector(s). The selectors
- *  may be either integer indices or ranges.
- *  See also <code>Array#select</code>.
+ *  See also Array#select.
  *
  *     a = %w{ a b c d e f }
- *     a.values_at(1, 3, 5)
- *     a.values_at(1, 3, 5, 7)
- *     a.values_at(-1, -3, -5, -7)
- *     a.values_at(1..3, 2...5)
+ *     a.values_at(1, 3, 5)          # => ["b", "d", "f"]
+ *     a.values_at(1, 3, 5, 7)       # => ["b", "d", "f", nil]
+ *     a.values_at(-1, -2, -2, -7)   # => ["f", "e", "e", nil]
+ *     a.values_at(4..6, 3...6)      # => ["e", "f", nil, "d", "e", "f"]
  */
 
 static VALUE
@@ -2307,17 +2814,20 @@ rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
 
 /*
  *  call-seq:
- *     ary.select {|item| block } -> new_ary
- *     ary.select                 -> an_enumerator
+ *     ary.select { |item| block } -> new_ary
+ *     ary.select                  -> Enumerator
  *
- *  Invokes the block passing in successive elements from +self+,
- *  returning an array containing those elements for which the block
- *  returns a true value (equivalent to <code>Enumerable#select</code>).
+ *  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.
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *     [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.select { |v| v =~ /[aeiou]/ }  #=> ["a", "e"]
+ *
+ *  See also Enumerable#select.
  */
 
 static VALUE
@@ -2326,87 +2836,138 @@ rb_ary_select(VALUE ary)
     VALUE result;
     long i;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     result = rb_ary_new2(RARRAY_LEN(ary));
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
+	if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
 	    rb_ary_push(result, rb_ary_elt(ary, i));
 	}
     }
     return result;
 }
 
+struct select_bang_arg {
+    VALUE ary;
+    long len[2];
+};
+
+static VALUE
+select_bang_i(VALUE a)
+{
+    volatile struct select_bang_arg *arg = (void *)a;
+    VALUE ary = arg->ary;
+    long i1, i2;
+
+    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) {
+	VALUE v = RARRAY_AREF(ary, i1);
+	if (!RTEST(rb_yield(v))) continue;
+	if (i1 != i2) {
+	    rb_ary_store(ary, i2, v);
+	}
+	arg->len[1] = ++i2;
+    }
+    return (i1 == i2) ? Qnil : ary;
+}
+
+static VALUE
+select_bang_ensure(VALUE a)
+{
+    volatile struct select_bang_arg *arg = (void *)a;
+    VALUE ary = arg->ary;
+    long len = RARRAY_LEN(ary);
+    long i1 = arg->len[0], i2 = arg->len[1];
+
+    if (i2 < i1) {
+	if (i1 < len) {
+	    RARRAY_PTR_USE(ary, ptr, {
+		    MEMMOVE(ptr + i2, ptr + i1, VALUE, len - i1);
+		});
+	}
+	ARY_SET_LEN(ary, len - i1 + i2);
+    }
+    return ary;
+}
+
 /*
  *  call-seq:
- *     ary.select! {|item| block } -> new_ary or nil
- *     ary.select!                 -> an_enumerator
+ *     ary.select!  {|item| block } -> ary or nil
+ *     ary.select!                  -> Enumerator
  *
- *  Invokes the block passing in successive elements from
- *  +self+, deleting elements for which the block returns a
- *  false value. It returns +self+ if changes were made,
- *  otherwise it returns <code>nil</code>.
- *  See also <code>Array#keep_if</code>
+ *  Invokes the given block passing in successive elements from +self+,
+ *  deleting elements for which the block returns a +false+ value.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  The array may not be changed instantly every time the block is called.
+ *
+ *  If changes were made, it will return +self+, otherwise it returns +nil+.
+ *
+ *  See also Array#keep_if
+ *
+ *  If no block is given, an Enumerator is returned instead.
  *
  */
 
 static VALUE
 rb_ary_select_bang(VALUE ary)
 {
-    long i1, i2;
+    struct select_bang_arg args;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_modify(ary);
-    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
-	VALUE v = RARRAY_PTR(ary)[i1];
-	if (!RTEST(rb_yield(v))) continue;
-	if (i1 != i2) {
-	    rb_ary_store(ary, i2, v);
-	}
-	i2++;
-    }
 
-    if (RARRAY_LEN(ary) == i2) return Qnil;
-    if (i2 < RARRAY_LEN(ary))
-	ARY_SET_LEN(ary, i2);
-    return ary;
+    args.ary = ary;
+    args.len[0] = args.len[1] = 0;
+    return rb_ensure(select_bang_i, (VALUE)&args, select_bang_ensure, (VALUE)&args);
 }
 
 /*
  *  call-seq:
- *     ary.keep_if {|item| block } -> ary
- *     ary.keep_if                 -> an_enumerator
+ *     ary.keep_if { |item| block } -> ary
+ *     ary.keep_if                  -> Enumerator
  *
- *  Deletes every element of +self+ for which <i>block</i> evaluates
- *  to false.
- *  See also <code>Array#select!</code>
+ *  Deletes every element of +self+ for which the given block evaluates to
+ *  +false+.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  See also Array#select!
+ *
+ *  If no block is given, an Enumerator is returned instead.
  *
  *     a = %w{ a b c d e f }
- *     a.keep_if {|v| v =~ /[aeiou]/}   #=> ["a", "e"]
+ *     a.keep_if { |v| v =~ /[aeiou]/ }  #=> ["a", "e"]
  */
 
 static VALUE
 rb_ary_keep_if(VALUE ary)
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rb_ary_select_bang(ary);
     return ary;
 }
 
+static void
+ary_resize_smaller(VALUE ary, long len)
+{
+    rb_ary_modify(ary);
+    if (RARRAY_LEN(ary) > len) {
+	ARY_SET_LEN(ary, len);
+	if (len * 2 < ARY_CAPA(ary) &&
+	    ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
+	    ary_resize_capa(ary, len * 2);
+	}
+    }
+}
+
 /*
  *  call-seq:
- *     ary.delete(obj)            -> obj or nil
- *     ary.delete(obj) { block }  -> obj or nil
+ *     ary.delete(obj)            -> item or nil
+ *     ary.delete(obj) { block }  -> item or result of block
+ *
+ *  Deletes all items from +self+ that are equal to +obj+.
+ *
+ *  Returns the last deleted item, or +nil+ if no matching item is found.
  *
- *  Deletes items from +self+ that are equal to <i>obj</i>.
- *  If any items are found, returns <i>obj</i>.   If
- *  the item is not found, returns <code>nil</code>. If the optional
- *  code block is given, returns the result of <i>block</i> if the item
- *  is not found.  (To remove <code>nil</code> elements and
- *  get an informative return value, use #compact!)
+ *  If the optional code block is given, the result of the block is returned if
+ *  the item is not found.  (To remove +nil+ elements and get an informative
+ *  return value, use Array#compact!)
  *
  *     a = [ "a", "b", "b", "b", "c" ]
  *     a.delete("b")                   #=> "b"
@@ -2422,7 +2983,7 @@ rb_ary_delete(VALUE ary, VALUE item)
     long i1, i2;
 
     for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
-	VALUE e = RARRAY_PTR(ary)[i1];
+	VALUE e = RARRAY_AREF(ary, i1);
 
 	if (rb_equal(e, item)) {
 	    v = e;
@@ -2440,16 +3001,32 @@ rb_ary_delete(VALUE ary, VALUE item)
 	return Qnil;
     }
 
-    rb_ary_modify(ary);
-    if (RARRAY_LEN(ary) > i2) {
-	ARY_SET_LEN(ary, i2);
-	if (i2 * 2 < ARY_CAPA(ary) &&
-	    ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
-	    ary_resize_capa(ary, i2*2);
+    ary_resize_smaller(ary, i2);
+
+    return v;
+}
+
+void
+rb_ary_delete_same(VALUE ary, VALUE item)
+{
+    long i1, i2;
+
+    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
+	VALUE e = RARRAY_AREF(ary, i1);
+
+	if (e == item) {
+	    continue;
+	}
+	if (i1 != i2) {
+	    rb_ary_store(ary, i2, e);
 	}
+	i2++;
+    }
+    if (RARRAY_LEN(ary) == i2) {
+	return;
     }
 
-    return v;
+    ary_resize_smaller(ary, i2);
 }
 
 VALUE
@@ -2465,9 +3042,10 @@ rb_ary_delete_at(VALUE ary, long pos)
     }
 
     rb_ary_modify(ary);
-    del = RARRAY_PTR(ary)[pos];
-    MEMMOVE(RARRAY_PTR(ary)+pos, RARRAY_PTR(ary)+pos+1, VALUE,
-	    RARRAY_LEN(ary)-pos-1);
+    del = RARRAY_AREF(ary, pos);
+    RARRAY_PTR_USE(ary, ptr, {
+	MEMMOVE(ptr+pos, ptr+pos+1, VALUE, len-pos-1);
+    });
     ARY_INCREASE_LEN(ary, -1);
 
     return del;
@@ -2477,11 +3055,12 @@ rb_ary_delete_at(VALUE ary, long pos)
  *  call-seq:
  *     ary.delete_at(index)  -> obj or nil
  *
- *  Deletes the element at the specified index, returning that element,
- *  or <code>nil</code> if the index is out of range. See also
- *  <code>Array#slice!</code>.
+ *  Deletes the element at the specified +index+, returning that element, or
+ *  +nil+ if the +index+ is out of range.
+ *
+ *  See also Array#slice!
  *
- *     a = %w( ant bat cat dog )
+ *     a = ["ant", "bat", "cat", "dog"]
  *     a.delete_at(2)    #=> "cat"
  *     a                 #=> ["ant", "bat", "dog"]
  *     a.delete_at(99)   #=> nil
@@ -2499,9 +3078,11 @@ rb_ary_delete_at_m(VALUE ary, VALUE pos)
  *     ary.slice!(start, length) -> new_ary or nil
  *     ary.slice!(range)         -> new_ary or nil
  *
- *  Deletes the element(s) given by an index (optionally with a length)
- *  or by a range. Returns the deleted object (or objects), or
- *  <code>nil</code> if the index is out of range.
+ *  Deletes the element(s) given by an +index+ (optionally up to +length+
+ *  elements) or by a +range+.
+ *
+ *  Returns the deleted object (or objects), or +nil+ if the +index+ is out of
+ *  range.
  *
  *     a = [ "a", "b", "c" ]
  *     a.slice!(1)     #=> "b"
@@ -2534,9 +3115,9 @@ 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_PTR(ary)+pos);
-	RBASIC(arg2)->klass = rb_obj_class(ary);
-	rb_ary_splice(ary, pos, len, Qundef);
+	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;
     }
 
@@ -2569,66 +3150,76 @@ ary_reject(VALUE orig, VALUE result)
     long i;
 
     for (i = 0; i < RARRAY_LEN(orig); i++) {
-	VALUE v = RARRAY_PTR(orig)[i];
+	VALUE v = RARRAY_AREF(orig, i);
 	if (!RTEST(rb_yield(v))) {
-	    rb_ary_push_1(result, v);
+	    rb_ary_push(result, v);
 	}
     }
     return result;
 }
 
 static VALUE
-ary_reject_bang(VALUE ary)
+reject_bang_i(VALUE a)
 {
-    long i;
-    VALUE result = Qnil;
+    volatile struct select_bang_arg *arg = (void *)a;
+    VALUE ary = arg->ary;
+    long i1, i2;
 
-    rb_ary_modify_check(ary);
-    for (i = 0; i < RARRAY_LEN(ary); ) {
-	VALUE v = RARRAY_PTR(ary)[i];
-	if (RTEST(rb_yield(v))) {
-	    rb_ary_delete_at(ary, i);
-	    result = ary;
-	}
-	else {
-	    i++;
+    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) {
+	VALUE v = RARRAY_AREF(ary, i1);
+	if (RTEST(rb_yield(v))) continue;
+	if (i1 != i2) {
+	    rb_ary_store(ary, i2, v);
 	}
+	arg->len[1] = ++i2;
     }
-    return result;
+    return (i1 == i2) ? Qnil : ary;
+}
+
+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;
+    return rb_ensure(reject_bang_i, (VALUE)&args, select_bang_ensure, (VALUE)&args);
 }
 
 /*
  *  call-seq:
- *     ary.reject! {|item| block }  -> ary or nil
- *     ary.reject!                  -> an_enumerator
+ *     ary.reject! { |item| block }  -> ary or nil
+ *     ary.reject!                   -> Enumerator
+ *
+ *  Deletes every element of +self+ for which the block evaluates to +true+,
+ *  if no changes were made returns +nil+.
  *
- *  Equivalent to <code>Array#delete_if</code>, deleting elements from
- *  +self+ for which the block evaluates to true, but returns
- *  <code>nil</code> if no changes were made.
- *  See also <code>Enumerable#reject</code> and <code>Array#delete_if</code>.
+ *  The array may not be changed instantly every time the block is called.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  See also Enumerable#reject and Array#delete_if.
  *
+ *  If no block is given, an Enumerator is returned instead.
  */
 
 static VALUE
 rb_ary_reject_bang(VALUE ary)
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     return ary_reject_bang(ary);
 }
 
 /*
  *  call-seq:
- *     ary.reject {|item| block }  -> new_ary
- *     ary.reject                  -> an_enumerator
+ *     ary.reject  {|item| block }  -> new_ary
+ *     ary.reject                   -> Enumerator
  *
- *  Returns a new array containing the items in +self+
- *  for which the block is not true.
- *  See also <code>Array#delete_if</code>
+ *  Returns a new array containing the items in +self+ for which the given
+ *  block is not +true+. The ordering of non-rejected elements is maintained.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  See also Array#delete_if
  *
+ *  If no block is given, an Enumerator is returned instead.
  */
 
 static VALUE
@@ -2636,7 +3227,7 @@ rb_ary_reject(VALUE ary)
 {
     VALUE rejected_ary;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     rejected_ary = rb_ary_new();
     ary_reject(ary, rejected_ary);
     return rejected_ary;
@@ -2644,30 +3235,34 @@ rb_ary_reject(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.delete_if {|item| block }  -> ary
- *     ary.delete_if                  -> an_enumerator
+ *     ary.delete_if { |item| block }  -> ary
+ *     ary.delete_if                   -> Enumerator
  *
- *  Deletes every element of +self+ for which <i>block</i> evaluates
- *  to true.
- *  See also <code>Array#reject!</code>
+ *  Deletes every element of +self+ for which block evaluates to +true+.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  The array is changed instantly every time the block is called, not after
+ *  the iteration is over.
  *
- *     a = [ "a", "b", "c" ]
- *     a.delete_if {|x| x >= "b" }   #=> ["a"]
+ *  See also Array#reject!
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *     scores = [ 97, 42, 75 ]
+ *     scores.delete_if {|score| score < 80 }   #=> [97]
  */
 
 static VALUE
 rb_ary_delete_if(VALUE ary)
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
     ary_reject_bang(ary);
     return ary;
 }
 
 static VALUE
-take_i(VALUE val, VALUE *args, int argc, VALUE *argv)
+take_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, cbarg))
 {
+    VALUE *args = (VALUE *)cbarg;
     if (args[1]-- == 0) rb_iter_break();
     if (argc > 1) val = rb_ary_new4(argc, argv);
     rb_ary_push(args[0], val);
@@ -2683,61 +3278,92 @@ take_items(VALUE obj, long n)
     if (!NIL_P(result)) return rb_ary_subseq(result, 0, n);
     result = rb_ary_new2(n);
     args[0] = result; args[1] = (VALUE)n;
-    rb_block_call(obj, rb_intern("each"), 0, 0, take_i, (VALUE)args);
+    if (rb_check_block_call(obj, idEach, 0, 0, take_i, (VALUE)args) == Qundef)
+	rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)",
+		 rb_obj_class(obj));
     return result;
 }
 
 
 /*
  *  call-seq:
- *     ary.zip(arg, ...)                   -> new_ary
- *     ary.zip(arg, ...) {| arr | block }  -> nil
- *
- *  Converts any arguments to arrays, then merges elements of
- *  +self+ with corresponding elements from each argument. This
- *  generates a sequence of <code>self.size</code> <em>n</em>-element
- *  arrays, where <em>n</em> is one more that the count of arguments. If
- *  the size of any argument is less than <code>enumObj.size</code>,
- *  <code>nil</code> values are supplied. If a block is given, it is
- *  invoked for each output array, otherwise an array of arrays is
- *  returned.
+ *     ary.zip(arg, ...)                  -> new_ary
+ *     ary.zip(arg, ...) { |arr| block }  -> nil
+ *
+ *  Converts any arguments to arrays, then merges elements of +self+ with
+ *  corresponding elements from each argument.
+ *
+ *  This generates a sequence of <code>ary.size</code> _n_-element arrays,
+ *  where _n_ is one more than the count of arguments.
+ *
+ *  If the size of any argument is less than the size of the initial array,
+ *  +nil+ values are supplied.
+ *
+ *  If a block is given, it is invoked for each output +array+, otherwise an
+ *  array of arrays is returned.
  *
  *     a = [ 4, 5, 6 ]
  *     b = [ 7, 8, 9 ]
- *     [1,2,3].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
- *     [1,2].zip(a,b)         #=> [[1, 4, 7], [2, 5, 8]]
- *     a.zip([1,2],[8])       #=> [[4,1,8], [5,2,nil], [6,nil,nil]]
+ *     [1, 2, 3].zip(a, b)   #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
+ *     [1, 2].zip(a, b)      #=> [[1, 4, 7], [2, 5, 8]]
+ *     a.zip([1, 2], [8])    #=> [[4, 1, 8], [5, 2, nil], [6, nil, nil]]
  */
 
 static VALUE
 rb_ary_zip(int argc, VALUE *argv, VALUE ary)
 {
     int i, j;
-    long len;
+    long len = RARRAY_LEN(ary);
     VALUE result = Qnil;
 
-    len = RARRAY_LEN(ary);
     for (i=0; i<argc; i++) {
 	argv[i] = take_items(argv[i], len);
     }
-    if (!rb_block_given_p()) {
-	result = rb_ary_new2(len);
-    }
 
-    for (i=0; i<RARRAY_LEN(ary); i++) {
-	VALUE tmp = rb_ary_new2(argc+1);
+    if (rb_block_given_p()) {
+	int arity = rb_block_arity();
 
-	rb_ary_push(tmp, rb_ary_elt(ary, i));
-	for (j=0; j<argc; j++) {
-	    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
-	}
-	if (NIL_P(result)) {
-	    rb_yield(tmp);
+	if (arity > 1) {
+	    VALUE work, *tmp;
+
+	    tmp = ALLOCV_N(VALUE, work, argc+1);
+
+	    for (i=0; i<RARRAY_LEN(ary); i++) {
+		tmp[0] = RARRAY_AREF(ary, i);
+		for (j=0; j<argc; j++) {
+		    tmp[j+1] = rb_ary_elt(argv[j], i);
+		}
+		rb_yield_values2(argc+1, tmp);
+	    }
+
+	    if (work) ALLOCV_END(work);
 	}
 	else {
+	    for (i=0; i<RARRAY_LEN(ary); i++) {
+		VALUE tmp = rb_ary_new2(argc+1);
+
+		rb_ary_push(tmp, RARRAY_AREF(ary, i));
+		for (j=0; j<argc; j++) {
+		    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+		}
+		rb_yield(tmp);
+	    }
+	}
+    }
+    else {
+	result = rb_ary_new_capa(len);
+
+	for (i=0; i<len; i++) {
+	    VALUE tmp = rb_ary_new_capa(argc+1);
+
+	    rb_ary_push(tmp, RARRAY_AREF(ary, i));
+	    for (j=0; j<argc; j++) {
+		rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+	    }
 	    rb_ary_push(result, tmp);
 	}
     }
+
     return result;
 }
 
@@ -2745,11 +3371,13 @@ rb_ary_zip(int argc, VALUE *argv, VALUE ary)
  *  call-seq:
  *     ary.transpose -> new_ary
  *
- *  Assumes that +self+ is an array of arrays and transposes the
- *  rows and columns.
+ *  Assumes that +self+ is an array of arrays and transposes the rows and
+ *  columns.
  *
  *     a = [[1,2], [3,4], [5,6]]
  *     a.transpose   #=> [[1, 3, 5], [2, 4, 6]]
+ *
+ *  If the length of the subarrays don't match, an IndexError is raised.
  */
 
 static VALUE
@@ -2783,9 +3411,10 @@ rb_ary_transpose(VALUE ary)
 /*
  *  call-seq:
  *     ary.replace(other_ary)  -> ary
+ *     ary.initialize_copy(other_ary)	-> ary
  *
- *  Replaces the contents of +self+ with the contents of
- *  <i>other_ary</i>, truncating or expanding if necessary.
+ *  Replaces the contents of +self+ with the contents of +other_ary+,
+ *  truncating or expanding if necessary.
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.replace([ "x", "y", "z" ])   #=> ["x", "y", "z"]
@@ -2800,19 +3429,17 @@ rb_ary_replace(VALUE copy, VALUE orig)
     if (copy == orig) return copy;
 
     if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) {
-        VALUE *ptr;
         VALUE shared = 0;
 
         if (ARY_OWNS_HEAP_P(copy)) {
-            xfree(RARRAY_PTR(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);
-        ptr = RARRAY_PTR(orig);
-        MEMCPY(RARRAY_PTR(copy), ptr, VALUE, RARRAY_LEN(orig));
+	ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR(orig));
         if (shared) {
             rb_ary_decrement_share(shared);
         }
@@ -2821,13 +3448,13 @@ rb_ary_replace(VALUE copy, VALUE orig)
     else {
         VALUE shared = ary_make_shared(orig);
         if (ARY_OWNS_HEAP_P(copy)) {
-            xfree(RARRAY_PTR(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, RARRAY_PTR(orig));
+        ARY_SET_PTR(copy, RARRAY_CONST_PTR(orig));
         ARY_SET_LEN(copy, RARRAY_LEN(orig));
         rb_ary_set_shared(copy, shared);
     }
@@ -2863,39 +3490,41 @@ 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)                                 -> ary
+ *     ary.fill(obj, start [, length])               -> ary
+ *     ary.fill(obj, range )                         -> ary
+ *     ary.fill { |index| block }                    -> ary
+ *     ary.fill(start [, length] ) { |index| block } -> ary
+ *     ary.fill(range) { |index| block }             -> ary
  *
  *  The first three forms set the selected elements of +self+ (which
- *  may be the entire array) to <i>obj</i>. A <i>start</i> of
- *  <code>nil</code> is equivalent to zero. A <i>length</i> of
- *  <code>nil</code> is equivalent to <i>self.length</i>. The last three
- *  forms fill the array with the value of the block. The block is
- *  passed the absolute index of each element to be filled.
- *  Negative values of <i>start</i> count from the end of the array.
+ *  may be the entire array) to +obj+.
+ *
+ *  A +start+ of +nil+ is equivalent to zero.
+ *
+ *  A +length+ of +nil+ is equivalent to the length of the array.
+ *
+ *  The last three forms fill the array with the value of the given block,
+ *  which is passed the absolute index of each element to be filled.
+ *
+ *  Negative values of +start+ count from the end of the array, where +-1+ is
+ *  the last element.
  *
  *     a = [ "a", "b", "c", "d" ]
  *     a.fill("x")              #=> ["x", "x", "x", "x"]
  *     a.fill("z", 2, 2)        #=> ["x", "x", "z", "z"]
  *     a.fill("y", 0..1)        #=> ["y", "y", "z", "z"]
- *     a.fill {|i| i*i}         #=> [0, 1, 4, 9]
- *     a.fill(-2) {|i| i*i*i}   #=> [0, 1, 8, 27]
+ *     a.fill { |i| i*i }       #=> [0, 1, 4, 9]
+ *     a.fill(-2) { |i| i*i*i } #=> [0, 1, 8, 27]
  */
 
 static VALUE
 rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE item, arg1, arg2;
+    VALUE item = Qundef, arg1, arg2;
     long beg = 0, end = 0, len = 0;
-    VALUE *p, *pend;
-    int block_p = FALSE;
 
     if (rb_block_given_p()) {
-	block_p = TRUE;
 	rb_scan_args(argc, argv, "02", &arg1, &arg2);
 	argc += 1;		/* hackish */
     }
@@ -2933,26 +3562,22 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 	if (end >= ARY_CAPA(ary)) {
 	    ary_resize_capa(ary, end);
 	}
-	rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), end - RARRAY_LEN(ary));
+	ary_mem_clear(ary, RARRAY_LEN(ary), end - RARRAY_LEN(ary));
 	ARY_SET_LEN(ary, end);
     }
 
-    if (block_p) {
+    if (item == Qundef) {
 	VALUE v;
 	long i;
 
 	for (i=beg; i<end; i++) {
 	    v = rb_yield(LONG2NUM(i));
 	    if (i>=RARRAY_LEN(ary)) break;
-	    RARRAY_PTR(ary)[i] = v;
+	    ARY_SET(ary, i, v);
 	}
     }
     else {
-	p = RARRAY_PTR(ary) + beg;
-	pend = p + len;
-	while (p < pend) {
-	    *p++ = item;
-	}
+	ary_memfill(ary, beg, len, item);
     }
     return ary;
 }
@@ -2961,57 +3586,106 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
  *  call-seq:
  *     ary + other_ary   -> new_ary
  *
- *  Concatenation---Returns a new array built by concatenating the
+ *  Concatenation --- Returns a new array built by concatenating the
  *  two arrays together to produce a third array.
  *
  *     [ 1, 2, 3 ] + [ 4, 5 ]    #=> [ 1, 2, 3, 4, 5 ]
+ *     a = [ "a", "b", "c" ]
+ *     c = a + [ "d", "e", "f" ]
+ *     c                         #=> [ "a", "b", "c", "d", "e", "f" ]
+ *     a                         #=> [ "a", "b", "c" ]
+ *
+ *  Note that
+ *     x += y
+ *  is the same as
+ *     x = x + y
+ *  This means that it produces a new array. As a consequence,
+ *  repeated use of <code>+=</code> on arrays can be quite inefficient.
+ *
+ *  See also Array#concat.
  */
 
 VALUE
 rb_ary_plus(VALUE x, VALUE y)
 {
     VALUE z;
-    long len;
+    long len, xlen, ylen;
 
     y = to_ary(y);
-    len = RARRAY_LEN(x) + RARRAY_LEN(y);
+    xlen = RARRAY_LEN(x);
+    ylen = RARRAY_LEN(y);
+    len = xlen + ylen;
     z = rb_ary_new2(len);
-    MEMCPY(RARRAY_PTR(z), RARRAY_PTR(x), VALUE, RARRAY_LEN(x));
-    MEMCPY(RARRAY_PTR(z) + RARRAY_LEN(x), RARRAY_PTR(y), VALUE, RARRAY_LEN(y));
+
+    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;
 }
 
+static VALUE
+ary_append(VALUE x, VALUE y)
+{
+    long n = RARRAY_LEN(y);
+    if (n > 0) {
+	rb_ary_splice(x, RARRAY_LEN(x), 0, RARRAY_CONST_PTR(y), n);
+    }
+    return x;
+}
+
 /*
  *  call-seq:
- *     ary.concat(other_ary)   -> ary
+ *     ary.concat(other_ary1, other_ary2,...)   -> ary
  *
- *  Appends the elements of <i>other_ary</i> 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" ].concat #=> [ "a" ]
+ *
+ *     a = [ 1, 2, 3 ]
+ *     a.concat( [ 4, 5 ] )
+ *     a                                 #=> [ 1, 2, 3, 4, 5 ]
+ *
+ *     a = [ 1, 2 ]
+ *     a.concat(a, a)                    #=> [1, 2, 1, 2, 1, 2]
+ *
+ *  See also Array#+.
  */
 
+static VALUE
+rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary)
+{
+    rb_ary_modify_check(ary);
+
+    if (argc > 0) {
+	int i;
+	VALUE args = rb_ary_tmp_new(argc);
+	for (i = 0; i < argc; i++) {
+	    rb_ary_concat(args, argv[i]);
+	}
+	ary_append(ary, args);
+    }
+
+    return ary;
+}
 
 VALUE
 rb_ary_concat(VALUE x, VALUE y)
 {
-    rb_ary_modify_check(x);
-    y = to_ary(y);
-    if (RARRAY_LEN(y) > 0) {
-	rb_ary_splice(x, RARRAY_LEN(x), 0, y);
-    }
-    return x;
+    return ary_append(x, to_ary(y));
 }
 
-
 /*
  *  call-seq:
  *     ary * int     -> new_ary
  *     ary * str     -> new_string
  *
- *  Repetition---With a String argument, equivalent to
- *  self.join(str). Otherwise, returns a new array
- *  built by concatenating the _int_ copies of +self+.
+ *  Repetition --- With a String argument, equivalent to
+ *  <code>ary.join(str)</code>.
+ *
+ *  Otherwise, returns a new array built by concatenating the +int+ copies of
+ *  +self+.
  *
  *
  *     [ 1, 2, 3 ] * 3    #=> [ 1, 2, 3, 1, 2, 3, 1, 2, 3 ]
@@ -3022,7 +3696,8 @@ rb_ary_concat(VALUE x, VALUE y)
 static VALUE
 rb_ary_times(VALUE ary, VALUE times)
 {
-    VALUE ary2, tmp, *ptr, *ptr2;
+    VALUE ary2, tmp;
+    const VALUE *ptr;
     long t, len;
 
     tmp = rb_check_string_type(times);
@@ -3046,17 +3721,16 @@ rb_ary_times(VALUE ary, VALUE times)
     ary2 = ary_new(rb_obj_class(ary), len);
     ARY_SET_LEN(ary2, len);
 
-    ptr = RARRAY_PTR(ary);
-    ptr2 = RARRAY_PTR(ary2);
+    ptr = RARRAY_CONST_PTR(ary);
     t = RARRAY_LEN(ary);
     if (0 < t) {
-        MEMCPY(ptr2, ptr, VALUE, t);
-        while (t <= len/2) {
-            MEMCPY(ptr2+t, ptr2, VALUE, t);
+	ary_memcpy(ary2, 0, t, ptr);
+	while (t <= len/2) {
+	    ary_memcpy(ary2, t, t, RARRAY_CONST_PTR(ary2));
             t *= 2;
         }
         if (t < len) {
-            MEMCPY(ptr2+t, ptr2, VALUE, len-t);
+	    ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR(ary2));
         }
     }
   out:
@@ -3067,15 +3741,15 @@ rb_ary_times(VALUE ary, VALUE times)
 
 /*
  *  call-seq:
- *     ary.assoc(obj)   -> new_ary  or  nil
+ *     ary.assoc(obj)   -> element_ary  or  nil
  *
- *  Searches through an array whose elements are also arrays
- *  comparing _obj_ with the first element of each contained array
- *  using obj.==.
- *  Returns the first contained array that matches (that
- *  is, the first associated array),
- *  or +nil+ if no match is found.
- *  See also <code>Array#rassoc</code>.
+ *  Searches through an array whose elements are also arrays comparing +obj+
+ *  with the first element of each contained array using <code>obj.==</code>.
+ *
+ *  Returns the first contained array that matches (that is, the first
+ *  associated array), or +nil+ if no match is found.
+ *
+ *  See also Array#rassoc
  *
  *     s1 = [ "colors", "red", "blue", "green" ]
  *     s2 = [ "letters", "a", "b", "c" ]
@@ -3092,9 +3766,9 @@ rb_ary_assoc(VALUE ary, VALUE key)
     VALUE v;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = rb_check_array_type(RARRAY_PTR(ary)[i]);
+	v = rb_check_array_type(RARRAY_AREF(ary, i));
 	if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
-	    rb_equal(RARRAY_PTR(v)[0], key))
+	    rb_equal(RARRAY_AREF(v, 0), key))
 	    return v;
     }
     return Qnil;
@@ -3102,12 +3776,16 @@ rb_ary_assoc(VALUE ary, VALUE key)
 
 /*
  *  call-seq:
- *     ary.rassoc(obj) -> new_ary or nil
+ *     ary.rassoc(obj) -> element_ary or nil
+ *
+ *  Searches through the array whose elements are also arrays.
+ *
+ *  Compares +obj+ with the second element of each contained array using
+ *  <code>obj.==</code>.
  *
- *  Searches through the array whose elements are also arrays. Compares
- *  _obj_ with the second element of each contained array using
- *  <code>==</code>. Returns the first contained array that matches. See
- *  also <code>Array#assoc</code>.
+ *  Returns the first contained array that matches +obj+.
+ *
+ *  See also Array#assoc.
  *
  *     a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
  *     a.rassoc("two")    #=> [2, "two"]
@@ -3121,10 +3799,10 @@ rb_ary_rassoc(VALUE ary, VALUE value)
     VALUE v;
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
-	v = RARRAY_PTR(ary)[i];
-	if (TYPE(v) == T_ARRAY &&
+	v = RARRAY_AREF(ary, i);
+	if (RB_TYPE_P(v, T_ARRAY) &&
 	    RARRAY_LEN(v) > 1 &&
-	    rb_equal(RARRAY_PTR(v)[1], value))
+	    rb_equal(RARRAY_AREF(v, 1), value))
 	    return v;
     }
     return Qnil;
@@ -3133,12 +3811,32 @@ rb_ary_rassoc(VALUE ary, VALUE value)
 static VALUE
 recursive_equal(VALUE ary1, VALUE ary2, int recur)
 {
-    long i;
+    long i, len1;
+    const VALUE *p1, *p2;
 
     if (recur) return Qtrue; /* Subtle! */
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
-	if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
-	    return Qfalse;
+
+    p1 = RARRAY_CONST_PTR(ary1);
+    p2 = RARRAY_CONST_PTR(ary2);
+    len1 = RARRAY_LEN(ary1);
+
+    for (i = 0; i < len1; i++) {
+	if (*p1 != *p2) {
+	    if (rb_equal(*p1, *p2)) {
+		len1 = RARRAY_LEN(ary1);
+		if (len1 != RARRAY_LEN(ary2))
+		    return Qfalse;
+		if (len1 < i)
+		    return Qtrue;
+		p1 = RARRAY_CONST_PTR(ary1) + i;
+		p2 = RARRAY_CONST_PTR(ary2) + i;
+	    }
+	    else {
+		return Qfalse;
+	    }
+	}
+	p1++;
+	p2++;
     }
     return Qtrue;
 }
@@ -3147,9 +3845,9 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur)
  *  call-seq:
  *     ary == other_ary   ->   bool
  *
- *  Equality---Two arrays are equal if they contain the same number
- *  of elements and if each element is equal to (according to
- *  Object.==) the corresponding element in the other array.
+ *  Equality --- Two arrays are equal if they contain the same number of
+ *  elements and if each element is equal to (according to Object#==) the
+ *  corresponding element in +other_ary+.
  *
  *     [ "a", "c" ]    == [ "a", "c", 7 ]     #=> false
  *     [ "a", "c", 7 ] == [ "a", "c", 7 ]     #=> true
@@ -3161,13 +3859,14 @@ static VALUE
 rb_ary_equal(VALUE ary1, VALUE ary2)
 {
     if (ary1 == ary2) return Qtrue;
-    if (TYPE(ary2) != T_ARRAY) {
-	if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
+    if (!RB_TYPE_P(ary2, T_ARRAY)) {
+	if (!rb_respond_to(ary2, idTo_ary)) {
 	    return Qfalse;
 	}
 	return rb_equal(ary2, ary1);
     }
     if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
+    if (RARRAY_CONST_PTR(ary1) == RARRAY_CONST_PTR(ary2)) return Qtrue;
     return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2);
 }
 
@@ -3188,35 +3887,44 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur)
  *  call-seq:
  *     ary.eql?(other)  -> true or false
  *
- *  Returns <code>true</code> if +self+ and _other_ are the same object,
- *  or are both arrays with the same content.
+ *  Returns +true+ if +self+ and +other+ are the same object,
+ *  or are both arrays with the same content (according to Object#eql?).
  */
 
 static VALUE
 rb_ary_eql(VALUE ary1, VALUE ary2)
 {
     if (ary1 == ary2) return Qtrue;
-    if (TYPE(ary2) != T_ARRAY) return Qfalse;
+    if (!RB_TYPE_P(ary2, T_ARRAY)) return Qfalse;
     if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
+    if (RARRAY_CONST_PTR(ary1) == RARRAY_CONST_PTR(ary2)) return Qtrue;
     return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2);
 }
 
+/*
+ *  call-seq:
+ *     ary.hash   -> integer
+ *
+ *  Compute a hash-code for this array.
+ *
+ *  Two arrays with the same content will have the same hash code (and will
+ *  compare using #eql?).
+ *
+ *  See also Object#hash.
+ */
+
 static VALUE
-recursive_hash(VALUE ary, VALUE dummy, int recur)
+rb_ary_hash(VALUE ary)
 {
     long i;
     st_index_t h;
     VALUE n;
 
     h = rb_hash_start(RARRAY_LEN(ary));
-    if (recur) {
-	h = rb_hash_uint(h, NUM2LONG(rb_hash(rb_cArray)));
-    }
-    else {
-	for (i=0; i<RARRAY_LEN(ary); i++) {
-	    n = rb_hash(RARRAY_PTR(ary)[i]);
-	    h = rb_hash_uint(h, NUM2LONG(n));
-	}
+    h = rb_hash_uint(h, (st_index_t)rb_ary_hash);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	n = rb_hash(RARRAY_AREF(ary, i));
+	h = rb_hash_uint(h, NUM2LONG(n));
     }
     h = rb_hash_end(h);
     return LONG2FIX(h);
@@ -3224,25 +3932,10 @@ recursive_hash(VALUE ary, VALUE dummy, int recur)
 
 /*
  *  call-seq:
- *     ary.hash   -> fixnum
- *
- *  Compute a hash-code for this array. Two arrays with the same content
- *  will have the same hash code (and will compare using <code>eql?</code>).
- */
-
-static VALUE
-rb_ary_hash(VALUE ary)
-{
-    return rb_exec_recursive_outer(recursive_hash, ary, 0);
-}
-
-/*
- *  call-seq:
- *     ary.include?(obj)   -> true or false
+ *     ary.include?(object)   -> true or false
  *
- *  Returns <code>true</code> if the given object is present in
- *  +self+ (that is, if any object <code>==</code> <i>anObject</i>),
- *  <code>false</code> otherwise.
+ *  Returns +true+ if the given +object+ is present in +self+ (that is, if any
+ *  element <code>==</code> +object+), otherwise returns +false+.
  *
  *     a = [ "a", "b", "c" ]
  *     a.include?("b")   #=> true
@@ -3253,9 +3946,15 @@ VALUE
 rb_ary_includes(VALUE ary, VALUE item)
 {
     long i;
+    VALUE e;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	if (rb_equal(RARRAY_PTR(ary)[i], item)) {
+	e = RARRAY_AREF(ary, i);
+	switch (rb_equal_opt(e, item)) {
+	  case Qundef:
+	    if (rb_equal(e, item)) return Qtrue;
+	    break;
+	  case Qtrue:
 	    return Qtrue;
 	}
     }
@@ -3274,7 +3973,8 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
 	len = RARRAY_LEN(ary2);
     }
     for (i=0; i<len; i++) {
-	VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
+	VALUE e1 = rb_ary_elt(ary1, i), e2 = rb_ary_elt(ary2, i);
+	VALUE v = rb_funcallv(e1, id_cmp, 1, &e2);
 	if (v != INT2FIX(0)) {
 	    return v;
 	}
@@ -3286,19 +3986,29 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur)
  *  call-seq:
  *     ary <=> other_ary   ->  -1, 0, +1 or nil
  *
- *  Comparison---Returns an integer (-1, 0,
- *  or +1) if this array is less than, equal to, or greater than
- *  <i>other_ary</i>.  Each object in each array is compared
- *  (using <=>). If any value isn't
- *  equal, then that inequality is the return value. If all the
- *  values found are equal, then the return is based on a
- *  comparison of the array lengths.  Thus, two arrays are
- *  ``equal'' according to <code>Array#<=></code> if and only if they have
- *  the same length and the value of each element is equal to the
- *  value of the corresponding element in the other array.
+ *  Comparison --- Returns an integer (+-1+, +0+, or <code>+1</code>) if this
+ *  array is less than, equal to, or greater than +other_ary+.
+ *
+ *  Each object in each array is compared (using the <=> operator).
+ *
+ *  Arrays are compared in an "element-wise" manner; the first element of +ary+
+ *  is compared with the first one of +other_ary+ using the <=> operator, then
+ *  each of the second elements, etc...
+ *  As soon as the result of any such comparison is non zero (i.e. the two
+ *  corresponding elements are not equal), that result is returned for the
+ *  whole array comparison.
+ *
+ *  If all the elements are equal, then the result is based on a comparison of
+ *  the array lengths. Thus, two arrays are "equal" according to Array#<=> if,
+ *  and only if, they have the same length and the value of each element is
+ *  equal to the value of the corresponding element in the other array.
+ *
+ *  +nil+ is returned if the +other_ary+ is not an array or if the comparison
+ *  of two elements returned +nil+.
  *
  *     [ "a", "a", "c" ]    <=> [ "a", "b", "c" ]   #=> -1
  *     [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ]            #=> +1
+ *     [ 1, 2 ]             <=> [ 1, :two ]         #=> nil
  *
  */
 
@@ -3325,7 +4035,8 @@ ary_add_hash(VALUE hash, VALUE ary)
     long i;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	rb_hash_aset(hash, RARRAY_PTR(ary)[i], Qtrue);
+	VALUE elt = RARRAY_AREF(ary, i);
+	rb_hash_add_new_element(hash, elt, elt);
     }
     return hash;
 }
@@ -3335,7 +4046,7 @@ ary_tmp_hash_new(void)
 {
     VALUE hash = rb_hash_new();
 
-    RBASIC(hash)->klass = 0;
+    RBASIC_CLEAR_CLASS(hash);
     return hash;
 }
 
@@ -3353,9 +4064,7 @@ ary_add_hash_by(VALUE hash, VALUE ary)
 
     for (i = 0; i < RARRAY_LEN(ary); ++i) {
 	VALUE v = rb_ary_elt(ary, i), k = rb_yield(v);
-	if (rb_hash_lookup2(hash, k, Qundef) == Qundef) {
-	    rb_hash_aset(hash, k, v);
-	}
+	rb_hash_add_new_element(hash, k, v);
     }
     return hash;
 }
@@ -3375,32 +4084,38 @@ ary_recycle_hash(VALUE hash)
 	RHASH(hash)->ntbl = 0;
 	st_free_table(tbl);
     }
+    RB_GC_GUARD(hash);
 }
 
 /*
  *  call-seq:
  *     ary - other_ary    -> new_ary
  *
- *  Array Difference---Returns a new array that is a copy of
- *  the original array, removing any items that also appear in
- *  <i>other_ary</i>. (If you need set-like behavior, see the
- *  library class Set.)
+ *  Array Difference
+ *
+ *  Returns a new array that is a copy of the original array, removing any
+ *  items that also appear in +other_ary+. The order is preserved from the
+ *  original array.
+ *
+ *  It compares elements using their #hash and #eql? methods for efficiency.
  *
  *     [ 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.
  */
 
 static VALUE
 rb_ary_diff(VALUE ary1, VALUE ary2)
 {
     VALUE ary3;
-    volatile VALUE hash;
+    VALUE hash;
     long i;
 
     hash = ary_make_hash(to_ary(ary2));
     ary3 = rb_ary_new();
 
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-	if (st_lookup(RHASH_TBL(hash), RARRAY_PTR(ary1)[i], 0)) 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);
@@ -3411,10 +4126,15 @@ rb_ary_diff(VALUE ary1, VALUE ary2)
  *  call-seq:
  *     ary & other_ary      -> new_ary
  *
- *  Set Intersection---Returns a new array
- *  containing elements common to the two arrays, with no duplicates.
+ *  Set Intersection --- Returns a new array containing unique elements common to the
+ *  two arrays. The order is preserved from the original array.
+ *
+ *  It compares elements using their #hash and #eql? methods for efficiency.
+ *
+ *     [ 1, 1, 3, 5 ] & [ 3, 2, 1 ]                 #=> [ 1, 3 ]
+ *     [ 'a', 'b', 'b', 'z' ] & [ 'a', 'b', 'c' ]   #=> [ 'a', 'b' ]
  *
- *     [ 1, 1, 3, 5 ] & [ 1, 2, 3 ]   #=> [ 1, 3 ]
+ *  See also Array#uniq.
  */
 
 
@@ -3422,20 +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_new2(RARRAY_LEN(ary1) < RARRAY_LEN(ary2) ?
-	    RARRAY_LEN(ary1) : RARRAY_LEN(ary2));
+    ary3 = rb_ary_new();
+    if (RARRAY_LEN(ary2) == 0) return ary3;
     hash = ary_make_hash(ary2);
-
-    if (RHASH_EMPTY_P(hash))
-        return ary3;
+    table = rb_hash_tbl_raw(hash);
 
     for (i=0; i<RARRAY_LEN(ary1); i++) {
-	vv = (st_data_t)(v = rb_ary_elt(ary1, i));
-	if (st_delete(RHASH_TBL(hash), &vv, 0)) {
+	v = RARRAY_AREF(ary1, i);
+	vv = (st_data_t)v;
+	if (st_delete(table, &vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
@@ -3444,44 +4164,159 @@ rb_ary_and(VALUE ary1, VALUE ary2)
     return ary3;
 }
 
+static int
+ary_hash_orset(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
+{
+    if (existing) return ST_STOP;
+    *key = *value = (VALUE)arg;
+    return ST_CONTINUE;
+}
+
 /*
  *  call-seq:
  *     ary | other_ary     -> new_ary
  *
- *  Set Union---Returns a new array by joining this array with
- *  <i>other_ary</i>, removing duplicates.
+ *  Set Union --- Returns a new array by joining +ary+ with +other_ary+,
+ *  excluding any duplicates and preserving the order from the given arrays.
  *
- *     [ "a", "b", "c" ] | [ "c", "d", "a" ]
- *            #=> [ "a", "b", "c", "d" ]
+ *  It compares elements using their #hash and #eql? methods for efficiency.
+ *
+ *     [ "a", "b", "c" ] | [ "c", "d", "a" ]    #=> [ "a", "b", "c", "d" ]
+ *     [ "c", "d", "a" ] | [ "a", "b", "c" ]    #=> [ "c", "d", "a", "b" ]
+ *
+ *  See also Array#uniq.
  */
 
 static VALUE
 rb_ary_or(VALUE ary1, VALUE ary2)
 {
-    VALUE hash, ary3, v;
-    st_data_t vv;
+    VALUE hash, ary3;
     long i;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY_LEN(ary1)+RARRAY_LEN(ary2));
-    hash = ary_add_hash(ary_make_hash(ary1), ary2);
+    hash = ary_make_hash(ary1);
 
-    for (i=0; i<RARRAY_LEN(ary1); i++) {
-	vv = (st_data_t)(v = rb_ary_elt(ary1, i));
-	if (st_delete(RHASH_TBL(hash), &vv, 0)) {
-	    rb_ary_push(ary3, v);
-	}
-    }
     for (i=0; i<RARRAY_LEN(ary2); i++) {
-	vv = (st_data_t)(v = rb_ary_elt(ary2, i));
-	if (st_delete(RHASH_TBL(hash), &vv, 0)) {
-	    rb_ary_push(ary3, v);
+	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;
 }
 
+/*
+ *  call-seq:
+ *     ary.max                     -> obj
+ *     ary.max { |a, b| block }    -> obj
+ *     ary.max(n)                  -> 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>.
+ *
+ *     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.
+ *
+ *     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)
+{
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+    VALUE result = Qundef, v;
+    VALUE num;
+    long i;
+
+    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()) {
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	   v = RARRAY_AREF(ary, i);
+	   if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) > 0) {
+	       result = v;
+	   }
+	}
+    }
+    else {
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	   v = RARRAY_AREF(ary, i);
+	   if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) {
+	       result = v;
+	   }
+	}
+    }
+    if (result == Qundef) return Qnil;
+    return result;
+}
+
+/*
+ *  call-seq:
+ *     ary.min                     -> obj
+ *     ary.min {| a,b | block }    -> obj
+ *     ary.min(n)                  -> array
+ *     ary.min(n) {| a,b | block } -> array
+ *
+ *  Returns the object in _ary_ with the minimum value. The
+ *  first form assumes all objects implement <code>Comparable</code>;
+ *  the second uses the block to return <em>a <=> b</em>.
+ *
+ *     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.
+ *
+ *     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)
+{
+    struct cmp_opt_data cmp_opt = { 0, 0 };
+    VALUE result = Qundef, v;
+    VALUE num;
+    long i;
+
+    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()) {
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	   v = RARRAY_AREF(ary, i);
+	   if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) < 0) {
+	       result = v;
+	   }
+	}
+    }
+    else {
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	   v = RARRAY_AREF(ary, i);
+	   if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) {
+	       result = v;
+	   }
+	}
+    }
+    if (result == Qundef) return Qnil;
+    return result;
+}
+
 static int
 push_value(st_data_t key, st_data_t val, st_data_t ary)
 {
@@ -3491,55 +4326,57 @@ push_value(st_data_t key, st_data_t val, st_data_t ary)
 
 /*
  *  call-seq:
- *     ary.uniq! -> ary or nil
+ *     ary.uniq!                -> ary or nil
+ *     ary.uniq! { |item| ... } -> ary or nil
  *
  *  Removes duplicate elements from +self+.
- *  Returns <code>nil</code> if no changes are made (that is, no
- *  duplicates are found).
+ *
+ *  If a block is given, it will use the return value of the block for
+ *  comparison.
+ *
+ *  It compares values using their #hash and #eql? methods for efficiency.
+ *
+ *  +self+ is traversed in order, and the first occurrence is kept.
+ *
+ *  Returns +nil+ if no changes are made (that is, no duplicates are found).
  *
  *     a = [ "a", "a", "b", "b", "c" ]
- *     a.uniq!   #=> ["a", "b", "c"]
+ *     a.uniq!   # => ["a", "b", "c"]
+ *
  *     b = [ "a", "b", "c" ]
- *     b.uniq!   #=> nil
- *     c = [ "a:def", "a:xyz", "b:abc", "b:xyz", "c:jkl" ]
- *     c.uniq! {|s| s[/^\w+/]}  #=> [ "a:def", "b:abc", "c:jkl" ]
+ *     b.uniq!   # => nil
+ *
+ *     c = [["student","sam"], ["student","george"], ["teacher","matz"]]
+ *     c.uniq! { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
+ *
  */
 
 static VALUE
 rb_ary_uniq_bang(VALUE ary)
 {
-    VALUE hash, v;
-    long i, j;
+    VALUE hash;
+    long hash_size;
 
     rb_ary_modify_check(ary);
     if (RARRAY_LEN(ary) <= 1)
         return Qnil;
-    if (rb_block_given_p()) {
+    if (rb_block_given_p())
 	hash = ary_make_hash_by(ary);
-	if (RARRAY_LEN(ary) == (i = RHASH_SIZE(hash))) {
-	    return Qnil;
-	}
-	ARY_SET_LEN(ary, 0);
-	if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
-	    rb_ary_unshare(ary);
-	    FL_SET_EMBED(ary);
-	}
-	ary_resize_capa(ary, i);
-	st_foreach(RHASH_TBL(hash), push_value, ary);
-    }
-    else {
+    else
 	hash = ary_make_hash(ary);
-	if (RARRAY_LEN(ary) == (long)RHASH_SIZE(hash)) {
-	    return Qnil;
-	}
-	for (i=j=0; i<RARRAY_LEN(ary); i++) {
-	    st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
-	    if (st_delete(RHASH_TBL(hash), &vv, 0)) {
-		rb_ary_store(ary, j++, v);
-	    }
-	}
-	ARY_SET_LEN(ary, j);
+
+    hash_size = RHASH_SIZE(hash);
+    if (RARRAY_LEN(ary) == hash_size) {
+	return Qnil;
+    }
+    rb_ary_modify_check(ary);
+    ARY_SET_LEN(ary, 0);
+    if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
+	rb_ary_unshare(ary);
+	FL_SET_EMBED(ary);
     }
+    ary_resize_capa(ary, hash_size);
+    st_foreach(rb_hash_tbl_raw(hash), push_value, ary);
     ary_recycle_hash(hash);
 
     return ary;
@@ -3547,39 +4384,41 @@ rb_ary_uniq_bang(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.uniq   -> new_ary
+ *     ary.uniq                -> new_ary
+ *     ary.uniq { |item| ... } -> new_ary
  *
  *  Returns a new array by removing duplicate values in +self+.
  *
+ *  If a block is given, it will use the return value of the block for comparison.
+ *
+ *  It compares values using their #hash and #eql? methods for efficiency.
+ *
+ *  +self+ is traversed in order, and the first occurrence is kept.
+ *
  *     a = [ "a", "a", "b", "b", "c" ]
- *     a.uniq   #=> ["a", "b", "c"]
- *     c = [ "a:def", "a:xyz", "b:abc", "b:xyz", "c:jkl" ]
- *     c.uniq {|s| s[/^\w+/]}  #=> [ "a:def", "b:abc", "c:jkl" ]
+ *     a.uniq   # => ["a", "b", "c"]
+ *
+ *     b = [["student","sam"], ["student","george"], ["teacher","matz"]]
+ *     b.uniq { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]]
+ *
  */
 
 static VALUE
 rb_ary_uniq(VALUE ary)
 {
-    VALUE hash, uniq, v;
-    long i;
+    VALUE hash, uniq;
 
     if (RARRAY_LEN(ary) <= 1)
         return rb_ary_dup(ary);
     if (rb_block_given_p()) {
 	hash = ary_make_hash_by(ary);
-	uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
-	st_foreach(RHASH_TBL(hash), push_value, uniq);
+	uniq = rb_hash_values(hash);
     }
     else {
 	hash = ary_make_hash(ary);
-	uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash));
-	for (i=0; i<RARRAY_LEN(ary); i++) {
-	    st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i));
-	    if (st_delete(RHASH_TBL(hash), &vv, 0)) {
-		rb_ary_push(uniq, v);
-	    }
-	}
+	uniq = rb_hash_values(hash);
     }
+    RBASIC_SET_CLASS(uniq, rb_obj_class(ary));
     ary_recycle_hash(hash);
 
     return uniq;
@@ -3590,8 +4429,8 @@ rb_ary_uniq(VALUE ary)
  *     ary.compact!    -> ary  or  nil
  *
  *  Removes +nil+ elements from the array.
- *  Returns +nil+ if no changes were made, otherwise returns
- *  <i>ary</i>.
+ *
+ *  Returns +nil+ if no changes were made, otherwise returns the array.
  *
  *     [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
  *     [ "a", "b", "c" ].compact!           #=> nil
@@ -3604,21 +4443,18 @@ rb_ary_compact_bang(VALUE ary)
     long n;
 
     rb_ary_modify(ary);
-    p = t = RARRAY_PTR(ary);
+    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_PTR(ary);
+    n = p - RARRAY_CONST_PTR(ary);
     if (RARRAY_LEN(ary) == n) {
 	return Qnil;
     }
-    ARY_SET_LEN(ary, n);
-    if (n * 2 < ARY_CAPA(ary) && ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
-	ary_resize_capa(ary, n * 2);
-    }
+    ary_resize_smaller(ary, n);
 
     return ary;
 }
@@ -3643,45 +4479,50 @@ rb_ary_compact(VALUE ary)
 
 /*
  *  call-seq:
- *     ary.count      -> int
- *     ary.count(obj) -> int
+ *     ary.count                   -> int
+ *     ary.count(obj)              -> int
  *     ary.count { |item| block }  -> int
  *
- *  Returns the number of elements.  If an argument is given, counts
- *  the number of elements which equals to <i>obj</i>.  If a block is
- *  given, counts the number of elements yielding a true value.
+ *  Returns the number of elements.
+ *
+ *  If an argument is given, counts the number of elements which equal +obj+
+ *  using <code>==</code>.
+ *
+ *  If a block is given, counts the number of elements for which the block
+ *  returns a true value.
  *
  *     ary = [1, 2, 4, 2]
- *     ary.count             #=> 4
- *     ary.count(2)          #=> 2
- *     ary.count{|x|x%2==0}  #=> 3
+ *     ary.count                  #=> 4
+ *     ary.count(2)               #=> 2
+ *     ary.count { |x| x%2 == 0 } #=> 3
  *
  */
 
 static VALUE
 rb_ary_count(int argc, VALUE *argv, VALUE ary)
 {
-    long n = 0;
+    long i, n = 0;
 
     if (argc == 0) {
-	VALUE *p, *pend;
+	VALUE v;
 
 	if (!rb_block_given_p())
 	    return LONG2NUM(RARRAY_LEN(ary));
 
-	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
-	    if (RTEST(rb_yield(*p))) n++;
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    v = RARRAY_AREF(ary, i);
+	    if (RTEST(rb_yield(v))) n++;
 	}
     }
     else {
-	VALUE obj, *p, *pend;
+	VALUE obj;
 
 	rb_scan_args(argc, argv, "1", &obj);
 	if (rb_block_given_p()) {
 	    rb_warn("given block not used");
 	}
-	for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
-	    if (rb_equal(*p, obj)) n++;
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    if (rb_equal(RARRAY_AREF(ary, i), obj)) n++;
 	}
     }
 
@@ -3704,12 +4545,16 @@ flatten(VALUE ary, int level, int *modified)
 
     while (1) {
 	while (i < RARRAY_LEN(ary)) {
-	    elt = RARRAY_PTR(ary)[i++];
+	    elt = RARRAY_AREF(ary, i++);
+	    if (level >= 0 && RARRAY_LEN(stack) / 2 >= level) {
+		rb_ary_push(result, elt);
+		continue;
+	    }
 	    tmp = rb_check_array_type(elt);
 	    if (RBASIC(result)->klass) {
 		rb_raise(rb_eRuntimeError, "flatten reentered");
 	    }
-	    if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) {
+	    if (NIL_P(tmp)) {
 		rb_ary_push(result, elt);
 	    }
 	    else {
@@ -3738,19 +4583,21 @@ flatten(VALUE ary, int level, int *modified)
 
     st_free_table(memo);
 
-    RBASIC(result)->klass = rb_class_of(ary);
+    RBASIC_SET_CLASS(result, rb_obj_class(ary));
     return result;
 }
 
 /*
  *  call-seq:
  *     ary.flatten!        -> ary or nil
- *     ary.flatten!(level) -> array or nil
+ *     ary.flatten!(level) -> ary or nil
  *
  *  Flattens +self+ in place.
- *  Returns <code>nil</code> if no modifications were made (i.e.,
- *  <i>ary</i> contains no subarrays.)  If the optional <i>level</i>
- *  argument determines the level of recursion to flatten.
+ *
+ *  Returns +nil+ if no modifications were made (i.e., the array contains no
+ *  subarrays.)
+ *
+ *  The optional +level+ argument determines the level of recursion to flatten.
  *
  *     a = [ 1, 2, [3, [4, 5] ] ]
  *     a.flatten!   #=> [1, 2, 3, 4, 5]
@@ -3788,10 +4635,14 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
  *     ary.flatten -> new_ary
  *     ary.flatten(level) -> new_ary
  *
- *  Returns a new array that is a one-dimensional flattening of this
- *  array (recursively). That is, for every element that is an array,
- *  extract its elements into the new array.  If the optional
- *  <i>level</i> argument determines the level of recursion to flatten.
+ *  Returns a new array that is a one-dimensional flattening of +self+
+ *  (recursively).
+ *
+ *  That is, for every element that is an array, extract its elements into
+ *  the new array.
+ *
+ *  The optional +level+ argument determines the level of recursion to
+ *  flatten.
  *
  *     s = [ 1, 2, 3 ]           #=> [1, 2, 3]
  *     t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
@@ -3819,9 +4670,9 @@ rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
 
 #define OPTHASH_GIVEN_P(opts) \
     (argc > 0 && !NIL_P((opts) = rb_check_hash_type(argv[argc-1])) && (--argc, 1))
-static VALUE sym_random;
+static ID id_random;
 
-#define RAND_UPTO(max) (long)(rb_random_real(randgen)*(max))
+#define RAND_UPTO(max) (long)rb_random_ulong_limited((randgen), (max)-1)
 
 /*
  *  call-seq:
@@ -3829,36 +4680,47 @@ static VALUE sym_random;
  *     ary.shuffle!(random: rng) -> ary
  *
  *  Shuffles elements in +self+ in place.
- *  If +rng+ is given, it will be used as the random number generator.
+ *
+ *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
+ *     a.shuffle!                #=> [2, 3, 1]
+ *     a                         #=> [2, 3, 1]
+ *
+ *  The optional +rng+ argument will be used as the random number generator.
+ *
+ *     a.shuffle!(random: Random.new(1))  #=> [1, 3, 2]
  */
 
 static VALUE
 rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE *ptr, opts, *snap_ptr, randgen = rb_cRandom;
-    long i, snap_len;
+    VALUE opts, randgen = rb_cRandom;
+    long i, len;
 
     if (OPTHASH_GIVEN_P(opts)) {
-	randgen = rb_hash_lookup2(opts, sym_random, randgen);
-    }
-    if (argc > 0) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+	VALUE rnd;
+	ID keyword_ids[1];
+
+	keyword_ids[0] = id_random;
+	rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd);
+	if (rnd != Qundef) {
+	    randgen = rnd;
+	}
     }
+    rb_check_arity(argc, 0, 0);
     rb_ary_modify(ary);
-    i = RARRAY_LEN(ary);
-    ptr = RARRAY_PTR(ary);
-    snap_len = i;
-    snap_ptr = ptr;
-    while (i) {
-	long j = RAND_UPTO(i);
-	VALUE tmp;
-	if (snap_len != RARRAY_LEN(ary) || snap_ptr != RARRAY_PTR(ary)) {
-	    rb_raise(rb_eRuntimeError, "modified during shuffle");
+    i = len = RARRAY_LEN(ary);
+    RARRAY_PTR_USE(ary, ptr, {
+	while (i) {
+	    long j = RAND_UPTO(i);
+	    VALUE tmp;
+	    if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR(ary)) {
+		rb_raise(rb_eRuntimeError, "modified during shuffle");
+	    }
+	    tmp = ptr[--i];
+	    ptr[i] = ptr[j];
+	    ptr[j] = tmp;
 	}
-	tmp = ptr[--i];
-	ptr[i] = ptr[j];
-	ptr[j] = tmp;
-    }
+    }); /* WB: no new reference */
     return ary;
 }
 
@@ -3868,12 +4730,13 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
  *     ary.shuffle              -> new_ary
  *     ary.shuffle(random: rng) -> new_ary
  *
- *  Returns a new array with elements of this array shuffled.
+ *  Returns a new array with elements of +self+ shuffled.
  *
  *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
  *     a.shuffle                 #=> [2, 3, 1]
+ *     a                         #=> [1, 2, 3]
  *
- *  If +rng+ is given, it will be used as the random number generator.
+ *  The optional +rng+ argument will be used as the random number generator.
  *
  *     a.shuffle(random: Random.new(1))  #=> [1, 3, 2]
  */
@@ -3894,40 +4757,49 @@ rb_ary_shuffle(int argc, VALUE *argv, VALUE ary)
  *     ary.sample(n)               -> new_ary
  *     ary.sample(n, random: rng)  -> new_ary
  *
- *  Choose a random element or +n+ random elements from the array. The elements
- *  are chosen by using random and unique indices into the array in order to
- *  ensure that an element doesn't repeat itself unless the array already
- *  contained duplicate elements. If the array is empty the first form returns
- *  <code>nil</code> and the second form returns an empty array.
+ *  Choose a random element or +n+ random elements from the array.
  *
- *  If +rng+ is given, it will be used as the random number generator.
+ *  The elements are chosen by using random and unique indices into the array
+ *  in order to ensure that an element doesn't repeat itself unless the array
+ *  already contained duplicate elements.
+ *
+ *  If the array is empty the first form returns +nil+ and the second form
+ *  returns an empty array.
+ *
+ *  The optional +rng+ argument will be used as the random number generator.
+ *
+ *     a = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+ *     a.sample         #=> 7
+ *     a.sample(4)      #=> [6, 4, 2, 5]
  */
 
 
 static VALUE
 rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 {
-    VALUE nv, result, *ptr;
+    VALUE nv, result;
     VALUE opts, randgen = rb_cRandom;
     long n, len, i, j, k, idx[10];
-    double rnds[numberof(idx)];
+    long rnds[numberof(idx)];
 
     if (OPTHASH_GIVEN_P(opts)) {
-	randgen = rb_hash_lookup2(opts, sym_random, randgen);
+	VALUE rnd;
+	ID keyword_ids[1];
+
+	keyword_ids[0] = id_random;
+	rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd);
+	if (rnd != Qundef) {
+	    randgen = rnd;
+	}
     }
-    ptr = RARRAY_PTR(ary);
     len = RARRAY_LEN(ary);
     if (argc == 0) {
-	if (len == 0) return Qnil;
-	if (len == 1) {
+	if (len < 2)
 	    i = 0;
-	}
-	else {
-	    double x = rb_random_real(randgen);
-	    if ((len = RARRAY_LEN(ary)) == 0) return Qnil;
-	    i = (long)(x * len);
-	}
-	return RARRAY_PTR(ary)[i];
+	else
+	    i = RAND_UPTO(len);
+
+	return rb_ary_elt(ary, i);
     }
     rb_scan_args(argc, argv, "1", &nv);
     n = NUM2LONG(nv);
@@ -3935,40 +4807,44 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
     if (n > len) n = len;
     if (n <= numberof(idx)) {
 	for (i = 0; i < n; ++i) {
-	    rnds[i] = rb_random_real(randgen);
+	    rnds[i] = RAND_UPTO(len - i);
 	}
     }
+    k = len;
     len = RARRAY_LEN(ary);
-    ptr = RARRAY_PTR(ary);
+    if (len < k && n <= numberof(idx)) {
+	for (i = 0; i < n; ++i) {
+	    if (rnds[i] >= len) return rb_ary_new_capa(0);
+	}
+    }
     if (n > len) n = len;
     switch (n) {
       case 0:
-	return rb_ary_new2(0);
+	return rb_ary_new_capa(0);
       case 1:
-	i = (long)(rnds[0] * len);
-	return rb_ary_new4(1, &ptr[i]);
+	i = rnds[0];
+	return rb_ary_new_from_values(1, &RARRAY_AREF(ary, i));
       case 2:
-	i = (long)(rnds[0] * len);
-	j = (long)(rnds[1] * (len-1));
+	i = rnds[0];
+	j = rnds[1];
 	if (j >= i) j++;
-	return rb_ary_new3(2, ptr[i], ptr[j]);
+	return rb_ary_new_from_args(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j));
       case 3:
-	i = (long)(rnds[0] * len);
-	j = (long)(rnds[1] * (len-1));
-	k = (long)(rnds[2] * (len-2));
+	i = rnds[0];
+	j = rnds[1];
+	k = rnds[2];
 	{
 	    long l = j, g = i;
 	    if (j >= i) l = i, g = ++j;
 	    if (k >= l && (++k >= g)) ++k;
 	}
-	return rb_ary_new3(3, ptr[i], ptr[j], ptr[k]);
+	return rb_ary_new_from_args(3, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j), RARRAY_AREF(ary, k));
     }
     if (n <= numberof(idx)) {
-	VALUE *ptr_result;
 	long sorted[numberof(idx)];
-	sorted[0] = idx[0] = (long)(rnds[0] * len);
+	sorted[0] = idx[0] = rnds[0];
 	for (i=1; i<n; i++) {
-	    k = (long)(rnds[i] * --len);
+	    k = rnds[i];
 	    for (j = 0; j < i; ++j) {
 		if (k < sorted[j]) break;
 		++k;
@@ -3976,48 +4852,65 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 	    memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j));
 	    sorted[j] = idx[i] = k;
 	}
-	result = rb_ary_new2(n);
-	ptr_result = RARRAY_PTR(result);
-	for (i=0; i<n; i++) {
-	    ptr_result[i] = ptr[idx[i]];
-	}
+	result = rb_ary_new_capa(n);
+	RARRAY_PTR_USE(result, ptr_result, {
+	    for (i=0; i<n; i++) {
+		ptr_result[i] = RARRAY_AREF(ary, idx[i]);
+	    }
+	});
     }
     else {
-	VALUE *ptr_result;
-	result = rb_ary_new4(len, ptr);
-	RBASIC(result)->klass = 0;
-	ptr_result = RARRAY_PTR(result);
+	result = rb_ary_dup(ary);
+	RBASIC_CLEAR_CLASS(result);
 	RB_GC_GUARD(ary);
-	for (i=0; i<n; i++) {
-	    j = RAND_UPTO(len-i) + i;
-	    nv = ptr_result[j];
-	    ptr_result[j] = ptr_result[i];
-	    ptr_result[i] = nv;
-	}
-	RBASIC(result)->klass = rb_cArray;
+	RARRAY_PTR_USE(result, ptr_result, {
+	    for (i=0; i<n; i++) {
+		j = RAND_UPTO(len-i) + i;
+		nv = ptr_result[j];
+		ptr_result[j] = ptr_result[i];
+		ptr_result[i] = nv;
+	    }
+	});
+	RBASIC_SET_CLASS_RAW(result, rb_cArray);
     }
     ARY_SET_LEN(result, n);
 
     return result;
 }
 
+static VALUE
+rb_ary_cycle_size(VALUE self, VALUE args, VALUE eobj)
+{
+    long mul;
+    VALUE n = Qnil;
+    if (args && (RARRAY_LEN(args) > 0)) {
+	n = RARRAY_AREF(args, 0);
+    }
+    if (RARRAY_LEN(self) == 0) return INT2FIX(0);
+    if (n == Qnil) return DBL2NUM(INFINITY);
+    mul = NUM2LONG(n);
+    if (mul <= 0) return INT2FIX(0);
+    n = LONG2FIX(mul);
+    return rb_funcallv(rb_ary_length(self), '*', 1, &n);
+}
 
 /*
  *  call-seq:
- *     ary.cycle(n=nil) {|obj| block }  -> nil
- *     ary.cycle(n=nil)                 -> an_enumerator
+ *     ary.cycle(n=nil) { |obj| block }  -> nil
+ *     ary.cycle(n=nil)                  -> Enumerator
+ *
+ *  Calls the given block for each element +n+ times or forever if +nil+ is
+ *  given.
  *
- *  Calls <i>block</i> for each element repeatedly _n_ times or
- *  forever if none or +nil+ is given.  If a non-positive number is
- *  given or the array is empty, does nothing.  Returns +nil+ if the
- *  loop has finished without getting interrupted.
+ *  Does nothing if a non-positive number is given or the array is empty.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  Returns +nil+ if the loop has finished without getting interrupted.
  *
+ *  If no block is given, an Enumerator is returned instead.
  *
  *     a = ["a", "b", "c"]
- *     a.cycle {|x| puts x }  # print, a, b, c, a, b, c,.. forever.
- *     a.cycle(2) {|x| puts x }  # print, a, b, c, a, b, c.
+ *     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.
  *
  */
 
@@ -4029,7 +4922,7 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
 
     rb_scan_args(argc, argv, "01", &nv);
 
-    RETURN_ENUMERATOR(ary, argc, argv);
+    RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_cycle_size);
     if (NIL_P(nv)) {
         n = -1;
     }
@@ -4040,85 +4933,148 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
 
     while (RARRAY_LEN(ary) > 0 && (n < 0 || 0 < n--)) {
         for (i=0; i<RARRAY_LEN(ary); i++) {
-            rb_yield(RARRAY_PTR(ary)[i]);
+            rb_yield(RARRAY_AREF(ary, i));
         }
     }
     return Qnil;
 }
 
 #define tmpbuf(n, size) rb_str_tmp_new((n)*(size))
-#define tmpbuf_discard(s) (rb_str_resize((s), 0L), RBASIC(s)->klass = rb_cString)
+#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(a)->klass = rb_cArray)
+#define tmpary_discard(a) (ary_discard(a), RBASIC_SET_CLASS_RAW(a, rb_cArray))
 
 /*
- * Recursively compute permutations of r elements of the set [0..n-1].
- * When we have a complete permutation of array indexes, copy the values
- * at those indexes into a new array and yield that array.
+ * Build a ruby array of the corresponding values and yield it to the
+ * associated block.
+ * Return the class of +values+ for reentry check.
+ */
+static int
+yield_indexed_values(const VALUE values, const long r, const long *const p)
+{
+    const VALUE result = rb_ary_new2(r);
+    VALUE *const result_array = RARRAY_PTR(result);
+    const VALUE *const values_array = RARRAY_CONST_PTR(values);
+    long i;
+
+    for (i = 0; i < r; i++) result_array[i] = values_array[p[i]];
+    ARY_SET_LEN(result, r);
+    rb_yield(result);
+    return !RBASIC(values)->klass;
+}
+
+/*
+ * Compute permutations of +r+ elements of the set <code>[0..n-1]</code>.
+ *
+ * When we have a complete permutation of array indices, copy the values
+ * at those indices into a new array and yield that array.
  *
  * n: the size of the set
  * r: the number of elements in each permutation
  * p: the array (of size r) that we're filling in
- * index: what index we're filling in now
  * used: an array of booleans: whether a given index is already used
  * values: the Ruby array that holds the actual values to permute
  */
 static void
-permute0(long n, long r, long *p, long index, char *used, VALUE values)
+permute0(const long n, const long r, long *const p, char *const used, const VALUE values)
 {
-    long i,j;
-    for (i = 0; i < n; i++) {
-	if (used[i] == 0) {
+    long i = 0, index = 0;
+
+    for (;;) {
+	const char *const unused = memchr(&used[i], 0, n-i);
+	if (!unused) {
+	    if (!index) break;
+	    i = p[--index];                /* pop index */
+	    used[i++] = 0;                 /* index unused */
+	}
+	else {
+	    i = unused - used;
 	    p[index] = i;
+	    used[i] = 1;                   /* mark index used */
+	    ++index;
 	    if (index < r-1) {             /* if not done yet */
-		used[i] = 1;               /* mark index used */
-		permute0(n, r, p, index+1, /* recurse */
-			 used, values);
-		used[i] = 0;               /* index unused */
+		p[index] = i = 0;
+		continue;
 	    }
-	    else {
-		/* We have a complete permutation of array indexes */
-		/* Build a ruby array of the corresponding values */
-		/* And yield it to the associated block */
-		VALUE result = rb_ary_new2(r);
-		VALUE *result_array = RARRAY_PTR(result);
-		const VALUE *values_array = RARRAY_PTR(values);
-
-		for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
-		ARY_SET_LEN(result, r);
-		rb_yield(result);
-		if (RBASIC(values)->klass) {
+	    for (i = 0; i < n; ++i) {
+		if (used[i]) continue;
+		p[index] = i;
+		if (!yield_indexed_values(values, r, p)) {
 		    rb_raise(rb_eRuntimeError, "permute reentered");
 		}
 	    }
+	    i = p[--index];                /* pop index */
+	    used[i] = 0;                   /* index unused */
+	    p[index] = ++i;
 	}
     }
 }
 
 /*
+ * Returns the product of from, from-1, ..., from - how_many + 1.
+ * http://en.wikipedia.org/wiki/Pochhammer_symbol
+ */
+static VALUE
+descending_factorial(long from, long how_many)
+{
+    VALUE cnt = LONG2FIX(how_many >= 0);
+    while (how_many-- > 0) {
+	VALUE v = LONG2FIX(from--);
+	cnt = rb_funcallv(cnt, '*', 1, &v);
+    }
+    return cnt;
+}
+
+static VALUE
+binomial_coefficient(long comb, long size)
+{
+    VALUE r, v;
+    if (comb > size-comb) {
+	comb = size-comb;
+    }
+    if (comb < 0) {
+	return LONG2FIX(0);
+    }
+    r = descending_factorial(size, comb);
+    v = descending_factorial(comb, comb);
+    return rb_funcallv(r, id_div, 1, &v);
+}
+
+static VALUE
+rb_ary_permutation_size(VALUE ary, VALUE args, VALUE eobj)
+{
+    long n = RARRAY_LEN(ary);
+    long k = (args && (RARRAY_LEN(args) > 0)) ? NUM2LONG(RARRAY_AREF(args, 0)) : n;
+
+    return descending_factorial(n, k);
+}
+
+/*
  *  call-seq:
  *     ary.permutation { |p| block }          -> ary
- *     ary.permutation                        -> an_enumerator
+ *     ary.permutation                        -> Enumerator
  *     ary.permutation(n) { |p| block }       -> ary
- *     ary.permutation(n)                     -> an_enumerator
+ *     ary.permutation(n)                     -> Enumerator
+ *
+ * When invoked with a block, yield all permutations of length +n+ of the
+ * elements of the array, then return the array itself.
  *
- * When invoked with a block, yield all permutations of length <i>n</i>
- * of the elements of <i>ary</i>, then return the array itself.
- * If <i>n</i> is not specified, yield all permutations of all elements.
- * The implementation makes no guarantees about the order in which
- * the permutations are yielded.
+ * If +n+ is not specified, yield all permutations of all elements.
  *
- * If no block is given, an enumerator is returned instead.
+ * The implementation makes no guarantees about the order in which the
+ * permutations are yielded.
+ *
+ * If no block is given, an Enumerator is returned instead.
  *
  * Examples:
  *
- *     a = [1, 2, 3]
- *     a.permutation.to_a     #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- *     a.permutation(1).to_a  #=> [[1],[2],[3]]
- *     a.permutation(2).to_a  #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
- *     a.permutation(3).to_a  #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
- *     a.permutation(0).to_a  #=> [[]] # one permutation of length 0
- *     a.permutation(4).to_a  #=> []   # no permutations of length 4
+ *   a = [1, 2, 3]
+ *   a.permutation.to_a    #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
+ *   a.permutation(1).to_a #=> [[1],[2],[3]]
+ *   a.permutation(2).to_a #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
+ *   a.permutation(3).to_a #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
+ *   a.permutation(0).to_a #=> [[]] # one permutation of length 0
+ *   a.permutation(4).to_a #=> []   # no permutations of length 4
  */
 
 static VALUE
@@ -4128,7 +5084,7 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
     long r, n, i;
 
     n = RARRAY_LEN(ary);                  /* Array length */
-    RETURN_ENUMERATOR(ary, argc, argv);   /* Return enumerator if no block */
+    RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_permutation_size);   /* Return enumerator if no block */
     rb_scan_args(argc, argv, "01", &num);
     r = NIL_P(num) ? n : NUM2LONG(num);   /* Permutation size from argument */
 
@@ -4140,38 +5096,67 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
     }
     else if (r == 1) { /* this is a special, easy case */
 	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
     else {             /* this is the general case */
-	volatile VALUE t0 = tmpbuf(n,sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
-	volatile VALUE t1 = tmpbuf(n,sizeof(char));
-	char *used = (char*)RSTRING_PTR(t1);
+	volatile VALUE t0;
+	long *p = ALLOCV_N(long, t0, r+roomof(n, sizeof(long)));
+	char *used = (char*)(p + r);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	RBASIC(ary0)->klass = 0;
+	RBASIC_CLEAR_CLASS(ary0);
 
 	MEMZERO(used, char, n); /* initialize array */
 
-	permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */
-	tmpbuf_discard(t0);
-	tmpbuf_discard(t1);
-	RBASIC(ary0)->klass = rb_cArray;
+	permute0(n, r, p, used, ary0); /* compute and yield permutations */
+	ALLOCV_END(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
+static void
+combinate0(const long len, const long n, long *const stack, const VALUE values)
+{
+    long lev = 0;
+
+    MEMZERO(stack+1, long, n);
+    stack[0] = -1;
+    for (;;) {
+	for (lev++; lev < n; lev++) {
+	    stack[lev+1] = stack[lev]+1;
+	}
+	if (!yield_indexed_values(values, n, stack+1)) {
+	    rb_raise(rb_eRuntimeError, "combination reentered");
+	}
+	do {
+	    if (lev == 0) return;
+	    stack[lev--]++;
+	} while (stack[lev+1]+n == len+lev+1);
+    }
+}
+
+static VALUE
+rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj)
+{
+    long n = RARRAY_LEN(ary);
+    long k = NUM2LONG(RARRAY_AREF(args, 0));
+
+    return binomial_coefficient(k, n);
+}
+
 /*
  *  call-seq:
  *     ary.combination(n) { |c| block }    -> ary
- *     ary.combination(n)                  -> an_enumerator
+ *     ary.combination(n)                  -> Enumerator
  *
- * When invoked with a block, yields all combinations of length <i>n</i>
- * of elements from <i>ary</i> and then returns <i>ary</i> itself.
- * The implementation makes no guarantees about the order in which
- * the combinations are yielded.
+ * When invoked with a block, yields all combinations of length +n+ of elements
+ * from the array and then returns the array itself.
  *
- * If no block is given, an enumerator is returned instead.
+ * The implementation makes no guarantees about the order in which the
+ * combinations are yielded.
+ *
+ * If no block is given, an Enumerator is returned instead.
  *
  * Examples:
  *
@@ -4188,10 +5173,10 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
 static VALUE
 rb_ary_combination(VALUE ary, VALUE num)
 {
-    long n, i, len;
+    long i, n, len;
 
     n = NUM2LONG(num);
-    RETURN_ENUMERATOR(ary, 1, &num);
+    RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_combination_size);
     len = RARRAY_LEN(ary);
     if (n < 0 || len < n) {
 	/* yield nothing */
@@ -4201,89 +5186,84 @@ rb_ary_combination(VALUE ary, VALUE num)
     }
     else if (n == 1) {
 	for (i = 0; i < len; i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
     else {
-	volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
-	long *stack = (long*)RSTRING_PTR(t0);
-	volatile VALUE cc = tmpary(n);
-	VALUE *chosen = RARRAY_PTR(cc);
-	long lev = 0;
-
-	MEMZERO(stack, long, n);
-	stack[0] = -1;
-	for (;;) {
-	    chosen[lev] = RARRAY_PTR(ary)[stack[lev+1]];
-	    for (lev++; lev < n; lev++) {
-		chosen[lev] = RARRAY_PTR(ary)[stack[lev+1] = stack[lev]+1];
-	    }
-	    rb_yield(rb_ary_new4(n, chosen));
-	    if (RBASIC(t0)->klass) {
-		rb_raise(rb_eRuntimeError, "combination reentered");
-	    }
-	    do {
-		if (lev == 0) goto done;
-		stack[lev--]++;
-	    } while (stack[lev+1]+n == len+lev+1);
-	}
-    done:
-	tmpbuf_discard(t0);
-	tmpary_discard(cc);
+	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+	volatile VALUE t0;
+	long *stack = ALLOCV_N(long, t0, n+1);
+
+	RBASIC_CLEAR_CLASS(ary0);
+	combinate0(len, n, stack, ary0);
+	ALLOCV_END(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
 /*
- * Recursively compute repeated permutations of r elements of the set
- * [0..n-1].
- * When we have a complete repeated permutation of array indexes, copy the
- * values at those indexes into a new array and yield that array.
+ * Compute repeated permutations of +r+ elements of the set
+ * <code>[0..n-1]</code>.
+ *
+ * When we have a complete repeated permutation of array indices, copy the
+ * values at those indices into a new array and yield that array.
  *
  * n: the size of the set
  * r: the number of elements in each permutation
  * p: the array (of size r) that we're filling in
- * index: what index we're filling in now
  * values: the Ruby array that holds the actual values to permute
  */
 static void
-rpermute0(long n, long r, long *p, long index, VALUE values)
+rpermute0(const long n, const long r, long *const p, const VALUE values)
 {
-    long i, j;
-    for (i = 0; i < n; i++) {
-	p[index] = i;
-	if (index < r-1) {              /* if not done yet */
-	    rpermute0(n, r, p, index+1, values); /* recurse */
+    long i = 0, index = 0;
+
+    p[index] = i;
+    for (;;) {
+	if (++index < r-1) {
+	    p[index] = i = 0;
+	    continue;
 	}
-	else {
-	    /* We have a complete permutation of array indexes */
-	    /* Build a ruby array of the corresponding values */
-	    /* And yield it to the associated block */
-	    VALUE result = rb_ary_new2(r);
-	    VALUE *result_array = RARRAY_PTR(result);
-	    const VALUE *values_array = RARRAY_PTR(values);
-
-	    for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
-	    ARY_SET_LEN(result, r);
-	    rb_yield(result);
-	    if (RBASIC(values)->klass) {
+	for (i = 0; i < n; ++i) {
+	    p[index] = i;
+	    if (!yield_indexed_values(values, r, p)) {
 		rb_raise(rb_eRuntimeError, "repeated permute reentered");
 	    }
 	}
+	do {
+	    if (index <= 0) return;
+	} while ((i = ++p[--index]) >= n);
     }
 }
 
+static VALUE
+rb_ary_repeated_permutation_size(VALUE ary, VALUE args, VALUE eobj)
+{
+    long n = RARRAY_LEN(ary);
+    long k = NUM2LONG(RARRAY_AREF(args, 0));
+    VALUE v;
+
+    if (k < 0) {
+	return LONG2FIX(0);
+    }
+
+    v = LONG2NUM(k);
+    return rb_funcallv(LONG2NUM(n), id_power, 1, &v);
+}
+
 /*
  *  call-seq:
  *     ary.repeated_permutation(n) { |p| block } -> ary
- *     ary.repeated_permutation(n)               -> an_enumerator
+ *     ary.repeated_permutation(n)               -> Enumerator
+ *
+ * When invoked with a block, yield all repeated permutations of length +n+ of
+ * the elements of the array, then return the array itself.
  *
- * When invoked with a block, yield all repeated permutations of length
- * <i>n</i> of the elements of <i>ary</i>, then return the array itself.
- * The implementation makes no guarantees about the order in which
- * the repeated permutations are yielded.
+ * The implementation makes no guarantees about the order in which the repeated
+ * permutations are yielded.
  *
- * If no block is given, an enumerator is returned instead.
+ * If no block is given, an Enumerator is returned instead.
  *
  * Examples:
  *
@@ -4301,7 +5281,7 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
     long r, n, i;
 
     n = RARRAY_LEN(ary);                  /* Array length */
-    RETURN_ENUMERATOR(ary, 1, &num);      /* Return enumerator if no block */
+    RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_permutation_size);      /* Return Enumerator if no block */
     r = NUM2LONG(num);                    /* Permutation size from argument */
 
     if (r < 0) {
@@ -4312,70 +5292,80 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
     }
     else if (r == 1) { /* this is a special, easy case */
 	for (i = 0; i < RARRAY_LEN(ary); i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
     else {             /* this is the general case */
-	volatile VALUE t0 = tmpbuf(r, sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
+	volatile VALUE t0;
+	long *p = ALLOCV_N(long, t0, r);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	RBASIC(ary0)->klass = 0;
+	RBASIC_CLEAR_CLASS(ary0);
 
-	rpermute0(n, r, p, 0, ary0); /* compute and yield repeated permutations */
-	tmpbuf_discard(t0);
-	RBASIC(ary0)->klass = rb_cArray;
+	rpermute0(n, r, p, ary0); /* compute and yield repeated permutations */
+	ALLOCV_END(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
 static void
-rcombinate0(long n, long r, long *p, long index, long rest, VALUE values)
+rcombinate0(const long n, const long r, long *const p, const long rest, const VALUE values)
 {
-    long j;
-    if (rest > 0) {
-	for (; index < n; ++index) {
-	    p[r-rest] = index;
-	    rcombinate0(n, r, p, index, rest-1, values);
+    long i = 0, index = 0;
+
+    p[index] = i;
+    for (;;) {
+	if (++index < r-1) {
+	    p[index] = i;
+	    continue;
 	}
-    }
-    else {
-	VALUE result = rb_ary_new2(r);
-	VALUE *result_array = RARRAY_PTR(result);
-	const VALUE *values_array = RARRAY_PTR(values);
-
-	for (j = 0; j < r; ++j) result_array[j] = values_array[p[j]];
-	ARY_SET_LEN(result, r);
-	rb_yield(result);
-	if (RBASIC(values)->klass) {
-	    rb_raise(rb_eRuntimeError, "repeated combination reentered");
+	for (; i < n; ++i) {
+	    p[index] = i;
+	    if (!yield_indexed_values(values, r, p)) {
+		rb_raise(rb_eRuntimeError, "repeated combination reentered");
+	    }
 	}
+	do {
+	    if (index <= 0) return;
+	} while ((i = ++p[--index]) >= n);
     }
 }
 
+static VALUE
+rb_ary_repeated_combination_size(VALUE ary, VALUE args, VALUE eobj)
+{
+    long n = RARRAY_LEN(ary);
+    long k = NUM2LONG(RARRAY_AREF(args, 0));
+    if (k == 0) {
+	return LONG2FIX(1);
+    }
+    return binomial_coefficient(k, n + k - 1);
+}
+
 /*
  *  call-seq:
  *     ary.repeated_combination(n) { |c| block } -> ary
- *     ary.repeated_combination(n)               -> an_enumerator
+ *     ary.repeated_combination(n)               -> Enumerator
  *
- * When invoked with a block, yields all repeated combinations of
- * length <i>n</i> of elements from <i>ary</i> and then returns
- * <i>ary</i> itself.
- * The implementation makes no guarantees about the order in which
- * the repeated combinations are yielded.
+ * When invoked with a block, yields all repeated combinations of length +n+ of
+ * elements from the array and then returns the array itself.
  *
- * If no block is given, an enumerator is returned instead.
+ * The implementation makes no guarantees about the order in which the repeated
+ * combinations are yielded.
+ *
+ * If no block is given, an Enumerator is returned instead.
  *
  * Examples:
  *
- *     a = [1, 2, 3]
- *     a.repeated_combination(1).to_a  #=> [[1], [2], [3]]
- *     a.repeated_combination(2).to_a  #=> [[1,1],[1,2],[1,3],[2,2],[2,3],[3,3]]
- *     a.repeated_combination(3).to_a  #=> [[1,1,1],[1,1,2],[1,1,3],[1,2,2],[1,2,3],
- *                                     #    [1,3,3],[2,2,2],[2,2,3],[2,3,3],[3,3,3]]
- *     a.repeated_combination(4).to_a  #=> [[1,1,1,1],[1,1,1,2],[1,1,1,3],[1,1,2,2],[1,1,2,3],
- *                                     #    [1,1,3,3],[1,2,2,2],[1,2,2,3],[1,2,3,3],[1,3,3,3],
- *                                     #    [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]]
- *     a.repeated_combination(0).to_a  #=> [[]] # one combination of length 0
+ *   a = [1, 2, 3]
+ *   a.repeated_combination(1).to_a  #=> [[1], [2], [3]]
+ *   a.repeated_combination(2).to_a  #=> [[1,1],[1,2],[1,3],[2,2],[2,3],[3,3]]
+ *   a.repeated_combination(3).to_a  #=> [[1,1,1],[1,1,2],[1,1,3],[1,2,2],[1,2,3],
+ *                                   #    [1,3,3],[2,2,2],[2,2,3],[2,3,3],[3,3,3]]
+ *   a.repeated_combination(4).to_a  #=> [[1,1,1,1],[1,1,1,2],[1,1,1,3],[1,1,2,2],[1,1,2,3],
+ *                                   #    [1,1,3,3],[1,2,2,2],[1,2,2,3],[1,2,3,3],[1,3,3,3],
+ *                                   #    [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]]
+ *   a.repeated_combination(0).to_a  #=> [[]] # one combination of length 0
  *
  */
 
@@ -4385,7 +5375,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
     long n, i, len;
 
     n = NUM2LONG(num);                 /* Combination size from argument */
-    RETURN_ENUMERATOR(ary, 1, &num);   /* Return enumerator if no block */
+    RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_combination_size);   /* Return enumerator if no block */
     len = RARRAY_LEN(ary);
     if (n < 0) {
 	/* yield nothing */
@@ -4395,21 +5385,21 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
     }
     else if (n == 1) {
 	for (i = 0; i < len; i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
     else if (len == 0) {
 	/* yield nothing */
     }
     else {
-	volatile VALUE t0 = tmpbuf(n, sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
+	volatile VALUE t0;
+	long *p = ALLOCV_N(long, t0, n);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
-	RBASIC(ary0)->klass = 0;
+	RBASIC_CLEAR_CLASS(ary0);
 
-	rcombinate0(len, n, p, 0, n, ary0); /* compute and yield repeated combinations */
-	tmpbuf_discard(t0);
-	RBASIC(ary0)->klass = rb_cArray;
+	rcombinate0(len, n, p, n, ary0); /* compute and yield repeated combinations */
+	ALLOCV_END(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
@@ -4419,12 +5409,13 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
  *     ary.product(other_ary, ...)                -> new_ary
  *     ary.product(other_ary, ...) { |p| block }  -> ary
  *
- *  Returns an array of all combinations of elements from all arrays,
- *  The length of the returned array is the product of the length
- *  of +self+ and the argument arrays.
- *  If given a block, <i>product</i> will yield all combinations
- *  and return +self+ instead.
+ *  Returns an array of all combinations of elements from all arrays.
+ *
+ *  The length of the returned array is the product of the length of +self+ and
+ *  the argument arrays.
  *
+ *  If given a block, #product will yield all combinations and return +self+
+ *  instead.
  *
  *     [1,2,3].product([4,5])     #=> [[1,4],[1,5],[2,4],[2,5],[3,4],[3,5]]
  *     [1,2].product([1,2])       #=> [[1,1],[1,2],[2,1],[2,2]]
@@ -4446,8 +5437,8 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
     long i,j;
     long resultlen = 1;
 
-    RBASIC(t0)->klass = 0;
-    RBASIC(t1)->klass = 0;
+    RBASIC_CLEAR_CLASS(t0);
+    RBASIC_CLEAR_CLASS(t1);
 
     /* initialize the arrays of arrays */
     ARY_SET_LEN(t0, n);
@@ -4469,15 +5460,14 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
     else {
 	/* Compute the length of the result array; return [] if any is empty */
 	for (i = 0; i < n; i++) {
-	    long k = RARRAY_LEN(arrays[i]), l = resultlen;
+	    long k = RARRAY_LEN(arrays[i]);
 	    if (k == 0) {
 		result = rb_ary_new2(0);
 		goto done;
 	    }
-	    resultlen *= k;
-	    if (resultlen < k || resultlen < l || resultlen / k != l) {
+            if (MUL_OVERFLOW_LONG_P(resultlen, k))
 		rb_raise(rb_eRangeError, "too big to product");
-	    }
+	    resultlen *= k;
 	}
 	result = rb_ary_new2(resultlen);
     }
@@ -4490,7 +5480,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary)
 	}
 
 	/* put it on the result array */
-	if(NIL_P(result)) {
+	if (NIL_P(result)) {
 	    FL_SET(t0, FL_USER5);
 	    rb_yield(subarray);
 	    if (! FL_TEST(t0, FL_USER5)) {
@@ -4528,7 +5518,11 @@ done:
  *  call-seq:
  *     ary.take(n)               -> new_ary
  *
- *  Returns first n elements from <i>ary</i>.
+ *  Returns first +n+ elements from the array.
+ *
+ *  If a negative number is given, raises an ArgumentError.
+ *
+ *  See also Array#drop
  *
  *     a = [1, 2, 3, 4, 5, 0]
  *     a.take(3)             #=> [1, 2, 3]
@@ -4547,16 +5541,18 @@ rb_ary_take(VALUE obj, VALUE n)
 
 /*
  *  call-seq:
- *     ary.take_while {|arr| block }   -> new_ary
- *     ary.take_while                  -> an_enumerator
+ *     ary.take_while { |obj| block }  -> new_ary
+ *     ary.take_while                  -> Enumerator
+ *
+ *  Passes elements to the block until the block returns +nil+ or +false+, then
+ *  stops iterating and returns an array of all prior elements.
  *
- *  Passes elements to the block until the block returns +nil+ or +false+,
- *  then stops iterating and returns an array of all prior elements.
+ *  If no block is given, an Enumerator is returned instead.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  See also Array#drop_while
  *
  *     a = [1, 2, 3, 4, 5, 0]
- *     a.take_while {|i| i < 3 }   #=> [1, 2]
+ *     a.take_while { |i| i < 3 }  #=> [1, 2]
  *
  */
 
@@ -4567,7 +5563,7 @@ rb_ary_take_while(VALUE ary)
 
     RETURN_ENUMERATOR(ary, 0, 0);
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+	if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
     }
     return rb_ary_take(ary, LONG2FIX(i));
 }
@@ -4576,8 +5572,12 @@ rb_ary_take_while(VALUE ary)
  *  call-seq:
  *     ary.drop(n)               -> new_ary
  *
- *  Drops first n elements from +ary+ and returns the rest of
- *  the elements in an array.
+ *  Drops first +n+ elements from +ary+ and returns the rest of the elements in
+ *  an array.
+ *
+ *  If a negative number is given, raises an ArgumentError.
+ *
+ *  See also Array#take
  *
  *     a = [1, 2, 3, 4, 5, 0]
  *     a.drop(3)             #=> [4, 5, 0]
@@ -4600,14 +5600,16 @@ rb_ary_drop(VALUE ary, VALUE n)
 
 /*
  *  call-seq:
- *     ary.drop_while {|arr| block }   -> new_ary
- *     ary.drop_while                  -> an_enumerator
+ *     ary.drop_while { |obj| block }   -> new_ary
+ *     ary.drop_while                  -> Enumerator
  *
- *  Drops elements up to, but not including, the first element for
- *  which the block returns +nil+ or +false+ and returns an array
- *  containing the remaining elements.
+ *  Drops elements up to, but not including, the first element for which the
+ *  block returns +nil+ or +false+ and returns an array containing the
+ *  remaining elements.
  *
- *  If no block is given, an enumerator is returned instead.
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *  See also Array#take_while
  *
  *     a = [1, 2, 3, 4, 5, 0]
  *     a.drop_while {|i| i < 3 }   #=> [3, 4, 5, 0]
@@ -4621,18 +5623,449 @@ rb_ary_drop_while(VALUE ary)
 
     RETURN_ENUMERATOR(ary, 0, 0);
     for (i = 0; i < RARRAY_LEN(ary); i++) {
-	if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
+	if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
     }
     return rb_ary_drop(ary, LONG2FIX(i));
 }
 
+/*
+ *  call-seq:
+ *     ary.any? [{ |obj| block }]   -> true or false
+ *
+ *  See also Enumerable#any?
+ */
+
+static VALUE
+rb_ary_any_p(VALUE ary)
+{
+    long i, len = RARRAY_LEN(ary);
+    const VALUE *ptr = RARRAY_CONST_PTR(ary);
+
+    if (!len) return Qfalse;
+    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) {
+	    if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+/*
+ * call-seq:
+ *   ary.dig(idx, ...)                 -> object
+ *
+ * Extracts the nested value specified by the sequence of <i>idx</i>
+ * objects by calling +dig+ at each step, returning +nil+ if any
+ * intermediate step is +nil+.
+ *
+ *   a = [[1, [2, 3]]]
+ *
+ *   a.dig(0, 1, 1)                    #=> 3
+ *   a.dig(1, 2, 3)                    #=> nil
+ *   a.dig(0, 0, 0)                    #=> TypeError: Fixnum does not have #dig method
+ *   [42, {foo: :bar}].dig(1, :foo)    #=> :bar
+ */
+
+VALUE
+rb_ary_dig(int argc, VALUE *argv, VALUE self)
+{
+    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+    self = rb_ary_at(self, *argv);
+    if (!--argc) return self;
+    ++argv;
+    return rb_obj_dig(argc, argv, self, Qnil);
+}
+
+/*
+ * call-seq:
+ *   ary.sum(init=0)                    -> number
+ *   ary.sum(init=0) {|e| expr }        -> number
+ *
+ * Returns the sum of elements.
+ * For example, [e1, e2, e3].sum returns init + e1 + e2 + e3.
+ *
+ * If a block is given, the block is applied to each element
+ * before addition.
+ *
+ * If <i>ary</i> is empty, it returns <i>init</i>.
+ *
+ *   [].sum                             #=> 0
+ *   [].sum(0.0)                        #=> 0.0
+ *   [1, 2, 3].sum                      #=> 6
+ *   [3, 5.5].sum                       #=> 8.5
+ *   [2.5, 3.0].sum(0.0) {|e| e * e }   #=> 15.25
+ *   [Object.new].sum                   #=> TypeError
+ *
+ * The (arithmetic) mean value of an array can be obtained as follows.
+ *
+ *   mean = ary.sum(0.0) / ary.length
+ *
+ * This method can be used for non-numeric objects by
+ * explicit <i>init</i> argument.
+ *
+ *   ["a", "b", "c"].sum("")            #=> "abc"
+ *   [[1], [[2]], [3]].sum([])          #=> [1, [2], 3]
+ *
+ * However, Array#join and Array#flatten is faster than Array#sum.
+ *
+ *   ["a", "b", "c"].join               #=> "abc"
+ *   [[1], [[2]], [3]].flatten(1)       #=> [1, [2], 3]
+ *
+ *
+ * Array#sum method may not respect method redefinition of "+" methods
+ * such as Fixnum#+.
+ *
+ */
+
+static VALUE
+rb_ary_sum(int argc, VALUE *argv, VALUE ary)
+{
+    VALUE e, v, r;
+    long i, n;
+    int block_given;
+
+    if (rb_scan_args(argc, argv, "01", &v) == 0)
+        v = LONG2FIX(0);
+
+    block_given = rb_block_given_p();
+
+    if (RARRAY_LEN(ary) == 0)
+        return v;
+
+    n = 0;
+    r = Qundef;
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+        e = RARRAY_AREF(ary, i);
+        if (block_given)
+            e = rb_yield(e);
+        if (FIXNUM_P(e)) {
+            n += FIX2LONG(e); /* should not overflow long type */
+            if (!FIXABLE(n)) {
+                v = rb_big_plus(LONG2NUM(n), v);
+                n = 0;
+            }
+        }
+        else if (RB_TYPE_P(e, T_BIGNUM))
+            v = rb_big_plus(e, v);
+        else if (RB_TYPE_P(e, T_RATIONAL)) {
+            if (r == Qundef)
+                r = e;
+            else
+                r = rb_rational_plus(r, e);
+        }
+        else
+            goto not_exact;
+    }
+    if (n != 0)
+        v = rb_fix_plus(LONG2FIX(n), v);
+    if (r != Qundef) {
+        /* r can be a Integer when mathn is loaded */
+        if (FIXNUM_P(r))
+            v = rb_fix_plus(r, v);
+        else if (RB_TYPE_P(r, T_BIGNUM))
+            v = rb_big_plus(r, v);
+        else
+            v = rb_rational_plus(r, v);
+    }
+    return v;
+
+  not_exact:
+    if (n != 0)
+        v = rb_fix_plus(LONG2FIX(n), v);
+    if (r != Qundef) {
+        /* r can be a Integer when mathn is loaded */
+        if (FIXNUM_P(r))
+            v = rb_fix_plus(r, v);
+        else if (RB_TYPE_P(r, T_BIGNUM))
+            v = rb_big_plus(r, v);
+        else
+            v = rb_rational_plus(r, v);
+    }
+
+    if (RB_FLOAT_TYPE_P(e)) {
+        /* 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, y, t;
+            e = RARRAY_AREF(ary, i);
+            if (block_given)
+                e = rb_yield(e);
+            if (RB_FLOAT_TYPE_P(e))
+              has_float_value:
+                x = RFLOAT_VALUE(e);
+            else if (FIXNUM_P(e))
+                x = FIX2LONG(e);
+            else if (RB_TYPE_P(e, T_BIGNUM))
+                x = rb_big2dbl(e);
+            else if (RB_TYPE_P(e, T_RATIONAL))
+                x = rb_num2dbl(e);
+            else
+                goto not_float;
+
+            y = x - c;
+            t = f + y;
+            c = (t - f) - y;
+            f = t;
+        }
+        return DBL2NUM(f);
 
+      not_float:
+        v = DBL2NUM(f);
+    }
 
-/* Arrays are ordered, integer-indexed collections of any object.
- * Array indexing starts at 0, as in C or Java.  A negative index is
- * assumed to be relative to the end of the array---that is, an index of -1
- * indicates the last element of the array, -2 is the next to last
- * element in the array, and so on.
+    goto has_some_value;
+    for (; i < RARRAY_LEN(ary); i++) {
+        e = RARRAY_AREF(ary, i);
+        if (block_given)
+            e = rb_yield(e);
+      has_some_value:
+        v = rb_funcall(v, idPLUS, 1, e);
+    }
+    return v;
+}
+
+/*
+ *  Arrays are ordered, integer-indexed collections of any object.
+ *
+ *  Array indexing starts at 0, as in C or Java.  A negative index is assumed
+ *  to be relative to the end of the array---that is, an index of -1 indicates
+ *  the last element of the array, -2 is the next to last element in the
+ *  array, and so on.
+ *
+ *  == Creating Arrays
+ *
+ *  A new array can be created by using the literal constructor
+ *  <code>[]</code>.  Arrays can contain different types of objects.  For
+ *  example, the array below contains an Integer, a String and a Float:
+ *
+ *     ary = [1, "two", 3.0] #=> [1, "two", 3.0]
+ *
+ *  An array can also be created by explicitly calling Array.new with zero, one
+ *  (the initial size of the Array) or two arguments (the initial size and a
+ *  default object).
+ *
+ *     ary = Array.new    #=> []
+ *     Array.new(3)       #=> [nil, nil, nil]
+ *     Array.new(3, true) #=> [true, true, true]
+ *
+ *  Note that the second argument populates the array with references to the
+ *  same object.  Therefore, it is only recommended in cases when you need to
+ *  instantiate arrays with natively immutable objects such as Symbols,
+ *  numbers, true or false.
+ *
+ *  To create an array with separate objects a block can be passed instead.
+ *  This method is safe to use with mutable objects such as hashes, strings or
+ *  other arrays:
+ *
+ *     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) }
+ *     #=> [[nil, nil, nil], [nil, nil, nil], [nil, nil, nil]]
+ *
+ *  An array can also be created by using the Array() method, provided by
+ *  Kernel, which tries to call #to_ary, then #to_a on its argument.
+ *
+ *	Array({:a => "a", :b => "b"}) #=> [[:a, "a"], [:b, "b"]]
+ *
+ *  == Example Usage
+ *
+ *  In addition to the methods it mixes in through the Enumerable module, the
+ *  Array class has proprietary methods for accessing, searching and otherwise
+ *  manipulating arrays.
+ *
+ *  Some of the more common ones are illustrated below.
+ *
+ *  == Accessing Elements
+ *
+ *  Elements in an array can be retrieved using the Array#[] method.  It can
+ *  take a single integer argument (a numeric index), a pair of arguments
+ *  (start and length) or a range. Negative indices start counting from the end,
+ *  with -1 being the last element.
+ *
+ *     arr = [1, 2, 3, 4, 5, 6]
+ *     arr[2]    #=> 3
+ *     arr[100]  #=> nil
+ *     arr[-3]   #=> 4
+ *     arr[2, 3] #=> [3, 4, 5]
+ *     arr[1..4] #=> [2, 3, 4, 5]
+ *     arr[1..-3] #=> [2, 3, 4]
+ *
+ *  Another way to access a particular array element is by using the #at method
+ *
+ *     arr.at(0) #=> 1
+ *
+ *  The #slice method works in an identical manner to Array#[].
+ *
+ *  To raise an error for indices outside of the array bounds or else to
+ *  provide a default value when that happens, you can use #fetch.
+ *
+ *     arr = ['a', 'b', 'c', 'd', 'e', 'f']
+ *     arr.fetch(100) #=> IndexError: index 100 outside of array bounds: -6...6
+ *     arr.fetch(100, "oops") #=> "oops"
+ *
+ *  The special methods #first and #last will return the first and last
+ *  elements of an array, respectively.
+ *
+ *     arr.first #=> 1
+ *     arr.last  #=> 6
+ *
+ *  To return the first +n+ elements of an array, use #take
+ *
+ *     arr.take(3) #=> [1, 2, 3]
+ *
+ *  #drop does the opposite of #take, by returning the elements after +n+
+ *  elements have been dropped:
+ *
+ *     arr.drop(3) #=> [4, 5, 6]
+ *
+ *  == Obtaining Information about an Array
+ *
+ *  Arrays keep track of their own length at all times.  To query an array
+ *  about the number of elements it contains, use #length, #count or #size.
+ *
+ *    browsers = ['Chrome', 'Firefox', 'Safari', 'Opera', 'IE']
+ *    browsers.length #=> 5
+ *    browsers.count #=> 5
+ *
+ *  To check whether an array contains any elements at all
+ *
+ *    browsers.empty? #=> false
+ *
+ *  To check whether a particular item is included in the array
+ *
+ *    browsers.include?('Konqueror') #=> false
+ *
+ *  == Adding Items to Arrays
+ *
+ *  Items can be added to the end of an array by using either #push or #<<
+ *
+ *    arr = [1, 2, 3, 4]
+ *    arr.push(5) #=> [1, 2, 3, 4, 5]
+ *    arr << 6    #=> [1, 2, 3, 4, 5, 6]
+ *
+ *  #unshift will add a new item to the beginning of an array.
+ *
+ *     arr.unshift(0) #=> [0, 1, 2, 3, 4, 5, 6]
+ *
+ *  With #insert you can add a new element to an array at any position.
+ *
+ *     arr.insert(3, 'apple')  #=> [0, 1, 2, 'apple', 3, 4, 5, 6]
+ *
+ *  Using the #insert method, you can also insert multiple values at once:
+ *
+ *     arr.insert(3, 'orange', 'pear', 'grapefruit')
+ *     #=> [0, 1, 2, "orange", "pear", "grapefruit", "apple", 3, 4, 5, 6]
+ *
+ *  == Removing Items from an Array
+ *
+ *  The method #pop removes the last element in an array and returns it:
+ *
+ *     arr =  [1, 2, 3, 4, 5, 6]
+ *     arr.pop #=> 6
+ *     arr #=> [1, 2, 3, 4, 5]
+ *
+ *  To retrieve and at the same time remove the first item, use #shift:
+ *
+ *     arr.shift #=> 1
+ *     arr #=> [2, 3, 4, 5]
+ *
+ *  To delete an element at a particular index:
+ *
+ *     arr.delete_at(2) #=> 4
+ *     arr #=> [2, 3, 5]
+ *
+ *  To delete a particular element anywhere in an array, use #delete:
+ *
+ *     arr = [1, 2, 2, 3]
+ *     arr.delete(2) #=> 2
+ *     arr #=> [1,3]
+ *
+ *  A useful method if you need to remove +nil+ values from an array is
+ *  #compact:
+ *
+ *     arr = ['foo', 0, nil, 'bar', 7, 'baz', nil]
+ *     arr.compact  #=> ['foo', 0, 'bar', 7, 'baz']
+ *     arr          #=> ['foo', 0, nil, 'bar', 7, 'baz', nil]
+ *     arr.compact! #=> ['foo', 0, 'bar', 7, 'baz']
+ *     arr          #=> ['foo', 0, 'bar', 7, 'baz']
+ *
+ *  Another common need is to remove duplicate elements from an array.
+ *
+ *  It has the non-destructive #uniq, and destructive method #uniq!
+ *
+ *     arr = [2, 5, 6, 556, 6, 6, 8, 9, 0, 123, 556]
+ *     arr.uniq #=> [2, 5, 6, 556, 8, 9, 0, 123]
+ *
+ *  == Iterating over Arrays
+ *
+ *  Like all classes that include the Enumerable module, Array has an each
+ *  method, which defines what elements should be iterated over and how.  In
+ *  case of Array's #each, all elements in the Array instance are yielded to
+ *  the supplied block in sequence.
+ *
+ *  Note that this operation leaves the array unchanged.
+ *
+ *     arr = [1, 2, 3, 4, 5]
+ *     arr.each { |a| print a -= 10, " " }
+ *     # prints: -9 -8 -7 -6 -5
+ *     #=> [1, 2, 3, 4, 5]
+ *
+ *  Another sometimes useful iterator is #reverse_each which will iterate over
+ *  the elements in the array in reverse order.
+ *
+ *     words = %w[first second third fourth fifth sixth]
+ *     str = ""
+ *     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                   #=> [1, 2, 3, 4, 5]
+ *     arr.map! { |a| a**2 } #=> [1, 4, 9, 16, 25]
+ *     arr                   #=> [1, 4, 9, 16, 25]
+ *
+ *  == Selecting Items from an Array
+ *
+ *  Elements can be selected from an array according to criteria defined in a
+ *  block.  The selection can happen in a destructive or a non-destructive
+ *  manner.  While the destructive operations will modify the array they were
+ *  called on, the non-destructive methods usually return a new array with the
+ *  selected elements, but leave the original array unchanged.
+ *
+ *  === 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                          #=> [1, 2, 3, 4, 5, 6]
+ *
+ *  === Destructive Selection
+ *
+ *  #select! and #reject! are the corresponding destructive methods to #select
+ *  and #reject
+ *
+ *  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                         #=> [4, 5, 6]
+ *
+ *     arr = [1, 2, 3, 4, 5, 6]
+ *     arr.keep_if { |a| a < 4 } #=> [1, 2, 3]
+ *     arr                       #=> [1, 2, 3]
+ *
  */
 
 void
@@ -4644,7 +6077,7 @@ Init_Array(void)
     rb_cArray  = rb_define_class("Array", rb_cObject);
     rb_include_module(rb_cArray, rb_mEnumerable);
 
-    rb_define_alloc_func(rb_cArray, ary_alloc);
+    rb_define_alloc_func(rb_cArray, empty_ary_alloc);
     rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
     rb_define_singleton_method(rb_cArray, "try_convert", rb_ary_s_try_convert, 1);
     rb_define_method(rb_cArray, "initialize", rb_ary_initialize, -1);
@@ -4653,6 +6086,7 @@ Init_Array(void)
     rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
     rb_define_alias(rb_cArray,  "to_s", "inspect");
     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);
 
@@ -4666,7 +6100,7 @@ Init_Array(void)
     rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1);
     rb_define_method(rb_cArray, "first", rb_ary_first, -1);
     rb_define_method(rb_cArray, "last", rb_ary_last, -1);
-    rb_define_method(rb_cArray, "concat", rb_ary_concat, 1);
+    rb_define_method(rb_cArray, "concat", rb_ary_concat_multi, -1);
     rb_define_method(rb_cArray, "<<", rb_ary_push, 1);
     rb_define_method(rb_cArray, "push", rb_ary_push_m, -1);
     rb_define_method(rb_cArray, "pop", rb_ary_pop_m, -1);
@@ -4724,6 +6158,9 @@ Init_Array(void)
     rb_define_method(rb_cArray, "&", rb_ary_and, 1);
     rb_define_method(rb_cArray, "|", rb_ary_or, 1);
 
+    rb_define_method(rb_cArray, "max", rb_ary_max, -1);
+    rb_define_method(rb_cArray, "min", rb_ary_min, -1);
+
     rb_define_method(rb_cArray, "uniq", rb_ary_uniq, 0);
     rb_define_method(rb_cArray, "uniq!", rb_ary_uniq_bang, 0);
     rb_define_method(rb_cArray, "compact", rb_ary_compact, 0);
@@ -4745,7 +6182,14 @@ Init_Array(void)
     rb_define_method(rb_cArray, "take_while", rb_ary_take_while, 0);
     rb_define_method(rb_cArray, "drop", rb_ary_drop, 1);
     rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
+    rb_define_method(rb_cArray, "bsearch", rb_ary_bsearch, 0);
+    rb_define_method(rb_cArray, "bsearch_index", rb_ary_bsearch_index, 0);
+    rb_define_method(rb_cArray, "any?", rb_ary_any_p, 0);
+    rb_define_method(rb_cArray, "dig", rb_ary_dig, -1);
+    rb_define_method(rb_cArray, "sum", rb_ary_sum, -1);
 
     id_cmp = rb_intern("<=>");
-    sym_random = ID2SYM(rb_intern("random"));
+    id_random = rb_intern("random");
+    id_div = rb_intern("div");
+    id_power = rb_intern("**");
 }
diff --git a/atomic.h b/atomic.h
deleted file mode 100644
index 5b3fb99024..0000000000
--- a/atomic.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef RUBY_ATOMIC_H
-#define RUBY_ATOMIC_H
-
-#ifdef _WIN32
-#if defined _MSC_VER && _MSC_VER > 1200
-#pragma intrinsic(_InterlockedOr)
-#endif
-typedef LONG rb_atomic_t;
-
-# define ATOMIC_SET(var, val) InterlockedExchange(&(var), (val))
-# define ATOMIC_INC(var) InterlockedIncrement(&(var))
-# define ATOMIC_DEC(var) InterlockedDecrement(&(var))
-#if defined __GNUC__
-# define ATOMIC_OR(var, val) __asm__("lock\n\t" "orl\t%1, %0" : "=m"(var) : "Ir"(val))
-#elif defined _MSC_VER && _MSC_VER <= 1200
-# define ATOMIC_OR(var, val) rb_w32_atomic_or(&(var), (val))
-static inline void
-rb_w32_atomic_or(volatile rb_atomic_t *var, rb_atomic_t val)
-{
-#ifdef _M_IX86
-    __asm mov eax, var;
-    __asm mov ecx, val;
-    __asm lock or [eax], ecx;
-#else
-#error unsupported architecture
-#endif
-}
-#else
-# define ATOMIC_OR(var, val) _InterlockedOr(&(var), (val))
-#endif
-# define ATOMIC_EXCHANGE(var, val) InterlockedExchange(&(var), (val))
-
-#elif defined HAVE_GCC_ATOMIC_BUILTINS
-/* @shyouhei hack to support atomic operations in case of gcc. Gcc
- * has its own pseudo-insns to support them.  See info, or
- * http://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html */
-
-typedef unsigned int rb_atomic_t; /* Anything OK */
-# define ATOMIC_SET(var, val)  __sync_lock_test_and_set(&(var), (val))
-# define ATOMIC_INC(var) __sync_fetch_and_add(&(var), 1)
-# define ATOMIC_DEC(var) __sync_fetch_and_sub(&(var), 1)
-# define ATOMIC_OR(var, val) __sync_or_and_fetch(&(var), (val))
-# define ATOMIC_EXCHANGE(var, val) __sync_lock_test_and_set(&(var), (val))
-
-#else
-typedef int rb_atomic_t;
-extern rb_atomic_t ruby_atomic_exchange(rb_atomic_t *ptr, rb_atomic_t val);
-
-# define ATOMIC_SET(var, val) ((var) = (val))
-# define ATOMIC_INC(var) (++(var))
-# define ATOMIC_DEC(var) (--(var))
-# define ATOMIC_OR(var, val) ((var) |= (val))
-# define ATOMIC_EXCHANGE(var, val) ruby_atomic_exchange(&(var), (val))
-#endif
-
-#endif /* RUBY_ATOMIC_H */
diff --git a/basictest/runner.rb b/basictest/runner.rb
new file mode 100755
index 0000000000..0330b6d506
--- /dev/null
+++ b/basictest/runner.rb
@@ -0,0 +1,33 @@
+#! ./miniruby
+
+exit if defined?(CROSS_COMPILING) and CROSS_COMPILING
+ruby = ENV["RUBY"]
+unless ruby
+  load './rbconfig.rb'
+  ruby = "./#{RbConfig::CONFIG['ruby_install_name']}#{RbConfig::CONFIG['EXEEXT']}"
+end
+unless File.exist? ruby
+  print "#{ruby} is not found.\n"
+  print "Try `make' first, then `make test', please.\n"
+  exit false
+end
+ARGV[0] and opt = ARGV[0][/\A--run-opt=(.*)/, 1] and ARGV.shift
+
+$stderr.reopen($stdout)
+error = ''
+
+srcdir = File.expand_path('..', File.dirname(__FILE__))
+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/
+    print "\ntest succeeded\n"
+    exit true
+  end
+  error << line if %r:^(basictest/test.rb|not): =~ line
+end
+puts
+print error
+print "test failed\n"
+exit false
diff --git a/basictest/test.rb b/basictest/test.rb
new file mode 100755
index 0000000000..8472a0d14a
--- /dev/null
+++ b/basictest/test.rb
@@ -0,0 +1,2367 @@
+#! /usr/bin/env ruby
+# -*- coding: us-ascii -*-
+
+$testnum=0
+$ntest=0
+$failed = 0
+class Progress
+  def initialize
+    @color = nil
+    @tty = nil
+    @quiet = nil
+    @verbose = nil
+    ARGV.each do |arg|
+      case arg
+      when /\A--color(?:=(?:always|(auto)|(never)|(.*)))?\z/
+        warn "unknown --color argument: #$3" if $3
+        @color = $1 ? nil : !$2
+      when /\A--tty(=(?:yes|(no)|(.*)))?\z/
+        warn "unknown --tty argument: #$3" if $3
+        @tty = !$1 || !$2
+        true
+      when /\A-(q|-quiet)\z/
+        @quiet = true
+      when /\A-(v|-verbose)\z/
+        @verbose = true
+      end
+    end
+    @tty = STDERR.tty? && !STDOUT.tty? && /dumb/ !~ ENV["TERM"] if @tty.nil?
+    @eol = @tty && !@verbose ? "\r\e[K\r" : "\n"
+    case @color
+    when nil
+      @color = @tty
+    end
+    if @color
+      # dircolors-like style
+      colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
+      begin
+        File.read(File.join(__dir__, "../test/colors")).scan(/(\w+)=([^:\n]*)/) do |n, c|
+          colors[n] ||= c
+        end
+      rescue
+      end
+      @passed = "\e[;#{colors["pass"] || "32"}m"
+      @failed = "\e[;#{colors["fail"] || "31"}m"
+      @reset = "\e[m"
+    else
+      @passed = @failed = @reset = ""
+    end
+    extend(Rotator) if @tty
+  end
+
+  def passed_string
+    "."
+  end
+  def failed_string
+    "#{@failed}F#{@reset}"
+  end
+  def init_string
+  end
+  def finish_string
+    if @quiet
+      @eol
+    else
+      "#{@passed}#{@ok ? 'OK' : ''} #{$testnum}#{@reset}#{@eol}"
+    end
+  end
+  def pass
+    STDERR.print passed_string
+  end
+  def fail
+    @ok = false
+    STDERR.print failed_string
+  end
+  def init
+    @ok = true
+    STDERR.print init_string
+  end
+  def finish
+    STDERR.print finish_string
+  end
+
+  module Rotator
+    ROTATOR = %w[- \\ | /]
+    BS = "\b" * ROTATOR[0].size
+    def passed_string
+      "#{BS}#{ROTATOR[(@count += 1) % ROTATOR.size]}"
+    end
+    def failed_string
+      "#{BS}#{super}#{ROTATOR[@count % ROTATOR.size]}"
+    end
+    def init_string
+      @count = 0
+      " "
+    end
+    def finish_string
+      s = "#{BS}#{' ' * BS.size}#{BS}#{super}"
+      s.gsub!(/\n/, "\r\e[2K\r") if @quiet
+      s
+    end
+  end
+end
+PROGRESS = Progress.new
+
+def test_check(what)
+  unless $ntest.zero?
+    PROGRESS.finish
+  end
+  STDERR.print "#{$0}:#{what} "
+  PROGRESS.init
+  $what = what
+  $testnum = 0
+end
+
+def test_ok(cond,n=1)
+  $testnum+=1
+  $ntest+=1
+  where = (st = caller(n)) ? st[0] : "caller error! (n=#{n}, trace=#{caller(0).join(', ')}"
+  if cond
+    PROGRESS.pass
+    printf "ok %d (%s)\n", $testnum, where
+  else
+    PROGRESS.fail
+    printf "not ok %s %d -- %s\n", $what, $testnum, where
+    $failed+=1
+  end
+  STDOUT.flush
+  STDERR.flush
+end
+
+# make sure conditional operators work
+
+test_check "assignment"
+
+a=[]; a[0] ||= "bar";
+test_ok(a[0] == "bar")
+h={}; h["foo"] ||= "bar";
+test_ok(h["foo"] == "bar")
+
+aa = 5
+aa ||= 25
+test_ok(aa == 5)
+bb ||= 25
+test_ok(bb == 25)
+cc &&=33
+test_ok(cc == nil)
+cc = 5
+cc &&=44
+test_ok(cc == 44)
+
+a = nil; test_ok(a == nil)
+a = 1; test_ok(a == 1)
+a = []; test_ok(a == [])
+a = [1]; test_ok(a == [1])
+a = [nil]; test_ok(a == [nil])
+a = [[]]; test_ok(a == [[]])
+a = [1,2]; test_ok(a == [1,2])
+a = [*[]]; test_ok(a == [])
+a = [*[1]]; test_ok(a == [1])
+a = [*[1,2]]; test_ok(a == [1,2])
+
+a = *[]; test_ok(a == [])
+a = *[1]; test_ok(a == [1])
+a = *[nil]; test_ok(a == [nil])
+a = *[[]]; test_ok(a == [[]])
+a = *[1,2]; test_ok(a == [1,2])
+a = *[*[]]; test_ok(a == [])
+a = *[*[1]]; test_ok(a == [1])
+a = *[*[1,2]]; test_ok(a == [1,2])
+
+a, = nil; test_ok(a == nil)
+a, = 1; test_ok(a == 1)
+a, = []; test_ok(a == nil)
+a, = [1]; test_ok(a == 1)
+a, = [nil]; test_ok(a == nil)
+a, = [[]]; test_ok(a == [])
+a, = 1,2; test_ok(a == 1)
+a, = [1,2]; test_ok(a == 1)
+a, = [*[]]; test_ok(a == nil)
+a, = [*[1]]; test_ok(a == 1)
+a, = *[1,2]; test_ok(a == 1)
+a, = [*[1,2]]; test_ok(a == 1)
+
+a, = *[]; test_ok(a == nil)
+a, = *[1]; test_ok(a == 1)
+a, = *[nil]; test_ok(a == nil)
+a, = *[[]]; test_ok(a == [])
+a, = *[1,2]; test_ok(a == 1)
+a, = *[*[]]; test_ok(a == nil)
+a, = *[*[1]]; test_ok(a == 1)
+a, = *[*[1,2]]; test_ok(a == 1)
+
+*a = nil; test_ok(a == [nil])
+*a = 1; test_ok(a == [1])
+*a = []; test_ok(a == [])
+*a = [1]; test_ok(a == [1])
+*a = [nil]; test_ok(a == [nil])
+*a = [[]]; test_ok(a == [[]])
+*a = [1,2]; test_ok(a == [1,2])
+*a = [*[]]; test_ok(a == [])
+*a = [*[1]]; test_ok(a == [1])
+*a = [*[1,2]]; test_ok(a == [1,2])
+
+*a = *[]; test_ok(a == [])
+*a = *[1]; test_ok(a == [1])
+*a = *[nil]; test_ok(a == [nil])
+*a = *[[]]; test_ok(a == [[]])
+*a = *[1,2]; test_ok(a == [1,2])
+*a = *[*[]]; test_ok(a == [])
+*a = *[*[1]]; test_ok(a == [1])
+*a = *[*[1,2]]; test_ok(a == [1,2])
+
+a,b,*c = nil; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = 1; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = []; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = [1]; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = [nil]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = [[]]; test_ok([a,b,c] == [[],nil,[]])
+a,b,*c = [1,2]; test_ok([a,b,c] == [1,2,[]])
+a,b,*c = [*[]]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = [*[1]]; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = [*[1,2]]; test_ok([a,b,c] == [1,2,[]])
+
+a,b,*c = *[]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = *[1]; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = *[nil]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = *[[]]; test_ok([a,b,c] == [[],nil,[]])
+a,b,*c = *[1,2]; test_ok([a,b,c] == [1,2,[]])
+a,b,*c = *[*[]]; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = *[*[1]]; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = *[*[1,2]]; test_ok([a,b,c] == [1,2,[]])
+
+def f; yield nil; end; f {|a| test_ok(a == nil)}
+def f; yield 1; end; f {|a| test_ok(a == 1)}
+def f; yield []; end; f {|a| test_ok(a == [])}
+def f; yield [1]; end; f {|a| test_ok(a == [1])}
+def f; yield [nil]; end; f {|a| test_ok(a == [nil])}
+def f; yield [[]]; end; f {|a| test_ok(a == [[]])}
+def f; yield [*[]]; end; f {|a| test_ok(a == [])}
+def f; yield [*[1]]; end; f {|a| test_ok(a == [1])}
+def f; yield [*[1,2]]; end; f {|a| test_ok(a == [1,2])}
+def f; yield *[]; end; f {|a| test_ok(a == nil)}
+def f; yield *[1]; end; f {|a| test_ok(a == 1)}
+def f; yield *[nil]; end; f {|a| test_ok(a == nil)}
+def f; yield *[[]]; end; f {|a| test_ok(a == [])}
+def f; yield *[*[]]; end; f {|a| test_ok(a == nil)}
+def f; yield *[*[1]]; end; f {|a| test_ok(a == 1)}
+def f; yield *[*[1,2]]; end; f {|a| test_ok(a == 1)}
+
+def f; yield; end; f {|a,| test_ok(a == nil)}
+def f; yield nil; end; f {|a,| test_ok(a == nil)}
+def f; yield 1; end; f {|a,| test_ok(a == 1)}
+def f; yield []; end; f {|a,| test_ok(a == nil)}
+def f; yield [1]; end; f {|a,| test_ok(a == 1)}
+def f; yield [nil]; end; f {|a,| test_ok(a == nil)}
+def f; yield [[]]; end; f {|a,| test_ok(a == [])}
+def f; yield [*[]]; end; f {|a,| test_ok(a == nil)}
+def f; yield [*[1]]; end; f {|a,| test_ok(a == 1)}
+def f; yield [*[1,2]]; end; f {|a,| test_ok(a == 1)}
+
+def f; yield *[]; end; f {|a,| test_ok(a == nil)}
+def f; yield *[1]; end; f {|a,| test_ok(a == 1)}
+def f; yield *[nil]; end; f {|a,| test_ok(a == nil)}
+def f; yield *[[]]; end; f {|a,| test_ok(a == nil)}
+def f; yield *[*[]]; end; f {|a,| test_ok(a == nil)}
+def f; yield *[*[1]]; end; f {|a,| test_ok(a == 1)}
+def f; yield *[*[1,2]]; end; f {|a,| test_ok(a == 1)}
+
+def f; yield; end; f {|*a| test_ok(a == [])}
+def f; yield nil; end; f {|*a| test_ok(a == [nil])}
+def f; yield 1; end; f {|*a| test_ok(a == [1])}
+def f; yield []; end; f {|*a| test_ok(a == [[]])}
+def f; yield [1]; end; f {|*a| test_ok(a == [[1]])}
+def f; yield [nil]; end; f {|*a| test_ok(a == [[nil]])}
+def f; yield [[]]; end; f {|*a| test_ok(a == [[[]]])}
+def f; yield [1,2]; end; f {|*a| test_ok(a == [[1,2]])}
+def f; yield [*[]]; end; f {|*a| test_ok(a == [[]])}
+def f; yield [*[1]]; end; f {|*a| test_ok(a == [[1]])}
+def f; yield [*[1,2]]; end; f {|*a| test_ok(a == [[1,2]])}
+
+def f; yield *[]; end; f {|*a| test_ok(a == [])}
+def f; yield *[1]; end; f {|*a| test_ok(a == [1])}
+def f; yield *[nil]; end; f {|*a| test_ok(a == [nil])}
+def f; yield *[[]]; end; f {|*a| test_ok(a == [[]])}
+def f; yield *[*[]]; end; f {|*a| test_ok(a == [])}
+def f; yield *[*[1]]; end; f {|*a| test_ok(a == [1])}
+def f; yield *[*[1,2]]; end; f {|*a| test_ok(a == [1,2])}
+
+def f; yield; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield nil; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield 1; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield []; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield [1]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield [nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield [[]]; end; f {|a,b,*c| test_ok([a,b,c] == [[],nil,[]])}
+def f; yield [*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield [*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield [*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,2,[]])}
+
+def f; yield *[]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield *[1]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield *[nil]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield *[[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield *[*[]]; end; f {|a,b,*c| test_ok([a,b,c] == [nil,nil,[]])}
+def f; yield *[*[1]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,nil,[]])}
+def f; yield *[*[1,2]]; end; f {|a,b,*c| test_ok([a,b,c] == [1,2,[]])}
+
+def r; return; end; a = r(); test_ok(a == nil)
+def r; return nil; end; a = r(); test_ok(a == nil)
+def r; return 1; end; a = r(); test_ok(a == 1)
+def r; return []; end; a = r(); test_ok(a == [])
+def r; return [1]; end; a = r(); test_ok(a == [1])
+def r; return [nil]; end; a = r(); test_ok(a == [nil])
+def r; return [[]]; end; a = r(); test_ok(a == [[]])
+def r; return [*[]]; end; a = r(); test_ok(a == [])
+def r; return [*[1]]; end; a = r(); test_ok(a == [1])
+def r; return [*[1,2]]; end; a = r(); test_ok(a == [1,2])
+
+def r; return *[]; end; a = r(); test_ok(a == [])
+def r; return *[1]; end; a = r(); test_ok(a == [1])
+def r; return *[nil]; end; a = r(); test_ok(a == [nil])
+def r; return *[[]]; end; a = r(); test_ok(a == [[]])
+def r; return *[*[]]; end; a = r(); test_ok(a == [])
+def r; return *[*[1]]; end; a = r(); test_ok(a == [1])
+def r; return *[*[1,2]]; end; a = r(); test_ok(a == [1,2])
+
+def r; return *[[]]; end; a = *r(); test_ok(a == [[]])
+def r; return *[*[1,2]]; end; a = *r(); test_ok(a == [1,2])
+
+def r; return; end; *a = r(); test_ok(a == [nil])
+def r; return nil; end; *a = r(); test_ok(a == [nil])
+def r; return 1; end; *a = r(); test_ok(a == [1])
+def r; return []; end; *a = r(); test_ok(a == [])
+def r; return [1]; end; *a = r(); test_ok(a == [1])
+def r; return [nil]; end; *a = r(); test_ok(a == [nil])
+def r; return [[]]; end; *a = r(); test_ok(a == [[]])
+def r; return [1,2]; end; *a = r(); test_ok(a == [1,2])
+def r; return [*[]]; end; *a = r(); test_ok(a == [])
+def r; return [*[1]]; end; *a = r(); test_ok(a == [1])
+def r; return [*[1,2]]; end; *a = r(); test_ok(a == [1,2])
+
+def r; return *[]; end; *a = r(); test_ok(a == [])
+def r; return *[1]; end; *a = r(); test_ok(a == [1])
+def r; return *[nil]; end; *a = r(); test_ok(a == [nil])
+def r; return *[[]]; end; *a = r(); test_ok(a == [[]])
+def r; return *[1,2]; end; *a = r(); test_ok(a == [1,2])
+def r; return *[*[]]; end; *a = r(); test_ok(a == [])
+def r; return *[*[1]]; end; *a = r(); test_ok(a == [1])
+def r; return *[*[1,2]]; end; *a = r(); test_ok(a == [1,2])
+
+def r; return *[[]]; end; *a = *r(); test_ok(a == [[]])
+def r; return *[1,2]; end; *a = *r(); test_ok(a == [1,2])
+def r; return *[*[1,2]]; end; *a = *r(); test_ok(a == [1,2])
+
+def r; return; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return nil; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return 1; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return []; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return [1]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return [nil]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return [[]]; end; a,b,*c = r(); test_ok([a,b,c] == [[],nil,[]])
+def r; return [1,2]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
+def r; return [*[]]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return [*[1]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return [*[1,2]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
+
+def r; return *[]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return *[1]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return *[nil]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return *[[]]; end; a,b,*c = r(); test_ok([a,b,c] == [[],nil,[]])
+def r; return *[1,2]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
+def r; return *[*[]]; end; a,b,*c = r(); test_ok([a,b,c] == [nil,nil,[]])
+def r; return *[*[1]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,nil,[]])
+def r; return *[*[1,2]]; end; a,b,*c = r(); test_ok([a,b,c] == [1,2,[]])
+
+f = lambda {|r,| test_ok([] == r)}
+f.call([], *[])
+
+f = lambda {|r,*l| test_ok([] == r); test_ok([1] == l)}
+f.call([], *[1])
+
+f = lambda{|x| x}
+test_ok(f.call(42) == 42)
+test_ok(f.call([42]) == [42])
+test_ok(f.call([[42]]) == [[42]])
+test_ok(f.call([42,55]) == [42,55])
+
+f = lambda{|x,| x}
+test_ok(f.call(42) == 42)
+test_ok(f.call([42]) == [42])
+test_ok(f.call([[42]]) == [[42]])
+test_ok(f.call([42,55]) == [42,55])
+
+f = lambda{|*x| x}
+test_ok(f.call(42) == [42])
+test_ok(f.call([42]) == [[42]])
+test_ok(f.call([[42]]) == [[[42]]])
+test_ok(f.call([42,55]) == [[42,55]])
+test_ok(f.call(42,55) == [42,55])
+
+f = lambda { |a, b=42, *c| [a,b,c] }
+test_ok(f.call(1      ) == [1,42,[  ]] )
+test_ok(f.call(1,43   ) == [1,43,[  ]] )
+test_ok(f.call(1,43,44) == [1,43,[44]] )
+
+f = lambda { |a, b=(a|16), *c, &block| [a,b,c,block&&block[]] }
+test_ok(f.call(8      )     == [8,24,[  ],nil] )
+test_ok(f.call(8,43   )     == [8,43,[  ],nil] )
+test_ok(f.call(8,43,44)     == [8,43,[44],nil] )
+test_ok(f.call(8      ){45} == [8,24,[  ],45 ] )
+test_ok(f.call(8,43   ){45} == [8,43,[  ],45 ] )
+test_ok(f.call(8,43,44){45} == [8,43,[44],45 ] )
+
+f = lambda { |a, b=42, *c, d| [a,b,c,d] }
+test_ok(f.call(1      ,99) == [1,42,[  ],99] )
+test_ok(f.call(1,43   ,99) == [1,43,[  ],99] )
+test_ok(f.call(1,43,44,99) == [1,43,[44],99] )
+
+f = lambda { |a, b=(a|16), &block| [a,b,block&&block[]] }
+test_ok(f.call(8   )     == [8,24,nil] )
+test_ok(f.call(8,43)     == [8,43,nil] )
+test_ok(f.call(8,43)     == [8,43,nil] )
+test_ok(f.call(8   ){45} == [8,24,45 ] )
+test_ok(f.call(8,43){45} == [8,43,45 ] )
+test_ok(f.call(8,43){45} == [8,43,45 ] )
+
+f = lambda { |a, b=42, d| [a,b,d] }
+test_ok(f.call(1   ,99) == [1,42,99] )
+test_ok(f.call(1,43,99) == [1,43,99] )
+test_ok(f.call(1,43,99) == [1,43,99] )
+
+f = lambda { |b=42, *c, &block| [b,c,block&&block[]] }
+test_ok(f.call(     )     == [42,[  ],nil] )
+test_ok(f.call(43   )     == [43,[  ],nil] )
+test_ok(f.call(43,44)     == [43,[44],nil] )
+test_ok(f.call(     ){45} == [42,[  ],45 ] )
+test_ok(f.call(43   ){45} == [43,[  ],45 ] )
+test_ok(f.call(43,44){45} == [43,[44],45 ] )
+
+f = lambda { |b=42, *c, d| [b,c,d] }
+test_ok(f.call(      99) == [42,[  ],99] )
+test_ok(f.call(43   ,99) == [43,[  ],99] )
+test_ok(f.call(43,44,99) == [43,[44],99] )
+
+f = lambda { |b=42, &block| [b,block&&block[]] }
+test_ok(f.call(  )     == [42,nil] )
+test_ok(f.call(43)     == [43,nil] )
+test_ok(f.call(43)     == [43,nil] )
+test_ok(f.call(  ){45} == [42,45 ] )
+test_ok(f.call(43){45} == [43,45 ] )
+test_ok(f.call(43){45} == [43,45 ] )
+
+f = lambda { |b=42, d| [b,d] }
+test_ok(f.call(   99) == [42,99] )
+test_ok(f.call(43,99) == [43,99] )
+test_ok(f.call(43,99) == [43,99] )
+
+
+a,=*[1]
+test_ok(a == 1)
+a,=*[[1]]
+test_ok(a == [1])
+a,=*[[[1]]]
+test_ok(a == [[1]])
+
+x, (y, z) = 1, 2, 3
+test_ok([1,2,nil] == [x,y,z])
+x, (y, z) = 1, [2,3]
+test_ok([1,2,3] == [x,y,z])
+x, (y, z) = 1, [2]
+test_ok([1,2,nil] == [x,y,z])
+
+a = loop do break; end; test_ok(a == nil)
+a = loop do break nil; end; test_ok(a == nil)
+a = loop do break 1; end; test_ok(a == 1)
+a = loop do break []; end; test_ok(a == [])
+a = loop do break [1]; end; test_ok(a == [1])
+a = loop do break [nil]; end; test_ok(a == [nil])
+a = loop do break [[]]; end; test_ok(a == [[]])
+a = loop do break [*[]]; end; test_ok(a == [])
+a = loop do break [*[1]]; end; test_ok(a == [1])
+a = loop do break [*[1,2]]; end; test_ok(a == [1,2])
+
+a = loop do break *[]; end; test_ok(a == [])
+a = loop do break *[1]; end; test_ok(a == [1])
+a = loop do break *[nil]; end; test_ok(a == [nil])
+a = loop do break *[[]]; end; test_ok(a == [[]])
+a = loop do break *[*[]]; end; test_ok(a == [])
+a = loop do break *[*[1]]; end; test_ok(a == [1])
+a = loop do break *[*[1,2]]; end; test_ok(a == [1,2])
+
+*a = loop do break; end; test_ok(a == [nil])
+*a = loop do break nil; end; test_ok(a == [nil])
+*a = loop do break 1; end; test_ok(a == [1])
+*a = loop do break []; end; test_ok(a == [])
+*a = loop do break [1]; end; test_ok(a == [1])
+*a = loop do break [nil]; end; test_ok(a == [nil])
+*a = loop do break [[]]; end; test_ok(a == [[]])
+*a = loop do break [1,2]; end; test_ok(a == [1,2])
+*a = loop do break [*[]]; end; test_ok(a == [])
+*a = loop do break [*[1]]; end; test_ok(a == [1])
+*a = loop do break [*[1,2]]; end; test_ok(a == [1,2])
+
+*a = loop do break *[]; end; test_ok(a == [])
+*a = loop do break *[1]; end; test_ok(a == [1])
+*a = loop do break *[nil]; end; test_ok(a == [nil])
+*a = loop do break *[[]]; end; test_ok(a == [[]])
+*a = loop do break *[1,2]; end; test_ok(a == [1,2])
+*a = loop do break *[*[]]; end; test_ok(a == [])
+*a = loop do break *[*[1]]; end; test_ok(a == [1])
+*a = loop do break *[*[1,2]]; end; test_ok(a == [1,2])
+
+*a = *loop do break *[[]]; end; test_ok(a == [[]])
+*a = *loop do break *[1,2]; end; test_ok(a == [1,2])
+*a = *loop do break *[*[1,2]]; end; test_ok(a == [1,2])
+
+a,b,*c = loop do break; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break nil; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break 1; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break []; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break [1]; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break [nil]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break [[]]; end; test_ok([a,b,c] == [[],nil,[]])
+a,b,*c = loop do break [1,2]; end; test_ok([a,b,c] == [1,2,[]])
+a,b,*c = loop do break [*[]]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break [*[1]]; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break [*[1,2]]; end; test_ok([a,b,c] == [1,2,[]])
+
+a,b,*c = loop do break *[]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break *[1]; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break *[nil]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break *[[]]; end; test_ok([a,b,c] == [[],nil,[]])
+a,b,*c = loop do break *[1,2]; end; test_ok([a,b,c] == [1,2,[]])
+a,b,*c = loop do break *[*[]]; end; test_ok([a,b,c] == [nil,nil,[]])
+a,b,*c = loop do break *[*[1]]; end; test_ok([a,b,c] == [1,nil,[]])
+a,b,*c = loop do break *[*[1,2]]; end; test_ok([a,b,c] == [1,2,[]])
+
+def r(val); a = yield(); test_ok(a == val, 2); end
+r(nil){next}
+r(nil){next nil}
+r(1){next 1}
+r([]){next []}
+r([1]){next [1]}
+r([nil]){next [nil]}
+r([[]]){next [[]]}
+r([]){next [*[]]}
+r([1]){next [*[1]]}
+r([1,2]){next [*[1,2]]}
+
+r([]){next *[]}
+r([1]){next *[1]}
+r([nil]){next *[nil]}
+r([[]]){next *[[]]}
+r([]){next *[*[]]}
+r([1]){next *[*[1]]}
+r([1,2]){next *[*[1,2]]}
+
+def r(val); *a = yield(); test_ok(a == val, 2); end
+r([nil]){next}
+r([nil]){next nil}
+r([1]){next 1}
+r([]){next []}
+r([1]){next [1]}
+r([nil]){next [nil]}
+r([[]]){next [[]]}
+r([1,2]){next [1,2]}
+r([]){next [*[]]}
+r([1]){next [*[1]]}
+r([1,2]){next [*[1,2]]}
+
+def r(val); *a = *yield(); test_ok(a == val, 2); end
+r([[]]){next *[[]]}
+r([1,2]){next *[1,2]}
+r([1,2]){next *[*[1,2]]}
+
+def r(val); a,b,*c = yield(); test_ok([a,b,c] == val, 2); end
+r([nil,nil,[]]){next}
+r([nil,nil,[]]){next nil}
+r([1,nil,[]]){next 1}
+r([nil,nil,[]]){next []}
+r([1,nil,[]]){next [1]}
+r([nil,nil,[]]){next [nil]}
+r([[],nil,[]]){next [[]]}
+r([1,2,[]]){next [1,2]}
+r([nil,nil,[]]){next [*[]]}
+r([1,nil,[]]){next [*[1]]}
+r([1,2,[]]){next [*[1,2]]}
+
+def r(val); a,b,*c = *yield(); test_ok([a,b,c] == val, 2); end
+r([[],nil,[]]){next *[[]]}
+r([1,2,[]]){next *[1,2]}
+r([1,2,[]]){next *[*[1,2]]}
+
+test_check "condition"
+
+$x = '0';
+
+$x == $x && test_ok(true)
+$x != $x && test_ok(false)
+$x == $x || test_ok(false)
+$x != $x || test_ok(true)
+
+# first test to see if we can run the tests.
+
+test_check "if/unless";
+
+$x = 'test';
+test_ok(if $x == $x then true else false end)
+$bad = false
+unless $x == $x
+  $bad = true
+end
+test_ok(!$bad)
+test_ok(unless $x != $x then true else false end)
+
+test_check "case"
+
+case 5
+when 1, 2, 3, 4, 6, 7, 8
+  test_ok(false)
+when 5
+  test_ok(true)
+end
+
+case 5
+when 5
+  test_ok(true)
+when 1..10
+  test_ok(false)
+end
+
+case 5
+when 1..10
+  test_ok(true)
+else
+  test_ok(false)
+end
+
+case 5
+when 5
+  test_ok(true)
+else
+  test_ok(false)
+end
+
+case "foobar"
+when /^f.*r$/
+  test_ok(true)
+else
+  test_ok(false)
+end
+
+test_check "while/until";
+
+while_tmp = "while_tmp.#{$$}"
+tmp = open(while_tmp, "w")
+tmp.print "tvi925\n";
+tmp.print "tvi920\n";
+tmp.print "vt100\n";
+tmp.print "Amiga\n";
+tmp.print "paper\n";
+tmp.close
+
+# test break
+
+tmp = open(while_tmp, "r")
+test_ok(tmp.kind_of?(File))
+
+while line = tmp.gets()
+  break if /vt100/ =~ line
+end
+
+test_ok(!tmp.eof? && /vt100/ =~ line)
+tmp.close
+
+# test next
+$bad = false
+tmp = open(while_tmp, "r")
+while line = tmp.gets()
+  next if /vt100/ =~ line
+  $bad = 1 if /vt100/ =~ line
+end
+test_ok(!(!tmp.eof? || /vt100/ =~ line || $bad))
+tmp.close
+
+# test redo
+$bad = false
+tmp = open(while_tmp, "r")
+while line = tmp.gets()
+  lastline = line
+  line = line.gsub(/vt100/, 'VT100')
+  if lastline != line
+    line.gsub!('VT100', 'Vt100')
+    redo
+  end
+  $bad = 1 if /vt100/ =~ line
+  $bad = 1 if /VT100/ =~ line
+end
+test_ok(tmp.eof? && !$bad)
+tmp.close
+
+sum=0
+for i in 1..10
+  sum += i
+  i -= 1
+  if i > 0
+    redo
+  end
+end
+test_ok(sum == 220)
+
+# test interval
+$bad = false
+tmp = open(while_tmp, "r")
+while line = tmp.gets()
+  break if 3
+  case line
+  when /vt100/, /Amiga/, /paper/
+    $bad = true
+  end
+end
+test_ok(!$bad)
+tmp.close
+
+File.unlink while_tmp or `/bin/rm -f "#{while_tmp}"`
+test_ok(!File.exist?(while_tmp))
+
+i = 0
+until i>4
+  i+=1
+end
+test_ok(i>4)
+
+
+# exception handling
+test_check "exception";
+
+begin
+  raise "this must be handled"
+  test_ok(false)
+rescue
+  test_ok(true)
+end
+
+$bad = true
+begin
+  raise "this must be handled no.2"
+rescue
+  if $bad
+    $bad = false
+    retry
+    test_ok(false)
+  end
+end
+test_ok(true)
+
+# exception in rescue clause
+$string = "this must be handled no.3"
+begin
+  begin
+    raise "exception in rescue clause"
+  rescue
+    raise $string
+  end
+  test_ok(false)
+rescue => e
+  test_ok($! == e)
+  test_ok(e.message == $string)
+  test_ok(e != $string)
+end
+
+# exception in ensure clause
+begin
+  begin
+    raise "this must be handled no.4"
+  ensure
+    raise "exception in ensure clause"
+  end
+  test_ok(false)
+rescue
+  test_ok(true)
+end
+
+$bad = true
+begin
+  begin
+    raise "this must be handled no.5"
+  ensure
+    $bad = false
+  end
+rescue
+end
+test_ok(!$bad)
+
+$bad = true
+begin
+  begin
+    raise "this must be handled no.6"
+  ensure
+    $bad = false
+  end
+rescue
+end
+test_ok(!$bad)
+
+$bad = true
+while true
+  begin
+    break
+  ensure
+    $bad = false
+  end
+end
+test_ok(!$bad)
+
+test_ok(catch(:foo) {
+     loop do
+       loop do
+	 throw :foo, true
+	 break
+       end
+       break
+       test_ok(false)			# should not reach here
+     end
+     false
+   })
+
+test_check "array"
+test_ok([1, 2] + [3, 4] == [1, 2, 3, 4])
+test_ok([1, 2] * 2 == [1, 2, 1, 2])
+test_ok([1, 2] * ":" == "1:2")
+
+test_ok([1, 2].hash == [1, 2].hash)
+
+test_ok([1,2,3] & [2,3,4] == [2,3])
+test_ok([1,2,3] | [2,3,4] == [1,2,3,4])
+test_ok([1,2,3] - [2,3] == [1])
+
+$x = [0, 1, 2, 3, 4, 5]
+test_ok($x[2] == 2)
+test_ok($x[1..3] == [1, 2, 3])
+test_ok($x[1,3] == [1, 2, 3])
+
+$x[0, 2] = 10
+test_ok($x[0] == 10 && $x[1] == 2)
+
+$x[0, 0] = -1
+test_ok($x[0] == -1 && $x[1] == 10)
+
+$x[-1, 1] = 20
+test_ok($x[-1] == 20 && $x.pop == 20)
+
+# array and/or
+test_ok(([1,2,3]&[2,4,6]) == [2])
+test_ok(([1,2,3]|[2,4,6]) == [1,2,3,4,6])
+
+# compact
+$x = [nil, 1, nil, nil, 5, nil, nil]
+$x.compact!
+test_ok($x == [1, 5])
+
+# uniq
+$x = [1, 1, 4, 2, 5, 4, 5, 1, 2]
+$x.uniq!
+test_ok($x == [1, 4, 2, 5])
+
+# empty?
+test_ok(!$x.empty?)
+$x = []
+test_ok($x.empty?)
+
+# sort
+$x = ["it", "came", "to", "pass", "that", "..."]
+$x = $x.sort.join(" ")
+test_ok($x == "... came it pass that to")
+$x = [2,5,3,1,7]
+$x.sort!{|a,b| a<=>b}		# sort with condition
+test_ok($x == [1,2,3,5,7])
+$x.sort!{|a,b| b-a}		# reverse sort
+test_ok($x == [7,5,3,2,1])
+
+# split test
+$x = "The Book of Mormon"
+test_ok($x.split(//).reverse!.join == $x.reverse)
+test_ok($x.reverse == $x.reverse!)
+test_ok("1 byte string".split(//).reverse.join(":") == "g:n:i:r:t:s: :e:t:y:b: :1")
+$x = "a b c  d"
+test_ok($x.split == ['a', 'b', 'c', 'd'])
+test_ok($x.split(' ') == ['a', 'b', 'c', 'd'])
+test_ok(defined? "a".chomp)
+test_ok("abc".scan(/./) == ["a", "b", "c"])
+test_ok("1a2b3c".scan(/(\d.)/) == [["1a"], ["2b"], ["3c"]])
+# non-greedy match
+test_ok("a=12;b=22".scan(/(.*?)=(\d*);?/) == [["a", "12"], ["b", "22"]])
+
+$x = [1]
+test_ok(($x * 5).join(":") == '1:1:1:1:1')
+test_ok(($x * 1).join(":") == '1')
+test_ok(($x * 0).join(":") == '')
+
+*$x = *(1..7).to_a
+test_ok($x.size == 7)
+test_ok($x == [1, 2, 3, 4, 5, 6, 7])
+
+$x = [1,2,3]
+$x[1,0] = $x
+test_ok($x == [1,1,2,3,2,3])
+
+$x = [1,2,3]
+$x[-1,0] = $x
+test_ok($x == [1,2,1,2,3,3])
+
+$x = [1,2,3]
+$x.concat($x)
+test_ok($x == [1,2,3,1,2,3])
+
+test_check "hash"
+$x = {1=>2, 2=>4, 3=>6}
+
+test_ok($x[1] == 2)
+
+test_ok(begin
+     for k,v in $x
+       raise if k*2 != v
+     end
+     true
+   rescue
+     false
+   end)
+
+test_ok($x.length == 3)
+test_ok($x.has_key?(1))
+test_ok($x.has_value?(4))
+test_ok($x.values_at(2,3) == [4,6])
+test_ok($x == {1=>2, 2=>4, 3=>6})
+
+$z = $x.keys.sort.join(":")
+test_ok($z == "1:2:3")
+
+$z = $x.values.sort.join(":")
+test_ok($z == "2:4:6")
+test_ok($x == $x)
+
+$x.shift
+test_ok($x.length == 2)
+
+$z = [1,2]
+$x[$z] = 256
+test_ok($x[$z] == 256)
+
+$x = Hash.new(0)
+$x[1] = 1
+test_ok($x[1] == 1)
+test_ok($x[2] == 0)
+
+$x = Hash.new([])
+test_ok($x[22] == [])
+test_ok($x[22].equal?($x[22]))
+
+$x = Hash.new{[]}
+test_ok($x[22] == [])
+test_ok(!$x[22].equal?($x[22]))
+
+$x = Hash.new{|h,k| $z = k; h[k] = k*2}
+$z = 0
+test_ok($x[22] == 44)
+test_ok($z == 22)
+$z = 0
+test_ok($x[22] == 44)
+test_ok($z == 0)
+$x.default = 5
+test_ok($x[23] == 5)
+
+$x = Hash.new
+def $x.default(k)
+  $z = k
+  self[k] = k*2
+end
+$z = 0
+test_ok($x[22] == 44)
+test_ok($z == 22)
+$z = 0
+test_ok($x[22] == 44)
+test_ok($z == 0)
+
+test_check "iterator"
+
+test_ok(!iterator?)
+
+def ttt
+  test_ok(iterator?)
+end
+ttt{}
+
+# yield at top level
+test_ok(!defined?(yield))
+
+$x = [1, 2, 3, 4]
+$y = []
+
+# iterator over array
+for i in $x
+  $y.push i
+end
+test_ok($x == $y)
+
+# nested iterator
+def tt
+  1.upto(10) {|i|
+    yield i
+  }
+end
+
+i=0
+tt{|i| break if i == 5}
+test_ok(i == 0)
+
+def tt2(dummy)
+  yield 1
+end
+
+def tt3(&block)
+  tt2(raise(ArgumentError,""),&block)
+end
+
+$x = false
+begin
+  tt3{}
+rescue ArgumentError
+  $x = true
+rescue Exception
+end
+test_ok($x)
+
+def tt4 &block
+  tt2(raise(ArgumentError,""),&block)
+end
+$x = false
+begin
+  tt4{}
+rescue ArgumentError
+  $x = true
+rescue Exception
+end
+test_ok($x)
+
+# iterator break/redo/next/retry
+done = true
+loop{
+  break
+  done = false			# should not reach here
+}
+test_ok(done)
+
+done = false
+$bad = false
+loop {
+  break if done
+  done = true
+  next
+  $bad = true			# should not reach here
+}
+test_ok(!$bad)
+
+done = false
+$bad = false
+loop {
+  break if done
+  done = true
+  redo
+  $bad = true			# should not reach here
+}
+test_ok(!$bad)
+
+$x = []
+for i in 1 .. 7
+  $x.push i
+end
+test_ok($x.size == 7)
+test_ok($x == [1, 2, 3, 4, 5, 6, 7])
+
+# append method to built-in class
+class Array
+  def iter_test1
+    collect{|e| [e, yield(e)]}.sort{|a,b|a[1]<=>b[1]}
+  end
+  def iter_test2
+    a = collect{|e| [e, yield(e)]}
+    a.sort{|a,b|a[1]<=>b[1]}
+  end
+end
+$x = [[1,2],[3,4],[5,6]]
+test_ok($x.iter_test1{|x|x} == $x.iter_test2{|x|x})
+
+class IterTest
+  def initialize(e); @body = e; end
+
+  def each0(&block); @body.each(&block); end
+  def each1(&block); @body.each {|*x| block.call(*x) } end
+  def each2(&block); @body.each {|*x| block.call(x) } end
+  def each3(&block); @body.each {|x| block.call(*x) } end
+  def each4(&block); @body.each {|x| block.call(x) } end
+  def each5; @body.each {|*x| yield(*x) } end
+  def each6; @body.each {|*x| yield(x) } end
+  def each7; @body.each {|x| yield(*x) } end
+  def each8; @body.each {|x| yield(x) } end
+
+  def f(a)
+    a
+  end
+end
+test_ok(IterTest.new(nil).method(:f).to_proc.call([1]) == [1])
+m = /\w+/.match("abc")
+test_ok(IterTest.new(nil).method(:f).to_proc.call([m]) == [m])
+
+IterTest.new([0]).each0 {|x| test_ok(x == 0)}
+IterTest.new([1]).each1 {|x| test_ok(x == 1)}
+IterTest.new([2]).each2 {|x| test_ok(x == [2])}
+#IterTest.new([3]).each3 {|x| test_ok(x == 3)}
+IterTest.new([4]).each4 {|x| test_ok(x == 4)}
+IterTest.new([5]).each5 {|x| test_ok(x == 5)}
+IterTest.new([6]).each6 {|x| test_ok(x == [6])}
+#IterTest.new([7]).each7 {|x| test_ok(x == 7)}
+IterTest.new([8]).each8 {|x| test_ok(x == 8)}
+
+IterTest.new([[0]]).each0 {|x| test_ok(x == [0])}
+IterTest.new([[1]]).each1 {|x| test_ok(x == [1])}
+IterTest.new([[2]]).each2 {|x| test_ok(x == [[2]])}
+IterTest.new([[3]]).each3 {|x| test_ok(x == 3)}
+IterTest.new([[4]]).each4 {|x| test_ok(x == [4])}
+IterTest.new([[5]]).each5 {|x| test_ok(x == [5])}
+IterTest.new([[6]]).each6 {|x| test_ok(x == [[6]])}
+IterTest.new([[7]]).each7 {|x| test_ok(x == 7)}
+IterTest.new([[8]]).each8 {|x| test_ok(x == [8])}
+
+IterTest.new([[0,0]]).each0 {|*x| test_ok(x == [[0,0]])}
+IterTest.new([[8,8]]).each8 {|*x| test_ok(x == [[8,8]])}
+
+def m0(v)
+  v
+end
+
+def m1
+  m0(block_given?)
+end
+test_ok(m1{p 'test'})
+test_ok(!m1)
+
+def m
+  m0(block_given?,&Proc.new{})
+end
+test_ok(m1{p 'test'})
+test_ok(!m1)
+
+class C
+  include Enumerable
+  def initialize
+    @a = [1,2,3]
+  end
+  def each(&block)
+    @a.each(&block)
+  end
+end
+
+test_ok(C.new.collect{|n| n} == [1,2,3])
+
+test_ok(Proc == lambda{}.class)
+test_ok(Proc == Proc.new{}.class)
+lambda{|a|test_ok(a==1)}.call(1)
+def block_test(klass, &block)
+  test_ok(klass === block)
+end
+
+block_test(NilClass)
+block_test(Proc){}
+
+def call_argument_test(state, proc, *args)
+  x = state
+  begin
+    proc.call(*args)
+  rescue ArgumentError
+    x = !x
+  end
+  test_ok(x,2)
+end
+
+call_argument_test(true, lambda{||})
+call_argument_test(false, lambda{||}, 1)
+call_argument_test(true, lambda{|a,|}, 1)
+call_argument_test(false, lambda{|a,|})
+call_argument_test(false, lambda{|a,|}, 1,2)
+
+call_argument_test(true, Proc.new{||})
+call_argument_test(true, Proc.new{||}, 1)
+call_argument_test(true, Proc.new{|a,|}, 1)
+call_argument_test(true, Proc.new{|a,|})
+call_argument_test(true, Proc.new{|a,|}, 1,2)
+
+def block_get(&block)
+  block
+end
+
+test_ok(Proc == block_get{}.class)
+call_argument_test(true, block_get{||})
+call_argument_test(true, block_get{||}, 1)
+call_argument_test(true, block_get{|a,|}, 1)
+call_argument_test(true, block_get{|a,|})
+call_argument_test(true, block_get{|a,|}, 1,2)
+
+call_argument_test(true, block_get(&lambda{||}))
+call_argument_test(false, block_get(&lambda{||}),1)
+call_argument_test(true, block_get(&lambda{|a,|}),1)
+call_argument_test(false, block_get(&lambda{|a,|}),1,2)
+
+blk = block_get{11}
+test_ok(blk.class == Proc)
+test_ok(blk.to_proc.class == Proc)
+test_ok(blk.clone.call == 11)
+test_ok(block_get(&blk).class == Proc)
+
+lmd = lambda{44}
+test_ok(lmd.class == Proc)
+test_ok(lmd.to_proc.class == Proc)
+test_ok(lmd.clone.call == 44)
+test_ok(block_get(&lmd).class == Proc)
+
+test_ok(Proc.new{|a,| a}.yield(1,2,3) == 1)
+call_argument_test(true, Proc.new{|a,|}, 1,2)
+
+test_ok(Proc.new{|&b| b.call(10)}.call {|x| x} == 10)
+test_ok(Proc.new{|a,&b| b.call(a)}.call(12) {|x| x} == 12)
+
+def test_return1
+  Proc.new {
+    return 55
+  }.yield + 5
+end
+test_ok(test_return1() == 55)
+def test_return2
+  lambda {
+    return 55
+  }.call + 5
+end
+test_ok(test_return2() == 60)
+
+def proc_call(&b)
+  b.call
+end
+def proc_yield()
+  yield
+end
+def proc_return1
+  lambda{return 42}.call+1
+end
+test_ok(proc_return1() == 43)
+def proc_return2
+  ->{return 42}.call+1
+end
+test_ok(proc_return2() == 43)
+def proc_return3
+  proc_call{return 42}+1
+end
+test_ok(proc_return3() == 42)
+def proc_return4
+  proc_yield{return 42}+1
+end
+test_ok(proc_return4() == 42)
+
+def ljump_test(state, proc, *args)
+  x = state
+  begin
+    proc.call(*args)
+  rescue LocalJumpError
+    x = !x
+  end
+  test_ok(x,2)
+end
+
+ljump_test(false, block_get{break})
+ljump_test(true, lambda{break})
+
+def exit_value_test(&block)
+  block.call
+rescue LocalJumpError
+  $!.exit_value
+end
+
+test_ok(45 == exit_value_test{break 45})
+
+test_ok(55 == begin
+              block_get{break 55}.call
+            rescue LocalJumpError
+              $!.exit_value
+            end)
+
+def block_call(&block)
+  block.call
+end
+
+def test_b1
+  block_call{break 11}
+end
+test_ok(test_b1() == 11)
+
+def ljump_rescue(r)
+  begin
+    yield
+  rescue LocalJumpError => e
+    r if /from proc-closure/ =~ e.message
+  end
+end
+
+def test_b2
+  ljump_rescue(22) do
+    block_get{break 21}.call
+  end
+end
+test_ok(test_b2() == 22)
+
+def test_b3
+  ljump_rescue(33) do
+    Proc.new{break 31}.yield
+  end
+end
+test_ok(test_b3() == 33)
+
+def test_b4
+  lambda{break 44}.call
+end
+test_ok(test_b4() == 44)
+
+def test_b5
+  ljump_rescue(55) do
+    b = block_get{break 54}
+    block_call(&b)
+  end
+end
+test_ok(test_b5() == 55)
+
+def test_b6
+  b = lambda{break 67}
+  block_call(&b)
+  66
+end
+test_ok(test_b6() == 66)
+
+def util_r7
+  block_get{break 78}
+end
+
+def test_b7
+  b = util_r7()
+  ljump_rescue(77) do
+    block_call(&b)
+  end
+end
+test_ok(test_b7() == 77)
+
+def util_b8(&block)
+  block_call(&block)
+end
+
+def test_b8
+  util_b8{break 88}
+end
+test_ok(test_b8() == 88)
+
+def util_b9(&block)
+  lambda{block.call; 98}.call
+end
+
+def test_b9
+  util_b9{break 99}
+end
+test_ok(test_b9() == 99)
+
+def util_b10
+  util_b9{break 100}
+end
+
+def test_b10
+  util_b10()
+end
+test_ok(test_b10() == 100)
+
+def test_b11
+  ljump_rescue(111) do
+    loop do
+      Proc.new{break 110}.yield
+      break 112
+    end
+  end
+end
+test_ok(test_b11() == 111)
+
+def test_b12
+  loop do
+    break lambda{break 122}.call
+    break 121
+  end
+end
+test_ok(test_b12() == 122)
+
+def test_b13
+  ljump_rescue(133) do
+    while true
+      Proc.new{break 130}.yield
+      break 131
+    end
+  end
+end
+test_ok(test_b13() == 133)
+
+def test_b14
+  while true
+    break lambda{break 144}.call
+    break 143
+  end
+end
+test_ok(test_b14() == 144)
+
+def test_b15
+  [0].each {|c| yield 1 }
+  156
+end
+test_ok(test_b15{|e| break 155 } == 155)
+
+def marity_test(m)
+  method = method(m)
+  test_ok(method.arity == method.to_proc.arity, 2)
+end
+marity_test(:test_ok)
+marity_test(:marity_test)
+marity_test(:p)
+
+lambda(&method(:test_ok)).call(true)
+lambda(&block_get{|a,n| test_ok(a,n)}).call(true, 2)
+
+class ITER_TEST1
+   def a
+     block_given?
+   end
+end
+
+class ITER_TEST2 < ITER_TEST1
+   def a
+     test_ok(super)
+     super
+   end
+end
+test_ok(ITER_TEST2.new.a {})
+
+class ITER_TEST3
+  def foo x
+    return yield if block_given?
+    x
+  end
+end
+
+class ITER_TEST4 < ITER_TEST3
+  def foo x
+    test_ok(super == yield)
+    test_ok(super(x, &nil) == x)
+  end
+end
+
+ITER_TEST4.new.foo(44){55}
+
+class ITER_TEST5
+   def tt(aa)
+     aa
+   end
+
+   def uu(a)
+      class << self
+         define_method(:tt) do |sym|
+            super(sym)
+         end
+      end
+   end
+
+   def xx(*x)
+     x.size
+   end
+end
+
+a = ITER_TEST5.new
+a.uu(12)
+test_ok(a.tt(1) == 1)
+
+class ITER_TEST6 < ITER_TEST5
+   def xx(*a)
+      a << 12
+      super
+   end
+end
+
+test_ok(ITER_TEST6.new.xx([24]) == 2)
+
+test_check "float"
+test_ok(2.6.floor == 2)
+test_ok((-2.6).floor == -3)
+test_ok(2.6.ceil == 3)
+test_ok((-2.6).ceil == -2)
+test_ok(2.6.truncate == 2)
+test_ok((-2.6).truncate == -2)
+test_ok(2.6.round == 3)
+test_ok((-2.4).truncate == -2)
+test_ok((13.4 % 1 - 0.4).abs < 0.0001)
+nan = 0.0/0
+def nan_test(x,y)
+  test_ok(x != y)
+  test_ok((x < y) == false)
+  test_ok((x > y) == false)
+  test_ok((x <= y) == false)
+  test_ok((x >= y) == false)
+end
+nan_test(nan, nan)
+nan_test(nan, 0)
+nan_test(nan, 1)
+nan_test(nan, -1)
+nan_test(nan, 1000)
+nan_test(nan, -1000)
+nan_test(nan, 1_000_000_000_000)
+nan_test(nan, -1_000_000_000_000)
+nan_test(nan, 100.0);
+nan_test(nan, -100.0);
+nan_test(nan, 0.001);
+nan_test(nan, -0.001);
+nan_test(nan, 1.0/0);
+nan_test(nan, -1.0/0);
+
+#s = "3.7517675036461267e+17"
+#test_ok(s == sprintf("%.16e", s.to_f))
+f = 3.7517675036461267e+17
+test_ok(f == sprintf("%.16e", f).to_f)
+
+
+test_check "bignum"
+def fact(n)
+  return 1 if n == 0
+  f = 1
+  while n>0
+    f *= n
+    n -= 1
+  end
+  return f
+end
+$x = fact(40)
+test_ok($x == $x)
+test_ok($x == fact(40))
+test_ok($x < $x+2)
+test_ok($x > $x-2)
+test_ok($x == 815915283247897734345611269596115894272000000000)
+test_ok($x != 815915283247897734345611269596115894272000000001)
+test_ok($x+1 == 815915283247897734345611269596115894272000000001)
+test_ok($x/fact(20) == 335367096786357081410764800000)
+$x = -$x
+test_ok($x == -815915283247897734345611269596115894272000000000)
+test_ok(2-(2**32) == -(2**32-2))
+test_ok(2**32 - 5 == (2**32-3)-2)
+
+$good = true;
+for i in 1000..1014
+  $good = false if ((1 << i) != (2**i))
+end
+test_ok($good)
+
+$good = true;
+n1= 1 << 1000
+for i in 1000..1014
+  $good = false if ((1 << i) != n1)
+  n1 *= 2
+end
+test_ok($good)
+
+$good = true;
+n2=n1
+for i in 1..10
+  n1 = n1 / 2
+  n2 = n2 >> 1
+  $good = false if (n1 != n2)
+end
+test_ok($good)
+
+$good = true;
+for i in 4000..4096
+  n1 = 1 << i;
+  if (n1**2-1) / (n1+1) != (n1-1)
+    $good = false
+  end
+end
+test_ok($good)
+
+b = 10**80
+a = b * 9 + 7
+test_ok(7 == a.modulo(b))
+test_ok(-b + 7 == a.modulo(-b))
+test_ok(b + -7 == (-a).modulo(b))
+test_ok(-7 == (-a).modulo(-b))
+test_ok(7 == a.remainder(b))
+test_ok(7 == a.remainder(-b))
+test_ok(-7 == (-a).remainder(b))
+test_ok(-7 == (-a).remainder(-b))
+
+test_ok(10**40+10**20 == 10000000000000000000100000000000000000000)
+test_ok(10**40/10**20 == 100000000000000000000)
+
+a = 677330545177305025495135714080
+b = 14269972710765292560
+test_ok(a % b == 0)
+test_ok(-a % b == 0)
+
+def shift_test(a)
+  b = a / (2 ** 32)
+  c = a >> 32
+  test_ok(b == c)
+
+  b = a * (2 ** 32)
+  c = a << 32
+  test_ok(b == c)
+end
+
+shift_test(-4518325415524767873)
+shift_test(-0xfffffffffffffffff)
+
+test_check "string & char"
+
+test_ok("abcd" == "abcd")
+test_ok("abcd" =~ /abcd/)
+test_ok("abcd" === "abcd")
+# compile time string concatenation
+test_ok("ab" "cd" == "abcd")
+test_ok("#{22}aa" "cd#{44}" == "22aacd44")
+test_ok("#{22}aa" "cd#{44}" "55" "#{66}" == "22aacd445566")
+test_ok("abc" !~ /^$/)
+test_ok("abc\n" !~ /^$/)
+test_ok("abc" !~ /^d*$/)
+test_ok(("abc" =~ /d*$/) == 3)
+test_ok("" =~ /^$/)
+test_ok("\n" =~ /^$/)
+test_ok("a\n\n" =~ /^$/)
+test_ok("abcabc" =~ /.*a/ && $& == "abca")
+test_ok("abcabc" =~ /.*c/ && $& == "abcabc")
+test_ok("abcabc" =~ /.*?a/ && $& == "a")
+test_ok("abcabc" =~ /.*?c/ && $& == "abc")
+test_ok(/(.|\n)*?\n(b|\n)/ =~ "a\nb\n\n" && $& == "a\nb")
+
+test_ok(/^(ab+)+b/ =~ "ababb" && $& == "ababb")
+test_ok(/^(?:ab+)+b/ =~ "ababb" && $& == "ababb")
+test_ok(/^(ab+)+/ =~ "ababb" && $& == "ababb")
+test_ok(/^(?:ab+)+/ =~ "ababb" && $& == "ababb")
+
+test_ok(/(\s+\d+){2}/ =~ " 1 2" && $& == " 1 2")
+test_ok(/(?:\s+\d+){2}/ =~ " 1 2" && $& == " 1 2")
+
+$x = <<END;
+ABCD
+ABCD
+END
+$x.gsub!(/((.|\n)*?)B((.|\n)*?)D/, '\1\3')
+test_ok($x == "AC\nAC\n")
+
+test_ok("foobar" =~ /foo(?=(bar)|(baz))/)
+test_ok("foobaz" =~ /foo(?=(bar)|(baz))/)
+
+$foo = "abc"
+test_ok("#$foo = abc" == "abc = abc")
+test_ok("#{$foo} = abc" == "abc = abc")
+
+foo = "abc"
+test_ok("#{foo} = abc" == "abc = abc")
+
+test_ok('-' * 5 == '-----')
+test_ok('-' * 1 == '-')
+test_ok('-' * 0 == '')
+
+foo = '-'
+test_ok(foo * 5 == '-----')
+test_ok(foo * 1 == '-')
+test_ok(foo * 0 == '')
+
+$x = "a.gif"
+test_ok($x.sub(/.*\.([^\.]+)$/, '\1') == "gif")
+test_ok($x.sub(/.*\.([^\.]+)$/, 'b.\1') == "b.gif")
+test_ok($x.sub(/.*\.([^\.]+)$/, '\2') == "")
+test_ok($x.sub(/.*\.([^\.]+)$/, 'a\2b') == "ab")
+test_ok($x.sub(/.*\.([^\.]+)$/, '<\&>') == "<a.gif>")
+
+# character constants(assumes ASCII)
+test_ok("a"[0] == ?a)
+test_ok(?a == ?a)
+test_ok(?\C-a == "\1")
+test_ok(?\M-a == "\341")
+test_ok(?\M-\C-a == "\201")
+test_ok("a".upcase![0] == ?A)
+test_ok("A".downcase![0] == ?a)
+test_ok("abc".tr!("a-z", "A-Z") == "ABC")
+test_ok("aabbcccc".tr_s!("a-z", "A-Z") == "ABC")
+test_ok("abcc".squeeze!("a-z") == "abc")
+test_ok("abcd".delete!("bc") == "ad")
+
+$x = "abcdef"
+$y = [ ?a, ?b, ?c, ?d, ?e, ?f ]
+$bad = false
+$x.each_byte {|i|
+  if i.chr != $y.shift
+    $bad = true
+    break
+  end
+}
+test_ok(!$bad)
+
+s = "a string"
+s[0..s.size]="another string"
+test_ok(s == "another string")
+
+s = <<EOS
+#{
+[1,2,3].join(",")
+}
+EOS
+test_ok(s == "1,2,3\n")
+test_ok("Just".to_i(36) == 926381)
+test_ok("-another".to_i(36) == -23200231779)
+test_ok(1299022.to_s(36) == "ruby")
+test_ok(-1045307475.to_s(36) == "-hacker")
+test_ok("Just_another_Ruby_hacker".to_i(36) == 265419172580680477752431643787347)
+test_ok(-265419172580680477752431643787347.to_s(36) == "-justanotherrubyhacker")
+
+a = []
+(0..255).each {|n|
+  ch = [n].pack("C")
+  a.push ch if /a#{Regexp.quote ch}b/x =~ "ab"
+}
+test_ok(a.size == 0)
+
+test_check "assignment"
+a = nil
+test_ok(defined?(a))
+test_ok(a == nil)
+
+# multiple asignment
+a, b = 1, 2
+test_ok(a == 1 && b == 2)
+
+a, b = b, a
+test_ok(a == 2 && b == 1)
+
+a, = 1,2
+test_ok(a == 1)
+
+a, *b = 1, 2, 3
+test_ok(a == 1 && b == [2, 3])
+
+a, (b, c), d = 1, [2, 3], 4
+test_ok(a == 1 && b == 2 && c == 3 && d == 4)
+
+*a = 1, 2, 3
+test_ok(a == [1, 2, 3])
+
+*a = 4
+test_ok(a == [4])
+
+*a = nil
+test_ok(a == [nil])
+
+test_check "call"
+def aaa(a, b=100, *rest)
+  res = [a, b]
+  res += rest if rest
+  return res
+end
+
+# not enough argument
+begin
+  aaa()				# need at least 1 arg
+  test_ok(false)
+rescue
+  test_ok(true)
+end
+
+begin
+  aaa				# no arg given (exception raised)
+  test_ok(false)
+rescue
+  test_ok(true)
+end
+
+test_ok(aaa(1) == [1, 100])
+test_ok(aaa(1, 2) == [1, 2])
+test_ok(aaa(1, 2, 3, 4) == [1, 2, 3, 4])
+test_ok(aaa(1, *[2, 3, 4]) == [1, 2, 3, 4])
+
+test_check "proc"
+$proc = Proc.new{|i| i}
+test_ok($proc.call(2) == 2)
+test_ok($proc.call(3) == 3)
+
+$proc = Proc.new{|i| i*2}
+test_ok($proc.call(2) == 4)
+test_ok($proc.call(3) == 6)
+
+Proc.new{
+  iii=5				# nested local variable
+  $proc = Proc.new{|i|
+    iii = i
+  }
+  $proc2 = Proc.new {
+    $x = iii			# nested variables shared by procs
+  }
+  # scope of nested variables
+  test_ok(defined?(iii))
+}.call
+test_ok(!defined?(iii))		# out of scope
+
+loop{iii=5; test_ok(eval("defined? iii")); break}
+loop {
+  iii = 10
+  def dyna_var_check
+    loop {
+      test_ok(!defined?(iii))
+      break
+    }
+  end
+  dyna_var_check
+  break
+}
+$x=0
+$proc.call(5)
+$proc2.call
+test_ok($x == 5)
+
+if defined? Process.kill
+  test_check "signal"
+
+  $x = 0
+  trap "SIGINT", Proc.new{|sig| $x = 2}
+  Process.kill "SIGINT", $$
+  100.times {
+    sleep 0.1
+    break if $x != 0
+  }
+  test_ok($x == 2)
+
+  trap "SIGINT", Proc.new{raise "Interrupt"}
+
+  x = false
+  begin
+    Process.kill "SIGINT", $$
+    sleep 0.1
+  rescue
+    x = $!
+  end
+  test_ok(x && /Interrupt/ =~ x.message)
+end
+
+test_check "eval"
+test_ok(eval("") == nil)
+$bad=false
+eval 'while false; $bad = true; print "foo\n" end'
+test_ok(!$bad)
+
+test_ok(eval('Object'))
+test_ok(eval('true'))
+test_ok(!eval('nil'))
+test_ok(!eval('false'))
+
+$foo = 'test_ok(true)'
+begin
+  eval $foo
+rescue
+  test_ok(false)
+end
+
+test_ok(eval("$foo") == 'test_ok(true)')
+test_ok(eval("true") == true)
+i = 5
+test_ok(eval("i == 5"))
+test_ok(eval("i") == 5)
+test_ok(eval("defined? i"))
+
+# eval with binding
+def test_ev
+  local1 = "local1"
+  lambda {
+    local2 = "local2"
+    return binding
+  }.call
+end
+
+$x = test_ev
+test_ok(eval("local1", $x) == "local1") # normal local var
+test_ok(eval("local2", $x) == "local2") # nested local var
+$bad = true
+begin
+  p eval("local1")
+rescue NameError		# must raise error
+  $bad = false
+end
+test_ok(!$bad)
+
+module EvTest
+  EVTEST1 = 25
+  evtest2 = 125
+  $x = binding
+end
+test_ok(eval("EVTEST1", $x) == 25)	# constant in module
+test_ok(eval("evtest2", $x) == 125)	# local var in module
+$bad = true
+begin
+  eval("EVTEST1")
+rescue NameError		# must raise error
+  $bad = false
+end
+test_ok(!$bad)
+
+x = binding #! YARV Limitation: Proc.new{}
+eval "i4 = 1", x
+test_ok(eval("i4", x) == 1)
+x = Proc.new{binding}.call #! YARV Limitation: Proc.new{Proc.new{}}.call
+eval "i4 = 22", x
+test_ok(eval("i4", x) == 22)
+$x = []
+x = Proc.new{binding}.call #! YARV Limitation: Proc.new{Proc.new{}}.call
+eval "(0..9).each{|i5| $x[i5] = Proc.new{i5*2}}", x
+test_ok($x[4].call == 8)
+
+x = binding
+eval "i = 1", x
+test_ok(eval("i", x) == 1)
+x = Proc.new{binding}.call
+eval "i = 22", x
+test_ok(eval("i", x) == 22)
+$x = []
+x = Proc.new{binding}.call
+eval "(0..9).each{|i5| $x[i5] = Proc.new{i5*2}}", x
+test_ok($x[4].call == 8)
+x = Proc.new{binding}.call
+eval "for i6 in 1..1; j6=i6; end", x
+test_ok(eval("defined? i6", x))
+test_ok(eval("defined? j6", x))
+
+Proc.new {
+  p = binding
+  eval "foo11 = 1", p
+  foo22 = 5
+  Proc.new{foo11=22}.call
+  Proc.new{foo22=55}.call
+  test_ok(eval("foo11", p) == eval("foo11"))
+  test_ok(eval("foo11") == 1)
+  test_ok(eval("foo22", p) == eval("foo22"))
+  test_ok(eval("foo22") == 55)
+}.call if false #! YARV Limitation
+
+#! YARV Limitation: p1 = Proc.new{i7 = 0; Proc.new{i7}}.call
+p1 = Proc.new{i7 = 0; binding}.call
+#! YARV Limitation: test_ok(p1.call == 0)
+eval "i7=5", p1
+#! YARV Limitation: test_ok(p1.call == 5)
+test_ok(!defined?(i7))
+
+if false #! YARV Limitation
+p1 = Proc.new{i7 = 0; Proc.new{i7}}.call
+i7 = nil
+test_ok(p1.call == 0)
+eval "i7=1", p1
+test_ok(p1.call == 1)
+eval "i7=5", p1
+test_ok(p1.call == 5)
+test_ok(i7 == nil)
+end
+
+test_check "system"
+test_ok(`echo foobar` == "foobar\n")
+test_ok(`./miniruby -e 'print "foobar"'` == 'foobar')
+
+script_tmp = "script_tmp.#{$$}"
+tmp = open(script_tmp, "w")
+tmp.print "print $zzz\n";
+tmp.close
+
+test_ok(`./miniruby -s #{script_tmp} -zzz` == 'true')
+test_ok(`./miniruby -s #{script_tmp} -zzz=555` == '555')
+
+tmp = open(script_tmp, "w")
+tmp.print "#! /usr/local/bin/ruby -s\n";
+tmp.print "print $zzz\n";
+tmp.close
+
+test_ok(`./miniruby #{script_tmp} -zzz=678` == '678')
+
+tmp = open(script_tmp, "w")
+tmp.print "this is a leading junk\n";
+tmp.print "#! /usr/local/bin/ruby -s\n";
+tmp.print "print $zzz\n";
+tmp.print "__END__\n";
+tmp.print "this is a trailing junk\n";
+tmp.close
+
+test_ok(`./miniruby -x #{script_tmp}` == '')
+test_ok(`./miniruby -x #{script_tmp} -zzz=555` == '555')
+
+tmp = open(script_tmp, "w")
+for i in 1..5
+  tmp.print i, "\n"
+end
+tmp.close
+
+`./miniruby -i.bak -pe '$_.sub!(/^[0-9]+$/){$&.to_i * 5}' #{script_tmp}`
+done = true
+tmp = open(script_tmp, "r")
+while tmp.gets
+  if $_.to_i % 5 != 0
+    done = false
+    break
+  end
+end
+tmp.close
+test_ok(done)
+
+File.unlink script_tmp or `/bin/rm -f "#{script_tmp}"`
+File.unlink "#{script_tmp}.bak" or `/bin/rm -f "#{script_tmp}.bak"`
+
+test_check "const"
+TEST1 = 1
+TEST2 = 2
+
+module Const
+  TEST3 = 3
+  TEST4 = 4
+end
+
+module Const2
+  TEST3 = 6
+  TEST4 = 8
+end
+
+include Const
+
+test_ok([TEST1,TEST2,TEST3,TEST4] == [1,2,3,4])
+
+include Const2
+STDERR.print "intentionally redefines TEST3, TEST4\n" if $VERBOSE
+test_ok([TEST1,TEST2,TEST3,TEST4] == [1,2,6,8])
+
+
+test_ok((String <=> Object) == -1)
+test_ok((Object <=> String) == 1)
+test_ok((Array <=> String) == nil)
+
+test_check "clone"
+foo = Object.new
+def foo.test
+  "test"
+end
+bar = foo.clone
+def bar.test2
+  "test2"
+end
+
+test_ok(bar.test2 == "test2")
+test_ok(bar.test == "test")
+test_ok(foo.test == "test")
+
+begin
+  foo.test2
+  test_ok false
+rescue NoMethodError
+  test_ok true
+end
+
+module M001; end
+module M002; end
+module M003; include M002; end
+module M002; include M001; end
+module M003; include M002; end
+
+test_ok(M003.ancestors == [M003, M002, M001])
+
+test_check "marshal"
+$x = [1,2,3,[4,5,"foo"],{1=>"bar"},2.5,fact(30)]
+$y = Marshal.dump($x)
+test_ok($x == Marshal.load($y))
+
+StrClone=String.clone;
+test_ok(Marshal.load(Marshal.dump(StrClone.new("abc"))).class == StrClone)
+
+[[1,2,3,4], [81, 2, 118, 3146]].each { |w,x,y,z|
+  a = (x.to_f + y.to_f / z.to_f) * Math.exp(w.to_f / (x.to_f + y.to_f / z.to_f))
+  ma = Marshal.dump(a)
+  b = Marshal.load(ma)
+  test_ok(a == b)
+}
+
+test_check "pack"
+
+$format = "c2x5CCxsdils_l_a6";
+# Need the expression in here to force ary[5] to be numeric.  This avoids
+# test2 failing because ary2 goes str->numeric->str and ary does not.
+ary = [1,-100,127,128,32767,987.654321098 / 100.0,12345,123456,-32767,-123456,"abcdef"]
+$x = ary.pack($format)
+ary2 = $x.unpack($format)
+
+test_ok(ary.length == ary2.length)
+test_ok(ary.join(':') == ary2.join(':'))
+test_ok($x =~ /def/)
+
+$x = [-1073741825]
+test_ok($x.pack("q").unpack("q") == $x)
+
+test_check "math"
+test_ok(Math.sqrt(4) == 2)
+
+include Math
+test_ok(sqrt(4) == 2)
+
+test_check "struct"
+struct_test = Struct.new("Test", :foo, :bar)
+test_ok(struct_test == Struct::Test)
+
+test = struct_test.new(1, 2)
+test_ok(test.foo == 1 && test.bar == 2)
+test_ok(test[0] == 1 && test[1] == 2)
+
+a, b = test.to_a
+test_ok(a == 1 && b == 2)
+
+test[0] = 22
+test_ok(test.foo == 22)
+
+test.bar = 47
+test_ok(test.bar == 47)
+
+test_check "variable"
+test_ok($$.instance_of?(Integer))
+
+# read-only variable
+begin
+  $$ = 5
+  test_ok false
+rescue NameError
+  test_ok true
+end
+
+foobar = "foobar"
+$_ = foobar
+test_ok($_ == foobar)
+
+class Gods
+  @@rule = "Uranus"		# private to Gods
+  def ruler0
+    @@rule
+  end
+
+  def self.ruler1		# <= per method definition style
+    @@rule
+  end
+  class << self			# <= multiple method definition style
+    def ruler2
+      @@rule
+    end
+  end
+end
+
+module Olympians
+  @@rule ="Zeus"
+  def ruler3
+    @@rule
+  end
+end
+
+class Titans < Gods
+  @@rule = "Cronus"		# do not affect @@rule in Gods
+  include Olympians
+  def ruler4
+    @@rule
+  end
+end
+
+test_ok(Gods.new.ruler0 == "Cronus")
+test_ok(Gods.ruler1 == "Cronus")
+test_ok(Gods.ruler2 == "Cronus")
+test_ok(Titans.ruler1 == "Cronus")
+test_ok(Titans.ruler2 == "Cronus")
+atlas = Titans.new
+test_ok(atlas.ruler0 == "Cronus")
+test_ok(atlas.ruler3 == "Zeus")
+test_ok(atlas.ruler4 == "Cronus")
+
+test_check "trace"
+$x = 1234
+$y = 0
+trace_var :$x, Proc.new{$y = $x}
+$x = 40414
+test_ok($y == $x)
+
+untrace_var :$x
+$x = 19660208
+test_ok($y != $x)
+
+trace_var :$x, Proc.new{$x *= 2}
+$x = 5
+test_ok($x == 10)
+
+untrace_var :$x
+
+test_check "defined?"
+
+test_ok(defined?($x))		# global variable
+test_ok(defined?($x) == 'global-variable')# returns description
+
+foo=5
+test_ok(defined?(foo))		# local variable
+
+test_ok(defined?(Array))	# constant
+test_ok(defined?(Object.new))	# method
+test_ok(!defined?(Object.print))# private method
+test_ok(defined?(1 == 2))	# operator expression
+
+class Foo
+  def foo
+    p :foo
+  end
+  protected :foo
+  def bar(f)
+    test_ok(defined?(self.foo))
+    test_ok(defined?(f.foo))
+  end
+end
+f = Foo.new
+test_ok(defined?(f.foo) == nil)
+f.bar(f)
+
+def defined_test
+  return !defined?(yield)
+end
+
+test_ok(defined_test)		# not iterator
+test_ok(!defined_test{})	# called as iterator
+
+test_check "alias"
+class Alias0
+  def foo; "foo" end
+end
+class Alias1<Alias0
+  alias bar foo
+  def foo; "foo+" + super end
+end
+class Alias2<Alias1
+  alias baz foo
+  undef foo
+end
+
+x = Alias2.new
+test_ok(x.bar == "foo")
+test_ok(x.baz == "foo+foo")
+
+# test_check for cache
+test_ok(x.baz == "foo+foo")
+
+class Alias3<Alias2
+  def foo
+    defined? super
+  end
+  def bar
+    defined? super
+  end
+  def quux
+    defined? super
+  end
+end
+x = Alias3.new
+test_ok(!x.foo)
+test_ok(x.bar)
+test_ok(!x.quux)
+
+test_check "path"
+test_ok(File.basename("a") == "a")
+test_ok(File.basename("a/b") == "b")
+test_ok(File.basename("a/b/") == "b")
+test_ok(File.basename("/") == "/")
+test_ok(File.basename("//") == "/")
+test_ok(File.basename("///") == "/")
+test_ok(File.basename("a/b////") == "b")
+test_ok(File.basename("a.rb", ".rb") == "a")
+test_ok(File.basename("a.rb///", ".rb") == "a")
+test_ok(File.basename("a.rb///", ".*") == "a")
+test_ok(File.basename("a.rb///", ".c") == "a.rb")
+test_ok(File.dirname("a") == ".")
+test_ok(File.dirname("/") == "/")
+test_ok(File.dirname("/a") == "/")
+test_ok(File.dirname("a/b") == "a")
+test_ok(File.dirname("a/b/c") == "a/b")
+test_ok(File.dirname("/a/b/c") == "/a/b")
+test_ok(File.dirname("/a/b/") == "/a")
+test_ok(File.dirname("/a/b///") == "/a")
+case Dir.pwd
+when %r'\A\w:'
+  test_ok(/\A\w:\/\z/ =~ File.expand_path(".", "/"))
+  test_ok(/\A\w:\/a\z/ =~ File.expand_path("a", "/"))
+  dosish = true
+when %r'\A//'
+  test_ok(%r'\A//[^/]+/[^/]+\z' =~ File.expand_path(".", "/"))
+  test_ok(%r'\A//[^/]+/[^/]+/a\z' =~ File.expand_path(".", "/"))
+  dosish = true
+else
+  test_ok(File.expand_path(".", "/") == "/")
+  test_ok(File.expand_path("sub", "/") == "/sub")
+end
+if dosish
+  test_ok(File.expand_path("/", "//machine/share/sub") == "//machine/share")
+  test_ok(File.expand_path("/dir", "//machine/share/sub") == "//machine/share/dir")
+  test_ok(File.expand_path("/", "z:/sub") == "z:/")
+  test_ok(File.expand_path("/dir", "z:/sub") == "z:/dir")
+end
+test_ok(File.expand_path(".", "//") == "//")
+test_ok(File.expand_path("sub", "//") == "//sub")
+
+# test_check "Proc#binding"
+ObjectSpace.each_object(Proc){|o|
+  begin
+    b = o.binding
+    eval 'self', b
+  rescue ArgumentError
+  end
+}
+
+test_check "gc"
+begin
+  1.upto(10000) {
+    tmp = [0,1,2,3,4,5,6,7,8,9]
+  }
+  tmp = nil
+  test_ok true
+rescue
+  test_ok false
+end
+class S
+  def initialize(a)
+    @a = a
+  end
+end
+l=nil
+100000.times {
+  l = S.new(l)
+}
+GC.start
+test_ok true   # reach here or dumps core
+l = []
+100000.times {
+  l.push([l])
+}
+GC.start
+test_ok true   # reach here or dumps core
+
+ObjectSpace.each_object{|o|
+  o.class.name
+}
+
+test_ok true   # reach here or dumps core
+
+PROGRESS.finish
+if $failed > 0
+  printf "not ok/test: %d failed %d\n", $ntest, $failed
+else
+  printf "end of test(test: %d)\n", $ntest
+end
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
deleted file mode 100644
index 1cd26a8643..0000000000
--- a/bcc32/Makefile.sub
+++ /dev/null
@@ -1,617 +0,0 @@
-# -*- makefile -*-
-
-SHELL = $(COMSPEC)
-MKFILES = Makefile
-
-!ifndef MFLAGS
-MFLAGS=-
-!endif
-
-#### Start of system configuration section. ####
-!ifndef OS
-OS = bccwin32
-!endif
-!if !defined(RT)
-!error RT not defined.  Retry from configure pass.
-!endif
-
-arch = $(ARCH)-$(OS)
-
-## variables may be overridden by $(compile_dir)/Makefile
-!ifndef srcdir
-srcdir = ..
-!endif
-!ifndef RUBY_INSTALL_NAME
-RUBY_INSTALL_NAME = ruby
-!endif
-!ifndef RUBYW_INSTALL_NAME
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
-!elif "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME:ruby=rubyw)
-!endif
-!if "$(RUBYW_INSTALL_NAME)" == "$(RUBY_INSTALL_NAME)"
-RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
-!endif
-!ifndef RUBY_SO_NAME
-RUBY_SO_NAME = $(RT)-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY)
-!endif
-!ifndef icondirs
-!ifdef ICONDIRS
-icondirs=$(ICONDIRS)
-!endif
-!endif
-!ifdef icondirs
-icondirs=$(icondirs:\=/)
-iconinc=-I$(icondirs: = -I)
-!endif
-###############
-
-.SUFFIXES: .y
-
-!ifndef CC
-CC = bcc32
-!endif
-!ifndef CPP
-CPP = cpp32
-!endif
-!ifndef RC
-RC = brcc32
-!endif
-!ifndef YACC
-YACC = bison
-!endif
-!ifndef AR
-AR = tlib
-!endif
-!ifndef BASERUBY
-BASERUBY = ruby
-!endif
-
-PURIFY =
-AUTOCONF = autoconf
-IFCHANGE = $(srcdir:/=\)\win32\ifchange.bat
-RM = $(srcdir:/=\)\win32\rm.bat
-CP = copy > nul
-MV = move > nul
-
-!if !defined(PROCESSOR_ARCHITECTURE)
-PROCESSOR_ARCHITECTURE = x86
-!endif
-MACHINE = $(PROCESSOR_ARCHITECTURE)
-!if "$(PROCESSOR_ARCHITECTURE)" == "x86"
-!ifndef PROCESSOR_LEVEL
-PROCESSOR_LEVEL = 5
-!endif
-!if 6 < $(PROCESSOR_LEVEL)
-PROCESSOR_LEVEL = 6
-!endif
-PROCESSOR_FLAG = -$(PROCESSOR_LEVEL)
-CPU = i$(PROCESSOR_LEVEL)86
-ARCH = i386
-!else
-CPU = $(PROCESSOR_ARCHITECTURE)
-ARCH = $(PROCESSOR_ARCHITECTURE)
-!endif
-!ifndef DEBUGFLAGS
-DEBUGFLAGS = 
-!endif
-!ifndef OPTFLAGS
-OPTFLAGS = -O
-!endif
-
-!ifndef prefix
-prefix = /usr
-!endif
-!ifndef exec_prefix
-exec_prefix = $(prefix)
-!endif
-!ifndef libdir
-libdir = $(exec_prefix)/lib
-!endif
-!if !defined(datadir)
-datadir = $(prefix)/share
-!endif
-!ifndef EXTOUT
-EXTOUT = .ext
-!endif
-!ifndef TESTUI
-TESTUI = console
-!endif
-!ifndef TESTS
-TESTS =
-!endif
-!ifndef RDOCTARGET
-RDOCTARGET = install-doc
-!endif
-
-OUTFLAG       = -o
-COUTFLAG      = -o
-!ifndef CFLAGS
-CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
-!endif
-!ifndef DEFS
-DEFS =
-!endif
-!ifndef CPPFLAGS
-CPPFLAGS =
-!endif
-CPPFLAGS = $(DEFS) $(CPPFLAGS)
-!ifndef CXXFLAGS
-CXXFLAGS = $(CFLAGS)
-!endif
-!ifndef LDFLAGS
-LDFLAGS = -S:$(STACK)
-!endif
-!ifndef RFLAGS
-RFLAGS = $(iconinc)
-!endif
-!ifndef EXTLIBS
-EXTLIBS =
-!endif
-!ifndef MEMLIB
-MEMLIB =
-!endif
-LIBS = $(MEMLIB) cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
-MISSING = acosh.obj cbrt.obj crypt.obj erf.obj lgamma_r.obj strlcat.obj strlcpy.obj tgamma.obj win32.obj
-
-!ifndef STACK
-STACK = 0x2000000
-!endif
-
-XCFLAGS = -DRUBY_EXPORT -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(srcdir)/missing
-
-ARFLAGS = /a /p32
-LD = ilink32 -q -Gn
-LDSHARED  = $(LD)
-XLDFLAGS  = -Tpe c0x32.obj
-WLDFLAGS  = -aa -Tpe c0w32.obj
-DLDFLAGS  = -Tpd c0d32.obj
-LIBRUBY_LDSHARED = $(LDSHARED)
-LIBRUBY_DLDFLAGS = -Gi $(DLDFLAGS) $(EXTLDFLAGS)
-LDOBJECTS = $(MAINOBJ)
-
-SOLIBS = 
-
-EXEEXT = .exe
-PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
-WPROGRAM=$(RUBYW_INSTALL_NAME)$(EXEEXT)
-RUBYDEF = $(RUBY_SO_NAME).def
-MINIRUBY = .\miniruby$(EXEEXT) -I$(srcdir)/lib $(MINIRUBYOPT)
-RUNRUBY = .\$(PROGRAM) -i"$(EXTOUT)/$(arch)" "$(srcdir)/runruby.rb" --extout="$(EXTOUT)" --
-
-ORGLIBPATH = $(LIB)
-
-#### End of system configuration section. ####
-
-LIBRUBY_A     = $(RUBY_SO_NAME)-static.lib
-LIBRUBY_SO    = $(RUBY_SO_NAME).dll
-LIBRUBY       = $(RUBY_SO_NAME).lib
-LIBRUBYARG    = $(LIBRUBY)
-THREAD_MODEL  = win32
-
-PREP          = miniruby$(EXEEXT)
-
-OBJEXT        = obj
-ASMEXT        = asm
-
-INSTALLED_LIST= .installed.list
-
-MKMAIN_CMD    = mkmain.bat
-
-SRC_FILE      = $(<:\=/)
-
-WINMAINOBJ    = winmain.$(OBJEXT)
-ARCHMINIOBJS  = dmydln.$(OBJEXT)
-
-arch_hdrdir = $(EXTOUT)/include/$(arch)
-hdrdir = $(srcdir)/include
-VPATH = $(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/enc;$(srcdir)/missing;$(srcdir)/win32
-
-.path.c = .;$(srcdir);$(srcdir)/enc;$(srcdir)/win32;$(srcdir)/missing
-.path.ci = $(srcdir)
-.path.inc = .;$(srcdir)
-.path.def = .;$(srcdir)
-.path.h = .;$(arch_hdrdir)/ruby;$(hdrdir)/ruby;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
-.path.y = $(srcdir)
-.path. = $(srcdir)
-
-.c.obj:
-	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) $(COUTFLAG)$@ -c $(<:/=\)
-
-.c.asm:
-	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) $(COUTFLAG)$@ -S $(<:\=/)
-
-.rc.res:
-	$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:/=\)
-
-all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
-
-ruby: $(PROGRAM)
-rubyw: $(WPROGRAM)
-
-!include $(srcdir)/common.mk
-
-$(MKFILES): $(srcdir)/bcc32/Makefile.sub $(srcdir)/bcc32/configure.bat $(srcdir)/bcc32/setup.mak
-	$(COMSPEC) /C $(srcdir:/=\)\bcc32\configure.bat $(configure_args)
-	@echo $(MKFILES) should be updated, re-run $(MAKE).
-	@$(MAKE) > nul -q -f &&|
-PHONY: nul
-	@exit
-|
-
-PHONY: nul
-
-RUBY_CONFIG_H = $(arch_hdrdir)/ruby/config.h
-CONFIG_H = ./.config.h.time
-
-config: config.status
-
-config.status: $(CONFIG_H)
-
-guard = INCLUDE_RUBY_CONFIG_H
-
-$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
-	@if not exist $(arch_hdrdir:/=\) md $(arch_hdrdir:/=\)
-	@if not exist $(arch_hdrdir:/=\)\ruby md $(arch_hdrdir:/=\)\ruby
-	@$(IFCHANGE) $(RUBY_CONFIG_H:/=\) &&|
-\#ifndef $(guard)
-\#define $(guard) 1
-\#define NO_BIG_INLINE 1
-\#define HAVE_SYS_TYPES_H 1
-\#define HAVE_SYS_STAT_H 1
-\#define HAVE_STDLIB_H 1
-\#define HAVE_STRING_H 1
-\#define HAVE_MEMORY_H 1
-\#define HAVE_LONG_LONG 1
-\#define HAVE_OFF_T 1
-\#define SIZEOF_INT 4
-\#define SIZEOF_SHORT 2
-\#define SIZEOF_LONG 4
-\#define SIZEOF_LONG_LONG 0
-\#define SIZEOF___INT64 8
-\#define SIZEOF_OFF_T 8
-\#define SIZEOF_VOIDP 4
-\#define SIZEOF_FLOAT 4
-\#define SIZEOF_DOUBLE 8
-\#define SIZEOF_TIME_T 4
-\#define SIZEOF_RLIM_T 0
-\#define SIZEOF_SIZE_T 4
-\#define SIZEOF_PTRDIFF_T 4
-\#define HAVE_PROTOTYPES 1
-\#define TOKEN_PASTE(x,y) x\#\#y
-\#define HAVE_STDARG_PROTOTYPES 1
-\#define NORETURN(x) x
-\#define RUBY_EXTERN extern __declspec(dllimport)
-\#define HAVE_DECL_SYS_NERR 1
-\#define HAVE_LIMITS_H 1
-\#define HAVE_FCNTL_H 1
-\#define HAVE_UTIME_H 1
-\#define HAVE_FLOAT_H 1
-\#define rb_uid_t uid_t
-\#define rb_gid_t gid_t
-\#define rb_pid_t int
-\#define HAVE_STRUCT_STAT_ST_RDEV 1
-\#define HAVE_ST_RDEV 1
-!if $(BORLANDC) < 0x0580
-\#define int8_t signed char
-\#define uint8_t unsigned char
-\#define int16_t short
-\#define uint16_t unsigned short
-\#define int32_t int
-\#define uint32_t unsigned int
-\#define int64_t __int64
-\#define uint64_t unsigned __int64
-\#define ssize_t int
-!endif
-\#define HAVE_INT8_T 1
-\#define HAVE_UINT8_T 1
-\#define SIZEOF_INT8_T 1
-\#define HAVE_INT16_T 1
-\#define HAVE_UINT16_T 1
-\#define SIZEOF_INT32_T 2
-\#define HAVE_INT32_T 1
-\#define HAVE_UINT32_T 1
-\#define SIZEOF_INT32_T 4
-\#define HAVE_INT64_T 1
-\#define HAVE_UINT64_T 1
-\#define SIZEOF_INT64_T 8
-\#define HAVE_INTPTR_T 1
-\#define HAVE_UINTPTR_T 1
-\#define HAVE_SSIZE_T 1
-\#define GETGROUPS_T int
-\#define RETSIGTYPE void
-\#define HAVE_ALLOCA 1
-\#define HAVE_DUP2 1
-\#define HAVE_MEMMOVE 1
-\#define HAVE_MKDIR 1
-\#define HAVE_STRCASECMP 1
-\#define HAVE_STRNCASECMP 1
-\#define HAVE_STRERROR 1
-\#define HAVE_STRFTIME 1
-\#define HAVE_STRCHR 1
-\#define HAVE_STRSTR 1
-\#define HAVE_STRTOD 1
-\#define HAVE_STRTOL 1
-\#define HAVE_STRTOUL 1
-\#define HAVE_SNPRINTF 1
-\#define HAVE_VSNPRINTF 1
-\#define HAVE_ISNAN 1
-\#define HAVE_FINITE 1
-\#define HAVE_HYPOT 1
-\#define HAVE_FMOD 1
-\#define HAVE_WAITPID 1
-\#define HAVE_FSYNC 1
-\#define HAVE_GETCWD 1
-\#define HAVE_TRUNCATE 1
-\#define HAVE_FTRUNCATE 1
-\#define HAVE_FSEEKO 1
-\#define HAVE_FTELLO 1
-\#define HAVE_TIMES 1
-\#define HAVE_FCNTL 1
-\#define HAVE_LINK 1
-\#define HAVE_TELLDIR 1
-\#define HAVE_SEEKDIR 1
-\#define HAVE_COSH 1
-\#define HAVE_SINH 1
-\#define HAVE_TANH 1
-\#define RSHIFT(x,y) ((x)>>(int)y)
-\#define FILE_COUNT level
-\#define FILE_READPTR curp
-\#define RUBY_SETJMP(env) setjmp(env)
-\#define RUBY_LONGJMP(env,val) longjmp(env,val)
-\#define RUBY_JMP_BUF jmp_buf
-\#define inline __inline
-\#define NEED_IO_SEEK_BETWEEN_RW 1
-\#define STACK_GROW_DIRECTION -1
-\#define DEFAULT_KCODE KCODE_NONE
-\#define LOAD_RELATIVE 1
-\#define DLEXT ".so"
-\#define RUBY_LIB_PREFIX "/lib/ruby"
-\#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#endif /* $(guard) */
-|
-	@exit > $(@:/=\)
-
-config.status: $(MKFILES) $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
-	@echo Creating $@
-	@type > $@ &&|
-# Generated automatically by Makefile.sub.
-s,@SHELL@,$$(COMSPEC),;t t
-s,@BUILD_FILE_SEPARATOR@,\,;t t
-s,@PATH_SEPARATOR@,;,;t t
-s,@CFLAGS@,$(CFLAGS),;t t
-s,@DEFS@,$(DEFS),;t t
-s,@CPPFLAGS@,$(CPPFLAGS),;t t
-s,@CXXFLAGS@,$(CXXFLAGS),;t t
-s,@FFLAGS@,$(FFLAGS),;t t
-s,@LDFLAGS@,,;t t
-s,@LIBS@,$(LIBS),;t t
-s,@exec_prefix@,$${prefix},;t t
-s,@prefix@,$(prefix),;t t
-s,@program_transform_name@,s,,,,;t t
-s,@bindir@,$${exec_prefix}/bin,;t t
-s,@sbindir@,$${exec_prefix}/sbin,;t t
-s,@libexecdir@,$${exec_prefix}/libexec,;t t
-s,@datadir@,$${prefix}/share,;t t
-s,@sysconfdir@,$${prefix}/etc,;t t
-s,@sharedstatedir@,/etc,;t t
-s,@localstatedir@,/var,;t t
-s,@libdir@,$${exec_prefix}/lib,;t t
-s,@includedir@,$${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,$${prefix}/info,;t t
-s,@mandir@,$${prefix}/man,;t t
-s,@ridir@,$${prefix}/share/ri,;t t
-s,@build@,$(CPU)-pc-$(OS),;t t
-s,@build_alias@,$(CPU)-$(OS),;t t
-s,@build_cpu@,$(CPU),;t t
-s,@build_vendor@,pc,;t t
-s,@build_os@,$(OS),;t t
-s,@host@,$(CPU)-pc-$(OS),;t t
-s,@host_alias@,$(CPU)-$(OS),;t t
-s,@host_cpu@,$(CPU),;t t
-s,@host_vendor@,pc,;t t
-s,@host_os@,$(OS),;t t
-s,@target@,$(ARCH)-pc-$(OS),;t t
-s,@target_alias@,$(ARCH)-$(OS),;t t
-s,@target_cpu@,$(ARCH),;t t
-s,@target_vendor@,pc,;t t
-s,@target_os@,$(OS),;t t
-s,@CC@,$(CC),;t t
-s,@CPP@,cpp32,;t t
-s,@CXX@,$$(CC),;t t
-s,@LD@,$(LD),;t t
-s,@YACC@,$(YACC),;t t
-s,@RANLIB@,,;t t
-s,@AR@,$(AR),;t t
-s,@ARFLAGS@,$(ARFLAGS) ,;t t
-s,@LN_S@,$(LN_S),;t t
-s,@SET_MAKE@,MFLAGS = -$$(MAKEFLAGS),;t t
-s,@RM@,$$(top_srcdir:/=\)\win32\rm.bat,;t t
-s,@CP@,copy > nul,;t t
-s,@LIBOBJS@, $(MISSING),;t t
-s,@ALLOCA@,$(ALLOCA),;t t
-s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
-s,@EXEEXT@,.exe,;t t
-s,@OBJEXT@,obj,;t t
-s,@XCFLAGS@,$(XCFLAGS),;t t
-s,@XLDFLAGS@,$(XLDFLAGS),;t t
-s,@DLDFLAGS@,$(DLDFLAGS),;t t
-s,@ARCH_FLAG@,$(ARCH_FLAG),;t t
-s,@STATIC@,$(STATIC),;t t
-s,@CCDLFLAGS@,,;t t
-s,@LDSHARED@,$(LDSHARED),;t t
-s,@DLEXT@,so,;t t
-s,@LIBEXT@,lib,;t t
-s,@STRIP@,$(STRIP),;t t
-s,@EXTSTATIC@,$(EXTSTATIC),;t t
-s,@setup@,Setup,;t t
-s,@MINIRUBY@,$(MINIRUBY),;t t
-s,@PREP@,miniruby$(EXEEXT),;t t
-s,@RUNRUBY@,$(RUNRUBY),;t t
-s,@EXTOUT@,$(EXTOUT),;t t
-s,@ARCHFILE@,,;t t
-s,@RDOCTARGET@,,;t t
-s,@LIBRUBY_LDSHARED@,$$(LDSHARED),;t t
-s,@LIBRUBY_DLDFLAGS@,-Gi $$(DLDFLAGS),;t t
-s,@RUBY_INSTALL_NAME@,$(RUBY_INSTALL_NAME),;t t
-s,@rubyw_install_name@,$(RUBYW_INSTALL_NAME),;t t
-s,@RUBYW_INSTALL_NAME@,$(RUBYW_INSTALL_NAME),;t t
-s,@RUBY_SO_NAME@,$(RUBY_SO_NAME),;t t
-s,@LIBRUBY_A@,$$(RUBY_SO_NAME)-static.lib,;t t
-s,@LIBRUBY_SO@,$$(RUBY_SO_NAME).dll,;t t
-s,@LIBRUBY_ALIASES@,$(LIBRUBY_ALIASES),;t t
-s,@LIBRUBY@,$$(RUBY_SO_NAME).lib,;t t
-s,@LIBRUBYARG@,$$(LIBRUBYARG_SHARED),;t t
-s,@LIBRUBYARG_STATIC@,$$(LIBRUBY_A),;t t
-s,@LIBRUBYARG_SHARED@,$$(LIBRUBY),;t t
-s,@SOLIBS@,$(SOLIBS),;t t
-s,@DLDLIBS@,$(DLDLIBS),;t t
-s,@ENABLE_SHARED@,yes,;t t
-s,@OUTFLAG@,$(OUTFLAG),;t t
-s,@COUTFLAG@,$(COUTFLAG),;t t
-s,@CPPOUTFILE@,,;t t
-s,@LIBPATHFLAG@, -L"%s",;t t
-s,@RPATHFLAG@,,;t t
-s,@LIBARG@,%s.lib,;t t
-s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS:/=\), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE:/=\), $$(RESFILE:/=\),;t t
-s,@COMPILE_C@,$$(CC) $$(INCFLAGS) $$(CFLAGS) $$(CPPFLAGS) $(COUTFLAG)$$(@) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P $(COUTFLAG)$$(@) -c $$(<:/=\),;t t
-s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
-s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
-s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
-s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t
-s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
-s,@cleanlibs@,$$*.tds,;t t
-s,@cleanobjs@,$$*-$$(arch).def $$*.il? $$*.lib,;t t
-s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
-s,@EXPORT_PREFIX@,_,;t t
-s,@arch@,$(ARCH)-$(OS),;t t
-s,@sitearch@,$(ARCH)-$(OS),;t t
-s,@sitedir@,$${prefix}/lib/ruby/site_ruby,;t t
-s,@vendordir@,$${prefix}/lib/ruby/vendor_ruby,;t t
-s,@rubyhdrdir@,$$(includedir)/ruby-$$(MAJOR).$$(MINOR).$$(TEENY),;t t
-s,@sitehdrdir@,$$(rubyhdrdir)/site_ruby,;t t
-s,@vendorhdrdir@,$$(rubyhdrdir)/vendor_ruby,;t t
-s,@configure_args@,--enable-shared $(configure_args),;t t
-s,@configure_input@,$$configure_input,;t t
-s,@srcdir@,$(srcdir),;t t
-s,@top_srcdir@,$(srcdir),;t t
-|
-
-miniruby$(EXEEXT):
-		@echo $(LIBS)
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS:/=\) $(DMYEXT),$@,nul,$(LIBS)
-
-$(PROGRAM):	$(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
-		$(LD) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBY_INSTALL_NAME).res
-
-$(WPROGRAM):	$(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
-		$(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
-
-$(LIBRUBY_A):	$(OBJS) $(DMYEXT)
-		@-if exist $@ del $@
-		$(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
-
-# $(LIBRUBY):	$(LIBRUBY_SO)
-#		implib $@ $(LIBRUBY_SO)
-
-$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
-		@echo $(DLDOBJS)
-		@$(PRE_LIBRUBY_UPDATE)
-		$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
-
-$(LIBRUBY): $(LIBRUBY_SO)
-
-$(RUBYDEF):	$(LIBRUBY_A) $(PREP)
-		$(MINIRUBY) $(srcdir)/bcc32/mkexports.rb -output=$@ -base=$(RUBY_SO_NAME) $(LIBRUBY_A)
-
-$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb $(srcdir)/revision.h $(srcdir)/win32/resource.rb
-		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-			-ruby_name=$(RUBY_INSTALL_NAME) \
-			-rubyw_name=$(RUBYW_INSTALL_NAME) \
-			-so_name=$(RUBY_SO_NAME) \
-			. $(icondirs) $(srcdir)/win32
-
-lex.c: {$(srcdir)}lex.c.blt
-	copy "$(?:/=\)" $@
-
-post-install-bin::
-	@$(NULLCMD)
-post-install-lib::
-	@$(NULLCMD)
-post-install-ext-comm::
-	@$(NULLCMD)
-post-install-ext-arch::
-	@$(NULLCMD)
-post-install-man::
-	@$(NULLCMD)
-post-install-doc::
-	@$(NULLCMD)
-
-clean-local::
-		@$(RM) $(WINMAINOBJ) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib
-		@$(RM) $(RUBY_INSTALL_NAME).res $(RUBYW_INSTALL_NAME).res $(RUBY_SO_NAME).res
-		@$(RM) *.map *.pdb *.ilk *.exp $(RUBYDEF) ext\ripper\y.output
-
-distclean-local::
-		@$(RM) ext\config.cache $(RBCONFIG:/=\)
-		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
-
-clean-ext distclean-ext realclean-ext::
-		@for /R ext %I in (.) do @if exist %I\Makefile ( \
-		    echo $(@:-ext=)ing %~nI & \
-		    cd %I & \
-		    $(MAKE) $(MFLAGS) $(@:-ext=) & \
-		    cd %CD% \
-		)
-
-ext/extinit.obj: ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
-
-main.$(OBJEXT): win32.h
-ascii.$(OBJEXT): win32.h
-array.$(OBJEXT): win32.h
-bignum.$(OBJEXT): win32.h
-class.$(OBJEXT): win32.h
-compar.$(OBJEXT): win32.h
-dir.$(OBJEXT): dir.h win32.h
-dln.$(OBJEXT): win32.h
-enum.$(OBJEXT): win32.h
-error.$(OBJEXT): win32.h
-euc_jp.$(OBJEXT): win32.h
-eval.$(OBJEXT): win32.h
-file.$(OBJEXT): win32.h
-gc.$(OBJEXT): win32.h
-hash.$(OBJEXT): win32.h
-inits.$(OBJEXT): win32.h
-io.$(OBJEXT): win32.h
-marshal.$(OBJEXT): win32.h
-math.$(OBJEXT): win32.h
-numeric.$(OBJEXT): win32.h
-object.$(OBJEXT): win32.h
-pack.$(OBJEXT): win32.h
-parse.$(OBJEXT): win32.h
-process.$(OBJEXT): win32.h
-prec.$(OBJEXT): win32.h
-random.$(OBJEXT): win32.h
-range.$(OBJEXT): win32.h
-re.$(OBJEXT): win32.h
-regcomp.$(OBJEXT): win32.h
-regenc.$(OBJEXT): win32.h
-regerror.$(OBJEXT): win32.h
-regexec.$(OBJEXT): win32.h
-reggnu.$(OBJEXT): win32.h
-regparse.$(OBJEXT): win32.h
-ruby.$(OBJEXT): win32.h
-signal.$(OBJEXT): win32.h
-sjis.$(OBJEXT): win32.h
-sprintf.$(OBJEXT): win32.h
-st.$(OBJEXT): win32.h
-string.$(OBJEXT): win32.h
-struct.$(OBJEXT): win32.h
-time.$(OBJEXT): win32.h
-utf_8.$(OBJEXT): win32.h
-util.$(OBJEXT): win32.h
-variable.$(OBJEXT): win32.h
-version.$(OBJEXT): win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
deleted file mode 100644
index cd33eec0a1..0000000000
--- a/bcc32/README.bcc32
+++ /dev/null
@@ -1,130 +0,0 @@
-=begin
-
-= How to build ruby using Borland C++
-
-== Requirement
-
-(1) Borland C++ 5.0 or later.
-
-(2) Please set environment variable (({PATH}))
-    to run required commands properly from the command line.
-
-    Note: building ruby requires following commands.
-     * make
-     * bcc32
-     * tlib
-     * ilink32
-
-(3) If you want to build from CVS source, following commands are required.
-     * bison ((<URL:http://gnuwin32.sourceforge.net/packages/bison.htm>))
-     * sed   ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>))
-
-(4) We strongly recommend to build ruby on C++Builder, to link following files.
-     * usebormm.lib
-     * memmgr.lib
-
-    RTL's internal memory manager cannot handle large memory block properly,
-    so we should use borlndmm.dll instead.
-     10000.times { "" << "." * 529671; GC.start } # crash
-
-== How to compile and install
-
-(1) Execute bcc32\configure.bat on your build directory.
-     ex. c:\src\ruby> bcc32\configure.bat
-    You can specify the target platform as an argument.
-    For example, run `((%configure i686-bccwin32%))'
-    You can also specify the install directory.
-    For example, run `((%configure --prefix=<install_directory>%))'
-    Default of the install directory is /usr .
-    The default ((|<PLATFORM>|)) is `(({i386-bccwin32}))'.
-     
-(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
-    if you want to change the name of the executable files. 
-    And add ((|RUBYW_INSTALL_NAME|)) to change the name of the
-    executable without console window if also you want.
-
-(3) Run `((%make%))'
-
-(4) Run `((%make test%))'
-
-(5) Run `((%make install%))'
-
-(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
-    usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
-    directory.
-
-== Icons
-
-Any icon files(*.ico) in the build directory, directories specified with
-((|icondirs|)) make variable and (({win32})) directory under the ruby
-source directory will be included in DLL or executable files, according
-to their base names.
-    $(RUBY_INSTALL_NAME).ico or ruby.ico   --> $(RUBY_INSTALL_NAME).exe
-    $(RUBYW_INSTALL_NAME).ico or rubyw.ico --> $(RUBYW_INSTALL_NAME).exe
-    the others                             --> $(RUBY_SO_NAME).dll
-
-Although no icons are distributed with the ruby source or in the official 
-site, you can use anything you like. For example, followings are written 
-in Japanese, but you can download at least.
-
-* ((<URL:http://member.nifty.ne.jp/ueivu/rubyico.html>)) or
-  ((<zipped icons|URL:http://member.nifty.ne.jp/ueivu/Ruby_ico.zip>))
-* ((<URL:http://homepage1.nifty.com/a_nakata/ruby/>)) or
-  ((<icon itself|URL:http://homepage1.nifty.com/a_nakata/ruby/RubyIcon.ico>))
-
-== Build examples
-
-* Build on the ruby source directory.
-
-  ex.)
-    ruby source directory:  C:\ruby
-    build directory:        C:\ruby
-    install directory:      C:\usr\local
-
-    C:
-    cd \ruby
-    bcc32\configure --prefix=/usr/local
-    make
-    make test
-    make install
-
-* Build on the relative directory from the ruby source directory and CPU type 
-  i386.
-
-  ex.)
-    ruby source directory:  C:\ruby
-    build directory:        C:\ruby\bccwin32
-    install directory:      C:\usr\local
-    CPU                     i386
-    
-    C:
-    cd \ruby
-    mkdir bccwin32
-    cd bccwin32
-    ..\bcc32\configure --prefix=/usr/local
-    make
-    make test
-    make install
-
-* Build on the different drive.
-
-  ex.)
-    ruby source directory:  C:\src\ruby
-    build directory:        D:\build\ruby
-    install directory:      C:\usr\local
-
-    D:
-    cd D:\build\ruby
-    C:\src\ruby\bcc32\configure --prefix=C:/usr/local
-    make
-    make test
-    make install
-
-== Bugs
-
-You can ((*NOT*)) use a path name contains any white space characters as
-the ruby source directory, this restriction comes from the behavior of
-(({!INCLUDE})) directives of (({MAKE})).
-((- you may call it a bug. -))
-
-=end
diff --git a/bcc32/configure.bat b/bcc32/configure.bat
deleted file mode 100755
index 8cdfc64b03..0000000000
--- a/bcc32/configure.bat
+++ /dev/null
@@ -1,163 +0,0 @@
-@echo off

-::: Don't set environment variable in batch file other than autoexec.bat

-::: to avoid "Out of environment space" problem on Windows 95/98.

-::: set TMPMAKE=~tmp~.mak

-

-echo> ~tmp~.mak ####

-echo>> ~tmp~.mak conf = %0

-echo>> ~tmp~.mak $(conf:\=/): nul

-echo>> ~tmp~.mak 	@del ~setup~.mak

-echo>> ~tmp~.mak 	@-$(MAKE) -l$(MAKEFLAGS) -f $(@D)setup.mak \

-if exist pathlist.tmp del pathlist.tmp

-if exist confargs.mk del confargs.mk

-:loop

-if "%1" == "" goto :end

-if "%1" == "--prefix" goto :prefix

-if "%1" == "prefix" goto :prefix

-if "%1" == "--srcdir" goto :srcdir

-if "%1" == "srcdir" goto :srcdir

-if "%1" == "--target" goto :target

-if "%1" == "target" goto :target

-if "%1" == "--with-static-linked-ext" goto :extstatic

-if "%1" == "--program-suffix" goto :suffix

-if "%1" == "RUBY_SUFFIX" goto :suffix

-if "%1" == "--program-name" goto :installname

-if "%1" == "--install-name" goto :installname

-if "%1" == "RUBY_INSTALL_NAME" goto :installname

-if "%1" == "--so-name" goto :soname

-if "%1" == "RUBY_SO_NAME" goto :soname

-if "%1" == "--enable-install-doc" goto :enable-rdoc

-if "%1" == "--disable-install-doc" goto :disable-rdoc

-if "%1" == "--extout" goto :extout

-if "%1" == "EXTOUT" goto :extout

-if "%1" == "--with-baseruby" goto :baseruby

-if "%1" == "BASERUBY" goto :baseruby

-if "%1" == "--path" goto :path

-if "%1" == "-h" goto :help

-if "%1" == "--help" goto :help

-  echo>>confargs.tmp 	%1 \

-  shift

-goto :loop

-:srcdir

-  echo>> ~tmp~.mak 	-Dsrcdir=%2 \

-  echo>>confargs.tmp 	--srcdir=%2 \

-  shift

-  shift

-goto :loop

-:prefix

-  echo>> ~tmp~.mak 	-Dprefix=%2 \

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:suffix

-  echo>>confargs.mk !ifndef RUBY_SUFFIX

-  echo>>confargs.mk RUBY_SUFFIX = %2

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:installname

-  echo>>confargs.mk !ifndef RUBY_INSTALL_NAME

-  echo>>confargs.mk RUBY_INSTALL_NAME = %2

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:soname

-  echo>>confargs.mk !ifndef RUBY_SO_NAME

-  echo>>confargs.mk RUBY_SO_NAME = %2

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:target

-  echo>> ~tmp~.mak 	%2 \

-  echo>>confargs.tmp 	--target=%2 \

-  shift

-  shift

-goto :loop

-:extstatic

-  echo>>confargs.mk !ifndef EXTSTATIC

-  echo>>confargs.mk EXTSTATIC = static

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1 \

-  shift

-goto :loop

-:enable-rdoc

-  echo>>confargs.mk !ifndef RDOCTARGET

-  echo>>confargs.mk RDOCTARGET = install-doc

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1 \

-  shift

-goto :loop

-:disable-rdoc

-  echo>>confargs.mk !ifndef RDOCTARGET

-  echo>>confargs.mk RDOCTARGET = install-nodoc

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1 \

-  shift

-goto :loop

-:extout

-  echo>>confargs.mk !ifndef EXTOUT

-  echo>>confargs.mk EXTOUT = %2

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:baseruby

-  echo>>confargs.mk !ifndef BASERUBY

-  echo>>confargs.mk BASERUBY = %2

-  echo>>confargs.mk !endif

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:path

-  echo>>pathlist.tmp %2;\

-  echo>>confargs.tmp 	%1=%2 \

-  shift

-  shift

-goto :loop

-:help

-  echo Configuration:

-  echo   --help                  display this help

-  echo   --srcdir=DIR            find the sources in DIR [configure dir or `..']

-  echo Installation directories:

-  echo   --prefix=PREFIX         install files in PREFIX (ignored currently)

-  echo System types:

-  echo   --target=TARGET         configure for TARGET [i386-bccwin32]

-  echo Optional Package:

-  echo   --with-baseruby=RUBY    use RUBY as baseruby [ruby]

-  echo   --with-static-linked-ext link external modules statically

-  echo   --enable-install-doc    install rdoc indexes during install

-  del *.tmp

-  del ~tmp~.mak

-goto :exit

-:end

-echo>> ~tmp~.mak 	-Dbcc32dir=$(@D)

-if not exist confargs.tmp goto :noconfargs

-    echo>>confargs.mk configure_args = \

-    type>>confargs.mk confargs.tmp

-    echo.>>confargs.mk

-    echo>>confargs.mk ####

-:noconfargs

-if not exist pathlist.tmp goto :nopathlist

-    echo>>confargs.mk pathlist = \

-    type>>confargs.mk pathlist.tmp

-    echo.>>confargs.mk

-    echo>>confargs.mk ####

-    echo>>confargs.mk PATH = $(pathlist:;=/bin;)$(PATH)

-    echo>>confargs.mk INCLUDE = $(pathlist:;=/include;)

-    echo>>confargs.mk LIB = $(pathlist:;=/lib;)

-:nopathlist

-if exist confargs.mk copy confargs.mk ~setup~.mak > nul

-type>>~setup~.mak ~tmp~.mak

-del *.tmp > nul

-del ~tmp~.mak > nul

-make -s -f ~setup~.mak

-:exit

diff --git a/bcc32/mkexports.rb b/bcc32/mkexports.rb
deleted file mode 100755
index 888ab2e2a6..0000000000
--- a/bcc32/mkexports.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#!./miniruby -s
-
-$:.unshift(File.expand_path("../..", __FILE__))
-require 'win32/mkexports'
-
-class Exports::Bcc < Exports
-  def forwarding(internal, export)
-    internal[/\A_?/]+export
-  end
-
-  def each_line(objs, &block)
-    objs.each do |obj|
-      opt = /\.(?:so|dll)\z/i =~ obj ? "-ee" : "-oiPUBDEF -oiPUBD32"
-      IO.foreach("|tdump -q #{opt} #{obj.tr('/', '\\')} < nul", &block)
-    end
-  end
-
-  def each_export(objs)
-    objdump(objs) do |l|
-      next unless /(?:PUBDEF|PUBD32|EXPORT)/ =~ l
-      yield $1 if /'(.*?)'/ =~ l
-    end
-    yield "_strcasecmp", "_stricmp"
-    yield "_strncasecmp", "_strnicmp"
-  end
-end
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
deleted file mode 100644
index df2fd3c128..0000000000
--- a/bcc32/setup.mak
+++ /dev/null
@@ -1,179 +0,0 @@
-# -*- makefile -*-
-
-!if "$(srcdir)" != ""
-bcc32dir = $(srcdir)/bcc32
-!elseif "$(bcc32dir)" == "bcc32/"
-srcdir = .
-!elseif "$(bcc32dir:/bcc32/=)/bcc32/" == "$(bcc32dir)"
-srcdir = $(bcc32dir:/bcc32/=)
-!else
-srcdir = $(bcc32dir)/..
-!endif
-!ifndef prefix
-prefix = /usr
-!endif
-OS = bccwin32
-RT = $(OS)
-BANG = !
-APPEND = echo.>>$(MAKEFILE)
-!ifdef MAKEFILE
-MAKE = $(MAKE) -f $(MAKEFILE)
-!else
-MAKEFILE = Makefile
-!endif
-
-all: Makefile
-Makefile: -prologue- -generic- -epilogue-
-i386-$(OS): -prologue- -i386- -epilogue-
-i486-$(OS): -prologue- -i486- -epilogue-
-i586-$(OS): -prologue- -i586- -epilogue-
-i686-$(OS): -prologue- -i686- -epilogue-
-alpha-$(OS): -prologue- -alpha- -epilogue-
-
--prologue-: -basic-vars- -version- -system-vars-
-
--basic-vars-: nul
-	@echo Creating $(MAKEFILE)
-	@type > $(MAKEFILE) &&|
-\#\#\# Makefile for ruby $(OS) \#\#\#
-$(BANG)ifndef srcdir
-srcdir = $(srcdir:\=/)
-$(BANG)endif
-$(BANG)ifndef prefix
-prefix = $(prefix:\=/)
-$(BANG)endif
-$(BANG)if !defined(BASERUBY)
-!if defined(BASERUBY)
-BASERUBY = $(BASERUBY)
-!endif
-|
-!if !defined(BASERUBY)
-	@for %I in (ruby.exe) do @echo BASERUBY = "%~$$PATH:I" >> $(MAKEFILE)
-!endif
-	@type >> $(MAKEFILE) &&|
-$(BANG)endif
-|
-!if exist(confargs.mk)
-	@type confargs.mk >> $(MAKEFILE)
-	@del confargs.mk
-!endif
-
--system-vars-: -runtime- -bormm-
-
--bormm-: nul
-	@-ilink32 -q -Gn -x usebormm.lib > nul
-	@-if exist usebormm.tds $(APPEND) MEMLIB = usebormm.lib
-	@if exist usebormm.* del usebormm.*
-
--osname-: nul
-	@echo OS =  >>$(MAKEFILE)
-
--runtime-: nul
-	type > conftest.c &&|
-\#include <stdio.h>
-int main(){printf("");return 0;}
-|
-	bcc32 conftest.c cw32i.lib > nul
-	tdump conftest.exe < nul > conftest.i
-	grep "^Imports from CC" conftest.i > conftest.c
-	cpp32 -P- -DFile=\# -DImports=RTNAME -Dfrom== conftest.c > nul
-	$(MAKE) > nul -DBANG=$(BANG) -f &&|
--runtime-: nul
-$(BANG)include conftest.i
-RT = $$(RTNAME:.DLL=)
-OS = $$(RT:CC32=)
--runtime-:
-	del conftest.*
-$(BANG)if "$$(OS)" == "50"
-	echo OS = bccwin32 >> $(MAKEFILE)
-$(BANG)else
-	echo OS = bccwin32_$$(OS) >> $(MAKEFILE)
-$(BANG)endif
-|
-	@echo RT = $$(OS) >> $(MAKEFILE)
-
--version-: nul
-	@cpp32 -I$(srcdir) -P- -o$(MAKEFILE) > nul &&|
-\#define RUBY_REVISION 0
-\#include "version.h"
-MAJOR = RUBY_API_VERSION_MAJOR
-MINOR = RUBY_API_VERSION_MINOR
-TEENY = RUBY_API_VERSION_TEENY
-
-BORLANDC = __BORLANDC__
-|
-	@$(MAKE) > nul -DBANG=$(BANG) -f &&,
--version-: nul
-$(BANG)include $(MAKEFILE)
-$(BANG)include $(MAKEFILE).i
--version-:
-	@del $(MAKEFILE).i
-	@type >> $(MAKEFILE) &&|
-MAJOR = $$(MAJOR)
-MINOR = $$(MINOR)
-TEENY = $$(TEENY)
-BORLANDC = $$(BORLANDC)
-|
-,
-
--generic-: nul
-!if defined(PROCESSOR_ARCHITECTURE) ||  defined(PROCESSOR_LEVEL)
-	@type >> $(MAKEFILE) &&|
-!if defined(PROCESSOR_ARCHITECTURE)
-$(BANG)ifndef PROCESSOR_ARCHITECTURE
-PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITECTURE)
-$(BANG)endif
-!endif
-!if defined(PROCESSOR_LEVEL)
-$(BANG)ifndef PROCESSOR_LEVEL
-PROCESSOR_LEVEL = $(PROCESSOR_LEVEL)
-$(BANG)endif
-!endif
-|
-!endif
-
--alpha-: nul
-	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
-	@$(APPEND) PROCESSOR_ARCHITECTURE = alpha
-	@$(APPEND) !endif
--ix86-: nul
-	@$(APPEND) !ifndef PROCESSOR_ARCHITECTURE
-	@$(APPEND) PROCESSOR_ARCHITECTURE = x86
-	@$(APPEND) !endif
-
--i386-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
-	@$(APPEND) PROCESSOR_LEVEL = 3
-	@$(APPEND) !endif
--i486-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
-	@$(APPEND) PROCESSOR_LEVEL = 4
-	@$(APPEND) !endif
--i586-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
-	@$(APPEND) PROCESSOR_LEVEL = 5
-	@$(APPEND) !endif
--i686-: -ix86-
-	@$(APPEND) !ifndef PROCESSOR_LEVEL
-	@$(APPEND) PROCESSOR_LEVEL = 6
-	@$(APPEND) !endif
-
--epilogue-: -encs-
-
--encs-: nul
-	@$(MAKE) -f $(srcdir)/win32/enc-setup.mak srcdir="$(srcdir)" MAKEFILE=$(MAKEFILE)
-
--epilogue-: nul
-	@type >> $(MAKEFILE) &&|
-
-\# RUBY_INSTALL_NAME = ruby
-\# RUBY_SO_NAME = $$(RT)-$$(RUBY_INSTALL_NAME)$$(MAJOR)$$(MINOR)
-\# CFLAGS = -q $$(DEBUGFLAGS) $$(OPTFLAGS) $$(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
-\# CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -DLIBRUBY_SO=\"$$(LIBRUBY_SO)\"
-\# STACK = 0x2000000
-\# LDFLAGS = -S:$$(STACK)
-\# RFLAGS = $$(iconinc)
-\# EXTLIBS = cw32.lib import32.lib user32.lib kernel32.lib
-$(BANG)include $$(srcdir)/bcc32/Makefile.sub
-|
-	@echo type "`$(MAKE)'" to make ruby for $(OS).
diff --git a/benchmark/bm_app_aobench.rb b/benchmark/bm_app_aobench.rb
new file mode 100644
index 0000000000..2bd6acfaf8
--- /dev/null
+++ b/benchmark/bm_app_aobench.rb
@@ -0,0 +1,291 @@
+# AO render benchmark
+# Original program (C) Syoyo Fujita in Javascript (and other languages)
+#      https://code.google.com/p/aobench/
+# Ruby(yarv2llvm) version by Hideki Miura
+#
+
+IMAGE_WIDTH = 256
+IMAGE_HEIGHT = 256
+NSUBSAMPLES = 2
+NAO_SAMPLES = 8
+
+class Vec
+  def initialize(x, y, z)
+    @x = x
+    @y = y
+    @z = z
+  end
+
+  attr_accessor :x, :y, :z
+
+  def vadd(b)
+    Vec.new(@x + b.x, @y + b.y, @z + b.z)
+  end
+
+  def vsub(b)
+    Vec.new(@x - b.x, @y - b.y, @z - b.z)
+  end
+
+  def vcross(b)
+    Vec.new(@y * b.z - @z * b.y,
+            @z * b.x - @x * b.z,
+            @x * b.y - @y * b.x)
+  end
+
+  def vdot(b)
+    @x * b.x + @y * b.y + @z * b.z
+  end
+
+  def vlength
+    Math.sqrt(@x * @x + @y * @y + @z * @z)
+  end
+
+  def vnormalize
+    len = vlength
+    v = Vec.new(@x, @y, @z)
+    if len > 1.0e-17 then
+      v.x = v.x / len
+      v.y = v.y / len
+      v.z = v.z / len
+    end
+    v
+  end
+end
+
+
+class Sphere
+  def initialize(center, radius)
+    @center = center
+    @radius = radius
+  end
+
+  attr_reader :center, :radius
+
+  def intersect(ray, isect)
+    rs = ray.org.vsub(@center)
+    b = rs.vdot(ray.dir)
+    c = rs.vdot(rs) - (@radius * @radius)
+    d = b * b - c
+    if d > 0.0 then
+      t = - b - Math.sqrt(d)
+
+      if t > 0.0 and t < isect.t then
+        isect.t = t
+        isect.hit = true
+        isect.pl = Vec.new(ray.org.x + ray.dir.x * t,
+                          ray.org.y + ray.dir.y * t,
+                          ray.org.z + ray.dir.z * t)
+        n = isect.pl.vsub(@center)
+        isect.n = n.vnormalize
+      else
+        0.0
+      end
+    end
+    nil
+  end
+end
+
+class Plane
+  def initialize(p, n)
+    @p = p
+    @n = n
+  end
+
+  def intersect(ray, isect)
+    d = -@p.vdot(@n)
+    v = ray.dir.vdot(@n)
+    v0 = v
+    if v < 0.0 then
+      v0 = -v
+    end
+    if v0 < 1.0e-17 then
+      return
+    end
+
+    t = -(ray.org.vdot(@n) + d) / v
+
+    if t > 0.0 and t < isect.t then
+      isect.hit = true
+      isect.t = t
+      isect.n = @n
+      isect.pl = Vec.new(ray.org.x + t * ray.dir.x,
+                        ray.org.y + t * ray.dir.y,
+                        ray.org.z + t * ray.dir.z)
+    end
+    nil
+  end
+end
+
+class Ray
+  def initialize(org, dir)
+    @org = org
+    @dir = dir
+  end
+
+  attr_accessor :org, :dir
+end
+
+class Isect
+  def initialize
+    @t = 10000000.0
+    @hit = false
+    @pl = Vec.new(0.0, 0.0, 0.0)
+    @n = Vec.new(0.0, 0.0, 0.0)
+  end
+
+  attr_accessor :t, :hit, :pl, :n
+end
+
+def clamp(f)
+  i = f * 255.5
+  if i > 255.0 then
+    i = 255.0
+  end
+  if i < 0.0 then
+    i = 0.0
+  end
+  i.to_i
+end
+
+def otherBasis(basis, n)
+  basis[2] = Vec.new(n.x, n.y, n.z)
+  basis[1] = Vec.new(0.0, 0.0, 0.0)
+
+  if n.x < 0.6 and n.x > -0.6 then
+    basis[1].x = 1.0
+  elsif n.y < 0.6 and n.y > -0.6 then
+    basis[1].y = 1.0
+  elsif n.z < 0.6 and n.z > -0.6 then
+    basis[1].z = 1.0
+  else
+    basis[1].x = 1.0
+  end
+
+  basis[0] = basis[1].vcross(basis[2])
+  basis[0] = basis[0].vnormalize
+
+  basis[1] = basis[2].vcross(basis[0])
+  basis[1] = basis[1].vnormalize
+end
+
+class Scene
+  def initialize
+    @spheres = Array.new
+    @spheres[0] = Sphere.new(Vec.new(-2.0, 0.0, -3.5), 0.5)
+    @spheres[1] = Sphere.new(Vec.new(-0.5, 0.0, -3.0), 0.5)
+    @spheres[2] = Sphere.new(Vec.new(1.0, 0.0, -2.2), 0.5)
+    @plane = Plane.new(Vec.new(0.0, -0.5, 0.0), Vec.new(0.0, 1.0, 0.0))
+  end
+
+  def ambient_occlusion(isect)
+    basis = Array.new
+    otherBasis(basis, isect.n)
+
+    ntheta    = NAO_SAMPLES
+    nphi      = NAO_SAMPLES
+    eps       = 0.0001
+    occlusion = 0.0
+
+    p0 = Vec.new(isect.pl.x + eps * isect.n.x,
+                isect.pl.y + eps * isect.n.y,
+                isect.pl.z + eps * isect.n.z)
+    nphi.times do |j|
+      ntheta.times do |i|
+        r = rand
+        phi = 2.0 * 3.14159265 * rand
+        x = Math.cos(phi) * Math.sqrt(1.0 - r)
+        y = Math.sin(phi) * Math.sqrt(1.0 - r)
+        z = Math.sqrt(r)
+
+        rx = x * basis[0].x + y * basis[1].x + z * basis[2].x
+        ry = x * basis[0].y + y * basis[1].y + z * basis[2].y
+        rz = x * basis[0].z + y * basis[1].z + z * basis[2].z
+
+        raydir = Vec.new(rx, ry, rz)
+        ray = Ray.new(p0, raydir)
+
+        occisect = Isect.new
+        @spheres[0].intersect(ray, occisect)
+        @spheres[1].intersect(ray, occisect)
+        @spheres[2].intersect(ray, occisect)
+        @plane.intersect(ray, occisect)
+        if occisect.hit then
+          occlusion = occlusion + 1.0
+        else
+          0.0
+        end
+      end
+    end
+
+    occlusion = (ntheta.to_f * nphi.to_f - occlusion) / (ntheta.to_f * nphi.to_f)
+
+    Vec.new(occlusion, occlusion, occlusion)
+  end
+
+  def render(w, h, nsubsamples)
+    cnt = 0
+    nsf = nsubsamples.to_f
+    h.times do |y|
+      w.times do |x|
+        rad = Vec.new(0.0, 0.0, 0.0)
+
+        # Subsampling
+        nsubsamples.times do |v|
+          nsubsamples.times do |u|
+
+            cnt = cnt + 1
+            wf = w.to_f
+            hf = h.to_f
+            xf = x.to_f
+            yf = y.to_f
+            uf = u.to_f
+            vf = v.to_f
+
+            px = (xf + (uf / nsf) - (wf / 2.0)) / (wf / 2.0)
+            py = -(yf + (vf / nsf) - (hf / 2.0)) / (hf / 2.0)
+
+            eye = Vec.new(px, py, -1.0).vnormalize
+
+            ray = Ray.new(Vec.new(0.0, 0.0, 0.0), eye)
+
+            isect = Isect.new
+            @spheres[0].intersect(ray, isect)
+            @spheres[1].intersect(ray, isect)
+            @spheres[2].intersect(ray, isect)
+            @plane.intersect(ray, isect)
+            if isect.hit then
+              col = ambient_occlusion(isect)
+              rad.x = rad.x + col.x
+              rad.y = rad.y + col.y
+              rad.z = rad.z + col.z
+            end
+          end
+        end
+
+        r = rad.x / (nsf * nsf)
+        g = rad.y / (nsf * nsf)
+        b = rad.z / (nsf * nsf)
+        printf("%c", clamp(r))
+        printf("%c", clamp(g))
+        printf("%c", clamp(b))
+      end
+      nil
+    end
+
+    nil
+  end
+end
+
+alias printf_orig printf
+def printf *args
+end
+
+# File.open("ao.ppm", "w") do |fp|
+  printf("P6\n")
+  printf("%d %d\n", IMAGE_WIDTH, IMAGE_HEIGHT)
+  printf("255\n", IMAGE_WIDTH, IMAGE_HEIGHT)
+  Scene.new.render(IMAGE_WIDTH, IMAGE_HEIGHT, NSUBSAMPLES)
+# end
+
+undef printf
+alias printf printf_orig
diff --git a/benchmark/bm_app_lc_fizzbuzz.rb b/benchmark/bm_app_lc_fizzbuzz.rb
new file mode 100644
index 0000000000..f09574bbeb
--- /dev/null
+++ b/benchmark/bm_app_lc_fizzbuzz.rb
@@ -0,0 +1,52 @@
+#
+# FizzBuzz program using only lambda calculus
+#
+# This program is quoted from
+#   "Understanding Computation" by Tom Stuart
+#   http://computationbook.com/
+#
+# You can understand why this program works fine by reading this book.
+#
+
+solution = -> k { -> f { -> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> l { -> x { -> g { -> b { b }[-> p { p[-> x { -> y { x } }] }[l]][x][-> y { g[f[-> l { -> p { p[-> x { -> y { y } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][x][g]][-> l { -> p { p[-> x { -> y { x } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][y] }] } } } }][k][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> l { -> x { -> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[l][f[x]] } }] } }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[m][n]][-> x { -> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[f[-> n { -> p { -> x { p[n[p][x]] } } }[m]][n]][m][x] }][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]] } } }][-> p { -> x { p[x] } }][-> p { -> x { p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[x]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] } }]][-> n { -> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[x]]]]]]]]]]]]]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[x]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> n { -> l { -> x { -> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> l { -> x { -> g { -> b { b }[-> p { p[-> x { -> y { x } }] }[l]][x][-> y { g[f[-> l { -> p { p[-> x { -> y { y } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][x][g]][-> l { -> p { p[-> x { -> y { x } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][y] }] } } } }][l][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][x]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }] } }[-> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> x { f[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { -> n { -> p { -> x { p[n[p][x]] } } }[f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n]][x] }][-> p { -> x { x } }] } } }][n][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][x] }]][-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]] } }][n]]]] }]
+
+FIRST     = -> l { LEFT[RIGHT[l]] }
+IF        = -> b { b }
+LEFT      = -> p { p[-> x { -> y { x } } ] }
+RIGHT     = -> p { p[-> x { -> y { y } } ] }
+IS_EMPTY  = LEFT
+REST      = -> l { RIGHT[RIGHT[l]] }
+
+def to_integer(proc)
+  proc[-> n { n + 1 }][0]
+end
+
+def to_boolean(proc)
+  IF[proc][true][false]
+end
+
+def to_array(proc)
+  array = []
+
+  until to_boolean(IS_EMPTY[proc])
+    array.push(FIRST[proc])
+    proc = REST[proc]
+  end
+
+  array
+end
+
+def to_char(c)
+  '0123456789BFiuz'.slice(to_integer(c))
+end
+
+def to_string(s)
+  to_array(s).map { |c| to_char(c) }.join
+end
+
+answer = to_array(solution).map do |p|
+  to_string(p)
+end
+
+answer_ary = answer.to_a
+# puts answer_ary
diff --git a/benchmark/bm_app_mandelbrot.rb b/benchmark/bm_app_mandelbrot.rb
index 89069db7ab..801b75e8e2 100644
--- a/benchmark/bm_app_mandelbrot.rb
+++ b/benchmark/bm_app_mandelbrot.rb
@@ -3,7 +3,7 @@ require 'complex'
 def mandelbrot? z
   i = 0
   while i<100
-    i+=1
+    i += 1
     z = z * z
     return false if z.abs > 2
   end
diff --git a/benchmark/bm_app_raise.rb b/benchmark/bm_app_raise.rb
index 01d2ae3219..5db8f95d50 100644
--- a/benchmark/bm_app_raise.rb
+++ b/benchmark/bm_app_raise.rb
@@ -1,6 +1,6 @@
-i=0
+i = 0
 while i<300000
-  i+=1
+  i += 1
   begin
     raise
   rescue
diff --git a/benchmark/bm_app_strconcat.rb b/benchmark/bm_app_strconcat.rb
index 7b2f2da5a7..7eed7c1aed 100644
--- a/benchmark/bm_app_strconcat.rb
+++ b/benchmark/bm_app_strconcat.rb
@@ -1,5 +1,5 @@
-i=0
+i = 0
 while i<2_000_000
   "#{1+1} #{1+1} #{1+1}"
-  i+=1
+  i += 1
 end
diff --git a/benchmark/bm_array_shift.rb b/benchmark/bm_array_shift.rb
new file mode 100644
index 0000000000..798bb9e3f4
--- /dev/null
+++ b/benchmark/bm_array_shift.rb
@@ -0,0 +1,14 @@
+require 'benchmark'
+
+Benchmark.bm do |x|
+  [10_000,1_000_000,100_000_000].each do |n|
+    ary = Array.new(n,0)
+    GC.start
+    x.report("#{n}:shift"){ ary.shift }
+    (0..4).each do |i|
+      ary = Array.new(n,0)
+      GC.start
+      x.report("#{n}:shift(#{i})"){ ary.shift(i) }
+    end
+  end
+end
diff --git a/benchmark/bm_hash_aref_dsym.rb b/benchmark/bm_hash_aref_dsym.rb
new file mode 100644
index 0000000000..af4f8c36d4
--- /dev/null
+++ b/benchmark/bm_hash_aref_dsym.rb
@@ -0,0 +1,4 @@
+h = {}
+syms = ('a'..'z').map { |s| s.to_sym }
+syms.each { |s| h[s] = 1 }
+200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_dsym_long.rb b/benchmark/bm_hash_aref_dsym_long.rb
new file mode 100644
index 0000000000..9d7759379e
--- /dev/null
+++ b/benchmark/bm_hash_aref_dsym_long.rb
@@ -0,0 +1,21 @@
+# [ruby-core:70129] [Bug #11396]
+collection_size = 200000
+sample_size = 10000
+
+values = (1..collection_size).to_a.map do |x|
+  "THIS IS A LONGER STRING THAT IS ALSO UNIQUE #{x}"
+end
+
+symbol_hash = {}
+
+values.each do |x|
+  symbol_hash[x.to_sym] = 1
+end
+
+# use the same samples each time to minimize deviations
+rng = Random.new(0)
+symbol_sample_array = values.sample(sample_size, random: rng).map(&:to_sym)
+
+3000.times do
+  symbol_sample_array.each { |x| symbol_hash[x] }
+end
diff --git a/benchmark/bm_hash_aref_fix.rb b/benchmark/bm_hash_aref_fix.rb
new file mode 100644
index 0000000000..1346890582
--- /dev/null
+++ b/benchmark/bm_hash_aref_fix.rb
@@ -0,0 +1,4 @@
+h = {}
+nums = (1..26).to_a
+nums.each { |i| h[i] = i }
+200_000.times { nums.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_flo.rb b/benchmark/bm_hash_aref_flo.rb
new file mode 100644
index 0000000000..2217274c82
--- /dev/null
+++ b/benchmark/bm_hash_aref_flo.rb
@@ -0,0 +1,4 @@
+h = {}
+strs = [*1..10000].map! {|i| i.fdiv(10)}
+strs.each { |s| h[s] = s }
+50.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_miss.rb b/benchmark/bm_hash_aref_miss.rb
new file mode 100644
index 0000000000..b0913dd4bb
--- /dev/null
+++ b/benchmark/bm_hash_aref_miss.rb
@@ -0,0 +1,5 @@
+h = {}
+strs = ('a'..'z').to_a.map!(&:freeze)
+strs.each { |s| h[s] = s }
+strs = ('A'..'Z').to_a
+200_000.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_str.rb b/benchmark/bm_hash_aref_str.rb
new file mode 100644
index 0000000000..19439b061b
--- /dev/null
+++ b/benchmark/bm_hash_aref_str.rb
@@ -0,0 +1,4 @@
+h = {}
+strs = ('a'..'z').to_a.map!(&:freeze)
+strs.each { |s| h[s] = s }
+200_000.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_sym.rb b/benchmark/bm_hash_aref_sym.rb
new file mode 100644
index 0000000000..f75d163fe6
--- /dev/null
+++ b/benchmark/bm_hash_aref_sym.rb
@@ -0,0 +1,9 @@
+h = {}
+syms = ('a'..'z').to_a
+begin
+  syms = eval("%i[#{syms.join(' ')}]")
+rescue SyntaxError # <= 1.9.3
+  syms.map!(&:to_sym)
+end
+syms.each { |s| h[s] = s }
+200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_sym_long.rb b/benchmark/bm_hash_aref_sym_long.rb
new file mode 100644
index 0000000000..9dab8df7be
--- /dev/null
+++ b/benchmark/bm_hash_aref_sym_long.rb
@@ -0,0 +1,13 @@
+h = {}
+syms = %w[puts warn syswrite write stat bacon lettuce tomato
+some symbols in this array may already be interned  others should not be
+hash browns make good breakfast but not cooked using prime numbers
+shift for division entries delete_if keys exist?
+]
+begin
+  syms = eval("%i[#{syms.join(' ')}]")
+rescue SyntaxError # <= 1.9.3
+  syms.map!(&:to_sym)
+end
+syms.each { |s| h[s] = s }
+200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_flatten.rb b/benchmark/bm_hash_flatten.rb
new file mode 100644
index 0000000000..e944aae9f2
--- /dev/null
+++ b/benchmark/bm_hash_flatten.rb
@@ -0,0 +1,9 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+1000.times do
+  h.flatten
+end
diff --git a/benchmark/bm_hash_ident_flo.rb b/benchmark/bm_hash_ident_flo.rb
new file mode 100644
index 0000000000..0c7edfed3e
--- /dev/null
+++ b/benchmark/bm_hash_ident_flo.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+strs = (1..10000).to_a.map!(&:to_f)
+strs.each { |s| h[s] = s }
+50.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_ident_num.rb b/benchmark/bm_hash_ident_num.rb
new file mode 100644
index 0000000000..b226736c6f
--- /dev/null
+++ b/benchmark/bm_hash_ident_num.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+nums = (1..26).to_a
+nums.each { |n| h[n] = n }
+200_000.times { nums.each { |n| h[n] } }
diff --git a/benchmark/bm_hash_ident_obj.rb b/benchmark/bm_hash_ident_obj.rb
new file mode 100644
index 0000000000..4b3b58edec
--- /dev/null
+++ b/benchmark/bm_hash_ident_obj.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+objs = 26.times.map { Object.new }
+objs.each { |o| h[o] = o }
+200_000.times { objs.each { |o| h[o] } }
diff --git a/benchmark/bm_hash_ident_str.rb b/benchmark/bm_hash_ident_str.rb
new file mode 100644
index 0000000000..8582b38e31
--- /dev/null
+++ b/benchmark/bm_hash_ident_str.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+strs = ('a'..'z').to_a
+strs.each { |s| h[s] = s }
+200_000.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_ident_sym.rb b/benchmark/bm_hash_ident_sym.rb
new file mode 100644
index 0000000000..4c81e3d28e
--- /dev/null
+++ b/benchmark/bm_hash_ident_sym.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+syms = ('a'..'z').to_a.map(&:to_sym)
+syms.each { |s| h[s] = s }
+200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_keys.rb b/benchmark/bm_hash_keys.rb
new file mode 100644
index 0000000000..6863cd01f9
--- /dev/null
+++ b/benchmark/bm_hash_keys.rb
@@ -0,0 +1,9 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+5000.times do
+  h.keys
+end
diff --git a/benchmark/bm_hash_shift.rb b/benchmark/bm_hash_shift.rb
new file mode 100644
index 0000000000..a645671a5b
--- /dev/null
+++ b/benchmark/bm_hash_shift.rb
@@ -0,0 +1,10 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+50000.times do
+  k, v = h.shift
+  h[k] = v
+end
diff --git a/benchmark/bm_hash_shift_u16.rb b/benchmark/bm_hash_shift_u16.rb
new file mode 100644
index 0000000000..ec800d0342
--- /dev/null
+++ b/benchmark/bm_hash_shift_u16.rb
@@ -0,0 +1,10 @@
+h = {}
+
+(16384..65536).each do |i|
+  h[i] = nil
+end
+
+300000.times do
+  k, v = h.shift
+  h[k] = v
+end
diff --git a/benchmark/bm_hash_shift_u24.rb b/benchmark/bm_hash_shift_u24.rb
new file mode 100644
index 0000000000..de4e0fa696
--- /dev/null
+++ b/benchmark/bm_hash_shift_u24.rb
@@ -0,0 +1,10 @@
+h = {}
+
+(0xff4000..0xffffff).each do |i|
+  h[i] = nil
+end
+
+300000.times do
+  k, v = h.shift
+  h[k] = v
+end
diff --git a/benchmark/bm_hash_shift_u32.rb b/benchmark/bm_hash_shift_u32.rb
new file mode 100644
index 0000000000..656aa55583
--- /dev/null
+++ b/benchmark/bm_hash_shift_u32.rb
@@ -0,0 +1,10 @@
+h = {}
+
+(0xffff4000..0xffffffff).each do |i|
+  h[i] = nil
+end
+
+300000.times do
+  k, v = h.shift
+  h[k] = v
+end
diff --git a/benchmark/bm_hash_to_proc.rb b/benchmark/bm_hash_to_proc.rb
new file mode 100644
index 0000000000..2b675bf509
--- /dev/null
+++ b/benchmark/bm_hash_to_proc.rb
@@ -0,0 +1,9 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+5000.times do |i|
+  [i].map(&h)
+end
diff --git a/benchmark/bm_hash_values.rb b/benchmark/bm_hash_values.rb
new file mode 100644
index 0000000000..069441302f
--- /dev/null
+++ b/benchmark/bm_hash_values.rb
@@ -0,0 +1,9 @@
+h = {}
+
+10000.times do |i|
+  h[i] = nil
+end
+
+5000.times do
+  h.values
+end
diff --git a/benchmark/bm_io_nonblock_noex.rb b/benchmark/bm_io_nonblock_noex.rb
new file mode 100644
index 0000000000..da9357fdc6
--- /dev/null
+++ b/benchmark/bm_io_nonblock_noex.rb
@@ -0,0 +1,22 @@
+nr = 1_000_000
+i = 0
+msg = '.'
+buf = '.'
+noex = { exception: false }
+begin
+  r, w = IO.pipe
+  while i < nr
+    i += 1
+    w.write_nonblock(msg, noex)
+    r.read_nonblock(1, buf, noex)
+  end
+rescue ArgumentError # old Rubies
+  while i < nr
+    i += 1
+    w.write_nonblock(msg)
+    r.read_nonblock(1, buf)
+  end
+ensure
+  r.close
+  w.close
+end
diff --git a/benchmark/bm_io_nonblock_noex2.rb b/benchmark/bm_io_nonblock_noex2.rb
new file mode 100644
index 0000000000..56819d049b
--- /dev/null
+++ b/benchmark/bm_io_nonblock_noex2.rb
@@ -0,0 +1,21 @@
+nr = 1_000_000
+i = 0
+msg = '.'
+buf = '.'
+begin
+  r, w = IO.pipe
+  while i < nr
+    i += 1
+    w.write_nonblock(msg, exception: false)
+    r.read_nonblock(1, buf, exception: false)
+  end
+rescue ArgumentError # old Rubies
+  while i < nr
+    i += 1
+    w.write_nonblock(msg)
+    r.read_nonblock(1, buf)
+  end
+ensure
+  r.close
+  w.close
+end
diff --git a/benchmark/bm_io_select2.rb b/benchmark/bm_io_select2.rb
index 7b167af774..10e37d71b2 100644
--- a/benchmark/bm_io_select2.rb
+++ b/benchmark/bm_io_select2.rb
@@ -2,7 +2,11 @@
 
 ios = []
 nr = 1000000
-max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
+if defined?(Process::RLIMIT_NOFILE)
+  max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
+else
+  max = 64
+end
 puts "max fd: #{max} (results not apparent with <= 1024 max fd)"
 
 ((max / 2) - 10).times do
diff --git a/benchmark/bm_io_select3.rb b/benchmark/bm_io_select3.rb
index fcdbb96e0e..7d0ba1f092 100644
--- a/benchmark/bm_io_select3.rb
+++ b/benchmark/bm_io_select3.rb
@@ -2,7 +2,11 @@
 
 ios = []
 nr = 100
-max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
+if defined?(Process::RLIMIT_NOFILE)
+  max = Process.getrlimit(Process::RLIMIT_NOFILE)[0]
+else
+  max = 64
+end
 puts "max fd: #{max} (results not apparent with <= 1024 max fd)"
 
 (max - 10).times do
diff --git a/benchmark/bm_loop_whileloop.rb b/benchmark/bm_loop_whileloop.rb
index 43d35e1131..0072822c06 100644
--- a/benchmark/bm_loop_whileloop.rb
+++ b/benchmark/bm_loop_whileloop.rb
@@ -1,4 +1,4 @@
-i=0
+i = 0
 while i<30_000_000 # benchmark loop 1
-  i+=1
+  i += 1
 end
diff --git a/benchmark/bm_loop_whileloop2.rb b/benchmark/bm_loop_whileloop2.rb
index e514989661..47d02dffc4 100644
--- a/benchmark/bm_loop_whileloop2.rb
+++ b/benchmark/bm_loop_whileloop2.rb
@@ -1,4 +1,4 @@
-i=0
+i = 0
 while i< 6_000_000 # benchmark loop 2
-  i+=1
+  i += 1
 end
diff --git a/benchmark/bm_marshal_dump_flo.rb b/benchmark/bm_marshal_dump_flo.rb
new file mode 100644
index 0000000000..9b8d0c6afb
--- /dev/null
+++ b/benchmark/bm_marshal_dump_flo.rb
@@ -0,0 +1,2 @@
+bug10761 = 10000.times.map { |x| x.to_f }
+100.times { Marshal.dump(bug10761) }
diff --git a/benchmark/bm_marshal_dump_load_geniv.rb b/benchmark/bm_marshal_dump_load_geniv.rb
new file mode 100644
index 0000000000..8252ad90fa
--- /dev/null
+++ b/benchmark/bm_marshal_dump_load_geniv.rb
@@ -0,0 +1,10 @@
+a = ''
+a.instance_eval do
+  @a = :a
+  @b = :b
+  @c = :c
+end
+100000.times do
+  a = Marshal.load(Marshal.dump(a))
+end
+#p(a.instance_eval { @a == :a && @b == :b && @c == :c })
diff --git a/benchmark/bm_marshal_dump_load_time.rb b/benchmark/bm_marshal_dump_load_time.rb
new file mode 100644
index 0000000000..e29743b791
--- /dev/null
+++ b/benchmark/bm_marshal_dump_load_time.rb
@@ -0,0 +1 @@
+100000.times { Marshal.load(Marshal.dump(Time.now)) }
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/bm_securerandom.rb b/benchmark/bm_securerandom.rb
new file mode 100644
index 0000000000..a082ea6d5b
--- /dev/null
+++ b/benchmark/bm_securerandom.rb
@@ -0,0 +1,5 @@
+require "securerandom"
+
+20_0000.times do
+  SecureRandom.random_number(100)
+end
diff --git a/benchmark/bm_so_binary_trees.rb b/benchmark/bm_so_binary_trees.rb
index 6a26465578..b1693e4109 100644
--- a/benchmark/bm_so_binary_trees.rb
+++ b/benchmark/bm_so_binary_trees.rb
@@ -4,7 +4,9 @@
 # contributed by Jesse Millikan
 
 # disable output
-def STDOUT.write_ *args
+alias puts_orig puts
+def puts str
+  # disable puts
 end
 
 def item_check(tree)
@@ -25,7 +27,7 @@ def bottom_up_tree(item, depth)
  end
 end
 
-max_depth = 12 # 16 # ARGV[0].to_i
+max_depth = 16 # ARGV[0].to_i
 min_depth = 4
 
 max_depth = min_depth + 2 if min_depth + 2 > max_depth
@@ -55,3 +57,6 @@ min_depth.step(max_depth + 1, 2) do |depth|
 end
 
 puts "long lived tree of depth #{max_depth}\t check: #{item_check(long_lived_tree)}"
+
+undef puts
+alias puts puts_orig
diff --git a/benchmark/bm_so_concatenate.rb b/benchmark/bm_so_concatenate.rb
index 56b9410632..873214de7c 100644
--- a/benchmark/bm_so_concatenate.rb
+++ b/benchmark/bm_so_concatenate.rb
@@ -5,9 +5,9 @@
 # based on code from Aristarkh A Zagorodnikov and Dat Nguyen
 
 STUFF = "hello\n"
-i=0
+i = 0
 while i<10
-  i+=1
+  i += 1
   hello = ''
   4_000_000.times do |e|
     hello << STUFF
diff --git a/benchmark/bm_so_exception.rb b/benchmark/bm_so_exception.rb
index d8b461290c..deb003a594 100644
--- a/benchmark/bm_so_exception.rb
+++ b/benchmark/bm_so_exception.rb
@@ -56,6 +56,6 @@ end
 i = 1
 max = NUM+1
 while i < max
-  i+=1
+  i += 1
   some_function(i+1)
 end
diff --git a/benchmark/bm_so_lists.rb b/benchmark/bm_so_lists.rb
index f8d26797aa..e8f4a2a5f7 100644
--- a/benchmark/bm_so_lists.rb
+++ b/benchmark/bm_so_lists.rb
@@ -40,7 +40,7 @@ end
 
 i = 0
 while i<NUM
-  i+=1
+  i += 1
   result = test_lists()
 end
 
diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb
index 99cf6a91cc..64a7d46afe 100644
--- a/benchmark/bm_so_meteor_contest.rb
+++ b/benchmark/bm_so_meteor_contest.rb
@@ -32,7 +32,7 @@ class Rotation
     @start_masks = Array.new(60)
 
     # create the rotational masks by placing the base mask at the location and seeing if
-    # 1) it overlaps the boundries and 2) it produces a prunable board.  if either of these
+    # 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)
@@ -260,7 +260,7 @@ end
 
 # support function that create three utility maps:
 #  $converter -- for each row an array that maps a five bit row (via array mapping)
-#                to the a a five bit representation of the bits below it
+#                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,
@@ -326,9 +326,9 @@ end
 #  The exact procedure is described in-code
 def prunable( board, location, slotting = false)
   collectors = []
-  # loop accross the rows
+  # loop across the rows
   (location / 6).to_i.upto(9) do | row_on |
-    # obtain a set of regions representing the bits of the curent row.
+    # obtain a set of regions representing the bits of the current row.
     regions = $regions[(board >> (row_on * 6)) & 0b11111]
     converter = $converter[row_on]
 
@@ -370,7 +370,7 @@ def prunable( board, location, slotting = false)
     end
 
     # check the existing collectors, if any collector overlapped no bits in the region its [2] value will
-    # be zero.  The size of any such reaason is tested if it is not a muliple of five true is returned since
+    # 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.
@@ -382,7 +382,7 @@ def prunable( board, location, slotting = false)
           collectors[collector_num] = nil
         else
           # if a collector matches all bits in the row then we can return unprunable early for the
-          # follwing reasons:
+          # 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
@@ -467,7 +467,7 @@ def find_top( rotation_skip)
 end
 
 # the normail find routine, iterates through the available pieces, checks all rotations at the current location
-# and adds any boards found.  depth is acheived via recursion.  the overall approach is described
+# 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
@@ -526,7 +526,7 @@ def save( board_string)
     @boards_found += 1
 
     # the exit motif is a time saver.  Ideally the function should return, but those tests
-    # take noticable time (performance).
+    # take noticeable time (performance).
     if (@boards_found == @stop_count) then
       print_results
       exit(0)
@@ -561,4 +561,3 @@ create_collector_support
 @boards_found = 0
 
 find_all ######## DO IT!!!
-
diff --git a/benchmark/bm_so_nsieve_bits.rb b/benchmark/bm_so_nsieve_bits.rb
index 019b8b6382..6f958ee44e 100644
--- a/benchmark/bm_so_nsieve_bits.rb
+++ b/benchmark/bm_so_nsieve_bits.rb
@@ -1,4 +1,5 @@
 #!/usr/bin/ruby
+#coding: us-ascii
 #
 # The Great Computer Language Shootout
 # http://shootout.alioth.debian.org/
diff --git a/benchmark/bm_so_random.rb b/benchmark/bm_so_random.rb
index 57f700b863..a66b9e8e63 100644
--- a/benchmark/bm_so_random.rb
+++ b/benchmark/bm_so_random.rb
@@ -12,9 +12,9 @@ end
 
 N = 3_000_000
 
-i=0
+i = 0
 while i<N
-  i+=1
+  i +=1
   gen_random(100.0)
 end
 # "%.9f" % gen_random(100.0)
diff --git a/benchmark/bm_so_sieve.rb b/benchmark/bm_so_sieve.rb
index 3f1b138bd1..43dc302648 100644
--- a/benchmark/bm_so_sieve.rb
+++ b/benchmark/bm_so_sieve.rb
@@ -4,12 +4,12 @@ count = i = j = 0
 flags0 = Array.new(8192,1)
 k = 0
 while k < num
-  k+=1
+  k += 1
   count = 0
   flags = flags0.dup
   i = 2
   while i<8192
-    i+=1
+    i += 1
     if flags[i]
       # remove all multiples of prime: i
       j = i*i
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
index 0a97883974..a9f56b15ea 100644
--- a/benchmark/bm_vm1_block.rb
+++ b/benchmark/bm_vm1_block.rb
@@ -2,9 +2,9 @@ def m
   yield
 end
 
-i=0
+i = 0
 while i<30_000_000 # while loop 1
-  i+=1
+  i += 1
   m{
   }
 end
diff --git a/benchmark/bm_vm1_const.rb b/benchmark/bm_vm1_const.rb
index 066916dc31..ac59ebccf1 100644
--- a/benchmark/bm_vm1_const.rb
+++ b/benchmark/bm_vm1_const.rb
@@ -2,7 +2,7 @@ Const = 1
 
 i = 0
 while i<30_000_000 # while loop 1
-  i+= 1
+  i += 1
   j = Const
   k = Const
 end
diff --git a/benchmark/bm_vm1_ensure.rb b/benchmark/bm_vm1_ensure.rb
index b1948f7621..a1596145f2 100644
--- a/benchmark/bm_vm1_ensure.rb
+++ b/benchmark/bm_vm1_ensure.rb
@@ -1,6 +1,6 @@
-i=0
+i = 0
 while i<30_000_000 # benchmark loop 1
-  i+=1
+  i += 1
   begin
     begin
     ensure
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
index 3ba56427f4..68a73cf92f 100644
--- a/benchmark/bm_vm1_ivar.rb
+++ b/benchmark/bm_vm1_ivar.rb
@@ -2,7 +2,7 @@
 
 i = 0
 while i<30_000_000 # while loop 1
-  i+= 1
+  i += 1
   j = @a
   k = @a
 end
diff --git a/benchmark/bm_vm1_ivar_set.rb b/benchmark/bm_vm1_ivar_set.rb
index c8076c6ab6..bd81b06c34 100644
--- a/benchmark/bm_vm1_ivar_set.rb
+++ b/benchmark/bm_vm1_ivar_set.rb
@@ -1,6 +1,6 @@
 i = 0
 while i<30_000_000 # while loop 1
-  i+= 1
+  i += 1
   @a = 1
   @b = 2
 end
diff --git a/benchmark/bm_vm1_length.rb b/benchmark/bm_vm1_length.rb
index ccb773278f..353de3ab0e 100644
--- a/benchmark/bm_vm1_length.rb
+++ b/benchmark/bm_vm1_length.rb
@@ -1,8 +1,8 @@
 a = 'abc'
 b = [1, 2, 3]
-i=0
+i = 0
 while i<30_000_000 # while loop 1
-  i+=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
index 9254a0ca9b..bbb4ae07a4 100644
--- a/benchmark/bm_vm1_neq.rb
+++ b/benchmark/bm_vm1_neq.rb
@@ -3,6 +3,6 @@ obj1 = Object.new
 obj2 = Object.new
 
 while i<30_000_000 # while loop 1
-  i+= 1
+  i += 1
   obj1 != obj2
 end
diff --git a/benchmark/bm_vm1_not.rb b/benchmark/bm_vm1_not.rb
index ee9d0f3605..b09ecdcc21 100644
--- a/benchmark/bm_vm1_not.rb
+++ b/benchmark/bm_vm1_not.rb
@@ -2,6 +2,6 @@ i = 0
 obj = Object.new
 
 while i<30_000_000 # while loop 1
-  i+= 1
+  i += 1
   !obj
 end
diff --git a/benchmark/bm_vm1_rescue.rb b/benchmark/bm_vm1_rescue.rb
index 3af12bb0f3..b0d3e2bdfa 100644
--- a/benchmark/bm_vm1_rescue.rb
+++ b/benchmark/bm_vm1_rescue.rb
@@ -1,6 +1,6 @@
-i=0
+i = 0
 while i<30_000_000 # while loop 1
-  i+=1
+  i += 1
   begin
   rescue
   end
diff --git a/benchmark/bm_vm1_simplereturn.rb b/benchmark/bm_vm1_simplereturn.rb
index 8e9bcb0129..63f9f21675 100644
--- a/benchmark/bm_vm1_simplereturn.rb
+++ b/benchmark/bm_vm1_simplereturn.rb
@@ -1,9 +1,9 @@
 def m
   return 1
 end
-i=0
+i = 0
 while i<30_000_000 # while loop 1
-  i+=1
+  i += 1
   m
 end
 
diff --git a/benchmark/bm_vm1_swap.rb b/benchmark/bm_vm1_swap.rb
index 611baf6b99..918f8b2112 100644
--- a/benchmark/bm_vm1_swap.rb
+++ b/benchmark/bm_vm1_swap.rb
@@ -1,8 +1,8 @@
 a = 1
 b = 2
-i=0
+i = 0
 while i<30_000_000 # while loop 1
-  i+=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
index 7713ae9f25..df9037c83c 100644
--- a/benchmark/bm_vm2_array.rb
+++ b/benchmark/bm_vm2_array.rb
@@ -1,5 +1,5 @@
-i=0
+i = 0
 while i<6_000_000 # benchmark loop 2
-  i+=1
+  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
index cd09788a85..adc6e4df0a 100644
--- a/benchmark/bm_vm2_case.rb
+++ b/benchmark/bm_vm2_case.rb
@@ -1,4 +1,4 @@
-i=0
+i = 0
 while i<6_000_000 # while loop 2
   case :foo
   when :bar
@@ -8,7 +8,7 @@ while i<6_000_000 # while loop 2
   when :boo
     raise
   when :foo
-    i+=1
+    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
index 06c0d01baa..053ed6c912 100644
--- a/benchmark/bm_vm2_defined_method.rb
+++ b/benchmark/bm_vm2_defined_method.rb
@@ -2,8 +2,8 @@ class Object
   define_method(:m){}
 end
 
-i=0
+i = 0
 while i<6_000_000 # benchmark loop 2
-  i+=1
+  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
index e72b4661ac..307cfc28ef 100644
--- a/benchmark/bm_vm2_eval.rb
+++ b/benchmark/bm_vm2_eval.rb
@@ -1,6 +1,6 @@
-i=0
+i = 0
 while i<6_000_000 # benchmark loop 2
-  i+=1
+  i += 1
   eval("1")
 end
 
diff --git a/benchmark/bm_vm2_method.rb b/benchmark/bm_vm2_method.rb
index f92e39a73f..a8ccff7138 100644
--- a/benchmark/bm_vm2_method.rb
+++ b/benchmark/bm_vm2_method.rb
@@ -2,8 +2,8 @@ def m
   nil
 end
 
-i=0
+i = 0
 while i<6_000_000 # benchmark loop 2
-  i+=1
+  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
index 01b1c478cb..5d16480c6b 100644
--- a/benchmark/bm_vm2_mutex.rb
+++ b/benchmark/bm_vm2_mutex.rb
@@ -1,9 +1,9 @@
 require 'thread'
 
-m = Mutex.new
+m = Thread::Mutex.new
 
-i=0
+i = 0
 while i<6_000_000 # benchmark loop 2
-  i+=1
+  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
index 921457d817..c82c0e4bce 100644
--- a/benchmark/bm_vm2_poly_method.rb
+++ b/benchmark/bm_vm2_poly_method.rb
@@ -12,9 +12,9 @@ end
 o1 = C1.new
 o2 = C2.new
 
-i=0
+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
+  i += 1
 end
diff --git a/benchmark/bm_vm2_poly_method_ov.rb b/benchmark/bm_vm2_poly_method_ov.rb
index bf09837dd7..aa5fd1dd38 100644
--- a/benchmark/bm_vm2_poly_method_ov.rb
+++ b/benchmark/bm_vm2_poly_method_ov.rb
@@ -12,9 +12,9 @@ end
 o1 = C1.new
 o2 = C2.new
 
-i=0
+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
+  i += 1
 end
diff --git a/benchmark/bm_vm2_proc.rb b/benchmark/bm_vm2_proc.rb
index 3f51056bf9..65e5217371 100644
--- a/benchmark/bm_vm2_proc.rb
+++ b/benchmark/bm_vm2_proc.rb
@@ -6,9 +6,9 @@ pr = m{
   a = 1
 }
 
-i=0
+i = 0
 while i<6_000_000 # benchmark loop 2
-  i+=1
+  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
index 428099e55a..55f9e957a3 100644
--- a/benchmark/bm_vm2_regexp.rb
+++ b/benchmark/bm_vm2_regexp.rb
@@ -1,6 +1,6 @@
-i=0
+i = 0
 str = 'xxxhogexxx'
 while i<6_000_000 # benchmark loop 2
   /hoge/ =~ str
-  i+=1
+  i += 1
 end
diff --git a/benchmark/bm_vm2_send.rb b/benchmark/bm_vm2_send.rb
index 37c79fb1c3..6a3ab6fdab 100644
--- a/benchmark/bm_vm2_send.rb
+++ b/benchmark/bm_vm2_send.rb
@@ -5,8 +5,8 @@ end
 
 o = C.new
 
-i=0
+i = 0
 while i<6_000_000 # benchmark loop 2
-  i+=1
+  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
index d4f0b647de..afd8579e7b 100644
--- a/benchmark/bm_vm2_super.rb
+++ b/benchmark/bm_vm2_super.rb
@@ -16,5 +16,5 @@ obj = CC.new
 i = 0
 while i<6_000_000 # benchmark loop 2
   obj.m
-  i+=1
+  i += 1
 end
diff --git a/benchmark/bm_vm2_unif1.rb b/benchmark/bm_vm2_unif1.rb
index 775f4d37e6..1774625942 100644
--- a/benchmark/bm_vm2_unif1.rb
+++ b/benchmark/bm_vm2_unif1.rb
@@ -3,6 +3,6 @@ def m a, b
 end
 
 while i<6_000_000 # benchmark loop 2
-  i+=1
+  i += 1
   m 100, 200
 end
diff --git a/benchmark/bm_vm2_zsuper.rb b/benchmark/bm_vm2_zsuper.rb
index 7e90df1822..2a43e62217 100644
--- a/benchmark/bm_vm2_zsuper.rb
+++ b/benchmark/bm_vm2_zsuper.rb
@@ -16,5 +16,5 @@ obj = CC.new
 
 while i<6_000_000 # benchmark loop 2
   obj.m 10
-  i+=1
+  i += 1
 end
diff --git a/benchmark/bm_vm3_backtrace.rb b/benchmark/bm_vm3_backtrace.rb
new file mode 100644
index 0000000000..0fbf73e1ca
--- /dev/null
+++ b/benchmark/bm_vm3_backtrace.rb
@@ -0,0 +1,22 @@
+# get last backtrace
+
+begin
+  caller(0, 0)
+rescue ArgumentError
+  alias caller_orig caller
+  def caller lev, n
+    caller_orig(lev)[0..n]
+  end
+end
+
+def rec n
+  if n < 0
+    100_000.times{
+      caller(0, 1)
+    }
+  else
+    rec(n-1)
+  end
+end
+
+rec 50
diff --git a/benchmark/bm_vm3_clearmethodcache.rb b/benchmark/bm_vm3_clearmethodcache.rb
index a25c372f06..9661323cd2 100644
--- a/benchmark/bm_vm3_clearmethodcache.rb
+++ b/benchmark/bm_vm3_clearmethodcache.rb
@@ -1,6 +1,6 @@
-i=0
+i = 0
 while i<200_000
-  i+=1
+  i += 1
 
   Class.new{
     def m; end
diff --git a/benchmark/bm_vm3_gc.rb b/benchmark/bm_vm3_gc.rb
index 7db9829d44..e668026915 100755..100644
--- a/benchmark/bm_vm3_gc.rb
+++ b/benchmark/bm_vm3_gc.rb
@@ -1,4 +1,3 @@
-#! /usr/bin/ruby
 5000.times do
   100.times do
     {"xxxx"=>"yyyy"}
diff --git a/benchmark/bm_vm3_gc_old_full.rb b/benchmark/bm_vm3_gc_old_full.rb
new file mode 100644
index 0000000000..cfdfc8c5a5
--- /dev/null
+++ b/benchmark/bm_vm3_gc_old_full.rb
@@ -0,0 +1,4 @@
+old_object = Array.new(1_000_000){''}
+100.times do
+  GC.start
+end
diff --git a/benchmark/bm_vm3_gc_old_immediate.rb b/benchmark/bm_vm3_gc_old_immediate.rb
new file mode 100644
index 0000000000..ad22feb655
--- /dev/null
+++ b/benchmark/bm_vm3_gc_old_immediate.rb
@@ -0,0 +1,4 @@
+old_object = Array.new(1_000_000){''}
+30_000.times do
+  GC.start(full_mark: false, immediate_sweep: true)
+end
diff --git a/benchmark/bm_vm3_gc_old_lazy.rb b/benchmark/bm_vm3_gc_old_lazy.rb
new file mode 100644
index 0000000000..b74d44baf1
--- /dev/null
+++ b/benchmark/bm_vm3_gc_old_lazy.rb
@@ -0,0 +1,4 @@
+old_object = Array.new(1_000_000){''}
+30_000.times do
+  GC.start(full_mark: false, immediate_sweep: false)
+end
diff --git a/benchmark/bm_vm_symbol_block_pass.rb b/benchmark/bm_vm_symbol_block_pass.rb
new file mode 100644
index 0000000000..1d433353e1
--- /dev/null
+++ b/benchmark/bm_vm_symbol_block_pass.rb
@@ -0,0 +1,13 @@
+class C
+  1000.times {|i|
+    eval("def i#{i};end")
+  }
+end
+
+c = C.new
+m = C.instance_methods(false)
+5_000.times do
+  m.each do |n|
+    c.tap(&n)
+  end
+end
diff --git a/benchmark/bm_vm_thread_close.rb b/benchmark/bm_vm_thread_close.rb
new file mode 100644
index 0000000000..3e9a265ce8
--- /dev/null
+++ b/benchmark/bm_vm_thread_close.rb
@@ -0,0 +1,6 @@
+1000.times { Thread.new { sleep } }
+i = 0
+while i<100_000 # benchmark loop 3
+  i += 1
+  IO.pipe.each(&:close)
+end
diff --git a/benchmark/bm_vm_thread_create_join.rb b/benchmark/bm_vm_thread_create_join.rb
index 325a66d587..393cd45df9 100644
--- a/benchmark/bm_vm_thread_create_join.rb
+++ b/benchmark/bm_vm_thread_create_join.rb
@@ -1,6 +1,6 @@
-i=0
+i = 0
 while i<100_000 # benchmark loop 3
-  i+=1
+  i += 1
   Thread.new{
   }.join
 end
diff --git a/benchmark/bm_vm_thread_mutex1.rb b/benchmark/bm_vm_thread_mutex1.rb
index 588506e87c..66e42c85e1 100644
--- a/benchmark/bm_vm_thread_mutex1.rb
+++ b/benchmark/bm_vm_thread_mutex1.rb
@@ -1,15 +1,15 @@
 # one thread, one mutex (no contention)
 
 require 'thread'
-m = Mutex.new
+m = Thread::Mutex.new
 r = 0
 max = 2000
 lmax = max * max
 (1..1).map{
   Thread.new{
-    i=0
+    i = 0
     while i<lmax
-      i+=1
+      i += 1
       m.synchronize{
         r += 1
       }
diff --git a/benchmark/bm_vm_thread_mutex2.rb b/benchmark/bm_vm_thread_mutex2.rb
index d700b146d4..6e6c804c31 100644
--- a/benchmark/bm_vm_thread_mutex2.rb
+++ b/benchmark/bm_vm_thread_mutex2.rb
@@ -1,15 +1,15 @@
 # two threads, one mutex
 
 require 'thread'
-m = Mutex.new
+m = Thread::Mutex.new
 r = 0
 max = 2000
 lmax = (max * max)/2
 (1..2).map{
   Thread.new{
-    i=0
+    i = 0
     while i<lmax
-      i+=1
+      i += 1
       m.synchronize{
         r += 1
       }
diff --git a/benchmark/bm_vm_thread_mutex3.rb b/benchmark/bm_vm_thread_mutex3.rb
index f502b6ac84..c750dc542a 100644
--- a/benchmark/bm_vm_thread_mutex3.rb
+++ b/benchmark/bm_vm_thread_mutex3.rb
@@ -1,14 +1,14 @@
 # 1000 threads, one mutex
 
 require 'thread'
-m = Mutex.new
+m = Thread::Mutex.new
 r = 0
 max = 2000
 (1..max).map{
   Thread.new{
-    i=0
+    i = 0
     while i<max
-      i+=1
+      i += 1
       m.synchronize{
         r += 1
       }
diff --git a/benchmark/bm_vm_thread_pass_flood.rb b/benchmark/bm_vm_thread_pass_flood.rb
index 56b5b0a956..27157d1a6f 100644
--- a/benchmark/bm_vm_thread_pass_flood.rb
+++ b/benchmark/bm_vm_thread_pass_flood.rb
@@ -2,7 +2,7 @@
   Thread.new{loop{Thread.pass}}
 }
 
-i=0
+i = 0
 while i<10000
   i += 1
 end
diff --git a/benchmark/bm_vm_thread_pipe.rb b/benchmark/bm_vm_thread_pipe.rb
index 272d231eba..112a621905 100644
--- a/benchmark/bm_vm_thread_pipe.rb
+++ b/benchmark/bm_vm_thread_pipe.rb
@@ -1,4 +1,4 @@
-# Mesure small and plenty pipe read/write.
+# Measure small and plenty pipe read/write.
 # A performance may depend on GVL implementation.
 
 lmax = 100_000
diff --git a/benchmark/bm_vm_thread_queue.rb b/benchmark/bm_vm_thread_queue.rb
new file mode 100644
index 0000000000..274ceda366
--- /dev/null
+++ b/benchmark/bm_vm_thread_queue.rb
@@ -0,0 +1,18 @@
+require 'thread'
+
+n = 1_000_000
+q = Thread::Queue.new
+consumer = Thread.new{
+  while q.pop
+    # consuming
+  end
+}
+
+producer = Thread.new{
+  n.times{
+    q.push true
+  }
+  q.push nil
+}
+
+consumer.join
diff --git a/benchmark/bmx_temp.rb b/benchmark/bmx_temp.rb
deleted file mode 100644
index 0b4b219ca2..0000000000
--- a/benchmark/bmx_temp.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-def m
-  nil
-end
-
-i=0
-while i<800000 # benchmark loop 2
-  i+=1
-  m; m; m; m; m; m; m; m;
-end
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
index 7dab292a15..eb976b4a90 100644
--- a/benchmark/driver.rb
+++ b/benchmark/driver.rb
@@ -18,6 +18,7 @@ end
 
 require 'benchmark'
 require 'pp'
+require 'tempfile'
 
 class BenchmarkDriver
   def self.benchmark(opt)
@@ -29,6 +30,24 @@ class BenchmarkDriver
     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)
@@ -60,22 +79,26 @@ class BenchmarkDriver
 
       if /(.+)::(.+)/ =~ e
         # ex) ruby-a::/path/to/ruby-a
-        v = $1.strip
-        e = $2
+        label = $1.strip
+        path = $2
+        version = `#{path} -v`.chomp
       else
-        v =  `#{e} -v`.chomp
-        v.sub!(/ patchlevel \d+/, '')
+        path = e
+        version = label = `#{path} -v`.chomp
       end
-      [e, v]
+      [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, ...]]], ...]
@@ -84,17 +107,56 @@ class BenchmarkDriver
     if @verbose
       @start_time = Time.now
       message @start_time
-      @execs.each_with_index{|(e, v), i|
-        message "target #{i}: #{v}"
+      @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 average results
-    results.inject(:+) / results.length
+  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
@@ -103,7 +165,30 @@ class BenchmarkDriver
       message
       message PP.pp(@results, "", 79)
       message
-      message "Elapesed time: #{Time.now - @start_time} (sec)"
+      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 '-----------------------------------------------------------'
@@ -113,50 +198,63 @@ class BenchmarkDriver
       output "minimum results in each #{@repeat} measurements."
     end
 
-    difference = "\taverage difference" if @execs.length == 2
-    total_difference = 0
-
-    output "name\t#{@execs.map{|(e, v)| v}.join("\t")}#{difference}"
+    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 = nil
-      result.each_with_index{|e, i|
-        r = e.min
-        case v
-        when /^vm1_/
-          if @loop_wl1
-            r -= @loop_wl1[i]
-            s = '*'
-          end
-        when /^vm2_/
-          if @loop_wl2
-            r -= @loop_wl2[i]
-            s = '*'
-          end
-        end
-        rets << sprintf("%.3f", r)
+      s = adjusted_results(v, result){|r|
+        rets << sprintf(numformat, r, width[rets.size])
       }
-
-      if difference
-        diff = average(result.last) - average(result.first)
-        total_difference += diff
-        rets << sprintf("%.3f", diff)
-      end
-
-      output "#{v}#{s}\t#{rets.join("\t")}"
+      v += s if s
+      output [v.ljust(name_width), rets].join("")
     }
 
-    if difference and @verbose
-      output '-----------------------------------------------------------'
-      output "average total difference is #{total_difference}"
+    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 = {}
-    vm1 = vm2 = wl1 = wl2 = false
     @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
@@ -217,32 +315,63 @@ class BenchmarkDriver
     result
   end
 
+  unless defined?(File::NULL)
+    if File.exist?('/dev/null')
+      File::NULL = '/dev/null'
+    end
+  end
+
   def measure executable, file
-    cmd = "#{executable} #{file}"
-    m = Benchmark.measure{
-      `#{cmd}`
-    }
+    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 "\`#{cmd}\' exited with abnormal status (#{$?})"
+      raise $?.inspect if $? && $?.signaled?
+      output "\`#{cmd}\' exited with abnormal status (#{$?})"
+      0
+    else
+      result
     end
-
-    m.real
   end
 end
 
 if __FILE__ == $0
   opt = {
-    :execs => ['ruby'],
-    :dir => './',
+    :execs => [],
+    :dir => File.dirname(__FILE__),
     :repeat => 1,
-    :output => "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}",
+    :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. (exec1; exec2; exec3, ...)"){|e|
-      opt[:execs] = e.split(/;/)
+      "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
@@ -250,21 +379,49 @@ if __FILE__ == $0
     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"){|o|
-      opt[:output] = o
+    o.on('-o', '--output-file [FILE]', "Output file"){|f|
+      opt[:output] = f
     }
-    o.on('-q', '--quiet', "Run without notify information except result table."){|q|
-      opt[:quiet] = q
+    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)
-  BenchmarkDriver.benchmark(opt)
+  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/gc/aobench.rb b/benchmark/gc/aobench.rb
new file mode 100644
index 0000000000..2eed7abc83
--- /dev/null
+++ b/benchmark/gc/aobench.rb
@@ -0,0 +1 @@
+require_relative '../bm_app_aobench.rb'
diff --git a/benchmark/gc/binary_trees.rb b/benchmark/gc/binary_trees.rb
new file mode 100644
index 0000000000..af8ea722aa
--- /dev/null
+++ b/benchmark/gc/binary_trees.rb
@@ -0,0 +1 @@
+require_relative '../bm_so_binary_trees.rb'
diff --git a/benchmark/gc/gcbench.rb b/benchmark/gc/gcbench.rb
new file mode 100644
index 0000000000..09a404466a
--- /dev/null
+++ b/benchmark/gc/gcbench.rb
@@ -0,0 +1,56 @@
+require 'benchmark'
+require 'pp'
+require 'optparse'
+
+$list = true
+$gcprof = true
+
+opt = OptionParser.new
+opt.on('-q'){$list = false}
+opt.on('-d'){$gcprof = false}
+opt.parse!(ARGV)
+
+script = File.join(File.dirname(__FILE__), ARGV.shift)
+script += '.rb' unless FileTest.exist?(script)
+raise "#{script} not found" unless FileTest.exist?(script)
+
+puts "Script: #{script}"
+
+if $gcprof
+  GC::Profiler.enable
+end
+
+tms = Benchmark.measure{|x|
+  load script
+}
+
+gc_time = 0
+
+if $gcprof
+  gc_time = GC::Profiler.total_time
+  GC::Profiler.report if $list and RUBY_VERSION >= '2.0.0' # before 1.9.3, report() may run infinite loop
+  GC::Profiler.disable
+end
+
+pp GC.stat
+
+puts "#{RUBY_DESCRIPTION} #{GC::OPTS.inspect}" if defined?(GC::OPTS)
+
+desc = "#{RUBY_VERSION}#{RUBY_PATCHLEVEL >= 0 ? "p#{RUBY_PATCHLEVEL}" : "dev"}"
+name = File.basename(script, '.rb')
+
+puts
+puts script
+puts Benchmark::CAPTION
+puts tms
+puts "GC total time (sec): #{gc_time}"
+
+# show High-Water Mark on Linux
+if File.exist?('/proc/self/status') && /VmHWM:\s*(\d+.+)/ =~ File.read('/proc/self/status')
+  puts
+  puts "VmHWM: #{$1.chomp}"
+end
+
+puts
+puts "Summary of #{name} on #{desc}\t#{tms.real}\t#{gc_time}\t#{GC.count}"
+puts "         (real time in sec, GC time in sec, GC count)"
diff --git a/benchmark/gc/hash1.rb b/benchmark/gc/hash1.rb
new file mode 100644
index 0000000000..cb030d458d
--- /dev/null
+++ b/benchmark/gc/hash1.rb
@@ -0,0 +1,11 @@
+value = 0.01
+h = {}
+n = 50_000
+
+1.upto(n){|i|
+  h["%020d" % i] = "v-#{i}"
+}
+
+(n * 1_000).times{
+  ''
+}
diff --git a/benchmark/gc/hash2.rb b/benchmark/gc/hash2.rb
new file mode 100644
index 0000000000..e8c943fb21
--- /dev/null
+++ b/benchmark/gc/hash2.rb
@@ -0,0 +1,7 @@
+value = 0.01
+h = {}
+n = 4*(10**6)
+
+1.upto(n){|i|
+  h["%020d" % i] = value * i
+}
diff --git a/benchmark/gc/null.rb b/benchmark/gc/null.rb
new file mode 100644
index 0000000000..c05a79f561
--- /dev/null
+++ b/benchmark/gc/null.rb
@@ -0,0 +1 @@
+# null
diff --git a/benchmark/gc/pentomino.rb b/benchmark/gc/pentomino.rb
new file mode 100644
index 0000000000..94ba74be89
--- /dev/null
+++ b/benchmark/gc/pentomino.rb
@@ -0,0 +1 @@
+require_relative '../bm_app_pentomino.rb'
diff --git a/benchmark/gc/rdoc.rb b/benchmark/gc/rdoc.rb
new file mode 100644
index 0000000000..14c89f5611
--- /dev/null
+++ b/benchmark/gc/rdoc.rb
@@ -0,0 +1,13 @@
+require 'rdoc/rdoc'
+require 'tmpdir'
+
+srcdir = File.expand_path('../..', __dir__)
+
+Dir.mktmpdir('rdocbench-'){|d|
+  dir = File.join(d, 'rdocbench')
+  args = %W(--root #{srcdir} --page-dir #{srcdir}/doc --encoding=UTF-8 --no-force-update --all --ri --debug --quiet #{srcdir})
+  args << '--op' << dir
+
+  r = RDoc::RDoc.new
+  r.document args
+}
diff --git a/benchmark/gc/redblack.rb b/benchmark/gc/redblack.rb
new file mode 100644
index 0000000000..c66290140a
--- /dev/null
+++ b/benchmark/gc/redblack.rb
@@ -0,0 +1,366 @@
+# This benchmark is imported from https://github.com/jruby/rubybench/blob/master/time/bench_red_black.rb
+# License is License is Apache-2
+
+require 'benchmark'
+
+# Algorithm based on "Introduction to Algorithms" by Cormen and others
+class RedBlackTree
+  class Node
+    attr_accessor :color
+    attr_accessor :key
+    attr_accessor :left
+    attr_accessor :right
+    attr_accessor :parent
+
+    RED = :red
+    BLACK = :black
+    COLORS = [RED, BLACK].freeze
+
+    def initialize(key, color = RED)
+      raise ArgumentError, "Bad value for color parameter" unless COLORS.include?(color)
+      @color = color
+      @key = key
+      @left = @right = @parent = NilNode.instance
+    end
+
+    def black?
+      return color == BLACK
+    end
+
+    def red?
+      return color == RED
+    end
+  end
+
+  class NilNode < Node
+    class << self
+      private :new
+
+      # it's not thread safe
+      def instance
+        @instance ||= begin
+          def instance
+            return @instance
+          end
+
+          new
+        end
+      end
+    end
+
+    def initialize
+      self.color = BLACK
+      self.key = 0
+      self.left = nil
+      self.right = nil
+      self.parent = nil
+    end
+
+    def nil?
+      return true
+    end
+  end
+
+  include Enumerable
+
+  attr_accessor :root
+  attr_accessor :size
+
+  def initialize
+    self.root = NilNode.instance
+    self.size = 0
+  end
+
+  def add(key)
+    insert(Node.new(key))
+  end
+
+  def insert(x)
+    insert_helper(x)
+
+    x.color = Node::RED
+    while x != root && x.parent.color == Node::RED
+      if x.parent == x.parent.parent.left
+        y = x.parent.parent.right
+        if !y.nil? && y.color == Node::RED
+          x.parent.color = Node::BLACK
+          y.color = Node::BLACK
+          x.parent.parent.color = Node::RED
+          x = x.parent.parent
+        else
+          if x == x.parent.right
+            x = x.parent
+            left_rotate(x)
+          end
+          x.parent.color = Node::BLACK
+          x.parent.parent.color = Node::RED
+          right_rotate(x.parent.parent)
+        end
+      else
+        y = x.parent.parent.left
+        if !y.nil? && y.color == Node::RED
+          x.parent.color = Node::BLACK
+          y.color = Node::BLACK
+          x.parent.parent.color = Node::RED
+          x = x.parent.parent
+        else
+          if x == x.parent.left
+            x = x.parent
+            right_rotate(x)
+          end
+          x.parent.color = Node::BLACK
+          x.parent.parent.color = Node::RED
+          left_rotate(x.parent.parent)
+        end
+      end
+    end
+    root.color = Node::BLACK
+  end
+
+  alias << insert
+
+  def delete(z)
+    y = (z.left.nil? || z.right.nil?) ? z : successor(z)
+    x = y.left.nil? ? y.right : y.left
+    x.parent = y.parent
+
+    if y.parent.nil?
+      self.root = x
+    else
+      if y == y.parent.left
+        y.parent.left = x
+      else
+        y.parent.right = x
+      end
+    end
+
+    z.key = y.key if y != z
+
+    if y.color == Node::BLACK
+      delete_fixup(x)
+    end
+
+    self.size -= 1
+    return y
+  end
+
+  def minimum(x = root)
+    while !x.left.nil?
+      x = x.left
+    end
+    return x
+  end
+
+  def maximum(x = root)
+    while !x.right.nil?
+      x = x.right
+    end
+    return x
+  end
+
+  def successor(x)
+    if !x.right.nil?
+      return minimum(x.right)
+    end
+    y = x.parent
+    while !y.nil? && x == y.right
+      x = y
+      y = y.parent
+    end
+    return y
+  end
+
+  def predecessor(x)
+    if !x.left.nil?
+      return maximum(x.left)
+    end
+    y = x.parent
+    while !y.nil? && x == y.left
+      x = y
+      y = y.parent
+    end
+    return y
+  end
+
+  def inorder_walk(x = root)
+    x = self.minimum
+    while !x.nil?
+      yield x.key
+      x = successor(x)
+    end
+  end
+
+  alias each inorder_walk
+
+  def reverse_inorder_walk(x = root)
+    x = self.maximum
+    while !x.nil?
+      yield x.key
+      x = predecessor(x)
+    end
+  end
+
+  alias reverse_each reverse_inorder_walk
+
+  def search(key, x = root)
+    while !x.nil? && x.key != key
+      key < x.key ? x = x.left : x = x.right
+    end
+    return x
+  end
+
+  def empty?
+    return self.root.nil?
+  end
+
+  def black_height(x = root)
+    height = 0
+    while !x.nil?
+      x = x.left
+      height +=1 if x.nil? || x.black?
+    end
+    return height
+  end
+
+private
+
+  def left_rotate(x)
+    raise "x.right is nil!" if x.right.nil?
+    y = x.right
+    x.right = y.left
+    y.left.parent = x if !y.left.nil?
+    y.parent = x.parent
+    if x.parent.nil?
+      self.root = y
+    else
+      if x == x.parent.left
+        x.parent.left = y
+      else
+        x.parent.right = y
+      end
+    end
+    y.left = x
+    x.parent = y
+  end
+
+  def right_rotate(x)
+    raise "x.left is nil!" if x.left.nil?
+    y = x.left
+    x.left = y.right
+    y.right.parent = x if !y.right.nil?
+    y.parent = x.parent
+    if x.parent.nil?
+      self.root = y
+    else
+      if x == x.parent.left
+        x.parent.left = y
+      else
+        x.parent.right = y
+      end
+    end
+    y.right = x
+    x.parent = y
+  end
+
+  def insert_helper(z)
+    y = NilNode.instance
+    x = root
+    while !x.nil?
+      y = x
+      z.key < x.key ? x = x.left : x = x.right
+    end
+    z.parent = y
+    if y.nil?
+      self.root = z
+    else
+      z.key < y.key ? y.left = z : y.right = z
+    end
+    self.size += 1
+  end
+
+  def delete_fixup(x)
+    while x != root && x.color == Node::BLACK
+      if x == x.parent.left
+        w = x.parent.right
+        if w.color == Node::RED
+          w.color = Node::BLACK
+          x.parent.color = Node::RED
+          left_rotate(x.parent)
+          w = x.parent.right
+        end
+        if w.left.color == Node::BLACK && w.right.color == Node::BLACK
+          w.color = Node::RED
+          x = x.parent
+        else
+          if w.right.color == Node::BLACK
+            w.left.color = Node::BLACK
+            w.color = Node::RED
+            right_rotate(w)
+            w = x.parent.right
+          end
+          w.color = x.parent.color
+          x.parent.color = Node::BLACK
+          w.right.color = Node::BLACK
+          left_rotate(x.parent)
+          x = root
+        end
+      else
+        w = x.parent.left
+        if w.color == Node::RED
+          w.color = Node::BLACK
+          x.parent.color = Node::RED
+          right_rotate(x.parent)
+          w = x.parent.left
+        end
+        if w.right.color == Node::BLACK && w.left.color == Node::BLACK
+          w.color = Node::RED
+          x = x.parent
+        else
+          if w.left.color == Node::BLACK
+            w.right.color = Node::BLACK
+            w.color = Node::RED
+            left_rotate(w)
+            w = x.parent.left
+          end
+          w.color = x.parent.color
+          x.parent.color = Node::BLACK
+          w.left.color = Node::BLACK
+          right_rotate(x.parent)
+          x = root
+        end
+      end
+    end
+    x.color = Node::BLACK
+  end
+end
+
+def rbt_bm
+  n = 100_000
+  a1 = []; n.times { a1 << rand(999_999) }
+  a2 = []; n.times { a2 << rand(999_999) }
+
+  start = Time.now
+
+  tree = RedBlackTree.new
+
+  n.times {|i| tree.add(i) }
+  n.times { tree.delete(tree.root) }
+
+  tree = RedBlackTree.new
+  a1.each {|e| tree.add(e) }
+  a2.each {|e| tree.search(e) }
+  tree.inorder_walk {|key| key + 1 }
+  tree.reverse_inorder_walk {|key| key + 1 }
+  n.times { tree.minimum }
+  n.times { tree.maximum }
+
+  return Time.now - start
+end
+
+N = (ARGV[0] || 10).to_i
+
+N.times do
+  # puts rbt_bm.to_f
+  rbt_bm.to_f
+  # puts "GC.count = #{GC.count}" if GC.respond_to?(:count)
+end
diff --git a/benchmark/gc/ring.rb b/benchmark/gc/ring.rb
new file mode 100644
index 0000000000..be2c7b7250
--- /dev/null
+++ b/benchmark/gc/ring.rb
@@ -0,0 +1,29 @@
+# create many old objects
+
+max = 30_000_000
+
+class Ring
+  attr_reader :next_ring
+  def initialize n = nil
+    @next_ring = n
+  end
+
+
+  def size
+    s = 1
+    ring = self
+    while ring.next_ring
+      s += 1
+      ring = ring.next_ring
+    end
+    s
+  end
+end
+
+ring = Ring.new
+
+max.times{
+  ring = Ring.new(ring)
+}
+
+# p ring.size
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/other-lang/fact.rb b/benchmark/other-lang/fact.rb
index 7e97b22b39..6cedc752cd 100644
--- a/benchmark/other-lang/fact.rb
+++ b/benchmark/other-lang/fact.rb
@@ -6,8 +6,8 @@ def fact(n)
   end
 end
 
-i=0
+i = 0
 while i<10000
-  i+=1
+  i += 1
   fact(100)
 end
diff --git a/benchmark/other-lang/loop.rb b/benchmark/other-lang/loop.rb
index d43cef61f3..b367b9dbf3 100644
--- a/benchmark/other-lang/loop.rb
+++ b/benchmark/other-lang/loop.rb
@@ -1,4 +1,4 @@
-i=0
+i = 0
 while i<30000000
-  i+=1
+  i += 1
 end
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_k_nucleotide.rb b/benchmark/prepare_so_k_nucleotide.rb
index f28f4460a1..d83aeb7a7e 100644
--- a/benchmark/prepare_so_k_nucleotide.rb
+++ b/benchmark/prepare_so_k_nucleotide.rb
@@ -1,2 +1,2 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
+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
index 7f089109de..da3ec2df14 100644
--- a/benchmark/prepare_so_reverse_complement.rb
+++ b/benchmark/prepare_so_reverse_complement.rb
@@ -1,2 +1,2 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
+require_relative 'make_fasta_output'
 prepare_fasta_output(2_500_000)
diff --git a/bignum.c b/bignum.c
index 9c289f7a8e..741fa2d21e 100644
--- a/bignum.c
+++ b/bignum.c
@@ -9,42 +9,2864 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/util.h"
 #include "internal.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
 
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 #include <math.h>
 #include <float.h>
 #include <ctype.h>
 #ifdef HAVE_IEEEFP_H
 #include <ieeefp.h>
 #endif
-#include <assert.h>
+#include "ruby_assert.h"
+
+#if defined(HAVE_LIBGMP) && defined(HAVE_GMP_H)
+#define USE_GMP
+#include <gmp.h>
+#endif
 
+#define RB_BIGNUM_TYPE_P(x) RB_TYPE_P((x), T_BIGNUM)
+
+#ifndef RUBY_INTEGER_UNIFICATION
 VALUE rb_cBignum;
+#endif
+const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
+
+#ifndef SIZEOF_BDIGIT_DBL
+# if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+#  define SIZEOF_BDIGIT_DBL SIZEOF_LONG_LONG
+# else
+#  define SIZEOF_BDIGIT_DBL SIZEOF_LONG
+# endif
+#endif
 
-static VALUE big_three = Qnil;
+STATIC_ASSERT(sizeof_bdigit_dbl, sizeof(BDIGIT_DBL) == SIZEOF_BDIGIT_DBL);
+STATIC_ASSERT(sizeof_bdigit_dbl_signed, sizeof(BDIGIT_DBL_SIGNED) == SIZEOF_BDIGIT_DBL);
+STATIC_ASSERT(sizeof_bdigit, SIZEOF_BDIGIT <= sizeof(BDIGIT));
+STATIC_ASSERT(sizeof_bdigit_and_dbl, SIZEOF_BDIGIT*2 <= SIZEOF_BDIGIT_DBL);
+STATIC_ASSERT(bdigit_signedness, 0 < (BDIGIT)-1);
+STATIC_ASSERT(bdigit_dbl_signedness, 0 < (BDIGIT_DBL)-1);
+STATIC_ASSERT(bdigit_dbl_signed_signedness, 0 > (BDIGIT_DBL_SIGNED)-1);
+STATIC_ASSERT(rbignum_embed_len_max, BIGNUM_EMBED_LEN_MAX <= (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT));
+
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_LONG % SIZEOF_BDIGIT == 0);
+#else
+STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0);
+#endif
 
-#if defined __MINGW32__
-#define USHORT _USHORT
+#ifdef WORDS_BIGENDIAN
+#   define HOST_BIGENDIAN_P 1
+#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))))
+#define CLEAR_LOWBITS(d, numbits) ((d) & LSHIFTX(~((d)*0), (numbits)))
+#define FILL_LOWBITS(d, numbits) ((d) | (LSHIFTX(((d)*0+1), (numbits))-1))
+#define POW2_P(x) (((x)&((x)-1))==0)
 
-#define BDIGITS(x) (RBIGNUM_DIGITS(x))
-#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
+#define BDIGITS(x) (BIGNUM_DIGITS(x))
+#define BITSPERDIG (SIZEOF_BDIGIT*CHAR_BIT)
 #define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
 #define BIGRAD_HALF ((BDIGIT)(BIGRAD >> 1))
-#define DIGSPERLONG (SIZEOF_LONG/SIZEOF_BDIGITS)
-#if HAVE_LONG_LONG
-# define DIGSPERLL (SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
-#endif
-#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
+#define BDIGIT_MSB(d) (((d) & BIGRAD_HALF) != 0)
+#define BIGUP(x) LSHIFTX(((x) + (BDIGIT_DBL)0), BITSPERDIG)
 #define BIGDN(x) RSHIFT((x),BITSPERDIG)
-#define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
-#define BDIGMAX ((BDIGIT)-1)
+#define BIGLO(x) ((BDIGIT)((x) & BDIGMAX))
+#define BDIGMAX ((BDIGIT)(BIGRAD-1))
+#define BDIGIT_DBL_MAX (~(BDIGIT_DBL)0)
+
+#if SIZEOF_BDIGIT == 2
+#   define swap_bdigit(x) swap16(x)
+#elif SIZEOF_BDIGIT == 4
+#   define swap_bdigit(x) swap32(x)
+#elif SIZEOF_BDIGIT == 8
+#   define swap_bdigit(x) swap64(x)
+#endif
 
-#define BIGZEROP(x) (RBIGNUM_LEN(x) == 0 || \
+#define BIGZEROP(x) (BIGNUM_LEN(x) == 0 || \
 		     (BDIGITS(x)[0] == 0 && \
-		      (RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
+		      (BIGNUM_LEN(x) == 1 || bigzero_p(x))))
+#define BIGSIZE(x) (BIGNUM_LEN(x) == 0 ? (size_t)0 : \
+    BDIGITS(x)[BIGNUM_LEN(x)-1] ? \
+        (size_t)(BIGNUM_LEN(x)*SIZEOF_BDIGIT - nlz(BDIGITS(x)[BIGNUM_LEN(x)-1])/CHAR_BIT) : \
+    rb_absint_size(x, NULL))
+
+#define BIGDIVREM_EXTRA_WORDS 1
+#define bdigit_roomof(n) roomof(n, SIZEOF_BDIGIT)
+#define BARY_ARGS(ary) ary, numberof(ary)
+
+#define BARY_ADD(z, x, y) bary_add(BARY_ARGS(z), BARY_ARGS(x), BARY_ARGS(y))
+#define BARY_SUB(z, x, y) bary_sub(BARY_ARGS(z), BARY_ARGS(x), BARY_ARGS(y))
+#define BARY_SHORT_MUL(z, x, y) bary_short_mul(BARY_ARGS(z), BARY_ARGS(x), BARY_ARGS(y))
+#define BARY_DIVMOD(q, r, x, y) bary_divmod(BARY_ARGS(q), BARY_ARGS(r), BARY_ARGS(x), BARY_ARGS(y))
+#define BARY_ZERO_P(x) bary_zero_p(BARY_ARGS(x))
+
+#define BIGNUM_SET_NEGATIVE_SIGN(b) BIGNUM_SET_SIGN(b, 0)
+#define BIGNUM_SET_POSITIVE_SIGN(b) BIGNUM_SET_SIGN(b, 1)
+
+#define bignew(len,sign) bignew_1(rb_cInteger,(len),(sign))
+
+#define BDIGITS_ZERO(ptr, n) do { \
+  BDIGIT *bdigitz_zero_ptr = (ptr); \
+  size_t bdigitz_zero_n = (n); \
+  while (bdigitz_zero_n) { \
+    *bdigitz_zero_ptr++ = 0; \
+    bdigitz_zero_n--; \
+  } \
+} while (0)
+
+#define BARY_TRUNC(ds, n) do { \
+        while (0 < (n) && (ds)[(n)-1] == 0) \
+            (n)--; \
+    } while (0)
+
+#define KARATSUBA_BALANCED(xn, yn) ((yn)/2 < (xn))
+#define TOOM3_BALANCED(xn, yn) (((yn)+2)/3 * 2 < (xn))
+
+#define GMP_MUL_DIGITS 20
+#define KARATSUBA_MUL_DIGITS 70
+#define TOOM3_MUL_DIGITS 150
+
+#define GMP_DIV_DIGITS 20
+#define GMP_BIG2STR_DIGITS 20
+#define GMP_STR2BIG_DIGITS 20
+
+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);
+
+static mulfunc_t bary_mul_toom3_start;
+static mulfunc_t bary_mul_karatsuba_start;
+static BDIGIT bigdivrem_single(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT y);
+static void bary_divmod(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn);
+
+static VALUE bigmul0(VALUE x, VALUE y);
+static void bary_mul_toom3(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn);
+static VALUE bignew_1(VALUE klass, size_t len, int sign);
+static inline VALUE bigtrunc(VALUE x);
+
+static VALUE bigsq(VALUE x);
+static void bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp);
+static inline VALUE power_cache_get_power(int base, int power_level, size_t *numdigits_ret);
+
+#if SIZEOF_BDIGIT <= SIZEOF_INT
+static int nlz(BDIGIT x) { return nlz_int((unsigned int)x) - (SIZEOF_INT-SIZEOF_BDIGIT) * CHAR_BIT; }
+#elif SIZEOF_BDIGIT <= SIZEOF_LONG
+static int nlz(BDIGIT x) { return nlz_long((unsigned long)x) - (SIZEOF_LONG-SIZEOF_BDIGIT) * CHAR_BIT; }
+#elif SIZEOF_BDIGIT <= SIZEOF_LONG_LONG
+static int nlz(BDIGIT x) { return nlz_long_long((unsigned LONG_LONG)x) - (SIZEOF_LONG_LONG-SIZEOF_BDIGIT) * CHAR_BIT; }
+#elif SIZEOF_BDIGIT <= SIZEOF_INT128_T
+static int nlz(BDIGIT x) { return nlz_int128((uint128_t)x) - (SIZEOF_INT128_T-SIZEOF_BDIGIT) * CHAR_BIT; }
+#endif
+
+#define U16(a) ((uint16_t)(a))
+#define U32(a) ((uint32_t)(a))
+#ifdef HAVE_UINT64_T
+#define U64(a,b) (((uint64_t)(a) << 32) | (b))
+#endif
+#ifdef HAVE_UINT128_T
+#define U128(a,b,c,d) (((uint128_t)U64(a,b) << 64) | U64(c,d))
+#endif
+
+/* The following script, maxpow.rb, generates the tables follows.
+
+def big(n, bits)
+  ns = []
+  ((bits+31)/32).times {
+    ns << sprintf("0x%08x", n & 0xffff_ffff)
+    n >>= 32
+  }
+  "U#{bits}(" + ns.reverse.join(",") + ")"
+end
+def values(ary, width, indent)
+  lines = [""]
+  ary.each {|e|
+    lines << "" if !ary.last.empty? && width < (lines.last + e + ", ").length
+    lines.last << e + ", "
+  }
+  lines.map {|line| " " * indent + line.chomp(" ") + "\n" }.join
+end
+[16,32,64,128].each {|bits|
+  max = 2**bits-1
+  exps = []
+  nums = []
+  2.upto(36) {|base|
+    exp = 0
+    n = 1
+    while n * base <= max
+      exp += 1
+      n *= base
+    end
+    exps << exp.to_s
+    nums << big(n, bits)
+  }
+  puts "#ifdef HAVE_UINT#{bits}_T"
+  puts "static const int maxpow#{bits}_exp[35] = {"
+  print values(exps, 70, 4)
+  puts "};"
+  puts "static const uint#{bits}_t maxpow#{bits}_num[35] = {"
+  print values(nums, 70, 4)
+  puts "};"
+  puts "#endif"
+}
+
+ */
+
+#if SIZEOF_BDIGIT_DBL == 2
+static const int maxpow16_exp[35] = {
+    15, 10, 7, 6, 6, 5, 5, 5, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3,
+    3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+};
+static const uint16_t maxpow16_num[35] = {
+    U16(0x00008000), U16(0x0000e6a9), U16(0x00004000), U16(0x00003d09),
+    U16(0x0000b640), U16(0x000041a7), U16(0x00008000), U16(0x0000e6a9),
+    U16(0x00002710), U16(0x00003931), U16(0x00005100), U16(0x00006f91),
+    U16(0x00009610), U16(0x0000c5c1), U16(0x00001000), U16(0x00001331),
+    U16(0x000016c8), U16(0x00001acb), U16(0x00001f40), U16(0x0000242d),
+    U16(0x00002998), U16(0x00002f87), U16(0x00003600), U16(0x00003d09),
+    U16(0x000044a8), U16(0x00004ce3), U16(0x000055c0), U16(0x00005f45),
+    U16(0x00006978), U16(0x0000745f), U16(0x00008000), U16(0x00008c61),
+    U16(0x00009988), U16(0x0000a77b), U16(0x0000b640),
+};
+#elif SIZEOF_BDIGIT_DBL == 4
+static const int maxpow32_exp[35] = {
+    31, 20, 15, 13, 12, 11, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7,
+    7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
+};
+static const uint32_t maxpow32_num[35] = {
+    U32(0x80000000), U32(0xcfd41b91), U32(0x40000000), U32(0x48c27395),
+    U32(0x81bf1000), U32(0x75db9c97), U32(0x40000000), U32(0xcfd41b91),
+    U32(0x3b9aca00), U32(0x8c8b6d2b), U32(0x19a10000), U32(0x309f1021),
+    U32(0x57f6c100), U32(0x98c29b81), U32(0x10000000), U32(0x18754571),
+    U32(0x247dbc80), U32(0x3547667b), U32(0x4c4b4000), U32(0x6b5a6e1d),
+    U32(0x94ace180), U32(0xcaf18367), U32(0x0b640000), U32(0x0e8d4a51),
+    U32(0x1269ae40), U32(0x17179149), U32(0x1cb91000), U32(0x23744899),
+    U32(0x2b73a840), U32(0x34e63b41), U32(0x40000000), U32(0x4cfa3cc1),
+    U32(0x5c13d840), U32(0x6d91b519), U32(0x81bf1000),
+};
+#elif SIZEOF_BDIGIT_DBL == 8 && defined HAVE_UINT64_T
+static const int maxpow64_exp[35] = {
+    63, 40, 31, 27, 24, 22, 21, 20, 19, 18, 17, 17, 16, 16, 15, 15, 15,
+    15, 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 12, 12, 12, 12, 12,
+    12,
+};
+static const uint64_t maxpow64_num[35] = {
+    U64(0x80000000,0x00000000), U64(0xa8b8b452,0x291fe821),
+    U64(0x40000000,0x00000000), U64(0x6765c793,0xfa10079d),
+    U64(0x41c21cb8,0xe1000000), U64(0x36427987,0x50226111),
+    U64(0x80000000,0x00000000), U64(0xa8b8b452,0x291fe821),
+    U64(0x8ac72304,0x89e80000), U64(0x4d28cb56,0xc33fa539),
+    U64(0x1eca170c,0x00000000), U64(0x780c7372,0x621bd74d),
+    U64(0x1e39a505,0x7d810000), U64(0x5b27ac99,0x3df97701),
+    U64(0x10000000,0x00000000), U64(0x27b95e99,0x7e21d9f1),
+    U64(0x5da0e1e5,0x3c5c8000), U64(0xd2ae3299,0xc1c4aedb),
+    U64(0x16bcc41e,0x90000000), U64(0x2d04b7fd,0xd9c0ef49),
+    U64(0x5658597b,0xcaa24000), U64(0xa0e20737,0x37609371),
+    U64(0x0c29e980,0x00000000), U64(0x14adf4b7,0x320334b9),
+    U64(0x226ed364,0x78bfa000), U64(0x383d9170,0xb85ff80b),
+    U64(0x5a3c23e3,0x9c000000), U64(0x8e651373,0x88122bcd),
+    U64(0xdd41bb36,0xd259e000), U64(0x0aee5720,0xee830681),
+    U64(0x10000000,0x00000000), U64(0x172588ad,0x4f5f0981),
+    U64(0x211e44f7,0xd02c1000), U64(0x2ee56725,0xf06e5c71),
+    U64(0x41c21cb8,0xe1000000),
+};
+#elif SIZEOF_BDIGIT_DBL == 16 && defined HAVE_UINT128_T
+static const int maxpow128_exp[35] = {
+    127, 80, 63, 55, 49, 45, 42, 40, 38, 37, 35, 34, 33, 32, 31, 31, 30,
+    30, 29, 29, 28, 28, 27, 27, 27, 26, 26, 26, 26, 25, 25, 25, 25, 24,
+    24,
+};
+static const uint128_t maxpow128_num[35] = {
+    U128(0x80000000,0x00000000,0x00000000,0x00000000),
+    U128(0x6f32f1ef,0x8b18a2bc,0x3cea5978,0x9c79d441),
+    U128(0x40000000,0x00000000,0x00000000,0x00000000),
+    U128(0xd0cf4b50,0xcfe20765,0xfff4b4e3,0xf741cf6d),
+    U128(0x6558e2a0,0x921fe069,0x42860000,0x00000000),
+    U128(0x5080c7b7,0xd0e31ba7,0x5911a67d,0xdd3d35e7),
+    U128(0x40000000,0x00000000,0x00000000,0x00000000),
+    U128(0x6f32f1ef,0x8b18a2bc,0x3cea5978,0x9c79d441),
+    U128(0x4b3b4ca8,0x5a86c47a,0x098a2240,0x00000000),
+    U128(0xffd1390a,0x0adc2fb8,0xdabbb817,0x4d95c99b),
+    U128(0x2c6fdb36,0x4c25e6c0,0x00000000,0x00000000),
+    U128(0x384bacd6,0x42c343b4,0xe90c4272,0x13506d29),
+    U128(0x31f5db32,0xa34aced6,0x0bf13a0e,0x00000000),
+    U128(0x20753ada,0xfd1e839f,0x53686d01,0x3143ee01),
+    U128(0x10000000,0x00000000,0x00000000,0x00000000),
+    U128(0x68ca11d6,0xb4f6d1d1,0xfaa82667,0x8073c2f1),
+    U128(0x223e493b,0xb3bb69ff,0xa4b87d6c,0x40000000),
+    U128(0xad62418d,0x14ea8247,0x01c4b488,0x6cc66f59),
+    U128(0x2863c1f5,0xcdae42f9,0x54000000,0x00000000),
+    U128(0xa63fd833,0xb9386b07,0x36039e82,0xbe651b25),
+    U128(0x1d1f7a9c,0xd087a14d,0x28cdf3d5,0x10000000),
+    U128(0x651b5095,0xc2ea8fc1,0xb30e2c57,0x77aaf7e1),
+    U128(0x0ddef20e,0xff760000,0x00000000,0x00000000),
+    U128(0x29c30f10,0x29939b14,0x6664242d,0x97d9f649),
+    U128(0x786a435a,0xe9558b0e,0x6aaf6d63,0xa8000000),
+    U128(0x0c5afe6f,0xf302bcbf,0x94fd9829,0xd87f5079),
+    U128(0x1fce575c,0xe1692706,0x07100000,0x00000000),
+    U128(0x4f34497c,0x8597e144,0x36e91802,0x00528229),
+    U128(0xbf3a8e1d,0x41ef2170,0x7802130d,0x84000000),
+    U128(0x0e7819e1,0x7f1eb0fb,0x6ee4fb89,0x01d9531f),
+    U128(0x20000000,0x00000000,0x00000000,0x00000000),
+    U128(0x4510460d,0xd9e879c0,0x14a82375,0x2f22b321),
+    U128(0x91abce3c,0x4b4117ad,0xe76d35db,0x22000000),
+    U128(0x08973ea3,0x55d75bc2,0x2e42c391,0x727d69e1),
+    U128(0x10e425c5,0x6daffabc,0x35c10000,0x00000000),
+};
+#endif
+
+static BDIGIT_DBL
+maxpow_in_bdigit_dbl(int base, int *exp_ret)
+{
+    BDIGIT_DBL maxpow;
+    int exponent;
+
+    assert(2 <= base && base <= 36);
+
+    {
+#if SIZEOF_BDIGIT_DBL == 2
+        maxpow = maxpow16_num[base-2];
+        exponent = maxpow16_exp[base-2];
+#elif SIZEOF_BDIGIT_DBL == 4
+        maxpow = maxpow32_num[base-2];
+        exponent = maxpow32_exp[base-2];
+#elif SIZEOF_BDIGIT_DBL == 8 && defined HAVE_UINT64_T
+        maxpow = maxpow64_num[base-2];
+        exponent = maxpow64_exp[base-2];
+#elif SIZEOF_BDIGIT_DBL == 16 && defined HAVE_UINT128_T
+        maxpow = maxpow128_num[base-2];
+        exponent = maxpow128_exp[base-2];
+#else
+        maxpow = base;
+        exponent = 1;
+        while (maxpow <= BDIGIT_DBL_MAX / base) {
+            maxpow *= base;
+            exponent++;
+        }
+#endif
+    }
+
+    *exp_ret = exponent;
+    return maxpow;
+}
+
+static inline BDIGIT_DBL
+bary2bdigitdbl(const BDIGIT *ds, size_t n)
+{
+    assert(n <= 2);
+
+    if (n == 2)
+        return ds[0] | BIGUP(ds[1]);
+    if (n == 1)
+        return ds[0];
+    return 0;
+}
+
+static inline void
+bdigitdbl2bary(BDIGIT *ds, size_t n, BDIGIT_DBL num)
+{
+    assert(n == 2);
+
+    ds[0] = BIGLO(num);
+    ds[1] = (BDIGIT)BIGDN(num);
+}
+
+static int
+bary_cmp(const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    BARY_TRUNC(xds, xn);
+    BARY_TRUNC(yds, yn);
+
+    if (xn < yn)
+        return -1;
+    if (xn > yn)
+        return 1;
+
+    while (xn-- && xds[xn] == yds[xn])
+        ;
+    if (xn == (size_t)-1)
+        return 0;
+    return xds[xn] < yds[xn] ? -1 : 1;
+}
+
+static BDIGIT
+bary_small_lshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift)
+{
+    size_t i;
+    BDIGIT_DBL num = 0;
+    assert(0 <= shift && shift < BITSPERDIG);
+
+    for (i=0; i<n; i++) {
+	num = num | (BDIGIT_DBL)*xds++ << shift;
+	*zds++ = BIGLO(num);
+	num = BIGDN(num);
+    }
+    return BIGLO(num);
+}
+
+static void
+bary_small_rshift(BDIGIT *zds, const BDIGIT *xds, size_t n, int shift, BDIGIT higher_bdigit)
+{
+    BDIGIT_DBL num = 0;
+    BDIGIT x;
+
+    assert(0 <= shift && shift < BITSPERDIG);
+
+    num = BIGUP(higher_bdigit);
+    while (n--) {
+	num = (num | xds[n]) >> shift;
+        x = xds[n];
+	zds[n] = BIGLO(num);
+	num = BIGUP(x);
+    }
+}
+
+static int
+bary_zero_p(BDIGIT *xds, size_t xn)
+{
+    if (xn == 0)
+        return 1;
+    do {
+	if (xds[--xn]) return 0;
+    } while (xn);
+    return 1;
+}
+
+static void
+bary_neg(BDIGIT *ds, size_t n)
+{
+    while (n--)
+        ds[n] = BIGLO(~ds[n]);
+}
+
+static int
+bary_2comp(BDIGIT *ds, size_t n)
+{
+    size_t i;
+    i = 0;
+    for (i = 0; i < n; i++) {
+        if (ds[i] != 0) {
+            goto non_zero;
+        }
+    }
+    return 1;
+
+  non_zero:
+    ds[i] = BIGLO(~ds[i] + 1);
+    i++;
+    for (; i < n; i++) {
+        ds[i] = BIGLO(~ds[i]);
+    }
+    return 0;
+}
+
+static void
+bary_swap(BDIGIT *ds, size_t num_bdigits)
+{
+    BDIGIT *p1 = ds;
+    BDIGIT *p2 = ds + num_bdigits - 1;
+    for (; p1 < p2; p1++, p2--) {
+        BDIGIT tmp = *p1;
+        *p1 = *p2;
+        *p2 = tmp;
+    }
+}
+
+#define INTEGER_PACK_WORDORDER_MASK \
+    (INTEGER_PACK_MSWORD_FIRST | \
+     INTEGER_PACK_LSWORD_FIRST)
+#define INTEGER_PACK_BYTEORDER_MASK \
+    (INTEGER_PACK_MSBYTE_FIRST | \
+     INTEGER_PACK_LSBYTE_FIRST | \
+     INTEGER_PACK_NATIVE_BYTE_ORDER)
+
+static void
+validate_integer_pack_format(size_t numwords, size_t wordsize, size_t nails, int flags, int supported_flags)
+{
+    int wordorder_bits = flags & INTEGER_PACK_WORDORDER_MASK;
+    int byteorder_bits = flags & INTEGER_PACK_BYTEORDER_MASK;
+
+    if (flags & ~supported_flags) {
+        rb_raise(rb_eArgError, "unsupported flags specified");
+    }
+    if (wordorder_bits == 0) {
+        if (1 < numwords)
+            rb_raise(rb_eArgError, "word order not specified");
+    }
+    else if (wordorder_bits != INTEGER_PACK_MSWORD_FIRST &&
+        wordorder_bits != INTEGER_PACK_LSWORD_FIRST)
+        rb_raise(rb_eArgError, "unexpected word order");
+    if (byteorder_bits == 0) {
+        rb_raise(rb_eArgError, "byte order not specified");
+    }
+    else if (byteorder_bits != INTEGER_PACK_MSBYTE_FIRST &&
+        byteorder_bits != INTEGER_PACK_LSBYTE_FIRST &&
+        byteorder_bits != INTEGER_PACK_NATIVE_BYTE_ORDER)
+        rb_raise(rb_eArgError, "unexpected byte order");
+    if (wordsize == 0)
+        rb_raise(rb_eArgError, "invalid wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
+    if (SSIZE_MAX < wordsize)
+        rb_raise(rb_eArgError, "too big wordsize: %"PRI_SIZE_PREFIX"u", wordsize);
+    if (wordsize <= nails / CHAR_BIT)
+        rb_raise(rb_eArgError, "too big nails: %"PRI_SIZE_PREFIX"u", nails);
+    if (SIZE_MAX / wordsize < numwords)
+        rb_raise(rb_eArgError, "too big numwords * wordsize: %"PRI_SIZE_PREFIX"u * %"PRI_SIZE_PREFIX"u", numwords, wordsize);
+}
+
+static void
+integer_pack_loop_setup(
+    size_t numwords, size_t wordsize, size_t nails, int flags,
+    size_t *word_num_fullbytes_ret,
+    int *word_num_partialbits_ret,
+    size_t *word_start_ret,
+    ssize_t *word_step_ret,
+    size_t *word_last_ret,
+    size_t *byte_start_ret,
+    int *byte_step_ret)
+{
+    int wordorder_bits = flags & INTEGER_PACK_WORDORDER_MASK;
+    int byteorder_bits = flags & INTEGER_PACK_BYTEORDER_MASK;
+    size_t word_num_fullbytes;
+    int word_num_partialbits;
+    size_t word_start;
+    ssize_t word_step;
+    size_t word_last;
+    size_t byte_start;
+    int byte_step;
+
+    word_num_partialbits = CHAR_BIT - (int)(nails % CHAR_BIT);
+    if (word_num_partialbits == CHAR_BIT)
+        word_num_partialbits = 0;
+    word_num_fullbytes = wordsize - (nails / CHAR_BIT);
+    if (word_num_partialbits != 0) {
+        word_num_fullbytes--;
+    }
+
+    if (wordorder_bits == INTEGER_PACK_MSWORD_FIRST) {
+        word_start = wordsize*(numwords-1);
+        word_step = -(ssize_t)wordsize;
+        word_last = 0;
+    }
+    else {
+        word_start = 0;
+        word_step = wordsize;
+        word_last = wordsize*(numwords-1);
+    }
+
+    if (byteorder_bits == INTEGER_PACK_NATIVE_BYTE_ORDER) {
+#ifdef WORDS_BIGENDIAN
+        byteorder_bits = INTEGER_PACK_MSBYTE_FIRST;
+#else
+        byteorder_bits = INTEGER_PACK_LSBYTE_FIRST;
+#endif
+    }
+    if (byteorder_bits == INTEGER_PACK_MSBYTE_FIRST) {
+        byte_start = wordsize-1;
+        byte_step = -1;
+    }
+    else {
+        byte_start = 0;
+        byte_step = 1;
+    }
+
+    *word_num_partialbits_ret = word_num_partialbits;
+    *word_num_fullbytes_ret = word_num_fullbytes;
+    *word_start_ret = word_start;
+    *word_step_ret = word_step;
+    *word_last_ret = word_last;
+    *byte_start_ret = byte_start;
+    *byte_step_ret = byte_step;
+}
+
+static inline void
+integer_pack_fill_dd(BDIGIT **dpp, BDIGIT **dep, BDIGIT_DBL *ddp, int *numbits_in_dd_p)
+{
+    if (*dpp < *dep && BITSPERDIG <= (int)sizeof(*ddp) * CHAR_BIT - *numbits_in_dd_p) {
+        *ddp |= (BDIGIT_DBL)(*(*dpp)++) << *numbits_in_dd_p;
+        *numbits_in_dd_p += BITSPERDIG;
+    }
+    else if (*dpp == *dep) {
+        /* higher bits are infinity zeros */
+        *numbits_in_dd_p = (int)sizeof(*ddp) * CHAR_BIT;
+    }
+}
+
+static inline BDIGIT_DBL
+integer_pack_take_lowbits(int n, BDIGIT_DBL *ddp, int *numbits_in_dd_p)
+{
+    BDIGIT_DBL ret;
+    ret = (*ddp) & (((BDIGIT_DBL)1 << n) - 1);
+    *ddp >>= n;
+    *numbits_in_dd_p -= n;
+    return ret;
+}
+
+#if !defined(WORDS_BIGENDIAN)
+static int
+bytes_2comp(unsigned char *buf, size_t len)
+{
+    size_t i;
+    for (i = 0; i < len; i++)
+        buf[i] = ~buf[i];
+    for (i = 0; i < len; i++) {
+        buf[i]++;
+        if (buf[i] != 0)
+            return 0;
+    }
+    return 1;
+}
+#endif
+
+static int
+bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords, size_t wordsize, size_t nails, int flags)
+{
+    BDIGIT *dp, *de;
+    unsigned char *buf, *bufend;
+
+    dp = ds;
+    de = ds + num_bdigits;
+
+    validate_integer_pack_format(numwords, wordsize, nails, flags,
+            INTEGER_PACK_MSWORD_FIRST|
+            INTEGER_PACK_LSWORD_FIRST|
+            INTEGER_PACK_MSBYTE_FIRST|
+            INTEGER_PACK_LSBYTE_FIRST|
+            INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP|
+            INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION);
+
+    while (dp < de && de[-1] == 0)
+        de--;
+    if (dp == de) {
+        sign = 0;
+    }
+
+    if (!(flags & INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION)) {
+        if (sign == 0) {
+            MEMZERO(words, unsigned char, numwords * wordsize);
+            return 0;
+        }
+        if (nails == 0 && numwords == 1) {
+            int need_swap = wordsize != 1 &&
+                (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_NATIVE_BYTE_ORDER &&
+                ((flags & INTEGER_PACK_MSBYTE_FIRST) ? !HOST_BIGENDIAN_P : HOST_BIGENDIAN_P);
+            if (0 < sign || !(flags & INTEGER_PACK_2COMP)) {
+                BDIGIT d;
+                if (wordsize == 1) {
+                    *((unsigned char *)words) = (unsigned char)(d = dp[0]);
+                    return ((1 < de - dp || CLEAR_LOWBITS(d, 8) != 0) ? 2 : 1) * sign;
+                }
+#if defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
+                if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
+                    uint16_t u = (uint16_t)(d = dp[0]);
+                    if (need_swap) u = swap16(u);
+                    *((uint16_t *)words) = u;
+                    return ((1 < de - dp || CLEAR_LOWBITS(d, 16) != 0) ? 2 : 1) * sign;
+                }
+#endif
+#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
+                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;
+                    return ((1 < de - dp || CLEAR_LOWBITS(d, 32) != 0) ? 2 : 1) * sign;
+                }
+#endif
+#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
+                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;
+                    return ((1 < de - dp || CLEAR_LOWBITS(d, 64) != 0) ? 2 : 1) * sign;
+                }
+#endif
+            }
+            else { /* sign < 0 && (flags & INTEGER_PACK_2COMP) */
+                BDIGIT_DBL_SIGNED d;
+                if (wordsize == 1) {
+                    *((unsigned char *)words) = (unsigned char)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
+                    return (1 < de - dp || FILL_LOWBITS(d, 8) != -1) ? -2 : -1;
+                }
+#if defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
+                if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
+                    uint16_t u = (uint16_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
+                    if (need_swap) u = swap16(u);
+                    *((uint16_t *)words) = u;
+                    return (wordsize == SIZEOF_BDIGIT && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
+                        (1 < de - dp || FILL_LOWBITS(d, 16) != -1) ? -2 : -1;
+                }
+#endif
+#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
+                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;
+                    return (wordsize == SIZEOF_BDIGIT && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
+                        (1 < de - dp || FILL_LOWBITS(d, 32) != -1) ? -2 : -1;
+                }
+#endif
+#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
+                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;
+                    return (wordsize == SIZEOF_BDIGIT && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
+                        (1 < de - dp || FILL_LOWBITS(d, 64) != -1) ? -2 : -1;
+                }
+#endif
+            }
+        }
+#if !defined(WORDS_BIGENDIAN)
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            (flags & INTEGER_PACK_WORDORDER_MASK) == INTEGER_PACK_LSWORD_FIRST &&
+            (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_MSBYTE_FIRST) {
+            size_t src_size = (de - dp) * SIZEOF_BDIGIT;
+            size_t dst_size = numwords * wordsize;
+            int overflow = 0;
+            while (0 < src_size && ((unsigned char *)ds)[src_size-1] == 0)
+                src_size--;
+            if (src_size <= dst_size) {
+                MEMCPY(words, dp, char, src_size);
+                MEMZERO((char*)words + src_size, char, dst_size - src_size);
+            }
+            else {
+                MEMCPY(words, dp, char, dst_size);
+                overflow = 1;
+            }
+            if (sign < 0 && (flags & INTEGER_PACK_2COMP)) {
+                int zero_p = bytes_2comp(words, dst_size);
+                if (zero_p && overflow) {
+                    unsigned char *p = (unsigned char *)dp;
+                    if (dst_size == src_size-1 &&
+                        p[dst_size] == 1) {
+                        overflow = 0;
+                    }
+                }
+            }
+            if (overflow)
+                sign *= 2;
+            return sign;
+        }
+#endif
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            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;
+            int overflow = 0;
+            int mswordfirst_p = (flags & INTEGER_PACK_MSWORD_FIRST) != 0;
+            int msbytefirst_p = (flags & INTEGER_PACK_NATIVE_BYTE_ORDER) ? HOST_BIGENDIAN_P :
+                (flags & INTEGER_PACK_MSBYTE_FIRST) != 0;
+            if (src_num_bdigits <= dst_num_bdigits) {
+                MEMCPY(words, dp, BDIGIT, src_num_bdigits);
+                BDIGITS_ZERO((BDIGIT*)words + src_num_bdigits, dst_num_bdigits - src_num_bdigits);
+            }
+            else {
+                MEMCPY(words, dp, BDIGIT, dst_num_bdigits);
+                overflow = 1;
+            }
+            if (sign < 0 && (flags & INTEGER_PACK_2COMP)) {
+                int zero_p = bary_2comp(words, dst_num_bdigits);
+                if (zero_p && overflow &&
+                    dst_num_bdigits == src_num_bdigits-1 &&
+                    dp[dst_num_bdigits] == 1)
+                    overflow = 0;
+            }
+            if (msbytefirst_p != HOST_BIGENDIAN_P) {
+                size_t i;
+                for (i = 0; i < dst_num_bdigits; i++) {
+                    BDIGIT d = ((BDIGIT*)words)[i];
+                    ((BDIGIT*)words)[i] = swap_bdigit(d);
+                }
+            }
+            if (mswordfirst_p ? !msbytefirst_p : msbytefirst_p) {
+                size_t i;
+                BDIGIT *p = words;
+                for (i = 0; i < numwords; i++) {
+                    bary_swap(p, bdigits_per_word);
+                    p += bdigits_per_word;
+                }
+            }
+            if (mswordfirst_p) {
+                bary_swap(words, dst_num_bdigits);
+            }
+            if (overflow)
+                sign *= 2;
+            return sign;
+        }
+    }
+
+    buf = words;
+    bufend = buf + numwords * wordsize;
+
+    if (buf == bufend) {
+        /* overflow if non-zero*/
+        if (!(flags & INTEGER_PACK_2COMP) || 0 <= sign)
+            sign *= 2;
+        else {
+            if (de - dp == 1 && dp[0] == 1)
+                sign = -1; /* val == -1 == -2**(numwords*(wordsize*CHAR_BIT-nails)) */
+            else
+                sign = -2; /* val < -1 == -2**(numwords*(wordsize*CHAR_BIT-nails)) */
+        }
+    }
+    else if (dp == de) {
+        memset(buf, '\0', bufend - buf);
+    }
+    else if (dp < de && buf < bufend) {
+        int word_num_partialbits;
+        size_t word_num_fullbytes;
+
+        ssize_t word_step;
+        size_t byte_start;
+        int byte_step;
+
+        size_t word_start, word_last;
+        unsigned char *wordp, *last_wordp;
+        BDIGIT_DBL dd;
+        int numbits_in_dd;
+
+        integer_pack_loop_setup(numwords, wordsize, nails, flags,
+            &word_num_fullbytes, &word_num_partialbits,
+            &word_start, &word_step, &word_last, &byte_start, &byte_step);
+
+        wordp = buf + word_start;
+        last_wordp = buf + word_last;
+
+        dd = 0;
+        numbits_in_dd = 0;
+
+#define FILL_DD \
+    integer_pack_fill_dd(&dp, &de, &dd, &numbits_in_dd)
+#define TAKE_LOWBITS(n) \
+    integer_pack_take_lowbits(n, &dd, &numbits_in_dd)
+
+        while (1) {
+            size_t index_in_word = 0;
+            unsigned char *bytep = wordp + byte_start;
+            while (index_in_word < word_num_fullbytes) {
+                FILL_DD;
+                *bytep = TAKE_LOWBITS(CHAR_BIT);
+                bytep += byte_step;
+                index_in_word++;
+            }
+            if (word_num_partialbits) {
+                FILL_DD;
+                *bytep = TAKE_LOWBITS(word_num_partialbits);
+                bytep += byte_step;
+                index_in_word++;
+            }
+            while (index_in_word < wordsize) {
+                *bytep = 0;
+                bytep += byte_step;
+                index_in_word++;
+            }
+
+            if (wordp == last_wordp)
+                break;
+
+            wordp += word_step;
+        }
+        FILL_DD;
+        /* overflow tests */
+        if (dp != de || 1 < dd) {
+            /* 2**(numwords*(wordsize*CHAR_BIT-nails)+1) <= abs(val) */
+            sign *= 2;
+        }
+        else if (dd == 1) {
+            /* 2**(numwords*(wordsize*CHAR_BIT-nails)) <= abs(val) < 2**(numwords*(wordsize*CHAR_BIT-nails)+1) */
+            if (!(flags & INTEGER_PACK_2COMP) || 0 <= sign)
+                sign *= 2;
+            else { /* overflow_2comp && sign == -1 */
+                /* test lower bits are all zero. */
+                dp = ds;
+                while (dp < de && *dp == 0)
+                    dp++;
+                if (de - dp == 1 && /* only one non-zero word. */
+                    POW2_P(*dp)) /* *dp contains only one bit set. */
+                    sign = -1; /* val == -2**(numwords*(wordsize*CHAR_BIT-nails)) */
+                else
+                    sign = -2; /* val < -2**(numwords*(wordsize*CHAR_BIT-nails)) */
+            }
+        }
+    }
+
+    if ((flags & INTEGER_PACK_2COMP) && (sign < 0 && numwords != 0)) {
+        unsigned char *buf;
+
+        int word_num_partialbits;
+        size_t word_num_fullbytes;
+
+        ssize_t word_step;
+        size_t byte_start;
+        int byte_step;
+
+        size_t word_start, word_last;
+        unsigned char *wordp, *last_wordp;
+
+        unsigned int partialbits_mask;
+        int carry;
+
+        integer_pack_loop_setup(numwords, wordsize, nails, flags,
+            &word_num_fullbytes, &word_num_partialbits,
+            &word_start, &word_step, &word_last, &byte_start, &byte_step);
+
+        partialbits_mask = (1 << word_num_partialbits) - 1;
+
+        buf = words;
+        wordp = buf + word_start;
+        last_wordp = buf + word_last;
+
+        carry = 1;
+        while (1) {
+            size_t index_in_word = 0;
+            unsigned char *bytep = wordp + byte_start;
+            while (index_in_word < word_num_fullbytes) {
+                carry += (unsigned char)~*bytep;
+                *bytep = (unsigned char)carry;
+                carry >>= CHAR_BIT;
+                bytep += byte_step;
+                index_in_word++;
+            }
+            if (word_num_partialbits) {
+                carry += (*bytep & partialbits_mask) ^ partialbits_mask;
+                *bytep = carry & partialbits_mask;
+                carry >>= word_num_partialbits;
+                bytep += byte_step;
+                index_in_word++;
+            }
+
+            if (wordp == last_wordp)
+                break;
+
+            wordp += word_step;
+        }
+    }
+
+    return sign;
+#undef FILL_DD
+#undef TAKE_LOWBITS
+}
+
+static size_t
+integer_unpack_num_bdigits_small(size_t numwords, size_t wordsize, size_t nails, int *nlp_bits_ret)
+{
+    /* nlp_bits stands for number of leading padding bits */
+    size_t num_bits = (wordsize * CHAR_BIT - nails) * numwords;
+    size_t num_bdigits = (num_bits + BITSPERDIG - 1) / BITSPERDIG;
+    *nlp_bits_ret = (int)(num_bdigits * BITSPERDIG - num_bits);
+    return num_bdigits;
+}
+
+static size_t
+integer_unpack_num_bdigits_generic(size_t numwords, size_t wordsize, size_t nails, int *nlp_bits_ret)
+{
+    /* BITSPERDIG = SIZEOF_BDIGIT * CHAR_BIT */
+    /* num_bits = (wordsize * CHAR_BIT - nails) * numwords */
+    /* num_bdigits = (num_bits + BITSPERDIG - 1) / BITSPERDIG */
+
+    /* num_bits = CHAR_BIT * (wordsize * numwords) - nails * numwords = CHAR_BIT * num_bytes1 - nails * numwords */
+    size_t num_bytes1 = wordsize * numwords;
+
+    /* q1 * CHAR_BIT + r1 = numwords */
+    size_t q1 = numwords / CHAR_BIT;
+    size_t r1 = numwords % CHAR_BIT;
+
+    /* num_bits = CHAR_BIT * num_bytes1 - nails * (q1 * CHAR_BIT + r1) = CHAR_BIT * num_bytes2 - nails * r1 */
+    size_t num_bytes2 = num_bytes1 - nails * q1;
+
+    /* q2 * CHAR_BIT + r2 = nails */
+    size_t q2 = nails / CHAR_BIT;
+    size_t r2 = nails % CHAR_BIT;
+
+    /* num_bits = CHAR_BIT * num_bytes2 - (q2 * CHAR_BIT + r2) * r1 = CHAR_BIT * num_bytes3 - r1 * r2 */
+    size_t num_bytes3 = num_bytes2 - q2 * r1;
+
+    /* q3 * BITSPERDIG + r3 = num_bytes3 */
+    size_t q3 = num_bytes3 / BITSPERDIG;
+    size_t r3 = num_bytes3 % BITSPERDIG;
+
+    /* num_bits = CHAR_BIT * (q3 * BITSPERDIG + r3) - r1 * r2 = BITSPERDIG * num_digits1 + CHAR_BIT * r3 - r1 * r2 */
+    size_t num_digits1 = CHAR_BIT * q3;
+
+    /*
+     * if CHAR_BIT * r3 >= r1 * r2
+     *   CHAR_BIT * r3 - r1 * r2 = CHAR_BIT * BITSPERDIG - (CHAR_BIT * BITSPERDIG - (CHAR_BIT * r3 - r1 * r2))
+     *   q4 * BITSPERDIG + r4 = CHAR_BIT * BITSPERDIG - (CHAR_BIT * r3 - r1 * r2)
+     *   num_bits = BITSPERDIG * num_digits1 + CHAR_BIT * BITSPERDIG - (q4 * BITSPERDIG + r4) = BITSPERDIG * num_digits2 - r4
+     * else
+     *   q4 * BITSPERDIG + r4 = -(CHAR_BIT * r3 - r1 * r2)
+     *   num_bits = BITSPERDIG * num_digits1 - (q4 * BITSPERDIG + r4) = BITSPERDIG * num_digits2 - r4
+     * end
+     */
+
+    if (CHAR_BIT * r3 >= r1 * r2) {
+        size_t tmp1 = CHAR_BIT * BITSPERDIG - (CHAR_BIT * r3 - r1 * r2);
+        size_t q4 = tmp1 / BITSPERDIG;
+        int r4 = (int)(tmp1 % BITSPERDIG);
+        size_t num_digits2 = num_digits1 + CHAR_BIT - q4;
+        *nlp_bits_ret = r4;
+        return num_digits2;
+    }
+    else {
+        size_t tmp1 = r1 * r2 - CHAR_BIT * r3;
+        size_t q4 = tmp1 / BITSPERDIG;
+        int r4 = (int)(tmp1 % BITSPERDIG);
+        size_t num_digits2 = num_digits1 - q4;
+        *nlp_bits_ret = r4;
+        return num_digits2;
+    }
+}
+
+static size_t
+integer_unpack_num_bdigits(size_t numwords, size_t wordsize, size_t nails, int *nlp_bits_ret)
+{
+    size_t num_bdigits;
+
+    if (numwords <= (SIZE_MAX - (BITSPERDIG-1)) / CHAR_BIT / wordsize) {
+        num_bdigits = integer_unpack_num_bdigits_small(numwords, wordsize, nails, nlp_bits_ret);
+#ifdef DEBUG_INTEGER_PACK
+        {
+            int nlp_bits1;
+            size_t num_bdigits1 = integer_unpack_num_bdigits_generic(numwords, wordsize, nails, &nlp_bits1);
+            assert(num_bdigits == num_bdigits1);
+            assert(*nlp_bits_ret == nlp_bits1);
+        }
+#endif
+    }
+    else {
+        num_bdigits = integer_unpack_num_bdigits_generic(numwords, wordsize, nails, nlp_bits_ret);
+    }
+    return num_bdigits;
+}
+
+static inline void
+integer_unpack_push_bits(int data, int numbits, BDIGIT_DBL *ddp, int *numbits_in_dd_p, BDIGIT **dpp)
+{
+    (*ddp) |= ((BDIGIT_DBL)data) << (*numbits_in_dd_p);
+    *numbits_in_dd_p += numbits;
+    while (BITSPERDIG <= *numbits_in_dd_p) {
+        *(*dpp)++ = BIGLO(*ddp);
+        *ddp = BIGDN(*ddp);
+        *numbits_in_dd_p -= BITSPERDIG;
+    }
+}
+
+static int
+integer_unpack_single_bdigit(BDIGIT u, size_t size, int flags, BDIGIT *dp)
+{
+    int sign;
+    if (flags & INTEGER_PACK_2COMP) {
+        sign = (flags & INTEGER_PACK_NEGATIVE) ?
+            ((size == SIZEOF_BDIGIT && u == 0) ? -2 : -1) :
+            ((u >> (size * CHAR_BIT - 1)) ? -1 : 1);
+        if (sign < 0) {
+            u |= LSHIFTX(BDIGMAX, size * CHAR_BIT);
+            u = BIGLO(1 + ~u);
+        }
+    }
+    else
+        sign = (flags & INTEGER_PACK_NEGATIVE) ? -1 : 1;
+    *dp = u;
+    return sign;
+}
+
+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)
+{
+    int sign;
+    const unsigned char *buf = words;
+    BDIGIT *dp;
+    BDIGIT *de;
+
+    dp = bdigits;
+    de = dp + num_bdigits;
+
+    if (!(flags & INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION)) {
+        if (nails == 0 && numwords == 1) {
+            int need_swap = wordsize != 1 &&
+                (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_NATIVE_BYTE_ORDER &&
+                ((flags & INTEGER_PACK_MSBYTE_FIRST) ? !HOST_BIGENDIAN_P : HOST_BIGENDIAN_P);
+            if (wordsize == 1) {
+                return integer_unpack_single_bdigit(*(uint8_t *)buf, sizeof(uint8_t), flags, dp);
+            }
+#if defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
+            if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
+                uint16_t u = *(uint16_t *)buf;
+                return integer_unpack_single_bdigit(need_swap ? swap16(u) : u, sizeof(uint16_t), flags, dp);
+            }
+#endif
+#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
+            if (wordsize == 4 && (uintptr_t)words % ALIGNOF(uint32_t) == 0) {
+                uint32_t u = *(uint32_t *)buf;
+                return integer_unpack_single_bdigit(need_swap ? swap32(u) : u, sizeof(uint32_t), flags, dp);
+            }
+#endif
+#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
+            if (wordsize == 8 && (uintptr_t)words % ALIGNOF(uint64_t) == 0) {
+                uint64_t u = *(uint64_t *)buf;
+                return integer_unpack_single_bdigit(need_swap ? swap64(u) : u, sizeof(uint64_t), flags, dp);
+            }
+#endif
+        }
+#if !defined(WORDS_BIGENDIAN)
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            (flags & INTEGER_PACK_WORDORDER_MASK) == INTEGER_PACK_LSWORD_FIRST &&
+            (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_MSBYTE_FIRST) {
+            size_t src_size = numwords * wordsize;
+            size_t dst_size = num_bdigits * SIZEOF_BDIGIT;
+            MEMCPY(dp, words, char, src_size);
+            if (flags & INTEGER_PACK_2COMP) {
+                if (flags & INTEGER_PACK_NEGATIVE) {
+                    int zero_p;
+                    memset((char*)dp + src_size, 0xff, dst_size - src_size);
+                    zero_p = bary_2comp(dp, num_bdigits);
+                    sign = zero_p ? -2 : -1;
+                }
+                else if (buf[src_size-1] >> (CHAR_BIT-1)) {
+                    memset((char*)dp + src_size, 0xff, dst_size - src_size);
+                    bary_2comp(dp, num_bdigits);
+                    sign = -1;
+                }
+                else {
+                    MEMZERO((char*)dp + src_size, char, dst_size - src_size);
+                    sign = 1;
+                }
+            }
+            else {
+                MEMZERO((char*)dp + src_size, char, dst_size - src_size);
+                sign = (flags & INTEGER_PACK_NEGATIVE) ? -1 : 1;
+            }
+            return sign;
+        }
+#endif
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            wordsize % SIZEOF_BDIGIT == 0) {
+            size_t bdigits_per_word = wordsize / SIZEOF_BDIGIT;
+            int mswordfirst_p = (flags & INTEGER_PACK_MSWORD_FIRST) != 0;
+            int msbytefirst_p = (flags & INTEGER_PACK_NATIVE_BYTE_ORDER) ? HOST_BIGENDIAN_P :
+                (flags & INTEGER_PACK_MSBYTE_FIRST) != 0;
+            MEMCPY(dp, words, BDIGIT, numwords*bdigits_per_word);
+            if (mswordfirst_p) {
+                bary_swap(dp, num_bdigits);
+            }
+            if (mswordfirst_p ? !msbytefirst_p : msbytefirst_p) {
+                size_t i;
+                BDIGIT *p = dp;
+                for (i = 0; i < numwords; i++) {
+                    bary_swap(p, bdigits_per_word);
+                    p += bdigits_per_word;
+                }
+            }
+            if (msbytefirst_p != HOST_BIGENDIAN_P) {
+                BDIGIT *p;
+                for (p = dp; p < de; p++) {
+                    BDIGIT d = *p;
+                    *p = swap_bdigit(d);
+                }
+            }
+            if (flags & INTEGER_PACK_2COMP) {
+                if (flags & INTEGER_PACK_NEGATIVE) {
+                    int zero_p = bary_2comp(dp, num_bdigits);
+                    sign = zero_p ? -2 : -1;
+                }
+                else if (BDIGIT_MSB(de[-1])) {
+                    bary_2comp(dp, num_bdigits);
+                    sign = -1;
+                }
+                else {
+                    sign = 1;
+                }
+            }
+            else {
+                sign = (flags & INTEGER_PACK_NEGATIVE) ? -1 : 1;
+            }
+            return sign;
+        }
+    }
+
+    if (num_bdigits != 0) {
+        int word_num_partialbits;
+        size_t word_num_fullbytes;
+
+        ssize_t word_step;
+        size_t byte_start;
+        int byte_step;
+
+        size_t word_start, word_last;
+        const unsigned char *wordp, *last_wordp;
+        BDIGIT_DBL dd;
+        int numbits_in_dd;
+
+        integer_pack_loop_setup(numwords, wordsize, nails, flags,
+            &word_num_fullbytes, &word_num_partialbits,
+            &word_start, &word_step, &word_last, &byte_start, &byte_step);
+
+        wordp = buf + word_start;
+        last_wordp = buf + word_last;
+
+        dd = 0;
+        numbits_in_dd = 0;
+
+#define PUSH_BITS(data, numbits) \
+        integer_unpack_push_bits(data, numbits, &dd, &numbits_in_dd, &dp)
+
+        while (1) {
+            size_t index_in_word = 0;
+            const unsigned char *bytep = wordp + byte_start;
+            while (index_in_word < word_num_fullbytes) {
+                PUSH_BITS(*bytep, CHAR_BIT);
+                bytep += byte_step;
+                index_in_word++;
+            }
+            if (word_num_partialbits) {
+                PUSH_BITS(*bytep & ((1 << word_num_partialbits) - 1), word_num_partialbits);
+                bytep += byte_step;
+                index_in_word++;
+            }
+
+            if (wordp == last_wordp)
+                break;
+
+            wordp += word_step;
+        }
+        if (dd)
+            *dp++ = (BDIGIT)dd;
+        assert(dp <= de);
+        while (dp < de)
+            *dp++ = 0;
+#undef PUSH_BITS
+    }
+
+    if (!(flags & INTEGER_PACK_2COMP)) {
+        sign = (flags & INTEGER_PACK_NEGATIVE) ? -1 : 1;
+    }
+    else {
+        if (nlp_bits) {
+            if ((flags & INTEGER_PACK_NEGATIVE) ||
+                (bdigits[num_bdigits-1] >> (BITSPERDIG - nlp_bits - 1))) {
+                bdigits[num_bdigits-1] |= BIGLO(BDIGMAX << (BITSPERDIG - nlp_bits));
+                sign = -1;
+            }
+            else {
+                sign = 1;
+            }
+        }
+        else {
+            if (flags & INTEGER_PACK_NEGATIVE) {
+                sign = bary_zero_p(bdigits, num_bdigits) ? -2 : -1;
+            }
+            else {
+                if (num_bdigits != 0 && BDIGIT_MSB(bdigits[num_bdigits-1]))
+                    sign = -1;
+                else
+                    sign = 1;
+            }
+        }
+        if (sign == -1 && num_bdigits != 0) {
+            bary_2comp(bdigits, num_bdigits);
+        }
+    }
+
+    return sign;
+}
+
+static void
+bary_unpack(BDIGIT *bdigits, size_t num_bdigits, const void *words, size_t numwords, size_t wordsize, size_t nails, int flags)
+{
+    size_t num_bdigits0;
+    int nlp_bits;
+    int sign;
+
+    validate_integer_pack_format(numwords, wordsize, nails, flags,
+            INTEGER_PACK_MSWORD_FIRST|
+            INTEGER_PACK_LSWORD_FIRST|
+            INTEGER_PACK_MSBYTE_FIRST|
+            INTEGER_PACK_LSBYTE_FIRST|
+            INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP|
+            INTEGER_PACK_FORCE_BIGNUM|
+            INTEGER_PACK_NEGATIVE|
+            INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION);
+
+    num_bdigits0 = integer_unpack_num_bdigits(numwords, wordsize, nails, &nlp_bits);
+
+    assert(num_bdigits0 <= num_bdigits);
+
+    sign = bary_unpack_internal(bdigits, num_bdigits0, words, numwords, wordsize, nails, flags, nlp_bits);
+
+    if (num_bdigits0 < num_bdigits) {
+        BDIGITS_ZERO(bdigits + num_bdigits0, num_bdigits - num_bdigits0);
+        if (sign == -2) {
+            bdigits[num_bdigits0] = 1;
+        }
+    }
+}
+
+static int
+bary_subb(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, int borrow)
+{
+    BDIGIT_DBL_SIGNED num;
+    size_t i;
+    size_t sn;
+
+    assert(xn <= zn);
+    assert(yn <= zn);
+
+    sn = xn < yn ? xn : yn;
+
+    num = borrow ? -1 : 0;
+    for (i = 0; i < sn; i++) {
+	num += (BDIGIT_DBL_SIGNED)xds[i] - yds[i];
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    if (yn <= xn) {
+        for (; i < xn; i++) {
+            if (num == 0) goto num_is_zero;
+            num += xds[i];
+            zds[i] = BIGLO(num);
+            num = BIGDN(num);
+        }
+    }
+    else {
+        for (; i < yn; i++) {
+            num -= yds[i];
+            zds[i] = BIGLO(num);
+            num = BIGDN(num);
+        }
+    }
+    if (num == 0) goto num_is_zero;
+    for (; i < zn; i++) {
+	zds[i] = BDIGMAX;
+    }
+    return 1;
+
+  num_is_zero:
+    if (xds == zds && xn == zn)
+        return 0;
+    for (; i < xn; i++) {
+	zds[i] = xds[i];
+    }
+    for (; i < zn; i++) {
+	zds[i] = 0;
+    }
+    return 0;
+}
+
+static int
+bary_sub(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    return bary_subb(zds, zn, xds, xn, yds, yn, 0);
+}
+
+static int
+bary_sub_one(BDIGIT *zds, size_t zn)
+{
+    return bary_subb(zds, zn, zds, zn, NULL, 0, 1);
+}
+
+static int
+bary_addc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, int carry)
+{
+    BDIGIT_DBL num;
+    size_t i;
+
+    assert(xn <= zn);
+    assert(yn <= zn);
+
+    if (xn > yn) {
+	const BDIGIT *tds;
+	tds = xds; xds = yds; yds = tds;
+	i = xn; xn = yn; yn = i;
+    }
+
+    num = carry ? 1 : 0;
+    for (i = 0; i < xn; i++) {
+	num += (BDIGIT_DBL)xds[i] + yds[i];
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    for (; i < yn; i++) {
+        if (num == 0) goto num_is_zero;
+	num += yds[i];
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    for (; i < zn; i++) {
+        if (num == 0) goto num_is_zero;
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+    return num != 0;
+
+  num_is_zero:
+    if (yds == zds && yn == zn)
+        return 0;
+    for (; i < yn; i++) {
+	zds[i] = yds[i];
+    }
+    for (; i < zn; i++) {
+	zds[i] = 0;
+    }
+    return 0;
+}
+
+static int
+bary_add(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    return bary_addc(zds, zn, xds, xn, yds, yn, 0);
+}
+
+static int
+bary_add_one(BDIGIT *ds, size_t n)
+{
+    size_t i;
+    for (i = 0; i < n; i++) {
+	ds[i] = BIGLO(ds[i]+1);
+        if (ds[i] != 0)
+            return 0;
+    }
+    return 1;
+}
+
+static void
+bary_mul_single(BDIGIT *zds, size_t zn, BDIGIT x, BDIGIT y)
+{
+    BDIGIT_DBL n;
+
+    assert(2 <= zn);
+
+    n = (BDIGIT_DBL)x * y;
+    bdigitdbl2bary(zds, 2, n);
+    BDIGITS_ZERO(zds + 2, zn - 2);
+}
+
+static int
+bary_muladd_1xN(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
+{
+    BDIGIT_DBL n;
+    BDIGIT_DBL dd;
+    size_t j;
+
+    assert(zn > yn);
+
+    if (x == 0)
+        return 0;
+    dd = x;
+    n = 0;
+    for (j = 0; j < yn; j++) {
+        BDIGIT_DBL ee = n + dd * yds[j];
+        if (ee) {
+            n = zds[j] + ee;
+            zds[j] = BIGLO(n);
+            n = BIGDN(n);
+        }
+        else {
+            n = 0;
+        }
+
+    }
+    for (; j < zn; j++) {
+        if (n == 0)
+            break;
+        n += zds[j];
+        zds[j] = BIGLO(n);
+        n = BIGDN(n);
+    }
+    return n != 0;
+}
+
+static BDIGIT_DBL_SIGNED
+bigdivrem_mulsub(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
+{
+    size_t i;
+    BDIGIT_DBL t2;
+    BDIGIT_DBL_SIGNED num;
+
+    assert(zn == yn + 1);
+
+    num = 0;
+    t2 = 0;
+    i = 0;
+
+    do {
+        BDIGIT_DBL ee;
+        t2 += (BDIGIT_DBL)yds[i] * x;
+        ee = num - BIGLO(t2);
+        num = (BDIGIT_DBL)zds[i] + ee;
+        if (ee) zds[i] = BIGLO(num);
+        num = BIGDN(num);
+        t2 = BIGDN(t2);
+    } while (++i < yn);
+    num += zds[i] - t2; /* borrow from high digit; don't update */
+    return num;
+}
+
+static int
+bary_mulsub_1xN(BDIGIT *zds, size_t zn, BDIGIT x, const BDIGIT *yds, size_t yn)
+{
+    BDIGIT_DBL_SIGNED num;
+
+    assert(zn == yn + 1);
+
+    num = bigdivrem_mulsub(zds, zn, x, yds, yn);
+    zds[yn] = BIGLO(num);
+    if (BIGDN(num))
+        return 1;
+    return 0;
+}
+
+static void
+bary_mul_normal(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    size_t i;
+
+    assert(xn + yn <= zn);
+
+    BDIGITS_ZERO(zds, zn);
+    for (i = 0; i < xn; i++) {
+        bary_muladd_1xN(zds+i, zn-i, xds[i], yds, yn);
+    }
+}
+
+VALUE
+rb_big_mul_normal(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    bary_mul_normal(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+
+/* efficient squaring (2 times faster than normal multiplication)
+ * ref: Handbook of Applied Cryptography, Algorithm 14.16
+ *      http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
+ */
+static void
+bary_sq_fast(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn)
+{
+    size_t i, j;
+    BDIGIT_DBL c, v, w;
+    BDIGIT vl;
+    int vh;
+
+    assert(xn * 2 <= zn);
+
+    BDIGITS_ZERO(zds, zn);
+
+    if (xn == 0)
+        return;
+
+    for (i = 0; i < xn-1; i++) {
+	v = (BDIGIT_DBL)xds[i];
+	if (!v)
+            continue;
+	c = (BDIGIT_DBL)zds[i + i] + v * v;
+	zds[i + i] = BIGLO(c);
+	c = BIGDN(c);
+	v *= 2;
+        vl = BIGLO(v);
+        vh = (int)BIGDN(v);
+	for (j = i + 1; j < xn; j++) {
+	    w = (BDIGIT_DBL)xds[j];
+	    c += (BDIGIT_DBL)zds[i + j] + vl * w;
+	    zds[i + j] = BIGLO(c);
+	    c = BIGDN(c);
+	    if (vh)
+                c += w;
+	}
+	if (c) {
+	    c += (BDIGIT_DBL)zds[i + xn];
+	    zds[i + xn] = BIGLO(c);
+	    c = BIGDN(c);
+            if (c)
+                zds[i + xn + 1] += (BDIGIT)c;
+	}
+    }
+
+    /* i == xn-1 */
+    v = (BDIGIT_DBL)xds[i];
+    if (!v)
+        return;
+    c = (BDIGIT_DBL)zds[i + i] + v * v;
+    zds[i + i] = BIGLO(c);
+    c = BIGDN(c);
+    if (c) {
+        zds[i + xn] += BIGLO(c);
+    }
+}
+
+VALUE
+rb_big_sq_fast(VALUE x)
+{
+    size_t xn = BIGNUM_LEN(x), zn = 2 * xn;
+    VALUE z = bignew(zn, 1);
+    bary_sq_fast(BDIGITS(z), zn, BDIGITS(x), xn);
+    RB_GC_GUARD(x);
+    return z;
+}
+
+/* balancing multiplication by slicing larger argument */
+static void
+bary_mul_balance_with_mulfunc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn, mulfunc_t *mulfunc)
+{
+    VALUE work = 0;
+    size_t yn0 = yn;
+    size_t r, n;
+
+    assert(xn + yn <= zn);
+    assert(xn <= yn);
+    assert(!KARATSUBA_BALANCED(xn, yn) || !TOOM3_BALANCED(xn, yn));
+
+    BDIGITS_ZERO(zds, xn);
+
+    n = 0;
+    while (yn > 0) {
+        BDIGIT *tds;
+        size_t tn;
+	r = xn > yn ? yn : xn;
+        tn = xn + r;
+        if (2 * (xn + r) <= zn - n) {
+            tds = zds + n + xn + r;
+            mulfunc(tds, tn, xds, xn, yds + n, r, wds, wn);
+            BDIGITS_ZERO(zds + n + xn, r);
+            bary_add(zds + n, tn,
+                     zds + n, tn,
+                     tds, tn);
+        }
+        else {
+            if (wn < xn) {
+                wn = xn;
+                wds = ALLOCV_N(BDIGIT, work, wn);
+            }
+            tds = zds + n;
+            MEMCPY(wds, zds + n, BDIGIT, xn);
+            mulfunc(tds, tn, xds, xn, yds + n, r, wds+xn, wn-xn);
+            bary_add(zds + n, tn,
+                     zds + n, tn,
+                     wds, xn);
+        }
+	yn -= r;
+	n += r;
+    }
+    BDIGITS_ZERO(zds+xn+yn0, zn - (xn+yn0));
+
+    if (work)
+        ALLOCV_END(work);
+}
+
+VALUE
+rb_big_mul_balance(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    bary_mul_balance_with_mulfunc(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, NULL, 0, bary_mul_toom3_start);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+
+/* multiplication by karatsuba method */
+static void
+bary_mul_karatsuba(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    VALUE work = 0;
+
+    size_t n;
+    int sub_p, borrow, carry1, carry2, carry3;
+
+    int odd_y = 0;
+    int odd_xy = 0;
+    int sq;
+
+    const BDIGIT *xds0, *xds1, *yds0, *yds1;
+    BDIGIT *zds0, *zds1, *zds2, *zds3;
+
+    assert(xn + yn <= zn);
+    assert(xn <= yn);
+    assert(yn < 2 * xn);
+
+    sq = xds == yds && xn == yn;
+
+    if (yn & 1) {
+        odd_y = 1;
+        yn--;
+        if (yn < xn) {
+            odd_xy = 1;
+            xn--;
+        }
+    }
+
+    n = yn / 2;
+
+    assert(n < xn);
+
+    if (wn < n) {
+        /* This function itself needs only n BDIGITs for work area.
+         * However this function calls bary_mul_karatsuba and
+         * bary_mul_balance recursively.
+         * 2n BDIGITs are enough to avoid allocations in
+         * the recursively called functions.
+         */
+        wn = 2*n;
+        wds = ALLOCV_N(BDIGIT, work, wn);
+    }
+
+    /* Karatsuba algorithm:
+     *
+     * x = x0 + r*x1
+     * y = y0 + r*y1
+     * z = x*y
+     *   = (x0 + r*x1) * (y0 + r*y1)
+     *   = x0*y0 + r*(x1*y0 + x0*y1) + r*r*x1*y1
+     *   = x0*y0 + r*(x0*y0 + x1*y1 - (x1-x0)*(y1-y0)) + r*r*x1*y1
+     *   = x0*y0 + r*(x0*y0 + x1*y1 - (x0-x1)*(y0-y1)) + r*r*x1*y1
+     */
+
+    xds0 = xds;
+    xds1 = xds + n;
+    yds0 = yds;
+    yds1 = yds + n;
+    zds0 = zds;
+    zds1 = zds + n;
+    zds2 = zds + 2*n;
+    zds3 = zds + 3*n;
+
+    sub_p = 1;
+
+    /* zds0:? zds1:? zds2:? zds3:? wds:? */
+
+    if (bary_sub(zds0, n, xds, n, xds+n, xn-n)) {
+        bary_2comp(zds0, n);
+        sub_p = !sub_p;
+    }
+
+    /* zds0:|x1-x0| zds1:? zds2:? zds3:? wds:? */
+
+    if (sq) {
+        sub_p = 1;
+        bary_mul_karatsuba_start(zds1, 2*n, zds0, n, zds0, n, wds, wn);
+    }
+    else {
+        if (bary_sub(wds, n, yds, n, yds+n, n)) {
+            bary_2comp(wds, n);
+            sub_p = !sub_p;
+        }
+
+        /* zds0:|x1-x0| zds1:? zds2:? zds3:? wds:|y1-y0| */
+
+        bary_mul_karatsuba_start(zds1, 2*n, zds0, n, wds, n, wds+n, wn-n);
+    }
+
+    /* zds0:|x1-x0| zds1,zds2:|x1-x0|*|y1-y0| zds3:? wds:|y1-y0| */
+
+    borrow = 0;
+    if (sub_p) {
+        borrow = !bary_2comp(zds1, 2*n);
+    }
+    /* zds0:|x1-x0| zds1,zds2:-?|x1-x0|*|y1-y0| zds3:? wds:|y1-y0| */
+
+    MEMCPY(wds, zds1, BDIGIT, n);
+
+    /* zds0:|x1-x0| zds1,zds2:-?|x1-x0|*|y1-y0| zds3:? wds:lo(-?|x1-x0|*|y1-y0|) */
+
+    bary_mul_karatsuba_start(zds0, 2*n, xds0, n, yds0, n, wds+n, wn-n);
+
+    /* zds0,zds1:x0*y0 zds2:hi(-?|x1-x0|*|y1-y0|) zds3:? wds:lo(-?|x1-x0|*|y1-y0|) */
+
+    carry1 = bary_add(wds, n, wds, n, zds0, n);
+    carry1 = bary_addc(zds2, n, zds2, n, zds1, n, carry1);
+
+    /* zds0,zds1:x0*y0 zds2:hi(x0*y0-?|x1-x0|*|y1-y0|) zds3:? wds:lo(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    carry2 = bary_add(zds1, n, zds1, n, wds, n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|) zds2:hi(x0*y0-?|x1-x0|*|y1-y0|) zds3:? wds:lo(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    MEMCPY(wds, zds2, BDIGIT, n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|) zds2:_ zds3:? wds:hi(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    bary_mul_karatsuba_start(zds2, zn-2*n, xds1, xn-n, yds1, n, wds+n, wn-n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|) zds2,zds3:x1*y1 wds:hi(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    carry3 = bary_add(zds1, n, zds1, n, zds2, n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|)+lo(x1*y1) zds2,zds3:x1*y1 wds:hi(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    carry3 = bary_addc(zds2, n, zds2, n, zds3, (4*n < zn ? n : zn-3*n), carry3);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|)+lo(x1*y1) zds2,zds3:x1*y1+hi(x1*y1) wds:hi(x0*y0-?|x1-x0|*|y1-y0|) */
+
+    bary_add(zds2, zn-2*n, zds2, zn-2*n, wds, n);
+
+    /* zds0:lo(x0*y0) zds1:hi(x0*y0)+lo(x0*y0-?|x1-x0|*|y1-y0|)+lo(x1*y1) zds2,zds3:x1*y1+hi(x1*y1)+hi(x0*y0-?|x1-x0|*|y1-y0|) wds:_ */
+
+    if (carry2)
+        bary_add_one(zds2, zn-2*n);
+
+    if (carry1 + carry3 - borrow < 0)
+        bary_sub_one(zds3, zn-3*n);
+    else if (carry1 + carry3 - borrow > 0) {
+        BDIGIT c = carry1 + carry3 - borrow;
+        bary_add(zds3, zn-3*n, zds3, zn-3*n, &c, 1);
+    }
+
+    /*
+    if (SIZEOF_BDIGIT * zn <= 16) {
+        uint128_t z, x, y;
+        ssize_t i;
+        for (x = 0, i = xn-1; 0 <= i; i--) { x <<= SIZEOF_BDIGIT*CHAR_BIT; x |= xds[i]; }
+        for (y = 0, i = yn-1; 0 <= i; i--) { y <<= SIZEOF_BDIGIT*CHAR_BIT; y |= yds[i]; }
+        for (z = 0, i = zn-1; 0 <= i; i--) { z <<= SIZEOF_BDIGIT*CHAR_BIT; z |= zds[i]; }
+        assert(z == x * y);
+    }
+    */
+
+    if (odd_xy) {
+        bary_muladd_1xN(zds+yn, zn-yn, yds[yn], xds, xn);
+        bary_muladd_1xN(zds+xn, zn-xn, xds[xn], yds, yn+1);
+    }
+    else if (odd_y) {
+        bary_muladd_1xN(zds+yn, zn-yn, yds[yn], xds, xn);
+    }
+
+    if (work)
+        ALLOCV_END(work);
+}
+
+VALUE
+rb_big_mul_karatsuba(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    if (!((xn <= yn && yn < 2) || KARATSUBA_BALANCED(xn, yn)))
+        rb_raise(rb_eArgError, "unexpected bignum length for karatsuba");
+    bary_mul_karatsuba(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, NULL, 0);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+
+static void
+bary_mul_toom3(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    size_t n;
+    size_t wnc;
+    VALUE work = 0;
+
+    /* "p" stands for "positive".  Actually it means "non-negative", though. */
+    size_t x0n; const BDIGIT *x0ds;
+    size_t x1n; const BDIGIT *x1ds;
+    size_t x2n; const BDIGIT *x2ds;
+    size_t y0n; const BDIGIT *y0ds;
+    size_t y1n; const BDIGIT *y1ds;
+    size_t y2n; const BDIGIT *y2ds;
+
+    size_t u1n; BDIGIT *u1ds; int u1p;
+    size_t u2n; BDIGIT *u2ds; int u2p;
+    size_t u3n; BDIGIT *u3ds; int u3p;
+
+    size_t v1n; BDIGIT *v1ds; int v1p;
+    size_t v2n; BDIGIT *v2ds; int v2p;
+    size_t v3n; BDIGIT *v3ds; int v3p;
+
+    size_t t0n; BDIGIT *t0ds; int t0p;
+    size_t t1n; BDIGIT *t1ds; int t1p;
+    size_t t2n; BDIGIT *t2ds; int t2p;
+    size_t t3n; BDIGIT *t3ds; int t3p;
+    size_t t4n; BDIGIT *t4ds; int t4p;
+
+    size_t z0n; BDIGIT *z0ds;
+    size_t z1n; BDIGIT *z1ds; int z1p;
+    size_t z2n; BDIGIT *z2ds; int z2p;
+    size_t z3n; BDIGIT *z3ds; int z3p;
+    size_t z4n; BDIGIT *z4ds;
+
+    size_t zzn; BDIGIT *zzds;
+
+    int sq = xds == yds && xn == yn;
+
+    assert(xn <= yn);  /* assume y >= x */
+    assert(xn + yn <= zn);
+
+    n = (yn + 2) / 3;
+    assert(2*n < xn);
+
+    wnc = 0;
+
+    wnc += (u1n = n+1); /* BITSPERDIG*n+2 bits */
+    wnc += (u2n = n+1); /* BITSPERDIG*n+1 bits */
+    wnc += (u3n = n+1); /* BITSPERDIG*n+3 bits */
+    wnc += (v1n = n+1); /* BITSPERDIG*n+2 bits */
+    wnc += (v2n = n+1); /* BITSPERDIG*n+1 bits */
+    wnc += (v3n = n+1); /* BITSPERDIG*n+3 bits */
+
+    wnc += (t0n = 2*n); /* BITSPERDIG*2*n bits */
+    wnc += (t1n = 2*n+2); /* BITSPERDIG*2*n+4 bits but bary_mul needs u1n+v1n */
+    wnc += (t2n = 2*n+2); /* BITSPERDIG*2*n+2 bits but bary_mul needs u2n+v2n */
+    wnc += (t3n = 2*n+2); /* BITSPERDIG*2*n+6 bits but bary_mul needs u3n+v3n */
+    wnc += (t4n = 2*n); /* BITSPERDIG*2*n bits */
+
+    wnc += (z1n = 2*n+1); /* BITSPERDIG*2*n+5 bits */
+    wnc += (z2n = 2*n+1); /* BITSPERDIG*2*n+6 bits */
+    wnc += (z3n = 2*n+1); /* BITSPERDIG*2*n+8 bits */
+
+    if (wn < wnc) {
+        wn = wnc * 3 / 2; /* Allocate working memory for whole recursion at once. */
+        wds = ALLOCV_N(BDIGIT, work, wn);
+    }
+
+    u1ds = wds; wds += u1n;
+    u2ds = wds; wds += u2n;
+    u3ds = wds; wds += u3n;
+
+    v1ds = wds; wds += v1n;
+    v2ds = wds; wds += v2n;
+    v3ds = wds; wds += v3n;
+
+    t0ds = wds; wds += t0n;
+    t1ds = wds; wds += t1n;
+    t2ds = wds; wds += t2n;
+    t3ds = wds; wds += t3n;
+    t4ds = wds; wds += t4n;
+
+    z1ds = wds; wds += z1n;
+    z2ds = wds; wds += z2n;
+    z3ds = wds; wds += z3n;
+
+    wn -= wnc;
+
+    zzds = u1ds;
+    zzn = 6*n+1;
+
+    x0n = n;
+    x1n = n;
+    x2n = xn - 2*n;
+    x0ds = xds;
+    x1ds = xds + n;
+    x2ds = xds + 2*n;
+
+    if (sq) {
+        y0n = x0n;
+        y1n = x1n;
+        y2n = x2n;
+        y0ds = x0ds;
+        y1ds = x1ds;
+        y2ds = x2ds;
+    }
+    else {
+        y0n = n;
+        y1n = n;
+        y2n = yn - 2*n;
+        y0ds = yds;
+        y1ds = yds + n;
+        y2ds = yds + 2*n;
+    }
+
+    /*
+     * ref. http://en.wikipedia.org/wiki/Toom%E2%80%93Cook_multiplication
+     *
+     * x(b) = x0 * b^0 + x1 * b^1 + x2 * b^2
+     * y(b) = y0 * b^0 + y1 * b^1 + y2 * b^2
+     *
+     * z(b) = x(b) * y(b)
+     * z(b) = z0 * b^0 + z1 * b^1 + z2 * b^2 + z3 * b^3 + z4 * b^4
+     * where:
+     *   z0 = x0 * y0
+     *   z1 = x0 * y1 + x1 * y0
+     *   z2 = x0 * y2 + x1 * y1 + x2 * y0
+     *   z3 = x1 * y2 + x2 * y1
+     *   z4 = x2 * y2
+     *
+     * Toom3 method (a.k.a. Toom-Cook method):
+     * (Step1) calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4),
+     * where:
+     *   b0 = 0, b1 = 1, b2 = -1, b3 = -2, b4 = inf,
+     *   z(0)   = x(0)   * y(0)   = x0 * y0
+     *   z(1)   = x(1)   * y(1)   = (x0 + x1 + x2) * (y0 + y1 + y2)
+     *   z(-1)  = x(-1)  * y(-1)  = (x0 - x1 + x2) * (y0 - y1 + y2)
+     *   z(-2)  = x(-2)  * y(-2)  = (x0 - 2 * (x1 - 2 * x2)) * (y0 - 2 * (y1 - 2 * y2))
+     *   z(inf) = x(inf) * y(inf) = x2 * y2
+     *
+     * (Step2) interpolating z0, z1, z2, z3 and z4.
+     *
+     * (Step3) Substituting base value into b of the polynomial z(b),
+     */
+
+    /*
+     * [Step1] calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4)
+     */
+
+    /* u1 <- x0 + x2 */
+    bary_add(u1ds, u1n, x0ds, x0n, x2ds, x2n);
+    u1p = 1;
+
+    /* x(-1) : u2 <- u1 - x1 = x0 - x1 + x2 */
+    if (bary_sub(u2ds, u2n, u1ds, u1n, x1ds, x1n)) {
+        bary_2comp(u2ds, u2n);
+        u2p = 0;
+    }
+    else {
+        u2p = 1;
+    }
+
+    /* x(1) : u1 <- u1 + x1 = x0 + x1 + x2 */
+    bary_add(u1ds, u1n, u1ds, u1n, x1ds, x1n);
+
+    /* x(-2) : u3 <- 2 * (u2 + x2) - x0 = x0 - 2 * (x1 - 2 * x2) */
+    u3p = 1;
+    if (u2p) {
+        bary_add(u3ds, u3n, u2ds, u2n, x2ds, x2n);
+    }
+    else if (bary_sub(u3ds, u3n, x2ds, x2n, u2ds, u2n)) {
+        bary_2comp(u3ds, u3n);
+        u3p = 0;
+    }
+    bary_small_lshift(u3ds, u3ds, u3n, 1);
+    if (!u3p) {
+        bary_add(u3ds, u3n, u3ds, u3n, x0ds, x0n);
+    }
+    else if (bary_sub(u3ds, u3n, u3ds, u3n, x0ds, x0n)) {
+        bary_2comp(u3ds, u3n);
+        u3p = 0;
+    }
+
+    if (sq) {
+        v1n = u1n; v1ds = u1ds; v1p = u1p;
+        v2n = u2n; v2ds = u2ds; v2p = u2p;
+        v3n = u3n; v3ds = u3ds; v3p = u3p;
+    }
+    else {
+	/* v1 <- y0 + y2 */
+        bary_add(v1ds, v1n, y0ds, y0n, y2ds, y2n);
+        v1p = 1;
+
+	/* y(-1) : v2 <- v1 - y1 = y0 - y1 + y2 */
+        v2p = 1;
+        if (bary_sub(v2ds, v2n, v1ds, v1n, y1ds, y1n)) {
+            bary_2comp(v2ds, v2n);
+            v2p = 0;
+        }
+
+	/* y(1) : v1 <- v1 + y1 = y0 + y1 + y2 */
+        bary_add(v1ds, v1n, v1ds, v1n, y1ds, y1n);
+
+	/* y(-2) : v3 <- 2 * (v2 + y2) - y0 = y0 - 2 * (y1 - 2 * y2) */
+        v3p = 1;
+        if (v2p) {
+            bary_add(v3ds, v3n, v2ds, v2n, y2ds, y2n);
+        }
+        else if (bary_sub(v3ds, v3n, y2ds, y2n, v2ds, v2n)) {
+            bary_2comp(v3ds, v3n);
+            v3p = 0;
+        }
+        bary_small_lshift(v3ds, v3ds, v3n, 1);
+        if (!v3p) {
+            bary_add(v3ds, v3n, v3ds, v3n, y0ds, y0n);
+        }
+        else if (bary_sub(v3ds, v3n, v3ds, v3n, y0ds, y0n)) {
+            bary_2comp(v3ds, v3n);
+            v3p = 0;
+        }
+    }
+
+    /* z(0) : t0 <- x0 * y0 */
+    bary_mul_toom3_start(t0ds, t0n, x0ds, x0n, y0ds, y0n, wds, wn);
+    t0p = 1;
+
+    /* z(1) : t1 <- u1 * v1 */
+    bary_mul_toom3_start(t1ds, t1n, u1ds, u1n, v1ds, v1n, wds, wn);
+    t1p = u1p == v1p;
+    assert(t1ds[t1n-1] == 0);
+    t1n--;
+
+    /* z(-1) : t2 <- u2 * v2 */
+    bary_mul_toom3_start(t2ds, t2n, u2ds, u2n, v2ds, v2n, wds, wn);
+    t2p = u2p == v2p;
+    assert(t2ds[t2n-1] == 0);
+    t2n--;
+
+    /* z(-2) : t3 <- u3 * v3 */
+    bary_mul_toom3_start(t3ds, t3n, u3ds, u3n, v3ds, v3n, wds, wn);
+    t3p = u3p == v3p;
+    assert(t3ds[t3n-1] == 0);
+    t3n--;
+
+    /* z(inf) : t4 <- x2 * y2 */
+    bary_mul_toom3_start(t4ds, t4n, x2ds, x2n, y2ds, y2n, wds, wn);
+    t4p = 1;
+
+    /*
+     * [Step2] interpolating z0, z1, z2, z3 and z4.
+     */
+
+    /* z0 <- z(0) == t0 */
+    z0n = t0n; z0ds = t0ds;
+
+    /* z4 <- z(inf) == t4 */
+    z4n = t4n; z4ds = t4ds;
+
+    /* z3 <- (z(-2) - z(1)) / 3 == (t3 - t1) / 3 */
+    if (t3p == t1p) {
+        z3p = t3p;
+        if (bary_sub(z3ds, z3n, t3ds, t3n, t1ds, t1n)) {
+            bary_2comp(z3ds, z3n);
+            z3p = !z3p;
+        }
+    }
+    else {
+        z3p = t3p;
+        bary_add(z3ds, z3n, t3ds, t3n, t1ds, t1n);
+    }
+    bigdivrem_single(z3ds, z3ds, z3n, 3);
+
+    /* z1 <- (z(1) - z(-1)) / 2 == (t1 - t2) / 2 */
+    if (t1p == t2p) {
+        z1p = t1p;
+        if (bary_sub(z1ds, z1n, t1ds, t1n, t2ds, t2n)) {
+            bary_2comp(z1ds, z1n);
+            z1p = !z1p;
+        }
+    }
+    else {
+        z1p = t1p;
+        bary_add(z1ds, z1n, t1ds, t1n, t2ds, t2n);
+    }
+    bary_small_rshift(z1ds, z1ds, z1n, 1, 0);
+
+    /* z2 <- z(-1) - z(0) == t2 - t0 */
+    if (t2p == t0p) {
+        z2p = t2p;
+        if (bary_sub(z2ds, z2n, t2ds, t2n, t0ds, t0n)) {
+            bary_2comp(z2ds, z2n);
+            z2p = !z2p;
+        }
+    }
+    else {
+        z2p = t2p;
+        bary_add(z2ds, z2n, t2ds, t2n, t0ds, t0n);
+    }
+
+    /* z3 <- (z2 - z3) / 2 + 2 * z(inf) == (z2 - z3) / 2 + 2 * t4 */
+    if (z2p == z3p) {
+        z3p = z2p;
+        if (bary_sub(z3ds, z3n, z2ds, z2n, z3ds, z3n)) {
+            bary_2comp(z3ds, z3n);
+            z3p = !z3p;
+        }
+    }
+    else {
+        z3p = z2p;
+        bary_add(z3ds, z3n, z2ds, z2n, z3ds, z3n);
+    }
+    bary_small_rshift(z3ds, z3ds, z3n, 1, 0);
+    if (z3p == t4p) {
+        bary_muladd_1xN(z3ds, z3n, 2, t4ds, t4n);
+    }
+    else {
+        if (bary_mulsub_1xN(z3ds, z3n, 2, t4ds, t4n)) {
+            bary_2comp(z3ds, z3n);
+            z3p = !z3p;
+        }
+    }
+
+    /* z2 <- z2 + z1 - z(inf) == z2 + z1 - t4 */
+    if (z2p == z1p) {
+        bary_add(z2ds, z2n, z2ds, z2n, z1ds, z1n);
+    }
+    else {
+        if (bary_sub(z2ds, z2n, z2ds, z2n, z1ds, z1n)) {
+            bary_2comp(z2ds, z2n);
+            z2p = !z2p;
+        }
+    }
+
+    if (z2p == t4p) {
+        if (bary_sub(z2ds, z2n, z2ds, z2n, t4ds, t4n)) {
+            bary_2comp(z2ds, z2n);
+            z2p = !z2p;
+        }
+    }
+    else {
+        bary_add(z2ds, z2n, z2ds, z2n, t4ds, t4n);
+    }
+
+    /* z1 <- z1 - z3 */
+    if (z1p == z3p) {
+        if (bary_sub(z1ds, z1n, z1ds, z1n, z3ds, z3n)) {
+            bary_2comp(z1ds, z1n);
+            z1p = !z1p;
+        }
+    }
+    else {
+        bary_add(z1ds, z1n, z1ds, z1n, z3ds, z3n);
+    }
+
+    /*
+     * [Step3] Substituting base value into b of the polynomial z(b),
+     */
+
+    MEMCPY(zzds, z0ds, BDIGIT, z0n);
+    BDIGITS_ZERO(zzds + z0n, 4*n - z0n);
+    MEMCPY(zzds + 4*n, z4ds, BDIGIT, z4n);
+    BDIGITS_ZERO(zzds + 4*n + z4n, zzn - (4*n + z4n));
+    if (z1p)
+        bary_add(zzds +   n, zzn -   n, zzds +   n, zzn -   n, z1ds, z1n);
+    else
+        bary_sub(zzds +   n, zzn -   n, zzds +   n, zzn -   n, z1ds, z1n);
+    if (z2p)
+        bary_add(zzds + 2*n, zzn - 2*n, zzds + 2*n, zzn - 2*n, z2ds, z2n);
+    else
+        bary_sub(zzds + 2*n, zzn - 2*n, zzds + 2*n, zzn - 2*n, z2ds, z2n);
+    if (z3p)
+        bary_add(zzds + 3*n, zzn - 3*n, zzds + 3*n, zzn - 3*n, z3ds, z3n);
+    else
+        bary_sub(zzds + 3*n, zzn - 3*n, zzds + 3*n, zzn - 3*n, z3ds, z3n);
+
+    BARY_TRUNC(zzds, zzn);
+    MEMCPY(zds, zzds, BDIGIT, zzn);
+    BDIGITS_ZERO(zds + zzn, zn - zzn);
+
+    if (work)
+        ALLOCV_END(work);
+}
+
+VALUE
+rb_big_mul_toom3(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    if (xn > yn || yn < 3 || !TOOM3_BALANCED(xn,yn))
+        rb_raise(rb_eArgError, "unexpected bignum length for toom3");
+    bary_mul_toom3(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, NULL, 0);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+
+#ifdef USE_GMP
+static void
+bary_mul_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    mpz_t x, y, z;
+    size_t count;
+
+    assert(xn + yn <= zn);
+
+    mpz_init(x);
+    mpz_init(y);
+    mpz_init(z);
+    mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds);
+    if (xds == yds && xn == yn) {
+        mpz_mul(z, x, x);
+    }
+    else {
+        mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds);
+        mpz_mul(z, x, y);
+    }
+    mpz_export(zds, &count, -1, sizeof(BDIGIT), 0, nails, z);
+    BDIGITS_ZERO(zds+count, zn-count);
+    mpz_clear(x);
+    mpz_clear(y);
+    mpz_clear(z);
+}
+
+VALUE
+rb_big_mul_gmp(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    bary_mul_gmp(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return z;
+}
+#endif
+
+static void
+bary_short_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    assert(xn + yn <= zn);
+
+    if (xn == 1 && yn == 1) {
+        bary_mul_single(zds, zn, xds[0], yds[0]);
+    }
+    else {
+        bary_mul_normal(zds, zn, xds, xn, yds, yn);
+        rb_thread_check_ints();
+    }
+}
+
+/* determine whether a bignum is sparse or not by random sampling */
+static inline int
+bary_sparse_p(const BDIGIT *ds, size_t n)
+{
+    long c = 0;
+
+    if (          ds[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
+    if (c <= 1 && ds[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
+    if (c <= 1 && ds[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
+
+    return (c <= 1) ? 1 : 0;
+}
+
+static int
+bary_mul_precheck(BDIGIT **zdsp, size_t *znp, const BDIGIT **xdsp, size_t *xnp, const BDIGIT **ydsp, size_t *ynp)
+{
+    size_t nlsz; /* number of least significant zero BDIGITs */
+
+    BDIGIT *zds = *zdsp;
+    size_t zn = *znp;
+    const BDIGIT *xds = *xdsp;
+    size_t xn = *xnp;
+    const BDIGIT *yds = *ydsp;
+    size_t yn = *ynp;
+
+    assert(xn + yn <= zn);
+
+    nlsz = 0;
+
+    while (0 < xn) {
+        if (xds[xn-1] == 0) {
+            xn--;
+        }
+        else {
+            do {
+                if (xds[0] != 0)
+                    break;
+                xds++;
+                xn--;
+                nlsz++;
+            } while (0 < xn);
+            break;
+        }
+    }
+
+    while (0 < yn) {
+        if (yds[yn-1] == 0) {
+            yn--;
+        }
+        else {
+            do {
+                if (yds[0] != 0)
+                    break;
+                yds++;
+                yn--;
+                nlsz++;
+            } while (0 < yn);
+            break;
+        }
+    }
+
+    if (nlsz) {
+        BDIGITS_ZERO(zds, nlsz);
+        zds += nlsz;
+        zn -= nlsz;
+    }
+
+    /* make sure that y is longer than x */
+    if (xn > yn) {
+        const BDIGIT *tds;
+        size_t tn;
+	tds = xds; xds = yds; yds = tds;
+	tn = xn; xn = yn; yn = tn;
+    }
+    assert(xn <= yn);
+
+    if (xn <= 1) {
+        if (xn == 0) {
+            BDIGITS_ZERO(zds, zn);
+            return 1;
+        }
+
+        if (xds[0] == 1) {
+            MEMCPY(zds, yds, BDIGIT, yn);
+            BDIGITS_ZERO(zds+yn, zn-yn);
+            return 1;
+        }
+        if (POW2_P(xds[0])) {
+            zds[yn] = bary_small_lshift(zds, yds, yn, bit_length(xds[0])-1);
+            BDIGITS_ZERO(zds+yn+1, zn-yn-1);
+            return 1;
+        }
+        if (yn == 1 && yds[0] == 1) {
+            zds[0] = xds[0];
+            BDIGITS_ZERO(zds+1, zn-1);
+            return 1;
+        }
+        bary_mul_normal(zds, zn, xds, xn, yds, yn);
+        return 1;
+    }
+
+    *zdsp = zds;
+    *znp = zn;
+    *xdsp = xds;
+    *xnp = xn;
+    *ydsp = yds;
+    *ynp = yn;
+
+    return 0;
+}
+
+static void
+bary_mul_karatsuba_branch(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    /* normal multiplication when x is small */
+    if (xn < KARATSUBA_MUL_DIGITS) {
+      normal:
+        if (xds == yds && xn == yn)
+            bary_sq_fast(zds, zn, xds, xn);
+        else
+            bary_short_mul(zds, zn, xds, xn, yds, yn);
+        return;
+    }
+
+    /* normal multiplication when x or y is a sparse bignum */
+    if (bary_sparse_p(xds, xn)) goto normal;
+    if (bary_sparse_p(yds, yn)) {
+        bary_short_mul(zds, zn, yds, yn, xds, xn);
+        return;
+    }
+
+    /* balance multiplication by slicing y when x is much smaller than y */
+    if (!KARATSUBA_BALANCED(xn, yn)) {
+        bary_mul_balance_with_mulfunc(zds, zn, xds, xn, yds, yn, wds, wn, bary_mul_karatsuba_start);
+        return;
+    }
+
+    /* multiplication by karatsuba method */
+    bary_mul_karatsuba(zds, zn, xds, xn, yds, yn, wds, wn);
+}
+
+static void
+bary_mul_karatsuba_start(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    if (bary_mul_precheck(&zds, &zn, &xds, &xn, &yds, &yn))
+        return;
+
+    bary_mul_karatsuba_branch(zds, zn, xds, xn, yds, yn, wds, wn);
+}
+
+static void
+bary_mul_toom3_branch(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    if (xn < TOOM3_MUL_DIGITS) {
+        bary_mul_karatsuba_branch(zds, zn, xds, xn, yds, yn, wds, wn);
+        return;
+    }
+
+    if (!TOOM3_BALANCED(xn, yn)) {
+        bary_mul_balance_with_mulfunc(zds, zn, xds, xn, yds, yn, wds, wn, bary_mul_toom3_start);
+        return;
+    }
+
+    bary_mul_toom3(zds, zn, xds, xn, yds, yn, wds, wn);
+}
+
+static void
+bary_mul_toom3_start(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn, BDIGIT *wds, size_t wn)
+{
+    if (bary_mul_precheck(&zds, &zn, &xds, &xn, &yds, &yn))
+        return;
+
+    bary_mul_toom3_branch(zds, zn, xds, xn, yds, yn, wds, wn);
+}
+
+static void
+bary_mul(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+#ifdef USE_GMP
+    const size_t naive_threshold = GMP_MUL_DIGITS;
+#else
+    const size_t naive_threshold = KARATSUBA_MUL_DIGITS;
+#endif
+    if (xn <= yn) {
+        if (xn < naive_threshold) {
+            if (xds == yds && xn == yn)
+                bary_sq_fast(zds, zn, xds, xn);
+            else
+                bary_short_mul(zds, zn, xds, xn, yds, yn);
+            return;
+        }
+    }
+    else {
+        if (yn < naive_threshold) {
+            bary_short_mul(zds, zn, yds, yn, xds, xn);
+            return;
+        }
+    }
+
+#ifdef USE_GMP
+    bary_mul_gmp(zds, zn, xds, xn, yds, yn);
+#else
+    bary_mul_toom3_start(zds, zn, xds, xn, yds, yn, NULL, 0);
+#endif
+}
+
+struct big_div_struct {
+    size_t yn, zn;
+    BDIGIT *yds, *zds;
+    volatile VALUE stop;
+};
+
+static void *
+bigdivrem1(void *ptr)
+{
+    struct big_div_struct *bds = (struct big_div_struct*)ptr;
+    size_t yn = bds->yn;
+    size_t zn = bds->zn;
+    BDIGIT *yds = bds->yds, *zds = bds->zds;
+    BDIGIT_DBL_SIGNED num;
+    BDIGIT q;
+
+    do {
+	if (bds->stop) {
+	    bds->zn = zn;
+	    return 0;
+        }
+	if (zds[zn-1] == yds[yn-1]) q = BDIGMAX;
+	else q = (BDIGIT)((BIGUP(zds[zn-1]) + zds[zn-2])/yds[yn-1]);
+	if (q) {
+            num = bigdivrem_mulsub(zds+zn-(yn+1), yn+1,
+                                   q,
+                                   yds, yn);
+	    while (num) { /* "add back" required */
+		q--;
+                num = bary_add(zds+zn-(yn+1), yn,
+                               zds+zn-(yn+1), yn,
+                               yds, yn);
+                num--;
+	    }
+	}
+        zn--;
+	zds[zn] = q;
+    } while (zn > yn);
+    return 0;
+}
+
+static void
+rb_big_stop(void *ptr)
+{
+    struct big_div_struct *bds = ptr;
+    bds->stop = Qtrue;
+}
+
+static BDIGIT
+bigdivrem_single1(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT x_higher_bdigit, BDIGIT y)
+{
+    assert(0 < xn);
+    assert(x_higher_bdigit < y);
+    if (POW2_P(y)) {
+        BDIGIT r;
+        r = xds[0] & (y-1);
+        bary_small_rshift(qds, xds, xn, bit_length(y)-1, x_higher_bdigit);
+        return r;
+    }
+    else {
+        size_t i;
+        BDIGIT_DBL t2;
+        t2 = x_higher_bdigit;
+        i = xn;
+        while (i--) {
+            t2 = BIGUP(t2) + xds[i];
+            qds[i] = (BDIGIT)(t2 / y);
+            t2 %= y;
+        }
+        return (BDIGIT)t2;
+    }
+}
+
+static BDIGIT
+bigdivrem_single(BDIGIT *qds, const BDIGIT *xds, size_t xn, BDIGIT y)
+{
+    return bigdivrem_single1(qds, xds, xn, 0, y);
+}
+
+static void
+bigdivrem_restoring(BDIGIT *zds, size_t zn, BDIGIT *yds, size_t yn)
+{
+    struct big_div_struct bds;
+    size_t ynzero;
+
+    assert(yn < zn);
+    assert(BDIGIT_MSB(yds[yn-1]));
+    assert(zds[zn-1] < yds[yn-1]);
+
+    for (ynzero = 0; !yds[ynzero]; ynzero++);
+
+    if (ynzero+1 == yn) {
+        BDIGIT r;
+        r = bigdivrem_single1(zds+yn, zds+ynzero, zn-yn, zds[zn-1], yds[ynzero]);
+        zds[ynzero] = r;
+        return;
+    }
+
+    bds.yn = yn - ynzero;
+    bds.zds = zds + ynzero;
+    bds.yds = yds + ynzero;
+    bds.stop = Qfalse;
+    bds.zn = zn - ynzero;
+    if (bds.zn > 10000 || bds.yn > 10000) {
+      retry:
+	bds.stop = Qfalse;
+	rb_thread_call_without_gvl(bigdivrem1, &bds, rb_big_stop, &bds);
+
+	if (bds.stop == Qtrue) {
+	    /* execute trap handler, but exception was not raised. */
+	    goto retry;
+	}
+    }
+    else {
+	bigdivrem1(&bds);
+    }
+}
+
+static void
+bary_divmod_normal(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    int shift;
+    BDIGIT *zds, *yyds;
+    size_t zn;
+    VALUE tmpyz = 0;
+
+    assert(yn < xn || (xn == yn && yds[yn - 1] <= xds[xn - 1]));
+    assert(qds ? (xn - yn + 1) <= qn : 1);
+    assert(rds ? yn <= rn : 1);
+
+    zn = xn + BIGDIVREM_EXTRA_WORDS;
+
+    shift = nlz(yds[yn-1]);
+    if (shift) {
+        int alloc_y = !rds;
+        int alloc_z = !qds || qn < zn;
+        if (alloc_y && alloc_z) {
+            yyds = ALLOCV_N(BDIGIT, tmpyz, yn+zn);
+            zds = yyds + yn;
+        }
+        else {
+            yyds = alloc_y ? ALLOCV_N(BDIGIT, tmpyz, yn) : rds;
+            zds = alloc_z ? ALLOCV_N(BDIGIT, tmpyz, zn) : qds;
+        }
+        zds[xn] = bary_small_lshift(zds, xds, xn, shift);
+        bary_small_lshift(yyds, yds, yn, shift);
+    }
+    else {
+        if (qds && zn <= qn)
+            zds = qds;
+        else
+            zds = ALLOCV_N(BDIGIT, tmpyz, zn);
+        MEMCPY(zds, xds, BDIGIT, xn);
+        zds[xn] = 0;
+        /* bigdivrem_restoring will not modify y.
+         * So use yds directly.  */
+        yyds = (BDIGIT *)yds;
+    }
+
+    bigdivrem_restoring(zds, zn, yyds, yn);
+
+    if (rds) {
+        if (shift)
+            bary_small_rshift(rds, zds, yn, shift, 0);
+        else
+            MEMCPY(rds, zds, BDIGIT, yn);
+        BDIGITS_ZERO(rds+yn, rn-yn);
+    }
+
+    if (qds) {
+        size_t j = zn - yn;
+        MEMMOVE(qds, zds+yn, BDIGIT, j);
+        BDIGITS_ZERO(qds+j, qn-j);
+    }
+
+    if (tmpyz)
+        ALLOCV_END(tmpyz);
+}
+
+VALUE
+rb_big_divrem_normal(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), qn, rn;
+    BDIGIT *xds = BDIGITS(x), *yds = BDIGITS(y), *qds, *rds;
+    VALUE q, r;
+
+    BARY_TRUNC(yds, yn);
+    if (yn == 0)
+        rb_num_zerodiv();
+    BARY_TRUNC(xds, xn);
+
+    if (xn < yn || (xn == yn && xds[xn - 1] < yds[yn - 1]))
+        return rb_assoc_new(LONG2FIX(0), x);
+
+    qn = xn + BIGDIVREM_EXTRA_WORDS;
+    q = bignew(qn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    qds = BDIGITS(q);
+
+    rn = yn;
+    r = bignew(rn, BIGNUM_SIGN(x));
+    rds = BDIGITS(r);
+
+    bary_divmod_normal(qds, qn, rds, rn, xds, xn, yds, yn);
+
+    bigtrunc(q);
+    bigtrunc(r);
+
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+
+    return rb_assoc_new(q, r);
+}
+
+#ifdef USE_GMP
+static void
+bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    mpz_t x, y, q, r;
+    size_t count;
+
+    assert(yn < xn || (xn == yn && yds[yn - 1] <= xds[xn - 1]));
+    assert(qds ? (xn - yn + 1) <= qn : 1);
+    assert(rds ? yn <= rn : 1);
+    assert(qds || rds);
+
+    mpz_init(x);
+    mpz_init(y);
+    if (qds) mpz_init(q);
+    if (rds) mpz_init(r);
+
+    mpz_import(x, xn, -1, sizeof(BDIGIT), 0, nails, xds);
+    mpz_import(y, yn, -1, sizeof(BDIGIT), 0, nails, yds);
+
+    if (!rds) {
+        mpz_fdiv_q(q, x, y);
+    }
+    else if (!qds) {
+        mpz_fdiv_r(r, x, y);
+    }
+    else {
+        mpz_fdiv_qr(q, r, x, y);
+    }
+
+    mpz_clear(x);
+    mpz_clear(y);
+
+    if (qds) {
+        mpz_export(qds, &count, -1, sizeof(BDIGIT), 0, nails, q);
+        BDIGITS_ZERO(qds+count, qn-count);
+        mpz_clear(q);
+    }
+
+    if (rds) {
+        mpz_export(rds, &count, -1, sizeof(BDIGIT), 0, nails, r);
+        BDIGITS_ZERO(rds+count, rn-count);
+        mpz_clear(r);
+    }
+}
+
+VALUE
+rb_big_divrem_gmp(VALUE x, VALUE y)
+{
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), qn, rn;
+    BDIGIT *xds = BDIGITS(x), *yds = BDIGITS(y), *qds, *rds;
+    VALUE q, r;
+
+    BARY_TRUNC(yds, yn);
+    if (yn == 0)
+        rb_num_zerodiv();
+    BARY_TRUNC(xds, xn);
+
+    if (xn < yn || (xn == yn && xds[xn - 1] < yds[yn - 1]))
+        return rb_assoc_new(LONG2FIX(0), x);
+
+    qn = xn - yn + 1;
+    q = bignew(qn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+    qds = BDIGITS(q);
+
+    rn = yn;
+    r = bignew(rn, BIGNUM_SIGN(x));
+    rds = BDIGITS(r);
+
+    bary_divmod_gmp(qds, qn, rds, rn, xds, xn, yds, yn);
+
+    bigtrunc(q);
+    bigtrunc(r);
+
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+
+    return rb_assoc_new(q, r);
+}
+#endif
+
+static void
+bary_divmod_branch(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+#ifdef USE_GMP
+    if (GMP_DIV_DIGITS < xn) {
+        bary_divmod_gmp(qds, qn, rds, rn, xds, xn, yds, yn);
+        return;
+    }
+#endif
+    bary_divmod_normal(qds, qn, rds, rn, xds, xn, yds, yn);
+}
+
+static void
+bary_divmod(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
+{
+    assert(xn <= qn);
+    assert(yn <= rn);
+
+    BARY_TRUNC(yds, yn);
+    if (yn == 0)
+        rb_num_zerodiv();
+
+    BARY_TRUNC(xds, xn);
+    if (xn == 0) {
+        BDIGITS_ZERO(qds, qn);
+        BDIGITS_ZERO(rds, rn);
+        return;
+    }
+
+    if (xn < yn || (xn == yn && xds[xn - 1] < yds[yn - 1])) {
+        MEMCPY(rds, xds, BDIGIT, xn);
+        BDIGITS_ZERO(rds+xn, rn-xn);
+        BDIGITS_ZERO(qds, qn);
+    }
+    else if (yn == 1) {
+        MEMCPY(qds, xds, BDIGIT, xn);
+        BDIGITS_ZERO(qds+xn, qn-xn);
+        rds[0] = bigdivrem_single(qds, xds, xn, yds[0]);
+        BDIGITS_ZERO(rds+1, rn-1);
+    }
+    else if (xn == 2 && yn == 2) {
+        BDIGIT_DBL x = bary2bdigitdbl(xds, 2);
+        BDIGIT_DBL y = bary2bdigitdbl(yds, 2);
+        BDIGIT_DBL q = x / y;
+        BDIGIT_DBL r = x % y;
+        qds[0] = BIGLO(q);
+        qds[1] = BIGLO(BIGDN(q));
+        BDIGITS_ZERO(qds+2, qn-2);
+        rds[0] = BIGLO(r);
+        rds[1] = BIGLO(BIGDN(r));
+        BDIGITS_ZERO(rds+2, rn-2);
+    }
+    else {
+        bary_divmod_branch(qds, qn, rds, rn, xds, xn, yds, yn);
+    }
+}
+
 
 #define BIGNUM_DEBUG 0
 #if BIGNUM_DEBUG
@@ -53,11 +2875,11 @@ static void
 dump_bignum(VALUE x)
 {
     long i;
-    printf("%c0x0", RBIGNUM_SIGN(x) ? '+' : '-');
-    for (i = RBIGNUM_LEN(x); i--; ) {
-	printf("_%08"PRIxBDIGIT, BDIGITS(x)[i]);
+    printf("%c0x0", BIGNUM_SIGN(x) ? '+' : '-');
+    for (i = BIGNUM_LEN(x); i--; ) {
+        printf("_%0*"PRIxBDIGIT, SIZEOF_BDIGIT*2, BDIGITS(x)[i]);
     }
-    printf(", len=%lu", RBIGNUM_LEN(x));
+    printf(", len=%"PRIuSIZE, BIGNUM_LEN(x));
     puts("");
 }
 
@@ -74,13 +2896,7 @@ rb_big_dump(VALUE x)
 static int
 bigzero_p(VALUE x)
 {
-    long i;
-    BDIGIT *ds = BDIGITS(x);
-
-    for (i = RBIGNUM_LEN(x) - 1; 0 <= i; i--) {
-	if (ds[i]) return 0;
-    }
-    return 1;
+    return bary_zero_p(BDIGITS(x), BIGNUM_LEN(x));
 }
 
 int
@@ -101,9 +2917,9 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
         if (l < 0) return -1;
         return 0;
     }
-    if (TYPE(val) == T_BIGNUM) {
+    if (RB_BIGNUM_TYPE_P(val)) {
 	if (BIGZEROP(val)) return 0;
-	if (RBIGNUM_SIGN(val)) return 1;
+	if (BIGNUM_SIGN(val)) return 1;
 	return -1;
     }
     if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
@@ -111,38 +2927,39 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
     return 0;
 }
 
-#define RBIGNUM_SET_LEN(b,l) \
-    ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
+#define BIGNUM_SET_LEN(b,l) \
+    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
      (void)(RBASIC(b)->flags = \
-	    (RBASIC(b)->flags & ~RBIGNUM_EMBED_LEN_MASK) | \
-	    ((l) << RBIGNUM_EMBED_LEN_SHIFT)) : \
+	    (RBASIC(b)->flags & ~BIGNUM_EMBED_LEN_MASK) | \
+	    ((l) << BIGNUM_EMBED_LEN_SHIFT)) : \
      (void)(RBIGNUM(b)->as.heap.len = (l)))
 
 static void
-rb_big_realloc(VALUE big, long len)
+rb_big_realloc(VALUE big, size_t len)
 {
     BDIGIT *ds;
-    if (RBASIC(big)->flags & RBIGNUM_EMBED_FLAG) {
-	if (RBIGNUM_EMBED_LEN_MAX < len) {
+    if (RBASIC(big)->flags & BIGNUM_EMBED_FLAG) {
+	if (BIGNUM_EMBED_LEN_MAX < len) {
 	    ds = ALLOC_N(BDIGIT, len);
-	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, RBIGNUM_EMBED_LEN_MAX);
-	    RBIGNUM(big)->as.heap.len = RBIGNUM_LEN(big);
+	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, BIGNUM_EMBED_LEN_MAX);
+	    RBIGNUM(big)->as.heap.len = BIGNUM_LEN(big);
 	    RBIGNUM(big)->as.heap.digits = ds;
-	    RBASIC(big)->flags &= ~RBIGNUM_EMBED_FLAG;
+	    RBASIC(big)->flags &= ~BIGNUM_EMBED_FLAG;
 	}
     }
     else {
-	if (len <= RBIGNUM_EMBED_LEN_MAX) {
+	if (len <= BIGNUM_EMBED_LEN_MAX) {
 	    ds = RBIGNUM(big)->as.heap.digits;
-	    RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
-	    RBIGNUM_SET_LEN(big, len);
+	    RBASIC(big)->flags |= BIGNUM_EMBED_FLAG;
+	    BIGNUM_SET_LEN(big, len);
+            (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary));
 	    if (ds) {
 		MEMCPY(RBIGNUM(big)->as.ary, ds, BDIGIT, len);
 		xfree(ds);
 	    }
 	}
 	else {
-	    if (RBIGNUM_LEN(big) == 0) {
+	    if (BIGNUM_LEN(big) == 0) {
 		RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
 	    }
 	    else {
@@ -153,34 +2970,32 @@ rb_big_realloc(VALUE big, long len)
 }
 
 void
-rb_big_resize(VALUE big, long len)
+rb_big_resize(VALUE big, size_t len)
 {
     rb_big_realloc(big, len);
-    RBIGNUM_SET_LEN(big, len);
+    BIGNUM_SET_LEN(big, len);
 }
 
 static VALUE
-bignew_1(VALUE klass, long len, int sign)
+bignew_1(VALUE klass, size_t len, int sign)
 {
-    NEWOBJ(big, struct RBignum);
-    OBJSETUP(big, klass, T_BIGNUM);
-    RBIGNUM_SET_SIGN(big, sign?1:0);
-    if (len <= RBIGNUM_EMBED_LEN_MAX) {
-	RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
-	RBIGNUM_SET_LEN(big, len);
+    NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0));
+    BIGNUM_SET_SIGN(big, sign);
+    if (len <= BIGNUM_EMBED_LEN_MAX) {
+	RBASIC(big)->flags |= BIGNUM_EMBED_FLAG;
+	BIGNUM_SET_LEN(big, len);
+        (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary));
     }
     else {
 	RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
 	RBIGNUM(big)->as.heap.len = len;
     }
-
+    OBJ_FREEZE(big);
     return (VALUE)big;
 }
 
-#define bignew(len,sign) bignew_1(rb_cBignum,(len),(sign))
-
 VALUE
-rb_big_new(long len, int sign)
+rb_big_new(size_t len, int sign)
 {
     return bignew(len, sign != 0);
 }
@@ -188,33 +3003,29 @@ rb_big_new(long len, int sign)
 VALUE
 rb_big_clone(VALUE x)
 {
-    long len = RBIGNUM_LEN(x);
-    VALUE z = bignew_1(CLASS_OF(x), len, RBIGNUM_SIGN(x));
+    size_t len = BIGNUM_LEN(x);
+    VALUE z = bignew_1(CLASS_OF(x), len, BIGNUM_SIGN(x));
 
     MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, len);
     return z;
 }
 
+static void
+big_extend_carry(VALUE x)
+{
+    rb_big_resize(x, BIGNUM_LEN(x)+1);
+    BDIGITS(x)[BIGNUM_LEN(x)-1] = 1;
+}
+
 /* modify a bignum by 2's complement */
 static void
 get2comp(VALUE x)
 {
-    long i = RBIGNUM_LEN(x);
+    long i = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
-    BDIGIT_DBL num;
 
-    if (!i) return;
-    while (i--) ds[i] = ~ds[i];
-    i = 0; num = 1;
-    do {
-	num += ds[i];
-	ds[i++] = BIGLO(num);
-	num = BIGDN(num);
-    } while (i < RBIGNUM_LEN(x));
-    if (num != 0) {
-	rb_big_resize(x, RBIGNUM_LEN(x)+1);
-	ds = BDIGITS(x);
-	ds[RBIGNUM_LEN(x)-1] = 1;
+    if (bary_2comp(ds, i)) {
+        big_extend_carry(x);
     }
 }
 
@@ -224,15 +3035,45 @@ rb_big_2comp(VALUE x)			/* get 2's complement */
     get2comp(x);
 }
 
+static BDIGIT
+abs2twocomp(VALUE *xp, long *n_ret)
+{
+    VALUE x = *xp;
+    long n = BIGNUM_LEN(x);
+    BDIGIT *ds = BDIGITS(x);
+    BDIGIT hibits = 0;
+
+    BARY_TRUNC(ds, n);
+
+    if (n != 0 && BIGNUM_NEGATIVE_P(x)) {
+        VALUE z = bignew_1(CLASS_OF(x), n, 0);
+        MEMCPY(BDIGITS(z), ds, BDIGIT, n);
+        bary_2comp(BDIGITS(z), n);
+        hibits = BDIGMAX;
+	*xp = z;
+    }
+    *n_ret = n;
+    return hibits;
+}
+
+static void
+twocomp2abs_bang(VALUE x, int hibits)
+{
+    BIGNUM_SET_SIGN(x, !hibits);
+    if (hibits) {
+        get2comp(x);
+    }
+}
+
 static inline VALUE
 bigtrunc(VALUE x)
 {
-    long len = RBIGNUM_LEN(x);
+    size_t len = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
 
     if (len == 0) return x;
     while (--len && !ds[len]);
-    if (RBIGNUM_LEN(x) > len+1) {
+    if (BIGNUM_LEN(x) > len+1) {
 	rb_big_resize(x, len+1);
     }
     return x;
@@ -241,36 +3082,52 @@ bigtrunc(VALUE x)
 static inline VALUE
 bigfixize(VALUE x)
 {
-    long len = RBIGNUM_LEN(x);
+    size_t n = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
-
-    if (len == 0) return INT2FIX(0);
-    if ((size_t)(len*SIZEOF_BDIGITS) <= sizeof(long)) {
-	long num = 0;
-#if 2*SIZEOF_BDIGITS > SIZEOF_LONG
-	num = (long)ds[0];
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    unsigned long u;
 #else
-	while (len--) {
-	    num = (long)(BIGUP(num) + ds[len]);
-	}
+    BDIGIT u;
 #endif
-	if (num >= 0) {
-	    if (RBIGNUM_SIGN(x)) {
-		if (POSFIXABLE(num)) return LONG2FIX(num);
-	    }
-	    else {
-		if (NEGFIXABLE(-num)) return LONG2FIX(-num);
-	    }
-	}
+
+    BARY_TRUNC(ds, n);
+
+    if (n == 0) return INT2FIX(0);
+
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (sizeof(long)/SIZEOF_BDIGIT < n)
+        goto return_big;
+    else {
+        int i = (int)n;
+        u = 0;
+        while (i--) {
+            u = (unsigned long)(BIGUP(u) + ds[i]);
+        }
+    }
+#else /* SIZEOF_BDIGIT >= SIZEOF_LONG */
+    if (1 < n)
+        goto return_big;
+    else
+        u = ds[0];
+#endif
+
+    if (BIGNUM_POSITIVE_P(x)) {
+        if (POSFIXABLE(u)) return LONG2FIX((long)u);
     }
+    else {
+        if (u <= -FIXNUM_MIN) return LONG2FIX(-(long)u);
+    }
+
+  return_big:
+    rb_big_resize(x, n);
     return x;
 }
 
 static VALUE
 bignorm(VALUE x)
 {
-    if (!FIXNUM_P(x) && TYPE(x) == T_BIGNUM) {
-	x = bigfixize(bigtrunc(x));
+    if (RB_BIGNUM_TYPE_P(x)) {
+	x = bigfixize(x);
     }
     return x;
 }
@@ -284,21 +3141,22 @@ rb_big_norm(VALUE x)
 VALUE
 rb_uint2big(VALUE n)
 {
-    BDIGIT_DBL num = n;
-    long i = 0;
-    BDIGIT *digits;
-    VALUE big;
+    long i;
+    VALUE big = bignew(bdigit_roomof(SIZEOF_VALUE), 1);
+    BDIGIT *digits = BDIGITS(big);
 
-    big = bignew(DIGSPERLONG, 1);
-    digits = BDIGITS(big);
-    while (i < DIGSPERLONG) {
-	digits[i++] = BIGLO(num);
-	num = BIGDN(num);
+#if SIZEOF_BDIGIT >= SIZEOF_VALUE
+    digits[0] = n;
+#else
+    for (i = 0; i < bdigit_roomof(SIZEOF_VALUE); i++) {
+	digits[i] = BIGLO(n);
+	n = BIGDN(n);
     }
+#endif
 
-    i = DIGSPERLONG;
+    i = bdigit_roomof(SIZEOF_VALUE);
     while (--i && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
+    BIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
@@ -306,15 +3164,19 @@ VALUE
 rb_int2big(SIGNED_VALUE n)
 {
     long neg = 0;
+    VALUE u;
     VALUE big;
 
     if (n < 0) {
-	n = -n;
+        u = 1 + (VALUE)(-(n + 1)); /* u = -n avoiding overflow */
 	neg = 1;
     }
-    big = rb_uint2big(n);
+    else {
+        u = n;
+    }
+    big = rb_uint2big(u);
     if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+	BIGNUM_SET_NEGATIVE_SIGN(big);
     }
     return big;
 }
@@ -333,286 +3195,890 @@ rb_int2inum(SIGNED_VALUE n)
     return rb_int2big(n);
 }
 
-#if SIZEOF_LONG % SIZEOF_BDIGITS != 0
-# error unexpected SIZEOF_LONG : SIZEOF_BDIGITS ratio
-#endif
+void
+rb_big_pack(VALUE val, unsigned long *buf, long num_longs)
+{
+    rb_integer_pack(val, buf, num_longs, sizeof(long), 0,
+            INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP);
+}
+
+VALUE
+rb_big_unpack(unsigned long *buf, long num_longs)
+{
+    return rb_integer_unpack(buf, num_longs, sizeof(long), 0,
+            INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP);
+}
 
 /*
- * buf is an array of long integers.
- * buf is ordered from least significant word to most significant word.
- * buf[0] is the least significant word and
- * buf[num_longs-1] is the most significant word.
- * This means words in buf is little endian.
- * However each word in buf is native endian.
- * (buf[i]&1) is the least significant bit and
- * (buf[i]&(1<<(SIZEOF_LONG*CHAR_BIT-1))) is the most significant bit
- * for each 0 <= i < num_longs.
- * So buf is little endian at whole on a little endian machine.
- * But buf is mixed endian on a big endian machine.
+ * Calculate the number of bytes to be required to represent
+ * the absolute value of the integer given as _val_.
+ *
+ * [val] an integer.
+ * [nlz_bits_ret] number of leading zero bits in the most significant byte is returned if not NULL.
+ *
+ * This function returns ((val_numbits * CHAR_BIT + CHAR_BIT - 1) / CHAR_BIT)
+ * where val_numbits is the number of bits of abs(val).
+ * This function should not overflow.
+ *
+ * If nlz_bits_ret is not NULL,
+ * (return_value * CHAR_BIT - val_numbits) is stored in *nlz_bits_ret.
+ * In this case, 0 <= *nlz_bits_ret < CHAR_BIT.
+ *
  */
-void
-rb_big_pack(VALUE val, unsigned long *buf, long num_longs)
+size_t
+rb_absint_size(VALUE val, int *nlz_bits_ret)
 {
+    BDIGIT *dp;
+    BDIGIT *de;
+    BDIGIT fixbuf[bdigit_roomof(sizeof(long))];
+
+    int num_leading_zeros;
+
     val = rb_to_int(val);
-    if (num_longs == 0)
-        return;
+
     if (FIXNUM_P(val)) {
-        long i;
-        long tmp = FIX2LONG(val);
-        buf[0] = (unsigned long)tmp;
-        tmp = tmp < 0 ? ~0L : 0;
-        for (i = 1; i < num_longs; i++)
-            buf[i] = (unsigned long)tmp;
-        return;
-    }
-    else {
-        long len = RBIGNUM_LEN(val);
-        BDIGIT *ds = BDIGITS(val), *dend = ds + len;
-        long i, j;
-        for (i = 0; i < num_longs && ds < dend; i++) {
-            unsigned long l = 0;
-            for (j = 0; j < DIGSPERLONG && ds < dend; j++, ds++) {
-                l |= ((unsigned long)*ds << (j * BITSPERDIG));
-            }
-            buf[i] = l;
+        long v = FIX2LONG(val);
+        if (v < 0) {
+            v = -v;
         }
-        for (; i < num_longs; i++)
-            buf[i] = 0;
-        if (RBIGNUM_NEGATIVE_P(val)) {
-            for (i = 0; i < num_longs; i++) {
-                buf[i] = ~buf[i];
-            }
-            for (i = 0; i < num_longs; i++) {
-                buf[i]++;
-                if (buf[i] != 0)
-                    return;
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+        fixbuf[0] = v;
+#else
+        {
+            int i;
+            for (i = 0; i < numberof(fixbuf); i++) {
+                fixbuf[i] = BIGLO(v);
+                v = BIGDN(v);
             }
         }
+#endif
+        dp = fixbuf;
+        de = fixbuf + numberof(fixbuf);
+    }
+    else {
+        dp = BDIGITS(val);
+        de = dp + BIGNUM_LEN(val);
+    }
+    while (dp < de && de[-1] == 0)
+        de--;
+    if (dp == de) {
+        if (nlz_bits_ret)
+            *nlz_bits_ret = 0;
+        return 0;
     }
+    num_leading_zeros = nlz(de[-1]);
+    if (nlz_bits_ret)
+        *nlz_bits_ret = num_leading_zeros % CHAR_BIT;
+    return (de - dp) * SIZEOF_BDIGIT - num_leading_zeros / CHAR_BIT;
 }
 
-/* See rb_big_pack comment for endianness of buf. */
-VALUE
-rb_big_unpack(unsigned long *buf, long num_longs)
+static size_t
+absint_numwords_small(size_t numbytes, int nlz_bits_in_msbyte, size_t word_numbits, size_t *nlz_bits_ret)
 {
-    while (2 <= num_longs) {
-        if (buf[num_longs-1] == 0 && (long)buf[num_longs-2] >= 0)
-            num_longs--;
-        else if (buf[num_longs-1] == ~0UL && (long)buf[num_longs-2] < 0)
-            num_longs--;
-        else
-            break;
+    size_t val_numbits = numbytes * CHAR_BIT - nlz_bits_in_msbyte;
+    size_t div = val_numbits / word_numbits;
+    size_t mod = val_numbits % word_numbits;
+    size_t numwords;
+    size_t nlz_bits;
+    numwords = mod == 0 ? div : div + 1;
+    nlz_bits = mod == 0 ? 0 : word_numbits - mod;
+    *nlz_bits_ret = nlz_bits;
+    return numwords;
+}
+
+static size_t
+absint_numwords_generic(size_t numbytes, int nlz_bits_in_msbyte, size_t word_numbits, size_t *nlz_bits_ret)
+{
+    static const BDIGIT char_bit[1] = { CHAR_BIT };
+    BDIGIT numbytes_bary[bdigit_roomof(sizeof(numbytes))];
+    BDIGIT val_numbits_bary[bdigit_roomof(sizeof(numbytes) + 1)];
+    BDIGIT nlz_bits_in_msbyte_bary[1];
+    BDIGIT word_numbits_bary[bdigit_roomof(sizeof(word_numbits))];
+    BDIGIT div_bary[numberof(val_numbits_bary) + BIGDIVREM_EXTRA_WORDS];
+    BDIGIT mod_bary[numberof(word_numbits_bary)];
+    BDIGIT one[1] = { 1 };
+    size_t nlz_bits;
+    size_t mod;
+    int sign;
+    size_t numwords;
+
+    nlz_bits_in_msbyte_bary[0] = nlz_bits_in_msbyte;
+
+    /*
+     * val_numbits = numbytes * CHAR_BIT - nlz_bits_in_msbyte
+     * div, mod = val_numbits.divmod(word_numbits)
+     * numwords = mod == 0 ? div : div + 1
+     * nlz_bits = mod == 0 ? 0 : word_numbits - mod
+     */
+
+    bary_unpack(BARY_ARGS(numbytes_bary), &numbytes, 1, sizeof(numbytes), 0,
+        INTEGER_PACK_NATIVE_BYTE_ORDER);
+    BARY_SHORT_MUL(val_numbits_bary, numbytes_bary, char_bit);
+    if (nlz_bits_in_msbyte)
+        BARY_SUB(val_numbits_bary, val_numbits_bary, nlz_bits_in_msbyte_bary);
+    bary_unpack(BARY_ARGS(word_numbits_bary), &word_numbits, 1, sizeof(word_numbits), 0,
+        INTEGER_PACK_NATIVE_BYTE_ORDER);
+    BARY_DIVMOD(div_bary, mod_bary, val_numbits_bary, word_numbits_bary);
+    if (BARY_ZERO_P(mod_bary)) {
+        nlz_bits = 0;
     }
-    if (num_longs == 0)
-        return INT2FIX(0);
-    else if (num_longs == 1)
-        return LONG2NUM((long)buf[0]);
-    else {
-        VALUE big;
-        BDIGIT *ds;
-        long len = num_longs * DIGSPERLONG;
-        long i;
-        big = bignew(len, 1);
-        ds = BDIGITS(big);
-        for (i = 0; i < num_longs; i++) {
-            unsigned long d = buf[i];
-#if SIZEOF_LONG == SIZEOF_BDIGITS
-            *ds++ = d;
-#else
-            int j;
-            for (j = 0; j < DIGSPERLONG; j++) {
-                *ds++ = BIGLO(d);
-                d = BIGDN(d);
-            }
+    else {
+        BARY_ADD(div_bary, div_bary, one);
+        bary_pack(+1, BARY_ARGS(mod_bary), &mod, 1, sizeof(mod), 0,
+            INTEGER_PACK_NATIVE_BYTE_ORDER);
+        nlz_bits = word_numbits - mod;
+    }
+    sign = bary_pack(+1, BARY_ARGS(div_bary), &numwords, 1, sizeof(numwords), 0,
+        INTEGER_PACK_NATIVE_BYTE_ORDER);
+
+    if (sign == 2) {
+#if defined __GNUC__ && (__GNUC__ == 4 && __GNUC_MINOR__ == 4)
+	*nlz_bits_ret = 0;
 #endif
-        }
-        if ((long)buf[num_longs-1] < 0) {
-            get2comp(big);
-            RBIGNUM_SET_SIGN(big, 0);
-        }
-        return bignorm(big);
+        return (size_t)-1;
     }
+    *nlz_bits_ret = nlz_bits;
+    return numwords;
 }
 
-#define QUAD_SIZE 8
+/*
+ * Calculate the number of words to be required to represent
+ * the absolute value of the integer given as _val_.
+ *
+ * [val] an integer.
+ * [word_numbits] number of bits in a word.
+ * [nlz_bits_ret] number of leading zero bits in the most significant word is returned if not NULL.
+ *
+ * This function returns ((val_numbits * CHAR_BIT + word_numbits - 1) / word_numbits)
+ * where val_numbits is the number of bits of abs(val).
+ *
+ * This function can overflow.
+ * When overflow occur, (size_t)-1 is returned.
+ *
+ * If nlz_bits_ret is not NULL and overflow is not occur,
+ * (return_value * word_numbits - val_numbits) is stored in *nlz_bits_ret.
+ * In this case, 0 <= *nlz_bits_ret < word_numbits.
+ *
+ */
+size_t
+rb_absint_numwords(VALUE val, size_t word_numbits, size_t *nlz_bits_ret)
+{
+    size_t numbytes;
+    int nlz_bits_in_msbyte;
+    size_t numwords;
+    size_t nlz_bits;
+
+    if (word_numbits == 0)
+        return (size_t)-1;
+
+    numbytes = rb_absint_size(val, &nlz_bits_in_msbyte);
+
+    if (numbytes <= SIZE_MAX / CHAR_BIT) {
+        numwords = absint_numwords_small(numbytes, nlz_bits_in_msbyte, word_numbits, &nlz_bits);
+#ifdef DEBUG_INTEGER_PACK
+        {
+            size_t numwords0, nlz_bits0;
+            numwords0 = absint_numwords_generic(numbytes, nlz_bits_in_msbyte, word_numbits, &nlz_bits0);
+            assert(numwords0 == numwords);
+            assert(nlz_bits0 == nlz_bits);
+        }
+#endif
+    }
+    else {
+        numwords = absint_numwords_generic(numbytes, nlz_bits_in_msbyte, word_numbits, &nlz_bits);
+    }
+    if (numwords == (size_t)-1)
+        return numwords;
+
+    if (nlz_bits_ret)
+        *nlz_bits_ret = nlz_bits;
 
-#if SIZEOF_LONG_LONG == QUAD_SIZE && SIZEOF_BDIGITS*2 == SIZEOF_LONG_LONG
+    return numwords;
+}
 
-void
-rb_quad_pack(char *buf, VALUE val)
+/* Test abs(val) consists only a bit or not.
+ *
+ * Returns 1 if abs(val) == 1 << n for some n >= 0.
+ * Returns 0 otherwise.
+ *
+ * rb_absint_singlebit_p can be used to determine required buffer size
+ * for rb_integer_pack used with INTEGER_PACK_2COMP (two's complement).
+ *
+ * Following example calculates number of bits required to
+ * represent val in two's complement number, without sign bit.
+ *
+ *   size_t size;
+ *   int neg = FIXNUM_P(val) ? FIX2LONG(val) < 0 : BIGNUM_NEGATIVE_P(val);
+ *   size = rb_absint_numwords(val, 1, NULL)
+ *   if (size == (size_t)-1) ...overflow...
+ *   if (neg && rb_absint_singlebit_p(val))
+ *     size--;
+ *
+ * Following example calculates number of bytes required to
+ * represent val in two's complement number, with sign bit.
+ *
+ *   size_t size;
+ *   int neg = FIXNUM_P(val) ? FIX2LONG(val) < 0 : BIGNUM_NEGATIVE_P(val);
+ *   int nlz_bits;
+ *   size = rb_absint_size(val, &nlz_bits);
+ *   if (nlz_bits == 0 && !(neg && rb_absint_singlebit_p(val)))
+ *     size++;
+ */
+int
+rb_absint_singlebit_p(VALUE val)
 {
-    LONG_LONG q;
+    BDIGIT *dp;
+    BDIGIT *de;
+    BDIGIT fixbuf[bdigit_roomof(sizeof(long))];
+    BDIGIT d;
 
     val = rb_to_int(val);
+
     if (FIXNUM_P(val)) {
-	q = FIX2LONG(val);
+        long v = FIX2LONG(val);
+        if (v < 0) {
+            v = -v;
+        }
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+        fixbuf[0] = v;
+#else
+        {
+            int i;
+            for (i = 0; i < numberof(fixbuf); i++) {
+                fixbuf[i] = BIGLO(v);
+                v = BIGDN(v);
+            }
+        }
+#endif
+        dp = fixbuf;
+        de = fixbuf + numberof(fixbuf);
     }
     else {
-	long len = RBIGNUM_LEN(val);
-	BDIGIT *ds;
+        dp = BDIGITS(val);
+        de = dp + BIGNUM_LEN(val);
+    }
+    while (dp < de && de[-1] == 0)
+        de--;
+    while (dp < de && dp[0] == 0)
+        dp++;
+    if (dp == de) /* no bit set. */
+        return 0;
+    if (dp != de-1) /* two non-zero words. two bits set, at least. */
+        return 0;
+    d = *dp;
+    return POW2_P(d);
+}
 
-	if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS) {
-	    len = SIZEOF_LONG_LONG/SIZEOF_BDIGITS;
-	}
-	ds = BDIGITS(val);
-	q = 0;
-	while (len--) {
-	    q = BIGUP(q);
-	    q += ds[len];
-	}
-	if (!RBIGNUM_SIGN(val)) q = -q;
+
+/*
+ * Export an integer into a buffer.
+ *
+ * This function fills the buffer specified by _words_ and _numwords_ as
+ * val in the format specified by _wordsize_, _nails_ and _flags_.
+ *
+ * [val] Fixnum, Bignum or another integer like object which has to_int method.
+ * [words] buffer to export abs(val).
+ * [numwords] the size of given buffer as number of words.
+ * [wordsize] the size of word as number of bytes.
+ * [nails] number of padding bits in a word.
+ *   Most significant nails bits of each word are filled by zero.
+ * [flags] bitwise or of constants which name starts "INTEGER_PACK_".
+ *
+ * flags:
+ * [INTEGER_PACK_MSWORD_FIRST] Store the most significant word as the first word.
+ * [INTEGER_PACK_LSWORD_FIRST] Store the least significant word as the first word.
+ * [INTEGER_PACK_MSBYTE_FIRST] Store the most significant byte in a word as the first byte in the word.
+ * [INTEGER_PACK_LSBYTE_FIRST] Store the least significant byte in a word as the first byte in the word.
+ * [INTEGER_PACK_NATIVE_BYTE_ORDER] INTEGER_PACK_MSBYTE_FIRST or INTEGER_PACK_LSBYTE_FIRST corresponding to the host's endian.
+ * [INTEGER_PACK_2COMP] Use 2's complement representation.
+ * [INTEGER_PACK_LITTLE_ENDIAN] Same as INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_LSBYTE_FIRST
+ * [INTEGER_PACK_BIG_ENDIAN] Same as INTEGER_PACK_MSWORD_FIRST|INTEGER_PACK_MSBYTE_FIRST
+ * [INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION] Use generic implementation (for test and debug).
+ *
+ * This function fills the buffer specified by _words_
+ * as abs(val) if INTEGER_PACK_2COMP is not specified in _flags_.
+ * If INTEGER_PACK_2COMP is specified, 2's complement representation of val is
+ * filled in the buffer.
+ *
+ * This function returns the signedness and overflow condition.
+ * The overflow condition depends on INTEGER_PACK_2COMP.
+ *
+ * INTEGER_PACK_2COMP is not specified:
+ *   -2 : negative overflow.  val <= -2**(numwords*(wordsize*CHAR_BIT-nails))
+ *   -1 : negative without overflow.  -2**(numwords*(wordsize*CHAR_BIT-nails)) < val < 0
+ *   0 : zero.  val == 0
+ *   1 : positive without overflow.  0 < val < 2**(numwords*(wordsize*CHAR_BIT-nails))
+ *   2 : positive overflow.  2**(numwords*(wordsize*CHAR_BIT-nails)) <= val
+ *
+ * INTEGER_PACK_2COMP is specified:
+ *   -2 : negative overflow.  val < -2**(numwords*(wordsize*CHAR_BIT-nails))
+ *   -1 : negative without overflow.  -2**(numwords*(wordsize*CHAR_BIT-nails)) <= val < 0
+ *   0 : zero.  val == 0
+ *   1 : positive without overflow.  0 < val < 2**(numwords*(wordsize*CHAR_BIT-nails))
+ *   2 : positive overflow.  2**(numwords*(wordsize*CHAR_BIT-nails)) <= val
+ *
+ * The value, -2**(numwords*(wordsize*CHAR_BIT-nails)), is representable
+ * in 2's complement representation but not representable in absolute value.
+ * So -1 is returned for the value if INTEGER_PACK_2COMP is specified
+ * but returns -2 if INTEGER_PACK_2COMP is not specified.
+ *
+ * The least significant words are filled in the buffer when overflow occur.
+ */
+
+int
+rb_integer_pack(VALUE val, void *words, size_t numwords, size_t wordsize, size_t nails, int flags)
+{
+    int sign;
+    BDIGIT *ds;
+    size_t num_bdigits;
+    BDIGIT fixbuf[bdigit_roomof(sizeof(long))];
+
+    RB_GC_GUARD(val) = rb_to_int(val);
+
+    if (FIXNUM_P(val)) {
+        long v = FIX2LONG(val);
+        if (v < 0) {
+            sign = -1;
+            v = -v;
+        }
+        else {
+            sign = 1;
+        }
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+        fixbuf[0] = v;
+#else
+        {
+            int i;
+            for (i = 0; i < numberof(fixbuf); i++) {
+                fixbuf[i] = BIGLO(v);
+                v = BIGDN(v);
+            }
+        }
+#endif
+        ds = fixbuf;
+        num_bdigits = numberof(fixbuf);
+    }
+    else {
+        sign = BIGNUM_POSITIVE_P(val) ? 1 : -1;
+        ds = BDIGITS(val);
+        num_bdigits = BIGNUM_LEN(val);
     }
-    memcpy(buf, (char*)&q, SIZEOF_LONG_LONG);
+
+    return bary_pack(sign, ds, num_bdigits, words, numwords, wordsize, nails, flags);
 }
 
+/*
+ * Import an integer into a buffer.
+ *
+ * [words] buffer to import.
+ * [numwords] the size of given buffer as number of words.
+ * [wordsize] the size of word as number of bytes.
+ * [nails] number of padding bits in a word.
+ *   Most significant nails bits of each word are ignored.
+ * [flags] bitwise or of constants which name starts "INTEGER_PACK_".
+ *
+ * flags:
+ * [INTEGER_PACK_MSWORD_FIRST] Interpret the first word as the most significant word.
+ * [INTEGER_PACK_LSWORD_FIRST] Interpret the first word as the least significant word.
+ * [INTEGER_PACK_MSBYTE_FIRST] Interpret the first byte in a word as the most significant byte in the word.
+ * [INTEGER_PACK_LSBYTE_FIRST] Interpret the first byte in a word as the least significant byte in the word.
+ * [INTEGER_PACK_NATIVE_BYTE_ORDER] INTEGER_PACK_MSBYTE_FIRST or INTEGER_PACK_LSBYTE_FIRST corresponding to the host's endian.
+ * [INTEGER_PACK_2COMP] Use 2's complement representation.
+ * [INTEGER_PACK_LITTLE_ENDIAN] Same as INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_LSBYTE_FIRST
+ * [INTEGER_PACK_BIG_ENDIAN] Same as INTEGER_PACK_MSWORD_FIRST|INTEGER_PACK_MSBYTE_FIRST
+ * [INTEGER_PACK_FORCE_BIGNUM] the result will be a Bignum
+ *   even if it is representable as a Fixnum.
+ * [INTEGER_PACK_NEGATIVE] Returns non-positive value.
+ *   (Returns non-negative value if not specified.)
+ * [INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION] Use generic implementation (for test and debug).
+ *
+ * This function returns the imported integer as Fixnum or Bignum.
+ *
+ * The range of the result value depends on INTEGER_PACK_2COMP and INTEGER_PACK_NEGATIVE.
+ *
+ * INTEGER_PACK_2COMP is not set:
+ *   0 <= val < 2**(numwords*(wordsize*CHAR_BIT-nails)) if !INTEGER_PACK_NEGATIVE
+ *   -2**(numwords*(wordsize*CHAR_BIT-nails)) < val <= 0 if INTEGER_PACK_NEGATIVE
+ *
+ * INTEGER_PACK_2COMP is set:
+ *   -2**(numwords*(wordsize*CHAR_BIT-nails)-1) <= val <= 2**(numwords*(wordsize*CHAR_BIT-nails)-1)-1 if !INTEGER_PACK_NEGATIVE
+ *   -2**(numwords*(wordsize*CHAR_BIT-nails)) <= val <= -1 if INTEGER_PACK_NEGATIVE
+ *
+ * INTEGER_PACK_2COMP without INTEGER_PACK_NEGATIVE means sign extension.
+ * INTEGER_PACK_2COMP with INTEGER_PACK_NEGATIVE mean assuming the higher bits are 1.
+ *
+ * Note that this function returns 0 when numwords is zero and
+ * INTEGER_PACK_2COMP is set but INTEGER_PACK_NEGATIVE is not set.
+ */
+
 VALUE
-rb_quad_unpack(const char *buf, int sign)
+rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t nails, int flags)
 {
-    unsigned LONG_LONG q;
-    long neg = 0;
-    long i;
-    BDIGIT *digits;
-    VALUE big;
-
-    memcpy(&q, buf, SIZEOF_LONG_LONG);
-    if (sign) {
-	if (FIXABLE((LONG_LONG)q)) return LONG2FIX((LONG_LONG)q);
-	if ((LONG_LONG)q < 0) {
-	    q = -(LONG_LONG)q;
-	    neg = 1;
-	}
+    VALUE val;
+    size_t num_bdigits;
+    int sign;
+    int nlp_bits;
+    BDIGIT *ds;
+    BDIGIT fixbuf[2] = { 0, 0 };
+
+    validate_integer_pack_format(numwords, wordsize, nails, flags,
+            INTEGER_PACK_MSWORD_FIRST|
+            INTEGER_PACK_LSWORD_FIRST|
+            INTEGER_PACK_MSBYTE_FIRST|
+            INTEGER_PACK_LSBYTE_FIRST|
+            INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP|
+            INTEGER_PACK_FORCE_BIGNUM|
+            INTEGER_PACK_NEGATIVE|
+            INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION);
+
+    num_bdigits = integer_unpack_num_bdigits(numwords, wordsize, nails, &nlp_bits);
+
+    if (LONG_MAX-1 < num_bdigits)
+        rb_raise(rb_eArgError, "too big to unpack as an integer");
+    if (num_bdigits <= numberof(fixbuf) && !(flags & INTEGER_PACK_FORCE_BIGNUM)) {
+        val = Qfalse;
+        ds = fixbuf;
     }
     else {
-	if (POSFIXABLE(q)) return LONG2FIX(q);
+        val = bignew((long)num_bdigits, 0);
+        ds = BDIGITS(val);
     }
+    sign = bary_unpack_internal(ds, num_bdigits, words, numwords, wordsize, nails, flags, nlp_bits);
 
-    i = 0;
-    big = bignew(DIGSPERLL, 1);
-    digits = BDIGITS(big);
-    while (i < DIGSPERLL) {
-	digits[i++] = BIGLO(q);
-	q = BIGDN(q);
+    if (sign == -2) {
+        if (val) {
+            big_extend_carry(val);
+        }
+        else if (num_bdigits == numberof(fixbuf)) {
+            val = bignew((long)num_bdigits+1, 0);
+	    MEMCPY(BDIGITS(val), fixbuf, BDIGIT, num_bdigits);
+            BDIGITS(val)[num_bdigits++] = 1;
+        }
+        else {
+            ds[num_bdigits++] = 1;
+        }
     }
 
-    i = DIGSPERLL;
-    while (i-- && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
-
-    if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+    if (!val) {
+        BDIGIT_DBL u = fixbuf[0] + BIGUP(fixbuf[1]);
+        if (u == 0)
+            return LONG2FIX(0);
+	if (0 < sign && POSFIXABLE(u))
+            return LONG2FIX(u);
+	if (sign < 0 && BDIGIT_MSB(fixbuf[1]) == 0 &&
+                NEGFIXABLE(-(BDIGIT_DBL_SIGNED)u))
+            return LONG2FIX(-(BDIGIT_DBL_SIGNED)u);
+        val = bignew((long)num_bdigits, 0 <= sign);
+        MEMCPY(BDIGITS(val), fixbuf, BDIGIT, num_bdigits);
     }
-    return bignorm(big);
+
+    if ((flags & INTEGER_PACK_FORCE_BIGNUM) && sign != 0 &&
+        bary_zero_p(BDIGITS(val), BIGNUM_LEN(val)))
+        sign = 0;
+    BIGNUM_SET_SIGN(val, 0 <= sign);
+
+    if (flags & INTEGER_PACK_FORCE_BIGNUM)
+        return bigtrunc(val);
+    return bignorm(val);
 }
 
-#else
+#define conv_digit(c) (ruby_digit36_to_number_table[(unsigned char)(c)])
+
+NORETURN(static inline void invalid_radix(int base));
+NORETURN(static inline void invalid_integer(VALUE s));
+
+static inline int
+valid_radix_p(int base)
+{
+    return (1 < base && base <= 36);
+}
+
+static inline void
+invalid_radix(int base)
+{
+    rb_raise(rb_eArgError, "invalid radix %d", base);
+}
+
+static inline void
+invalid_integer(VALUE s)
+{
+    rb_raise(rb_eArgError, "invalid value for Integer(): %+"PRIsVALUE, s);
+}
 
 static int
-quad_buf_complement(char *buf, size_t len)
+str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size_t *num_digits_p, ssize_t *len_p)
 {
-    size_t i;
-    for (i = 0; i < len; i++)
-        buf[i] = ~buf[i];
-    for (i = 0; i < len; i++) {
-        buf[i]++;
-        if (buf[i] != 0)
-            return 0;
+    char nondigit = 0;
+    size_t num_digits = 0;
+    const char *digits_start = str;
+    const char *digits_end = str;
+    ssize_t len = *len_p;
+
+    int c;
+
+    if (!len) {
+	*num_digits_p = 0;
+	*len_p = 0;
+	return TRUE;
     }
-    return 1;
+
+    if (badcheck && *str == '_') goto bad;
+
+    while ((c = *str++) != 0) {
+	if (c == '_') {
+	    if (nondigit) {
+		if (badcheck) goto bad;
+		break;
+	    }
+	    nondigit = (char) c;
+	}
+	else if ((c = conv_digit(c)) < 0 || c >= base) {
+	    break;
+	}
+	else {
+	    nondigit = 0;
+	    num_digits++;
+	    digits_end = str;
+	}
+	if (len > 0 && !--len) break;
+    }
+    if (badcheck && nondigit) goto bad;
+    if (badcheck && len) {
+	str--;
+	while (*str && ISSPACE(*str)) {
+	    str++;
+	    if (len > 0 && !--len) break;
+	}
+	if (len && *str) {
+	  bad:
+	    return FALSE;
+	}
+    }
+    *num_digits_p = num_digits;
+    *len_p = digits_end - digits_start;
+    return TRUE;
 }
 
-void
-rb_quad_pack(char *buf, VALUE val)
-{
-    long len;
+static VALUE
+str2big_poweroftwo(
+    int sign,
+    const char *digits_start,
+    const char *digits_end,
+    size_t num_digits,
+    int bits_per_digit)
+{
+    BDIGIT *dp;
+    BDIGIT_DBL dd;
+    int numbits;
+
+    size_t num_bdigits;
+    const char *p;
+    int c;
+    VALUE z;
 
-    memset(buf, 0, QUAD_SIZE);
-    val = rb_to_int(val);
-    if (FIXNUM_P(val)) {
-	val = rb_int2big(FIX2LONG(val));
+    num_bdigits = (num_digits / BITSPERDIG) * bits_per_digit + roomof((num_digits % BITSPERDIG) * bits_per_digit, BITSPERDIG);
+    z = bignew(num_bdigits, sign);
+    dp = BDIGITS(z);
+    dd = 0;
+    numbits = 0;
+    for (p = digits_end; digits_start < p; p--) {
+        if ((c = conv_digit(p[-1])) < 0)
+            continue;
+        dd |= (BDIGIT_DBL)c << numbits;
+        numbits += bits_per_digit;
+        if (BITSPERDIG <= numbits) {
+            *dp++ = BIGLO(dd);
+            dd = BIGDN(dd);
+            numbits -= BITSPERDIG;
+        }
     }
-    len = RBIGNUM_LEN(val) * SIZEOF_BDIGITS;
-    if (len > QUAD_SIZE) {
-        len = QUAD_SIZE;
+    if (numbits) {
+        *dp++ = BIGLO(dd);
     }
-    memcpy(buf, (char*)BDIGITS(val), len);
-    if (RBIGNUM_NEGATIVE_P(val)) {
-        quad_buf_complement(buf, QUAD_SIZE);
+    assert((size_t)(dp - BDIGITS(z)) == num_bdigits);
+
+    return z;
+}
+
+static VALUE
+str2big_normal(
+    int sign,
+    const char *digits_start,
+    const char *digits_end,
+    size_t num_bdigits,
+    int base)
+{
+    size_t blen = 1;
+    BDIGIT *zds;
+    BDIGIT_DBL num;
+
+    size_t i;
+    const char *p;
+    int c;
+    VALUE z;
+
+    z = bignew(num_bdigits, sign);
+    zds = BDIGITS(z);
+    BDIGITS_ZERO(zds, num_bdigits);
+
+    for (p = digits_start; p < digits_end; p++) {
+        if ((c = conv_digit(*p)) < 0)
+            continue;
+        num = c;
+        i = 0;
+        for (;;) {
+            while (i<blen) {
+                num += (BDIGIT_DBL)zds[i]*base;
+                zds[i++] = BIGLO(num);
+                num = BIGDN(num);
+            }
+            if (num) {
+                blen++;
+                continue;
+            }
+            break;
+        }
+        assert(blen <= num_bdigits);
     }
+
+    return z;
 }
 
-#define BNEG(b) (RSHIFT(((BDIGIT*)(b))[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
+static VALUE
+str2big_karatsuba(
+    int sign,
+    const char *digits_start,
+    const char *digits_end,
+    size_t num_digits,
+    size_t num_bdigits,
+    int digits_per_bdigits_dbl,
+    int base)
+{
+    VALUE powerv;
+    size_t unit;
+    VALUE tmpuv = 0;
+    BDIGIT *uds, *vds, *tds;
+    BDIGIT_DBL dd;
+    BDIGIT_DBL current_base;
+    int m;
+    int power_level = 0;
 
-VALUE
-rb_quad_unpack(const char *buf, int sign)
-{
-    VALUE big = bignew(QUAD_SIZE/SIZEOF_BDIGITS, 1);
+    size_t i;
+    const char *p;
+    int c;
+    VALUE z;
+
+    uds = ALLOCV_N(BDIGIT, tmpuv, 2*num_bdigits);
+    vds = uds + num_bdigits;
 
-    memcpy((char*)BDIGITS(big), buf, QUAD_SIZE);
-    if (sign && BNEG(buf)) {
-	char *tmp = (char*)BDIGITS(big);
+    powerv = power_cache_get_power(base, power_level, NULL);
 
-	RBIGNUM_SET_SIGN(big, 0);
-        quad_buf_complement(tmp, QUAD_SIZE);
+    i = 0;
+    dd = 0;
+    current_base = 1;
+    m = digits_per_bdigits_dbl;
+    if (num_digits < (size_t)m)
+        m = (int)num_digits;
+    for (p = digits_end; digits_start < p; p--) {
+        if ((c = conv_digit(p[-1])) < 0)
+            continue;
+        dd = dd + c * current_base;
+        current_base *= base;
+        num_digits--;
+        m--;
+        if (m == 0) {
+            uds[i++] = BIGLO(dd);
+            uds[i++] = (BDIGIT)BIGDN(dd);
+            dd = 0;
+            m = digits_per_bdigits_dbl;
+            if (num_digits < (size_t)m)
+                m = (int)num_digits;
+            current_base = 1;
+        }
+    }
+    assert(i == num_bdigits);
+    for (unit = 2; unit < num_bdigits; unit *= 2) {
+        for (i = 0; i < num_bdigits; i += unit*2) {
+            if (2*unit <= num_bdigits - i) {
+                bary_mul(vds+i, unit*2, BDIGITS(powerv), BIGNUM_LEN(powerv), uds+i+unit, unit);
+                bary_add(vds+i, unit*2, vds+i, unit*2, uds+i, unit);
+            }
+            else if (unit <= num_bdigits - i) {
+                bary_mul(vds+i, num_bdigits-i, BDIGITS(powerv), BIGNUM_LEN(powerv), uds+i+unit, num_bdigits-(i+unit));
+                bary_add(vds+i, num_bdigits-i, vds+i, num_bdigits-i, uds+i, unit);
+            }
+            else {
+                MEMCPY(vds+i, uds+i, BDIGIT, num_bdigits-i);
+            }
+        }
+        power_level++;
+        powerv = power_cache_get_power(base, power_level, NULL);
+        tds = vds;
+        vds = uds;
+        uds = tds;
     }
+    BARY_TRUNC(uds, num_bdigits);
+    z = bignew(num_bdigits, sign);
+    MEMCPY(BDIGITS(z), uds, BDIGIT, num_bdigits);
 
-    return bignorm(big);
+    if (tmpuv)
+        ALLOCV_END(tmpuv);
+
+    return z;
 }
 
+#ifdef USE_GMP
+static VALUE
+str2big_gmp(
+    int sign,
+    const char *digits_start,
+    const char *digits_end,
+    size_t num_digits,
+    size_t num_bdigits,
+    int base)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    char *buf, *p;
+    const char *q;
+    VALUE tmps;
+    mpz_t mz;
+    VALUE z;
+    BDIGIT *zds;
+    size_t zn, count;
+
+    buf = ALLOCV_N(char, tmps, num_digits+1);
+    p = buf;
+    for (q = digits_start; q < digits_end; q++) {
+        if (conv_digit(*q) < 0)
+            continue;
+        *p++ = *q;
+    }
+    *p = '\0';
+
+    mpz_init(mz);
+    mpz_set_str(mz, buf, base);
+    zn = num_bdigits;
+    z = bignew(zn, sign);
+    zds = BDIGITS(z);
+    mpz_export(BDIGITS(z), &count, -1, sizeof(BDIGIT), 0, nails, mz);
+    BDIGITS_ZERO(zds+count, zn-count);
+    mpz_clear(mz);
+
+    if (tmps)
+        ALLOCV_END(tmps);
+
+    return z;
+}
 #endif
 
+/*
+ * Parse +str+ as Ruby Integer, i.e., underscores, 0d and 0b prefixes.
+ *
+ * str:      pointer to the string to be parsed.
+ *	     should be NUL-terminated.
+ * base:     base of conversion, must be 2..36, or -36..0.
+ *           if +base+ > 0, the conversion is done according to the +base+
+ *           and unmatched prefix is parsed as a part of the result if
+ *           present.
+ *           if +base+ <= 0, the conversion is done according to the
+ *           prefix if present, in base <code>-base</code> if +base+ < -1,
+ *           or in base 10.
+ * badcheck: if non-zero, +ArgumentError+ is raised when +str+ is not
+ *           valid as an Integer.  if zero, Fixnum 0 is returned in
+ *           that case.
+ */
 VALUE
 rb_cstr_to_inum(const char *str, int base, int badcheck)
 {
-    const char *s = str;
     char *end;
-    char sign = 1, nondigit = 0;
+    VALUE ret = rb_cstr_parse_inum(str, -1, (badcheck ? NULL : &end), base);
+    if (NIL_P(ret)) {
+	if (badcheck) rb_invalid_str(str, "Integer()");
+	ret = INT2FIX(0);
+    }
+    return ret;
+}
+
+/*
+ * Parse +str+ as Ruby Integer, i.e., underscores, 0d and 0b prefixes.
+ *
+ * str:  pointer to the string to be parsed.
+ *       should be NUL-terminated if +len+ is negative.
+ * len:  length of +str+ if >= 0.  if +len+ is negative, +str+ should
+ *       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.
+ * base: see +rb_cstr_to_inum+
+ */
+
+VALUE
+rb_cstr_parse_inum(const char *str, ssize_t len, char **endp, int base)
+{
+    const char *const s = str;
+    char sign = 1;
     int c;
-    BDIGIT_DBL num;
-    long len, blen = 1;
-    long i;
     VALUE z;
-    BDIGIT *zds;
 
-#undef ISDIGIT
-#define ISDIGIT(c) ('0' <= (c) && (c) <= '9')
-#define conv_digit(c) \
-    (!ISASCII(c) ? -1 : \
-     ISDIGIT(c) ? ((c) - '0') : \
-     ISLOWER(c) ? ((c) - 'a' + 10) : \
-     ISUPPER(c) ? ((c) - 'A' + 10) : \
-     -1)
+    unsigned long val;
+    int ov;
+
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    size_t num_bdigits;
+    const ssize_t len0 = len;
+    const int badcheck = !endp;
+
+#define ADV(n) do {\
+	if (len > 0 && len <= (n)) goto bad; \
+	str += (n); \
+	len -= (n); \
+    } while (0)
+#define ASSERT_LEN() do {\
+	assert(len != 0); \
+	if (len0 >= 0) assert(s + len0 == str + len); \
+    } while (0)
 
     if (!str) {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
+      bad:
+	if (endp) *endp = (char *)str;
+	return Qnil;
     }
-    while (ISSPACE(*str)) str++;
+    if (len) {
+	while (ISSPACE(*str)) ADV(1);
 
-    if (str[0] == '+') {
-	str++;
-    }
-    else if (str[0] == '-') {
-	str++;
-	sign = 0;
-    }
-    if (str[0] == '+' || str[0] == '-') {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
+	if (str[0] == '+') {
+	    ADV(1);
+	}
+	else if (str[0] == '-') {
+	    ADV(1);
+	    sign = 0;
+	}
+	ASSERT_LEN();
+	if (str[0] == '+' || str[0] == '-') {
+	    goto bad;
+	}
     }
     if (base <= 0) {
-	if (str[0] == '0') {
+	if (str[0] == '0' && len > 1) {
 	    switch (str[1]) {
 	      case 'x': case 'X':
 		base = 16;
+		ADV(2);
 		break;
 	      case 'b': case 'B':
 		base = 2;
+		ADV(2);
 		break;
 	      case 'o': case 'O':
 		base = 8;
+		ADV(2);
 		break;
 	      case 'd': case 'D':
 		base = 10;
+		ADV(2);
 		break;
 	      default:
 		base = 8;
@@ -625,75 +4091,67 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 	    base = 10;
 	}
     }
-    switch (base) {
-      case 2:
-	len = 1;
+    else if (len == 1) {
+	/* no prefix */
+    }
+    else if (base == 2) {
 	if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
-	    str += 2;
+	    ADV(2);
 	}
-	break;
-      case 3:
-	len = 2;
-	break;
-      case 8:
+    }
+    else if (base == 8) {
 	if (str[0] == '0' && (str[1] == 'o'||str[1] == 'O')) {
-	    str += 2;
+	    ADV(2);
 	}
-      case 4: case 5: case 6: case 7:
-	len = 3;
-	break;
-      case 10:
+    }
+    else if (base == 10) {
 	if (str[0] == '0' && (str[1] == 'd'||str[1] == 'D')) {
-	    str += 2;
+	    ADV(2);
 	}
-      case 9: case 11: case 12: case 13: case 14: case 15:
-	len = 4;
-	break;
-      case 16:
-	len = 4;
+    }
+    else if (base == 16) {
 	if (str[0] == '0' && (str[1] == 'x'||str[1] == 'X')) {
-	    str += 2;
-	}
-	break;
-      default:
-	if (base < 2 || 36 < base) {
-	    rb_raise(rb_eArgError, "invalid radix %d", base);
-	}
-	if (base <= 32) {
-	    len = 5;
+	    ADV(2);
 	}
-	else {
-	    len = 6;
-	}
-	break;
     }
-    if (*str == '0') {		/* squeeze preceding 0s */
+    if (!valid_radix_p(base)) {
+        invalid_radix(base);
+    }
+    if (!len) goto bad;
+    if (*str == '0' && len != 1) { /* squeeze preceding 0s */
 	int us = 0;
+	const char *end = len < 0 ? NULL : str + len;
 	while ((c = *++str) == '0' || c == '_') {
 	    if (c == '_') {
 		if (++us >= 2)
 		    break;
-	    } else
+	    }
+	    else {
 		us = 0;
+	    }
+	    if (str == end) break;
 	}
-	if (!(c = *str) || ISSPACE(c)) --str;
+	if (!c || ISSPACE(c)) --str;
+	if (end) len = end - str;
+	ASSERT_LEN();
     }
     c = *str;
     c = conv_digit(c);
     if (c < 0 || c >= base) {
-	if (badcheck) goto bad;
-	return INT2FIX(0);
+	goto bad;
     }
-    len *= strlen(str)*sizeof(char);
-
-    if ((size_t)len <= (sizeof(long)*CHAR_BIT)) {
-	unsigned long val = STRTOUL(str, &end, base);
 
-	if (str < end && *end == '_') goto bigparse;
+    val = ruby_scan_digits(str, len, base, &num_digits, &ov);
+    if (!ov) {
+	const char *end = &str[num_digits];
+	if (num_digits > 0 && *end == '_') goto bigparse;
+	if (endp) *endp = (char *)end;
 	if (badcheck) {
-	    if (end == str) goto bad; /* no number */
-	    while (*end && ISSPACE(*end)) end++;
-	    if (*end) goto bad;	      /* trailing garbage */
+	    if (num_digits == 0) return Qnil; /* no number */
+	    while (len < 0 ? *end : end < str + len) {
+		if (!ISSPACE(*end)) return Qnil; /* trailing garbage */
+		end++;
+	    }
 	}
 
 	if (POSFIXABLE(val)) {
@@ -705,54 +4163,41 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 	}
 	else {
 	    VALUE big = rb_uint2big(val);
-	    RBIGNUM_SET_SIGN(big, sign);
+	    BIGNUM_SET_SIGN(big, sign);
 	    return bignorm(big);
 	}
     }
+
   bigparse:
-    len = (len/BITSPERDIG)+1;
-    if (badcheck && *str == '_') goto bad;
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	goto bad;
+    digits_end = digits_start + len;
 
-    z = bignew(len, sign);
-    zds = BDIGITS(z);
-    for (i=len;i--;) zds[i]=0;
-    while ((c = *str++) != 0) {
-	if (c == '_') {
-	    if (nondigit) {
-		if (badcheck) goto bad;
-		break;
-	    }
-	    nondigit = c;
-	    continue;
-	}
-	else if ((c = conv_digit(c)) < 0) {
-	    break;
-	}
-	if (c >= base) break;
-	nondigit = 0;
-	i = 0;
-	num = c;
-	for (;;) {
-	    while (i<blen) {
-		num += (BDIGIT_DBL)zds[i]*base;
-		zds[i++] = BIGLO(num);
-		num = BIGDN(num);
-	    }
-	    if (num) {
-		blen++;
-		continue;
-	    }
-	    break;
-	}
+    if (POW2_P(base)) {
+        z = str2big_poweroftwo(sign, digits_start, digits_end, num_digits,
+			       bit_length(base-1));
     }
-    if (badcheck) {
-	str--;
-	if (s+1 < str && str[-1] == '_') goto bad;
-	while (*str && ISSPACE(*str)) str++;
-	if (*str) {
-	  bad:
-	    rb_invalid_str(s, "Integer()");
-	}
+    else {
+        int digits_per_bdigits_dbl;
+        maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
+        num_bdigits = roomof(num_digits, digits_per_bdigits_dbl)*2;
+
+#ifdef USE_GMP
+        if (GMP_STR2BIG_DIGITS < num_bdigits) {
+            z = str2big_gmp(sign, digits_start, digits_end, num_digits,
+                    num_bdigits, base);
+        }
+        else
+#endif
+        if (num_bdigits < KARATSUBA_MUL_DIGITS) {
+            z = str2big_normal(sign, digits_start, digits_end,
+                    num_bdigits, base);
+        }
+        else {
+            z = str2big_karatsuba(sign, digits_start, digits_end, num_digits,
+                    num_bdigits, digits_per_bdigits_dbl, base);
+        }
     }
 
     return bignorm(z);
@@ -761,54 +4206,206 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 VALUE
 rb_str_to_inum(VALUE str, int base, int badcheck)
 {
-    char *s;
-    long len;
-    VALUE v = 0;
     VALUE ret;
+    const char *s;
+    long len;
+    char *end;
 
     StringValue(str);
-    if (badcheck) {
-	s = StringValueCStr(str);
+    rb_must_asciicompat(str);
+    RSTRING_GETMEM(str, s, len);
+    ret = rb_cstr_parse_inum(s, len, (badcheck ? NULL : &end), base);
+    if (NIL_P(ret)) {
+	if (badcheck) invalid_integer(str);
+	ret = INT2FIX(0);
     }
-    else {
-	s = RSTRING_PTR(str);
+    return ret;
+}
+
+VALUE
+rb_str2big_poweroftwo(VALUE arg, int base, int badcheck)
+{
+    int positive_p = 1;
+    const char *s, *str;
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    ssize_t len;
+    VALUE z;
+
+    if (!valid_radix_p(base) || !POW2_P(base)) {
+        invalid_radix(base);
     }
-    if (s) {
-	len = RSTRING_LEN(str);
-	if (s[len]) {		/* no sentinel somehow */
-	    char *p = ALLOCV(v, len+1);
 
-	    MEMCPY(p, s, char, len);
-	    p[len] = '\0';
-	    s = p;
-	}
+    rb_must_asciicompat(arg);
+    s = str = StringValueCStr(arg);
+    len = RSTRING_LEN(arg);
+    if (*str == '-') {
+	len--;
+        str++;
+        positive_p = 0;
     }
-    ret = rb_cstr_to_inum(s, base, badcheck);
-    if (v)
-	ALLOCV_END(v);
-    return ret;
+
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	invalid_integer(arg);
+    digits_end = digits_start + len;
+
+    z = str2big_poweroftwo(positive_p, digits_start, digits_end, num_digits,
+            bit_length(base-1));
+
+    RB_GC_GUARD(arg);
+
+    return bignorm(z);
+}
+
+VALUE
+rb_str2big_normal(VALUE arg, int base, int badcheck)
+{
+    int positive_p = 1;
+    const char *s, *str;
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    ssize_t len;
+    VALUE z;
+
+    int digits_per_bdigits_dbl;
+    size_t num_bdigits;
+
+    if (!valid_radix_p(base)) {
+        invalid_radix(base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValuePtr(arg);
+    len = RSTRING_LEN(arg);
+    if (len > 0 && *str == '-') {
+	len--;
+        str++;
+        positive_p = 0;
+    }
+
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	invalid_integer(arg);
+    digits_end = digits_start + len;
+
+    maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
+    num_bdigits = roomof(num_digits, digits_per_bdigits_dbl)*2;
+
+    z = str2big_normal(positive_p, digits_start, digits_end,
+            num_bdigits, base);
+
+    RB_GC_GUARD(arg);
+
+    return bignorm(z);
+}
+
+VALUE
+rb_str2big_karatsuba(VALUE arg, int base, int badcheck)
+{
+    int positive_p = 1;
+    const char *s, *str;
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    ssize_t len;
+    VALUE z;
+
+    int digits_per_bdigits_dbl;
+    size_t num_bdigits;
+
+    if (!valid_radix_p(base)) {
+        invalid_radix(base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValuePtr(arg);
+    len = RSTRING_LEN(arg);
+    if (len > 0 && *str == '-') {
+	len--;
+        str++;
+        positive_p = 0;
+    }
+
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	invalid_integer(arg);
+    digits_end = digits_start + len;
+
+    maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
+    num_bdigits = roomof(num_digits, digits_per_bdigits_dbl)*2;
+
+    z = str2big_karatsuba(positive_p, digits_start, digits_end, num_digits,
+            num_bdigits, digits_per_bdigits_dbl, base);
+
+    RB_GC_GUARD(arg);
+
+    return bignorm(z);
+}
+
+#ifdef USE_GMP
+VALUE
+rb_str2big_gmp(VALUE arg, int base, int badcheck)
+{
+    int positive_p = 1;
+    const char *s, *str;
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    ssize_t len;
+    VALUE z;
+
+    int digits_per_bdigits_dbl;
+    size_t num_bdigits;
+
+    if (!valid_radix_p(base)) {
+        invalid_radix(base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValuePtr(arg);
+    len = RSTRING_LEN(arg);
+    if (len > 0 && *str == '-') {
+	len--;
+        str++;
+        positive_p = 0;
+    }
+
+    digits_start = str;
+    if (!str2big_scan_digits(s, str, base, badcheck, &num_digits, &len))
+	invalid_integer(arg);
+    digits_end = digits_start + len;
+
+    maxpow_in_bdigit_dbl(base, &digits_per_bdigits_dbl);
+    num_bdigits = roomof(num_digits, digits_per_bdigits_dbl)*2;
+
+    z = str2big_gmp(positive_p, digits_start, digits_end, num_digits, num_bdigits, base);
+
+    RB_GC_GUARD(arg);
+
+    return bignorm(z);
 }
+#endif
 
 #if HAVE_LONG_LONG
 
 static VALUE
 rb_ull2big(unsigned LONG_LONG n)
 {
-    BDIGIT_DBL num = n;
-    long i = 0;
-    BDIGIT *digits;
-    VALUE big;
+    long i;
+    VALUE big = bignew(bdigit_roomof(SIZEOF_LONG_LONG), 1);
+    BDIGIT *digits = BDIGITS(big);
 
-    big = bignew(DIGSPERLL, 1);
-    digits = BDIGITS(big);
-    while (i < DIGSPERLL) {
-	digits[i++] = BIGLO(num);
-	num = BIGDN(num);
+#if SIZEOF_BDIGIT >= SIZEOF_LONG_LONG
+    digits[0] = n;
+#else
+    for (i = 0; i < bdigit_roomof(SIZEOF_LONG_LONG); i++) {
+	digits[i] = BIGLO(n);
+	n = BIGDN(n);
     }
+#endif
 
-    i = DIGSPERLL;
+    i = bdigit_roomof(SIZEOF_LONG_LONG);
     while (i-- && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
+    BIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
@@ -816,15 +4413,19 @@ static VALUE
 rb_ll2big(LONG_LONG n)
 {
     long neg = 0;
+    unsigned LONG_LONG u;
     VALUE big;
 
     if (n < 0) {
-	n = -n;
+        u = 1 + (unsigned LONG_LONG)(-(n + 1)); /* u = -n avoiding overflow */
 	neg = 1;
     }
-    big = rb_ull2big(n);
+    else {
+        u = n;
+    }
+    big = rb_ull2big(u);
     if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+	BIGNUM_SET_NEGATIVE_SIGN(big);
     }
     return big;
 }
@@ -845,6 +4446,46 @@ rb_ll2inum(LONG_LONG n)
 
 #endif  /* HAVE_LONG_LONG */
 
+#ifdef HAVE_INT128_T
+static VALUE
+rb_uint128t2big(uint128_t n)
+{
+    long i;
+    VALUE big = bignew(bdigit_roomof(SIZEOF_INT128_T), 1);
+    BDIGIT *digits = BDIGITS(big);
+
+    for (i = 0; i < bdigit_roomof(SIZEOF_INT128_T); i++) {
+	digits[i] = BIGLO(RSHIFT(n ,BITSPERDIG*i));
+    }
+
+    i = bdigit_roomof(SIZEOF_INT128_T);
+    while (i-- && !digits[i]) ;
+    BIGNUM_SET_LEN(big, i+1);
+    return big;
+}
+
+VALUE
+rb_int128t2big(int128_t n)
+{
+    int neg = 0;
+    uint128_t u;
+    VALUE big;
+
+    if (n < 0) {
+        u = 1 + (uint128_t)(-(n + 1)); /* u = -n avoiding overflow */
+	neg = 1;
+    }
+    else {
+        u = n;
+    }
+    big = rb_uint128t2big(u);
+    if (neg) {
+	BIGNUM_SET_NEGATIVE_SIGN(big);
+    }
+    return big;
+}
+#endif
+
 VALUE
 rb_cstr2inum(const char *str, int base)
 {
@@ -857,378 +4498,607 @@ rb_str2inum(VALUE str, int base)
     return rb_str_to_inum(str, base, base==0);
 }
 
-const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-
-static VALUE bigsqr(VALUE x);
-static void bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp);
-
-#define POW2_P(x) (((x)&((x)-1))==0)
-
-static inline int
-ones(register unsigned long x)
+static VALUE
+big_shift3(VALUE x, int lshift_p, size_t shift_numdigits, int shift_numbits)
 {
-#if SIZEOF_LONG == 8
-# define MASK_55 0x5555555555555555UL
-# define MASK_33 0x3333333333333333UL
-# define MASK_0f 0x0f0f0f0f0f0f0f0fUL
-#else
-# define MASK_55 0x55555555UL
-# define MASK_33 0x33333333UL
-# define MASK_0f 0x0f0f0f0fUL
-#endif
-    x -= (x >> 1) & MASK_55;
-    x = ((x >> 2) & MASK_33) + (x & MASK_33);
-    x = ((x >> 4) + x) & MASK_0f;
-    x += (x >> 8);
-    x += (x >> 16);
-#if SIZEOF_LONG == 8
-    x += (x >> 32);
-#endif
-    return (int)(x & 0x7f);
-#undef MASK_0f
-#undef MASK_33
-#undef MASK_55
+    BDIGIT *xds, *zds;
+    long s1;
+    int s2;
+    VALUE z;
+    long xn;
+
+    if (lshift_p) {
+        if (LONG_MAX < shift_numdigits) {
+            rb_raise(rb_eArgError, "too big number");
+        }
+        s1 = shift_numdigits;
+        s2 = shift_numbits;
+        xn = BIGNUM_LEN(x);
+        z = bignew(xn+s1+1, BIGNUM_SIGN(x));
+        zds = BDIGITS(z);
+        BDIGITS_ZERO(zds, s1);
+        xds = BDIGITS(x);
+        zds[xn+s1] = bary_small_lshift(zds+s1, xds, xn, s2);
+    }
+    else {
+        long zn;
+        BDIGIT hibitsx;
+        if (LONG_MAX < shift_numdigits || (size_t)BIGNUM_LEN(x) <= shift_numdigits) {
+            if (BIGNUM_POSITIVE_P(x) ||
+                bary_zero_p(BDIGITS(x), BIGNUM_LEN(x)))
+                return INT2FIX(0);
+            else
+                return INT2FIX(-1);
+        }
+        s1 = shift_numdigits;
+        s2 = shift_numbits;
+        hibitsx = abs2twocomp(&x, &xn);
+        xds = BDIGITS(x);
+        if (xn <= s1) {
+            return hibitsx ? INT2FIX(-1) : INT2FIX(0);
+        }
+        zn = xn - s1;
+        z = bignew(zn, 0);
+        zds = BDIGITS(z);
+        bary_small_rshift(zds, xds+s1, zn, s2, hibitsx != 0 ? BDIGMAX : 0);
+        twocomp2abs_bang(z, hibitsx != 0);
+    }
+    RB_GC_GUARD(x);
+    return z;
 }
 
-static inline unsigned long
-next_pow2(register unsigned long x)
+static VALUE
+big_shift2(VALUE x, int lshift_p, VALUE y)
 {
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    x |= x >> 8;
-    x |= x >> 16;
-#if SIZEOF_LONG == 8
-    x |= x >> 32;
-#endif
-    return x + 1;
+    int sign;
+    size_t lens[2];
+    size_t shift_numdigits;
+    int shift_numbits;
+
+    assert(POW2_P(CHAR_BIT));
+    assert(POW2_P(BITSPERDIG));
+
+    if (BIGZEROP(x))
+        return INT2FIX(0);
+    sign = rb_integer_pack(y, lens, numberof(lens), sizeof(size_t), 0,
+        INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER);
+    if (sign < 0) {
+        lshift_p = !lshift_p;
+        sign = -sign;
+    }
+    if (lshift_p) {
+        if (1 < sign || CHAR_BIT <= lens[1])
+            rb_raise(rb_eRangeError, "shift width too big");
+    }
+    else {
+        if (1 < sign || CHAR_BIT <= lens[1])
+            return BIGNUM_POSITIVE_P(x) ? INT2FIX(0) : INT2FIX(-1);
+    }
+    shift_numbits = (int)(lens[0] & (BITSPERDIG-1));
+    shift_numdigits = (lens[0] >> bit_length(BITSPERDIG-1)) |
+      (lens[1] << (CHAR_BIT*SIZEOF_SIZE_T - bit_length(BITSPERDIG-1)));
+    return big_shift3(x, lshift_p, shift_numdigits, shift_numbits);
 }
 
-static inline int
-floor_log2(register unsigned long x)
+static VALUE
+big_lshift(VALUE x, unsigned long shift)
 {
-    x |= x >> 1;
-    x |= x >> 2;
-    x |= x >> 4;
-    x |= x >> 8;
-    x |= x >> 16;
-#if SIZEOF_LONG == 8
-    x |= x >> 32;
-#endif
-    return (int)ones(x) - 1;
+    long s1 = shift/BITSPERDIG;
+    int s2 = (int)(shift%BITSPERDIG);
+    return big_shift3(x, 1, s1, s2);
 }
 
-static inline int
-ceil_log2(register unsigned long x)
+static VALUE
+big_rshift(VALUE x, unsigned long shift)
 {
-    return floor_log2(x) + !POW2_P(x);
+    long s1 = shift/BITSPERDIG;
+    int s2 = (int)(shift%BITSPERDIG);
+    return big_shift3(x, 0, s1, s2);
 }
 
-#define LOG2_KARATSUBA_DIGITS 7
-#define KARATSUBA_DIGITS (1L<<LOG2_KARATSUBA_DIGITS)
-#define MAX_BIG2STR_TABLE_ENTRIES 64
+#define MAX_BASE36_POWER_TABLE_ENTRIES (SIZEOF_SIZE_T * CHAR_BIT + 1)
 
-static VALUE big2str_power_cache[35][MAX_BIG2STR_TABLE_ENTRIES];
+static VALUE base36_power_cache[35][MAX_BASE36_POWER_TABLE_ENTRIES];
+static size_t base36_numdigits_cache[35][MAX_BASE36_POWER_TABLE_ENTRIES];
 
 static void
 power_cache_init(void)
 {
     int i, j;
     for (i = 0; i < 35; ++i) {
-	for (j = 0; j < MAX_BIG2STR_TABLE_ENTRIES; ++j) {
-	    big2str_power_cache[i][j] = Qnil;
+	for (j = 0; j < MAX_BASE36_POWER_TABLE_ENTRIES; ++j) {
+	    base36_power_cache[i][j] = Qnil;
 	}
     }
 }
 
 static inline VALUE
-power_cache_get_power0(int base, int i)
+power_cache_get_power(int base, int power_level, size_t *numdigits_ret)
+{
+    /*
+     * MAX_BASE36_POWER_TABLE_ENTRIES is big enough to that
+     * base36_power_cache[base][MAX_BASE36_POWER_TABLE_ENTRIES-1] fills whole memory.
+     * So MAX_BASE36_POWER_TABLE_ENTRIES <= power_level is not possible to calculate.
+     *
+     * number-of-bytes =
+     * log256(base36_power_cache[base][MAX_BASE36_POWER_TABLE_ENTRIES-1]) =
+     * log256(maxpow_in_bdigit_dbl(base)**(2**(MAX_BASE36_POWER_TABLE_ENTRIES-1))) =
+     * log256(maxpow_in_bdigit_dbl(base)**(2**(SIZEOF_SIZE_T*CHAR_BIT))) =
+     * (2**(SIZEOF_SIZE_T*CHAR_BIT))*log256(maxpow_in_bdigit_dbl(base)) =
+     * (256**SIZEOF_SIZE_T)*log256(maxpow_in_bdigit_dbl(base)) >
+     * (256**SIZEOF_SIZE_T)*(sizeof(BDIGIT_DBL)-1) >
+     * 256**SIZEOF_SIZE_T
+     */
+    if (MAX_BASE36_POWER_TABLE_ENTRIES <= power_level)
+        rb_bug("too big power number requested: maxpow_in_bdigit_dbl(%d)**(2**%d)", base, power_level);
+
+    if (NIL_P(base36_power_cache[base - 2][power_level])) {
+        VALUE power;
+        size_t numdigits;
+        if (power_level == 0) {
+            int numdigits0;
+            BDIGIT_DBL dd = maxpow_in_bdigit_dbl(base, &numdigits0);
+            power = bignew(2, 1);
+            bdigitdbl2bary(BDIGITS(power), 2, dd);
+            numdigits = numdigits0;
+        }
+        else {
+            power = bigtrunc(bigsq(power_cache_get_power(base, power_level - 1, &numdigits)));
+            numdigits *= 2;
+        }
+        rb_obj_hide(power);
+        base36_power_cache[base - 2][power_level] = power;
+        base36_numdigits_cache[base - 2][power_level] = numdigits;
+	rb_gc_register_mark_object(power);
+    }
+    if (numdigits_ret)
+        *numdigits_ret = base36_numdigits_cache[base - 2][power_level];
+    return base36_power_cache[base - 2][power_level];
+}
+
+struct big2str_struct {
+    int negative;
+    int base;
+    BDIGIT_DBL hbase2;
+    int hbase2_numdigits;
+    VALUE result;
+    char *ptr;
+};
+
+static void
+big2str_alloc(struct big2str_struct *b2s, size_t len)
+{
+    if (LONG_MAX-1 < len)
+        rb_raise(rb_eArgError, "too big number");
+    b2s->result = rb_usascii_str_new(0, (long)(len + 1)); /* plus one for sign */
+    b2s->ptr = RSTRING_PTR(b2s->result);
+    if (b2s->negative)
+        *b2s->ptr++ = '-';
+}
+
+static void
+big2str_2bdigits(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t taillen)
 {
-    if (NIL_P(big2str_power_cache[base - 2][i])) {
-	big2str_power_cache[base - 2][i] =
-	    i == 0 ? rb_big_pow(rb_int2big(base), INT2FIX(KARATSUBA_DIGITS))
-		   : bigsqr(power_cache_get_power0(base, i - 1));
-	rb_gc_register_mark_object(big2str_power_cache[base - 2][i]);
+    size_t j;
+    BDIGIT_DBL num;
+    char buf[SIZEOF_BDIGIT_DBL*CHAR_BIT], *p;
+    int beginning = !b2s->ptr;
+    size_t len = 0;
+
+    assert(xn <= 2);
+    num = bary2bdigitdbl(xds, xn);
+
+    if (beginning) {
+        if (num == 0)
+            return;
+        p = buf;
+        j = sizeof(buf);
+        do {
+            BDIGIT_DBL idx = num % b2s->base;
+            num /= b2s->base;
+            p[--j] = ruby_digitmap[idx];
+        } while (num);
+        len = sizeof(buf) - j;
+        big2str_alloc(b2s, len + taillen);
+	MEMCPY(b2s->ptr, buf + j, char, len);
     }
-    return big2str_power_cache[base - 2][i];
+    else {
+        p = b2s->ptr;
+        j = b2s->hbase2_numdigits;
+        do {
+            BDIGIT_DBL idx = num % b2s->base;
+            num /= b2s->base;
+            p[--j] = ruby_digitmap[idx];
+        } while (j);
+        len = b2s->hbase2_numdigits;
+    }
+    b2s->ptr += len;
 }
 
-static VALUE
-power_cache_get_power(int base, long n1, long* m1)
+static void
+big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
+		  int power_level, size_t taillen)
 {
-    int i, m;
-    long j;
-    VALUE t;
+    VALUE b;
+    size_t half_numdigits, lower_numdigits;
+    int lower_power_level;
+    size_t bn;
+    const BDIGIT *bds;
+    size_t len;
 
-    if (n1 <= KARATSUBA_DIGITS)
-	rb_bug("n1 > KARATSUBA_DIGITS");
+    /*
+     * Precondition:
+     * abs(x) < maxpow**(2**power_level)
+     * where
+     *   maxpow = maxpow_in_bdigit_dbl(base, &numdigits)
+     *
+     * This function generates sequence of zeros, and then stringized abs(x) into b2s->ptr.
+     *
+     * b2s->ptr can be NULL.
+     * It is allocated when the first character is generated via big2str_alloc.
+     *
+     * The prefix zeros should be generated if and only if b2s->ptr is not NULL.
+     * When the zeros are generated, the zeros and abs(x) consists
+     * numdigits*(2**power_level) characters at total.
+     *
+     * Note:
+     * power_cache_get_power(base, power_level, &len) may not be cached yet. It should not be called.
+     * power_cache_get_power(base, power_level-1, &len) should be cached already if 0 <= power_level-1.
+     */
 
-    m = ceil_log2(n1);
-    if (m1) *m1 = 1 << m;
-    i = m - LOG2_KARATSUBA_DIGITS;
-    if (i >= MAX_BIG2STR_TABLE_ENTRIES)
-	i = MAX_BIG2STR_TABLE_ENTRIES - 1;
-    t = power_cache_get_power0(base, i);
+    if (xn == 0 || bary_zero_p(xds, xn)) {
+	if (b2s->ptr) {
+            /* When x is zero, power_cache_get_power(base, power_level) should be cached already. */
+            power_cache_get_power(b2s->base, power_level, &len);
+	    memset(b2s->ptr, '0', len);
+            b2s->ptr += len;
+	}
+        return;
+    }
 
-    j = KARATSUBA_DIGITS*(1 << i);
-    while (n1 > j) {
-	t = bigsqr(t);
-	j *= 2;
+    if (power_level == 0) {
+	big2str_2bdigits(b2s, xds, xn, taillen);
+        return;
     }
-    return t;
-}
 
-/* big2str_muraken_find_n1
- *
- * Let a natural number x is given by:
- * x = 2^0 * x_0 + 2^1 * x_1 + ... + 2^(B*n_0 - 1) * x_{B*n_0 - 1},
- * where B is BITSPERDIG (i.e. BDIGITS*CHAR_BIT) and n_0 is
- * RBIGNUM_LEN(x).
- *
- * Now, we assume n_1 = min_n \{ n | 2^(B*n_0/2) <= b_1^(n_1) \}, so
- * it is realized that 2^(B*n_0) <= {b_1}^{2*n_1}, where b_1 is a
- * given radix number. And then, we have n_1 <= (B*n_0) /
- * (2*log_2(b_1)), therefore n_1 is given by ceil((B*n_0) /
- * (2*log_2(b_1))).
- */
-static long
-big2str_find_n1(VALUE x, int base)
-{
-    static const double log_2[] = {
-	1.0,              1.58496250072116, 2.0,
-	2.32192809488736, 2.58496250072116, 2.8073549220576,
-	3.0,              3.16992500144231, 3.32192809488736,
-	3.4594316186373,  3.58496250072116, 3.70043971814109,
-	3.8073549220576,  3.90689059560852, 4.0,
-	4.08746284125034, 4.16992500144231, 4.24792751344359,
-	4.32192809488736, 4.39231742277876, 4.4594316186373,
-	4.52356195605701, 4.58496250072116, 4.64385618977472,
-	4.70043971814109, 4.75488750216347, 4.8073549220576,
-	4.85798099512757, 4.90689059560852, 4.95419631038688,
-	5.0,              5.04439411935845, 5.08746284125034,
-	5.12928301694497, 5.16992500144231
-    };
-    long bits;
-
-    if (base < 2 || 36 < base)
-	rb_bug("invalid radix %d", base);
+    lower_power_level = power_level-1;
+    b = power_cache_get_power(b2s->base, lower_power_level, &lower_numdigits);
+    bn = BIGNUM_LEN(b);
+    bds = BDIGITS(b);
 
-    if (FIXNUM_P(x)) {
-	bits = (SIZEOF_LONG*CHAR_BIT - 1)/2 + 1;
+    half_numdigits = lower_numdigits;
+
+    while (0 < lower_power_level &&
+            (xn < bn ||
+             (xn == bn && bary_cmp(xds, xn, bds, bn) < 0))) {
+        lower_power_level--;
+        b = power_cache_get_power(b2s->base, lower_power_level, &lower_numdigits);
+        bn = BIGNUM_LEN(b);
+        bds = BDIGITS(b);
+    }
+
+    if (lower_power_level == 0 &&
+            (xn < bn ||
+             (xn == bn && bary_cmp(xds, xn, bds, bn) < 0))) {
+        if (b2s->ptr) {
+            len = half_numdigits * 2 - lower_numdigits;
+            memset(b2s->ptr, '0', len);
+            b2s->ptr += len;
+        }
+	big2str_2bdigits(b2s, xds, xn, taillen);
     }
-    else if (BIGZEROP(x)) {
-	return 0;
+    else {
+        BDIGIT *qds, *rds;
+        size_t qn, rn;
+        BDIGIT *tds;
+        int shift;
+
+        if (lower_power_level != power_level-1 && b2s->ptr) {
+            len = (half_numdigits - lower_numdigits) * 2;
+            memset(b2s->ptr, '0', len);
+            b2s->ptr += len;
+        }
+
+        shift = nlz(bds[bn-1]);
+
+        qn = xn + BIGDIVREM_EXTRA_WORDS;
+
+        if (shift == 0) {
+            /* bigdivrem_restoring will not modify y.
+             * So use bds directly.  */
+            tds = (BDIGIT *)bds;
+            xds[xn] = 0;
+        }
+        else {
+            /* bigdivrem_restoring will modify y.
+             * So use temporary buffer.  */
+            tds = xds + qn;
+            assert(qn + bn <= xn + wn);
+            bary_small_lshift(tds, bds, bn, shift);
+            xds[xn] = bary_small_lshift(xds, xds, xn, shift);
+        }
+
+        bigdivrem_restoring(xds, qn, tds, bn);
+
+        rds = xds;
+        rn = bn;
+
+        qds = xds + bn;
+        qn = qn - bn;
+
+        if (shift) {
+            bary_small_rshift(rds, rds, rn, shift, 0);
+        }
+
+        BARY_TRUNC(qds, qn);
+        assert(qn <= bn);
+        big2str_karatsuba(b2s, qds, qn, xn+wn - (rn+qn), lower_power_level, lower_numdigits+taillen);
+        BARY_TRUNC(rds, rn);
+        big2str_karatsuba(b2s, rds, rn, xn+wn - rn, lower_power_level, taillen);
     }
-    else if (RBIGNUM_LEN(x) >= LONG_MAX/BITSPERDIG) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
+}
+
+static VALUE
+big2str_base_poweroftwo(VALUE x, int base)
+{
+    int word_numbits = ffs(base) - 1;
+    size_t numwords;
+    VALUE result;
+    char *ptr;
+    numwords = rb_absint_numwords(x, word_numbits, NULL);
+    if (BIGNUM_NEGATIVE_P(x)) {
+        if (LONG_MAX-1 < numwords)
+            rb_raise(rb_eArgError, "too big number");
+        result = rb_usascii_str_new(0, 1+numwords);
+        ptr = RSTRING_PTR(result);
+        *ptr++ = BIGNUM_POSITIVE_P(x) ? '+' : '-';
     }
     else {
-	bits = BITSPERDIG*RBIGNUM_LEN(x);
+        if (LONG_MAX < numwords)
+            rb_raise(rb_eArgError, "too big number");
+        result = rb_usascii_str_new(0, numwords);
+        ptr = RSTRING_PTR(result);
+    }
+    rb_integer_pack(x, ptr, numwords, 1, CHAR_BIT-word_numbits,
+                    INTEGER_PACK_BIG_ENDIAN);
+    while (0 < numwords) {
+        *ptr = ruby_digitmap[*(unsigned char *)ptr];
+        ptr++;
+        numwords--;
     }
+    return result;
+}
 
-    return (long)ceil(bits/log_2[base - 2]);
+VALUE
+rb_big2str_poweroftwo(VALUE x, int base)
+{
+    return big2str_base_poweroftwo(x, base);
 }
 
-static long
-big2str_orig(VALUE x, int base, char* ptr, long len, long hbase, int trim)
+static VALUE
+big2str_generic(VALUE x, int base)
 {
-    long i = RBIGNUM_LEN(x), j = len;
-    BDIGIT* ds = BDIGITS(x);
+    BDIGIT *xds;
+    size_t xn;
+    struct big2str_struct b2s_data;
+    int power_level;
+    VALUE power;
 
-    while (i && j > 0) {
-	long k = i;
-	BDIGIT_DBL num = 0;
+    xds = BDIGITS(x);
+    xn = BIGNUM_LEN(x);
+    BARY_TRUNC(xds, xn);
 
-	while (k--) {               /* x / hbase */
-	    num = BIGUP(num) + ds[k];
-	    ds[k] = (BDIGIT)(num / hbase);
-	    num %= hbase;
-	}
-	if (trim && ds[i-1] == 0) i--;
-	k = SIZEOF_BDIGITS;
-	while (k--) {
-	    ptr[--j] = ruby_digitmap[num % base];
-	    num /= base;
-	    if (j <= 0) break;
-	    if (trim && i == 0 && num == 0) break;
-	}
+    if (xn == 0) {
+	return rb_usascii_str_new2("0");
     }
-    if (trim) {
-	while (j < len && ptr[j] == '0') j++;
-	MEMMOVE(ptr, ptr + j, char, len - j);
-	len -= j;
+
+    if (!valid_radix_p(base))
+	invalid_radix(base);
+
+    if (xn >= LONG_MAX/BITSPERDIG) {
+        rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
     }
-    return len;
-}
 
-static long
-big2str_karatsuba(VALUE x, int base, char* ptr,
-		  long n1, long len, long hbase, int trim)
-{
-    long lh, ll, m1;
-    VALUE b, q, r;
+    power_level = 0;
+    power = power_cache_get_power(base, power_level, NULL);
+    while (power_level < MAX_BASE36_POWER_TABLE_ENTRIES &&
+           (size_t)BIGNUM_LEN(power) <= (xn+1)/2) {
+        power_level++;
+        power = power_cache_get_power(base, power_level, NULL);
+    }
+    assert(power_level != MAX_BASE36_POWER_TABLE_ENTRIES);
 
-    if (BIGZEROP(x)) {
-	if (trim) return 0;
-	else {
-	    memset(ptr, '0', len);
-	    return len;
-	}
+    if ((size_t)BIGNUM_LEN(power) <= xn) {
+        /*
+         * This increment guarantees x < power_cache_get_power(base, power_level)
+         * without invoking it actually.
+         * (power_cache_get_power(base, power_level) can be slow and not used
+         * in big2str_karatsuba.)
+         *
+         * Although it is possible that x < power_cache_get_power(base, power_level-1),
+         * it is no problem because big2str_karatsuba checks it and
+         * doesn't affect the result when b2s_data.ptr is NULL.
+         */
+        power_level++;
     }
 
-    if (n1 <= KARATSUBA_DIGITS) {
-	return big2str_orig(x, base, ptr, len, hbase, trim);
+    b2s_data.negative = BIGNUM_NEGATIVE_P(x);
+    b2s_data.base = base;
+    b2s_data.hbase2 = maxpow_in_bdigit_dbl(base, &b2s_data.hbase2_numdigits);
+
+    b2s_data.result = Qnil;
+    b2s_data.ptr = NULL;
+
+    if (power_level == 0) {
+	big2str_2bdigits(&b2s_data, xds, xn, 0);
     }
+    else {
+        VALUE tmpw = 0;
+        BDIGIT *wds;
+        size_t wn;
+        wn = power_level * BIGDIVREM_EXTRA_WORDS + BIGNUM_LEN(power);
+        wds = ALLOCV_N(BDIGIT, tmpw, xn + wn);
+        MEMCPY(wds, xds, BDIGIT, xn);
+	big2str_karatsuba(&b2s_data, wds, xn, wn, power_level, 0);
+        if (tmpw)
+            ALLOCV_END(tmpw);
+    }
+    RB_GC_GUARD(x);
 
-    b = power_cache_get_power(base, n1, &m1);
-    bigdivmod(x, b, &q, &r);
-    lh = big2str_karatsuba(q, base, ptr, (len - m1)/2,
-			   len - m1, hbase, trim);
-    rb_big_resize(q, 0);
-    ll = big2str_karatsuba(r, base, ptr + lh, m1/2,
-			   m1, hbase, !lh && trim);
-    rb_big_resize(r, 0);
+    *b2s_data.ptr = '\0';
+    rb_str_resize(b2s_data.result, (long)(b2s_data.ptr - RSTRING_PTR(b2s_data.result)));
 
-    return lh + ll;
+    RB_GC_GUARD(x);
+    return b2s_data.result;
 }
 
 VALUE
-rb_big2str0(VALUE x, int base, int trim)
+rb_big2str_generic(VALUE x, int base)
 {
-    int off;
-    VALUE ss, xx;
-    long n1, n2, len, hbase;
-    char* ptr;
+    return big2str_generic(x, base);
+}
 
-    if (FIXNUM_P(x)) {
-	return rb_fix2str(x, base);
-    }
-    if (BIGZEROP(x)) {
-	return rb_usascii_str_new2("0");
-    }
+#ifdef USE_GMP
+static VALUE
+big2str_gmp(VALUE x, int base)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
+    mpz_t mx;
+    size_t size;
+    VALUE str;
+    BDIGIT *xds = BDIGITS(x);
+    size_t xn = BIGNUM_LEN(x);
 
-    if (base < 2 || 36 < base)
-	rb_raise(rb_eArgError, "invalid radix %d", base);
+    mpz_init(mx);
+    mpz_import(mx, xn, -1, sizeof(BDIGIT), 0, nails, xds);
 
-    n2 = big2str_find_n1(x, base);
-    n1 = (n2 + 1) / 2;
-    ss = rb_usascii_str_new(0, n2 + 1); /* plus one for sign */
-    ptr = RSTRING_PTR(ss);
-    ptr[0] = RBIGNUM_SIGN(x) ? '+' : '-';
+    size = mpz_sizeinbase(mx, base);
 
-    hbase = base*base;
-#if SIZEOF_BDIGITS > 2
-    hbase *= hbase;
-#endif
-    off = !(trim && RBIGNUM_SIGN(x)); /* erase plus sign if trim */
-    xx = rb_big_clone(x);
-    RBIGNUM_SET_SIGN(xx, 1);
-    if (n1 <= KARATSUBA_DIGITS) {
-	len = off + big2str_orig(xx, base, ptr + off, n2, hbase, trim);
+    if (BIGNUM_NEGATIVE_P(x)) {
+        mpz_neg(mx, mx);
+        str = rb_usascii_str_new(0, size+1);
     }
     else {
-	len = off + big2str_karatsuba(xx, base, ptr + off, n1,
-				      n2, hbase, trim);
+        str = rb_usascii_str_new(0, size);
     }
-    rb_big_resize(xx, 0);
+    mpz_get_str(RSTRING_PTR(str), base, mx);
+    mpz_clear(mx);
 
-    ptr[len] = '\0';
-    rb_str_resize(ss, len);
+    if (RSTRING_PTR(str)[RSTRING_LEN(str)-1] == '\0') {
+        rb_str_set_len(str, RSTRING_LEN(str)-1);
+    }
 
-    return ss;
+    RB_GC_GUARD(x);
+    return str;
 }
 
 VALUE
-rb_big2str(VALUE x, int base)
+rb_big2str_gmp(VALUE x, int base)
 {
-    return rb_big2str0(x, base, 1);
+    return big2str_gmp(x, base);
 }
-
-/*
- *  call-seq:
- *     big.to_s(base=10)   ->  string
- *
- *  Returns a string containing the representation of <i>big</i> radix
- *  <i>base</i> (2 through 36).
- *
- *     12345654321.to_s         #=> "12345654321"
- *     12345654321.to_s(2)      #=> "1011011111110110111011110000110001"
- *     12345654321.to_s(8)      #=> "133766736061"
- *     12345654321.to_s(16)     #=> "2dfdbbc31"
- *     78546939656932.to_s(36)  #=> "rubyrules"
- */
+#endif
 
 static VALUE
-rb_big_to_s(int argc, VALUE *argv, VALUE x)
+rb_big2str1(VALUE x, int base)
 {
-    int base;
+    BDIGIT *xds;
+    size_t xn;
 
-    if (argc == 0) base = 10;
-    else {
-	VALUE b;
+    if (FIXNUM_P(x)) {
+	return rb_fix2str(x, base);
+    }
+
+    bigtrunc(x);
+    xds = BDIGITS(x);
+    xn = BIGNUM_LEN(x);
+    BARY_TRUNC(xds, xn);
+
+    if (xn == 0) {
+	return rb_usascii_str_new2("0");
+    }
+
+    if (!valid_radix_p(base))
+	invalid_radix(base);
+
+    if (xn >= LONG_MAX/BITSPERDIG) {
+        rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
+    }
+
+    if (POW2_P(base)) {
+        /* base == 2 || base == 4 || base == 8 || base == 16 || base == 32 */
+        return big2str_base_poweroftwo(x, base);
+    }
 
-	rb_scan_args(argc, argv, "01", &b);
-	base = NUM2INT(b);
+#ifdef USE_GMP
+    if (GMP_BIG2STR_DIGITS < xn) {
+        return big2str_gmp(x, base);
     }
-    return rb_big2str(x, base);
+#endif
+
+    return big2str_generic(x, base);
 }
 
-static VALUE
-big2ulong(VALUE x, const char *type, int check)
+VALUE
+rb_big2str(VALUE x, int base)
 {
-    long len = RBIGNUM_LEN(x);
-    BDIGIT_DBL num;
+    return rb_big2str1(x, base);
+}
+
+static unsigned long
+big2ulong(VALUE x, const char *type)
+{
+    size_t len = BIGNUM_LEN(x);
+    unsigned long num;
     BDIGIT *ds;
 
-    if (len > DIGSPERLONG) {
-	if (check)
-	    rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
-	len = DIGSPERLONG;
+    if (len == 0)
+        return 0;
+    if (BIGSIZE(x) > sizeof(long)) {
+        rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
     }
     ds = BDIGITS(x);
+#if SIZEOF_LONG <= SIZEOF_BDIGIT
+    num = (unsigned long)ds[0];
+#else
     num = 0;
     while (len--) {
-	num = BIGUP(num);
-	num += ds[len];
-    }
-    return (VALUE)num;
-}
-
-VALUE
-rb_big2ulong_pack(VALUE x)
-{
-    VALUE num = big2ulong(x, "unsigned long", FALSE);
-    if (!RBIGNUM_SIGN(x)) {
-	return (VALUE)(-(SIGNED_VALUE)num);
+	num <<= BITSPERDIG;
+	num += (unsigned long)ds[len]; /* overflow is already checked */
     }
+#endif
     return num;
 }
 
-VALUE
+unsigned long
 rb_big2ulong(VALUE x)
 {
-    VALUE num = big2ulong(x, "unsigned long", TRUE);
+    unsigned long num = big2ulong(x, "unsigned long");
 
-    if (!RBIGNUM_SIGN(x)) {
-	if ((long)num < 0) {
-	    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
-	}
-	return (VALUE)(-(SIGNED_VALUE)num);
+    if (BIGNUM_POSITIVE_P(x)) {
+        return num;
     }
-    return num;
+    else {
+        if (num <= 1+(unsigned long)(-(LONG_MIN+1)))
+            return -(long)(num-1)-1;
+    }
+    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
 }
 
-SIGNED_VALUE
+long
 rb_big2long(VALUE x)
 {
-    VALUE num = big2ulong(x, "long", TRUE);
+    unsigned long num = big2ulong(x, "long");
 
-    if ((long)num < 0 &&
-	(RBIGNUM_SIGN(x) || (long)num != LONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
+    if (BIGNUM_POSITIVE_P(x)) {
+        if (num <= LONG_MAX)
+            return num;
     }
-    if (!RBIGNUM_SIGN(x)) return -(SIGNED_VALUE)num;
-    return num;
+    else {
+        if (num <= 1+(unsigned long)(-(LONG_MIN+1)))
+            return -(long)(num-1)-1;
+    }
+    rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
 }
 
 #if HAVE_LONG_LONG
@@ -1236,18 +5106,23 @@ rb_big2long(VALUE x)
 static unsigned LONG_LONG
 big2ull(VALUE x, const char *type)
 {
-    long len = RBIGNUM_LEN(x);
-    BDIGIT_DBL num;
-    BDIGIT *ds;
+    size_t len = BIGNUM_LEN(x);
+    unsigned LONG_LONG num;
+    BDIGIT *ds = BDIGITS(x);
 
-    if (len > SIZEOF_LONG_LONG/SIZEOF_BDIGITS)
+    if (len == 0)
+        return 0;
+    if (BIGSIZE(x) > SIZEOF_LONG_LONG)
 	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
-    ds = BDIGITS(x);
+#if SIZEOF_LONG_LONG <= SIZEOF_BDIGIT
+    num = (unsigned LONG_LONG)ds[0];
+#else
     num = 0;
     while (len--) {
 	num = BIGUP(num);
 	num += ds[len];
     }
+#endif
     return num;
 }
 
@@ -1256,9 +5131,14 @@ rb_big2ull(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "unsigned long long");
 
-    if (!RBIGNUM_SIGN(x))
-	return (VALUE)(-(SIGNED_VALUE)num);
-    return num;
+    if (BIGNUM_POSITIVE_P(x)) {
+        return num;
+    }
+    else {
+        if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return -(LONG_LONG)(num-1)-1;
+    }
+    rb_raise(rb_eRangeError, "bignum out of range of unsigned long long");
 }
 
 LONG_LONG
@@ -1266,12 +5146,15 @@ rb_big2ll(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "long long");
 
-    if ((LONG_LONG)num < 0 && (RBIGNUM_SIGN(x)
-			       || (LONG_LONG)num != LLONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
+    if (BIGNUM_POSITIVE_P(x)) {
+        if (num <= LLONG_MAX)
+            return num;
     }
-    if (!RBIGNUM_SIGN(x)) return -(LONG_LONG)num;
-    return num;
+    else {
+        if (num <= 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return -(LONG_LONG)(num-1)-1;
+    }
+    rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
 }
 
 #endif  /* HAVE_LONG_LONG */
@@ -1292,7 +5175,7 @@ dbl2big(double d)
 	rb_raise(rb_eFloatDomainError, "NaN");
     }
 
-    while (!POSFIXABLE(u) || 0 != (long)u) {
+    while (1.0 <= u) {
 	u /= (double)(BIGRAD);
 	i++;
     }
@@ -1314,32 +5197,11 @@ rb_dbl2big(double d)
     return bignorm(dbl2big(d));
 }
 
-static int
-nlz(BDIGIT x)
-{
-    BDIGIT y;
-    int n = BITSPERDIG;
-#if BITSPERDIG > 64
-    y = x >> 64; if (y) {n -= 64; x = y;}
-#endif
-#if BITSPERDIG > 32
-    y = x >> 32; if (y) {n -= 32; x = y;}
-#endif
-#if BITSPERDIG > 16
-    y = x >> 16; if (y) {n -= 16; x = y;}
-#endif
-    y = x >>  8; if (y) {n -=  8; x = y;}
-    y = x >>  4; if (y) {n -=  4; x = y;}
-    y = x >>  2; if (y) {n -=  2; x = y;}
-    y = x >>  1; if (y) {return n - 2;}
-    return n - x;
-}
-
 static double
 big2dbl(VALUE x)
 {
     double d = 0.0;
-    long i = (bigtrunc(x), RBIGNUM_LEN(x)), lo = 0, bits;
+    long i = (bigtrunc(x), BIGNUM_LEN(x)), lo = 0, bits;
     BDIGIT *ds = BDIGITS(x), dl;
 
     if (i) {
@@ -1356,16 +5218,17 @@ big2dbl(VALUE x)
 		d = ds[i] + BIGRAD*d;
 	    }
 	    dl = ds[i];
-	    if (bits && (dl & (1UL << (bits %= BITSPERDIG)))) {
-		int carry = dl & ~(~(BDIGIT)0 << bits);
+	    if (bits && (dl & ((BDIGIT)1 << (bits %= BITSPERDIG)))) {
+		int carry = (dl & ~(BDIGMAX << bits)) != 0;
 		if (!carry) {
 		    while (i-- > 0) {
-			if ((carry = ds[i]) != 0) break;
+			carry = ds[i] != 0;
+			if (carry) break;
 		    }
 		}
 		if (carry) {
-		    dl &= (BDIGIT)~0 << bits;
-		    dl += (BDIGIT)1 << bits;
+		    dl &= BDIGMAX << bits;
+		    dl = BIGLO(dl + ((BDIGIT)1 << bits));
 		    if (!dl) d += 1;
 		}
 	    }
@@ -1380,7 +5243,7 @@ big2dbl(VALUE x)
 	    }
 	}
     }
-    if (!RBIGNUM_SIGN(x)) d = -d;
+    if (BIGNUM_NEGATIVE_P(x)) d = -d;
     return d;
 }
 
@@ -1399,181 +5262,180 @@ rb_big2dbl(VALUE x)
     return d;
 }
 
-/*
- *  call-seq:
- *     big.to_f -> float
- *
- *  Converts <i>big</i> to a <code>Float</code>. If <i>big</i> doesn't
- *  fit in a <code>Float</code>, the result is infinity.
- *
- */
-
-static VALUE
-rb_big_to_f(VALUE x)
+VALUE
+rb_integer_float_cmp(VALUE x, VALUE y)
 {
-    return DBL2NUM(rb_big2dbl(x));
-}
+    double yd = RFLOAT_VALUE(y);
+    double yi, yf;
+    VALUE rel;
 
-/*
- *  call-seq:
- *     big <=> numeric   -> -1, 0, +1 or nil
- *
- *  Comparison---Returns -1, 0, or +1 depending on whether <i>big</i> is
- *  less than, equal to, or greater than <i>numeric</i>. This is the
- *  basis for the tests in <code>Comparable</code>.
- *
- */
+    if (isnan(yd))
+        return Qnil;
+    if (isinf(yd)) {
+        if (yd > 0.0) return INT2FIX(-1);
+        else return INT2FIX(1);
+    }
+    yf = modf(yd, &yi);
+    if (FIXNUM_P(x)) {
+#if SIZEOF_LONG * CHAR_BIT < DBL_MANT_DIG /* assume FLT_RADIX == 2 */
+        double xd = (double)FIX2LONG(x);
+        if (xd < yd)
+            return INT2FIX(-1);
+        if (xd > yd)
+            return INT2FIX(1);
+        return INT2FIX(0);
+#else
+        long xn, yn;
+        if (yi < FIXNUM_MIN)
+            return INT2FIX(1);
+        if (FIXNUM_MAX+1 <= yi)
+            return INT2FIX(-1);
+        xn = FIX2LONG(x);
+        yn = (long)yi;
+        if (xn < yn)
+            return INT2FIX(-1);
+        if (xn > yn)
+            return INT2FIX(1);
+        if (yf < 0.0)
+            return INT2FIX(1);
+        if (0.0 < yf)
+            return INT2FIX(-1);
+        return INT2FIX(0);
+#endif
+    }
+    y = rb_dbl2big(yi);
+    rel = rb_big_cmp(x, y);
+    if (yf == 0.0 || rel != INT2FIX(0))
+        return rel;
+    if (yf < 0.0)
+        return INT2FIX(1);
+    return INT2FIX(-1);
+}
 
 VALUE
-rb_big_cmp(VALUE x, VALUE y)
+rb_integer_float_eq(VALUE x, VALUE y)
 {
-    long xlen = RBIGNUM_LEN(x);
-    BDIGIT *xds, *yds;
-
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
+    double yd = RFLOAT_VALUE(y);
+    double yi, yf;
 
-      case T_BIGNUM:
-	break;
-
-      case T_FLOAT:
-	{
-	    double a = RFLOAT_VALUE(y);
+    if (isnan(yd) || isinf(yd))
+        return Qfalse;
+    yf = modf(yd, &yi);
+    if (yf != 0)
+        return Qfalse;
+    if (FIXNUM_P(x)) {
+#if SIZEOF_LONG * CHAR_BIT < DBL_MANT_DIG /* assume FLT_RADIX == 2 */
+        double xd = (double)FIX2LONG(x);
+        if (xd != yd)
+            return Qfalse;
+        return Qtrue;
+#else
+        long xn, yn;
+        if (yi < LONG_MIN || LONG_MAX < yi)
+            return Qfalse;
+        xn = FIX2LONG(x);
+        yn = (long)yi;
+        if (xn != yn)
+            return Qfalse;
+        return Qtrue;
+#endif
+    }
+    y = rb_dbl2big(yi);
+    return rb_big_eq(x, y);
+}
 
-	    if (isinf(a)) {
-		if (a > 0.0) return INT2FIX(-1);
-		else return INT2FIX(1);
-	    }
-	    return rb_dbl_cmp(rb_big2dbl(x), a);
+VALUE
+rb_big_cmp(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(y)) {
+	x = bigfixize(x);
+        if (FIXNUM_P(x)) {
+	    /* SIGNED_VALUE and Fixnum have same sign-bits, same
+	     * order */
+	    SIGNED_VALUE sx = (SIGNED_VALUE)x, sy = (SIGNED_VALUE)y;
+	    if (sx < sy) return INT2FIX(-1);
+	    return INT2FIX(sx > sy);
+        }
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+	if (BIGNUM_SIGN(x) == BIGNUM_SIGN(y)) {
+	    int cmp = bary_cmp(BDIGITS(x), BIGNUM_LEN(x), BDIGITS(y), BIGNUM_LEN(y));
+	    return INT2FIX(BIGNUM_SIGN(x) ? cmp : -cmp);
 	}
-
-      default:
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+        return rb_integer_float_cmp(x, y);
+    }
+    else {
 	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
     }
-
-    if (RBIGNUM_SIGN(x) > RBIGNUM_SIGN(y)) return INT2FIX(1);
-    if (RBIGNUM_SIGN(x) < RBIGNUM_SIGN(y)) return INT2FIX(-1);
-    if (xlen < RBIGNUM_LEN(y))
-	return (RBIGNUM_SIGN(x)) ? INT2FIX(-1) : INT2FIX(1);
-    if (xlen > RBIGNUM_LEN(y))
-	return (RBIGNUM_SIGN(x)) ? INT2FIX(1) : INT2FIX(-1);
-
-    xds = BDIGITS(x);
-    yds = BDIGITS(y);
-
-    while(xlen-- && (xds[xlen]==yds[xlen]));
-    if (-1 == xlen) return INT2FIX(0);
-    return (xds[xlen] > yds[xlen]) ?
-	(RBIGNUM_SIGN(x) ? INT2FIX(1) : INT2FIX(-1)) :
-	    (RBIGNUM_SIGN(x) ? INT2FIX(-1) : INT2FIX(1));
+    return INT2FIX(BIGNUM_SIGN(x) ? 1 : -1);
 }
 
+enum big_op_t {
+    big_op_gt,
+    big_op_ge,
+    big_op_lt,
+    big_op_le
+};
+
 static VALUE
-big_op(VALUE x, VALUE y, int op)
+big_op(VALUE x, VALUE y, enum big_op_t op)
 {
     VALUE rel;
     int n;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-      case T_BIGNUM:
+    if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) {
 	rel = rb_big_cmp(x, y);
-	break;
-
-      case T_FLOAT:
-	{
-	    double a = RFLOAT_VALUE(y);
-
-	    if (isinf(a)) {
-		if (a > 0.0) rel = INT2FIX(-1);
-		else rel = INT2FIX(1);
-		break;
-	    }
-	    rel = rb_dbl_cmp(rb_big2dbl(x), a);
-	    break;
-	}
-
-      default:
-	{
-	    ID id = 0;
-	    switch (op) {
-		case 0: id = '>'; break;
-		case 1: id = rb_intern(">="); break;
-		case 2: id = '<'; break;
-		case 3: id = rb_intern("<="); break;
-	    }
-	    return rb_num_coerce_relop(x, y, id);
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+        rel = rb_integer_float_cmp(x, y);
+    }
+    else {
+	ID id = 0;
+	switch (op) {
+	  case big_op_gt: id = '>'; break;
+	  case big_op_ge: id = rb_intern(">="); break;
+	  case big_op_lt: id = '<'; break;
+	  case big_op_le: id = rb_intern("<="); break;
 	}
+	return rb_num_coerce_relop(x, y, id);
     }
 
     if (NIL_P(rel)) return Qfalse;
     n = FIX2INT(rel);
 
     switch (op) {
-	case 0: return n >  0 ? Qtrue : Qfalse;
-	case 1: return n >= 0 ? Qtrue : Qfalse;
-	case 2: return n <  0 ? Qtrue : Qfalse;
-	case 3: return n <= 0 ? Qtrue : Qfalse;
+	case big_op_gt: return n >  0 ? Qtrue : Qfalse;
+	case big_op_ge: return n >= 0 ? Qtrue : Qfalse;
+	case big_op_lt: return n <  0 ? Qtrue : Qfalse;
+	case big_op_le: return n <= 0 ? Qtrue : Qfalse;
     }
     return Qundef;
 }
 
-/*
- * call-seq:
- *   big > real  ->  true or false
- *
- * Returns <code>true</code> if the value of <code>big</code> is
- * greater than that of <code>real</code>.
- */
-
-static VALUE
-big_gt(VALUE x, VALUE y)
+VALUE
+rb_big_gt(VALUE x, VALUE y)
 {
-    return big_op(x, y, 0);
+    return big_op(x, y, big_op_gt);
 }
 
-/*
- * call-seq:
- *   big >= real  ->  true or false
- *
- * Returns <code>true</code> if the value of <code>big</code> is
- * greater than or equal to that of <code>real</code>.
- */
-
-static VALUE
-big_ge(VALUE x, VALUE y)
+VALUE
+rb_big_ge(VALUE x, VALUE y)
 {
-    return big_op(x, y, 1);
+    return big_op(x, y, big_op_ge);
 }
 
-/*
- * call-seq:
- *   big < real  ->  true or false
- *
- * Returns <code>true</code> if the value of <code>big</code> is
- * less than that of <code>real</code>.
- */
-
-static VALUE
-big_lt(VALUE x, VALUE y)
+VALUE
+rb_big_lt(VALUE x, VALUE y)
 {
-    return big_op(x, y, 2);
+    return big_op(x, y, big_op_lt);
 }
 
-/*
- * call-seq:
- *   big <= real  ->  true or false
- *
- * Returns <code>true</code> if the value of <code>big</code> is
- * less than or equal to that of <code>real</code>.
- */
-
-static VALUE
-big_le(VALUE x, VALUE y)
+VALUE
+rb_big_le(VALUE x, VALUE y)
 {
-    return big_op(x, y, 3);
+    return big_op(x, y, big_op_le);
 }
 
 /*
@@ -1590,156 +5452,90 @@ big_le(VALUE x, VALUE y)
 VALUE
 rb_big_eq(VALUE x, VALUE y)
 {
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
-      case T_BIGNUM:
-	break;
-      case T_FLOAT:
-	{
-	    volatile double a, b;
-
-	    a = RFLOAT_VALUE(y);
-	    if (isnan(a) || isinf(a)) return Qfalse;
-	    b = rb_big2dbl(x);
-	    return (a == b)?Qtrue:Qfalse;
-	}
-      default:
+    if (FIXNUM_P(y)) {
+	return bignorm(x) == y ? Qtrue : Qfalse;
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+        return rb_integer_float_eq(x, y);
+    }
+    else {
 	return rb_equal(y, x);
     }
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
-    if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
+    if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y)) return Qfalse;
+    if (BIGNUM_LEN(x) != BIGNUM_LEN(y)) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,BIGNUM_LEN(y)) != 0) return Qfalse;
     return Qtrue;
 }
 
-/*
- *  call-seq:
- *     big.eql?(obj)   -> true or false
- *
- *  Returns <code>true</code> only if <i>obj</i> is a
- *  <code>Bignum</code> with the same value as <i>big</i>. Contrast this
- *  with <code>Bignum#==</code>, which performs type conversions.
- *
- *     68719476736.eql?(68719476736.0)   #=> false
- */
-
-static VALUE
+VALUE
 rb_big_eql(VALUE x, VALUE y)
 {
-    if (TYPE(y) != T_BIGNUM) return Qfalse;
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
-    if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
+    if (!RB_BIGNUM_TYPE_P(y)) return Qfalse;
+    if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y)) return Qfalse;
+    if (BIGNUM_LEN(x) != BIGNUM_LEN(y)) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,BIGNUM_LEN(y)) != 0) return Qfalse;
     return Qtrue;
 }
 
-/*
- * call-seq:
- *    -big   ->  integer
- *
- * Unary minus (returns an integer whose value is 0-big)
- */
-
 VALUE
 rb_big_uminus(VALUE x)
 {
     VALUE z = rb_big_clone(x);
 
-    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+    BIGNUM_NEGATE(z);
 
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     ~big  ->  integer
- *
- * Inverts the bits in big. As Bignums are conceptually infinite
- * length, the result acts as if it had an infinite number of one
- * bits to the left. In hex representations, this is displayed
- * as two periods to the left of the digits.
- *
- *   sprintf("%X", ~0x1122334455)    #=> "..FEEDDCCBBAA"
- */
-
-static VALUE
-rb_big_neg(VALUE x)
+VALUE
+rb_big_comp(VALUE x)
 {
     VALUE z = rb_big_clone(x);
-    BDIGIT *ds;
-    long i;
-
-    if (!RBIGNUM_SIGN(x)) get2comp(z);
-    ds = BDIGITS(z);
-    i = RBIGNUM_LEN(x);
-    if (!i) return INT2FIX(~(SIGNED_VALUE)0);
-    while (i--) {
-	ds[i] = ~ds[i];
-    }
-    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(z));
-    if (RBIGNUM_SIGN(x)) get2comp(z);
+    BDIGIT *ds = BDIGITS(z);
+    long n = BIGNUM_LEN(z);
 
-    return bignorm(z);
-}
-
-static void
-bigsub_core(BDIGIT *xds, long xn, BDIGIT *yds, long yn, BDIGIT *zds, long zn)
-{
-    BDIGIT_DBL_SIGNED num;
-    long i;
+    if (!n) return INT2FIX(-1);
 
-    for (i = 0, num = 0; i < yn; i++) {
-	num += (BDIGIT_DBL_SIGNED)xds[i] - yds[i];
-	zds[i] = BIGLO(num);
-	num = BIGDN(num);
-    }
-    while (num && i < xn) {
-	num += xds[i];
-	zds[i++] = BIGLO(num);
-	num = BIGDN(num);
-    }
-    while (i < xn) {
-	zds[i] = xds[i];
-	i++;
+    if (BIGNUM_POSITIVE_P(z)) {
+        if (bary_add_one(ds, n)) {
+            big_extend_carry(z);
+        }
+        BIGNUM_SET_NEGATIVE_SIGN(z);
     }
-    assert(i <= zn);
-    while (i < zn) {
-	zds[i++] = 0;
+    else {
+        bary_neg(ds, n);
+        if (bary_add_one(ds, n))
+            return INT2FIX(-1);
+        bary_neg(ds, n);
+        BIGNUM_SET_POSITIVE_SIGN(z);
     }
+
+    return bignorm(z);
 }
 
 static VALUE
 bigsub(VALUE x, VALUE y)
 {
-    VALUE z = 0;
-    long i = RBIGNUM_LEN(x);
-    BDIGIT *xds, *yds;
+    VALUE z;
+    BDIGIT *xds, *yds, *zds;
+    long xn, yn, zn;
 
-    /* if x is smaller than y, swap */
-    if (RBIGNUM_LEN(x) < RBIGNUM_LEN(y)) {
-	z = x; x = y; y = z;	/* swap x y */
-    }
-    else if (RBIGNUM_LEN(x) == RBIGNUM_LEN(y)) {
-	xds = BDIGITS(x);
-	yds = BDIGITS(y);
-	while (i > 0) {
-	    i--;
-	    if (xds[i] > yds[i]) {
-		break;
-	    }
-	    if (xds[i] < yds[i]) {
-		z = x; x = y; y = z;	/* swap x y */
-		break;
-	    }
-	}
-    }
+    xn = BIGNUM_LEN(x);
+    yn = BIGNUM_LEN(y);
+    zn = xn < yn ? yn : xn;
+
+    z = bignew(zn, 1);
+
+    xds = BDIGITS(x);
+    yds = BDIGITS(y);
+    zds = BDIGITS(z);
 
-    z = bignew(RBIGNUM_LEN(x), z==0);
-    bigsub_core(BDIGITS(x), RBIGNUM_LEN(x),
-		BDIGITS(y), RBIGNUM_LEN(y),
-		BDIGITS(z), RBIGNUM_LEN(z));
+    if (bary_sub(zds, zn, xds, xn, yds, yn)) {
+        bary_2comp(zds, zn);
+        BIGNUM_SET_NEGATIVE_SIGN(z);
+    }
 
     return z;
 }
@@ -1751,21 +5547,30 @@ bigsub_int(VALUE x, long y0)
 {
     VALUE z;
     BDIGIT *xds, *zds;
-    long xn;
+    long xn, zn;
     BDIGIT_DBL_SIGNED num;
     long i, y;
 
     y = y0;
     xds = BDIGITS(x);
-    xn = RBIGNUM_LEN(x);
+    xn = BIGNUM_LEN(x);
 
-    z = bignew(xn, RBIGNUM_SIGN(x));
+    if (xn == 0)
+        return LONG2NUM(-y0);
+
+    zn = xn;
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    z = bignew(zn, BIGNUM_SIGN(x));
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+    assert(xn == zn);
     num = (BDIGIT_DBL_SIGNED)xds[0] - y;
     if (xn == 1 && num < 0) {
-	RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+	BIGNUM_NEGATE(z);
 	zds[0] = (BDIGIT)-num;
 	RB_GC_GUARD(x);
 	return bignorm(z);
@@ -1773,26 +5578,62 @@ bigsub_int(VALUE x, long y0)
     zds[0] = BIGLO(num);
     num = BIGDN(num);
     i = 1;
+    if (i < xn)
+        goto y_is_zero_x;
+    goto finish;
 #else
     num = 0;
-    for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
+    for (i=0; i < xn; i++) {
+        if (y == 0) goto y_is_zero_x;
 	num += (BDIGIT_DBL_SIGNED)xds[i] - BIGLO(y);
 	zds[i] = BIGLO(num);
 	num = BIGDN(num);
 	y = BIGDN(y);
     }
+    for (; i < zn; i++) {
+        if (y == 0) goto y_is_zero_z;
+        num -= BIGLO(y);
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
+        y = BIGDN(y);
+    }
+    goto finish;
 #endif
-    while (num && i < xn) {
+
+    for (; i < xn; i++) {
+      y_is_zero_x:
+        if (num == 0) goto num_is_zero_x;
 	num += xds[i];
-	zds[i++] = BIGLO(num);
+	zds[i] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (i < xn) {
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    for (; i < zn; i++) {
+      y_is_zero_z:
+        if (num == 0) goto num_is_zero_z;
+        zds[i] = BIGLO(num);
+        num = BIGDN(num);
+    }
+#endif
+    goto finish;
+
+    for (; i < xn; i++) {
+      num_is_zero_x:
 	zds[i] = xds[i];
-	i++;
     }
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    for (; i < zn; i++) {
+      num_is_zero_z:
+        zds[i] = 0;
+    }
+#endif
+    goto finish;
+
+  finish:
+    assert(num == 0 || num == -1);
     if (num < 0) {
-	z = bigsub(x, rb_int2big(y0));
+        get2comp(z);
+	BIGNUM_NEGATE(z);
     }
     RB_GC_GUARD(x);
     return bignorm(z);
@@ -1808,126 +5649,114 @@ bigadd_int(VALUE x, long y)
     long i;
 
     xds = BDIGITS(x);
-    xn = RBIGNUM_LEN(x);
+    xn = BIGNUM_LEN(x);
 
-    if (xn < 2) {
-	zn = 3;
-    }
-    else {
-	zn = xn + 1;
-    }
-    z = bignew(zn, RBIGNUM_SIGN(x));
+    if (xn == 0)
+        return LONG2NUM(y);
+
+    zn = xn;
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    zn++;
+
+    z = bignew(zn, BIGNUM_SIGN(x));
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     num = (BDIGIT_DBL)xds[0] + y;
     zds[0] = BIGLO(num);
     num = BIGDN(num);
     i = 1;
+    if (i < xn)
+        goto y_is_zero_x;
+    goto y_is_zero_z;
 #else
     num = 0;
-    for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
+    for (i=0; i < xn; i++) {
+        if (y == 0) goto y_is_zero_x;
 	num += (BDIGIT_DBL)xds[i] + BIGLO(y);
 	zds[i] = BIGLO(num);
 	num = BIGDN(num);
 	y = BIGDN(y);
     }
-#endif
-    while (num && i < xn) {
-	num += xds[i];
-	zds[i++] = BIGLO(num);
+    for (; i < zn; i++) {
+        if (y == 0) goto y_is_zero_z;
+	num += BIGLO(y);
+	zds[i] = BIGLO(num);
 	num = BIGDN(num);
+	y = BIGDN(y);
     }
-    if (num) zds[i++] = (BDIGIT)num;
-    else while (i < xn) {
-	zds[i] = xds[i];
-	i++;
-    }
-    assert(i <= zn);
-    while (i < zn) {
-	zds[i++] = 0;
-    }
-    RB_GC_GUARD(x);
-    return bignorm(z);
-}
-
-static void
-bigadd_core(BDIGIT *xds, long xn, BDIGIT *yds, long yn, BDIGIT *zds, long zn)
-{
-    BDIGIT_DBL num = 0;
-    long i;
+    goto finish;
 
-    if (xn > yn) {
-	BDIGIT *tds;
-	tds = xds; xds = yds; yds = tds;
-	i = xn; xn = yn; yn = i;
-    }
+#endif
 
-    i = 0;
-    while (i < xn) {
-	num += (BDIGIT_DBL)xds[i] + yds[i];
-	zds[i++] = BIGLO(num);
+    for (;i < xn; i++) {
+      y_is_zero_x:
+        if (num == 0) goto num_is_zero_x;
+	num += (BDIGIT_DBL)xds[i];
+	zds[i] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (num && i < yn) {
-	num += yds[i];
-	zds[i++] = BIGLO(num);
+    for (; i < zn; i++) {
+      y_is_zero_z:
+        if (num == 0) goto num_is_zero_z;
+	zds[i] = BIGLO(num);
 	num = BIGDN(num);
     }
-    while (i < yn) {
-	zds[i] = yds[i];
-	i++;
+    goto finish;
+
+    for (;i < xn; i++) {
+      num_is_zero_x:
+	zds[i] = xds[i];
     }
-    if (num) zds[i++] = (BDIGIT)num;
-    assert(i <= zn);
-    while (i < zn) {
-	zds[i++] = 0;
+    for (; i < zn; i++) {
+      num_is_zero_z:
+	zds[i] = 0;
     }
+    goto finish;
+
+  finish:
+    RB_GC_GUARD(x);
+    return bignorm(z);
 }
 
 static VALUE
 bigadd(VALUE x, VALUE y, int sign)
 {
     VALUE z;
-    long len;
+    size_t len;
 
-    sign = (sign == RBIGNUM_SIGN(y));
-    if (RBIGNUM_SIGN(x) != sign) {
+    sign = (sign == BIGNUM_SIGN(y));
+    if (BIGNUM_SIGN(x) != sign) {
 	if (sign) return bigsub(y, x);
 	return bigsub(x, y);
     }
 
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	len = RBIGNUM_LEN(x) + 1;
+    if (BIGNUM_LEN(x) > BIGNUM_LEN(y)) {
+	len = BIGNUM_LEN(x) + 1;
     }
     else {
-	len = RBIGNUM_LEN(y) + 1;
+	len = BIGNUM_LEN(y) + 1;
     }
     z = bignew(len, sign);
 
-    bigadd_core(BDIGITS(x), RBIGNUM_LEN(x),
-		BDIGITS(y), RBIGNUM_LEN(y),
-		BDIGITS(z), RBIGNUM_LEN(z));
+    bary_add(BDIGITS(z), BIGNUM_LEN(z),
+             BDIGITS(x), BIGNUM_LEN(x),
+             BDIGITS(y), BIGNUM_LEN(y));
 
     return z;
 }
 
-/*
- *  call-seq:
- *     big + other  -> Numeric
- *
- *  Adds big and other, returning the result.
- */
-
 VALUE
 rb_big_plus(VALUE x, VALUE y)
 {
     long n;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	n = FIX2LONG(y);
-	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	if ((n > 0) != BIGNUM_SIGN(x)) {
 	    if (n < 0) {
 		n = -n;
 	    }
@@ -1937,34 +5766,26 @@ rb_big_plus(VALUE x, VALUE y)
 	    n = -n;
 	}
 	return bigadd_int(x, n);
-
-      case T_BIGNUM:
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
 	return bignorm(bigadd(x, y, 1));
-
-      case T_FLOAT:
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
 	return DBL2NUM(rb_big2dbl(x) + RFLOAT_VALUE(y));
-
-      default:
+    }
+    else {
 	return rb_num_coerce_bin(x, y, '+');
     }
 }
 
-/*
- *  call-seq:
- *     big - other  -> Numeric
- *
- *  Subtracts other from big, returning the result.
- */
-
 VALUE
 rb_big_minus(VALUE x, VALUE y)
 {
     long n;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	n = FIX2LONG(y);
-	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	if ((n > 0) != BIGNUM_SIGN(x)) {
 	    if (n < 0) {
 		n = -n;
 	    }
@@ -1974,773 +5795,185 @@ rb_big_minus(VALUE x, VALUE y)
 	    n = -n;
 	}
 	return bigsub_int(x, n);
-
-      case T_BIGNUM:
-	return bignorm(bigadd(x, y, 0));
-
-      case T_FLOAT:
-	return DBL2NUM(rb_big2dbl(x) - RFLOAT_VALUE(y));
-
-      default:
-	return rb_num_coerce_bin(x, y, '-');
     }
-}
-
-static long
-big_real_len(VALUE x)
-{
-    long i = RBIGNUM_LEN(x);
-    BDIGIT *xds = BDIGITS(x);
-    while (--i && !xds[i]);
-    return i + 1;
-}
-
-static VALUE
-bigmul1_single(VALUE x, VALUE y)
-{
-    BDIGIT_DBL n;
-    VALUE z = bignew(2, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    BDIGIT *xds, *yds, *zds;
-
-    xds = BDIGITS(x);
-    yds = BDIGITS(y);
-    zds = BDIGITS(z);
-
-    n = (BDIGIT_DBL)xds[0] * yds[0];
-    zds[0] = BIGLO(n);
-    zds[1] = (BDIGIT)BIGDN(n);
-
-    return z;
-}
-
-static VALUE
-bigmul1_normal(VALUE x, VALUE y)
-{
-    long xl = RBIGNUM_LEN(x), yl = RBIGNUM_LEN(y), i, j = xl + yl + 1;
-    BDIGIT_DBL n = 0;
-    VALUE z = bignew(j, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    BDIGIT *xds, *yds, *zds;
-
-    xds = BDIGITS(x);
-    yds = BDIGITS(y);
-    zds = BDIGITS(z);
-    while (j--) zds[j] = 0;
-    for (i = 0; i < xl; i++) {
-	BDIGIT_DBL dd;
-	dd = xds[i];
-	if (dd == 0) continue;
-	n = 0;
-	for (j = 0; j < yl; j++) {
-	    BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * yds[j];
-	    n = zds[i + j] + ee;
-	    if (ee) zds[i + j] = BIGLO(n);
-	    n = BIGDN(n);
-	}
-	if (n) {
-	    zds[i + j] = (BDIGIT)n;
-	}
-    }
-    rb_thread_check_ints();
-    return z;
-}
-
-static VALUE bigmul0(VALUE x, VALUE y);
-
-/* balancing multiplication by slicing larger argument */
-static VALUE
-bigmul1_balance(VALUE x, VALUE y)
-{
-    VALUE z, t1, t2;
-    long i, xn, yn, r, n;
-    BDIGIT *yds, *zds, *t1ds;
-
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
-    assert(2 * xn <= yn || 3 * xn <= 2*(yn+2));
-
-    z = bignew(xn + yn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    t1 = bignew(xn, 1);
-
-    yds = BDIGITS(y);
-    zds = BDIGITS(z);
-    t1ds = BDIGITS(t1);
-
-    for (i = 0; i < xn + yn; i++) zds[i] = 0;
-
-    n = 0;
-    while (yn > 0) {
-	r = xn > yn ? yn : xn;
-	MEMCPY(t1ds, yds + n, BDIGIT, r);
-	RBIGNUM_SET_LEN(t1, r);
-	t2 = bigmul0(x, t1);
-	bigadd_core(zds + n, RBIGNUM_LEN(z) - n,
-		    BDIGITS(t2), big_real_len(t2),
-		    zds + n, RBIGNUM_LEN(z) - n);
-	yn -= r;
-	n += r;
-    }
-
-    return z;
-}
-
-/* split a bignum into high and low bignums */
-static void
-big_split(VALUE v, long n, volatile VALUE *ph, volatile VALUE *pl)
-{
-    long hn = 0, ln = RBIGNUM_LEN(v);
-    VALUE h, l;
-    BDIGIT *vds = BDIGITS(v);
-
-    if (ln > n) {
-	hn = ln - n;
-	ln = n;
+    else if (RB_BIGNUM_TYPE_P(y)) {
+	return bignorm(bigadd(x, y, 0));
     }
-
-    if (!hn) {
-	h = rb_uint2big(0);
+    else if (RB_FLOAT_TYPE_P(y)) {
+	return DBL2NUM(rb_big2dbl(x) - RFLOAT_VALUE(y));
     }
     else {
-	while (--hn && !vds[hn + ln]);
-	h = bignew(hn += 2, 1);
-	MEMCPY(BDIGITS(h), vds + ln, BDIGIT, hn - 1);
-	BDIGITS(h)[hn - 1] = 0; /* margin for carry */
+	return rb_num_coerce_bin(x, y, '-');
     }
-
-    while (--ln && !vds[ln]);
-    l = bignew(ln += 2, 1);
-    MEMCPY(BDIGITS(l), vds, BDIGIT, ln - 1);
-    BDIGITS(l)[ln - 1] = 0; /* margin for carry */
-
-    *pl = l;
-    *ph = h;
 }
 
-/* multiplication by karatsuba method */
 static VALUE
-bigmul1_karatsuba(VALUE x, VALUE y)
+bigsq(VALUE x)
 {
-    long i, n, xn, yn, t1n, t2n;
-    VALUE xh, xl, yh, yl, z, t1, t2, t3;
-    BDIGIT *zds;
+    long xn, zn;
+    VALUE z;
+    BDIGIT *xds, *zds;
 
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
-    n = yn / 2;
-    big_split(x, n, &xh, &xl);
-    if (x == y) {
-	yh = xh; yl = xl;
-    }
-    else big_split(y, n, &yh, &yl);
+    xn = BIGNUM_LEN(x);
+    zn = 2 * xn;
 
-    /* x = xh * b + xl
-     * y = yh * b + yl
-     *
-     * Karatsuba method:
-     *   x * y = z2 * b^2 + z1 * b + z0
-     *   where
-     *     z2 = xh * yh
-     *     z0 = xl * yl
-     *     z1 = (xh + xl) * (yh + yl) - z2 - z0
-     *
-     *  ref: http://en.wikipedia.org/wiki/Karatsuba_algorithm
-     */
+    z = bignew(zn, 1);
 
-    /* allocate a result bignum */
-    z = bignew(xn + yn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    xds = BDIGITS(x);
     zds = BDIGITS(z);
 
-    /* t1 <- xh * yh */
-    t1 = bigmul0(xh, yh);
-    t1n = big_real_len(t1);
-
-    /* copy t1 into high bytes of the result (z2) */
-    MEMCPY(zds + 2 * n, BDIGITS(t1), BDIGIT, t1n);
-    for (i = 2 * n + t1n; i < xn + yn; i++) zds[i] = 0;
-
-    if (!BIGZEROP(xl) && !BIGZEROP(yl)) {
-	/* t2 <- xl * yl */
-	t2 = bigmul0(xl, yl);
-	t2n = big_real_len(t2);
-
-	/* copy t2 into low bytes of the result (z0) */
-	MEMCPY(zds, BDIGITS(t2), BDIGIT, t2n);
-	for (i = t2n; i < 2 * n; i++) zds[i] = 0;
-    }
-    else {
-	t2 = Qundef;
-	t2n = 0;
-
-	/* copy 0 into low bytes of the result (z0) */
-	for (i = 0; i < 2 * n; i++) zds[i] = 0;
-    }
-
-    /* xh <- xh + xl */
-    if (RBIGNUM_LEN(xl) > RBIGNUM_LEN(xh)) {
-	t3 = xl; xl = xh; xh = t3;
-    }
-    /* xh has a margin for carry */
-    bigadd_core(BDIGITS(xh), RBIGNUM_LEN(xh),
-		BDIGITS(xl), RBIGNUM_LEN(xl),
-		BDIGITS(xh), RBIGNUM_LEN(xh));
-
-    /* yh <- yh + yl */
-    if (x != y) {
-	if (RBIGNUM_LEN(yl) > RBIGNUM_LEN(yh)) {
-	    t3 = yl; yl = yh; yh = t3;
-	}
-	/* yh has a margin for carry */
-	bigadd_core(BDIGITS(yh), RBIGNUM_LEN(yh),
-		    BDIGITS(yl), RBIGNUM_LEN(yl),
-		    BDIGITS(yh), RBIGNUM_LEN(yh));
-    }
-    else yh = xh;
-
-    /* t3 <- xh * yh */
-    t3 = bigmul0(xh, yh);
-
-    i = xn + yn - n;
-    /* subtract t1 from t3 */
-    bigsub_core(BDIGITS(t3), big_real_len(t3), BDIGITS(t1), t1n, BDIGITS(t3), big_real_len(t3));
-
-    /* subtract t2 from t3; t3 is now the middle term of the product */
-    if (t2 != Qundef) bigsub_core(BDIGITS(t3), big_real_len(t3), BDIGITS(t2), t2n, BDIGITS(t3), big_real_len(t3));
-
-    /* add t3 to middle bytes of the result (z1) */
-    bigadd_core(zds + n, i, BDIGITS(t3), big_real_len(t3), zds + n, i);
+#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;
 }
 
-static void
-biglsh_bang(BDIGIT *xds, long xn, unsigned long shift)
-{
-    long const s1 = shift/BITSPERDIG;
-    int const s2 = (int)(shift%BITSPERDIG);
-    int const s3 = BITSPERDIG-s2;
-    BDIGIT* zds;
-    BDIGIT num;
-    long i;
-    if (s1 >= xn) {
-	MEMZERO(xds, BDIGIT, xn);
-	return;
-    }
-    zds = xds + xn - 1;
-    xn -= s1 + 1;
-    num = xds[xn]<<s2;
-    do {
-	*zds-- = num | xds[--xn]>>s3;
-	num = xds[xn]<<s2;
-    }
-    while (xn > 0);
-    *zds = num;
-    for (i = s1; i > 0; --i)
-	*zds-- = 0;
-}
-
-static void
-bigrsh_bang(BDIGIT* xds, long xn, unsigned long shift)
-{
-    long s1 = shift/BITSPERDIG;
-    int s2 = (int)(shift%BITSPERDIG);
-    int s3 = BITSPERDIG - s2;
-    int i;
-    BDIGIT num;
-    BDIGIT* zds;
-    if (s1 >= xn) {
-	MEMZERO(xds, BDIGIT, xn);
-	return;
-    }
-
-    i = 0;
-    zds = xds + s1;
-    num = *zds++>>s2;
-    do {
-	xds[i++] = (BDIGIT)(*zds<<s3) | num;
-	num = *zds++>>s2;
-    }
-    while (i < xn - s1 - 1);
-    xds[i] = num;
-    MEMZERO(xds + xn - s1, BDIGIT, s1);
-}
-
-static void
-big_split3(VALUE v, long n, volatile VALUE* p0, volatile VALUE* p1, volatile VALUE* p2)
-{
-    VALUE v0, v12, v1, v2;
-
-    big_split(v, n, &v12, &v0);
-    big_split(v12, n, &v2, &v1);
-
-    *p0 = bigtrunc(v0);
-    *p1 = bigtrunc(v1);
-    *p2 = bigtrunc(v2);
-}
-
-static VALUE big_lshift(VALUE, unsigned long);
-static VALUE big_rshift(VALUE, unsigned long);
-static VALUE bigdivrem(VALUE, VALUE, volatile VALUE*, volatile VALUE*);
-
 static VALUE
-bigmul1_toom3(VALUE x, VALUE y)
+bigmul0(VALUE x, VALUE y)
 {
-    long n, xn, yn, zn;
-    VALUE x0, x1, x2, y0, y1, y2;
-    VALUE u0, u1, u2, u3, u4, v1, v2, v3;
-    VALUE z0, z1, z2, z3, z4, z, t;
-    BDIGIT* zds;
-
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
-    assert(xn <= yn);  /* assume y >= x */
-
-    n = (yn + 2) / 3;
-    big_split3(x, n, &x0, &x1, &x2);
-    if (x == y) {
-	y0 = x0; y1 = x1; y2 = x2;
-    }
-    else big_split3(y, n, &y0, &y1, &y2);
-
-    /*
-     * ref. http://en.wikipedia.org/wiki/Toom%E2%80%93Cook_multiplication
-     *
-     * x(b) = x0 * b^0 + x1 * b^1 + x2 * b^2
-     * y(b) = y0 * b^0 + y1 * b^1 + y2 * b^2
-     *
-     * z(b) = x(b) * y(b)
-     * z(b) = z0 * b^0 + z1 * b^1 + z2 * b^2 + z3 * b^3 + z4 * b^4
-     * where:
-     *   z0 = x0 * y0
-     *   z1 = x0 * y1 + x1 * y0
-     *   z2 = x0 * y2 + x1 * y1 + x2 * y0
-     *   z3 = x1 * y2 + x2 * y1
-     *   z4 = x2 * y2
-     *
-     * Toom3 method (a.k.a. Toom-Cook method):
-     * (Step1) calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4),
-     * where:
-     *   b0 = 0, b1 = 1, b2 = -1, b3 = -2, b4 = inf,
-     *   z(0)   = x(0)   * y(0)   = x0 * y0
-     *   z(1)   = x(1)   * y(1)   = (x0 + x1 + x2) * (y0 + y1 + y2)
-     *   z(-1)  = x(-1)  * y(-1)  = (x0 - x1 + x2) * (y0 - y1 + y2)
-     *   z(-2)  = x(-2)  * y(-2)  = (x0 - 2 * (x1 - 2 * x2)) * (y0 - 2 * (y1 - 2 * y2))
-     *   z(inf) = x(inf) * y(inf) = x2 * y2
-     *
-     * (Step2) interpolating z0, z1, z2, z3, z4, and z5.
-     *
-     * (Step3) Substituting base value into b of the polynomial z(b),
-     */
-
-    /*
-     * [Step1] calculating 5 points z(b0), z(b1), z(b2), z(b3), z(b4)
-     */
-
-    /* u1 <- x0 + x2 */
-    u1 = bigtrunc(bigadd(x0, x2, 1));
-
-    /* x(-1) : u2 <- u1 - x1 = x0 - x1 + x2 */
-    u2 = bigtrunc(bigsub(u1, x1));
-
-    /* x(1) : u1 <- u1 + x1 = x0 + x1 + x2 */
-    u1 = bigtrunc(bigadd(u1, x1, 1));
-
-    /* x(-2) : u3 <- 2 * (u2 + x2) - x0 = x0 - 2 * (x1 - 2 * x2) */
-    u3 = bigadd(u2, x2, 1);
-    if (BDIGITS(u3)[RBIGNUM_LEN(u3)-1] & BIGRAD_HALF) {
-	rb_big_resize(u3, RBIGNUM_LEN(u3) + 1);
-	BDIGITS(u3)[RBIGNUM_LEN(u3)-1] = 0;
-    }
-    biglsh_bang(BDIGITS(u3), RBIGNUM_LEN(u3), 1);
-    u3 = bigtrunc(bigadd(bigtrunc(u3), x0, 0));
-
-    if (x == y) {
-	v1 = u1; v2 = u2; v3 = u3;
-    }
-    else {
-	/* v1 <- y0 + y2 */
-	v1 = bigtrunc(bigadd(y0, y2, 1));
-
-	/* y(-1) : v2 <- v1 - y1 = y0 - y1 + y2 */
-	v2 = bigtrunc(bigsub(v1, y1));
-
-	/* y(1) : v1 <- v1 + y1 = y0 + y1 + y2 */
-	v1 = bigtrunc(bigadd(v1, y1, 1));
-
-	/* y(-2) : v3 <- 2 * (v2 + y2) - y0 = y0 - 2 * (y1 - 2 * y2) */
-	v3 = bigadd(v2, y2, 1);
-	if (BDIGITS(v3)[RBIGNUM_LEN(v3)-1] & BIGRAD_HALF) {
-	    rb_big_resize(v3, RBIGNUM_LEN(v3) + 1);
-	    BDIGITS(v3)[RBIGNUM_LEN(v3)-1] = 0;
-	}
-	biglsh_bang(BDIGITS(v3), RBIGNUM_LEN(v3), 1);
-	v3 = bigtrunc(bigadd(bigtrunc(v3), y0, 0));
-    }
-
-    /* z(0) : u0 <- x0 * y0 */
-    u0 = bigtrunc(bigmul0(x0, y0));
-
-    /* z(1) : u1 <- u1 * v1 */
-    u1 = bigtrunc(bigmul0(u1, v1));
-
-    /* z(-1) : u2 <- u2 * v2 */
-    u2 = bigtrunc(bigmul0(u2, v2));
-
-    /* z(-2) : u3 <- u3 * v3 */
-    u3 = bigtrunc(bigmul0(u3, v3));
-
-    /* z(inf) : u4 <- x2 * y2 */
-    u4 = bigtrunc(bigmul0(x2, y2));
-
-    /* for GC */
-    v1 = v2 = v3 = Qnil;
-
-    /*
-     * [Step2] interpolating z0, z1, z2, z3, z4, and z5.
-     */
-
-    /* z0 <- z(0) == u0 */
-    z0 = u0;
-
-    /* z4 <- z(inf) == u4 */
-    z4 = u4;
-
-    /* z3 <- (z(-2) - z(1)) / 3 == (u3 - u1) / 3 */
-    z3 = bigadd(u3, u1, 0);
-    bigdivrem(z3, big_three, &z3, NULL); /* TODO: optimize */
-    bigtrunc(z3);
-
-    /* z1 <- (z(1) - z(-1)) / 2 == (u1 - u2) / 2 */
-    z1 = bigtrunc(bigadd(u1, u2, 0));
-    bigrsh_bang(BDIGITS(z1), RBIGNUM_LEN(z1), 1);
-
-    /* z2 <- z(-1) - z(0) == u2 - u0 */
-    z2 = bigtrunc(bigadd(u2, u0, 0));
+    long xn, yn, zn;
+    VALUE z;
+    BDIGIT *xds, *yds, *zds;
 
-    /* z3 <- (z2 - z3) / 2 + 2 * z(inf) == (z2 - z3) / 2 + 2 * u4 */
-    z3 = bigadd(z2, z3, 0);
-    bigrsh_bang(BDIGITS(z3), RBIGNUM_LEN(z3), 1);
-    t = big_lshift(u4, 1); /* TODO: combining with next addition */
-    z3 = bigtrunc(bigadd(z3, t, 1));
+    if (x == y)
+        return bigsq(x);
 
-    /* z2 <- z2 + z1 - z(inf) == z2 + z1 - u4 */
-    z2 = bigtrunc(bigadd(z2, z1, 1));
-    z2 = bigtrunc(bigadd(z2, u4, 0));
+    xn = BIGNUM_LEN(x);
+    yn = BIGNUM_LEN(y);
+    zn = xn + yn;
 
-    /* z1 <- z1 - z3 */
-    z1 = bigtrunc(bigadd(z1, z3, 0));
+    z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
 
-    /*
-     * [Step3] Substituting base value into b of the polynomial z(b),
-     */
-
-    zn = 6*n + 1;
-    z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    xds = BDIGITS(x);
+    yds = BDIGITS(y);
     zds = BDIGITS(z);
-    MEMCPY(zds, BDIGITS(z0), BDIGIT, RBIGNUM_LEN(z0));
-    MEMZERO(zds + RBIGNUM_LEN(z0), BDIGIT, zn - RBIGNUM_LEN(z0));
-    bigadd_core(zds +   n, zn -   n, BDIGITS(z1), big_real_len(z1), zds +   n, zn -   n);
-    bigadd_core(zds + 2*n, zn - 2*n, BDIGITS(z2), big_real_len(z2), zds + 2*n, zn - 2*n);
-    bigadd_core(zds + 3*n, zn - 3*n, BDIGITS(z3), big_real_len(z3), zds + 3*n, zn - 3*n);
-    bigadd_core(zds + 4*n, zn - 4*n, BDIGITS(z4), big_real_len(z4), zds + 4*n, zn - 4*n);
-    z = bignorm(z);
-
-    return bignorm(z);
-}
 
-/* efficient squaring (2 times faster than normal multiplication)
- * ref: Handbook of Applied Cryptography, Algorithm 14.16
- *      http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf
- */
-static VALUE
-bigsqr_fast(VALUE x)
-{
-    long len = RBIGNUM_LEN(x), i, j;
-    VALUE z = bignew(2 * len + 1, 1);
-    BDIGIT *xds = BDIGITS(x), *zds = BDIGITS(z);
-    BDIGIT_DBL c, v, w;
+    bary_mul(zds, zn, xds, xn, yds, yn);
 
-    for (i = 2 * len + 1; i--; ) zds[i] = 0;
-    for (i = 0; i < len; i++) {
-	v = (BDIGIT_DBL)xds[i];
-	if (!v) continue;
-	c = (BDIGIT_DBL)zds[i + i] + v * v;
-	zds[i + i] = BIGLO(c);
-	c = BIGDN(c);
-	v *= 2;
-	for (j = i + 1; j < len; j++) {
-	    w = (BDIGIT_DBL)xds[j];
-	    c += (BDIGIT_DBL)zds[i + j] + BIGLO(v) * w;
-	    zds[i + j] = BIGLO(c);
-	    c = BIGDN(c);
-	    if (BIGDN(v)) c += w;
-	}
-	if (c) {
-	    c += (BDIGIT_DBL)zds[i + len];
-	    zds[i + len] = BIGLO(c);
-	    c = BIGDN(c);
-	}
-	if (c) zds[i + len + 1] += (BDIGIT)c;
-    }
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
     return z;
 }
 
-#define KARATSUBA_MUL_DIGITS 70
-#define TOOM3_MUL_DIGITS 150
-
-
-/* determine whether a bignum is sparse or not by random sampling */
-static inline VALUE
-big_sparse_p(VALUE x)
-{
-    long c = 0, n = RBIGNUM_LEN(x);
-
-    if (          BDIGITS(x)[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
-    if (c <= 1 && BDIGITS(x)[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
-    if (c <= 1 && BDIGITS(x)[rb_genrand_ulong_limited(n / 2) + n / 4]) c++;
-
-    return (c <= 1) ? Qtrue : Qfalse;
-}
-
-static VALUE
-bigmul0(VALUE x, VALUE y)
-{
-    long xn, yn;
-
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
-
-    /* make sure that y is longer than x */
-    if (xn > yn) {
-	VALUE t;
-	long tn;
-	t = x; x = y; y = t;
-	tn = xn; xn = yn; yn = tn;
-    }
-    assert(xn <= yn);
-
-    /* normal multiplication when x is small */
-    if (xn < KARATSUBA_MUL_DIGITS) {
-      normal:
-	if (x == y) return bigsqr_fast(x);
-	if (xn == 1 && yn == 1) return bigmul1_single(x, y);
-	return bigmul1_normal(x, y);
-    }
-
-    /* normal multiplication when x or y is a sparse bignum */
-    if (big_sparse_p(x)) goto normal;
-    if (big_sparse_p(y)) return bigmul1_normal(y, x);
-
-    /* balance multiplication by slicing y when x is much smaller than y */
-    if (2 * xn <= yn) return bigmul1_balance(x, y);
-
-    if (xn < TOOM3_MUL_DIGITS) {
-	/* multiplication by karatsuba method */
-	return bigmul1_karatsuba(x, y);
-    }
-    else if (3*xn <= 2*(yn + 2))
-	return bigmul1_balance(x, y);
-    return bigmul1_toom3(x, y);
-}
-
-/*
- *  call-seq:
- *     big * other  -> Numeric
- *
- *  Multiplies big and other, returning the result.
- */
-
 VALUE
 rb_big_mul(VALUE x, VALUE y)
 {
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      case T_FLOAT:
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
 	return DBL2NUM(rb_big2dbl(x) * RFLOAT_VALUE(y));
-
-      default:
+    }
+    else {
 	return rb_num_coerce_bin(x, y, '*');
     }
 
     return bignorm(bigmul0(x, y));
 }
 
-struct big_div_struct {
-    long nx, ny;
-    BDIGIT *yds, *zds;
-    VALUE stop;
-};
-
 static VALUE
-bigdivrem1(void *ptr)
+bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
 {
-    struct big_div_struct *bds = (struct big_div_struct*)ptr;
-    long nx = bds->nx, ny = bds->ny;
-    long i, j, nyzero;
-    BDIGIT *yds = bds->yds, *zds = bds->zds;
-    BDIGIT_DBL t2;
-    BDIGIT_DBL_SIGNED num;
-    BDIGIT q;
-
-    j = nx==ny?nx+1:nx;
-    for (nyzero = 0; !yds[nyzero]; nyzero++);
-    do {
-	if (bds->stop) return Qnil;
-	if (zds[j] ==  yds[ny-1]) q = (BDIGIT)BIGRAD-1;
-	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
-	if (q) {
-           i = nyzero; num = 0; t2 = 0;
-	    do {			/* multiply and subtract */
-		BDIGIT_DBL ee;
-		t2 += (BDIGIT_DBL)yds[i] * q;
-		ee = num - BIGLO(t2);
-		num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		if (ee) zds[j - ny + i] = BIGLO(num);
-		num = BIGDN(num);
-		t2 = BIGDN(t2);
-	    } while (++i < ny);
-	    num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
-	    while (num) {		/* "add back" required */
-		i = 0; num = 0; q--;
-		do {
-		    BDIGIT_DBL ee = num + yds[i];
-		    num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		    if (ee) zds[j - ny + i] = BIGLO(num);
-		    num = BIGDN(num);
-		} while (++i < ny);
-		num--;
-	    }
-	}
-	zds[j] = q;
-    } while (--j >= ny);
-    return Qnil;
-}
+    long xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y);
+    VALUE z;
+    BDIGIT *xds, *yds, *zds;
+    BDIGIT dd;
 
-static void
-rb_big_stop(void *ptr)
-{
-    VALUE *stop = (VALUE*)ptr;
-    *stop = Qtrue;
-}
+    VALUE q = Qnil, r = Qnil;
+    BDIGIT *qds, *rds;
+    long qn, rn;
 
-static VALUE
-bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
-{
-    struct big_div_struct bds;
-    long nx = RBIGNUM_LEN(x), ny = RBIGNUM_LEN(y);
-    long i, j;
-    VALUE z, yy, zz;
-    BDIGIT *xds, *yds, *zds, *tds;
-    BDIGIT_DBL t2;
-    BDIGIT dd, q;
+    yds = BDIGITS(y);
+    BARY_TRUNC(yds, yn);
+    if (yn == 0)
+        rb_num_zerodiv();
 
-    if (BIGZEROP(y)) rb_num_zerodiv();
     xds = BDIGITS(x);
-    yds = BDIGITS(y);
-    if (nx < ny || (nx == ny && xds[nx - 1] < yds[ny - 1])) {
+    BARY_TRUNC(xds, xn);
+
+    if (xn < yn || (xn == yn && xds[xn - 1] < yds[yn - 1])) {
 	if (divp) *divp = rb_int2big(0);
 	if (modp) *modp = x;
 	return Qnil;
     }
-    if (ny == 1) {
+    if (yn == 1) {
 	dd = yds[0];
-	z = rb_big_clone(x);
+	z = bignew(xn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
 	zds = BDIGITS(z);
-	t2 = 0; i = nx;
-	while (i--) {
-	    t2 = BIGUP(t2) + zds[i];
-	    zds[i] = (BDIGIT)(t2 / dd);
-	    t2 %= dd;
-	}
-	RBIGNUM_SET_SIGN(z, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+        dd = bigdivrem_single(zds, xds, xn, dd);
 	if (modp) {
-	    *modp = rb_uint2big((VALUE)t2);
-	    RBIGNUM_SET_SIGN(*modp, RBIGNUM_SIGN(x));
+	    *modp = rb_uint2big((VALUE)dd);
+	    BIGNUM_SET_SIGN(*modp, BIGNUM_SIGN(x));
 	}
 	if (divp) *divp = z;
 	return Qnil;
     }
+    if (xn == 2 && yn == 2) {
+        BDIGIT_DBL x0 = bary2bdigitdbl(xds, 2);
+        BDIGIT_DBL y0 = bary2bdigitdbl(yds, 2);
+        BDIGIT_DBL q0 = x0 / y0;
+        BDIGIT_DBL r0 = x0 % y0;
+        if (divp) {
+            z = bignew(bdigit_roomof(sizeof(BDIGIT_DBL)), BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+            zds = BDIGITS(z);
+            zds[0] = BIGLO(q0);
+            zds[1] = BIGLO(BIGDN(q0));
+            *divp = z;
+        }
+        if (modp) {
+            z = bignew(bdigit_roomof(sizeof(BDIGIT_DBL)), BIGNUM_SIGN(x));
+            zds = BDIGITS(z);
+            zds[0] = BIGLO(r0);
+            zds[1] = BIGLO(BIGDN(r0));
+            *modp = z;
+        }
+        return Qnil;
+    }
 
-    z = bignew(nx==ny?nx+2:nx+1, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
-    zds = BDIGITS(z);
-    if (nx==ny) zds[nx+1] = 0;
-    while (!yds[ny-1]) ny--;
-
-    dd = 0;
-    q = yds[ny-1];
-    while ((q & (BDIGIT)(1UL<<(BITSPERDIG-1))) == 0) {
-	q <<= 1UL;
-	dd++;
-    }
-    if (dd) {
-	yy = rb_big_clone(y);
-	tds = BDIGITS(yy);
-	j = 0;
-	t2 = 0;
-	while (j<ny) {
-	    t2 += (BDIGIT_DBL)yds[j]<<dd;
-	    tds[j++] = BIGLO(t2);
-	    t2 = BIGDN(t2);
-	}
-	yds = tds;
-	RB_GC_GUARD(y) = yy;
-	j = 0;
-	t2 = 0;
-	while (j<nx) {
-	    t2 += (BDIGIT_DBL)xds[j]<<dd;
-	    zds[j++] = BIGLO(t2);
-	    t2 = BIGDN(t2);
-	}
-	zds[j] = (BDIGIT)t2;
+    if (divp) {
+        qn = xn + BIGDIVREM_EXTRA_WORDS;
+        q = bignew(qn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
+        qds = BDIGITS(q);
     }
     else {
-	zds[nx] = 0;
-	j = nx;
-	while (j--) zds[j] = xds[j];
+        qn = 0;
+        qds = NULL;
     }
 
-    bds.nx = nx;
-    bds.ny = ny;
-    bds.zds = zds;
-    bds.yds = yds;
-    bds.stop = Qfalse;
-    if (nx > 10000 || ny > 10000) {
-	rb_thread_blocking_region(bigdivrem1, &bds, rb_big_stop, &bds.stop);
+    if (modp) {
+        rn = yn;
+        r = bignew(rn, BIGNUM_SIGN(x));
+        rds = BDIGITS(r);
     }
     else {
-	bigdivrem1(&bds);
+        rn = 0;
+        rds = NULL;
     }
 
-    if (divp) {			/* move quotient down in z */
-	*divp = zz = rb_big_clone(z);
-	zds = BDIGITS(zz);
-	j = (nx==ny ? nx+2 : nx+1) - ny;
-	for (i = 0;i < j;i++) zds[i] = zds[i+ny];
-	if (!zds[i-1]) i--;
-	RBIGNUM_SET_LEN(zz, i);
-    }
-    if (modp) {			/* normalize remainder */
-	*modp = zz = rb_big_clone(z);
-	zds = BDIGITS(zz);
-	while (--ny && !zds[ny]); ++ny;
-	if (dd) {
-	    t2 = 0; i = ny;
-	    while(i--) {
-		t2 = (t2 | zds[i]) >> dd;
-		q = zds[i];
-		zds[i] = BIGLO(t2);
-		t2 = BIGUP(q);
-	    }
-	}
-	if (!zds[ny-1]) ny--;
-	RBIGNUM_SET_LEN(zz, ny);
-	RBIGNUM_SET_SIGN(zz, RBIGNUM_SIGN(x));
+    bary_divmod_branch(qds, qn, rds, rn, xds, xn, yds, yn);
+
+    if (divp) {
+        bigtrunc(q);
+        *divp = q;
     }
-    return z;
+    if (modp) {
+        bigtrunc(r);
+        *modp = r;
+    }
+
+    return Qnil;
 }
 
 static void
@@ -2749,7 +5982,7 @@ bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
     VALUE mod;
 
     bigdivrem(x, y, divp, &mod);
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y) && !BIGZEROP(mod)) {
+    if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y) && !BIGZEROP(mod)) {
 	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
 	if (modp) *modp = bigadd(mod, y, 1);
     }
@@ -2764,26 +5997,22 @@ rb_big_divide(VALUE x, VALUE y, ID op)
 {
     VALUE z;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      case T_FLOAT:
-	{
-	    double div = rb_big2dbl(x) / RFLOAT_VALUE(y);
-	    if (op == '/') {
-		return DBL2NUM(div);
-	    }
-	    else {
-		return rb_dbl2big(div);
-	    }
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+	if (op == '/') {
+	    return DBL2NUM(rb_big2dbl(x) / RFLOAT_VALUE(y));
 	}
-
-      default:
+	else {
+	    double dy = RFLOAT_VALUE(y);
+	    if (dy == 0.0) rb_num_zerodiv();
+	    return rb_dbl2big(rb_big2dbl(x) / dy);
+	}
+    }
+    else {
 	return rb_num_coerce_bin(x, y, op);
     }
     bigdivmod(x, y, &z, 0);
@@ -2791,57 +6020,27 @@ rb_big_divide(VALUE x, VALUE y, ID op)
     return bignorm(z);
 }
 
-/*
- *  call-seq:
- *     big / other     -> Numeric
- *
- * Performs division: the class of the resulting object depends on
- * the class of <code>numeric</code> and on the magnitude of the
- * result.
- */
-
 VALUE
 rb_big_div(VALUE x, VALUE y)
 {
     return rb_big_divide(x, y, '/');
 }
 
-/*
- *  call-seq:
- *     big.div(other)  -> integer
- *
- * Performs integer division: returns integer value.
- */
-
 VALUE
 rb_big_idiv(VALUE x, VALUE y)
 {
     return rb_big_divide(x, y, rb_intern("div"));
 }
 
-/*
- *  call-seq:
- *     big % other         -> Numeric
- *     big.modulo(other)   -> Numeric
- *
- *  Returns big modulo other. See Numeric.divmod for more
- *  information.
- */
-
 VALUE
 rb_big_modulo(VALUE x, VALUE y)
 {
     VALUE z;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      default:
+    }
+    else if (!RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bin(x, y, '%');
     }
     bigdivmod(x, y, 0, &z);
@@ -2849,29 +6048,15 @@ rb_big_modulo(VALUE x, VALUE y)
     return bignorm(z);
 }
 
-/*
- *  call-seq:
- *     big.remainder(numeric)    -> number
- *
- *  Returns the remainder after dividing <i>big</i> by <i>numeric</i>.
- *
- *     -1234567890987654321.remainder(13731)      #=> -6966
- *     -1234567890987654321.remainder(13731.24)   #=> -9906.22531493148
- */
-static VALUE
+VALUE
 rb_big_remainder(VALUE x, VALUE y)
 {
     VALUE z;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      default:
+    }
+    else if (!RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bin(x, y, rb_intern("remainder"));
     }
     bigdivrem(x, y, 0, &z);
@@ -2879,27 +6064,15 @@ rb_big_remainder(VALUE x, VALUE y)
     return bignorm(z);
 }
 
-/*
- *  call-seq:
- *     big.divmod(numeric)   -> array
- *
- *  See <code>Numeric#divmod</code>.
- *
- */
 VALUE
 rb_big_divmod(VALUE x, VALUE y)
 {
     VALUE div, mod;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
-
-      case T_BIGNUM:
-	break;
-
-      default:
+    }
+    else if (!RB_BIGNUM_TYPE_P(y)) {
 	return rb_num_coerce_bin(x, y, rb_intern("divmod"));
     }
     bigdivmod(x, y, &div, &mod);
@@ -2907,98 +6080,60 @@ rb_big_divmod(VALUE x, VALUE y)
     return rb_assoc_new(bignorm(div), bignorm(mod));
 }
 
-static int
-bdigbitsize(BDIGIT x)
-{
-    int size = 1;
-    int nb = BITSPERDIG / 2;
-    BDIGIT bits = (~0 << nb);
-
-    if (!x) return 0;
-    while (x > 1) {
-	if (x & bits) {
-	    size += nb;
-	    x >>= nb;
-	}
-	x &= ~bits;
-	nb /= 2;
-	bits >>= nb;
-    }
-
-    return size;
-}
-
-static VALUE big_lshift(VALUE, unsigned long);
-static VALUE big_rshift(VALUE, unsigned long);
-
 static VALUE
 big_shift(VALUE x, long n)
 {
     if (n < 0)
-	return big_lshift(x, (unsigned long)-n);
+	return big_lshift(x, 1+(unsigned long)(-(n+1)));
     else if (n > 0)
 	return big_rshift(x, (unsigned long)n);
     return x;
 }
 
 static VALUE
-big_fdiv(VALUE x, VALUE y)
+big_fdiv(VALUE x, VALUE y, long ey)
 {
 #define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
     VALUE z;
-    long l, ex, ey;
-    int i;
+    long l, ex;
 
     bigtrunc(x);
-    l = RBIGNUM_LEN(x) - 1;
-    ex = l * BITSPERDIG;
-    ex += bdigbitsize(BDIGITS(x)[l]);
+    l = BIGNUM_LEN(x);
+    ex = l * BITSPERDIG - nlz(BDIGITS(x)[l-1]);
     ex -= 2 * DBL_BIGDIG * BITSPERDIG;
     if (ex) x = big_shift(x, ex);
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-      case T_BIGNUM: {
-	bigtrunc(y);
-	l = RBIGNUM_LEN(y) - 1;
-	ey = l * BITSPERDIG;
-	ey += bdigbitsize(BDIGITS(y)[l]);
-	ey -= DBL_BIGDIG * BITSPERDIG;
-	if (ey) y = big_shift(y, ey);
-      bignum:
-	bigdivrem(x, y, &z, 0);
-	l = ex - ey;
+    bigdivrem(x, y, &z, 0);
+    l = ex - ey;
 #if SIZEOF_LONG > SIZEOF_INT
-	{
-	    /* Visual C++ can't be here */
-	    if (l > INT_MAX) return DBL2NUM(INFINITY);
-	    if (l < INT_MIN) return DBL2NUM(0.0);
-	}
-#endif
-	return DBL2NUM(ldexp(big2dbl(z), (int)l));
-      }
-      case T_FLOAT:
-	y = dbl2big(ldexp(frexp(RFLOAT_VALUE(y), &i), DBL_MANT_DIG));
-	ey = i - DBL_MANT_DIG;
-	goto bignum;
+    {
+	/* Visual C++ can't be here */
+	if (l > INT_MAX) return DBL2NUM(INFINITY);
+	if (l < INT_MIN) return DBL2NUM(0.0);
     }
-    rb_bug("big_fdiv");
-    /* NOTREACHED */
+#endif
+    return DBL2NUM(ldexp(big2dbl(z), (int)l));
 }
 
-/*
- *  call-seq:
-  *     big.fdiv(numeric) -> float
- *
- *  Returns the floating point result of dividing <i>big</i> by
- *  <i>numeric</i>.
- *
- *     -1234567890987654321.fdiv(13731)      #=> -89910996357705.5
- *     -1234567890987654321.fdiv(13731.24)   #=> -89909424858035.7
- *
- */
+static VALUE
+big_fdiv_int(VALUE x, VALUE y)
+{
+    long l, ey;
+    bigtrunc(y);
+    l = BIGNUM_LEN(y);
+    ey = l * BITSPERDIG - nlz(BDIGITS(y)[l-1]);
+    ey -= DBL_BIGDIG * BITSPERDIG;
+    if (ey) y = big_shift(y, ey);
+    return big_fdiv(x, y, ey);
+}
 
+static VALUE
+big_fdiv_float(VALUE x, VALUE y)
+{
+    int i;
+    y = dbl2big(ldexp(frexp(RFLOAT_VALUE(y), &i), DBL_MANT_DIG));
+    return big_fdiv(x, y, i - DBL_MANT_DIG);
+}
 
 VALUE
 rb_big_fdiv(VALUE x, VALUE y)
@@ -3006,72 +6141,50 @@ rb_big_fdiv(VALUE x, VALUE y)
     double dx, dy;
 
     dx = big2dbl(x);
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	dy = (double)FIX2LONG(y);
 	if (isinf(dx))
-	    return big_fdiv(x, y);
-	break;
-
-      case T_BIGNUM:
+	    return big_fdiv_int(x, rb_int2big(FIX2LONG(y)));
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
 	dy = rb_big2dbl(y);
 	if (isinf(dx) || isinf(dy))
-	    return big_fdiv(x, y);
-	break;
-
-      case T_FLOAT:
+	    return big_fdiv_int(x, y);
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
 	dy = RFLOAT_VALUE(y);
 	if (isnan(dy))
 	    return y;
 	if (isinf(dx))
-	    return big_fdiv(x, y);
-	break;
-
-      default:
+	    return big_fdiv_float(x, y);
+    }
+    else {
 	return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
     }
     return DBL2NUM(dx / dy);
 }
 
-static VALUE
-bigsqr(VALUE x)
-{
-    return bigtrunc(bigmul0(x, x));
-}
-
-/*
- *  call-seq:
- *     big ** exponent   -> numeric
- *
- *  Raises _big_ to the _exponent_ power (which may be an integer, float,
- *  or anything that will coerce to a number). The result may be
- *  a Fixnum, Bignum, or Float
- *
- *    123456789 ** 2      #=> 15241578750190521
- *    123456789 ** 1.2    #=> 5126464716.09932
- *    123456789 ** -2     #=> 6.5610001194102e-17
- */
-
 VALUE
 rb_big_pow(VALUE x, VALUE y)
 {
     double d;
     SIGNED_VALUE yy;
 
+  again:
     if (y == INT2FIX(0)) return INT2FIX(1);
-    switch (TYPE(y)) {
-      case T_FLOAT:
+    if (RB_FLOAT_TYPE_P(y)) {
 	d = RFLOAT_VALUE(y);
-	if ((!RBIGNUM_SIGN(x) && !BIGZEROP(x)) && d != round(d))
+	if ((BIGNUM_NEGATIVE_P(x) && !BIGZEROP(x)) && d != round(d))
 	    return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
-	break;
-
-      case T_BIGNUM:
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+	y = bignorm(y);
+	if (FIXNUM_P(y))
+	    goto again;
 	rb_warn("in a**b, b may be too big");
 	d = rb_big2dbl(y);
-	break;
-
-      case T_FIXNUM:
+    }
+    else if (FIXNUM_P(y)) {
 	yy = FIX2LONG(y);
 
 	if (yy < 0)
@@ -3079,648 +6192,565 @@ rb_big_pow(VALUE x, VALUE y)
 	else {
 	    VALUE z = 0;
 	    SIGNED_VALUE mask;
-	    const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
+            const size_t xbits = rb_absint_numwords(x, 1, NULL);
+	    const size_t BIGLEN_LIMIT = 32*1024*1024;
 
-	    if ((RBIGNUM_LEN(x) > BIGLEN_LIMIT) ||
-		(RBIGNUM_LEN(x) > BIGLEN_LIMIT / yy)) {
+	    if (xbits == (size_t)-1 ||
+                (xbits > BIGLEN_LIMIT) ||
+                (xbits * yy > BIGLEN_LIMIT)) {
 		rb_warn("in a**b, b may be too big");
 		d = (double)yy;
-		break;
 	    }
-	    for (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
-		if (z) z = bigsqr(z);
-		if (yy & mask) {
-		    z = z ? bigtrunc(bigmul0(z, x)) : x;
+	    else {
+		for (mask = FIXNUM_MAX + 1; mask; mask >>= 1) {
+		    if (z) z = bigsq(z);
+		    if (yy & mask) {
+			z = z ? bigtrunc(bigmul0(z, x)) : x;
+		    }
 		}
+		return bignorm(z);
 	    }
-	    return bignorm(z);
 	}
-	/* NOTREACHED */
-	break;
-
-      default:
+    }
+    else {
 	return rb_num_coerce_bin(x, y, rb_intern("**"));
     }
     return DBL2NUM(pow(rb_big2dbl(x), d));
 }
 
-static inline VALUE
-bit_coerce(VALUE x)
-{
-    while (!FIXNUM_P(x) && TYPE(x) != T_BIGNUM) {
-	if (TYPE(x) == T_FLOAT) {
-	    rb_raise(rb_eTypeError, "can't convert Float into Integer");
-	}
-	x = rb_to_int(x);
-    }
-    return x;
-}
-
 static VALUE
-bigand_int(VALUE x, long y)
+bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y)
 {
     VALUE z;
     BDIGIT *xds, *zds;
-    long xn, zn;
+    long zn;
     long i;
-    char sign;
+    BDIGIT hibitsy;
 
     if (y == 0) return INT2FIX(0);
-    sign = (y > 0);
+    if (xn == 0) return hibitsx ? LONG2NUM(y) : 0;
+    hibitsy = 0 <= y ? 0 : BDIGMAX;
     xds = BDIGITS(x);
-    zn = xn = RBIGNUM_LEN(x);
-#if SIZEOF_BDIGITS == SIZEOF_LONG
-    if (sign) {
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
+    if (!hibitsy) {
 	y &= xds[0];
 	return LONG2NUM(y);
     }
 #endif
 
-    z = bignew(zn, RBIGNUM_SIGN(x) || sign);
+    zn = xn;
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (hibitsx && zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+
+    z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     i = 1;
-    zds[0] = xds[0] & y;
+    zds[0] = xds[0] & BIGLO(y);
 #else
-    {
-	BDIGIT_DBL num = y;
-
-	for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
-	    zds[i] = xds[i] & BIGLO(num);
-	    num = BIGDN(num);
-	}
+    for (i=0; i < xn; i++) {
+        if (y == 0 || y == -1) break;
+        zds[i] = xds[i] & BIGLO(y);
+        y = BIGDN(y);
+    }
+    for (; i < zn; i++) {
+        if (y == 0 || y == -1) break;
+        zds[i] = hibitsx & BIGLO(y);
+        y = BIGDN(y);
     }
 #endif
-    while (i < xn) {
-	zds[i] = sign?0:xds[i];
-	i++;
+    for (;i < xn; i++) {
+	zds[i] = xds[i] & hibitsy;
+    }
+    for (;i < zn; i++) {
+	zds[i] = hibitsx & hibitsy;
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    twocomp2abs_bang(z, hibitsx && hibitsy);
+    RB_GC_GUARD(x);
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     big & numeric   ->  integer
- *
- * Performs bitwise +and+ between _big_ and _numeric_.
- */
-
 VALUE
-rb_big_and(VALUE xx, VALUE yy)
+rb_big_and(VALUE x, VALUE y)
 {
-    volatile VALUE x, y, z;
+    VALUE z;
     BDIGIT *ds1, *ds2, *zds;
-    long i, l1, l2;
-    char sign;
+    long i, xn, yn, n1, n2;
+    BDIGIT hibitsx, hibitsy;
+    BDIGIT hibits1, hibits2;
+    VALUE tmpv;
+    BDIGIT tmph;
+    long tmpn;
 
-    x = xx;
-    y = bit_coerce(yy);
-    if (!RBIGNUM_SIGN(x)) {
-	x = rb_big_clone(x);
-	get2comp(x);
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
+	return rb_num_coerce_bit(x, y, '&');
     }
+
+    hibitsx = abs2twocomp(&x, &xn);
     if (FIXNUM_P(y)) {
-	return bigand_int(x, FIX2LONG(y));
-    }
-    if (!RBIGNUM_SIGN(y)) {
-	y = rb_big_clone(y);
-	get2comp(y);
+	return bigand_int(x, xn, hibitsx, FIX2LONG(y));
     }
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	l1 = RBIGNUM_LEN(y);
-	l2 = RBIGNUM_LEN(x);
-	ds1 = BDIGITS(y);
-	ds2 = BDIGITS(x);
-	sign = RBIGNUM_SIGN(y);
-    }
-    else {
-	l1 = RBIGNUM_LEN(x);
-	l2 = RBIGNUM_LEN(y);
-	ds1 = BDIGITS(x);
-	ds2 = BDIGITS(y);
-	sign = RBIGNUM_SIGN(x);
+    hibitsy = abs2twocomp(&y, &yn);
+    if (xn > yn) {
+        tmpv = x; x = y; y = tmpv;
+        tmpn = xn; xn = yn; yn = tmpn;
+        tmph = hibitsx; hibitsx = hibitsy; hibitsy = tmph;
     }
-    z = bignew(l2, RBIGNUM_SIGN(x) || RBIGNUM_SIGN(y));
+    n1 = xn;
+    n2 = yn;
+    ds1 = BDIGITS(x);
+    ds2 = BDIGITS(y);
+    hibits1 = hibitsx;
+    hibits2 = hibitsy;
+
+    if (!hibits1)
+        n2 = n1;
+
+    z = bignew(n2, 0);
     zds = BDIGITS(z);
 
-    for (i=0; i<l1; i++) {
+    for (i=0; i<n1; i++) {
 	zds[i] = ds1[i] & ds2[i];
     }
-    for (; i<l2; i++) {
-	zds[i] = sign?0:ds2[i];
+    for (; i<n2; i++) {
+	zds[i] = hibits1 & ds2[i];
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    twocomp2abs_bang(z, hibits1 && hibits2);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
     return bignorm(z);
 }
 
 static VALUE
-bigor_int(VALUE x, long y)
+bigor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
 {
     VALUE z;
     BDIGIT *xds, *zds;
-    long xn, zn;
+    long zn;
     long i;
-    char sign;
+    BDIGIT hibitsy;
 
-    sign = (y >= 0);
+    if (y == -1) return INT2FIX(-1);
+    if (xn == 0) return hibitsx ? INT2FIX(-1) : LONG2FIX(y);
+    hibitsy = 0 <= y ? 0 : BDIGMAX;
     xds = BDIGITS(x);
-    zn = xn = RBIGNUM_LEN(x);
-    z = bignew(zn, RBIGNUM_SIGN(x) && sign);
+
+    zn = BIGNUM_LEN(x);
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     i = 1;
-    zds[0] = xds[0] | y;
+    zds[0] = xds[0] | BIGLO(y);
+    if (i < zn)
+        goto y_is_fixed_point;
+    goto finish;
 #else
-    {
-	BDIGIT_DBL num = y;
+    for (i=0; i < xn; i++) {
+        if (y == 0 || y == -1) goto y_is_fixed_point;
+        zds[i] = xds[i] | BIGLO(y);
+        y = BIGDN(y);
+    }
+    if (hibitsx)
+        goto fill_hibits;
+    for (; i < zn; i++) {
+        if (y == 0 || y == -1) goto y_is_fixed_point;
+        zds[i] = BIGLO(y);
+        y = BIGDN(y);
+    }
+  goto finish;
+#endif
 
-	for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
-	    zds[i] = xds[i] | BIGLO(num);
-	    num = BIGDN(num);
-	}
+  y_is_fixed_point:
+    if (hibitsy)
+        goto fill_hibits;
+    for (; i < xn; i++) {
+        zds[i] = xds[i];
     }
-#endif
-    while (i < xn) {
-	zds[i] = sign?xds[i]:(BDIGIT)(BIGRAD-1);
-	i++;
+    if (hibitsx)
+        goto fill_hibits;
+    for (; i < zn; i++) {
+        zds[i] = 0;
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+  goto finish;
+
+  fill_hibits:
+    for (; i < zn; i++) {
+        zds[i] = BDIGMAX;
+    }
+
+  finish:
+    twocomp2abs_bang(z, hibitsx || hibitsy);
+    RB_GC_GUARD(x);
     return bignorm(z);
 }
 
-/*
- * call-seq:
- *     big | numeric   ->  integer
- *
- * Performs bitwise +or+ between _big_ and _numeric_.
- */
-
 VALUE
-rb_big_or(VALUE xx, VALUE yy)
+rb_big_or(VALUE x, VALUE y)
 {
-    volatile VALUE x, y, z;
+    VALUE z;
     BDIGIT *ds1, *ds2, *zds;
-    long i, l1, l2;
-    char sign;
-
-    x = xx;
-    y = bit_coerce(yy);
+    long i, xn, yn, n1, n2;
+    BDIGIT hibitsx, hibitsy;
+    BDIGIT hibits1, hibits2;
+    VALUE tmpv;
+    BDIGIT tmph;
+    long tmpn;
 
-    if (!RBIGNUM_SIGN(x)) {
-	x = rb_big_clone(x);
-	get2comp(x);
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
+	return rb_num_coerce_bit(x, y, '|');
     }
+
+    hibitsx = abs2twocomp(&x, &xn);
     if (FIXNUM_P(y)) {
-	return bigor_int(x, FIX2LONG(y));
+	return bigor_int(x, xn, hibitsx, FIX2LONG(y));
     }
-    if (!RBIGNUM_SIGN(y)) {
-	y = rb_big_clone(y);
-	get2comp(y);
-    }
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	l1 = RBIGNUM_LEN(y);
-	l2 = RBIGNUM_LEN(x);
-	ds1 = BDIGITS(y);
-	ds2 = BDIGITS(x);
-	sign = RBIGNUM_SIGN(y);
-    }
-    else {
-	l1 = RBIGNUM_LEN(x);
-	l2 = RBIGNUM_LEN(y);
-	ds1 = BDIGITS(x);
-	ds2 = BDIGITS(y);
-	sign = RBIGNUM_SIGN(x);
+    hibitsy = abs2twocomp(&y, &yn);
+    if (xn > yn) {
+        tmpv = x; x = y; y = tmpv;
+        tmpn = xn; xn = yn; yn = tmpn;
+        tmph = hibitsx; hibitsx = hibitsy; hibitsy = tmph;
     }
-    z = bignew(l2, RBIGNUM_SIGN(x) && RBIGNUM_SIGN(y));
+    n1 = xn;
+    n2 = yn;
+    ds1 = BDIGITS(x);
+    ds2 = BDIGITS(y);
+    hibits1 = hibitsx;
+    hibits2 = hibitsy;
+
+    if (hibits1)
+        n2 = n1;
+
+    z = bignew(n2, 0);
     zds = BDIGITS(z);
 
-    for (i=0; i<l1; i++) {
+    for (i=0; i<n1; i++) {
 	zds[i] = ds1[i] | ds2[i];
     }
-    for (; i<l2; i++) {
-	zds[i] = sign?ds2[i]:(BDIGIT)(BIGRAD-1);
+    for (; i<n2; i++) {
+	zds[i] = hibits1 | ds2[i];
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    twocomp2abs_bang(z, hibits1 || hibits2);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
     return bignorm(z);
 }
 
 static VALUE
-bigxor_int(VALUE x, long y)
+bigxor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
 {
     VALUE z;
     BDIGIT *xds, *zds;
-    long xn, zn;
+    long zn;
     long i;
-    char sign;
+    BDIGIT hibitsy;
 
-    sign = (y >= 0) ? 1 : 0;
+    hibitsy = 0 <= y ? 0 : BDIGMAX;
     xds = BDIGITS(x);
-    zn = xn = RBIGNUM_LEN(x);
-    z = bignew(zn, !(RBIGNUM_SIGN(x) ^ sign));
+    zn = BIGNUM_LEN(x);
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS == SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     i = 1;
-    zds[0] = xds[0] ^ y;
+    zds[0] = xds[0] ^ BIGLO(y);
 #else
-    {
-	BDIGIT_DBL num = y;
-
-	for (i=0; i<(int)(sizeof(y)/sizeof(BDIGIT)); i++) {
-	    zds[i] = xds[i] ^ BIGLO(num);
-	    num = BIGDN(num);
-	}
+    for (i = 0; i < xn; i++) {
+        zds[i] = xds[i] ^ BIGLO(y);
+        y = BIGDN(y);
+    }
+    for (; i < zn; i++) {
+        zds[i] = hibitsx ^ BIGLO(y);
+        y = BIGDN(y);
     }
 #endif
-    while (i < xn) {
-	zds[i] = sign?xds[i]:~xds[i];
-	i++;
+    for (; i < xn; i++) {
+        zds[i] = xds[i] ^ hibitsy;
+    }
+    for (; i < zn; i++) {
+        zds[i] = hibitsx ^ hibitsy;
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
+    twocomp2abs_bang(z, (hibitsx ^ hibitsy) != 0);
+    RB_GC_GUARD(x);
     return bignorm(z);
 }
-/*
- * call-seq:
- *     big ^ numeric   ->  integer
- *
- * Performs bitwise +exclusive or+ between _big_ and _numeric_.
- */
 
 VALUE
-rb_big_xor(VALUE xx, VALUE yy)
+rb_big_xor(VALUE x, VALUE y)
 {
-    volatile VALUE x, y;
     VALUE z;
     BDIGIT *ds1, *ds2, *zds;
-    long i, l1, l2;
-    char sign;
+    long i, xn, yn, n1, n2;
+    BDIGIT hibitsx, hibitsy;
+    BDIGIT hibits1, hibits2;
+    VALUE tmpv;
+    BDIGIT tmph;
+    long tmpn;
 
-    x = xx;
-    y = bit_coerce(yy);
-
-    if (!RBIGNUM_SIGN(x)) {
-	x = rb_big_clone(x);
-	get2comp(x);
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
+	return rb_num_coerce_bit(x, y, '^');
     }
+
+    hibitsx = abs2twocomp(&x, &xn);
     if (FIXNUM_P(y)) {
-	return bigxor_int(x, FIX2LONG(y));
-    }
-    if (!RBIGNUM_SIGN(y)) {
-	y = rb_big_clone(y);
-	get2comp(y);
-    }
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	l1 = RBIGNUM_LEN(y);
-	l2 = RBIGNUM_LEN(x);
-	ds1 = BDIGITS(y);
-	ds2 = BDIGITS(x);
-	sign = RBIGNUM_SIGN(y);
+	return bigxor_int(x, xn, hibitsx, FIX2LONG(y));
     }
-    else {
-	l1 = RBIGNUM_LEN(x);
-	l2 = RBIGNUM_LEN(y);
-	ds1 = BDIGITS(x);
-	ds2 = BDIGITS(y);
-	sign = RBIGNUM_SIGN(x);
-    }
-    RBIGNUM_SET_SIGN(x, RBIGNUM_SIGN(x)?1:0);
-    RBIGNUM_SET_SIGN(y, RBIGNUM_SIGN(y)?1:0);
-    z = bignew(l2, !(RBIGNUM_SIGN(x) ^ RBIGNUM_SIGN(y)));
+    hibitsy = abs2twocomp(&y, &yn);
+    if (xn > yn) {
+        tmpv = x; x = y; y = tmpv;
+        tmpn = xn; xn = yn; yn = tmpn;
+        tmph = hibitsx; hibitsx = hibitsy; hibitsy = tmph;
+    }
+    n1 = xn;
+    n2 = yn;
+    ds1 = BDIGITS(x);
+    ds2 = BDIGITS(y);
+    hibits1 = hibitsx;
+    hibits2 = hibitsy;
+
+    z = bignew(n2, 0);
     zds = BDIGITS(z);
 
-    for (i=0; i<l1; i++) {
+    for (i=0; i<n1; i++) {
 	zds[i] = ds1[i] ^ ds2[i];
     }
-    for (; i<l2; i++) {
-	zds[i] = sign?ds2[i]:~ds2[i];
+    for (; i<n2; i++) {
+	zds[i] = hibitsx ^ ds2[i];
     }
-    if (!RBIGNUM_SIGN(z)) get2comp(z);
-
+    twocomp2abs_bang(z, (hibits1 ^ hibits2) != 0);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
     return bignorm(z);
 }
 
-static VALUE
-check_shiftdown(VALUE y, VALUE x)
-{
-    if (!RBIGNUM_LEN(x)) return INT2FIX(0);
-    if (RBIGNUM_LEN(y) > SIZEOF_LONG / SIZEOF_BDIGITS) {
-	return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(-1);
-    }
-    return Qnil;
-}
-
-/*
- * call-seq:
- *     big << numeric   ->  integer
- *
- * Shifts big left _numeric_ positions (right if _numeric_ is negative).
- */
-
 VALUE
 rb_big_lshift(VALUE x, VALUE y)
 {
-    long shift;
-    int neg = 0;
+    int lshift_p;
+    size_t shift_numdigits;
+    int shift_numbits;
 
     for (;;) {
 	if (FIXNUM_P(y)) {
-	    shift = FIX2LONG(y);
-	    if (shift < 0) {
-		neg = 1;
-		shift = -shift;
+	    long l = FIX2LONG(y);
+            unsigned long shift;
+	    if (0 <= l) {
+		lshift_p = 1;
+                shift = l;
+            }
+            else {
+		lshift_p = 0;
+		shift = 1+(unsigned long)(-(l+1));
 	    }
-	    break;
+            shift_numbits = (int)(shift & (BITSPERDIG-1));
+            shift_numdigits = shift >> bit_length(BITSPERDIG-1);
+            return bignorm(big_shift3(x, lshift_p, shift_numdigits, shift_numbits));
 	}
-	else if (TYPE(y) == T_BIGNUM) {
-	    if (!RBIGNUM_SIGN(y)) {
-		VALUE t = check_shiftdown(y, x);
-		if (!NIL_P(t)) return t;
-		neg = 1;
-	    }
-	    shift = big2ulong(y, "long", TRUE);
-	    break;
+	else if (RB_BIGNUM_TYPE_P(y)) {
+            return bignorm(big_shift2(x, 1, y));
 	}
 	y = rb_to_int(y);
     }
-
-    x = neg ? big_rshift(x, shift) : big_lshift(x, shift);
-    return bignorm(x);
-}
-
-static VALUE
-big_lshift(VALUE x, unsigned long shift)
-{
-    BDIGIT *xds, *zds;
-    long s1 = shift/BITSPERDIG;
-    int s2 = (int)(shift%BITSPERDIG);
-    VALUE z;
-    BDIGIT_DBL num = 0;
-    long len, i;
-
-    len = RBIGNUM_LEN(x);
-    z = bignew(len+s1+1, RBIGNUM_SIGN(x));
-    zds = BDIGITS(z);
-    for (i=0; i<s1; i++) {
-	*zds++ = 0;
-    }
-    xds = BDIGITS(x);
-    for (i=0; i<len; i++) {
-	num = num | (BDIGIT_DBL)*xds++<<s2;
-	*zds++ = BIGLO(num);
-	num = BIGDN(num);
-    }
-    *zds = BIGLO(num);
-    return z;
 }
 
-/*
- * call-seq:
- *     big >> numeric   ->  integer
- *
- * Shifts big right _numeric_ positions (left if _numeric_ is negative).
- */
-
 VALUE
 rb_big_rshift(VALUE x, VALUE y)
 {
-    long shift;
-    int neg = 0;
+    int lshift_p;
+    size_t shift_numdigits;
+    int shift_numbits;
 
     for (;;) {
 	if (FIXNUM_P(y)) {
-	    shift = FIX2LONG(y);
-	    if (shift < 0) {
-		neg = 1;
-		shift = -shift;
+	    long l = FIX2LONG(y);
+            unsigned long shift;
+            if (0 <= l) {
+                lshift_p = 0;
+                shift = l;
+            }
+            else {
+                lshift_p = 1;
+		shift = 1+(unsigned long)(-(l+1));
 	    }
-	    break;
+            shift_numbits = (int)(shift & (BITSPERDIG-1));
+            shift_numdigits = shift >> bit_length(BITSPERDIG-1);
+            return bignorm(big_shift3(x, lshift_p, shift_numdigits, shift_numbits));
 	}
-	else if (TYPE(y) == T_BIGNUM) {
-	    if (RBIGNUM_SIGN(y)) {
-		VALUE t = check_shiftdown(y, x);
-		if (!NIL_P(t)) return t;
-	    }
-	    else {
-		neg = 1;
-	    }
-	    shift = big2ulong(y, "long", TRUE);
-	    break;
+	else if (RB_BIGNUM_TYPE_P(y)) {
+            return bignorm(big_shift2(x, 0, y));
 	}
 	y = rb_to_int(y);
     }
-
-    x = neg ? big_lshift(x, shift) : big_rshift(x, shift);
-    return bignorm(x);
-}
-
-static VALUE
-big_rshift(VALUE x, unsigned long shift)
-{
-    BDIGIT *xds, *zds;
-    long s1 = shift/BITSPERDIG;
-    int s2 = (int)(shift%BITSPERDIG);
-    VALUE z;
-    BDIGIT_DBL num = 0;
-    long i, j;
-    volatile VALUE save_x;
-
-    if (s1 > RBIGNUM_LEN(x)) {
-	if (RBIGNUM_SIGN(x))
-	    return INT2FIX(0);
-	else
-	    return INT2FIX(-1);
-    }
-    if (!RBIGNUM_SIGN(x)) {
-	save_x = x = rb_big_clone(x);
-	get2comp(x);
-    }
-    xds = BDIGITS(x);
-    i = RBIGNUM_LEN(x); j = i - s1;
-    if (j == 0) {
-	if (RBIGNUM_SIGN(x)) return INT2FIX(0);
-	else return INT2FIX(-1);
-    }
-    z = bignew(j, RBIGNUM_SIGN(x));
-    if (!RBIGNUM_SIGN(x)) {
-	num = ((BDIGIT_DBL)~0) << BITSPERDIG;
-    }
-    zds = BDIGITS(z);
-    while (i--, j--) {
-	num = (num | xds[i]) >> s2;
-	zds[j] = BIGLO(num);
-	num = BIGUP(xds[i]);
-    }
-    if (!RBIGNUM_SIGN(x)) {
-	get2comp(z);
-    }
-    return z;
 }
 
-/*
- *  call-seq:
- *     big[n] -> 0, 1
- *
- *  Bit Reference---Returns the <em>n</em>th bit in the (assumed) binary
- *  representation of <i>big</i>, where <i>big</i>[0] is the least
- *  significant bit.