1 files changed, 6 insertions, 0 deletions
diff --git a/spec/ruby/core/objectspace/weakmap/include_spec.rb b/spec/ruby/core/objectspace/weakmap/include_spec.rb
new file mode 100644
index 0000000000..54ca6b3030
--- /dev/null
+++ b/spec/ruby/core/objectspace/weakmap/include_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../../spec_helper'
+require_relative 'shared/include'
+
+describe "ObjectSpace::WeakMap#include?" do
+  it_behaves_like :weakmap_include?, :include?
+end
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index a72211d03f..0000000000
--- a/.cvsignore
+++ /dev/null
@@ -1,48 +0,0 @@
-*.bak
-*.orig
-*.rej
-*.sav
-*~
-.*.list
-.*.time
-.ccmalloc
-.ppack
-.ext
-.git
-.svn
-.pc
-COPYING.LIB
-ChangeLog.pre-alpha
-ChangeLog.pre1_1
-Makefile
-README.fat-patch
-README.v6
-README.atheos
-archive
-autom4te*.cache
-automake
-beos
-config.cache
-config.h
-config.h.in
-config.log
-config.status
-configure
-libruby.so.*
-miniruby
-newdate.rb
-newver.rb
-parse.c
-patches
-ppack
-preview
-rbconfig.rb
-repack
-riscos
-rubicon
-ruby
-ruby-man.rd.gz
-tmp
-web
-y.output
-y.tab.c
diff --git a/.document b/.document
index 230c50e387..9a5067bc52 100644
--- a/.document
+++ b/.document
@@ -6,11 +6,23 @@
 # Process all the C source files
 *.c
 
-# the lib/ directory (which has its own .document file)
+# prelude
+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
+ChangeLog
+
+NEWS
+
+README
+README.EXT
+README.EXT.ja
+README.ja
+
+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
new file mode 100644
index 0000000000..78ab191c40
--- /dev/null
+++ b/.gdbinit
@@ -0,0 +1,881 @@
+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
+end
+
+# set prompt \033[36m(gdb)\033[m\040
+
+define rp
+  ruby_gdb_init
+  if ruby_dummy_gdb_enums.special_consts
+  end
+  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)
+    printf "%sSYMBOL%s: ", $color_type, $color_end
+    rp_id $id
+  else
+  if ($arg0) == RUBY_Qfalse
+    echo false\n
+  else
+  if ($arg0) == RUBY_Qtrue
+    echo true\n
+  else
+  if ($arg0) == RUBY_Qnil
+    echo nil\n
+  else
+  if ($arg0) == RUBY_Qundef
+    echo undef\n
+  else
+  if (VALUE)($arg0) & RUBY_IMMEDIATE_MASK
+    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)
+    printf "[PROMOTED] "
+  end
+  if ($flags & RUBY_T_MASK) == RUBY_T_NONE
+    printf "%sT_NONE%s: ", $color_type, $color_end
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_NIL
+    printf "%sT_NIL%s: ", $color_type, $color_end
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_OBJECT
+    printf "%sT_OBJECT%s: ", $color_type, $color_end
+    print (struct RObject *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_CLASS
+    printf "%sT_CLASS%s%s: ", $color_type, ($flags & RUBY_FL_SINGLETON) ? "*" : "", $color_end
+    rp_class $arg0
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_ICLASS
+    printf "%sT_ICLASS%s: ", $color_type, $color_end
+    rp_class $arg0
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_MODULE
+    printf "%sT_MODULE%s: ", $color_type, $color_end
+    rp_class $arg0
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_FLOAT
+    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 "%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 "%sT_REGEXP%s: ", $color_type, $color_end
+    set print address off
+    output (char *)(($rsflags & RUBY_FL_USER1) ? \
+	    ((struct RString*)$regsrc)->as.heap.ptr : \
+	    ((struct RString*)$regsrc)->as.ary)
+    set print address on
+    printf " len:%ld ", ($rsflags & RUBY_FL_USER1) ? \
+            ((struct RString*)$regsrc)->as.heap.len : \
+            (($rsflags & (RUBY_FL_USER2|RUBY_FL_USER3|RUBY_FL_USER4|RUBY_FL_USER5|RUBY_FL_USER6)) >> RUBY_FL_USHIFT+2)
+    if $flags & RUBY_FL_USER6
+      printf "(none) "
+    end
+    if $flags & RUBY_FL_USER5
+      printf "(literal) "
+    end
+    if $flags & RUBY_FL_USER4
+      printf "(fixed) "
+    end
+    printf "encoding:%d ", ($flags & RUBY_ENCODING_MASK) >> RUBY_ENCODING_SHIFT
+    print (struct RRegexp *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_ARRAY
+    if ($flags & RUBY_FL_USER1)
+      set $len = (($flags & (RUBY_FL_USER3|RUBY_FL_USER4)) >> (RUBY_FL_USHIFT+3))
+      printf "%sT_ARRAY%s: len=%ld ", $color_type, $color_end, $len
+      printf "(embed) "
+      if ($len == 0)
+	printf "{(empty)} "
+      else
+	output/x *((VALUE*)((struct RArray*)($arg0))->as.ary) @ $len
+	printf " "
+      end
+    else
+      set $len = ((struct RArray*)($arg0))->as.heap.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
+	printf " "
+      else
+	printf "(ownership) capa=%ld ", ((struct RArray*)($arg0))->as.heap.aux.capa
+      end
+      if ($len == 0)
+	printf "{(empty)} "
+      else
+	output/x *((VALUE*)((struct RArray*)($arg0))->as.heap.ptr) @ $len
+	printf " "
+      end
+    end
+    print (struct RArray *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_FIXNUM
+    printf "%sT_FIXNUM%s: ", $color_type, $color_end
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_HASH
+    printf "%sT_HASH%s: ", $color_type, $color_end,
+    if ((struct RHash *)($arg0))->ntbl
+      printf "len=%ld ", ((struct RHash *)($arg0))->ntbl->num_entries
+    end
+    print (struct RHash *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_STRUCT
+    printf "%sT_STRUCT%s: len=%ld ", $color_type, $color_end, \
+      (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+       ($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) >> (RUBY_FL_USHIFT+1) : \
+       ((struct RStruct *)($arg0))->as.heap.len)
+    print (struct RStruct *)($arg0)
+    x/xw (($flags & (RUBY_FL_USER1|RUBY_FL_USER2)) ? \
+          ((struct RStruct *)($arg0))->as.ary : \
+          ((struct RStruct *)($arg0))->as.heap.ptr)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_BIGNUM
+    printf "%sT_BIGNUM%s: sign=%d len=%ld ", $color_type, $color_end, \
+      (($flags & RUBY_FL_USER1) != 0), \
+      (($flags & RUBY_FL_USER2) ? \
+       ($flags & (RUBY_FL_USER5|RUBY_FL_USER4|RUBY_FL_USER3)) >> (RUBY_FL_USHIFT+3) : \
+       ((struct RBignum*)($arg0))->as.heap.len)
+    if $flags & RUBY_FL_USER2
+      printf "(embed) "
+    end
+    print (struct RBignum *)($arg0)
+    x/xw (($flags & RUBY_FL_USER2) ? \
+          ((struct RBignum*)($arg0))->as.ary : \
+          ((struct RBignum*)($arg0))->as.heap.digits)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_RATIONAL
+    printf "%sT_RATIONAL%s: ", $color_type, $color_end
+    print (struct RRational *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_COMPLEX
+    printf "%sT_COMPLEX%s: ", $color_type, $color_end
+    print (struct RComplex *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_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 "%sT_TRUE%s: ", $color_type, $color_end
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_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 "%sT_DATA%s(%s): ", $color_type, $color_end, ((struct RTypedData *)($arg0))->type->wrap_struct_name
+      print (struct RTypedData *)($arg0)
+    else
+      printf "%sT_DATA%s: ", $color_type, $color_end
+      print (struct RData *)($arg0)
+    end
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_MATCH
+    printf "%sT_MATCH%s: ", $color_type, $color_end
+    print (struct RMatch *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_SYMBOL
+    printf "%sT_SYMBOL%s: ", $color_type, $color_end
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_T_UNDEF
+    printf "%sT_UNDEF%s: ", $color_type, $color_end
+    print (struct RBasic *)($arg0)
+  else
+  if ($flags & RUBY_T_MASK) == RUBY_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 "%sT_ZOMBIE%s: ", $color_type, $color_end
+    print (struct RData *)($arg0)
+  else
+    printf "%sunknown%s: ", $color_type, $color_end
+    print (struct RBasic *)($arg0)
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+  end
+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
+    rb_numtable_entry global_symbols.id_str $id
+    if $rb_numtable_rec
+      rp_string $rb_numtable_rec
+    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 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 nd_type
+  print (enum node_type)((((NODE*)($arg0))->flags&RUBY_NODE_TYPEMASK)>>RUBY_NODE_TYPESHIFT)
+end
+document nd_type
+  Print a Ruby' node type.
+end
+
+define nd_file
+  print ((NODE*)($arg0))->nd_file
+end
+document nd_file
+  Print the source file name of a node.
+end
+
+define nd_line
+  print ((unsigned int)((((NODE*)($arg0))->flags>>RUBY_NODE_LSHIFT)&RUBY_NODE_LMASK))
+end
+document nd_line
+  Print the source line number of a node.
+end
+
+# Print members of ruby node.
+
+define nd_head
+  printf "%su1.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.node
+end
+
+define nd_alen
+  printf "%su2.argc%s: ", $color_highlite, $color_end
+  p ($arg0).u2.argc
+end
+
+define nd_next
+  printf "%su3.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u3.node
+end
+
+
+define nd_cond
+  printf "%su1.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.node
+end
+
+define nd_body
+  printf "%su2.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u2.node
+end
+
+define nd_else
+  printf "%su3.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u3.node
+end
+
+
+define nd_orig
+  printf "%su3.value%s: ", $color_highlite, $color_end
+  rp ($arg0).u3.value
+end
+
+
+define nd_resq
+  printf "%su2.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u2.node
+end
+
+define nd_ensr
+  printf "%su3.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u3.node
+end
+
+
+define nd_1st
+  printf "%su1.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.node
+end
+
+define nd_2nd
+  printf "%su2.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u2.node
+end
+
+
+define nd_stts
+  printf "%su1.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.node
+end
+
+
+define nd_entry
+  printf "%su3.entry%s: ", $color_highlite, $color_end
+  p ($arg0).u3.entry
+end
+
+define nd_vid
+  printf "%su1.id%s: ", $color_highlite, $color_end
+  p ($arg0).u1.id
+end
+
+define nd_cflag
+  printf "%su2.id%s: ", $color_highlite, $color_end
+  p ($arg0).u2.id
+end
+
+define nd_cval
+  printf "%su3.value%s: ", $color_highlite, $color_end
+  rp ($arg0).u3.value
+end
+
+
+define nd_cnt
+  printf "%su3.cnt%s: ", $color_highlite, $color_end
+  p ($arg0).u3.cnt
+end
+
+define nd_tbl
+  printf "%su1.tbl%s: ", $color_highlite, $color_end
+  p ($arg0).u1.tbl
+end
+
+
+define nd_var
+  printf "%su1.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.node
+end
+
+define nd_ibdy
+  printf "%su2.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u2.node
+end
+
+define nd_iter
+  printf "%su3.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u3.node
+end
+
+
+define nd_value
+  printf "%su2.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u2.node
+end
+
+define nd_aid
+  printf "%su3.id%s: ", $color_highlite, $color_end
+  p ($arg0).u3.id
+end
+
+
+define nd_lit
+  printf "%su1.value%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.value
+end
+
+
+define nd_frml
+  printf "%su1.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.node
+end
+
+define nd_rest
+  printf "%su2.argc%s: ", $color_highlite, $color_end
+  p ($arg0).u2.argc
+end
+
+define nd_opt
+  printf "%su1.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.node
+end
+
+
+define nd_recv
+  printf "%su1.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.node
+end
+
+define nd_mid
+  printf "%su2.id%s: ", $color_highlite, $color_end
+  p ($arg0).u2.id
+end
+
+define nd_args
+  printf "%su3.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u3.node
+end
+
+
+define nd_noex
+  printf "%su1.id%s: ", $color_highlite, $color_end
+  p ($arg0).u1.id
+end
+
+define nd_defn
+  printf "%su3.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u3.node
+end
+
+
+define nd_old
+  printf "%su1.id%s: ", $color_highlite, $color_end
+  p ($arg0).u1.id
+end
+
+define nd_new
+  printf "%su2.id%s: ", $color_highlite, $color_end
+  p ($arg0).u2.id
+end
+
+
+define nd_cfnc
+  printf "%su1.cfunc%s: ", $color_highlite, $color_end
+  p ($arg0).u1.cfunc
+end
+
+define nd_argc
+  printf "%su2.argc%s: ", $color_highlite, $color_end
+  p ($arg0).u2.argc
+end
+
+
+define nd_cname
+  printf "%su1.id%s: ", $color_highlite, $color_end
+  p ($arg0).u1.id
+end
+
+define nd_super
+  printf "%su3.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u3.node
+end
+
+
+define nd_modl
+  printf "%su1.id%s: ", $color_highlite, $color_end
+  p ($arg0).u1.id
+end
+
+define nd_clss
+  printf "%su1.value%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.value
+end
+
+
+define nd_beg
+  printf "%su1.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u1.node
+end
+
+define nd_end
+  printf "%su2.node%s: ", $color_highlite, $color_end
+  rp ($arg0).u2.node
+end
+
+define nd_state
+  printf "%su3.state%s: ", $color_highlite, $color_end
+  p ($arg0).u3.state
+end
+
+define nd_rval
+  printf "%su2.value%s: ", $color_highlite, $color_end
+  rp ($arg0).u2.value
+end
+
+
+define nd_nth
+  printf "%su2.argc%s: ", $color_highlite, $color_end
+  p ($arg0).u2.argc
+end
+
+
+define nd_tag
+  printf "%su1.id%s: ", $color_highlite, $color_end
+  p ($arg0).u1.id
+end
+
+define nd_tval
+  printf "%su2.value%s: ", $color_highlite, $color_end
+  rp ($arg0).u2.value
+end
+
+define rb_p
+  call rb_p($arg0)
+end
+
+define rb_numtable_entry
+  set $rb_numtable_tbl = $arg0
+  set $rb_numtable_id = (st_data_t)$arg1
+  set $rb_numtable_key = 0
+  set $rb_numtable_rec = 0
+  if $rb_numtable_tbl->entries_packed
+    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 + 1
+      end
+    end
+  else
+    set $rb_numtable_p = $rb_numtable_tbl->as.big.bins[$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
+	set $rb_numtable_rec = $rb_numtable_p->record
+	set $rb_numtable_p = 0
+      else
+	set $rb_numtable_p = $rb_numtable_p->next
+      end
+    end
+  end
+end
+
+define rb_id2name
+  printf "%sID%s: ", $color_type, $color_end
+  rp_id $arg0
+end
+document rb_id2name
+  Print the name of id
+end
+
+define rb_method_entry
+  set $rb_method_entry_klass = (struct RClass *)$arg0
+  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
+    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
+    end
+  end
+  if $rb_method_entry_me
+    print *$rb_method_entry_klass
+    print *$rb_method_entry_me
+  else
+    echo method not found\n
+  end
+end
+document rb_method_entry
+  Search method entry by class and id
+end
+
+define rb_classname
+  # 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 = ((struct RClass *)($rb_ancestors_module))->ptr.super
+  end
+end
+document rb_ancestors
+  Print ancestors.
+end
+
+define rb_backtrace
+  call rb_backtrace()
+end
+
+define iseq
+  if ruby_dummy_gdb_enums.special_consts
+  end
+  if ($arg0)->type == ISEQ_ELEMENT_NONE
+    echo [none]\n
+  end
+  if ($arg0)->type == ISEQ_ELEMENT_LABEL
+    print *(LABEL*)($arg0)
+  end
+  if ($arg0)->type == ISEQ_ELEMENT_INSN
+    print *(INSN*)($arg0)
+    if ((INSN*)($arg0))->insn_id != YARVINSN_jump
+      set $i = 0
+      set $operand_size = ((INSN*)($arg0))->operand_size
+      set $operands = ((INSN*)($arg0))->operands
+      while $i < $operand_size
+	rp $operands[$i++]
+      end
+    end
+  end
+  if ($arg0)->type == ISEQ_ELEMENT_ADJUST
+    print *(ADJUST*)($arg0)
+  end
+end
+
+define rb_ps
+  rb_ps_vm ruby_current_vm
+end
+document rb_ps
+Dump all threads and their callstacks
+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->as.packed.entries[$ps_threads_i].key
+      set $ps_threads_val = (st_data_t)$ps_threads->as.packed.entries[$ps_threads_i].val
+      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
+    end
+  end
+end
+document rb_ps_vm
+Dump all threads in a (rb_vm_t*) and their callstacks
+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
+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
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000..9cd98beee1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,135 @@
+*-*-*.def
+*.a
+*.bak
+*.dSYM
+*.dmyh
+*.dylib
+*.elc
+*.inc
+*.log
+*.o
+*.orig
+*.rej
+*.sav
+*.swp
+*~
+.*-*
+.*.list
+.*.time
+.DS_Store
+.ccmalloc
+.ext
+.pc
+.ppack
+.svn
+Makefile
+extconf.h
+y.output
+y.tab.c
+
+# /
+/*.pc
+/*_prelude.c
+/COPYING.LIB
+/ChangeLog-1.8.0
+/ChangeLog.pre-alpha
+/ChangeLog.pre1_1
+/Doxyfile
+/GNUmakefile
+/README.atheos
+/README.fat-patch
+/README.v6
+/TAGS
+/archive
+/autom4te*.cache
+/automake
+/beos
+/breakpoints.gdb
+/config.cache
+/config.h
+/config.h.in
+/config.status
+/config.status.lineno
+/configure
+/doc/capi
+/enc.mk
+/encdb.h
+/exts.mk
+/goruby
+/id.[ch]
+/largefile.h
+/lex.c
+/libruby*.*
+/miniprelude.c
+/miniruby
+/newdate.rb
+/newline.c
+/newver.rb
+/parse.c
+/parse.h
+/patches
+/patches-master
+/pitest.rb
+/ppack
+/prelude.c
+/preview
+/probes.h
+/rbconfig.rb
+/rename2.h
+/repack
+/revision.h
+/riscos
+/rubicon
+/ruby
+/ruby-man.rd.gz
+/sizes.c
+/test.rb
+/tmp
+/transdb.h
+/uncommon.mk
+/verconf.h
+/web
+/yasmdata.rb
+
+# /benchmark/
+/benchmark/bmx_*.rb
+
+# /enc/trans/
+/enc/trans/*.c
+
+# /ext/
+/ext/extinit.c
+
+# /ext/dl/callback/
+/ext/dl/callback/callback-*.c
+/ext/dl/callback/callback.c
+
+# /ext/rbconfig/
+/ext/rbconfig/sizeof/sizes.c
+
+# /ext/ripper/
+/ext/ripper/eventids1.c
+/ext/ripper/eventids2table.c
+/ext/ripper/ripper.*
+/ext/ripper/ids1
+/ext/ripper/ids2
+
+# /ext/socket/
+/ext/socket/constants.h
+/ext/socket/constdefs.h
+/ext/socket/constdefs.c
+
+# /ext/tk/
+/ext/tk/config_list
+
+# /spec/
+/spec/mspec
+/spec/rubyspec
+
+# /tool/
+/tool/config.guess
+/tool/config.sub
+
+# /win32/
+/win32/*.ico
+/win32/.time
diff --git a/.indent.pro b/.indent.pro
new file mode 100644
index 0000000000..6a207a0554
--- /dev/null
+++ b/.indent.pro
@@ -0,0 +1,21 @@
+-bap
+-nbbb
+-nbc
+-br
+-nbs
+-ncdb
+-ce
+-cli0.5
+-ndj
+-ei
+-nfc1
+-i4
+-l120
+-lp
+-npcs
+-psl
+-sc
+-sob
+
+-TID
+-TVALUE
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000000..8db00587d6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,86 @@
+# 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
+
+# Compilers.  Several  compilers are  provided in Travis,  so we try  them all.
+# The value set here is visible via $CC environment variable.
+compiler:
+  - gcc
+  - clang
+
+# 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:
+  - "sudo apt-get -qq update"
+  - "sudo apt-get -qq install $CC" # upgrade if any
+install: "sudo apt-get -qq build-dep ruby1.9.1 2>/dev/null"
+
+# 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:
+  - "make -f common.mk BASERUBY=ruby srcdir=. update-config_files"
+  - "autoconf"
+  - "mkdir config_1st config_2nd"
+  - "./configure -C --with-gcc=$CC"
+  - "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 -sj encs"
+  - "make -sj exts"
+script:
+  - "make test OPTS=-v"
+#  - "make test-all TESTS='-v'"
+
+# Branch matrix.  Not all branches are Travis-ready so we limit branches here.
+branches:
+  only:
+    - trunk
+    - ruby_1_9_3
+
+# 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: change # [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
+
+# 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
new file mode 100644
index 0000000000..a009caefea
--- /dev/null
+++ b/BSDL
@@ -0,0 +1,22 @@
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
diff --git a/COPYING b/COPYING
index 9043404a83..a1f19ff99d 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Ruby is copyrighted free software by Yukihiro Matsumoto <matz@netlab.jp>.
-You can redistribute it and/or modify it under either the terms of the GPL
-version 2 (see the file GPL), or the conditions below:
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
 
   1. You may make and give away verbatim copies of the source form of the
      software without restriction, provided that you duplicate all of the
diff --git a/COPYING.ja b/COPYING.ja
index 933cc7cb9a..e50d01c8d1 100644
--- a/COPYING.ja
+++ b/COPYING.ja
@@ -1,51 +1,51 @@
-$BK\%W%m%0%i%`$O%U%j!<%=%U%H%&%'%"$G$9!%(BGPL(the GNU General
-Public License)$B$^$?$O0J2<$K<($9>r7o$GK\%W%m%0%i%`$r:FG[I[$G(B
-$B$-$^$9!%(BGPL$B$K$D$$$F$O(BGPL$B%U%!%$%k$r;2>H$7$F2<$5$$!%(B
+本プログラムはフリーソフトウェアです．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 e001f25239..2540307c53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,25483 +1,16182 @@
-Sat Dec 10 20:44:23 2011  Tanaka Akira  <akr@fsij.org>
+Sat Nov 23 03:44:03 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/securerandom.rb: call OpenSSL::Random.seed at the
-	  SecureRandom.random_bytes call.
-	  insert separators for array join.
-	  patch by Masahiro Tomita.  [ruby-dev:44270]
+	* lib/rubygems:  Update to RubyGems master dcce4ff.  Important changes
+	  in this commit:
 
-Mon Oct 17 04:20:22 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Remove automatic detection of gem dependencies files.  This prevents a
+	  security hole as described in [ruby-core:58490]
 
-	* mkconfig.rb: fix for continued lines.  based on a patch from
-	  Marcus Rueckert <darix AT opensu.se> at [ruby-core:20420].
+	  Fixed bugs for installing git gems.
 
-Mon Oct 17 04:19:39 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/rubygems:  ditto.
 
-	* numeric.c (flo_cmp): Infinity is greater than any bignum
-	  number.  [ruby-dev:38672]
+Fri Nov 22 22:30:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* bignum.c (rb_big_cmp): ditto.
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power):
+	  Round the result value only if the precision is given.
 
-Mon Oct 17 03:56:12 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+Fri Nov 22 17:20:50 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): initialize
-	  store->ex_data.sk.  [ruby-core:28907] [ruby-core:23971]
-	  [ruby-core:18121]
+	* transcode.c (str_transcode0): don't scrub invalid chars if
+	  str.encode doesn't have explicit invalid: :replace.
+	  workaround fix for see #8995
 
-Thu Jun 30 12:52:56 2011  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri Nov 22 17:11:26 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
+	* include/ruby/intern.h, internal.h: Expose rb_gc_count().
 
-Sun Jun 26 17:52:32 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
+Fri Nov 22 17:07:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-        * 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.
+	* ext/bigdecimal/bigdecimal.gemspec: version 1.2.2.
 
-Sun Jun 26 17:52:32 2011  Nobuhiro Iwamatsu  <iwamatsu@nigauri.org>
+Fri Nov 22 17:04:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* 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
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_data_type):
+	  Use RUBY_TYPED_FREE_IMMEDIATELY only if it is available.
 
-Sun Jun 26 17:46:43 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Fri Nov 22 16:49:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* ext/tk/extconf.rb: copy from trunk, as requested by Hidetoshi NAGAI.
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): Round the result value.
+	  [Bug #8818] [ruby-core:56802]
 
-Thu Jun 23 18:38:43 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+	* test/bigdecimal/test_bigdecimal.rb: Add a test for the above fix.
 
-	backported r26281 from ruby_1_8
+Fri Nov 22 16:25:43 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/webrick/accesslog.rb (WEBrick::AccessLog.format): log parameter
-	  embedding did not work. See #4913.
+	* gc.c (heap_set_increment): accept minimum additional page number.
 
-	* test/webrick/test_accesslog.rb: Add for test it.
+	* gc.c (gc_after_sweep): allocate pages to allocate at least
+	   RUBY_HEAP_MIN_SLOTS.
+	   [Bug #9137]
 
-Thu Jun 16 22:55:02 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+Fri Nov 22 16:19:52 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-	* 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.
+	* include/ruby/intern.h (rb_gc_set_params): Deprecate
+	  rb_gc_set_params because it's only used in ruby internal.
 
-Mon Jun 13 18:33:04 2011  Tanaka Akira  <akr@fsij.org>
+	* internal.h (ruby_gc_set_params): Declare rb_gc_set_params's
+	  alias function.
 
-	* lib/securerandom.rb (SecureRandom.random_bytes): modify PRNG state
-	  to prevent random number sequence repeatation at forked
-	  child process which has same pid.
-	  reported by Eric Wong.  [ruby-core:35765]
+	* gc.c: ditto.
 
-Thu Jun  2 18:33:51 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* ruby.c: use ruby_gc_set_params.
 
-	* variable.c (rb_const_get_0):  Fix  previous change.   There were
-	  possibilities   when   an   autoload-specified   library   lacks
-	  definition of  the constant  it was bound  to.  Once  after such
-	  library had  already beed loaded, the autoload  engine shall not
-	  reload  it.   Instead  the  interpreter have  to  consider  such
-	  constant nonexistent.  It results in a const_missing situation.
+Fri Nov 22 14:55:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* variable.c (rb_autoload_load): ditto.
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Insert rb_thread_check_ints.
 
-	* variable.c (autoload_node): ditto.
+Fri Nov 22 14:35:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-Thu Jun  2 18:28:58 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix the inserting points
+	  of RB_GC_GUARDs.
 
-	* variable.c (rb_autoload_load):  There is a  race condition while
-	  autoloading.  When two or more threads touch a single autoloaded
-	  constant at  a time,  one of them  does the require,  but others
-	  behave  oddly.   To  fix  this  situation we  now  refrain  from
-	  deleting the autoload table while someone is doing the autoload.
-	  That  deletion is  deferred to  a  point where  a require  ended
-	  successfully.  Doing so make it possible for multiple threads to
-	  enter autoloading at the same  time but the require is protected
-	  against  multiple simultaneous  entrance anyway  so all  but one
-	  thread  gets blocked  at that  point.   So with  it, touching  a
-	  constant that gets autoloaded cause those threads to block until
-	  there is another one that does the same thing.
-	  [ruby-core:36308] (#921)
+Fri Nov 22 14:31:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* variable.c (rb_const_get_0): ditto.
+	* ext/bigdecimal/bigdecimal.c: Fix indentation.
 
-	* variable.c (autoload_node): ditto.
+Fri Nov 22 14:03:00 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* variable.c (autoload_delete): ditto.
+	* ext/nkf: merge nkf 2.1.3 2a2f2c5.
 
-Mon May 30 10:58:17 2011  Hiroshi Nakamura  <nahi@ruby-lang.org>
+Fri Nov 22 12:43:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/logger.rb (Logger::ProgName): do not depend on subversion
-	  keyword ($Id$). ProgName with revision number was written in the
-	  header line of each logfile for ease of tracking what version user
-	  is using in troubleshooting.  Logger is already stable enough.
+	* util.c (ruby_strtod): ignore too long fraction part, which does not
+	  affect the result.
 
-Sat May 21 07:33:54 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+Fri Nov 22 12:17:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
-	  This caused failure when test/csv is executed with GC.stress = true.
+	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#initialize):
+	  initialize of a module should pass arguments to super.
 
-Sat May 21 05:43:03 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Fri Nov 22 12:02:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_thread_atfork): When a ruby process forks, its random
-	  seed shall be reinitialized to prevent CVE-2003-0900 situation.
-	  This bug affects for 1.8 and earlier series, but not for 1.9.
-	  fixed [ruby-core:34944].
+	* test/ruby/test_settracefunc.rb: Ignore events from other threads.
 
-	* io.c (pipe_open): ditto.
+Fri Nov 22 10:35:57 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* random.c (rb_reset_random_seed): ditto.
+	* vm.c (ruby_vm_destruct): do not use ruby_xfree() after freeing
+	  objspace.
 
-	* intern.h (rb_reset_random_seed): ditto.
+	* gc.c (ruby_mimfree): added. It is similar to ruby_mimmalloc().
 
-Sat May 21 04:55:15 2011  Akinori MUSHA  <knu@iDaemons.org>
+	* internal.h: 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]
+Fri Nov 22 09:42:35 2013  Zachary Scott  <e@zzak.io>
 
-Sat May 21 04:54:20 2011  Akinori MUSHA  <knu@iDaemons.org>
+	* test/digest/test_digest.rb: Reverse order of assert_equal
+	  Reported by @splattael
 
-	* lib/fileutils.rb (FileUtils#touch): Fix corrupted output.
-	  ref [ruby-dev:43401]
+Fri Nov 22 09:03:16 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sat May 21 02:10:09 2011  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c: fix build failure on FreeBSD introduced by r43763.
+	  malloc_usable_size() is defined by malloc_np.h on FreeBSD.
 
-	* re.h (RMATCH_REGS): parenthesize cast expression.  suggested
-	  from Nikolai Weibull in [ruby-core:35825].
+	* configure.in: check malloc.h and malloc_np.h.
 
-Sat May 21 01:32:08 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov 22 08:27:13 2013  Eric Hodel  <drbrain@segment7.net>
 
-	backported r31286 from trunk
+	* lib/rubygems:  Update to RubyGems master 50a8210.  Important changes
+	  in this commit:
 
-	* numeric.c (ruby_float_step): wrong loop condition.
-	  fixes [ruby-core:35753], reported by Joey Zhou.
+	  RubyGems now automatically checks for gem.deps.rb or Gemfile when
+	  running ruby executables.  This behavior is similar to `bundle exec
+	  rake`.  This change may be reverted before Ruby 2.1.0 if too many bugs
+	  are found.
 
-	* test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753):
-	  test above change.
+	* test/rubygems:  ditto.
 
-Sat May 21 00:55:21 2011  NARUSE, Yui  <naruse@ruby-lang.org>
+Thu Nov 21 22:33:59 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* 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
+	* gc.c: RGENGC_CHECK_MODE should be 0.
 
-Fri May 20 23:46:44 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Nov 21 21:40:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* ext/socket/{getaddrinfo,getnameinfo}.c: include winsock2.h only when
-	  specified to use winsock2 by user.
-	  this problem is reported by kosaki.
+	* ext/bigdecimal/bigdecimal.c (VpAlloc): Fix the expr to adjust the size
+	  of the digit array.
 
-Fri May 20 23:23:45 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Nov 21 21:36:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* ext/socket/socket.c (make_addrinfo): skip IPv6 addresses when ruby
-	  doesn't support IPv6 but system supports it.
-	  [ruby-dev:42944] (#4230)
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_sqrt): Fix the precision of
+	  the result BigDecimal of sqrt.
+	  [Bug #5266] [ruby-dev:44450]
 
-Fri May 20 23:10:07 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/bigdecimal/test_bigdecimal.rb: add tests for the above changes.
 
-	* win32/README.win32: note to need NT based OS to build ruby.
+Thu Nov 21 18:49:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/{configure.bat,setup.mak}: backport current build method from
-	  trunk. [ruby-dev:42893] (#4206)
+	* gc.c (vm_xrealloc, vm_xfree): use malloc_usable_size() to obtain old
+	  size if available.
 
-Fri May 20 23:06:31 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Nov 21 18:47:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* Backported the fix at
-	  Mon Sep 13 09:23:58 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/delegate.rb (SimpleDelegator#__getobj__): target object must be set.
 
-	* ext/openssl/ossl_bn.c (ossl_bn_is_prime): fix comparison
-	  with rb_scan_args. Before this fix, OpenSSL::BN#prime?
-	  is fully broken.
+	* lib/delegate.rb (DelegateClass#__getobj__): ditto.
 
-Fri May 20 23:06:31 2011  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Nov 21 18:28:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* Backported the fix at
-	  Mon Oct  4 09:30:42 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/tempfile.rb (Tempfile#initialize): use class method to get rid
+	  of warnings when $VERBOSE.
 
-	* 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]
+Thu Nov 21 17:43:29 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Feb 18 21:18:55 2011  Shugo Maeda  <shugo@ruby-lang.org>
+	* gc.c: rename initial_xxx variables to gc_params.xxx.
+	  They are not only used initial values.
 
-	* test/ruby/test_exception.rb (TestException::test_to_s_taintness_propagation):
-	  Test for below.
+	  Chikanaga-san: Congratulations on RubyPrize!
 
-Fri Feb 18 21:18:55 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Thu Nov 21 17:16:00 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* error.c (exc_to_s): untainted strings can be tainted via
-	  Exception#to_s, which enables attackers to overwrite sane strings.
-	  Reported by: Yusuke Endoh <mame at tsg.ne.jp>.
+	* gc.c: enable "RGENGC_ESTIMATE_OLDSPACE" option as default.
+	  Without this option, some application consumes huge memory.
+	  (and there are only a few performance down)
 
-	* error.c (name_err_to_s): ditto.
+	  Introduced new environment variables:
+	  * RUBY_GC_HEAP_OLDSPACE (default 16MB)
+	  * RUBY_GC_HEAP_OLDSPACE_MAX (default 128 MB)
+	  * RUBY_GC_HEAP_OLDSPACE_GROWTH_FACTOR (default 1.2)
 
-Fri Feb 18 21:17:22 2011  Shugo Maeda  <shugo@ruby-lang.org>
+	* gc.c (initial_malloc_limit): rename to initial_malloc_limit_min.
 
-	* 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>
+Thu Nov 21 16:51:34 2013  Zachary Scott  <e@zzak.io>
 
-Fri Feb 18 19:46:46 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/digest/bubblebabble/bubblebabble.c: Teach RDoc digest/bubblebabble
 
-	* win32/win32.c (init_stdhandle): backport mistake of r29382.
-	  some code are needless in ruby 1.8.
-	  [ruby-core:34579]
+Thu Nov 21 16:50:16 2013  Zachary Scott  <e@zzak.io>
 
-Fri Feb 18 19:22:17 2011  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* test/digest/test_digest.rb: Add more tests for digest/bubblebabble
 
-	* configure.in: revert revision r29854.  This revision introduced
-	  binary incompatibilities on some circumstances.  The bug that
-	  revision was fixing gets reopened by this reversion.
-	  [ruby-dev:43152] cf. [Bug #2553]
+Thu Nov 21 16:32:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Dec 23 12:22:35 2010  Tanaka Akira  <akr@fsij.org>
+	* lib/delegate.rb (Delegator#method_missing): try private methods defined in
+	  Kernel after the target.  [Fixes GH-449]
 
-	* lib/resolv.rb (Resolv::IPv4::Regex): make it only accept 0 to 255.
-	  [ruby-core:29501]
+Thu Nov 21 16:25:08 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Tue Dec 21 01:43:01 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* test/uri/test_generic.rb (URI#test_merge): Test uri + URI(path)
+	  in addition to uri + path.
 
-	* lib/webrick/https.rb: uninitialized instance variables.
-	  Backport a part of r20864 for ruby_1_8.
+Thu Nov 21 15:36:08 2013  Zachary Scott  <e@zzak.io>
 
-Sat Dec  4 11:35:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/lib/openssl/buffering.rb: [DOC] Fix HEREDOC comment for
+	  OpenSSL::Buffering which breaks overview because of RDoc bug
 
-	* lib/mkmf.rb (init_mkmf): needs default library path even if
-	  cross compiling.
+Thu Nov 21 14:46:57 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Dec  4 11:25:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* eval_intern.h (SAVE_ROOT_JMPBUF): workaround for the failure of
+	  test/ruby/test_exception.rb on Windows.
+	  wrap by __try and __exception statements on mswin to raise SIGSEGV
+	  when EXCEPTION_STACK_OVERFLOW is occurred, because MSVCRT doesn't
+	  handle the exception.
+	  however, (1) mingw-gcc doesn't support __try and __exception
+	  statements, and (2) we cannot retry SystemStackError after this
+	  change yet (maybe crashed) because SEH and longjmp() are too
+	  uncongenial.
 
-	* re.c (rb_reg_regcomp): should succeed the taint status from the
-	  origin. [ruby-core:33338]
+	* signal.c (check_stack_overflow, CHECK_STACK_OVERFLOW): now defined on
+	  Windows, too.
 
-Thu Dec  2 21:13:42 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* thread_win32.c (ruby_stack_overflowed_p): ditto.
 
-	* Makefile.in (fake.rb): need to expand the topdir in case of it
-	  being relative, a patch from Luis Lavena <luislavena at gmail.com>.
-	  [ruby-core:33466]
+Thu Nov 21 14:18:24 2013  Zachary Scott  <e@zzak.io>
 
-Wed Nov 24 18:24:26 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* object.c: [DOC] Clarify Object#dup vs #clone [Bug #9128]
+	  Moving existing doc for this comparison to separate section of #dup
+	  Adding examples to document behavior of #dup with Module#extend.
+	  Based on a patch by stevegoobermanhill
 
-	* ext/socket/extconf.rb: backported entirely from ruby_1_8, with small
-	  modifications for the difference of mkmf.rb.
+Thu Nov 21 14:06:02 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Nov 24 16:24:24 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_marks_check): do not dump all refs.
 
-	* mkconfig.rb (patchlevel): config.status may not contain
-	  PATCHLEVEL even if other version numbers exist.
+	* gc.c (allrefs_dump_i): fix output format.
 
-Wed Nov 24 16:18:02 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Thu Nov 21 13:43:07 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/Makefile.sub ($(RCFILES)): no revision.h in this
-	  branch, a patch from Luis Lavena <luislavena at gmail.com>.
-	  [ruby-core:33310]
+	* gc.c: change RGENGC_CHECK_MODE (>= 2) logic.
+	  Basically, make an object graph of all of living objects before and
+	  after marking and check status.
 
-	* cygwin/GNUmakefile.in ($(RCFILES)): ditto.
+	  [Before marking: check WB sanity]
+	  If there is a non-old object `obj' pointed from old object
+	  (`parent') then `parent' or `obj' should be remembered.
 
-Wed Nov 24 15:44:11 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	  [After marking: check marking miss]
+	  Traversible objects with the object graph should be marked.
+	  (However, this alert about objects pointed by machine context
+	   can be false positive. We only display alert.)
 
-	* ext/socket/extconf.rb (getaddrinfo): should initialize winsock on
-	  windows.
+	  [Implementation memo]
+	  objspace_allrefs() creates an object graph.
+	  The object graph is represented by st_table, key is object (VALUE)
+	  and value is referring objects. Referring objects are stored by
+	  "struct reflist".
 
-Wed Nov 24 13:55:21 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c (init_mark_stack): do not use push_mark_stack_chunk() at init.
+	  This pre-allocation causes failure on is_mark_stask_empty()
+	  without any pushing.
 
-	* 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.
+Thu Nov 21 13:40:20 2013  Zachary Scott  <e@zzak.io>
 
-Wed Nov 24 13:27:34 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/observer.rb: [DOC] Clarify default observer method.
+	  By @edward [Fixes GH-450] https://github.com/ruby/ruby/pull/450
 
-	* ext/stringio/stringio.c (strio_getline): fix for "" as separator.
-	  [ruby-dev:34591] (Backport r17739 by Yusuke Endoh from trunk).
+Thu Nov 21 13:32:53 2013  Zachary Scott  <e@zzak.io>
 
-Wed Nov 24 13:27:20 2010  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* ext/openssl/ossl_engine.c: [DOC] Documentation for OpenSSL::Engine
+	  This patch is based off work by @vbatts in GH-436 completing the
+	  documentation for this class and its methods.
+	  https://github.com/ruby/ruby/pull/436
 
-	* lib/net/pop.rb (Net::POP3#set_all_uids): speed
-	  up. a patch from <m-sumi AT techfirm.co.jp> [ruby-list:45047]
+Thu Nov 21 10:45:22 2013  Zachary Scott  <e@zzak.io>
 
-Tue Nov 23 20:48:10 2010  Shugo Maeda  <shugo@ruby-lang.org>
+	* ext/openssl/lib/openssl/buffering.rb: Remove unused arguments from
+	  OpenSSL::Buffering.new [Fixes GH-445]
 
-	* lib/net/imap.rb (initialize): sets sync_close to true.
-	  Thanks, Hiroshi NAKAMURA.  [ruby-core:31753]
+Thu Nov 21 10:30:47 2013  Zachary Scott  <e@zzak.io>
 
-Tue Nov 23 17:09:14 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/digest/test_digest.rb: Add test for Digest::SHA256.bubblebabble
 
-	* lib/pathname.rb (relative_path_from): backport r23093 and r25440
-	  from ruby_1_9_2.  [ruby-core:32415]
+Wed Nov 20 20:54:01 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Mon Nov 22 14:13:45 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+	* tool/instruction.rb : fix typo.
 
-	* ext/win32ole/win32ole.c: fix checking version of GCC.
+Wed Nov 20 19:45:22 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Nov 22 14:13:45 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+	* random.c (rand_init): Make it possible to specify arbitrary array
+	  for init_genrand().
 
-	* ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc
-	  version is older than 3.4.4. [ruby-core:31567] [Bug #3637]
-	* ext/win32ole/extconf.rb: ditto.
+Wed Nov 20 17:34:13 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Nov 19 19:28:00 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* parse.y (rb_gc_mark_symbols): set global_symbols.minor_marked only
+	  when full_mark is 0.
+	  rb_gc_mark_symbols() (with full_mark == 1) can be called by other
+	  than GC (such as rb_objspace_reachable_objects_from_root()).
 
-	* Makefile.in (fake.rb): hook needed to fake mkmf.rb.
-	  #2531 [ruby-core:27327]
+Wed Nov 20 11:46:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Oct 18 10:21:01 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	* ext/json: merge JSON 1.8.1.
+	  https://github.com/nurse/json/compare/002ac2771ce32776b32ccd2d06e5604de6c36dcd...e09ffc0d7da25d0393873936c118c188c78dbac3
+	* Remove Rubinius exception since transcoding should be working now.
+	* Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
+	  Lafortune <github_rocks@marc-andre.ca>. Thanks!
+	* Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress
+	  warning with -Wchar-subscripts and better validate UTF-8 strings.
+	* Applied patch by ginriki@github to remove unnecessary if.
+	* Add load/dump interface to JSON::GenericObject to make
+	  serialize :some_attribute, JSON::GenericObject
+	  work in Rails active models for convenient
+	  SomeModel#some_attribute.foo.bar access to serialised JSON data.
 
-	* lib/net/http.rb (transport_request): @socket may be nil.
-	  patched by Egbert Eich [ruby-core:32829]
+Wed Nov 20 01:39:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Oct  8 10:51:56 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rdoc/constant.rb (RDoc::Constant#documented?): workaround for
+	  NoMethodError when the original of alias is not found.
 
-	* common.mk (RBCONFIG): depends on version.h due to
-	  RUBY_PATCHLEVEL.  [ruby-core:32709]
+Tue Nov 19 23:38:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Oct  7 18:10:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in (--with-os-version-style): option to transform target
+	  OS version string.
 
-	* cygwin/GNUmakefile.in, win32/Makefile.sub (RCFILES): depend on
-	  real config.rb file.  [ruby-core:32709]
+Tue Nov 19 21:27:33 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Oct  3 18:30:23 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/net/http/utils.rb (spawn_server): Specify zero for port to
+	  avoid reusing an allocated port.
 
-	* parse.y (rb_intern): should check symbol table overflow.
-	  #3900 [ruby-dev:42330]
+	* test/net/http/test_http.rb: Don't specify port here.
 
-Fri Oct  1 15:12:05 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/net/http/test_https.rb: Ditto.
 
-	* win32/win32.c (init_stdhandle): redirect unopened IOs to NUL.
-	  backport r11362 from trunk. [ruby-core:31445]
+Tue Nov 19 18:52:10 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Aug 23 11:42:41 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* gc.c (heap_is_swept_object): use heap_page::before_sweep flag.
 
-	* ext/openssl/ossl_asn1.c (obj_to_asn1bool): fixed ASN1::Boolean
-	  encoding issue for OpenSSL 1.0.0 compatibility.
-	  ASN1::Boolean.new(false).to_der wrongly generated "\1\1\377" which
-	  means 'true'.  [BUG:3735] 
-	  
-	  ASN1_TYPE_set of OpenSSL <= 0.9.8 treats value 0x100 as 'false' but
-	  OpenSSL >= 1.0.0 treats it as 'true'.  ruby-ossl was using 0x100 for
-	  'false' for backward compatibility.  Just use 0x0 for the case
-	  OpenSSL >= OpenSSL 0.9.7.
+Tue Nov 19 18:49:32 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* test/openssl/test_asn1.rb: test added.
+	* gc.c (rb_objspace_reachable_objects_from_root): do major marking.
 
-Tue Aug 10 17:35:49 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+Tue Nov 19 18:45:40 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri):
-	  rollup leading slashes. [ruby-core:31657]
-	  patched by Jamison Wilde
-	  NOTE: //authority/path is valid relative URI both RFC2396 and
-	  RFC3986. So when give a relative URI-like string to URI lib,
-	  users must care leading slashes.
+	* gc.c (rb_gc_resurrect): added.
+	  rb_fstring() used rb_gc_mark() to avoid freeing used string.
+	  However, rb_gc_mark() set mark bit *and* pushes mark_stack.
+	  rb_gc_resurrect() does only set mark bit if it is before sweeping.
 
-Fri Jul 30 08:51:51 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_fstring): use rb_gc_resurrect.
 
-	* file.c (file_expand_path): home directory must be absolute.
-	  [ruby-core:31537]
+	* internal.h: add decl.
 
-Fri Jul 30 08:33:20 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Nov 19 09:47:02 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* file.c (file_expand_path): should check if could find user.
-	  [ruby-core:31538]
+	* lib/rdoc:  Update to RDoc master a1195ce.  Changes include:
 
-Thu Jul 29 22:43:57 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	  Improved accessibility of the main sidebar navigation.
 
-	* lib/webrick/ssl.rb (WEBrick::Utils.create_self_signed_cert): wrongly
-	  created dummy SSL certificate with version == 3 (no such version) and
-	  serial == 0 (must be >0).
+	  Fixed handling of regexp options in HTML source highlighting.
 
-Sat Jul 24 15:44:29 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+	* test/rdoc:  ditto.
 
-	* ext/win32ole/win32ole.c (fev_initialize): initialize pTypeInfo.
-	  [ruby-core:31304][Bug #3576].
+Tue Nov 19 09:33:52 2013  Eric Hodel  <drbrain@segment7.net>
 
-Tue Jul 13 21:46:38 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/rubygems:  Update to RubyGems master 6a3d9f9.  Changes include:
 
-	* ext/openssl/ossl_config.c, ext/openssl/lib/openssl/config.rb,
-	  ext/openssl/lib/openssl.rb: reimplement OpenSSL::Config in Ruby. Now
-	  it should work on windows.
+	  Compatibly renamed Gem::DependencyResolver to Gem::Resolver.
 
-	* test/openssl/test_config.rb: added tests for OpenSSL::Config#dup.
+	  Added support for git gems in gem.deps.rb and Gemfile.
 
-Mon Jul 12 22:26:00 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	  Fixed resolver bugs.
 
-	* ext/openssl/ossl_config.c (ossl_config_copy): wrongly updating the
-	  given object with uninitialized CONF data.  now
-	  OpenSSL::Config#clone works as expected; cloning the config instead of
-	  SEGV or empty definition.
+	* test/rubygems: ditto.
 
-	* test/openssl/test_config.rb: added tests for Config#clone.
+	* lib/rubygems/LICENSE.txt:  Updated to license from RubyGems trunk.
+	  [ruby-trunk - Bug #9086]
 
-Thu Jul  8 13:43:13 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/rubygems/commands/which_command.rb:  RubyGems now indicates
+	  failure when any file is missing.  [ruby-trunk - Bug #9004]
 
-	* test/openssl/test_config.c: added tests for all Config methods.
+	* lib/rubygems/ext/builder:  Extensions are now installed into the
+	  extension install directory and the first directory in the require
+	  path from the gem.  This allows backwards compatibility with msgpack
+	  and other gems that calculate full require paths.
+	  [ruby-trunk - Bug #9106]
 
-Wed Jul  7 13:24:24 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* file.c (ruby_find_basename): set correct baselen.
+Tue Nov 19 07:21:56 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Jul  2 23:34:45 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (ruby_find_basename, ruby_find_extname): split from
-	  rb_file_s_basename() and rb_file_s_extname().
-
-	* util.c (ruby_add_suffix): support arbitrary length of the suffix
-	  to get rid of the potential buffer overflow.
-	  reported by tarui.
-
-Sat Jul 10 10:51:29 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: fix use_context condition inversion.
-	[Bug #2553][ruby-core:31164]. Thanks, Andre Nathan. 
-
-Wed Jun 23 21:36:45 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: avoid getcontext() overhead if possible.
-	[ruby-core:27380][Bug #2553]
-	Thanks, Joe Damato, Dan Peterson and Patrick Mohr.
-
-Wed Jan 13 06:54:44 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: check for if struct timezone is defined.
-
-	* missing.h (struct timezone): define if not defined.
-
-	* win32/win32.h (struct timezone): defined in the newer w32api.
-	  [ruby-core:27515]
-
-Sun Aug 15 19:59:58 2010  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
-
-	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#set_error):
-	  Fix for possible cross-site scripting (CVE-2010-0541). 
-	  Found by Apple, reported by Hideki Yamane.
-	  Patch by Hirokazu Nishio <nishio.hirokazu AT gmail.com>.
-
-Sat Jul 17 15:19:58 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* configure.in: Change AC_PREREQ from 2.58 to 2.60 because
-	  AC_CASE macro require 2.60 or later. Thanks, Mitsuru SHIMAMURA.
-	  [Bug #3579] [ruby-dev:41856]
-
-Wed Jun 23 22:22:42 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/optparse/test_summary.rb: fixed superclass so that it run
-	  solely.
-
-Wed Jun 23 21:54:17 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* marshal.c, test/ruby/test_marshal.rb: Revert r25230.  This test
-	  is troublesome.
-
-Mon Jun 21 18:12:15 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/extconf.rb: check some functions added at OpenSSL 1.0.0.
-
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): use engines which
-	  exists.
-
-Mon Jun 21 18:12:15 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_config.c: defined own IMPLEMENT_LHASH_DOALL_ARG_FN_098
-	  macro according to IMPLEMENT_LHASH_DOALL_ARG_FN in OpenSSL 0.9.8m.
-	  OpenSSL 1.0.0beta5 has a slightly different definiton so it could
-	  be a temporal workaround for 0.9.8 and 1.0.0 dual support.
-
-	* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): follows function
-	  definition in OpenSSL 1.0.0beta5. PKCS5_PBKDF2_HMAC is from 1.0.0
-	  (0.9.8 only has PKCS5_PBKDF2_HMAC_SHA1)
-
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_eq): do not use
-	  SSL_SESSION_cmp and implement equality func by ousrself.  See the
-	  comment.
-
-Mon Jun 21 18:12:15 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl_session.c
-	  (ossl_ssl_session_{get,set}_time{,out}): fixed a bug introduced by
-	  backporting. (see [ruby-dev:40573])  use long in according to
-	  OpenSSL API. (SSL_SESSION_{get,set}_time{,out})
-
-Mon Jun 21 18:12:15 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_x509name.c: added X509::Name#hash_old as a wrapper
-	  for X509_NAME_hash_old in OpenSSL 1.0.0.
-
-	* test/openssl/test_x509name.rb (test_hash): make test pass with
-	  OpenSSL 1.0.0.
-
-Mon Jun 21 18:12:15 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/openssl/test_x509*: make tests pass with OpenSSL 1.0.0b5.
-	  * PKey::PKey#verify raises an exception when a given PKey does not
-	    match with signature.
-	  * PKey::DSA#sign accepts SHA1, SHA256 other than DSS1.
-
-Mon Jun 21 18:12:15 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* backport the commit from trunk:
-	  Sun Feb 28 11:49:35 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* openssl/ossl.c (OSSL_IMPL_SK2ARY): for OpenSSL 1.0.
-	  patched by Jeroen van Meeuwen at [ruby-core:25210]
-	  fixed by Nobuyoshi Nakada [ruby-core:25238],
-	  Hongli Lai [ruby-core:27417],
-	  and Motohiro KOSAKI [ruby-core:28063]
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab),
-	  (ossl_ssl_cipher_to_ary): constified.
-
-	* ext/openssl/ossl_pkcs7.c (pkcs7_get_certs, pkcs7_get_crls):
-	  split pkcs7_get_certs_or_crls.
-
-Mon Jun 21 18:12:15 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/openssl/test_ec.rb: added test_dsa_sign_asn1_FIPS186_3. dgst is
-	  truncated with ec_key.group.order.size after openssl 0.9.8m for
-	  FIPS 186-3 compliance.
-
-	  WARNING: ruby-openssl aims to wrap an OpenSSL so when you're using
-	  openssl 0.9.8l or earlier version, EC.dsa_sign_asn1 raises
-	  OpenSSL::PKey::ECError as before and EC.dsa_verify_asn1 just returns
-	  false when you pass dgst longer than expected (no truncation
-	  performed).
-
-	* ext/openssl/ossl_pkey_ec.c: rdoc typo fixed.
-
-Wed Jun 16 16:01:42 2010  Tanaka Akira  <akr@fsij.org>
-
-	* lib/pathname.rb (Pathname#sub): suppress a warning.
-	  [ruby-dev:38488]
-
-Wed Jun 16 15:21:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/webrick/utils.rb (TestWEBrick#start_server): add log for
-	  test_filehandler.rb
-
-Wed Jun 16 15:21:12 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
-	  use inclusive range same as the header representation.
-
-Thu Jun 10 14:39:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/iconv/test_option.rb: removed particular implementation specific tests.
-	  [ruby-dev:40078]
-
-Thu Jun 10 14:22:09 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* lib/webrick/httpstatus.rb (WEBrick::HTTPStatus::Status::initialize):
-	  accept 0 or more arguments. [ruby-core:28692]
-
-Thu Jun 10 13:37:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_load): initialize orig_func.   [ruby-core:27296]
-
-Tue Jun  8 18:57:48 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.status): no need to embbed manifest if not exist.
-
-Tue Jun  8 18:38:36 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* include/ruby/win32.h: include errno.h before defining errnos.
-
-	* include/ruby/win32.h: check definition existance before defining
-	  errno macros.
-
-	* win32/win32.c (errmap): define winsock errors mappings.
-	  these are VC++10 support, merge from trunk (r27236, r27258).
-
-Tue Jun  8 18:31:02 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* regexp.c (re_compile_pattern): allow zero times match for
-	  non-greedy range repeatation. [ruby-core:30613]
-
-Tue Jun  8 18:08:18 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* Makefile.in (fake.rb): double the backslash.
-
-Tue Jun  8 18:08:15 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in: should replace COMMON_HEADERS if --with-winsock2 is
-	  specified.  [ruby-dev:41521]
-
-Tue Jun  8 17:49:18 2010  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
-
-	* io.c, eval.c, process.c: remove all condition of r26371.
-	  now, all platform use the same way. [Bug #3278][ruby-core:30167]
-
-Tue Jun  8 17:45:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments.
-	  a patch by Masaya TARUI <tarui AT prx.jp>.
-
-Tue Jun  8 17:45:36 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if
-	  errno is not set.  [ruby-dev:41317]
-
-Tue Jun  8 17:32:37 2010  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c (pack_pack): call rb_quad_pack to preserve RangeError.
-
-Tue Jun  8 17:32:37 2010  Tanaka Akira  <akr@fsij.org>
-
-	* pack.c: backport integer pack/unpack from 1.9 for [ruby-core:21937].
-
-	* configure.in: backport RUBY_DEFINT and fixed size integer checks.
-
-	* ruby.h: include stdint.h if available.
-
-	* bignum.c (rb_big_pack): defined..
-	  (rb_big_unpack): defined.
-
-	* intern.h (rb_big_pack): declared.
-	  (rb_big_unpack): declared.
-
-Tue Jun  8 16:52:35 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regex.c (read_special): get rid of overrun.
-
-Tue Jun  8 16:51:48 2010  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb: backported exception handling from trunk.
-	  [ruby-core:29745]
-
-Tue Jun  8 16:42:48 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (VpAlloc): ensure buf does not get
-	  collected.  based on a patch masaya tarui at [ruby-dev:41213].
-
-Tue Jun  8 16:08:00 2010  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (fetch_internal): do not quote message data item
-	  names.  Thanks, Eric Hodel.  [ruby-core:23508]  backported form
-	  trunk.
-
-Tue Jun  8 15:45:52 2010  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap (encode_utf7): encode & properly.  Thanks, Kengo
-	  Matsuyama.  [ruby-dev:38063]  backported from trunk.
-
-Tue Jun  8 15:43:43 2010  Masaki Suketa <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_val2variant): fix the core dump
-	  when converting Array object to VT_ARRAY variant. [ruby-core:28446]
-	  [Bug #2836]
-
-Tue Jun  8 15:34:15 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_extname): skip last directory separators.
-	  [ruby-core:29627]
-
-Tue Jun  8 15:33:30 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::cp_r): dup needed here; options are
-	  destroyed otherwise.
-
-Tue Jun  8 15:27:00 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (search_required): expand home relative path first.
-	  [ruby-core:29610]
-
-Tue Jun  8 15:23:10 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/timeout.rb (Timeout#timeout): propagate errors to the
-	  caller.  [ruby-dev:41010]'
-
-Tue Jun  8 15:15:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/net/smtp.rb (Net::SMTP#rcptto_list): fixed typo.
-	  [ruby-core:29809]
-
-Tue Jun  8 15:15:18 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/net/smtp.rb (Net::SMTP#rcptto_list): continue when at least
-	  one RCPT is accepted.  based on a patch from Kero van Gelder at
-	  [ruby-core:26190].
-
-Tue Jun  8 15:14:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* LEGAL: separated the section for parse.c.  contributed by Paul
-	  Betteridge in [ruby-core:29472].
-
-Tue Jun  8 14:00:33 2010  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* ext/rational/lib/rational.rb: fix [Bug #1397].
-
-Tue Jun  8 13:40:04 2010  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (Date#>>): fixed.  [ruby-core:28011]
-
-Tue Jun  8 12:37:56 2010  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* io.c, eval.c, process.c: add linux to r26371's condition.
-	  patched by Motohiro KOSAKI [ruby-core:28151]
-
-Tue Jun  8 12:37:56 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (thread_timer, rb_thread_stop_timer): check the timing of
-	  stopping timer.  patch from KOSAKI Motohiro <kosaki.motohiro _AT_
-	  jp.fujitsu.com> via IRC.
-
-	* eval.c (rb_thread_start_timer): NetBSD5 seems to be hung when calling
-	  pthread_create() from pthread_atfork()'s parent handler.
-
-	* io.c (pipe_open): workaround for NetBSD5. stop timer thread before
-	  fork(), and restart it after fork() on parent, and on child if
-	  needed.
-
-	* process.c (rb_f_fork, rb_f_system): ditto.
-
-	  these changes are tested by naruse.  fixed [ruby-dev:40074]
-
-Mon Jun  7 19:23:04 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (numchar_getc): get rid of buffer
-	  overflow.  [ruby-dev:40606]
-
-Mon Jun  7 18:57:02 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl/ossl_ssl_session.c
-	  (ossl_ssl_session_{get,set}_time{,out}): fixed a bug introduced by
-	  backporting. (see [ruby-dev:40573])  use long in according to
-	  OpenSSL API. (SSL_SESSION_{get,set}_time{,out})
-
-Tue May 25 08:42:42 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* ext/openssl: backport fixes in 1.9.
-
-	  * r25019 by marcandre
-	    * ossl_ocsp.c (ossl_ocspres_to_der): Bug fix in Response#to_def.
-	      Patch by Chris Chandler [ruby-core:18411]
-
-	  * r25017 by marcandre
-	    * ossl_config.c (ossl_config_add_value_m,
-	      ossl_config_set_section): Check if frozen (or untrusted for
-	      $SECURE >= 4) [ruby-core:18377]
-
-	  * r22925 by nobu
-	    * ext/openssl/openssl_missing.h (i2d_of_void): cast for callbacks.
-	      [ruby-core:22860]
-
-	    * ext/openssl/ossl_engine.c (ossl_engine_s_by_id): suppress a
-	      warning.
-
-	    * ext/openssl/ossl_ssl.c (ossl_sslctx_flush_sessions): time_t may
-	      be larger than long.
-
-	    * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_get_time),
-	      (ossl_ssl_session_get_timeout): use TIMET2NUM() to convert
-	      time_t.
-
-	  * r22924 by nobu
-	    * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use
-	      OPENSSL_free instead of free.  a patch from Charlie Savage at
-	      [ruby-core:22858].
-
-	  * r22918 by akr
-	    * ext/openssl: suppress warnings.
+	* configure.in (LOCALTIME_OVERFLOW_PROBLEM): Define it for cross
+	  compiling.
+	  [ruby-core:58391] [Bug #9119] Reported by Luis Lavena.
+	  Analyzed by Heesob Park.
 
-	    * ext/openssl/ossl.h (OSSL_Debug): don't use gcc extention for
-	      variadic macro.
+Tue Nov 19 05:55:05 2013  Eric Hodel  <drbrain@segment7.net>
 
-	  * r22666 by akr
-	    * ext/openssl/lib/openssl/buffering.rb: define Buffering module
-	      under OpenSSL.  [ruby-dev:37906]
+	* lib/rdoc/rubygems_hook.rb:  Remove debugging puts committed by
+	  accident.
 
-	  * r22440 by nobu
-	    * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify
-	      returns positive value on success, not non-zero.
-	      [ruby-core:21762]
+Mon Nov 18 22:47:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	  * r22378 by akr
-	    * ext/openssl: avoid cyclic require.
+	* eval_intern.h (TH_PUSH_TAG, TH_EXEC_TAG): refine stack overflow
+	  detection.  chain local tag after setjmp() successed on it, because
+	  calling setjmp() also can overflow the stack.
+	  [ruby-dev:47804] [Bug #9109]
 
-	    * ext/openssl/lib/openssl/ssl-internal.rb: renamed from ssl.rb
+	* vm_eval.c (rb_catch_obj): now th->tag points previous tag until
+	  TH_EXEC_TAG().
 
-	    * ext/openssl/lib/openssl/x509-internal.rb: renamed from x509.rb.
-	      [ruby-dev:38018]
+	* thread_pthread.c (ruby_init_stack): set stack_start properly by
+	  get_main_stack() if possible.
 
-	  * r22101 by nobu
-	    * ext/openssl/ossl_cipher.c (add_cipher_name_to_ary): used
-	      conditionally.
+Mon Nov 18 22:45:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	  * r21510 by akr
-	    * ext/openssl/ossl.c (ossl_raise): abolish a warning.
+	* eval_jump.c (rb_exec_end_proc): unlink and free procs data before
+	  calling for each procs.  [Bug #9110]
 
-	  * r21208 by akr
-	    * ext/openssl/ossl_digest.c (GetDigestPtr): use StringValueCStr
-	      instead of STR2CSTR.
+Sun Nov 17 06:33:32 2013  Shota Fukumori  <her@sorah.jp>
 
-	    * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto.
-	      (ossl_ec_group_initialize): ditto.
+	* configure.in: Use $LIBS for base of $SOLIBS, also in darwin.
+	  By this fix, environment that libgmp is located in $LIBS can build
+	  ruby.
 
-	  * r19420 by mame
-	    * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_to_string): comment out
-	      fragments of unused code.
+Sun Nov 17 01:56:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	  * r18975 by nobu
-	    * ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): fix for
-	      initialization of r18168.
+	* thread_pthread.c (rb_thread_create_timer_thread): Show error
+	  message instead of error number.
+	  (thread_create_core): Ditto.
 
-	  * r18971 by nobu
-	    * ext/openssl/ossl_config.c (Init_ossl_config): removed C99ism.
+	* cont.c (fiber_machine_stack_alloc): Ditto.
 
-	  * r18944 by matz
-	    * ext/openssl/ossl_config.c (Init_ossl_config): memory leak fixed.
-	      a patch <shinichiro.hamaji at gmail.com> in [ruby-dev:35880].
+Sat Nov 16 18:28:08 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	    * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
+	* lib/rexml/parsers/ultralightparser.rb
+	  (REXML::Parsers::UltraLightParser#parse): Fix wrong :start_doctype
+	  position.
+	  [Bug #9061] [ruby-dev:47778]
+	  Patch by Ippei Obayashi. Thanks!!!
 
-	  * r18917 by nobu
-	    * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): fix for
-	      initialization of r18168.
+	* test/rexml/parser/test_ultra_light.rb: Add a test for this case.
 
-	    * ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): ditto.
+Sat Nov 16 02:13:56 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	    * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
+	* cont.c : Introduce ensure rollback mechanism. Please see below.
 
-	  * r18283 by nobu
-	    * ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): suppress
-	      warnings on platforms which int size differs from pointer size.
+	* internal.h (ruby_register_rollback_func_for_ensure): catch up above change.
+	  Add rollback mechanism API.
 
-	  * r18181 by nobu
-	    * ext/openssl/openssl_missing.h (d2i_of_void): define for older
-	      versions.  [ruby-dev:35637]
+	* vm_core.h (typedef struct rb_vm_struct): catch up above change.
+	  Introduce ensure-rollback relation table.
 
-	  * r18168 by nobu
-	    * ext/openssl: suppress warnings.
+	* vm_core.h (typedef struct rb_thread_struct): catch up above change.
+	  Introduce ensure stack.
 
-Sat May 22 22:31:36 2010  Tanaka Akira  <akr@fsij.org>
+	* eval.c (rb_ensure): catch up above change.
+	  Introduce ensure stack.
 
-	* lib/resolv.rb: fix [ruby-core:28320] reported by Paul Clegg.
-	  (Resolv::DNS::Requester#request): raise ResolvTimeout consistently
-	  for timeout.
+	* hash.c : New function for rollback ensure, and register it to
+	  ensure-rollback relation table. [ruby-dev:47803] [Bug #9105]
 
-Sat May 22 22:14:11 2010  NARUSE, Yui  <naruse@ruby-lang.org>
+	Ensure Rollback Mechanism:
+	A rollback's function is a function to rollback a state before ensure's
+	function execution.
+	When the jump of callcc is across the scope of rb_ensure,
+	ensure's functions and rollback's functions are executed appropriately
+	for keeping consistency.
 
-	* ext/readline/readline.c (Init_readline): initialize
-	  check rl_catch_signals and rl_catch_sigwinch.
-	  [ruby-core:28238] [ruby-core:28242]
+	Current API is unstable, and only internal use.
 
-	* ext/readline/extconf.rb: check rl_catch_signals and
-	  rl_catch_sigwinch.
+	ruby_register_rollback_func_for_ensure(ensure_func,rollback_func)
+	This API create relation ensure's function to rollback's function.
+	By registered rollback's function, it is executed When jumping into
+	corresponding rb_ensure scope.
 
-Sat May 22 21:54:58 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Sat Nov 16 00:18:36 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* test/net/http/test_connection.rb (TestHTTP::HTTPConnectionTest#test_connection_refused_in_request):
-	  Wrong exception to assert.
+	* eval_jump.c (rb_exec_end_proc): fix double free or corruption error
+	  when reentering by callcc. [ruby-core:58329] [Bug #9110]
 
-Sat May 22 21:03:16 2010  Tanaka Akira  <akr@fsij.org>
+	* test/ruby/test_beginendblock.rb: test for above.
 
-	* io.c (rb_io_modenum_mode): return "r" for O_RDONLY|O_APPEND.
-	  [ruby-dev:40379]
+Fri Nov 15 01:06:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat May 22 20:51:39 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* ext/objspace/objspace_dump.c (dump_output): allow IO object as
+	  output, and use Tempfile.create and return open file instead of
+	  mkstemp() and path name for :file output.
+	  [ruby-core:58266] [Bug #9102]
 
-	* lib/resolv.rb (Resolv::DNS::Config#nameserver_port): 1.8.7
-	  specific tweaks
+	* test/objspace/test_objspace.rb (TestObjSpace#dump_my_heap_please):
+	  remove temporary output file.
 
-Sat May 22 20:51:09 2010  Tanaka Akira  <akr@fsij.org>
+Thu Nov 14 23:39:00 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-	* lib/resolv.rb: fix [ruby-core:28144] reported by Hans de Graaff.
-	  (Resolv::DNS#make_requester): pass nameserver_port to
-	  UnconnectedUDP.new.
-	  (Resolv::DNS.bind_random_port): change the is_ipv6 argument to
-	  bind_host.
-	  (Resolv::DNS::Requester#initialize): change instance variable to
-	  store multiple sockets.
-	  (Resolv::DNS::Requester#request): pass readable sockets to
-	  recv_reply.
-	  (Resolv::DNS::Requester#close): close all sockets.
-	  (Resolv::DNS::Requester::UnconnectedUDP#initialize): allocate
-	  a socket for each address family of name servers.
-	  (Resolv::DNS::Requester::UnconnectedUDP#recv_reply): read from the
-	  passwd readable socket.
-	  (Resolv::DNS::Requester::UnconnectedUDP#sender): use appropriate
-	  socket for the target nameserver.
-	  (Resolv::DNS::Requester::ConnectedUDP): follow the instance variable
-	  change.
-	  (Resolv::DNS::Requester::TCP#sender): ditto.
-	  (Resolv::DNS::Config#nameserver_port): new method.
+	* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] remove example of
+	  Rational#to_d without argument. [Bug #8958]
 
-Sat May 22 19:46:27 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov 14 20:24:15 2013  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* lib/net/http.rb (Net::HTTP#request): close @socket only after
-	  started.  [ruby-core:28028]
+	* ruby_atomic.h (ATOMIC_SIZE_CAS): fix compile error on Solaris
+	  since r43460.
 
-Sat May 22 19:36:38 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Nov 14 19:53:00 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (proc_invoke): reverted r25975.  [ruby-dev:39931]
-	  [ruby-dev:40059]
+	* test/openssl/test_cipher.rb (test_aes_gcm_wrong_tag): Don't use
+	  String#succ because it can make modified (wrong) auth_tag longer
+	  than 16 bytes.  The longer auth_tag makes that
+	  EVP_CIPHER_CTX_ctrl (and internally aes_gcm_ctrl) fail.
+	  [ruby-core:55143] [Bug #8439] reported by Vit Ondruch.
 
-	* eval.c (rb_mod_define_method): return original block but not
-	  bound block.  [ruby-core:26984]
+Thu Nov 14 11:33:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu May 20 16:28:17 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* hash.c (foreach_safe_i, hash_foreach_iter): deal with error detected
+	  by ST_CHECK.
 
-	* lib/webrick/httpservlet/filehandler.rb (make_partial_content):
-	  add bytes-unit.  [ruby-dev:40030]
+	* st.c (st_foreach_check): call with non-error argument in normal case.
 
-Thu May 20 16:17:37 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Nov 14 02:37:14 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/zlib/zlib.c: backport r18029 and r21861 from trunk.
-	  * r18029 ext/zlib/zlib.c (rb_deflate_params): flush before
-	    deflateParams. [ruby-core:17675] (by mame)
-	  * r21861 ext/zlib/zlib.c (zstream_run): desperately guard the
-	    variable.  [ruby-core:20576] (by usa)
+	* ext/thread/thread.c: [DOC] This patch accomplishes the following:
 
-	* test/zlib/test_zlib.rb: backport deflate tests from trunk.
+	  - Teach RDoc about ConditionVariable
+	  - Teach RDoc about Queue
+	  - Teach RDoc about SizedQueue
+	  - Use fully-qualified namespace for Document-method
+	    This is necessary to separate definitions between classes
+	  - Fix rdoc bug in call_seq vs. call-seq
+	  - Correct doc for SizedQueue#pop patch by @jackdanger [Bug #8988]
 
-Thu May 20 15:59:14 2010  Kouhei Sutou  <kou@cozmixng.org>
+Thu Nov 14 01:11:54 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/rss/maker/base.rb, test/rss/test_maker_0.9.rb:
-	accept any time format in maker. [ruby-core:26923]
+	* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] +precision+ is required
 
-Thu May 20 15:54:08 2010  Akinori MUSHA  <knu@iDaemons.org>
+Wed Nov 13 19:21:36 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (recursive_push): Taint internal hash to prevent
-	  unexpected SecurityError; fixes #1864.
+	* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] Document the required
+	  +precision+ argument for Rational#to_d [Bug #8958]
 
-Thu May 20 15:39:26 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov 13 19:02:05 2013  Zachary Scott  <e@zzak.io>
 
-	* io.c (io_fwrite): preserve errno.  [ruby-core:27425]
+	* ext/digest/*: [DOC] Fix several typos and broken http links.
+	  Improved examples for Digest overview and fixed a broken example in
+	  Digest::HMAC overview. This patch also adds a description of
+	  Digest::SHA256.bubblebabble to the Digest overview.
 
-Tue Apr 20 08:04:37 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	  Patched by @stomar [Bug #9027]
 
-	* io.c (rb_io_s_read): close the IO if an exception is raised on
-	  seeking. [ruby-core:27429]
+Wed Nov 13 18:32:12 2013  Zachary Scott  <e@zzak.io>
 
-Mon Apr 19 22:43:28 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/ossl_config.c: [DOC] Document the following:
 
-	 * ruby.h (RB_GC_GUARD_PTR): workaround for gcc optimization.
-	   [ruby-core:27402]
+	  - OpenSSL::ConfigError
+	  - OpenSSL::Config::DEFAULT_CONFIG_FILE
 
-Tue Apr 20 06:40:53 2010  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	  Patched by @vbatts via GH-436
+	  https://github.com/ruby/ruby/pull/436
 
-	* lib/uri/generic.rb (URI::Generic::eql): Check the class of the
-	  compared object. Based on a patch by Peter McLain [ruby-core:27019]
+Wed Nov 13 18:03:00 2013  Zachary Scott  <e@zzak.io>
 
-Fri Apr  2 03:27:22 2010  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/openssl/ossl_asn1.c: [DOC] Document parts of
+	  OpenSSL::ASN1::ObjectId included a fix for the class overview, which
+	  previously showed the documentation for Constructive due to missing
+	  ObjectId overview. This patch also includes a note for Primitive.
 
-	* lib/net/http.rb (HTTPGenericRequest#send_request_with_body_stream):
-	  increased encoding chunk size for POST request with body_stream
-	  (1K -> 16K). patched by Brian Candler. #1284.
+	  Based on a patch by @vbatts via GH-436
+	  https://github.com/ruby/ruby/pull/436
 
-	* test/net/http/test_post_io.rb: added for the patch. It's good if a
-	  patch comes with a test.
+Wed Nov 13 17:19:36 2013  Zachary Scott  <e@zzak.io>
 
-Thu Apr  1 05:32:17 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/openssl/lib/openssl/config.rb: In #parse use +string+ for +str+
 
-	* string.c (rb_str_inspect): wrong result of UTF-8 inspect because of
-	  the mistake of calculation.  reported by eban via IRC.
+Wed Nov 13 17:09:45 2013  Zachary Scott  <e@zzak.io>
 
-Sun Jan 10 19:00:31 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/lib/openssl/*.rb: [DOC] Document the following:
 
-	* lib/webrick/accesslog.rb : Escape needed.
+	  - Integer#to_bn
+	  - OpenSSL::Buffering module
+	  - Deprecated OpenSSL::Digest::Digest compatibility class
+	  - OpenSSL::Config
 
-	* lib/webrick/httpstatus.rb : ditto.
+	  These changes were based on a patch by @vbatts via GH-436
+	  https://github.com/ruby/ruby/pull/436
 
-	* lib/webrick/httprequest.rb : ditto.
+Wed Nov 13 10:55:43 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/webrick/httputils.rb : ditto.
+	* doc/regexp.rdoc: [DOC] Fix typo in Special global variables section.
+	  Reported by Alex Johnson on ruby-doc.org
 
-Thu Dec 24 18:04:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov 13 10:43:19 2013  Zachary Scott  <e@zzak.io>
 
-	* configure.in: default ac_cv_prog_CC to CC.
+	* hash.c: [DOC] Adds an example for Hash#store
 
-Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov 13 09:03:40 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/extmk.rb: MINIRUBY is given via make-flag.
+	* doc/regexp.rdoc: [DOC] add note about Bug #4044 as suggested by
+	  duerst-san in [ruby-core:43612] [Fixes GH-443] Patched by @rosenfeld
+	  https://github.com/ruby/ruby/pull/443
 
-Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Nov 12 10:15:14 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
-	  [ruby-core:20131]
+	* test/rubygems/insure_session.rb:  Remove unused test file.
 
-Thu Dec 24 17:56:32 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Nov 12 09:16:24 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* common.mk (EXTMK_ARGS): shouldn't use ``\"'' because cmd.exe eat
-	  ''\'' in such quotes.
+	* lib/rubygems:  Update to RubyGems master b9213d7.  Changes include:
 
-Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Fixed tests on Windows (I hope) by forcing platform for
+	  platform-dependent tests.
 
-	* common.mk (EXTMK_ARGS): needs MINIRUBY for cross-compile.
-	  [ruby-core:20131]
+	  Fixed File.exists? warnings.
 
-Thu Dec 24 17:56:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Improved testing infrastructure.
 
-	* mkconfig.rb (patchlevel): config.status may not contain
-	  PATCHLEVEL even if other version numbers exist.
+	* test/rubygems:  ditto.
 
-Thu Dec 24 17:50:35 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+	* test/rdoc/test_rdoc_rubygems_hook.rb:  Switch to util_spec like
+	  RubyGems.
 
-	* ext/stringio/stringio.c (strio_init): rewind when reopened.
+Mon Nov 11 18:31:12 2013  Aman Gupta <ruby@tmm1.net>
 
-Thu Dec 24 17:06:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (run_final): runs finalizers with the object terminated.
+	* internal.h: move common string/hash flags to include file.
+	* ext/objspace/objspace_dump.c: remove flags shared above.
+	* hash.c: ditto.
+	* string.c: ditto.
 
-	* gc.c (rb_gc_call_finalizer_at_exit): ObjectSpace::finalizers needs
-	  to scan whole object space, although deprecated.
+Mon Nov 11 04:36:14 2013  Eric Hodel  <drbrain@segment7.net>
 
-Thu Dec 24 17:06:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rubygems/specification.rb:  Include 2.2.0.preview.2 when checking
+	  if extensions should be built.  Fixes a ruby-ci failure.
+	* test/rubygems/test_gem_specification.rb:  Test for the above.
 
-	* gc.c (chain_finalized_object): deletes finalizers to be invoked from
-	  finalizer_table.
+Mon Nov 11 03:15:56 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* gc.c (rb_gc_call_finalizer_at_exit): warns when could not invoke
-	  finalizers.
+	* vm_trace.c (symbol2event_flag): add secret feature.
+	  add a_call/a_return events.
+	  a_call is call | b_call | c_call, and same as a_return.
 
-Mon Dec 21 16:09:09 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Nov 11 02:51:17 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* win32/Makefile.sub (LD_SHARED1): typo.
+	* lib/rubygems: Update to RubyGems master 4bdc4f2.  Important changes
+	  in this commit:
 
-Wed Dec 16 20:17:40 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	  RubyGems now chooses the test server port reliably.  Patch by akr.
 
-	* win32/win32.c (CreateChild): allocate temporary buffer and use it
-	  instead of directly modify the passed string.  [ruby-dev:39635]
+	  Partial implementation of bundler's Gemfile format.
 
-Wed Dec 16 19:49:47 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	  Refactorings to improve the new resolver.
 
-	* instruby.rb (with_destdir): revert. [ruby-dev:39885]
+	  Fixes bugs in the resolver.
 
-Mon Dec 14 13:28:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/rubygems:  Tests for the above.
 
-	* lib/test/unit.rb (Test::Unit.run=, Test::Unit.run?): fixed rdoc.
-	  [ruby-core:25034]
+Mon Nov 11 01:02:06 2013  Zachary Scott  <e@zzak.io>
 
-Mon Dec 14 13:21:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/timeout.rb: [DOC] Add note about change from #8730 [Fixes GH-440]
+	* NEWS: [DOC] Improve grammar on change to Timeout
+	  Patched by @srawlins in https://github.com/ruby/ruby/pull/440
 
-	* lib/open3.rb (Open3#popen3): fixed and improved rdoc.  [ruby-core:25658]
+Sun Nov 10 23:47:05 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-Mon Dec 14 13:09:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (rb_gcdebug_print_obj_condition): catch up recent changes
+	  to compile on GC_DEBUG.
 
-	* configure.in (LIBPATHFLAG): use numbered specifier if RPATHFLAG
-	  is set.  [ruby-talk:322136]
+Sun Nov 10 22:16:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Dec 14 12:53:56 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* error.c (exc_cause): captured previous exception.
 
-	* lib/bigdecimal.rb: fix comparison operators [ruby-core:26646]
+	* eval.c (make_exception): capture previous exception automagically.
+	  [Feature #8257]
 
-Mon Dec 14 12:40:10 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+Sun Nov 10 08:37:20 2013  Zachary Scott  <e@zzak.io>
 
-	* object.c (rb_Float): Allow results of to_f to be NaN
-	  [ruby-core:26733]
+	* thread.c: [DOC] Remove duplicate reference
 
-Mon Dec 14 12:35:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Nov 10 08:09:29 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (proc_invoke): unbound block created by define_method
-	  cannot call super.  [ruby-core:26984]
+	* lib/drb/drb.rb: [DOC] promote better windows-safe filename regular
+	  expression in DRb Logger example. Reported by Chris Pheonix
+	  [Bug #9074]
 
-Mon Dec 14 12:06:39 2009  Akinori MUSHA  <knu@iDaemons.org>
+Sun Nov 10 08:03:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/digest/digest.c (rb_digest_instance_method_unimpl): Do not
-	  call rb_inspect() on an object that does not implement necessary
-	  methods; reported by NaHi.
+	* gc.c (rb_define_finalizer, rb_undefine_finalizer): rename and export
+	  finalizer functions.
 
-Mon Dec 14 11:47:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Nov 10 07:41:22 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (rb_method_missing): adjusted format and argument number.
+	* lib/weakref.rb: [DOC] fix typos by @xaviershay [Fixes GH-439]
+	  https://github.com/ruby/ruby/pull/439
 
-	* eval.c (rb_call): fixed for super in cached method.
-	  [ruby-dev:39757]
+Sun Nov 10 06:14:39 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Mon Dec 14 11:40:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* compile.c (iseq_compile_each): emit opt_str_freeze if the #freeze
+	  method is called on a static string literal with no arguments.
 
-	* hash.c (ruby_setenv): get rid of crash in Solaris 8 and 10.
-	  [ruby-core:26668]
+	* defs/id.def (firstline): add freeze so idFreeze is available
 
-Mon Dec 14 11:31:58 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+	* insns.def (opt_str_freeze): add opt_str_freeze instruction which
+	  pushes a frozen string literal without allocating a new object if
+	  String#freeze is not overridden
 
-	* lib/cgi.rb: fix command-line option of
-	  non-interactive terminal. [ruby-core:23016]
+	* string.c (Init_String): define String#freeze
 
-Mon Dec 14 03:36:20 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* vm.c (vm_init_redefined_flag): define BOP_FREEZE on String class as
+	  a basic operation
 
-	* eval.c (method_inspect, method_name, mnew): Bug fix when
-	  method created from an alias.
-	  Based on a patch by Peter Vanbroekhoven [ruby-core:22040]
+	* vm_insnhelper.h: ditto
 
-Mon Dec 14 02:27:32 2009  Yusuke Endoh  <mame@tsg.ne.jp>
+	[Feature #8992] [ruby-core:57705]
 
-	* hash.c (rb_hash): always return a fixnum value because a return
-	  value of rb_hash may be used as a hash value itself and bignums have
-	  no unique VALUE.
+Sun Nov 10 01:34:14 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* test/ruby/test_hash.rb: add a test for above.
+	* gc.c (vm_malloc_increase): sweep immediately on GC due to malloc().
+	  To reduce memory usage, sweep as soon as possible.
+	  This behavior is same as Ruby 2.0.0 and before.
 
-Mon Dec 14 00:42:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Nov 10 00:39:26 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* string.c (rb_str_inspect): get rid of adding garbage to shor
-	  UTF-8 string.  [ruby-dev:39550]
+	* benchmark/gc/gcbench.rb: output version description and GC::OPTS.
 
-Sun Dec 13 23:54:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Nov 10 00:36:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* marshal.c (marshal_load): should set taintness.  [ruby-dev:39723]
+	* gc.c (should_be_callable): allow private call since rb_eval_cmd
+	  calls even private methods.
 
-Sun Dec 13 23:54:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Nov 10 00:33:17 2013  Zachary Scott  <e@zzak.io>
 
-	* marshal.c (struct {dump,load}_arg): manage with dfree, instead
-	  of using local variable which may be moved by context switch.
-	  [ruby-dev:39425]
+	* lib/racc/rdoc/grammar.en.rdoc: [DOC] fix typo by Tsuyoshi Sawada
+	  [Bug #9077]
 
-Wed Nov 25 17:42:33 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Nov  9 22:35:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (io_fwrite): adjust stdio file position after direct write on
-	  BSDish platforms.   [ruby-core:26300]
+	* tool/rbinstall.rb (Gem::Specification.load): obtain spec date from
+	  VCS for the case using git, RUBY_RELEASE_DATE is the last resort.
+	  probably fixes [Bug #9085].
 
-Wed Nov 25 17:39:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Nov  9 20:56:12 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-	* test/ostruct/test_ostruct.rb (test_frozen): added assertions.
+	* ext/objspace/object_tracing.c: use declarations in internal.h.
 
-Wed Nov 25 16:43:24 2009  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/objspace/objspace.c: ditto
 
-	* lib/monitor.rb (MonitorMixin.mon_release): ensure the scheduled
-	  thread to be alive when a thread is releasing a monitor. #2240
+Sat Nov  9 20:32:59 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Nov 25 16:28:11 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* test/objspace/test_objspace.rb (test_dump_all): Make the test string
+	  shorter to be an embedded string on 32bit environment as well as
+	  64bit environment.
 
-	* lib/rexml/element.rb (text=): false should be converted to string.
-	  A patch by Teruo Oshida [ruby-dev:38351]
+Sat Nov  9 15:00:16 2013  Zachary Scott  <e@zzak.io>
 
-Wed Nov 25 16:18:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c: [DOC] ARGF.gets may return nil [Bug #9029] patch by znz
 
-	* eval.c (rb_clear_cache_for_undef): clear entries for inherited
-	  methods.  [ruby-core:26074]
+Sat Nov  9 14:54:52 2013  Zachary Scott  <e@zzak.io>
 
-Tue Nov 24 16:15:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rss/*: [DOC] document various constants @steveklabnik [Bug #8812]
 
-	* ext/iconv/iconv.c (iconv_create): cannot retry with given block.
-	  [ruby-dev:39487]
+Sat Nov  9 14:50:09 2013  Zachary Scott  <e@zzak.io>
 
-Tue Nov 24 16:12:33 2009  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/rss/rss.rb: [DOC] document Time#w3cdtf by @steveklabnik
+	  [Bug #8821]
 
-	* lib/net/imap.rb (resp_text_code): accepts response codes without
-	  text.  backported from trunk.  [ruby-core:24194]
+Sat Nov  9 14:29:04 2013  Zachary Scott  <e@zzak.io>
 
-Tue Nov 24 16:09:41 2009  Shugo Maeda  <shugo@ruby-lang.org>
+	* ext/dl/cfunc.c: [DOC] fix typo in example [Bug #8944]
+	  Patched by Heesob Park
 
-	* lib/net/ftp.rb (getaddress): rescue exceptions.  [ruby-dev:39451]
+Sat Nov  9 13:59:58 2013  Zachary Scott  <e@zzak.io>
 
-Tue Nov 24 15:51:07 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* lib/test/unit/assertions.rb: [DOC] better example for assert_send()
+	  Patch by Andrew Grimm [Bug #8975]
 
-	* ext/curses/curses.c: Many functions of module Curses could cause a
-	  crash if the ncurses library was not properly initialized.
-	  Fix pointed out by Alexander Beisig [ruby-core:22592]
-	  Functions fixed: attroff, attron, attrset, bkgd, bkgdset,
-	  can_change_color, close_screen, closed, color_content, curs_set,
-	  def_prog_mode, delch, deleteln, getmouse, getstr, has_colors,
-	  init_color, init_pair, insertln, keyname, mouseinterval, mousemask,
-	  pair_content, pair_number, reset_prog_mode, resizeterm, scrl,
-	  setscrreg, standend, standout, start_color, timeout, ungetmouse
+Sat Nov  9 12:45:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Fri Nov 20 15:49:59 2009  Tanaka Akira  <akr@fsij.org>
+	* insns.def: unify ic_constant_serial and ic_class_serial into one field
+	  ic_serial. This is possible because these fields are only ever used
+	  exclusively with each other.
 
-	* lib/resolv.rb (Resolv::DNS.bind_random_port): bind to "::" for IPv6.
-	  (Resolv::DNS::ConnectedUDP#initialize): specify is_ipv6 argument of
-	  bind_random_port.
-	  [ruby-core:25970]
+	* insns.def: ditto
+	* vm_core.h: ditto
+	* vm_insnhelper.c: ditto
 
-Thu Nov 19 18:03:31 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+Sat Nov  9 12:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* lib/cgi.rb (CGI.unescapeHTML): fix for hex values 80-FF,
-	  single-byte hex entity encodings from 80-FF are valid HTML.
-	  [ruby-core:25702]
+	* class.c: unify names of vm state version counters to 'serial'.
+	  This includes renaming 'vm_state_version_t' to 'rb_serial_t',
+	  'method_state' to 'method_serial', 'seq' to 'class_serial',
+	  'vmstat' to 'constant_serial', etc.
 
-Thu Nov 19 15:34:40 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* insns.def: ditto
+	* internal.h: ditto
+	* vm.c: ditto
+	* vm_core.h: ditto
+	* vm_insnhelper.c: ditto
+	* vm_insnhelper.h: ditto
+	* vm_method.c: ditto
 
-	* io.c (rb_io_fptr_finalize): free fptr to avoid memory leaks.
-	  fixed: #2009   [ruby-core:25173] [ruby-dev:39410]
+Sat Nov  9 09:22:29 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Thu Nov 19 15:27:17 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* gc.c (gc_page_sweep, rgengc_rememberset_mark): Refactoring.
+	  Get bitmaps directly.
 
-	* lib/net/http.rb (transport_request): Handle timeout error by
-	  closing socket if exception raised. [ruby-core:20976]
+Sat Nov  9 09:16:36 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Wed Nov 18 14:14:38 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* gc.c (RVALUE_PROMOTE_INFANT): Refactoring. Remove duplicated nonsense
+	  code.
 
-	* ext/openssl/ossl_config.c (ossl_config_add_value_m,
-	  ossl_config_set_section): Check if frozen (or untainted for $SECURE >=
-	  4) [ruby-core:18377]
+Sat Nov  9 09:04:48 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Wed Nov 18 14:13:14 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c (gc_marks_test): Bugfix. Fix a struct member name for build
+	  with RGENGC_CHECK_MODE.
 
-	* instruby.rb: win32/win32.h exists in srcdir.
-	  reported by arton ( http://www.artonx.org/diary/20090919.html#p01 )
+Sat Nov  9 08:58:23 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Wed Nov 18 14:13:14 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c : Add GC_PROFILE_DETAIL_MEMORY option.
+	  If GC_PROFILE_MORE_DETAIL && GC_PROFILE_DETAIL_MEMORY,
+	  maxrss, minflt and majflt are added to each profile record.
 
-	* win32/win32.c (subtract): if the parameters are same value, should
-	  return zero.
+Sat Nov  9 07:41:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Nov 18 14:13:14 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* internal.h (rb_vm_backtrace_object, rb_gc_count): make prototype
+	  declarations, not old-K&R style.
 
-	* win32/win32.c (rb_w32_select): of course, need to initialize rest.
+Sat Nov  9 06:11:14 2013  vo.x (Vit Ondruch)  <vondruch@redhat.com>
 
-Wed Nov 18 14:13:14 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* tool/rbinstall.rb (Gem::Specification#collect): make stable
+	  Gem::Specification.files in default .gemspecs the different order of
+	  "files" in .gemspec files makes them different therefore possibly
+	  conflicting in multilib scenario.  patch by vo.x (Vit Ondruch) at
+	  [ruby-core:57544] [Bug #8623].
 
-	* win32/win32.c (rb_w32_select): wait specified time on select.
+Sat Nov  9 01:59:18 2013  Aman Gupta <ruby@tmm1.net>
 
-Wed Nov 18 14:13:14 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/objspace/objspace_dump.c: Add experimental methods to
+	  dump objectspace as json: ObjectSpace.dump_all and
+	  ObjectSpace.dump(obj). These methods are useful for debugging
+	  reference leaks and memory growth in large ruby applications.
+	  [Bug #9026] [ruby-core:57893] [Fixes GH-423]
+	* test/objspace/test_objspace.rb: tests for above.
 
-	* win32/win32.c (rb_w32_select): on 1.8, we don't need to poll sockets,
-	  because our select is never called from multiple threads.
+Sat Nov  9 00:26:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Nov 17 16:22:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (GetLastError): already defined in windows.h on nowadays
+	  cygwin, and caused the confliction with the system provided
+	  definition on cygwin64.  by @kou1okada [Fixes GH-433].
 
-	* eval.c (rb_thread_start_0, rb_thread_start_1): should call star
-	  timer after added new thread to thread list.  [ruby-core:25613]
+Fri Nov  8 18:35:31 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Tue Nov 17 16:22:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/open3.rb: receive arguments as keyword arguments.
 
-	* eval.c (rb_thread_start_timer): start to catch SIGVTALRM together
-	  with timer thread.   [ruby-core:25606]
+Fri Nov  8 13:19:26 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* eval.c (rb_thread_atfork): stop timer thread.
+	* io.c (rb_io_open_with_args): use RARRAY_CONST_PTR().
 
-Tue Nov 17 16:04:02 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* io.c (rb_scan_open_args): use const qualifier for above.
 
-	* lib/cgi/cookie.rb (value): Keep CGI::Cookie#value in sync with the
-	  cookie itself. A patch by Arthur Schreiber [ruby-core:17634]
+	* io.c (rb_open_file): ditto.
 
-Tue Nov 17 15:49:00 2009  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+	* io.c (rb_io_open_with_args): ditto.
 
-	* lib/irb/ext/multi-irb.rb: Fix arguments handling for shell commands
-	  in irb; a patch by Yusuke Endoh [ruby-dev:35075]
+Fri Nov  8 11:35:06 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Tue Nov 17 15:32:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dir.c, pack.c, ruby.c, struct.c, vm_eval.c: use RARRAY_CONST_PTR().
 
-	* io.c (rb_io_binmode): check if closed regardless platforms.
-	  [ruby-core:25363]
+Fri Nov  8 10:58:02 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Tue Nov 17 15:31:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* compile.c (iseq_build_from_ary_exception): use RARRAY_CONST_PTR().
 
-	* numeric.c (round): added declaration.  [ruby-dev:39222]
+	* compile.c (iseq_build_from_ary_body): ditto.
 
-Mon Nov 16 19:58:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Nov  8 10:49:34 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* gc.c (gc_sweep): makes new room if object space is full of
-	  finalized objects and has no free objects.  [ruby-dev:39201]
+	* enumerator.c (append_method): use RARRAY_CONST_PTR().
 
-Mon Nov 16 19:45:27 2009  Tanaka Akira  <akr@fsij.org>
+	* enumerator.c (lazy_init_iterator): ditto.
 
-	* util.c: suppress strict-aliasing warning with gcc-4.4.0 -O2 to fix
-	  infinite loop by ruby -e "1.402e-45" .
+Fri Nov  8 02:44:29 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Nov 16 19:28:23 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* gc.c (vm_malloc_increase): check GVL before gc_rest_sweep().
+	  vm_malloc_increase() can be called without GVL.
+	  However, gc_rest_sweep() assumes acquiring GVL.
+	  To avoid this problem, check GVL before gc_rest_sweep().
+	  [Bug #9090]
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_i): revert a part of
-	  r23645, which was not a bug fix. [ruby-dev:39474]
+	  This workaround introduces possibility to set malloc_limit as
+	  wrong value (*1). However, this may be rare case. So I commit it.
 
-Fri Sep 11 11:56:53 2009  Akinori MUSHA  <knu@iDaemons.org>
+	  *1: Without rest_sweep() here, gc_rest_sweep() can decrease
+	      malloc_increase due to ruby_sized_xfree().
 
-	* class.c (rb_singleton_class_clone): Qnil must be used for a null
-	  class reference when we use NIL_P() to check class reference
-	  validity.  The bug was exposed by the spec test of Sequel.
+Fri Nov  8 02:50:25 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (ruby_init): Use NEW_CREF().
+	* lib/securerandom.rb: [DOC] specify arguments passed to ::random_bytes
+	  By @chastell [Fixes GH-412] https://github.com/ruby/ruby/pull/412
 
-Thu Sep 10 10:53:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Nov  8 02:43:01 2013  Zachary Scott  <e@zzak.io>
 
-	* io.c (rb_sysopen): workaround for MSVCRT's bug.
-	  [ruby-core:24838]
+	* ext/objspace/object_tracing.c: [DOC] trace_object_allocations_stop
+	  By @srawlins [Fixes GH-421] https://github.com/ruby/ruby/pull/421
 
-Mon Sep  7 19:52:44 2009  Tanaka Akira  <akr@fsij.org>
+Fri Nov  8 02:34:20 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (rb_thread_schedule): need select for WAIT_SELECT, even if
-	  already timeout.  [ruby-dev:38971]
-	  (WAIT_DONE): defined for mark threads which can be runnable.
+	* lib/net/ftp.rb: [DOC] Document Net::FTP.mdtm and .set_socket and fix
+	  spelling typo, based on patch by @artfuldodger [Fixes GH-426]
+	  https://github.com/ruby/ruby/pull/426
 
-Mon Sep  7 19:52:44 2009  Tanaka Akira  <akr@fsij.org>
+Fri Nov  8 02:14:37 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (rb_thread_schedule): refine previous change.
+	* array.c: [DOC] Add note about negative indices in Array overview
+	  By @ckaenzig [Fixes GH-427] https://github.com/ruby/ruby/pull/427
 
-Mon Sep  7 19:52:44 2009  Tanaka Akira  <akr@fsij.org>
+Fri Nov  8 02:09:12 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (rb_thread_schedule): fix condition for making thread
-	  runnable.  [ruby-core:23515]
+	* lib/csv.rb: [DOC] Fix typo in CSV.parse_line by @funky-bibimbap
+	  [Fixes GH-430] https://github.com/ruby/ruby/pull/430
 
-Sun Sep  6 19:47:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Nov  8 01:01:54 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
-	  [ruby-core:24767]
+	* golf_prelude.rb: syntax formatting for whitespace [Fixes GH-425]
+	  Patch by @edward https://github.com/ruby/ruby/pull/425
 
-Sun Sep  6 01:34:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Nov  7 19:36:09 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/win32.c (rb_w32_connect): return value was broken when some
-	  error occurred.
-	  [ruby-core:24234]
+	* gc.c: modify malloc_limit strategy.
 
-Fri Sep  4 10:03:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  * fix default values:
+	    GC_MALLOC_LIMIT_GROWTH_FACTOR
+	    GC_MALLOC_LIMIT: 8MB -> 16MB
+	    GC_MALLOC_LIMIT_MAX: 384MB -> 32MB
 
-	* io.c (argf_eof): go to the next file if called after ARGF.close
-	  or ARGF.skip.  a patch from Mike Kasick at [ruby-core:24561].
+	  * algorithm of malloc_limit increment.
+	    if (malloc_increase < malloc_limit) {
+	      next_malloc_limit = malloc_limit * factor
+	      if (malloc_limit > malloc_limit_max) {
+	        malloc_limit = malloc_increase
+	      }
+	    }
+	    This algorithm change malloc_limit from
+	    16MB -> 32MB slowly.
+	    If malloc_limit exceeds malloc_limit_max, then
+	    increase with malloc_increase.
 
-Sun Aug  9 17:43:44 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+Thu Nov  7 11:06:05 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* lib/irb.rb, lib/irb/init.rb, lib/irb/ext/save-history.rb: add
-	  IRB::irb_at_exit. no use finalizer saving history. [ruby-dev-38563]
+	* array.c (rb_ary_shuffle_bang): use RARRAY_PTR_USE() without WB
+	  because there are not new relations.
 
-Wed Aug  5 15:29:54 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Nov  7 10:34:12 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* io.c (rb_io_flush): fsync() after buffer is flushed on win32.
-	  backported from trunk.  [ruby-core:20043]
+	* array.c (rb_ary_sample): use rb_ary_dup().
 
+Thu Nov  7 09:39:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Aug  4 11:00:30 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_trace.c (rb_threadptr_exec_event_hooks_orig): errinfo should not
+	  be propagated to trace blocks so that no argument raise does not
+	  throw internal objects.  [ruby-dev:47793] [Bug #9088]
 
-	* re.h (RMATCH_REGS): added for compatibility.
+Wed Nov  6 21:30:55 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Mon Aug  3 14:46:53 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (gc_before_sweep): Change algorithm of malloc_limit to
+	  conservative for closing to memory consumption of ruby 2.0.
 
-	* lib/complex.rb (Numeric#arg): should return NaN for NaN.
-	  [ruby-core:24116]
+	* gc.c (GC_MALLOC_LIMIT, GC_MALLOC_LIMIT_GROWTH_FACTOR):
+	  Adjust parameters for new algorithm.
 
-Thu Jul 30 09:27:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov  6 21:16:51 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* bignum.c (big_lshift, big_rshift): return Bignum always withou
-	  normalization.  [ruby-dev:38680]
+	* array.c (rb_ary_shift_m): use RARRAY_PTR_USE() without WB because
+	  there are not new relations.
 
-Wed Jul 29 11:19:47 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Nov  6 21:05:20 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* io.c (argf_close): always call #close method.  [ruby-core:23853]
+	* array.c (rb_ary_reverse): use RARRAY_PTR_USE().
 
-	* io.c (argf_skip): should close only when current_file is available.
+Wed Nov  6 19:30:44 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Sat Jul 25 21:26:18 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* common.mk (help): add texts about gcbench.
 
-	* enum.c (first_i): Enumerator#first should consume only what is
-	  needed.   a patch from Marc-Andre Lafortune.  [ruby-core:23661]
+Wed Nov  6 16:32:32 2013  Martin Duerst <duerst@it.aoyama.ac.jp>
 
-	* enum.c (take_i): ditto.
+	* lib/open3.rb: tweaked grammar in comments
 
-	* enum.c (enum_first): call to_int once for an argument.  a patch
-	  from Marc-Andre Lafortune.
+Wed Nov  6 11:46:36 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Fri Jul 24 17:19:40 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_sample): use RARRAY_AREF() and RARRAY_PTR_USE()
+	  instead of RARRAY_PTR().
 
-	* lib/cgi.rb (HTTP_STATUS): typo fixed.   [ruby-dev:38538]
+Wed Nov  6 10:37:07 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Wed Jul 22 23:39:34 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_and): defer hash creation and some refactoring.
 
-	* lib/rexml/text.rb (REXML::Text.normalize): call to_s for input.
-	  [ruby-talk:337069]
+Wed Nov  6 09:14:31 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jul 21 18:21:47 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* benchmark/bm_vm1_gc_short_lived.rb: added.
+	  These GC benchmarks do not reflect practical applications.
+	  They are only for tuning.
 
-	* lib/mkmf.rb (SRC_EXT): should be flat.
-	  http://twitter.com/_tad_/status/1825862632
+	* benchmark/bm_vm1_gc_short_with_complex_long.rb: added.
 
-Sat Jul 18 00:44:43 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* benchmark/bm_vm1_gc_short_with_long.rb: added.
 
-	* gc.c (rb_gc_call_finalizer_at_exit): finalizer_table can be NULL.
-	  [ruby-core:24395]
+	* benchmark/bm_vm1_gc_short_with_symbol.rb: added.
 
-Thu Jul 16 09:35:06 2009  Akinori MUSHA  <knu@iDaemons.org>
+	* benchmark/bm_vm1_gc_wb_ary.rb: added.
 
-	* lib/delegate.rb (Delegator#method_missing)
-	  (DelegateClass()#method_missing): Properly pass a given block
-	  through. [ruby-dev:38390]
+	* benchmark/bm_vm1_gc_wb_obj.rb: added.
 
-Wed Jul 15 11:40:34 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* benchmark/bm_vm_thread_queue.rb: added.
+	  This benchmark is added to know how fast C version of thread.so.
 
-	* file.c (rb_file_join): recursive array has no meaning as path
-	  name.  [ruby-core:23329]
+Wed Nov  6 09:13:32 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jul 14 19:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c: define RGENGC_ESTIMATE_OLDSPACE == 0 if USE_RGENGC is 0.
 
-	* eval.c (get_ts): use readtime clock.  [ruby-dev:38354]
+Wed Nov  6 07:13:18 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_thread_stop_timer): clear thread_init while locking.
+	* gc.c (Init_GC): add GC::OPTS to show options.
 
-Tue Jul 14 19:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov  6 07:12:17 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_thread_start_timer): guard condition was inverted.
-	  [ruby-dev:38319]
+	* benchmark/gc/gcbench.rb: add some options to make quiet.
 
-Tue Jul 14 19:57:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Nov  6 04:14:25 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* eval.c (safe_mutex_lock): pthread_cleanup_push() must not be
-	  inside parens.
+	* ext/psych/lib/psych/visitors/to_ruby.rb: process merge keys before
+	  reviving objects. Fixes GH psych #168
+	* test/psych/test_merge_keys.rb: test for change
+	  https://github.com/tenderlove/psych/issues/168
 
-Mon Jul 13 01:36:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Nov  5 21:21:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* time.c (time_timeval): rounds subsecond toward zero.
+	* test/ruby/test_thread.rb (test_thread_join_in_trap):
+	  Run the test in a different process.
 
-Mon Jul 13 01:36:54 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Nov  5 20:14:32 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* time.c (time_timeval): check out-of-range.  [ruby-core:23282]
-	  [Bug #1396]
+	* gc.c (is_live_object): A hidden object may be a live object.
+	  [ruby-dev:47788] [Bug #9072]
 
-Thu Jul  9 17:58:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Nov  5 13:37:19 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (proc_invoke): shares dmethod scope local variables.
-	  a patch from coderrr at [ruby-core:23050]
+	* gc.c: add support to estimate increase of oldspace memory usage.
+	  This is another approach to solve an issue discussed at r43530.
+	  This feature is disabled as default.
 
-	* gc.c (obj_free): do not free cloned scope local variables.
+	  This feature measures an increment of memory consumption by oldgen
+	  objects. It measures memory consumption for each objects when
+	  the object is promoted. However, measurement of memory consumption
+	  is not accurate now. So that this measurement is `estimation'.
 
-Wed Jul  8 19:28:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  To implement this feature, move memsize_of() function from
+	  ext/objspace/objspace.c and expose rb_obj_memsize_of().
 
-	* eval.c (rb_thread_remove): stops timer thread unless other
-	  threads exist.  [ruby-core:18444]
+	  Some memsize() functions for T_DATA (T_TYPEDDATA) have problem to
+	  measure memory size, so that we ignores T_DATA objects now.
+	  For example, some functions skip NULL check for pointer.
 
-Mon Jul  6 16:01:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  The macro RGENGC_ESTIMATE_OLDSPACE enables/disables this feature,
+	  and turned off as default.
 
-	* eval.c (rb_eval): checks for interrupt, stack and finalizers too.
-	  [ruby-dev:38208], [Bug #1329]
+	  We need to compare 3gen GC and this feature carefully.
+	  (it is possible to enable both feature)
+	  We need a help to compare them.
 
-	* eval.c (eval): replaces the message if frozen.
+	* internal.h: expose rb_obj_memsize_of().
 
-Sun Jul  5 03:50:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/objspace/objspace.c: use rb_obj_memsize_of() function.
 
-	* lib/test/unit.rb: use Kernel.exit to get rid of using
-	  IRB::ExtendCommandBundle#exit.  a patch from Dmitry Vazhov by
-	  [ruby-core:22986].
+	* cont.c (fiber_memsize): fix to check NULL.
 
-Fri Jul  3 09:05:38 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* variable.c (autoload_memsize): ditto.
 
-	* lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network
-	  families problem. a patch from Charl Matthee at [ruby-core:21033].
+	* vm.c (vm_memsize): ditto.
 
-Wed Jul  1 15:46:30 2009  Tanaka Akira  <akr@fsij.org>
+Tue Nov  5 04:03:07 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/pathname.rb (Pathname#sub): set $~ in block.binding.
-	  [ruby-dev:38173]
+	* gc.c (GC_MALLOC_LIMIT_MAX): fix default value 512MB -> 384MB.
+	  512MB is huge.
 
-Mon Jun 29 13:18:42 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Nov  5 03:31:23 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/fileutils.rb (FileUtils#fu_get_gid): stringify group
-	  argument before making regexp match.  [ruby-dev:38155]
+	* gc.c: add 3gen GC patch, but disabled as default.
 
-Fri Jun 12 16:36:44 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  RGenGC is designed as 2 generational GC, young and old generation.
+	  Young objects will be promoted to old objects after one GC.
+	  Old objects are not collect until major (full) GC.
 
-	* ext/bigdecimal/bigdecimal.c (VpToString): fixed a bug introduced
-	  in r23613.  [ruby-talk:338957]
+	  The issue of this approach is some objects can promoted as old
+	  objects accidentally and not freed until major GC.
+	  Major GC is not frequently so short-lived but accidentally becoming
+	  old objects are not freed.
 
-Mon Jun  8 10:58:41 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	  For example, the program "loop{Array.new(1_000_000)}" consumes huge
+	  memories because short lived objects (an array which has 1M
+	  elements) are promoted while GC and they are not freed before major
+	  GC.
 
-	* eval.c (rb_thread_schedule): mswin32 doesn't have F_GETFD, so check
-	  with another method.
+	  To solve this problem, generational GC with more generations
+	  technique is known. This patch implements three generations gen GC.
 
-Mon Jun  8 08:15:36 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  At first, newly created objects are "Infant" objects.
+	  After surviving one GC, "Infant" objects are promoted to "Young"
+	  objects.
+	  "Young" objects are promoted to "Old" objects after surviving
+	  next GC.
+	  "Infant" and "Young" objects are collected if it is not marked
+	  while minor GC. So that this technique solves this problem.
 
-	* ext/bigdecimal/bigdecimal.c (VpAlloc): avoid ALLOCA_N() to avoid
-	  segmentation fault caused by (insanely) long decimal values.
-	  backported from 1.9. CVE-2009-1904
- 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_dump, BigDecimal_to_i,
-	  BigDecimal_to_f, BigDecimal_to_s, BigDecimal_split,
-	  BigDecimal_inspect): ditto.
+	  Representation of generations:
+	  * Infant: !FL_PROMOTED and !oldgen_bitmap [00]
+	  * Young :  FL_PROMOTED and !oldgen_bitmap [10]
+	  * Old   :  FL_PROMOTED and  oldgen_bitmap [11]
 
-Mon Jun  8 08:15:36 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  The macro "RGENGC_THREEGEN" enables/disables this feature, and
+	  turned off as default because there are several problems.
+	  (1) Failed sometimes (Heisenbugs).
+	  (2) Performance down.
+	      Especially on write barriers. We need to detect Young or Old
+	      object by oldgen_bitmap. It is slower than checking flags.
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): returns Inf if
-	  exp is bigger than DBL_MANT_DIG.
+	  To evaluate this feature on more applications, I commit this patch.
+	  Reports are very welcome.
 
-Wed Jun  3 21:16:30 2009  Tanaka Akira  <akr@fsij.org>
+	  This patch includes some refactoring (renaming names, etc).
 
-	* file.c: include fcntl.h for O_RDONLY on Solaris.
+	* include/ruby/ruby.h: catch up 3gen GC.
 
-Wed Jun  3 21:09:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* .gdbinit: fix to show a prompt "[PROMOTED]" for promoted objects.
 
-	* util.c (rv_strdup): macro to duplicate nul-terminated string.
-	  [ruby-core:22852]
+Tue Nov  5 00:05:51 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* util.c (ruby_dtoa): allocates one more byte to get rid of buffer
-	  overrun.  a patch from Charlie Savage at [ruby-core:22604].
+	* node.h: catch up comments for last commit.
 
-Wed Jun  3 21:09:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Nov  5 00:02:00 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* util.c (ruby_dtoa): allocates one more byte to get rid of buffer
-	  overrun.  a patch from Charlie Savage at [ruby-core:22604].
+	* include/ruby/ruby.h: rename FL_OLDGEN to FL_PROMOTED.
+	  This flag represents that "this object is promoted at least once."
 
-Wed Jun  3 21:05:44 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c, debug.c, object.c: catch up this change.
 
-	* ext/bigdecimal/bigdecimal.c (gfDebug): uncommented out.
-	  [ruby-core:22600]
+Mon Nov  4 22:20:16 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Jun  3 20:54:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/xmlrpc: Don't use fixed ports: 8070 and 8071.
 
-	* eval.c (rb_eval): needs to guard intermediate string objects.
-	  based on a patch from Brent Roman <brent AT mbari.org> a
-	  [ruby-core:22584].
+Mon Nov  4 15:25:52 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue May 26 21:24:01 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* test/xmlrpc/webrick_testing.rb (start_server): Initialize the server
+	  at main thread to fail early.
 
-	* Makefile.in (update-rubyspec, test-rubyspec): Catch up to
-	  rubyspec merge.  A patch by Brian Ford at [ruby-core:21032]
+Mon Nov  4 10:08:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue May 26 21:21:49 2009  Akinori MUSHA  <knu@iDaemons.org>
+	* eval_intern.h (TH_EXEC_TAG, TH_JUMP_TAG): get rid of undefined
+	  behavior of setjmp() in rhs of assignment expression.
+	  [ISO/IEC 9899:1999] 7.13.1.1
 
-	* lib/soap/mimemessage.rb (MIMEMessage#to_s): Fix a fatal
-	  method name typo. [Bug #1173]
+Sun Nov  3 23:06:51 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue May 26 21:16:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* sample/test.rb: Make temporary file names unique.
 
-	* file.c (rb_file_s_extname): fix for spaces before extention.
-	  [ruby-dev:38044]
+Sun Nov  3 20:41:17 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue May 26 21:09:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/xmlrpc: Wrap definitions by TestXMLRPC module.
 
-	* win32/win32.c (_CrtDbgReportW): prevent from false positive
-	  assertions in msvcrtd.  [ruby-core:22116]
+Sun Nov  3 20:23:38 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue May 26 21:02:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/xmlrpc/webrick_testing.rb (stop_server): Don't try to shutdown
+	  the server if the server is not started.
 
-	* lib/ostruct.rb (OpenStruct#new_ostruct_member): checks if frozen.
-	  [ruby-talk:328195], [ruby-core:22142]
+Sun Nov  3 09:35:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue May 26 21:00:08 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* load.c (rb_feature_p): deal with default loadable suffixes.
 
-	* lib/ostruct.rb (OpenStruct#inspect): fixed the recursion check.
-	  Patch by Kornelius Kalnbach.  [ruby-core:20992].
+	* load.c (load_lock): initialize statically linked extensions.
 
-	* test/ostruct/test_ostruct.rb: test for inspect.
-	  Patch by Kornelius Kalnbach.  [ruby-core:20992].
+	* load.c (search_required, rb_require_safe): deal with statically
+	  linked extensions.
 
-Tue May 26 20:50:32 2009  Tanaka Akira  <akr@fsij.org>
+	* load.c (ruby_init_ext): defer initialization of statically linked
+	  extensions until required actually.  [Bug #8883]
 
-	* eval.c (rb_thread_schedule): handle EBADF of select as well.
-	  [ruby-core:21264]
+Sat Nov  2 15:14:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Apr  8 18:59:52 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/logger.rb (Logger::LogDevice::LogDeviceMutex#lock_shift_log):
+	  open file can't be removed or renamed on Windows.  [ruby-dev:47790]
+	  [Bug #9046]
 
-	* win32/win32.c (subtruct): check tv_sec.
+	* test/logger/test_logger.rb (TestLogDevice#run_children): don't use
+	  fork.
 
-Thu Apr  2 16:06:17 2009  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Sat Nov  2 07:08:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/rss/test_atom.rb (RSS::TestAtomCore::assert_atom_content_inline_other_base64_to_s):
-	  ditto. [ruby-dev:38248]
+	* lib/logger.rb: Inter-process locking for log rotation
+	  Current implementation fails log rotation on multi process env.
+	  by sonots <sonots@gmail.com>
+	  https://github.com/ruby/ruby/pull/428 fix GH-428 [Bug #9046]
 
-Thu Apr  2 15:43:46 2009  Kouhei Sutou  <kou@cozmixng.org>
+Fri Nov  1 23:24:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/rss/rss-assertions.rb (RSS::Assertions::assert_atom_content_inline_other_text):
-	  newlines are valid for Base64 data. [ruby-dev:38248]
+	* gc.c (wmap_mark_map): mark live objects only, but delete zombies.
+	  [ruby-dev:47787] [Bug #9069]
 
-Thu Apr  2 14:17:09 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Fri Nov  1 22:45:54 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* test/openssl/test_ssl.rb (OpenSSL#test_client_session):
-	  Debian's openssl 0.9.8g-13 failed at assert(ssl.session_reused?),
-	  when use default SSLContext. [ruby-dev:36167]
-	  backported r19268 from trunk. [ruby-core:22843]
+	* gc.c (struct heap_page, gc_page_sweep, gc_sweep): Refactoring for
+	  performance. Add before_sweep condition to heap_page structure.
 
-Thu Mar 31 18:18:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (rb_gc_force_recycle): Use before_sweep member.
 
-	* lib/mkmf.rb (mkintpath): new function which converts native path
-	  to format acceptable in Makefile.
+	* gc.c (heap_is_before_sweep, is_before_sweep): Remove. They have not
+	  already been used.
 
-	* lib/mkmf.rb (configuration): leaves PATH_SEPARATOR unchanged.
+Fri Nov  1 22:20:28 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* lib/mkmf.rb (configuration): convers srcdir, topdir and hdrdir.
-	  a patch by Alexey Borzenkov <snaury AT gmail.com> at
-	  [ruby-core:21448].
+	* gc.c (make_deferred): Refactoring. Collect codes which should be
+	  atomic.
 
-Fri Mar 27 19:22:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (make_io_deferred, obj_free, rb_objspace_call_finalizer,
+	  gc_page_sweep): Correspond to the above.
 
-	* gc.c (run_final): frees zombies only.  [ruby-dev:38171]
+Fri Nov  1 21:40:35 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Fri Mar 27 19:22:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (typedef struct rb_objspace): Refactoring. Move some members
+	  into profile member.
 
-	* gc.c (rb_gc_call_finalizer_at_exit): leave Thread objects
-	  unfinalized.  [ruby-dev:38168]
+	* gc.c (newobj_of): Correspond to the above.
 
-Fri Mar 27 19:22:02 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (finalize_list): Ditto.
 
-	* gc.c (run_final): calls free function.  [ruby-core:22578]
+	* gc.c (objspace_live_num): Ditto.
 
-Mon Mar 23 19:17:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_page_sweep): Ditto.
 
-	* ext/thread/thread.c (rb_queue_pop, rb_queue_push): should not lock
-	  mutex if got an exception while waiting, and should ensure unlocked
-	  after signaled.  [ruby-dev:37545]
+	* gc.c (rb_gc_force_recycle): Ditto.
 
-Mon Mar 23 18:26:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (garbage_collect_body): Ditto.
 
-	* eval.c (rb_thread_value): missed to change at r17874.  [ruby-core:17595]
+	* gc.c (rb_gc_count): Ditto.
 
-Mon Mar 23 18:26:57 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_stat): Ditto.
 
-	* eval.c (rb_thread_join): new API.
+	* gc.c (gc_prof_set_heap_info): Ditto.
 
-	* ext/thread/thread.c (wait_mutex, lock_mutex): wait until the locking
-	  thread exits.  [ruby-dev:34856]
+	* gc.c (gc_profile_dump_on): Ditto.
 
-Mon Mar 23 17:41:49 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Nov  1 20:53:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* file.c (file_load_ok): checks if regular file, except for the
-	  platform disallows to open directories, e.g. dosish.
-	  [ruby-dev:38097], [Bug #1221]
+	* string.c (rb_str_scrub): fix typo, should yield invalid byte
+	  sequence to be scrubbed.  reported by znz at IRC.
 
-Mon Mar  9 20:59:24 2009  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Nov  1 17:25:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify
-	  returns positive value on success, not non-zero.  [ruby-core:21762]
-	  backported r22440 from trunk.
+	* gc.c (is_live_object): finalizer may not run because of lazy-sweep.
+	  [ruby-dev:47786] [Bug #9069]
 
-Mon Mar  9 10:02:15 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Nov  1 16:55:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* re.c (match_check): check if MatchData is initialized.
-	  [ruby-core:18749]
+	* string.c (rb_str_scrub): export with fixed length arguments, and
+	  allow nil as replacement string instead of omitting.
 
-Mon Mar  9 09:56:34 2009  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Nov  1 06:20:44 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* lib/rexml/rexml.rb: incremented Ruby::VERSION.  Thanks, Jeremy
-	  Kemper.  [ruby-core:20113]
+	* thread.c (rb_mutex_struct): reduce rb_mutex_t size by 8 bytes
+	  on 64bit platform. Patch by Eric Wong. [Feature #9068][ruby-core:58114]
 
-Mon Mar  9 09:52:53 2009  Tanaka Akira  <akr@fsij.org>
+Fri Nov  1 01:08:33 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* io.c (io_getpartial): fflush after read for updating pos in FILE.
-	  not portable, I guess.  [ruby-core:21561]
+	* benchmark/gc/gcbench.rb: print HWM (high water mark) if possible.
 
-Mon Mar  9 09:04:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Oct 31 21:48:31 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* gc.c (define_final): cannot define finalizer for immediate
-	  values.  [ruby-core:21500]
+	* lib/rexml/parsers/streamparser.rb: Add dependency file require.
+	  [Bug #9062] [ruby-dev:47779]
+	  Reported by Ippei Obayashi. Thanks!!!
 
-	* gc.c (define_final): freezes or hides internal values.
+Thu Oct 31 14:09:32 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Mar  9 08:54:47 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* vm_method.c (rb_method_entry_make): fix to pass an ISeq value.
+	  OBJ_WRITTEN() accepts only VALUE.
 
-	* parse.y (IS_BEG): EXPR_CLASS should be treated like EXPR_BEG.
-	  [ruby-core:21453]
+Wed Oct 30 19:07:57 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Feb 25 15:15:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* misc/ruby-additional.el (ruby-brace-to-do-end)
+	  (ruby-do-end-to-brace, ruby-toggle-block): Remove functions that
+	  are already in the latest released version of Emacs (24.3).
+	  [Bug #7565]
 
-	* node.h (rb_thread_raised_clear): should not clear flags other than
-	  raised flags.  a patch by Tomoyuki Chikanaga <chikanag AT
-	  nippon-control-system.co.jp> at [ruby-dev:37794].  [ruby-dev:37776]
+Wed Oct 30 12:44:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Feb 25 15:05:48 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/Makefile.sub (config.status): add missing variables,
+	  PLATFORM_DIR and THREAD_MODEL.
 
-	* ext/socket/extconf.rb (gai_strerror): checks if available and if
-	  returns const pointer.
+Wed Oct 30 12:20:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/socket/getaddrinfo.c (gai_strerror): defines only if non
-	  available.  [ruby-core:21328]
+	* time.c (v2w): Normalize a rational value to an integer if possible.
+	  [ruby-core:58070] [Bug #9059] reported by Isaac Schwabacher.
 
-Wed Feb 25 14:57:18 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 30 12:08:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* win32/win32.c (open_dir_handle): extracted from rb_w32_opendir.
+	* array.c (rb_ary_uniq_bang): use rb_ary_modify_check() instead of
+	  rb_ary_modify() because the array will be unshared soon.
 
-	* win32/win32.c (winnt_stat): gets rid of strange behavior of
-	  GetFileAttributes().  [ruby-core:21269]
+Wed Oct 30 03:25:10 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-Tue Feb 24 02:44:39 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: make less garbage when
+	  testing if a string is binary.
 
-	* lib/erb.rb (PercentScanner): remove PercentScanner. fixed % after
-	  %> bug. [ruby-dev:37751] [Bug #997] 
+Wed Oct 30 03:08:24 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* test/erb/test_erb.rb: ditto
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: string subclasses should
+	  not be considered to be binary.  Fixes Psych / GH 166
+	  https://github.com/tenderlove/psych/issues/166
 
-Tue Feb 24 02:35:29 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/psych/test_string.rb: test for fix
 
-	* hash.c (rb_hash_s_create): set nil as the value if assoc length
-	  is not enough.  [ruby-core:21249]
+Tue Oct 29 23:01:18 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sun Feb 22 22:08:45 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_zip): some refactoring.
 
-	* eval.c (stack_extend): streamlined rb_thread_restore_context()
-	  to ensure O(1) time.  based on a patch by Brent Roman <brent AT
-	  mbari.org>.
+Tue Oct 29 22:11:37 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sun Feb 22 22:03:40 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_uniq_bang): use st_foreach() instead of for loop.
 
-	* eval.c (cc_mark): frees the continuation's stack if its thread
-	  is dead to avoid recursive gc that segfaults.  [ruby-core:13889]
-	  a patch by Brent Roman <brent AT mbari.org>.
+Tue Oct 29 20:01:58 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_cont_check): checks for valid continuation instance.
+	* add RUBY_TYPED_FREE_IMMEDIATELY to data types which only use
+	  safe functions during garbage collection such as xfree().
 
-	* eval.c (rb_callcc): assigns th->thread before scope_dup() to
-	  avoid segfaults if this scope_dup() triggers a gc pass.
-	  a patch by Brent Roman <brent AT mbari.org>.
+	  On default, T_DATA objects are freed at same points as finalizers.
+	  This approach protects issues such as reported by [ruby-dev:35578].
+	  However, freeing T_DATA objects immediately helps heap usage.
 
-Sun Feb 22 21:43:34 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Most of T_DATA (in other words, most of dfree functions) are safe.
+	  However, we turned off RUBY_TYPED_FREE_IMMEDIATELY by default
+	  for safety.
 
-	* numeric.c (ruby_float_step): extracted from num_step().
+	* cont.c: ditto.
 
-	* range.c (range_step): uses ruby_float_step() for float range.
-	  [ruby-dev:37691]
+	* dir.c: ditto.
 
-Sun Feb 22 00:49:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* encoding.c: ditto.
 
-	* ext/extmk.rb (extmake): does not use both of makefile.rb and
-	  extconf.rb at the same time.
+	* enumerator.c: ditto.
 
-	* lib/mkmf.rb (DLLIB): depends on Makefile.  [ruby-core:21096]
+	* error.c: ditto.
 
-Sun Feb 22 00:19:05 2009  Tanaka Akira  <akr@fsij.org>
+	* file.c: ditto.
 
-	* eval.c (rb_thread_schedule): Don't change status of threads which
-	  don't run next even if select notify readability/writability.
-	  [ruby-core:20446]
+	* gc.c: ditto.
 
-Fri Feb 20 20:43:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c: ditto.
 
-	* lib/optparse.rb (OptionParser::List#summarize): gives priority
-	  to latter switches.  [ruby-dev:36692]
+	* iseq.c: ditto.
 
-	* lib/optparse.rb (OptionParser#summarize): do not append
-	  unnecessary line terminator.
+	* marshal.c: ditto.
 
-Fri Feb 20 19:35:08 2009  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+	* parse.y: ditto.
 
-	* lib/cgi/session.rb: ignore session_id options fixed.[Bug #605]
+	* proc.c: ditto.
 
-Fri Feb 20 18:06:40 2009  James Edward Gray II  <jeg2@ruby-lang.org>
+	* process.c: ditto.
 
-	Merged 20854 from trunk.
+	* random.c: ditto.
 
-	* lib/xmlrpc/server.rb:  Restricting method inspection to show only
-	  non-inherited public methods.  [ruby-core:20603]
+	* thread.c: ditto.
 
-	* lib/xmlrpc/server.rb:  Fixing method inspection so it doesn't 
-	  trigger XMLRPC::FaultException when used.  [ruby-core:20604]
+	* time.c: ditto.
 
-Fri Feb 20 01:41:08 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* transcode.c: ditto.
 
-	* lib/sync.rb (Sync_m#sync_try_lock): wrong variable name fixed.
-	  a patch from [ruby-core:20561]
+	* variable.c: ditto.
 
-	* lib/sync.rb (Sync_m::Err.Fail): turn off Thread.critical before
-	  exit.
+	* vm.c: ditto.
 
-Thu Feb 19 18:02:10 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+	* vm_backtrace.c: ditto.
 
-	* pack.c (pack_pack): fixed odd act of 'm*', 'M*', and 'P*'.
-	  just ignores '*' in these cases.
-	  [ruby-dev:37289]
+	* vm_trace.c: ditto.
 
-Thu Feb 19 17:26:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/bigdecimal/bigdecimal.c: ditto.
 
-	* pack.c (pack_pack): fixed length for odd length string.
-	  [ruby-dev:37283]
+	* ext/objspace/objspace.c: ditto.
 
-Thu Feb 19 17:13:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/stringio/stringio.c: ditto.
 
-	* eval.c (rb_yield_0): Qundef means no argument.  [ruby-Bugs-22525]
+	* ext/strscan/strscan.c: ditto.
 
-Wed Feb 18 22:28:00 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Oct 29 19:48:33 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/win32.c (rb_w32_isatty): check whether fd is valid.
+	* include/ruby/ruby.h: fix typo (FL_WB_PROTECT -> FL_WB_PROTECTED).
 
-Wed Feb 18 22:24:23 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Oct 29 18:45:08 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/win32.c (waitpid): fix bug of checking child slot.
+	* vm_trace.c (tp_free): removed because empty free function.
+	  Use RUBY_TYPED_NEVER_FREE instead.
 
-	* win32/win32.c (FindChildSlotByHandle): new.
+Tue Oct 29 18:37:33 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Feb 18 22:17:04 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* include/ruby/ruby.h: introduce new flags for T_TYPEDDATA.
+	  * RUBY_TYPED_FREE_IMMEDIATELY: free the data given by DATA_PTR()
+	    with dfree function immediately.  Otherwise (default), the data
+	    freed at finalization point.
+	  * RUBY_TYPED_WB_PROTECTED: make this object with FL_WB_PROTECT
+	    (not shady).
 
-	* pack.c (pack_pack): propagate taint status from format string to
-	  result string.
+	* gc.c (obj_free): support RUBY_TYPED_FREE_IMMEDIATELY.
 
-Wed Feb 18 22:07:44 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Oct 29 16:49:03 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/gdbm/gdbm.c: do not set members of RSTRING(str) directly.
-	  [ruby-dev:37182]
+	* gc.c (vm_malloc_increase): decrease it more carefully.
 
-	* ext/gdbm/gdbm.c (rb_gdbm_nextkey): fix memory leak.
+Tue Oct 29 16:24:52 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Feb 17 11:58:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (heap_page_resurrect): return a page in tomb heap even if
+	  freelist is NULL.
 
-	* string.c (str_independent): no independent string points null_str.
-	  [ruby-core:20082]
+Tue Oct 29 15:46:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Feb 16 23:30:24 2009  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ruby_atomic.h (ATOMIC_SIZE_CAS): new macro, compare and swap size_t.
 
-	* ext/tk/lib/tkextlib/blt.rb, ext/tk/lib/tkextlib/blt/vector.rb: 
-	  fix NameError bug.
+Tue Oct 29 12:08:05 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Feb 16 23:08:22 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/readline/readline.c (readline_getc): Consider
+	  NULL as input.
 
-	* string.c (rb_str_s_alloc, rb_str_replace): use null_str as well as
-	  rb_string_value so that extension libraries do not segfault.
-	  [ruby-core:19971]
+Tue Oct 29 11:10:08 2013  Aman Gupta <ruby@tmm1.net>
 
-	* string.c (rb_str_replace): reduced unnecessary malloc and copy.
+	* gc.c (gc_profile_total_time): fix off-by-one error in
+	  GC::Profiler.total_time.
+	* test/ruby/test_gc.rb (class TestGc): test for above.
 
-Mon Feb 16 22:45:41 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Tue Oct 29 09:53:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* test/rinda/test_rinda.rb: fixed fails occasionally [ruby-dev:37119].
-	  thanks, shinichiro.h.
+	* insns.def, vm.c, vm_insnhelper.c, vm_insnhelper.h, vm_method.c: split
+	  ruby_vm_global_state_version into two separate counters - one for the
+	  global method state and one for the global constant state. This means
+	  changes to constants do not affect method caches, and changes to
+	  methods do not affect constant caches. In particular, this means
+	  inclusions of modules containing constants no longer globally
+	  invalidate the method cache.
 
-Mon Feb 16 22:36:37 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* class.c, eval.c, include/ruby/intern.h, insns.def, vm.c, vm_method.c:
+	  rename rb_clear_cache_by_class to rb_clear_method_cache_by_class
 
-	* lib/drb/drb.rb (DRbConn::alive?): fixed NoMethodError problem
-	  from NaHi [ruby-dev:37110].
+	* class.c, include/ruby/intern.h, variable.c, vm_method.c: add
+	  rb_clear_constant_cache
 
-Sun Feb 15 04:21:42 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* compile.c, vm_core.h, vm_insnhelper.c: rename vmstat field in
+	  rb_call_info_struct to method_state
 
-	* lib/net/ftp.rb (Net::FTP#open_socket): SOCKSsocket is obsolete.
-	  a patch from Alan Johnson <alan.wayne.johnson at gmail.com> in 
-	  [ruby-core:19982].
+	* vm_method.c: rename vmstat field in struct cache_entry to method_state
 
-Fri Feb 13 19:18:42 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Oct 28 23:26:04 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/logger.rb (ProgName): fixed for svn, based on a patch from
-	  Nobuhiro IMAI at [ruby-dev:37108].
+	* test/readline/test_readline.rb (teardown): Clear Readline.input and
+	  Readline.output.
 
-Sun Feb 15 04:17:40 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Oct 28 21:35:31 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_request_line):
-	  use non-greedy match for path retrieval to avoid huge recursion
-	  for insanely long path.
+	* ext/-test-/file/depend, ext/-test-/postponed_job/depend,
+	  ext/-test-/tracepoint/depend: New files for dependencies.
 
-Fri Feb 13 19:04:54 2009  Keiju Ishitsuka  <keiju@ruby-lang.org>
+Mon Oct 28 15:32:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* shell/command-processor.rb: undefined method `top_level_test' in
-  	  Shell#test. [ruby-list:45634]
+	* ext/openssl/depend (ossl.o): work around of dependency of
+	  thread_native.h, which depends on headers by THREAD_MODEL.
+	  [ruby-dev:47777]
 
-Tue Feb 10 20:00:52 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/extconf.rb: need THREAD_MODEL.
 
-	* eval.c (load_lock): makes circular require deadlock.
-	  [ruby-core:19821]
+Mon Oct 28 14:57:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Feb 10 19:40:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* load.c (ruby_init_ext): share feature names between frame name and
+	  provided features.
 
-	* eval.c (rb_feature_p): returns found feature name if loading.
-	  [ruby-core:19798]
+Mon Oct 28 14:41:27 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* eval.c (search_required): ditto.
+	* misc/ruby-electric.el: Import ruby-electric.el 2.1 from
+	  https://github.com/knu/ruby-electric.el.
 
-Wed Feb 11 23:37:35 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  * Hitting the newline-and-indent key within a comment fires
+	    comment-indent-new-line.
 
-	* ext/bigdecimal/bigdecimal.c (VpMidRound): Round method bug
-	  pointed by Ryan Platte fixed(Patch to the patch from "NATORI
-	  Shin").  [ruby-talk:273360]
-	  back ported from 1.9. fix [ruby-core:19791]
+	  * Introduce a new feature
+	    `ruby-electric-autoindent-on-closing-char`.
 
-Mon Feb  9 17:35:38 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	  * Fix fallback behavior of ruby-electric-space/return that
+	    caused error with auto-complete.
 
-	* win32/win32.c (rb_w32_accept): secure fd before accept because if
-	  error causes in securing, cannot restore the state of accepted
-	  socket.
-	  fixed [ruby-core:19728]
+Mon Oct 28 13:17:17 2013  Or Cohen  <orc@fewbytes.com>
 
-Mon Feb  9 13:42:15 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* error.c (name_err_to_s): remove no longer needed overriding, since
+	  r30455 which made exc_to_s almost same.  Fixes [GH-413].
 
-	* win32/win32.c (ifs_open_socket): should retry without proto_buffer
-	  if cannot find the suitable protocol. a patch from Heesob Park.
-	  fixed [ruby-core:19713]
+Mon Oct 28 12:42:11 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Feb  9 13:40:21 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* common.mk, ext/objspace/depend, ext/coverage/depend,
+	  ext/-test-/debug/depend, ext/date/depend: Update dependencies.
 
-	* ext/stringio/stringio.c (strio_ungetc): should allow ungetc at
-	  the top of the buffer.  ref #701
+Mon Oct 28 09:29:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Thu Feb  5 09:38:48 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+	* vm.c: vm_clear_all_cache is not necessary now we use a 64 bit counter
+	  for global state version.
 
-	* ext/nkf/nkf-utf8/nkf.c (h_conv): can't guess UTF-8 input in
-	  conversion. [ruby-list:45609]
+	* vm_insnhelper.h: ruby_vm_global_state_version overflow is unnecessary
 
-Thu Feb  5 09:03:21 2009  Shugo Maeda  <shugo@ruby-lang.org>
+Mon Oct 28 07:47:32 2013  Aman Gupta <ruby@tmm1.net>
 
-	* lib/rexml/entity.rb (unnormalized): do not call
-	  document.record_entity_expansion if document is nil.
-	  see <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502535>.
-	  Thanks, Naohisa Goto.  backported from trunk.
+	* vm_backtrace.c (rb_profile_frame_classpath): do not use rb_inspect
+	  directly, since it might have a custom implementation or show ivars.
 
-	* test/rexml/test_document.rb: ditto.
+Mon Oct 28 04:10:41 2013  Aman Gupta <ruby@tmm1.net>
 
-Thu Feb  5 08:55:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_backtrace.c (rb_profile_frame_classpath): handle singleton
+	  methods defined directly on an object.
+	* test/-ext-/debug/test_profile_frames.rb: test for above.
 
-	* array.c (rb_ary_join): do not repeat self in a recursive array.
-	  [ruby-dev:37019]
+Mon Oct 28 00:52:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Feb  4 14:26:58 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* struct.c (new_struct): fix warning message, class name and encoding.
 
-	* dir.c (dir_globs): need taint check.  reported by steve
-	  <oksteev at gmail.com>
+Sun Oct 27 20:53:08 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Feb  3 14:35:26 2009  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* ext/readline/readline.c: Include ruby/thread.h for
+	  rb_thread_call_without_gvl2.
+	  (readline_rl_instream, readline_rl_outstream): Record FILE
+	  structures allocated by this extension.
+	  (getc_body): New function extracted from readline_getc.
+	  (getc_func): New function.
+	  (readline_getc): Use rb_thread_call_without_gvl2 to invoke getc_func.
+	  [ruby-dev:47033] [Bug #8749]
+	  (clear_rl_instream, clear_rl_outstream): Close FILE structure
+	  allocated by this extension reliably.  [ruby-core:57951] [Bug #9040]
+	  (readline_readline): Use clear_rl_instream and clear_rl_outstream.
+	  (readline_s_set_input): Set readline_rl_instream.
+	  (readline_s_set_output): Set readline_rl_outstream.
+	  (Init_readline): Don't call readline_s_set_input because
+	  readline_getc doesn't block other threads for any FILE structure now.
 
-	* lib/net/pop.rb: check for invalid APOP timestamp. (CVE-2007-1558)
-	  [ruby-dev:36631]
+	  [ruby-dev:47033] [Bug #8749] reported by Nobuhiro IMAI.
+	  [ruby-core:57951] [Bug #9040] reported by Eamonn Webster.
 
-	* test/net/pop/test_pop.rb: ditto.
+Sat Oct 26 19:31:28 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-Mon Feb  2 20:03:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c: catch up recent changes to compile on GC_DEBUG,
+	  RGENGC_CHECK_MODE.
 
-	* time.c (time_mdump, time_mload): preserves GMT status.
-	  [ruby-core:19252]
+Sat Oct 26 19:08:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Feb  2 11:34:51 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* range.c (range_initialize_copy): disallow to modify after
+	  initialized.
 
-	* variable.c (autoload_delete, autoload_file): should not delete
-	  autoload table, since it may be shared with duplicated modules.
-	  [ruby-core:19181]
+Sat Oct 26 17:48:54 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Jan 29 11:54:22 2009  Tadayoshi Funaba  <tadf@dotrb.org>
+	* lib/open-uri.rb (meta_add_field): : Re-implemented.
+	   [ruby-core:58017] [Bug #9051] patch by Eamonn Webster.
 
-	* lib/date.rb (today,now): should produce own instances.
-	  [ruby-talk:317020]
+Sat Oct 26 14:35:09 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Jan 28 22:51:55 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_profile_dump_on): use "Page" terminology.
 
-	* eval.c (rb_mod_modfunc): method undefined in included module
-	  may not have nd_body.  [ruby-core:18738]
+Sat Oct 26 13:25:45 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Jan 28 20:53:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_sweep, gc_heap_lazy_sweep): fix measurement code.
+	  We only need one sweep time measurement without lazy sweep.
 
-	* marshal.c (marshal_dump): fixed for check_dump_arg.
+Sat Oct 26 11:59:13 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Jan 27 17:30:11 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* addr2line.c: Include ELF header after system headers (especially
+	  sys/types.h) to avoid compilation failure,
+	  "usr/include/sh3/elf_machdep.h:4:2: error: #error Define _BYTE_ORDER!",
+	  on NetBSD/sh3 (dreamcast, hpcsh, landisk, mmeye).
 
-	* marshal.c (marshal_dump): initializes dump_arg before any funcall.
-	  [ruby-dev:36648]
+Sat Oct 26 11:35:22 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jan 27 15:17:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c: tuning parameters.
 
-	* ext/socket/socket.c (host_str): numeric address should be unsigned.
-	  [ruby-core:18971]
+	* gc.c (GC_MALLOC_LIMIT): change default value to 16MB.
 
-Mon Jan 26 11:12:03 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c (GC_MALLOC_LIMIT_GROWTH_FACTOR): change default value to 2.0.
 
-	* lib/tmpdir.rb: setup buffer with nul characters instead of spaces.
-	  fixed [ruby-dev:36493]
+	* gc.c (gc_before_sweep): change decrease ratio of `malloc_limit'
+	  from 1/4 to 1/10.
 
-Sun Jan 25 00:07:23 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Oct 26 11:30:07 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rexml/formatters/pretty.rb (REXML::Formatters::Pretty#wrap):
-	  abandon wrapping if the line contains no space.  [ruby-dev:36045]
-	  fix: #342
+	* gc.c (vm_malloc_increase): do gc_rest_sweep() before GC.
+	  gc_rest_sweep() can reduce malloc_increase, so try it before GC.
+	  Otherwise, malloc_increase can be less than malloc_limit at
+	  gc_before_sweep(). This means that re-calculation of malloc_limit
+	  may be wrong value.
 
-Sun Jan 25 00:02:23 2009  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
+Sat Oct 26 06:35:41 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* lib/matrix.rb (Vector#eql?): typo of the method name as "eqn?".
-	  (Vector#eqn?): removed. Defined by mistake.
-	  Fixes [ruby-dev:36294]. Reported by weda <weda AT
-	  issp.u-tokyo.ac.jp> and an anonymous user.
+	* gc.c (gc_before_heap_sweep): Restructure code to mean clearly.
+	  heap->freelist is connected to end of list.
 
-	* test/matrix/test_matrix.rb: added.
+Sat Oct 26 04:01:35 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* test/matrix/test_vector.rb: added.
+	* gc.c (gc_before_heap_sweep): fix freelist management.
+	  After rb_gc_force_recycle() for a object belonging to heap->freelist,
+	  `heap->using_page->freelist' is not null.
 
-Fri Jan 23 11:49:45 2009  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Oct 24 21:57:24 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-	* NEWS: added an entry for REXML.
+	* parse.y: Remove +(binary) and -(binary) special cases
+	  [Feature #9048]
 
-	* lib/rexml/document.rb: fixed typo.
+Thu Oct 24 12:45:53 2013  Zachary Scott  <e@zzak.io>
 
-Fri Jan 23 11:49:45 2009  Shugo Maeda  <shugo@ruby-lang.org>
+	* object.c: [DOC] Document first argument also takes string for:
 
-	* lib/rexml/document.rb: limit entity expansion.  Thanks, Luka
-	  Treiber, Mitja Kolsek, and Michael Koziarski.  backported from
-	  trunk r19033, r19317, r19318.
+	  rb_mod_const_get, rb_mod_const_set, rb_mod_const_defined
 
-	* lib/rexml/entity.rb: ditto.
+	  Also added note about NameError exception for invalid constant name
 
-	* test/rexml/test_document.rb: ditto.
+Thu Oct 24 12:23:58 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Thu Jan 22 15:19:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c (rb_thread_terminate_all): add a comment why we need
+	  state check and call terminate_i again.
 
-	* marshal.c (marshal_load): arg.data is no longer a VALUE but a
-	  st_table, and freed in load_ensure.  pointed out by pegacorn.
-	  [ruby-dev:37008]
+Thu Oct 24 12:15:02 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Thu Jan 22 15:19:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c (rb_thread_terminate_all): add a comment why infinite
+	  sleep is safe.
 
-	* gc.c (rb_mark_set): new function to mark keys.
+Thu Oct 24 07:41:42 2013  Aman Gupta <ruby@tmm1.net>
 
-	* marshal.c (struct dump_arg, struct load_arg): added wrappers to mark
-	  data entries.  backport from trunk r13527,r13528,r13961,r16533.
-	  [ruby-dev:36082]
+	* gc.c: add new initial_growth_max tuning parameter.
+	  [ruby-core:57928] [Bug #9035]
+	* gc.c (heap_set_increment): when initial_growth_max is set,
+	  do not grow number of slots by more than growth_max at a time.
+	* gc.c (rb_gc_set_params): load optional new tuning value from
+	  RUBY_HEAP_SLOTS_GROWTH_MAX environment variable.
+	* test/ruby/test_gc.rb (class TestGc): test for above.
 
-Wed Jan 21 11:12:55 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Oct 24 01:34:12 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (filetime_to_timeval): new function, split from
-	  gettimeofday().
+	* include/ruby/win32.h (rb_infinity_float): suppress overflow in
+	  constant arithmetic warnings.  [ruby-core:57981] [Bug #9044]
 
-	* win32/win32.c (gettimeofday): use above function.
+Thu Oct 24 00:11:24 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-	* win32/win32.c (filetime_to_unixtime): ditto. [ruby-dev:36135]
+	* lib/ostruct.rb: raise NoMethodError with a #name and #args.
+	  Raise RuntimeError when modifying frozen instances
+	  instead of TypeError.
+	  (OpenStruct#each_pair): Return an enumerator with size
+	  (OpenStruct#delete): Use the converted argument.
+	  Patches by Kenichi Kamiya. [Fixes GH-383]
 
-Wed Jan 21 11:12:55 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/ostruct/test_ostruct.rb: Added tests for above.
 
-	* win32/win32.c (gettimeofday): tv_usec is usec, not msec.
-	  [ruby-dev:36094]
+Thu Oct 24 00:10:22 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-Wed Jan 21 11:12:55 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* array.c: Add Array#to_h [Feature #7292]
 
-	* win32/win32.c (gettimeofday): calc tv_sec and tv_usec from system
-	  time by myself. [ruby-dev:36084]
+	* enum.c: Add Enumerable#to_h
 
-Wed Jan 21 11:12:55 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Oct 23 23:48:28 2013  Aman Gupta <ruby@tmm1.net>
 
-	* win32/win32.c (gettimeofday): shouldn't use mktime(2) because it's
-	  buggy about handling summer time.
-	  reported by Yoshikawa <yoshixool AT gmail.com> at [ruby-dev:36071]
+	* gc.c: Rename free_min to min_free_slots and free_min_page to
+	  max_free_slots. The algorithm for heap growth is:
+	    if (swept_slots < min_free_slots) pages++
+	    if (swept_slots > max_free_slots) pages--
 
-Tue Jan 20 12:23:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 23 22:51:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/scanf.rb (Scanf::FormatSpecifier#initialize): %i should accept
-	  single digit decimal.  [ruby-core:18355]
+	* win32/Makefile.sub (config.h): VC 2013 supports C99 mathematics
+	  functions.  [ruby-core:57981] [Bug #9044]
 
-Mon Jan 19 18:25:28 2009  Tanaka Akira  <akr@fsij.org>
+Wed Oct 23 19:13:18 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* configure.in (rb_cv_broken_glibc_ia64_erfc): renamed from
-	  rb_broken_glibc_ia64_erfc.
-	  [ruby-core:18228]
+	* gc.c: move increment from heap to heap_pages.
+	  Share `increment' information with heaps.
 
-Sat Jan 17 12:16:10 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c: change ratio of heap_pages_free_min_page
+	  to 0.80.
+	  This change means slow down page freeing speed.
 
-	* random.c (Init_Random): always initialize seed.
+Wed Oct 23 17:52:03 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Jan 16 10:59:31 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (heap_pages_free_unused_pages): cast to (int) for size_t
+	  variable `i'.
 
-	* class.c (clone_method): should copy cbase in cref as well.
-	  [ruby-dev:35116]
+Wed Oct 23 17:39:35 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* node.h (NEW_CREF): new NEW_ macro.
+	* gc.c: introduce tomb heap.
+	  Tomb heap is where zombie objects and ghost (freed slot) lived in.
+	  Separate from other heaps (now there is only eden heap) at sweeping
+	  helps freeing pages more efficiently.
+	  Before this patch, even if there is an empty page at former phase
+	  of sweeping, we can't free it.
 
-	* eval.c (PUSH_CREF): use NEW_CREF().
+	  Algorithm:
+	    (1) Sweeping all pages in a heap and move empty pages from the
+	        heap to tomb_heap.
+	    (2) Check all existing pages and free a page
+	        if all slots of this page are empty and
+	           there is enough empty slots (checking by swept_num)
 
-Thu Jan 15 14:34:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  To introduce this patch, there are several tuning of GC parameters.
 
-	* gc.c (STACK_LEVEL_MAX, ruby_stack_length): returns size_t.
-	  [ruby-core:18207]
-Wed Jan 14 10:39:56 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 23 14:20:56 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* stable/ext/socket/socket.c (NI_MAXHOST, NI_MAXSERV): fixed invalid
-	  preprocessor directives.  a patch from Peter Bowen at
-	  [ruby-core:18211].
+	* gc.c (gc_prof_sweep_timer_stop): catch up recent changes
+	  to compile on GC_PROFILE_MORE_DETAIL=1.
 
-Tue Jan 13 04:40:30 2009  Shugo Maeda  <shugo@ruby-lang.org>
+Wed Oct 23 11:43:27 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/net/ftp.rb (login): raise FTPReplyError if passwd or acct
-	  is not supplied.  backported from trunk.  fixed [ruby-core:18058].
+	* file.c: [DOC] fix rdoc format of File#expand_path from r43386
 
-Mon Jan 12 00:23:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct 22 21:58:28 2013  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
-	* gc.c (gc_sweep, obj_free, run_final): defer finalizers of IO and
-	  Data.  [ruby-dev:35578]
+	* vm_core.h (enum): avoid syntax error.
 
-	* gc.c (rb_gc_call_finalizer_at_exit): self-referencing finalizers
-	  cannot be invoked.  [ruby-dev:35681]
+	* method.h: ditto.
 
-Sun Jan 11 11:33:27 2009  Shugo Maeda  <shugo@ruby-lang.org>
+	* internal.h: ditto.
 
-	* lib/net/ftp.rb (chdir): handle 5xx errors correctly.
-	  backported from trunk.  fixed [ruby-core:18057].
+Tue Oct 22 19:53:16 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Jan  9 19:25:25 2009  Shugo Maeda  <shugo@ruby-lang.org>
+	* gc.c (Init_heap): move logics from heap_pages_init() and remove
+	  heap_pages_init().
 
-	* lib/net/imap.rb (disconnect): do not refer SSL::SSLSocket for
-	  environments without OpenSSL.  backported from trunk.
-	  fixed [ruby-dev:35755].
+Tue Oct 22 19:19:05 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Jan  8 13:24:23 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c: allow multiple heaps.
+	  Now, objects are managed by page. And a set of pages is called heap.
+	  This commit supports multiple heaps in the object space.
 
-	* parse.y (deferred_nodes, compstmt, arg, fixup_nodes, range_op): fix
-	  up fixnum range literal in conditional as automagical line number
-	  comparison.  [ruby-core:12124], [ruby-dev:35731]
+	  * Functions heap_* and rb_heap_t manages heap data structure.
+	  * Functions heap_page_* and struct heap_page manage page data
+	    structure.
+	  * Functions heap_pages_* and struct rb_objspace_t::heap_pages
+	    maintains all pages.
+	    For example, pages are allocated from the heap_pages.
 
-Wed Jan  7 10:09:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/GC_design
+	  and https://bugs.ruby-lang.org/attachments/4015/data-heap_structure_with_multiple_heaps.png
+	  for more details.
 
-	* eval.c (timeofday): use monotonic clock.  based on a patch
-	  from zimbatm <zimbatm@oree.ch> in [ruby-core:16627].
+	  Now, there is only one heap called `eden', which is a space for all
+	  new generated objects.
 
-Tue Jan  6 09:03:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct 22 18:26:12 2013  Tanaka Akira  <akr@fsij.org>
 
-	* parse.y (yylex): 8 and 9 in octal integer should cause compile
-	  error.  [ruby-dev:35729]
+	* lib/pp.rb (object_address_group): Use Kernel#to_s to obtain the class
+	  name and object address.
+	  This fix a problem caused by %p in C generates variable length
+	  address.
+	  Reported by ko1 via IRC.
 
-Mon Jan  5 11:14:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct 22 16:57:48 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* eval.c (rb_thread_schedule): runs deferred finalizers.
+	* file.c (File#expand_path): [DOC] improve documentation of File#expand_path.
+	  Based on patch by Prathamesh Sonpatki. [ruby-core:57734] [Bug #9002]
 
-	* gc.c (gc_sweep): sets rb_thread_pending to run deferred finalizers.
+Tue Oct 22 15:59:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* rubysig.h (CHECK_INTS): now checks rb_thread_pending even on
-	  platforms where setitimer is not available.  [ruby-core:18045]
+	* dir.c (glob_helper): don't skip current directories if FNM_DOTMATCH
+	  is given.  [ruby-core:53108] [Bug #8006]
 
-Mon Jan  5 11:14:39 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct 22 14:53:11 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* rubysig.h (CHECK_INTS): gives the chance to perform to deferred
-	  finalizers before explicit GC.start or the process termination.
-	  [ruby-core:18045]
+	* vm_trace.c: exterminate Zombies.
+	  There is a bug that T_ZOMBIE objects are not collected.
+	  Because there is a pass to miss finalizer postponed job
+	  with multi-threading. This patch solve this issue.
 
-Sun Jan  4 04:49:01 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_trace.c (rb_postponed_job_register_one): set
+	  RUBY_VM_SET_POSTPONED_JOB_INTERRUPT(th) if another same job
+	  is registered.
+	  There is a possibility to remain a postponed job without
+	  interrupt flag.
 
-	* win32/win32.c (rb_w32_telldir): just returns loc.
+	* vm_trace.c (rb_postponed_job_register_one): check interrupt
+	  carefully.
 
-	* win32/win32.c (rb_w32_rewinddir): needs to intialize loc.
-	  [ruby-core:18041]
+	* vm_trace.c (rb_postponed_job_register_one): use additional space
+	  to avoid buffer full.
 
-Sun Jan  4 04:45:26 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_finalize_deferred_register): check failure.
 
-	* win32/win32.c (rb_w32_select): recalc the rest of timeout for each
-	  iterations.  [ruby-core:18015]
+	* thread.c (rb_threadptr_execute_interrupts): check
+	  `postponed_job_interrupt' immediately.  There is a possibility
+	  to miss this flag.
 
-Fri Jan  2 03:08:47 2009  Kouhei Sutou  <kou@cozmixng.org>
+Tue Oct 22 12:11:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/rss/: use PNG instead of zlib as binary data. [ruby-dev:35666]
+	* configure.in: check if the given CFLAGS and LDFLAGS are working, and
+	  bail out early if not.
 
-Tue Nov 11 01:07:32 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Oct 22 00:06:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in: fix SEGV on Mac OS X 10.5.3 with --enable-pthread.
-	  a patch from Wataru Kimura in Bug #193 [ruby-core:17333].
+	* file.c (rb_file_exists_p): warn deprecated name.  [Bug #9041]
 
-Mon Aug 11 09:37:17 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Oct 21 23:57:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/dl.c (rb_str_to_ptr): should propagate taint to dlptr.
+	* encoding.c (load_encoding): should preserve outer errinfo, so that
+	  expected exception may not be lost.  [ruby-core:57949] [Bug #9038]
 
-	* ext/dl/dl.c (rb_ary_to_ptr): ditto.
+Sun Oct 20 15:41:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/sym.c (rb_dlsym_call): should check taint of DLPtrData as
-	  well.
+	* io.c (rb_io_reopen): create a new, temporary FD via rb_sysopen and
+	  call rb_cloexec_dup2 on it to atomically replace the file fptr->fd
+	  points to.  This leaves no possible window where fptr->fd is invalid
+	  to userspace (even for any threads running w/o GVL).  based on the
+	  patch by Eric Wong <normalperson@yhbt.net> at [ruby-core:57943].
+	  [Bug #9036]
 
-Fri Aug  8 10:53:52 2008  Tanaka Akira  <akr@fsij.org>
+Sun Oct 20 15:29:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/resolv.rb: randomize source port and transaction id.
-	  CVE-2008-1447.
+	* error.c (rb_syserr_fail_path_in): new function split from
+	  rb_sys_fail_path_in to raise SystemCallError without errno.
 
-	* lib/resolv-replace.rb (UDPSocket#bind): don't resolv host if host is
-	  "".
+	* internal.h (rb_syserr_fail_path): like rb_sys_fail_path but without
+	  errno.
 
-Mon Aug  4 14:49:35 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Sun Oct 20 13:58:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/smtp.rb (Net::SMTP::rcptto): fix a typo. a patch from
-	  Masao Takaku <masao at nii.ac.jp>
-	  fix [ruby-dev:35489].
+	* include/ruby/ruby.h (rb_obj_wb_unprotect, rb_obj_written),
+	  (rb_obj_write): suppress unused-parameter warnings.
 
-Mon Aug  4 14:13:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Oct 20 10:32:48 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* regex.c (xmalloc, xrealloc, xfree): not to use ruby managed memory.
+	* lib/rubygems:  Update RubyGems to master 0886307.  This commit
+	  improves documentation and should bring ruby above 75% documented on
+	  rubyci.
 
-	* regex.c (DOUBLE_STACK, re_compile_fastmap0, re_adjust_startpos),
-	  (re_search, re_match_exec): check if failed to allocate memory.
+Sun Oct 20 09:30:56 2013  Eric Hodel  <drbrain@segment7.net>
 
-Mon Aug  4 13:53:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rubygems:  Update to RubyGems master 3de7e0f.  Changes:
 
-	* bignum.c (rb_big2str0, bigsqr): made interruptible.  [ruby-Bugs-20622]
+	  Only attempt to build extensions for newly-installed gems.  This
+	  prevents compilation attempts at gem activation time for gems that
+	  already have extensions built.
 
-Mon Aug  4 13:31:41 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	  Fix crash in the dependency resolver for dependencies that cannot be
+	  resolved.
 
-	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
-	  about 64bit positive value.
-Mon Aug  4 13:31:41 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/rubygems:  ditto.
 
-	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): strict check.
-	  fixed [ruby-dev:33683]
+Sun Oct 20 05:24:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jul 17 21:42:07 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* variable.c (rb_class2name): should return real class name, not
+	  singleton class or iclass.
 
-	* lib/net/smtp.rb (Net::SMTP::start): revert to avoid RFC2821
-	  violation. [ruby-dev:35487]
+Sun Oct 20 04:18:48 2013  Aman Gupta <ruby@tmm1.net>
 
-Thu Jul 17 21:32:49 2008  Tanaka Akira  <akr@fsij.org>
+	* variable.c (rb_class2name): call rb_tmp_class_path() directly to
+	  avoid extra rb_str_dup() from rb_class_name().
 
-	* string.c (rb_str_format_m): make tmp volatile to avoid possible GC
-	  problem.
+Sat Oct 19 19:59:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jul 17 21:30:55 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/file.c (code_page): use simple array instead of st_table.
 
-	* lib/optparse.rb (OptionParser#environment): requires shellwords.
-	  [ruby-dev:35466]
+	* encoding.c (rb_locale_encindex): defer initialization of win32 code
+	  page table until encoding db loaded.
 
-Thu Jul 17 02:05:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Oct 19 08:25:05 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): requires
-	  webrick/cookie.  [ ruby-Bugs-21139 ]
+	* gc.c: fix rb_objspace_t.
+	  * make "struct heap" and move most of variables
+	    in rb_objspace_t::heap.
+	  * rename rb_objspace_t::heap::sorted to
+	    rb_objspace_t::heap_sorted_pages
+	    and make a macro heap_sorted_pages.
+	  * rename rb_objspace_t::heap::range to
+	    rb_objspace_t::heap_range and rename macros
+	    lomem/himem to heap_lomem/heap_himem.
 
-Thu Jul 17 01:38:31 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Sat Oct 19 07:14:40 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/zlib/zlib.c (rb_gzfile_set_mtime): fix typo.  [ruby-core:17713]
+	* lib/rubygems:  Update to RubyGems master 42543b6.  Changes:
 
-Sun Jul 13 00:08:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Fix `gem update` for gems with multiple platforms.
 
-	* lib/ipaddr.rb (IPAddr#initialize): get rid of ArgumentError in
-	  IPAddr#to_range.  a patch from okkez <okkez000 AT gmail.com> in
-	  [ruby-dev:35091].
+	* test/rubygems:  ditto.
 
-Sun Jul 13 00:04:38 2008  Tanaka Akira  <akr@fsij.org>
+Sat Oct 19 06:55:52 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* configure.in (erfc): erfc of glibc comes with Debian GNU/Linux Etch
-	  on IA64 is broken.  erfc(10000.0) aborts.
-	  use missing/erf.c instead.
-	  http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
+	* lib/rubygems:  Update to RubyGems master 0a3814b.  Changes:
 
-Thu Jul 10 18:50:48 2008  Tanaka Akira  <akr@fsij.org>
+	  Fixed extension directory in Gem::Specification#require_paths.
 
-	* common.mk (SPEC_GIT_BASE): update RubySpec GIT URL.
+	  Allow installation of gems when $HOME is nonexistent or unwritable.
 
-Thu Jul 10 18:46:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Use proper API in InstallCommand.
 
-	* file.c (rb_file_s_extname): fix for file name with spaces.
-	  [ruby-talk:307404]
+	  Improve support for path option in gem dependency files.
 
-Thu Jul 10 18:42:37 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	  Remove warnings.
 
-	* lib/erb.rb (PercentScanner#scan): fix %% line bug. [ruby-core:17491]
+	* test/rubygems:  ditto.
 
-	* test/erb/test_erb.rb (test_percent): ditto.
+Fri Oct 18 15:23:34 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Jul 10 18:40:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c: change terminology of heap.
+	  Change "slot" to "page". "Slot" is a space of RVALUE.
+	  1. "Heap" consists of a set of "heap_page"s (pages).
+	  2. Each "heap_page" has "heap_page_body".
+	  3. "heap_page_body" has RVALUE (a.k.a. "slot") spaces.
+	  4. "sorted" is a sorted array of "heap_page"s, sorted
+	     by address of heap_page_body (for "is_pointer_to_heap").
 
-	* lib/net/ftp.rb (Net::FTP#sendport): use divmod.  [ruby-core:17557]
+	  See https://bugs.ruby-lang.org/attachments/4008/data-heap_structure.png.
 
-Thu Jul 10 18:36:53 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Fri Oct 18 09:40:43 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ruby.c: Mac OS X needs origargc times of '\0' in
-	  origargv. [ruby-dev:35308]
+	* lib/rubygems:  Update to RubyGems master cee6788.  Changes:
 
-Thu Jul 10 13:53:08 2008  Tanaka Akira  <akr@fsij.org>
+	  Fix test failure on vc10-x64 Server on rubyci.org due to attempting
+	  to File.chmod where it is not supported.
 
-	* include/ruby/ruby.h (POSFIXABLE): use FIXNUM_MAX+1 instead of
-	  FIXNUM_MAX to make it possible to convert to double accurately.
-	  It assumes FLT_RADIX is 2.
-	  fix RubyForge bug #14102.
-	  backported from 1.9.
+	  Continuing work on improved gem dependencies file (Gemfile) support.
 
-Mon Jul  7 16:21:38 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test:  ditto.
 
-	* lib/net/smtp.rb (Net::SMTP::start): use 'localhost' instead of
-	  'localhost.localdomain'.  [ruby-dev:35333]
+Fri Oct 18 06:02:49 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/net/smtp.rb (Net::SMTP::SMTP.start): ditto.
+	* lib/rubygems:  Update to RubyGems master f738c67.  Changes:
 
-Mon Jul  7 15:02:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Fixed test bug for ruby with ENABLE_SHARED = no
 
-	* eval.c (rb_longjmp): duplicate the thrown exception to set backtrace
-	  if it was frozen.  clear all raised flags.
+	* test/rubygems:  ditto.
 
-	* eval.c (stack_check): leave clearing flag to rb_longjmp.
+Fri Oct 18 00:57:07 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_thread_set_raised, rb_thread_reset_raised): use generic
-	  flags.
+	* lib/tsort.rb (TSort.tsort): Extracted from TSort#tsort.
+	  (TSort.tsort_each): Extracted from TSort#tsort_each.
+	  (TSort.strongly_connected_components): Extracted from
+	  TSort#strongly_connected_components.
+	  (TSort.each_strongly_connected_component): Extracted from
+	  TSort#each_strongly_connected_component.
 
-	* eval.c (Init_Proc), gc.c (Init_GC): freeze preallocated special exceptions.
+Thu Oct 17 18:50:08 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* gc.c (rb_memerror): use thread raised flag instead of static flag,
-	  and raise nomem_error without backtrace if failed to make backtrace.
-	  [ruby-dev:34724]
+	* gc.c (CALC_EXACT_MALLOC_SIZE_CHECK_OLD_SIZE): introduced.
+	  This macro enable checker compare with allocated memory and
+	  declared old_size of sized_xfree and sized_xrealloc.
 
-	* gc.c (ruby_xmalloc): increase malloc_increase only if malloc
-	  succeeds.  failed malloc size can be huge.  it may increase
-	  malloc_limit too big which cause less GC and memory full.
-	  (ruby_xrealloc): ditto.
+Thu Oct 17 18:45:41 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Jul  7 12:23:05 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* string.c (STR_HEAP_SIZE): includes TERM_LEN(str).
 
-	* ext/win32ole/win32ole.c: avoid creating Ruby object during
-	  GC. thanks to arton <artonx AT yahoo.co.jp>. [ruby-dev:35313]
+	* string.c (rb_str_memsize): use STR_HEAP_SIZE().
 
-	* ext/win32ole/tests: add test_win32ole_event.rb, remove
-	  testOLEEVENT.rb
+Thu Oct 17 17:43:00 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/win32ole/tests/testWIN32OLE.rb(test_convert_bignum):
-	  fix test.
+	* vm_insnhelper.c (vm_call_method): set ci->me to 0 when the
+	  original method of a refined method is undef to avoid SEGV.
 
-Mon Jul  7 12:23:05 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* vm_method.c (rb_method_entry_without_refinements): return 0 when
+	  the original method of a refined method is undef to avoid SEGV.
 
-	* gc.c: add rb_during_gc(). based on a patch from arton <artonx AT
-	  yahoo.co.jp> at [ruby-dev:35313].   
+	* test/ruby/test_refinement.rb: related test.
 
-	* intern.h: ditto.
+Thu Oct 17 17:38:36 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Jul  3 20:13:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c, internal.h: rename ruby_xsizefree/realloc to
+	  rb_sized_free/realloc.
 
-	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
-	  public methods only.  [ruby-core:17283]
+	* array.c: catch up these changes.
 
-	* object.c (convert_type): ditto.
+	* string.c: ditto.
 
-	* lib/singleton.rb (Singleton#_dump): conversion method should be
-	  public.
+Thu Oct 17 17:32:51 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Jul  2 19:06:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c, string.c: use ruby_xsizedfree() and ruby_xsizedrealloc().
 
-	* lib/cgi.rb (CGI::QueryExtension.read_multipart): blanks inside
-	  double quotes are allowed.  [ruby-list:45140]
+	* internal.h (SIZED_REALLOC_N): define a macro as REALLOC_N().
 
-Wed Jul  2 19:03:37 2008  Tanaka Akira  <akr@fsij.org>
+Thu Oct 17 17:11:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* numeric.c (num_coerce): call rb_Float(x) first.  don't depend on
-	  evaluation order of function arguments.
+	* win32/win32.c (console_emulator_p): check by comparison between
+	  module handle of WriteConsoleW and kernel32.dll.
 
-Wed Jul  2 18:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in, win32/Makefile.sub, win32/setup.mak: no longer need
+	  psapi.lib.
 
-	* ext/syslog/syslog.c (syslog_write): syslog operations should be
-	  protected from $SAFE level 4.  a patch from Keita Yamaguchi
-	  <keita.yamaguchi at gmail.com>.
+Thu Oct 17 16:53:30 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/syslog/syslog.c (mSyslog_close): ditto.
+	* gc.c, internal.h: add new internal memory management functions.
+	  * void *ruby_xsizedrealloc(void *ptr, size_t new_size, size_t old_size)
+	  * void ruby_xsizedfree(void *x, size_t size)
+	  These functions accept additional size parameter to calculate more
+	  accurate malloc_increase parameter which control GC timing.
+	  [Feature #8985]
 
-	* ext/syslog/syslog.c (mSyslog_set_mask): ditto.
+Thu Oct 17 14:21:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jul  2 18:26:20 2008  Tanaka Akira  <akr@fsij.org>
+	* win32/file.c (rb_file_expand_path_internal): fix memory leaks at
+	  a non-absolute home exception.
 
-	* math.c (domain_check): fix preprocess condition.
+Thu Oct 17 14:06:39 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Jul  2 18:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/objspace/object_tracing.c (newobj_i): fix memory leak.
+	  There is possibility to remain info due to missing FREEOBJ event.
+	  FREEOBJ events are skipped while suppress_tracing state, for example,
+	  during trace events are invoking.
 
-	* lib/tmpdir.rb (@@systmpdir): prior LOCAL_APPDATA if possible, and
-	  should be clean.  based on a patch from arton <artonx AT
-	  yahoo.co.jp> at [ruby-dev:35269]
+Thu Oct 17 12:30:16 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Jul  2 18:16:19 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* lib/tsort.rb (TSort.each_strongly_connected_component_from):
+	  Extracted from TSort#each_strongly_connected_component_from.
 
-	* ext/win32ole/win32ole.c (date2time_str): fix the overflow in
-	  some situation. [ruby-bugs-20793]
+Thu Oct 17 11:07:06 2013  Eric Hodel  <drbrain@segment7.net>
 
-Tue Jul  1 15:11:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rubygems:  Update to RubyGems master 941c21a.  Changes:
 
-	* array.c (rb_ary_fill): check if beg is too big.
+	  Restored method bundler wants to remove for compatibility.
 
-Mon Jun 30 20:35:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Improvements to Gemfile compatibility.
 
-	* string.c (str_buf_cat): check for self concatenation.
+	* test/rubygems:  ditto.
 
-Sun Jun 29 21:39:54 2008  Tanaka Akira  <akr@fsij.org>
+Thu Oct 17 08:08:11 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_obj_respond_to): use RTEST to test the result of
-	  respond_to? method.
+	* ext/objspace/object_tracing.c (newobj_i): add workaround.
+	  some bugs hits this check.
 
-Sun Jun 29 21:20:17 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* ext/objspace/object_tracing.c (object_allocations_reporter_i): cast as pointer.
 
-	* array.c (rb_ary_fill): (compatibility) do not raise
-	  ArgumentError on negative length.  This behaviour shall change
-	  in a future release.
+Thu Oct 17 07:36:53 2013  Eric Hodel  <drbrain@segment7.net>
 
-Sun Jun 29 20:08:11 2008  Tanaka Akira  <akr@fsij.org>
+	* lib/rubygems:  Update to RubyGems master 2abce58.  Changes:
 
-	* time.c (time_timeval): fix rounding negative float.
+	  Fixed documentation generation when sdoc and json are installed as
+	  gems.
 
-Sun Jun 29 19:19:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Added some missing documentation.
 
-	* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen
-	  $0.  [ruby-dev:35261]
+Thu Oct 17 07:10:26 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/test/unit/ui/console/testrunner.rb (TestRunner#finished): ditto.
+	* ext/curses/curses.c: [DOC] Cleaned up formatting consistency of rdoc
+	  comments for Curses, including period spacing and column width.
 
-Sun Jun 29 19:19:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  This patch also fixed some typos. Thanks to @postmodern for the patch!
+	  [Fixes GH-420] https://github.com/ruby/ruby/pull/420
 
-	* ruby.c (set_arg0, ruby_prog_init): freeze $0.  a patch from Keita
-	  Yamaguchi <keita.yamaguchi at gmail.com>.
+Thu Oct 17 06:58:42 2013  Zachary Scott  <e@zzak.io>
 
-Sun Jun 29 18:33:33 2008  Tanaka Akira  <akr@fsij.org>
+	* ext/date/date_core.c: [DOC] plural grammar fixed by @scott113341
+	  Contributed via documenting-ruby.org: documenting-ruby/ruby#16
+	  https://github.com/documenting-ruby/ruby/pull/16
 
-	* process.c: include sys/resource.h if HAVE_SYS_RESOURCE_H is defined.
-	  pointed by TOYOFUKU Chikanobu.  [ruby-dev:35258]
+Thu Oct 17 05:52:31 2013  Zachary Scott  <e@zzak.io>
 
-Sun Jun 29 18:26:01 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/io/nonblock/nonblock.c: [DOC] Document io/nonblock by reprah
+	  [Fixes GH-418] https://github.com/ruby/ruby/pull/418 based on the
+	  original discussion from documenting-ruby/ruby#18
 
-	* variable.c (rb_f_trace_var): should not be allowed at safe level 4.  
-	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
+Thu Oct 17 05:40:33 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_call0): wrong condition to check insecure method.
-	  a patch from Keita Yamaguchi <keita.yamaguchi at gmail.com>.
+	* gc.c (objspace_each_objects): do not skip empty RVALUEs.
 
-Sun Jun 29 18:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Oct 17 05:31:31 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* array.c (rb_ary_fill): not depend on unspecified behavior at integer
-	  overflow.  reported by Vincenzo Iozzo <snagg AT openssl.it>.
+	* error.c (rb_bug_reporter_add): return simply 0 if failed.
+	  Please check return value.
 
-Sun Jun 29 18:22:06 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Thu Oct 17 05:17:33 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/win32ole/win32ole.c(ole_invoke): fix memory leak.
-	  [ruby-bugs-20792]
+	* ext/objspace/object_tracing.c: add new method
+	  ObjectSpace.trace_object_allocations_debug_start for GC debugging.
+	  If you encounter the BUG "... is T_NONE" (and so on) on your
+	  application, please try this method at the beginning of your app.
 
-Sun Jun 29 18:19:11 2008  Akinori MUSHA  <knu@iDaemons.org>
+Wed Oct 16 22:35:27 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (PUSH_FRAME, PUSH_CLASS): Add volatile to avoid a
-	  possible optimization bug on OS X/PPC.  This at least makes
-	  build with gcc -O1 and `make test' pass.
+	* ext/io/nonblock/nonblock.c: use rb_cIO instead of VALUE
 
-Sun Jun 29 17:24:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 16 17:45:13 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
-	  magic comment.
+	* bootstraptest/runner.rb: check nil before calling `signal?'
+	  for a process status.
 
-Sun Jun 29 17:22:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Oct 16 17:37:17 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/stringio/stringio.c (strio_each, strio_readlines): IO#each and
-	  IO#readlines do not affect $_.  [ruby-core:17277]
+	* error.c, internal.h (rb_bug_reporter_add): add a new C-API.
+	  rb_bug_reporter_add() allows to register a function which
+	  is called at rb_bug() called.
 
-Sun Jun 29 17:19:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/-test-/bug_reporter/bug_reporter.c: add a test for this C-API.
 
-	* ext/stringio/stringio.c (strio_readline, strio_each)
-	  (strio_readlines): set lastline.  [ruby-core:17257]
+	* ext/-test-/bug_reporter/extconf.rb: ditto.
 
-Sun Jun 29 17:15:49 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/-ext-/bug_reporter/test_bug_reporter.rb: ditto.
 
-	* ext/openssl/ossl.h: include winsock.h if USE_WINSOCK2 is not defined.
-	  a patch from arton <artonx at yahoo.co.jp> in [ruby-dev:35078]
+Wed Oct 16 15:14:21 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Jun 29 17:09:48 2008  wanabe  <s.wanabe@gmail.com>
+	* NEWS: add a line into NEWS for last commit.
 
-	* util.c (ruby_strtod): ruby_strtod don't allow a trailing
-	  decimal point like "7.". [ruby-dev:34835] [ruby-dev:35009]
+Wed Oct 16 15:09:14 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sat Jun 28 19:23:40 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* ext/objspace/objspace.c: add a new method `reachable_objects_from_root'.
+	  ObjectSpace.reachable_objects_from_root returns all objects referred
+	  from root (called "root objects").
+	  This feature is for deep object analysis.
 
-	* class.c (clone_method): use rb_copy_node_scope.
-	  fixed [ruby-list:45102]
-	  fixed [ruby-core:17393]
+	* test/objspace/test_objspace.rb: add a test.
 
-Sat Jun 28 18:49:50 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Wed Oct 16 15:00:21 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* class.c: revert to r15855.
+	* lib/rubygems:  Update to RubyGems master b955554.  Changes:
 
-Fri Jun 20 18:25:18 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Fixed NameError for Gem::Ext due to re-entering file lookup in
+	  RubyGems' overridden require.  Bug by Koichi Sasada.
 
-	* string.c (rb_str_buf_append): should infect.
+	  Fixed possible circular require warning in tests.
 
-Fri Jun 20 16:33:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Used existing constant for `gem install -g` dependency file list.
 
-	* array.c (rb_ary_store, rb_ary_splice): not depend on unspecified
-	  behavior at integer overflow.
+	* test/rubygems:  ditto.
 
-	* string.c (str_buf_cat): ditto.
+Wed Oct 16 09:42:42 2013  Eric Hodel  <drbrain@segment7.net>
 
-Wed Jun 18 22:24:46 2008  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* lib/rubygems:  Update to RubyGems master 278d00d.  Changes:
 
-	* array.c (ary_new, rb_ary_initialize, rb_ary_store,
-	  rb_ary_aplice, rb_ary_times): integer overflows should be
-	  checked. based on patches from Drew Yao <ayao at apple.com>
-	  fixed CVE-2008-2726
+	  Fixes building extensions without a "clean" make rule
 
-	* string.c (rb_str_buf_append): fixed unsafe use of alloca,
-	  which led memory corruption. based on a patch from Drew Yao
-	  <ayao at apple.com> fixed CVE-2008-2726
+	  Adds gem dependency file autodetection to "gem install -g"
 
-	* sprintf.c (rb_str_format): backported from trunk.
+	* test/rubygems:  Tests for the above.
 
-	* intern.h: ditto.
+Wed Oct 16 09:12:23 2013  Eric Hodel  <drbrain@segment7.net>
 
-Tue Jun 17 15:09:46 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rubygems:  Update to RubyGems master commit 2a74263.  This fixes
+	  several bugs in RubyGems 2.2.0.preview.1.
 
-	* file.c (file_expand_path): no need to expand root path which has no
-	  short file name.  [ruby-dev:35095]
+	* test/rubygems:  ditto.
 
-Sun Jun 15 19:27:40 2008  Akinori MUSHA  <knu@iDaemons.org>
+Wed Oct 16 07:25:02 2013  Aman Gupta <ruby@tmm1.net>
 
-	* configure.in: Fix $LOAD_PATH.  Properly expand vendor_ruby
-	  directories; submitted by Takahiro Kambe <taca at
-	  back-street.net> in [ruby-dev:35099].
+	* gc.c (gc_mark_roots): rename roots to be categories
+	  instead of function names.
 
-Mon Jun  9 17:56:30 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Oct 15 19:18:13 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/set.rb (Set#delete_if): Call to_a.
-	  (SortedSet#delete_if, TC_SortedSet#test_sortedset): Use super to
-	  yield elements in sorted order; [ruby-core:17144] by Arthur
-	  Schreiber.
-	  (SortedSet#each, SortedSet#each, TC_Set#test_each)
-	  (TC_SortedSet#test_sortedset): Return self; [ruby-dev:35002] by
-	  Arthur Schreiber.
+	* gc.h (rb_objspace_reachable_objects_from_root): added.
+	  This API provides information which objects are root objects.
+	  `category' shows what kind of root objects.
 
-Mon Jun  9 03:28:05 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* gc.c (gc_mark_roots): separate from gc_marks_body().
 
-	* ext/zlib/zlib.c (rb_deflate_initialize, Init_zlib): Fix up
-	  initialize_copy; [ruby-list:45016], [ruby-list:45018].
+Tue Oct 15 17:47:59 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Jun  9 03:26:03 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* process.c: Fix a typo.  MacOS X doesn't have ENOTSUPP.
 
-	* NEWS: Mention new constants.
+Mon Oct 14 12:32:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Jun  9 03:24:18 2008  Tanaka Akira  <akr@fsij.org>
+	* ruby.c (process_options): load statically linked extensions before
+	  rubygems, because of ext/thread.
 
-	* hash.c (hash_i): make Hash#hash order insensitive.
+	* ruby.c (process_options): use gem_prelude instead of requiring
+	  rubygems directly when --enable=gems is given.
 
-Mon Jun  9 03:22:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* Makefile.in (DEFAULT_PRELUDES): always use gem_prelude regardless of
+	  --disable-rubygems.
 
-	* configure.in (VENDOR_DIR): use LIBDIR instead of PREFIX as well as
-	  SITE_DIR.  a patch from Richard Brown <rbrown AT exherbo.org> in
-	  [ruby-core:17129].
+Mon Oct 14 11:07:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Jun  9 03:21:20 2008  Tanaka Akira  <akr@fsij.org>
+	* lib/mkmf.rb (have_framework): should append framework options to
+	  $LIBS, not $LDFLAGS.  The former is propagated to exts.mk when
+	  enable-static-linked-ext.
 
-	* gc.c (os_obj_of): assure to not free the scanning heap.
+	* lib/mkmf.rb (create_makefile): ranlib on static library, not DLLIB.
 
-Mon Jun  9 03:20:12 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Oct 13 23:53:40 2013  Andrew Grimm  <andrew.j.grimm@gmail.com>
 
-	* io.c (rb_open_file, rb_io_s_sysopen): fmode should be unsigned int.
-	  fixed [ruby-dev:34979]
+	* vsnprintf.c: Fix spelling from compliment to complement.
+	  Patch by @agrimm.
 
-Fri Jun  6 21:16:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* include/ruby/ruby.h: ditto
 
-	* win32/Makefile.sub (COMMON_HEADERS): include ws2tcpip.h.
+Sun Oct 13 20:59:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/socket/addrinfo.h (addrinfo, getaddrinfo, getnameinfo,
-	  freehostent, freeaddrinfo): undef before define because these are
-	  macros in some versions of Windows SDK.
+	* vm.c (Init_BareVM): initialize defined_module_hash here,
+	  Init_top_self() is too late to register core classes/modules.
 
-	* win32/setup.mak: maybe commit miss.
+	* compile.c (compile_array_): no hash to merge if it is empty.
 
-Fri Jun  6 19:34:22 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* vm.c (m_core_hash_merge_kwd): just check keys if only one argument
+	  is given, without merging.
 
-	* mkconfig.rb: hide build path from rbconfig.rb.
+Sat Oct 12 06:35:01 2013-10-11  Eric Hodel  <drbrain@segment7.net>
 
-	* util.c (ruby_strtod, dtoa): initialize more variables for error
-	  handling.
+	* lib/rake:  Update to rake 10.1.0
+	* bin/rake:  ditto.
+	* test/rake:  ditto.
 
-	* io.c (rscheck), marshal.c (w_nbyte, w_bytes, w_unique),
-	  (path2class, path2module): constified.
+	* NEWS:  Update NEWS to include rake 10.1.0 and links to release notes.
 
-	* pack.c (pack_unpack), process.c (rb_syswait): suppress warnings.
+Sat Oct 12 03:26:04 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* suppress warnings on cygwin, mingw and mswin.
+	* class.c, variable.c, gc.c (rb_class_tbl): removed.
 
-Fri Jun  6 19:23:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm.c, vm_core.h (rb_vm_add_root_module): added to register as a
+	  defined root module or class.
+	  This guard helps mark miss from defined classes/modules they are
+	  only referred from C's global variables in C-exts.
+	  Basically, it is extension's bug.
+	  Register to hash object VM has.
+	  Marking a hash objects allows generational GC supports.
 
-	* file.c (file_expand_path): fix for non-existent files and SFN of
-	  symlinks.  [ruby-talk:303736]
+	* gc.c (RGENGC_PRINT_TICK): disable (revert).
 
-Fri Jun  6 18:25:43 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Oct 12 03:24:49 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* test/iconv: Tests fixed.
+	* vm_method.c (rb_gc_mark_unlinked_live_method_entries):
+	  revert last commit to introduce debug prints.
 
-Fri Jun  6 17:04:56 2008  Akinori MUSHA  <knu@iDaemons.org>
+Fri Oct 11 21:05:19 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/win32.h: include ws2tcpip.h. fixed [ruby-Bugs-20528]
+	* internal.h, parse.y: use `full_mark' instead of `full_marking'.
 
-	* lib/time.rb (Time.xmlschema): don't use float.  fix
-	  http://rubyforge.org/tracker/index.php?func=detail&group_id=426&atid=1698&aid=20504
+Fri Oct 11 20:58:16 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* object.c (rb_obj_alloc): RDoc updated.  a patch from Gaston
-	  Ramos <ramos.gaston at gmail.com> in [ruby-core:17073].
+	* gc.c: use terminology `full_mark' instead of `minor_gc'
+	  in mark functions.
 
-	* lib/rdoc.rb: massive spelling correction patch from Evan Farrar
-	  <evanfarrar at gmail.com> in [ruby-doc:1382] applied.
+Fri Oct 11 20:46:09 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/ossl_ssl_session.c (ossl_ssl_session_initialize):
-	  Add a null check for ssl; submitted by akira yamada
-	  in [ruby-dev:34950].
+	* gc.c: use __GNUC__ instead of __GCC__.
 
-	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Define OP_NO_TICKET if
-	  SSL_OP_NO_TICKET is present; submitted by akira yamada
-	  in [ruby-dev:34944].
+Fri Oct 11 20:35:59 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* test/openssl/test_ssl.rb (OpenSSL#test_server_session): Add a
-	  workaround for the case where OpenSSL is configured with
-	  --enable-tlsext; submitted by akira yamada in [ruby-dev:34944].
+	* gc.c, parse.y: support generational Symbol related marking.
+	  Each symbols has String objects respectively to represent
+	  Symbols.
+	  These objects are marked only when:
+	  * full marking
+	  * new symbols are added
+	  This hack reduce symbols (related strings) marking time.
+	  For example, on my Linux environment, the following code
+	    "20_000_000.times{''}"
+	  with 40k symbols (similar symbol number on Rails 3.2.14 app,
+	  @jugyo tells me) boosts, from 7.3sec to 4.2sec.
 
-Fri Jun  6 16:58:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h: change prototype of rb_gc_mark_symbols().
 
-	* ext/iconv/iconv.c (iconv_iconv): fix for length argument and now
-	  allows range.  [ruby-core:17092] [ruby-core:17115]
+Fri Oct 11 19:27:22 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Jun  4 17:22:30 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* misc/ruby-electric.el: Import ruby-electric.el 2.0.1 which fixes
+	  a bug and a flaw with auto-end introduced in the revamp.
 
-	* NEWS: Fix typos and move misplaced entries.
-	  NEWS: Somehow optflags and warnflags were not actually included
-	  in this release.
+	  * ruby-forward-sexp is inappropriate here because it moves the
+	    cursor past the keyword.
 
-Tue Jun  3 19:33:22 2008  Akinori MUSHA  <knu@iDaemons.org>
+	  * Fix a reversed looking-back check in
+	    ruby-electric--block-beg-keyword-at-point-p.
 
-	* enumerator.c (enumerator_init_copy): Take care of
-	  initialize_copy as well as initialize.
+	  * Do not add end again if space or return is hit repeatedly
+	    after a block beginning keyword.
 
-	* test/ruby/test_enumerator.rb: Pull in the test suite for
-	  enumerator from trunk.
+Fri Oct 11 18:12:47 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jun  3 12:51:57 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/objspace/gc_hook.c: prohibit reentrant.
 
-	* enumerator.c (enumerator_allocate, enumerator_ptr): Properly
-	  detect if the object is initialized and raise error when
-	  appropriate.
-	  (enumerator_initialize): Fix a typo in rdoc. [ruby-core:17052]
+Fri Oct 11 18:11:34 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jun  3 10:16:40 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* vm_trace.c (rb_postponed_job_flush): fix bit operation.
 
-	* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
-	  where tokens are not yilelded one by one.
-	  (ERB::Compiler::TrimScanner#explicit_trim_line): Fix without-
-	  strscan problems. [ruby_core:17028].
+Fri Oct 11 17:33:24 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/erb/test_erb.rb (TestERBCore#_test_01)
-	  (TestERBCore#test_02_safe_04): The expected value should come
-	  first for assert_equal().
-	  (TestERBCoreWOStrScan): Add test class for without-strscan.
+	* misc/ruby-electric.el: Import ruby-electric.el 2.0 from
+	  https://github.com/knu/ruby-electric.el which integrates changes
+	  from another fork by @qoobaa.
 
-Mon Jun  2 19:47:16 2008  Akinori MUSHA  <knu@iDaemons.org>
+	  * Allow ruby-electric-mode to be disabled by introducing a
+	    dedicated key map.  Electric key bindings are now defined in
+	    ruby-electric-mode-map instead of overwriting ruby-mode-map.
 
-	* lib/delegate.rb (DelegateClass, Delegator#respond_to?):
-	  respond_to? must take optional second argument.  This was a
-	  latent bug exposed by a recent internal change of marshal.c to
-	  call respond_to? with a second argument; submitted by Jeremy
-	  Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
+	  * Add ruby-electric-mode-hook.
 
-Sat May 31 23:53:35 2008  Akinori MUSHA  <knu@iDaemons.org>
+	  * Use a remap in binding ruby-electric-delete-backward-char.
 
-	* .: Release as Ruby 1.8.7.
+	  * Totally revamp electric keywords and then introduce electric
+	    return.  Modifier keywords are now properly detected making
+	    use of ruby-mode's indentation level calculator, and
 
-Sat May 31 23:33:34 2008  Akinori MUSHA  <knu@iDaemons.org>
+	  * block-mid keywords (then, else, elsif, when, rescue and
+	    ensure) also become electric with automatic reindentation.
 
-	* README, README.ja: Add a note about default C flags.
+	  * Add standardized comments for ELPA integration.
 
-Sat May 31 22:11:15 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	  * Fix interaction with smartparens-mode by disabling its end
+	    keyword completion, since ruby-electric has become more clever
+	    at it.
 
-	* version.c (ruby_description, ruby_copyright): backported from
-	  1.9. bug#19002, [ruby-dev:34883]
+	  * The custom variable `ruby-electric-keywords` is changed to
+	    `ruby-electric-keywords-alist`, allowing user to fine-grained
+	    configuration.
 
-	* error.c (report_bug): uses ruby_description.
+Fri Oct 11 16:53:28 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sat May 31 20:56:04 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* vm_trace.c (rb_postponed_job_flush): simplify.
 
-	* array.c (rb_ary_delete_if): should return enumerator if no block
-	  is given.  [ruby-dev:34901]
+Fri Oct 11 03:36:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat May 31 18:28:17 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c (rb_threadptr_execute_interrupts): flush postponed job only
+	  once at last.
 
-	* suppress warnings with -Wwrite-string.
+	* vm_trace.c (rb_postponed_job_flush): defer calling postponed jobs
+	  registered while flushing to get rid of infinite reentrance of
+	  ObjectSpace.after_gc_start_hook.  [ruby-dev:47400] [Bug #8492]
 
-Sat May 31 15:58:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Oct 10 23:04:00 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* Makefile.in, configure.in (warnflags): defaulted to -Wall
-	  -Wno-parentheses with gcc.  [ruby-dev:34810]
+	* array.c (rb_ary_or): remove unused variables.
 
-Fri May 30 05:28:18 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Oct 10 23:01:16 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* enum.c (count_i, count_iter_i, count_all_i): add prototypes for VC.
+	* array.c (rb_ary_or): use rb_hash_keys().
 
-Fri May 30 04:32:07 2008  Akinori MUSHA  <knu@iDaemons.org>
+Thu Oct 10 21:36:16 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* enum.c (count_i, count_iter_i): Sync with trunk.
-	  enum.c (enum_count, count_all_i, Init_Enumerable),
-	  array.c (rb_ary_count): Sync with trunk.  If no argument or
-	  block is given, count the number of all elements.
+	* array.c (rb_ary_compact_bang): use ary_resize_smaller().
 
-Fri May 30 03:12:18 2008  Akinori MUSHA  <knu@iDaemons.org>
+Thu Oct 10 17:25:28 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand):
-	  Int should be enough here.
+	* vm.c (vm_exec): support :b_return event for "lambda{return}.call".
+	  [Bug #8622]
 
-Fri May 30 02:35:00 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* test/ruby/test_settracefunc.rb: add a test.
 
-	* ext/openssl/ossl_bn.c (ossl_bn_s_rand, ossl_bn_s_pseudo_rand),
-	  ext/openssl/ossl_pkey_dh.c (ossl_dh_s_generate)
-	  (ossl_dh_initialize),
-	  ext/openssl/ossl_pkey_dsa.c (ossl_dsa_s_generate),
-	  ext/openssl/ossl_rand.c (ossl_rand_bytes)
-	  (ossl_rand_pseudo_bytes, ossl_rand_egd_bytes),
-	  ext/openssl/ossl_x509store.c (ossl_x509stctx_set_error): Do not
-	  use FIX2INT() without checking the value type.  Use NUM2INT()
-	  instead; found by akr in [ruby-dev:34890].
+Thu Oct 10 13:52:37 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu May 29 20:07:45 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* vm_trace.c (postponed_job): use preallocated buffer.
+	  Pre-allocate MAX_POSTPONED_JOB (1024) sized buffer
+	  and use it.
+	  If rb_postponed_job_register() cause overflow, simply it
+	  fails and returns 0.
+	  And maybe rb_postponed_job_register() is signal safe.
 
-	* configure.in, win32/Makefile.sub, mkconfig.rb, instruby.rb,
-	  ruby.c, lib/mkmf.rb, README.EXT, README.EXT.ja: Backport the
-	  vendor_ruby directory support.
+	* vm_core.h: change data structure.
 
-Thu May 29 17:52:31 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Oct 10 11:11:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6
-	  as WIN32.  [ruby-core:16984]
+	* vm.c (Init_VM): hide also the singleton class of frozen-core, not
+	  only frozen-core itself.
 
-Wed May 28 17:54:29 2008  Akinori MUSHA  <knu@iDaemons.org>
+Thu Oct 10 06:02:08 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* string.c (rb_str_start_with): Remove an unused variable.
-	  (rb_str_upto_m): Fix a prototype.
+	* test/ruby/test_rand.rb: fix r43224. local variable `e' is
+	  no longer available.
 
-Wed May 28 17:48:28 2008  Akinori MUSHA  <knu@iDaemons.org>
+Thu Oct 10 00:02:35 2013  Yusuke Endoh  <mame@tsg.ne.jp>
 
-	* range.c (range_step): Fix brokenness when a non-integer numeric
-	  value is specified as step. [rubyspec]
-	  (range_step): Make use of String#step internally if a string (or
-	  string-alike) range is given.
+	* numeric.c (fix_aref): avoid a possible undefined behavior.
+	  1L << 63 on 64-bit platform is undefined, at least, according to
+	  ISO/IEC 9899 (C99) 6.5.7.
 
-	* string.c (rb_str_upto_m, Init_String): Add an optional second
-	  argument to specify if the last value should be included.
+Wed Oct  9 23:57:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 28 16:53:39 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* object.c (id_for_attr): avoid inadvertent symbol creation.
 
-	* array.c (rb_ary_slice_bang): Call rb_ary_modify_check() at the
-	  beginning. [rubyspec]
+Wed Oct  9 18:03:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 28 16:12:44 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* vm_method.c (rb_attr): preserve encoding of the attribute ID in
+	  error message.
 
-	* lib/webrick/httpservlet/cgihandler.rb (WEBrick::HTTPServlet::CGIHandler#do_GET):
-	  Set the HTTP status code to 302 if a Location header field is
-	  present and the status code is not valid as a client
-	  redirection.  cf. RFC 3875 6.2.3, 6.2.4.
+Wed Oct  9 17:40:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 28 15:18:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_fstring): because of lazy sweep, str may be unmarked
+	  already and swept at next time, so mark it for the time being.
+	  [ruby-core:57756]
 
-	* lib/singleton.rb (SingletonClassMethods): _load should be public.
+Wed Oct  9 13:53:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 28 12:52:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* compar.c (cmp_eq): fail if recursion.  [ruby-core:57736] [Bug #9003]
 
-	* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
-	  private methods too.  [ruby-dev:34671]
+	* thread.c (rb_exec_recursive_paired_outer): new function which is
+	  combination of paired and outer variants.
 
-	* object.c (convert_type): ditto.
+Wed Oct  9 09:18:14 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue May 27 23:26:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* include/ruby/debug.h,
+	  vm_backtrace.c (rb_profile_frame_full_label): add new C API
+	  rb_profile_frame_full_label() which returns label with
+	  qualified method name.
+	  Note that in future version of Ruby label() may return
+	  same return value of full_label().
 
-	* error.c (rb_bug): description from rb_bug() should include
-	  patchlevel.  [ruby-dev:34826]
+	* ext/-test-/debug/profile_frames.c,
+	  test/-ext-/debug/test_profile_frames.rb: fix a test for this change.
 
-Tue May 27 20:19:22 2008  Akinori MUSHA  <knu@iDaemons.org>
 
-	* array.c (rb_ary_slice_bang): Return an empty array instead of
-	  nil when pos is valid and len is adjusted from a valid value to
-	  zero; caught by RubySpec.
+Wed Oct  9 00:55:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue May 27 19:45:20 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* load.c (load_lock): display backtrace to $stderr at circular
+	  require.
 
-	* numeric.c (flo_divmod): Revert the behavior change; do not
-	  suppress an exception when div is NaN or Inf. [ruby-dev:34857]
+	* vm_backtrace.c (rb_backtrace_print_to): new function to print
+	  backtrace to the given output.
 
-Tue May 27 19:24:40 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Oct  8 21:03:35 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* enum.c (enum_to_a): Pass arguments through to #each().
-	  (enum_sort): Follow the enum_to_a signature change.
-	  (enum_reverse_each): Add #reverse_each().
+	* vm_backtrace.c, include/ruby/debug.h: add new APIs
+	  * VALUE rb_profile_frame_method_name(VALUE frame)
+	  * VALUE rb_profile_frame_qualified_method_name(VALUE frame)
 
-Tue May 27 18:54:02 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* iseq.c (rb_iseq_klass), internal.h: add new internal function
+	  rb_iseq_method_name().
 
-	* ext/stringio/stringio.c (strio_each_char, Init_stringio): Add
-	  StringIO#{each_char,chars}.
+	* ext/-test-/debug/profile_frames.c (profile_frames),
+	  test/-ext-/debug/test_profile_frames.rb: add a test.
 
-Tue May 27 17:59:34 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Oct  8 16:11:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/stringio/stringio.c (strio_each): Return an enumerator if no
+	* array.c (rb_ary_uniq): use rb_hash_values(), as well as the case no
 	  block is given.
-	  (strio_each_byte): Return an enumerator if no block is given,
-	  and return self if one is given as the rdoc says.
-
-	* io.c (rb_io_each_byte): Fix rdoc.  IO#each_byte returns self,
-	  not nil.
-
-Tue May 27 16:02:58 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_mod_module_exec, Init_eval): Add
-	  Module#{module_exec,class_exec}.
-
-Tue May 27 15:36:37 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* io.c (rb_io_each_char, argf_each_char, Init_IO):
-	  Add {IO#,ARGF.}{each_char,chars}.
-
-Tue May 27 13:46:52 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/stringio/stringio.c (Init_stringio): Define
-	  StringIO#{getbyte,readbyte}.
-
-Tue May 27 13:38:51 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* io.c (Init_IO): Define {IO#,ARGF.}{getbyte,readbyte}.
-
-Tue May 27 13:26:15 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/stringio/stringio.c (Init_stringio): Define #bytes and
-	  #lines.
-
-Tue May 27 13:20:35 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* io.c: (rb_io_lines, rb_io_bytes, Init_IO): Define
-	  IO#{lines,bytes} and ARGF.{lines,bytes}.
-
-Tue May 27 12:13:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (BUFCHECK): wrong condition. [ruby-core:16921]
-
-	* file.c (file_expand_buf): shouldn't use buflen for length of string.
-
-Mon May 26 18:24:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (BUFCHECK): no resize if enough room.
-
-	* file.c (file_expand_path): use BUFCHECK.
-
-Mon May 26 16:46:19 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (ntfs_tail): filename which starts with '.' is valid.
-
-	* file.c (file_expand_path): cygwin symlink support.
-
-Mon May 26 12:16:43 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* .: Release as Ruby 1.8.7-preview4.
-
-Mon May 26 12:12:26 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* marshal.c (dump_ensure, load_ensure): should return values.
-
-	* eval.c (yield_under, yield_under_i, yield_args_under_i)
-	  (specific_eval, rb_obj_instance_exec, Init_eval): Implement
-	  Object#instance_exec(), a 1.9 feature.
-
-Mon May 26 11:53:21 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_yield_0, proc_invoke, proc_arity): allow passing a
-	  block to a Proc.  [ruby-dev:23533]; by nobu; backported from
-	  1.9.  This implementation in current shape is known to be
-	  buggy/broken, especially with nested block invocation.  Take
-	  this as an experimental feature.
-
-	* parse.y (block_par, block_var): ditto.
-
-Mon May 26 08:00:52 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* marshal.c (r_object0, Init_marshal): Fix the garbled s_call
-	  definition; fixes [ruby-dev:34843].
-
-Mon May 26 03:16:20 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* hash.c (rb_hash_default): Fix rdoc.
-	  (rb_hash_each, env_each_value, env_each_pair): Return an
-	  enumerator if no block is given.
-	  (rb_hash_update): Update rdoc.
-	  (envix): Conditionalize the definition itself.
-	  (rb_f_getenv, env_fetch, env_keys, env_values, env_values_at)
-	  (env_select, env_inspect, env_to_a, env_empty_p, env_has_key)
-	  (env_has_value, env_index, env_indexes, env_to_hash, env_shift)
-	  (env_update): Require secure level 4.
-	  (env_each_value, env_each_i): Delay variable initialization.
-	  (env_each_key, env_each_value, env_reject_bang)
-	  (env_clear, env_replace): Omit duplicated secure level check.
-	  (env_has_value): Do to_str conversion.
-
-Sun May 25 19:48:12 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* hash.c (env_delete_if): Return an enumerator if no block is
-	  given.
-	  (env_each_key): Delay a variable initialization after
-	  RETURN_ENUMERATOR().
-
-Sun May 25 05:07:19 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* array.c (rb_ary_slice_bang): Be consistent with Array#slice()
-	  and String#slice!().  Just return nil when a negative length or
-	  out of boundary index is given instead of raising an exception
-	  via internal functions.
-	  (rb_ary_slice_bang): should not use rb_ary_subseq() which shares
-	  internal pointer.  splice modifies the receiver right after
-	  subseq.  [ruby-dev:34005]
-	  (rb_ary_slice_bang): should adjust length before making
-	  sub-array.
-
-	* enumerator.c (Init_Enumerator): Override
-	  Enumerable::Enumerator#each_with_index with #with_index.
-
-Sun May 25 03:13:09 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (Init_Thread): Initialize recursive_key.
-
-Sun May 25 02:45:49 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* error.c (syserr_eqq): Use en.
-
-Sat May 24 22:32:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): should clear errno before calling
-	  strtod(3).  [ruby-dev:34834]
-
-Sat May 24 22:27:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (marshal_load): should initialize arg.data used for
-	  reentrant check.  [ruby-dev:34837]
-
-Sat May 24 00:34:59 2008  Tanaka Akira  <akr@fsij.org>
-
-	* lib/rational.rb (Rational#to_i): fix rdoc.  Rational(-7,4).to_i
-	  should be -1.
-
-Fri May 23 20:22:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (reentrant_check): check reentrance via callcc.
-	  [ruby-dev:34802]
-
-Fri May 23 16:46:28 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c (proc_call): Remove an unused static function.
-
-Fri May 23 13:46:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (cflags): commit miss.
-
-Fri May 23 09:52:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (MINIRUBY), common.mk (RUBYOPT): add purelib.rb.
-	  [ruby-core:16642]
-
-	* ext/extmk.rb: load purelib.rb only when not cross compiling.
-
-Fri May 23 08:47:02 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (syserr_eqq): === should be able to handle delegated
-	  objects as well.
-
-Fri May 23 04:22:19 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c, ext/tk/tkutil/tkutil.c: fix memory leak.
-
-	* ext/tk/lib/tk.rb: avoid trouble when finalize TclTkIp.
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/*: help to fix troubles when
-	  use Ttk widgets on old Tk scripts.
-
-	* ext/tk/sample/*: update and add demo scripts. some of them are
-	  introduction about new features of Tcl/Tk8.5.
-
-Fri May 23 03:48:10 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* class.c (clone_method): Just use ruby_cref as cref.
-
-Fri May 23 01:03:23 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* class.c (rb_singleton_class_clone): Pass Qnil, not 0.
-
-Fri May 23 00:51:48 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* class.c (clone_method): Totally revamp the previous fix which
-	  was incorrect.
-	  (rb_mod_init_copy): Ditto.
-	  (singleton_class_clone_int): Ditto.
-
-Fri May 23 00:48:10 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c (rb_copy_node_scope), node.h: Rename from copy_node_scope
-	  and export.
-
-Thu May 22 21:24:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (top_local_setup): fixed memory leak bug based on a
-	  patch from Roger Pack <rogerpack2005 at gmail.com> in
-	  [ruby-core:16610].
-
-Thu May 22 14:20:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* array.c (flatten): check if reentered.  [ruby-dev:34798]
-
-Thu May 22 08:28:49 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (flatten): free memo hash table before raising exception.
-	  [ruby-dev:34789]
-
-Thu May 22 06:30:10 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* array.c (flatten): fix memory leak.
-
-Thu May 22 05:45:30 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* proc.c (proc_dup): should copy safe_level from src proc
-	  properly.  a patch from Keita Yamaguchi
-	  <keita.yamaguchi at gmail.com>
-
-Wed May 21 23:31:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_get_method_body, rb_alias, rb_eval): should not cache
-	  uninitialized value, since search_method doesn't set origin if the
-	  method wasn't found.
-
-	* eval.c (search_method, remove_method, error_print, rb_alias)
-	  (rb_eval, rb_rescue2, search_required, Init_eval, rb_thread_create),
-	  gc.c (rb_source_filename, Init_stack), io.c (rb_io_getline),
-	  parse.y (rb_id2name, rb_parser_free): suppress warnings.
-
-Wed May 21 12:34:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_delete): rdoc fix based on a patch from Gaston Ramos
-	  <ramos.gaston AT gmail.com>.  [ruby-core:16825]
-
-Tue May 20 13:15:46 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* file.c (lchmod_internal): Remove a compiler warning.
-
-Mon May 19 18:22:35 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/openssl/ossl_pkcs5.c (ossl_pkcs5_pbkdf2_hmac): Fix the type
-	  of md; pointed out by Takahiro Kambe <taca at back-street.net>
-	  in [ruby-dev:34748].
-
-Mon May 19 14:20:13 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): fixed SEGV on win32 with "% 0e" % 1.0/0.0.
-
-Mon May 19 13:29:58 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* process.c (rb_f_system): set last_status when status == -1 because
-	  there is no path to set it on win32. this patch is derived from
-	  [ruby-core:16787], submitted by Luis Lavena <luislavena at gmail.com>
-
-Mon May 19 13:01:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk ({MSPEC,RUBYSPEC}_GIT_URL): moved from Makefine.in.
-
-	* {win32,bcc32}/Makefile.sub (update-rubyspec): added.
-
-Mon May 19 11:53:45 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted
-	  prototype change in openssl bundled with newer OpenBSD.
-	  a patch from Takahiro Kambe <taca at back-street.net> in
-	  [ruby-dev:34691].
-
-Mon May 19 06:36:37 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* .: Release as Ruby 1.8.7-preview3.
-
-Sun May 18 22:26:51 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservlet/filehandler.rb: should normalize path
-	  name in path_info to prevent script disclosure vulnerability on
-	  DOSISH filesystems. (fix: CVE-2008-1891)
-	  Note: NTFS/FAT filesystem should not be published by the platforms
-	  other than Windows. Pathname interpretation (including short
-	  filename) is less than perfect.
-
-	* lib/webrick/httpservlet/abstract.rb
-	  (WEBrick::HTTPServlet::AbstracServlet#redirect_to_directory_uri):
-	  should escape the value of Location: header.
-
-	* lib/webrick/httpservlet/cgi_runner.rb: accept interpreter
-	  command line arguments.
-
-Sat May 17 23:53:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (file_expand_path): fix for short file name on Cygwin.
-
-Sat May 17 11:29:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_extname): first dot is not an extension name.
-
-Sat May 17 10:18:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_search): need to free allocated buffer in re_register.
-
-Fri May 16 17:01:44 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (test-rubyspec): added.
-
-Fri May 16 16:22:40 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: sometimes freeze when receive Interrupt signal.
-
-Fri May 16 14:54:56 2008  Tanaka Akira  <akr@fsij.org>
-
-	* Makefile.in (update-rubyspec): move rubyspec to srcdir. 
-	  (test-rubyspec): ditto.
-
-Fri May 16 14:25:22 2008  Tanaka Akira  <akr@fsij.org>
 
-	* Makefile.in (test-rubyspec): use RUNRUBY.  suggested by nobu.
+	* internal.h: define rb_hash_values() as internal API.
 
-Fri May 16 13:01:43 2008  Tanaka Akira  <akr@fsij.org>
+Tue Oct  8 13:53:21 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* Makefile.in (update-rubyspec): new target to download rubyspec.
-	  (test-rubyspec): new target to run rubyspec.  this doesn't work
-	  before install.
+	* array.c (rb_ary_uniq): use rb_hash_keys().
 
-Fri May 16 08:15:52 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* internal.h: define rb_hash_keys() as internal API.
 
-	* ext/tk/lib/tk.rb: fix memory (object) leak bug.
+	* hash.c (rb_hash_keys): ditto.
 
-	* ext/tk/sample/demos-jp/aniwave.rb, ext/tk/sample/demos-en/aniwave.rb:
-	  bug fix.
+Tue Oct  8 10:56:39 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Thu May 15 17:00:22 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* cont.c: disable FIBER_USE_NATIVE on GNU/Hurd because it doesn't
+	  support a combination getcontext() and threads. Patch by
+	  Gabriele Giacone (1o5g4r8o@gmail.com). [Bug #8990][ruby-core:57685]
 
-	* string.c (Init_String): Define #bytesize as an alias for #size
-	  for compatibility with 1.9.
+Tue Oct  8 05:58:12 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu May 15 15:33:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local
+	  time Time object as Ruby 2.0 and before.
 
-	* file.c (file_expand_path): support for alternative data stream
-	  and ignored trailing garbages of NTFS.
+Tue Oct  8 05:40:37 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* file.c (rb_file_s_basename): ditto.
+	* .travis.yml:  Rebuild Travis CI's "ruby-head" version on successful
+	  build.  Patch by Konstantin Haase.  [Fixes GH-417]
+	  https://github.com/ruby/ruby/pull/417
 
-	* file.c (rb_file_s_extname): ditto.
+Tue Oct  8 04:28:25 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed May 14 19:24:59 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* misc/ruby-mode.el: Use preceding-char/following-char
+	  (returning 0 at BOF/EOF) instead of char-before/char-after
+	  (returning nil at BOF/EOF) to avoid error from char-syntax when
+	  at BOF/EOF.
 
-	* array.c (rb_ary_count): Override Enumerable#count for better
-	  performance.
-	  (rb_ary_nitems): Undo the backport.  Use #count {} instead.
-
-	* enumerator.c (enumerator_iter_i): Remove an unused function.
-	  (enumerator_with_index, enumerator_each): Remove unused
-	  variables.
-
-Wed May 14 17:15:11 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/tk/tkutil/extronf.rb: check stdndup() because it's not standard
-	  function of C.
-
-	* ext/tk/tkutil/tkutil.c (cbsubst_table_setup): use malloc() and
-	  strncpy() instead of strndup() if not available.
-
-Wed May 14 09:52:02 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil/tkutil.c: improve handling callback-subst-keys. 
-	  Now, support longnam-keys (e.g. '%CTT' on tkdnd-2.0; however, still
-	  not support tkdnd-2.0 on tkextlib), and symbols of parameters (e.g. 
-	  :widget=>'%W', :keycode=>'%k', '%x'=>:x, '%X'=>:root_x, and so on; 
-	  those are attributes of event object). It means that Ruby/Tk accepts
-	  not only "widget.bind(ev, '%W', '%k', ...){|w, k, ...| ... }", but 
-	  also "widget.bind(ev, :widget, :keycode, ...){|w, k, ...| ... }". 
-	  It is potentially incompatible, when user passes symbols to the
-	  arguments of the callback block (the block receives the symbols as
-	  strings). I think that is very rare case (probably, used by Ruby/Tk
-	  experts only). When causes such trouble, please give strings instead
-	  of such symbol parameters (e.g. call Symbol#to_s method).
-
-	* ext/tk/lib/tk/event.rb, ext/tk/lib/tk/validation.rb, 
-	  ext/tk/lib/tkextlib/blt/treeview.rb, 
-	  ext/tk/lib/tkextlib/winico/winico.rb: ditto.
-
-	* ext/tk/tkutil/tkutil.c: strings are available on subst_tables on 
-	  TkUtil::CallbackSubst class (it is useful on Ruby 1.9). 
-
-	* ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tkextlib/iwidgets/hierarchy.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/spinner.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/entryfield.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/calendar.rb, 
-	  ext/tk/lib/tkextlib/blt/dragdrop.rb, 
-	  ext/tk/lib/tkextlib/tkDND/tkdnd.rb, 
-	  ext/tk/lib/tkextlib/treectrl/tktreectrl.rb, 
-	  ext/tk/lib/tkextlib/tktable/tktable.rb: disable code piece became 
-	  unnecessary by reason of the changes of ext/tk/tkutil/tkutil.c.
-
-Tue May 13 15:10:50 2008  Akinori MUSHA  <knu@iDaemons.org>
-
-	* enumerator.c: Update rdoc.
-	  (enumerator_initialize): Discourage the use.
-	  (enum_each_slice, enum_each_cons, enumerator_each)
-	  (enumerator_with_index): Add a note about a call without a block.
-
-	* NEWS: Intentionally omit enum_slice and enum_cons, which are
-	  removed in 1.9.
-
-Tue May 13 07:56:36 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_cat): fixed buffer overrun reported by
-	  Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746]
-
-Mon May 12 13:57:19 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}.  "defined?(a||=1)"
-	  should not operate assignment.  [ruby-dev:34645]
-
-Mon May 12 12:59:23 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/wm.rb: Wm#overrideredirect overwrites arguemnt to
-	  an invalid value.
-
-	* ext/tk/sample/ttk_wrapper.rb: support "if __FILE__ == $0" idiom.
-
-Mon May 12 12:36:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_select): backport from trunk.
-	  [ruby-talk:300743]
-
-Mon May 12 12:33:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (RUBYLIB, RUBYOPT): clear.
-
-Mon May 12 10:41:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (SimpleDelegator::dup): removed needless argument.
-	  [ruby-list:44910]
-
-	* lib/delegate.rb (clone, dup): keep relationship with the target
-	  object.
-
-Sun May 11 23:19:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (all_iter_i, any_iter_i): reduced duplicated code.
-
-Sun May 11 17:57:36 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (MINIRUBY): should not include extension library path.
-
-Sun May 11 10:36:10 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* eval.c (method_name, method_owner): New methods; backported
-	  from 1.9. (UnboundMethod#name, UnboundMethod#owner)
-
-Sun May 11 02:48:13 2008    <nagai@orca16.orcabay.ddo.jp>
-
-	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: fail to do pack/grid 
-	  without options.
-
-	* ext/tk/lib/tk.rb: add TkWindow#grid_anchor, grid_column, grid_row.
-
-Sat May 10 18:19:16 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_each_line): RDoc updated.  [ruby-dev:34586]
-
-Sat May 10 13:17:56 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/pack.rb, ext/tk/lib/tk/grid.rb: increase supported
-	  parameter patterns of configure method.
-
-Sat May 10 09:16:13 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): backported from 1.9.  a patch from Satoshi
-	  Nakagawa <psychs at limechat.net> in [ruby-dev:34625]. 
-	  fixed: [ruby-dev:34623]
-
-Fri May  9 23:33:25 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/wm.rb: methods of Tk::Wm_for_General module cannot
-	  pass the given block to methods of Tk::Wm module.
-
-	* ext/tk/lib/tk/grid.rb: lack of module-method definitions.
-
-	* ext/tk/lib/tkextlib/tile.rb: lack of autoload definitions.
-
-	* ext/tk/lib/tkextlib/tile/tnotebook.rb: cannot use kanji (not UTF-8) 
-	  characters for headings.
-
-	* ext/tk/tcltklib.c: maybe a little more stable about @encoding value 
-	  of TclTkIp object.
-
-Wed May  7 08:46:44 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_s_def): to_str should be called only once.
-	  [ruby-core:16647]
-
-Wed May  7 00:54:25 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/zlib/zlib.c (gzreader_gets): may cause infinite loop.
-	  a patch from Kouya <kouyataifu4 at gmail.com> in
-	  [ruby-reference-manual:762].
-
-Sun May  4 09:35:51 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* sample/erb/erb4html.rb (ERB4Html) : add example of ERB#set_eoutvar.
-	  ERB4Html is an auto-quote ERB.
-
-Sat May  3 22:52:48 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
-	  ext/tk/sample/ttk_wrapper.rb: improve treating and control themes. 
-	  add Tk::Tile.themes and Tk::Tile.set_theme(theme).
-
-Fri May  2 14:52:33 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el: move fontifying code from hook.  a patch from
-	  Phil Hagelberg <phil at hagelb.org> in [ruby-core:16636].
-
-Fri May  2 13:47:51 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (match_select): restore previous behavior of MatchData#select.
-	  RDoc updated as well, mentioning the plan to remove this method
-	  in the future.  [ruby-dev:34556]
-
-Fri May  2 13:04:04 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dbm/dbm.c (Init_dbm): defines DBM::VERSION even when
-	  DB_VERSION_STRING is not available.  [ruby-dev:34569]
-
-Thu May  1 23:57:06 2008  James Edward Gray II  <jeg2@ruby-lang.org>
-
-	Merged 16257 from trunk.
-
-	* lib/net/telnet.rb:  This patch from Brian Candler adds a FailEOF mode which
-	  can be activated to have net/telnet raise EOFError exceptions when the 
-	  remote connection is closed.  The default behavior remains unchanged though.
+Tue Oct  8 04:12:45 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu May  1 23:43:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* misc/ruby-additional.el (ruby-mode-set-encoding): Add a missing
+	  else clause to unbreak with `cp932`, etc.
 
-	* range.c (range_step): check if step can be converted to an integer.
-	  [ruby-dev:34558]
+	* misc/ruby-mode.el (ruby-mode-set-encoding): Ditto.
 
-	* range.c (range_step): allow float step bigger than zero but less
-	  than one.  [ruby-dev:34557]
+Tue Oct  8 03:57:34 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Apr 30 20:22:40 2008  James Edward Gray II  <jeg2@ruby-lang.org>
+	* misc/ruby-additional.el (ruby-mode-set-encoding): Use
+	  `default-buffer-file-coding-system` if the :prefer-utf-8
+	  property is not available.
 
-	Merged 16241 from trunk.
+	* misc/ruby-mode.el (ruby-mode-set-encoding): Ditto.
 
-	* lib/net/telnet.rb:  Fixing a bug where line endings would not be properly
-	  escaped when the two character ending was broken up into separate TCP
-	  packets.  Issue reported and patched by Brian Candler.
+	* misc/ruby-additional.el (ruby-encoding-map): Override the
+	  default value.
 
-Wed Apr 30 17:47:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Oct  8 03:19:19 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* re.c (rb_reg_search): use local variable.  a patch from wanabe
-	  <s.wanabe AT gmail.com> in [ruby-dev:34537].  [ruby-dev:34492]
+	* misc/ruby-additional.el (ruby-mode-set-encoding): Add support
+	  for `prefer-utf-8` which was introduced in Emacs trunk.
 
-Sat Apr 26 19:40:34 2008  Guy Decoux  <decoux@moulon.inra.fr>
+	* misc/ruby-additional.el (ruby-encoding-map): Add a mapping from
+	  `japanese-cp932` to `cp932` to fix the problem where saving a
+	  source file written in Shift_JIS twice would end up having
+	  `coding: japanese-cp932` which Ruby could not recognize.
 
-	* class.c (struct clone_method_data): Add cref.
-	  (clone_method): Properly handle NODE_BMETHOD and NODE_DMETHOD.
-	  (rb_singleton_class_clone, singleton_class_clone_int): Set a
-	  proper value to klass and propagate cref. [ruby-core:16238]
+	* misc/ruby-additional.el (ruby-mode-set-encoding): Add support
+	  for encodings mapped to nil in `ruby-encoding-map`.
 
-	* eval.c (rb_block_dup, rb_method_dup), intern.h: Add duplicator
-	  methods for use from class.c#clone_method().
+	* misc/ruby-additional.el (ruby-encoding-map): Map `us-ascii` and
+	  `utf-8` to nil by default, meaning they need not be explicitly
+	  declared in magic comment.
 
-Fri Apr 25 15:46:37 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* misc/ruby-additional.el (ruby-encoding-map): Add type
+	  declaration for better customize UI.
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/scrollbar.rb, ext/tk/lib/tk/scale.rb:
-	  improve unknonw-option check when create a widget. 
+	* misc/ruby-mode.el: Ditto for the above.
 
-	* ext/tk/lib/tkextlib/blt/unix_dnd.rb, ext/tk/lib/tkextlib/blt/ted.rb,
-	  ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix on 'cget'.
+Tue Oct  8 00:14:53 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/tk/lib/tk/menuspec.rb: option check will fail when 
-	  TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__ is true.
+	* misc/ruby-additional.el: Add a standard header and footer,
+	  including (provide 'ruby-additional).
 
-	* ext/tk/lib/tk/palette.rb: bug fix.
+Mon Oct  7 22:52:45 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Apr 25 12:37:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* misc/ruby-electric.el (ruby-electric-space-can-be-expanded-p):
+	  Return nil to avoid "end" insertion when in smartparens-mode
+	  that is configured to insert "end" for the same keyword.
 
-	* array.c (flatten): returns an instance of same class.
-	  [ruby-core:16554]
+	* misc/ruby-electric.el (ruby-electric-keywords): New custom
+	  variable to replace `ruby-electric-simple-keywords-re` with.
 
-Thu Apr 24 23:47:50 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Mon Oct  7 22:52:16 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/net/pop.rb: backported from 1.9. bug#19003
+	* misc/ruby-additional.el: Use preceding-char/following-char
+	  (returning 0 at BOF/EOF) instead of char-before/char-after
+	  (returning nil at BOF/EOF) to avoid error from char-syntax when
+	  at BOF/EOF.
 
-	* ext/openssl/lib/openssl/ssl.rb: set_params; backported from 1.9.
-	  bug#19552, [ruby-dev:34402]
+Mon Oct  7 22:45:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_ssl.c: ditto.
+	* cont.c (FIBER_USE_NATIVE): split long conditions.
 
-	* test/openssl/test_ssl.rb: ditto.
+Mon Oct  7 20:29:31 2013  Zachary Scott  <e@zzak.io>
 
-Thu Apr 24 17:06:34 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/time.rb: [DOC] typo in Time.rb overview by @srt32 [Fixes GH-416]
+	  https://github.com/ruby/ruby/pull/416
 
-	* eval.c (THREAD_SAVE_CONTEXT): remove unnecessary
-	  FLUSH_REGISTER_WINDOWS before calling setjmp().  [ruby-core:16285]
+Mon Oct  7 20:07:20 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Apr 24 14:15:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/time.rb (Time.strptime): Use :offset.
+	  Patch by Felipe Contreras.  [ruby-core:57694]
 
-	* dln.c (dln_find_1): prior files with extensions to files sans
-	  extensions.  [ruby-core:16517]
+Mon Oct  7 16:47:27 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Apr 23 15:39:31 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* test/-ext-/debug/test_profile_frames.rb: rename class C to
+	  something long name because one test depends on absence of
+	  class ::C.
 
-	* eval.c (bind_eval): Add Binding#eval, a shorthand method for
-	  eval(str, binding, ..); backported from 1.9.
+Mon Oct  7 16:33:10 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Apr 23 15:28:52 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* ext/-test-/debug/profile_frames.c:
+	  test/-ext-/debug/test_profile_frames.rb: add a test for new C-APIs.
 
-	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_no_create): failed
-	  notice moved from comment to assertion message. [ruby-dev:29127]
+Mon Oct  7 16:12:36 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Apr 23 14:00:05 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* include/ruby/debug.h: add backtrace collecting APIs for profiler.
+	  * int rb_profile_frames(int start, int limit, VALUE *buff, int *lines);
+	    Collect information of frame information.
 
-	* lib/mkmf.rb (create_makefile): Add a missing dependency on the
-	  target directory for each .rb file.  This will hopefully fix
-	  parallel make (-jN).  Tested on FreeBSD.
+	  * VALUE rb_profile_frame_path(VALUE frame);
+	  * VALUE rb_profile_frame_absolute_path(VALUE frame);
+	  * VALUE rb_profile_frame_label(VALUE frame);
+	  * VALUE rb_profile_frame_base_label(VALUE frame);
+	  * VALUE rb_profile_frame_first_lineno(VALUE frame);
+	  * VALUE rb_profile_frame_classpath(VALUE frame);
+	  * VALUE rb_profile_frame_singleton_method_p(VALUE frame);
+	    Get information about each frame.
 
-Wed Apr 23 11:49:54 2008  Akinori MUSHA  <knu@iDaemons.org>
+	  These APIs are designed for profilers, for example, no object allocation,
+	  and enough information for profilers.
+	  In this version, this API collects only Ruby level frames.
+	  This issue will be fixed after Ruby 2.1.
 
-	* lib/set.rb (Set#each, SortedSet#each, TC_Set#test_each): Return
-	  an enumerator if no block is given.
+	* vm_backtrace.c: implement above APIs.
 
-Wed Apr 23 00:42:49 2008  Tanaka Akira  <akr@fsij.org>
+	* iseq.c (rb_iseq_klass): return local_iseq's class.
 
-	* eval.c (error_print): show full stack grace except SystemStackError.
-	  backport from 1.9.  [ruby-dev:31014]
+Mon Oct  7 14:26:01 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Apr 23 00:18:45 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* proc.c: catch up last commit.
+	  Type of return value of rb_iseq_first_lineno() is now VALUE.
 
-	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): Improve
-	  tests of Symbol#to_proc.
+	* vm_insnhelper.c (argument_error): ditto.
 
-Tue Apr 22 22:43:05 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* vm_method.c (rb_method_entry_make): ditto.
 
-	* eval.c (rb_proc_new, YIELD_FUNC_LAMBDA): Add a new nd_state
-	  YIELD_FUNC_LAMBDA which avoids automatic `avalue' conversion for
-	  arguments.  This fixes a bug where [1,[2,3]].map(&:object_id)
-	  fails.
+Mon Oct  7 14:07:45 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* intern.h, object.c: Hide rb_proc_new() from intern.h.  It should
-	  not be considered an official API function yet.
+	* iseq.c, internal.h: change to public (but internal) functions
+	  * VALUE rb_iseq_path(VALUE iseqval);
+	  * VALUE rb_iseq_absolute_path(VALUE iseqval);
+	  * VALUE rb_iseq_label(VALUE iseqval);
+	  * VALUE rb_iseq_base_label(VALUE iseqval);
+	  * VALUE rb_iseq_first_lineno(VALUE iseqval);
+	  And new (temporary) function:
+	  * VALUE rb_iseq_klass(VALUE iseqval);
 
-Tue Apr 22 21:24:32 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* iseq.c. vm_core.h (int rb_iseq_first_lineno): remove
+	  function `int rb_iseq_first_lineno(const rb_iseq_t *iseq)'.
+	  Use `VALUE rb_iseq_first_lineno(VALUE iseqval)' instead.
 
-	* eval.c (rb_proc_new): Turn the BLOCK_LAMBDA flag on.
+	* proc.c. vm_insnhelper.c, vm_method.c: catch up this change.
 
-	* object.c (sym_to_proc), test/ruby/test_symbol.rb: Add back
-	  Symbol#to_proc, now that it passes the tests.
+Sun Oct  6 08:37:39 2013  Zachary Scott  <e@zzak.io>
 
-Tue Apr 22 19:35:03 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/webrick.rb: [DOC] fix grammar in WEBrick overview [Fixes GH-413]
+	  Based on patch by @chastell https://github.com/ruby/ruby/pull/413
 
-	* enumerator.c (enumerator_initialize): Remove an undocumented
-	  feature (passing a block to the constructor) that's broken.
-	  This is not what I intended.
+Sat Oct  5 11:21:01 2013  Aaron Pfeifer  <aaron.pfeifer@gmail.com>
 
-Tue Apr 22 17:49:46 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* thread.c (terminate_atfork_i): fix locking mutexes not unlocked in
+	  forks when not tracked in thread.  [ruby-core:55102] [Bug #8433]
 
-	* sprintf.c (rb_f_sprintf): should protect temporary string from
-	  GC.   [ruby-dev:34480]
+Fri Oct  4 19:54:09 2013  Zachary Scott  <e@zzak.io>
 
-Tue Apr 22 17:12:05 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/dbm/dbm.c: [DOC] Fix wrong constant name in DBM by @edward
+	  [Fixes GH-409] https://github.com/ruby/ruby/pull/409
 
-	* regex.c (re_search): string might be NULL.  [ruby-core:16478]
+Fri Oct  4 19:49:42 2013  Aman Gupta <ruby@tmm1.net>
 
-Tue Apr 22 16:44:00 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* gc.c: rename heap.free_num as heap.swept_num to clarify meaning and
+	  avoid confusion with objspace_free_num().
 
-	* object.c (rb_obj_tap): Correct documentation; pointed out by
-	  okkez in [ruby-dev:34472].
+Fri Oct  4 19:02:01 2013  Aman Gupta <ruby@tmm1.net>
 
-Tue Apr 22 10:05:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c (objspace_free_num): new method for available/free slots on
+	  heap. [ruby-core:57633] [Bug #8983]
+	* gc.c (gc_stat): change heap_free_num definition to use new method.
+	* test/ruby/test_gc.rb: test for above.
 
-	* file.c (eaccess): workaround for recent msvcrt's behavior.
-	  [ruby-core:16460]
+Fri Oct  4 18:53:42 2013  Aman Gupta <ruby@tmm1.net>
 
-Mon Apr 21 16:06:47 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c: add rb_objspace.limit to keep accurate count of total heap
+	  slots [ruby-core:57633] [Bug #8983]
 
-	* enumerator.c (enumerator_init): preserve the method name in ID.
+Fri Oct  4 09:32:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enumerator.c (enumerator_each): need not to call rb_to_id().
+	* lib/csv.rb (CSV.foreach): support enumerator.  based on a patch by
+	  Hanmac (Hans Mackowiak) at [ruby-core:57643].  [ruby-core:57283]
+	  [Feature #8929]
 
-	* enumerator.c (enumerator_with_index): ditto.
+Thu Oct  3 18:20:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Apr 21 17:19:52 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* win32/win32.c (console_emulator_p, constat_handle): disable built-in
+	  console colorizing when console-emulator-like DLL is injected.
+	  [Feature #8201]
 
-	* eval.c (rb_f_method_name): New gloval function: __method__;
-	  backported from matzruby / 1.9.
+Thu Oct  3 18:01:44 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_frame_this_func), intern.h: New internal function.
+	* gc.c: define gc_profile_record::allocated_size if
+	  CALC_EXACT_MALLOC_SIZE is true.
 
-	* intern.h (RETURN_ENUMERATOR): Use rb_frame_this_func() instead
-	  of rb_frame_last_func(), to accommodate the behavior to that of
-	  1.9.
+Thu Oct  3 13:42:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Apr 21 15:54:48 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* common.mk (yes-test-sample): use RUNRUBY instead of MINIRUBY to set
+	  runtime library path and run the built ruby.  [Bug #8971]
 
-	* lib/tempfile.rb (Tempfile::_close): check @data before modifying
-	  it; backported from 1.9.  [ruby-dev:34094]
+Thu Oct  3 00:17:15 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/tempfile.rb (Tempfile::close): clear @data and @tmpname.
+	* misc/ruby-additional.el: Properly quote the body.  An unquoted
+	  body given to eval-after-load is evaluated immediately!
 
-Mon Apr 21 10:17:17 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Oct  2 21:38:30 2013  Yusuke Endoh  <mame@tsg.ne.jp>
 
-	* time.c: should include <errno.h> to refer errno.
+	* ext/socket/ifaddr.c (rsock_getifaddrs): fix possible memory leak.
+	  When a system had no interface, this function used xmalloc for root
+	  but did not return any reference to it.  This patch fixes it by
+	  immediately returning an empty array if no interface is found.
+	  Coverity Scan found this bug.
 
-Mon Apr 21 10:02:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Oct  2 21:37:04 2013  Yusuke Endoh  <mame@tsg.ne.jp>
 
-	* hash.c (recursive_hash): prototype.
+	* random.c (make_seed_value): a local array declaration was accessed
+	  out of scope.  Coverity Scan found this bug.
 
-Mon Apr 21 10:00:51 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Oct  2 18:52:40 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* time.c (rb_strftime): check errno to detect strftime(3)'s error.
-	  this is workaround for recent version of MSVCRT.
-	  [ruby-dev:34456]
+	* gc.c: relax GC condition due to malloc_limit.
 
-Sun Apr 20 21:10:04 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* gc.c (GC_MALLOC_LIMIT_MAX): change default value
+	  (256MB -> 512MB) and permit zero to ignore max value.
 
-	* .: Release as Ruby 1.8.7-preview2.
+	* gc.c (vm_malloc_increase, vm_xrealloc): do not cause GC on realloc.
 
-Sun Apr 20 21:02:06 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* gc.c (gc_before_sweep): change debug messages.
 
-	* enumerator.c: Resolve the method every time an enumeration
-	  method is run, not once when the enumerator is initialized as it
-	  was before, so that method_missing() and method (re)definition
-	  afterwards are both in effect; pointed out in: [ruby-core:16441]
+Wed Oct  2 16:26:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Apr 20 17:59:25 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* io.c (rb_io_close_read): duplex IO should wait its child process
+	  even after close_read.
 
-	* object.c, NEWS, test/ruby/test_symbol.rb: Revert Symbol#to_proc
-	  since it does not pass the tests.
+Wed Oct  2 15:39:13 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun Apr 20 14:29:35 2008  Technorama Ltd.  <oss-ruby@technorama.net>
+	* vm_core.h: use __has_attribute() instead of __clang__major__ because
+	  clang says "Note that marketing version numbers should not be used
+	  to check for language features, as different vendors use different
+	  numbering schemes. Instead, use the Feature Checking Macros."
+	  http://clang.llvm.org/docs/LanguageExtensions.html
 
-	* ext/openssl/ossl_ssl.c: initialize session class.
+Wed Oct  2 14:19:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Apr 19 20:54:42 2008  akira yamada  <akira@arika.org>
+	* io.c (rb_io_close_write): detach tied IO for writing before closing
+	  to get rid of race condition.  [ruby-list:49598]
 
-	* lib/uri/ftp.rb, lib/uri/generic.rb, test/uri/test_common.rb,
-	  test/uri/test_ftp.rb, test/uri/test_generic.rb: backported from 1.9.
-	  [ruby-dev:31318]
+	* io.c (rb_io_close_read): keep fptr in write_io to be discarded, to
+	  fix freed pointer access when it is in use by other threads, and get
+	  rid of potential memory/fd leak.
 
-Sat Apr 19 20:35:02 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Oct  1 23:44:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* lib/yaml/baseemitter.rb, lib/yaml/encoding.rb: performance
-	  tuning around String#gsub.
+	* vm_core.h: use __attribute__((unused)) in UNINITIALIZED_VAR on clang
+	  4.0+ instead of just on 4.2. Clang has supported the unused attribute
+	  since before version 4, so this should be safe.
 
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
+Tue Oct  1 22:03:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/yaml/store.rb (YAML::load): modified to support empty
-	  database.
+	* lib/tempfile.rb (Tempfile#unlink): finalizer is no longer needed
+	  after unlinking.  patched by by normalperson (Eric Wong) at
+	  [ruby-core:56521] [Bug #8768]
 
-	* lib/yaml/store.rb (YAML::Store::marshal_dump_supports_canonical_option?):
-	  add a method to support faster PStore.
+Tue Oct  1 20:54:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Apr 19 20:16:52 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* file.c (stat_new_0): constify.
 
-	* lib/yaml/types.rb: Likewise, pass self to YAML::quick_emit;
-	  merged from 1.9.
+	* file.c (rb_stat_new): constify and export.  based on a patch by
+	  Hanmac (Hans Mackowiak) at [ruby-core:53225].  [Feature #8050]
 
-	* lib/yaml.rb (quick_emit): use combination of object_id and hash to
-	  identify repeated object references, since GC will reuse memory of
-	  objects during output of YAML. [ruby-Bugs-8548] [ruby-Bugs-3698];
-	  merged from 1.9.
+Tue Oct  1 16:03:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Apr 19 20:05:39 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* include/ruby/ruby.h (ruby_safe_level_4_warning): needed by extension
+	  libraries which check safe level 4.  [ruby-dev:47517] [Bug #8652]
 
-	* array.c (rb_ary_equal, rb_ary_eql, rb_ary_hash, rb_ary_cmp):
-	  Make Array#eql?, #hash, #== and #<=> use rb_exec_recursive() and
-	  handle recursive data properly.
+Mon Sep 30 23:14:36 2013  Zachary Scott  <e@zzak.io>
 
-	* hash.c (hash_equal, rb_hash_hash): Make Hash#eql?, #hash and #==
-	  use rb_exec_recursive() and handle recursive data properly.
+	* ext/objspace/objspace.c: [DOC] Cleaned up many rdoc formatting
+	  issues and several duplicate grammar bugs.
 
-Sat Apr 19 19:26:09 2008  Akinori MUSHA  <knu@iDaemons.org>
+Mon Sep 30 23:01:01 2013  Zachary Scott  <e@zzak.io>
 
-	* intern.h, eval.c (rb_exec_recursive): New internal function to
-	  help perform recursive operation; backported from 1.9.
+	* ext/objspace/object_tracing.c: [DOC] Adjust rdoc formatting and fix
+	  small grammar typo
 
-Sat Apr 19 18:42:04 2008  Akinori MUSHA  <knu@iDaemons.org>
+Mon Sep 30 17:28:39 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* intern.h, hash.c (rb_hash_lookup): New internal function to
-	  check if a key exists in a hash, ignoring #default; backported
-	  from 1.9.
+	* ext/objspace/object_tracing.c: [DOC] add some notes for
+	  ObjectSpace::trace_object_allocations.
 
-Fri Apr 18 18:56:57 2008  Akinori MUSHA  <knu@iDaemons.org>
+Mon Sep 30 16:46:58 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/syck/rubyext.c (syck_genericresolver_node_import): should
-	  not set instance variable "@kind" before initializing it.
-	  [ruby-dev:32677]
+	* ext/objspace/object_tracing.c: add new 3 methods to control tracing.
+	  * ObjectSpace::trace_object_allocations_start
+	  * ObjectSpace::trace_object_allocations_stop
+	  * ObjectSpace::trace_object_allocations_clear
+	  And some refactoring.
 
-	* ext/syck/rubyext.c (syck_resolver_initialize,
-	  syck_resolver_detect_implicit, syck_emitter_emit): remove unused
-	  variables.
+	* test/objspace/test_objspace.rb: add a test for new methods.
 
-Fri Apr 18 18:54:57 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* NEWS: add a description for new methods.
 
-	* ext/syck/rubyext.c: Node#value defined twice.
+Mon Sep 30 11:18:04 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/yaml/: several method redefinitions causing warnings.
+	* gc.c (rb_gc_disable): do rest_sweep() before disable GC.
+	  This fix may solve a failure of
+	  TestTracepointObj#test_tracks_objspace_events
+	  [test/-ext-/tracepoint/test_tracepoint.rb:43].
 
-Fri Apr 18 16:36:16 2008  Akinori MUSHA  <knu@iDaemons.org>
+Mon Sep 30 10:40:20 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/rexml/node.rb (REXML::Node::indent): should initialize rv
-	  variable.  a patch from Tadayoshi Funaba <tadf AT dotrb.org> in 
-	  [ruby-dev:32783].
+	* vm_method.c (rb_undef): raise a NameError if the original method
+	  of a refined method is not defined.
 
-Fri Apr 18 16:01:37 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* vm_insnhelper.c (rb_method_entry_eq): added NULL check to avoid SEGV.
 
-	* lib/rexml: Merge fixes since 1.8.6 made solely on the ruby_1_8_6
-	  branch.
+	* test/ruby/test_refinement.rb: related test.
 
-Wed Apr 16 06:11:49 2008  Akinori MUSHA  <knu@iDaemons.org>
+Sun Sep 29 23:45:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/ruby/test_settracefunc.rb (TestSetTraceFunc#test_event):
-	  Fix tests to reflect the following changes: r15833, r15759.
+	* parse.y (rb_id_attrset, intern_str): allow junk attrset ID for
+	  Struct.
 
-Wed Apr 16 05:03:48 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* parse.y (rb_id_attrset): fix inconsistency with literals, allow
+	  ID_ATTRSET and return it itself, but ID_JUNK cannot make ID_ATTRSET.
+	  and raise a NameError instead of rb_bug() for invalid argument.
 
-	* .: Release as Ruby 1.8.7-preview1.
+Sun Sep 29 18:45:05 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-Wed Apr 16 02:09:14 2008  Kouhei Sutou  <kou@cozmixng.org>
+	* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_yield_setup_block_args):
+	  clear keyword arguments to prevent GC bug which occurs
+	  while marking VM stack.
+	  [ruby-dev:47729] [Bug #8964]
 
-	* lib/xmlrpc/client.rb: fix cookie handling. [ruby-dev:34403]
+	* test/ruby/test_keyword.rb: tests for the above.
 
-	* test/xmlrpc/test_cookie.rb: add a test for the above fix.
+Sat Sep 28 23:25:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Apr 15 23:48:28 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* math.c (math_log, math_log2, math_log10): fix for Bignum argument.
+	  numbits should be add only when right shifted.
 
-	* version.h: Branch off ruby_1_8_7 from ruby_1_8 in preparation
-	  for the forthcoming 1.8.7 release.
+Sat Sep 28 14:30:29 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Tue Apr 15 23:40:39 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* test/dl/test_base.rb: {libc, libm} detection now handle GNU/Hurd
+	  correctly. Patch by Gabriele Giacone (1o5g4r8o@gmail.com).
+	  [Bug #8937][ruby-core:57311]
+	* test/fiddle/helper.rb: ditto.
 
-	* ext/syck/rubyext.c (rb_syck_mktime): Avoid buffer overflow.
+Sat Sep 28 00:19:41 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-Tue Apr 15 20:32:03 2008  Tanaka Akira  <akr@fsij.org>
+	* ext/curses/extconf.rb: check the size of chtype.
 
-	* re.c (match_inspect): backported from 1.9.
+	* ext/curses/curses.c (NUM2CH, CH2NUM): use proper macros for
+	  the size of chtype.
 
-Tue Apr 15 19:03:28 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	[ruby-core:56090] [Bug #8659]
 
-	* eval.c (method_receiver, method_name, method_owner): New
-	  methods; backported from 1.9. bug#19007
+Fri Sep 27 18:33:23 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Apr 15 18:39:14 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* gc.c: add two GC tuning environment variables.
+	  RUBY_GC_MALLOC_LIMIT_MAX and RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR.
+	  See r43067 for details.
 
-	* lib/uri.rb, lib/uri/ldaps.rb: added LDAPS
-	  scheme; backported from 1.9. bug#19015, [ruby-dev:31896]
+	* gc.c (rb_gc_set_params): refactoring. And change verbose notation.
+	  Mostly duplicated functions get_envparam_int/double is not cool.
+	  Please rewrite it.
 
-Tue Apr 15 17:45:43 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* test/ruby/test_gc.rb: fix a test for this change.
 
-	* lib/net/smtp.rb: backported from 1.9. bug#19003
+Fri Sep 27 17:44:41 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Apr 15 17:06:12 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* gc.c (GC_MALLOC_LIMIT): 8,000,000 -> 8 * 1,024 * 1,024.
 
-	* test/ruby/test_symbol.rb (TestSymbol#test_to_proc): add tests.
+Fri Sep 27 17:19:39 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Apr 15 16:58:55 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (gc_before_sweep): cast to size_t to suppress warnings.
 
-	* ext/tk/lib/tk/menuspec.rb: option check will fail when 
-	  TkConfigMethod.__IGNORE_UNKNOWN_CONFIGURE_OPTION__ is true.
+Fri Sep 27 17:07:55 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/palette.rb: bug fix.
+	* gc.c: add some fine-grained profiling codes to tuning marking phase.
+	  If you enable RGENGC_PRINT_TICK to 1, then profiling results by RDTSC
+	  (on x86/amd64 environment) are printed at last.
+	  Thanks Yoshii-san.
 
-Tue Apr 15 16:47:48 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Fri Sep 27 16:32:27 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* signal.c, gc.c: New methods: GC.stress, GC.stress=;
-	  backported from 1.9. a patch from Tadashi Saito
-	  in [ruby-dev:34394] and bug#19000
+	* gc.c: simplify threshold of GC caused by malloc_increase.
+	  Now, malloc_limit is increased/decreased by mysterious logic.
+	  This fix simplify malloc_limit increase/decrease logic such as:
+	    if (malloc_increase > malloc_limit) /* so many malloc */
+	      malloc_limit += malloc_limit * (GC_MALLOC_LIMIT_FACTOR-1);
+	    else
+	      malloc_limit -= malloc_limit * (GC_MALLOC_LIMIT_FACTOR-1)/4;
+	  Default value of GC_MALLOC_LIMIT_FACTOR is 1.8.
+	  malloc_limit is bounded by GC_MALLOC_LIMIT_MAX (256MB by default).
+	  This logic runs at gc_before_sweep(). So there are no effect from
+	  caused by lazy sweep. And we can remove malloc_increase2.
 
-Tue Apr 15 12:35:44 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (HEAP_MIN_SLOTS, FREE_MIN, HEAP_GROWTH_FACTOR): rename to
+	  GC_HEAP_MIN_SLOTS, GC_FREE_MIN, GC_HEAP_GROWTH_FACTOR respectively.
+	  Check them by `#ifndef' so you can specify these values outside gc.c.
 
-	* rubyio.h (rb_io_t): renamed from OpenFile.
+	* gc.c (ruby_gc_params_t): add initial_malloc_limit_factor and
+	  initial_malloc_limit_max.
 
-	* ruby.h (struct RHash), file.c, gc.c, io.c, ext/dl/dl.c,
-	  ext/io/wait/wait.c, ext/pty/pty.c, ext/readline/readline.c,
-	  ext/socket/socket.c: ditto.
+	* gc.c (vm_malloc_prepare, vm_xrealloc): use vm_malloc_increase to
+	  add and check malloc_increase.
 
-	* win32/win32.h: removed workaround for OpenFile.
+Fri Sep 27 01:05:00 2013  Zachary Scott  <e@zzak.io>
 
-Tue Apr 15 00:15:29 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* re.c: [DOC] arguments of Regexp::union receive #to_regexp [Bug #8205]
 
-	* ext/tk/lib/tk/text.rb: typo. call a wrong method.
+Fri Sep 27 00:39:27 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/tk/lib/tk/itemconfig.rb: ditto.
+	* struct.c: [DOC] grammar of ArgumentError in Struct.new [Bug #8936]
+	  Patch by Prathamesh Sonpatki
 
-	* ext/tk/sample/ttk_wrapper.rb: bug fix.
+Thu Sep 26 22:11:56 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/tk/sample/tktextio.rb: add binding for 'Ctrl-u' at console mode.
+	* ext/bigdecimal/bigdecimal.c: [DOC] several fixes by @chastell
+	  This includes fixing the capitalization of Infinity, return value of
+	  example "BigDecimal.new('NaN') == 0.0", and code style in example.
+	  [Fixes GH-398] https://github.com/ruby/ruby/pull/398
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/itemfont.rb, ext/tk/lib/font.rb: 
-	  support __IGNORE_UNKNOWN_CONFIGURE_OPTION__ about font options.
+Thu Sep 26 22:08:11 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb, 
-	  ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: bug fix. 
+	* lib/observer.rb: [DOC] syntax improvement in example by @chastell
+	  [Fixes GH-400] https://github.com/ruby/ruby/pull/400
 
-	* ext/tk/lib/tkextlib/tile/tpaned.rb: improve TPaned#add.
+Thu Sep 26 22:03:15 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/tk/lib/tk/timer.rb: add TkTimer#at_end(proc) to register the 
-	  procedure which called at end of the timer.
+	* ext/digest/digest.c: [DOC] typo in overview by @chastell
+	  [Fixes GH-399] https://github.com/ruby/ruby/pull/399
 
-Mon Apr 14 19:54:21 2008  Akinori MUSHA  <knu@iDaemons.org>
+Thu Sep 26 22:00:42 2013  Zachary Scott  <e@zzak.io>
 
-	* array.c (rb_ary_flatten, rb_ary_flatten_bang): Take an optional
-	  argument that determines the level of recursion to flatten;
-	  backported from 1.9.
+	* ext/openssl/ossl.c: [DOC] typo in example by @zoranzaric
+	  [Fixes GH-401] https://github.com/ruby/ruby/pull/401
 
-	* array.c (rb_ary_shuffle_bang, rb_ary_shuffle, rb_ary_choice,
-	  rb_ary_cycle, rb_ary_permutation, rb_ary_combination,
-	  rb_ary_product, rb_ary_take, rb_ary_take_while, rb_ary_drop,
-	  rb_ary_drop_while): New methods: Array#shuffle, #shuffle!,
-	  #choice, #cycle, #permutation, #combination, #product, #take,
-	  #take_while, #drop, #drop_while; backported from 1.9.
+Thu Sep 26 21:07:49 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Apr 14 19:52:35 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* misc/ruby-electric.el (ruby-electric-delete-backward-char): Add
+	  support for smartparens-mode.
 
-	* ruby.h: New macro: RB_GC_GUARD().
+	* misc/ruby-electric.el (ruby-electric-cua-replace-region-maybe)
+	  (ruby-electric-cua-delete-region-maybe): New functions that
+	  combine `ruby-electric-cua-*-region` with
+	  `ruby-electric-cua-*-region-p`, using a slightly better way to
+	  detect if it is in cua-mode.
 
-Mon Apr 14 19:49:35 2008  Akinori MUSHA  <knu@iDaemons.org>
+Thu Sep 26 16:51:00 2013  Shota Fukumori  <her@sorah.jp>
 
-	* random.c (rb_genrand_int32, rb_genrand_real), intern.h: Export.
+	* insns.def (opt_regexpmatch2): Check String#=~ hasn't overridden
+	  before calling rb_reg_match().
 
-	* string.c (rb_str_tmp_new), intern.h: New function.
+	* test/ruby/test_string.rb: Test for above.
 
-Mon Apr 14 19:18:55 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* vm.c (vm_init_redefined_flag): Add BOP flag for String#=~
 
-	* enum.c (inject_i, inject_op_i): prototype.
+	[ruby-core:57385] [Bug #8953]
 
-Mon Apr 14 19:10:47 2008  Akinori MUSHA  <knu@iDaemons.org>
+Thu Sep 26 16:43:42 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* enum.c New methods: Enumerable#take, #take_while, #drop and
-	  #drop_while; backported from 1.9.
+	* misc/ruby-electric.el: Avoid use of the interactive function
+	  `self-insert-command` which fires `post-self-insert-hook` and
+	  `post-command-hook`, to make the ruby-electric commands work
+	  nicely with those minor modes that make use of them to do
+	  similar input assistance, such as electric-pair-mode,
+	  autopair-mode and smartparens-mode.
 
-Mon Apr 14 18:50:15 2008  Akinori MUSHA  <knu@iDaemons.org>
+Thu Sep 26 16:24:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* enum.c: New methods: Enumerable#one?, #none?, #minmax, #min_by,
-	  #max_by, #minmax_by and #cycle; backported from 1.9.
+	* insns.def (opt_regexpmatch1): check Regexp#=~ is not defined before
+	  calling rb_reg_match()
 
-	* enum.c (enum_find_index): Add support for find_index(obj);
-	  [ruby-dev:34313]; backported from 1.9.
+	* test/ruby/test_regexp.rb: add test
 
-	* enum.c (enum_inject): Add support for Enumerable#inject(:binop);
-	  backported from 1.9.
+	* vm.c (ruby_vm_redefined_flag): change type to short[]
 
-	* enum.c: Alias Enumerable#reject to #inject; backported from 1.9.
+	* vm.c (vm_redefinition_check_flag): return REGEXP_REDEFINED_OP_FLAG if
+	  klass == rb_cRegexp
 
-Mon Apr 14 18:14:19 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* vm.c (vm_init_redefined_flag): setup BOP flag for Regexp#=~
 
-	* enum.c (enum_find, enum_reject): Return an enumerator if no
-	  block is given; backported from 1.9.
+	* vm_insnhelper.h: add REGEXP_REDEFINED_OP_FLAG
 
-	* io.c (rb_io_each_line, rb_io_each_byte, rb_io_s_foreach,
-	  argf_each_line, argf_each_byte): Ditto.
+	[ruby-core:57385] [Bug #8953]
 
-	* string.c (str_gsub): Ditto.
+Thu Sep 26 14:46:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Apr 14 18:10:05 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c (mark_locations_array): disable AddressSanitizer.  based on a
+	  patch by halfie (Ruby Guy) at [ruby-core:57372].
+	  [ruby-core:56155] [Bug #8680]
 
-	* enum.c (find_index_i, find_index_iter_i): add prototype for VC.
+Wed Sep 25 17:41:29 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Apr 14 17:55:30 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* README.EXT, README.EXT.ja: remove description of RARRAY_PTR()
+	  and add a caution of accessing internal data structure directly.
+	  Also add a description of rb_ary_store().
+	  [Bug #8399]
 
-	* array.c (rb_ary_collect_bang, rb_ary_select): Return an
-	  enumerator if no block is given; backported from 1.9.
+Wed Sep 25 17:12:08 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* dir.c (dir_each, dir_foreach): Ditto.
+	* include/ruby/ruby.h: rename RARRAY_RAWPTR() to RARRAY_CONST_PTR().
+	  RARRAY_RAWPTR(ary) returns (const VALUE *) type pointer and
+	  usecase of this macro is not acquire raw pointer, but acquire
+	  read-only pointer. So we rename to better name.
+	  RSTRUCT_RAWPTR() is also renamed to RSTRUCT_CONST_PTR()
+	  (I expect that nobody use it).
 
-	* enum.c (enum_partition, enum_sort_by): Ditto.
+	* array.c, compile.c, cont.c, enumerator.c, gc.c, proc.c, random.c,
+	  string.c, struct.c, thread.c, vm_eval.c, vm_insnhelper.c:
+	  catch up this change.
 
-	* gc.c (os_each_obj): Ditto.
+Wed Sep 25 16:58:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* hash.c (rb_hash_delete_if, rb_hash_reject_bang, rb_hash_select,
-	  rb_hash_each_value, rb_hash_each_key, rb_hash_each_pair,
-	  env_each_key, env_each_value, env_each, env_each_pair,
-	  env_reject_bang, env_delete_if, env_select): Ditto.
+	* internal.h (rb_float_value, rb_float_new): move inline functions
+	  from ruby/ruby.h.
 
-	* numeric.c (num_step, int_upto, int_downto, int_dotimes): Ditto.
+	* numeric.c (rb_float_value, rb_float_new): define external functions
+	  for extension libraries.
 
-Mon Apr 14 16:42:53 2008  Akinori MUSHA  <knu@iDaemons.org>
+Wed Sep 25 15:37:02 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ruby.h (rb_block_call_func): Fix prototype.
+	* test/rdoc/test_rdoc_generator_darkfish.rb: add a guard for windows.
 
-	* enumerator.c (enumerator_iter_i, enumerator_each_i): Ditto.
+Wed Sep 25 09:53:11 2013  Eric Hodel  <drbrain@segment7.net>
 
-Mon Apr 14 15:49:05 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/rubygems:  Fix CVE-2013-4363.  Miscellaneous minor improvements.
 
-	* enum.c (enum_count, enum_find_index): New methods:
-	  Enumerable#count and #find_index; backported from 1.9.
+	* test/rubygems:  Tests for the above.
 
-Mon Apr 14 14:16:08 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Sep 24 17:38:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enumerator.c (enumerator_mark, enumerator_iter_i, enumerator_each_i,
-	  enumerator_allocate): add prototype.
+	* string.c (rb_str_inspect): get rid of out-of-bound access.
 
-	* enumerator.c (enumerator_each_i): declare unused two arguments.
+	* string.c (rb_str_inspect): when a UTF-16/32 string doesn't have a
+	  BOM, inspect as a dummy encoding string.
 
-Mon Apr 14 13:58:32 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Sep 24 17:15:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c (rb_str_each_char): New methods: String#chars and
-	  #each_char; backported from 1.9.
+	* enc/encdb.c (ENC_DUMMY_UNICODE): make BOM-encodings dummy.
 
-Mon Apr 14 13:42:20 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* encoding.c (enc_autoload): keep dummy encodings dummy.
 
-	* string.c (rb_str_each_line, rb_str_each_byte): Reflect
-	  enumerator integration.  #lines and #bytes are now aliases to
-	  #each_line and #each_byte, respectively.
+Tue Sep 24 16:41:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Apr 14 13:19:36 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#write): data size
+	  is in bytes, not chars.  terminators should be placed automatically.
 
-	* range.c (range_each, range_step): Return an enumerator if no
-	  block is given; backported from 1.9.
+Tue Sep 24 16:39:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* struct.c (rb_struct_each, rb_struct_each_pair): Ditto.
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#each_value): encode
+	  name.
 
-Mon Apr 14 13:07:59 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#each_key): ditto.
 
-	* string.c (rb_str_partition, rb_str_rpartition,
-	  rb_str_start_with, rb_str_end_with): New methods:
-	  String#partition, #rpartition, #start_with? and #end_with?;
-	  backported from 1.9.  These methods are $KCODE aware unlike
-	  #index, #rindex and #include?.
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#export_string):
+	  encode to locale encoding if default internal is not set.
 
-Sun Apr 13 15:55:52 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Sep 24 16:35:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* object.c (sym_to_proc): new method Symbol#to_proc; backported
-	  from 1.9. bug#19012
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API#EnumKey):
+	  size of the name is in WCHARs, not in bytes.
 
-Fri Apr 11 19:14:30 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Sep 24 14:07:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* object.c (rb_obj_tap): new method Object#tap; backported from
-	  1.9. bug#19008
+	* gc.c (free_method_cache_entry_i): unused function
 
-Fri Apr 11 18:58:09 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* gc.c (rb_free_mc_table): ditto
 
-	* process.c: new method Process.exec; backported from 1.9. bug#19006
+	* internal.h (method_cache_entry_t): unused struct
 
-Fri Apr 11 12:43:56 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* vm_method.c (verify_method_cache): remove unused variable
 
-	* ext/tk/lib/tkextlib/tile.rb, ext/tk/lib/tkextlib/tile/style.rb, 
-	  ext/tk/sample/tkextlib/tile/demo.rb: previous patch is not complete.
+	* vm_method.c (rb_method_entry): ditto
 
-Fri Apr 11 10:22:54 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue Sep 24 14:01:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/tile.rb:
-	  __define_LoadImages_proc_for_compatibility__! do nothing when the 
-	  Tcl command exists.
+	* class.c (class_alloc): remove mc_tbl
 
-	* ext/tk/lib/tkextlib/tile/style.rb:
-	  __define_wrapper_proc_for_compatibility__! do nothing when the Tcl
-	  command exists.
+	* gc.c (obj_free): ditto
 
-	* ext/tk/sample/tkextlib/tile/demo.rb: don't create 'step' theme if 
-	  it already exists.
+	* internal.h (struct rb_classext_struct): ditto
 
-Fri Apr 11 08:05:12 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* method.h (rb_method_entry): remove ent param
 
-	* marshal.c (w_object): add volatile to avoid potential GC bug.  a
-	  patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
-	  in [ruby-dev:34311].
+	* vm_method.c: restore the global method cache. Per class cache tables
+	  turned out to be far too slow.
 
-Thu Apr 10 20:29:13 2008  Akinori MUSHA  <knu@iDaemons.org>
+	  [ruby-core:57289] [Bug #8930]
 
-	* misc/rdebug.el, misc/README: Remove rdebug.el as per request
-	  from the maintainer and mention the ruby-debug project at
-	  RubyForge in README; bug#19043.
+Tue Sep 24 12:51:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Apr 10 20:08:37 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API): need
+	  Constants.
 
-	* enum.c (enum_first, enum_group_by): New methods:
-	  Enumerable#first and #group_by; backported from 1.9.
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API#EnumValue):
+	  size of the name is in WCHARs, not in bytes.
 
-Thu Apr 10 19:49:10 2008  Akinori MUSHA  <knu@iDaemons.org>
+Mon Sep 23 22:16:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* enumerator.c (rb_eStopIteration), eval.c (rb_f_loop), ruby.h:
-	  Add a new exception class StopIteration, which breaks Kernel#loop
-	  iteration when raised; backported from 1.9.
+	* enc/encdb.c, enc/utf_16_32.h (ENC_DUMMY_UNICODE): Unicode with BOM
+	  must be based on big endian variants, so that actual encodings would
+	  work.  [ruby-core:57318] [Bug #8940]
 
-	* enumerator.c (enumerator_next, enumerator_rewind): Implement
-	  #next and #rewind using the "generator" library.
+Mon Sep 23 12:11:26 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* lib/generator.rb: Implement Enumerable::Enumerator#next and
-	  #rewind.
+	* hash.c (env_each_pair): do not call rb_assoc_new() if
+	  it isn't needed.
 
-Thu Apr 10 19:29:48 2008  Akinori MUSHA  <knu@iDaemons.org>
+Mon Sep 23 10:42:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* array.c (rb_ary_first, rb_ary_last): Return a shared array when
-	  possible.
+	* test/ruby/test_module.rb (TestModule#test_include_toplevel): test
+	  for top level main.include.  based on a part of the patch by
+	  kyrylo at [GH-395].
 
-	* array.c (rb_ary_pop, rb_ary_pop_m, rb_ary_shift, rb_ary_shift_m):
-	  Array#pop and Array#shift can take an optional argument
-	  specifying the number of elements to remove and return;
-	  backported from 1.9.
+Mon Sep 23 05:07:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Apr 10 14:00:44 2008  Tanaka Akira  <akr@fsij.org>
+	* include/ruby/intern.h (rb_ary_cat): move from internal.h, since it
+	  is described in README.EXT.
 
-	* lib/resolv.rb (Resolv::DNS#each_address): backport from 1.9 for
-	  CNAME.  [ruby-dev:34200]
+Sun Sep 22 20:55:20 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-Thu Apr 10 01:42:25 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* vm_insnhelper.c (vm_make_proc_with_iseq): fix bug message.
+	  This is follow up to changes in r42637.
 
-	* enum.c (iterate_method): add prototype to avoid warning on VC++.
+Sun Sep 22 20:35:38 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-Wed Apr  9 23:12:41 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/-test-/tracepoint/tracepoint.c (Init_tracepoint): prevent from GC.
 
-	* ext/tk/tcltklib.c: SEGV when tcltk-stubs is enabled.
+Sun Sep 22 19:00:28 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* ext/tk/tcltklib.c: avoid error on a shared object.
+	* benchmark/bm_app_answer.rb: revert r42990, benchmark scripts should
+	  be self-contained and avoid dependencies, especially such small one.
+	  See https://github.com/ruby/ruby/pull/393#issuecomment-24861301.
 
-	* ext/tk/extconf.rb: support --with-tcltkversion
+Sat Sep 21 20:11:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/README.tcltklib: add document about --with-tcltkversion
+	* process.c (rb_fork_internal): remove cloexec setting on pipes
+	  created by rb_cloexec_pipe.  patch by normalperson (Eric Wong) at
+	  [ruby-core:56523].  [Bug #8769]
 
-	* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget, 
-	  ext/tk/sample/demos-jp/style.rb, ext/tk/sample/demos-en/style.rb, 
-	  ext/tk/sample/demos-jp/bind.rb, ext/tk/sample/demos-en/bind.rb: 
-	  bug fix.
+Sat Sep 21 01:04:25 2013  Zachary Scott  <e@zzak.io>
 
-Wed Apr  9 21:54:45 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/benchmark.rb: [DOC] grammar of Benchmark#bm [Bug #8888]
+	  Patch by Prathamesh Sonpatki
 
-	* array.c (rb_ary_pop): Do not reallocate too often; backported
-	  from 1.9.
+Sat Sep 21 00:50:02 2013  Zachary Scott  <e@zzak.io>
 
-Wed Apr  9 21:13:05 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* enumerator.c: [DOC] Enumerator#each arguments documentation [GH-388]
+	  Patch by @kachick  https://github.com/ruby/ruby/pull/388
 
-	* array.c (rb_ary_each, rb_ary_each_index, rb_ary_reverse_each,
-	  rb_ary_reject, rb_ary_reject_bang): Array#each, #each_index,
-	  #reverse_each, #reject, #reject! and #delete_if return an
-	  enumerator if no block is given; backported from 1.9.
+Sat Sep 21 00:49:16 2013  Zachary Scott  <e@zzak.io>
 
-Wed Apr  9 20:47:16 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* enum.c: [DOC] Enumerable#to_a accepts arguments [GH-388]
+	  Patch by @kachick https://github.com/ruby/ruby/pull/388
 
-	* array.c (rb_ary_index, rb_ary_index): Array#index and #rindex
-	  can take a block instead of an argument; backported from 1.9.
+Sat Sep 21 00:47:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Apr  9 19:58:31 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* string.c (rb_str_conv_enc_opts): make sure to scan coderange to get
+	  rid of unnecessary conversion.
 
-	* enumerator.c, inits.c (rb_call_inits), ruby.h, intern.h,
-	  ext/enumerator, common.mk (OBJS, enumerator.$(OBJEXT)): Make the
-	  enumerator module built-in.
+Sat Sep 21 00:21:08 2013  Zachary Scott  <e@zzak.io>
 
-	* enumerator.c: New method: Enumerable::Enumerator#with_index.
+	* ext/openssl/lib/openssl/ssl.rb: [DOC] Document OpenSSL::SSLServer
+	  Based on a patch by Rafal Lisowski [Bug #8758]
 
-	* enum.c (enum_each_with_index): Enumerable#each_with_index now
-	  returns an enumerator instead of raising an exception if no
-	  block is given.  Enumerable#enum_with_index, formerly defined in
-	  the enumerator module, is kept as an alias to each_with_index
-	  for backward compatibility.
+Fri Sep 20 23:54:03 2013  Zachary Scott  <e@zzak.io>
 
-Wed Apr  9 19:43:51 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/gserver.rb: [DOC] correct gserver.rb license [Bug #8913]
 
-	* eval.c (rb_obj_method, rb_proc_call), intern.h: Export.
+Fri Sep 20 23:48:34 2013  Zachary Scott  <e@zzak.io>
 
-Tue Apr  8 11:11:28 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/psych/yaml/yaml.h: [DOC] merge upstream typo fix by @GreenGeorge
+	  https://github.com/tenderlove/psych/pull/161
 
-	* eval.c (EXEC_TAG): remove unnecessary FLUSH_REGISTER_WINDOWS for
-	  better performance on SPARC.  [ruby-core:16159]
+Fri Sep 20 23:37:40 2013  Zachary Scott  <e@zzak.io>
 
-Tue Apr  8 10:49:54 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/securerandom.rb: [DOC] SecureRandom.hex length argument
+	  [Fixes GH-394] Patch by @avdi https://github.com/ruby/ruby/pull/394
 
-	* re.c (rb_reg_quote): should always copy the quoting string.
-	  [ruby-core:16235]
+Fri Sep 20 23:34:48 2013  Zachary Scott  <e@zzak.io>
 
-Mon Apr  7 21:35:08 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* benchmark/bm_app_answer.rb: removed duplicate code [Fixes GH-393]
+	  Patch by @gouravtiwari https://github.com/ruby/ruby/pull/393
 
-	* array.c (rb_ary_nitems): Backport Array#nitems with a block;
-	  suggested by Bertram Scharpf <lists@bertram-scharpf.de> in
-	  [ruby-talk:134083].
+Fri Sep 20 23:24:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Apr  6 09:45:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* common.mk (btest, btest-ruby, test-knownbug): add $(RUN_OPTS) to
+	  ruby to be run, so that tests are runnable before making exts.
 
-	* dir.c (dir_tell): check if closed.  [ruby-core:16223]
+	* common.mk (test-sample): ditto, and use $(MINIRUBY) as rubytest.rb
+	  does not need extension libraries.
 
-Sat Apr  5 10:05:00 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* tool/rubytest.rb: pass $(RUN_OPTS) to testing ruby using --run-opt.
 
-	* object.c (rb_check_to_integer): backported for range_step.
+Fri Sep 20 15:01:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Apr  4 05:57:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (intern_str): sigil only names are junk, at least one
+	  identifier character is needed.  [ruby-dev:47723] [Bug #8928]
 
-	* lib/net/pop.rb (Net::POP3::do_finish): clear @n_mails and
-	  @n_bytes as well.  [ruby-core:16144]
+	* parse.y (rb_enc_symname_type): fix out of bound access.
 
-Fri Apr  4 02:17:06 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Sep 20 14:14:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	* range.c (range_step): should not round step into integer if
-	  begin and end are numeric.  [ruby-core:15990]
+	* ext/-test-/printf/printf.c (printf_test_call): Fix an end of buffer
+	  argument.
 
-Tue Apr  1 14:43:38 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Sep 19 16:59:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in: get rid of empty expansion.
+	* parse.y (lambda): adjust position to the beginning of the block.
 
-	* {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
+Thu Sep 19 16:25:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Apr  1 11:36:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vsnprintf.c (BSD_vfprintf): initialize cp so that size is 0 in the
+	  commented case.  fix an accidental bug at r16716.
 
-	* configure.in: _setjmp is available but _longjmp is not on mingw.
+Thu Sep 19 14:33:14 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Apr  1 03:20:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* NEWS: add a news for r42974.
 
-	* configure.in (RUBY_SETJMP, RUBY_LONGJMP, RUBY_JMP_BUF): prefers
-	  _setjmp over setjmp and sigsetjmp.  [ruby-core:16023]
-	  __builtin_setjmp cannot handle a variable.
+Thu Sep 19 14:12:02 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* configure.in (--with-setjmp-type): new option to override the
-	  default rule in the above.
+	* include/ruby/ruby.h: make Symbol objects frozen.
+	  [Feature #8906]
+	  I want to freeze this good day, too.
 
-	* eval_intern.h (ruby_setjmp, ruby_longjmp), gc.c (rb_setjmp),
-	  vm_core.h (rb_jmpbuf_t): use RUBY_SETJMP, RUBY_LONGJMP and
-	  RUBY_JMP_BUF.
+	* test/ruby/test_eval.rb: catch up this change.
 
-Tue Apr  1 01:55:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_symbol.rb: add a test to check frozen symbols.
 
-	* lib/resolv.rb (Resolv::Config.default_config_hash): requires
-	  win32/resolv to use Win32::Resolv.  [ruby-dev:34138]
+Thu Sep 19 09:11:33 2013  Eric Hodel  <drbrain@segment7.net>
 
-Mon Mar 31 14:51:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* NEWS:  Update for RDoc 4.1.0.preview.1 and RubyGems 2.2.0.preview.1
 
-	* bignum.c (rb_big_div): Bignum#div should return integer for
-	  floating number operand.
+Thu Sep 19 08:59:41 2013  Eric Hodel  <drbrain@segment7.net>
 
-Sun Mar 30 07:00:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rdoc/markdown/literals_1_9.rb:  Fix trailing whitespace.
 
-	* ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet.
+	  Previously kpeg (which generates this file) added trailing
+	  whitespace, but this bug is now fixed.
 
-Sat Mar 29 14:18:41 2008  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/rdoc/markdown.rb:  ditto.
 
-	* ext/tk/*: full update Ruby/Tk to support Ruby(1.9|1.8) and Tc/Tk8.5.
+Thu Sep 19 08:33:14 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/tk/lib/tkextlib/tile.rb: [incompatible] remove TileWidgets' 
-	  instate/state/identify method to avoid the conflict with standard
-	  widget options. Those methods are renamed to ttk_instate/ttk_state/
-	  ttk_identify (tile_instate/tile_state/tile_identify are available 
-	  too). Although I don't recommend, if you realy need old methods, 
-	  please define "Tk::USE_OBSOLETE_TILE_STATE_METHOD = true" before 
-	  "require 'tkextlib/tile'".
+	* lib/rdoc:  Update to RDoc 4.1.0.preview.1
 
-	* ext/tk/lib/tkextlib/tile.rb: "Tk::Tile::__Import_Tile_Widgets__!"
-	  is obsolete. It outputs warning. To control default widget set, 
-	  use "Tk.default_widget_set = :Ttk".
+	  RDoc 4.1.0 contains a number of enhancements including a new default
+	  style and accessibility support.  You can see the changelog here:
 
-	* ext/tk/lib/tk.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ method and 
-	  __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method are defind 
-	  as module methods of TkConfigMethod. It may help users to wrap old 
-	  Ruby/Tk scripts (use standard widgets) to force to use Ttk widgets.
-	  Ttk widgets don't have some options of standard widgets which are 
-	  control the view of widgets. When set ignore-mode true, configure 
-	  method tries to ignoure such unknown options with no exception. 
-	  Of course, it may raise other troubles on the GUI design. 
-	  So, those are a little danger methods. 
+	  https://github.com/rdoc/rdoc/blob/v4.1.0.preview.1/History.rdoc
 
-	* ext/tk/lib/tk/itemconfig.rb: __IGNORE_UNKNOWN_CONFIGURE_OPTION__ 
-	  method and __set_IGNORE_UNKNOWN_CONFIGURE_OPTION__!(mode) method 
-	  are defind as module methods of TkItemConfigMethod as the same 
-	  purpose as TkConfigMethod's ones.
+	* test/rdoc:  ditto.
 
-	* ext/tk/sample/ttk_wrapper.rb: A new example. This is a tool for 
-	  wrapping old Ruby/Tk scripts (which use standard widgets) to use 
-	  Ttk (Tile) widgets as default.
+Thu Sep 19 07:16:26 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* ext/tk/sample/tkextlib/tile/demo.rb: use ttk_instate/ttk_state 
-	  method instead of instate/state method.
+	* ext/psych/lib/psych.rb: updating Psych version
 
-	* ext/tk/lib/tk/root, ext/tk/lib/tk/namespace.rb,
-	  ext/tk/lib/tk/text.rb, ext/tk/lib/tkextlib/*: some 'instance_eval's  
-	  are replaced to "instance_exec(self)".
+	* ext/psych/psych.gemspec: ditto
 
-	* ext/tk/lib/tk/event.rb: bug fix on KEY_TBL and PROC_TBL (?x is not 
-	  a character code on Ruby1.9).
+Thu Sep 19 06:39:40 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/tk/lib/tk/variable.rb: support new style of operation argument 
-	  on Tcl/Tk's 'trace' command for variables. 
+	* lib/rubygems/dependency_resolver.rb:  Switch the iterative resolver
+	  algorithm from recursive to iterative to avoid possible
+	  SystemStackError.
 
-	* ext/tk/sample/demos-jp/widget, ext/tk/sample/demos-en/widget: bug fix
+Thu Sep 19 06:29:30 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/tk/sammple/demos-jp/textpeer.rb, 
-	  ext/tk/sammple/demos-en/textpeer.rb: new widget demo.
+	* lib/rubygems:  Update to RubyGems 2.2.0.preview.1
 
-	* ext/tk/tcltklib.c: decrase SEGV troubles (probably)
+	  This brings several new features to RubyGems summarized here:
 
-	* ext/tk/lib/tk.rb: remove Thread.critical access if Ruby1.9
+	  https://github.com/rubygems/rubygems/blob/v2.2.0.preview.1/History.txt
 
-	* ext/tk/lib/tk/multi-tk.rb: support Ruby1.9 (probably)
+	* test/rubygems:  ditto.
 
-	* ext/tk/lib/tkextlib/tile.rb: add method to define Tcl/Tk command 
-	  to make Tcl/Tk theme sources (based on different version of Tile 
-	  extension) available. 
-	  (Tk::Tile::__define_LoadImages_proc_for_comaptibility__)
+Wed Sep 18 23:14:58 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/wm.rb: support dockable frames
-	  (Tcl/Tk8.5 feature). 'wm' command can treat many kinds of widgets 
-	  as toplevel widgets.
+	* string.c (rb_str_enumerate_lines): make String#each_line and
+	  #lines not raise invalid byte sequence error when it is called
+	  with an argument. The patch also causes performance improvement.
+	  [ruby-dev:47549] [Bug #8698]
 
-	* ext/tk/lib/tkextlib/tile/style.rb: ditto.
-	  (Tk::Tile::Style.__define_wrapper_proc_for_compatibility__)
+	* test/ruby/test_m17n_comb.rb (test_str_each_line): remove
+	  assertions which check that String#each_line and #lines will
+	  raise an error if the receiver includes invalid byte sequence.
 
-	* ext/tk/lib/tk/font.rb: add actual_hash and metrics_hash to get 
-	  properties as a hash. metrics_hash method returns a boolean value 
-	  for 'fixed' option. But metrics method returns numeric value 
-	  (0 or 1) for 'fixed' option, because of backward compatibility. 
+Wed Sep 18 16:32:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk/timer.rb: somtimes fail to set callback procedure.
+	* proc.c (mnew_from_me): allocate structs after allocated wrapper
+	  object successfully, to get rid of potential memory leak.
 
-	* ext/tk/lib/tk.rb: add Tk.sleep and Tk.wakeup method. Tk.sleep 
-	  doesn't block the eventloop. It will be better to use the method 
-	  in event callbacks.
+Tue Sep 17 15:54:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/sample/tksleep_sample.rb: sample script about Tk.sleep.
+	* lib/shell/command-processor.rb (Shell::CommandProcessor#find_system_command):
+	  return executable file only, should ignore directories and
+	  unexecutable files.  [ruby-core:57235] [Bug #8918]
 
-Sat Mar 29 04:08:59 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert_throw):
+	  assertion for throw.  MiniTest::Assertions#assert_throws discards
+	  the caught value.
 
-	* class.c (clone_method): should copy cref as well.
-	  [ruby-core:15833]
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert_nothing_thrown):
+	  returns the result of the given block.
 
-Mon Mar 24 20:07:42 2008  Akinori MUSHA  <knu@iDaemons.org>
+Tue Sep 17 12:55:58 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* eval.c (rb_eval): Call trace hook for if expression after the
-	  condition has been evaluated, not before; submitted by Rocky
-	  Bernstein in #18722.
+	* doc/regexp.rdoc:  [DOC] Replace paragraphs in verbatim sections with
+	  plain paragraphs to improve readability as ri and HTML.
 
-Mon Mar 24 19:44:53 2008  Akinori MUSHA  <knu@iDaemons.org>
+Mon Sep 16 07:32:35 2013  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* parse.y (yycompile): Always prepare a new array for each file's
-	  SCRIPT_LINES__ storage, instead of appending source lines every
-	  time a file is re-loaded; submitted by Rocky Bernstein in
-	  #18517.
+	* complex.c: removed meaningless lines.
+	* rational.c: ditto.
 
-Mon Mar 24 10:25:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Sep 16 00:44:23 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* configure.in: sitearch should use target_cpu.  [ruby-core:15986]
+	* ext/socket/mkconstants.rb: define MSG_FASTOPEN.
+	  [ruby-core:57138] [Feature #8897]
 
-Mon Mar 24 01:24:24 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Sep 15 13:31:23 2013  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* lib/erb.rb (result): use proc instead of Thread. [ruby-dev:33692]
+	* rational.c (nurat_div): reverted r28844, r28886 and r28887.
+	  REASON: Nobuyoshi Nakada  <nobu@ruby-lang.org>'s commits are buggy.
+	  So Rational#/ may produce exact number with inexact number.
+	  Moreover, without reducing.
+	  REALLY NONSENSE COMMITS.
+	  A bug report by me [ruby-dev:44710] is also caused by this behavior.
+	  Kenta Murata  <mrkn@mrkn.jp> patched it up.
+	  But he did not fix the origin.
+	  Today, the bug is still alive in ruby 1.9.3 and 2.0.0.
 
-Fri Mar 21 21:26:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep 14 06:08:10 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
-	  [ruby-dev:29945], [ruby-dev:34095]
+	* dir.c (dir_s_glob):  [DOC] Improve wording and layout.
 
-	* lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased
-	  name too for cygwin.  [ruby-dev:29945]
+	* dir.c (file_s_fnmatch):  ditto.
 
-	* lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.
+	* dir.c (Init_Dir):  [DOC] Document File::Constants::FNM_XXX
+	  constants.  (These won't show up in RDoc until a new RDoc is
+	  imported.)
 
-Fri Mar 21 21:10:00 2008  Akinori MUSHA  <knu@iDaemons.org>
+Thu Sep 12 14:58:58 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/ipaddr.rb: Say that I am the current maintainer.
+	* lib/uri/generic.rb (URI::Generic.find_proxy): return nil if
+	  http_proxy environment variable is empty string.
+	  [ruby-core:57140] [Bug #8898]
 
-	* lib/set.rb: Ditto.
+Fri Sep 13 10:40:28 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/shellwords.rb: Ditto.
+	* lib/rubygems:  Update to RubyGems 2.1.3
 
-	* ext/syslog/syslog.txt: Ditto.
+	  Fixed installing platform gems
 
-Fri Mar 21 09:24:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Restored concurrent requires
 
-	* instruby.rb (open_for_install): write block result and rewrite only
-	  if changed from existing file.
+	  Fixed installing gems with extensions with --install-dir
 
-Wed Mar 19 21:01:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Fixed `gem fetch -v` to install the latest version
 
-	* dir.c (dir_inspect, dir_path, dir_tell): check for frozen and closed
-	  is not needed.  [ruby-dev:32640]
+	  Fixed installing gems with "./" in their files entries
 
-Wed Mar 19 20:25:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/rubygems/test_gem_package.rb:  Tests for the above.
 
-	* dir.c (Init_Dir): define inspect method.  [ruby-core:15960]
+	* NEWS:  Updated for RubyGems 2.1.3
 
-Wed Mar 19 14:59:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Sep 12 22:40:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* misc/ruby-style.el (ruby-style-{case,label}-indent): fix for labels
-	  inside blocks in switch and function top level.
+	* configure.in (RUBY_CHECK_SIGNEDNESS): macro to check signedness of a
+	  type.
 
-Wed Mar 19 14:36:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in (size_t): must be unsigned.
+	  [ruby-core:57149] [Feature #8890]
 
-	* bignum.c (rb_cstr_to_inum): treat successive underscores as
-	  nondigit.  [ruby-dev:34089]
+Thu Sep 12 22:37:08 2013  Anton Ovchinnikov  <revolver112@gmail.com>
 
-Wed Mar 19 00:01:23 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ext/bigdecimal/bigdecimal.c, ext/digest/md5/md5.c,
+	  ext/json/fbuffer/fbuffer.h, ext/json/generator/generator.c:
+	  Eliminate less-than-zero checks for unsigned variables.
+	  According to section 4.1.5 of C89 standard, size_t is an unsigned
+	  type.  These checks were found with 'cppcheck' static analysis tool.
+	  [ruby-core:57117] [Feature #8890]
 
-	* lib/erb.rb (ERB::Compiler): Make some minor code optimization.
+Thu Sep 12 21:35:46 2013  Naohisa Goto  <ngotogenome@gmail.com>
 
-Mon Mar 17 17:11:13 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* Makefile.in (libruby-static.a): change LDFLAGS order. LDFLAGS may
+	  include library path that should be specified before LIBS.
+	  [ruby-dev:47707] [Bug #8901]
 
-	* misc/ruby-mode.el (ruby-mode): should use `run-mode-hooks' instead
-	  of calling `run-hooks' directly to run the mode hook.  patch from
-	  Chiyuan Zhang <pluskid AT gmail.com> in [ruby-core:15915]
+Thu Sep 12 20:07:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Mar 17 16:41:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vsnprintf.c (MAXEXP, MAXFRACT): calculate depending on constants in
+	  float.h.
 
-	* configure.in: unset GREP_OPTIONS.  [ruby-core:15918]
+	* vsnprintf.c (BSD_vfprintf): limit length for cvt() to get rid of
+	  buffer overflow.  [ruby-core:57023] [Bug #8864]
 
-Fri Mar 14 16:59:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vsnprintf.c (exponent): make expbuf size more precise.
 
-	* configure.in (RUBY_LIB_PREFIX): fix for prefix.
+Wed Sep 11 17:30:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Mar 14 16:35:11 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (RUNRUBY): append -- only after runruby.rb, not
+	  cross-compiling baseruby, so that $(RUN_OPT) can be command line
+	  options.  [ruby-dev:47703] [Bug #8893]
 
-	* lib/cgi.rb (CGI::Cookie::initialize): performance patch from
-	  Makoto Kuwata <kwa@kuwata-lab.com> in [ruby-dev:34048].
+Wed Sep 11 07:55:17 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Fri Mar 14 15:49:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c (rb_mutex_unlock): Mutex#unlock no longer raise
+	  an exception even if uses on trap. [Bug #8891]
 
-	* configure.in (RUBY_LIB_PREFIX): use libdir.
+Tue Sep 10 14:37:01 2013  Shota Fukumori  <sorah@tubusu.net>
 
-Fri Mar 14 10:12:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_backtrace.c (vm_backtrace_to_ary): Ignore the second argument if
+	  it is nil. [Bug #8884] [ruby-core:57094]
 
-	* configure.in (RUBY_CHECK_VARTYPE): should not indent preprocessor
-	  directives.
+	* test/ruby/test_backtrace.rb (test_caller_with_nil_length):
+	  Test for above.
 
-Thu Mar 13 00:37:20 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep 10 12:39:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_call0): yields the last executed node line number at
-	  return event.  [ruby-core:15855]
+	* class.c (method_entry_i): should exclude refined methods from
+	  instance method list.  [ruby-core:57080] [Bug #8881]
 
-Wed Mar 12 02:12:20 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Tue Sep 10 12:05:04 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* lib/delegate.rb: check $@ to avoid NoMethodError.
+	* io.c (rb_f_printf): [DOC] add missing parenthesis in rdoc.
 
-Tue Mar 11 19:48:09 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep 10 10:08:00 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* numeric.c (fix_coerce): try conversion before type check.
-	  [ruby-core:15838]
+	* NEWS: Update RubyGems note.
 
-Tue Mar 11 17:03:23 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep 10 09:51:22 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/delegate.rb (Delegator#initialize, DelegateClass): skip correct
-	  backtrace.  [ruby-dev:34019]
+	* lib/rubygems:  Update to RubyGems 2.1.0.  Fixes CVE-2013-4287.
 
-Tue Mar 11 16:43:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  See http://rubygems.rubyforge.org/rubygems-update/CVE-2013-4287_txt.html
+	  for CVE information.
 
-	* win32/win32.c (rb_w32_cmdvector): terminate shrunken command line.
+	  See http://rubygems.rubyforge.org/rubygems-update/History_txt.html#label-2.1.0+%2F+2013-09-09
+	  for release notes.
 
-Tue Mar 11 12:39:03 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/rubygems:  Tests for the above.
 
-	* common.mk (clean-local): removes MINOBJS.
+Mon Sep  9 21:31:45 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Mar  8 18:50:57 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c: Remove spaces between SI prefix and unit to follow
+	  SI brochure.
+	  http://www.bipm.org/en/si/si_brochure/
+	  https://www.nmij.jp/library/units/si/
 
-	* file.c (isdirsep): backslash is valid path separator on cygwin too.
+	* time.c: Ditto.
 
-Fri Mar  7 19:56:10 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/ancdata.c: Ditto.
 
-	* lib/mkmf.rb: rdoc added.  [ruby-Patches-9762]
+Mon Sep  9 16:55:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Mar  6 15:10:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* vm_method.c (rb_add_refined_method_entry): clear cache in the
+	  refined class since refining a method entry is modifying the class.
+	  [ruby-core:57079] [Bug #8880]
 
-	* {bcc32,win32}/Makefile.sub (RUNRUBY): use $(PROGRAM) instead of
-	  ruby$(EXEEXT).
-	  suggested by KIMURA Koichi <kimura.koichi at canon.co.jp>.
-	  [ruby-dev:34000]
+Mon Sep  9 09:14:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Mar  6 12:15:06 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* tool/rbinstall.rb (Gem::Specification#initialize): default date to
+	  RUBY_RELEASE_DATE.  [ruby-core:57072] [Bug #8878]
 
-	* parse.y (opt_block_param): command can start just after block param
-	  definition.  [ruby-list:44479]
+	* tool/rbinstall.rb (Gem::Specification#to_ruby): add date.
 
-Thu Mar  6 00:34:11 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun Sep  8 16:01:54 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/erb.rb: update RDoc. Thanks Makoto Kuwata [ruby-dev:33702]
+	* rational.c (f_gcd): Relax the condition to use GMP.
 
-Mon Mar  3 23:28:34 2008  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Sep  8 13:56:38 2013  Masaki Suketa <masaki.suketa@nifty.ne.jp>
 
-	* lib/webrick/httpservlet/filehandler.rb: should normalize path
-	  separators in path_info to prevent directory traversal attacks
-	  on DOSISH platforms.
-	  reported by Digital Security Research Group [DSECRG-08-026].
+	* ext/win32ole/win32ole.c (folevariant_initialize): check type of
+	  element of array.
 
-	* lib/webrick/httpservlet/filehandler.rb: pathnames which have
-	  not to be published should be checked case-insensitively.
+	* test/win32ole/test_win32ole_variant.rb (test_s_new_ary): ditto.
 
-Mon Mar  3 16:14:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep  7 21:33:10 2013  Tanaka Akira  <akr@fsij.org>
 
-	* hash.c (rb_any_hash): shrinks all results in Fixnum range.
-	  [ruby-core:15713]
+	* math.c (math_log): Test the sign for bignums.
+	  (math_log2): Ditto.
+	  (math_log10): Ditto.
 
-Sat Mar  1 02:35:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep  7 20:25:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* bignum.c (big2str_find_n1): check integer overflow.
+	* math.c (math_log): Support bignums bigger than 2**1024.
+	  (math_log2): Ditto.
+	  (math_log10): Ditto.
 
-Tue Feb 26 16:06:00 2008  Technorama Ltd.  <oss-ruby@technorama.net>
+Sat Sep  7 15:36:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* ext/openssl/ossl_pkey_{ec,dh,dsa,rsa}.c: Remove useless warnings.
+	* vm_eval.c (vm_call0): fix prototype, the id parameter should be of
+	  type ID, not VALUE
 
-	* ext/openssl/ossl_asn1.c: Simplify code.
+	* vm_insnhelper.c (check_match): the rb_funcall family of functions
+	  does not care about refinements. We need to use
+	  rb_method_entry_with_refinements instead to call === with
+	  refinements. Thanks to Jon Conley for reporting this bug.
+	  [ruby-core:57051] [Bug #8872]
 
-	* ext/openssl/ossl_ssl_session.c Fix compiler warnings.
-	  Undefine #id if SSL_SESSION_get_id is not supported.
+	* test/ruby/test_refinement.rb: add test
 
-Tue Feb 26 15:43:42 2008  Tanaka Akira  <akr@fsij.org>
+Sat Sep  7 13:49:40 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* parse.y (tokadd_escape): refactored.  [ruby-core:15657]
+	* variable.c (classname): the name of class that has
+	  non class id should not be nil. This bug was introduced
+	  in r36577.
 
-Mon Feb 25 17:30:29 2008  Technorama Ltd.  <oss-ruby@technorama.net>
+	* test/thread/test_cv.rb: test for change.
 
-	* ext/openssl/digest.c ext/openssl/lib/openssl/digest.rb:
-	  Commit patch #9280 from Akinori MUSHA.
-	  Simplify the OpenSSL::Digest class and make use of the
-	  existing Digest framework.
-	  Enhance performance.
+Sat Sep  7 13:29:22 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-Mon Feb 25 13:40:03 2008  Tanaka Akira  <akr@fsij.org>
+	* lib/find.rb (Find.find): respect the encodings of arguments.
+	  [ruby-dev:47530] [Feature #8657]
 
-	* process.c (Init_process): share bignum objects for RLIM_INFINITY,
-	  RLIM_SAVED_MAX and RLIM_SAVED_CUR if they are equal.
+	* test/test_find.rb: add tests.
 
-Sun Feb 24 23:29:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Sep  7 10:40:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	* common.mk, {bcc,win}32/Makefile.sub (clean-local): remove
-	  intermediate files.
+	* ext/socket/mkconstants.rb (TCP_FASTOPEN): Defined for TCP fast open.
+	  [ruby-core:57048] [Feature #8871] patch by Masaki Matsushita.
 
-Sun Feb 24 03:52:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep  6 23:53:31 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* util.c (valid_filename): use O_EXCL to get rid of clobbering
-	  existing files in race conditions.
+	* common.mk: use RUNRUBY instead of MINIRUBY because MINIRUBY can't
+	  require extension libraries. The patch is from nobu
+	  (Nobuyoshi Nakada).
 
-Fri Feb 22 19:50:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/thread/extconf.rb: for build ext/thread/thread.c.
 
-	* bignum.c (BIGZEROP): fix for longer Bignum zeros.  [ruby-Bugs-17454]
+	* include/ruby/intern.h: ditto.
 
-Fri Feb 22 16:09:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c: ditto.
 
-	* bignum.c (rb_big_lshift, rb_big_rshift, rb_big_aref): removed excess
-	  arguments.
+	* lib/thread.rb: removed and replaced by ext/thread/thread.c.
 
-Thu Feb 21 00:01:34 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/thread/thread.c: Queue, SizedQueue and ConditionVariable
+	  implementations in C. This patch is based on patches from panaggio
+	  (Ricardo Panaggio) and funny_falcon (Yura Sokolov) and  ko1
+	  (Koichi Sasada). [ruby-core:31513] [Feature #3620]
 
-	* configure.in (RPATHFLAG): -R option of HP-UX ld is not for runtime
-	  load path.  [ruby-list:44600]
+	* test/thread/test_queue.rb (test_queue_thread_raise): add a test for
+	  ensuring that killed thread should be removed from waiting threads.
+	  It is based on a code by ko1 (Koichi Sasada). [ruby-core:45950]
 
-Wed Feb 20 23:55:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep  6 22:47:12 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/win32.c (rb_w32_map_errno): exported.
+	* configure.in: Define ac_cv_func_clock_getres to yes for mingw*.
 
-Wed Feb 20 13:08:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep  6 21:04:10 2013  Tanaka Akira  <akr@fsij.org>
 
-	* instruby.rb (parse_args): added --dir-mode, --script-mode and
-	  --cmd-type options.  [ruby-dev:33816]
+	* rational.c: Include gmp.h if GMP is used.
+	  (GMP_GCD_DIGITS): New macro.
+	  (rb_gcd_gmp): New function.
+	  (f_gcd_normal): Renamed from f_gcd.
+	  (rb_gcd_normal): New function.
+	  (f_gcd): Invoke rb_gcd_gmp or f_gcd_normal.
 
-	* instruby.rb (parse_args): added bin-arch and bin-comm to install
-	  type, for compiled files and script files.
+	* internal.h (rb_gcd_normal): Declared.
+	  (rb_gcd_gmp): Ditto.
 
-	* instruby.rb (parse_args): deal with make style command line macros,
-	  and count as long syle options if prefixed with INSTALL_.
+	* ext/-test-/rational: New directory.
 
-	* instruby.rb (makedirs): use $dir_mode.  [ruby-dev:33805]
+	* test/-ext-/rational: New directory.
 
-	* instruby.rb (open_for_install): set file mode, which is now
-	  permission mode instead of access mode.
+Fri Sep  6 14:23:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* instruby.rb (bin-comm): installs scripts with replacing shebang
-	  lines.
+	* win32/win32.c (clock_getres): required as well as clock_gettime().
+	  [ruby-dev:47699] [Bug #8869]
 
-Tue Feb 19 18:34:32 2008  Tanaka Akira  <akr@fsij.org>
+Fri Sep  6 11:45:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* gc.c (STACK_LENGTH) [SPARC] : 0x80 offset removed.  [ruby-dev:33857]
+	* transcode.c (rb_econv_append): new function to append a string data
+	  with converting its encoding.  split from rb_econv_substr_append.
 
-Tue Feb 19 14:27:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Sep  6 02:37:22 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* ext/readline/readline.c (readline_event): prevent polling.  based on
-	  a patch from error errorsson in [ruby-Bugs-17675].
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: use double quotes when
+	  strings start with special characters.
+	  https://github.com/tenderlove/psych/issues/157
 
-Tue Feb 19 12:08:29 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/psych/test_string.rb: test for change.
 
-	* parse.y (yycompile): clear ruby_eval_tree_begin if parse failed.
+Fri Sep  6 00:05:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Feb 18 16:23:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* class.c (rewrite_cref_stack): remove recursion.
 
-	* parse.y (yycompile): clear ruby_eval_tree_begin too before parse.
+Thu Sep  5 18:05:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Mon Feb 18 10:17:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (fstring_cmp): take string encoding into account when
+	  comparing fstrings [ruby-core:57037] [Bug #8866]
 
-	* ext/pty/lib/expect.rb (IO#expect): check if peer is closed.
-	  [ruby-Bugs-17940]
+	* test/ruby/test_string.rb: add test
 
-Fri Feb 15 20:37:06 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Thu Sep  5 17:25:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rational.rb (floor, ceil, truncate, round): do not use
-	  definitions of Numeric.
+	* string.c (rb_fstring, rb_str_free): use st_data_t instead of VALUE.
 
-	* lib/rational.rb (to_i): should returns truncated self.
+	* string.c (rb_fstring): get rid of duplicating already frozen object.
 
-	* lib/complex.rb (numerator): requires
-	  Integer#{numerator,denominator}.
+Thu Sep  5 14:01:22 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/complex.rb (quo): do not use definition of Numeric.
+	* lib/optparse.rb:  The Integer acceptable now allows binary and
+	  hexadecimal numbers per the documentation.  [ruby-trunk - Bug #8865]
 
-	* lib/complex.rb (div, divmod, floor, ceil, truncate, round):
-	  undef'ed.
+	  DecimalInteger, OctalInteger, DecimalNumeric now validate their input
+	  before converting to a number.  [ruby-trunk - Bug #8865]
 
-Fri Feb 15 15:23:12 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/optparse/test_acceptable.rb:  Tests for the above, tests for all
+	  numeric acceptables for existing behavior.
 
-	* ext/iconv/iconv.c (iconv_convert): check upper bound.  a patch from
-	  Daniel Luz at [ruby-Bugs-17910].
+Thu Sep  5 13:49:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Fri Feb 15 02:42:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/ruby.h: add RSTRING_FSTR flag
 
-	* configure.in (ftruncate): check if available.
+	* internal.h: add rb_fstring() prototype
 
-	* file.c (rb_file_truncate): check if ftruncate instead of truncate.
+	* string.c (rb_fstring): deduplicate frozen string literals
 
-Fri Feb 15 02:40:54 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_free): delete fstrings from frozen_strings table when
+	  they are GC'd
 
-	* configure.in (sigsetmask): check when signal semantics is not POSIX.
+	* string.c (Init_String): initialize frozen_strings table
 
-	* signal.c (USE_TRAP_MASK): set true if sigprocmask or sigsetmask is
-	  available.
+Thu Sep  5 12:48:00 2013  Kenta Murata  <mrkn@cookpad.com>
 
-Thu Feb 14 17:44:32 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (with_gmp): set with_gmp no if it is empty.
 
-	* ext/dl/ptr.c (dlmem_each_i): typo fixed.  a patch from IKOMA
-	  Yoshiki <ikoma AT mb.i-chubu.ne.jp> in [ruby-dev:33776].
+Thu Sep  5 10:41:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Thu Feb 14 16:02:51 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_insnhelper.c (vm_getivar): use class sequence to check class
+	  identity, instead of pointer + vm state
 
-	* file.c (rb_file_s_utime): inhibits with secure level 2 or higher.
+	* vm_insnhelper.c (vm_setivar): ditto
 
-Thu Feb 14 01:43:16 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Sep  5 08:20:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/timeout.rb (Timeout::timeout): made sensitive to location on the
-	  stack.  [ruby-core:15458]
+	* bignum.c (GMP_DIV_DIGITS): New macro.
+	  (bary_divmod_gmp): New function.
+	  (rb_big_divrem_gmp): Ditto.
+	  (bary_divmod_branch): Ditto.
+	  (bary_divmod): Use bary_divmod_branch.
+	  (bigdivrem): Ditto.
 
-Thu Feb 14 00:49:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (rb_big_divrem_gmp): Declared.
 
-	* common.mk (INSTRUBY_ARGS): pass mode to install.  [ruby-dev:33766]
+Thu Sep  5 06:22:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* instruby.rb (parse_args): added --data-mode and --prog-mode options.
+	* bignum.c (bary_divmod_normal): Reduce temporary array allocations.
 
-Tue Feb 12 11:33:26 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu Sep  5 02:17:06 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/erb/test_erb.rb(TestERBCore): import from erb-2.0.4.
+	* bignum.c (rb_big_divrem_normal): Add GC guards.
 
-	* test/erb/hello.erb: ditto
+Thu Sep  5 00:38:32 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Feb 11 17:25:21 2008  Kouhei Sutou  <kou@cozmixng.org>
+	* bignum.c (rb_big_divrem_normal): New function.
 
-	* lib/rss/rss.rb (RSS::VERSION), test/rss/test_version.rb, NEWS:
-	  0.2.3 -> 0.2.4.
+	* internal.h (rb_big_divrem_normal): Declared.
 
-	* lib/rss/maker.rb, lib/rss/maker/, test/rss/test_maker_2.0.rb:
-	  fixed a bug that RSS::Maker.make("0.9")'s item doesn't make some
-	  elements if description is missed.
-	  Reported by Michael Auzenne. Thanks!!!
+	* ext/-test-/bignum/div.c: New file.
 
-	* lib/rss/maker/0.9.rb, test/rss/test_maker_0.9.rb:
-	  RSS::Maker.make("0.9") generates RSS 0.92 not RSS 0.91.
+	* test/-ext-/bignum/test_div.rb: New file.
 
-Mon Feb 11 16:57:00 2008  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Thu Sep  5 00:08:44 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ChangeLog: format-time-string under C locale. [ruby-dev:33261]
+	* bignum.c (bigdivrem_normal): Removed.
+	  (bary_divmod_normal): New function.
+	  (bary_divmod): Use bary_divmod_normal.
+	  (bigdivrem): Use bary_divmod_normal.
 
-Mon Feb 11 16:31:47 2008  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+Wed Sep  4 23:02:12 2013  Tanaka Akira  <akr@fsij.org>
 
-	* gc.c (rb_newobj): prohibit call of rb_newobj() during gc.
-	  Submitted by Sylvain Joyeux [ruby-core:12099].
+	* bignum.c (bigdivrem): Useless declaration removed.
 
-	* ext/dl/ptr.c: do not use LONG2NUM() inside dlptr_free().
-	  Slightly modified fix bassed on a patch by Sylvain Joyeux
-	  [ruby-core:12099] [ ruby-bugs-11859 ] [ ruby-bugs-11882 ]
-	  [ ruby-patches-13151 ].
+Wed Sep  4 22:56:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Feb 11 00:22:55 2008  NARUSE, Yui  <naruse@ruby-lang.org>
+	* numeric.c (NUM_STEP_GET_INF): split from NUM_STEP_SCAN_ARGS(), since
+	  inf is not used in num_step_size().
 
-	* lib/benchmark.rb (Job::Benchmark#item): fix typo.
+Wed Sep  4 20:22:43 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Feb  9 23:22:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bigdivrem_normal): Add assertions.
 
-	* ext/bigdecimal/extconf.rb: simplified the condition.
+Wed Sep  4 19:18:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Feb  9 17:51:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (vm_state_version_t): prefer LONG_LONG to uint64_t.
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_to_f): use strtod() for more
-	  precision.  [ruby-talk:290296]
+Wed Sep  4 16:28:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/bigdecimal/bigdecimal.c (BASE_FIG): made constant.
+	* internal.h (vm_state_version_t): use uint64_t when it is larger than
+	  LONG_LONG, and fallback to unsigned long.
 
-	* ext/bigdecimal/extconf.rb: ditto.  [ruby-dev:33658]
+Wed Sep  4 15:37:05 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sat Feb  9 00:44:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enc/trans/utf8_mac-tbl.rb: fix r42789.
+	  Fix conversion table and logic. [ruby-dev:47680]
 
-	* lib/irb.rb (IRB::Irb::eval_input): rescues Interrupt and other than
-	  SystemExit and SignalException.  [ruby-core:15359]
+Wed Sep  4 14:08:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Fri Feb  8 15:09:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
+	  variable.c, vm.c, vm_core.c, vm_insnhelper.c, vm_insnhelper.h,
+	  vm_method.c: Implement class hierarchy method cache invalidation.
 
-	* lib/mkmf.rb (xsystem): expand macros like as make.
+	  [ruby-core:55053] [Feature #8426] [GH-387]
 
-Tue Feb  5 11:14:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Sep  4 11:13:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (INSTALL_DIRS, install_dirs): added BINDIR.
+	* string.c (str_gsub): use BEG(0) for whole matched position not
+	  return value from rb_reg_search(), for \K matching.
+	  [ruby-dev:47694] [Bug #8856]
 
-	* lib/mkmf.rb (install_files): rejects files matching to
-	  $NONINSTALLFILES.
+Wed Sep  4 11:11:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (init_mkmf): defaults $NONINSTALLFILES to backup and
-	  temporary filse.
+	* configure.in (SOLIBS): LIBRUBY_SO also needs linking with gmp, to
+	  run worker processes in test-all on non-ELF platforms.
 
-Mon Feb  4 16:44:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep  3 23:01:41 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* configure.in (darwin): NSIG is not defined if _XOPEN_SOURCE > 500L.
-	  [ruby-dev:33584]
+	* test/rexml/parser/test_tree.rb
+	  (TestTreeParser::TestInvalid#test_unmatched_close_tag):
+	  Compute expected value from test value.
 
-Sat Feb  2 20:06:42 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Sep  3 22:59:58 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/benchmark.rb (Benchmark::realtime): make Benchmark#realtime
-	  a bit faster.  a patch from Alexander Dymo <dymo AT ukrpost.ua> in
-	  [ruby-core:15337].
+	* lib/rexml/parsers/treeparser.rb (REXML::Parsers::TreeParser#parse):
+	  Add source information to parse exception on no close tag error.
+	  [Bug #8844]  [ruby-dev:47672]
+	  Patch by Ippei Obayashi. Thanks!!!
+	* test/rexml/parser/test_tree.rb: Add a test for the above case.
 
-Sat Feb  2 09:53:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep  3 22:57:57 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* configure.in (darwin): disabled fat-binary support which confuses
-	  configure much, since ``universal'' implies hidden cross-compiling.
-	  TODO: ruby and libruby.bundle might be possible to bound with `lipo'
-	  after builds for each archs.  Anyway, config.h and rbconfig.rb must
-	  be separated definitely at least.
+	* test/rexml/parser/test_tree.rb: Fix test name to describe test
+	  content.
 
-Fri Feb  1 21:42:37 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep  3 22:54:46 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* configure.in (darwin): _XOPEN_SOURCE is necessary to make ucontext_t
-	  consistent with the library implementation of MacOS X 10.5.
-	  [ruby-dev:33461]
+	* lib/rexml/parsers/treeparser.rb (REXML::Parsers::TreeParser#parse):
+	  Remove needless nested parse exception information.
+	  [Bug #8844]  [ruby-dev:47672]
+	  Reported by Ippei Obayashi. Thanks!!!
+	* test/rexml/parser/test_tree.rb: Add a test for the above case.
 
-	* configure.in (darwin): ucontext on PowerPC MacOS X 10.5 is broken.
+Tue Sep  3 22:03:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jan 31 08:31:19 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_enc_str_new_cstr): new function to create a string from
+	  the C-string pointer with the specified encoding.
 
-	* common.mk (ext/extmk.rb, instruby.rb): inlined $(MAKE) so that can
-	  be executed even with -n.
+Tue Sep  3 21:41:37 2013  Akira Matsuda  <ronnie@dio.jp>
 
-Thu Jan 31 07:00:19 2008  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* eval.c (Init_eval): Make Module#include and Module#prepend public
+	  [Feature #8846]
 
-	* lib/rinda/tuplespace.rb (bin_for_find): should find a symbol by
-	  Symbol class.
+	* test/ruby/test_module.rb (class TestModule): Test for above
 
-	* test/rinda/test_rinda.rb (test_symbol_tuple): ditto.
+Tue Sep  3 21:35:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jan 30 22:07:58 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+	* thread_pthread.c (sys/dyntune.h): for gettune().
 
-	* lib/date.rb: refined deprecated methods.
+	* thread_pthread.c (hpux_attr_getstackaddr): fix missing *.
+	  [ruby-core:56983] [Feature #8793]
 
-Wed Jan 30 22:06:54 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Tue Sep  3 20:12:46 2013  Tanaka Akira  <akr@fsij.org>
 
-	* bignum.c (rb_cstr_to_inum): '0_2' is a valid representation.
+	* bignum.c (GMP_STR2BIG_DIGITS): New macro.
+	  (str2big_gmp): New function.
+	  (rb_cstr_to_inum): Use str2big_gmp for big bignums.
+	  (rb_str2big_gmp): New function.
 
-Tue Jan 29 22:40:12 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+	* internal.h (rb_str2big_gmp): Declared.
 
-	* range.c (step_i): rb_funcall receives VALUE as an argument.
+Tue Sep  3 19:44:40 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Jan 29 11:53:05 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/win32/lib/win32/registry.rb (Win32::Registry#values): added.
+	  [Feature #7763] [ruby-core:51783]
 
-	* configure.in: rm largefile.h.
+Tue Sep  3 18:26:00 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Jan 28 01:21:15 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* misc/inf-ruby.el (inf-ruby-keys, run-ruby): Add magic autoload
+	  comments.
 
-	* io.c (rb_open_file): should check NUL in path.
-	  <http://www.rubyist.net/~matz/20080125.html#c01>.
+	* misc/rdoc-mode.el (rdoc-mode): Ditto.
 
-	* io.c (rb_io_s_popen): ditto.
+	* misc/ruby-electric.el (ruby-electric-mode): Ditto.
 
-	* io.c (rb_io_reopen): ditto.
+	* misc/ruby-style.el (ruby-style-c-mode): Ditto.
 
-	* io.c (next_argv): ditto.
+Tue Sep  3 17:06:15 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* io.c (rb_io_s_foreach): ditto.
+	* test/ruby/test_rubyoptions.rb
+	  (TestRubyOptions::SEGVTest::ExpectedStderr): the URL was changed at
+	  r42800.
 
-	* io.c (rb_io_s_readlines): ditto.
+Tue Sep  3 14:48:25 2013  Zachary Scott  <e@zzak.io>
 
-	* io.c (rb_io_s_read): ditto.
+	* lib/thread.rb: [DOC] CV#wait typo by @avdi [Fixes GH-386]
+	  https://github.com/ruby/ruby/pull/386
 
-Fri Jan 25 22:33:38 2008  Yusuke Endoh  <mame@tsg.ne.jp>
+Tue Sep  3 14:37:53 2013  Zachary Scott  <e@zzak.io>
 
-	* math.c: fix comment.  [ruby-dev:33276]
+	* error.c: [DOC] Update bug tracker url by @ScotterC [Fixes GH-390]
+	  https://github.com/ruby/ruby/pull/390
 
-Fri Jan 25 10:31:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep  3 12:45:23 2013  Tanaka Akira  <akr@fsij.org>
 
-	* */*.bat: set svn:mime-type to text/batch.
+	* bignum.c (rb_str2big_poweroftwo): New function.
+	  (rb_str2big_normal): Ditto.
+	  (rb_str2big_karatsuba): Ditto.
 
-Thu Jan 24 19:36:22 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (rb_str2big_poweroftwo): Declared.
+	  (rb_str2big_normal): Ditto.
+	  (rb_str2big_karatsuba): Ditto.
 
-	* lib/uri/generic.rb (URI::Generic::inspect): use Kernel#to_s instead
-	  object_id with printf.  [ruby-dev:33347]
+	* ext/-test-/bignum/str2big.c: New file.
 
-Tue Jan 22 11:22:47 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/-ext-/bignum/test_str2big.rb: New file.
 
-	* win32/setup.mak ($(ARCH)): if a macro is appended by $(APPEND),
-	  a space will be inserted on the top of the line.
+	* ext/-test-/bignum/depend: Add the dependency for str2big.c.
 
-	* win32/Makefile.sub (MKFILES): stop make process if Makefile is
-	  updated.
+Tue Sep  3 12:09:08 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Jan 21 17:34:41 2008  Akinori MUSHA  <knu@iDaemons.org>
+	* process.c (rb_clock_gettime): Support times() based monotonic clock.
+	  (rb_clock_getres): Ditto.
 
-	* io.c (rb_io_mode_flags, rb_io_mode_modenum): Ignore encoding
-	  options for forward compatibility.
+Tue Sep  3 12:03:02 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Jan 21 12:50:02 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (str2big_scan_digits): Extracted from rb_cstr_to_inum.
 
-	* eval.c, gc.c (setjmp): sigsetjmp is a macro on cygwin.
+Tue Sep  3 11:23:57 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Jan 19 11:21:53 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (rb_w32_select_with_thread): rounding up the fraction of
+	  tv_usec instead of rounding down.
+	  this change is an experiment to get rid of failures on vc10-x64 CI.
 
-	* configure.in (sigsetjmp): check if available.
+Tue Sep  3 11:00:28 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* eval.c, gc.c (setjmp): do not use _setjmp if sigsetjmp is available.
+	* win32/win32.c (do_select): constify timeout.
 
-Sat Jan 19 11:10:11 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (rb_w32_select_with_thread): constify 10ms wait and
+	  0ms wait structs.
 
-	* configure.in: Remove wrong assumptions about Cygwin.  a patch from
-	  Corinna Vinschen in [ruby-Bugs-17018].
+Tue Sep  3 10:03:42 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Jan 17 21:06:01 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/openssl/test_pair.rb
+	  (OpenSSL::TestPair#test_write_nonblock_no_exceptions): on some CIs
+	  such as Debian 6.0, Ubuntu 10.04, CentOS and vc10-x64 (maybe depend
+	  on OpenSSL version), writing to SSLSocket after SSL_ERROR_WANT_WRITE
+	  causes SSL_ERROR_SSL "bad write retry".
 
-	* lib/date.rb (Date::Infinity#<=>): didn't work.  A patch from
-	  Dirkjan Bussink <d.bussink AT gmail.com> [ruby-core:15098].
-	  This is a bug obviously.  However it didn't affect the library's
-	  functions.
+Tue Sep  3 08:20:46 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/date.rb, lib/date/format.rb: some trivial changes.
+	* enc/trans/utf8_mac-tbl.rb: update conversion table to recent OS X.
+	  Previous table is used on Mac OS X 10.1 or prior.
+	  This table is used on 10.2 or later. [ruby-dev:47680]
 
-Tue Jan 15 15:09:28 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep  3 07:49:25 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* win32/setup.mak: strip out empty lines from CPP output.
+	* numeric.c (NUM_STEP_SCAN_ARGS): On second thought, keep
+	  Numeric#step backward compatible in that it raises TypeError
+	  when nil is given as second argument.
 
-Tue Jan 15 03:41:42 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_float.rb (TestFloat#test_num2dbl): Revert.
 
-	* eval.c (eval): check if backtrace is empty.  [ruby-core:15040]
+	* test/ruby/test_numeric.rb (TestNumeric#test_step): Fix test
+	  cases for the above change.
 
-Tue Jan 15 01:28:47 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep  3 07:39:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* common.mk: simplified dummy objects dependencies.
+	* bignum.c (bytes_2comp): Define it only for little endian
+	  environment.
 
-Mon Jan 14 16:12:58 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Sep  3 07:31:29 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/shellwords.rb: scape should be an alias to shellescape.  a
-	  patch from Masahiro Kawato <m-kawato AT mwb.biglobe.ne.jp> in
-	  [ruby-dev:33060].
+	* numeric.c (NUM_STEP_SCAN_ARGS): Numeric#step should raise
+	  TypeError if a non-numeric parameter is given.
 
-Mon Jan 14 09:32:40 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/ruby/test_float.rb (TestFloat#test_num2dbl): Allow nil as
+	  step, as with the keyword argument.
 
-	* lib/time.rb: do not reference Time directly from the inside of
-	  definitions. [ruby-dev:33059]
+	* test/ruby/test_numeric.rb (TestNumeric#test_step): Add tests for
+	  nil as step or limit.
 
-Sat Jan 12 18:27:41 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep  3 07:28:49 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_define_alloc_func, rb_undef_alloc_func): should
-	  define/undef on a signleton class.  [ruby-core:09959]
+	* internal.h (bit_length): Add casts to fix compilation error with
+	  clang 3.0 -Werror,-Wshorten-64-to-32.
+	  [ruby-dev:47687] reported by SASADA Koichi.
 
-Sat Jan 12 12:04:14 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Tue Sep  3 03:17:26 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/date.rb, lib/date/format.rb: tuning for performance.
+	* vm_insnhelper.c (vm_search_super_method): use ci->argc instead of
+	  ci->orig_argc. ci->argc can be changed by splat arguments.
+	  [ruby-list:49575]
+	  This fix should be applied to Ruby 2.0.0 series.
 
-Fri Jan 11 12:35:56 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_super.rb: add a test for above.
 
-	* configure.in: moved broken syscall checks from process.c etc.
+Mon Sep  2 23:46:29 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* defines.h (WORDS_BIGENDIAN): honor __BIG_ENDIAN__ than the result of
-	  configure.
+	* numeric.c (num_step): Default the limit argument to infinity and
+	  allow it to be omitted.  Keyword arguments (by: and to:) are
+	  introduced for ease of use. [Feature #8838] [ruby-dev:47662]
+	  [ruby-dev:42194]
 
-	* dln.c: use dlopen on Mac OS X 10.3 or later.  backport from trunk.
+	* numeric.c (num_step): Optimize for infinite loop.
 
-	* lib/rdoc/options.rb (check_diagram): more precise check, darwin
-	  is not Windows but minwg is on it.
+Mon Sep  2 22:55:59 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Jan 10 10:53:50 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (ISDIGIT): Unused macro removed.
 
-	* win32/win32.c (rb_w32_open_osfhandle): reverted to old definition.
-	  [ ruby-Bugs-16948 ]
+Mon Sep  2 22:49:15 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Jan  8 20:02:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (str2big_poweroftwo): Extracted from rb_cstr_to_inum.
+	  (str2big_normal): Ditto.
+	  (str2big_karatsuba): Ditto.
 
-	* win{32,ce}/Makefile.sub: merged.
+Mon Sep  2 14:39:29 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Sun Jan  6 09:39:02 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+	* ruby.c (Process#setproctitle): [DOC] Fix and improve rdoc.
 
-	* lib/date.rb, lib/date/format.rb: introduced some constants
-	  (for internal use).
+	* ruby.c (Process#argv0): [DOC] Improve rdoc.
 
-	* sample/cal.rb: trivial adjustments.
+Mon Sep  2 14:15:00 2013  Kenta Murata  <mrkn@cookpad.com>
 
-Fri Jan  4 23:08:48 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* NEWS: fix description of number literal suffixes.
 
-	* time.c (time_arg): use converted object.  [ruby-core:14759]
+Mon Sep  2 14:01:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Fri Jan  4 01:20:21 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/rake/test_rake_rules.rb: add space after string literal to
+	  prevent conflict with string options syntax "foo"opts
 
-	* win32.h: only VC6 needs extern "C++" for math.h.  [ruby-talk:285660]
+	* test/rss/rss-assertions.rb: ditto
 
-Thu Jan  3 11:28:58 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Sep  2 12:28:38 2013  Tanaka Akira  <akr@fsij.org>
 
-	* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]
+	* test/ruby/test_bignum.rb (test_interrupt_during_to_s): Disable it
+	  when GMP is used.
 
-Wed Jan  2 10:18:56 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Sep  2 07:02:10 2013  Tanaka Akira  <akr@fsij.org>
 
-	* sample/time.rb: use Process.times instead of Time.times.
+	* bignum.c (Init_Bignum): Define Bignum::GMP_VERSION when GMP is used.
 
-Wed Jan  2 09:18:11 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Sep  2 01:46:14 2013  Tanaka Akira  <akr@fsij.org>
 
-	* sample/goodfriday.rb: examples for date are enough.  retired.
+	* bignum.c (big2str_generic): Reduce arguments.
+	  (big2str_gmp): Ditto.
+	  (rb_big2str1): Follow the above change.
 
-Wed Jan  2 09:06:55 2008  Tadayoshi Funaba  <tadf@dotrb.org>
+Mon Sep  2 00:08:08 2013  Tanaka Akira  <akr@fsij.org>
 
-	* sample/cal.rb: just updated with the newest version.
+	* process.c (get_mach_timebase_info): Extracted from rb_clock_gettime.
+	  (rb_clock_gettime): Use get_mach_timebase_info.
+	  (rb_clock_getres): Support MACH_ABSOLUTE_TIME_BASED_CLOCK_MONOTONIC.
 
-Mon Dec 31 06:50:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Sep  1 23:30:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
-	  compiling.
+	* bignum.c (GMP_BIG2STR_DIGITS): New constant.
+	  (big2str_gmp): New function.
+	  (rb_big2str1): Use big2str_gmp for big bignums.
 
-	* configure.in, {win,bcc}32/Makefile.sub (MINIRUBY): -I$(srcdir)/lib
-	  moved.
+	* internal.h (rb_big2str_gmp): Declared.
 
-Sun Dec 30 22:48:37 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+	* ext/-test-/bignum/big2str.c (big2str_gmp): New method.
 
-	* lib/date.rb (_valid_time?): I'm not sure to recommend such an
-	  expression.  but anyway it is acceptable now.  [ruby-core:14580]
+Sun Sep  1 22:37:51 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Dec 28 16:36:33 2007  NARUSE, Yui  <naruse@airemix.com>
+	* bignum.c (bary_mul_gmp): Use mpz_init and mpz_clear instead of
+	  mpz_inits and mpz_clears.
+	  Older GMP don't have them.
 
-       * lib/resolv.rb (Resolv::DNS#each_address): now returns IPv6 address.
+Sun Sep  1 21:17:54 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Dec 28 13:21:32 2007  Kouhei Sutou  <kou@cozmixng.org>
+	* test/net/http/test_http.rb (test_bind_to_local_port): Choose an open
+	  port more reliably.
 
-	* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.2 -> 0.2.3.
+Sun Sep  1 20:32:40 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rss/parser.rb, test/rss/test_parser.rb: supported "-" in tag name.
-	  Reported by Ray Chen. Thanks.
+	* bignum.c (big2str_base_poweroftwo): Renamed from
+	  big2str_base_powerof2.
+	  (rb_big2str_poweroftwo): New function for test.
+	  (big2str_generic): Extracted from rb_big2str1.
+	  (rb_big2str_generic): New function for test.
 
-Thu Dec 27 23:56:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (rb_big2str_poweroftwo): Declared.
+	  (rb_big2str_generic): Ditto.
 
-	* mkconfig.rb: should not use the libraries under the source directory
-	  at cross compiling.
+	* ext/-test-/bignum/big2str.c: New file.
 
-Thu Dec 27 11:02:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/-ext-/bignum/test_big2str.rb: New file.
 
-	* intern.h, string.c (rb_str_set_len): added for upgrading path from
-	  1.8 to 1.9. [ruby-dev:32807]
+Sun Sep  1 15:21:21 2013  Tanaka Akira  <akr@fsij.org>
 
-	* string.c (rb_str_lines, rb_str_bytes): ditto.
+	* bignum.c (big2str_2bdigits): Renamed from big2str_orig.
 
-Thu Dec 27 10:47:32 2007  Technorama Ltd.  <oss-ruby@technorama.net>
+Sun Sep  1 13:02:24 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_ssl.c: Only show a warning if the default
-	  DH callback is actually used.
+	* bignum.c: Remove BITSPERDIG >= INT_MAX test.  The static assertion,
+	  SIZEOF_BDIGITS <= sizeof(BDIGIT) is enough.
 
-	* ext/openssl/ossl_rand.c: New method: random_add().
+Sun Sep  1 11:38:26 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Dec 26 22:27:45 2007  NARUSE, Yui <naruse@ruby-lang.org>
+	* bignum.c (maxpow_in_bdigit): Removed.
 
-	* lib/resolv.rb (Resolv::DNS::Name.==): fix for other is array of
-	  Resolv::DNS::Label::Str.
+Sun Sep  1 10:30:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/resolv.rb (Resolv::DNS::MessageEncoder#put_label): String#string
-	  is not defined, so replace to_s.
+	* numeric.c (rb_fix_bit_length): Moved from bignum.c.
 
-	* lib/resolv.rb (Resolv::IPv6#to_name): ip6.int is obsoleted by
-	  int.arpa.
+Sun Sep  1 09:55:45 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Dec 24 16:18:57 2007  Eric Hodel  <drbrain@segment7.net>
+	* internal.h (bit_length): Moved from bignum.c.
+	  (nlz_int): Ditto.
+	  (nlz_long): Ditto.
+	  (nlz_long_long): Ditto.
+	  (nlz_int128): Ditto.
 
-	* lib/rdoc/ri/ri_options.rb:  Fix ri --help listing of gem ri paths.
-	  Merge of r14567 and r14569 from trunk.
+Sun Sep  1 03:32:22 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rdoc/ri/ri_paths.rb:  Fix duplication of ri data for multiple
-	  gems.  Merge of r14567 from trunk
+	* bignum.c (bit_length): Renamed from bitsize.
 
-Mon Dec 24 12:35:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Sep  1 00:07:09 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win{32,ce}/Makefile.sub (MFLAGS): defaulted to -l.
+	* bignum.c (rb_big_bit_length): New method.
+	  (rb_fix_bit_length): Ditto.
+	  [ruby-core:56247] [Feature #8700]
 
-Mon Dec 24 11:56:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug 31 22:18:29 2013  Tanaka Akira  <akr@fsij.org>
 
-	* {bcc32,win{32,ce}}/Makefile.sub (SET_MAKE): set MFLAGS which is not
-	  set by default, to get rid of chaotic situation of MFLAGS/MAKEFLAGS.
+	* process.c (rb_clock_getres): New method.
+	  (timetick2dblnum_reciprocal): New function.
 
-Sat Dec 22 14:49:46 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+	* configure.in: Check clock_getres.
 
-	* lib/date.rb: don't freeze nil even if 1.8 will not be aware of
-	  the issue. [ruby-dev:32677]
+	[ruby-core:56780] [Feature #8809] accepted as a CRuby feature at
+	DevelopersMeeting20130831Japan
+	https://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20130831Japan
 
-Wed Dec 19 13:57:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug 31 21:02:07 2013  Tanaka Akira  <akr@fsij.org>
 
-	* configure.in (TIMEZONE_VOID): check whether timezone requires zero
-	  arguments.  [ruby-dev:32631]
+	* bignum.c: Use GMP to accelerate big Bignum multiplication.
+	  (bary_mul_gmp): New function.
+	  (bary_mul): Use bary_mul_gmp.
+	  (bigsq): Use different threshold with GMP.
 
-Wed Dec 19 12:01:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: Detect GMP.
 
-	* parse.y (f_rest_arg): check if duplicated.  [ruby-core:14140]
+	[ruby-core:56658] [Feature #8796]
 
-Wed Dec 19 10:52:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug 31 15:03:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* bignum.c (rb_cstr_to_inum): an underscore succeeding after octal
-	  prefix is allowed.  [ruby-core:14139]
+	* compile.c (NODE_MATCH3): pass CALL_INFO to opt_regexpmatch2
 
-Mon Dec 17 13:43:15 2007  Tanaka Akira  <akr@fsij.org>
+	* insns.def (opt_regexpmatch2): use CALL_SIMPLE_METHOD to call =~ if
+	  the receiver is not a T_STRING [Bug #8847] [ruby-core:56916]
 
-	* gc.c (stack_end_address): use local variable address instead of
-	  __builtin_frame_address(0) to avoid SEGV on SunOS 5.11 on x86 with
-	  gcc (GCC) 3.4.3 (csl-sol210-3_4-20050802).
-	  stack_end_address returned a frame address of garbage_collect
-	  since stack_end_address doesn't create its own frame.
-	  So a VALUE stored in a callee saved register, %edi, pushed into
-	  the stack at the beginning of garbage_collect was not marked.
+Sat Aug 31 14:07:11 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Dec 17 12:21:25 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/securerandom.rb (random_bytes): Use Process.clock_gettime.
 
-	* Makefile.in (RUNRUBY): added RUNRUBYOPT.
+Sat Aug 31 00:25:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Dec 14 12:36:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/encoding.h (rb_{ascii8bit,utf8,usascii}_encindex): get
+	  rid of conflict with macros defined in internal.h.
 
-	* configure.in (RUBY_CHECK_VARTYPE): check if a variable is defined
-	  and its type.
+Fri Aug 30 22:37:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in (timezone, altzone): check for recent cygwin.
+	* thread_pthread.c (native_thread_init_stack): wait the creator thread
+	  to fill machine stack info, if get_stack_of() is available.
 
-	* missing/strftime.c (strftime): fix for timezone.  [ruby-dev:32536]
+	* thread_pthread.c (native_thread_create): fill the created thread
+	  stack info after starting, if get_stack_of() is available.
 
-	* lib/mkmf.rb (try_var): should fail for functions.
+	* thread_pthread.c (native_thread_create): define attr only if it is
+	  used, and merge pthread_create() calls.
 
-	* ext/readline/extconf.rb: should use have_func for functions instead
-	  of have_var.
+	* thread_pthread.c (get_main_stack): separate function to get stack of
+	  main thread.
 
-Tue Dec 11 00:04:05 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Aug 29 18:05:33 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* array.c (rb_ary_slice_bang): If an invalid negative index (<
-	  -size) is given, do not raise an exception but return nil just
-	  like slice() does.
+	* struct.c (rb_struct_define_without_accessor_under): added.
+	  This function is similar to rb_define_class_under() against
+	  rb_define_class().
 
-	* test/ruby/test_array.rb (TestArray::test_slice,
-	  TestArray::test_slice!): Pull in test cases from trunk.
+	* include/ruby/intern.h: add a declaration of this function.
 
-Mon Dec 10 21:47:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug 29 17:03:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* transcode.c (str_transcode): allow non-registered encodings.
-	  [ruby-dev:32520]
+	* vm_insnhelper.c (vm_call_method): a method entry refers the based
+	  class/module, so should search superclass from the origin i-class
+	  where the entry belongs to, to get rid of infinite loop when zsuper
+	  in a prepended class/module.  [ruby-core:54105] [Bug #8238]
 
-Mon Dec 10 21:00:30 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Aug 29 05:35:58 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* array.c (rb_ary_slice_bang): should return nil if position out
-	  of range.  a patch from Akinori MUSHA <knu AT iDaemons.org>.
-	  [ruby-dev:32518]
+	* ext/zlib/zlib.c (zstream_run):  Fix handling of deflate streams that
+	  need a dictionary but are being decompressed by Zlib::Inflate.inflate
+	  (which has no option to set a dictionary).  Now Zlib::NeedDict is
+	  raised instead of crashing.  [ruby-trunk - Bug #8829]
+	* test/zlib/test_zlib.rb (TestZlibInflate):  Test for the above.
 
-Mon Dec 10 18:28:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Aug 29 02:40:45 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* lib/uri/common.rb (URI::REGEXP::PATTERN): typo in REG_NAME
-	  regular expression.  a patch from Ueda Satoshi
-	  <s-ueda AT livedoor.jp>.  [ruby-dev:32514]
+	* ext/psych/lib/psych/scalar_scanner.rb: invalid floats should be
+	  treated as strings.
+	  https://github.com/tenderlove/psych/issues/156
 
-Sun Dec  9 12:39:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/psych/test_string.rb: test for change
 
-	* lib/cgi.rb (read_multipart): exclude blanks from header values.
-	  [ruby-list:44327]
+Wed Aug 28 17:20:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Dec  5 23:38:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread_pthread.c (hpux_attr_getstackaddr): basic support for the
+	  get_stack() under HP-UX.  based on the patch by michal@rokos.cz
+	  (Michal Rokos) at [ruby-core:56645].  [Feature #8793]
 
-	* range.c (range_each): followed step_i change.
+Wed Aug 28 11:24:20 2013  Michal Rokos  <michal@rokos.cz>
 
-Wed Dec  5 18:08:45 2007  Tanaka Akira  <akr@fsij.org>
+	* configure.in (sys/pstat.h): fix missing header check for
+	  missing/setproctitle.c on HP-UX.  [ruby-core:56644] [Bug #8792]
 
-	* numeric.c (int_odd_p): new method Integer#odd?.
-	  (int_even_p): new method Integer#even?.
-	  (int_pred): new method Integer#pred.
-	  (fix_odd_p): new method Fixnum#odd?.
-	  (fix_even_p): new method Fixnum#even?.
+Wed Aug 28 04:54:33 2013  Eric Hodel  <drbrain@segment7.net>
 
-Wed Dec  5 15:15:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read):  Replace duplicate
+	  wait_writable with wait_readable.
 
-	* range.c (step_i, range_step): support non-fixnum steps.
-	  [ruby-talk:282100]
+Tue Aug 27 17:18:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Dec  4 11:23:50 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/timeout.rb (Timeout#timeout): skip rescue clause only when no
+	  exception class is given.
 
-	* bignum.c (rb_cstr_to_inum): trailing spaces may exist at sqeezing
-	  preceeding 0s.  [ruby-core:13873]
+Tue Aug 27 17:02:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Dec  2 22:43:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (copy_stream_body): should write in binary mode.  based on a
+	  patch by godfat (Lin Jen-Shin) at [ruby-core:56556].
+	  [ruby-core:56518] [Bug #8767]
 
-	* eval.c (error_print): put newline unless multiple line message ends
-	  with a newline.  [ruby-dev:32429]
+Tue Aug 27 17:02:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Dec  2 15:49:20 2007  Kouhei Sutou  <kou@cozmixng.org>
+	* io.c (copy_stream_body): move common open flags.
 
-	* lib/rss/rss.rb, test/rss/test_version.rb, NEWS: 0.2.1 -> 0.2.2.
+Tue Aug 27 16:56:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rss/maker/itunes.rb: fixed new_itunes_category.
-	* lib/rss/maker/taxonomy.rb: new_taxo_topic -> new_topic because
-	  of consistency.
+	* enumerator.c (enumerator_size): use rb_check_funcall() instead of
+	  respond_to? and call.
 
-	* test/rss/test_maker_itunes.rb, test/rss/test_itunes.rb: removed
-	  needless UTF-8 characters.
+	* enumerator.c (enumerator_each): ensure that argument array size
+	  does not overflow at appending.
 
-Sun Dec  2 01:12:15 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+Tue Aug 27 16:46:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	Merged 14070 from trunk.
+	* array.c (rb_ary_index, rb_ary_rindex): use optimized equality to
+	  improve performance.  [Feature #8820]
 
-	* lib/xmlrpc/server.rb (XMLRPC::Server#server): Improve signal handling so
-	  pressing control-c in the controlling terminal or sending SIGTERM stops
-	  the XML-RPC server.
+	* vm_insnhelper.c (rb_equal_opt): optimized equality function.
 
-Sat Dec  1 15:13:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Aug 27 16:11:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/resolv.rb: documentation update.  backported from 1.9.
-	  [ruby-core:13273]
+	* vm_insnhelper.c (opt_eq_func): use RBASIC_CLASS() instead of HEAP_CLASS_OF().
 
-Sat Dec  1 03:30:47 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* insns.def (opt_plus, opt_minus, opt_mult, opt_div, opt_mod, opt_lt),
+	  (opt_gt, opt_ltlt, opt_aref, opt_aset, opt_length, opt_size),
+	  (opt_empty_p, opt_succ): ditto.
 
-	* parse.y (newline_node): set line from outermost node before removing
-	  NODE_BEGIN.  [ruby-dev:32406]
+Tue Aug 27 16:08:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Nov 30 21:53:28 2007  Kouhei Sutou  <kou@cozmixng.org>
+	* vm_eval.c (rb_check_funcall, rb_check_funcall_with_hook): constify
+	  argv.
 
-	* lib/rss/rss.rb, test/rss/test_version.rb: 0.2.0 -> 0.2.1.
+Tue Aug 27 13:03:33 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rss/content.rb, lib/rss/content/1.0.rb,
-	  lib/rss/content/2.0.rb, lib/rss/maker/content.rb,
-	  test/rss/rss-testcase.rb, test/rss/test_content.rb,
-	  test/rss/test_maker_content.rb: supported content:encoded with RSS
-	  2.0.
-	  Suggested by Sam Lown. Thanks.
+	* ext/stringio/stringio.c (strio_read_nonblock): declare local
+	  variables at the first of function.
 
-	* NEWS: added the above changes.
+Tue Aug 27 11:51:37 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-Thu Nov 29 16:59:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enumerator.c: Allow Enumerator size argument to be any callable.
+	  Patch by Avdi Grimm. [bug #8641] [ruby-core:56032] [fix GH-362]
 
-	* parse.y (stmt): remove unnecessary NODE_BEGIN.  [ruby-core:13814]
+	* test/ruby/test_enumerator.rb: Test for above
 
-Wed Nov 28 14:43:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug 27 11:46:31 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/extmk.rb (extract_makefile): use dldflags instead of DLDFLAGS to
-	  get rid of mixing $LDFLAGS and $ARCH_FLAG.
+	* gc.c (gc_profile_clear): do rest_sweep() before clearing
+	  profile.current_record.
 
-	* lib/mkmf.rb (configuration): ditto.
+Tue Aug 27 07:35:05 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* lib/mkmf.rb (create_makefile): support for extensions which has no
-	  shared object.
+	* io.c (io_read_nonblock): support non-blocking reads without raising
+	  exceptions. As in: `io.read_nonblock(size, exception: false)`
+	  [ruby-core:38666] [Feature #5138]
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal): ditto
+	* ext/stringio/stringio.c (strio_sysread): ditto
+	* io.c (rb_io_write_nonblock): support non-blocking writes without
+	  raising an exception.
+	* ext/openssl/ossl_ssl.c (ossl_ssl_write_internal): ditto
+	* test/openssl/test_pair.rb (class OpenSSL): tests
+	* test/ruby/test_io.rb (class TestIO): ditto
+	* test/socket/test_nonblock.rb (class TestSocketNonblock): ditto
+	* test/stringio/test_stringio.rb (class TestStringIO): ditto
 
-Wed Nov 28 09:51:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug 27 05:24:34 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* bignum.c (rb_big2str0): do not clobber space for sign.
+	* lib/rubygems:  Import RubyGems 2.1.0 Release Candidate
+	* test/rubygems:  ditto.
 
-	* sprintf.c (remove_sign_bits): extends sign bit first.
+Mon Aug 26 16:24:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Nov 21 01:04:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (parser_nextc): warn carriage return in middle of line.
+	  [ruby-core:56240] [Feature #8699]
 
-	* object.c (nil_plus): remove unused function.  [ruby-core:13737]
+Mon Aug 26 15:27:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Nov 18 14:03:44 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/timeout.rb (Timeout#timeout): should not be caught by rescue
+	  clause.  [Bug #8730]
 
-	* eval.c (rb_alias): do not call hook functions until initialization
-	  finishes.  [ruby-talk:279538]
+Mon Aug 26 14:44:26 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Nov 18 09:09:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (rb_ary_splice): use RARRAY_PTR_USE() without WB because
+	  there are not new relations.
 
-	* lib/mkmf.rb (String#tr_cpp): make preprocessor identifiers.
+	* enum.c (enum_sort_by): ditto.
 
-Sat Nov 17 13:58:11 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* struct.c (setup_struct): use RARRAY_RAWPTR().
 
-	* ext/win32ole/win32ole.c (ole_invoke): bug fix. [ruby-talk:279100]
+	* vm_eval.c (yield_under): ditto.
 
-Fri Nov 16 17:41:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/pathname/pathname.c (path_entries): use RARRAY_AREF().
 
-	* ext/iconv/iconv.c (Document-class): moved the simplest example to
-	  the top.
+	* ext/pathname/pathname.c (path_s_glob): ditto.
 
-	* ext/iconv/iconv.c (iconv_s_iconv): Document-method: needs class
-	  prefix for class method.  [ruby-core:13542]
+Mon Aug 26 13:11:10 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* ext/iconv/iconv.c (iconv_iconv): also instance method needs to be
-	  qualified.
+	* array.c (ary_ensure_room_for_push): fix typo in r42658.
 
-Fri Nov 16 11:16:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Aug 26 12:37:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/yaml/rubytypes.rb (String#is_binary_data?): use Integer#fdiv.
+	* template/sizes.c.tmpl: generate automatically by extracting
+	  RUBY_CHECK_SIZEOF from configure.in.
 
-Thu Nov 15 19:50:46 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Aug 26 10:16:59 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* ext/curses/extconf.rb: check macro if cannot find func.
-	  [ruby-list:44224]
+	* process.c (gcd_timetick_int): Renamed from gcd_timtick_int.
 
-Thu Nov 15 12:19:14 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Aug 25 21:02:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/cgi/session.rb (CGI::Session::FileStore::restore): use
-	  lockfile for exclusive locks.  a patch from <tommy AT tmtm.org>.
-	  [ruby-dev:32296]
+	* sizes.c (Init_sizes): Define the size of clock_t.
 
-Wed Nov 14 01:52:59 2007  Tanaka Akira  <akr@fsij.org>
+Sun Aug 25 01:47:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* missing/isinf.c (isinf): don't define if the macro is defined.
+	* bignum.c (BARY_SHORT_MUL): Renamed from BARY_MUL1.
+	  (bary_short_mul): Renamed from bary_mul1.
 
-Wed Nov 14 01:34:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug 24 10:35:09 2013  Tanaka Akira  <akr@fsij.org>
 
-	* numeric.c (round): fallback definition.
+	* process.c (rb_clock_gettime): The emulated clock names changed.
 
-	* numeric.c (flo_divmod, flo_round): use round() always.
-	  [ruby-dev:32269]
+Fri Aug 23 22:22:07 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Nov 13 22:02:23 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* process.c (rb_clock_gettime): Add a cast to fix compile error by
+	  -Werror,-Wshorten-64-to-32.
 
-	* lib/drb/drb.rb: remove Thread.exclusive.
+Fri Aug 23 22:12:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/drb/extservm.rb: ditto.
+	* process.c (rb_intern): no symbol cache while initialization.
 
-Tue Nov 13 16:33:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug 23 22:07:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* numeric.c (flodivmod): work around for infinity.
+	* configure.in (clock_t): needs time.h.
 
-	* numeric.c (flo_divmod): work around for platforms have no round().
-	  [ruby-dev:32247]
+Fri Aug 23 21:37:28 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Nov 13 13:58:51 2007  Tanaka Akira  <akr@fsij.org>
+	* process.c (reduce_factors): New function.
+	  (timetick2dblnum): Use reduce_factors.
+	  (timetick2integer): Ditto.
+	  (make_clock_result): Follow the above change.
+	  (rb_clock_gettime): Ditto.
 
-	* numeric.c (numeric.c): Integer#ord implemented.  [ruby-dev:32206]
+Fri Aug 23 21:00:55 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Nov 13 02:57:04 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+	* process.c (timetick_int_t): Renamed from timetick_giga_count_t.
+	  (gcd_timtick_int): Renamed from gcd_ul and make the arguments
+	  timetick_giga_count_t.
+	  (reduce_fraction): Make the arguments timetick_int_t.
+	  (timetick2integer): Ditto.
+	  (make_clock_result): Ditto.
+	  (timetick2dblnum): Fix the return type.
+	  (rb_clock_gettime): Use timetick_int_t.
 
-	* numeric.c (flo_divmod): round to the nearest integer.
-	  [ ruby-Bugs-14540 ]
+Fri Aug 23 20:50:40 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Nov 12 16:52:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (gcd_ul): New function.
+	  (reduce_fraction): Ditto.
+	  (reduce_fraction): Ditto.
+	  (timetick2dblnum): Ditto.
+	  (timetick2integer): Ditto.
+	  (make_clock_result): Use timetick2dblnum and timetick2integer.
+	  (rb_clock_gettime): Follow the make_clock_result change.
 
-	* lib/mkmf.rb (create_makefile): rdoc about srcprefix.  a patch from
-	  Daniel Berger <djberg96 AT gmail.com> in [ruby-core:13378].
+Fri Aug 23 18:39:04 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Nov 12 13:53:06 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (ary_make_shared): shared ary as shady. Need more effort to
+	  make it normal object.
 
-	* misc/ruby-mode.el (ruby-parse-partial): handle stringified
-	  symbols properly using ruby-forward-string.
+	* array.c (rb_ary_modify): use RARRAY_PTR_USE() without WB because
+	  there are not new relations.
 
-Mon Nov 12 12:38:31 2007  Tanaka Akira  <akr@fsij.org>
+	* array.c (ary_ensure_room_for_unshift): use RARRAY_RAWPTR() because
+	  there are not new relations.
 
-	* Makefile.in (lex.c): don't remove lex.c at first.
+Fri Aug 23 11:25:57 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Nov  9 07:26:04 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c: introduce ARY_SHARED_OCCUPIED(shared).
 
-	* random.c: update MT URL.[ruby-core:13305].
+Fri Aug 23 11:07:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Nov  7 03:32:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/Makefile.sub (config.h): now SIZEOF_CLOCK_T is needed for
+	  unsigned_clock_t.
 
-	* lib/rexml/encodings/SHIFT-JIS.rb (REXML::Encoding): place -x for
-	  nkf conversion.  a patch from <moonwolf AT moonwolf.com>.
-	  [ruby-dev:32183]
+Thu Aug 22 22:01:04 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Nov  5 05:17:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (rb_clock_gettime): Strip "s" from unit names.
 
-	* lib/optparse.rb (OptionParser::Switch::summarize): fix for long form
-	  option with very long argument.  a patch from Kobayashi Noritada
-	  <nori1 AT dolphin.c.u-tokyo.ac.jp> in [ruby-list:44179].
+Thu Aug 22 20:14:59 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Nov  5 01:20:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* process.c (unsigned_clock_t): Defined.
+	  (rb_clock_gettime): Consider clock_t overflow for
+	  ISO_C_CLOCK_BASED_CLOCK_PROCESS_CPUTIME_ID.
 
-	* parse.y (call_args): remove "parenthesize argument(s) for future
-	  version" warning.  when I added this warning, I had a plan to
-	  reimplement the parser that is simpler than the current one.
-	  since we abandoned the plan, warning no longer required.
+	* configure.in: Check the size of clock_t.
 
-Fri Nov  2 00:13:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Aug 22 16:22:48 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* array.c (rb_ary_assoc): check and convert inner arrays (assocs)
-	  using #to_ary.
+	* compile.c (build_postexe_iseq): fix to setup the local table.
 
-	* hash.c (rb_hash_s_create): check and convert argument hash
-	  using #to_hash.
+Thu Aug 22 15:42:43 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* hash.c (rb_hash_s_create): Hash#[] now takes assocs as source of
-	  hash conversion.
+	* compile.c (rb_iseq_compile_node): accept NODE_IFUNC to support
+	  custom compilation.
 
-Thu Nov  1 23:47:43 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* compile.c (NODE_POSTEXE): compile to
+	  "ONCE{ VMFrozenCore::core#set_postexe{...} }" with a new custom
+	  compiler `build_postexe_iseq()'.
 
-	* lib/drb/drb.rb (DRbTCPSocket): Improving with multiple network
-	  interface.
+	* vm.c (m_core_set_postexe): remove parameters (passed by a block).
 
-	* test/drb/drbtest.rb: ditto.
+Thu Aug 22 06:54:15 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Oct 26 17:14:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c (rb_clock_gettime): Change emulation symbols for
+	  Process.clock_gettime.
 
-	* numeric.c (fix_pow): returns 1.0 for 0**0.0.
+Thu Aug 22 06:24:54 2013  Tanaka Akira  <akr@fsij.org>
 
-	* numeric.c (fix_pow): returns infinity for 0**-1.  [ruby-dev:32084]
+	* process.c (make_clock_result): Extracted from rb_clock_gettime.
 
-Wed Oct 25 07:18:09 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+Wed Aug 21 22:30:51 2013  Tanaka Akira  <akr@fsij.org>
 
-	Merged 13781 from trunk.
+	* process.c (rb_clock_gettime): clock() based CLOCK_PROCESS_CPUTIME_ID
+	  emulation implemented.
 
-	* lib/net/telnet.rb (Net::Telnet#login): Allowing "passphrase" in
-	  addition to "password" for Telnet login prompts. [ruby-Bugs-10746]
+Wed Aug 21 21:02:37 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Oct 25 06:46:21 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+	* process.c (rb_proc_times): Use RB_GC_GUARD to guard objects from GC.
 
-	Merged 13779 from trunk.
+Wed Aug 21 20:33:01 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/net/telnet.rb (Net::Telnet#login): Making the password prompt
-	  pattern case insensitive. [ruby-Bugs-10746]
+	* process.c (get_clk_tck): Extracted from rb_proc_times.
+	  (rb_clock_gettime): times() based CLOCK_PROCESS_CPUTIME_ID emulation
+	  is implemented.
 
-Thu Oct 25 14:19:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Aug 21 19:31:48 2013  Tanaka Akira  <akr@fsij.org>
 
-	* io.c (rb_io_tell, rb_io_seek): check errno too.  [ruby-dev:32093]
+	* process.c: POSIX_GETTIMEOFDAY_CLOCK_REALTIME is renamed to
+	  SUS_GETTIMEOFDAY_CLOCK_REALTIME.
 
-Wed Oct 25 08:03:53 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+Wed Aug 21 19:17:46 2013  Tanaka Akira  <akr@fsij.org>
 
-	Merged 13767, 13768, 13769, and 13770 from trunk.
+	* process.c (rb_clock_gettime): CLOCK_PROCESS_CPUTIME_ID emulation
+	  using getrusage is implemented.
 
-	* lib/xmlrpc/parser.rb (XMLRPC::Convert::dateTime): Fixing a bug that
-	  caused time zone conversion to fail for some ISO 8601 date formats.
-	  [ruby-Bugs-12677]
+Wed Aug 21 17:34:27 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Explicitly start
-	  the HTTP connection to support keepalive requests. [ruby-Bugs-9353]
+	* gc.c (getrusage_time): Fallback clock_gettime to getrusage when
+	  clock_gettime fails.
+	  Reported by Eric Saxby.  [ruby-core:56762] [Bug #8805]
 
-	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
-	  message for Content-Type check failures. [ruby-core:12163]
+Wed Aug 21 02:32:32 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
-	  Making Content-Type checks case insensitive. [ruby-Bugs-3367]
+	* insns.def: fix regexp's once option behavior.
+	  fix [ruby-trunk - Bug #6701]
 
-Sun Oct 21 21:16:43 2007  Kouhei Sutou  <kou@cozmixng.org>
+	* insns.def: remove `onceinlinecache' and introduce `once' instruction.
+	  `once' doesn't use `setinlinecache' insn any more.
 
-	* lib/rss.rb, lib/rss/, test/rss/, sample/rss/: merged from trunk.
-	- 0.1.6 -> 2.0.0.
-	- fixed image module URI. Thanks to Dmitry Borodaenko.
-	- supported Atom.
-	- supported ITunes module.
-	- supported Slash module.
+	* vm_core.h: `union iseq_inline_storage_entry' to store once data.
 
-	* NEWS: added an entry for RSS Parser.
+	* compile.c: catch up above changes.
 
-Thu Oct 18 10:57:06 2007  Tanaka Akira  <akr@fsij.org>
+	* iseq.c: ditto.
 
-	* ruby.h (RCLASS_IV_TBL): defined.
-	  (RCLASS_M_TBL): ditto.
-	  (RCLASS_SUPER): ditto.
-	  (RMODULE_IV_TBL): ditto.
-	  (RMODULE_M_TBL): ditto.
-	  (RMODULE_SUPER): ditto.
+	* vm.c, vm_insnhelper.c: ditto. fix `m_core_set_postexe()' which
+	  is depend on `onceinlinecache' insn.
 
-Mon Oct 15 22:08:55 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* test/ruby/test_regexp.rb: add tests.
 
-	* NEWS: Merge some of the sub-sections, as the differences were
-	  unclear.
+	* iseq.c: ISEQ_MINOR_VERSION to 1 (should increment major?)
 
-Mon Oct 15 21:57:07 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Aug 21 02:30:15 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* NEWS: Mention ipaddr enhancements.
+	* gc.c (rb_gcdebug_print_obj_condition): add printing information.
 
-	* lib/ipaddr.rb (in_addr, in6_addr, addr_mask): Make some minor
-	  code optimization.
+Tue Aug 20 13:38:00 2013  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* lib/ipaddr.rb (<=>): Implement IPAddr#<=> and make IPAddr
-	  comparable.
+	* test/gdbm/test_gdbm.rb: skip TestGDBM#test_s_open_lock on Solaris.
+	  On Solaris (and platforms which do not have flock and have lockf),
+	  with GDBM 1.10, gdbm_open(3) blocks when opening already locked
+	  gdbm file. [Bug #8790] [ruby-dev:47631]
 
-	* lib/ipaddr.rb (succ): Implement IPAddr#succ.  You can now create
-	  a range between two IPAddr's, which (Range) object is
-	  enumerable.
+Tue Aug 20 02:32:52 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/ipaddr.rb (to_range): A new method to create a Range object
-	  for the (network) address.
+	* lib/test/: [DOC] Document Test::Unit, hide most submodules and
+	  classes from rdoc. Since lib/test is only present as a compatibility
+	  layer with the legacy test suite many test/unit users will be using
+	  minitest or the test/unit gem instead. It is recommended to use one
+	  of these alternatives for writing new tests.
 
-	* lib/ipaddr.rb (coerce_other): Support type coercion and make &,
-	  |, == and include? accept a string or an integer instead of an
-	  IPAddr object as the argument.
+	  This patch was based on a patch submitted by Steve Klabnik.
+	  [ruby-core:56694] [Bug #8778]
 
-	* lib/ipaddr.rb (initialize): Give better error messages.
+Tue Aug 20 02:10:19 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/ipaddr.rb: Improve documentation.
+	* lib/rss/rss.rb: [DOC] Document for constants by Steve Klabnik
+	  [ruby-core:56705] [Bug #8798]
 
-Mon Oct 15 21:24:25 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Aug 20 02:01:10 2013  Zachary Scott  <e@zzak.io>
 
-	* NEWS: Mention shellwords and tempfile enhancements.
+	* lib/rss/xmlparser.rb: [DOC] Hide legacy constant from rdoc
+	  Patch by Steve Klabnik [ruby-core:56708] [Bug #8799]
 
-	* NEWS: Move the entry about Tk::X_Scrollable to a better section.
+Tue Aug 20 01:52:05 2013  Zachary Scott  <e@zzak.io>
 
-Mon Oct 15 17:28:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/socket/unixserver.c: [DOC] Document #accept
+	* ext/socket/tcpserver.c: ditto
+	* ext/socket/udpsocket.c: [DOC] Fix indentation of documentation
+	* ext/socket/socket.c: ditto
+	  Patches by David Rodr'iguez [ruby-core:56734] [Bug #8802]
 
-	* ext/openssl/lib/openssl/buffering.rb (read, readpartial): revert
-	  r12496. handling EOF is a little differnt in ruby 1.8 and ruby 1.9.
-	  [ruby-dev:31979]
+Tue Aug 20 01:19:22 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Oct 15 11:45:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: Define ac_cv_func_clock_gettime to yes for mingw*.
 
-	* marshal.c (r_bytes0): refined length check.  [ruby-dev:32059]
+Mon Aug 19 21:31:35 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Oct 15 09:58:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/defines.h: Fix a compilation error with
+	  i586-mingw32msvc-gcc of gcc-mingw32 package on Debian squeeze.
+	  ruby/missing.h should be included before include/ruby/win32.h
+	  because struct timespec, used in the clock_gettime declaration in
+	  include/ruby/win32.h, is defined in ruby/missing.h instead of
+	  system headers.
 
-	* marshal.c (r_bytes0): check if source has enough data.
-	  [ruby-dev:32054]
+Mon Aug 19 20:55:12 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Oct 15 01:15:09 2007  Tanaka Akira  <akr@fsij.org>
+	* gc.c: fix around GC_DEBUG.
 
-	* ext/socket/socket.c (s_accept_nonblock): make accepted fd
-	  nonblocking.  [ruby-talk:274079]
+	* gc.c (RVALUE::line): should be VALUE. On some environment
+	  (such as mswin64), `int' introduces alignment mismatch.
 
-Sun Oct 14 04:08:34 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (newobj_of): add an assertion to check VALUE alignment.
 
-	* configure.in (AC_SYS_LARGEFILE): keep results also in command
-	  options, to vail out of mismatch.  [ruby-list:44114]
+	* gc.c (aligned_malloc): `&' is low priority than `=='.
 
-	* mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.
+	* gc.c: define GC_DEBUG everytime and use it as value 0 or 1.
 
-Sun Oct 14 03:55:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Aug 19 17:43:44 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/mkexports.rb: deal with __fastcall name decorations.
-	  [ruby-list:44111]
+	* test/ruby/test_fiber.rb: collect garbage fibers immediately.
 
-Sat Oct 13 09:02:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Aug 19 17:41:49 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* {bcc,win}32/mkexports.rb: explicit data.  [ruby-list:44108]
+	* test/profile_test_all.rb: add `failed?' information.
 
-Sat Oct 13 00:35:03 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Aug 19 17:00:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): typo
-	  fixed.  [ruby-list:44099]
+	* process.c (retry_fork): retry with GC if ENOMEM occurred, to free
+	  swap/kernel space.
 
-Fri Oct 12 11:22:15 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Aug 19 13:28:47 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* re.c (match_values_at): make #select to be alias to #values_at
-	  to adapt RDoc description.  [ruby-core:12588]
+	* include/ruby/win32.h (CLOCK_MONOTONIC): typo.
 
-Thu Oct 11 14:32:46 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/win32.c: removed duplicated declarations.
 
-	* {bcc32,win32}/Makefile.sub (COMMON_MACROS): workaround for old SDK's
-	  bug. [ruby-core:12584]
+Mon Aug 19 13:03:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Oct 10 23:34:45 2007  Tanaka Akira  <akr@fsij.org>
+	* configure.in (clock_gettime): should not overwrite cache variable
+	  with different condition.  otherwise -lrt is not linked and the link
+	  fails, after reconfig.
 
-	* lib/securerandom.rb: new file.  [ruby-dev:31928]
+Mon Aug 19 12:56:49 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/cgi/session.rb (create_new_id): use securerandom if available.
+	* process.c (Init_process): Add constants: CLOCK_REALTIME_ALARM and
+	  CLOCK_BOOTTIME_ALARM.
 
-Tue Oct  9 01:01:55 2007  Tanaka Akira  <akr@fsij.org>
+Sun Aug 18 20:17:41 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* re.c (rb_reg_s_union_m): Regexp.union accepts single
-	  argument which is an array of patterns.  [ruby-list:44084]
+	* variable.c, vm_method.c: remove dead code.
 
-Mon Oct  8 20:06:23 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/ruby/test_fiber.rb, test/ruby/test_thread.rb:
+	  change accordingly.
 
-	* lib/net/http.rb, lib/open-uri.rb: remove
-	  Net::HTTP#enable_post_connection_check.  [ruby-dev:31960]
+Sun Aug 18 19:32:26 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* lib/net/imap.rb: hostname should be verified against server's
-	  indentity as persented in the server's certificate. [ruby-dev:31960]
+	* error.c, file.c, gc.c, hash.c, thread.c, variable.c, vm_eval.c, bin/erb:
+	  $SAFE=4 is obsolete.
 
-	* ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto.
+Sun Aug 18 14:30:47 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Oct  6 23:14:54 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* process.c (rb_clock_gettime): Rename POSIX_TIME_CLOCK_REALTIME to
+	  ISO_C_TIME_CLOCK_REALTIME.
 
-	* string.c (rb_str_to_i): update RDoc since base can be any value
-	  between 2 and 36.  [ruby-talk:272879]
+Sun Aug 18 14:22:45 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Oct  5 15:44:50 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* configure.in: Revert r42604.  It causes linking librt on systems
+	  with newer glibc uselessly.
 
-	* lib/shellwords.rb: Add shellescape() and shelljoin().
+Sun Aug 18 13:18:38 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/shellwords.rb: Rename shellwords() to shellsplit() and make
-	  the former an alias to the latter.
+	* process.c (Init_process): Add constants: CLOCK_REALTIME_COARSE,
+	  CLOCK_MONOTONIC_COARSE and CLOCK_BOOTTIME.
 
-	* lib/shellwords.rb: Add escape(), split(), join() as class
-	  methods, which are aliases to their respective long names
-	  prefixed with `shell'.
+Sun Aug 18 12:41:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/shellwords.rb: Add String#shellescape(), String#shellsplit()
-	  and Array#shelljoin() for convenience.
+	* configure.in (clock_gettime): need to check with -lrt prior to check
+	  for the function only.  otherwise -lrt is not linked and the link
+	  fails, when ac_cv_func_clock_gettime is cached as yes.
 
-Fri Oct  5 15:40:04 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Aug 18 10:05:12 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/tempfile.rb (Tempfile::make_tmpname): Allow to specify a
-	  suffix for a temporary file name.
+	* bignum.c (rb_big2str1): Make an expression more explicit.
 
-	* lib/tempfile.rb (Tempfile::make_tmpname): Make temporary file
-	  names less predictable by including a random string.
-	  [inspired by: akr]
+Sun Aug 18 03:18:45 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Oct  2 21:20:14 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (rb_big2str1): Use power_level instead of bitsize(xn).
 
-	* win32/win32.c (make_cmdvector): adjust escaped successive
-	  double-quote handling. (merge from trunk)
+Sun Aug 18 00:44:58 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Oct  2 20:35:24 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (BIGDIVREM_EXTRA_WORDS): Redefine to 1.
+	  (bigdivrem_num_extra_words): Removed.
+	  (bigdivrem_normal): Simplified.
+	  (big2str_karatsuba): Ditto.
 
-	* win32/win32.c (init_env): initialize HOME and USER environment
-	  variables unless set. [ruby-core:12328] (merge from trunk)
+Sat Aug 17 23:25:19 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* win32/win32.c (NtInitialize, getlogin): ditto.
+	* test/ruby/test_time.rb: use the in_timezone() helper
+	  and define it at the top with other helpers.
 
-	* configure.in, win32/Makefile.sub (LIBS): need to link shell32
-	  library for SH* functions on mswin32 and mingw32.
+Sat Aug 17 22:20:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Oct  1 12:50:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* time.c (time_mload): ignore auxiliary data, offset and zone, if
+	  invalid.  [ruby-core:56648] [Bug #8795]
 
-	* gc.c (id2ref): valid id should not refer T_VALUE nor T_ICLASS.
-	  [ruby-dev:31911]
+Sat Aug 17 20:11:49 2013  Benoit Daloze  <eregontp@gmail.com>
 
-Wed Sep 26 23:54:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* process.c: [DOC] MACH_ABSOLUTE_TIME_CLOCK_MONOTONIC is an
+	  available emulation for a monotonic clock on Darwin.
+	  https://developer.apple.com/library/mac/qa/qa1398/_index.html
 
-	* ext/extmk.rb (extmake), lib/mkmf.rb (configuration): top_srcdir
-	  should not prefixed with DESTDIR.
+Fri Aug 16 18:12:05 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Sep 26 08:36:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/profile_test_all.rb: fix typo.
 
-	* Makefile.in (ext/extinit.o): use $(OUTFLAG) as well as other
-	  objects.  [ruby-Bugs-14228]
+Fri Aug 16 18:09:20 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Sep 26 05:12:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/profile_test_all.rb: remove space characters from test names.
 
-	* parse.y (yyerror): limit error message length.  [ruby-dev:31848]
+Fri Aug 16 17:32:02 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* regex.c (re_mbc_startpos): separated from re_adjust_startpos.
+	* test/profile_test_all.rb: refactoring memory profiling tool for
+	  test-all.
+	  Add profiling targets /proc/meminfo and /proc/self/status.
 
-Tue Sep 25 13:47:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/runner.rb: accept other than 'true'.
 
-	* eval.c (remove_method): should not remove undef place holder.
-	  [ruby-dev:31817]
+Fri Aug 16 11:23:35 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Mon Sep 24 16:52:11 2007  Urabe Shyouhei  <shyouhei@ruby-lang.org>
+	* file.c (rb_file_size, rb_file_flock): improve performance of Windows.
 
-	* lib/net/http.rb: fix typo.
+	* file.c (rb_file_truncate): removed unnecessary #ifdef.
 
-Sun Sep 23 21:57:25 2007  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/test_file.rb (TestFile#test_truncate_size): added an assertion
+	  for File#size.
 
-	* lib/net/http.rb: an SSL verification (the server hostname should
-	  be matched with its certificate's commonName) is added.
-	  this verification can be skipped by
-	  "Net::HTTP#enable_post_connection_check=(false)".
-	  suggested by Chris Clark <cclark at isecpartners.com>
+Fri Aug 16 10:07:59 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/net/open-uri.rb: use Net::HTTP#enable_post_connection_check to
-	  perform SSL post connection check.
+	* bignum.c (bigdivrem_single1): Renamed from bigdivrem_single.  Add
+	  x_higher_bdigit argument.
+	  (bigdivrem_single): Just call bigdivrem_single1.
+	  (bigdivrem_restoring): Use bigdivrem_single1 to avoid memmove.
 
-	* ext/openssl/lib/openssl/ssl.c
-	  (OpenSSL::SSL::SSLSocket#post_connection_check): refine error message.
+Fri Aug 16 09:17:00 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Sep 23 09:05:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bary_small_rshift): Specify the higher BDIGIT instead of
+	  sign bit.
+	  (big_shift3): Follow the above change.
 
-	* gc.c (os_obj_of, os_each_obj): hide objects to be finalized.
-	  [ruby-dev:31810]
+Fri Aug 16 02:20:39 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Sep 23 08:58:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bary_mul_toom3): Reduce a branch.
 
-	* eval_method.ci (rb_attr): should not use alloca for unknowen size
-	  input.  [ruby-dev:31816]
+Fri Aug 16 02:14:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* parse.y (rb_intern_str): prevent str from optimization.
+	* process.c (rb_clock_gettime): add CLOCK_MONOTONIC support on OS X.
+	  http://developer.apple.com/library/mac/qa/qa1398/_index.html
+	  [Feature #8658]
 
-Sun Sep 23 05:42:35 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Fri Aug 16 01:37:43 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rdoc/options.rb (Options::check_diagram): dot -V output
-	  changed. [ ruby-Bugs-11978 ], Thanks Florian Frank.
+	* bignum.c (bigdivrem_single): Use shift when y is a power of two.
 
-Sat Sep 22 06:02:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug 16 01:09:33 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/optparse.rb (OptionParser::List::summarize): use each_line if
-	  defined rather than each.  [ruby-Patches-14096]
+	* bignum.c (bigdivrem_restoring): Use bigdivrem_single if non-topmost
+	  BDIGITs of y are zero.
 
-Sat Sep 22 05:19:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug 16 00:33:12 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/stringio/stringio.c (strio_init): separate from strio_initialize
-	  to share with strio_reopen properly.  [ruby-Bugs-13919]
+	* bignum.c (rb_big2str1): Truncate topmost zeros of x.
 
-Fri Sep 21 15:46:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug 16 00:00:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* process.c (struct rb_exec_arg): proc should be a VALUE.
+	* bignum.c (bary_divmod): Simplify an expression.
 
-	* process.c (rb_f_exec): suppress a warning.
+Thu Aug 15 23:26:12 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Sep 21 03:05:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bigdivrem_normal): Remove a local variable.
 
-	* eval.c, intern.h, ext/thread/thread.c: should not free queue while
-	  any live threads are waiting.  [ruby-dev:30653]
+Thu Aug 15 23:08:32 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Sep 20 17:24:59 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (big2str_karatsuba): Use bigdivrem_restoring directly to
+	  reduce working buffer and memory copy.
+	  (rb_big2str1): Allocate working buffer for big2str_karatsuba here.
 
-	* process.c (rb_detach_process): cast for the platforms where size of
-	  pointer differs from size of int.
+Thu Aug 15 20:51:29 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* process.c (rb_f_exec, rb_f_system): should not exceptions after
-	  fork.  [ruby-core:08262]
+	* io.c, internal.h (rb_io_flush_raw): new function to select calling
+	  fsync() (on Windows).
 
-Fri Sep 14 00:34:25 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* io.c (rb_io_flush_raw): use above function.
 
-	* lib/drb/extservm.rb (invoke_service): use Thread.exclusive instead of
-	  Thread.critical
+	* file.c (rb_file_truncate): use above function.
 
-Wed Sep 12 23:12:22 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/ruby/test_file.rb (TestFile#test_truncate_size): test for
+	  above changes.
 
-	* ruby.c (proc_options): -W should be allowed in RUBYOPT
-	  environment variable.  [ruby-core:12118]
+Thu Aug 15 18:39:31 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Mon Sep 10 01:05:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (clock_gettime): improve precision when freq is less
+	  than and nearly equals 10**9.
 
-	* range.c (range_step): fixed integer overflow.  [ruby-dev:31763]
+Thu Aug 15 17:43:15 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Sep  9 09:14:45 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+	* gc.c (gc_lazy_sweep): remove heap_increment() here because heap_inc
+	  may be 0.
 
-	* lib/date/format.rb (_strptime): now also attaches an element
-	  which denotes leftover substring if exists.
+Thu Aug 15 16:59:56 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Sep  8 10:22:20 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* io.c (rb_io_rewind): remove fsync() for Windows to improve the
+	  performance.
 
-	* struct.c (rb_struct_s_members): should raise TypeError instead
-	  of call rb_bug().  [ruby-dev:31709]
+Thu Aug 15 16:30:23 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* marshal.c (r_object0): no nil check require any more.
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_rmdir):
+	  FileUtils.rmdir ignores Errno::ENOTEMPTY, so, in such cases, this
+	  assertion is nonsense.
 
-Sat Sep  8 09:38:19 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Thu Aug 15 15:49:35 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/date/format.rb (str[fp]time): now check specifications more
-	  strictly.
+	* process.c (rb_clock_gettime): [DOC] FreeBSD 7.1 supports
+	  CLOCK_THREAD_CPUTIME_ID.
+	  http://www.freebsd.org/releases/7.1R/relnotes.html
 
-Fri Sep  7 05:36:19 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu Aug 15 14:30:23 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* test/rinda/test_rinda.rb (MockClock): correct synchronous problems
-	  of the MultiThreading. [ruby-dev:31692]
+	* include/ruby/win32.h, win32/Makefile.sub, win32/win32.c
+	  (clock_gettime): [experimental] emulates clock_gettime(2) of posix.
 
-Wed Sep  5 22:02:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Aug 15 02:32:40 2013  Zachary Scott  <e@zzak.io>
 
-	* array.c (rb_ary_subseq): need integer overflow check.
-	  [ruby-dev:31736]
+	* hash.c (rb_hash_aset): [DOC] Document key dup patch by @kachick
+	  [Fixes GH-382] https://github.com/ruby/ruby/pull/382
 
-	* array.c (rb_ary_splice): ditto.  [ruby-dev:31737]
+Wed Aug 14 14:28:39 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* array.c (rb_ary_fill): ditto.  [ruby-dev:31738]
+	* proc.c (rb_mod_define_method): now they return the symbols of the
+	  defined methods, not the methods/procs themselves.
+	  [ruby-dev:42151] [Feature #3753]
 
-	* string.c (rb_str_splice): integer overflow for length.
-	  [ruby-dev:31739]
+	* NEWS: documents about above change and def-expr (see r42337).
 
-Sun Sep  2 00:48:15 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+	* test/ruby/test_module.rb: tests about above change.
 
-	* lib/date/format.rb (_parse): improved parsing of ordinal dates.
+Wed Aug 14 00:51:14 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/date/format.rb (_parse): use named character classes in some
-	  regular expressions.
+	* bignum.c (bigdivrem_restoring): xn argument removed.
+	  (bigdivrem_normal): Follow the above change.
 
-Sat Sep  1 08:13:36 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Wed Aug 14 00:18:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/win32ole/win32ole.c: add WIN32OLE#ole_activex_initialize.
+	* bignum.c (big_div_struct): Remove xn and j field.  Add zn field.
+	  (bigdivrem1): Follow the above change.
+	  (bigdivrem_restoring): Ditto.
 
-Thu Aug 30 13:13:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug 13 23:38:17 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (try_const, have_const): check for a const is defined.
-	  [ruby-core:04422]
+	* bignum.c (big_div_struct): ynzero field removed.
+	  (bigdivrem1): Follow the above change.
+	  (bigdivrem_restoring): Ditto.
 
-Thu Aug 30 13:10:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug 13 23:01:16 2013  Tanaka Akira  <akr@fsij.org>
 
-	* configure.in (group_member): check if presents.
+	* bignum.c (bigdivrem_restoring): Extracted from bigdivrem_normal.
 
-	* configure.in (XCFLAGS): add _GNU_SOURCE on linux.
+Tue Aug 13 22:12:59 2013  Kenichi Kamiya  <kachick1@gmail.com>
 
-	* file.c (group_member): use system routine if available.
+	* random.c (rb_random_ulong_limited): coerce before check negative.
+	  [Fixes GH-379]
 
-Thu Aug 30 08:24:18 2007  Tanaka Akira  <akr@fsij.org>
+Tue Aug 13 21:52:15 2013  Kenichi Kamiya  <kachick1@gmail.com>
 
-	* ruby.h (RHASH_TBL): defined for compatibility to 1.9.
-	* (RHASH_ITER_LEV): ditto.
-	* (RHASH_IFNONE): ditto.
-	* (RHASH_SIZE): ditto.
-	* (RHASH_EMPTY_P): ditto.
+	* object.c (Init_Object): undef Module#prepend_features on Class, as
+	  well as Module#append_features.  [Fixes GH-376]
 
-Wed Aug 29 13:05:59 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test_class.rb: Added test for above. And ensure type checking
+	  on similar methods as module_function.
 
-	* include/ruby/defines.h (flush_register_windows): call "ta 0x03"
-	  even on Linux/Sparc.  [ruby-dev:31674]
+Tue Aug 13 08:52:18 2013  Zachary Scott  <e@zzak.io>
 
-Tue Aug 28 23:26:12 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* doc/syntax/literals.rdoc: [DOC] String literal concat by @cknadler
+	  [Fixes GH-380] https://github.com/ruby/ruby/pull/380
 
-	* ext/win32ole/win32ole.c (ole_type_progid, reg_enum_key,
-	  reg_get_val, ole_wc2mb): fix the bug. Thanks, arton.
-	  [ruby-dev:31576]
+Mon Aug 12 23:07:21 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Mon Aug 27 19:10:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (gc_marks_test): inhibit gc for st's operation.
 
-	* ext/etc/etc.c (etc_getlogin): update documentation to note
-	  security issue.  [ruby-Bugs-11821]
+Mon Aug 12 15:59:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Aug 21 21:09:48 2007  Tanaka Akira  <akr@fsij.org>
+	* parse.y (parser_whole_match_p): treat CR in middle of a line as a
+	  mere whitespace.
 
-	* lib/tmpdir.rb (Dir.mktmpdir): make directory suffix specifiable.
+Mon Aug 12 15:16:58 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Aug 21 13:57:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* class.c (rb_prepend_module): make T_ICLASS object shady because
+	  this T_ICLASS object seems to share method table with other class
+	  objects. It was causes WB miss.
+	  TODO: need to know the data structure.
 
-	* hash.c (st_foreach_func, rb_foreach_func): typedefed.
+	* test/ruby/test_module.rb: add a test for WB miss.
 
-Mon Aug 20 17:25:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Aug 12 13:47:54 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (mnew): should preserve noex as safe_level.
+	* process.c: [DOC] RDoc formatting of Process.clock_gettime
 
-	* eval.c (rb_call0): tighten security check condition..
+Mon Aug 12 13:29:09 2013  Zachary Scott  <e@zzak.io>
 
-Sat Aug 18 21:32:20 2007  Tanaka Akira  <akr@fsij.org>
+	* lib/yaml/dbm.rb: [DOC] Document call-seq for YAML::DBM
 
-	* lib/tmpdir.rb (Dir.mktmpdir): new method.
-	  [ruby-dev:31462]
+Mon Aug 12 12:57:26 2013  Zachary Scott  <e@zzak.io>
 
-Sat Aug 18 17:44:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/dbm/extconf.rb: [DOC] Hide from RDoc
+	  Some libraries might want to document extconf.rb so RDoc treats it
+	  like any other ruby program. However, DBM users shouldn't care about
+	  these methods.
 
-	* ext/tk/tcltklib.c (Init_tcltklib): use rb_set_end_proc().
+Mon Aug 12 12:53:39 2013  Zachary Scott  <e@zzak.io>
 
-Sat Aug 18 15:59:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/dbm/dbm.c: [DOC] Reformat headings of DBM class
 
-	* process.c (detach_process_watcher): should not pass the pointer
-	  to an auto variable to the thread to be created.  pointed and
-	  fix by KUBO Takehiro <kubo at jiubao.org>  [ruby-dev:30618]
+Mon Aug 12 12:46:31 2013  Zachary Scott  <e@zzak.io>
 
-Sat Aug 18 12:24:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/yaml.rb, lib/yaml/: [DOC] Document YAML::DBM#key and add
+	  references to similar methods with more detail. This patch brings
+	  lib/yaml to 100% documentation coverage.
 
-	* sample/test.rb, test/ruby/test_system.rb(valid_syntax?): keep
-	  comment lines first.
+Mon Aug 12 02:51:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu Aug 16 20:40:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/readline/readline.c (readline_s_set_input): on OS X with editline,
+	  Readline.readline doesn't work because readline_get doesn't use
+	  rl_getc. The difference is introduced by r42402 [ruby-dev:47509]
+	  [Bug #8644]. Before it rb_io_stdio_file set ifp->stdio_file.
+	  Therefore add manually setting the value.
 
-	* bignum.c (bigtrunc): RBIGNUM(x)->len may be zero.  out of bound
-	  access.  [ruby-dev:31404]
+	* ext/readline/readline.c (readline_s_set_output): ditto.
 
-Thu Aug 16 16:46:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Aug 11 23:27:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in (aix): enable shared by default.
+	* file.c (rb_str_encode_ospath): OS path encoding on Mac OS X is also
+	  fixed.
 
-	* configure.in (aix): for 64bit-mode AIX.  [ruby-dev:31401]
-	  + use CC for LDSHARED if non-gcc,
-	  + moved -G option from *LDFLAGS to LDSHARED,
-	  + set -brtl only in XLDFLAGS.
+Sun Aug 11 22:57:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Aug 16 13:06:08 2007  Tanaka Akira  <akr@fsij.org>
+	* test/ruby/test_require.rb (assert_require_nonascii_path): OS path
+	  encoding on Windows is fixed, so encoding of __FILE__ should be it.
+	  [ruby-core:56498] [Bug #8764]
 
-	* bignum.c (big_lshift): make shift offset long type.
-	  (big_rshift): ditto.
-	  (rb_big_lshift): ditto.
-	  (big_rshift): ditto.
-	  [ruby-dev:31434]
+Sun Aug 11 19:11:45 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Thu Aug 16 04:09:19 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* test/rexml/parser/test_sax2.rb: Expand abbreviated class name.
 
-	* lib/rinda/tuplespace.rb (Rinda::TupleSpace#start_keeper): improve
-	  keeper thread.
+Sun Aug 11 19:06:03 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Aug 15 13:50:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rexml/sax2listener.rb (REXML::SAX2Listener#notationdecl): Fix
+	  wrong number of arguments in the template listener.
+	  [Bug #8731] [ruby-dev:47582]
+	  Reported by Ippei Obayashi.
+	* test/rexml/parser/test_sax2.rb: Add tests for parsing notation
+	  declarations with SAX2 API.
 
-	* hash.c (rb_hash_delete_key): delete the entry without calling block.
+Sun Aug 11 18:44:04 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* hash.c (rb_hash_shift): should consider iter_lev too.
+	* lib/rexml/sax2listener.rb (REXML::SAX2Listener#elementdecl): Fix wrong
+	  examples. [Bug #8731] [ruby-dev:47582]
+	  Reported by Ippei Obayashi.
 
-	* hash.c (delete_if_i): use rb_hash_delete_key() so that the block
-	  isn't called twice.  [ruby-core:11556]
+Sun Aug 11 18:42:13 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Sun Arg 12 03:56:30 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/rexml/parsers/sax2parser.rb
+	  (REXML::Parsers::SAX2Parser#handle_entitydecl): Extract.
 
-	* lib/rinda/tuplespace.rb: fix Rinda::TupleSpace keeper thread bug.
-	  the thread is started too early. [ruby-talk:264062]
+Sun Aug 11 18:40:25 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* test/rinda/test_rinda.rb: ditto.
+	* lib/rexml/parsers/sax2parser.rb (REXML::Parsers::SAX2Parser#parse):
+	  Fix wrong "%" position in parameter entity declaration event argument.
+	* test/rexml/parser/test_sax2.rb: Add tests for the above case.
 
-Sat Aug 11 07:34:10 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Aug 11 18:08:40 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/date/format.rb: reverted some wrongly erased "o" options
-	  (pointed out by nobu).
+	* lib/rexml/parsers/sax2parser.rb (REXML::Parsers::SAX2Parser#parse):
+	  Support NDATA in external ID entity declaration.
+	* test/rexml/parser/test_sax2.rb: Add tests for the above case.
 
-Tue Aug  7 14:58:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Aug 11 18:07:39 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/pty/pty.c (establishShell): handshaking before close slave
-	  device.  [ruby-talk:263410]
+	* lib/rexml/parsers/baseparser.rb
+	  (REXML::Parsers::BaseParser#pull_event): Support optional NDATA
+	  in external ID entity declaration.
 
-	* ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): constified.
+Sun Aug 11 17:54:07 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/pty/pty.c (SlaveName): removed static buffer.
+	* NEWS (REXML::Parsers::SAX2Parser): Add about this change.
+	* lib/rexml/parsers/sax2parser.rb (REXML::Parsers::SAX2Parser#parse):
+	  Fix wrong number of arguments. Document says "an array of the
+	  entity declaration" but it passes two or more arguments.
+	  This is a bug but it break backward compatibility.
+	  Reported by Ippei Obayashi. [Bug #8731] [ruby-dev:47582]
+	* lib/rexml/sax2listener.rb (REXML::SAX2Listener#entitydecl): ditto.
+	  The listener template accepted two arguments.
+	* test/rexml/parser/test_sax2.rb: Add tests for external ID case.
 
-	* ext/pty/expect_sample.rb: support for autologin.
+Sun Aug 11 17:41:41 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Tue Aug  7 12:45:13 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/rexml/parser/test_sax2.rb: Add SAX2 API test.
 
-	* configure.in (ac_cv_func_isinf): set yes also on OpenSolaris.
-	  [ruby-Bugs-12859]
+Sun Aug 11 15:10:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Aug  6 17:36:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (rb_enc_symname_type): allow ID_ATTRSET for ID_INSTANCE,
+	  ID_GLOBAL, ID_CLASS, ID_JUNK too.  [Bug #8756]
 
-	* lib/rexml/encodings/{ISO-8859-15,CP-1252}.rb: fixed invalid syntax.
+Sun Aug 11 13:17:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Fri Aug  3 11:05:54 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/encoding.h: Reduce ENCODING_INLINE_MAX to 127 as this
+	  should be sufficient to represent all the encodings Ruby supports.
 
-	* ext/extmk.rb (extmake): save all CONFIG values.
+Sun Aug 11 11:54:38 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/extmk.rb (extmake): remove mkmf.log at clean, and extconf.h at
-	  distclean, respectively.
+	* process.c (rb_clock_gettime): New method.
+	  This is accepted in the meeting:
+	  https://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20130809
+	  This method is accepted as a CRuby feature.
+	  I.e. Other Ruby implementations don't need to implement it.
+	  [ruby-core:56087] [Feature #8658]
 
-	* ext/extmk.rb: remove rdoc at clean, and installed list file at
-	  distclean, respectively.
+Sun Aug 11 10:40:48 2013  Zachary Scott  <e@zzak.io>
 
-Fri Aug  3 07:09:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/time.rb: [DOC] Correcting rdoc visibility of time.rb constants
+	  Reported by Tanaka Akira [ruby-core:56517]
 
-	* lib/mkmf.rb: more verbose message.  [ruby-Bugs-12766]
+Sun Aug 11 04:48:14 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/mkmf.rb (have_type): suppress a warning with -Wall.
+	* file.c (rb_str_normalize_ospath):
+	  HFS Plus (Mac OS Extended) uses a variant of Normal Form D in which
+	  U+2000 through U+2FFF, U+F900 through U+FAFF, and U+2F800 through
+	  U+2FAFF are not decomposed (this avoids problems with round trip
+	  conversions from old Mac text encodings).
+	  http://developer.apple.com/library/mac/qa/qa1173/_index.html
+	  Therefore fix r42457 to exclude the range.
 
-	* lib/mkmf.rb (find_type): new method.
+Sun Aug 11 03:26:07 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Aug  2 13:46:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bitsize): Fix a conditional expression.
 
-	* sprintf.c (rb_f_sprintf): should not check positional number as
-	  width.  [ruby-core:11838]
+Sun Aug 11 02:44:03 2013  Zachary Scott  <e@zzak.io>
 
-Mon Jul 30 11:16:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/time.rb: [DOC] Document constants by @markijbema [Fixes GH-377]
+	  https://github.com/ruby/ruby/pull/377
 
-	* bignum.c (rb_big_aref): check for Bignum index range.
-	  [ruby-dev:31271]
+Sun Aug 11 01:28:52 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Jul 28 09:35:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in: Revert r42458.
+	  It removes the HAVE_CLOCK_GETTIME from config.h.
+	  http://www.rubyist.net/~akr/chkbuild/debian/ruby-trunk/log/20130809T044800Z.diff.html.gz
 
-	* ext/digest/lib/digest.rb (Digest::self.const_missing): avoid
-	  infinite recursive const_missing call.  [ruby-talk:262193]
+Sat Aug 10 13:53:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Jul 26 13:57:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (rb_id_attrset): allow other than ID_ATTRSET.
 
-	* dln.c (load_1, dln_find_1): constified.
+	* parse.y (intern_str): ditto.  try stem ID for ID_INSTANCE,
+	  ID_GLOBAL, ID_CLASS, ID_JUNK too.  [Bug #8756]
 
-	* dln.c (conv_to_posix_path): removed.
+Sat Aug 10 12:49:50 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ruby.c (usage): constified.
+	* lib/rexml/parsers/baseparser.rb
+	  (REXML::Parsers::BaseParser::CDATA_END): Use "\A" instead of "^".
+	  It is not an used constant but I fix it. (Or should I remove it?)
 
-	* ruby.c (rubylib_mangled_path, rubylib_mangled_path2): return
-	  VALUE instead of a pointer to static buffer.
+Sat Aug 10 12:47:19 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ruby.c (push_include_cygwin): fixed buffer overflow.
-	  [ruby-dev:31297]
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser):
+	  Fix wrong constant name. "]>" pattern match is the same but
+	  it is used for "<!DOCTYPE" end mark not "<![CDATA[" end mark.
 
-	* ruby.c (ruby_init_loadpath): not convert built-in paths.
+Sat Aug 10 12:43:15 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Sun Jul 22 16:07:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser):
+	  Use "\A" instead of "^" in document type declaration patterns
+	  because they are used as the head match in content not the head
+	  match in line. They don't cause any problems in the current code
+	  but it should be fixed.
 
-	* intern.h (is_ruby_native_thread): removed since declared as an int
-	  function in ruby.h already.
+Sat Aug 10 12:39:00 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Sun Jul 22 14:33:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/rexml/parse/test_document_type_declaration.rb: Add tests for
+	  parsing document type declaration.
 
-	* file.c (rb_file_s_rename): deleted code to get rid of a bug of
-	  old Cygwin.
+Sat Aug 10 12:00:45 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* file.c (rb_file_truncate): added prototype of GetLastError()
-	  on cygwin.  [ruby-dev:31239]
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::SYSTEM):
+	  Fix loose "head" match regular expression. It doesn't cause any
+	  problem in the current code but it should be fixed because readers
+	  may confuse it.
+	  Patch by Ippei Obayashi. Thanks!!!
 
-	* intern.h (is_ruby_native_thread): prototype.
+Sat Aug 10 11:58:24 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* missing/strftime.c (strftime): fix printf format and actual
-	  arguments.
+	* test/rexml/parse/test_notation_declaration.rb (#test_system_public):
+	  Add a test for PUBLIC notation and SYSTEM notation order case.
 
-	* ext/Win32API/Win32API.c (Win32API_initialize): ditto.
+Sat Aug 10 11:31:35 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/tk/tcltklib.c (ip_finalize): ditto.
+	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::PUBLIC):
+	  Fix loose "head" match regular expression.
+	  [Bug #8701] [ruby-dev:47551]
+	  Patch by Ippei Obayashi. Thanks!!!
+	* test/rexml/parse/test_notation_declaration.rb (#test_system_public):
+	  Add a test for the above case.
 
-	* ext/dl/ptr.c (rb_dlptr_inspect): ditto.  [ruby-dev:31268]
+Sat Aug 10 09:20:21 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/dl/sym.c (rb_dlsym_inspect): ditto.
+	* NEWS: [DOC] typo in example reported by @moretea
+	  https://github.com/ruby/ruby/commit/a39e724#commitcomment-3831489
 
-	* ext/socket/getnameinfo.c: include stdio.h always.
+Sat Aug 10 09:19:04 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/win32ole/win32ole.c (ole_hresult2msg, folevariable_name,
-	  folevariable_ole_type, folevariable_ole_type_detail,
-	  folevariable_value, folemethod_visible): missing return value.
+	* proc.c: [DOC] rdoc code formatting
 
-Sat Jul 21 17:48:26 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug 10 09:12:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (create_makefile): make OBJS depend on RUBY_EXTCONF_H
-	  only if extconf.h is created.
+	* parse.y (rb_id_attrset): check if the argument is valid type as an
+	  attribute.
 
-	* bcc32/{Makefile.sub,configure.bat,setup.mak: configure_args
-	  support.
+Sat Aug 10 05:44:08 2013  Zachary Scott  <e@zzak.io>
 
-	* bcc32/setup.mak: check runtime version.
+	* lib/rss/trackback.rb: [DOC] Hide RSS::Trackback from rdoc
+	  Patch by Steve Klabnik [Bug #8755] [ruby-core:56456]
 
-	* win32/win32.c (rb_w32_open_osfhandle): prototype has changed
-	  in bcc 5.82.
+Sat Aug 10 04:52:21 2013  Tanaka Akira  <akr@fsij.org>
 
-	* {win32,wince,bcc32}/setup.mak (-version-): no RUBY_EXTERN magic.
+	* bignum.c (big_div_struct): Use size_t.
+	  (bigdivrem1): Ditto.
+	  (bigdivrem_num_extra_words): Ditto.
+	  (bigdivrem_single): Ditto.
+	  (bigdivrem_normal): Ditto.
+	  (bary_divmod): Ditto.
 
-	* win32/resource.rb: include patchlevel number.
+Fri Aug  9 23:47:15 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Sat Jul 21 12:06:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rss/rexmlparser.rb: Remove needless REXML version check.
+	  Both RSS Parser and REXML are bundled in Ruby. RSS Parser can
+	  always use the latest REXML. [Bug #8754] [ruby-core:56454]
+	  Patch by Steve Klabnik. Thanks!!!
 
-	* lib/mkmf.rb (init_mkmf): should remove mkmf.log too.
+Fri Aug  9 22:51:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Jul 21 01:53:17 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+	* configure.in (XLDFLAGS, LIBRUBYARG_STATIC): CoreFoundation framework
+	  option is now needed always, regardless enable-shared.
+	  [ruby-core:56467] [Bug #8759]
 
-	* lib/date/format.rb (Date._parse): completes calendar week based year.
+Fri Aug  9 22:20:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/date/format.rb (Date._parse): detects year of ordinal date in
-	  extended format.
+	* ruby.c (load_file_internal): use rb_parser_compile_string_path and
+	  rb_parser_compile_file_path, String path name versions.  [Bug #8753]
 
-Fri Jul 20 15:22:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  9 07:16:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* ext/openssl/ossl_config.c (ossl_config_set_section): do not
-	  initialize aggregations with dynamic values.  [ruby-talk:259306]
+	* ext/io/console/console.c: delete redefinition of rb_cloexec_open.
+	  drop support for 1.8 and 1.9 from the next release of io-console gem.
 
-Thu Jul 19 19:24:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  9 19:13:54 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (get_backtrace): check the result more.
-	  [ruby-dev:31261] [ruby-bugs-12398]
+	* NEWS: update about new methods for Binding.
 
-Thu Jul 19 14:38:45 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  9 18:48:09 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* bignum.c (rb_big_lshift, rb_big_rshift): separated functions
-	  to get rid of infinite recursion.  fixed calculation in edge
-	  cases.  [ruby-dev:31244]
+	* proc.c: add Binding#local_variable_get/set/defined?
+	  to access local variables which a binding contains.
+	  Most part of implementation by nobu.
 
-	* numeric.c (rb_fix_lshift, rb_fix_rshift): ditto.
+	* test/ruby/test_proc.rb: add a tests for above.
 
-Wed Jul 18 16:57:41 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm.c, vm_core.h (rb_binding_add_dynavars): add a new function
+	  to add a new environment to create space for new local variables.
 
-	* bignum.c (rb_big_pow): refine overflow check.  [ruby-dev:31242]
+Fri Aug  9 14:02:01 2013  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
-Wed Jul 18 08:47:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* tool/make-snapshot: Fix order of priority for option parameter.
 
-	* time.c (time_succ): Time#succ should return a time object in the
-	  same timezone mode to the original.  [ruby-talk:260256]
+Fri Aug  9 12:06:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jul 17 00:50:53 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (rb_str_normalize_ospath): normalize to Normalization Form C
+	  using CFString.
 
-	* numeric.c (fix_pow): integer power calculation: 0**n => 0,
-	  1**n => 1, -1**n => 1 (n: even) / -1 (n: odd).
+Fri Aug  9 10:53:57 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* test/ruby/test_fixnum.rb (TestFixnum::test_pow): update test
-	  suite.  pow(-3, 2^64) gives NaN when pow(3, 2^64) gives Inf.
+	* time.c (get_timeval, get_new_timeval): use rb_obj_class()
+	  instead of CLASS_OF() because CLASS_OF() may return
+	  a singleton class.
 
-Mon Jul 16 23:07:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Aug  9 10:42:11 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* lib/base64.rb (Base64::b64encode): should not specify /o option
-	  for regular expression.  [ruby-dev:31221]
+	* vm_insnhelper.c (vm_invoke_block): returning from lambda proc
+	  now always exits from the Proc. [ruby-core:56193] [Feature #8693]
 
-Mon Jul 16 18:29:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* NEWS, test/ruby/test_lambda.rb: ditto. Patch by nobu.
 
-	* string.c (rb_str_rindex_m): accept string-like object convertible
-	  with #to_str method, as well as rb_str_index_m.  [ruby-core:11692]
+Fri Aug  9 00:10:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Jul 16 05:45:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* enumerator.c (lazy_zip_func): fix non-single argument.  fix
+	  out-of-bound access and pack multiple yielded values.
+	  [ruby-core:56383] [Bug #8735]
 
-	* sprintf.c (rb_f_sprintf): more checks for format argument.
-	  [ruby-core:11569], [ruby-core:11570], [ruby-core:11571],
-	  [ruby-core:11573]
+Thu Aug  8 23:01:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Jul 16 00:26:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (rb_mod_singleton_p): new method Module#singleton_class? to
+	  return whether the receiver is a singleton class or not.
+	  [ruby-core:51087] [Feature #7609]
 
-	* bignum.c (rb_big_pow): removed invariant variable.  [ruby-dev:31236]
+Thu Aug  8 21:56:44 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Jul 15 23:59:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (time_overflow_p): Avoid signed integer overflow.
+	  (rb_time_new): Fix overflow condition.
 
-	* bignum.c (rb_big_neg): SIGNED_VALUE isn't in 1.8.
+Thu Aug  8 19:58:02 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Jul 15 22:24:49 2007  pegacorn  <subscriber.jp AT gmail.com>
+	* thread.c (rb_threadptr_pending_interrupt_check_mask):
+	  use RARRAY_RAWPTR() instead of RARRAY_PTR() because
+	  there is no new reference.
 
-	* ext/digest/digest.c (rb_digest_instance_update,
-	  rb_digest_instance_finish, rb_digest_instance_reset,
-	  rb_digest_instance_block_length): %s in rb_raise() expects char*.
-	  [ruby-dev:31222]
+Thu Aug  8 19:56:52 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/ossl.h: include ossl_pkcs5.h.  [ruby-dev:31231]
+	* string.c (rb_str_format_m): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
 
-	* ext/openssl/ossl_pkcs5.h: new file for PKCS5.  [ruby-dev:31231]
+Thu Aug  8 19:55:51 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): use ossl_raise()
-	  instead of rb_raise().  [ruby-dev:31222]
+	* include/ruby/ruby.h: define USE_RGENGC_LOGGING_WB_UNPROTECT.
 
-	* ext/sdbm/_sdbm.c: DOSISH platforms need io.h.  [ruby-dev:31232]
+Thu Aug  8 16:44:25 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/syck/syck.h: include stdlib.h for malloc() and free().
-	  [ruby-dev:31232]
+	* include/ruby/ruby.h: add old macro name `RUBY_EVENT_SWITCH'.
+	  This macro name is obsolete because it is renamed to
+	  RUBY_INTERNAL_EVENT_SWITCH, but it has compatibility problem
+	  using this macro name like ruby-prof.
+	  I want to remove this macro after ruby 2.1.
 
-	* ext/syck/syck.h (syck_parser_set_input_type): prototype added.
-	  [ruby-dev:31231]
+Thu Aug  8 15:37:53 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* win32/win32.c: include mbstring.h for _mbspbrk().  [ruby-dev:31232]
+	* test/coverage/test_coverage.rb (TestCoverage#test_big_code): use `1'
+	  instead of `p' to get rid of a side effect.
+	  Kernel#p without any argument seems to do nothing, but flushes stdout.
+	  and, if stdout is redirected to file, fsync() will be called on
+	  Windows.  so, when running test-all on Windows with redirection, such
+	  as CI environment, this test took a lot of time.
 
-	* win32.h (rb_w32_getcwd): prototype added.  [ruby-dev:31232]
+Thu Aug  8 14:54:18 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-Sun Jul 15 21:07:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* NEWS: add description of incompatibility introduced by r42396.
+	  [ruby-core:56329] [Bug #8722]
 
-	* bignum.c (bigtrunc): do not empty Bignum.  [ruby-dev:31229]
+Thu Aug  8 14:50:36 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun Jul 15 19:05:28 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* common.mk (mini): portable target to build miniruby
 
-	* bignum.c (rb_cstr_to_inum): check leading non-digits.
-	  [ruby-core:11691]
+	* common.mk (bisect): run git-bisect with miniruby
 
-Sun Jul 15 04:42:20 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* common.mk (bisect-ruby): run git-bisect with ruby
 
-	* bignum.c (get2comp): do nothing for empty Bignum.  [ruby-dev:31225]
+	* tool/bisect.sh: script for git-bisect
 
-Sat Jul 14 14:04:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug  8 12:11:43 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* enum.c (sort_by_cmp): check if reentered.  [ruby-dev:24291]
+	* test/webrick/test_httpresponse.rb (test_send_body_*_chunked): these
+	  expectations assumes that the IOs are binmode.  fixed test failures
+	  introduced at r42427 on Windows.
 
-Sat Jul 14 12:44:14 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Aug  8 10:27:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/openssl/test_pkcs7.rb: reverted the previous patch.  it should
-	  be as it was to check interface compatibility.  sorry for bothering
-	  with this.
+	* range.c (range_last): revert r42400.  [Bug #8739]
 
-Sat Jul 14 12:16:17 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Thu Aug  8 10:26:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/openssl/test_pkcs7.rb: follow the library change.  applied a
-	  patch from <zn at mbf.nifty.com> [ruby-dev:31214].
-	  NOTE: r12496 imports the latest openssl libs from trunk to ruby_1_8
-	  though its's not ChangeLog-ed.  maintainer should aware that.
+	* file.c (rb_str_normalize_ospath): extract and move from dir.c.
 
-Sat Jul 14 02:51:52 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Aug  8 05:59:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* numeric.c (fix_pow): 0**2 should not raise floating point
-	  exception.  [ruby-dev:31216]
+	* test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.
+	  Patch by Antonio Terceiro. [Bug #8750] [ruby-core:56437]
 
-Sat Jul 14 02:25:48 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Aug  8 03:37:38 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* numeric.c (int_pow): wrong overflow detection.  [ruby-dev:31213]
+	* lib/webrick/httpresponse.rb:  Allow #body to be an IO-like object
+	  that responds to #readpartial and #read.
+	  [ruby-trunk - Feature #8155]
+	* NEWS:  NEWS for above
+	* test/webrick/test_httpresponse.rb:  Tests for above.
 
-	* numeric.c (int_pow): wrong overflow detection.  [ruby-dev:31215]
+Wed Aug  7 23:06:26 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Jul 13 16:10:00 2007  Tanaka Akira  <akr@fsij.org>
+	* ruby.c (Process.argv0): New method to return the original value
+	  of $0. [Feature #8696]
 
-	* lib/open-uri.rb (URI::Generic#find_proxy): use ENV.to_hash to access
-	  http_proxy environment variable to avoid case insensitive
-	  environment search.
+Wed Aug  7 23:05:55 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Jul 13 15:02:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.c (Process.setproctitle): New method to change the title of
+	  the running process that is shown in ps(1). [Feature #8696]
 
-	* win32/win32.c (CreateChild): enclose command line except for
-	  command.com which can not handle quotes.  [ruby-talk:258939]
+Wed Aug  7 20:05:38 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Jul 13 10:10:46 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_odd_p): Check the bignum length.
+	  (rb_big_even_p): Ditto.
 
-	* lib/mkmf.rb (link_command, cc_command, cpp_command): do not expand
-	  ::CONFIG which is an alias of MAKEFILE_CONFIG.
+Wed Aug  7 19:29:26 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Jul 12 17:03:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (dbl2big): A condition simplified.
 
-	* struct.c (rb_struct_init_copy): disallow changing the size.
-	  [ruby-dev:31168]
+Wed Aug  7 16:34:30 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed Jul 11 23:38:14 2007  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}):
+	  mswin is not only mswin32 but also mswin64. [Bug #8746]
 
-	* random.c: documentation fix.  srand(0) initializes PRNG with '0',
-	  not with random_seed.
+Wed Aug  7 16:19:12 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jul 10 14:50:01 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* cont.c (rb_fiber_start): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
 
-	* bcc32/{Makefile.sub,setup.mak}: remove surplus slash from srcdir.
+	* proc.c (curry): ditto.
 
-Fri Jul  6 15:22:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* proc.c (rb_proc_call): remove line break.
 
-	* eval.c (rb_interrupt): suppress a gcc's officious warning.
+Wed Aug  7 13:20:12 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Jul  5 16:44:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* random.c (random_load): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
 
-	* numeric.c (int_pow): fix previous nubu's commit.
+Wed Aug  7 12:58:23 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* test/ruby/test_fixnum.rb: new test.
+	* thread.c (thread_start_func_2): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
 
-Thu Jul  5 15:56:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Aug  7 09:00:24 2013  Zachary Scott  <e@zzak.io>
 
-	* numeric.c (int_pow): even number multiplication never be negative.
+	* string.c: [DOC] Description of rb_str_equal [Fixes GH-375]
+	  Based on a patch by @markijbema
+	  https://github.com/ruby/ruby/pull/375
 
-Mon Jul  2 14:34:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Aug  7 08:30:38 2013  Zachary Scott  <e@zzak.io>
 
-	* sprintf.c (rb_f_sprintf): sign bit extension should not be done
-	  if FPLUS flag is specified.  [ruby-list:39224]
+	* ext/openssl/ossl_hmac.c: [DOC] Documentation for OpenSSL::HMAC
+	  based on a patch by @repah documenting-ruby/ruby#14
+	  https://github.com/documenting-ruby/ruby/pull/14
 
-Sat Jun 30 16:05:41 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Aug  7 07:46:23 2013  Zachary Scott  <e@zzak.io>
 
-	* array.c (rb_ary_initialize): should call rb_ary_modify() first.
-	  [ruby-core:11562]
+	* lib/rss/utils.rb: [DOC] RSS::Utils by Steve Klabnik [Bug #8745]
 
-Sat Jun 30 00:17:00 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Aug  7 07:38:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	* parse.y (yylex): return non-valid token for an invalid
-	  instance/class variable name.  a patch from Yusuke ENDOH
-	  <mame AT tsg.ne.jp>.  [ruby-dev:31095]
+	* bignum.c (nlz16): Removed.
+	  (nlz32): Ditto.
+	  (nlz64): Ditto.
+	  (nlz128): Ditto.
+	  (nlz_int): New function.
+	  (nlz_long): New function.
+	  (nlz_long_long): New function.
+	  (nlz_int128): New function.
+	  (nlz): Follow above changes.
+	  (bitsize): Follow above changes.
 
-Fri Jun 29 11:23:09 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug  6 22:38:15 2013  Zachary Scott  <e@zzak.io>
 
-	* parse.y (dsym): return non-null NODE even if yyerror().  based on a
-	  patch from Yusuke ENDOH <mame AT tsg.ne.jp>.  [ruby-dev:31085]
+	* time.c: [DOC] Typo in Time overview by @sparr [Fixes GH-374]
+	  https://github.com/ruby/ruby/pull/374
 
-Tue Jun 26 16:35:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug  6 22:35:32 2013  Zachary Scott  <e@zzak.io>
 
-	* process.c (ruby_setreuid, ruby_setregid): rename to get rid of name
-	  clash.
+	* lib/rss/1.0.rb: [DOC] Document RSS10 by Steve Klabnik [Bug #8740]
 
-	* process.c (proc_exec_v, rb_proc_exec): preserve errno.
+Tue Aug  6 22:14:11 2013  Kouji Takao  <kouji.takao@gmail.com>
 
-Sat Jun 23 00:37:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/readline/readline.c (readline_s_delete_text): remove
+	  checking "$SAFE == 4".
 
-	* hash.c (rb_hash_select): remove unnecessary varargs for
-	  rb_hash_select.  a patch from Daniel Berger
-	  <Daniel.Berger at qwest.com>.   [ruby-core:11527]
+	* ext/readline/readline.c: fix rdoc, remove "Raises SecurityError"
+	  and add "Raises NotImplementedError".
 
-	* hash.c: ditto.
+Tue Aug  6 22:04:38 2013  Kouji Takao  <kouji.takao@gmail.com>
 
-Mon Jun 18 08:47:54 2007  Technorama Ltd.  <oss-ruby@technorama.net>
+	* ext/readline/readline.c, test/readline/test_readline.rb: fix
+	  indent.
 
-	* ext/openssl/{extconf.rb,ossl_ssl_session.c}:
-	  Fix ruby-Bugs-11513.
+Tue Aug  6 21:59:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_pkey_ec.c
-	  New methods EC::Point.[eql,make_affine!,invert!,on_curve?,infinity?]
-	  By default output the same key form as the openssl command.
+	* range.c (range_last): return nil for empty range, or in the case the
+	  predecessor is smaller than the begin.  [Bug #8739]
 
-	* ext/openssl/ossl_rand.c
-	  New method Random.status?
+Tue Aug  6 21:48:31 2013  Kouji Takao  <kouji.takao@gmail.com>
 
-Mon Jun 18 13:54:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/readline/readline.c (readline_s_set_point, Init_readline):
+	  add Readline.point=(pos). Patched by naruse.  [ruby-dev:47535]
+	  [Feature #8675]
 
-	* eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured
-	  in at_exit blocks.  [ruby-core:11263]
+Tue Aug  6 21:14:11 2013  Kouji Takao  <kouji.takao@gmail.com>
 
-Mon Jun 18 01:14:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/readline/readline.c (Init_readline, readline_s_set_output)
+	(clear_rl_outstream, readline_s_set_input, clear_rl_instream)
+	(readline_readline): fix causing SEGV if closed IO object that is
+	  set Readline.input or Readline.output. Patched by akr
+	  [ruby-dev:47509] [Bug #8644]
 
-	* variable.c (rb_path2class): get rid of dangling pointer caused by
-	  optimized out value.
+Tue Aug  6 17:56:40 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* variable.c (rb_global_entry, rb_f_untrace_var, rb_alias_variable,
-	  rb_generic_ivar_table, generic_ivar_get, generic_ivar_set,
-	  generic_ivar_defined, generic_ivar_remove, rb_mark_generic_ivar,
-	  rb_free_generic_ivar, rb_copy_generic_ivar,
-	  rb_obj_instance_variables): suppress warnings.
+	* vm_insnhelper.c (vm_push_frame): change type of stack_max to size_t.
 
-Fri Jun 15 22:33:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Aug  6 17:42:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk (realclean): separate local and ext.
+	* range.c (range_last): exclude the last number of the exclusive range
+	  if the end is Numeric.  [ruby-dev:47587] [Bug #8739]
 
-	* ext/extmk.rb: not remove unrelated directories.
+Tue Aug  6 17:42:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jun 15 17:01:20 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/win32.c (rb_w32_conv_from_wchar): converted string to CP_UTF8
+	  should have UTF-8 encoding.  otherwise no conversion takes place
+	  later.
 
-	* ext/dl/lib/dl/win32.rb: seems that dl doesn't accept void argument.
-	  fixed [ruby-bugs:PR#5489].
+Tue Aug  6 17:21:38 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Jun 14 17:09:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_insnhelper.c (vm_push_frame): fix stack overflow check codes.
+	  Stack overflow check should be done *after* pushing a stack frame.
+	  However, some stack overflow checking codes checked *before*
+	  pushing a stack frame with iseq->stack_max.
+	  To solve this problem, add a new parameter `stack_max' to specify
+	  a possible consuming stack size.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser): handle more
-	  extensions.  [ruby-dev:30972]
+	* vm_core.h (CHECK_VM_STACK_OVERFLOW0): add to share the stack overflow
+	  checking code.
 
-Wed Jun 13 06:05:12 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* insns.def: catch up this change.
 
-	* configure.in (darwin): prohibit loading extension libraries to
-	  miniruby.
+	* vm.c, vm_eval.c: ditto.
 
-Wed Jun 13 05:47:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_exception.rb: add a stack overflow test.
+	  This code is reported by nobu.
 
-	* eval.c (rb_kill_thread): renamed in order to get rid of conflict
-	  with a BeOS system function.  [ruby-core:10830]
+Tue Aug  6 17:02:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jun 12 14:53:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (rb_w32_conv_from_wchar): use WideCharToMultiByte(),
+	  as like as mbstr_to_wstr(), in the first step of the conversion from
+	  WCHAR.
 
-	* lib/mkmf.rb (Logging.quiet, Logging.message): added quiet flag and
-	  use it.  [ruby-core:10909]
+Tue Aug  6 16:14:32 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/mkmf.rb (find_header): use header names in the message.
+	* vm_eval.c (eval_string_with_cref): copy cref to limit the scope of
+	  refinements in the eval string. [ruby-core:56329] [Bug #8722]
 
-Sun Jun 10 13:47:36 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_refinement.rb: related test.
 
-	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
-	  get rid of invoking shell.  [ruby-dev:30942]
+Tue Aug  6 12:23:12 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Jun  7 19:02:48 2007  Tanaka Akira  <akr@fsij.org>
+	* bignum.c (rb_big_realloc): Use VALGRIND_MAKE_MEM_UNDEFINED to
+	  declare undefined memory area.
+	  (bignew_1): Ditto.
 
-	* lib/pp.rb: call original "method" method instead of redefined one.
+	* internal.h (VALGRIND_MAKE_MEM_DEFINED): Moved from gc.c
+	  (VALGRIND_MAKE_MEM_UNDEFINED): Ditto.
 
-Mon Jun  4 11:11:12 2007  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Aug  6 01:40:37 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/net/imap.rb (ResponseParser#next_token): fixed
-	  error message. (backported from HEAD)
+	* process.c: [DOC] Document caveats of command form of Process.spawn
+	  with regard to the shell and OS. Patched by Steve Klabnik [Bug #8550]
 
-	* lib/net/imap.rb (ResponseParser#parse_error): fixed
-	  the condition not to refer @token.symbol unexpectedly.
-	  Thanks, Dick Monahan. (backported from HEAD)
+Tue Aug  6 01:28:35 2013  Zachary Scott  <e@zzak.io>
 
-Thu May 31 17:27:53 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rss/0.9.rb: [DOC] Typo in example [Bug #8732]
 
-	* lib/benchmark.rb (Benchmark::Job::item): avoid modifying the
-	  argument unintentionally.  [ruby-talk:253676]
+Tue Aug  6 01:22:37 2013  Zachary Scott  <e@zzak.io>
 
-Thu May 31 02:12:32 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/rss/2.0.rb: [DOC] Document RSS::Rss by Steve Klabnik #8740
+	* lib/rss/atom.rb: [DOC] Typo in rdoc by Steve Klabnik
 
-	* lib/rinda/tuplespace.rb (Rinda::TupleBag): create index on tuple bag
-	  by first column.
+Mon Aug  5 23:47:59 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed May 30 13:27:40 2007  Shugo Maeda  <shugo@ruby-lang.org>
+	* bignum.c: Rename local variables.
 
-	* lib/net/ftp.rb (Net::FTP#transfercmd): skip 2XX
-	  responses for some FTP servers. (backported from HEAD)
+Mon Aug  5 22:23:59 2013  Zachary Scott  <e@zzak.io>
 
-Wed May 30 05:17:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_trace.c: [DOC] Fix TracePoint return values in examples
+	  Based on a patch by @sho-h [Fixes GH-373]
+	  https://github.com/ruby/ruby/pull/373
 
-	* eval.c (rb_eval): get rid of SEGV at ZSUPER in a block
-	  [ruby-dev:30836]
+Mon Aug  5 17:38:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 30 04:29:43 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (rb_w32_write_console): use MultiByteToWideChar() for
+	  the last step of conversion to WCHAR, to get rid of warnings from
+	  rb_enc_find() in miniruby.  [ruby-dev:47584] [Bug #8733]
 
-	* eval.c (thread_timer): timer thread should not receive any
-	  signals.  submitted by Sylvain Joyeux.  [ruby-core:08546]
+	* win32/win32.c (wstr_to_mbstr, mbstr_to_wstr): fix wrong trimming.
+	  WideCharToMultiByte() and MultiByteToWideChar() do not count
+	  NUL-terminator in the size for conversion result, unless the input
+	  length is -1.
 
-Wed May 30 04:18:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Aug  5 11:51:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* eval.c (rb_eval_cmd): just return if no exceptions.
-	  [ruby-dev:30820]
+	* include/ruby/encoding.h: document which user flags are used by
+	  ENCODING_MASK for better greppability
 
-Tue May 29 11:01:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Aug  5 10:01:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* win32/win32.c (rb_w32_opendir): store attributes of the second
-	  entries or later too.
+	* object.c (rb_class_inherited_p): allow iclasses to be tested for
+	  inheritance. [Bug #8686] [ruby-core:56174]
 
-	* win32/win32.c (rb_w32_opendir, rb_w32_readdir): eliminate magic
-	  numbers.
+	* test/ruby/test_method.rb: add test
 
-Mon May 28 02:54:05 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Mon Aug  5 06:13:48 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/rinda/tuplespace.rb (Rinda::TupleBag#delete): use rindex and
-	  delete_at instead of delete for little improvement.
+	* enumerator.c: [DOC] Remove reference to Enumerator::Lazy#cycle
+	  Patch by @kachick [Fixes GH-372]
+	  https://github.com/ruby/ruby/pull/372
 
-Sat May 26 00:05:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Aug  5 03:57:16 2013  Zachary Scott  <e@zzak.io>
 
-	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
-	  skip tests for exitstatus and termsig on the platforms where
-	  signals not supported.
+	* lib/rss/0.9.rb: [DOC] Document RSS09 by Steve Klabnik [Bug #8732]
 
-Wed May 23 06:51:46 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Mon Aug  5 03:35:11 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/cgi.rb (CGI#[]): get rid of exceptions being raised.
-	  [ruby-dev:30740], Thanks Kentaro KAWAMOTO.
+	* lib/rexml/attribute.rb: [DOC] Update example for #namespace
+	  Patch by Ippei Obayashi [Bug #8685] [ruby-core:56173]
 
-Wed May 23 05:49:49 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Aug  4 21:08:29 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/extmk.rb, ext/purelib.rb, lib/mkmf.rb, runruby.rb: clear default
-	  load path to get rid of load pre-installed extensions/libraries.
-	  [ruby-core:11017]
+	* array.c (rb_ary_zip): performance implement by using
+	  ALLOCA_N() to allocate tmp buffer.
 
-Sat May 19 10:29:18 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sun Aug  4 07:14:49 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/date/format.rb (Date._parse): detects some OFX dates
-	  (Of course not fully).
+	* README.EXT, README.EXT.ja: Mention rb_integer_pack and
+	  rb_integer_unpack.
 
-Fri May 18 23:07:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Aug  4 01:54:45 2013  Tanaka Akira  <akr@fsij.org>
 
-	* array.c (rb_ary_first): call rb_ary_subseq() instead of pushing
-	  values by itself.  [ruby-talk:252062]
+	* bignum.c (BARY_TRUNC): New macro.
+	  (bary_cmp): Use BARY_TRUNC.
+	  (bary_mul_toom3): Ditto.
+	  (bary_divmod): Ditto.
+	  (abs2twocomp): Ditto.
+	  (bigfixize): Ditto.
+	  (rb_cstr_to_inum): Ditto.
+	  (big2str_karatsuba): Ditto.
+	  (bigdivrem): Ditto.
 
-	* array.c (rb_ary_first): add negative length check.
+Sun Aug  4 00:57:58 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri May 18 17:10:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (big2str_karatsuba): Don't allocate new temporary buffer
+	  if the buffer is enough for current invocation.
 
-	* win32/win32.c (move_to_next_entry): loc also must move forward.
-	  [ruby-talk:251987]
+Sun Aug  4 00:22:34 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri May 18 03:02:40 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bary2bdigitdbl): New function.
+	  (bdigitdbl2bary): Ditto.
+	  (bary_mul_single): Use bdigitdbl2bary.
+	  (power_cache_get_power): Ditto.
+	  (bary_divmod): Use bary2bdigitdbl.
+	  (big2str_orig): Ditto.
+	  (bigdivrem): Ditto.
 
-	* win32/mkexports.rb: preserve prefixed underscores for WINAPI
-	  symbols.
+Sat Aug  3 22:47:11 2013  Tanaka Akira  <akr@fsij.org>
 
-	* wince/mkconfig_wce.rb, wince/mkexports.rb: obsolete.
+	* bignum.c: The branch condition of selecting multiplication
+	  algorithms should check smaller argument because Karatsuba and Toom3
+	  is effective only if both arguments are big.
+	  (bary_mul_toom3_branch): Compare the smaller argument to
+	  TOOM3_MUL_DIGITS.
+	  (bary_mul): Compare the smaller argument to KARATSUBA_MUL_DIGITS.
 
-Thu May 17 17:03:11 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug  3 22:23:31 2013  Tanaka Akira  <akr@fsij.org>
 
-	* misc/ruby-style.el (ruby-style-label-indent): for yacc rules.
+	* bignum.c (big2str_orig): Receive the number to stringize as
+	  BDIGIT array and size.
+	  (big2str_karatsuba): Receive the number to stringize as BDIGIT array
+	  and size.  Use an temporary array of BDIGIT.
+	  (rb_big2str1): Follow the above change.
 
-Tue May 15 14:54:07 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Aug  3 13:30:04 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/win32.c (init_stdhandle): stderr should be without buffering,
-	  but mswin32 use buffering when stderr is not connected to tty.
+	* bignum.c (MAX_BASE36_POWER_TABLE_ENTRIES): Renamed from
+	  MAX_BIG2STR_TABLE_ENTRIES.
+	  (base36_power_cache): Renamed from big2str_power_cache.
+	  (base36_numdigits_cache): Renamed from big2str_numdigits_cache.
 
-Mon May 14 13:28:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug  3 10:33:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/thread/thread.c (wait_list): supress a warning.
+	* parse.y (parser_set_integer_literal): use rb_rational_raw1() for
+	  integral rational because no reduction is needed with 1.
 
-Thu May 10 15:21:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Aug  3 09:46:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/iconv/iconv.c (iconv_s_conv): rdoc fix.
+	* ext/etc/etc.c (setup_passwd, setup_group): set proper encodings to
+	  string members.
 
-Thu May 10 10:14:14 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Aug  3 09:30:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_thread_priority): rdoc fix; the initial value is
-	  inherited from the creating thread.  [ruby-core:10607]
+	* struct.c (rb_struct_define_under): new function to define Struct
+	  under the given namespace, not under Struct.  [Feature #8264]
 
-Wed May  9 12:28:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/etc/etc.c: use rb_struct_define_under.
 
-	* bignum.c (Init_Bignum), numeric.c (Init_Numeric): added fdiv as
-	  aliases of quo.  [ruby-dev:30771]
+Sat Aug  3 06:55:29 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed May  9 11:55:15 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (value_expr_gen): now NODE_DEFN and NODE_DEFS are not void
+	  value expressions.  get rid of wrong warning with -w, and make to
+	  pass tests with chkbuild.  ref. [Feature #3753]
 
-	* bignum.c (rb_big_quo): now calculate in integer.  [ruby-dev:30753]
+Sat Aug  3 04:23:48 2013  Eric Hodel  <drbrain@segment7.net>
 
-Wed May  9 11:51:06 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* doc/syntax/refinements.rdoc:  Remove mention of instance_eval and
+	  module_eval from scope section per:
+	  http://twitter.com/shugomaeda/status/363219951336693761
 
-	* bignum.c (rb_big_pow): reduce multiplying for even number.
+Sat Aug  3 02:22:05 2013  Tanaka Akira  <akr@fsij.org>
 
-	* bignum.c (rb_big_pow): truncate all zero BDIGITs. [ruby-dev:30733]
+	* bignum.c (big2str_orig): Refactored.
 
-	* bignum.c (rb_big_pow): improvement by calculating from MSB and using
-	  factorization.  <http://yowaken.dip.jp/tdiary/20070426.html#p01>
+Sat Aug  3 01:20:19 2013  Tanaka Akira  <akr@fsij.org>
 
-	* numeric.c (int_pow): calculate power in Fixnum as possible.
-	  [ruby-dev:30726]
+	* bignum.c (bigadd_core): Removed.
+	  (bigadd): Use bary_add instead of bigadd_core.
 
-Tue May  8 23:42:51 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Aug  3 00:52:43 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/date/format.rb (Date._parse): revised treatment of
-	  hyphened/separatorless dates.
+	* bignum.c (rb_big2str1): Simplify power_level calculation.
 
-	* lib/date/format.rb: some trivial adjustments.
+Sat Aug  3 00:34:20 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Tue May  8 20:25:05 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+	* array.c (rb_ary_zip): use rb_ary_new2() to create buffer
+	  if rb_block_arity() > 1.
 
-	* lib/date/format.rb: reverted.
+Sat Aug  3 00:12:00 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sat May  5 16:26:33 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* NEWS: Add the description that IO#seek supports SEEK_DATA
+	  and SEEK_HOLE.
 
-	* lib/date/format.rb (Format::Bag#method_missing): get rid of
-	  modifying orginal argument.  [ruby-core:11090]
+Fri Aug  2 23:57:57 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Mon Apr 30 01:17:51 2007  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* vm.c (m_core_define_method, m_core_define_singleton_method): now
+	  the value of def-expr is the Symbol of the name of the method, not
+	  nil.
+	  ref. [ruby-dev:42151] [Feature #3753]
 
-	* lib/rinda/tuplespace.rb (TupleSpace#create_entry, TupleBag#push,
-	  delete): extract method, and rename parameter.
+	* test/ruby/test_syntax.rb (TestSyntax#test_value_of_def): test for
+	  above changes.
 
-Fri Apr 27 02:00:17 2007  Ryan Davis  <ryand-ruby@zenspider.com>
+Fri Aug  2 23:54:11 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* signal.c: Fixed backwards compatibility for 'raise Interrupt'.
+	* array.c (rb_ary_zip): performance improvement by avoiding
+	  array creation if rb_block_arity() > 1.
 
-	* lib/yaml/tag.rb: Running rdoc over the 1.8.6 tree skips
-	  Module. Patch from James Britt
+Fri Aug  2 23:50:53 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Apr 26 13:54:51 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (power_cache_get_power): Apply bigtrunc to the result of
+	  bigsq.
+	  (big2str_karatsuba): Fix number of leading zero characters.
 
-	* misc/ruby-style.el: new file.  C/C++ style for ruby source code.
+Fri Aug  2 23:48:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Apr 25 19:49:16 2007  Tanaka Akira  <akr@fsij.org>
+	* parse.y (parser_yylex): calculate denominator directly as powers of
+	  ten, not parsing string.
 
-	* ext/socket/socket.c (unix_send_io, unix_recv_io): use CMSG_DATA to
-	  align file descriptor appropriately.
+	* parse.y (parser_number_literal_suffix): return bit set of found
+	  suffixes.
 
-Tue Apr 24 09:33:57 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (parser_set_number_literal, parser_set_integer_literal):
+	  split from parser_number_literal_suffix to set yylval.
 
-	* dir.c (do_stat, do_lstat, do_opendir): should not warn ENOTDIR.
-	  [ruby-talk:248288]
+	* parse.y (parser_yylex): parse rational number literal with decimal
+	  point precisely.
 
-Mon Apr 23 22:14:42 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (simple_numeric): integrate numeric literals and simplify
+	  numeric rules.
 
-	* ext/extmk.rb ($ruby): add extout directory to include path.
-	  [ruby-core:11003]
+	* ext/ripper/eventids2.c (ripper_init_eventids2): ripper support for
+	  new literals, tRATIONAL and tIMAGINARY.
 
-	* lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current
-	  directory.
+Fri Aug  2 18:33:28 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (init_mkmf): add current directory to default
-	  library path with highest priority.  [ruby-core:10960]
+	* bignum.c (big2str_karatsuba): Reduce power_level more than one at
+	  recursion, if possible.
+	  (rb_big2str1): Follow the above change.
 
-	* lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.
+Fri Aug  2 12:25:15 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Apr 20 16:05:22 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bary_mul): Swap x and y for bary_mul1 if x is longer than y.
+	  [ruby-dev:47565] [Bug #8719] Reported by Narihiro Nakamura.
 
-	* configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,
-	  it is done by libpathflag in mkmf.rb.
+Fri Aug  2 10:39:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Fri Apr 20 12:27:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (negate_lit): add T_RATIONAL and T_COMPLEX to the switch
+	  statement, and call rb_bug() if an unknown type is passed to
+	  negate_lit(). [ruby-core:56316] [Bug #8717]
 
-	* lib/optparse.rb: fix to override conv proc.
+	* bootstraptest/test_literal_suffix.rb (assert_equal): add test
 
-Fri Apr 20 12:17:05 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  2 09:14:47 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* eval.c (ruby_cleanup): inversed the order of errinfos.
+	* doc/syntax/refinements.rdoc:  Improve description of where you may
+	  activate refinements.
 
-Thu Apr 19 14:53:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  2 07:45:55 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/monitor.rb (ConditionVariable#wait, mon_enter, mon_exit_for_cond):
-	  ensures Thread.critical to be false.  [ruby-talk:248300]
+	* bignum.c (big2str_orig): Remove len argument.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Follow above change.
 
-Wed Apr 18 10:41:21 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug  2 02:32:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* util.c (ruby_strtod): exponent is radix 10.  [ruby-talk:248272]
+	* NEWS: Add the description of number literal suffixes.
 
-Wed Apr 18 02:30:24 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug  2 00:02:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* configure.in (LDFLAGS): prepend -L. instead appending it to
-	  XLDFLAGS.  [ruby-core:10933]
+	* bootstraptest/test_literal_suffix.rb: add two test cases to
+	  examine that "1if true" and "1rescue nil" are recognized as 1.
 
-	* configure.in (Makefile): remove $U for automake from MISSING.
-	  [ruby-talk:248171]
+Thu Aug  1 23:45:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-Tue Apr 17 16:46:46 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* rational.c (rb_flt_rationalize_with_prec): new public C function
+	  to rationalize a Float instance with a precision.
 
-	* eval.c (rb_yield_0): should not clear state on TAG_NEXT when
-	  it's invoked from within lambda body.  [ruby-talk:248136]
+	* rational.c (rb_flt_rationalize): new public C function to
+	 rationalize a Float instance.  A precision is calculated from
+	 the given float number.
 
-	* eval.c (proc_invoke): handle TAG_NEXT which would be caused by
-	  next in the lambda body as well.
+	* include/ruby/intern.h: Add rb_flt_rationalize_with_prec and
+	  rb_flt_rationalize.
 
-Mon Apr 16 22:56:01 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y: implement number literal suffixes, 'r' and 'i'.
+	  [ruby-core:55096] [Feature #8430]
 
-	* ext/pty/expect_sample.rb: avoid symbolic link representation for
-	  expect.  a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
-	  [ruby-dev:30714]
+	* bootstraptest/test_literal_suffix.rb: add tests for parser to scan
+	  number literals with the above tsuffixes.
 
-Mon Apr 16 22:51:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Aug  1 23:55:08 2013  Tanaka Akira  <akr@fsij.org>
 
-	* sample: replace TRUE, FALSE with true, false respectively.
-	  a patch from Kazuhiro NISHIYAMA <zn at mbf.nifty.com>.
-	  [ruby-dev:30713]
+	* bignum.c (rb_big2str1): Remove a local variable.
 
-Mon Apr 16 17:08:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug  1 23:33:01 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/optparse.rb (make_switch): do not clobber converter if pattern
-	  has no convert method.  reported by sheepman in [ruby-dev:30709].
+	* bignum.c (rb_cstr_to_inum): Use power_cache_get_power.
 
-Mon Apr 16 16:49:32 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug  1 21:02:48 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/stringio/stringio.c (strio_seek): consistent behavior with
-	  IO#seek.  patch by sheepman in [ruby-dev:30710].
+	* bignum.c (rb_big2str1): Raise an error for too big number.
 
-Mon Apr 16 16:34:08 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Aug  1 20:46:29 2013  Tanaka Akira  <akr@fsij.org>
 
-	* parse.y (parser_yylex): should set command_start after block
-	  starting "do"s and braces.  [ruby-core:10916]
+	* bignum.c (power_cache_get_power): Hide cached Bignum objects.
 
-Sun Apr 15 09:19:57 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Thu Aug  1 19:15:05 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/date/format.rb: added some zone names.
+	* bignum.c (rb_big2str1): Remove non-trim mode.
+	  (rb_big2str0): Non-trim mode implemented here.
+	  (big2str_find_n1): Change the result type to long again.
+	  (big2str_base_powerof2): Don't take arguments: len and trim.
+	  (rb_big2str): Follow above change.
 
-	* lib/date/format.rb (_parse): now interprets doted numerical
-	  dates as a big endian (except dd.mm.yyyy).
+Thu Aug  1 12:37:58 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Apr 10 17:37:36 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (big2str_alloc): New function to allocate the result string.
+	  It is called after actual length is calculated.
+	  (big2str_struct): Add fields: negative, result and ptr.
+	  (big2str_orig): Write out the result via b2s->ptr.
+	  (big2str_orig): Ditto.
+	  (rb_big2str1): Don't allocate the result string at beginning.
 
-	* win32/win32.c (rb_w32_fclose, rb_w32_close): need to save errno
-	  before calling original fclose()/close().
+Thu Aug  1 07:36:27 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Apr  9 09:30:44 2007  Shugo Maeda  <shugo@ruby-lang.org>
+	* bignum.c (big2str_orig): Use temporary buffer when trim mode.
 
-	* lib/net/imap.rb (disconnect): call shutdown for
-	  SSLSocket. Thanks, Technorama Ltd.
+Thu Aug  1 06:28:48 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Apr  5 00:42:48 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (big2str_orig): Simplified because RBIGNUM_LEN(x) <= 2 now.
+	  (big2str_struct): Two fields added: hbase2, hbase2_numdigits.
+	  (rb_big2str1): Initialize above fields.
 
-	* error.c (rb_notimplement), io.c (pipe_open): removed definite
-	  articles and UNIX manual section from messages.  [ruby-dev:30690]
+Thu Aug  1 04:06:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Apr  4 17:09:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rdoc/options.rb (RDoc#finish): include root path in include
+	  paths, to work in another directory than the source directory.
+	  [ruby-core:56282] [Bug #8712]
 
-	* io.c (pipe_open): refined the message of NotImplementedError.
-	  [ruby-dev:30685]
+	* test/test_rdoc_markup_pre_process.rb (TestRDocMarkupPreProcess#setup):
+	  fix input_file_name, as the test script is not pre-processed.
 
-Wed Apr  4 10:18:04 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Aug  1 01:45:18 2013  Tanaka Akira  <akr@fsij.org>
 
-	* io.c (pipe_open): raise NotImplementedError for command "-" on
-	  platforms where fork(2) is not available.  [ruby-dev:30681]
+	* bignum.c (big2str_karatsuba): Fix a condition of power_level.
 
-Tue Apr  3 15:45:41 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Aug  1 01:09:02 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/socket/socket.c (s_recv, s_recvfrom): some systems (such as
-	  windows) doesn't set fromlen if the socket is connection-oriented.
-	  reported by Bram Whillock in [ruby-core:10512] [ruby-Bugs#9061]
+	* bignum.c (LOG2_KARATSUBA_BIG2STR_DIGITS): Removed.
+	  (KARATSUBA_BIG2STR_DIGITS): Removed.
+	  (big2str_numdigits_cache): New variable.
+	  (power_cache_get_power): Merged with power_cache_get_power0.
+	  This function returns maxpow_in_bdigit_dbl(base)**(2**power_level).
+	  (rb_big2str1): use power_cache_get_power.
 
-Sat Mar 24 23:40:29 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 31 23:59:28 2013  Tanaka Akira  <akr@fsij.org>
 
-	* node.h (struct rb_thread.locals): explicit as struct.
-	  [ruby-core:10585]
+	* bignum.c (big2str_find_n1): Change the return type to size_t.
+	  (big2str_orig): Ditto.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Follow the above changes.
 
-	* eval.c, node.h (enum rb_thread_status, struct rb_thread,
-	  rb_curr_thread, rb_main_thread): prefixed.  [ruby-core:10586]
+Wed Jul 31 23:19:06 2013  Tanaka Akira  <akr@fsij.org>
 
-	* file.c (chompdirsep): made an unprefixed name static.
+	* bignum.c (power_cache_get_power): Change numdigits_ret to size_t *.
+	  (big2str_orig): Change len argument to size_t.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Follow the above changes.
 
-	* io.c (io_fread): ditto.
+Wed Jul 31 22:59:47 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Sat Mar 24 01:54:03 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/rexml/parse/test_notation_declaration.rb: Change class
+	  name to follow file name change.
 
-	* eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
-	  block.  [ruby-core:10609]
+Wed Jul 31 22:57:50 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
-	  test for exit in END block.  [ruby-core:10760]
+	* test/rexml/test_notationdecl_parsetest.rb: Rename to ...
+	* test/rexml/parse/test_notation_declaration.rb: ... this.
 
-	* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
-	  test for signal in END block.
+Wed Jul 31 22:54:39 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Thu Mar 22 23:13:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/rexml/test_notationdecl_mixin.rb: Remove duplicated tests.
 
-	* eval.c (rb_provided): check for extension library if SOEXT is
-	  explicitly given.  [ruby-dev:30657]
+Wed Jul 31 22:52:55 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Thu Mar 22 10:29:25 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/rexml/test_notationdecl_parsetest.rb: Fix typos in expected
+	  value.
+	  pubilc ->
+	  public
+	     ^^
 
-	* test/ruby/test_bignum.rb (test_to_s): add tests for Bignum#to_s.
+Wed Jul 31 22:50:51 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Mar 21 17:04:30 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/rexml/test_notationdecl_parsetest.rb: Add tests that focus
+	  system literal in external ID system notation declaration.
 
-	* bignum.c (rb_big2str0): round up for the most significant digit.
-	  [ruby-core:10686]
+Wed Jul 31 22:36:21 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Mar 21 07:21:24 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* bignum.c (bary_cmp): Extracted from rb_big_cmp.
+	  (power_cache_get_power): Change n1 argument (number of digits) to
+	  power_level which is just passed to power_cache_get_power0.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Calculate the initial power_level.
 
-	* ext/thread/thread.c (remove_one): Preserve List invariants;
-	  submitted by: MenTaLguY <mental AT rydia.net>
-	  in [ruby-core:10598] and [ruby-bugs:PR#9388].
+Wed Jul 31 22:04:36 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Tue Mar 20 22:54:50 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/rexml/test_notationdecl_parsetest.rb: Fix a typo.
+	  Extern  ID ->
+	  ExternalID
+	        ^^
 
-	* marshal.c (w_extended): erroneous check condition when dump
-	  method is defined.  [ruby-core:10646]
+Wed Jul 31 22:01:36 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Tue Mar 20 15:37:24 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* test/rexml/test_notationdecl_parsetest.rb: Add tests that focus
+	  public ID in external ID notation declaration.
 
-	* distruby.rb: Add zip generation.
+Wed Jul 31 22:01:24 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Tue Mar 20 11:28:41 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* parse.y: fix build error with bison-3.0.
 
-	* lib/matrix.rb (Matrix::inverse_from): adding partial pivoting to
-	  the Gauss-Jordan algorithm, making it stable.  a patch from
-	  Peter Vanbroekhoven.  [ruby-core:10641]
+Wed Jul 31 21:58:53 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Mon Mar 19 11:39:29 2007  Minero Aoki  <aamine@loveruby.net>
+	* test/rexml/test_notationdecl_parsetest.rb: Split test patterns.
 
-	* lib/net/protocol.rb (rbuf_read): extend buffer size for speed.
+Wed Jul 31 21:42:33 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Sun Mar 18 04:23:52 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* test/rexml/test_notationdecl_parsetest.rb: Group tests.
 
-	* NEWS: Add a note about the new `date' library defining
-	  Time#to_date and Time#to_datetime private methods.
+Wed Jul 31 21:37:51 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* NEWS: Inform that the old `thread' library is considered to be
-	  stable.
+	* test/rexml/test_notationdecl_mixin.rb (TestNotationDecl#test_name):
+	  Move to ...
+	* test/rexml/test_notationdecl_parsetest.rb
+	  (TestNotationDecl#test_name): ... here.
 
-	* NEWS: Sort library entries in alphabetical order.
+Wed Jul 31 21:37:47 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Fri Mar 16 21:48:11 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 31 21:31:49 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/dl/dl.c (rb_ary2cary): Fix a bug in type validation;
-	  submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
-	  in [ruby-dev:30554].
+	* test/rexml/test_notationdecl_parsetest.rb: Remove setup because it
+	  doesn't share anything with other tests.
 
-Fri Mar 16 18:28:06 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 31 21:24:55 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/etc/etc.c (etc_getgrgid): Fix a bug in Etc::getgrgid()
-	  always returning the (real) group entry of the running process;
-	  reported by: UEDA Hiroyuki <ueda AT netforest.ad.jp>
-	  in [ruby-dev:30586].
+	* test/rexml/test_attributes_mixin.rb: Remove a needless shebang.
+	* test/rexml/test_notationdecl_mixin.rb: ditto.
+	* test/rexml/test_doctype.rb: ditto.
+	* test/rexml/test_xml_declaration.rb: ditto.
+	* test/rexml/test_changing_encoding.rb: ditto.
 
-Fri Mar 16 16:33:58 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 31 21:20:08 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/thread/thread.c (unlock_mutex_inner): Make sure that the
-	  given mutex is actually owned by the caller; submitted by:
-	  Sylvain Joyeux <sylvain.joyeux AT m4x.org> in [ruby-core:10598].
+	* test/rexml/test_notationdecl_parsetest.rb: remove a needless shebang.
 
-Fri Mar 16 16:21:35 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 31 20:11:01 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/thread/thread.c (wait_condvar, lock_mutex): Fix a problem in
-	  ConditionVariable#wait that occurs when two threads that are
-	  trying to access the condition variable are also in concurrence
-	  for the given mutex; submitted by: Sylvain Joyeux
-	  <sylvain.joyeux AT m4x.org> and MenTaLguY <mental AT rydia.net>
-	  in [ruby-core:10598].
+	* string.c (rb_str_rindex): fix bug introduced in r42269.
+	  "".rindex("") should return 0.
+	  (str_rindex): ditto.
 
-Fri Mar 16 16:17:27 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 31 19:55:33 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/thread/test_thread.rb: Add a test script for the `thread'
-	  library.  This should result in failure as of now with
-	  ext/thread; submitted by: Sylvain Joyeux <sylvain.joyeux AT
-	  m4x.org> in [ruby-core:10598].
+	* bignum.c (MAX_BIG2STR_TABLE_ENTRIES): Use SIZEOF_SIZE_T.
+	  (power_cache_get_power0): Add rb_bug call for too bit i argument.
+	  (power_cache_get_power): Simplified.
 
-Wed Mar 14 12:30:00 2007  Shigeo Kobayashi  <shigeo@tinyforest.jp>
+Wed Jul 31 18:32:25 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/bigdecimal/bigdecimal.c: BigDecimal("-.31") is now
-	  treated as ("-0.31") not as ("0.31").
+	* lib/uri/common.rb (URI.decode_www_form_component): Use String#b.
 
-Tue Mar 13 09:25:10 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 31 18:24:02 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* common.mk (clear-installed-list): separated from install-prereq.
+	* eval.c (rb_mod_refine, mod_using, top_using): don't show
+	  warnings because Refinements are no longer experimental.
+	  [ruby-core:55993] [Feature #8632]
 
-Tue Mar 13 06:38:43 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* test/ruby/test_refinement.rb: related test.
 
-	* NEWS: Reword and improve entries.
+	* NEWS: fixes for the above change.
 
-Tue Mar 13 06:03:46 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 31 17:55:55 2013  Shota Fukumori  <her@sorah.jp>
 
-	* stable version 1.8.6 released from the ruby_1_8_6 branch.
+	* lib/uri/common.rb (URI.decode_www_form_component):
+	  Don't raise error when str includes multibyte characters.
 
-Tue Mar 13 03:24:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 31 17:45:39 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* runruby.rb: added --pure (turned on by default) and --debugger
-	  options.
+	* string.c (rb_str_rindex): performance improvement by using
+	  memrchr(3).
 
-Tue Mar 13 02:50:28 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 31 16:43:30 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph
-	  assumption any more; submitted by MIYASAKA Masaru <alkaid AT
-	  coral.ocn.ne.jp> in [ruby-dev:30537].
+	* string.c (rb_str_rindex): refactoring and avoid to call str_nth() if
+	  pos == 0.
 
-Mon Mar 12 11:07:44 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 31 14:41:36 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/openssl/ossl_asn1.c (Init_ossl_asn1): Let rdoc know about
-	  externally defined modules; submitted by Technorama
-	  Ltd. <oss-ruby AT technorama.net> in [ruby-bugs:PR#4704].
+	* lib/set.rb: [DOC] Add a couple of notes on Hash as storage.
+	  ref. [Feature #6589]
 
-	* ext/openssl/ossl_bn.c (Init_ossl_bn): Ditto.
+Wed Jul 31 14:38:52 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/openssl/ossl_cipher.c (Init_ossl_cipher): Ditto.
+	* lib/set.rb: [DOC] Fix example result.  Hash is now ordered.
 
-	* ext/openssl/ossl_digest.c (Init_ossl_digest): Ditto.
+Wed Jul 31 14:38:10 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/openssl/ossl_hmac.c (Init_ossl_hmac): Ditto.
+	* lib/set.rb: [DOC] Use the term "sorted" instead of "ordered"
+	  when mentioning SortSet.
 
-	* ext/openssl/ossl_pkey.c (Init_ossl_pkey): Ditto.
+Wed Jul 31 12:18:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_pkey_dh.c (Init_ossl_dh): Ditto.
+	* bignum.c (big2str_struct): New structure.
+	  (big2str_orig): Use big2str_struct.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str1): Ditto.
 
-	* ext/openssl/ossl_pkey_dsa.c (Init_ossl_dsa): Ditto.
+Wed Jul 31 12:02:16 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): Ditto.
+	* lib/rubygems.rb: [DOC] typo in url patch by @Red54 [Fixes #369]
+	  https://github.com/ruby/ruby/pull/369
 
-	* ext/openssl/ossl_rand.c (Init_ossl_rand): Ditto.
+Wed Jul 31 07:09:07 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/openssl/ossl_ssl.c (Init_ossl_ssl): Ditto.
+	* lib/rubygems:  Import RubyGems from master as of commit 523551c
+	* test/rubygems:  ditto.
 
-Mon Mar 12 01:05:17 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 30 22:21:54 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/dl/sym.c (rb_dlsym_inspect): Use "0x%x" rather for pointers.
-	  This might not be very right but it is commonly used in other
-	  parts of the code; submitted by sheepman <sheepman AT
-	  sheepman.sakura.ne.jp> in [ruby-dev:30532].
+	* test/ruby/test_hash.rb: add a test for enumeration order of Hash.
 
-	* ext/dl/ptr.c (rb_dlptr_inspect): Ditto.
+Tue Jul 30 18:52:27 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Mar 12 00:59:19 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* lib/set.rb (Set#intersect?, Set#disjoint?): Add new methods for
+	  testing if two sets have any element in common.
+	  [ruby-core:45641] [Feature #6588] Based on the code by marcandre.
 
-	* ext/dl/lib/dl/import.rb (DL::Importable::Internal::import,
-	  DL::Importable::Internal::callback): Avoid race condition for an
-	  instance variable; submitted by sheepman <sheepman AT
-	  sheepman.sakura.ne.jp> in [ruby-dev:30530].
+Tue Jul 30 17:16:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Mar 11 18:57:50 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* sprintf.c (ruby__sfvextra): add QUOTE flag to escape unprintable
+	  characters.
 
-	* misc/README: Add a note about ruby-electric.el.
+Tue Jul 30 11:00:52 2013  Zachary Scott  <e@zzak.io>
 
-	* misc/ruby-mode.el (ruby-non-block-do-re): Fix
-	  ruby-non-block-do-re. [ruby-core:03719]
+	* ext/curses/extconf.rb: [DOC] nodoc to reduce Object pollution
 
-	* misc/inf-ruby.el: Synchronize the comment section with trunk.
+Tue Jul 30 08:19:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* misc/README, misc/rdebug.el: Add rdebug.el, Emacs ruby-debug
-	  interface based on rubydb3x.el; submitted by Martin Nordholts
-	  <enselic AT gmail.com> in [ruby-bugs:PR#9023].
+	* sizes.c (Init_sizes): Define sizes only if the type actually exists.
 
-Sun Mar 11 17:45:51 2007  Akinori MUSHA  <knu@iDaemons.org>
+Mon Jul 29 22:55:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/mkcallback.rb (mkfunc): Make sure that a callback
-	  function is found in the function table before trying to call
-	  it; submitted by sheepman <sheepman AT sheepman.sakura.ne.jp>
-	  in [ruby-dev:30524].
+	* sizes.c (Init_sizes): define RbConfig::SIZEOF.  [Feature #8568]
 
-Sun Mar 11 12:09:37 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 29 22:25:20 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (error_handle): no message when exiting by signal.
+	* ext/curses/curses.c: [DOC] Update location of samples
+	* samples/curses/*: Move Curses samples and refactor from mixin
+	  The samples are included in rdoc for module and use of mixin is
+	  confusing
 
-	* eval.c (ruby_cleanup): re-send signal.  [ruby-dev:30516]
+Mon Jul 29 22:16:11 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_thread_interrupt): instantiate SignalException.
+	* bignum.c (LOG2_KARATSUBA_BIG2STR_DIGITS): Renamed from
+	  LOG2_KARATSUBA_DIGITS.
+	  (KARATSUBA_BIG2STR_DIGITS): Renamed from KARATSUBA_DIGITS.
 
-	* eval.c (rb_thread_signal_raise): now takes signal number instead
-	  of signal name.
+Mon Jul 29 22:04:45 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* intern.h (rb_thread_signal_raise, ruby_default_signal): prototypes.
+	* hash.c (rb_hash_compare_by_id): add function prototype.
 
-	* signal.c (esignal_init): takes a signal number and an optional
-	  signal name.
+Mon Jul 29 21:53:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* signal.c (interrupt_init): pass SIGINT always.
+	* hash.c (rb_hash_compare_by_id): don't call rb_hash_rehash()
+	  if self.compare_by_identity? == true.
 
-	* signal.c (ruby_default_signal): invoke system default signal
-	  handler.
+Mon Jul 29 21:29:48 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* signal.c (rb_signal_exec, trap): handle SIGTERM.  [ruby-dev:30505]
+	* hash.c (rb_hash_assoc): performance improvement by replacing
+	  compare function in RHASH(hash)->ntbl->type temporarily like r42224.
+	  it falls back to rb_hash_foreach() if st_lookup() doesn't find the key.
 
-Tue Mar  6 19:08:46 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* test/ruby/test_hash.rb: add a test for above.
 
-	* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Do not modify
-	  Digest::MD5.
+Mon Jul 29 21:15:30 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
+	* test/ruby/test_lazy_enumerator.rb
+	  (TestLazyEnumerator#test_initialize): Make sure
+	  Enumerator::Lazy#initialize raises error if the object is
+	  frozen.  The check was performed by rb_ivar_set() before
+	  rb_check_frozen() was added to enumerator_init().
 
-Tue Mar  6 18:58:37 2007  Keiju Ishitsuka  <keiju@ruby-lang.org>
+Mon Jul 29 21:06:42 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/shell/process-controller.rb: fix thread synchronization
-	  problem for [ruby-dev:30477].
+	* enumerator.c (enumerator_init): Add a frozenness check to
+	  prevent a frozen Enumerator object from being reinitialized with
+	  a different enumerable object.  This is the least we should do,
+	  and more fixes will follow. [Fixes GH-368] Patch by Kenichi
+	  Kamiya.
 
-Tue Mar  6 18:44:26 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* enumerator.c (generator_init): Ditto.
 
-	* ext/digest/lib/md5.rb (MD5::new, MD5::md5): Catch up with
-	  Digest's API changes; noted by: Kazuhiro Yoshida <moriq AT
-	  moriq.com> in [ruby-dev:30500].
+Mon Jul 29 20:14:24 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/digest/lib/sha1.rb (SHA1::new, SHA1::sha1): Ditto.
+	* hash.c (rb_hash_assoc): revert r42224. table->type->compare is
+	  called only if hashes are matched.
 
-Tue Mar  6 18:24:19 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* test/ruby/test_hash.rb: add a test to check using #== to compare.
 
-	* time.c (time_to_s): Back out the format changes; discussed
-	  in [ruby-dev:30495].
+Mon Jul 29 17:00:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Mar  6 11:53:25 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* parse.y (yycompile): store file name as String to keep the encoding.
 
-	* ext/tk/sample/irbtkw.rbw: fails to exit process.
+	* parse.y (rb_parser_compile_string_path, rb_parser_compile_file_path):
+	  new functions to pass file name as a String.
 
-Mon Mar  5 20:14:49 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* parse.y (gettable_gen): return a copy of the original file name, not
+	  a copy in filesystem encoding.
 
-	* time.c (time_to_s): Correct the wrong format which did not
-	  really conform to RFC 2822; pointed out by: OHARA Shigeki <os at
-	  iij.ad.jp> in [ruby-dev:30487].
+	* vm_eval.c (eval_string_with_cref): use Qundef instead of "(eval)".
 
-Sun Mar  4 23:38:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 29 16:53:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* file.c (rb_stat_s_utime): fixed a commit miss for the platforms
-	  where utimes() does not exist.
+	* hash.c (rb_hash_initialize_copy): copy st_table type even if empty.
+	  [ruby-core:56256] [Bug #8703]
 
-	* lib/fileutils.rb (touch): ditto.
+Mon Jul 29 16:34:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Mar  4 14:46:56 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* hash.c (rb_hash_initialize_copy): clear old table before copy new
+	  table.
 
-	* util.c (push_element): should return a int value.
+Mon Jul 29 16:34:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Mar  4 01:05:57 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* hash.c (rb_hash_assoc): aggregate object can be initialized only
+	  with link time constants.
 
-	* lib/set.rb (Set#^, Set#&): Correct documentation.  Those methods
-	  return sets, not arrays; noted by Oliver Frank Wittich <nietz AT
-	  mangabrain.de>.
+Mon Jul 29 14:54:44 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sat Mar  3 23:01:07 2007  Minero Aoki  <aamine@loveruby.net>
+	* hash.c (rb_hash_assoc): performance improvement by replacing
+	  compare function in RHASH(hash)->ntbl->type temporarily.
 
-	* lib/fileutils.rb (mv): could not move a directory between
-	  different filesystems. [ruby-dev:30411]
+Mon Jul 29 14:52:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Mar  3 22:57:11 2007  Minero Aoki  <aamine@loveruby.net>
+	* lib/mkmf.rb (xsystem): expand environment variable in all macros not
+	  expanded with RbConfig.  [Bug #8702]
 
-	* lib/fileutils.rb (touch): last commit causes error if :mtime
-	  option was not given.
+	* test/mkmf/test_framework.rb (create_framework): replace all $@ not
+	  only once.
 
-Sat Mar  3 22:37:02 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 29 06:54:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* file.c (rb_file_s_utime): allow nil to set the current time.
+	* win32/win32.c (rb_w32_pipe): use enum for compile time constants,
+	  instead of const int for debugging.
 
-	* lib/fileutils.rb (touch): ditto, and added :mtime and :nocreate
-	  options.  fixed: [ruby-talk:219037]
+Mon Jul 29 00:11:49 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Mar  3 21:17:35 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* bignum.c (bigdivrem): Specialized implementation added for
+	  nx == 2 && ny == 2
 
-	* eval.c (stack_check): Unset inline to fix build with GCC 3.4.6;
-	  submitted by: NISHIMATSU Takeshi <t_nissie AT yahoo.co.jp> in
-	  [ruby-list:43218].
-	  cf. http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24556
+Sun Jul 28 20:28:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sat Mar  3 19:05:31 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* io.c (io_getpartial): use rb_str_locktmp_ensure().
+	  [ruby-core:56121] [Bug #8669]
 
-	* ext/thread/thread.c (push_list): Use ALLOC().
+	* io.c (rb_io_sysread): ditto.
 
-	* ext/thread/thread.c (rb_mutex_alloc): Ditto.
+	* test/ruby/test_io.rb: add tests for above.
 
-	* ext/thread/thread.c (rb_condvar_alloc): Ditto.
+Sun Jul 28 20:10:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Mar  3 18:53:11 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/extmk.rb (extmake): should make static libraries for extensions
+	  to be statically linked.  [Bug #7948]
 
-	* NEWS: Add a note for String#intern.
+Sun Jul 28 17:38:32 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sat Mar  3 16:23:13 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* string.c: add internal API rb_str_locktmp_ensure().
 
-	* env.h (SCOPE_CLONE): Introduce a new scope flag to prevent a
-	  local_tbl region from getting freed many times; submitted by
-	  Chikanaga Tomoyuki <chikanag AT nippon-control-system.co.jp> in
-	  [ruby-dev:30460].
+	* io.c (io_fread): use rb_str_locktmp_ensure().
+	  [ruby-core:56121] [Bug #8669]
 
-	* eval.c (proc_invoke): Ditto.
+	* test/ruby/test_io.rb: add a test for above.
 
-	* gc.c (obj_free): Ditto.
+Sun Jul 28 13:04:39 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* parse.y (top_local_setup_gen): Ditto.
+	* io.c (interpret_seek_whence): support SEEK_DATA and SEEK_HOLE.
+	  These are whences for lseek(2) supported by Linux since version 3.1.
+	  [ruby-core:56123] [Feature #8671]
 
-Sat Mar  3 16:07:02 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* test/ruby/test_io.rb: Add tests for above.
 
-	* object.c (rb_obj_ivar_set): RDoc updated according to a
-	  suggestion from Brian Candler <B.Candler AT pobox.com>.
-	  [ruby-core:10469]
+Sun Jul 28 12:41:39 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Mar  1 21:38:07 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (absint_numwords_generic): The char_bit variable changed
+	  to static constant.
 
-	* parse.y (stmt, arg): should not omit lhs of OP_ASGN1 even if
-	  empty.  [ruby-dev:30455]
+Sun Jul 28 12:03:23 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Mar  1 08:55:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c: Constify bary_* functions.
 
-	* eval.c (rb_feature_p): check loading_tbl if the given ext is
-	  empty.  [ruby-dev:30452]
+Sun Jul 28 11:12:07 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_feature_p): fix possible buffer overrun.
+	* include/ruby/intern.h (rb_absint_size): Declaration moved from
+	  internal.h to calculate required buffer size to pack integers.
+	  (rb_absint_numwords): Ditto.
+	  (rb_absint_singlebit_p): Ditto.
+	  [ruby-core:42813] [Feature #6065]
 
-Thu Mar  1 03:30:21 2007  Akinori MUSHA  <knu@iDaemons.org>
+Sun Jul 28 10:54:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/digest/digest.c (get_digest_base_metadata): Allow inheriting
-	  Digest::Base subclasses, which was unintentionally made
-	  impossible while restructuring Digest classes.
+	* win32/win32.c (rb_w32_pipe): fix pipe name formatting.  as "%x" may
+	  not contain '0' at all, fill at fixed position instead.
 
-Thu Mar  1 02:05:17 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 28 00:35:14 2013  Tanaka Akira  <akr@fsij.org>
 
-	* mkconfig.rb (patchlevel): read from version.h.
+	* bignum.c (rb_big_size): Return the bignum "bytewise" size.
+	  [ruby-core:55578] [Feature #8553]
+	  This is accepted by matz on DevelopersMeeting20130727Japan.
 
-Thu Mar  1 00:09:39 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 28 00:07:48 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_provided): return true only for features loaded from
-	  .rb files, and not search actual library type.  [ruby-dev:30414]
+	* include/ruby/intern.h (rb_integer_pack): Declaration moved from
+	  internal.h.
+	  (rb_integer_unpack): Ditto.
+	  [ruby-core:42813] [Feature #6065]
 
-Wed Feb 28 21:15:00 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri Jul 26 23:18:13 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* configure.in (ac_cv_func_fcntl): fcntl support for MinGW.
+	* NEWS: Add a new feature that REXML::Parsers::StreamParser
+	  supports "entity" event.
 
-	* missing/flock.c: workaround for MinGW.
+Fri Jul 26 23:14:31 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Feb 28 20:51:32 2007  URABE Shyouhei  <shyouhei@ruby-lang.org>
+	* lib/rexml/parsers/streamparser.rb
+	  (REXML::Parsers::StreamParser#parse): Add "entity" event support to
+	  listener. [Bug #8689] [ruby-dev:47542]
+	  Reported by Ippei Obayashi.
+	* test/rexml/test_stream.rb (StreamTester#entity): Add a test for
+	  the above case.
 
-	* pack.c (pack_unpack): properly ignore non-base64 octets such as
-	  UTF-8 encoded BOMs; submitted by SOUMA Yutaka <holon@radastery.jp>
-	  to fix [ruby-core:10437]
+Fri Jul 26 23:05:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Feb 28 18:59:57 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* parse.y (parser_yylex): separate numeric literal from succeeding
+	  token, and treat 'e' as floating point number only if followed by
+	  exponent part.
 
-	* NEWS: Add NEWS, a document file to keep user visible feature
-	  changes between releases.
+Fri Jul 26 22:14:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Feb 28 18:35:50 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* vm_exec.h (CHECK_VM_STACK_OVERFLOW_FOR_INSN): surround with
+	  do/while (0), and remove unnecessary casts.
 
-	* ext/openssl/extconf.rb: no need to check unistd.h and sys/time.h.
-	  they are already checked at configure.
-	  reported by KOBAYASHI Yasuhiro [ruby-list:43225]
+Fri Jul 26 20:12:07 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Feb 28 18:34:48 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/syslog/lib/syslog/logger.rb (Syslog::Logger): Add facility
+	  to Syslog::Logger. [Fixes GH-305] patch by Max Shytikov
+	  https://github.com/ruby/ruby/pull/305
 
-	* lib/mkmf.rb ($DEFLIBPATH): default library paths ($(topdir), etc)
-	  should be the first elements of library paths list.
-	  reported by KOBAYASHI Yasuhiro [ruby-list:43225]
+Fri Jul 26 19:25:17 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Feb 28 18:31:32 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* vm_exec.h, tool/instruction.rb: not an error, but a BUG if stack
+	  overflow checking failed just before/after the beginning of an
+	  instruction. It should be treated as a BUG.
+	  Please tell us if your code cause BUG with this problem.
+	  This check will removed soon (for performance).
 
-	* doc/NEWS-1.8.0: Rename NEWS to NEWS-1.8.0.  This is way too old
-	  NEWS.
+Fri Jul 26 18:30:14 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Feb 28 01:22:58 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* array.c (ary_memcpy): cast to int to suppress a warning.
 
-	* test/{dbm,gdbm}/test_{dbm,gdbm}.rb: shouldn't use host_os. use
-	  target_os instead. reported by KOBAYASHI Yasuhiro [ruby-list:43225]
+Fri Jul 26 18:21:58 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Feb 28 00:08:11 2007  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+	* array.c (ary_memcpy): try to enable optimization.
+	  At least on my environments, I don't see any errors
+	  with many trials. Please tell us if you find any GC bugs.
 
-	* mkconfig.rb (RbConfig): add CONFIG['PATCHLEVEL']
+Fri Jul 26 17:49:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* common.mk: new target dist
+	* win32/file.c (fix_string_encoding): fix target encoding.  the
+	  parameter `encoding' is not the target encoding but the original
+	  encoding.
 
-	* distruby.rb: new file
+Fri Jul 26 14:05:19 2013  Zachary Scott  <e@zzak.io>
 
-Tue Feb 27 22:18:45 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/fiddle/*: [DOC] More doc on dlopen and RTLD_DEFAULT from r42184
 
-	* configure.in (--enable-auto-image-base): avoid the neccessity to
-	  rebase the shared libs as much as possible;
-	  submitted by Corinna Vinschen <spam at vinschen.de> in
-	  [ruby-talk:240964].
+Fri Jul 26 13:08:53 2013  Zachary Scott  <e@zzak.io>
 
-Tue Feb 27 21:36:47 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/fiddle/lib/fiddle.rb: [DOC] Document Fiddle.dlopen(nil)
+	* ext/fiddle/handle.c: [DOC] Document Fiddle::Handle.new(nil)
 
-	* util.c (__crt0_glob_function): use ruby_glob() instead of rb_globi().
+Fri Jul 26 13:04:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Feb 27 21:33:04 2007  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* load.c (rb_load_internal): use rb_load_file_str() to keep path
+	  encoding.
 
-	* configure.in (ac_cv_func_setrlimit): workaround for djgpp.
+	* load.c (rb_require_safe): search in OS path encoding for Windows.
 
-Tue Feb 27 19:38:52 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* ruby.c (rb_load_file_str): load file with keeping path encoding.
 
-	* lib/base64.rb (Base64::b64encode): Fix documentation; submitted
-	  by David Symonds <dsymonds@gmail.com> in [ruby-core:10432].
+	* win32/file.c (rb_file_load_ok): use WCHAR type API assuming incoming
+	  path is encoded in UTF-8.  [ruby-core:56136] [Bug #8676]
 
-Tue Feb 27 19:36:57 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* file.c (rb_str_encode_ospath): simplify using rb_str_conv_enc().
 
-	* regex.c (calculate_must_string, slow_search, re_search): Silence
-	  warnings regarding char * vs. unsigned char * mismatch;
-	  submitted by Lyle Johnson <lyle.johnson@gmail.com>
-	  in [ruby-core:10416].
+	* win32/file.c (fix_string_encoding): simplify with rb_str_conv_enc().
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_load): Ditto.
+	* win32/file.c (convert_mb_to_wchar): use bare pointer instead of
+	  VALUE, and remove useless argument.
 
-	* ext/digest/sha1/sha1ossl.c (SHA1_Finish): Ditto.
+Fri Jul 26 11:42:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/digest/rmd160/rmd160ossl.c (RMD160_Finish): Ditto.
+	* rational.c (f_round_common): Rational is expected to be returned by
+	  Rational#*, but mathn.rb breaks that assumption.  [ruby-core:56177]
+	  [Bug #8687]
 
-	* ext/digest/digest.c (rb_digest_base_finish,
-	  rb_digest_base_update): Ditto.
+Fri Jul 26 01:37:45 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/nkf/nkf.c (rb_str_resize, rb_nkf_kconv, rb_nkf_guess1,
-	  rb_nkf_guess2): Ditto.
+	* include/ruby/ruby.h: check defined(USE_RGENGC_LOGGING_WB_UNPROTECT)
 
-Tue Feb 27 03:40:09 2007  Akinori MUSHA  <knu@iDaemons.org>
+Fri Jul 26 01:21:41 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/thread/thread.c (wait_list_cleanup, rb_mutex_try_lock):
-	  Eliminate rb_thread_critical switching where unnecessary;
-	  implied by shugo in [ruby-dev:30412].
+	* file.c (rb_file_expand_path_internal): fix r42160; skip '~'.
 
-	* ext/thread/thread.c (set_critical): Merge in
-	  thread_exclusive_ensure().
+Thu Jul 25 17:53:18 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/thread/thread.c: Consistently use 0 and 1 for
-	  rb_thread_critical values.
+	* lib/net/http.rb (Net::HTTP#connect): disable Nagle's algorithm on
+	  HTTP connection. [ruby-core:56158] [Feature #8681]
 
-Mon Feb 26 15:18:23 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Jul 25 17:49:42 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/thread/thread.c: Use xmalloc()/xfree() instead of
-	  malloc()/free(); pointed out by shugo in [ruby-dev:30412].
+	* re.c (rb_reg_to_s): convert closing parenthesis to the target encoding
+	  if it is ASCII incompatible encoding. [ruby-core:56063] [Bug #8650]
 
-Sun Feb 25 23:02:55 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Jul 25 17:21:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::initialize):
-	  Initialize @workdir properly to silence a warning under -w.
-	  Submitted by <tommy at tmtm.org> in [ruby-dev:30400].
+	* encoding.c (is_obj_encoding): new macro to check if obj is an
+	  Encoding.  obj can be any type while is_data_encoding expects T_DATA
+	  only.
 
-Sun Feb 25 02:47:43 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Jul 25 17:17:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* defines.h: Pull the RUBY_MBCHAR_MAXSIZE definition from trunk,
-	  which is necessary for dir.c to compile on djgpp and emx.
+	* file.c (rb_file_expand_path_internal): should clear coderange after
+	  copying user name as binary data.
 
-Sat Feb 24 10:42:01 2007  Minero Aoki  <aamine@loveruby.net>
+Thu Jul 25 16:17:55 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/racc/cparse/cparse.c (cparse_params_mark): remove useless
-	  rb_gc_mark.  Thanks Tomoyuki Chikanaga. [ruby-dev:30405]
+	* encoding.c (check_encoding): Check T_DATA or not.
+	  is_data_encoding(obj) assumes that `obj' is T_DATA.
 
-Fri Feb 23 15:10:46 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jul 25 13:06:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (set_pioinfo_extra): new function for VC++8 SP1
-	  workaround. [ruby-core:10259]
+	* dir.c (dir_s_home): use rb_home_dir_of and rb_default_home_dir.
 
-	* win32/win32.c (NtInitialize): call above function.
+	* file.c (rb_home_dir_of): split from rb_home_dir() for the home
+	  directry of the given user, and the user name is a VALUE, not a bare
+	  pointer.  should raise if the user does not exist.
 
-Fri Feb 23 14:19:40 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* file.c (rb_default_home_dir): split from rb_home_dir() for the home
+	  directry of the current user.
 
-	* signal.c (sighandler): need to tell to be interrupted to main
-	  context when handler is installed.
+Thu Jul 25 12:32:11 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/win32.[ch] (rb_win32_interrupted): new function to listen
-	  interrupt.
+	* ext/openssl/ossl.c: support additional three thread synchronization
+	  functions. [ruby-trunk - Bug #8386]
 
-Fri Feb 23 13:02:17 2007  Akinori MUSHA  <knu@iDaemons.org>
+Thu Jul 25 07:15:58 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* numeric.c (fix_cmp, fix_equal): Remove FIX2LONG() to optimize.
-	  suggested in
-	  http://t-a-w.blogspot.com/2007/02/making-ruby-faster.html.
-	  [ruby-talk:240223]
+	* lib/rubygems:  Import RubyGems from master as of commit 4ff70cc
+	* test/rubygems:  ditto.
 
-Fri Feb 23 12:43:17 2007  James Edward Gray II  <james@grayproductions.net>
+Wed Jul 24 20:57:44 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): Make the
-	  Content-Length parameter optional for responses in
-	  xmlrpc/client.rb; suggested by Daniel Berger
-	  <Daniel.Berger@qwest.com> and approved by the maintainer.
+	* compile.c (iseq_set_arguments): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
 
-	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): Add DateTime
-	  support to xmlrpc; approved by the maintainer.
+	* compile.c (iseq_set_exception_table): ditto.
 
-Mon Feb 19 18:22:52 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 24 19:49:54 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* configure.in, defines.h, eval.c (rb_feature_p, rb_provided,
-	  load_wait, search_required, rb_require_safe), ext/extmk.rb: Fix
-	  a bug where a statically linked extension cannot be autoloaded.
-	  [ruby-dev:30023] / [ruby-dev:30239]
+	* lib/uri/generic.rb (find_proxy): raise BadURIError if the URI is
+	  a relative URI. [Bug #8645]
 
-Mon Feb 19 17:14:28 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jul 24 18:56:06 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/socket/socket.c (unix_peeraddr): wrong syscall name in error
-	  message for #peeraddr. a patch from Sam Roberts
-	  <sroberts at uniserve.com>.  [ruby-core:10366]
+	* vm_insnhelper.c (vm_expandarray): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR() because there is no new reference.
 
-Sun Feb 18 19:35:21 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+	* vm_insnhelper.c (vm_caller_setup_args): ditto.
 
-	* lib/date/format.rb: updated based on date2 4.0.3.
+	* vm_insnhelper.c (vm_yield_setup_block_args): ditto.
 
-Fri Feb 16 11:18:21 2007  Eric Hodel  <drbrain@segment7.net>
+Wed Jul 24 18:40:11 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/.document: Apply patch for irb, e2mmap and README by Hugh Sasse
-	  <hgs at dmu.ac.uk> from [ruby-core:10135]
+	* array.c, gc.c: move ary_unprotect_logging() into
+	  rb_gc_unprotect_logging() which is general version
 
-	* lib/prettyprint.rb: Suppress RDoc for PrettyPrint test suite.
+	* include/ruby/ruby.h: add USE_RGENGC_LOGGING_WB_UNPROTECT
+	  to enable.
 
-Thu Feb 15 20:26:30 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 24 17:37:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/uri/ftp.rb: Revert the previous change pending discussion.
+	* file.c (rb_file_expand_path_internal): preserve the file name
+	  encoding in an exception message.
 
-Thu Feb 15 18:08:17 2007  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 24 08:04:49 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* dir.c (glob_helper): Fix the function declaration.
+	* test/-ext-/tracepoint/test_tracepoint.rb: add GC on/off to count
+	  GC events strictly.
 
-Thu Feb 15 17:13:32 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 23 23:19:24 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* version.h: Welcome to the post-1.8.6 world.  Radical changes are
-	  inhibited in the ruby_1_8 branch until the 1.8.6 final release
-	  goes out of the door.
+	* ext/openssl/extconf.rb (CRYPTO_THREADID): check exist or not.
 
-Thu Feb 15 16:44:14 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/openssl/ossl.c (ossl_thread_id): use rb_nativethread_self()
+	  implemented at r42137 to allow threads which doesn't associated with
+	  Ruby thread to use openssl functions.
 
-	* lib/uri/generic.rb (URI::Generic::userinfo): Considering how
-	  `scheme://user:@...', `scheme://:password@...' and
-	  `scheme://:@...' are parsed, an empty user name or password
-	  should be allowed and represented as it is.
+	* ext/openssl/ossl.c (Init_ossl_locks): If CRYPTO_THREADID is defined
+	  (OpenSSL 1.0.0 or later has it) use CRYPTO_THREADID_set_callback()
+	  instead of CRYPTO_set_id_callback() because its argument is
+	  unsigned long; it may cause id collision on mswin64
+	  whose sizeof(unsigned long) < sizeof(void*).
+	  http://www.openssl.org/docs/crypto/threads.html
 
-Thu Feb 15 11:46:05 2007  KIMURA Koichi  <hogemuta@gmail.com>
+	* ext/openssl/ossl.c (ossl_threadid_func): defined for above.
 
-	* dir.c, win32/win32.c, win32/dir.h, ruby.h, intern.h: Bring
-	  encoding aware globbing support in from trunk.  Dir.[] and
-	  Dir.glob() can now take many patterns in an array.  Minor fixes
-	  will follow.
+Tue Jul 23 20:47:36 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Feb 15 11:00:26 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* bignum.c: Move functions.
 
-	* lib/uri/generic.rb (URI::Generic::userinfo): should support
-	  empty password.  [ruby-core:10290]
+Tue Jul 23 20:14:55 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/uri/generic.rb (URI::Generic::set_password): password can be
-	  cleared by nil.  [ruby-core:10290]
+	* bignum.c (bary_divmod): Add special cases for x < y easily detected
+	  and nx == 2 && ny == 2.
 
-	* lib/uri/common.rb (escape): regard second string argument as a
-	  character set properly. [ruby-dev:27692]
+Tue Jul 23 19:48:38 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/uri/ftp.rb: Attempt to conform to RFC 1738 with regard to
-	  relative/absolute paths.
+	* thread_(pthread|win32).h: rename rb_thread_cond_t to
+	  rb_nativethread_cond_t.
 
-	* lib/uri: Lovely RDOC patches from mathew (metaATpoboxDOTcom).
+	* thread.c, thread_pthread.c, thread_win32.c, vm_core.h: catch up
+	  renaming.
 
-Thu Feb 15 10:57:38 2007  Tietew  <tietew@tietew.net>>
+Tue Jul 23 19:44:32 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/cgi.rb (CGI::unescapeHTML): invalid decoding for single
-	  unescaped ampersand.  a patch from Tietew
-	  <tietew+ruby-dev at tietew.net> in [ruby-dev:30292].
-	  fixed: [ruby-dev:30289]
+	* thread_native.h: add rb_nativethread_self() which returns
+	  current running native thread identifier.
 
-Thu Feb 15 10:48:40 2007  MenTaLguY  <mental@rydia.net>
+	* thread_[pthread|win32].c: implement rb_nativethread_self().
 
-	* ext/thread/thread.c: Handle interrupted waits correctly.
-	  [ruby-bugs:PR#8663]
+Tue Jul 23 19:34:11 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Feb 14 19:22:15 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* thread_pthread.h, thread_win32.h: rename rb_thread_id_t to
+	  rb_nativethread_id_t.
 
-	* ext/digest/lib/digest.rb (Digest::self.const_missing): Drop
-	  autoloads for sha2 classes in favor of handling in
-	  const_missing(), to work around a problem exposed on OS X.
+	* thread_pthread.c, vm_core.h: use rb_nativethread_id_t.
 
-Tue Feb 13 02:21:12 2007  Sam Roberts  <sroberts@uniserve.com>
+Tue Jul 23 18:56:11 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* io.c (rb_f_syscall): Fix buffer overflow with syscall
-	  arguments.  [ruby-bugs:PR#8541]
+	* ext/openssl/ossl.c: use system native (system provided)
+	  thread locking APIs added by last commit.
+	  This patch fixes [Bug #8386].
+	  "rb_mutex_*" APIs control only "Ruby" threads.
+	  Not for native threads.
 
-Sun Feb 11 07:46:45 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 23 18:44:15 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): Properly parse
-	  a quoted-string in a Content-Disposition value.
+	* thread_native.h: added.
+	  Move native thread related lines from vm_core.h.
+	  And declare several functions "rb_nativethread_lock_*",
+	  manipulate locking.
 
-Sun Feb 11 06:27:54 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* common.mk: add thread_native.h.
 
-	* configure.in, ext/thread/extconf.rb, lib/thread.rb: Add a
-	  configure option `--disable-fastthread', to choose the original,
-	  pure ruby version of the "thread" library instead of the new,
-	  much faster implementation in ext/thread.
+	* thread.c: add functions "rb_nativethread_lock_*".
 
-Sun Feb 11 06:22:20 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* thread.c, thread_[pthread,win32].[ch]: rename rb_thread_lock_t
+	  to rb_nativethread_lock_t to make it clear that this lock is for
+	  native threads, not for ruby threads.
 
-	* ext/Setup: Add thread except for platforms without threads
-	  support.
+Tue Jul 23 16:14:57 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Feb 11 06:15:16 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* gc.c (gc_before_sweep): fix spacing.
 
-	* ext/thread/lib/thread.rb: Add a replacement of thread.rb that
-	  loads this extension.
+Tue Jul 23 15:57:11 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Feb 11 05:39:47 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* gc.c (heap_get_freeobj): clear slot->freelist here.
+	  This means that this slot doesn't have any free objects.
+	  And store this slot with objspace->heap.using_slot.
 
-	* lib/thread.rb: Remove an ineffective part of the code.
+	* gc.c (gc_before_sweep): restore objspace->freelist
+	  into objspace->heap.using_slot->freelist.
+	  This means that using_slot has free objects which are
+	  pointed from objspace->freelist.
 
-Sun Feb 11 05:32:54 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* gc.c (gc_slot_sweep): do not need to clear slot->freelist.
 
-	* ext/thread/thread.c (rb_thread_exclusive): Implement
-	  Thread.exclusive.
+Tue Jul 23 09:34:49 2013  Zachary Scott  <e@zzak.io>
 
-Sun Feb 11 05:26:51 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* sample/drb/README*.rdoc: [DOC] migrate DRb sample READMEs to rdoc
 
-	* ext/thread/thread.c: Get rid of use of a dummy function.
+Tue Jul 23 09:28:05 2013  Zachary Scott  <e@zzak.io>
 
-Sun Feb 11 01:45:31 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/drb/invokemethod.rb: [DOC] nodoc InvokeMethod18Mixin
 
-	* ext/thread/thread.c (Init_thread): Define missing aliases:
-	  Queue#enq and SizedQueue#enq.
+Tue Jul 23 08:44:37 2013  Eric Hodel  <drbrain@segment7.net>
 
-Sat Feb 10 09:27:35 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* ext/openssl/ossl_asn1.c (asn1time_to_time):  Implement YYMMDDhhmmZ
+	  format for ASN.1 UTCTime.  [ruby-trunk - Bug #8664]
+	* test/openssl/test_asn1.rb:  Test for the above.
 
-	* ext/win32ole/win32ole.c (ole_variant2val): fix compile error
-	  on VC++.
+Tue Jul 23 08:11:32 2013  Zachary Scott  <e@zzak.io>
 
-Sat Feb 10 07:41:52 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* lib/rexml/streamlistener.rb: [DOC] Fix examples in
+	  REXML::StreamListener#entitydecl patch by Ippei Obayashi [Bug #8665]
 
-	* ext/win32ole/win32ole.c (ole_variant2val): fix the bug when
-	  SAFEARRAY pointer is NULL.
+Tue Jul 23 07:44:59 2013  Eric Hodel  <drbrain@segment7.net>
 
-Sat Feb 10 00:13:11 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/rubygems:  Import RubyGems from master as of commit b165260
+	* test/rubygems:  ditto.
 
-	* ext/tk/lib/tk.rb: fix typo (TkConfigMethod::__confinfo_cmd,
-	  __conv_keyonly_opts).
+Tue Jul 23 07:14:31 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Feb  9 20:44:53 2007  Akinori MUSHA  <knu@iDaemons.org>
+	* bignum.c (bary_mulsub_1xN): New function.
+	  (bary_mul_toom3): Use bary_mulsub_1xN.
 
-	* ext/thread: Make style fixes (mostly de-K&R'ism) to match the
-	  rest of the source code.
+Tue Jul 23 03:32:23 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/thread: Make USE_MEM_POOLS an extconf option.
+	* bignum.c (KARATSUBA_BALANCED): New macro.
+	  (TOOM3_BALANCED): Ditto.
+	  (bary_mul_balance_with_mulfunc): Use KARATSUBA_BALANCED and
+	  TOOM3_BALANCED.
+	  (rb_big_mul_balance): Relax a condition.
+	  (rb_big_mul_karatsuba): Use KARATSUBA_BALANCED.
+	  (rb_big_mul_toom3): Use TOOM3_BALANCED.
+	  (bary_mul_karatsuba_branch): Use KARATSUBA_BALANCED.
+	  (bary_mul_toom3_branch): Use TOOM3_BALANCED.
 
-Fri Feb  9 20:43:01 2007  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 23 01:34:45 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/thread: Import the "fastthread" implementation by MenTaLguY
-	  in the original form.  This module is not hooked into the build
-	  yet since it needs some style fixes and adjustments.
+	* bignum.c (bigdivrem_mulsub): Extracted from bigdivrem1.
+	  (bigdivrem1): Use bary_add.
 
-Fri Feb  9 15:46:09 2007  Akinori MUSHA  <knu@iDaemons.org>
+Mon Jul 22 18:39:52 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/bigdecimal: Synchronize with trunk.  Better function
-	  prototypes, removal of a useless method `!=', and document
-	  updates.
+	* string.c (rb_str_enumerate_chars): specify array capa
+	  with str_strlen().
 
-Tue Feb 06 22:06:45 2007  NARUSE, Yui  <naruse@ruby-lang.org>
+	* string.c (rb_str_enumerate_codepoints): ditto.
 
-	* ext/nkf/nkf-utf8/{nkf.c,utf8tbl.c}:
-	  imported nkf 2007-01-28.
-	  * Fixed: can't decode MIME encode JIS string.
-	  * Fixed: Fullwitdh-halfwidth conversion.
-	  * Support DoCoMo's and Softbank's EMOJI
-	  * Support CP932, CP5022x, eucJP-ms UDC
-	  * Support UTF-32 encoding
-	  * Support beyond BMP
-	  [ruby-dev:29700] [ruby-dev:29922] [ruby-dev:30144]
+Mon Jul 22 18:01:33 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Wed Jan 31 14:52:09 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_enumerate_chars): specify array capa.
 
-	* eval.c (rb_iterate): need to PUSH_ITER in proper order.
-	  [ruby-core:10125]
+Mon Jul 22 17:24:14 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
-	  add new test.  [ruby-core:10125]
+	* string.c (rb_str_each_char_size): performance improvement by
+	  using rb_str_length().
 
-Tue Jan 30 14:58:51 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jul 22 16:32:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c (rb_str_sub_bang): calling rb_str_modify() should be just
-	  before actually modifying the string.
-	  fixed: [ruby-dev:30211] (originally reported by zunda)
+	* vm_eval.c (eval_string_with_cref): check by Check_TypedStruct
+	  instead of rb_obj_is_kind_of.
 
-Tue Jan 30 12:05:35 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 22 13:19:22 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* mkconfig.rb: autoconf 2.61 support.  [ruby-core:10016]
+	* array.c (ary_resize_capa): use RARRAY_RAWPTR() because
+	  this code creates no new references.
 
-Sat Jan 27 15:20:11 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul 22 12:58:18 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* parse.y (dyna_var_lookup): should not alter dvar->val not to
-	  destroy living value.  [ruby-core:10076]
+	* array.c (ary_memfill): added.
 
-	* parse.y (dyna_init): ditto.
+	* array.c (rb_ary_initialize): use ary_memfill().
 
-Fri Jan 26 12:03:39 2007  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* array.c (rb_ary_fill): ditto.
 
-	* ext/tk/lib/tk.rb (TkConfigMethod#__confinfo_cmd,
-	  __conv_keyonly_optkeys): make them private [ruby-dev:30074].
+	* array.c (rb_ary_slice_bang): use RARRAY_RAWPTR() because
+	  this code creates no new references.
 
-	* ext/tk/lib/tk/txtwin_abst.rb: fix typo [ruby-dev:30073].
+Mon Jul 22 10:09:46 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/canvas.rb (TkCanvas#scan_dragto): lack of an argument.
+	* gc.c (gc_slot_sweep): need to add empty RVALUE as freeobj.
 
-	* ext/tk/lib/tk/canvas.rb: clarify the including module name
-	  [ruby-dev:30080].
+Mon Jul 22 09:48:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk/scrollable.rb: change primary name of modules
-	  [ruby-dev:30080].
+	* vm_eval.c (eval_string_with_cref): use the given file name unless
+	  eval even if scope is given.  additional fix for [Bug #8436].
+	  based on the patch by srawlins at [ruby-core:56099] [Bug #8662].
 
-Wed Jan 24 18:05:39 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul 22 09:24:19 2013  Kouji Takao  <kouji@takao7.net>
 
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): fix
-	  regexp font-lock bug.  [ruby-talk:235758]
+	* ext/readline/readline.c (Init_readline): added
+	  Readline.delete_text. [ruby-dev:45789] [Feature #6626]
+	* ext/readline/extconf.rb: check for rl_delete_text() in Readline library.
 
-Tue Jan 23 11:02:33 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  Thanks, Nobuyoshi Nakada, for the patch.
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest::read_line):
+Mon Jul 22 03:15:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jan 23 18:26:12 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/date/date_parse.c (rfc2822_cb): check if wday is given, since it
+	  can be omitted.
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): use == instead
-	  of ===.  [ruby-dev:30176]
+Mon Jul 22 00:15:20 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Jan 23 10:48:17 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (bary_sq_fast): Refine expressions.
 
-	* hash.c: added documentation for Hash about how it uses eql? and
-	  hash methods for the keys.  [ruby-core:09995]
+Sun Jul 21 21:08:59 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Jan 22 14:57:25 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (bary_mul): Use simple multiplication if yl is small.
+	  (rb_cstr_to_inum): Invoke bigsq instead of bigmul0.
+	  (bigsq): Re-implemented.
+	  (bigmul0): Invoke bigsq if two arguments are identical.
 
-	* ext/socket/socket.c: fix errors in socket sample code.
-	  [ruby-core:09992]
+Sun Jul 21 09:58:19 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Jan 13 23:54:48 2007  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* bignum.c (bary_mul_toom3): New function based on bigmul1_toom3.
+	  (bary_mul_toom3_branch): Call bary_mul_toom3.
+	  (rb_big_mul_toom3): Ditto.
+	  (bigmul1_toom3): Removed.
+	  (big_real_len): Ditto.
+	  (big_split): Ditto.
+	  (big_split3): Ditto.
 
-	* ext/win32ole/win32ole.c (ole_free, ole_type_free,
-	  olemethod_free, olevariable_free, oleparam_free,
-	  ole_event_free): fix memory leak.  [ruby-core:09846]
+Sun Jul 21 08:12:16 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-Fri Jan 12 11:13:55 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* proc.c (proc_to_s): use PRIsVALUE to preserve the result encoding.
 
-	* ext/etc/etc.c (etc_getpwuid, etc_getgrgid): fix to correctly
-	  convert uid/gid from VALUE. (backport of r11521)
+Sun Jul 21 03:36:18 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Jan 10 18:57:57 2007  Minero Aoki  <aamine@loveruby.net>
+	* hash.c (rb_hash_flatten): use NUM2INT to raise TypeError on 32bit
+	  platform. it's introduced by r42039
 
-	* ext/strscan/strscan.c (strscan_do_scan): should set kcode option
-	  before match. [ruby-dev:29914]
+Sun Jul 21 01:07:45 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* test/strscan/test_stringscanner.rb: test it.
+	* common.mk (help): Fix environment variable name and argument.
+	  Actually it can also be a directory or any argument for
+	  test/unit runner. [Fixes GH-363]
 
-	* re.c: export kcode_set_option and kcode_reset_option (with "rb_"
-	  prefix).
+Sat Jul 20 22:44:50 2013  Zachary Scott  <e@zzak.io>
 
-	* intern.h: ditto.
+	* common.mk: Document running a single test [Fixes GH-363]
+	  Patch by Avdi Grimm https://github.com/ruby/ruby/pull/363
 
-Tue Jan  9 17:45:17 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Jul 20 22:39:56 2013  Zachary Scott  <e@zzak.io>
 
-	* file.c (rb_find_file): should not call fpath_check() with NULL.
-	  fixed: [ruby-core:09867]
+	* sample/*: whitespace patch by Sergio Campama [Fixes GH-364]
+	  https://github.com/ruby/ruby/pull/364
 
-Tue Jan  9 03:54:38 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jul 20 22:33:13 2013  Zachary Scott  <e@zzak.io>
 
-	* string.c (rb_str_upto): String#upto from empty string makes
-	  inifinite loop.  [ruby-core:09864]
+	* doc/regexp.rdoc: [DOC] Fix typo in example [Fixes GH-365]
+	  Patch by Juanito Fatas https://github.com/ruby/ruby/pull/365
 
-Sun Jan  7 12:13:26 2007  Eric Hodel  <drbrain@segment7.net>
+Sat Jul 20 17:46:03 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment):
-	  Look for class and module comments above rb_define_class and
-	  rb_define_module.  Patch by Daniel Berger <djberg96 at gmail.com>
+	* string.c (rb_str_succ): add missing case NEIGHBOR_WRAPPED.
+	  r42078 caused buggy behavior like "\xFF".b -> "\x01\xFF".b
 
-Sun Jan  7 10:32:12 2007  Eric Hodel  <drbrain@segment7.net>
+Sat Jul 20 15:22:38 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constants):
-	  Properly handle escaping of : in comments.
-	* test/rdoc/parsers/test_parse_c.rb:
-	  Test RDoc::C_Parser#do_classes and Rdoc::C_Parser#find_class_comment.
+	* array.c (rb_ary_resize): use simple memcpy because there are no new
+	  references.
 
-Sun Jan  7 09:33:02 2007  Tadayoshi Funaba  <tadf@dotrb.org>
+Sat Jul 20 15:02:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/date/format.rb: updated based on date2 4.0.1.
+	* safe.c (ruby_safe_level_4_warning): define for old extension
+	  libraries.  [Bug #8652]
 
-Wed Jan  3 11:36:51 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jul 20 14:38:00 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* io.c (ruby_dup): start GC on ENOMEM as well.
+	* array.c (ary_make_shared): make shared array shady.
+	  Making non-shady shared array causes SEGV (see rubyci).
+	  It seems a bug around shared array.
 
-Mon Jan  1 06:13:11 2007  Eric Hodel  <drbrain@segment7.net>
+Sat Jul 20 12:14:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc/parsers/c_parser.rb: Make Rdoc accessible.  Update constant
-	  value information.
+	* string.c (enc_succ_char, enc_pred_char): consider wchar case.
+	  [ruby-core:56071] [Bug #8653]
 
-Mon Jan  1 06:13:11 2007  Eric Hodel  <drbrain@segment7.net>
+	* string.c (rb_str_succ): do not replace with invalid char.
 
-	* ext/bigdecimal/bigdecimal.c: Update constant comments to provide
-	  values for RDoc.
+	* encoding.c (rb_enc_code_to_mbclen): add new function which returns
+	  mbclen from codepoint like as rb_enc_codelen() but 0 for invalid
+	  char.
 
-Mon Jan  1 06:05:55 2007  Eric Hodel  <drbrain@segment7.net>
+	* include/ruby/encoding.h (rb_enc_code_to_mbclen): declaration and
+	  shortcut macro.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts):
-	  Allow RDoc comment to give friendly value for rb_define_const.  Patch
-	  by Daniel Berger <djberg96 at gmail.com>, [ruby-patches-7499].
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#handle_constansts): Fix
-	  whitespace handling in constant comments.
+Fri Jul 19 21:59:12 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Dec 31 00:31:16 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+	* gc.c: declare type_name() at the beginning of file.
 
-	* lib/date.rb, lib/date/format.rb: updated based on date2 4.0.
+Fri Jul 19 21:35:09 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Dec 14 18:29:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c: reduce shady operations.
 
-	* ext/readline/readline.c: NetBSD editline does not have
-	  rl_username_completion_function() and rl_completion_matches().
-	  a patch from Takahiro Kambe <taca at back-street.net>.
-	  [ruby-dev:30008]
+	* array.c (rb_ary_modify, ary_make_partial, rb_ary_splice,
+	  rb_ary_replace, rb_ary_eql, rb_ary_compact_bang):
+	  use RARRAY_RAWPTR() instead of RARRAY_PTR().
 
-Thu Dec 14 18:20:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_shift): use RARRAY_PTR_USE() without WB because
+	  there are not new relations.
 
-	* lib/irb/locale.rb (IRB::Locale::puts): typo fixed.  a patch from
-	  NAKAMURA Usaku <usa@ruby-lang.org>.  [ruby-dev:30012]
+	* array.c (ary_ensure_room_for_unshift): ditto.
 
-Mon Dec 11 11:58:36 2006  Akinori MUSHA  <knu@iDaemons.org>
+	* array.c (rb_ary_sort_bang): ditto.
 
-	* ext/digest/sha2/lib/sha2.rb: Moved one level up from under
-	  the superfluous subdirectory digest/.
+	* array.c (rb_ary_delete_at): ditto.
 
-Mon Dec 11 11:46:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_reverse_m): use RARRAY_RAWPTR() because
+	  there are not new relations.
 
-	* variable.c (rb_define_const): typo fixed.
+Fri Jul 19 20:58:20 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Dec 11 09:36:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c: reduce shade operations.
 
-	* string.c (rb_str_aset): index double decode problem.
-	  [ruby-core:09695]
+	* array.c (rb_ary_modify): use RARRAY_RAWPTR().
 
-Sat Dec  9 21:39:24 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c (ary_make_substitution, rb_ary_s_create, ary_make_partial,
+	  rb_ary_splice, rb_ary_resize, rb_ary_rotate_m, rb_ary_times):
+	  use ary_memcpy().
 
-	* eval.c (ruby_cleanup): keep the exception till after END blocks.
-	  [ruby-core:09675]
+Fri Jul 19 19:55:28 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sat Dec  9 11:22:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (ary_mem_clear): added. This operation doesn't need WB
+	  because this operation creates a reference to Qnil.
 
-	* lib/irb/locale.rb (IRB::Locale::search_file): ues File.exist?
-	  instead of File.exists?.  a patch from Yutaka Kanemoto
-	  <kinpoco at gmail.com> in [ruby-dev:30000].
+	* array.c (ary_make_shared, rb_ary_store, rb_ary_shift_m,
+	  rb_ary_splice, rb_ary_resize, rb_ary_fill): use ary_mem_clear()
+	  instead of rb_mem_clear().
 
-Thu Dec  7 09:29:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (ary_make_shared): use RARRAY_RAWPTR() instead of RARRAY_PTR().
 
-	* lib/weakref.rb (WeakRef::__setobj__): should support
-	  marshaling.  [ruby-talk:228508]
+Fri Jul 19 19:18:51 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/delegate.rb (Delegator::marshal_load): need to call
-	  __setobj__.
+	* array.c: fix commit miss.
+	  RGENGC_UNPROTECT_LOGGING should be 0.
 
-Wed Dec  6 23:56:14 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul 19 19:15:30 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* Makefile.in, common.mk (NULLCMD): moved for platforms that empty
-	  command does not run.  fixed: [ruby-dev:29994]
+	* array.c (rb_ary_resurrect): use RARRAY_RAWPTR() because there is no
+	  writing.
 
-Wed Dec  6 17:17:26 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* array.c (rb_ary_new_from_values): use ary_memcpy().
 
-	* configure.in (SITE_DIR): fixed to emtpy RUBY_SITE_LIB in config.h on
-	  NetBSD.  fixed: [ruby-dev:29358]
+Fri Jul 19 19:07:31 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Dec  5 00:59:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (ary_memcpy): add a function to copy VALUEs into ary
+	  with write barrier. If ary is promoted, use write barrier correctly.
 
-	* misc/ruby-mode.el (ruby-parse-partial): need to parse "/=" as
-	  self assignment operator, not regex.  [ruby-talk:227324]
+	* array.c (rb_ary_cat, rb_ary_unshift_m, rb_ary_dup,
+	  rb_ary_sort_bang, rb_ary_replace, rb_ary_plus): use ary_memcpy().
 
-Mon Dec  4 10:48:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul 19 15:32:57 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ruby.h (OFFT2NUM): use LONG2NUM() if sizeof(long) equals to
-	  sizeof(off_t).
+	* array.c (rb_ary_store): use RARRAY_PTR_USE() instead of RARRAY_PTR().
+	  Clearing memory space doesn't need WBs.
 
-Mon Dec  4 10:43:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul 19 15:19:37 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* parse.y (dyna_init_gen): dvar initialization only if dvar is
-	  assigned inner block.  [ruby-talk:227402]
+	* array.c (ary_ensure_room_for_push): use RARRAY_RAWPTR() instead of
+	  RARRAY_PTR. In this code, there are no "write" operation.
 
-Mon Dec  4 08:32:49 2006  Shugo Maeda  <shugo@ruby-lang.org>
+	* array.c (rb_ary_equal): ditto.
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): should quote
-	  boundary. JVN#84798830
+	* array.c (recursive_equal): ditto.
 
-Sat Dec  2 07:09:04 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Jul 19 15:09:22 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/ossl_ocsp.c: OpenSSL::OCSP::OSCPError should be
-	  subclass of OpenSSL::OpenSSLError. [ruby-dev:29980]
+	* gc.c, internal.h (rb_gc_writebarrier_remember_promoted): add a new
+	  function to remember an specified object. This api is only
+	  experimental (strongly depend on WB/rgengc strategy).
 
-Fri Dec  1 17:01:49 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Jul 19 14:56:00 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* gc.c (ruby_init_stack): decrease "stack level too deep" in Windows.
-	  merge from trunk.
+	* array.c (ary_unprotect_logging): use (void *) for first parameter
+	  because VALUE is not defined before including ruby/ruby.h.
 
-Fri Dec  1 16:31:53 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Jul 19 14:19:48 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
-	  [ruby-talk: 227408]
+	* ext/pathname/pathname.c (path_inspect): use PRIsVALUE to preserve
+	  the result encoding.
 
-Mon Nov 27 17:18:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul 19 12:35:41 2013  Tanaka Akira  <akr@fsij.org>
 
-	* sprintf.c (rb_f_sprintf): need not to truncate string if no
-	  width specifier given for %s.  [ruby-dev:29952]
+	* test/socket/test_tcp.rb (test_initialize_failure): Use EADDRNOTAVAIL
+	  to test an error message generated by bind() failure.
 
-Sun Nov 26 16:36:46 2006  URABE Shyouhei  <shyouhei@ruby-lang.org>
+Fri Jul 19 11:27:38 2013  Zachary Scott  <e@zzak.io>
 
-	* version.h: addition of RUBY_PATCHLEVEL.
-	* version.c: ditto.
+	* lib/racc/parser.rb: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
 
-Fri Nov 24 10:17:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul 19 11:26:28 2013  Zachary Scott  <e@zzak.io>
 
-	* bignum.c (bignorm): avoid segmentation.  a patch from Hiroyuki
-	  Ito <ZXB01226@nifty.com>.  [ruby-list:43012]
+	* ext/psych/lib/psych*: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
 
-Thu Nov 23 10:38:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul 19 11:25:12 2013  Zachary Scott  <e@zzak.io>
 
-	* eval.c (rb_mod_define_method): set implicit visibility only when
-	  it's called for the target class (ruby_cbase).
+	* lib/rdoc/*: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
 
-Wed Nov 22 16:00:49 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Jul 19 11:23:55 2013  Zachary Scott  <e@zzak.io>
 
-	* ext/tk/extconf.rb: support --with-X11/--without-X11 option.
+	* lib/rubygems*: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
 
-	* ext/tk/README.tcltklib: add description about --with-X11-* option
-	  [ruby-talk:225166] and --with-X11/--without-X11 option.
+Fri Jul 19 11:16:54 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/tk/tkutil/extconf.rb: able to be called manually
-	  [ruby-talk:225950].
+	* lib/set.rb (Set#to_set): Define Set#to_set so that aSet.to_set
+	  returns self. [Fixes GH-359]
 
-Wed Nov 15 23:22:54 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul 19 11:10:23 2013  Zachary Scott  <e@zzak.io>
 
-	* file.c (test_grpowned, rb_stat_grpowned): should honor
-	  supplementary group IDs.  [ruby-core:09546]
+	* lib/rake/*: [DOC] Capitalize "Ruby" in documentation
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
 
-Thu Nov  9 03:15:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul 19 01:04:14 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (BEGIN_CALLARGS): ruby_block may be NULL even when
-	  ITER_PRE.
+	* ext/-test-/bignum/intpack.c: Renamed from ext/-test-/bignum/pack.c.
+	  (Init_intpack): Renamed from Init_pack.
+	  Reported by Naohisa Goto.  [ruby-dev:47526] [Bug #8655]
 
-Tue Nov  7 18:34:34 2006  Akinori MUSHA  <knu@iDaemons.org>
+Fri Jul 19 00:54:27 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* ext/digest/lib/digest/hmac.rb: Keep this out of the 1.8 tree
-	  until we reach a consensus that HMAC should be put under Digest.
+	* test/ruby/test_array.rb (test_count): add a test case for #count
+	  with an argument. See Bug #8654.
 
-Tue Nov  7 18:05:01 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Jul 18 23:45:06 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/tk/lib/tk/itemconfig.rb: minor bug fix.
+	* array.c (rb_ary_eql): compare RARRAY_PTR() for performance
+	  improvement in case of that self and other are shared.
 
-Mon Nov  6 20:11:20 2006  Kouhei Sutou  <kou@cozmixng.org>
+Thu Jul 18 22:46:42 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/rss/0.9.rb (RSS::Rss): removed needless include.
+	* lib/cgi.rb: [DOC] Capitalize "Ruby" in documentation [Fixes GH-341]
+	  Patch by Dave Worth https://github.com/ruby/ruby/pull/341
+	* lib/webrick.rb: ditto
+	* lib/scanf.rb: ditto
+	* lib/xmlrpc/config.rb: ditto
+	* lib/resolv.rb: ditto
+	* lib/e2mmap.rb: ditto
+	* lib/fileutils.rb: ditto
+	* lib/mkmf.rb: ditto
+	* lib/cgi/session.rb: ditto
+	* lib/yaml.rb: ditto
+	* lib/erb.rb: ditto
+	* lib/irb.rb: ditto
+	* lib/tracer.rb: ditto
+	* lib/net/http.rb: ditto
+	* ext/syslog/lib/syslog/logger.rb: ditto
+	* sample/pty/expect_sample.rb: ditto
 
-Mon Nov  6 15:41:55 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Jul 18 21:30:50 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/itemconfig.rb: ext/tk/lib/tk/itemconfig.rb: bug
-	  fix on 'itemconfiginfo' method, and modify to make it easy to
-	  override 'itemconfiginfo' method.
+	* bignum.c (bary_sq_fast): Specialize the last iteration of the
+	  outer loop.
+	  (bigfixize): A condition simplified.
 
-	* ext/tk/lib/tkextlib/tile/treeview.rb : support Tile 0.7.8.
+Thu Jul 18 21:15:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/tk/lib/tkextlib/version.rb : [new] add Tk::Tkextlib_RELEASE_DATE
-	  to get the information from scripts.
+	* array.c (rb_ary_equal): compare RARRAY_PTR() for performance
+	  improvement in case of that self and other are shared.
 
-	* ext/tk/lib/tk.rb: load 'tkextlib/version.rb', and update RELEASE_DATE
+Thu Jul 18 20:44:51 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/tk/lib/tkextlib/SUPPORT_STATUS: update.
+	* array.c (rb_ary_fill): use memfill().
 
-	* ext/tk/sample/editable_listbox.rb: [new] the listbox with editable
-	  items. It's one of the example about usage of Place geometry manager.
+Thu Jul 18 20:35:14 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* ext/tk/sample/tktextio.rb: improve the functions of TkTextIO class.
-	  Those are required by 'irbtkw.rbw'.
+	* array.c (rb_ary_count): check length to avoid SEGV
+	  while iterating. Remove other pointer loop when arg is given.
 
-	* ext/tk/sample/irbtkw.rbw: [new] IRB on Ruby/Tk. It doesn't need any
-	  real console. IRB works on a text widget without I/O blocking. That
-	  is, thread switching on IRB will work properly, even if on Windows.
+	* test/ruby/test_array.rb (test_count): add test for bug.
+	  [ruby-core:56072] [Bug #8654]
 
-Sun Nov  5 19:53:49 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Thu Jul 18 18:14:36 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* lib/date.rb: updated based on date2 3.9.7.
+	* array.c (rb_ary_count): iterate items appropriately.
+	  [Bug #8654]
 
-Sat Nov  4 13:13:57 2006  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Jul 18 17:35:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* lib/net/imap.rb: accept NOMODSEQ. [ruby-core:9002]
-	  (backported from HEAD)
+	* hash.c (rb_hash_flatten): performance improvement by not using
+	  rb_hash_to_a() to avoid array creation with rb_assoc_new().
 
-Fri Nov  3 00:16:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jul 18 16:16:17 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/socket/socket.c (ruby_getnameinfo__aix): AF_INET6 workaround
-	  for AIX.  a patch from Yutaka Kanemoto <kinpoco AT gmail.com>.
-	  [ruby-dev:29744]
+	* array.c: add logging feature for RGenGC's write barrier unprotect
+	  event.
 
-Thu Nov  2 15:43:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Jul 18 15:45:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (primary): should set NODE even when compstmt is NULL.
-	  merge from trunk. fixed: [ruby-dev:29732]
+	* include/ruby/ruby.h (RUBY_SAFE_LEVEL_CHECK): make only
+	  rb_set_safe_level(4) an error always but make rb_secure(4) an error
+	  only in the core.  [ruby-dev:47517] [Bug #8652]
 
-Thu Nov  2 14:48:30 2006  Akinori MUSHA  <knu@iDaemons.org>
+Thu Jul 18 15:42:01 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/set.rb (Set#^): Fix XOR operation against a container that
-	  holds duplicate values. [issue: #6444]
+	* include/ruby/ruby.h: fix spell miss.
 
-Wed Nov  1 02:41:38 2006  Akinori MUSHA  <knu@iDaemons.org>
+Thu Jul 18 15:11:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/digest/lib/digest/hmac.rb (Digest::HMAC::update): Minor
-	  optimization.
+	* include/ruby/ruby.h (ruby_safe_level_4): get rid of special
+	  character.  [ruby-dev:47512] [misc #8646]
 
-	* ext/digest/digest.c (rb_digest_instance_equal): Allow comparing
-	  a digest instance with another of a different class.
+Thu Jul 18 14:51:39 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Nov  1 01:05:13 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* array.c (ary_alloc): slim setup process.
 
-	* eval.c (rb_call0): fixed bug of zsuper with both of opt and rest.
-	  fixed: [ruby-list:42928]
+Thu Jul 18 14:37:57 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* test/ruby/test_super.rb: add tests to check above bug.
+	* string.c (str_alloc): no need to clear RString (already cleared).
 
-Tue Oct 31 17:03:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jul 18 12:57:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* time.c (time_dup): duplicate the class of original time.
-	  [ruby-core:09357]
+	* bignum.c (BDIGITS_ZERO): Defined.
+	  (bary_pack): Use BDIGITS_ZERO.
+	  (bary_unpack): Ditto.
+	  (bary_mul_single): Ditto.
+	  (bary_mul_normal): Ditto.
+	  (bary_sq_fast): Ditto.
+	  (bary_mul_balance_with_mulfunc): Ditto.
+	  (bary_mul_precheck): Ditto.
+	  (bary_mul_toom3_branch): Ditto.
+	  (rb_cstr_to_inum): Ditto.
+	  (big_shift3): Ditto.
+	  (bigmul1_toom3): Ditto.
+	  (bary_divmod): Ditto.
 
-	* lib/time.rb (Time::make_time, Time::rfc2822, Time::httpdate):
-	  should respect subclasses.  [ruby-core:09357]
+Thu Jul 18 06:30:02 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Oct 30 23:40:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c: rename gc related functions with prefix "gc_".
+	  * before_gc_sweep() -> gc_before_sweep().
+	  * after_gc_sweep()  -> gc_after_sweep().
+	  * lazy_sweep()      -> gc_lazy_sweep().
+	  * rest_sweep()      -> gc_rest_sweep().
+	  * slot_sweep()      -> gc_slot_sweep().
 
-	* Makefile.in (miniruby): add XLDFLAGS.
+	* gc.c: rename a heap management function with prefix "heap_".
+	  * get_freeobj() -> heap_get_freeobj().
 
-	* configure.in (aix): use -bE option for miniruby.  [ruby-dev:29698]
+	* gc.c: rename markable_object_p() to is_markable_object().
 
-	* dir.c (glob_helper): get rid of possible memory leak.
+Wed Jul 17 22:57:40 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* win32/win32.c (cmdglob, rb_w32_cmdvector, rb_w32_opendir,
-	  rb_w32_get_environ): not to use GC before initialization.
+	* hash.c (delete_if_i): use ST_DELETE.
 
-Mon Oct 30 19:29:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jul 17 22:34:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* bignum.c (rb_big2str0): use better approximation.
+	* bignum.c: An static assertion for relation of SIZEOF_LONG and
+	  SIZEOF_BDIGITS is added.
+	  (bary_mul_precheck): Reduce comparisons.
+	  (bary_mul): Invoke bary_sq_fast or bary_mul1 if the bignum size is
+	  small.
+	  (bigfixize): Resize the argument bignum here.
+	  (bignorm): Don't call bigtrunc after bigfixize.
 
-Mon Oct 30 18:35:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jul 17 22:13:26 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* bignum.c (rb_big2str0): wrong allocation length.  a patch from
-	  U.Nakamura <usa at garbagecollect.jp> [ruby-dev:29710]
+	* hash.c (rb_hash_replace): performance improvement by using
+	  st_copy().
 
-Mon Oct 30 12:34:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jul 17 17:19:54 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_eval): fix commit miss.  [ruby-dev:29707]
+	* gc.c: rename heap management functions with prefix "heap_".
+	  * allocate_sorted_array() -> heap_allocate_sorted_array().
+	  * slot_add_freeobj()      -> heap_slot_add_freeobj().
+	  * assign_heap_slot()      -> heap_assign_slot().
+	  * add_heap_slots()        -> heap_add_slots().
+	  * init_heap()             -> heap_init().
+	  * set_heap_increment()    -> heap_set_increment().
 
-Mon Oct 30 12:20:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (initial_expand_heap): inlined in rb_gc_set_params().
 
-	* bignum.c (rb_big2str0): a bug in length adjustment.
+Wed Jul 17 17:12:23 2013  Matthew M. Boedicker  <matthewm@boedicker.org>
 
-Mon Oct 30 11:15:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (env_fetch): Add key name to message on ENV.fetch KeyError,
+	  as well as Hash#fetch.  [ruby-core:56062] [Feature #8649]
 
-	* sprintf.c (rb_str_format): should preserve leading zero
-	  information for negative %b and %x.  [ruby-talk:221347]
+Wed Jul 17 15:59:33 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Oct 26 21:05:58 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* gc.c: catch up last changes for debugging/checking mode.
 
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_verify): should clear error.
-	  (fix http://bugs.debian.org/394336)
+Wed Jul 17 15:50:10 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): ditto.
+	* gc.c (rb_objspace_free): free slot itself.
 
-Thu Oct 26 15:21:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c (objspace_each_objects): fix condition.
+	  Use slot->body instead of slot.
 
-	* ext/digest/digest.c (Init_digest): typo.
+	* gc.c (count_objects): use "slot" variable.
 
-Wed Oct 25 17:23:28 2006  Akinori MUSHA  <knu@iDaemons.org>
+Wed Jul 17 15:21:10 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/digest, test/digest/test_digest.rb: Merge from trunk:
-	  - Introduce versioning in Digest::Base API, and prefix C
-	    constants with RUBY_ and C type names with rb_ to avoid name
-	    clash in writing extensions.
-	  - Introduce Digest::Class and Digest::Instance for ease of
-	    implementing subclasses and add-ons.
-	  - Digest::Instance module requires and assumes that any instance
-	    be resettable and clonable.  An instance method #new() is
-	    added so digest instances work just like digest classes.
-	  - The constructor does no longer take an initial string to feed;
-	    digest() and hexdigest() now do, instead.  This allows digest
-	    classes to take their own hashing parameters.
-	  - Make some changes to digest() and hexdigest() class methods,
-	    which now take extra arguments, which are passed through to
-	    the constructor in an internal call.
-	  - Add #digest_length/size/length() and #block_length(),
-	  - Add the Digest::SHA2 class to wrap up SHA2 variants: SHA256,
-	    SHA384 and SHA512, hoping this module would make a decent
-	    example of a digest subclass written in Ruby.
-	  - Rip BubbleBabble support out of the base class and have a
-	    separate module named digest/bubblebabble.
-	  - Remove RD documents in favor of newly written and embedded
-	    RDoc documentation.
+	* gc.c (unlink_heap_slot): fix memory leak.
+	  free slot itself at free_heap_slot().
 
-Wed Oct 25 08:03:23 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+	  Reproduce-able code is here:
+	    N1 = 100_000; N2 = 1_000_000
+	    N1.times{ary = []; N2.times{ary << ''}}
+	  Maybe this problem is remaining in Ruby 2.0.0.
 
-	* lib/date/format.rb: updated based on date2 3.9.6.
-	  [ruby-core:09323]
+	* gc.c (unlink_heap_slot): remove not working code.
 
-Sun Oct 22 14:48:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jul 17 14:31:13 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* signal.c (ruby_signal): don't set SA_RESTART.  a backport from
-	  the HEAD.  [ruby-talk:220937]  [ruby-talk:147220]
+	* gc.c: re-design the heap structure.
 
-	* signal.c (Init_signal): avoid duplicated installation of SIGCHLD
-	  handler.
+	  (1) The heap is consists of a set of slots.
+	  (2) Each "slot" has a "slot_body".
+	      slot::start and slot::limit specify RVALUE beginning address
+	      and number of RVALUE in a "slot_body".
+	  (3) "slot_body" contains a pointer to slot (slot_body::header::slot)
+	      and an array of RVALUE.
+	  (4) heap::sorted is an array of "slots", sorted by an address of
+	      slot::body.
 
-Sun Oct 22 16:47:56 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  See https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/GC_design
+	  for more details (figure).
 
-	* string.c (rb_str_substr): should be infected with only original
-	  string, but not the shared string.  fixed: [ruby-core:09152]
+	* gc.c: Avoid "heaps" terminology. It is ambiguous.
 
-	* string.c (rb_str_new4): keep shared string untainted when orignal
-	  string is tainted.  fixed: [ruby-dev:29672]
+Wed Jul 17 13:29:16 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Oct 22 05:20:34 2006  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+	* gc.c: fix heaps_header and heaps_slot to reduce memory consumption.
+	  (1) move heaps_header::start and limit to  heaps_slot.
+	  (2) remove heaps_header::end which can be calculated by start+limit.
 
-	* configure.in: alloca is broken; use C_ALLOCA instead.
-	  [ruby-dev:29416]
+	* gc.c: catch up above change.
 
-Fri Oct 20 10:47:43 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jul 17 12:30:05 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
+	* include/ruby/st.h (st_strcasecmp): Macro defined for compatibility.
+	  (st_strncasecmp): Ditto.
 
-Fri Oct 20 08:42:38 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 17 11:57:45 2013  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
 
-	* common.mk (NULLCMD): dummy command.
+	* lib/cgi/util.rb (CGI::Util#escape, unescape): Avoid use of regexp
+	  special global variable. [Feature #8648] Thanks to fotos.
 
-	* bcc32/Makefile.sub (post-install-*): Borland make cannot ignore
-	  command-less double-colon rules.  [ruby-dev:29676]
+Wed Jul 17 11:57:10 2013  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
 
-Fri Oct 20 00:37:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/erb.rb (ERB::Util#url_encode): Avoid use of regexp special global
+	  variable. [Feature #8648] Thanks to fotos.
 
-	* bcc32/Makefile.sub ($(LIBRUBY_SO)): execute pre-link hook.
+Wed Jul 17 08:12:41 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/extmk.rb: workaround for Borland make.
+	* st.c (st_locale_insensitive_strcasecmp): Renamed from st_strcasecmp.
+	  (st_locale_insensitive_strncasecmp): Renamed from st_strncasecmp.
 
-Wed Oct 18 23:02:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/st.h: Follow above changes.
 
-	* array.c (rb_ary_shift): shorten copy size.  fixed: [ruby-list:42907]
+	* include/ruby/ruby.h: Ditto.
 
-	* signal.c (Init_signal): handle SIGTERM.  fixed: [ruby-list:42895]
+Wed Jul 17 00:14:59 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/win32.c (rb_w32_utime): allow NULL to set the current time.
-	  [ruby-talk:219248]
+	* bignum.c (bigmul1_toom3): Use bigdivrem_single instead of bigdivrem.
+	  (big_three): Removed.
+	  (Init_Bignum): Don't initialize big_three.
 
-Wed Oct 18 00:55:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul 16 21:46:03 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* parse.y (parser_yylex): use particular enums.  [ruby-core:09221]
+	* configure.in: revert r42008. strcasecmp() uses the current locale.
 
-Mon Oct 16 08:30:43 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/ruby.h: ditto.
 
-	* mkconfig.rb: *OBJS are not needed for extension libraries.
+	* st.c (st_strcasecmp): ditto.
 
-	* {bcc32,wince,win32}/Makefile.sub (config.status): fixed typo,
-	  missing comma.
+Tue Jul 16 21:07:04 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sun Oct 15 01:03:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: check strcasecmp().
 
-	* lib/test/unit/collector/dir.rb (Collector::Dir#collect): append base
-	  directory but not prepend.
+	* include/ruby/ruby.h: use strcasecmp() as st_strcasecmp() if it
+	  exists.
 
-	* lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): do not
-	  join with dot.  fixed: [ruby-core:09179]
+	* st.c (st_strcasecmp): define the function only if strcasecmp()
+	  doesn't exist.
 
-Sat Oct 14 23:39:50 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jul 16 20:21:28 2013  Tanaka Akira  <akr@fsij.org>
 
-	* parse.y (singleton): no need to re-create NODE_SELF() again.
-	  [ruby-core:09177]
+	* bignum.c (bigsq): Renamed from bigsqr.
 
-Sat Oct 14 23:25:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jul 16 19:42:08 2013  Tanaka Akira  <akr@fsij.org>
 
-	* parse.y (parser_warning, parser_warn): some error message may
-	  contain format specifiers.  a patch from Akinori MUSHA <knu at
-	  iDaemons.org>.  [ruby-dev:29657]
+	* bignum.c (USHORT): Unused macro removed.
 
-	* ext/bigdecimal/bigdecimal.c (VpException): ditto.
+Tue Jul 16 19:18:51 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/dl/handle.c (rb_dlhandle_initialize): ditto.
+	* gc.c: slim a path of newobj_of().
 
-	* ext/gdbm/gdbm.c (rb_gdbm_fatal): ditto.
+	* gc.c (objspace): add a new field objspace::freelist, which contains
+	  available RVALUEs.
 
-Sat Oct 14 08:24:45 2006  Akinori MUSHA  <knu@iDaemons.org>
+	* gc.c (newobj_of): simply call new function `get_freeobj()'.
+	  get_freeobj() returns objspace::freelist. If  objspace::freelist
+	  is not available, refill objspace::freelist with a slot pointed by
+	  objspace::heap::free_slots.
 
-	* ext/digest/lib/digest/hmac: Back out the addition of digest/hmac
-	  for now because the API is too premature for a stable branch.
+	* gc.c (before_gc_sweep): clear objspace::freelist.
 
-Sat Oct 14 00:55:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (slot_sweep): clear slot::freelist.
 
-	* bcc32/Makefile.sub (post-install-ext): no longer needed.
+	* gc.c (heaps_prepare_freeslot): renamed to heaps_prepare_freeslot.
 
-	* bcc32/configure.bat: get rid of a quirk of Borland make, which
-	  sets empty macro in command line to "1".
+	* gc.c (unlink_free_heap_slot): remove unused function.
 
-Fri Oct 13 22:50:43 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+	* gc.c (rb_free_const_table): remove unused function.
 
-	* lib/date.rb: updated based on date2 3.9.5.
+Tue Jul 16 19:05:12 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Oct 13 22:33:28 2006  Minero Aoki  <aamine@loveruby.net>
+	* bignum.c (big_shift3): Big shift width is not a problem for right
+	  shift.
 
-	* lib/fileutils.rb (FileUtils.cp_r): dereference_root=true is
-	  default in Ruby 1.8.  This line is wrongly removed in last commit.
+Tue Jul 16 18:50:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Oct 13 18:19:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_count): [DOC] fix typo.  Array#count uses ==, not
+	  ===.  a question at asakusa.rb ML.
 
-	* object.c: Class#inherited RDoc added.  a patch from Daniel
-	  Berger <djberg96 at gmail.com>  [ruby-core:08942]
+Tue Jul 16 18:35:48 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Oct 13 02:30:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bary_mul_karatsuba): Avoid duplicate calculation when
+	  squaring.
+	  (bary_mul_toom3_branch): Ditto.
 
-	* lib/test/unit/collector/dir.rb (Collector::Dir#collect): prepend
-	  base directory to load path.
+Tue Jul 16 17:43:22 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/test/unit/collector/dir.rb (Collector::Dir#collect_file): should
-	  use the given File-like interface, but not File directly.
+	* gc.c (link_free_heap_slot): removed.
 
-	* test/testunit/collector/test_dir.rb (TestDir::FileSystem): implement
-	  File-like methods correctly.
+	* gc.c (slot_sweep): use `heaps_add_freeslot' instead of
+	  `link_free_heap_slot'.
 
-Fri Oct 13 01:48:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (assign_heap_slot): use local variable `slot' instead of
+	  `heaps'.
 
-	* lib/date.rb (Date::self.complete_hash): need to check if g is
-	  nil before dereference.  [ruby-core:09116]
+Tue Jul 16 17:21:39 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Oct 13 00:34:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (assign_heap_slot): refactoring variable names.
 
-	* object.c (rb_mod_cvar_defined): wrong id check.  a patch from
-	  Mauricio Fernandez <mfp at acm.org>.  [ruby-core:09158]
+	* gc.c (slot_add_freeobj): added.
 
-	* object.c (rb_mod_cvar_get): typo fixed.  [ruby-core:09168]
+	* gc.c (heaps_add_freeslot): added.
 
-	* object.c (rb_mod_cvar_set): ditto.
+	* gc.c (finalize_list, rb_gc_force_recycle, slot_sweep): use
+	  `slot_add_freeobj' instead of modifying linked list directly.
 
-Wed Oct 11 22:21:41 2006  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 16 16:30:58 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/digest: Merge from trunk; metadata location changed,
-	  Digest::Base#reset() added, Digest::Base#equal() changed, and
-	  digest/hmac added with some modifications made for ruby 1.8.
+	* gc.c (lazy_sweep): refactoring.
 
-Tue Oct 10 17:24:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jul 16 13:32:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* {bcc32,win32,wince}/Makefile.sub (config.status): shouldn't use
-	  copy command instead of install. use -run install.
+	* encoding.c (enc_set_index): since r41967, old terminator is dealt
+	  with in str_fill_term().  should not consider it here because this
+	  function is called before any encoding is set.
 
-Tue Oct 10 16:49:16 2006  Akinori MUSHA  <knu@iDaemons.org>
+Tue Jul 16 11:12:03 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/digest/digest.c (hexdigest_str_new, bubblebabble_str_new):
-	  Perform StringValue() checks properly.
+	* proc.c (rb_block_arity): raise ArgumentError if no block given.
 
-	* ext/digest/digest.c: Use RSTRING_{PTR,LEN} macros.
+Tue Jul 16 08:15:22 2013  Zachary Scott  <e@zzak.io>
 
-Tue Oct 10 13:49:53 2006  Akinori MUSHA  <knu@iDaemons.org>
+	* ext/bigdecimal/lib/bigdecimal/util.rb: [DOC] document top-level
+	  classes from BigDecimal utils native extensions
 
-	* ext/digest: Merge from trunk; apply all changes since the
-	  initial import, except for the removal of compatibility stub
-	  libraries (md5.rb and sha1.rb).
+Tue Jul 16 03:23:03 2013  Zachary Scott  <e@zzak.io>
 
-Mon Oct  9 23:46:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* numeric.c: [DOC] improve rdoc formatting for parameters and links
 
-	* lib/parsedate.rb: documentation patch from Konrad Meyer
-	  <konrad.meyer@gmail.com>.  [ruby-doc:1238]
+Mon Jul 15 14:40:00 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/open3.rb, lib/ping.rb: ditto.
+	* include/ruby/intern.h (rb_big2str0): Deprecated.
 
-Mon Oct  9 22:56:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (rb_big2str1): Renamed from rb_big2str0.
+	  (rb_big2str0): Deprecated wrapper for rb_big2str1.
+	  (rb_big2str): Invoke rb_big2str1 instead of rb_big2str0.
 
-	* lib/rexml/encoding.rb (REXML::Encoding::check_encoding): spaces
-	  are allowed around equal sign.  [ruby-core:09032]
+Mon Jul 15 14:13:02 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser): ditto.
+	* struct.c (rb_struct_each_pair): use rb_yield_values(2, key, value)
+	  instead of rb_yield(rb_assoc_new(key, value)) if rb_block_arity()
+	  is greater than 1.
 
-Sat Oct  7 23:53:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul 15 13:46:26 2013  Tanaka Akira  <akr@fsij.org>
 
-	* string.c (rb_str_scan): small documentation fix.
-	  [ruby-core:09007]
+	* bignum.c: Add static assertions.
 
-Sat Oct  7 23:44:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul 15 13:36:02 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* bignum.c (rb_big_rshift): a bug in right shift of negative
-	  bignums.  [ruby-core:09020]
+	* hash.c (rb_hash_each_pair): performance improvement by using
+	  rb_block_arity().
 
-Sat Oct  7 00:27:58 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul 15 13:15:37 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* class.c (rb_include_module): remove unnecessary check.
-	  [ruby-talk:218402]
+	* proc.c (rb_block_arity): create internal API rb_block_arity().
+	  it returns arity of given block.
 
-Fri Oct  6 04:30:30 2006  Akinori MUSHA  <knu@iDaemons.org>
+Mon Jul 15 13:07:27 2013  Yuki Yugui Sonoda  <yugui@yugui.jp>
 
-	* sample/openssl/c_rehash.rb: Use digest/md5 instead of obsolete md5.
+	* lib/prime.rb (Prime::EratosthenesGenerator,
+	  Prime::EratosthenesSieve): New implementation by
+	  robertjlooby <robertjlooby AT gmail.com>.
 
-Wed Oct  4 18:47:25 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* test/test_prime.rb: updated with new method name
 
-	* ext/tk/lib/tkextlib/*: bugfix and update
-	  (see ext/tk/ChangeLog.tkextlib).
+Mon Jul 15 11:32:46 2013  Zachary Scott  <e@zzak.io>
 
-Wed Oct  4 17:25:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* numeric.c (rb_cNumeric): [DOC] Added comment for Numeric to fix doc
 
-	* eval.c (rb_call): check protected visibility based on real self,
-	  not ruby_frame->self.  [ruby-talk:217822]
+Mon Jul 15 11:24:48 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Oct  4 08:52:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (maxpow_in_bdigit_dbl): Useless #if removed.
 
-	* test/optparse/test_getopts.rb: changed the class name of test case
-	  to get rid of conflict with test_optparse.rb.
+Mon Jul 15 11:10:46 2013  Zachary Scott  <e@zzak.io>
 
-Tue Oct  3 23:32:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_coerce): [DOC] Add docs for Bignum#coerce
+	  Based on patch by Juanito Fatas [Fixes GH-360]
+	  https://github.com/ruby/ruby/pull/360
 
-	* lib/test/unit/testcase.rb (Test::Unit::TestCase.suite): test name
-	  must be string.  fixed: [ruby-core:08978]
+Mon Jul 15 10:56:01 2013  Zachary Scott  <e@zzak.io>
 
-Mon Oct  2 23:47:55 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c (mutex_sleep): [DOC] Awake thread will reacquire lock
+	  By Tim Abdulla [Fixes GH-342] https://github.com/ruby/ruby/pull/342
 
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::COLLECTORS):
-	  base directory should be lower precedence.  fixed: [ruby-dev:29622]
+Mon Jul 15 10:45:09 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): typo.
+	* bignum.c (nlz16): Use __builtin_clz if possible.
+	  (nlz32): Use __builtin_clz or __builtin_clzl if possible.
+	  (nlz64): Use __builtin_clzl or __builtin_clzll if possible.
+	  (nlz128): Use __builtin_clzll if possible.
 
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
-	  load expanded path.  fixed: [ruby-dev:29621]
+	* configure.in: Check __builtin_clz, __builtin_clzl and
+	  __builtin_clzll.
 
-Mon Oct  2 15:49:19 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Mon Jul 15 09:39:07 2013  Tanaka Akira  <akr@fsij.org>
 
-	* instruby.rb: batfile should be CRLF'ed.
+	* bignum.c (power_cache_get_power): Use bitsize instead of ceil_log2.
+	  (ones): Removed.
+	  (next_pow2): Removed.
+	  (floor_log2): Removed.
+	  (ceil_log2): Removed.
 
-Mon Oct  2 01:24:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in (__builtin_popcountl): Don't check.
 
-	* common.mk (test-all): separate directory where running test cases
-	  from source tree.
+Mon Jul 15 02:47:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit/autorunner.rb (options): added --basedir, --workdir
-	  and --load-path options.
+	* localeinit.c (rb_locale_charmap, Init_enc_set_filesystem_encoding):
+	  move from encoding.c.
 
-	* lib/test/unit/collector/dir.rb (recursive_collect, collect_file):
-	  base directory support.
+	* miniinit.c (rb_locale_charmap, Init_enc_set_filesystem_encoding):
+	  define miniruby specific functions only.
 
-Sun Oct  1 23:56:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul 15 02:32:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* Makefile.in, common.mk, ext/extmk.rb, win{32,ce}/Makefile.in: keep
-	  LIBRUBY_SO unless need to be removed.
+	* encoding.c (rb_enc_init): no longer needs NO_PRESERVED_ENCODING.
 
-Sun Oct  1 23:12:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* encoding.c (enc_inspect): defer loading autoloaded encoding.
 
-	* lib/optparse.rb (OptionParser#make_switch): pass arguments directly.
+	* encoding.c (enc_check_encoding): use is_data_encoding() to check
+	  type consistently.
 
-Sat Sep 30 15:12:25 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+	* encoding.c (must_encoding): return rb_encoding* instead of encoding
+	  index.
 
-	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.4.
+	* encoding.c (enc_check_encoding): use is_data_encoding() to check
+	  type consistently.
 
-Fri Sep 29 12:11:04 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* encoding.c (must_encoding): return rb_encoding* instead of encoding
+	  index.
 
-	* jcode.rb (succ!): call original succ! if $KCODE == 'n'.
-	  fixed: [ruby-talk:216845]
+Mon Jul 15 02:21:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep 29 11:43:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (str_fill_term): consider old terminator length, and should
+	  not use rb_enc_ascget since it depends on the current encoding which
+	  may not be compatible with the new terminator.  [Bug #8634]
 
-	* lib/mkmf.rb (try_func): revert fallback checking undeclared function.
-	  fixed: [ruby-core:08949]
+	* encoding.c (enc_inspect): use PRIsVALUE to preserve the result
+	  encoding.
 
-Fri Sep 29 09:56:56 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 14 23:21:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/extmk.rb: extout is needed for also clean.
-	  fixed: [ruby-core:08944]
+	* configure.in: Check __builtin_popcountl, __builtin_bswap32 and
+	  __builtin_bswap64.
 
-	* lib/optparse.rb (OptionParser::Switch#conv_arg): unsplat by
-	  Proc#call if no conversion is given.
+	* internal.h (swap32): Use the configure result for the condition to
+	  use __builtin_bswap32.
+	  (swap64): Use the configure result for the condition to use
+	  __builtin_bswap64.
 
-Thu Sep 28 23:59:31 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (ones): Use the configure result for the condition to use
+	  __builtin_popcountl.
+	  (bary_unpack_internal): Use appropriate types for swap argument.
 
-	* node.h (struct thread): declare win32_exception_list on cygwin and
-	  win32 regardless if it is implemented.  Provisional fix for
-	  [ruby-core:08917].
+Sun Jul 14 22:21:11 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Sep 28 20:53:16 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (bary_subb): Support xn < yn.
+	  (bigsub_core): Removed.
+	  (bigsub): Don't compare before subtraction.  Just subtract and
+	  get the two's complement if the subtraction causes a borrow.
 
-	* lib/tmpdir.rb: use return value of getdir.call for length.
+Sun Jul 14 00:36:03 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Sep 27 01:04:49 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (DIGSPERLONG): Unused macro removed.
+	  (DIGSPERLL): Ditto.
 
-	* lib/mkmf.rb (try_func): check function pointer first and macro next.
+Sun Jul 14 00:32:51 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (have_type): simplified with typedef and sizeof.
+	* bignum.c (rb_big_aref): Less scan when the number is negative.
 
-Tue Sep 26 23:57:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul 14 00:17:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/optparse.rb (OptionParser#getopts): use strings as key.
-	  fixed: [ruby-dev:29614]
+	* bignum.c (big_shift): Avoid signed integer overflow.
 
-Tue Sep 26 15:31:26 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Jul 14 00:14:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* {win32,wince}/Makefile.sub (CPP): check predefined value.
+	* bignum.c (bary_mul_precheck): Use bary_small_lshift or
+	  bary_mul_normal if xl is 1.
 
-Tue Sep 26 07:55:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jul 13 22:58:16 2013  Tanaka Akira  <akr@fsij.org>
 
-	* array.c (rb_ary_shift): should not move memory region if array
-	  body is shared.  a patch from Kent Sibilev <ksruby at gmail.com>.
-	  [ruby-core:08922]
+	* bignum.c (big_shift3): New function.
+	  big_lshift and big_rshift are merged.
+	  (big_shift2): New function.
+	  (big_lshift): Use big_shift3.
+	  (big_rshift): Ditto.
+	  (check_shiftdown): Removed.
+	  (rb_big_lshift): Use big_shift2 and big_shift3.
+	  (rb_big_rshift): Ditto.
+	  (big_lshift): Removed.
+	  (big_rshift): Ditto.
 
-Mon Sep 25 22:26:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul 13 15:51:38 2013  Tanaka Akira  <akr@fsij.org>
 
-	* file.c (rb_path_end): skip root directory.  fixed: [ruby-core:08913]
+	* bignum.c (bary_small_lshift): Use size_t instead of long.
+	  (bary_small_rshift): Ditto.
 
-	* lib/mkmf.rb (init_mkmf): set default $LDFLAGS.  Patch by Michal
-	  Suchanek <hramrach at centrum.cz>.  [ruby-talk:216256]
+Sat Jul 13 15:33:33 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Sep 25 08:14:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (bary_small_lshift): Functions moved to remove
+	  declaration.
+	  (bary_small_rshift): Ditto.
 
-	* array.c (rb_ary_shift): should clear shifting top element.
-	  [ruby-talk:216055]
+Sat Jul 13 12:27:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* array.c (rb_ary_shift): avoid creating shared object if array
-	  size is small.
+	* encoding.c (rb_enc_associate_index): fill new terminator length, not
+	  old one.
 
-Mon Sep 25 08:11:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jul 13 12:24:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* random.c (rb_f_rand): RDoc typo fix.  a patch from Frederick
-	  Cheung <fred at 82ask.com>.  [ruby-talk:216047]
+	* ext/win32: move from ext/dl and ext/fiddle.  since ext/extmk.rb
+	  builds extensions in alphabetical order, compiled?('fiddle') under
+	  ext/dl makes no sense.
 
-Sun Sep 24 22:28:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jul 13 09:26:09 2013  Tanaka Akira  <akr@fsij.org>
 
-	* runruby.rb: extension library scripts moved into common directory.
+	* bignum.c (biglsh_bang): Removed.
+	  (bigrsh_bang): Ditto.
+	  (bigmul1_toom3): Use bary_small_lshift and bary_small_rshift.
 
-Sun Sep 24 14:59:50 2006  Tanaka Akira  <akr@fsij.org>
+Sat Jul 13 01:04:43 2013  Zachary Scott  <e@zzak.io>
 
-	* node.h (struct thread): ia64 support is broken by sandbox patch.
+	* lib/rubygems/psych_additions.rb: Ignore Psych docs here
 
-Sun Sep 24 12:11:16 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Fri Jul 12 18:10:46 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.3.
+	* ext/fiddle/win32/lib/win32/registry.rb
+	  (Win32::Registry::API#make_wstr): same as r41922.
 
-Sat Sep 23 23:24:57 2006  why the lucky stiff  <why@ruby-lang.org>
+Fri Jul 12 16:28:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_thread_save_context, rb_thread_restore_context):
-	  sandbox hook to save and restore sandbox state.
+	* encoding.c (rb_enc_associate_index): refill the terminator if it
+	  becomes longer than before.  [ruby-dev:47500] [Bug #8624]
 
-	* eval.c (thread_no_ensure): added THREAD_NO_ENSURE thread flag.
+	* string.c (str_null_char, str_fill_term): get rid of out of bound
+	  access.
 
-	* eval.c (rb_thread_kill_bang): Thread#kill! uses the above flag
-	  to circumvent ensure, in order to prevent endless loops.
-	  [ruby-core:08768]
+	* string.c (rb_str_fill_terminator): add a parameter for the length of
+	  new terminator.
 
-	* eval.c (rb_thread_kill): fix Thread#kill docs, which returns
-	  the thread object in all cases.
+Fri Jul 12 11:26:25 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* node.h: expose the rb_jmpbuf_t and rb_thread_t structs, along
-	  with the thread flags.  used by the sandbox extension.
+	* hash.c (rb_hash_reject_bang): do not call rb_hash_foreach() if RHash
+	  has ntbl and it is empty.
 
-	* ruby.h: extern rb_eThreadError, so sandbox can swap it.
+Fri Jul 12 11:17:41 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sat Sep 23 21:34:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (recursive_hash): use RHASH_SIZE() to check hash size.
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): CGI content
-	  may be empty.  a patch from Jamis Buck <jamis at 37signals.com>.
+Fri Jul 12 00:20:00 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sat Sep 23 08:35:53 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* hash.c (rb_hash_size): use RHASH_SIZE().
 
-	* lib/rdoc/ri/ri_options.rb: prevent NameError.  [ruby-dev:29597]
+Fri Jul 12 00:08:24 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Sat Sep 23 01:04:20 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+	* hash.c (rb_hash_values): set array capa to RHASH_SIZE().
 
-	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.2.
+Thu Jul 11 23:54:45 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Fri Sep 22 02:06:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* hash.c (rb_hash_keys): set array capa to RHASH_SIZE().
 
-	* .cvsignore: ignore timestamp files and installed list file.
+Thu Jul 11 21:30:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep 22 01:36:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (rb_w32_pow): undef pow to get rid of infinite
+	  recursive call.  re-fix [Bug #8495].  [ruby-core:55923] [Bug #8621]
 
-	* instruby.rb: include FileUtils unconditionally.
+Thu Jul 11 20:18:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Sep 21 22:56:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/dl/win32/lib/win32/registry.rb (Win32::Registry::API#make_wstr):
+	  remove workaround to append WCHAR terminator.
 
-	* common.mk (no-install): not install rdoc actually.
+	* transcode.c (str_encode_associate): fill terminator after conversion.
 
-	* common.mk (install-doc, no-install-doc): use instruby.rb.
+	* string.c (rb_enc_str_new, rb_str_set_len, rb_str_resize): fill
+	  minimum length of the encoding as the terminator.
 
-	* instruby.rb: rdoc installation.
+	* string.c (str_buf_cat, rb_str_buf_append, rb_str_splice_0): ditto.
 
-	* ext/extmk.rb: expand ruby executable names.
+	* string.c (str_make_independent_expand, rb_str_modify_expand): make
+	  the capacity enough for multi-byte terminator.
 
-Thu Sep 21 13:55:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_string_value_cstr): fill minimum length of the encoding
+	  as the terminator.
 
-	* ext/etc/etc.c (etc_getpwuid): uid integer should be wraped in
-	  uid_t value.  [ruby-core:08897]
+	* string.c (rb_string_value_cstr): check null char in char, not in
+	  byte.
 
-	* ext/etc/etc.c (etc_getpwuid): uid_t may be bigger than plain
-	  'int' type.
+Thu Jul 11 14:48:35 2013  Zachary Scott  <e@zzak.io>
 
-Wed Sep 20 23:17:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c: Replace confusing example for #reverse_each in overview
+	  Patch by Earl St Sauver [Fixes documenting-ruby/ruby-12]
+	  https://github.com/documenting-ruby/ruby/pull/12
 
-	* common.mk (pre-install-doc): create data directory before install.
+Thu Jul 11 14:22:37 2013  Zachary Scott  <e@zzak.io>
 
-	* lib/mkmf.rb (dir_re): fixed typo.
+	* test/drb/ut_eq.rb: Use localhost for drb tests [Bug #7311]
+	  Patch by Vit Ondruch [ruby-core:49101]
+	* test/drb/ut_array.rb: ditto
+	* test/drb/ut_array_drbssl.rb: ditto
 
-	* lib/mkmf.rb (install_dirs): remove extra slash.
+Thu Jul 11 13:48:03 2013  Zachary Scott  <e@zzak.io>
 
-Wed Sep 20 09:53:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* sprintf.c: Fix typo patch by @hynkle [Fixes GH-357]
+	  https://github.com/ruby/ruby/pull/357
 
-	* {bcc32,win32,wince}/Makefile.sub (INSTALLED_LIST): need to define
-	  this macro to install.
+Thu Jul 11 13:00:34 2013  Zachary Scott  <e@zzak.io>
 
-Wed Sep 20 09:43:10 2006  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/securerandom.rb: Refactor conditions by Rafal Chmiel
+	  [Fixes GH-326] https://github.com/ruby/ruby/pull/326
 
-	* lib/net/imap.rb: allow extra spaces in responses.
-	  Thanks, Tom Soderlund. (backported from HEAD)
+Thu Jul 11 12:04:47 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Sep 20 09:25:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c: Don't use toom3 after once karatsuba is chosen.
+	  (mulfunc_t): New type.
+	  (bary_mul_toom3_start): Renamed from bary_mul.
+	  (bary_mul_karatsuba_start): Renamed from bary_mul.
+	  (bary_mul_balance_with_mulfunc): Renamed from bary_mul_balance and
+	  new argument, mulfunc, is added.
+	  (rb_big_mul_balance): Invoke bary_mul_balance_with_mulfunc with
+	  bary_mul_toom3_start.
+	  (bary_mul_karatsuba): Invoke bary_mul_karatsuba_start instead of
+	  bary_mul.
+	  (bary_mul_precheck): Extracted from bary_mul.
+	  (bary_mul_karatsuba_branch): Extracted from bary_mul.
+	  (bary_mul_karatsuba_start): New function to call bary_mul_precheck
+	  and bary_mul_karatsuba_branch.
+	  (bary_mul_toom3_branch): Extracted from bary_mul.
+	  (bary_mul_toom3_start): New function to call bary_mul_precheck and
+	  bary_mul_toom3_branch.
+	  (bary_mul): Just call bary_mul_toom3_start.
+	  Arguments for work memory are removed.
+	  (rb_cstr_to_inum): Follow the bary_mul change.
+	  (bigmul0): Ditto.
 
-	* ext/gdbm/gdbm.c: add RDoc documentation. a patch from Peter
-	  Adolphs <futzilogik at users dot sourceforge dot net>.
-	  [ruby-doc:1223]
+Thu Jul 11 10:46:38 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Sep 19 01:28:00 2006  Minero Aoki  <aamine@loveruby.net>
+	* tool/probes_to_wiki.rb: fix usage comment.  use Enumerable#grep
+	  which yields each elements to reduce unnecessary array.
 
-	* lib/fileutils.rb: backport from HEAD (rev 1.71).
+Thu Jul 11 10:09:18 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/fileutils.rb (FileUtils.cp_r): new option
-	  :remove_destination.
+	* process.c (rb_daemon): daemon(3) is implemented with fork(2).
+	  Therefore it needs rb_thread_atfork(). (and revert r41903)
 
-Tue Sep 19 00:42:15 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul 11 03:22:10 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* object.c (rb_obj_ivar_defined, rb_mod_cvar_defined): new methods,
-	  Kernel#instance_variable_defined? and Module#class_variable_defined?.
-	  [ruby-dev:29587]
+	* tool/probes_to_wiki.rb: adding a script to convert probes.d to wiki
+	  format for easy wiki updates.
 
-	* lib/date/format.rb (Date::Bag#method_missing): use new method,
-	  instance_variable_defined? to check if an instance variable is
-	  defined.  fixed: [ruby-dev:29554]
-	  -- This didn't fix anything.
+Thu Jul 11 00:54:07 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Sun Sep 17 23:44:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* man/ri.1: Incorrect use of .Dd macro [Bug #8620] by Tristan Hill
 
-	* lib/rdoc/rdoc.rb (RDoc::RDoc#document): scan only files modified
-	  after the previous generation.
+Thu Jul 11 00:48:29 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Sun Sep 17 17:42:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/delegate.rb: Add example for __setobj__ and __getobj__
+	  [Bug #8615] Patch by Caleb Thompson
 
-	* common.mk (install-doc): reverted.
+Wed Jul 10 23:29:22 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* instruby.rb: stores file name list without destdir prefix.
+	* lib/logger.rb: Use :call-seq: for method signature rdoc
 
-	* lib/rdoc/generators/ri_generator.rb: do not chdir twice.
+Wed Jul 10 23:23:18 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Sat Sep 16 23:14:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/logger.rb (#add): Remove incorrect rdoc for return value
+	  [Bug #8567] Reported by Tim Pease.
 
-	* ext/pty/pty.c (establishShell): remove remaining unused line.
+Wed Jul 10 23:12:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Sep 16 16:40:44 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_subpos): make public function.
 
-	* Makefile.in, common.in, instruby.rb, ext/extmk.rb, lib/mkmf.rb:
-	  use instruby.rb to install extensions instead of ext/extmk.rb.
+Wed Jul 10 22:44:19 2013  Tanaka Akira  <akr@fsij.org>
 
-	* instruby.rb: store installed list into the file.
+	* bignum.c: Add a static assertion for RBIGNUM_EMBED_LEN_MAX.
 
-	* ext/dbm/extconf.rb: allow multiple candidates for dbm-type.
+Wed Jul 10 22:31:25 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-	* ext/io/wait/extconf.rb: suspicious checking_for.
+	* string.c (rb_str_index): cache single byte flag and some
+	  cosmetic changes.
 
-	* ext/pty/pty.c (establishShell): parent pid is not used.
+Wed Jul 10 22:03:27 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/pty/pty.c (freeDevice): not used.
+	* bignum.c (bary_2comp): Don't use bary_plus_one.
+	  (bary_add_one): Replaced by the implementation of bary_plus_one.
 
-	* ext/pty/pty.c (get_device_once): removed garbage right brace.
+Wed Jul 10 20:48:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (checking_for): improved the messages.
+	* bignum.c (sizeof_bdigit_dbl): check sizeof(BDIGIT_DBL).
 
-Thu Sep 14 16:11:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* internal.h (STATIC_ASSERT): move from enum.c.
 
-	* string.c (rb_str_intern): raise SecurityError only when $SAFE
-	  level is greater than zero.  [ruby-core:08862]
+Wed Jul 10 20:08:21 2013  Tanaka Akira  <akr@fsij.org>
 
-	* parse.y (rb_interned_p): new function to check if a string is
-	  already interned.
+	* bignum.c (SIZEOF_BDIGIT_DBL): Add a ifdef guard for test.
 
-	* object.c (str_to_id): use rb_str_intern().
+Wed Jul 10 14:18:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Sep 13 18:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* process.c (fork_daemon): kill the other threads all and abandon the
+	  kept mutexes.
 
-	* README.EXT: English adjustment.  [ruby-core:08851] and
-	  [ruby-core:08852]
+Wed Jul 10 11:35:36 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed Sep 13 18:25:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/net/http/test_http.rb (TestNetHTTP_v1_2#test_get,
+	  TestNetHTTP_v1_2_chunked#test_get): shouldn't check
+	  HttpResponse#decode_content if Zlib is not available.
+	  ko1 complained via IRC.
 
-	* misc/ruby-mode.el (ruby-parse-partial): better here-doc support.
-	  a patch from Marshall T. Vandegrift <llasram at gmail.com>.
-	  [ruby-core:08804]
+Wed Jul 10 10:20:07 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Sep 13 16:43:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* tool/rbinstall.rb: always require rubygems to stabilize rubygems
+	  related status like whether Gem::Specification is defined or not.
 
-	* string.c (rb_str_intern): prohibit interning tainted string.
+	* tool/rbinstall.rb (Gem::Specification.unresolved_deps): define stub.
 
-Wed Sep 13 01:14:21 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jul 10 08:21:15 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/optparse.rb (OptionParser#getopts): works with pre-registered
-	  options.  [ruby-core:08826]
+	* lib/rubygems:  Import RubyGems 2.1
+	* test/rubygems:  Ditto.
 
-Sun Sep 10 20:27:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
+Wed Jul 10 07:34:34 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.1.
+	* lib/rubygems/ext/ext_conf_builder.rb:  Remove siteconf file after
+	  building the gem.
+	* test/rubygems/test_gem_ext_ext_conf_builder.rb:  Test for the above.
 
-Tue Jan 10 09:18:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rubygems/psych_tree.rb (module Gem):  Add backward compatibility
+	  for r41148
 
-	* eval.c (stack_extend): fixed prototype.
+	* test/rubygems/test_gem_package.rb:  Add backward compatibility for
+	  double-slash elimination.
 
-	* eval.c (rb_require_safe): prevent extension from loading twice.
-	  fixed: [ruby-dev:29523]
+Wed Jul 10 06:22:27 2013  Tadayoshi Funaba  <tadf@dotrb.org>
 
-Sat Sep  9 23:50:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831].
 
-	* bignum.c (rb_big_mul0): bignum multiplication without
-	  normalization.
+Wed Jul 10 00:41:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* bignum.c (rb_big_pow): use rb_big_mul0().  [ruby-dev:29547]
+	* bignum.c (bary_mul): x*1 is x.
 
-Sat Sep  9 14:08:38 2006  Eric Hodel  <drbrain@segment7.net>
+Tue Jul  9 22:24:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/test/unit/testcase.rb (Test::Unit::TestCase#run): Rescue
-	  Exception in Test::Unit::TestCase#run.  [ruby-core:08783]
+	* bignum.c (bary_mul1): No need to invoke MEMZERO at last.
+	  (bary_mul_single): Invoke MEMZERO here.
 
-Sat Sep  9 04:55:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul  9 21:40:01 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/pstore.rb: open all in binary mode, and get rid of the quirk of
-	  msvcrt.  fixed: [ruby-dev:29518]
+	* test/rexml/test_text.rb: Add missing tests for Text#<<.
+	  Reported by nagachika. Thanks!!!
 
-Sat Sep  9 04:54:42 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul  9 18:02:38 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* Makefile.in, win32/Makefile.sub (MINIRUBY): append MINIRUBYOPT.
+	* lib/fileutils.rb (FileUtils#chown_R): Do not skip traversal even
+	  if user and group are both nil, to be consistent with #chown and
+	  other commands.
 
-	* mkconfig.rb, ext/extmk.rb, lib/mkmf.rb, win32/mkexports.rb: suppress
-	  warnings with $VERBOSE.
+Tue Jul  9 17:58:26 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/extmk.rb: Proc#call does not pass the block in 1.8.
+	* test/fileutils/test_fileutils.rb
+	  (TestFileUtils#assert_output_lines): New utility assertion
+	  method for testing verbose output.
 
-	* win32/resource.rb: add more info.
+Tue Jul  9 17:43:57 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Sep  8 10:03:59 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/test_tracer.rb: catch up recent rubygems changes.
 
-	* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookies): new
-	  method to parse multiple cookies per Set-Cookie header.
-	  Thanks to Aaron Patterson <aaron_patterson at speakeasy.net>.
-	  [ruby-core:08802]
+Tue Jul  9 16:58:30 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri Sep  8 08:59:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb: hope that the final
+	  resolution to fix the failure of test-all.  and includes Win64
+	  support (fixed a potential bug).
 
-	* win32/Makefile.sub, win32/configure.bat win32/setup.mak: program
-	  name transform.
+Tue Jul  9 15:57:20 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Sep  8 01:33:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* object.c: Fix rdoc for Kernel#<=>. [Fixes GH-352]
 
-	* ruby.h (RSTRING_PTR): add migration macro.
+Tue Jul  9 15:53:51 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ruby.h (RARRAY_PTR): ditto.
+	* lib/fileutils.rb (FileUtils#mode_to_s): Define mode_to_s() also
+	  as singleton method, or FileUtils.chmod fails in verbose mode.
 
-Thu Sep  7 23:27:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jul  9 15:16:02 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* file.c (path_check_0, fpath_check): disable path check on cygwin.
-	  [ruby-talk:213074]
+	* test/fileutils/fileasserts.rb
+	  (Test::Unit::FileAssertions#assert_not_symlink): Add a missing
+	  optional argument "message".
 
-Wed Sep 06 12:05:19 2006  NARUSE, Yui  <naruse@ruby-lang.org>
+Tue Jul  9 15:03:24 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): fix regexp for euc-jp
-	  [ruby-dev:29344]
+	* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): If user
+	  and group are both nil, print ":".
 
-	* ext/nkf/lib/kconv.rb (Kconv::toeuc): remove -m0 [ruby-dev:29505]
+Tue Jul  9 12:47:08 2013  Masaki Matsushita  <glass.saga@gmail.com>
 
-Tue Sep  5 06:47:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* io.c (appendline): use READ_CHAR_PENDING_XXX macros and
+	  RSTRING_END().
 
-	* time.c (time_to_s): variable declaration after an execution
+	* io.c (rb_io_getline_1): rewrite nested if statement into one
 	  statement.
 
-Tue Sep  5 05:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* numeric.c (flo_hash): improve collision.  fixed: [ruby-dev:29352]
-
-Tue Sep  5 05:49:41 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (path_check_0): check if sticky bit is set on parent
-	  directories for executable path.  fixed: [ruby-dev:29415]
-
-Tue Sep  5 05:03:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (fix_plus): addition in Fixnum will never overflow
-	  long.  a patch from Ondrej Bilka <neleai at seznam.cz>.
-	  [ruby-core:08794]
-
-	* numeric.c (fix_minus): ditto.
-
-	* bignum.c (rb_big_pow): eagerly truncate resulting bignum.
-	  [ruby-core:08794]
-
-Mon Sep  4 23:15:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_to_s): make it conform to RFC2822 date format.
-	  [ruby-dev:29467]
-
-Mon Sep  4 21:43:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/dbm/extconf.rb: create makefile according to the result of check
-	  for dbm header.  fixed: [ruby-dev:29445]
-
-Mon Sep  4 21:42:35 2006  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb, lib/date/format.rb: updated based on date2 3.9.
-
-Mon Sep  4 21:14:20 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_strftime): include nul character.  fixed: [ruby-dev:29422]
-
-Mon Sep  4 16:29:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::out): specify -m0 -x option for nkf.
-	  [ruby-dev:29284]
-
-Mon Sep  4 16:13:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (pipe_open): command name should not contain null bytes.
-	  [ruby-dev:29421]
-
-	* process.c (proc_spawn): ditto.
-
-	* process.c (proc_spawn_n): ditto.
-
-	* process.c (rb_f_system): ditto.
-
-Sun Sep  3 15:32:44 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: get rid of nil.to_s.
-
-Sun Sep  3 06:24:38 2006  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/socket.c (ruby_connect): sockerrlen should be socklen_t.
-
-Sun Sep  3 04:40:42 2006  Tanaka Akira  <akr@fsij.org>
-
-	* ext/socket/extconf.rb: check arpa/inet.h for ntohs.
-
-	* ext/socket/socket.c: include arpa/inet.h if available.
-
-Sun Sep  3 02:34:55 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/unix.rb (DRbUNIXSocket#close): don't get path if client mode.
-	  [ruby-dev:29417]
-
-Sun Sep  3 01:45:17 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/acl.rb (ACLEntry#initialize): examine whether '*' is
-	  included before IPAddr.new. [ruby-dev:29406]
-
-Sat Sep  2 13:23:01 2006  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk (ia64.o): use the compiler driver to assemble ia64.s
-	  to use appropriate ABI.
-
-Sat Sep  2 03:36:22 2006  Tanaka Akira  <akr@fsij.org>
-
-	* common.mk, configure.in, defines.h, eval.c, gc.c, main.c,
-	  numeric.c, ruby.h, ia64.s: backport IA64 HP-UX support.
-
-Fri Sep  1 13:52:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/font.rb: TkFont#current_configinfo() doesn't work
-	  on Tcl/Tk8.x.
-
-Thu Aug 31 12:46:55 2006  why the lucky stiff  <why@ruby-lang.org>
-
-	* eval.c (ruby_init): rename top_cref to ruby_top_cref and export,
-	  along with ruby_cref, for use by the sandbox. [ruby-core:08762]
-
-	* node.h: ditto.
-
-Tue Aug 29 19:10:10 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* hash.c (rb_hash_s_create): fixed memory leak, based on the patch
-	  by Kent Sibilev <ksruby at gmail.com>.  fixed: [ruby-talk:211233]
-
-Mon Aug 28 11:36:02 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_rb.rb: Fix typo.  Submitted by
-	  <calamitas at gmail.com>.  [ruby-core:08724]
-
-Mon Aug 28 07:53:44 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/ri/ri_formatter.rb: Don't unescape HTML in HtmlFormatter.
-	  Submitted by Kent Sibilev <ksruby at gmail.com>.  [ruby-core:08392].
-
-Mon Aug 28 07:25:45 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* file.c (File#size?): Fix documentation submitted by Rick Ohnemus.
-	  ruby-Bugs-5529.  [ruby-core:08725]
-
-Sat Aug 26 08:07:13 2006  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb, lib/date/format.rb: updated based on date2 3.8.2.
-
-Fri Aug 25 22:32:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rexml/source.rb (REXML::IOSource#initialize): encoding have to
-	  be set with the accessor.  fixed: [ruby-list:42737]
-
-Fri Aug 25 17:15:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.8.5 released.
-
-Fri Aug 25 17:02:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_sweep): typo fixed.
-
-Tue Aug 22 18:47:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_method):
-	  rdoc documents C module methods as instance methods. a patch in
-	  [ruby-core:08536].
-
-Sat Aug 19 14:15:02 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub (config.status): include winsock2.h instead of
-	  winsock.h when --with-winsock2 is specified.
-	  fixed: [ruby-dev:29296]
-
-Sat Aug 19 11:28:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_rename): use errno if set properly.
-	  fixed: [ruby-dev:29293]
-
-Sat Aug 19 11:09:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (then): remove semicolon warning.  [ruby-dev:29299]
-
-Thu Aug 17 19:15:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_stat_[rRwWxX]): check for super user.
-	  fixed: [ruby-core:08616]
-
-Thu Aug 17 14:47:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: added rdoc by Daniel Berger.  [ruby-core:08177]
-
-Thu Aug 17 00:39:05 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/ring.rb (do_reply): Fix for RingServer fails to find a
-	  TupleSpace when TupleSpace resides in the same ruby process with
-	  RingServer. a patch from Kent Sibilev. [ruby-core:08453]
-
-Wed Aug 16 11:45:36 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_setuid, proc_setgid, proc_seteuid, proc_setegid):
-	  get rid of bogus implementations on Mac OS X.
-
-Tue Aug 15 19:10:18 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_class_comment): Fix
-	  broken class-level documentation.
-
-Wed Aug 16 11:09:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (set_arg0): fill argv other than the first with an empty
-	  string instead of NULL.
-
-Wed Aug 16 11:08:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.h: removed an excess macro.  fixed: [ruby-dev:29258]
-
-Tue Aug  8 23:49:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/extend-command.rb (IRB::ExtendCommandBundle): pacify
-	  RDoc.  a patch from Eric Hodel <drbrain at segment7.net>.
-	  [ruby-core:08522]
-
-Tue Aug  8 11:32:54 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* Makefile.in, common.mk, configure.in: fix for platforms without
-	  rm. patches from Yutaka kanemoto <kinpoco at gmail.com>.
-	  [ruby-dev:29215]
-
-Mon Aug  7 17:56:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c, ext/digest/rmd160/rmd160ossl.c,
-	  ext/digest/sha1/sha1ossl.c, ext/readline/readline.c: move
-	  incluion of config.h to pacify AIX.  a patch from Yutaka
-	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29197]
-
-Mon Aug  7 15:55:08 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/syck.c (syck_move_tokens): should avoid negative
-	  memmove.  [ruby-list:42625]
-
-Mon Aug  7 14:37:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in, common.mk: AIX link issue.  a patch from Yutaka
-	  Kanemoto <kinpoco at gmail.com>.  [ruby-dev:29190]
-
-	* ext/socket/socket.c: AIX socket support.  [ruby-dev:29190]
-
-Mon Aug  7 12:05:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dln.c, eval.c, gc.c, regex.c, ruby.h: shut up AIX alloca
-	  warning.  a patch from Yutaka Kanemoto <kinpoco at gmail.com>.
-	  [ruby-dev:29191]
-
-Sun Aug  6 20:40:41 2006  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (str[fp]time): %[EO]U didn't denote %U.
-
-Sat Aug  5 17:07:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (top_local_setup): local_vars[-1] should point
-	  ruby_scope itself to protect local_tbl from garbage collection.
-	  [ruby-dev:29049]
-
-Sat Aug  5 13:54:03 2006  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date/format.rb (str[fp]time): "%\n" means "\n".
-
-Fri Aug  4 15:21:00 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib: Merge RDoc and .document from HEAD.
-	* lib/drb/ssl.rb: Close socket on SSLError [ruby-core:7197]
-
-Fri Aug  4 19:13:41 2006  Keiju Ishitsuka  <keiju@ruby-lang.org>
-
-	* lib/irb/{init.rb,ruby-lex.rb,slex.rb}: can't input '\c' for
-	  [ruby-core: 7122].
-
-Fri Aug  4 14:02:14 2006  James Edward Gray II  <james@grayproductions.net>
-
-	* lib/date/format.rb (__strptime, strftime): allow multi-line patterns
-	  in Date#strftime the same as Time#strftime accepts.
-	  fixed: [ruby-core:08466]
-
-Fri Aug  4 13:56:51 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* pack.c (pack_pack): check argument overrun for 'P'.  based on a
-	  patch by rucila <rucila at yahoo.cojp>.  fixed: [ruby-dev:29182]
-
-Tue Aug  1 17:44:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (init_stdhandle): assign standard file handles.
-
-Tue Aug  1 12:24:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (Init_Binding): fix old commit miss.
-
-Mon Jul 31 17:08:20 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (exit_handler): new function; release winsock and
-	  environment work area.
-
-	* win32/win32.c (NTInitialize): setup exit_handler.
-
-	* win32/win32.c (StartSockets): use exit_handler.
-
-	* win32/win32.c (rb_w32_getenv): use GetEnvironmentStrings() instead
-	  of GetEnvironmentVariable(), because the latter cannot distinguish
-	  wheather a null environment variable exists or not.
-	  fixed: [ruby-talk:205123]
-
-Mon Jul 31 16:15:13 2006  Tanaka Akira  <akr@fsij.org>
-
-	* test/ruby/test_process.rb (TestProcess#test_rlimit_nofile):
-	  setrlimit may fail with EINVAL.
-	  reported by MIYAMUKO Katsuyuki.  [ruby-dev:29174]
-
-Mon Jul 31 13:38:22 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPReuqest#parse_uri): improve
-	  for the value of IPv6 address in the Host: header field.
-
-Mon Jul 31 09:22:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h: use ifdef (or defined) for macro constants that may or
-	  may not be defined to shut up gcc's -Wundef warnings.
-	  [ruby-core:08447]
-
-Sun Jul 30 23:26:22 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_call0): trace call/return of method defined from block.
-	  fixed: [ruby-core:08329]
-
-	* eval.c (rb_trap_eval): make the current thread runnable to deal with
-	  exceptions which occurred within the trap.  fixed: [ruby-dev:27729]
-
-	* lib/cgi/session.rb, lib/cgi/session/pstore.rb: suppress warnings.
-	  fixed: [ruby-talk:204896]
-
-Sat Jul 29 06:12:06 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: freeze ip_name for security reason.
-
-Sat Jul 29 01:23:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/logger.rb: improves the amount of documentation that Rdoc
-	  picks up when processing logger.rb by moving the require
-	  statement back before the comment block.  a patch from Hugh
-	  Sasse <hgs at dmu.ac.uk>.  [ruby-core:08422]
-
-Thu Jul 27 22:21:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (time_to_s): fixed format mismatch.
-
-Thu Jul 27 21:19:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* math.c (domain_check): a new function to check domain error
-	  explicitly for systems that return NaN like FreeBSD.
-	  [ruby-core:07019]
-
-	* math.c (math_acos, math_asin, math_acosh, math_atanh, math_log,
-	  math_log10, math_sqrt): use domain_check().
-
-	* math.c (math_sqrt): fix documentation flaw.
-
-Thu Jul 27 18:12:12 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* time.c: need to declare time_utc_offset.
-
-Thu Jul 27 17:01:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_close): always calls "close" method of the receiver.
-	  [ruby-core:6911] [ruby-core:8112]
-
-Thu Jul 27 16:49:01 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_to_s): use +0900 style timezone string for local time.
-	  [ruby-dev:29143]
-
-Thu Jul 27 16:41:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up
-	  Solaris compiler.  [ruby-core:08114]
-
-Wed Jul 26 22:20:59 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: add support for as and ASFLAGS.  [ruby-dev:29138]
-
-Wed Jul 26 22:13:45 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: sync with HEAD (rev 1.132).
-
-	* lib/net/http.rb (Net::HTTP#post, request_post, request): should
-	  set Content-Type: x-www-form-urlencoded by default.
-
-	* lib/net/http.rb (Net::HTTPHeader#content_type): should return
-	  nil when there's no Content-Type.
-
-	* lib/net/http.rb (Net::HTTPHeader#sub_type): should return nil
-	  when there's no sub Content-Type (e.g. "Content-Type: text").
-
-	* lib/net/http.rb (Net::HTTPHeader#type_params): wrongly failed
-	  when there's no Content-Type.
-
-Wed Jul 26 18:35:38 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: sync with HEAD (rev 1.25).
-
-	* ext/strscan/strscan.c (strscan_do_scan):
-	  StringScanner.new("").scan(//) should return "". [ruby-Bugs:4361]
-
-Wed Jul 26 18:14:19 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/pty/pty.c (getDevice): retry once after GC on failure.
-	  [ruby-core:08282]
-
-Wed Jul 26 17:28:16 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): prepend ".." to %u for negative bignum,
-	  but not "-".  fixed: [ruby-core:08167]
-
-Wed Jul 26 16:39:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_scan): add string modification check.
-	  [ruby-core:7216]
-
-Wed Jul 26 16:06:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): check
-	  multipart boundary end.  a patch from Fujioka <fuj at rabbix.jp>
-	  [ruby-dev:28470]
-
-Wed Jul 26 01:02:59 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in: suppress warnings by automake 1.8 or later.
-
-Tue Jul 25 00:30:06 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/prettyprint.rb: RD to RDoc conversion by Hugh Sasse.
-
-Tue Jul 25 14:49:51 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/mkmf.rb (configuration): typo.
-
-Tue Jul 25 13:14:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_proc_times): rename hz to hertz to avoid name
-	  crash on AIX.  [ruby-dev:29126]
-
-Mon Jul 24 22:03:40 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (backtrace): skip frames successive on node and method name.
-
-Mon Jul 24 17:55:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_system): add security check.  [ruby-talk:202947]
-
-	* process.c (rb_f_system): move signal right before fork to avoid
-	  signal handler intervention.
-
-Mon Jul 24 15:51:52 2006  Tanaka Akira  <akr@fsij.org>
-
-	* ext/readline/readline.c (readline_readline): rl_deprep_term_function
-	  may be NULL with libedit.  reported by Ryan Davis.  [ruby-dev:29070]
-
-Mon Jul 24 15:19:55 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jul  9 11:04:35 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* eval.c (rb_call0): revert last change.  [ruby-dev:29112]
-	  [ruby-core:08374]
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb (Win32::Registry#check):
+	  should report the position of the error.
 
-Sun Jul 23 22:59:49 2006  Tanaka Akira  <akr@fsij.org>
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb
+	  (Win32::Registry#QueryValue): workaround for test-all crash.
 
-	* test/socket/test_unix.rb: disabled on cygwin.
-	  reported by Kouhei Yanagita.  [ruby-dev:29080]
+Tue Jul  9 10:27:56 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Fri Jul 21 21:21:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_call0): include funcalled methods in caller list.
-	  fixed: [ruby-core:08290]
-
-Fri Jul 21 12:11:00 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb, lib/mkmf.rb (with_destdir): remove drive letter before
-	  prepending destdir on DOSISH.
-
-Thu Jul 20 15:07:14 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h: export classes/modules to implement sandbox.
-	  [ruby-core:08283]
-
-Thu Jul 20 00:06:29 2006  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/irb/completion.rb: support for completion of numeric
-	  number. [ruby-dev: 29038]
-
-Wed Jul 19 23:53:05 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb, lib/rss/utils.rb: added documents.
-
-Tue Jul 18 22:10:13 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_system): block SIGCHLD during the process
-	  execution, like glibc system(3) does.  [ruby-talk:202361]
-
-Tue Jul 18 23:12:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (open_ifs_socket): should not use plain malloc.
-
-	* win32/win32.c (rb_w32_opendir): should not use plain realloc.
-
-Tue Jul 18 18:05:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/ruby/test_float.rb (TestFloat::test_strtod): update test to
-	  conform strtod change.
-
-Tue Jul 18 15:49:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_unpack): propagate association array to copied
-	  string.  [ruby-core:08223]
-
-	* pack.c (pack_unpack): return referenced string itself if it has
-	  same length as specified.  a patch from <nobu at ruby-lang.org>
-	  in [ruby-core:08225].
-
-	* pack.c (pack_pack): taint 'p' packed strings.
-
-Tue Jul 18 14:03:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer::unmount): remove
-	  inpect argument from sprintf.  [ruby-dev:29039]
-
-Tue Jul 18 10:53:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_cstr_to_dbl): limit out-of-range message.
-
-	* util.c (ruby_strtod): return end pointer even if ERANGE occurred.
-	  fixed: [ruby-dev:29041]
-
-Mon Jul 18 00:43:05 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (ruby_strtod): stop at dot not followed by digits.
-	  fixed: [ruby-dev:29035]
-
-Tue Jul 18 00:01:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: remove LIBRUBY_SO if static linked extensions exist.
-
-Mon Jul 17 23:30:46 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (rb_cv_msvcrt): defaulted to msvcrt.  Workaround for a
-	  bug of cygwin 1.5.20.
-
-Mon Jul 17 13:43:05 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (define_swapx): should not use plain malloc.
-
-Mon Jul 17 12:58:41 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: should use ac_cv_lib_dl_dlopen=no on MinGW.
-
-Sat Jul 15 23:50:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_require_safe): wait for another thread requiring the same
-	  feature.  fixed: [ruby-core:08229]
-
-Sat Jul 15 01:27:13 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (has_magic): glob names contain alphabets to enable case fold
-	  search also for directories.  fixed: [ruby-talk:201917]
-
-Sat Jul 15 01:09:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.c (malloc): use xmalloc/xcalloc instead of plain
-	  malloc/calloc, to detect memory allocation failure.  see
-	  <http://www.nongnu.org/failmalloc/>.
-
-	* gc.c (rb_memerror): should not raise empty nomem_error.
-
-Fri Jul 14 13:08:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add methods for new features of latest Tcl/Tk8.5.
-
-	* ext/tk/lib/tk/namespace.rb: ditto.
-
-Fri Jul 14 02:30:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/monitor.rb: document patch from Hugh Sasse <hgs at dmu.ac.uk>.
-	  [ruby-core:08205]
-
-Fri Jul 14 01:09:46 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (then): error in warning action.
-
-Fri Jul 14 00:10:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_pop): may cause realloc oscillation.  a patch
-	  from MORITA Naoyuki <mlgetter at kidou.sakura.ne.jp>.
-	  [ruby-dev:29028]
-
-Thu Jul 13 22:23:56 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/composite.rb: improve handling of the classname on the
-	  option database for the widget class which includes TkComposite.
-
-Thu Jul 13 20:32:19 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb: updated documents by a patch from
-	  Hugh Sasse <hgs at dmu.ac.uk>. [ruby-core:8194]
-
-Wed Jul 12 13:54:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (then): we'd like to reserve colon here for the future.
-	  warning added.
-
-Tue Jul 11 20:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h: export rb_cMethod.  [ruby-talk:201259]
-
-Tue Jul 11 19:13:33 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: remove restriction on the class of
-	  pseudo-toplevel.
-
-Tue Jul 11 18:00:57 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: security fix.
-
-Tue Jul 11 17:33:39 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* string.c (rb_str_dump): need to extend len for \b.
-
-Mon Jul 10 22:00:00 2006  Shigeo Kobayashi  <shigek@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c: Allows '_' to appear within
-	  digits.  [ruby-dev:28872]
-
-	* ext/bigdecimal/lib/bigdecimal/util.rb: Bug in to_r reported by
-	  [ruby-list:42533] fixed.
-
-Mon Jul 10 19:22:19 2006  Tanaka Akira  <akr@fsij.org>
-
-	* gc.c (gc_sweep): expand heap earlier.
-	  reported by MORITA Naoyuki.  [ruby-dev:28960]
-
-Mon Jul 10 18:59:34 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/font.rb: sorry. mistaken to patch.
-
-Mon Jul 10 18:46:52 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: make SEGV risk lower at exit.
-
-	* ext/tk/lib/tk.rb: ditto.
-
-	* ext/tk/lib/multi-tk.rb: fail to call function-style methods on slave
-	  interpreters. The strategy (MultiTkIp_PseudoToplevel_Evaluable) to
-	  fix the problem is a little tricky. You may have to take care of
-	  conflicting with it.
-
-	* ext/tk/lib/tk.rb: a little change for the pseudo-toplevel strategy.
-
-	* ext/tk/lib/tk/font.rb: ditto.
-
-	* ext/tk/lib/tk/msgcat.rb: ditto.
-
-	* ext/tk/lib/tkextlib/itk/incr_tk.rb: ditto.
-
-	* ext/tk/sample/demos-en/widget: fail to call function-style methods
-	  on sample scripts. To fix it, a strategy which similar to the way
-	  on MultiTiIp is used. Please take care when re-write and re-run a
-	  demo script on the Widget-Demo code viewer.
-
-	* ext/tk/sample/demos-jp/widget: ditto.
-
-Mon Jul 10 13:58:40 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
-	  sigsend_to_ruby_thread, install_nativethread_sighandler):
-	  nativethread-support on signal handler. RE-backport from 1.9.
-
-	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
-
-	* eval.c (ruby_native_thread_kill): ditto.
-
-Mon Jul 10 10:54:14 2006  Ryan Davis  <ryand@zenspider.com>
-
-	* lib/rdoc/parsers/parse_f95.rb: massive overhaul from Yasuhiro
-	  Morikawa including new file suffixes, function support, public
-	  variables and constants, derived-types, defined operators and
-	  assignments, namelists, and subroutine and function
-	  arguments. Truly massive.
-
-	* lib/rdoc/diagram.rb: diagrams are now cached.
-
-	* lib/irb/completion.rb: fixed a crasher when completing against
-	  an unnamed class/module.
-
-	* lib/rdoc/parsers/parse_c.rb: private comment (--/++) support in
-	  C-file rdoc.
-
-	* lib/debug.rb: minor clarification in help.
-
-	* lib/pp.rb: minor clarification on exception.
-
-Mon Jul 10 09:29:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_clear_cache_for_undef): clear entries for included
-	  module.  fixed: [ruby-core:08180]
-
-Mon Jul 10 01:48:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.h (st_data_t): use pointer sized integer for st_data_t.
-	  [ruby-dev:28988]
-
-Sun Jul  9 18:06:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
-
-	* lib/mkmf.rb (create_makefile): prevent substitution of macro
-	  definition.  fixed: http://www.yotabanana.com/lab/20060624.html#p02
-
-Sun Jul  9 00:54:34 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (next_jump): deal with destination of next.
-	  fixed: [ruby-core:08169]
-
-Fri Jul  7 00:38:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_default): should not call default procedure if
-	  no key is given.  [ruby-list:42541]
-
-Fri Jul  7 00:29:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_mload): a patch from Daniel Berger
-	  <Daniel.Berger at qwest.com>.  [ruby-core:08128]
-
-Thu Jul  6 22:21:57 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (rb_proc_times): use sysconf(_SC_CLK_TCK) value prior to
-	  HZ and CLK_TCK.  fixed: [ruby-talk:200293]
-
-Thu Jul  6 22:17:21 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/racc/cparse/cparse.c: sync with original code, rev 1.8.
-
-	* ext/racc/cparse/cparse.c: should mark CparseParams objects.
-
-	* lib/racc/parser.rb: sync with original code, rev 1.8.
-
-	* lib/racc/parser.rb: update coding style.
-
-Mon Jul  3 19:04:38 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (ip_make_menu_embeddable): help to make a menu
-	  widget embeddable (pack, grid, and so on) like as a general widget.
-	  However, an embeddable menu may require to be definied some event
-	  bindings for general use.
-
-	* ext/tk/lib/tk/event.rb: [bug fix] Tk.callback_break and
-	  Tk.callback_continue don't work on MultiTkIp.
-
-	* ext/tk/lib/multi-tk.rb: ditto.
-
-	* ext/tk/lib/tk.rb: lack of Tk.callback_return.
-
-	* ext/tk/lib/tk/menu.rb: improve creating clone menus.
-
-Mon Jul  3 14:42:06 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/extconf.rb (PW_UID2VAL, PW_GID2VAL): defaulted to conversion
-	  from int, and sys/types.h needs to be included before grp.h.
-	  fixed: [ruby-dev:28938]
-
-Mon Jul  3 01:14:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_inspect): encode \b (\010) for escape.
-	  [ruby-dev:28927]
-
-	* string.c (rb_str_dump): ditto.
-
-Sun Jul  2 19:17:56 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/racc/cparse/cparse.c: sync with original code (rev 1.7).
-
-	* ext/racc/cparse/cparse.c: use rb_catch instead of rb_iterate.
-	  Giving a block to a Ruby-level method by rb_iterate is obsolete on
-	  Ruby 1.9.  Note that current cparse.c still includes one
-	  rb_iterate call on Ruby 1.8, but it is not a problem (at least
-	  just now).
-
-Sat Jul  1 15:15:49 2006  Tanaka Akira  <akr@m17n.org>
-
-	* test/socket/test_nonblock.rb: add timeout to send/receive
-	  an empty UDP packet.
-	  [ruby-dev:28820]
-
-Fri Jun 30 23:46:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: should test isinf for Solaris with GCC compiler.
-	  a patch from <ville.mattila at stonesoft.com>.  [ruby-core:07791]
-
-	* configure.in: -shared patch from Andrew Morrow
-	  <andrew.c.morrow at gmail.com>.  [ruby-core:08100]
-
-Thu Jun 29 18:58:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_version): fix patch
-	  failure.
-
-Thu Jun 29 18:00:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/bigdecimal/bigdecimal.c: add RDoc document.  a patch from
-	  mathew <meta at pobox.com>.   [ruby-core:07050]
-
-Wed Jun 28 15:47:14 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/optparse.rb: RDoc patch from Robin Stocker <robin@nibor.org>
-	  [ruby-core:08087]
-
-Wed Jun 28 19:04:34 2006  Tanaka Akira  <akr@m17n.org>
-
-	* test/socket/test_unix.rb: test_seqpacket_pair removed.
-	  [ruby-dev:28846]
-
-Tue Jun 27 23:03:49 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c: RDoc update for =~ method.  a patch from Alex Young
-	  <alex at blackkettle.org>.  [ruby-core:08068]
-
-Tue Jun 27 22:47:18 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: forgot to update TCLTKLIB_RELEASE_DATE.
-
-	* ext/tk/lib/tk.rb (tk_tcl2ruby): [bug fix] sometimes fail to convert
-	  a tcl string to a ruby object if the tcl string includes "\n".
-
-Tue Jun 27 16:04:05 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.h: define isascii on MinGW for msvcrt compatibility.
-
-	* configure.in: set ac_cv_header_sys_time_h=no on MinGW
-	  for msvcrt compatibility.
-
-Tue Jun 27 11:36:02 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/etc/etc.c (setup_passwd, setup_group): allow bignum uid, gid and
-	  so on.  [ruby-talk:199102]
-
-Mon Jun 26 13:37:27 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc: Merge from HEAD.
-	  Add options to limit the ri search path.
-
-Tue Jun 27 00:54:08 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* util.c (powersOf10): constified.
-
-Mon Jun 26 18:37:44 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (ip_delete): fix SEGV when a slave-ip is
-	  deleted on callback.
-
-Mon Jun 26 10:47:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (pipe_open): avoid closing uninitialized file descriptors.
-	  a patch from <tommy at tmtm.org> [ruby-dev:28600]
-
-Mon Jun 26 09:56:22 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch] (rb_w32_send, rb_w32_sendto): constified.
-
-Sun Jun 25 23:02:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in, mkconfig.rb: catch-up for latest autoconf.
-
-Sat Jun 24 06:35:00 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* signal.c: revert last change.
-
-	* ruby.h: ditto.
-
-	* eval.c: ditto.
-
-Thu Jun 22 11:52:02 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/net/http.rb (Net::HTTPResponse): duplicated error 501;
-	  HTTPInternalServerError should be error 500.  [ruby-core:08037]
-
-Thu Jun 22 05:15:58 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (sock_s_socketpair): try GC only once.
-	  [ruby-dev:28778]
-
-Wed Jun 21 21:28:32 2006  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (jd_to_commercial): now works fine even if in
-	  mathn-ized context.
-
-Wed Jun 21 17:32:31 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* signal.c (ruby_nativethread_signal, posix_nativethread_signal,
-	  sigsend_to_ruby_thread, install_nativethread_sighandler):
-	  nativethread-support on signal handler (backport from 1.9).
-
-	* ruby.h (HAVE_NATIVETHREAD_KILL): ditto.
-
-	* eval.c (ruby_native_thread_kill): ditto.
-
-Wed Jun 21 08:39:54 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/xmlrpc/create.rb (XMLRPC::Create::conv2value): merge Date
-	  and Time processing.  [ruby-core:08033]
-
-Wed Jun 21 01:40:25 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (yylex, reswords): modifier token is no longer returned in
-	  fname state.  [ruby-dev:28775]
-
-Wed Jun 21 01:12:46 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: RSS::Element.def_corresponded_attr_writer
-	  supported date type.
-
-Tue Jun 20 22:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_parser.rb: split parser tests into ...
-	* test/rss/test_parser_1.0.rb: ... RSS 1.0 parsing tests and ...
-	* test/rss/test_parser_2.0.rb: ... RSS 2.0 parsing tests.
-
-Tue Jun 20 21:19:06 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: provided default RSS::Element#children.
-
-	* lib/rss/0.9.rb: used default RSS::Element#children.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-
-Tue Jun 20 21:04:33 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: provided default RSS::Element#_tags.
-
-	* lib/rss/0.9.rb: used default RSS::Element#_tags.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-
-Tue Jun 20 20:47:07 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: hide RSS::Element.install_model.
-	  (RSS::Element.install_have_child_element,
-	   RSS::Element.install_have_children_element,
-	   RSS::Element.install_text_element,
-	   RSS::Element.install_date_element): call
-	  RSS::Element.install_model internally.
-
-	* lib/rss/0.9.rb: followed new API.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-Tue Jun 20 20:18:05 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: add check for OBJ_NAME_do_all_sorted.
-
-	* ext/openssl/ossl_cipher.c (ossl_s_ciphers): new method
-	  OpenSSL::Cipher.ciphers. it returns all the cipher names.
-
-	* ext/openssl/lib/openssl/cipher.rb:
-	  - add constants AES128, AES192, AES256. [ruby-dev:28610]
-	  - reimplement without eval()
-
-	* ext/openssl/lib/openssl/digest.rb: reimplement without eval().
-
-	* test/openssl/test_cipher.rb, test_digest: fix about reimplemented
-	  features.
-
-	* sample/openssl/cipher.rb: rewrite all.
-
-Sat Jun 19 11:21:46 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/test/unit/assertions.rb: Merge RDoc from HEAD.
-
-Tue Jun 20 01:06:57 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb:
-	  - cleanup validation mechanism. Now, #XXX_validation is
-	    needless.
-	  - changed internal variable name RSS::Element::MODEL to
-	    RSS::Element::MODELS.
-	  - RSS::Element.install_model requires uri.
-
-	* lib/rss/0.9.rb: followed new validation API.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-Mon Jun 19 23:40:59 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb: remove default -m0 and fix document.
-
-	* ext/nkf/nkf-8/{nkf.c, config.h, utf8tbl.c, utf8tbl.h}:
-	  imported nkf 2.0.7.
-
-Mon Jun 19 22:31:59 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb:
-	  - provided default #to_s as RSS::Element#to_s.
-	  - removed RSS::Element#other_element.
-	  - RSS::Element#tag requires attributes as Hash instead of Array.
-
-	* lib/rss/0.9.rb: removed #to_s to use RSS::Element#to_s.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* lib/rss/2.0.rb: removed #other_element.
-
-Mon Jun 19 22:09:16 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c(ole_invoke): support some kind of
-	  method of word. [ruby-Bugs#3237]
-
-	* ext/win32ole/tests/test_word.rb: ditto.
-
-	* ext/win32ole/tests/testall.rb: ditto.
-
-Mon Jun 19 00:02:17 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: automatically detected attributes.
-
-	* lib/rss/0.9.rb: removed #_attrs.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* lib/rss/parser.rb: followed new internal API.
-
-Mon Jun 19 00:00:17 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: fix bug: initialize improper tables.
-
-Sun Jun 18 22:36:13 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: RSS::Element#initialize accepts initial
-	  attributes.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* lib/rss/utils.rb: added Utils.element_initialize_arguments? to
-	  detect backward compatibility initial arguments.
-
-	* lib/rss/parser.rb: user initial attributes to initialize
-	  RSS::Element.
-
-Sun Jun 18 18:24:42 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/converter.rb: use NKF for Uconv fallback.
-
-Sun Jun 18 18:22:04 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_image.rb: shared name space configuration.
-
-Sun Jun 18 18:13:25 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: improved ignore_unknown_element
-	  handling. RSS::NotExpectedTagError provides tag URI.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/content.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* test/rss/rss-assertions.rb: checked URI of not expected tag too.
-	* test/rss/test_parser.rb: ditto.
-
-Sun Jun 18 18:08:36 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: changed empty namespace URI representation to ""
-	  from nil.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-
-Sun Jun 18 18:03:50 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/parser.rb: removed a guard for requiring open-uri.
-
-Sun Jun 18 18:01:26 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: fixed typo: except -> expect
-	* lib/rss/parser.rb: ditto.
-	* test/rss/rss-assertions.rb: ditto.
-	* test/rss/test_parser.rb: ditto.
-
-Sun Jun 18 17:52:39 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: RSS::Element#calc_indent became to be deprecated.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/taxonomy.rb: ditto.
-	* lib/rss/trackback.rb: ditto.
-
-	* test/rss/test_1.0.rb: removed RSS::Element.indent_size tests.
-	* test/rss/test_2.0.rb: ditto.
-
-Sun Jun 18 00:49:11 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (bsock_recv_nonblock): new method
-	  BasicSocket#recv_nonblock.
-	  (udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
-	  IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
-	  (unix_recvfrom_nonblock): removed.
-	  UNIXSocket#recvfrom_nonblock is removed.
-
-Sat Jun 17 22:17:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/mathn.rb (Integer::prime_division): raise ZeroDivisionError
-	  on zeros.  [ruby-dev:28739]
-
-Sat Jun 17 14:53:32 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb: backport from 1.9.
-	  (Kernel#Pathname): new method.
-
-Sat Jun 17 10:30:41 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (Hash#merge, Enumerable#sort_by): removed.
-
-	* lib/rss/rss.rb (RSS::RootElementMixin#to_xml): added.
-	  [ruby-talk:197284]
-
-	  We can convert RSS version easily like the following:
-	    rss10 = RSS::Parser.parse(File.read("1.0.rdf"))
-	    File.open("2.0.rss", "w") {|f| f.print(rss10.to_xml("2.0"))}
-
-	* test/rss/test_1.0.rb: added #to_xml test.
-	* test/rss/test_2.0.rb: ditto.
-
-	* test/rss/rss-testcase.rb: added some helper methods that
-	  generates sample RSS 2.0.
-
-	* sample/rss/convert.rb: added a sample script to convert RSS format.
-
-Sat Jun 17 10:23:22 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (Kernel#funcall): removed.
-	* lib/rss/parser.rb (Kernel.URI): removed.
-
-	* lib/rss/maker/: supported
-	    xxx.new_yyy do |yyy|
-	      yyy.zzz = zzz
-	      ...
-	    end
-	  style and this style became the style of the recommendation.
-
-	  Old style
-	    yyy = xxx.new_yyy
-	    yyy.zzz = zzz
-	    ...
-	  is supported too but this style isn't recommended.
-	  [ruby-talk:197284]
-
-	* test/rss/test_*maker*.rb: used new recommended style.
-
-Sat Jun 17 09:03:47 2006  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
-
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.5 -> 0.1.6.
-	* test/rss/test_version.rb (RSS::TestVersion#test_version): ditto.
-
-	* lib/rss/trackback.rb: added TrackBack prefix.
-	* lib/rss/maker/trackback.rb: ditto.
-
-	* lib/rss/rss.rb : removed needless argument 'prefix'.
-	* lib/rss/parser.rb: ditto.
-
-	* lib/rss/1.0.rb: added rdf:Bag.
-
-	* lib/rss/taxonomy.rb: implemented taxonomy module.
-	* test/rss/test_taxonomy.rb: added tests for taxonomy support.
-
-	* lib/rss/1.0.rb: added convenience method 'resources'.
-	* lib/rss/taxonomy.rb: ditto.
-	* test/rss/rss-assertions.rb: added test for 'resources'.
-	* test/rss/test_taxonomy.rb: ditto.
-
-	* lib/rss/rss.rb: fixed a indentation bug.
-	* lib/rss/taxonomy.rb: fixed <taxo:topic> #to_s bug.
-	* test/rss/test_taxonomy.rb: added a #to_s test.
-
-	* lib/rss/maker/taxonomy.rb: implemented taxonomy module for RSS
-	  Maker.
-	* lib/rss/taxonomy.rb: supported RSS Maker.
-	* lib/rss/maker.rb: added taxonomy module support.
-
-	* lib/rss/rss.rb: adjusted to other element API.
-	* lib/rss/1.0.rb: adjusted to other element API but backward
-	  compatibility is reserved.
-	* lib/rss/0.9.rb: ditto.
-
-	* test/rss/test_maker_taxo.rb: added test case for taxonomy module
-	  for RSS Maker.
-	* test/rss/test_setup_maker_1.0.rb: added tests for taxo:topic.
-
-	* test/rss/test_setup_maker_1.0.rb: added backward compatibility
-	  test.
-	* test/rss/test_setup_maker_0.9.rb: ditto.
-	* test/rss/test_setup_maker_2.0.rb: ditto.
-
-	* test/rss/rss-testcase.rb: added convenience method for setting
-	  up taxo:topic.
-	* test/rss/rss-assertions.rb: added assertion for taxo:topic.
-
-	* sample/rss/blend.rb: followed new API.
-
-	* lib/rss/taxonomy.rb: changed class or module prefix to
-	  Taxonomy from Taxo.
-	* lib/rss/maker/taxonomy.rb: ditto.
-
-	* test/rss/test_taxonomy.rb: use #reject directory.
-
-	* lib/rss/: use #__send__ instead of #send.
-	* test/rss/: ditto.
-
-	* lib/rss/parser.rb: added entity handling type predicate.
-	* lib/rss/rexmlparser.rb: ditto.
-	* lib/rss/xmlparser.rb: ditto.
-	* lib/rss/xmlscanner.rb: ditto.
-
-	* lib/rss/xmlscanner.rb: more robust entity handling.
-
-	* test/rss/test_parser.rb: added an entity handling test.
-
-	* test/rss/test_2.0.rb: added RSS 2.0 tests.
-	* test/rss/rss-assertions.rb: extended XML stylesheet assertion.
-	* lib/rss/0.9.rb: added initialize method.
-	* test/rss/test_1.0.rb: cleanup.
-
-	* lib/rss/image.rb: added Image prefix.
-	* lib/rss/maker/image.rb: ditto.
-
-	* lib/rss/rss.rb: improved type conversion.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-
-	* test/rss/test_2.0.rb: added type conversion tests.
-	* test/rss/test_accessor.rb: ditto.
-	* test/rss/test_to_s.rb: ditto.
-	* test/rss/test_syndication.rb: ditto.
-	* test/rss/test_setup_maker_2.0.rb: ditto.
-	* test/rss/test_setup_maker_1.0.rb: ditto.
-	* test/rss/test_setup_maker_0.9.rb: ditto.
-	* test/rss/test_maker_sy.rb: ditto.
-	* test/rss/test_maker_image.rb: ditto.
-	* test/rss/test_maker_2.0.rb: ditto.
-	* test/rss/test_maker_0.9.rb: ditto.
-	* test/rss/test_image.rb: ditto.
-
-	* test/rss/test_maker_1.0.rb: use assert instead of assert_equal.
-
-	* test/rss/rss-assertions.rb: improved type conversion assertions.
-
-	* lib/rss/rss.rb: added backward compatibility codes.
-	* lib/rss/parser.rb: ditto.
-	* test/rss/test_parser.rb: ditto.
-	* test/rss/test_2.0.rb: ditto.
-
-Sat Jun 17 02:01:00 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb
+	  (Win32::Registry.expand_environ): use suitable encoding for the
 	  string.
 
-Sat Jun 17 00:23:58 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (reswords): kDO_BLOCK was missing.  fixed: [ruby-core:7995]
-
-Sat Jun 17 00:02:15 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_propertyput): support
-	  PROPERTYPUTREF. [ruby-talk:183042]
-
-	* ext/win32ole/tests/test_propertyputref.rb: ditto.
-
-Thu Jun 15 23:02:47 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (fole_methods): The return value
-	  of WIN32OLE#ole_methods should include PROPERTYPUTREF methods.
-
-	* ext/win32ole/win32ole.c (fole_put_methods): The return value
-	  of WIN32OLE#ole_put_methods should include PROPERTYPUTREF methods.
-
-	* ext/win32ole/tests/test_ole_methods.rb: ditto.
-
-	* ext/win32ole/tests/testall.rb : ditto.
-
-Wed Jun 14 18:23:28 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* enum.c (enum_any): Documentation typo.
-
-Wed Jun 14 15:01:09 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser#warn): Don't print
-	  warnings when -q is set.
-
-Wed Jun 14 23:03:53 2006  Tanaka Akira  <akr@m17n.org>
-
-	* configure.in: check sizeof(rlim_t).
-	  check setrlimit.
-
-	* process.c (proc_getrlimit): new method Process.getrlimit.
-	  (proc_setrlimit): new method Process.setrlimit.
-
-	* ruby.h (NUM2ULL): new macro.
-
-Mon Jun 12 22:25:09 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): adjust precision length to prevent
-	  splitting multi-byte characters.  [ruby-list:42389]
-
-Sun Jun 11 23:20:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::Arguable#getopts): pass self to the
-	  parser.
-
-Sun Jun 11 10:00:57 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.h (write): not need to define on bcc.
-
-Sun Jun 11 08:30:33 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#getopts): new methods.
-
-Sat Jun 10 18:02:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/bigdecimal/lib/bigdecimal/newton.rb (Newton::nlsolve): typo
-	  fixed: raize -> raise.  [ruby-talk:196608]
-
-Thu Jun  8 14:19:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch] (rb_w32_read, rb_w32_write): new functions.
-	  use recv() and send() when fd is socket. fixed: [ruby-dev:28694]
-
-Wed Jun  7 16:22:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
-	  basename and pid.  [ruby-talk:196272]
-
-Wed Jun  7 14:53:04 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (errmap): add some winsock errors.
-
-Wed Jun  7 11:34:38 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in: add new configure option `--with-winsock2' for mingw.
-
-	* win32/Makefile.sub (config.h): define USE_WINSOCK2 in config.h
-	  instead of in CPPFLAGS.
-
-	* ext/socket/extconf.rb: determine whether to use winsock2 or not
-	  by using with_config.
-
-Wed Jun  7 10:45:10 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/{configure.bat, setup.mak, Makefile.sub, win32.h}: add
-	  new configure option `--with-winsock2'.
-
-	* win32/win32.c (StartSockets): ditto.
-
-	* ext/socket/extconf.rb: ditto.
-
-	* win32/win32.c (open_ifs_socket): new function.
-
-	* win32/win32.c (StartSockets, rb_w32_socket): use open_ifs_socket()
-	  instead of socket().
-	  ifs socket support is backported from trunk.
-
-Wed Jun  7 09:14:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): binding for the return event hook should have
-	  consistent scope.  [ruby-core:07928]
-
-	* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
-	  event_hooks.	no guarantee for arbitrary hook deletion.
-	  [ruby-dev:28632]
-
-Mon Jun  5 18:12:12 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject
-	  non-AF_INET/AF_INET6 sockaddr.
-	  (sock_s_unpack_sockaddr_un): reject non-AF_UNIX sockaddr.
-	  [ruby-dev:28691]
-
-Sun Jun  4 20:40:19 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c: fix sockaddr_un handling.
-	  [ruby-dev:28677]
-
-Fri Jun  2 22:08:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/forwardable.rb: RDoc typo fix from Jan Svitok
-	  <jan.svitok at gmail.com>.  [ruby-core:07943]
-
-Fri Jun  2 19:02:09 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: use create_header.
-
-	* ext/openssl/ossl.h, ext/openssl/openssl_missing.h:
-	  include RUBY_EXTCONF_H.
-
-Fri Jun  2 17:16:52 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (CLEANINGS): remove extconf.h by distclean if created.
-
-Fri Jun  2 00:11:19 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ext/socket/socket.c (s_recvfrom): alen may be zero with UNIXSocket
-	  too.  (tested on NetBSD 3.0)
-	  (s_recvfrom_nonblock): extracted from sock_recvfrom_nonblock.
-	  (sock_recvfrom_nonblock): use s_recvfrom_nonblock.
-	  (ip_recvfrom_nonblock): new method: IPSocket#recvfrom_nonblock
-	  (unix_recvfrom_nonblock): new method: UNIXSocket#recvfrom_nonblock
-	  (s_accept_nonblock): extracted from sock_accept_nonblock.
-	  (sock_accept_nonblock): use s_accept_nonblock.
-	  (tcp_accept_nonblock): new method: TCPServer#accept_nonblock
-	  (unix_accept_nonblock): new method: UNIXServer#accept_nonblock
-
-Thu Jun  1 19:12:37 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_cmdvector): backslashes inside single-quotes
-	  no longer has special meanings.  fixed: [ruby-list:42311]
-
-Thu Jun  1 16:14:41 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_getcwd): runtime's getcwd() will not success
-	  if the length of the cwd is longer than MAX_PATH.
-	  fixed [ruby-list:42335]
-
-Thu Jun  1 11:29:14 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_getcwd): set errno if not set.
-	  fixed [ruby-list:42346]
-
-Sat May 27 11:29:46 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): remove extinit files if no statically linked
-	  extensions.
-
-Fri May 26 09:05:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* ruby.h, lib/mkmf.rb (create_header): clear command line options for
-	  macros moved to extconf.h.
-
-	* ext/extmk.rb (extract_makefile, extmk): made RUBY_EXTCONF_H and
-	  EXTSTATIC permanent.
-
-	* ext/{dbm,digest/*,socket,zlib}/extconf.rb: used $defs and $INCFLAGS.
-
-	* {bcc32,win32,wince}/Makefile.sub (COMPILE_C, COMPILE_CXX): added
-	  $(INCFLAGS).
-
-	* lib/mkmf.rb (configuration): add $defs unless extconf.h was created.
-
-Thu May 25 01:52:07 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (pkg_config): particular config commands support.
-
-	* ext/extmk.rb: deal with $static set in extconf.rb.
-
-	* mkconfig.rb: merge multiple entries to an entry with multiple lines.
-
-	* lib/mkmf.rb: allow a series of commands to link.
-
-	* win32/Makefile.sub: embed manifests.
-
-	* win32/setup.mak: suffix OS name by runtime version.
-
-Wed May 24 23:52:11 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* configure.in (ac_install_sh): ignore dummy install-sh.
-	  [ruby-talk:193876]
-
-Wed May 24 03:10:48 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/ssl.rb
-	  (OpenSSL::SSL::SocketForwarder#setsockopt,getsockopt): typo fixed.
-
-Mon May 22 17:54:12 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_recvfrom_nonblock): use rb_read_pending
-	  instead of rb_io_read_pending.
-	  [ruby-dev:28663]
-
-Mon May 22 17:30:04 2006  Tanaka Akira  <akr@m17n.org>
-
-	* rubyio.h (rb_io_set_nonblock): declared.
-
-	* io.c (rb_io_set_nonblock): new function.
-	  (io_getpartial): nonblocking read support.
-	  (io_read_nonblock): new method: IO#read_nonblock.
-	  (io_write_nonblock): new method: IO#write_nonblock.
-
-	* ext/socket/socket.c
-	  (sock_connect_nonblock): new method: Socket#connect_nonblock.
-	  (sock_accept_nonblock): new method: Socket#accept_nonblock.
-	  (sock_recvfrom_nonblock): new method: Socket#recvfrom_nonblock.
-
-	  [ruby-core:7917]
-
-Mon May 22 15:57:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (umethod_bind): should not update original class.
-	  [ruby-dev:28636]
-
-Mon May 22 13:38:57 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ev_const_get): should support constant access from
-	  within instance_eval().  [ruby-dev:28327]
-
-Thu May 18 17:51:32 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_timeval): should round for usec floating
-	  number.  [ruby-core:07896]
-
-	* time.c (time_add): ditto.
-
-Thu May 18 17:11:45 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi.rb (CGI::out): support utf-8.  a patch from Fujioka
-	  <fuj at rabbix.jp>.  [ruby-dev:28649]
-
-Thu May 18 00:42:12 2006  nobuyoshi nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb, lib/mkmf.rb: use BUILD_FILE_SEPARATOR in Makefiles.
-
-Wed May 17 17:55:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (sys_warning): should not call a vararg function
-	  rb_sys_warning() indirectly.  [ruby-core:07886]
-
-Wed May 17 08:17:15 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): try to reduce errors using powersOf10
-	  table.  [ruby-dev:28644]
-
-Tue May 16 15:34:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize): should not allow modifying literal
-	  regexps.  frozen check moved from rb_reg_initialize_m as well.
-
-Tue May 16 09:20:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_initialize): should not modify untainted objects in
-	  safe levels higher than 3.
-
-	* re.c (rb_memcmp): type change from char* to const void*.
-
-	* dir.c (dir_close): should not close untainted dir stream.
-
-	* dir.c (GetDIR): add tainted/frozen check for each dir operation.
-
-Mon May 15 17:42:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
-	  typo fixed.  a patch from Florian Gross <florg at florg.net>.
-
-Sat May 13 16:14:05 2006  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (PP.mcall): new method.
-	  (Struct#pretty_print): call Kernel#class and Struct#members even if
-	  overridden.
-	  (Struct#pretty_print_cycle): ditto.
-	  [ruby-core:7865]
-
-Thu May 11 19:57:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): differ addition to minimize error.
-	  [ruby-dev:28619]
-
-Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
-
-Thu May 11 18:10:43 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): should not raise ERANGE when the input
-	  string does not have any digits.  [ruby-dev:28629]
-
-Sun May  7 03:09:51 2006  Stephan Maka  <stephan@spaceboyz.net>
-
-	* lib/resolv.rb (Resolv::DNS::Requester::ConnectedUDP#initialize):
-	  Use AF_INET6 for nameservers containing colons.
-
-Sat May  6 00:38:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (trap): sig should be less then NSIG.  Coverity found
-	  this bug.  a patch from Kevin Tew <tewk at tewk.com>.
-	  [ruby-core:07823]
-
-Thu May  4 02:24:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
-	  uninitialized array element.  a patch from Pat Eyler
-	  <rubypate at gmail.com>.  [ruby-core:07809]
-
-	* array.c (rb_ary_fill): initialize local variables first.  a
-	  patch from Pat Eyler <rubypate at gmail.com>.  [ruby-core:07810]
-
-	* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
-	  type_tag.  a patch from Pat Eyler <rubypate at gmail.com>.
-	  [ruby-core:07808]
-
-Wed May  3 02:12:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (make_hostent_internal): accept ai_family
-	  check from Sam Roberts <sroberts at uniserve.com>.
-	  [ruby-core:07691]
-
-Mon May  1 12:23:19 2006    <sinara@blade.nagaokaut.ac.jp>
-
-	* numeric.c (num_div): use floor rather than rb_Integer().
-	  [ruby-dev:28589]
-
-	* numeric.c (flo_divmod): the first element of Float#divmod should
-	  be an integer. [ruby-dev:28589]
-
-	* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
-
-Sat Apr 29 22:42:08 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode0): should initialize
-	  flag. [ruby-core:07785]
-
-Fri Apr 28 10:53:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): should not cut off 18 digits for no
-	  reason.  [ruby-core:07796]
-
-	* util.c (ruby_strtod): fixed wrong conversion.
-
-Thu Apr 27 01:38:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_fill): internalize local variable "beg" to
-	  pacify Coverity.  [ruby-core:07770]
-
-Wed Apr 26 16:59:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_unpack): now supports CRLF newlines.  a patch from
-	  <tommy at tmtm.org>.  [ruby-dev:28601]
-
-Tue Apr 25 18:00:05 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (delete_slaves): maybe increment the reference
-	  count of a NULL Tcl_Obj [ruby-core:07759].
-
-Tue Apr 25 07:55:31 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/jcode.rb (String::tr_s): should have translated non
-	  squeezing character sequence (i.e. a character) as well.  thanks
-	  to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
-
-Tue Apr 25 00:08:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): should check if c is not a
-	  multibyte character.  a patch from KIMURA Koichi
-	  <kimura.koichi at canon.co.jp>.  [ruby-dev:28598]
-
-Fri Apr 21 15:19:13 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c (lib_eventloop_ensure): refer freed pointer
-	  [ruby-core:07744] and memory leak.
-
-Fri Apr 21 12:14:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c: document update patch from Sam Roberts
-	  <sroberts at uniserve.com>.  [ruby-core:07701]
-
-Wed Apr 19 13:55:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (arg): too much NEW_LIST()
-
-	* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
-
-Wed Apr 19 11:57:04 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
-	  [ruby-dev:28585]
-
-	* parse.y (list_concat): revert last change.
-
-	* parse.y (arg): use NODE_ARGSCAT for placeholder.
-
-Wed Apr 19 11:13:17 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
-	  mathew <meta at pobox.com>.  [ruby-core:07738]
-
-Wed Apr 19 10:13:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_const_set): raise error when no target klass is
-	  supplied.  [ruby-dev:28582]
-
-Wed Apr 19 09:49:36 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (list_concat): should not modify nodes other than
-	  NODE_ARRAY.  [ruby-dev:28583]
-
-Tue Apr 18 17:40:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: add a binding to a container for a slave IP.
-
-	* ext/tk/lib/tk.rb: update RELEASE_DATE.
-
-	* ext/tk/tcltklib.c: forget to reset a Tcl interpreter.
-
-	* ext/tk/stubs.c: fix potential bugs about handling rb_argv0.
-
-Tue Apr 18 00:11:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c: block_unique should be 1, not frame_unique.
-	  [ruby-dev:28577]
-
-Fri Aug 11 15:39:25 2006  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#find_body): Make RDoc
-	  ignore C function prototypes.  Patch by Tilman Sauerbeck
-	  <tilman at code-monkey.de>.  [ruby-core:8574]
-	* lib/yaml/tag.rb: Replace nodoc with stopdoc so Module methods get
-	  documented.
-
-Mon Apr 10 01:03:10 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* prec.c (prec_prec_f): documentation patch from
-	  <gerardo.santana at gmail.com>.  [ruby-core:07689]
-
-Sat Apr  8 02:34:34 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_pow): second operand may be too big even if
-	  it's a Fixnum.  [ruby-talk:187984]
-
-Sat Apr  8 02:12:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* README.EXT: update symbol description.  [ruby-talk:188104]
-
-Thu Apr  6 23:28:47 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* COPYING: explicitly note GPLv2.  [ruby-talk:187922]
-
-Thu Apr  6 11:18:37 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/panedwindow.rb: lack of arguments. [ruby-core:7681]
-
-Thu Apr  6 01:04:47 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tcltklib.c: fix SEGV when embedding to an application.
-	  [ruby-core:7600]
-
-	* ext/tk/tcltklib.c: fix SEGV at exit. [ruby-talk:186489]
-
-	* ext/tk/tkutil/tkutil.c: follow to changing specification of
-	  instance_eval on ruby-1.9.x.
-
-	* ext/tk/lib/tk.rb: ditto.
-
-	* ext/tk/lib/multi-tk.rb: ditto.
-
-	* ext/tk/lib/tk.rb: remove warning about redefinition of methods.
-
-	* ext/tk/lib/tk/variable.rb: remove warning about unseting Tcl
-	  variables.
-
-Wed Mar 29 20:54:44 2006  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (fole_getproperty): WIN32OLE#[] should accept
-	  multi arguments.
-
-	* ext/win32ole/tests/testWIN32OLE.rb (test_setproperty_bracket): ditto.
-
-Wed Mar 29 10:07:44 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (nkf_each_char_to_hex, encode_fallback_subchar,
-	  e2w_conv): support C90 compiler.
-
-Wed Mar 29 06:48:40 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (backtrace): reports aliased method names in a generated
-	  backtrace.  a patch from "U.Nakamura" <usa at garbagecollect.jp>.
-	  [ruby-dev:28471]
-
-Mon Mar 27 22:19:09 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/{nkf.c, utf8tbl.c, config.h}: imported nkf 2.0.6.
-	  * Add --ic / --oc option and mapping tables.
-	  * Add fallback option.
-	  * Add --no-best-fit-chars option.
-	  * Fix some bugs.
-
-	* ext/nkf/nkf.c (nkf_split_options): added for parse option string.
-
-	* ext/nkf/lib/kconv.rb (Kconv.to*): add -m0.
-	  Note that Kconv.to* still imply -X.
-
-Mon Mar 27 03:17:21 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): insecure calling should be checked for non
-	  NODE_SCOPE method invocations too.
-
-	* eval.c (rb_alias): should preserve the current safe level as
-	  well as method definition.
-
-Fri Mar 24 23:14:30 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (yield_under_i): pass self again for instance_eval().
-	  [ruby-dev:28466]
-
-Fri Mar 24 17:20:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_sleep): remove description about SIGALRM which
-	  is not valid on the current implementation.  [ruby-dev:28464]
-
-Thu Mar 23 10:47:03 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (method_missing): should support argument splat in
-	  super.  [ruby-talk:185438]
-
-Mon Mar 20 12:05:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: Solaris SunPro compiler -rapth patch from
-	  <kuwa at labs.fujitsu.com>.  [ruby-dev:28443]
-
-Mon Mar 20 09:40:23 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: remove enable_rpath=no for Solaris.
-	  [ruby-dev:28440]
-
-Fri Mar 17 19:08:49 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: fix typo.
-	  [ruby-core:07571]
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb (Win32::Registry#read):
+	  should return REG_SZ, REG_EXPAND_SZ and REG_MULTI_SZ values with
+	  the expected encoding -- assumed as the same encoding of name.
 
-Wed Mar 15 16:54:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jul  9 10:02:45 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/mkmf.rb (create_makefile): support libraries without *.so.
-
-Wed Mar 15 16:35:43 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c, ext/openssl/ossl_nsspki.c: should use
-	  "rb_str_new(0, 0)" to make empty string.
-
-Sat Mar 11 14:24:06 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::wrap): removed
-	  space before argument parenthesis.  [ruby-talk:183630]
-
-	* ruby.1: a clarification patch from David Lutterkort
-	  <dlutter at redhat.com>.  [ruby-core:7508]
-
-Sat Mar  4 15:26:40 2006  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (id2ref): fix symbol test.
-
-Sat Mar  4 01:08:07 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
-	  directories.  a patch from Eric Hodel <drbrain at segment7.net>.
-	  [ruby-core:07423]
-
-Thu Mar  2 19:44:18 2006  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c: align VALUE with sizeof(RVALUE) globally.
-	  (is_pointer_to_heap): check alignment out of loop.
-	  (id2ref): avoid collision between symbols and objects.
-	  (rb_obj_id): ditto.  moved from object.c.
-	  [ruby-talk:178364] [ruby-core:7305]
-
-Thu Mar  2 18:58:18 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_fd_writable): should not re-schedule output
-	  from KILLED thread (must be error printing).
-
-Thu Mar  2 17:57:49 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
-	  [ruby-core:7474]
-
-Thu Mar  2 12:59:14 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (filetime_to_unixtime): should set tm_isdst to -1.
-	  stat() didn't treat daylight saving time property on WinNT.
-	  [ruby-talk:182100]
-
-Thu Mar  2 08:02:42 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (add_heap): heap_slots may overflow.  a patch from Stefan
-	  Weil <weil at mail.berlios.de>.
-
-Wed Mar  1 00:24:31 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/rdoc/parsers/parse_rb.rb (read_escape): could not handle /\^/.
-	  merged Mr. Ishizuka's lib/irb/ruby-lex.rb 's patch rev 1.29.
-	  [ruby-talk:181631] [ruby-dev:28404]
-
-Tue Feb 28 09:32:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/drb/extservm.rb (invoke_service_command): cannot invoke command
-	  if command name is quoted on mswin32. [ruby-dev:28400]
-
-Mon Feb 27 00:19:16 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ruby.h (SYM2ID): should not cast to signed long.
-	  [ruby-core:07414]
-
-Fri Feb 24 20:07:23 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/drbtest.rb (add_service_command): quote pathnames in the
-	  server's command line for space contained directory names.
-	  Thanks, arton. [ruby-dev:28386]
-
-Fri Feb 24 12:11:08 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* instruby.rb: install *.exe.manifest and *.dll.manifest if exist.
-	  It's for VC++8.
-
-Fri Feb 24 11:33:52 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub (HAVE_HYPOT): bcc32 has hypot().
-
-Fri Feb 24 11:19:58 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (time_new_internal): add prototype to tell the compiler
-	  arugments types.
-
-	* win32/win32.c (NtInitialize): need to set a handler for VC++8.
-
-Fri Feb 24 08:19:16 2006  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* test.rb: Removed.  Obsolete by test/nkf.
-
-	* ext/.document: enabled documents in nkf and kconv
-
-	* ext/nkf/nkf.c ext/nkf/lib/kconv.rb: Add rdoc.
-
-Thu Feb 23 22:39:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: use borlndmm.dll if possible. bcc32's RTL internal
-	  memory manager cannot handle large memory block properly.
-	  ex: 10000.times { "" << "." * 529671; GC.start } # crash
-	  [ruby-dev:28230]
-
-Thu Feb 23 13:20:28 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* eval.c (SETUP_ARGS0): fixed memory corruption. [ruby-dev:28360]
-
-Tue Feb 21 02:18:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in (mingw): have link.  [ruby-list:41838]
-
-	* win32/Makefile.sub (config.h): ditto.
-
-Tue Feb 21 02:07:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (f_arglist): should set command_start = Qtrue for
-	  command body.  [ruby-talk:180648]
-
-Mon Feb 20 17:37:26 2006  Tanaka Akira  <akr@m17n.org>
-
-	* mkconfig.rb: alias RbConfig for Config.
-
-Mon Feb 20 12:27:53 2006  Kent Sibilev  <ksruby@gmail.com>
-
-	* lib/rational.rb (Integer::gcd): small typo fix.
-	  [ruby-core:07395]
-
-Mon Feb 20 01:05:27 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rational.rb (Integer::gcd): replaced by gcd4 in
-	  [ruby-core:07390].  [ruby-core:07377]
-
-Mon Feb 20 00:57:02 2006  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.h (OSSL_Debug): should not use __func__.
-	  [ruby-dev:28339]
-
-Sun Feb 19 04:46:29 2006  Guy Decoux  <ts@moulon.inra.fr>
-
-	* eval.c: initial value for block_unique must be 1.
-	  [ruby-talk:180420]
-
-Sat Feb 18 23:58:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tracer.rb (Tracer::Tracer.add_filter): turn on tracer mode
-	  only when caller() level size is one.  [ruby-core:07389]
-
-	* lib/rdoc/parsers/parse_rb.rb: need not to require "tracer".
-	  [ruby-core:07389]
-
-	* sample/rtags.rb: ditto.
-
-Sat Feb 18 12:18:26 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::fu_world_writable): make it
-	  private.  [ruby-core:07383]
-
-Sat Feb 18 00:22:39 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tracer.rb: merged a minor clarification patch from Daniel
-	  Berger <Daniel.Berger at qwest.com>.  [ruby-core:07376]
-
-Fri Feb 17 11:18:42 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* util.c (ruby_strtod): Float("1e") should fail. [ruby-core:7330]
-
-	* pack.c (EXTEND32): unpack("l") did not work where sizeof(long) != 4.
-	  [ruby-talk:180024]
-
-	* pack.c (pack_unpack): fixed integer overflow on template "w".
-	  [ruby-talk:180126]
-
-Fri Feb 17 09:39:29 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_wait_for): sleep should always sleep for
-	  specified amount of time.  [ruby-talk:180067]
-
-Thu Feb 16 01:10:48 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (backtrace): frame->orig_func may not be initialized.
-	  [ruby-core:07367]
-
-Wed Feb 15 16:52:52 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): NODE_OP_ASGN1 should allow splat in its
-	  argument list.  [ruby-core:07366]
-
-	* parse.y (arg): avoid unnecessary extra argument.
-	  [ruby-core:07366]
-
-	* eval.c (rb_eval): honor visibility on OP_ASGN1 and
-	  OP_ASGN2. [ruby-core:07366]
-
-Wed Feb 15 10:09:51 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (yield_under_i): should not pass self as an argument to
-	  the block for instance_eval.  [ruby-core:07364]
-
-Wed Feb 15 09:20:35 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_obj_instance_eval): should be no singleton classes for
-	  true, false, and nil.  [ruby-dev:28186]
-
-Tue Feb 14 18:48:33 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (DMETHOD_P): accessing wrong frame.  [ruby-dev:28181]
-
-	* eval.c (proc_invoke): preserve FRAME_DMETH flag.
-
-Tue Feb 14 15:13:51 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/zlib/zlib.c: supress warning on test/zlib. [ruby-dev:28323]
-
-Tue Feb 14 14:01:17 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* time.c (search_time_t): support non 32bit time_t environments.
-
-	* win32/Makefile.sub (config.h): VC++8 has ``long long'' type.
-
-	* win32/Makefile.sub (config.h): VC++8's time_t is 64bit value.
-
-	* win32/win32.c (rb_w32_utime): drop read-only attribute before
-	  changing file time.
-
-	  all changes are backported from CVS HEAD.
-
-Tue Feb 14 11:21:38 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_forward): should not use frame->argv.
-	  [ruby-core:07358]
-
-Mon Feb 13 18:08:12 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call0): argument update propagation.  [ruby-dev:28044]
-
-	* env.h: remove argv member from struct FRAME.
-
-Mon Feb 13 13:27:00 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): should push class from binding if supplied.
-	  [ruby-core:07347]
-
-Mon Feb 13 00:04:00 2006  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/erb.rb (ERB::Compiler): add instance variable @insert_cmd to
-	  change <%='s behavior. (backported 1.15 - 1.16)
-
-Sat Feb 11 02:04:11 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): no need to push ruby_class.  [ruby-dev:28176]
-
-Sat Feb 11 01:57:44 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_autoload): check if ruby_cbase is nil (during
-	  instance_eval for objects cannot have singleton classes,
-	  e.g. fixnums and symbols).  [ruby-dev:28178]
-
-Tue Feb  7 23:03:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/zlib/zlib.c: should not access ruby objects in finalizer.
-	  [ruby-dev:28286]
-
-Mon Feb  6 16:02:51 2006  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* file.c (rb_thread_flock): ERROR_NOT_LOCKED is not an error on Cygwin.
-	  In such situation, flock() should return 0.
-
-Mon Feb  6 00:41:08 2006  Tanaka Akira  <akr@m17n.org>
-
-	* ruby.h (RSTRUCT_LEN, RSTRUCT_PTR): defined for source level
-	  compatibility with ruby 1.9.
-
-Sun Feb  5 21:05:34 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* numeric.c (fix_to_s): removed workaround for radix 2. Historically,
-	  rb_fix2str could only handle radix 8, 10, 16. (Rev1.37) But for now,
-	  it can handle radix 2..36. [ruby-Bugs#3438] [ruby-core:7300]
-
-Sun Feb  5 18:55:08 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: imported from trunk, rev 1.129
-
-	* lib/net/http.rb (add_field, get_fields): keep 1.8.2 backward
-	  compatibility.
-
-	* lib/net/https.rb: imported from trunk, rev 1.3.
-
-	* lib/net/https.rb: #use_ssl? definition moved from net/http.rb.
-
-Sun Feb  5 14:22:15 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/pstore.rb: should return default value if name is not found.
-	  [ruby-core:7304]
-
-	* lib/pstore.rb: should raise PStore::Error if not in transaction.
-
-Sat Feb  4 22:51:43 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c: apply the FreeBSD getcontext/setcontext workaround
-	  only before FreeBSD 7-CURRENT.
-
-Sat Feb  4 21:19:23 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (LK_ERR): ERROR_NOT_LOCKED is not an error.
-	  In such situation, flock() should return 0.
-
-Sat Feb  4 15:56:37 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* numeric.c (fix_to_s): (2**32).to_s(2) fails with exception where
-	  sizeof(int) == 4 < sizeof(long). [ruby-core:7300]
-
-Fri Feb  3 15:06:50 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/syck.c (syck_move_tokens): should reset p->cursor or etc
-	  even if skip == 0. This causes buffer overrun.
-	  (ex: YAML.load('--- "..' + '\x82\xA0' * 511 + '"'))
-
-Thu Feb  2 23:51:18 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/emitter.c (syck_emitter_write): should not set '\0' on
-	  emitter's marker. if marker points to the end of buffer, this causes
-	  buffer overrun. (ex: YAML.dump("." * 12288))
-
-Thu Feb  2 16:01:24 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): need not to protect $SAFE value.
-	  [ruby-core:07177]
-
-Thu Feb  2 14:45:53 2006  Ville Mattila  <ville.mattila@stonesoft.com>
-
-	* configure.in: The isinf is not regognized by autoconf
-	  library guesser on solaris 10. [ruby-core:7138]
-
-Wed Feb  1 22:01:47 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* configure.in, hash.c (ruby_setenv): use setenv(3) and unsetenv(3)
-	  where they are supported. modifing environ variable seems to
-	  segfault solaris 10. [ruby-core:7276] [ruby-dev:28270]
-
-	* ruby.c (set_arg0): if use setenv(3), environ space cannot be used
-	  for altering argv[0].
-
-Tue Jan 31 14:46:28 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (rb_struct_select): update RDoc description.
-	  [ruby-core:7254]
-
-Tue Jan 31 11:58:51 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#eval and bg_eval.
-
-	* ext/tk/lib/tk/namespace.rb: TkNamespace#eval was enbugged at the
-	  last commit. Now it will return a proper object.
-
-Tue Jan 31 00:10:26 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c (syck_resolver_transfer): workaround for SEGV.
-	  ex: ruby -ryaml -e 'YAML.load("!map:B {}")' [ruby-core:7217]
-
-Sat Jan 28 07:56:57 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/rdoc/usage.rb: support "a:0:33" style caller[-1]. In this case
-	  file name is "a:0". I don't know this really happens though...
-	  [ruby-Bugs:3344]
-
-Wed Jan 25 22:29:04 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, dln.c, file.c, intern.h, missing.h (eaccess): use
-	  system routine if provided.  fixed: [ruby-core:07195]
-
-Sun Jan 22 23:27:13 2006  Go Noguchi  <gonoguti@yahoo.co.jp>
-
-	* lib/test/unit/autorunner.rb (process_args): ignore arguments after
-	  '--' so that test scripts can handle them.  fixed: [ruby-dev:28258]
-
-Sun Jan 22 22:09:52 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (POST_GETCONTEXT): define separately from PRE_GETCONTEXT on
-	  IA64 to avoid reusing variable address.
-
-Sun Jan 22 20:03:35 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (ruby_setjmp): define PRE_GETCONTEXT and POST_GETCONTEXT
-	  instead of FUNCTION_CALL_MAY_RETURN_TWICE.
-	  define PRE_GETCONTEXT to clear carry flag for workaround of
-	  FreeBSD/i386 getcontext/setcontext bug.
-	  [ruby-dev:28263]
-
-Sat Jan 21 00:36:47 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): use only on SPARC and IA64
-	  before gcc 4.0.3.
-	  [ruby-dev:28247]
-
-Thu Jan 19 22:21:23 2006  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mv): should remove file after copying.
-	  [ruby-dev:28223]
-
-Wed Jan 18 23:37:06 2006  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): don't clobber %l7 of SPARC
-	  if enable-shared.
-	  (ruby_setjmp): call FUNCTION_CALL_MAY_RETURN_TWICE after getcontext
-	  too.
-	  reported by Pav Lucistnik and Marius Strobl.
-	  http://lists.freebsd.org/pipermail/freebsd-sparc64/2006-January/003739.html
-
-Tue Jan 17 11:32:46 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/setup.mak (MAKE): workaround for nmake 8.
-
-Tue Jan 17 11:10:21 2006  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/{Makefile.sub,setup.mak}: invoke .bat via shell. workaround
-	  for nmake 8.
-
-Mon Jan 16 10:26:23 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/emitter.c (syck_emit_seq, syck_emit_map, syck_emit_item):
-	  should output complex key mark even if map's key is empty seq/map.
-	  [ruby-core:7129]
-
-Sat Jan 14 05:37:06 2006  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (READ_DATA_PENDING, READ_DATA_PENDING_COUNT): defined
-	  for DragonFly BSD 1.4.0.
-
-Sat Jan 14 03:43:24 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* file.c (rb_file_s_chmod): avoid warning where sizeof(int) !=
-	  sizeof(void*).
-
-Fri Jan 13 19:14:56 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/rdoc/diagram.rb:
-	    - properly quote bare element attributes
-	    - terminates dangling elements (e.g. <img>, <br>, <link>, etc)
-	    - converts "CVS" to the more HTML-friendly acronym element
-	    - adds missing type attributes to style elements
-
-	  based on Paul Duncan's patch <pabs@pablotron.org> [ruby-core:7028]
-
-	* lib/rdoc/generators/html_generator.rb: ditto.
-	* lib/rdoc/generators/template/html/hefss.rb: ditto.
-	* lib/rdoc/generators/template/html/html.rb: ditto.
-	* lib/rdoc/generators/template/html/kilmer.rb: ditto.
-
-Thu Jan 12 11:53:08 2006  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/tkballoonhelp.rb: [bug fix] couldn't add to a widget
-	  which is constructed with TkComposite module.
-	  [new feature] support 'command' option which is called just before
-	  popping up the balloon help.
-
-Wed Jan 11 15:00:00 2006  Ville Mattila  <mulperi@iki.fi>
-
-	* io.c (READ_PENDING*): Support solaris 64-bit environments.
-	  Solaris defines a opaque FILE struct when compiling 64 bit
-	  binaries. This means that we dont have access to _ptr etc.
-	  members anymore. The solution by Steven Lumos is to define
-	  FILE64 that has needed members available. I've modified
-	  the origanal patch a bit so that it compiles both with gcc
-	  and now free sun studio 11 compiler and both amd64 and sparc.
-	  NOTE! We have to 64 bit solaris FILE structure time to time
-	  otherwise we'll get breakage.
-	  [ruby-core:7106]
-
-Tue Jan 10 19:42:33 2006  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (garbage_collect): mark ruby_current_node.
-	  if an exception is raised in a finalizer called written in C by
-	  rb_gc_call_finalizer_at_exit, ruby_set_current_source may use
-	  collected ruby_current_node and mark_source_filename may corrupt
-	  memory.
-
-Tue Jan 10 13:30:34 2006  akira yamada  <akira@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_resolver_transfer): should be able to load
-	  !ruby/object:Bignum syntax 1.8.3 dumped. [ruby-core:6159]
-
-Tue Jan 10 12:47:41 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/yaml/rubytypes.rb (Fixnum): Bignum could not be loaded in
-	  ruby 1.8.3/1.8.4. [ruby-core:6115]
-
-	* lib/yaml/rubytypes.rb (Numeric): Subclass of Numeric could not
-	  be dumped properly. [ruby-core:7047]
-
-Tue Jan 10 12:00:48 2006  Aaron Schrab  <aaron @nospam@ schrab.com>
-
-	* lib/yaml/rubytypes.rb (Symbol#yaml_new): YAML loading of quoted
-	  Symbols broken. [ruby-Bugs:2535]
-
-Mon Jan  9 19:54:35 2006  arton  <artonx@yahoo.co.jp>
-
-	* ext/zlib/extconf.rb: zlib compiled DLL version 1.2.3 distributed by
-	  http://www.zlib.net/ has zdll.lib. [ruby-dev:28209]
-
-Mon Jan  9 14:17:12 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/Makefile.sub (OPTFLAGS): I have experienced trouble on y- flag,
-	  (VisualC++6) so use -O2b2xg- if  $(MSC_VER) < 1400. [ruby-core:7040]
-
-Mon Jan  9 14:17:12 2006  Kero van Gelder  <rubyforge @nospam@ kero.tmfweb.nl>
-
-	* lib/webrick/httpservlet/filehandler.rb: fixed typo. [ruby-core:7075]
-
-Sat Jan  7 15:40:07 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (singleton): get rid of segfault on syntax error.
-	  fixed: [ruby-core:07070]
-
-Fri Jan  6 10:16:20 2006  Steven Lumos  <steven@lumos.us>
-
-	* io.c (READ_DATA_PENDING): defined for 64bit Solaris on SPARC.
-	  [ruby-core:7057]
-	  (READ_DATA_PENDING_COUNT): ditto.
-	  (READ_DATA_PENDING_PTR): ditto.
-
-Sun Jan  1 17:07:59 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_seekdir): should not segfault even if passed
-	  the location which rb_w32_telldir didn't return. [ruby-core:7035]
-	  (I think HEAD implementation is better. but binary compatibility)
-
-	* test/ruby/test_dir.rb: added.
-
-Sat Dec 31 22:57:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_save_context): should not recycle scope object used
-	  in a thread.  fixed: [ruby-dev:28177]
-
-Fri Dec 30 18:22:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (garbage_collect): mark objects refered from aborting threads.
-	  [ruby-dev:28190]
-
-	* win32/Makefile.sub: VC++8 support.
-
-Fri Dec 30 14:24:53 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dir.c (glob_helper): do not use TRUE for djgpp.
-
-Fri Dec 30 04:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (eaccess): workaround for VC++8 runtime.
-
-	* win32/win32.c (ioinfo): VC++8 support.
-
-Thu Dec 29 23:59:37 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_gc_mark_threads): leave unmarked threads which won't wake
-	  up alone, and mark threads in the loading table.  [ruby-dev:28154]
-
-	* eval.c (rb_gc_abort_threads), gc.c (gc_sweep): kill unmarked
-	  threads.  [ruby-dev:28172]
-
-Thu Dec 29 17:02:07 2005  Tanaka Akira  <akr@m17n.org>
-
-	* test/ruby/envutil.rb (EnvUtil.rubybin): search "ruby" instead of
-	  "miniruby".  [ruby-dev:28140]
-
-Tue Dec 27 16:59:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* test/drb/drbtest.rb (DRbService::self.ext_service): increase
-	  timeout limit.  a patch from Kazuhiro NISHIYAMA
-	  <zn at mbf.nifty.com>. [ruby-dev:28132]
-
-Tue Dec 27 08:29:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLSocket#post_connection_chech):
-	  treat wildcard character in commonName. [ruby-dev:28121]
-
-Mon Dec 26 22:32:47 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval), gc.c (gc_mark_children), node.h (NEW_ALIAS,
-	  NEW_VALIAS), parse.y (fitem): allow dynamic symbols to
-	  NODE_UNDEF and NODE_ALIAS.
-	  backported from trunk.  fixed: [ruby-dev:28105]
-
-Mon Dec 26 08:50:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (ev_const_get): fixed a bug in constant reference during
-	  instance_eval.  [yarv-dev:707]
-
-	* eval.c (ev_const_defined): ditto.
-
-	* lib/yaml.rb (YAML::add_domain_type): typo fixed.  a patch from
-	  Joel VanderWerf <vjoel at path.berkeley.edu>.
-	  [ruby-talk:165285] [ruby-core:6995]
-
-Sat Dec 24 18:58:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.8.4 released.
-
-Fri Dec 23 10:30:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/digest/sha2/sha2.c (ULL): support AIX C.  a patch from
-	  Kailden <kailden at gmail.com>.  [ruby-core:06984]
-
-Wed Dec 21 16:53:06 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* file.c (w32_io_info): should return handle because FileIndex is
-	  valid only while file is open. [ruby-dev:28088]
-
-Wed Dec 21 14:53:26 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (test_kernel_open): use File.identical?.
-	  [ruby-talk:171804]
-
-Tue Dec 20 22:41:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (eval_under_i): evaluate source in caller's frame.
-	  [ruby-dev:28076]
-
-	* eval.c (rb_call_super): use original method name on exception.
-	  [ruby-dev:28078]
-
-Tue Dec 20 13:11:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c: fixed GC problem (backported HEAD 1.55 - 1.62)
-	  [ruby-dev:27839]
-
-	* ext/syck/syck.h (S_FREE): small hack. no need to check if pointer is
-	  NULL or not before S_FREE.
-
-	* st.c: uses malloc instead of xmalloc to avoid GC. syck uses st_insert
-	  in gram.c to insert node from rb_syck_bad_anchor_handler into
-	  SyckParser's hash table. if GC occurs in st_insert, it's not under
-	  SyckParser's mark system yet. so RString can be released wrongly.
-	  [ruby-dev:28057]
-
-Tue Dec 20 12:53:23 2005  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_emitter_reset): to ensure compatibility
-	  with previous Ruby versions, documents are no longer headless.
-
-Tue Dec 20 01:46:48 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_f_backquote): fix a GC problem on
-	  IA64 with gcc 4.0.3 20051216 (prerelease) -O3.
-
-Mon Dec 19 23:32:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_symname_p): fixed wrong validation.  [ruby-dev:28047]
-
-Sat Dec 17 03:57:01 2005  Tanaka Akira  <akr@m17n.org>
-
-	* bignum.c (rb_big_rshift): fix a GC problem on
-	  IA64 with gcc 4.0.3 20051216 (prerelease).
-
-Sat Dec 17 03:30:23 2005  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (bmcall): fix a GC problem by tail call on
-	  IA64 with gcc 4.0.3 20051216 (prerelease).
-
-Fri Dec 16 00:54:06 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* signal.c (Init_signal): revert C++ style comment.
-	  [ruby-dev:28041]
-
-Thu Dec 15 12:35:14 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/tmpdir.rb: merged RDoc patch from Eric Hodel <drbrain at
-	  segment7.net>.  [ruby-core:06894]
-
-Thu Dec 15 01:33:31 2005  Tanaka Akira  <akr@m17n.org>
-
-	* ext/zlib/zlib.c (zstream_run): fix a GC problem by tail call on
-	  x86_64 with gcc 4.0.3 20051111 (prerelease) (Debian 4.0.2-4)
-
-Wed Dec 14 12:11:46 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* test/gdbm/test_gdbm.rb: specify pid for the argument of
-	  Process.wait.  workaround for Cygwin.
-
-Wed Dec 14 12:01:26 2005  Tanaka Akira  <akr@m17n.org>
-
-	* marshal.c (r_object0): fix a GC problem for reading a bignum on
-	  IA64 with gcc 3.3.5 (Debian 1:3.3.5-13).
-
-Tue Dec 13 12:23:47 2005  Tanaka Akira  <akr@m17n.org>
-
-	* re.c (rb_reg_regcomp): fix a GC problem on x86_64 with
-	  gcc 3.3.5 (Debian 1:3.3.5-13).
-
-Tue Dec 13 01:44:16 2005  Tanaka Akira  <akr@m17n.org>
-
-	* array.c (rb_ary_diff): fix a GC problem on IA64 with
-	  gcc 3.3.5 (Debian 1:3.3.5-13).
-	  When rb_ary_push is called, there was no register which contains
-	  `hash' but `&RHASH(hash)->tbl' instead.
-
-Tue Dec 13 00:08:09 2005  Tanaka Akira  <akr@m17n.org>
-
-	* sprintf.c (rb_str_format): fix a GC problem.
-	  [ruby-dev:28001]
-
-Mon Dec 12 15:54:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* test/openssl/test_ssl.rb (test_parallel): call GC.start to close
-	  unused files. [ruby-dev:27981]
-
-Mon Dec 12 00:33:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/digest/digest.c (rb_digest_base_s_digest): add volatile to
-	  protect temporary context object.  [ruby-dev:27979]
-
-	* ext/iconv/iconv.c (Init_iconv): rb_gc_register_address() should
-	  be called before actual variable initialization.
-	  [ruby-dev:27986]
-
-Fri Dec  9 23:31:02 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rexml/encoding.rb (encoding=): give priority to particular
-	  conversion to iconv.  [ruby-core:06520]
-
-Thu Dec  8 02:07:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (umethod_bind): adjust invoking class for module method.
-	  [ruby-dev:27964]
-
-Thu Dec  8 00:40:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (call_trace_func): klass parameter should be a
-	  class/module that defines calling method.  [ruby-talk:169307]
-
-Wed Dec  7 17:10:27 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
-
-Wed Dec  7 15:31:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_str_format): integer overflow check added.
-
-	* sprintf.c (GETASTER): ditto.
-
-Wed Dec  7 01:02:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/README.macosx-aqua: [new document] tips to avoid the known
-	  bug on platform specific dialogs of Tcl/Tk Aqua on MacOS X.
-
-	* ext/tk/tcltklib.c: fix bug on switching threads and waiting on the
-	  deleted interpreter on vwait and tkwait command.
-
-	* ext/tk/lib/multi-tk.rb: kill the meaningless loop for the deleted Tk
-	  interpreter.
-
-	* ext/tk/sample/demos-jp/image3.rb: [bug fix] wrong argument.
-
-	* ext/tk/sample/demos-en/image3.rb: ditto.
-
-	* ext/tk/sample/demos-jp/menu.rb: fix message for MacOS X.
-
-	* ext/tk/sample/demos-jp/menu8x.rb: ditto.
-
-	* ext/tk/sample/demos-en/menu.rb: ditto.
-
-Tue Dec  6 16:37:57 2005  Yuya Nishida  <yuya@j96.org>
-
-	* eval.c (exec_under): avoid accessing ruby_frame->prev.
-	  [ruby-dev:27948]
-
-Thu Dec  1 00:50:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_funcall2): allow to call protected methods.
-	  fixed: [ruby-dev:27890]
-
-Wed Nov 30 23:52:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
-	  fixed: [ruby-dev:27896]
-
-Wed Nov 30 13:43:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-expr-beg): support $! at the end of
-	  expression.   [ruby-dev:27868]
-
-Mon Nov 28 18:55:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (init_inetsock_internal): remove setting
-	  SO_REUSEADDR option on server socket on Cygwin.
-	  fixed: [ruby-core:6765] ([ ruby-Bugs-2872 ])
-
-Mon Nov 28 13:08:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_strerror): remove all CR and LF. (avoid broken
-	  error message on bccwin32 + winsock)
-
-Mon Nov 28 09:21:49 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/mkmf.rb (create_makefile): should not change sodir with
-	  dir.gsub!. (bccwin32 failed to install third party exntesions)
-	  [ruby-dev:27834]
-
-Sun Nov 27 00:56:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/wsdl/xmlSchema/complexContent.rb: missing
-	  ComplexContent#elementformdefault method.
-
-Sat Nov 26 19:57:45 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* dln.c (conv_to_posix_path): should initialize posix.
-
-Thu Nov 24 21:05:58 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* configure.in (AC_CHECK_FUNCS): need to check link().
-	  fixed: [ruby-dev:27814]
-
-Thu Nov 24 01:22:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* file.c (w32_io_info): CreateFile failed on Win9x if file was already
-	  opened. (FILE_SHARE_READ was needed, but actually I don't understand
-	  the flags of CreateFile well...)
-
-Wed Nov 23 20:59:01 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add Tk.pkgconfig_list and Tk.pkgconfig_get
-	  [Tk8.5 feature].
-
-	* ext/tk/lib/tk/text.rb: supports new indices modifires on a Text
-	  widget [Tk8.5 feature].
-
-	* ext/tk/lib/tk/virtevent.rb: add TkNamedVirtualEvent.
-
-	* ext/tk/lib/tk/autoload.rb: ditto.
-
-	* ext/tk/lib/tk/event.rb: add :data key for virtual events [Tk8.5
-	  feature].
-
-Wed Nov 23 18:55:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* file.c (w32_io_info): should not call GetFileInformationByHandle
-	  for pipe.
-
-	* file.c (w32_io_info): checks return value from rb_w32_get_osfhandle.
-
-	* file.c (w32_io_info): now can identify directory on WinNT.
-
-Wed Nov 23 03:40:49 2005  Guy Decoux  <ts@moulon.inra.fr>
-
-	* re.c (KR_REHASH): should cast to unsigned for 64bit CPU.
-	  [ruby-core:06721]
-
-Wed Nov 23 11:01:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* intern.h, file.c: failed to compile on windows.
-
-Wed Nov 23 07:26:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: check for X509V3_EXT_nconf_nid.
-
-	* ext/openssl/ossl_x509ext.c (MakeX509ExtFactory): should use
-	  OPENSSL_malloc to allocate X509V3_CTX.
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext): use
-	  X509V3_EXT_nconf_nid to avoid SEGV (and to build extensions which
-	  values are placed in separate section).
-
-	* test/openssl/test_x509ext.rb: new file.
-
-Wed Nov 23 01:22:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (test_identical): test if two files are identical.
-
-	* file.c (rb_f_test): support DOSISH systems where st_ino is not
-	  reliable.  fixed: [ruby-core:06672]
-
-	* win32.h, win32.c (rb_w32_osid): check the running platform.
-
-Tue Nov 22 23:52:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb: match incomplete (in current enconding) multibyte
-	  string.  http://inamode6.tokuhirom.dnsalias.org/show/1551
-
-Tue Nov 22 18:36:11 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (winnt_stat): set mapped errno instead of ENOENT.
-
-Tue Nov 22 14:46:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_file_s_basename): skip slashes just after UNC top slashes.
-
-	* test/ruby/test_path.rb (test_dirname, test_basename): follow new
-	  spec. and add new tests.
-
-Tue Nov 22 13:18:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_stat): Dir.chdir('//server/shared');
-	  p Dir.glob('*') should work on WinNT. (implemented our own
-	  stat(2) on WinNT) [ruby-list:41552] [ruby-dev:27711]
-
-Tue Nov 22 02:31:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/tile.rb: bug fix (Tk::Tile::USE_TTK_NAMESPACE
-	  is not defined).
-
-Tue Nov 22 01:45:21 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_basename): DOSISH_UNC is defined on cygwin but
-	  DOSISH is not.  fixed: [ruby-dev:27797]
-
-Mon Nov 21 22:50:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_path_skip_prefix, rb_file_s_basename): UNC without path
-	  should not be splitted.  fixed: [ruby-dev:27776] [ruby-dev:27786]
-
-	* parse.y (dsym): prohibit empty symbol literal by interpolation.
-	  fixed: [ruby-talk:166529]
-
-Mon Nov 21 16:03:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* win32/setup.mk: findstr doesn't exist on win9x.
-	  fixed: [ruby-dev:27756]
-
-Sun Nov 20 22:34:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_symname_p): [ not followed by ] is not valid symbol.
-	  fixed: [ruby-talk:166520]
-
-Sat Nov 19 19:57:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/fileutils.rb (FileUtils::ln): ln documentation fix.
-	  [ruby-core:06661]
-
-Sat Nov 19 07:34:32 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/font.rb: remove dependency on Ruby's version (1.8
-	  or 1.9).
-
-	* ext/tk/lib/tkextlib/ICONS/icons.rb: ditto.
-
-	* ext/tk/sample/tkextlib/treectrl/demo.rb: ditto.
-
-Fri Nov 18 17:57:08 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_file_s_dirname): should use skipprefix for UNC path.
-	  pointed out by nobu ([ruby-dev:27744]). fixed: [ruby-core:5076]
-
-Fri Nov 18 17:35:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: add restriction to access the entried
-	  command table and manipulate other IPs (for reason of security).
-	  Now, a IP object can be controlled by only its master IP or the
-	  default IP.
-
-	* ext/tk/lib/remote-tk.rb: add restriction to manipulate.
-
-	* ext/tk/tcltklib.c (ip_is_slave_of_p): add TclTkIp#slave_of?(ip)
-	  to check manipulability.
-
-	* ext/tk/lib/tk.rb: bug fix on handling of Tcl's namespaces.
-
-	* ext/tk/lib/tk/namespace.rb: ditto.
-
-Fri Nov 18 17:26:06 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (rb_file_s_dirname): added checks for some patterns with drive
-	  letter. fixed: [ruby-dev:27738]
-
-	* test/ruby/test_path.rb (test_dirname): added tests for above
-	  patterns.
-
-Fri Nov 18 12:18:02 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.h (S_IFIFO): r,w = IO.pipe; r.stat.pipe? now
-	  returns true on VisualC++6.
-
-Wed Nov 16 23:24:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* common.mk (static-ruby): overridable.
-
-	* ext/extmk.rb (parse_args): force to link extensions statically only
-	  if static is given for extstatic.
-
-	* ext/extmk.rb (RUBY, RUBYW): overridable.
-
-Tue Nov 15 23:46:35 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/find.rb (Find::find): should not ignore symbolic links to
-	  non-existing files.  [ruby-talk:165866]
-
-Tue Nov 15 16:23:26 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* array.c (rb_ary_fill): previous commit disabled this usage:
-
-	    a = [0,1,2,3,4,5,6,7,8,9]
-	    a.fill {|i| a[i] * 10} #=> [nil, nil, ...., nil]
-
-	  previous commit has the advantage of early garbage collection, but
-	  potensially this would break some script. so I reverted behavior.
-
-Tue Nov 15 16:04:10 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* array.c (rb_ary_fill): tail elements were vanished when the middle
-	  part of array was filled. (ie: [0,1,2,3,4].fill(-1,2,1) => [0,1,-1])
-
-	* test/ruby/test_array.rb (test_fill): added.
-
-Tue Nov 15 14:39:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_fill): should adjust array length correctly when
-	  an array is expanded in the fill process.  [ruby-core:06625]
-
-Mon Nov 14 23:49:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_readlink): ERANGE will occur only on GPFS.
-	  [ruby-dev:27699]
-
-Mon Nov 14 17:36:22 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_first): RDoc update from Daniel Berger
-	  <djberg96@yahoo.com>.  [ruby-core:06577].
-
-Fri Nov 11 10:31:44 2005  Zach Dennis  <zdennis@mktec.com>
-
-	* ext/socket/socket.c: Socket Documentation. [ruby-core:6552]
-
-Fri Nov 11 08:20:56 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (OUTFLAG): keep trailing spaces.  [ruby-dev:27666]
-
-	* mkconfig.rb: substitution refereces added.
-
-Fri Nov 11 07:44:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* configure.in: undef HAVE_LINK on BeOS. (link(2) always returns
-	  EINVAL, and this causes error in test/fileutils.)
-
-	* file.c: overwride chown(2) and fchown(2) on BeOS. (these functions
-	  should not change user/group id if -1 is passed as corresponding
-	  argument, and this causes error in test/fileutils too)
-	  [ruby-dev:27672]
-
-	* file.c (rb_file_s_link): checks HAVE_LINK.
-
-Tue Nov  8 15:32:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/drb/ssl.rb (DRb::SSLConfig#accept): fixed typo.
-	  [ruby-dev:27560] [ruby-core:4627]
-
-Mon Nov  7 13:43:51 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/stubs.c (_nativethread_consistency_check): use simpler
-	  (low cost) way to check whether the Tcl interpreter was compiled
-	  with threads enabled of not.
-
-	* ext/tk/tcltklib.c: reduce warnings.
-
-	* ext/tk/tkutil/tkutil.c: ditto.
-
-Mon Nov  7 00:06:58 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/yaml.rb: removed :nodoc: to generate Kernel doc. [ruby-core:6324]
-
-Sun Nov  6 23:39:13 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (Iconv::BrokenLibrary): exception when detected a
-	  bug of underlying library.
-
-Sun Nov  6 21:46:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tk/stubs.c (ruby_tcl_create_ip_and_stubs_init): should touch
-	  interpreter after initialization is done. [ruby-dev:27638]
-
-Sun Nov  6 20:13:27 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_s_readlink): readlink(2) on AIX fails with ERANGE if
-	  buffer size is less than required.  fixed: [ruby-dev:27634]
-
-Wed Nov  2 20:25:28 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/extconf.rb: ext/tk/extconf.rb: change the check parameter
-	  for Win32.
-
-Wed Nov  2 20:14:53 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib: merge into ext/tk and remove.
-
-Wed Nov  2 19:03:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_rbUpdateObjCmd,
-	  ip_rb_threadUpdateObjCmd): passed improper flags to DoOneEvent().
-
-	* ext/tk/tkutil.c: use rb_obj_respond_to() instead of rb_respond_to().
-
-Tue Nov  1 14:20:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_call_super): should call method_missing if super is
-	  called from Kernel method.
-
-	* eval.c (exec_under): frame during eval should preserve external
-	  information.
-
-Tue Nov  1 10:50:17 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: should check ERR_peek_last_error().
-	  [ruby-dev:27597]
-
-	* ext/openssl/ossl.c (ossl_raise): ditto.
-
-Mon Oct 31 17:34:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* configure.in: use proper option for Sun linker. A patch from
-	  Shinya Kuwamura <kuwa at labs.fujitsu.com>.  [ruby-dev:27603]
-
-Mon Oct 31 11:27:22 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb (test_s_open_error):
-	  skip on Win32/DOS platforms.
-
-Mon Oct 31 05:49:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_update): input data must
-	  not be empty. [ruby-talk:161220]
-
-	* test/openssl/test_cipher.rb: add test for Cipher#update("").
-
-Mon Oct 31 05:37:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservlet/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIHandler#do_GET): the value of Set-Cookie:
-	  header field should be splited into each cookie.  [ruby-Bugs:2199]
-
-	* lib/webrick/cookie.rb (WEBrick::Cookie.parse_set_cookie): new method
-	  to parse the value of Set-Cookie: header field.
-
-	* test/webrick/test_cookie.rb, test/webrick/test_cgi.rb,
-	  test/webrick/webrick.cgi: add some test for cookie.
-
-Mon Oct 31 03:19:36 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/readline/readline.c (readline_readline): type check.
-	  [ruby-core:6089]
-
-	* numeric.c (fix_rshift): RDoc fix.  [ruby-core:6351]
-
-	* util.h (strtod): add #undef for platforms defines strtod()
-	  macro.   [ruby-dev:27563]
-
-Mon Oct 31 02:35:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/ruby/test_float.rb (test_precision): test by assert_in_delta.
-	  [ruby-dev:27575]
-
-Sat Oct 29 01:58:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/etc/etc.c: document update from mathew <meta@pobox.com>.
-	  [ruby-core:06473]
-
-	* ext/fcntl/fcntl.c: ditto.
-
-Thu Oct 27 16:45:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (scan_once): wrong condition to use mbclen2().
-	  [ruby-dev:27535]
-
-Wed Oct 26 09:27:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/implicit.c (syck_type_id_to_uri): should return
-	  newly allocated memory. otherwise, type_id will be freed
-	  twice. [ruby-dev:27384] [ruby-core:6385]
-
-Wed Oct 26 09:04:51 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ruby.h (Qfalse, Qtrue, Qnil, Qundef): make sure these immediate
-	  values have VALUE type. there is an environment where sizeof(VALUE)
-	  != sizeof(int) like IA64. if 32bit integer (Qtrue) is passed to ANYARGS
-	  and received by 64bit integer (VALUE), upper bits may have garbage value.
-	  [ruby-dev:27513]
-
-Wed Oct 26 01:58:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (RUBY_EXTERN): macro to export symbols in shared
-	  library.  [ruby-core:05528]
-
-	* defines.h, {bcc32,win32,wince}/Makefile.sub (RUBY_EXTERN): moved to
-	  configuration pass.
-
-	* ext/extmk.rb (extmake): RUBY_EXTERN for static linked extensions.
-
-Tue Oct 25 15:32:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/rational.rb: applied documentation patch from Gavin Sinclair
-	  <gsinclair@gmail.com>.  [ruby-core:06364]
-
-	* lib/irb.rb (IRB::Irb::eval_input): handle prompts with newlines
-	  in irb auto-indentation mode.  [ruby-core:06358]
-
-Tue Oct 25 02:12:08 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::LABEL_LIST_RE):
-	  reduce redundant backtrack.  [ruby-talk:161771]
-
-Tue Oct 25 00:27:35 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/*: RDoc documentation from Eric Hodel
-	  <drbrain@segment7.net> added.
-
-Mon Oct 24 21:14:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in, io.c: use sys/syscall.h if syscall.h is not available.
-	  [ruby-core:06247]
-
-Mon Oct 24 20:49:45 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/Win32API/lib/win32/resolv.rb (get_info): support multiple DNS.
-	  fixed: [ruby-list:40058], [ruby-dev:27479]
-
-Mon Oct 24 07:57:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/tk/lib/tk/canvas.rb (TkCanvasItemConfig::__item_val2ruby_optkeys):
-	  typo fixed.  [ruby-talk:162187]
-
-	* ext/tk/lib/tk/menu.rb (TkMenuEntryConfig::__item_val2ruby_optkeys):
-	  ditto.  [ruby-core:06359]
-
-Sun Oct 23 21:50:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/enumerator/enumerator.c: applied documentation patch from
-	  James Edward Gray II <james@grayproductions.net>.
-	  [ruby-core:06348]
-
-Sun Oct 23 07:11:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/extconf.rb: improve messages [ruby-core:06325].
-
-	* ext/tk/lib/tk.rb, ext/tk/lib/tk/canvas.rb, ext/tk/lib/tk/entry.rb,
-	  ext/tk/lib/tk/frame.rb, ext/tk/lib/tk/image.rb,
-	  ext/tk/lib/tk/itemconfig.rb, ext/tk/lib/tk/labelframe.rb,
-	  ext/tk/lib/tk/listbox.rb, ext/tk/lib/tk/menu.rb,
-	  ext/tk/lib/tk/radiobutton.rb, ext/tk/lib/tk/scale.rb,
-	  ext/tk/lib/tk/spinbox.rb, ext/tk/lib/tk/text.rb,
-	  ext/tk/lib/tk/toplevel.rb: improve conversion of option values.
-
-	* ext/tk/lib/tkextlib/*: ditto.
-
-	* ext/tk/lib/tkextlib/*: update to support ActiveTcl8.4.11.2.
-
-	* ext/tk/lib/tkextlib/trofs/*: support Trofs 0.4.3.
-
-	* ext/tk/lib/tkextlib/tile/*: support Tile 0.7.2.
-
-	* ext/tk/lib/tkextlib/vu/*: support vu 2.3.0.
-
-	* ext/tk/lib/tkextlib/tcllib/*: support Tcllib 1.8 (Tklib 0.3).
-
-Sat Oct 22 23:54:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb, lib/mkmf.rb (with_config): support --with-extension
-	  options.  [ruby-dev:27449]
-
-Sat Oct 22 13:26:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (sym_inspect), parse.y (parser_yylex, rb_symname_p): check
-	  if valid as a symbol name more strictly.  [ruby-dev:27478]
-
-	* test/ruby/test_symbol.rb: tests for [ruby-core:03573].
-
-	* time.c (rb_strftime): removed meaningless volatile modifiers, and
-	  concatenate successive nul characters at once.  [ruby-dev:27472]
-
-Fri Oct 21 19:21:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* rubysig.h (CHECK_INTS): fixed typo. (I believe bit-or is improper)
-
-Fri Oct 21 17:49:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bin/erb (ERB::Main::run): typo fixed.  [ruby-core:06337]
-
-Fri Oct 21 15:27:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bignum.c (bignew_1): convertion from `int' to `char' discards
-	  upper bits, (ie. (char)0xff00 -> 0) so it's better to test if
-	  nonzero and set 0 or 1 instead of simply casting ... as a flag usage.
-	  (but I believe this won't cause actual bug in current implementation)
-	  [ruby-dev:27055]
-
-	* time.c: should use LONG_LONG instead of `long long'.
-
-Thu Oct 20 09:37:15 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/mkmf.rb (create_makefile): Borland make seems not to allow
-	  empty dependency list. If this change is not good, please correct
-	  it.
-
-Thu Oct 20 07:55:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): get rid of a restriction
-	  of Borland make.  fixed: [ruby-dev:27460]
-
-Thu Oct 20 00:13:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubysig.h (CHECK_INTS): fix typo.
-
-Wed Oct 19 23:58:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_makefile): do not create unnecessary empty
-	  directories.  fixed: [ruby-dev:27451]
-
-Wed Oct 19 19:26:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (rb_gc_mark_parser): get rid of segfault with old yacc.
-	  fixed: [ruby-dev:27439]
-
-Wed Oct 19 08:28:32 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_join): elements may contain null pointer strings.
-	  report and fixed by Lloyd Zusman (hippoman): [ruby-core:06326]
-
-Wed Oct 19 02:34:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c, gc.c, time.c: made internal symbols static.  [ruby-dev:27435]
-
-Wed Oct 19 01:27:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): numeric literal inside character class
-	  disabled succeeding backtrack.  fixed: [ruby-list:41328]
-
-Mon Oct 17 21:18:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (parser_heap): byacc never free parser stack.
-	  fixed: [ruby-dev:27428]
-
-Mon Oct 17 16:04:47 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* file.c (chmod_internal, lchmod_internal): fixed type of 2nd argument.
-
-Sun Oct 16 22:16:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: omit non-existing directories.
-
-Sun Oct 16 14:30:05 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/rinda.rb (Rinda::Tuple#initialize): check remote hash
-	  tuple. fixed: [ruby-list:41227]
-
-	* test/rinda/test_rinda.rb: test it.
-
-Sun Oct 16 03:38:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* rubysig.h (CHECK_INTS): prevent signal handler to run during
-	  critical section.  [ruby-core:04039]
-
-	* eval.c (load_wait): need not to call rb_thread_schedule()
-	  explicitly.  [ruby-core:04039]
-
-	* eval.c (rb_thread_schedule): clear rb_thread_critical.
-	  [ruby-core:04039]
-
-Sat Oct 15 19:56:38 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* bin/erb: typo fixed, again. thanks, Doug Kearns.
-
-Fri Oct 14 22:08:26 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (ioctl): should set errno.
-
-Fri Oct 14 16:57:32 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/{dl,fiddle}/win32/lib/win32/registry.rb
+	  (Win32::Registry::Error#initialize): use suitable encoding for the
+	  string.
 
-	* lib/webrick/config.rb (Config::FileHandler): :UserDir should be nil.
-	  It is harmful to permit the access to ~/public_html by default.
-	  suggested by Hiroyuki Iwatsuki.
+Tue Jul  9 09:46:53 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Oct 13 23:29:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/dl/win32/lib/win32/registry.rb (Win32::Registry.expand_environ):
+	  use suitable encoding for the string.  fixed a test-all error of
+	  r41838.
 
-	* parse.y (HEAPCNT): bison allocates indivisible size.
-	  fixed: [ruby-core:06261]
+	* ext/fiddle/win32/lib/win32/registry.rb: same changes of r41838 and
+	  this revision of dl's win32/registry.rb.
 
-	* io.c, pack.c, ext/syck/rubyext.c, ext/syck/syck.h, missing/isinf.c:
-	  get rid of warnings.  fixed: [ruby-core:06247]
+Tue Jul  9 07:39:45 2013  Eric Hodel  <drbrain@segment7.net>
 
-Wed Oct 12 12:52:57 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/rubygems:  Update to RubyGems 2.0.4.  See
+	  https://github.com/rubygems/rubygems/blob/2.0/History.txt for changes
 
-	* ext/openssl/ossl.c (Init_openssl): should call
-	  OpenSSL_add_ssl_algorithms().
+Tue Jul  9 01:47:16 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Oct 12 11:08:54 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* bignum.c (biglsh_bang): Don't shift a BDIGIT with BITSPERDIG bits.
+	  (bigrsh_bang): Ditto.
 
-	* file.c (rb_f_test): typo in RDoc comments.
+Tue Jul  9 01:17:57 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Oct 11 21:41:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bigrsh_bang): Fix bignum digits overrun.
 
-	* eval.c (rb_obj_respond_to): check if obj responds to the given
-	  method with the given visibility.  [ruby-dev:27408]
+Tue Jul  9 00:46:22 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_respond_to): conform to Object#respond_to?.  [ruby-dev:27411]
+	* bignum.c (biglsh_bang): Fix bignum digits under-run.
 
-Tue Oct 11 00:01:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jul  8 23:36:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* st.c (st_free_table): do not call free() but xfree().
-	  [ruby-core:06205]
+	* ext/dl/win32/lib/win32/registry.rb (Error, API): use WCHAR
+	  interfaces.  c.f. [Bug #8508]
 
-Sat Oct  8 20:04:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul  8 23:13:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (Init_Binding): add Binding#dup method.  [yarv-dev:666]
+	* win32/win32.c (rb_w32_pow): move from win32.h and disable strict
+	  ANSI mode macro to let _controlfp() stuff defined.
+	  [ruby-core:55312] [Bug #8495]
 
-	* parse.y (rb_parser_malloc, rb_parser_free): manage parser stack on
-	  heap.  [ruby-list:41199]
+	* numeric.c (finite): add declaration for strict ANSI.
+	  [ruby-core:55312] [Bug #8495]
 
-	* ext/iconv/charset_alias.rb: parse config.charset_alias file directly.
+	* thread_win32.c (w32_thread_start_func, thread_start_func_1),
+	  (timer_thread_func): use __stdcall instead of _stdcall which is
+	  unavailable in strict ANSI mode.  [ruby-core:55312] [Bug #8495]
 
-Fri Oct  7 09:54:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (gettimeofday): use __cdecl instead of _cdecl.
 
-	* lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
-	  not be parsed correctly.  A patch from August Z. Flatby
-	  (augustzf) in [ruby-Patches-2595].  [ruby-core:06183]
+Mon Jul  8 22:41:12 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Oct  6 20:12:16 2005  Minero Aoki  <aamine@loveruby.net>
+	* bignum.c (bary_mul): Arguments for work memory added.
+	  (bary_mul_balance): Ditto.
+	  (bary_mul_karatsuba): Ditto.
 
-	* ext/strscan/strscan.c (strscan_free): remove useless code.
-	  [ruby-dev:26368] [ruby-dev:27389]
-	  (backported from trunk, rev 1.22)
+Mon Jul  8 22:03:30 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Oct  5 04:42:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* bignum.c (rb_big_sq_fast): New function for testing.
+	  (rb_big_mul_toom3): Ditto.
 
-	* lib/xmlrpc/server.rb (XMLRPC::Server#initialize): should mount the
-	  servlet on "/".
+	* internal.h (rb_big_sq_fast): Declared.
+	  (rb_big_mul_toom3): Ditto.
 
-Wed Oct  5 03:59:09 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Jul  8 21:59:34 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/xmlrpc/server.rb (XMLRPC::Server#serve): delete wrong call
-	  of "join".
+	* bignum.c (bary_mul_balance): Initialize a local variable to suppress
+	  a warning.
 
-Mon Oct  3 00:04:00 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Mon Jul  8 20:55:22 2013  Tanaka Akira  <akr@fsij.org>
 
-	* pack.c (EXTEND16): [ruby-dev:27383]
+	* bignum.c (bary_mul_balance): Reduce work memory.
 
-Thu Sep 29 10:26:18 2005  Tanaka Akira  <akr@m17n.org>
+Mon Jul  8 08:26:15 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
 
-	* ext/dl/dl.c (rb_io_to_ptr): abolish sizeof(FILE).
-	  [ruby-dev:27317]
+	* test/openssl/test_pkey_ec.rb: Skip tests for "Oakley" curves as
+	  they are not suitable for ECDSA.
+	  [ruby-core:54881] [Bug #8384]
 
-Thu Sep 29 07:22:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jul  8 08:03:01 2013  Tanaka Akira  <akr@fsij.org>
 
-	* evalc. (rb_f_send): underscores need to be escaped.
-	  fixed by Doug Kearns.  [ruby-core:06053]
+	* bignum.c (bary_mul): Add a RB_GC_GUARD.
 
-Thu Sep 29 00:57:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jul  7 23:56:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (ev_const_get), variable.c (rb_const_get_0): retry only when
-	  autoload succeeded.
+	* bignum.c (bary_mul_karatsuba): Unreachable code removed.  Remove
+	  several branches.
 
-	* variable.c (rb_autoload_load): now return true if autoload
-	  succeeded.  fixed: [ruby-dev:27331]
+Sun Jul  7 22:59:06 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Sep 28 23:42:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (rb_big_mul_normal): Declared.
+	  (rb_big_mul_balance): Ditto.
+	  (rb_big_mul_karatsuba): Ditto.
 
-	* file.c (apply2files): add prototype.
+	* bignum.c (rb_big_mul_normal): New function for tests.
+	  (rb_big_mul_balance): Ditto.
+	  (rb_big_mul_karatsuba): Ditto.
 
-	* file.c (rb_stat_inspect): constified.
+Sun Jul  7 19:21:30 2013  Tanaka Akira  <akr@fsij.org>
 
-	* class.c (rb_mod_init_copy, rb_class_init_copy), file.c (rb_stat_init_copy),
-	  numeric.c (num_init_copy), object.c (rb_obj_init_copy, Init_Object),
-	  re.c (match_init_copy, rb_reg_init_copy), time.c (time_init_copy):
-	  undocumented.
+	* bignum.c: Reorder functions to decrease forward reference.
 
-Wed Sep 28 23:09:23 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jul  7 14:41:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/delegate.rb: document update from James Edward Gray II
-	  <james@grayproductions.net>.  [ruby-core:06027]
+	* bignum.c: (bigsub_core): Use bary_sub.
+	  (bary_sub): Returns a borrow flag.  Use bary_subb.
+	  (bary_subb): New function for actually calculating subtraction with
+	  borrow.
+	  (bary_sub_one): New function.
+	  (bigadd_core): Use bary_add.
+	  (bary_add): Returns a carry flag.  Use bary_addc.
+	  (bary_addc): New function for actually calculating addition with
+	  carry.
+	  (bary_add_one): New function.
+	  (bary_muladd_1xN): Extracted from bary_mul_normal.
+	  (bigmul1_normal): Removed.
+	  (bary_mul_karatsuba): New function.
+	  (bary_mul1): Invoke rb_thread_check_ints after bary_mul_normal.
+	  (bary_mul): Remove most and least significant zeros before actual
+	  multiplication.  Use bary_sq_fast, bary_mul_balance,
+	  bary_mul_karatsuba and bigmul1_toom3 as bigmul0.
+	  (bigmul1_balance): Removed.
+	  (bigmul1_karatsuba): Removed.
+	  (bigsqr_fast): Removed.
+	  (bary_sparse_p): Extracted from big_sparse_p.
+	  (big_sparse_p): Removed.
+	  (bigmul0): Use bary_mul.
 
-Wed Sep 28 15:14:19 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Jul  7 11:54:33 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/webrick/cgi.rb (WEBrick::CGI#start): req.query_string should
-	  refer the value of QUERY_STRING. [ruby-list:41186]
+	* NEWS: Add REXML::Text#<< related updates.
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#query_string=):
-	  add new method.
+Sun Jul  7 11:49:19 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Sep 28 10:45:44 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/rexml/text.rb (REXML::Text#<<): Support appending in not
+	  "raw" mode. [Bug #8602] [ruby-dev:47482]
+	  Reported by Ippei Obayashi. Thanks!!!
 
-	* ext/tcltklib/tcltklib.c: cannot compile with Tcl/Tk8.0.x
-	  [ruby-dev:27335].
+Sun Jul  7 11:43:13 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Sep 28 08:12:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rexml/text.rb (REXML::Text#<<): Support method chain use by "<<"
+	  like other objects.
 
-	* io.c (read_buffered_data): check if reached EOF.  fixed: [ruby-dev:27334]
+Sun Jul  7 11:34:18 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Sep 28 07:56:52 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rexml/text.rb (REXML::Text#clear_cache): Extract common
+	  cache clear code.
 
-	* lib/yaml/basenode.rb (YAML::BaseNode::match_segment): fix typo.
-	  [ruby-dev:27237], [ruby-core:05854]
+Sun Jul  7 11:01:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/yaml/tag.rb (Module#yaml_as): suppress warnings.
+	* configure.in (RUBY_DTRACE_POSTPROCESS): dtrace version SUN D 1.11
+	  introduces a check in the dtrace compiler to ensure that probes
+	  actually exist. If there are no probes, then the -G step will
+	  fail. As this test is only being used to determine whether -G is
+	  necessary (for instance, on OSX it is not), adding a real probe to
+	  the conftest allows it to succeed on newer versions of dtrace.
+	  Patch by Eric Saxby <sax AT livinginthepast.org> at
+	  [ruby-core:55826].  [Fixes GH-351], [Bug #8606].
 
-	* lib/yaml/types.rb (YAML::PrivateType, YAML::DomainType): ditto.
+Sun Jul  7 10:07:22 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Sep 28 03:23:35 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (bary_sq_fast): Extracted from bigsqr_fast and
+	  ensure not to access zds[2*xn].
+	  (bigsqr_fast): Allocate the result bignum with 2*xn words.
 
-	* rubysig.h: fixed build problem with --enable-pthread on platforms
-	  which don't have setitimer().
+Sat Jul  6 07:37:43 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
 
-Mon Sep 26 22:32:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/openssl/ossl_pkey_ec.c: Ensure compatibility to builds of
+	  OpenSSL with OPENSSL_NO_EC2M defined, but OPENSSL_NO_EC not
+	  defined.
+	* test/openssl/test_pkey_ec.rb: Iterate over built-in curves
+	  (and assert their non-emptiness!) instead of hard-coding them, as
+	  this may cause problems with respect to the different availability
+	  of individual curves in individual OpenSSL builds.
+	  [ruby-core:54881] [Bug #8384]
 
-	* eval.c (set_trace_func): add rb_secure(4) to prevent adding
-	  tracing function.
+	  Thanks to Vit Ondruch for providing the patch!
 
-Sun Sep 25 12:05:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Jul  6 07:12:39 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
 
-	* bin/erb: typo fixed.
+	* test/openssl/test_x509crl.rb: Remove unused variable.
+	  [ruby-core:53501] [Bug #8114]
 
-Sun Sep 25 01:46:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Thanks, Vipul Amler, for pointing this out!
 
-	* misc/ruby-mode.el (ruby-calculate-indent): arrange deep-indent
-	  closing parenthesis at same column as the opening.
+Sat Jul  6 06:37:10 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
 
-Sun Sep 25 00:42:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/ossl.c: Provide CRYPTO_set_locking_callback() and
+	  CRYPTO_set_id_callback() callback functions ossl_thread_id and
+	  ossl_lock_callback to ensure the OpenSSL extension is usable in
+	  multi-threaded environments.
+	  [ruby-core:54900] [Bug #8386]
 
-	* misc/ruby-mode.el (ruby-expr-beg): deal with heredoc separately.
-	  fixed: [ruby-list:41168]
+	  Thanks, Dirkjan Bussink, for the patch!
 
-	* misc/ruby-mode.el (ruby-calculate-indent): not to deepen indent
-	  level for continuous line inside parentheses.
-	  http://nabeken.tdiary.net/20050915.html#p02
+Sat Jul  6 06:06:16 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
 
-Sun Sep 25 00:18:11 2005  Tanaka Akira  <akr@m17n.org>
+	* lib/openssl/ssl.rb: Fix SSL client connection crash for SAN marked
+	  critical.
+	  The patch for CVE-2013-4073 caused SSL crash when a SSL server returns
+	  the certificate that has critical SAN value.  X509 extension could
+	  include 2 or 3 elements in it:
 
-	* eval.c (unknown_node): show more information.  [ruby-dev:26196]
+	  [id, criticality, octet_string] if critical,
+	  [id, octet_string] if not.
 
-Sat Sep 24 08:56:01 2005  Minero Aoki  <aamine@loveruby.net>
+	  Making sure to pick the last element of X509 extension and use it as
+	  SAN value.
+	  [ruby-core:55685] [Bug #8575]
 
-	* lib/fileutils.rb (cd): no longer accept :noop option, related
-	  code is useless (backported from trunk, rev 1.67).
-	  [ruby-core:05858] [ruby-Bugs:2494]
+	  Thank you @nahi for providing the patch!
 
-Sat Sep 24 08:38:07 2005  Minero Aoki  <aamine@loveruby.net>
+Sat Jul  6 04:49:38 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* lib/fileutils.rb: fix visibility of FileUtils::NoWrite, Verbose,
-	  DryRun (backported from trunk, rev 1.66). [ruby-core:05954]
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: register time objects so
+	  they are referenced as ids during output.
+	* test/psych/test_date_time.rb: corresponding test.
 
-	* test/fileutils/test_nowrite.rb: test it.
+Fri Jul  5 20:46:39 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* test/fileutils/test_dryrun.rb: new file.
+	* test/ruby/test_unicode_escape.rb (TestUnicodeEscape#test_basic): this
+	  assertion doesn't seems to be checking the unicode string on command
+	  line, but seems to be checking how to treat the unicode string from
+	  stdin.  so, should escape '\' before 'u'.  this fixes a test failure
+	  on Windows.
 
-	* test/fileutils/test_verbose.rb: new file.
+Fri Jul  5 19:05:40 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Sat Sep 24 02:40:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/fileutils.rb (FileUtils#chown, FileUtils#chown_R): Fix the
+	  wrong output message when user is nil, which should be "chown
+	  :group file" instead of "chown group file".
 
-	* lib/delegate.rb: document update from James Edward Gray II
-	  <james@grayproductions.net>.  [ruby-core:05942]
+Fri Jul  5 16:21:56 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Sep 22 23:36:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_regexp.rb
+	  (TestRegexp#test_options_in_look_behind)
+	  (TestRegexp#assert_match_at): Add tests for another problem
+	  fixed in Onigmo 5.13.5.  Previously Onigmo did not allow option
+	  enclosures in look-behind, which makes it impossible to
+	  interpolate a regexp into another in the middle of a look-behind
+	  pattern.  cf. https://github.com/k-takata/Onigmo/pull/17
 
-	* lib/mkmf.rb (find_executable0): default path if environment is not
-	  set.  [ruby-dev:27281]
+	* test/ruby/test_regexp.rb
+	  (TestRegexp#test_options_in_look_behind)
+	  (TestRegexp#assert_match_at): Parse regexps in run time rather
+	  than in compile time.
 
-Thu Sep 22 16:33:12 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Jul  5 12:14:40 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* test/readline/test_readline.rb (TestReadline::replace_stdio):
-	  merged the patch of [ruby-dev:25232] instead of [ruby-dev:25223].
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_notfound): after
+	  r41710, the path of command uses backslash as the separator on
+	  Windows.
 
-Wed Sep 21 23:30:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jul  5 11:29:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (configuration): generalized nmake dependent code.
+	* lib/test/unit/assertions.rb (assert_raise_with_message): move from
+	  test/fileutils/test_fileutils.rb.  this is still experimental and
+	  the interface may be changed.
 
-Wed Sep 21 09:07:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jul  5 11:08:00 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* stable version 1.8.3 released.
+	* win32/win32.c (w32_spawn): r41710 made that if the command starts with
+	  a quote and includes slash, removed the top quote and NOT removed the
+	  last quote.
+	  this fixes test failures on test/ruby/test_process.rb and
+	  test/webrick.
 
-Wed Sep 21 08:52:25 2005  why the lucky stiff  <why@ruby-lang.org>
+Fri Jul  5 09:53:15 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+	* lib/mkmf.rb (CONFIG['CPPOUTFILE']): fix r41769; CONFIG['CPPOUTFILE']
+	  may be nil.
 
-	* ext/syck/token.c: correctly compute identation of a block
-	  scalar's parent node. [ruby-talk:150620]
+Fri Jul  5 05:39:53 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Sep 21 08:20:24 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (BARY_MUL1): Renamed from BARY_MUL.
+	  (bary_mul1): Renamed from bary_mul.
+	  (bary_mul): Renamed from bary_mul2.
 
-	* README.EXT, README.EXT.ja: add new features.
+Fri Jul  5 04:58:05 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Sep 21 07:43:58 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bary_mul_balance): Extracted from bigmul1_balance and
+	  use bary_mul2 and bary_add to decrease allocations.
 
-	* lib/optparse.rb (default_argv, Arguable#options): defaults strings
-	  to be parsed to Arguable instance.
+Fri Jul  5 02:14:00 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Wed Sep 21 02:44:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/fileutils.rb (FileUtils#symbolic_modes_to_i): Fix the wrong
+	  character class [+-=], which happened to match all desired
+	  characters but also match undesired characters.
 
-	* file.c (path_check_0): disallow sticky world writable directory
-	  in PATH (and $LOAD_PATH).  [ruby-dev:27226]
+	* lib/fileutils.rb (FileUtils.chmod{,_R}): Enhance the symbolic
+	  mode parser to support the permission symbols u/g/o and multiple
+	  actions as defined in SUS, so that chmod("g=o+w", file) works as
+	  expected.  Invalid symbolic modes are now rejected with
+	  ArgumentError.
 
-	* file.c (fpath_check): typo fixed.
+Fri Jul  5 00:25:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Sep 20 22:29:49 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/mkmf.rb (have_framework): allow header file to check.
+	  [ruby-core:55745] [Bug #8593]
 
-	* test/wsdl/simpletype/rpc/test_rpc.rb, test/wsdl/ref/test_ref.rb,
-	  test/wsdl/any/test_any.rb test/soap/wsdlDriver/test_calc.rb:
-	  suppress deliberate warnings with $VERBOSE = nil.
+Thu Jul  4 22:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Tue Sep 20 21:26:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (rb_obj_equal): Fixed an rb_obj_equal documentation typo
+	  where "a" was used instead of "obj".
+	  Fixes GH-349. Patch by @adnandoric
 
-	* ext/io/wait/lib/nonblock.rb: disable on platforms non-blocking flag
-	  is not available.  fixed: [ruby-dev:27187]
+Thu Jul  4 20:39:20 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Sep 20 18:23:04 2005  Tanaka Akira  <akr@m17n.org>
+	* tool/make-snapshot: Exit with EXIT_FAILURE when it fails.
 
-	* eval.c (thread_mark): mark th->last_status.  [ruby-dev:27179]
+Thu Jul  4 20:20:23 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Sep 20 18:20:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (maxpow_in_bdigit_dbl): Use tables if available.
+	  (maxpow_in_bdigit): Ditto.
+	  (U16): New macro.
+	  (U32): Ditto.
+	  (U64): Ditto.
+	  (U128): Ditto.
+	  (maxpow16_exp): New table.
+	  (maxpow16_num): New table.
+	  (maxpow32_exp): New table.
+	  (maxpow32_num): New table.
+	  (maxpow64_exp): New table.
+	  (maxpow64_num): New table.
+	  (maxpow128_exp): New table.
+	  (maxpow128_num): New table.
 
-	* lib/yaml.rb: require 'yaml/constants'.  [ruby-core:5776]
+Thu Jul  4 18:25:25 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Sep 20 17:48:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (rb_cstr_to_inum): Avoid temporary buffer allocation except
+	  very big base non-power-of-2 numbers.
 
-	* lib/xmlrpc/client.rb (XMLRPC::Client::do_rpc): add charset
-	  information to content-type header.[ruby-core:5127]
+Thu Jul  4 15:51:56 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/xmlrpc/server.rb (CGIServer::serve): ditto.
+	* string.c (rb_str_succ): use ONIGENC_MBCLEN_CHARFOUND_P correctly.
 
-	* lib/xmlrpc/server.rb (ModRubyServer::serve): ditto.
+	* string.c (rb_str_dump): ditto.
 
-	* lib/xmlrpc/server.rb (WEBrickServlet::service): ditto.
+Thu Jul  4 10:04:11 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Sep 20 17:34:46 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* regcomp.c (): Merge Onigmo 5.13.5 23b523076d6f1161.
 
-	* test/webrick/test_cgi.rb: set ENV["PATH"] to CGIEnvPath on
-	  windows. bcc32's runtime is not installed into system directory,
-	  so it cannot be found without this setting. [ruby-dev:27166]
+	  * [bug]  (thanks Akinori MUSHA and Ippei Obayashi)
+	           Fix a renumbering bug in condition regexp with a named
+	           capture. [Bug #8583]
+	  * [spec] (thanks Akinori MUSHA)
+	    Allow ENCLOSE_OPTION in look-behind.
 
-Tue Sep 20 17:10:38 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jul  4 00:36:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/dbm/test_dbm.rb (TestDBM::test_s_open_error): remove
-	  test_s_open_error test to detect duplicate open.
-	  [ruby-dev:27202]
+	* internal.h (SIGNED_INTEGER_MAX): suppress warning C4146 on VC6.
+	  seems a logical ORed expression becomes unsigned.
 
-Tue Sep 20 17:08:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jul  4 00:13:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c: PIPE_BUF is not defined on BeOS. use _POSIX_PIPE_BUF instead.
-	  [ruby-dev:27185]
+	* ruby_atomic.h (rb_w32_atomic_cas): call InterlockedCompareExchange
+	  directly.
 
-Tue Sep 20 16:53:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ruby_atomic.h (ATOMIC_CAS): fix missing function call.
 
-	* test/readline/test_readline.rb (TestReadline::replace_stdio):
-	  BSD seek support from [ruby-dev:25223].  fixed: [ruby-dev:27150]
+Wed Jul  3 23:47:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Sep 20 15:39:40 2005  why the lucky stiff  <why@ruby-lang.org>
+	* ruby_atomic.h (ATOMIC_CAS): suppress C4022 and C4047 warnings in
+	  VC6.  only InterlockedCompareExchange is declared using PVOID.
 
-	* ext/syck/emitter.c (syck_scan_scalar): prevent indicators from
-	  appearing alone or at the end of plain scalars. [ruby-core:5826]
+Wed Jul  3 22:29:20 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/syck/emitter.c (syck_emit_scalar): treat typed scalar nodes
-	  as complex keys.
+	* internal.h (ruby_digit36_to_number_table): Declared.
 
-	* lib/syck.h: version 0.60.
+	* util.c (ruby_digit36_to_number_table): Moved from scan_digits.
 
-	* lib/yaml/basenode.rb (YAML::BaseNode#at): transform keys during
-	  key searches.
+	* bignum.c (conv_digit): Use ruby_digit36_to_number_table.
 
-	* ext/syck/rubyext.c: loading of binary-typed nodes.  prevent
-	  emission of plain strings that look like symbols, but which aren't.
+	* pack.c (hex2num): Ditto.
 
-Tue Sep 20 05:50:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jul  3 18:12:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/xmlrpc/test_webrick_server.rb (setup_http_server):
-	  should not include 'webrick/https' unless 'use_ssl' because
-	  it fails where openssl is not installed.
+	* lib/mkmf.rb (install_dirs): revert DESTDIR prefix by r39841, since
+	  it is fixed by r41648.  [ruby-core:55760] [Bug #8115]
 
-Tue Sep 20 00:34:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Jul  3 14:15:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (io_close): call rb_io_close() directly if io is a T_FILE
-	  object.  [ruby-dev:27156]
+	* dir.c (do_stat): use rb_w32_ustati64() in win32.c to get rid of
+	  mysterious behavior of FindFirstFile() Windows API which treat "<"
+	  and ">" like as wildcard characters.  [ruby-core:55764] [Bug #8597]
 
-Mon Sep 19 19:09:08 2005  Minero Aoki  <aamine@loveruby.net>
+Wed Jul  3 12:06:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* file.c (rb_file_chown): should accept nil. [ruby-dev:27171]
-	  (backport from trunk, rev 1.208)
+	* bignum.c (maxpow_in_bdigit): Renamed from calc_hbase and return
+	  maxpow.
 
-Mon Sep 19 18:35:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jul  2 23:47:50 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/dl/dl.c (rb_io_to_ptr): fix DragonFlyBSD support.
-	  [ruby-dev:27151]
+	* bignum.c (roomof): Cast to long.
+	  (rb_ull2big): Fix bignew arguments.
 
-Mon Sep 19 14:17:04 2005  Minero Aoki  <aamine@loveruby.net>
+Tue Jul  2 21:17:37 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/syck/emitter.c (syck_emit): passing an int* value to the
-	  long* parameter causes unaligned access on LP64 systems.
-	  [ruby-dev:27161]
+	* bignum.c (rb_cstr_to_inum): Merge two temporary buffers.
 
-Mon Sep 19 13:44:03 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Tue Jul  2 20:25:04 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/win32ole/win32ole.c: avoid core dump with WIN32OLE_EVENT.
-	  [ruby-dev:27133]
+	* bignum.c (rb_cstr_to_inum): Use BDIGIT_DBL to collect adjacent digits.
+	  (BDIGIT_DBL_MAX): New macro.
+	  (maxpow_in_bdigit_dbl): New function.
 
-Mon Sep 19 10:36:06 2005  Minero Aoki  <aamine@loveruby.net>
+Tue Jul  2 17:23:33 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/fileutils.rb (cp_r): default is :dereference_root=>true for
-	  backward compatibility. [ruby-dev:27145]
+	* doc/syntax/refinements.rdoc: add description of Module#using and
+	  refinement inheritance by module inclusion.
 
-	* test/fileutils/test_fileutils.rb (test_cp_r): test it.
+Tue Jul  2 17:22:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Sep 19 09:57:39 2005  Minero Aoki  <aamine@loveruby.net>
+	* internal.h: add EUC-JP and Windows-31J.
 
-	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
-	  (again) [ruby-dev:27145]
+	* re.c (rb_char_to_option_kcode): use built-in encoding indexes in
+	  internal.h.
 
-Mon Sep 19 07:45:37 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* internal.h: add UTF8-MAC.
 
-	* ext/openssl/ossl_pkey.h, ossl_pkey_rsa.c, ossl_pkey_dsa.c:
-	  an instance variable "private" is added to OpenSSL::PKey class.
-	  this ivar is a flag that shows whether there is a private key
-	  in the instance.
+	* dir.c (rb_utf8mac_encoding): use built-in encoding indexes in
+	  internal.h.
 
-	* ext/openssl/ossl_engine.c: (ossl_engine_load_privkey): set private
-	  key flag.
+	* internal.h: add UTF-{16,32} dummy encodings.
 
-Mon Sep 19 06:41:32 2005  Minero Aoki  <aamine@loveruby.net>
+	* string.c (rb_str_inspect, str_scrub0): use built-in encoding indexes
+	  in internal.h.
 
-	* lib/fileutils.rb: backported from trunk (rev 1.65):
+	* internal.h: add UTF-{16,32}{BE,LE}.
 
-	* lib/fileutils.rb (rm_r): new option :secure.
+	* io.c (io_strip_bom): use built-in encoding indexes in internal.h.
 
-	* lib/fileutils.rb (rm_rf): new option :secure.
+	* internal.h (rb_{ascii8bit,utf8,usascii}_encindex): use built-in
+	  encoding indexes for optimization.
 
-	* lib/fileutils.rb: new method #remove_entry_secure.
+	* encoding.c (enc_inspect, rb_locale_encindex),
+	  (enc_set_filesystem_encoding, rb_filesystem_encindex): use built-in
+	  encoding indexes directly.
 
-	* lib/fileutils.rb (cd): remove option :noop.
+	* encoding.c (rb_enc_set_index, rb_enc_associate_index): validate
+	  argument encoding index.
 
-	* lib/fileutils.rb (cp_r): new option :dereference_root.
+	* include/ruby/encoding.h (ENCODING_SET): use rb_enc_set_index()
+	  instead of setting inlined bits directly.
 
-	* lib/fileutils.rb (cp_r): new option :dereference_root.
+	* encoding.c (rb_enc_init): register preserved indexes.
 
-	* lib/fileutils.rb: new method #remove_entry.
+	* internal.h (ruby_preserved_encindex): move from encoding.c.
 
-	* lib/fileutils.rb: new method #chmod_R.
+Tue Jul  2 11:14:36 2013  Shota Fukumori  <sorah@cookpad.com>
 
-	* lib/fileutils.rb: new method #chown.
+	* lib/mkmf.rb (try_config): Fix to not replace $LDFLAGS with $libs
+	  (1.9.3 behavior) [ruby-core:55752] [Bug #8595]
 
-	* lib/fileutils.rb: new method #chown_R.
+Tue Jul  2 00:39:59 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/fileutils.rb: new method .commands.
+	* ext/socket/ipsocket.c (init_inetsock_internal): Don't try mismatched
+	  address family if already failed.
 
-	* lib/fileutils.rb: new method .options.
+Mon Jul  1 23:07:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/fileutils.rb: new method .have_option?.
+	* template/encdb.h.tmpl: define encoding index macros to use the index
+	  statically from C source.
 
-	* lib/fileutils.rb: new method .options_of.
+Mon Jul  1 22:57:19 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/fileutils.rb: new method .collect_method.
+	* bignum.c (bary_mul2): New function.
+	  (rb_cstr_to_inum): Use a better algorithm to compose the result
+	  if input length is very long.
 
-	* lib/fileutils.rb: use module_function instead of single extend.
+Mon Jul  1 20:22:00 2013  Kenta Murata  <mrkn@cookpad.com>
 
-	* test/fileutils/test_fileutils.rb: backported from trunk (1.36).
+	* ext/bigdecimal/bigdecimal.h (RB_UNUSED_VAR, UNREACHABLE):
+	  import macros from ruby.h for 1.9.3.
+	  [Bug #8588] [ruby-core:55730]
 
-Mon Sep 19 03:17:48 2005  Tanaka Akira  <akr@m17n.org>
+	* ext/bigdecimal/bigdecimal.gemspec: Bump version to 1.2.1.
 
-	* file.c (rb_thread_flock): wrap the flock system call by
-	  TRAP_BEG/TRAP_END to enable signals.  [ruby-dev:27122]
+Mon Jul  1 20:03:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/socket/socket.c (bsock_send): wrap the sendto and send system
-	  call by TRAP_BEG/TRAP_END to enable signals when writing to a socket
-	  which is full.  [ruby-dev:27132]
+	* ext/socket/ipsocket.c (init_inetsock_internal): Use an address
+	  family for local address which is different to the remote
+	  address if no other choice.
 
-	* io.c (rb_io_syswrite): wrap the write system call by
-	  TRAP_BEG/TRAP_END to enable signals when writing to a pipe which is
-	  full.  [ruby-dev:27134]
+Mon Jul  1 15:05:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Sep 19 03:02:08 2005  Tanaka Akira  <akr@m17n.org>
+	* lib/csv.rb (CSV#<<): use StringIO#set_encoding instead of creating
+	  new StringIO instance with String#force_encoding, forcing encoding
+	  discards the cached coderange bits and can make further operations
+	  very slow.  [ruby-core:55714] [Bug #8585]
 
-	* io.c (io_fwrite): wrap the write system call by TRAP_BEG/TRAP_END to
-	  enable signals when writing to a pipe which is full.
+	* ext/stringio/stringio.c (strio_write): keep coderange of
+	  ptr->string.
 
-Sun Sep 18 02:10:47 2005  why the lucky stiff  <why@ruby-lang.org>
+	* string.c (rb_enc_cr_str_buf_cat, rb_str_append): consider an empty
+	  string 7bit-clean and should not discard cached coderange of string
+	  to be appended.
 
-	* lib/yaml/rubytypes.rb: remove comments that are bungling up
-	  the rdoc and ri output.  output symbols as plain scalars.
+Mon Jul  1 12:56:41 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/syck/rubyext.c (syck_emitter_reset): emit headless
-	  documents always.
+	* eval.c (rb_using_module): activate refinements in the ancestors of
+	  the argument module to support refinement inheritance by
+	  Module#include.  [ruby-core:55671] [Feature #8571]
 
-	* ext/syck/emitter.c (syck_scan_scalar): quote scalars with any
-	  kind of surrounding line space, tabs or spaces alike.
+	* test/ruby/test_refinement.rb: related test.
 
-	* ext/syck/token.c: accept tabs as whitespace, not for indentation,
-	  but strip from plain scalars.
+Mon Jul  1 12:02:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/yaml/test_yaml.rb: remove outdated tests.
+	* bignum.c (rb_cstr_to_inum): Skip leading zeros.
 
-Sat Sep 17 23:25:04 2005  sheepman  <sheepman@sheepman.sakura.ne.jp>
+Mon Jul  1 00:59:23 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mathn.rb (Rational::inspect): should preserve original
-	  operand.  [ruby-core:05806]
+	* bignum.c (nlz16): New function.
+	  (nlz32): Ditto.
+	  (nlz64): Ditto.
+	  (nlz128): Ditto.
+	  (nlz): Redefined using an above function.
+	  (bitsize): New macro.
+	  (rb_cstr_to_inum): Use bitsize instead of nlz.
 
-Sat Sep 17 23:20:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jun 30 22:40:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* lib/cgi.rb (CGI::Cookie): should handle multiple values for a
-	  cookie name.  [ruby-talk:156140]
+	* lib/prime.rb: Corrected a few comments. Patch by @Nullset14.
+	  Fixes GH-346.
 
-Sat Sep 17 10:42:13 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sun Jun 30 21:53:38 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
-	  should call Kernel.eval on caller's safe-level instead of slave's
-	  safe-level (Of course, the given script should be evaluated on
-	  slave's safe-level).
+	* bignum.c (rb_cstr_to_inum): Use rb_integer_unpack if base is a power
+	  of 2.
 
-Sat Sep 17 09:45:26 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jun 30 10:59:23 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* string.c (rb_str_substr): should propagate taintness even for
-	  empty strings.  [ruby-dev:27121]
+	* win32/win32.c (join_argv): use backslash instead of slash in program
+	  path, otherwise cannot invoke "./c\u{1ee7}a.exe" for some reason.
+	  [ruby-core:24309] [Bug #1771]
 
-	* string.c (rb_str_aref): should infect result if range argument
-	  is tainted.  [ruby-dev:27121]
+	* io.c (spawnv, spawn): use UTF-8 spawn family.  [Bug #1771]
 
-Sat Sep 17 08:35:39 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* process.c (proc_exec_sh, proc_spawn_cmd, proc_spawn_sh): ditto.
 
-	* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#normalize): fixed
-	  strange RSS::Maker::Item#max_size behavior.
-	  Thanks to Kazuhiko <kazuhiko@fdiary.net>.
+	* win32/win32.c (translate_char, join_argv, has_redirection): make
+	  codepage aware.
 
-	* test/rss/test_maker_1.0.rb (RSS::TestMaker10#test_items): ditto.
+	* win32/win32.c (rb_w32_udln_find_exe_r, rb_w32_udln_find_file_r):
+	  codepage independent versions.
 
-Fri Sep 16 23:09:20 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* win32/win32.c (w32_spawn): extract codepage aware code from
+	  rb_w32_spawn().
 
-	* ext/win32ole/win32ole.c (ole_search_event_at): bug fix
-	  in ext/win32ole/sample/ienavi.rb.
+	* win32/win32.c (rb_w32_uspawn): add UTF-8 version function.
 
-	* ext/win32ole/win32ole/tests/testOLEEVENT.rb: ditto.
+	* win32/win32.c (w32_aspawn_flags): extract codepage aware code from
+	  rb_w32_aspawn_flags().
 
-Fri Sep 16 22:41:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/win32.c (rb_w32_uaspawn_flags, rb_w32_uaspawn_flags): add
+	  UTF-8 version functions.
 
-	* file.c (rb_file_s_extname): empty string for path name ending with a
-	  period.  fixed: [ruby-core:05651]
+	* win32/win32.c (w32_getenv): extract codepage aware code from
+	  rb_w32_ugetenv() and rb_w32_getenv().
 
-	* file.c (rb_file_join): smarter behavior at edge cases.
-	  fixed: [ruby-core:05706]
+	* win32/win32.c (w32_stati64): extract codepage aware code from
+	  rb_w32_ustati64() and rb_w32_stati64().
 
-Fri Sep 16 18:34:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* dln.h (DLN_FIND_EXTRA_ARG, DLN_FIND_EXTRA_ARG_DECL): allow extra
+	  arguments to dln_find_{exe,file}_r().
 
-	* ext/syck/node.c (syck_replace_str): was using return from the
-	  void function.  a patch from MIYAMUKO Katsuyuki
-	  <miyamuko at mtb.biglobe.ne.jp>.  [ruby-dev:27111]
+	* dln_find.c (dln_find_exe_r, dln_find_file_r): add extract arguments.
 
-Fri Sep 16 14:48:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* process.c (EXPORT_STR, EXPORT_DUP): convert to default process
+	  encoding if defined.
 
-	* ext/tk/lib/multi-tk.rb: fix typo on MultiTkIp#bg_eval_string
+	* process.c (check_exec_env_i): convert environment variables too.
 
-Fri Sep 16 12:02:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* process.c (rb_exec_fillarg): convert program path and arguments too.
 
-	* ext/syck/rubyext.c (syck_resolver_transfer): remove C++ style
-	  comment (//).  [ruby-core:05793]
+Sun Jun 30 01:57:08 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Sep 16 00:14:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* bignum.c (big_rshift): Use abs2twocomp and twocomp2abs_bang.
 
-	* test/logger/test_logger.rb: unintentionally overwritten changes by
-	  Usa.  reverted.
+Sun Jun 30 00:14:20 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Sep 16 00:06:18 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* bignum.c (RBIGNUM_SET_NEGATIVE_SIGN): New macro.
+	  (RBIGNUM_SET_POSITIVE_SIGN): Ditto.
+	  (rb_big_neg): Inline get2comp to avoid double negation.
 
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#initialize): should set
-	  $stdout.binmode.
+Sat Jun 29 23:26:41 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Sep 15 23:25:21 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* bignum.c (bary_neg): Extracted from bary_2comp.
+	  (bary_plus_one): Extracted from bary_2comp.
+	  (bary_2comp): Use bary_neg and bary_plus_one.
+	  (big_extend_carry): Extracted from get2comp.
+	  (get2comp): Use big_extend_carry.
+	  (rb_integer_unpack): Use big_extend_carry.
+	  (rb_big_neg): Use bary_neg.
 
-	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5.
+Sat Jun 29 22:31:59 2013  Tanaka Akira  <akr@fsij.org>
 
-	  #nnn is a ticket number at http://dev.ctor.org/soap4r
+	* bignum.c (bary_2comp): Simplified.
 
-	  * SOAP
+Sat Jun 29 09:33:53 2013  Tanaka Akira  <akr@fsij.org>
 
-	    * allow to configure an envelope namespace of SOAP request. (#124)
-	   	TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope'
-	  	@client.options["soap.envelope.requestnamespace"] =
-		  TemporaryNamespace
-	 	@client.options["soap.envelope.responsenamespace"] =
-		  TemporaryNamespace
-		@client.do_proc(...)
+	* bignum.c (bigor_int): Return -1 if y == -1.
 
-	    * let SOAP request XML indent space configuable.  see
-	      "soap.envelope.no_indent" option. (#130)
+Sat Jun 29 09:07:16 2013  Tanaka Akira  <akr@fsij.org>
 
-	    * let external CES configuable.
-	      ex. client["soap.mapping.external_ces"] = 'SJIS'.  $KCODE is used
-	      by default. (#133)
-		external CES ::= CES used in Ruby object of client and server
-		internal CES ::= CES used in SOAP/OM
+	* bignum.c (bigor_int): Use RB_GC_GUARD.
+	  (bigxor_int): Take xn and hibitsx arguments.  Use twocomp2abs_bang.
+	  (rb_big_xor): Use abs2twocomp and twocomp2abs_bang.
 
-	    * add iso-8859-1 external CES support. (#106)
+Sat Jun 29 08:19:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	    * fixed illegal 'qualified' handling of elements.  it caused
-	      ASP.NET inteoperability problem. (#144)
+	* bignum.c (bigand_int): Don't apply bitwise and for BDIGIT and long.
+	  (bigor_int): Take xn and hibitsx arguments.  Use twocomp2abs_bang.
+	  (rb_big_or): Use abs2twocomp and twocomp2abs_bang.
 
-	    * added 'soap.envelope.use_numeric_character_reference' (boolean)
-	      option to let query XML use numeric character reference in XML,
-	      not plain UTF-8 character.  !GoogleSearch server seems to not
-	      allow plain UTF-8 character since 2005-08-15 update. (#147)
+Fri Jun 29 01:08:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	    * SOAP::Header::SimpleHeader (de)serialization throws an exception
-	      on !SimpleHeader.on_(in|out)bound when header is a String.  so we
-	      could not use a simple single element headerItem.  fixed.  thanks
-	      to emil. (#129)
+	* numeric.c (fix_mul): remove FIT_SQRT_LONG test as it was causing
+	  fix_mul to return an incorrect result for -2147483648*-2147483648
+	  on 64 bit platforms
 
-	    * out parameter of rpc operation did not work.  (#132)
+	* test/ruby/test_integer_comb.rb (class TestIntegerComb): add test case
 
-	    * follow HTTP redirect only if using http-access2.  (#125) (#145)
+Fri Jun 28 12:26:53 2013  Tanaka Akira  <akr@fsij.org>
 
-	    * add a workaround for importing an WSDL whose path begins with
-	      drive letter.  (#115)
+	* bignum.c (rb_big_and): Allocate new bignum with same size to shorter
+	  argument if it's high bits are zero.
 
-	  * WSDL
+Fri Jun 28 12:14:04 2013  Tanaka Akira  <akr@fsij.org>
 
-	    * SOAP Data which is defined as a simpletype was not mapped
-	      correctly to Ruby obj when using wsdl2ruby.rb generated classdef
-	      file. (#123)
+	* ext/socket/ipsocket.c (init_inetsock_internal): Don't use local
+	  addresses which address family is different to remote address.
 
-	    * rpc/literal support. (#118)
+Fri Jun 28 08:06:22 2013  Tanaka Akira  <akr@fsij.org>
 
-	    * re-implemented local element qualify/unqualify control.  handles
-	      elementFormDefault and form in WSDL.  (#119)
+	* bignum.c (bigand_int): Add arguments, xn and hibitsx.
+	  Use twocomp2abs_bang.
 
-	    * Array of an element which has simpleType causes a crash. (#128)
+Thu Jun 27 23:58:13 2013  Tanaka Akira  <akr@fsij.org>
 
-	    * prarmeterOrder may not contain return part so it can be shorter
-	      than parts size.  Thanks to Hugh.  (#139)
+	* bignum.c (abs2twocomp_bang): Removed.
+	  (abs2twocomp): Take n_ret argument to return actual length.
+	  (rb_big_and): Follow above change.
 
-	  * Samples
+Thu Jun 27 22:52:19 2013  Tanaka Akira  <akr@fsij.org>
 
-	    * added !BasicAuth client sample. (#117)
+	* bignum.c (get2comp): Use bary_2comp.
+	  (abs2twocomp_bang): New function.
+	  (abs2twocomp): New function.
+	  (twocomp2abs_bang): New function.
+	  (rb_big_and): Use abs2twocomp and twocomp2abs_bang.
 
-	    * added Base64 client/server sample.
+Thu Jun 27 20:03:13 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-	    * added Flickr SOAP interface client sample. (#122)
+	* ext/openssl/lib/openssl/ssl.rb (verify_certificate_identity): fix
+	  hostname verification. Patched by nahi.
 
-	    * added !SalesForce client sample. (#135)
+	* test/openssl/test_ssl.rb (test_verify_certificate_identity): test for
+	  above.
 
-	    * updated Thawte CA certificate for !GoogleAdWords sample.
 
-	    * updated a client script with the newer version made by Johan.
-	      thanks!
+Thu Jun 27 00:23:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	    * shortened long file names. (#120)
+	* bignum.c (rb_big_pow): Retry if y is a Bignum and it is
+	  representable as a Fixnum.
+	  Use rb_absint_numwords.
 
-	    * fixed typo in authheader sample. (#129)
+Wed Jun 26 23:53:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	    * updated deprecated method usage.  (#138)
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_save_rounding_mode): fix typo.
+	  Fixes GH-343. Patch by @jgarber.
 
-Thu Sep 15 23:02:57 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jun 26 23:22:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.h (rb_w32_stat): added prototype.
+	* enumerator.c (rb_enumeratorize_with_size): use strict definition
+	  rb_enumerator_size_func.
 
-Thu Sep 15 22:35:55 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Jun 26 23:11:14 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* test/ruby/test_signal.rb (test_exit_action): skip the test using
-	  fork on fork-less platforms.
+	* gc.c (is_before_sweep): Add a missing space before a parenthesis.
+	* gc.c (rb_gc_force_recycle): Add a missing space around a parenthesis.
 
-Thu Sep 15 11:39:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Jun 26 22:44:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk/dialog.rb: If a dialog does not show up yet,
-	  TkDialogObj#name raises an exception. [ruby-talk:156109]
+	* include/ruby/intern.h (rb_enumeratorize_with_size): cast for
+	  backward compatibility.
 
-Thu Sep 15 01:39:19 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* include/ruby/intern.h (rb_enumerator_size_func): define strict
+	  function declaration for rb_enumeratorize_with_size().
 
-	* lib/rinda/tuplespace.rb (Rinda::TemplateEntry::initialize): pull
-	  up method. Tabs converted to spaces.
+Wed Jun 26 21:01:22 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-Thu Sep 15 00:18:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/ruby/test_io.rb (TestIO#test_write_32bit_boundary): skip if
+	  writing a file is slow.
+	  [ruby-core:55541] [Bug #8519]
 
-	* lib/net/telnet.rb (Net::Telnet::waitfor): replace sysread with
-	  readpartial.  [ruby-talk:127641]
+Wed Jun 26 16:42:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Sep 14 22:40:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/mkmf.rb: should use expanded values for header directories
+	  unless extmk.  patch by vo.x (Vit Ondruch) at [ruby-core:55653]
+	  [Bug #8115], rhbz#921650.
 
-	* dir.c (ruby_glob): glob function not using ruby exception system.
+Wed Jun 26 12:48:22 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Sep 14 01:26:03 2005  Minero Aoki  <aamine@loveruby.net>
+	* bignum.c (bigxor_int): Fix a buffer over read.
 
-	* lib/net/https.rb: backported from trunk, rev 1.3.
-	  [ruby-dev:25673] (again), [ruby-dev:26617] (again),
-	  [ruby-dev:27062]
+Wed Jun 26 12:13:12 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/lib/net/https.rb: removed.
+	* bignum.c (bigand_int): Consider negative values.
+	  (bigor_int): The allocated bignum should have enough size
+	  to store long.
+	  This fixes (bignum fits in a BDIGIT) | (fixnum bigger than BDIGIT)
+	  on platforms which SIZEOF_BDIGITS < SIZEOF_LONG,
+	  such as LP64 with 32bit BDIGIT (no int128).
 
-	* ext/openssl/lib/net/protocols.rb: removed.
+Wed Jun 26 12:08:51 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/net/http.rb: #use_ssl?, #use_ssl are moved from net/https.
+	* test/socket/test_udp.rb: Close sockets explicitly.
+	  Don't use fixed port number.
 
-Tue Sep 13 22:09:40 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Jun 26 07:27:17 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/logger.rb (Logger): added formatter accessor to logger for
-	  dictating the way in which the logger should format the messages it
-	  displays.  Thanks to Nicholas Seckar (cf. [ruby-talk:153391]) and
-	  Daniel Berger.
+	* bignum.c (bigand_int): Fix a buffer over read.
 
-	* lib/logger.rb (Logger): added VERSION constant.
+Wed Jun 26 06:48:07 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/logger.rb: removed document for LogDevice. It is an
-	  implementation detail and is not a public interface.
+	* bignum.c (bigadd_int): Fix a buffer over read.
 
-	* test/logger/test_logger.rb: added tests.
+Wed Jun 26 01:18:13 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Tue Sep 13 21:47:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (is_before_sweep): Add new helper function that check the object
+	  is before sweep?
+	* gc.c (rb_gc_force_recycle): Have to clear mark bit if object's slot
+	  already ready to minor sweep.
 
-	* eval.c (BEGIN_CALLARGS): pop halfly pushed status.
-	  fixed: [ruby-dev:26881]
+Wed Jun 26 01:17:29 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Sep 13 16:26:45 2005  Minero Aoki  <aamine@loveruby.net>
+	* bignum.c (bigsub_int): Fix a buffer over read.
 
-	* lib/net/http.rb: backported from trunk, rev 1.128.
-	  [ruby-dev:25673] [ruby-dev:26617]
+Tue Jun 25 22:45:43 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/net/protocol.rb: backported from trunk, rev 1.78.
+	* bignum.c (rb_absint_singlebit_p): Use POW2_P.
+	  (bary_pack): Ditto.
+	  (rb_big2str0): Ditto.
+	  (POW2_P): Moved to top.
 
-	* lib/net/protocol.rb: new method #old_open to support net/smtp
-	  and net/pop.
+Tue Jun 25 22:28:07 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/net/smtp.rb: use #old_open.
+	* lib/rubygems/ext/builder.rb (Gem::Ext::Builder.make): Pass
+	  DESTDIR via command line to override what's in MAKEFLAGS.  This
+	  fixes an installation problem under a package building
+	  environment where DESTDIR is specified in the (parent) command
+	  line. [Fixes GH-327]
 
-	* lib/net/pop.rb: ditto.
+Tue Jun 25 21:43:13 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Sep 13 12:33:05 2005  why the lucky stiff  <why@ruby-lang.org>
+	* bignum.c (big2dbl): Use (BDIGIT)1 instead of 1UL.
+	  (bary_mul_normal): Remove a useless cast.
 
-	* lib/yaml.rb: reworking YAML::Stream to use the new
-	  emitter.
+Tue Jun 25 21:26:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* lib/yaml/stream.rb: ditto.
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): Fix for the cases when
+	  the argument x is not a BigDecimal.
+	  This change is based on the patch made by Heesob Park and Garth Snyder.
+	  [Bug #6862] [ruby-core:47145]
+	  [Fixes GH-332] https://github.com/ruby/ruby/pull/332
 
-	* lib/yaml/rubytypes.rb: added Object#yaml_new.
+Tue Jun 25 20:36:31 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/yaml/tag.rb: the tag_subclasses? method now
-	  shows up in the class.  allow taguri to be set using an accessor.
-	  continue support of Object#to_yaml_type.
+	* bignum.c (big2ulong): "check" argument removed.
+	  (rb_big2ulong): Follow above change.
+	  (rb_big2long): Ditto.
+	  (rb_big_rshift): Ditto.
+	  (rb_big_aref): Ditto.
 
-	* ext/syck/rubyext.c: new emitter code.  yaml_new and yaml_initialize
-	  get called, should they be present.  consolidated all the diaspora of internal
-	  node types into the family below YAML::Syck::Node -- Map,
-	  Seq, Scalar -- all of whom are SyckNode structs pointing to
-	  Ruby data.  moved Object#yaml_new into the node_import and made it the
-	  default behavior.  the target_class is always called wih yaml_new, prepended
-	  a parameter, which is the klass.  loaded nodes through GenericResolver show their style.
-	  new Resolver#tagurize converts type ids to taguris.
+Tue Jun 25 20:08:29 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/syck/implicit.re: were 'y' and 'n' seriously omitted??
+	* bignum.c (rb_big2ulong_pack): Use rb_integer_pack.
+	  (rb_big_aref): Call big2ulong with TRUE for "check" argument.
+	  It should be non-effective.
 
-	* ext/syck/emitter.c: renovated emitter, walks the tree in advance.
-	  consolidated redundant block_styles struct into
-	  the scalar_style struct.  (this means loaded nodes can now
-	  be sent back to emitter and preserve at least its very basic
-	  formatting.)
+Tue Jun 25 19:07:33 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/syck/gram.c: headless documents of any kind allowed.
+	* bignum.c (LSHIFTX): Revert r41611.
+	  The redundant expression suppresses a warning, C4293, by Visual
+	  Studio.
+	  http://ruby-mswin.cloudapp.net/vc10-x64/ruby-trunk/log/20130625T072854Z.log.html.gz#miniruby
 
-	* ext/syck/node.c: new syck_replace_str methods and syck_empty_*
-	  methods for rewriting node contents, while keeping the ID
-	  and other setup info.  added syck_seq_assign.
+Tue Jun 25 19:03:00 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/syck/syck.h: reflect block_styles and new node functions.
+	* bignum.c (big2ulong): Add a cast.
+	  (big2ull): Add a specialized code for SIZEOF_LONG_LONG <=
+	  SIZEOF_BDIGITS.
 
-Mon Sep 12 20:53:06 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Jun 25 12:42:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/openssl/test_pkcs7.rb (test_enveloped): skip this test
-	  to avoid a bug of PKCS7_enctypt() (only if ext/openssl is
-	  compiled with OpenSSL-0.9.7d or earlier versions).
-	  http://www.mail-archive.com/openssl-dev@openssl.org/msg17376.html
+	* bignum.c (integer_unpack_single_bdigit): Use "1 + ~u" instead of
+	  "-u" to suppress warning (C4146) by Visual Studio.
+	  Reported by ko1 via IRC.
 
-Mon Sep 12 14:03:33 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun 25 12:28:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/dbm/test_dbm.rb: remove locking test, which may not be
-	  supported on some platforms.  [ruby-dev:27030]
+	* bignum.c (big2ulong): Add code specialized for SIZEOF_LONG <=
+	  SIZEOF_BDIGITS.
+	  This prevents shift width warning from "num <<= BITSPERDIG".
 
-Mon Sep 12 10:45:58 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun 25 12:23:30 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/dl/dl.c (rb_io_to_ptr): merged a patch for DragonFly BSD
-	  from Takahiro Kambe <taca at back-street.net>.  [ruby-dev:27023]
+	* gc.c: fix oldgen/remembered_shady counting algorithm.
 
-Sun Sep 11 22:05:51 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* gc.c (rgengc_check_shady): increment
+	  `objspace->rgengc.remembered_shady_object_count' here.
 
-	* bin/erb (ERB::Main#run): set ERB#filename so that it is used
-	  when reporting syntax/runtime errors. Tabs converted to spaces.
+	* gc.c (rgengc_remember): return FALSE if obj is already remembered.
 
-Sat Sep 10 10:17:03 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* gc.c (rgengc_rememberset_mark): make it void.
 
-	* ext/openssl/ossl_engine.c (ossl_engine_s_by_id):
-	  OpenSSL::Engine.by_id calls given block before calling
-	  ENGINE_init (block parameter is the return value of this method
-	  itself).  this functionality is useful to load dynamic shared
-	  engines. the following code is a sample of loading a key using
-	  OpenSC PKCS #11 module.
+	* gc.c (gc_mark_children): fix to double counting oldgen_object_count
+	  at minor GC.
 
-		require "openssl"
-		pkcs11 = OpenSSL::Engine.by_id("dynamic"){|e|
-		  e.ctrl_cmd("SO_PATH", "/usr/lib/opensc/engine_pkcs11.so")
-		  e.ctrl_cmd("LIST_ADD", "1")
-		  e.ctrl_cmd("LOAD")
-		}
-		pkcs11.ctrl_cmd("PIN", "secret")
-		key = pkcs11.load_private_key
+Tue Jun 25 12:07:18 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_engine.c (ossl_engine_ctrl_cmd): new method
-	  OpenSSL::Engine#ctrl_cmd. it wraps ENGINE_ctrl_cmd_string.
+	* bignum.c (MSB): Removed.
+	  (BDIGIT_MSB): Defined using BIGRAD_HALF.
+	  (bary_2comp): Apply BIGLO after possible over flow of BDIGIT.
+	  (get2comp): Ditto.
+	  (bary_unpack_internal): Use BDIGIT_MSB.
+	  Apply BIGLO after possible over flow of BDIGIT.
+	  (rb_integer_unpack): Use BDIGIT_MSB.
+	  (calc_hbase): Use BDIGMAX.
+	  (big2dbl): Use BDIGMAX.
+	  Apply BIGLO after possible over flow of BDIGIT.
+	  (rb_big_neg): Apply BIGLO after possible over flow of BDIGIT.
+	  (biglsh_bang): Ditto.
+	  (bigrsh_bang): Ditto.
+	  (bary_divmod): Use BDIGIT_MSB.
+	  (bigdivrem): Ditto.
+	  (bigxor_int): Apply BIGLO after possible over flow of BDIGIT.
 
-	* ext/openssl/ossl_engine.c (ossl_engine_get_cmds): new method
-	  OpenSSL::Engine#cmds. it returms engine command definitions.
+	* marshal.c (shortlen): Use SIZEOF_BDIGITS instead of sizeof(BDIGIT).
 
-Sat Sep 10 10:09:47 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): Use SIZEOF_BDIGITS
+	  instead of sizeof(BDIGIT).
 
-	* ext/openssl/ossl_asn1.c (asn1str_to_str): new function.
+Tue Jun 25 11:40:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_pkcs7.c: new class OpenSSL::PKCS7::RecipientInfo.
-	  this class wraps PKCS7_RECIP_INFO struct.
+	* bignum.c (big2ulong): suppress shorten-64-to-32 warning.  BDIGIT can
+	  be bigger than long now.
 
-	* ext/openssl/ossl_pkcs7.c: OpenSSL::PKCS7::Signer is renamed to
-	  OpenSSL::PKCS7::SignerInfo. ("Signer" remains as an alias of
-	  SignerInfo.)
+	* bignum.c (LSHIFTX): remove redundant never-true expression.
 
-	* test/openssl/test_pkcs7.rb: new file.
+Tue Jun 25 00:55:54 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Sat Sep 10 10:05:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* gc.c (typedef struct rb_objspace): Change members for monitor objects.
+	* gc.c (gc_marks_test): Check all WriteBarrier Errors and track them in obj-tree.
+	* gc.c (rgengc_check_shady): Ditto.
+	* gc.c (gc_marks): Move 2 function calls to gc_marks_test for test initialize.
 
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_initialize): assume that
-	  the argument is a DER string if Base64 decoding failed.
+Mon Jun 24 23:30:31 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_ns_pki.c (ossl_spki_to_der): new method.
+	* bignum.c (integer_unpack_single_bdigit): Refine code to filling
+	  higher bits and use BIGLO.
 
-	* test/openssl/test_ns_spki.rb: add new file.
+Mon Jun 24 22:26:31 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-Sat Sep 10 09:56:24 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/rinda/test_rinda.rb (RingIPv6#prepare_ipv6):
+	  ifindex() function may not be implemented on Windows. We use another
+	  check for the case.
 
-	* ext/openssl/lib/digest.rb: added SHA224, SHA256, SHA384 and SHA512.
-	  these features are enabled if this library is compiled with
-	  OpenSSL 0.9.8 or later.
+Mon Jun 24 22:11:37 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* test/openssl/test_digest.rb: add test for new digests.
+	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_nolock):
+	  skip a failing test on Windows because flock() implementation is
+	  different from Unix.
 
-Sat Sep 10 09:51:30 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Jun 24 22:06:14 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* ext/openssl/ossl.c (ossl_raise): should use ERR_peek_last_error
-	  to get last error on the current thread. And should report
-	  errors on the stack while OpenSSL.debug is true.
+	* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
+	  use ruby in build directory in case ruby is not installed.
+	  [ruby-core:53265] [Bug #8058]
 
-	* ext/openssl/ossl.c (ossl_get_errors): new method for debugging
-	  this library.
+Mon Jun 24 22:04:02 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): fix error message.
+	* ext/dl/cfunc.c (rb_dlcfunc_call): fix conversion from Bignum to
+	  pointer. sizeof(DLSTACK_TYPE) is larger than sizeof(long) on
+	  Windows x64 and higher bits over sizeof(long) of DLSTACK_TYPE was
+	  zero even if a pointer value was over 32 bits which causes SEGV on
+	  DL::TestCPtr#test_to_ptr_io. Adding a cast solves the bug.
 
-	* ext/openssl/ossl_x509req.c (ossl_x509req_set_attributes): get rid
-	  of unused variable.
+Mon Jun 24 22:04:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): should
-	  set @time to avoid warning.
+	* eval_error.c (warn_printf): use rb_vsprintf instead so ruby specific
+	  extensions like PRIsVALUE can be used in format strings
+	* eval_error.c (error_print): use warn_print_str (alias for
+	  rb_write_error_str) to print a string value instead of using
+	  RSTRING_PTR and RSTRING_LEN manually
+	* eval.c (setup_exception): use PRIsVALUE instead of %s and RSTRING_PTR
 
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths,
-	  X509_STORE_add_cert, X509_STORE_add_crl): should raise error if
-	  wrapped functions failed.
+Mon Jun 24 20:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* test/openssl/test_x509store.rb: add test for errors.
+	* compile.c (make_name_for_block): use PRIsVALUE in format string
+	  instead of %s and RSTRING_PTR to protect objects from being garbage
+	  collected too soon
+	* encoding.c (str_to_encindex): ditto
+	* hash.c (rb_hash_fetch_m): ditto
+	* io.c (rb_io_reopen): ditto
+	* parse.y (reg_fragment_check_gen): ditto
+	* parse.y (reg_compile_gen): ditto
+	* parse.y (ripper_assert_Qundef): ditto
+	* re.c (rb_reg_raise): ditto
+	* ruby.c (set_option_encoding_once): ditto
+	* vm_eval.c (rb_throw_obj): ditto
 
-Fri Sep  9 22:13:19 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jun 24 07:57:18 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* eval.c (rb_call0): prohibit calling tainted method (>2) when
-	  $SAFE == 0.
+	* gc.c (after_gc_sweep): Have to record malloc info before reset.
+	* gc.c (gc_prof_timer_start): Pick out part of new record creation as gc_prof_setup_new_record.
+	* gc.c (gc_prof_set_malloc_info): Move point of recording allocation size to front of mark.
 
-Fri Sep  9 16:45:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jun 24 02:53:09 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* string.c (rb_str_times): make empty strings to keep taintness,
-	  and a little improvement.  [ruby-dev:26900]
+	* array.c: Return value in Array overview example found by @PragTob
+	  [Fixes GH-336] https://github.com/ruby/ruby/pull/336
 
-	* ext/iconv/iconv.c (iconv_try), ext/iconv/extconf.rb: get rid of meta
-	  characters in command line option.  fixed: [ruby-talk:155369]
+Mon Jun 24 02:45:51 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Thu Sep  8 14:58:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c (rb_ary_zip): typo by @PragTob [Fixes GH-337]
+	  https://github.com/ruby/ruby/pull/337
 
-	* merged a patch from Takahiro Kambe <taca at back-street.net> to
-	  support DragonFly BSD.  [ruby-dev:26984]
+Mon Jun 24 02:42:01 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Wed Sep  7 12:55:08 2005  Tanaka Akira  <akr@m17n.org>
+	* win32/README.win32: grammar typo by @blankenshipz [Fixes GH-334]
+	  https://github.com/ruby/ruby/pull/334
 
-	* lib/open-uri.rb: abolish mod === tempfile to avoid a problem
-	  [ruby-dev:26967].
+Mon Jun 24 00:59:35 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Sep  7 10:45:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (BIGUP): Use LSHIFTX and avoid cast to consider the type
+	  of x is bigger than BDIGIT_DBL.
+	  (big2ulong): Use unsigned long to store the result.
+	  (big2ull): Use unsigned LONG_LONG to store the result.
+	  (bigand_int): Use long for num to avoid data loss.
+	  (bigor_int): Ditto.
+	  (bigxor_int): Ditto.
 
-	* eval.c (rb_thread_switch): convert all exceptions to
-	  SystemExit.  fixed: [ruby-core:05724]
+Sun Jun 23 23:05:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_thread_terminated): show backtrace before propagate
-	  exceptions to main thread.
+	* include/ruby/defines.h (BDIGIT): Define it only if it is not defined
+	  yet.  This eases tests and debug.
+	  (SIZEOF_BDIGITS): Ditto.
+	  (BDIGIT_DBL): Ditto.
+	  (BDIGIT_DBL_SIGNED): Ditto.
+	  (PRI_BDIGIT_PREFIX): Ditto.
+	  (PRI_BDIGIT_DBL_PREFIX): Ditto.
+	  (PRIdBDIGIT): Define it only if PRI_BDIGIT_PREFIX is defined.
+	  (PRIiBDIGIT): Ditto.
+	  (PRIoBDIGIT): Ditto.
+	  (PRIuBDIGIT): Ditto.
+	  (PRIxBDIGIT): Ditto.
+	  (PRIXBDIGIT): Ditto.
+	  (PRIdBDIGIT_DBL): Ditto.
+	  (PRIiBDIGIT_DBL): Ditto.
+	  (PRIoBDIGIT_DBL): Ditto.
+	  (PRIuBDIGIT_DBL): Ditto.
+	  (PRIxBDIGIT_DBL): Ditto.
+	  (PRIXBDIGIT_DBL): Ditto.
 
-Wed Sep  7 08:35:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/ruby.h (RBIGNUM_EMBED_LEN_MAX): Define it only if it is
+	  not defined yet.
 
-	* Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load
-	  extension libraries.
+Sun Jun 23 17:29:51 2013  Tanaka Akira  <akr@fsij.org>
 
-	* bignum.c (bignew_1, bigadd): K&R style argument actually can't be
-	  defined as char.
+	* bignum.c (integer_unpack_single_bdigit): Use a cast.
 
-	* missing/vsnprintf.c: ANSI compiler supports const keyword.
+Sun Jun 23 15:38:07 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/digest/sha2/extconf.rb: reject platforms which has inttypes.h
-	  but no 64bit integer.
+	* bootstraptest/test_thread.rb: rescue resource limitation errors.
 
-	* lib/mkmf.rb (what_type?): guesstimate type.
+Sun Jun 23 08:19:27 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/etc/etc.c (setup_passwd), ext/etc/extconf.rb: pw_age might be
-	  char*.  fixed: [ruby-core:05470]
+	* bignum.c (integer_unpack_single_bdigit): Extracted from
+	  bary_unpack_internal.
 
-Wed Sep  7 08:32:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jun 23 07:41:52 2013  Tanaka Akira  <akr@fsij.org>
 
-	* object.c (rb_mod_cvar_get, rb_mod_cvar_set): document fix from
-	  sheepman <sheepman@sheepman.sakura.ne.jp>; a bug in visibility
-	  description.  [ruby-dev:26965]
+	* bignum.c (bary_unpack_internal): Suppress warnings (C4146) on Visual Studio.
+	  Reported by ko1 via IRC.
 
-	* sprintf.c (rb_f_sprintf): warn "too many argument" on verbose
-	  mode (-v/-w); backported from 1.9.  [ruby-dev:26963]
+Sun Jun 23 06:49:28 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Sep  5 17:03:07 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* include/ruby/ruby.h, gc.c: rename macros and functions:
+	  OBJ_WB_GIVEUP() -> OBJ_WB_UNPROTECT(),
+	  rb_obj_wb_giveup() -> rb_obj_wb_unprotect(),
+	  rb_gc_giveup_promoted_writebarrier() ->
+	  rb_gc_writebarrier_unprotect_promoted(),
 
-	* lib/ostruct.rb: a patch from Florian Gross <florgro at gmail.com>
-	  merged to allow recursive inspect (and to_s) for OpenStruct.
-	  [ruby-core:05532]
+	* class.c, eval.c, hash.c: use OBJ_WB_UNPROTECT().
 
-Mon Sep  5 07:01:12 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Jun 23 05:41:32 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/openssl/lib/openssl/buffering.rb (Buffering#do_write):
-	  should clear data from the buffer which already been output.
+	* class.c (rb_include_class_new), eval.c (rb_using_refinement):
+	  make classes/modules (who share method table) shady.
+	  If module `a' and `b' shares method table m_tbl and new method
+	  with iseq is added, then write barrier is applied only `a' or `b'.
+	  To avoid this issue, shade such classes/modules.
 
-Fri Sep  2 23:51:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_method.c (rb_method_entry_make): add write barriers.
 
-	* lib: do not use __send__ to access private methods.  [ruby-dev:26935]
+Sun Jun 23 01:27:54 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Sep  2 03:29:00 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	* bignum.c (bytes_zero_p): Removed.
+	  (bary_pack): Don't call bytes_zero_p.
 
-	* lib/irb/init.rb: make IRB -I option that is same befavior for ruby.
-	  [ruby-dev:26872], [ruby-dev: 26920]
+Sun Jun 23 00:51:29 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/irb/locale.rb: support to print help message when OS locale is
-	  ja_JP.utf-8. [ruby-dev:26872]
+	* bignum.c (bytes_zero_p): Extracted from bary_pack.
+	  (bary_pack): Use bytes_zero_p.
 
-Thu Sep  1 17:11:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Jun 23 00:16:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_call0): wrong condition for $SAFE restoration.
+	* bignum.c (MSB): New macro.
+	  (bary_unpack_internal): Use MSB.
+	  (bary_divmod): Ditto.
+	  (bigdivrem): Ditto.
 
-Thu Sep  1 14:12:45 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Jun 22 23:45:22 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/multi-tk.rb: On Tcl8.5, MultiTkIp#invoke_hidden doesn't
-	  work (gives wrong order of arguments).
+	* bignum.c (bary_swap): New function.
+	  (bary_pack): Use bary_swap.
+	  (bary_unpack_internal): Ditto.
 
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#invoke_hidden_on_namespace
-	  to support '-namespace' option of 'interp invokehidden' command
-	  on Tcl8.5.
+Sat Jun 22 23:18:39 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Aug 31 14:43:15 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (bytes_2comp): Renamed from quad_buf_complement.
+	  (bary_pack): Use bytes_2comp.
+	  (rb_quad_pack): Use rb_integer_pack.
+	  (rb_quad_unpack): Use rb_integer_unpack.
 
-	* win32/Makefile.sub (OPTFLAGS): default global optimization to
-	  disabled for all VC++ versions.  fixed: [ruby-dev:26897]
+Sat Jun 22 21:46:18 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Aug 31 11:35:43 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (rb_integer_unpack): Don't allocate a Bignum if possible.
 
-	* test/gdbm/test_gdbm.rb (teardown): should remove GDBM temporary
-	  file.
+Sat Jun 22 21:03:58 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Aug 31 10:30:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* pack.c (pack_unpack): Remove specialized unpackers for integers.
 
-	* process.c (proc_detach, proc_setmaxgroups): missing argument type
-	  declaration. (I recommend ANSI-style function)
+Sat Jun 22 20:36:50 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Aug 30 23:20:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bary_unpack_internal): Specialized unpacker implemented.
+	  (bary_unpack): Support INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION.
+	  (rb_integer_unpack): Support INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION.
 
-	* eval.c (rb_rescue2): initialization miss.  fixed: [ruby-dev:26917]
+Sat Jun 22 18:53:10 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (xsystem, xpopen): no longer expand by Config.
+	* bignum.c (bary_pack): Support
+	  INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION flag.
+	  Fix byte order and word order handling in code specialized for
+	  wordsize % SIZEOF_BDIGITS == 0.
 
-	* lib/mkmf.rb (link_command, cc_command, cpp_command): expand
-	  variables at once, and quote hdrdir.  fixed: [ruby-core:05680]
+	* internal.h (INTEGER_PACK_FORCE_GENERIC_IMPLEMENTATION): Defined.
 
-	* lib/mkmf.rb (libpathflag): quote paths.
+Sat Jun 22 15:41:25 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Aug 30 19:34:27 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* gc.c (rgengc_check_shady): add new WB miss checking
+	  on RGENGC_CHECK_MODE >= 2.
 
-	* ext/digest/md5/md5ossl.h, ext/digest/rmd160/rmd160ossl.h,
-	  ext/digest/sha1/sha1ossl.h: include <stddef.h> to avoid
-	  error in compilation with OpenSSL-0.9.8. [ruby-list:41068]
+	    (1) Save bitmaps before marking
+	    (2) Run full marking
+	    (3) On each traceable object,
+	      (a) object        was not oldgen (== newly or shady object) &&
+	      (b) parent object was     oldgen &&
+	      (c) parent object was not remembered &&
+	      (d) object        was not remembered
+	      then, it should be WB miss.
 
-Mon Aug 29 19:54:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	  This idea of this checker is by Masaya Tarui <tarui@ruby-lang.org>.
 
-	* lib/rdoc/usage.rb: improper exceptions. [ruby-dev:26870]
+Sat Jun 22 15:25:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* lib/rdoc/usage.rb: support the case when non-ruby code exists before
-	  shebang. (this is needed when ri.bat is executed on windows)
+	* ext/etc/etc.c (setup_passwd): revert r41560, unnecessary
 
-Mon Aug 29 17:48:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jun 22 14:39:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* eval.c (method_arity): should return proper arity value.
-	  [ruby-dev:26390]
+	* ext/etc/etc.c (Init_etc): omit 'passwd' from definition of Etc::Passwd
+	  if HAVE_STRUCT_PASSWD_PW_PASSWD is not defined to prevent mismatch of
+	  fields and values in setup_passwd
 
-Mon Aug 29 01:19:57 2005  Tanaka Akira  <akr@m17n.org>
+Sat Jun 22 14:35:40 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/time.rb (Time.parse): extract fractional seconds using
-	  Date._parse.  [ruby-talk:153859]
+	* ext/dl/cfunc.c (rb_dlcfunc_call): Use rb_big_pack instead of
+	  rb_big2ulong_pack and rb_big2ull.
 
-Sat Aug 27 20:20:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* include/ruby/intern.h (rb_big2ulong_pack): Deprecated.
 
-	* ext/curses/curses.c ({curses,window}_clrtoeol): added. suggested
-	  by Reyn Vlietstra.
+Sat Jun 22 14:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* ext/curses/curses.c: chtype in curses is not `char', rahter `long'.
-	  [ruby-Bugs:2298]
+	* ext/etc/etc.c (setup_passwd): pass 0 as VALUE to rb_struct_new to
+	  prevent segfault if the compiler passes it as a 32 bit integer on
+	  a 64 bit ruby
 
-	* ext/curses/view.rb: String =~ String is deprecated.
+Sat Jun 22 13:47:13 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Aug 24 10:53:28 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* bignum.c (bary_pack): MEMZERO can be used even if nails is not zero.
 
-	* test/logger/test_logger.rb (test_shifting_size): should close log
-	  device before unlink, since some platform cannot unlink opened
-	  file.
+Sat Jun 22 13:43:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Sun Aug 21 00:13:27 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/etc/etc.c (etc_getpwnam): use PRIsVALUE in format string instead
+	  of %s and RSTRING_PTR
 
-	* lib/wsdl/xmlSchema/importer.rb (WSDL::XMLSchema::Importer#fetch): add
-	  a workaround for importing an WSDL whose path begins with drive
-	  letter.  [ruby-dev:26242]
+	* ext/etc/etc.c (etc_getgrnam): ditto
 
-Sat Aug 20 22:37:13 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Jun 22 13:07:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/logger.rb (write, shift_log?, shift_log): file shifting race
-	  condition bug fixed.  [ruby-dev:26764]
+	* bignum.c (CLEAR_LOWBITS): Rewritten without RSHIFTX.
+	  (RSHIFTX): Removed.
 
-	* test/logger/test_logger.rb: tests.
+Sat Jun 22 10:38:03 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Aug 19 18:13:39 2005  Tanaka Akira  <akr@m17n.org>
+	* pack.c (num2i32): Removed.
+	  (pack_pack): Don't use num2i32.
 
-	* lib/time.rb (Time.apply_offset): fix a problem with last day of
-	  month.  reported by Lucas Nussbaum.  [ruby-talk:152866]
+Sat Jun 22 09:55:13 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Aug 18 12:46:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bignum.c (LSHIFTX): Defined to suppress a warning.
+	  (RSHIFTX): Ditto.
+	  (CLEAR_LOWBITS): Use LSHIFTX and RSHIFTX.
+	  (FILL_LOWBITS): Use LSHIFTX.
+	  Reported by ko1 via IRC.
 
-	* bcc32/Makefile.sub (COMMON_HEADERS): reverted 1.42.2.24.
-	  I misunderstood, bccwin32 on ruby_1_8 uses winsock2 originally.
-	  [ruby-dev:26806]
+Sat Jun 22 09:11:33 2013  Ryan Davis  <ryand-ruby@zenspider.com>
 
-	* win32/win32.h: include winsock2.h instead of winsock.h. (bcc32)
+	* lib/minitest/*: Imported minitest 4.7.5 (r8724)
+	* test/minitest/*: ditto
 
-Wed Aug 17 23:58:05 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun 22 07:20:30 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* object.c (rb_to_integer): argument constified.
+	* gc.c (gc_prof_set_heap_info, after_gc_sweep): call
+	  gc_prof_set_heap_info() just after sweeping to calculate
+	  live object number correctly.
+	  (live object number = total generated number (before marking) -
+	                        total freed number (after sweeping))
 
-	* eval.c (terminate_process): take String message.
+	* gc.c (gc_marks): record `oldgen_object_count' into current profile`
+	  record directly.
 
-	* eval.c (rb_thread_switch): propagate the exception caused thread
-	  termination directly.  fixed: [ruby-core:05552]
+	* gc.c (rgengc_rememberset_mark): same for remembered_normal_objects
+	  and remembered_shady_objects.
 
-Wed Aug 17 00:05:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jun 22 06:46:04 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_add_method): preserve safe level in the environment
-	  where a method is defined .
+	* gc.c (rb_objspace::profile): rename rb_objspace::profile::record to
+	  records (because it points a set of records) and add a field
+	  rb_objspace::profile::current_record to point a current profiling
+	  record.
 
-	* eval.c (rb_call0): restore preserved safe level in the method
-	  execution.
+	* gc.c: use above fields.
 
-Mon Aug 15 00:38:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun 22 06:05:36 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_rescue2): reduce PUSH_TAG() as well as NODE_RESCUE.
-	  [ruby-dev:26800]
+	* gc.c (rb_gc_giveup_promoted_writebarrier): remove `rest_sweep()'
+	  because all of remembered objects are called for gc_mark_children().
 
-	* range.c (range_check, range_init): reduce useless exceptions.
+Sat Jun 22 05:08:03 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sat Aug 13 18:51:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (rgengc_rememberset_mark): call gc_mark_children() for
+	  remembered objects directly instead of pushing on the mark stack.
 
-	* eval.c (rb_block_pass): distinguish current block from others.
-	  fixed: [ruby-dev:26274]
+Sat Jun 22 04:48:53 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/stringio/stringio.c (strio_set_string): disallow nil.
-	  http://www.rubyist.net/~nobu/t/20050811.html#c05
+	* include/ruby/ruby.h (OBJ_WRITE): cast to (VALUE *) for second
+	  parameter `slot'. You don't need to write a cast (VALUE *) any more.
 
-Thu Aug 11 23:29:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* class.c, compile.c, hash.c, iseq.c, proc.c, re.c, variable.c,
+	  vm.c, vm_method.c: remove cast expressions for OBJ_WRITE().
 
-	* ext/stringio/stringio.c: keep holding string after closed.
+Sat Jun 22 04:37:08 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Aug 11 13:01:48 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* gc.c (slot_sweep_body): rename to slot_sweep().
+	  No need to separate major/minor GC.
 
-	* lib/rss: fixed sort bug. [ruby-list:41018]
+	* gc.c (gc_setup_mark_bits): remove gc_clear_mark_bits() and unify to
+	  this function.
 
-	* lib/rss/1.0.rb (RSS::RDF::Channel#setup_maker_attributes):
-	  removed self.
+Sat Jun 22 04:20:21 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rss/maker/base.rb (RSS::Maker::ItemsBase#<=>): use #date
-	  instead of @date.
-	  (RSS::Maker::Base::self.def_array_element): added #size.
+	* gc.c (check_bitmap_consistency): add to check flag and bitmap consistency.
+	  Use this function in several places.
 
-	* lib/rss/maker/1.0.rb
-	  (RSS::Maker::RSS10::Channel#to_rss,
-	   RSS::Maker::RSS10::Items::Item#to_rss): cleared dc_dates set
-	  upped by using #date.
+Sat Jun 22 02:18:07 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rss/maker/dublincore.rb
-	  (RSS::Maker::ChannelBase, RSS::Maker::ItemsBase::ItemBase):
-	  fixed opposite alias.
+	* bignum.c (bary_pack): Specialized packers implemented.
+	  (HOST_BIGENDIAN_P): New macro.
+	  (ALIGNOF): New macro.
+	  (CLEAR_LOWBITS): New macro.
+	  (FILL_LOWBITS): New macro.
+	  (swap_bdigit): New macro.
+	  (bary_2comp): Returns an int.
 
-	* test/rss/test_setup_maker_1.0.rb
-	  (RSS::TestSetupMaker10::test_setup_maker_items_sort): added some
-	  tests for RSS::Maker::ItemsBase#do_sort.
+	* internal.h (swap16): Moved from pack.c
+	  (swap32): Ditto.
+	  (swap64): Ditto.
 
-Wed Aug 10 10:29:40 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Jun 21 21:29:49 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: fix bug on handling __ruby2val_optkeys().
+	* gc.c (typedef enum): Introduce flags of major gc reason.
+	* gc.c (garbage_collect_body): Ditto.
+	* gc.c (gc_profile_flags): Ditto.
+	* gc.c (gc_profile_dump_on): Ditto.
 
-	* ext/tk/lib/tk/itemconfig.rb: fix bug on handling
-	  __item_ruby2val_optkeys().
+Fri Jun 21 21:11:53 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/canvas.rb: didn't check __item_ruby2val_optkeys().
+	* gc.c (allocate_sorted_heaps): remove unused variable `add'.
 
-	* ext/tk/lib/tkextlib/blt/component.rb: ditto.
+Fri Jun 21 20:50:32 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Aug  9 15:12:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* include/ruby/ruby.h: constify RArray::as::ary and RArray::heap::ptr.
+	  Use RARRAY_ASET() or RARRAY_PTR_USE() to modify Array objects.
 
-	* ext/tcltklib/tcltklib.c: remove dangerous 'rb_jump_tag's.
+	* array.c, gc.c: catch up above changes.
 
-	* ext/tk/lib/tk.rb: add __val2ruby_optkeys and __ruby2val_optkeys to
-	  help to convert option values between ruby and tcl.
+Fri Jun 21 20:32:13 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/itemconfig.rb: add __item_val2ruby_optkeys and
-	  __item_ruby2val_optkeys to help to convert option values between
-	    ruby and tcl.
+	* vm_eval.c (eval_string_with_cref): fix WB miss.
 
-	* ext/tk/lib/tk/radiobutton.rb: use __ruby2val_optkeys for 'variable'
-	  option (for the reason of backward compatibility).
+Fri Jun 21 20:15:49 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/composite.rb: clarify the arguments of super().
+	* include/ruby/ruby.h: support write barrier protection for T_STRUCT.
+	  Introduce the following C APIs:
+	    * RSTRUCT_RAWPTR(st) returns pointer (do WB on your risk).
+	      The type of returned pointer is (const VALUE *).
+	    * RSTRUCT_GET(st, idx) returns idx-th value of struct.
+	    * RSTRUCT_SET(st, idx, v) set idx-th value by v with WB.
+	  And
+	    * RSTRUCT_PTR(st) returns pointer with shady operation.
+	      The type of returned pointer is (VALUE *).
 
-	* ext/tk/lib/tk/spinbox.rb: ditto.
+	* struct.c, re.c, gc.c, marshal.c: rewrite with above APIs.
 
-	* ext/tk/lib/tk/text.rb: ditto.
+Fri Jun 21 19:38:37 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/validation.rb: ditto.
+	* bignum.c (BDIGMAX): Use BIGRAD.
+	  (BIGLO): Use BDIGMAX.
+	  (bigdivrem1): Ditto.
+	  (bigor_int): Ditto.
+	  (rb_big_or): Ditto.
 
-	* ext/tk/lib/tkextlib/*: support to treat tkvariable-type
-	  configure options.
+Fri Jun 21 19:18:48 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Aug  9 20:30:19 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+	* pack.c (pack_pack): Move the implementation for 'c' directive after
+	  pack_integer label.
 
-	* bignum.c (rb_big_coerce): allow bignum x bignum coercing.
-	  [ruby-dev:26778]
+Fri Jun 21 19:11:56 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Aug  8 20:43:02 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* include/ruby/ruby.h, re.c: support write barrier for T_REGEXP.
 
-	* test/ruby/test_method.rb: added.  [ruby-dev:26761]
+	   Note: T_MATCH object is also easy to support write barriers.
+	         However, most of T_MATCH objects are short-lived objects.
+	         So I skipped to support non-shady T_MATCH.
 
-Sun Aug  7 23:50:14 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Fri Jun 21 18:56:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/ruby/test_super.rb: added from HEAD. [ruby-dev:26743]
+	* bignum.c (bigsub_int): Use bdigit_roomof.
+	  (bigadd_int): Ditto.
+	  (bigand_int): Ditto.
+	  (bigor_int): Ditto.
+	  (bigxor_int): Ditto.
 
-Sun Aug  7 01:31:15 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Fri Jun 21 17:56:25 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/win32ole/win32ole.c (WIN32OLE_EVENT#on_event): should set
-	  only one event handler.
+	* benchmark/gc/gcbench.rb: fix summary of benchmark result notation.
 
-	* ext/win32ole/tests/testOLEEVENT.rb: ditto.
+Fri Jun 21 16:38:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* ext/win32ole/tests/testOLEPARAM.rb: remove re-defined
-	  test_ole_type_detail method.
+	* ext/openssl/ossl_x509attr.c: change OSSL_X509ATTR_IS_SINGLE and
+	  OSSL_X509ATTR_SET_SINGLE macros to use ->value.set rather than
+	  ->set to fix compile failure
 
-Sat Aug  6 12:35:24 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Jun 21 15:26:45 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/{tk.rb,tk/itemconfig.rb}: configure creates
-	  TkVariable if key name is 'variable' or 'textvariable'
-	  by default. [ruby-dev:26749]
+	* gc.c (gc_sweep): profile sweep time correctly when LAZY_SWEEP is
+	  disabled.
 
-	* ext/tk/lib/tk/{label,radiobutton}.rb: removed its own
-	  {variable,textvariable} function.
+	* gc.c (gc_marks_test): store oldgen count and shady count
+	  before test marking and restore them after marking.
 
-	* ext/tk/lib/tk/variable.rb: retains backward conpatibility.
+Fri Jun 21 15:07:42 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Aug  5 12:50:32 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* gc.c: enable lazy sweep (commit miss).
 
-	* ext/tcltklib/tcltklib.c: fixed memory leak when tk_funcall raised
-	  exception. (copies argv into heap in tk_funcall instead of
-	  caller)
+Fri Jun 21 14:31:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Aug  5 12:42:57 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* hash.c (ruby_setenv): refine error message so include the variable
+	  name.
 
-	* lib/mkmf.rb (create_makefile): need to convert path separetor
-	  before invoking install command.
+Fri Jun 21 14:15:08 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Aug  5 00:27:04 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* gc.c: fix to use total_allocated_object_num and heaps_used
+	  at the GC time for profiler.
 
-	* ext/tcltklib/tcltklib.c: refactoring - extract ruby string <->
-	  tcl object conversion as get_str_from_obj and get_obj_from_str.
+Fri Jun 21 12:35:35 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Aug  5 00:19:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c: RGENGC_CHECK_MODE should be 0.
 
-	* extmk.rb (extmake): needs to be wrapped in an Array.
+Fri Jun 21 11:18:25 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Aug  4 18:38:36 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (gc_marks_body): fix to get `th' in this function.
 
-	* ext/tcltklib/tcltklib.c: cannot compile for Tcl7.6/Tk4.2.
+Fri Jun 21 10:21:44 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tcltklib/tcltklib.c: add nativethread consistency check.
+	* gc.c (heaps_header/heaps_slot): embed bitmaps into heaps_slot.
+	  no need to maintain allocation/free bitmaps.
 
-	* ext/tcltklib/stubs.c: ditto.
+Fri Jun 21 09:22:16 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk.rb: forgot to define TclTkIp.encoding and encoding=
-	  when Tcl is 7.6 or 8.0.
+	* gc.c (slot_sweep_body): add counters at a time.
 
-	* ext/tk/lib/tk/wm.rb: support to make some methods as options of
-	  root or toplevel widget. [ruby-talk:150336]
+	* gc.c (gc_profile_dump_on): fix line break position.
 
-	* ext/tk/lib/tk/root.rb: ditto.
+Fri Jun 21 08:14:00 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* ext/tk/lib/tk/toplevel.rb: ditto.
+	* gc.c: refactoring bitmaps. introduce bits_t type and some Consts.
 
-	* ext/tk/lib/tkextlib/SUPPRT_STATUS: update RELEASE_DATE
+Fri Jun 21 08:04:32 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Aug  4 08:03:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c: fix to support USE_RGENGC == 0 (disable RGenGC).
+	  If USE_RGENGC==0, it caused compilation error.
 
-	* ext/extmk.rb (extmake): should not modify $mflags for each
-	  extentions.
+Fri Jun 21 08:08:11 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Thu Aug  4 00:25:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (lazy_sweep): Use is_lazy_sweeping()
+	* gc.c (rest_sweep): Ditto.
+	* gc.c (gc_prepare_free_objects): Ditto.
 
-	* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
-	  macro definitions.
+Fri Jun 21 07:34:47 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
+	* gc.c (gc_profile_record::oldgen_objects): added.
 
-	* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
+	* gc.c (gc_profile_dump_on): print the following information:
+	  * Living object counts
+	  * Free object counts
+	  If RGENGC_PROFILE > 0 then
+	  * Oldgen object counts
+	  * Remembered normal object counts
+	  * Remembered shady object counts
 
-Wed Aug  3 21:59:16 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Jun 21 06:43:59 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on
-	  TkVariable retrived from TkVariable.new_hash.ref. [ruby-dev:26721]
+	* bignum.c (rb_ull2big): Refactored.
+	  (rb_uint2big): Useless code removed.
 
-Wed Aug  3 08:22:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun 21 05:37:39 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
-	  changes at 2004-09-07.  [ruby-dev:26656]
+	* gc.c (gc_prof_sweep_timer_stop): accumulate sweep time only when
+	  record->gc_time > 0.
 
-Tue Aug  2 10:20:54 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jun 21 00:37:31 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of
-	  Tcl_Obj[GS]etVar2. (avoid Tcl_NewStringObj on supported platforms)
+	* ext/bigdecimal: Workaround fix for bigdecimal test failures caused
+	  by [ruby-dev:47413] [Feature #8509]
 
-	* ext/tcltklib/tcltklib.c: use ip_{get,set,unset}_variable2_core from
-	  ip_{get,set,unset}_variable.
+	* ext/bigdecimal/bigdecimal.h (BDIGIT): Make it independent from the
+	  definition for bignum.c.
+	  (SIZEOF_BDIGITS): Ditto.
+	  (BDIGIT_DBL): Ditto.
+	  (BDIGIT_DBL_SIGNED): Ditto.
+	  (PRI_BDIGIT_PREFIX): Undefine the definition.
+	  (PRI_BDIGIT_DBL_PREFIX): Ditto.
 
-	* ext/tcltklib/tcltklib.c: replaced Tcl_Panic with rb_bug.
+	* ext/bigdecimal/bigdecimal.c (RBIGNUM_ZERO_P): Use rb_bigzero_p.
+	  (bigzero_p): Removed.
+	  (is_even): Use rb_big_pack.
 
-Tue Aug  2 01:41:28 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Jun 20 22:52:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/ping.rb (Ping.pingecho): should rescue StandardError.
-	  [ruby-dev:26677]
+	* bignum.c (bigmul1_toom3): Don't call bignorm twice.
 
-Mon Aug  1 19:09:41 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jun 20 22:49:27 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tcltklib/tcltklib.c: refactoring - replaced rb_ivar_defined &
-	  rb_ivar_get with single rb_attr_get call.
+	* bignum.c (bignorm): Don't call bigtrunc if the result is a fixnum.
 
-Mon Aug  1 18:45:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jun 20 22:29:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tcltklib/tcltklib.c (Tcl_GetStringResult): refactoring - define
-	  alternative macro on Tcl7.x or earlier.
+	* bignum.c (rb_uint2big): Refactored.
 
-Mon Aug  1 13:57:35 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jun 20 22:24:41 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tcltklib/tcltklib.c (deleted_ip): refactoring - interpreter
-	  deletion check. [ruby-dev:26664]
+	* bignum.c (dump_bignum): Use SIZEOF_BDIGITS.
 
-Mon Aug  1 01:17:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Thu Jun 20 22:22:46 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/drb/drb.rb (check_insecure_method): use private_methods and
-	  protected_methods instead of respond_to? to check method visibility.
-	  [ruby-dev:26616]
+	* bignum.c (big2ulong): Change the return type to unsigned long.
+	  (rb_big2ulong_pack): Follow the above change.
+	  (rb_big2long): Ditto.
+	  (rb_big_lshift): Ditto.
+	  (rb_big_rshift): Ditto.
+	  (rb_big_aref): Ditto.
 
-	* test/drb/drbtest.rb: ditto.
+Thu Jun 20 22:02:46 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/drb/ut_drb.rb: ditto.
+	* bignum.c (bary_unpack_internal): Return -2 when negative overflow.
+	  (bary_unpack): Set the overflowed bit if an extra BDIGIT exists.
+	  (rb_integer_unpack): Set the overflowed bit.
 
-Mon Aug  1 00:07:32 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+Thu Jun 20 21:17:19 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955]
+	* gc.c (rgengc_rememberset_mark): record
+	  (1) normal objects count in remember set
+	  (2) shady objects count in remember set
+	  each GC timing.
 
-Fri Jul 29 09:59:38 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_profile_record_get): enable to access above information
+	  and REMOVING_OBJECTS, EMPTY_OBJECTS.
 
-	* eval.c (rb_yield_0): push yielded node instead of yielding.
-	  fixed: [yarv-dev:549]
+Thu Jun 20 18:29:26 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Jul 28 18:09:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* benchmark/gc/gcbench.rb: Do not use GC::Profiler::disable because
+	  GC::Profiler::disable prohibit to access profiling data. It should
+	  be spec bug.
 
-	* ext/tcltklib/stubs.c: When --enable-tcltk-stubs, the initialize
-	  routine creates a Tcl/Tk interpreter and deletes it. However,
-	  init cost of Tk's MainWindow is not so small. And that makes it
-	  impossible to use libraries written with Tcl functions only on
-	  an environment without a graphical display. This changes support
-	  delaying initalization of Tk_Stubs until the script needs Tk.
+	  Skip GC::Profiler::report if RUBY_VERSION < '2.0.0'
 
-	* ext/tcltklib/stubs.h: New file. Define prototypes and return
-	  codes of functions on stubs.c.
+Thu Jun 20 17:59:08 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tcltklib/tcltklib.c: Support delaying initalization of
-	  Tk_Stubs until the script needs Tk.
+	* benchmark/gc/gcbench.rb: stop GC::Profiler before output results.
+	  Generating GC::Profiler result under profiling causes infinite loop.
 
-	* ext/tcltklib/tcltklib.c: Show friendly error messages for errors
-	  on initialization.
+Thu Jun 20 17:24:24 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tcltklib/tcltklib.c: Avoid SEGV on ip_finalize() when ruby is
-	  exiting and $DEBUG is true. (Not fix. If you know the reason of
-	  why, please fix it.)
+	* benchmark/gc/gcbench.rb: don't use __dir__ to make compatible
+	  with ruby 1.9.3.
 
-	* ext/tk/tkutil.c (ary2list, ary2list2): bug fix on handling of
-	  encoding.
+Thu Jun 20 16:57:19 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string and bg_eval_string
-	  don't work propery.
+	* benchmark/bm_app_aobench.rb: use attr_accessor/reader instead of
+	  defining methods.
 
-	* ext/tk/lib/tk.rb: Forget extending Tk::Encoding module to Tk.
-	* ext/tk/lib/tk/variable.rb: TkVarAccess fails to initialize the
-	  object for an element of a Tcl's array variable.
+Thu Jun 20 16:46:46 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Jul 27 23:23:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* benchmark/bm_app_aobench.rb: added.
 
-	* gc.c (obj_free): make message format consistent with one from
-	  gc_mark().  [ruby-talk:149668]
+	* benchmark/gc/aobench.rb: added.
 
-Wed Jul 27 22:11:37 2005  Kouhei Sutou  <kou@cozmixng.org>
+Thu Jun 20 16:28:33 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* sample/rss/tdiary_plugin: removed. because the plugin
-	  is imported in the tDiary plugin packages.
+	* benchmark/bm_so_binary_trees.rb: disable `puts' method
+	  and change iteration parameter to increase execution time.
 
-Wed Jul 27 10:59:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* benchmark/gc/binarytree.rb: added.
 
-	* dir.c (dir_each): rewinddir(3) before iteration.
-	  [ruby-talk:149628]
+Thu Jun 20 16:06:37 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jul 26 12:57:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* benchmark/gc/pentomino.rb: added.
+	  Simply load pentomino puzzle in the benchmark/ directory.
 
-	* ext/openssl/openssl_missin.c: include <openssl/engine.h> before
-	  <openssl/x509_vfy.h> to avoid compilation error of mswin32.
-	  suggested by NAKAMURA Usaku.
+Thu Jun 20 15:32:56 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Jul 25 21:30:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* benchmark/gc/redblack.rb: import red black tree benchmark from
+	  https://github.com/jruby/rubybench/blob/master/time/bench_red_black.rb
 
-	* {bcc32,win32,wince}/Makefile.sub: moved CPPFLAGS only for ruby
-	  source to XCFLAGS.
+	* benchmark/gc/ring.rb: add a benchmark. This benchmark create many
+	  old objects.
 
-Mon Jul 25 13:45:18 2005  NAJIMA Hiroki  <najima@mickey.ai.kyutech.ac.jp>
+Thu Jun 20 15:14:00 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* io.c: check HAVE_SYS_IOCTL_H before including the header.
-	  [ruby-dev:26610]
+	* benchmark/gc: create a directory to store GC related benchmark.
 
-Mon Jul 25 14:10:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* benchmark/gc/gcbench.rb: moved from tool/gcbench.rb.
 
-	* ext/tk/lib/multi-tk.rb: fix en-bugged part in the last commit.
+	* benchmark/gc/hash(1|2).rb: ditto.
 
-Sat Jul 23 16:49:04 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* benchmark/gc/rdoc.rb: ditto.
 
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should check
-	  OPENSSL_NO_STATIC_ENGINE.
+	* benchmark/gc/null.rb: added.
 
-Fri Jul 22 21:06:08 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
+	* common.mk: fix rule.
 
-	* bignum.c (rb_big_eq): reduce isnan().  [ruby-dev:26600]
+Thu Jun 20 14:09:54 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le): ditto.
+	* tool/hashbench1.rb: fix parameter too. Increase temporary objects.
 
-Fri Jul 22 15:02:39 2005  Kouhei Sutou  <kou@cozmixng.org>
+Thu Jun 20 14:01:35 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rss/rss.rb: moved copyright description to lib/rss.rb.
+	* tool/hashbench1.rb: fix parameters.
 
-	* lib/rss.rb: added for convenience.
+Thu Jun 20 14:00:34 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* sample/rss/re_read.rb: added #to_s sample.
+	* common.mk: remove dependency from ruby.
 
-	* sample/rss/blend.rb: use 'require "rss"' instead of
-	  'require "rss/*"'.
-	* sample/rss/list_description.rb: ditto.
-	* sample/rss/rss_recent.rb: ditto.
-	* sample/rss/tdiary-plugin/rss-recent.rb: ditto.
+Thu Jun 20 13:14:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* sample/rss/tdiary-plugin/rss-recent.rb: 0.0.6 -> 0.0.7.
+	* error.c (rb_check_backtrace): evaluate RARRAY_AREF only once.
+	  the first argument of RB_TYPE_P is expanded twice for non-immediate
+	  types.
 
-Fri Jul 22 14:37:43 2005  Kouhei Sutou  <kou@cozmixng.org>
+Thu Jun 20 08:09:29 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rss/parser.rb (RSS::Parser#initialize): accept HTTP/FTP
-	  URI and local file path too.
+	* tool/gcbench.rb: Summary in one line.
 
-	* test/rss/test_parser.rb (RSS::TestParser#test_parse): test
-	  for the above.
+	* common.mk: separate gcbench-hash to gcbench-hash1 and gcbench-hash2.
 
-Fri Jul 22 07:01:42 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Jun 20 08:07:23 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/tkutil.c (tk_conv_args): forget to revert thread_critical
-	  and gc_disable when raise ArgumentError.
+	* bignum.c (BIGSIZE): New macro.
+	  (bigfixize): Use BIGSIZE.
+	  (big2ulong): Ditto.
+	  (check_shiftdown): Ditto.
+	  (rb_big_aref): Ditto.
 
-	* ext/tk/lib/remote-tk.rb: RemoteTkIp doesn't need to include TkUtil.
+Thu Jun 20 07:46:48 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp#has_mainwindow? method.
+	* gc.c (rb_gc_writebarrier): give up rescan A and register B directly
+	  if A has huge number of children.
 
-	* ext/tk/lib/tk.rb: add Tk.has_mainwindow? method.
+Thu Jun 20 07:30:35 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#has_mainwindow? method.
+	* common.mk: add new rules `gcbench-rdoc', `gcbench-hash'.
 
-	* ext/tk/lib/remote-tk.rb: add RemoteTkIp#has_mainwindow? method.
+	* tool/gcbench.rb: separate GC bench framework and process.
 
-	* ext/tk/lib/multi-tk.rb: slave IP fail to exit itself when $SAFE==4.
+	* tool/hashbench1.rb, tool/hashbench2.rb: add two types GC bench.
+	  hashbench1: many temporal objects (GC by newobj)
+	  hashbench2: hash size becomes bigger and bigger (GC by malloc)
+	  Two benches are executed by `gcbench-hash' rule.
 
-	* ext/tk/lib/multi-tk.rb: remove constants from MultiTkIp module to
-	  avoid access from external.
+	* tool/rdocbench.rb: separated.
 
-	* ext/tk/lib/multi-tk.rb: check_root flag is ignored on slave IPs'
-	  mainloop.
+Thu Jun 20 06:25:39 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/multi-tk.rb: hang-up Tk.mainloop called on a slave IP
-	  with $SAFE==4.
+	* tool/rdocbench.rb: add summary.
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#bg_eval_proc doesn't work
-	  properly.
+Thu Jun 20 06:18:01 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp#set_cb_error(proc) and
-	  cb_error(exc) to log errors at callbacks on safe slave IPs.
+	* gc.c (gc_profile_total_time): check objspace->profile.next_index > 0.
 
-	* ext/tk/lib/multi-tk.rb: fail to get an available slave IP object
-	  when call Tk.mainloop in the block which is given to new_* method,
-	    because cannot finish initialize while the root widget is alive.
+Thu Jun 20 05:47:41 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/multi-tk.rb: fail to control a slave IP when Tk.mainloop
-	  runs on the IP.
+	* gc.c (gc_prof_sweep_timer_start): fix merge miss.
 
-Wed Jul 20 19:20:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c (GC_PROFILE_MORE_DETAIL): set it 0.
 
-	* io.c (S_ISREG): need to define S_ISREG before it is used first.
+Thu Jun 20 05:38:56 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Jul 20 18:40:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* gc.c: Accumulate sweep time to GC time.
+	  Now [GC time] is [mark time] + [sweep time] + [misc].
+	  ([GC time] >= [mark time] + [sweep time])
 
-	* io.c (wsplit_p): patch for the environment where
-	  fcntl(F_GETFL, O_NONBLOCK) is not supported. in that case,
-	  set FMODE_WSPLIT without fcntl check. [ruby-dev:26566]
+	* gc.c (gc_prof_sweep_slot_timer_start/stop): rename to
+	  gc_prof_sweep_timer_start/stop and locate at lazy_sweep().
 
-Wed Jul 20 18:07:11 2005  Tanaka Akira  <akr@m17n.org>
+	* gc.c (elapsed_time_from): add a utility function.
 
-	* io.c (rb_io_ctl): update FMODE_WSPLIT_INITIALIZED and FMODE_WSPLIT
-	  by F_SETFL.
+Thu Jun 20 05:08:53 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Jul 20 10:04:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (gc_marks): fix wrong option. FALSE means major/full GC.
+	  It should be TRUE (minor marking).
 
-	* variable.c (rb_class_path): need to adjust snprintf() len for
-	  teminating NUL.  [ruby-dev:26581]
+Thu Jun 20 02:44:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jul 20 04:01:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* win32/win32.c (waitpid): should not return 0 but wait until exit
+	  unless WNOHANG is given.  waiting huge process may return while
+	  active, for some reason.
 
-	* ext/socket/socket.c: sorry, BeOS also uses HAVE_CLOSESOCKET,
-	  so reverted.
+Thu Jun 20 01:34:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/socket/extconf.rb: should not define HAVE_CLOSESOCKET
-	  on windows.
+	* bignum.c (bdigit_roomof): Use SIZEOF_BDIGITS.
+	  (bigfixize): Refine an ifdef condition.
+	  (rb_absint_size): Use bdigit_roomof.
+	  (rb_absint_singlebit_p): Ditto.
+	  (rb_integer_pack): Ditto.
+	  (integer_pack_fill_dd): Use BITSPERDIG.
+	  (integer_unpack_push_bits): Use BITSPERDIG, BIGLO and BIGDN.
 
-Wed Jul 20 03:16:43 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Thu Jun 20 01:07:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/socket/socket.c: should not undef close() on win32.
-	  it's defined to rb_w32_close(), otherwise handle leaks.
-	  [ruby-Bugs-2131]
+	* gc.c (MARKED_IN_BITMAP, FL_TEST2): return boolean value since always
+	  used as boolean value.
 
-Wed Jul 20 00:48:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (MARK_IN_BITMAP, CLEAR_IN_BITMAP): evaluate bits once.
 
-	* error.c (syserr_initialize): don't use str before StringValue()
-	  check.  [ruby-dev:26579]
+Thu Jun 20 00:05:07 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jul 19 22:47:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (RVALUE_PROMOTED): fix type.
 
-	* error.c (syserr_initialize): add 1 byte for snprintf() size for
-	  NUL at the end.  [ruby-dev:26574]
+Wed Jun 19 23:39:01 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jul 19 16:39:46 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (gc_marks_test): rewrite checking code.
+	  When RGENGC_CHECK_MODE >= 2, all minor marking, run normal minor
+	  marking *and* major/full marking. After that, compare the results
+	  and shows BUG if a object living with major/full marking but dead
+	  with minor marking.
+	  After detecting bugs, print references information.
+	  (RGENGC_CHECK_MODE == 2, show references to dead object)
+	  (RGENGC_CHECK_MODE == 3, show all references)
 
-	* io.c (rb_io_inspect): replace sprintf() with "%s" format all
-	  over the place by snprintf() to avoid integer overflow.
+Wed Jun 19 23:51:48 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Jul 19 14:08:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bignum.c (bigfixize): Use rb_absint_size.
+	  (check_shiftdown): Ditto.
+	  (big2ulong): Use bdigit_roomof.
 
-	* ext/tcltklib/tcltklib.c: rbtk_eventloop_depth is used as int.
+Wed Jun 19 23:32:23 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tcltklib/tcltklib.c: rbtk_pending_exception is tested with
-	  NIL_P, so should assign Qnil instead of 0 (Qfalse).
+	* gc.c (RVALUE_PROMOTED): check consistency between oldgen flag and
+	  oldgen bitmap if RGENGC_CHECK_MODE > 0.
 
-	* ext/tcltklib/tcltklib.c (ip_invoke_real): fixed memory leak when
-	  ip is deleted.
+Wed Jun 19 23:29:29 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Jul 19 13:19:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (rb_gc_force_recycle): clear oldgen bitmap, too.
 
-	* ext/tk/lib/tk/variable.rb: For symmetry, add TkVariable#string. It
-	  returns a string even if the default value type of the TkVariable
-	  object is not "string".
+Wed Jun 19 21:02:13 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Jul 18 21:40:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bignum.c (rb_uint2big): Consider environments BDIGIT is bigger than
+	  long.
+	  (big2ulong): Ditto.
+	  (rb_big_aref): Ditto.
+	  (rb_big_pack): Just call rb_integer_pack.
+	  (rb_big_unpack): Just call rb_integer_unpack.
 
-	* eval.c (rb_call0): make the pointer to NODE volatile
-	  instead of NODE itself.
+Wed Jun 19 20:51:21 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Mon Jul 18 14:32:21 2005  Tanaka Akira  <akr@m17n.org>
+	* gc.c (gc_stress_get): GC.stress can be Fixnum.
 
-	* eval.c (rb_call0): make body volatile to avoid optimization problem.
-	  [ruby-dev:26195]
+Wed Jun 19 19:31:30 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Jul 18 12:23:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bignum.c (DIGSPERLONG): Don't define if BDIGIT is bigger than long.
+	  (DIGSPERLL): Don't define if BDIGIT is bigger than LONG_LONG
+	  (rb_absint_size): Consider environments BDIGIT is bigger than long.
+	  Use BIGLO and BIGDN.
+	  (rb_absint_singlebit_p): Ditto.
+	  (rb_integer_pack): Ditto.
+	  (bigsub_int): Consider environments BDIGIT is bigger than long.
+	  Use SIZEOF_BDIGITS instead of sizeof(BDIGIT).
+	  (bigadd_int): Ditto.
+	  (bigand_int): Ditto.
+	  (bigor_int): Ditto.
+	  (bigxor_int): Ditto.
 
-	* ext/io/wait/wait.c: wrong backport from trunk.  fixed: [ruby-dev:26562]
+Wed Jun 19 15:14:30 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Jul 18 09:36:25 2005  Tanaka Akira  <akr@m17n.org>
+	* include/ruby/ruby.h (struct rb_data_type_struct), gc.c: add
+	  rb_data_type_struct::flags. Now, this flags is passed
+	  at T_DATA object creation. You can specify FL_WB_PROTECTED
+	  on this flag.
 
-	* rubyio.h (FMODE_WSPLIT, FMODE_WSPLIT_INITIALIZED): new constant.
+	* iseq.c: making non-shady iseq objects.
 
-	* io.c (wsplit_p): new function.
-	  (io_fwrite): split writing data by PIPE_BUF if wsplit_p is true in
-	  multi-threaded mode.
-	  [ruby-dev:26540]
+	* class.c, compile.c, proc.c, vm.c: add WB for iseq objects.
 
-Sun Jul 17 13:46:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_core.h, iseq.h: constify fields to detect WB insertion.
 
-	* ext/io/wait/extconf.rb, ext/io/wait/wait.c: Win32 platforms support.
+Wed Jun 19 15:11:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jul 15 23:59:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_mark_children): show more info for broken object.
 
-	* lib/rdoc/parsers/parse_c.rb (handle_class_module): handle a
-	  module enclosed in a built-in module.  fixed: [ruby-talk:148239]
+Wed Jun 19 14:04:41 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* lib/rdoc/parsers/parse_c.rb (find_body): allow macros as methods.
+	* test/ruby/envutil.rb (EnvUtil#rubybin): remove unnecessary
+	  unless expression.
 
-	* lib/rdoc/parsers/parse_c.rb (find_call_seq): allow :nodoc: modifier
-	  in C.  [ruby-core:04572]
+Wed Jun 19 07:47:48 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Jul 15 18:00:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* gc.c (garbage_collect_body): use FIX2INT for ruby_gc_stress.
 
-	* bcc32/Makefile.sub (COMMON_HEADERS): ruby_1_8 is using winsock.h.
-	  failed to compile ext/socket on bcc5.6.4. [ruby-dev:26193]
+Wed Jun 19 07:44:31 2013  Koichi Sasada  <ko1@atdot.net>
 
-Fri Jul 15 07:58:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* gc.c (rb_objspace::gc_stress): int -> VALUE to store Fixnum object.
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#accept_client):
-	  sockets should be non-blocking mode. [ruby-dev:26405]
+Wed Jun 19 07:25:35 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/webrick/utils.rb (WEBrick::Utils.set_non_blocking): new method.
+	* gc.c (make_deferred): clear flags to T_ZOMBIE.
 
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#read_chunked):
-	  should call sock.read repeatedly until the preferred size data
-	  is obtained.
+	* gc.c (slot_sweep_body): fix indent.
 
-Thu Jul 14 18:27:16 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jun 19 07:18:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/win32.c (rb_w32_strerror): should return correct message
-	  for ENAMETOOLONG and ENOTEMPTY. (bcc32) [ruby-dev:26533]
+	* bignum.c (rb_big_aref): Apply BIGLO to ~xds[i] for environment which
+	  BDIGIT is 16bit.
 
-	* win32/win32.c (rb_w32_strerror): stripped CR LF on the tail.
-	  (bcc32) [ruby-dev:26533]
+Wed Jun 19 07:09:26 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Jul 14 00:45:42 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (rgengc_remember): fix output level.
 
-	* LEGAL (ext/nkf/nkf-utf8): updated from nkf1.7 to nkf-utf8.
+	* gc.c (rgengc_rememberset_mark): fix to output clear count.
+	  (shady_object_count + clear_count = count of remembered objects)
 
-Wed Jul 13 19:37:47 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Wed Jun 19 07:06:21 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/win32.c (rb_w32_mkdir): should set EEXIST (not EACCES)
-	  if file or directory already exists. (bcc32) [ruby-dev:26508]
+	* gc.c (rgengc_remember): check T_NONE and T_ZOMBIE
+	  if RGENGC_CHECK_MODE > 0.
 
-	* win32/win32.c (rb_w32_rmdir): should set ENOTDIR (not EINVAL)
-	  if it is not directory. (bcc32, win32)
+Wed Jun 19 07:02:19 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/win32.c (rb_w32_rmdir, rb_w32_unlink): restore
-	  FILE_ATTRIBUTE_READONLY flag on function failure.
+	* gc.c (RGENGC_CHECK_MODE): add new check mode `3'.
+	  In this mode, show all references if there is
+	  a miss-corrected object.
 
-Wed Jul 13 12:40:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Jun 19 06:31:08 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tcltklib/tcltklib.c: TclTkLib.do_one_event doesn't work.
+	* gc.c (gc_stress_set): add special option of GC.stress.
+	  `GC.stress=(flag)' accepts integer to control behavior of GC.
+	  See code for details. Of course, this feature is only for MRI.
 
-	* ext/tk/lib/tk.rb: Tk.thread_update is available.
+	  You can debug RGenGC (WB) using `GC.stress = 1'.
+	  Using this option, do minor marking at all possible places.
 
-Tue Jul 12 23:32:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  GC::STRESS_MINOR_MARK = 1 and GC::STRESS_LAZY_SWEEP = 2
+	  seem good to add.
 
-	* lib/mkmf.rb: keep curdir unexpanded.
+Wed Jun 19 06:29:31 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Jul 11 08:31:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm.c (kwmerge_i): add WB.
 
-	* regex.c (read_special): fix parsing backslashes following \c in
-	  regexp.  fixed: [ruby-dev:26500]
+Wed Jun 19 06:26:49 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Jul 11 02:53:00 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* hash.c: `st_update()' also has same issue of last fix.
+	  write barriers at callback function are too early.
+	  All write barriers are executed after `st_update()'
 
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
-	  mistook in merging the patch of [ruby-dev:26235] at
-	  revision 1.4.2.6.
+Wed Jun 19 04:33:22 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Jul 10 23:58:04 2005  Tanaka Akira  <akr@m17n.org>
+	* variable.c (rb_const_set): fix WB miss.
 
-	* lib/pathname.rb (Pathname#unlink): try Dir.unlink first to
-	  avoid unlink a directory by root.
-	  cf. [ruby-dev:26237]
+	  WBs had located before creating reference between a klass
+	  and constant value. It causes GC bug.
 
-Sun Jul 11 05:18:17 2005  Michael Neumann  <mneumann@ruby-lang.org>
+	    # pseudo code:
+	    WB(klass, value); # WB and remember klass
+	    st_insert(klass->const_table, const_id, value);
 
-	* lib/xmlrpc/server.rb (XMLRPC::Server): Switch from GServer over to
-	  WEBrick. This makes file lib/xmlrpc/httpserver.rb obsolete (at least it is
-		no further used by the XML-RPC library).
+	  `st_insert()' can cause GC before inserting `value' and
+	  forget `klass' from the remember set. After that, relationship
+	  between `klass' and `value' are created with constant table.
+	  Now, `value' can be young (shady) object and `klass' can be old
+	  object, without remembering `klass' object.
+	  At the next GC, old `klass' object will be skipped and
+	  young (shady) `value' will be miss-collected. -> GC bug
 
-Sun Jul 10 12:47:01 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  Lesson: The place of a WB is important.
 
-	* lib/debug.rb (debug_command): added a deficient format specifier.
-	  fixed: [ruby-core:05419]
+Tue Jun 18 22:01:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Sat Jul  9 21:28:46 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* vm_insnhelper.c (vm_call_method): ensure methods of type
+	  VM_METHOD_TYPE_ATTR_SET are called with 1 argument
 
-	* ext/win32ole/win32ole.c (ole_method_dispid): convert dispid
-	  in Ruby and C by INT2NUM and NUM2INT.
+	* test/ruby/test_module.rb
+	  (TestModule#test_attr_writer_with_no_arguments): add test
+	  [ruby-core:55543] [Bug #8540]
 
-	* ext/win32ole/win32ole.c (ole_invoke2): ditto.
+Tue Jun 18 22:36:23 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* ext/win32ole/test/testWIN32OLE.rb: ditto.
+	* gc.c (gc_profile_record_flag): fix typo.
 
-	* ext/win32ole/test/testOLEMETHOD.rb: ditto.
+Tue Jun 18 22:08:53 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Fri Jul  8 15:45:04 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* ext/objspace/object_tracing.c: Return for ::allocation_generation
 
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.4 -> 0.1.5.
+Tue Jun 18 22:04:35 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* test/rss/test_version.rb (RSS::TestVersion#test_version):
-	  ditto.
+	* ext/objspace/object_tracing.c: Document object_tracing methods.
 
-	* lib/rss/0.9.rb (RSS::Rss::Channel::Item::Category):
-	  domain attribute of <category> is optional. Thanks to
-	  Chris Lee <clee@kde.org>.
+Tue Jun 18 21:58:17 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* test/rss/test_parser.rb (RSS::TestParser#test_category20):
-	  adjusted test case.
+	* gc.c: Rename rb_mObSpace -> rb_mObjSpace
 
-Tue Jul  5 23:44:06 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 18 20:55:05 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* instruby.rb: expand source library path.
+	* ext/objspace/objspace.c: Document ObjectSpace::InternalObjectWrapper.
 
-Tue Jul  5 23:27:14 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 18 20:39:04 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* array.c (sort_2): get rid of yet another bcc's bug.
-	  fixed: [ruby-core:05152]
+	* ext/objspace/object_tracing.c: Teach rdoc object_tracing.c [Bug #8537]
 
-	* eval.c (rb_thread_save_context): must not switch contexts during
-	  re-allocating stack.  fixed: [ruby-core:05219]
+Tue Jun 18 20:29:47 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Jul  5 15:15:10 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/.document: add object_tracing.c to document file
 
-	* ext/tk/tkutil.c: fix typo.
+Tue Jun 18 20:20:27 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Jul  5 14:51:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/objspace/objspace.c: rdoc on require to overview from r41355
 
-	* ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings.
+Tue Jun 18 18:39:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tcltklib/tcltklib.c: add methods to treat encoding mode.
+	* configure.in: Check __int128.
 
-	* ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding,
-	  encoding_system, and so on.
+	* include/ruby/defines.h (BDIGIT_DBL): Use uint128_t if it is available.
+	  (BDIGIT): Use uint64_t if uint128_t is available.
+	  (SIZEOF_BDIGITS): Defined for above case.
+	  (BDIGIT_DBL_SIGNED): Ditto.
+	  (PRI_BDIGIT_PREFIX): Ditto.
 
-	* ext/tcltklib/MANUAL.euc: ditto.
+	* include/ruby/ruby.h (PRI_64_PREFIX): Defined.
 
-	* ext/tk/tkutil.c: fail to create a Tcl's list string from an
-	  array including multiple kind of encoded strings.
+	* bignum.c (rb_big_pow): Don't use BITSPERDIG for the condition which
+	  rb_big_pow returns Float or Bignum.
 
-	* ext/tk/lib/tk.rb: ditto.
+	[ruby-dev:47413] [Feature #8509]
 
-	* ext/tk/lib/multi-tk.rb: 2nd arg of _{to|from}UTF8 is omissible.
+Tue Jun 18 16:43:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/remote-tk.rb: ditto.
+	* parse.y (parser_heredoc_restore): clear lex_strterm always to get
+	  rid of marking recycled node.  this bug is revealed by r41372 with
+	  GC.stress=true.
 
-	* ext/tk/lib/tk.rb: override TclTkLib#encoding and encoding= to
-	  use TkCore::INTERP.encoding and encoding=.
+Tue Jun 18 12:53:25 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk.rb: when "require 'tk'" and $KCODE=='NONE', check
-	  DEFAULT_TK_ENCODING to decide Ruby/Tk's system encoding mode.
+	* bignum.c (nlz): Cast the result explicitly.
+	  (big2dbl): Don't assign BDIGIT values to int variable.
 
-	* ext/tk/lib/tk/encodedstr.rb: check both of Tk.encoding and
-	  Tk.encoding_system. Tk.encoding has higher priority.
+Tue Jun 18 12:25:16 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/optiondb.rb: ditto.
+	* bignum.c (rb_big_xor): Non-effective code removed.
 
-	* ext/tk/lib/tk/spinbox.rb: ditto.
+Tue Jun 18 11:26:05 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/validation.rb: ditto.
+	* gc.c (gc_stat): add `generated_normal_object_count_types' for
+	  RGENGC_PROFILE >= 2.
 
-	* ext/tk/lib/tk/namespace.rb: arguemnts for TclTkIp#_merge_tklist
-	  should be UTF-8 strings.
+Tue Jun 18 11:02:18 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Jul  4 14:35:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (gc_mark_maybe): check to skip T_NONE.
 
-	* sample/svr.rb: service can be stopped by ill-behaved client; use
-	  tsvr.rb instead.
+	* gc.c (markable_object_p): do not need to check (flags == 0) here.
 
-Mon Jul  4 13:25:21 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun 18 10:17:37 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* missing/erf.c: original erf.c by prof. Okumura is confirmed to
-	  be public domain.  reverted BSD implementation.
+	* variable.c (rb_autoload): fix WB miss.
 
-Mon Jul  4 11:15:37 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Jun 18 04:20:18 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* test/{dbm,gdbm,sdbm}/test_{dbm,gdbm,sdbm}.rb: skip some tests
-	  which using fork on fork-less platforms.
+	* gc.c (gc_mark_children): don't need to care about T_ZOMBIE here.
 
-Sun Jul  3 23:26:30 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Jun 17 22:16:02 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* test/wsdl/document/test_rpc.rb: compare formatted time string of
-	  Time objects instead of comparing Time objects itself to avoid
-	  unintended conflict of usec part.  [ruby-dev:26220]
+	* test/ruby/test_proc.rb (TestProc#test_block_given_method_to_proc):
+	  run test for r41359.
 
-Sat Jul  2 22:41:04 2005  Tanaka Akira  <akr@m17n.org>
+Mon Jun 17 21:42:18 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* ext/socket/socket.c (unix_send_io, unix_recv_io): support x86-64 and
-	  IA64.
+	* include/ruby/ruby.h, vm_eval.c (rb_funcall_with_block):
+	  new function to invoke a method with a block passed
+	  as an argument.
 
-Sat Jul  2 17:06:23 2005  Tanaka Akira  <akr@m17n.org>
+	* string.c (sym_call): use the above function to avoid
+	  a block sharing. [ruby-dev:47438] [Bug #8531]
 
-	* defines.h (FLUSH_REGISTER_WINDOWS): defined for IA64.
-	  (flush_register_windows): declare flush_register_windows.
+	* vm_insnhelper.c (vm_yield_with_cfunc): don't set block
+	  in the frame.
 
-	* eval.c (flush_register_windows): new function.
+	* test/ruby/test_symbol.rb (TestSymbol#test_block_given_to_proc):
+	  run related tests.
 
-Fri Jul  1 17:48:52 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jun 17 21:33:27 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* bignum.c (get2comp): revert all prior changes, and calculate
-	  proper 2's complement for negative numbers.  backported from
-	  HEAD.
+	* include/ruby/intern.h, proc.c (rb_method_call_with_block):
+	  new function to invoke a Method object with a block passed
+	  as an argument.
 
-Fri Jul  1 15:50:12 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* proc.c (bmcall): use the above function to avoid a block sharing.
+	  [ruby-core:54626] [Bug #8341]
 
-	* missing/erf.c: need to include some headers for some platforms.
+	* test/ruby/test_proc.rb (TestProc#test_block_persist_between_calls):
+	  run related tests.
 
-	* win32/win32.h (copysign, scalb): define for compatibility with
-	  other platforms. [ruby-dev:26430]
+Mon Jun 17 20:53:21 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Jul  1 15:37:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* loadpath.c (RUBY_REVISION): Defined to suppress revision.h
+	  inclusion actually.  r41352 removes the dependency.
 
-	* missing/crypt.c: modified to make it compilable on platforms
-	  other than BSD.  [ruby-dev:26430]
+Mon Jun 17 18:15:57 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* missing/erf.c: ditto.  code from <exp.c> merged.
+	* ext/objspace/objspace.c: let rdoc know about objspace methods.
+	  Specify 'objspace' should be required. See #8537.
 
-Fri Jul  1 12:44:56 2005  Tanaka Akira  <akr@m17n.org>
+Mon Jun 17 17:44:31 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* lib/open-uri.rb (OpenURI.open_http): refine post_connection_check
-	  call.
+	* gc.c (ObjectSpace): is a module not a class.
 
-Fri Jul  1 11:34:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/objspace/objspace.c: try to include overview in rdoc,
+	  see #8537.
 
-	* missing/crypt.c: replaced with 4.4BSD version.
+Mon Jun 17 17:38:24 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* missing/erf.c: ditto.
+	* gc.c: fix example of ObjectSpace.define_finalizer in overview
 
-	* missing/vsnprintf.c: removed the third provision from the old
-	  BSD license.  [ruby-core:05177]
+Mon Jun 17 16:59:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Jul  1 01:45:21 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/tk/tkutil/tkutil.c: use rb_sprintf(), rb_id2str(), and
+	  rb_intern_str() instead of rb_intern() and RSTRING_PTR() with
+	  RB_GC_GUARD(), to prevent temporary objects from GC.
+	  [ruby-core:39000] [Bug #5199]
 
-	* enum.c (enum_min, enum_max): must not return Qundef.
-	  fixed: [ruby-core:05299]
+Mon Jun 17 14:27:54 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Fri Jul  1 00:18:40 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* vm_backtrace.c: Update rdoc for Backtrace#label with @_ko1
 
-	* lib/delegate.rb (Delegator::respond_to): respond_to? must check
-	  destination object.  [ruby-talk:146894]
+Mon Jun 17 13:04:01 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Jun 30 19:00:21 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	* tool/ifchange (until): Fix the condition, although harmless in
+	  this case.
 
-	* lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements
-	  for [ruby-dev:26410]. And support a numeric form of 0d99999.
+Mon Jun 17 11:50:29 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Jun 30 17:28:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (gc_mark_maybe): added. check `is_pointer_to_heap()' and
+	  type is not T_ZOMBIE.
 
-	* lib/irb/ruby-lex.rb (RubyLex::identify_number): should not treat
-	  plain zero as an octal number.  [ruby-dev:26410]
+	* gc.c: use `gc_mark_maybe()'. T_ZOMBIE objects should not be pushed
+	  to the mark stack.
 
-Thu Jun 30 15:13:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jun 17 07:56:24 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_eval): pre-evaluate argument for unambiguous
-	  evaluation order.  [ruby-dev:26383]
+	* bignum.c (bary_small_lshift): Renamed from bdigs_small_lshift.
+	  (bary_small_rshift): Renamed from bdigs_small_rshift.
 
-Thu Jun 30 09:53:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Jun 17 07:38:48 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/delegate.rb (Delegator::method_missing): forward unknown
-	  method to the destination.  suggested by
-	  <christophe.poucet@gmail.com>.  [ruby-talk:146776]
+	* bignum.c (absint_numwords_bytes): Removed.
+	  (rb_absint_numwords): Don't call absint_numwords_bytes.
 
-Tue Jun 28 21:59:29 2005  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+Sun Jun 16 23:14:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* dir.c, eval.c, hash.c, process.c, ruby.c: avoid warning "unused
-	  variable" [ruby-dev:26387]
+	* bignum.c (BARY_ADD): New macro.
+	  (BARY_SUB): Ditto.
+	  (BARY_MUL): Ditto.
+	  (BARY_DIVMOD): Ditto.
+	  (BARY_ZERO_P): Ditto.
+	  (absint_numwords_generic): Use these macros.
 
-Sat Jun 25 17:15:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Jun 16 21:41:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_query): should
-	  discard if key=val pair is empty. patch from Gary Wright.
+	* bignum.c (bary_2comp): Extracted from get2comp.
+	  (integer_unpack_num_bdigits): Extracted from
+	  rb_integer_unpack_internal.
+	  (bary_unpack_internal): Renamed from bary_unpack and support
+	  INTEGER_PACK_2COMP.
+	  (bary_unpack): New function to validate arguments and invoke
+	  bary_unpack_internal.
+	  (rb_integer_unpack_internal): Removed.
+	  (rb_integer_unpack): Invoke bary_unpack_internal.
+	  (rb_integer_unpack_2comp): Removed.
 
-Sat Jun 25 23:30:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* internal.h (rb_integer_unpack_2comp): Removed.
 
-	* process.c (detach_process_watcher): terminate process watcher
-	  thread right after rb_waitpid() succeed.  [ruby-talk:146430]
+	* pack.c: Follow the above change.
 
-Sat Jun 25 15:49:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun 16 18:41:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* enum.c (enum_min, enum_max): do not ignore nil as the first element.
+	* internal.h (INTEGER_PACK_2COMP): Defined.
+	  (rb_integer_pack_2comp): Removed.
 
-Sat Jun 25 14:40:17 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* bignum.c (bary_pack): Support INTEGER_PACK_2COMP.
+	  (rb_integer_pack): Invoke bary_pack directly.
+	  (rb_integer_pack_2comp): Removed.
+	  (rb_integer_pack_internal): Ditto.
+	  (absint_numwords_generic): Follow the above change.
 
-	* ext/sdbm/init.c (fsdbm_select): SDBM#select had returned the array
-	  which contained each elements twice. [ruby-dev:26358]
+	* pack.c (pack_pack): Ditto.
 
-Fri Jun 25 05:06:47 2005  Michael Neumann  <mneumann@ruby-lang.org>
+	* sprintf.c (rb_str_format): Ditto.
 
-	* lib/xmlrpc/*, test/xmlrpc/*: backported changes from HEAD into 1.8
+Sun Jun 16 17:48:14 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Jun 24 17:00:00 2005  Shigeo Kobayashi  <shigeo@tinyforest.jp>
+	* bignum.c (absint_numwords_generic): rb_funcall invocations removed.
 
-	* ext/bigdecimal/bigdecimal.c: patch from "NATORI Shin"
-	  (u-tokyo.ac.jp) applied to fix rounding bug.
+Sun Jun 16 16:04:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Jun 24 13:06:45 2005  akira yamada  <akira@ruby-lang.org>
+	* tool/config_files.rb: use URI.read to allow it runs with Ruby 1.8.5.
 
-	* lib/uri/common.rb, lib/uri/generic.rb: fixed typo in documents and
-	  replaced some existent domain name with "example.com".
+Sun Jun 16 14:32:25 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Jun 24 12:23:19 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bignum.c (bary_pack) Extracted from rb_integer_pack_internal.
+	  (absint_numwords_generic): Use bary_pack.
 
-	* ext/tk/lib/tk.rb: fix typo on Tk.grid_propagate.
+Sun Jun 16 11:01:57 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/tk/lib/tk.rb: Tk.event_generate and TkWindow#event_generate
-	  accept TkEvent::Event object as context argument.
+	* NEWS (XMLRPC::Client#http): Add.
+	  [ruby-core:55197] [Feature #8461]
 
-	* ext/tk/lib/tk/event.rb: add TkEvent::Event#valid_fields and
-	  valid_for_generate to get field parameters of event_generate.
+Sun Jun 16 10:38:45 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Jun 23 23:55:59 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bary_add): New function.
+	  (bary_zero_p): Extracted from bigzero_p.
+	  (absint_numwords_generic): Use bary_zero_p and bary_add.
+	  (bary_mul): Fix an argument for bary_mul_single.
+	  (bary_divmod): Use size_t for arguments.
 
-	* runruby.rb: should load built rbconfig.rb.
+Sun Jun 16 08:55:22 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Jun 23 16:53:15 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bignum.c (bigdivrem): Use a BDIGIT variable to store the return
+	  value of bigdivrem_single.
 
-	* ext/tk/lib/tk/canvastag.rb: TkcGroup.new cannot include given items.
-	  TkcGroup#exclude calls wrong method.
-	  Add alias TkcGroup#add [ruby-talk:146049].
+Sun Jun 16 08:43:59 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/canvas.rb: TkCanvas#dtag and some subcommands of
-	  TkCanvas#addtag fail to treat a TkcTag argument.
+	* bignum.c (bary_divmod): New function.
+	  (absint_numwords_generic): Use bary_divmod.
+	  (bigdivrem_num_extra_words): Extracted from bigdivrem.
+	  (bigdivrem_single): Ditto.
+	  (bigdivrem_normal): Ditto.
+	  (BIGDIVREM_EXTRA_WORDS): Defined.
 
-	* ext/tk/lib/tk/event.rb: add TkEvent::Event#generate to help to send
-	  current event to other widgets.
+Sun Jun 16 05:51:51 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Mon Jun 20 18:44:04 2005  Tanaka Akira  <akr@m17n.org>
+	* gc.c: Fixup around GC by MALLOC.
+	  Add allocate size to malloc_increase before GC
+	  for updating limit in after_gc_sweep.
+	  Reset malloc_increase into garbage_collect()
+	  for preventing GC again soon.
 
-	* eval.c (FUNCTION_CALL_MAY_RETURN_TWICE): DUMMY_SETJMP is replaced
-	  because setjmp is not enough to fix getcontext and SPARC register
-	  window problem.
+Sun Jun 16 05:15:36 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Mon Jun 20 16:48:36 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c: Add some columns to more detail profile.
+	  new columns: Allocated size, Prepare Time, Removing Objects, Empty Objects
 
-	* ext/dbm/dbm.c (fdbm_closed): new method DBM#closed?
+Sun Jun 16 02:04:40 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* ext/gdbm/gdbm.c (fgdbm_closed): new method GDBM#closed?
+	* gc.c (gc_prof_timer_stop): Merge function codes of GC_PROFILE_MORE_DETAIL and !GC_PROFILE_MORE_DETAIL.
+	* gc.c (gc_prof_mark_timer_start): Ditto.
+	* gc.c (gc_prof_mark_timer_stop): Ditto.
+	* gc.c (gc_prof_sweep_slot_timer_start): Ditto.
+	* gc.c (gc_prof_sweep_slot_timer_stop): Ditto.
+	* gc.c (gc_prof_set_malloc_info): Ditto.
+	* gc.c (gc_prof_set_heap_info): Ditto.
 
-	* ext/sdbm/init.c (fsdbm_closed): new method SDBM#closed?
+Sat Jun 15 23:50:24 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb, test/sdbm/test_sdbm.rb
-	  (teardown): close all db objects before deleting data files.
+	* bignum.c (bary_sub): New function.
+	  (absint_numwords_generic): Use bary_sub.
+	  (bigsub_core): Skip unnecessary copy.
 
-	* win32/win32.{ch} (unlink): hook runtime function to change
-	  file attribute before unlinking.
-	  fixed: [ruby-dev:26360]
+Sat Jun 15 22:05:30 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Jun 20 02:15:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bary_mul): New function.
+	  (absint_numwords_generic): Use bary_mul.
+	  (bary_mul_single): Extracted from bigmul1_single.
+	  (bary_mul_normal): Extracted from bigmul1_normal.
 
-	* gc.c (define_final): document fix: finalizers never get called
-	  before target object is destroyed.
+Sat Jun 15 20:13:46 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Jun 20 01:26:49 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* bignum.c (bary_unpack): Extracted from rb_integer_unpack_internal.
+	  (absint_numwords_generic): Use bary_unpack.
+	  (roomof): Defined.
+	  (bdigit_roomof): Defined.
+	  (BARY_ARGS): Defined.
+	  (bary_unpack): Declared.
 
-	* ext/openssl/openssl_missing.c, ext/openssl/ossl.h,
-	  ext/openssl/ossl_asn1.c, ext/openssl/ossl_bio.c,
-	  ext/openssl/ossl_pkcs12.h, ext/openssl/ossl_x509req.c: avoid
-	  compiler warnings. suggested by Michal Rokos.
+Sat Jun 15 19:35:04 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Jun 19 14:09:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (absint_numwords_bytes): Make it static.
+	  (absint_numwords_small): Ditto.
+	  (absint_numwords_generic): Ditto.
 
-	* gc.c (run_final): reduce unnecessary object allocation during
-	  finalization.
+Sat Jun 15 17:14:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	* gc.c (rb_gc_call_finalizer_at_exit): deferred finalizers list should
-	  be cleared before calling them.  fixed: [ruby-talk:145790]
+	* bignum.c (bigmul1_normal): Shrink the result Bignum length.
 
-Fri Jun 17 13:01:40 2005  Tanaka Akira  <akr@m17n.org>
+Sat Jun 15 10:19:42 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/time.rb (Time.parse): fix previous leap seconds support.
-	  (Time.rfc2822): ditto.
-	  (Time.xmlschema): ditto.
+	* ext/bigdecimal/bigdecimal.c: Update overview formatting of headers
 
-Thu Jun 16 15:06:55 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jun 15 10:19:06 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/tcltklib/tcltklib.c (ip_rb_threadVwaitCommand): Tcl_Release
-	  was missing.
+	* ext/bigdecimal/bigdecimal.gemspec: Update authors
 
-Thu Jun 16 13:34:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Jun 15 10:02:26 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk.rb: add Tk.getMultiple{Open|Save}File() which return
-	  an Array of selected files.
+	* bignum.c (bdigs_small_rshift): Extracted from big_rshift.
+	  (bigdivrem): Use bdigs_small_rshift.
 
-Thu Jun 16 12:53:24 2005  Tanaka Akira  <akr@m17n.org>
+Sat Jun 15 08:37:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/time.rb (Time.parse): "Fri Jan  1 08:59:60 +0900 1999" was
-	  parsed as "Fri Jan 01 09:00:00 JST 1999" even on an environment
-	  which supports leap seconds.
-	  (Time.rfc2822): ditto.
-	  (Time.xmlschema): ditto.
+	* vm_eval.c (eval_string_with_cref): propagate absolute path from the
+	  binding if it is given explicitly.  patch by Gat (Dawid Janczak) at
+	  [ruby-core:55123]. [Bug #8436]
 
-Thu Jun 16 08:29:22 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jun 15 02:40:18 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/dl/sym.c (rb_dlsym_call): needs FREE_ARGS before return.
-	  fixed memory leak. [ruby-Bugs-2034]
+	* bignum.c (bdigs_small_lshift): Extracted from big_lshift.
+	  (bigdivrem): Use bdigs_small_lshift.
 
-Wed Jun 15 18:26:39 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Jun 14 20:47:41 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk.rb: support "tk inactive" sub-command [for Tcl/Tk8.5a3]
+	* bignum.c (bigdivrem): Reduce number of digits before bignew() for div.
 
-	* ext/tk/lib/tk/namespace.rb: support "namespace path" sub-command and
-	  'namespace ensemble' sub-command [for Tcl/Tk8.5a3]
+Fri Jun 14 20:12:37 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Jun 14 02:02:43 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bignum.c (bigdivrem): Use bignew when ny == 1.
 
-	* ext/tk/tkutil.c: add TkUtil::CallbackSubst.subst_arg(m, ...) &
-	  _define_attribute_aliases(hash) to get substitution-argument from
-	  attributes (e.g. subst_arg(:x,:y,:num,:button) --> "%x %y %b %b ").
+Fri Jun 14 18:52:51 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/event.rb: use _define_attribute_aliases().
+	* compile.c (rb_iseq_compile_node): fix location of a `trace'
+	  instruction (b_return event).
+	  [ruby-core:55305] [ruby-trunk - Bug #8489]
+	  (need a backport to 2.0.0?)
 
-Mon Jun 13 13:01:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* test/ruby/test_settracefunc.rb: add a test.
 
-	* hash.c (ruby_setenv): fixed SEGV. [ruby-dev:26186]
+Fri Jun 14 18:18:07 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Jun 13 01:54:20 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* class.c, include/ruby/ruby.h: add write barriers for T_CLASS,
+	  T_MODULE, T_ICLASS.
 
-	* signal.c (sigexit): call rb_thread_signal_exit() instead of
-	  rb_exit().  [ruby-dev:26347]
+	* constant.h: constify rb_const_entry_t::value and file to detect
+	  assignment.
 
-	* eval.c (rb_thread_signal_exit): a new function to exit on main
-	  thread.
+	* variable.c, internal.h (rb_st_insert_id_and_value, rb_st_copy):
+	  added. update table with write barrier.
 
-	* eval.c (rb_thread_switch): exit status should be retrieved from
-	  ruby_errinfo.
+	* method.h: constify some variables to detect assignment.
 
-	* eval.c (rb_f_exit): ensure exit(0) should call
-	  exit(EXIT_SUCCESS).
+	* object.c (init_copy): add WBs.
 
-Mon Jun 13 01:20:02 2005  Tanaka Akira  <akr@m17n.org>
+	* variable.c: ditto.
 
-	* eval.c (rb_gc_mark_threads): curr_thread may not be part of the
-	  thread list.  [ruby-dev:26312]
+	* vm_method.c (rb_add_method): ditto.
 
-Fri Jun 10 23:35:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun 14 14:33:47 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* missing/mkdir.c: remove. [ruby-core:05177]
+	* NEWS: add a note for Module#using.
 
-Fri Jun 10 22:54:26 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun 14 13:40:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* missing.h: fd_set stuffs need sys/types.h.  fixed: [ruby-core:05179]
+	* .travis.yml (before_script): update config files.
 
-Thu Jun  9 23:58:12 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* common.mk ($(srcdir)/tool/config.{guess,sub}): use get-config_files.
 
-	* ext/Win32API/Win32API.c (Win32API_Call): disable global
-	  optimization. fixed: [ruby-core:05143]
+	* tool/config_files.rb: split get-config_files.
 
-Thu Jun  9 23:35:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* common.mk (update-config_files): rule to download config files.
 
-	* enum.c (enum_inject): default the result value to Qundef to use
-	  first element as initial value if not given.
+	* tool/config.guess, tool/config.sub: remove and download from the
+	  upstream.
 
-Thu Jun  9 19:55:41 2005  Tanaka Akira  <akr@m17n.org>
+	* tool/config_files.rb: download config files from GNU.
 
-	* eval.c (ruby_longjmp): new macro to call longjmp, setcontext, etc.
-	  (ruby_setjmp): new macro to call setjmp, getcontext, etc.
-	  (ruby_setjmp): call setjmp before getcontext to avoid IA64 register
-	  stack problem.
-	  [ruby-talk:144939]
+Fri Jun 14 12:21:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* gc.c (Init_stack): remove IA64_MAGIC_STACK_LIMIT.
+	* include/ruby/ruby.h (RUBY_SAFE_LEVEL_CHECK): suppress warnings
+	  "left-hand operand of comma expression has no effect", on gcc 4.4.
 
-Thu Jun  9 11:55:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Jun 14 09:48:48 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/delegate.rb (SimpleDelegator::__setobj__): need check for
-	  recursive delegation.  [ruby-core:04940]
+	* NEWS: add notes for $SAFE.
 
-Wed Jun  8 18:47:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* doc/security.rdoc: remove the description of $SAFE=4.
 
-	* misc/ruby-mode.el (ruby-expr-beg): fix looking point drift.
+Fri Jun 14 00:14:29 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Jun  8 11:11:34 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* bignum.c (bigdivrem): Zero test condition simplified.
 
-	* bignum.c (get2comp): calculate proper 2's complement for
-	  negative numbers.  a bug in normalizing negative numbers
-	  reported from Honda Hiroki <hhonda@ipflex.com>.
+Thu Jun 13 23:43:11 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Wed Jun  8 08:33:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/bigdecimal/*: improve documentation, nodoc samples with @mrkn
 
-	* enum.c (enum_min_by, enum_max_by): return nil if no iteration.
-	  fixed: [ruby-dev:26245]
+Thu Jun 13 23:02:14 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* eval.c (rb_need_block): ensure a block is given.
+	* lib/xmlrpc/client.rb (XMLRPC::Client#http): Add reader for raw
+	  Net::HTTP. [ruby-core:55197] [Feature #8461]
+	  Reported by Herwin Weststrate. Thanks!!!
 
-	* eval.c (backtrace): skip successive frames sharing same node.
+Thu Jun 13 22:44:52 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Jun  8 00:15:08 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/xmlrpc/client.rb (XMLRPC::Client#parse_set_cookies): Support
+	  multiple names in a response. [ruby-core:41711] [Bug #5774]
+	  Reported by Roman Riha. Thanks!!!
+	* test/xmlrpc/test_client.rb (XMLRPC::ClientTest#test_cookie_override):
+	  Add a test of the above case.
 
-	* ext/socket/socket.c (ruby_getaddrinfo__aix): merged a patch from
-	  KUBO Takehiro <kubo at jiubao.org> to support AIX.  [ruby-list:40832]
+Thu Jun 13 22:35:50 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Wed Jun  8 00:09:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/xmlrpc/client.rb (XMLRPC::Client#parse_set_cookies): Use
+	  guard style.
 
-	* lib/yaml/rubytypes.rb (Array::to_yaml): merged a patch from
-	  Tilman Sauerbeck <tilman at code-monkey.de>.  [ruby-core:05055]
+Thu Jun 13 22:12:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/yaml/rubytypes.rb (Hash::to_yaml): ditto.
+	* lib/fileutils.rb (FileUtils#rmdir): fix traversal loop, not trying
+	  remove same directory only.
 
-Wed Jun  8 00:00:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jun 13 21:30:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/curses/curses.c (curses_insertln): merged a patch from
-	  TAKAHASHI Tamotsu <ttakah at lapis.plala.or.jp>.  [ruby-ext:02305]
+	* configure.in (opt-dir), tool/ifchange: get rid of "alternate value"
+	  expansion for legacy sh.  [ruby-dev:47420] [Bug #8524]
 
-Tue Jun  7 19:34:15 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jun 13 21:24:09 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/irb/init.rb (IRB::IRB.rc_file_generators): more flexible
-	  IRB.rc_file_generators.  [ruby-core:05163]
+	* bignum.c (bigdivrem): Refactored to use ALLOCV_N for temporary
+	  buffers.
 
-Tue Jun  7 18:39:31 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jun 13 18:54:11 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/thread.rb: RDoc documentation from Eric Hodel
-	  <drbrain at segment7.net> added.  [ruby-core:05148]
+	* bignum.c (integer_unpack_num_bdigits_generic): reorder terms (but not
+	  changed the intention of the expression) because VC++ reports a
+	  warning for it.  reported by ko1 via IRC.
 
-Tue Jun  7 18:30:04 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jun 13 18:53:14 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (create_makefile): add .SUFFIXES from depend file.
-	  fixed: [ruby-dev:26294]
+	* test/ruby/test_thread.rb (test_thread_local_security): Don't create
+	  an unused thread.
 
-Tue Jun  7 17:39:54 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Jun 13 18:34:20 2013  Tanaka Akira  <akr@fsij.org>
 
-	* object.c (rb_mod_cvar_get): Module#class_variable_get(): back
-	  ported from CVS HEAD.  [ruby-talk:144741]
+	* bignum.c (bigdivrem): Use nlz.
 
-	* object.c (rb_mod_cvar_set): Module#class_variable_set().
-	  [ruby-talk:144741]
+Thu Jun 13 14:51:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Jun  7 16:32:53 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* include/ruby/ruby.h (RUBY_SAFE_LEVEL_CHECK): check constant safe
+	  level at compile time.
 
-	* sprintf.c (rb_f_sprintf): raise exception on debug mode (-d),
-	  not verbose mode (-v/-w).  [ruby-core:05123]
+Thu Jun 13 14:39:08 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-Tue Jun  7 10:30:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* test/-ext-/test_printf.rb, test/rss/test_parser.rb,
+	  test/ruby/test_array.rb, test/ruby/test_hash.rb,
+	  test/ruby/test_m17n.rb, test/ruby/test_marshal.rb,
+	  test/ruby/test_object.rb, test/ruby/test_string.rb: don't use
+	  untrusted?, untrust, and trust to avoid warnings in case $VERBOSE is
+	  true.
 
-	* ext/tk/lib/multi-tk.rb: slave-ip fails to call procedures
-	  delegated by master-ip.
+Thu Jun 13 10:47:16 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-Sun Jun  5 23:00:35 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bootstraptest/test_autoload.rb, bootstraptest/test_method.rb:
+	  remove tests for $SAFE=4.
 
-	* ext/tk/lib/tk/console.rb: create console when required
+	* lib/pp.rb: use taint instead of untrust to avoid warnings when
+	  $VERBOSE is set to true.
 
-	* ext/tk/sample/tkextlib/tile/demo.rb: fix TypeError & create Console
+Thu Jun 13 06:12:18 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Jun  4 14:55:18 2005  Tanaka Akira  <akr@m17n.org>
+	* bignum.c (integer_unpack_num_bdigits_small): Fix a compile error on
+	  clang -Werror,-Wshorten-64-to-32
+	  Reported by Eric Hodel.  [ruby-core:55467] [Bug #8522]
 
-	* test/dbm/test_dbm.rb: merged from ext/dbm/testdbm.rb.
+Thu Jun 13 05:32:13 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* test/gdbm/test_gdbm.rb: merged from ext/gdbm/testgdbm.rb.
+	* ext/socket/extconf.rb:  Enable RFC 3542 IPV6 socket options for OS X
+	  10.7+.  [ruby-trunk - Bug #8517]
 
-	* test/sdbm/test_sdbm.rb: renamed from ext/sdbm/testsdbm.rb with
-	  modification to use test/unit.
+Thu Jun 13 00:17:18 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Jun  3 14:06:12 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bignum.c (rb_integer_unpack_2comp): New function.
+	  (rb_integer_unpack_internal): Extracted from rb_integer_unpack and
+	  nlp_bits_ret argument added.
+	  (integer_unpack_num_bdigits_small): nlp_bits_ret argument added to
+	  return number of leading padding bits.
+	  (integer_unpack_num_bdigits_generic): Ditto.
 
-	* ext/tk/lib/multi-tk.rb: fix typo.
+	* internal.h (rb_integer_unpack_2comp): Declared.
 
-Wed Jun  1 11:32:42 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* pack.c (pack_unpack): Use rb_integer_unpack_2comp and
+	  rb_integer_unpack.
 
-	* bcc32/Makefile.sub: can use single quote character in DESTDIR.
-	  [ruby-dev:26205]
+Wed Jun 12 23:27:03 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-Mon May 30 23:48:29 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (mod_using): new method Module#using, which activates
+	  refinements of the specified module only in the current class or
+	  module definition.  [ruby-core:55273] [Feature #8481]
 
-	* ext/tk/lib/tk/macpkg.rb: add PACKAGE_NAME information of Tcl/Tk
-	  Extension.
+	* test/ruby/test_refinement.rb: related test.
 
-	* ext/tk/lib/tk/msgcat.rb: ditto.
+Wed Jun 12 22:58:48 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* ext/tk/lib/tk/winpkg.rb: ditto.
+	* safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError
+	  when $SAFE is set to 4.  $SAFE=4 is now obsolete.
+	  [ruby-core:55222] [Feature #8468]
 
-	* ext/tk/lib/tkextlib/*: ditto.
+	* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
+	  Kernel#untrusted?, untrust, and trust are now deprecated.
+	  Their behavior is same as tainted?, taint, and untaint,
+	  respectively.
 
-Sat May 28 16:40:15 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
+	  and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
+	  respectively.
 
-	* test/openssl/test_x509store.rb: add test for expired CRL
-	  and refine some assertions.
+	* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
+	  ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
+	  ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
+	  ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
+	  ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
+	  ext/socket/socket.c, ext/socket/udpsocket.c,
+	  ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
+	  ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
+	  load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
+	  safe.c, string.c, thread.c, transcode.c, variable.c,
+	  vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
+	  $SAFE=4.
 
-Sat May 28 05:15:51 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/dl/test_dl2.rb, test/erb/test_erb.rb,
+	  test/readline/test_readline.rb,
+	  test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
+	  test/ruby/test_array.rb, test/ruby/test_dir.rb,
+	  test/ruby/test_encoding.rb, test/ruby/test_env.rb,
+	  test/ruby/test_eval.rb, test/ruby/test_exception.rb,
+	  test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
+	  test/ruby/test_io.rb, test/ruby/test_method.rb,
+	  test/ruby/test_module.rb, test/ruby/test_object.rb,
+	  test/ruby/test_pack.rb, test/ruby/test_rand.rb,
+	  test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
+	  test/ruby/test_struct.rb, test/ruby/test_thread.rb,
+	  test/ruby/test_time.rb: remove tests for $SAFE=4.
 
-	* ext/openssl/ossl_x509store.c (ossl_x509stctx_set_time): should
-	  not set internal flag directry.
+Wed Jun 12 22:18:23 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat May 28 02:00:11 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* bignum.c (integer_unpack_num_bdigits_generic): Rewritten without
+	  rb_funcall.
+	  (integer_unpack_num_bdigits_bytes): Removed.
+	  (rb_integer_unpack): integer_unpack_num_bdigits_bytes invocation
+	  removed.
 
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line):
-	  ENV["REQUEST_URI"] is better to get correct Request-URI
-	  than ENV["SCRIPT_NAME"] + ENV["PATH_INFO"].  [ruby-dev:26235]
+Wed Jun 12 20:18:03 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Fri May 27 16:32:04 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/xmlrpc/client.rb (XMLRPC::Client#parse_set_cookies): Extract.
 
-	* lib/mkmf.rb: use the semicolon as the path separator
-	  in the environment of MSYS.  fixed: [ruby-dev:26232]
+Wed Jun 12 18:19:41 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu May 26 06:08:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bignum.c (validate_integer_pack_format): supported_flags argument
+	  added and validate given flags.
+	  (rb_integer_pack_internal): Specify supported_flags.
+	  (rb_integer_unpack): Ditto.
 
-	* ext/tk/lib/tk.rb: add shortcut-methods of tk_call + tk_split_list
+Wed Jun 12 16:41:38 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 25 22:52:42 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* array.c (rb_ary_sort_bang): remove duplicated assertions.
+	  ARY_HEAP_PTR() implies ary not to be embedded.  [ruby-dev:47419]
+	  [Bug #8518]
 
-	* lib/irb/input-method.rb: do not use Readline::HISTORY.pop.
-	  (backported from HEAD)
+Wed Jun 12 12:44:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed May 25 21:55:40 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* io.c (io_getc): fix 7bit coderange condition, check if ascii read
+	  data instead of read length. [ruby-core:55444] [Bug #8516]
 
-	* ext/readline/readline.c: supported libedit. (backported from HEAD)
+Wed Jun 12 12:35:13 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/readline/extconf.rb: ditto.
+	* pack.c (pack_pack): Use rb_integer_pack_2comp.
 
-	* test/readline/test_readline.rb: ditto.
+Wed Jun 12 12:07:04 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed May 25 20:06:27 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* sprintf.c (rb_str_format): Fix a dynamic format string.
 
-	* ext/tk/lib/tk.rb: TkComm#tk_split_*list fail to split a kind of SJIS
-	  strings. To avoid the trouble, add arguments to control converting
-	  encoding, and do split on a UTF8 string.
+Wed Jun 12 12:04:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/multi-tk.rb: modify to attend encoding.
+	* array.c (rb_ary_uniq_bang): must not be modified once frozen even in
+	  a callback method.
 
-	* ext/tk/lib/remote-tk.rb: ditto.
+Wed Jun 12 12:03:43 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk/itemconfig.rb: ditto.
+	* array.c (rb_ary_sort_bang): must not be modified once frozen even in
+	  a callback method.
 
-	* ext/tk/lib/tk/listbox.rb: ditto.
+Wed Jun 12 12:00:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk/namespace.rb: ditto.
+	* array.c (FL_SET_EMBED): shared object is frozen even when get
+	  unshared.
 
-	* ext/tk/lib/tk/panedwindow.rb: ditto.
+	* array.c (rb_ary_modify): ARY_SET_CAPA needs unshared array.
 
-	* ext/tk/lib/tk/text.rb: ditto.
+Wed Jun 12 07:32:01 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/textmark.rb: ditto.
+	* random.c (rand_int): Use rb_big_uminus.
 
-	* ext/tk/lib/tk/texttag.rb: ditto.
+Wed Jun 12 07:12:54 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/tk/lib/tk/variable.rb: ditto.
+	* struct.c:  Improve documentation: replace "instance variable" with
+	  "member", recommend the use of a block to customize structs, note
+	  that member accessors are created, general cleanup.
 
-	* ext/tk/lib/tk/winfo.rb: ditto.
+Wed Jun 12 06:35:01 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tkextlib/iwidgets/scrolledlistbox.rb: ditto.
+	* internal.h (INTEGER_PACK_NEGATIVE): Defined.
+	  (rb_integer_unpack): sign argument removed.
 
-	* ext/tk/lib/tkextlib/iwidgets/scrolledtext.rb: ditto.
+	* bignum.c (rb_integer_unpack): sign argument removed.
+	  Non-negative integers generated by default.
+	  INTEGER_PACK_NEGATIVE flag is used to generate non-positive integers.
 
-	* ext/tk/lib/tk.rb: add TkWindow#lower_window/raise_window and
-	  Tk#lower_window/raise_window by reason of method-name conflict
+	* pack.c (pack_unpack): Follow the above change.
 
-	* ext/tk/lib/tk/canvas.rb: bug fix on TkCanvas#delete when given
-	  non-TkcItem arguments.
+	* random.c (int_pair_to_real_inclusive): Ditto.
+	  (make_seed_value): Ditto.
+	  (mt_state): Ditto.
+	  (limited_big_rand): Ditto.
 
-	* ext/tk/lib/tkextlib/iwidgets/scrolledcanvas.rb: ditto.
+	* marshal.c (r_object0): Ditto.
 
-Wed May 25 12:59:48 2005  Tanaka Akira  <akr@m17n.org>
+Wed Jun 12 00:07:46 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/open-uri.rb (OpenURI::Meta::RE_QUOTED_STRING): a content of
-	  quoted-string should be zero or more characters.
+	* test/xmlrpc/test_client.rb (XMLRPC::ClientTest#test_cookie_simple):
+	  Add a test for the extracted method.
 
-Tue May 24 23:42:16 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun 11 23:56:24 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* numeric.c (fix_pow): support Fixnum ** Float case directly
-	  without coercing.  [ruby-talk:142697] [ruby-talk:143054]
+	* test/xmlrpc/test_client.rb (XMLRPC::ClientTest::Fake::HTTP#started):
+	  Add a missing empty line.
 
-Tue May 24 16:57:24 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun 11 23:37:19 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ruby.c (require_libraries): caused SEGV when continuation jumped
-	  in to the required library code.
+	* bignum.c (validate_integer_pack_format): Don't require a word order
+	  flag if numwords is 1 or less.
+	  (absint_numwords_generic): Don't specify a word order for
+	  rb_integer_pack.
 
-Tue May 24 11:56:25 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* hash.c (rb_hash): Ditto.
 
-	* lib/getopts.rb: should warn only if verbose mode.
-	  fixed: [ruby-dev:26201]
+	* time.c (v2w_bignum): Ditto.
 
-Tue May 24 06:45:31 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Jun 11 23:01:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* misc/ruby-mode.el (ruby-font-lock-syntactic-keywords): string
-	  literals to be matched non-greedy.
+	* bignum.c (validate_integer_pack_format): Refine error messages.
 
-Tue May 24 00:34:32 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Jun 11 22:25:04 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/soap/calc: method name 'set' was able to crash with a class Set.
-	  [ruby-dev:26210]
+	* bignum.c (validate_integer_pack_format): numwords argument added.
+	  Move a varidation from rb_integer_pack_internal and rb_integer_unpack.
+	  (rb_integer_pack_internal): Follow above change.
+	  (rb_integer_unpack): Ditto.
 
-	* test/wsdl/document/test_rpc.rb: dateTime comparison failed under
-	  TZ=right/Asia/Tokyo (with leap second.) [ruby-dev:26208]
+Tue Jun 11 20:52:43 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon May 23 16:24:05 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* bignum.c (rb_integer_pack_internal): Renamed from rb_integer_pack
+	  and overflow_2comp argument added.
+	  (rb_integer_pack): Just call rb_integer_pack_internal.
+	  (rb_integer_pack_2comp): New function.
 
-	* ext/tcltklib/extconf.rb: Framework support on MacOS X Tiger.
+	* internal.h (rb_integer_pack_2comp): Declared.
 
-	* ext/tcltklib/README.1st: add description of Framework support options.
+	* sprintf.c (rb_str_format): Use rb_integer_pack and
+	  rb_integer_pack_2comp to format binary/octal/hexadecimal integers.
+	  (ruby_digitmap): Declared.
+	  (remove_sign_bits): Removed.
+	  (BITSPERDIG): Ditto.
+	  (EXTENDSIGN): Ditto.
 
-Mon May 23 12:21:37 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Jun 11 16:15:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* re.c (make_regexp): should not return junk address during
-	  compile time.  [ruby-dev:26206]
+	* array.c (ary_shrink_capa): shrink the capacity so it fits just with
+	  the length.
 
-Sun May 22 21:54:06 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* array.c (ary_make_shared): release never used elements from frozen
+	  array to be shared.  [ruby-dev:47416] [Bug #8510]
 
-	* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
+Tue Jun 11 12:49:01 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	  == SOAP client and server ==
+	* doc/re.rdoc: Rename to doc/regexp.rdoc
+	* re.c: Update rdoc include for rename of file
 
-	  === for both client side and server side ===
+Tue Jun 11 07:13:13 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	  * improved document/literal service support.
-	    style(rpc,document)/use(encoding, literal) combination are all
-	    supported.  for the detail about combination, see
-	    test/soap/test_style.rb.
+	* eval_error.c (error_print): keep that errat is non-shady object.
+	  and guard errat from GC.
 
-	  * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to
-	    WSDL as well as obj2soap.  closes #70.
+Tue Jun 11 05:04:25 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	  * let SOAP::Mapping::Object handle XML attribute for doc/lit service.
-	    you can set/get XML attribute via accessor methods which as a name
-	    'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name).
+	* ext/racc/cparse/cparse.c: use rb_ary_entry() and
+	  rb_ary_subseq() instead of RARRAY_PTR.
+	  Based on a patch by Dirkjan Bussink. See Bug #8399.
 
-	  === client side ===
+Mon Jun 10 23:51:51 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	  * WSDLDriver capitalized name operation bug fixed.  from
-	    1.5.3-ruby1.8.2, operation which has capitalized name (such as
-	    KeywordSearchRequest in AWS) is defined as a method having
-	    uncapitalized name. (converted with GenSupport.safemethodname
-	    to handle operation name 'foo-bar').  it introduced serious
-	    incompatibility; in the past, it was defined as a capitalized.
-	    define capitalized method as well under that circumstance.
+	* array.c (rb_ary_new_from_values): fix a typo. pointed out by
+	  nagachika.
+	  http://d.hatena.ne.jp/nagachika/20130610/ruby_trunk_changes_41199_41220
 
-	  * added new factory interface 'WSDLDriverFactory#create_rpc_driver'
-	    to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver
-	    are merged).  'WSDLDriverFactory#create_driver' still creates
-	    WSDLDriver for compatibility but it warns that the method is
-	    deprecated.  please use create_rpc_driver instead of create_driver.
+Mon Jun 10 21:51:03 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	  * allow to use an URI object as an endpoint_url even with net/http,
-	    not http-access2.
+	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): Fix indent.
 
-	  === server side ===
+Mon Jun 10 21:49:43 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	  * added mod_ruby support to SOAP::CGIStub.  rename a CGI script
-	    server.cgi to server.rb and let mod_ruby's RubyHandler handles the
-	    script.  CGIStub detects if it's running under mod_ruby environment
-	    or not.
+	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): Add missing return
+	  value assignment.
 
-	  * added fcgi support to SOAP::CGIStub.  see the sample at
-	    sample/soap/calc/server.fcgi.  (almost same as server.cgi but has
-	    fcgi handler at the bottom.)
+Mon Jun 10 20:58:11 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	  * allow to return a SOAPFault object to respond customized SOAP fault.
+	* ext/socket/raddrinfo.c (nogvl_getaddrinfo): work around for Ubuntu
+	  13.04's getaddrinfo issue with mdns4. [ruby-list:49420]
 
-	  * added the interface 'generate_explicit_type' for server side
-	    (CGIStub, HTTPServer).  call 'self.generate_explicit_type = true'
-	    if you want to return simplified XML even if it's rpc/encoded
-	    service.
+Mon Jun 10 19:34:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	  == WSDL ==
+	* bignum.c (rb_integer_pack): Returns sign instead of words.
+	  (absint_numwords_generic): Follow the above change.
+	  (big2str_base_powerof2): Follow the above change.
 
-	  === WSDL definition ===
+	* internal.h: Ditto.
 
-	  * improved XML Schema support such as extension, restriction,
-	    simpleType, complexType + simpleContent, ref, length, import,
-	    include.
+	* hash.c (rb_hash): Ditto.
 
-	  * reduced "unknown element/attribute" warnings (warn only 1 time for
-	    each QName).
+	* pack.c (pack_pack): Ditto.
 
-	  * importing XSD file at schemaLocation with xsd:import.
+	* random.c (int_pair_to_real_inclusive): Ditto.
+	  (rand_init): Ditto.
+	  (random_load): Ditto.
+	  (limited_big_rand): Ditto.
 
-	  === code generation from WSDL ===
+	* time.c (v2w_bignum): Ditto.
 
-	  * generator crashed when there's '-' in defined element/attribute
-	    name.
+Mon Jun 10 17:20:01 2013  Koichi Sasada  <ko1@atdot.net>
 
-	  * added ApacheMap WSDL definition.
+	* gc.c (rgengc_remember): permit promoted object.
+	  (rb_gc_writebarrier -> remember)
 
-	* sample/{soap,wsdl}: removed.
+Mon Jun 10 17:14:01 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun May 22 19:11:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* gc.c (RVALUE_PROMOTE): fix parameter name (`x' to `obj')
+	  and make it inline function (like RVALUE_PROMOTE).
 
-	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#intialize):
-	  should initialize session id context. [ruby-core:4663]
+Mon Jun 10 16:22:50 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): add session id support.
+	* array.c (rb_ary_new_from_values): add assertion
+	  (ary should be young object).
 
-Sat May 21 10:24:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon Jun 10 16:05:59 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* bcc32/Makefile.sub: tds files were not deleted when DESTDIR
-	  included '\' path delimiter. [ruby-dev:26193]
+	* gc.c (wmap_mark): check allocation of `w->obj2wmap'.
+	  (no-allocation `w->obj2wmap' will be NULL pointer reference)
 
-Thu May 19 19:04:29 2005  speakillof  <speakillof@yahoo.co.jp>
+Mon Jun 10 15:36:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rexml/encodings/SHIFT-JIS.rb: encoding and decoding were
-	  swapped. [ruby-core:4772]
+	* eval_error.c (error_print): use checking functions instead of
+	  catching exceptions.
 
-Wed May 18 23:42:25 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* eval_error.c (error_print): restore errinfo for the case new
+	  exception raised while printing the message.  [ruby-core:55365]
+	  [Bug #8501]
 
-	* error.c (exc_exception): reverted to call Exception#initialize
-	  directly.  fixed: [ruby-dev:26177]
+	* eval_error.c (error_print): reduce calling setjmp.
 
-Wed May 18 23:39:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Jun 10 12:10:06 2013  Tanaka Akira  <akr@fsij.org>
 
-	* dir.c (glob_helper): get rid of using String.  [ruby-dev:26180]
+	* bignum.c (integer_unpack_num_bdigits_small: Extracted from
+	  rb_integer_unpack.
+	  (integer_unpack_num_bdigits_generic): Ditto.
+	  (integer_unpack_num_bdigits_bytes): New function.
+	  (rb_integer_unpack): Use above functions.
+	  Return a Bignum for INTEGER_PACK_FORCE_BIGNUM even when the result
+	  is zero.
 
-	* dir.c (push_braces): should skip balanced braces.
+Mon Jun 10 05:38:23 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (ruby_options), win32/win32.c (NtInitialize): move argument
-	  intialization back.  [ruby-dev:26180]
+	* bignum.c (absint_numwords_small): New function.
+	  (absint_numwords_generic): Use absint_numwords_small if possible.
 
-Tue May 17 15:31:31 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Jun 10 01:07:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should
-	  break the loop if the socket reached to EOF. [ruby-talk:142285]
+	* bignum.c (absint_numwords_bytes): New function.
+	  (absint_numwords_generic): Extracted from rb_absint_numwords.
+	  (rb_absint_numwords): Use absint_numwords_bytes if possible.
 
-Tue May 17 11:52:18 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Jun  9 21:33:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/win32.c (unixtime_to_filetime): use localtime() instead of
-	  gmtime() when using FileLocalTimeToFileTime().
+	* bignum.c (rb_absint_numwords): Return (size_t)-1 when overflow.
+	  Refine variable names.
+	  (rb_absint_size): Refine variable names.
 
-Mon May 16 22:28:43 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (rb_absint_size): Refine an argument name.
+	  (rb_absint_numwords): Ditto.
 
-	* win32/win32.h, {bcc32,win32,wince}/Makefile.sub: moved rb_[ugp]id_t
-	  to get rid of redefinition warnings on mingw.
+Sun Jun  9 16:51:41 2013  Tanaka Akira  <akr@fsij.org>
 
-	* class.c (rb_class_init_copy): singleton class is disallowed to copy,
-	  from its definition.  fixed: [ruby-talk:142749]
+	* bignum.c (rb_absint_numwords): Renamed from rb_absint_size_in_word.
 
-Mon May 16 08:52:29 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* internal.h (rb_absint_numwords): Follow the above change.
 
-	* win32/win32.{h,c}: define rb_[pgu]id_t.
+	* pack.c (pack_pack): Ditto.
 
-Mon May 16 00:21:02 2005  Tanaka Akira  <akr@m17n.org>
+	* random.c (rand_init): Ditto.
+	  (limited_big_rand): Ditto.
 
-	* lib/pathname.rb (Pathname#unlink): use SystemCallError instead of
-	  Errno::EISDIR because EISDIR is not portable.
-	  [ruby-core:5001]
+Sun Jun  9 14:41:05 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun May 15 22:11:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* bignum.c (rb_integer_pack): numwords_allocated argument removed.
 
-	* lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
-	  [ruby-dev:26164]
+	* internal.h (rb_integer_pack): Follow the above change.
 
-Sun May 15 18:56:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* hash.c (rb_hash): Ditto.
 
-	* configure.in, ruby.h: define rb_[pgu]id_t macros instead of typedefs
-	  to get rid of types which might not be defined yet.  [ruby-dev:26165]
+	* time.c (v2w_bignum): Ditto.
 
-Sun May 15 14:35:46 2005  Tanaka Akira  <akr@m17n.org>
+	* pack.c (pack_pack): Ditto.
 
-	* lib/pathname.rb (Pathname#unlink): unlink a symlink to a directory
-	  was failed.  [ruby-core:4992]
+	* random.c (int_pair_to_real_inclusive): Ditto.
+	  (rand_init): Ditto.
+	  (random_load): Ditto.
+	  (limited_big_rand): Ditto.
 
-Sun May 15 09:57:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun  9 09:34:44 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/win32.c (unixtime_to_filetime): deal with DST.
-	  [ruby-talk:141817]
+	* bignum.c (big2str_base_powerof2): New function.
+	  (rb_big2str0): Use big2str_base_powerof2 if base is 2, 4, 8, 16 or 32.
 
-Sat May 14 23:59:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun  9 00:59:04 2013  Tanaka Akira  <akr@fsij.org>
 
-	* error.c (exc_exception, {exit,name_err,syserr}_initialize): call
-	  Execption#initialize.  fixed: [ruby-talk:142593]
+	* hash.c (rb_hash): Use rb_integer_pack to obtain least significant
+	  long integer.
 
-Sat May 14 23:57:26 2005  Erik Huelsmann  <ehuels@gmail.com>
+Sat Jun  8 23:56:00 2013  Tanaka Akira  <akr@fsij.org>
 
-	* configure.in: Check for the availability of pid_t, gid_t and uid_t and
-	  remove AC_TYPE_UID_T.  fixed: [ruby-core:04745]
+	* numeric.c (rb_num_to_uint): Use rb_absint_size instead of
+	  RBIGNUM_LEN.
 
-	* defines.h: Remove pid_t typedef.
+Sat Jun  8 22:53:45 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ruby.h: Define rb_pid_t, rb_gid_t and rb_uid_t in accordance with
-	 the available system types.
+	* marshal.c (r_object0): Use rb_integer_unpack.
 
-	* process.c: Change instances of pid_t and gid_t to their rb_*
-	 counterparts.
+Sat Jun  8 22:18:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/pty/pty.c: Change pid_t to rb_pid_t.
+	* time.c (v2w): Use rb_absint_size instead of RBIGNUM_LEN.
 
-	* vms/config.h: Define HAVE_{P,G,U}ID_T to 1.
+Sat Jun  8 21:47:33 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/Makefile.sub: Remove #define for {g,u}id_t.
+	* time.c (v2w_bignum): Simplified using rb_integer_pack.
+	  (rb_big_abs_find_maxbit): Removed.
 
-	* win32/win32.c: Change pid_t to rb_pid_t.
+Sat Jun  8 21:03:40 2013  Tanaka Akira  <akr@fsij.org>
 
-	* wince/Makefile.sub: Remove #define for {g,u}id_t.
+	* bignum.c (rb_absint_singlebit_p): New function.
 
-	* wince/sys/types.h: Remove definitions of {p,g,u}id_t.
+	* internal.h (rb_absint_singlebit_p): Declared.
 
-Fri May 13 23:44:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* time.c (v2w_bignum): Use rb_absint_singlebit_p instead of
+	  rb_big_abs_find_minbit.
+	  (rb_big_abs_find_minbit): Removed.
 
-	* ext/extmk.rb: keep srcdir unexpanded.
+Sat Jun  8 20:24:23 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
-	  fixed: [ruby-core:04932]
+	* time.c (rb_big_abs_find_maxbit): Use rb_absint_size.
+	  (bdigit_find_maxbit): Removed.
 
-	* lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
-	  also INSTALL_PROG and INSTALL_DATA system dependent.
-	  fixed: [ruby-core:04931]
+Sat Jun  8 19:47:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Fri May 13 17:54:39 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* class.c (include_modules_at): invalidate method cache if included
+	  module contains constants
 
-	* variable.c (generic_ivar_get): rb_attr_get should not warn.
-	  [ruby-dev:26010]
+	* test/ruby/test_module.rb: add test
 
-Fri May 13 12:28:43 2005  Daniel Berger  <djberge@qwest.com>
+Sat Jun  8 19:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* array.c (rb_ary_select): can remove argc check. [ruby-core:4911]
+	* random.c (limited_big_rand): declare rnd, lim and mask as uint32_t
+	  to avoid 64 bit to 32 bit shorten warnings.
 
-	* test/ruby/test_array.rb: add test for find_all.
+Sat Jun  8 19:23:53 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri May 13 11:29:00 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* win32/Makefile.sub: r41163 changed win32/win32.c and configure.in
+	  but it didn't treat about mswin32/mswin64, so fix it.
+	  NOTE: this needs a review by usa whether additional condition is
+	  required or not.
 
-	* eval.c (unknown_node): add volatile directive to prototype.
+Sat Jun  8 19:06:26 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu May 12 17:08:48 2005  Tanaka Akira  <akr@m17n.org>
+	* random.c: Unused RBignum internal accessing macros removed.
 
-	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
-	  (swallow, rb_io_each_byte, rb_io_getc): revert previous change.
+Sat Jun  8 19:04:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* io.c (rb_io_eof, io_fread, appendline, swallow, rb_io_each_byte)
-	  (rb_io_getc, rb_getc): call clearerr before getc to avoid
-	  stdio incompatibility.
+	* random.c (limited_big_rand): The argument, limit, is changed to
+	  VALUE.  Use rb_integer_pack and rb_integer_unpack.
 
-Thu May 12 16:52:20 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jun  8 17:15:18 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rdoc/parsers/parse_c.rb: more readability for mixing
-	  progress "c..." and warning message.
+	* random.c (make_seed_value): Fix the length given for
+	  rb_integer_unpack.
 
-Thu May 12 16:31:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat Jun  8 16:38:02 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 2.0.5
+	* bignum.c (rb_integer_unpack): Don't use rb_funcall if possible.
 
-Thu May 12 16:15:01 2005  Tanaka Akira  <akr@m17n.org>
+	* random.c: Use uint32_t for elements of seed.
+	  (make_seed_value): Use rb_integer_unpack.
 
-	* io.c (rb_io_eof, remain_size, read_all, io_read, appendline)
-	  (swallow, rb_io_each_byte, rb_io_getc): don't rely EOF flag.
-	  [ruby-talk:141527]
+Sat Jun  8 15:58:18 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu May 12 15:56:20 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+	* random.c (rand_init): Add a cast to fix clang compile error:
+	  random.c:410:32: error: implicit conversion loses integer precision:
+	  'size_t' (aka 'unsigned long') to 'int' [-Werror,-Wshorten-64-to-32]
+	  This cast doesn't cause a problem because len is not bigger than
+	  MT_MAX_STATE.
 
-	* lib/rdoc/parsers/parse_c.rb: show parsing progress for C files.
-	  [ruby-core:4341]
+Sat Jun  8 15:30:03 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu May 12 13:47:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* random.c (rand_init): Use rb_integer_pack.
+	  (roomof): Removed.
 
-	* test/drb/test_drb{ssl,unix}.rb: can test drb
-	  before install. (backported from HEAD) [ruby-dev:26146]
+Sat Jun  8 14:58:32 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu May 12 09:53:57 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (INTEGER_PACK_FORCE_BIGNUM): New flag constant.
 
-	* version.c (ruby_show_version): flush for non-tty stdout.
+	* bignum.c (rb_integer_unpack): Support INTEGER_PACK_FORCE_BIGNUM.
 
-Thu May 12 09:07:07 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* random.c (int_pair_to_real_inclusive): Use
+	  INTEGER_PACK_FORCE_BIGNUM to use rb_big_mul instead of rb_funcall.
 
-	* test/ruby/envutil.rb, test/drb/drbtest.rb: can test drb
-	  before install. (backported from HEAD) [ruby-Bugs-1672]
+Sat Jun  8 14:17:01 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu May 12 01:23:55 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: check for NET_LUID.  header macro varies across
+	  compiler versions.
 
-	* eval.c (rb_eval), parse.y (arg): reduce fixnum range literal at
-	  parser.  fixed: [ruby-dev:26113]
+	* win32/win32.c: use configured macro.
 
-	* eval.c (unknown_node): ignore broken NODE to get rid of accessing
-	  possibly inaccessible address.  fixed: [ruby-dev:26122]
-	  should emit more useful information like [ruby-dev:26126], though.
+Sat Jun  8 11:59:55 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed May 11 16:20:01 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* random.c (int_pair_to_real_inclusive): Use rb_funcall instead of
+	  rb_big_mul because rb_integer_unpack can return a Fixnum.
 
-	* lib/webrick/cgi.rb: new methods WEBrick::CGI#[], WEBrick::CGI#logger
-	  and WEBrick::CGI#config. (backported from HEAD)
+Sat Jun  8 11:17:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape_path): should
-	  not use String#split("/"). (backported from HEAD)
+	* random.c (int_pair_to_real_inclusive): Use rb_integer_pack.
 
-Wed May 11 15:58:39 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Jun  8 09:49:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (break_jump): break should not cross functions.
-	  [ruby-list:40818]
+	* random.c (int_pair_to_real_inclusive): Use rb_integer_unpack.
 
-Wed May 11 10:39:37 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jun  8 08:12:22 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/tempfile.rb (Tempfile#unlink): fixed typo.
+	* random.c (random_load): Use rb_integer_pack.
 
-Wed May 11 01:03:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun  8 06:15:46 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (TMP_ALLOC): use macro NEW_NODE() to get rid of warnings on
-	  platforms which have no alloca().  fixed: [ruby-talk:141301]
+	* random.c (numberof): Removed.
 
-Sun May  8 23:17:47 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Jun  8 06:00:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/timer.rb: fix typo.
+	* random.c: include internal.h.
+	  (mt_state): Use rb_integer_unpack.
 
-Sun May  8 16:52:56 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Jun  8 00:55:51 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/profiler.rb: fixed "undefined method `[]' for nil:NilClass"
-	  [ruby-core:4775] [ruby-talk:140401] [ruby-dev:26118]
+	* bignum.c (integer_pack_loop_setup): word_num_nailbytes_ret argument
+	  removed.
+	  (rb_integer_pack): Follow the above change.
+	  (rb_integer_unpack): Follow the above change.
 
-Sat May  7 22:58:00 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun  8 00:37:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (have_var): no libs argument is given.
+	* bignum.c (validate_integer_pack_format): Renamed from
+	  validate_integer_format.
+	  (integer_pack_loop_setup): Renamed from integer_format_loop_setup.
+	  (integer_pack_fill_dd): Renamed from int_export_fill_dd.
+	  (integer_pack_take_lowbits): Renamed from int_export_take_lowbits.
+	  (integer_unpack_push_bits): Renamed from int_import_push_bits.
 
-Sun May  1 09:58:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun  7 23:58:06 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ruby.c (process_sflag): replace '-' in variable names with '_'.
-	  [ruby-dev:26107]
+	* bignum.c (rb_integer_pack): Arguments changed.  Use flags to
+	  specify word order and byte order.
+	  (rb_integer_unpack): Ditto.
+	  (validate_integer_format): Follow the above change.
+	  (integer_format_loop_setup): Ditto.
 
-	* ruby.c (set_arg0): use also environment variable space for setting
-	  $0.  [ruby-core:04774]
+	* pack.c: Ditto.
 
-Wed Apr 27 23:42:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h: Ditto.
+	  (INTEGER_PACK_MSWORD_FIRST): Defined.
+	  (INTEGER_PACK_LSWORD_FIRST): Ditto.
+	  (INTEGER_PACK_MSBYTE_FIRST): Ditto.
+	  (INTEGER_PACK_LSBYTE_FIRST): Ditto.
+	  (INTEGER_PACK_NATIVE_BYTE_ORDER): Ditto.
+	  (INTEGER_PACK_LITTLE_ENDIAN): Ditto.
+	  (INTEGER_PACK_BIG_ENDIAN): Ditto.
 
-	* win32/Makefile.sub (OPTFLAGS): default global optimization to
-	  disabled only for VC++6.
+Fri Jun  7 22:10:50 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Apr 26 22:58:00 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/rubygems/specification.rb (Gem::Specification#to_yaml):
+	  use Gem::NoAliasYAMLTree.create instead of Gem::NoAliasYAMLTree.new
+	  to suppress deprecated warnings.
 
-	* ext/tcltklib/tcltklib.c (ip_invoke_core): call Tcl's "::unknown"
-	  command when can't get information of target command.
+Fri Jun  7 21:39:39 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Apr 25 01:18:43 2005  Tanaka Akira  <akr@m17n.org>
+	* bignum.c (rb_integer_pack): Renamed from rb_int_export.
+	  (rb_integer_unpack): Renamed from rb_int_import.
 
-	* regex.c: declare rb_warn to have variadic argument.  [ruby-core:4751]
+	* internal.h, pack.c: Follow the above change.
 
-Sat Apr 23 19:45:59 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jun  7 21:05:26 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tcltklib/tcltklib.c (ip_RubyExitCommand): exit with status code
-	  via TclTkIp#_eval didn't work. [ruby-talk:139390]
+	* bignum.c (integer_format_loop_setup): Extracted from rb_int_export
+	  and rb_int_import.
 
-Fri Apr 22 16:41:50 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jun  7 19:48:38 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tcltklib/tcltklib.c (ip_set_exc_message): fixed memory leak.
+	* bignum.c (validate_integer_format): Extracted from rb_int_export and
+	  rb_int_import.
 
-	* ext/tcltklib/tcltklib.c: eTkCallbackReturn was not initialized.
+Fri Jun  7 19:23:15 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Apr 21 00:07:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_absint_size): Use numberof.
+	  (rb_int_export): Ditto.
 
-	* lib/mkmf.rb (create_makefile): support platforms have file separator
-	  other than /.
+Fri Jun  7 18:58:56 2013  Tanaka Akira  <akr@fsij.org>
 
-	* {bcc32,win32,wince}/Makefile.sub (BUILD_FILE_SEPARATOR): separator
-	  of building platform.
+	* internal.h (numberof): Gathered from various files.
 
-	* {bcc32,win32,wince}/Makefile.sub (CP, INSTALL): use COPY command.
+	* array.c, math.c, thread_pthread.c, iseq.c, enum.c, string.c, io.c,
+	  load.c, compile.c, struct.c, eval.c, gc.c, parse.y, process.c,
+	  error.c, ruby.c: Remove the definitions of numberof.
 
-Wed Apr 20 23:22:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun  7 18:24:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	* Makefile.in, common.mk: miniruby depens on MINIOBJS.
+	* bignum.c (rb_absint_size): Declare a variable, i, just before used
+	  to suppress a warning.
+	  (rb_int_export): Ditto.
 
-	* dmydln.c (dln_load): dummy function to raise LoadError.
+Fri Jun  7 17:41:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* cygwin/GNUmakefile.in, {bcc32,win32,wince}/Makefile.sub: miniruby
-	  can't load extensions on Windows.
+	* bignum.c (rb_absint_size): explicit cast to BDIGIT to avoid implicit
+	  64 bit to 32 bit shortening warning
+	* bignum.c (rb_int_export): ditto
+	* bignum.c (int_import_push_bits): ditto
 
-Wed Apr 20 23:01:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun  7 17:31:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* win32/ifchange.bat: delete testing files.
+	* internal.h (RCLASS_SUPER): use descriptive variable name
+	* internal.h (RCLASS_SET_SUPER): ditto
 
-Wed Apr 20 07:27:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun  7 13:25:27 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* {bcc32,win32,wince}/configure.bat, {bcc32,win32,wince}/setup.mak:
-	  add extout option.
+	* ext/json/fbuffer/fbuffer.h (fbuffer_append_str): change the place of
+	  RB_GC_GUARD. it should be after the object is used.
 
-	* bcc32/setup.mak: make configuration variables overridable.
+Fri Jun  7 13:22:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Apr 20 04:15:27 2005  Keiju Ishitsuka  <keiju@ruby-lang.org>
+	* gc.c (before_gc_sweep): noinline can also avoid the segv instead of
+	  -O0 of r41084. this way is expected less slow.
 
-	* lib/irb.rb lib/irb/* doc/irb: IRB 0.9.5
+Fri Jun  7 11:45:42 2013  Kenta Murata  <mrkn@cookpad.com>
 
-Tue Apr 19 23:37:09 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* rational.c (numeric_quo): move num_quo in numeric.c to numeric_quo
+	  in rational.c to refer canonicalization state for mathn support.
+	  [ruby-core:41575] [Bug #5736]
 
-	* lib/ftools.rb (File.safe_unlink): do not modify a symlinked file.
+	* numeric.c (num_quo): ditto.
 
-Tue Apr 19 00:06:20 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/test_mathn.rb: add a test for the change at r41109.
 
-	* ext/extmk.rb: expand path for ext/**/extconf.rb.
+Fri Jun  7 11:41:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Apr 18 11:25:14 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* configure.in: revert r41106.  size_t may not be unsigned
 
-	* ext/zlib/zlib.c (zstream_run): fixed SEGV. [ruby-core:4712]
+	* bignum.c (rb_absint_size_in_word, rb_int_export, rb_int_import): use
+	  NUM2SIZET() and SIZET2NUM() already defined in ruby/ruby.h.
 
-Sun Apr 17 23:57:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Jun  7 11:28:37 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* ext/extmk.rb (extmake, parse_args): do not expand destdir.
+	* gc.c: use oldgen bitmap as initial mark bitmap when major gc.
+	  so can skip oldgen bitmap check around mark & sweep.
+	* gc.c (slot_sweep_body): change scan algorithm for performance:
+	  from object's pointer base to bitmap one.
 
-	* ext/extmk.rb (relative_from): treat mere drive letter as an absolute
-	  path.
+Fri Jun  7 11:25:56 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Sat Apr 16 17:01:16 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* gc.c: introduce oldgen bitmap for preparing performance tuning.
 
-	* sample/rss/tdiary_plugin/rss-recent.rb (rss_recent_cache_rss):
-	  use the first date information of items as site date information
-	  if channel doesn't have date information.
+Fri Jun  7 11:20:57 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Sat Apr 16 15:27:03 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (MARKED_IN_BITMAP, MARK_IN_BITMAP, CLEAR_IN_BITMAP): bring
+	  bitmap macros in one place, and introduce BITMAP_BIT.
 
-	* configure.in (RUBY_PROG_INSTALL): not add -p option to INSTALL.
-	  files need timestamps to be kept are only ar-archive on a few
-	  platforms, and be installed by instruby.rb but not INSTALL.
-	  fixed: [ruby-core:04721]
+Fri Jun  7 11:18:35 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* mkconfig.rb: purge autoconf value variables.
+	* array.c (ary_new): change order of allocation in order
+	  to remove FL_OLDGEN operation.
 
-Sat Apr 16 10:36:01 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Fri Jun  7 11:16:28 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* bcc32/Makefile.sub: quick hack... prepend DESTDIR.
-	  still have restriction on DESTDIR ("", "/", "e:")
+	* tool/rdocbench.rb: add gc total time information.
 
-Sat Apr 16 03:59:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Jun  7 10:12:01 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/extconf.rb: check for OPENSSL_cleanse.
+	* gc.c: remove "Sunny" terminology.
+	  "Sunny" doesn't mean antonym of "Shady" (questionable, doubtful, etc).
+	  Instead of "Sunny", use "non-shady" or "normal".
 
-	* ext/openssl/openssl_missing.h: ditto.
+Fri Jun  7 09:29:33 2013  Kenta Murata  <mrkn@cookpad.com>
 
-Thu Apr 14 19:18:30 2005  Minero Aoki  <aamine@loveruby.net>
+	* bignum.c (rb_int_import): explicitly casting BDIGIT_DBL to BDIGIT
+	  to prevent warning.
 
-	* lib/fileutils.rb (remove_file): ignore exceptions caused by
-	  chmod.
+Fri Jun  7 07:29:33 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/fileutils.rb (remove_dir): try to get rights to rmdir.
-	  [ruby-Bugs:1502] (2 items backportted from HEAD, rev 1.53-54)
+	* internal.h (rb_int_export): countp argument is split into
+	  wordcount_allocated and wordcount.
 
-Thu Apr 14 16:57:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_int_export): Follow the above change.
 
-	* bcc32/Makefile.sub: failed to remove debug information files.
-	  fixed: [ruby-dev:26034]
+	* pack.c (pack_pack): Ditto.
 
-Wed Apr 13 23:40:21 2005  Kouhei Sutou  <kou@cozmixng.org>
+Fri Jun  7 07:17:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.3 -> 0.1.4.
+	* NEWS: describe a compatibility issue of Numeric#quo
+	  introduced at r41109.
 
-	* lib/rss/rss.rb (RSS::Element#converter): fixed converter
-	  transmission bug.
+Fri Jun  7 07:15:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-Wed Apr 13 21:20:35 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* NEWS: fix style.
 
-	* configure.in (mingw32): extract msvcr*.dll from objdump result.
+Fri Jun  7 06:48:17 2013  Benoit Daloze  <eregontp@gmail.com>
 
-Wed Apr 13 20:24:30 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* numeric.c: remove unused ID id_to_r introduced in r41109.
 
-	* configure.in (mingw32): use actual runtime DLL name as ruby DLL
-	  name and default load path.
+Fri Jun  7 06:15:31 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/Makefile.sub, win32/setup.mak: ditto.
+	* bignum.c (rb_int_import): New function.
+	  (int_import_push_bits): Ditto.
 
-Tue Apr 12 15:33:09 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* internal.h (rb_int_import): Declared.
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): better modification than the
-	  previous commit [ruby-dev:26029].
+	* pack.c (pack_unpack): Use rb_int_import for BER compressed integer.
 
-Tue Apr 12 12:38:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Jun  6 22:24:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): fix SEGV when Tcl_GlobalEval()
-	  modifies the argument string to eval.
+	* numeric.c (num_quo): Use to_r method to convert the receiver to
+	  rational.  [ruby-core:41575] [Bug #5736]
 
-Tue Apr 12 02:21:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* test/ruby/test_numeric.rb: add a test for the above change.
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): add existence check of
-	  Tcl commands before calling Tcl_GlobalEval().
+Thu Jun  6 20:40:17 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Apr 11 23:47:21 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* configure.in: Invoke RUBY_REPLACE_TYPE for size_t.
+	  Don't invoke RUBY_CHECK_PRINTF_PREFIX for size_t to avoid conflict
+	  with RUBY_REPLACE_TYPE.
 
-	* lib/drb/drb.rb: [druby-ja:123] fix: When reference of my object is
-	  loaded, the object is tainted.
+	* internal.h (rb_absint_size): Declared.
+	  (rb_absint_size_in_word): Ditto.
+	  (rb_int_export): Ditto.
 
-	* test/drb/test_drb.rb: ditto.
+	* bignum.c (rb_absint_size): New function.
+	  (rb_absint_size_in_word): Ditto.
+	  (int_export_fill_dd): Ditto.
+	  (int_export_take_lowbits): Ditto.
+	  (rb_int_export): Ditto.
 
-Mon Apr 11 22:18:23 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* pack.c (pack_pack): Use rb_int_export for BER compressed integer.
 
-	* dir.c, file.c (lstat): avoid warnings for mingw.
+Thu Jun  6 19:31:33 2013  Tadayoshi Funaba  <tadf@dotrb.org>
 
-Mon Apr 11 20:11:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/date/date_core.c: fixed coding error [ruby-core:55337].
+	  reported by Riley Lynch.
 
-	* ext/tcltklib/tcltklib.c (ip_finalize): adhoc patch to avoid SEGV
-	  when exit on Tcl/Tk8.3.x.
+Thu Jun  6 14:16:37 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-Mon Apr 11 15:26:25 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/objspace/object_tracing.c: rename allocation_info to
+	  lookup_allocation_info. At times I confused "struct
+	  allocation_info" with "function allocation_info".
 
-	* lib/mkmf.rb (configuration): shouldn't output hdrdir twice.
+Thu Jun  6 13:57:06 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-Mon Apr 11 12:09:05 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* ext/objspace/object_tracing.c: allocation_info function isn't
+	  called by any other file.
 
-	* {bcc32,win32,wince}/Makefile.sub: ri data was not installed
-	  into correct path. [ruby-dev:26011]
+Thu Jun  6 09:41:00 2013  Kenta Murata  <mrkn@cookpad.com>
 
-	* bcc32/Makefile.sub: defaulted install-nodoc. [ruby-dev:26011]
+	* numeric.c (num_quo): should return a Float for a Float argument.
+	  [ruby-dev:44710] [Bug #5515]
 
-Sun Apr 10 10:12:42 2005  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+	* test/ruby/test_fixnum.rb: Add an assertion for the above change.
 
-	* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
-	  to VT_EMPTY.
+	* test/ruby/test_bignum.rb: ditto.
 
-	* ext/win32ole/win32ole/tests/testWIN32OLE.rb: correct error
-	  message string "Unknown" => "unknown".
+Thu Jun  6 00:59:44 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-Sat Apr  9 18:20:31 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (gc_mark): get rid of pushing useless objects.
+	* gc.c (rgengc_rememberset_mark): bypass gc_mark() in order to push
+	  sunny old object at minor gc.
+	* gc.c (gc_mark_children): move sunny old check to gc_mark().
+	* gc.c (rgengc_check_shady): remove DEMOTE that already unnecessary.
+	* gc.c (rb_gc_writebarrier): ditto.
 
-	* ext/tk/lib/tk/image.rb: support to create TkImage object without
-	  creating a new image object on Tk.
+	  change sunny old check point in order to save mark stack and
+	  remove unnatural rest_sweep & demote.
 
-	* ext/tk/lib/tk/menu.rb: use TkCommandNames on create_self()
+Thu Jun  6 00:52:42 2013  Masaya Tarui  <tarui@ruby-lang.org>
 
-	* ext/tk/lib/tk/root.rb: TkRoot.to_eval() returns '.'.
+	* gc.c (rgengc_rememberset_mark): change scan algorithm for performance:
+	  from object's pointer base to bitmap one.
 
-	* ext/tk/lib/tk/text.rb: add methods to create a TkText::IndexString
-	  from (x, y) coords.
+Thu Jun  6 00:30:04 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/tile/: add demo and update support status.
+	* win32/win32.c (NET_LUID): define it on MinGW32.
+	  mingw-w64 has NET_LUID but mingw32 (mingw.org) still doesn't have
+	  NET_LUID. reported by taco on IRC
 
-Sat Apr  9 14:42:29 2005  Kouhei Sutou  <kou@cozmixng.org>
+Thu Jun  6 00:05:08 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* sample/rss/tdiary_plugin/rss-recent.rb: supported configuration
-	  via Web browser.
+	* string.c (String#b): Allow code range scan to happen later so
+	  ascii_only? on a result string returns the correct value.
+	  [ruby-core:55315] [Bug #8496]
 
-Sat Apr  9 11:59:57 2005  Kouhei Sutou  <kou@cozmixng.org>
+Wed Jun  5 22:40:42 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/rss: backoported from HEAD.
+	* lib/net/imap.rb (capability_response): should ignore trailing
+	  spaces.  Thanks, Peter Kovacs.  [ruby-core:55024] [Bug #8415]
 
-	* lib/rss: refactored.
-	  - gave a name to 'x'.
-	  - undef_method -> remove_method for avoiding a warning in ruby 1.6.
+	* test/net/imap/test_imap_response_parser.rb: related test.
 
-	* lib/rss/parser.rb: @@setter -> @@setters.
+Wed Jun  5 21:17:08 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rss/parser.rb
-	  (RSS::BaseListener.register_uri)
-	  (RSS::BaseListener.uri_registered?)
-	  (RSS::BaseListener.install_get_text_element):
-	  swapped the first argument and the second argument.
+	* bignum.c (big_fdiv): Use nlz() instead of bdigbitsize().
+	  (bdigbitsize): Removed.
 
-	* lib/rss/taxonomy.rb: swapped the first argument and the second
-	  argument for RSS::BaseListener.install_get_text_element.
-	* lib/rss/image.rb: ditto.
-	* lib/rss/syndication.rb: ditto.
-	* lib/rss/dublincore.rb: ditto.
-	* lib/rss/parser.rb: ditto.
-	* lib/rss/1.0.rb: ditto.
-	* lib/rss/2.0.rb: ditto.
-	* lib/rss/0.9.rb: ditto.
-	* lib/rss/content.rb: ditto.
+Wed Jun  5 20:32:00 2013  Kenta Murata  <mrkn@cookpad.com>
 
-	* lib/rss/parser.rb
-	  (RSS::BaseListener.install_setter)
-	  (RSS::BaseListener.register_uri): changed fallback way.
+	* include/ruby/ruby.h: fix alignment in comment.
 
-	* lib/rss/parser.rb: added class name registry for complex model
-	  elements. (ex. have childlen elements, have some attributes and
-	  a child element and so on.)
+Wed Jun  5 20:05:29 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rss/dublincore.rb: supported multiple Dublin Core items.
-	* lib/rss/maker/dublincore.rb: ditto.
+	* random.c (int_pair_to_real_inclusive): Add a cast to BDIGIT.
+	  (random_load): Fix shift width for fixnums.
+	  Re-implement bignum extraction without ifdefs.
 
-	* lib/rss/maker/image.rb: supproted new Dublin Core API.
+Wed Jun  5 15:26:10 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rss/maker/base.rb: added default current_element implementation.
+	* gc.c (before_gc_sweep): don't optimize it to avoid segv on Ubuntu
+	  10.04 gcc 4.4.
+	  http://u32.rubyci.org/~chkbuild/ruby-trunk/log/20130527T190301Z.diff.html.gz
 
-	* lib/rss/trackback.rb (RSS::TrackBackUtils.new_with_value_if_need):
-	  moved to RSS::Utils.
+Wed Jun  5 09:46:46 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rss/utils.rb (RSS::Utils.new_with_value_if_need):
-	  moved from RSS::TrackBackUtils.
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_mkdir): add
+	  EACCES for Windows.
 
-	* lib/rss/maker/image.rb: fixed invalid argument of
-	  add_need_initialize_variable bug.
-	* lib/rss/maker/trackback.rb: ditto.
+Wed Jun  5 08:13:37 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rss/rss.rb (Hash#merge): added for ruby 1.6.
+	* bignum.c (rb_big_pow): Don't need to multiply SIZEOF_BDIGITS.
+	  Use nlz instead of bitlength_bdigit.
+	  (bitlength_bdigit): Removed.
 
-	* lib/rss/rss.rb (RSS::BaseModel.date_writer): changed to accept nil
-	  for date value.
+Wed Jun  5 07:14:18 2013  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* test/test_dublincore.rb: added tests for plural accessor and
-	  multiple Dublin Core items.
+	* ext/date/date_core.c (d_lite_cmp, d_lite_equal): simplified.
 
-	* test/test_setup_maker_1.0.rb: fixed swapped actual and expected
-	  values.
+Wed Jun  5 07:07:01 2013  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* test/rss/rss-assertions.rb (assert_multiple_dublin_core): added
-	  an assertion for testing multiple Dublin Core items.
+	* ext/date/date_core.c: fixed a bug [ruby-core:55295].  reported
+	  by Riley Lynch.
 
-	* test/rss/test_maker_dc.rb (test_rss10_multiple): added a test
-	  for making multiple Dublin Core items.
+Wed Jun  5 06:44:08 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* test/rss/test_maker_dc.rb (test_date): added a test for #date=
-	  and #dc_date=.
+	* lib/rubygems:  Update to RubyGems 2.0.3
 
-	* sample/rss/tdiary_plugin/rss-recent.rb:
-	  new option: @options['rss-recent.use-image-link']:
-	  use image as link instread of text if available.
+	* test/rubygems:  Tests for the above.
 
-	* sample/rss/tdiary_plugin/rss-recent.rb (RSS_RECENT_VERSION):
-	  0.0.5 -> 0.0.6.
+	* NEWS:  Added RubyGems 2.0.3 note.
 
-Fri Apr  8 20:17:48 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Jun  5 06:35:15 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/extmk.rb (extmake): hdrdir needs to be defined also in
-	  Config::CONFIG.
+	* doc/marshal.rdoc:  Add description of Marshal format.
 
-	* lib/mkmf.rb (configuration, create_makefile): get rid of recursive
-	  macro reference.
+Wed Jun  5 01:16:09 2013  Benoit Daloze  <eregontp@gmail.com>
 
-Fri Apr  8 18:26:56 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* array.c (Array#+): fix documentation example.
+	  Patch by Logan Serman. [Fixes GH-324]
 
-	* ext/openssl/ossl_ssl.c: add callbacks to OpenSSL::SSL::SSLContexts.
-	  - SSLContext#client_cert_cb=(aProc). it is called when a client
-	    certificate is requested by a server and no certificate was not
-	    set for the SSLContext. it must return an Array which includes
-	    OpenSSL::X509::Certificate and OpenSSL::PKey::RSA/DSA objects.
-	  - SSLContext#tmp_dh_callback=(aProc). it is called in key
-	    exchange with DH algorithm. it must return an OpenSSL::PKey::DH
-	    object.
+Wed Jun  5 00:21:54 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_set_ciphers): ignore the
-	  argument if it's nil.
+	* lib/irb/lc/ja/help-message: update help messages.
+	  following r41028. [ruby-dev:46707] [Feature #7510]
 
-	* ext/openssl/ossl_pkey.c
-	  (GetPrivPKeyPtr, ossl_pkey_sign): should call rb_funcall first.
-	  (DupPrivPKeyPtr): new function.
+Wed Jun  5 00:09:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_pkey_dh.c: add default DH parameters.
+	* marshal.c (r_object0): Generalize a round up expression.
+	  Use BDIGIT instead of int.
 
-	* ext/openssl/ossl_pkey.h: ditto.
+Tue Jun  4 23:44:02 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-Fri Apr  8 01:55:20 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* object.c (rb_Hash): fix docs. patched by Stefan Sch"ussler.
+	  [ruby-core:55299] [Bug #8487]
 
-	* ext/tk/sample/demos-{en,jp}/goldberg.rb: reduced window size.
-	  [ruby-dev:25992]
+Tue Jun  4 23:16:49 2013  Benoit Daloze  <eregontp@gmail.com>
 
-Thu Apr  7 23:58:40 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/irb/completion.rb: Use %w literal construction for long lists.
+	  Patch by Dave Goodchild. [Fixes GH-299]
 
-	* ext/extmk.rb (extmake): keep directory names in Makefile as macros.
+Tue Jun  4 23:08:42 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* lib/mkmf.rb (configuration, create_makefile): ditto.
+	* ext/objspace/objspace.c: improve wording and remove duplicated comment.
+	  Based on a patch by Dave Goodchild. [Fixes GH-299]
 
-	* lib/mkmf.rb (CXX_EXT): separate C++ extensions.
+Tue Jun  4 18:41:47 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Apr  7 17:43:25 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* bignum.c (bitlength_bdigit): Fix an off-by-one error.
 
-	* eval.c (rb_call0): "return" event hook should be always executed
-	  if event_hooks is set.  fixed: [ruby-core:04662]
-	  (backported from HEAD)
+Tue Jun  4 15:30:00 2013  Kenta Murata  <mrkn@cookpad.com>
 
-Mon Apr  4 23:17:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/bigdecimal/lib/bigdecimal/util.rb (Float#to_d): fix the number
+	  of figures.  Patch by Vipul A M <vipulnsward@gmail.com>.
+	  https://github.com/ruby/ruby/pull/323  fix GH-323
 
-	* ext/tk/lib/tk.rb (TkComm#array2tk_list): accept enc-mode argument to
-	  decide whether convert encoding of each element or not.
+	* test/bigdecimal/test_bigdecimal_util.rb: fix for the above change.
 
-	* ext/tk/lib/tk/variable.rb (TkVariable#value=): fail to convert the
-	  encoding of array elements when assign an array to an TkVariable
-	  object.
+Tue Jun  4 00:44:27 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Mon Apr  4 10:26:48 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* test/fileutils/test_fileutils.rb (TestFileUtils#test_mkdir): add
+	  EEXIST for Linux. (suggested by nurse)
 
-	* ext/tk/lib/tk/dialog.rb: fixed typo.
+Mon Jun  3 23:58:19 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Sun Apr  3 17:16:33 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/fileutils.rb (FileUtils.rmdir): use remove_tailing_slash.
+	* test/fileutils/test_fileutils.rb: test for above.
 
-	* win32/win32.{h,c} (rb_w32_fdopen): avoid warning on bcc32.
-	  (backported from HEAD)
+Mon Jun  3 23:47:55 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Apr  2 23:38:54 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (bitlength_bdigit): New function.
+	  (rb_big_pow): Use bitlength_bdigit instead of ffs.
 
-	* configure.in (CP, INSTALL): get rid of less portable options.
+Mon Jun  3 23:11:19 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-	* lib/mkmf.rb (configuration, create_makefile): correct configuration
-	  variable.
+	* lib/fileutils.rb: fix behavior when mkdir/mkdir_p accepted "/".
+	* test/fileutils/test_fileutils.rb: add test for above change.
+	  Patched by Mitsunori Komatsu. [GH-319]
 
-	* {bcc32,win32,wince}/{Makefile.sub,setup.mak}: leave prefix empty in
-	  config.status for backward compatibility.  fixed: [ruby-core:04649]
+Mon Jun  3 19:02:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (create_makefile): ensure library directories get made
-	  before copying libraries there.
+	* dir.c (is_hfs): use the file descriptor instead of a path.
 
-Sat Apr  2 16:59:46 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Jun  3 07:15:17 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/tk/lib/tk.rb: forgot to update RELEASE_DATE
+	* configure.in: removes AC_CHECK_FUNCS(readdir_r). readdir_r()
+	  is only used from dir.c and it doesn't need readdir_r().
+	* configure.in (SIZEOF_STRUCT_DIRENT_TOO_SMALL): removed. It is
+	  only used for readdir_r.
+	* dir.c: removes NAME_MAX_FOR_STRUCT_DIRENT. It is not right way
+	  to detect maximum length of path len. POSIX require to use
+	  fpathconf(). IOW, it might have lead to make a vulnerability
+	  using stack smashing. Moreover, readdir() works enough for our
+	  usage.
+	* dir.c (READDIR): removes an implementation which uses
+	  readdir_r() and parenthesize in a macro body correctly.
+	* dir.c (dir_read): removes IF_HAVE_READDIR_R(DEFINE_STRUCT_DIRENT
+	  entry), it is used only for readdir_r().
+	* dir.c (dir_each): ditto.
+	* dir.c (glob_helper): ditto.
 
-	* ext/tk/lib/tk/variable.rb: fix namespace trouble when autoloading
+	* dir.c (READDIR): removes entry and dp argument.
+	* dir.c (dir_read): adjust for the above change.
+	* dir.c (dir_each): ditto.
+	* dir.c (glob_helper): ditto.
 
-	* ext/tk/lib/tk/palette.rb: define Tcl variable 'tkPalette' as global
+Mon Jun  3 03:40:29 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/tk/lib/tk/dialog.rb: use array2tk_list method when calling
-	  Tk.ip_eval.
+	* vm_insnhelper.c (vm_yield_setup_block_args): partially revert r41019.
+	  The code is not useless.
 
-	* ext/tk/lib/tk/autoload.rb: add autoload entry 'TkDialogObj' and
-	  'TkWarningObj'
+Mon Jun  3 01:25:25 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-Sat Apr  2 02:19:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* test/socket/test_sockopt.rb: change test name. follow r41037.
 
-	* ext/tk/lib/tk.rb (TkWindow.initialize): accept 'without_creating'
-	  option without 'widgetname' option to allow creating a widget object
-	  which is used as an argument of Tcl/Tk's widget allocation commands.
+Mon Jun  3 01:08:43 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-	* ext/tk/lib/tk/image.rb (TkImage.initialize): accept 'imagename'
-	  option to create a image object by the given name.
+	* test/rinda/test_rinda.rb: rename functions introduced in r41009.
 
-Thu Mar 31 22:23:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Jun  2 23:33:42 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* lib/mkmf.rb (SRC_EXT): exclude just case different suffixes on case
-	  insensitive file system platforms.
+	* enc/trans/japanese_euc.trans, test/ruby/test_transcode.rb,
+	  tool/transcode-tblgen.rb: change EUC-JP-2004 to EUC-JIS-2004.
+	  This is follow up to changes in r41024.
 
-	* README.EXT, README.EXT.ja (Appendix C): utility functions.
+Sun Jun  2 22:44:42 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu Mar 31 14:15:44 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/socket/option.c: rename functions introduced in r41009
+	  s/ip/ipv4/g because they are ipv4 functions.
+	  (there's a policy that the name "ip" is for methods which supports
+	   both ipv4 and ipv6)
 
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should return
-	  value. [ruby-dev:25971]
+Sun Jun  2 16:15:29 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Mar 31 08:25:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* dln_find.c (dln_find_exe, dln_find_file): remove deprecated
+	  non-reentrant functions.
 
-	* common.mk (RUBYOPT): clear for the environment RubyGems installed.
+Sun Jun  2 15:04:35 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* common.mk (clean-local): keep $(PREP) files till distclean.
+	* lib/cgi/util.rb, lib/erb.rb: Use String#b [Feature #8394] by znz
 
-	* common.mk (check): do all tests.
+Sun Jun  2 14:10:21 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Thu Mar 31 06:00:20 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/irb/lc/help-message: Apply english updates for irb --help #7510
 
-	* ext/openssl/ossl_engine.c (ossl_engine_s_load): should not raise
-	  error even if the specified engine could not be loaded. (Dynamic
-	  engines don't have fixed name to load.)
+Sun Jun  2 12:03:58 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Thu Mar 31 00:18:27 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* range.c: Fix rdoc on Range#bsearch [Bug #8242] [ruby-core:54143]
 
-	* win32/ifchange.bat, win32/rm.bat: backported from HEAD.
+Sun Jun  2 02:08:37 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Mar 30 23:44:50 2005  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+	* enc/euc_jp.c: fix typo: the name of EUC-JIS-2004.
 
-	* Makefile.in, */Makefile.sub, */configure.bat,
-	  cygwin/GNUmakefile.in, common.mk, configure.in, ext/extmk.rb,
-	  lib/mkmf.rb, instruby.rb, runruby.rb: backport extout.
-	  [ruby-dev:25963]
+Sat Jun  1 23:17:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Wed Mar 30 17:41:48 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* vm_eval.c (rb_mod_module_eval): mention in docs that arguments passed
+	  to the method are passed to the block
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp#_create_console() method to
-	  create a Tcl/Tk's console window.
+Sat Jun  1 17:58:13 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/tk/lib/multi-tk.rb: support TclTkIp#_create_console() method.
+	* lib/set.rb (Set#freeze, taint, untaint): Save a "self" by
+	  utilizing super returning self, and add tests while at it.
 
-	* ext/tk/lib/remote-tk.rb: ditto.
+Sat Jun  1 17:24:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk/console.rb: ditto.
+	* compile.c (iseq_set_arguments): not a simple single argument if any
+	  keyword arguments exist.  [ruby-core:55203] [Bug #8463]
 
-	* ext/tk/lib/tk.rb: update RELEASE_DATE
+	* vm_insnhelper.c (vm_yield_setup_block_args): split single parameter
+	  if any keyword arguments exist, and then extract keyword arguments.
+	  [ruby-core:55203] [Bug #8463]
 
-	* ext/tk/sample/demo-*/check2.rb: use 'return' in the Proc object.
+Sat Jun  1 11:16:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/sample/tkextlib/**: ditto.
+	* error.c (rb_exc_new_cstr): rename from rb_exc_new2.
 
-Tue Mar 29 22:11:56 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* error.c (rb_exc_new_str): rename from rb_exc_new3.
 
-	* test/rinda/test_rinda.rb: use DRbObject.new_with instead of reinit.
-	  [ruby-dev:25961]
+Sat Jun  1 10:13:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Mar 28 23:40:40 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* string.c (rb_str_new[2-5], rb_{tainted,usascii}_str_new2),
+	  (rb_str_buf_new2): remove old interfaces.
 
-	* lib/drb/drb.rb: move method DRbObject#reinit to DRbObject.new_with.
-	  extract method DRbObject.prepare_backtrace. add DRb.regist_server,
-	  remove_server, fetch_server. change server in thread variable if
-	  in-proc server. [druby-ja:113]
+Sat Jun  1 08:00:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/drb/gw.rb: ditto.
+	* ext/zlib/zlib.c (gzfile_read, gzfile_read_all, gzfile_getc),
+	  (gzreader_gets): check EOF.  [ruby-core:55220] [Bug #8467]
 
-Mon Mar 28 20:43:34 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun  1 07:32:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/syck/rubyext.c: get rid of warnings caused by a bug of VC.
+	* bignum.c: Use BDIGIT type for hbase.
 
-Mon Mar 28 08:39:49 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Jun  1 02:37:35 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/iconv/iconv.c (iconv_create): Iconv::Failure requires 3
-	  arguments.  (pointed out by NaHi)
+	* ext/socket/option.c (sockopt_s_byte): constructor of the sockopt
+	  whose value's is byte.
 
-Sat Mar 26 22:51:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/socket/option.c (sockopt_byte): getter for above.
 
-	* ext/tk/lib/tk.rb (_callback_entry_class?): add for checking whether
-	  a class is available for a callback entry.
+	* ext/socket/option.c (inspect_byte): inspect for above.
 
-	* ext/tk/lib/tk.rb (after_cancel): add Tk.after_cancel(afterID) method.
+	* ext/socket/option.c (sockopt_s_ip_multicast_loop): constructor of
+	  the sockopt whose optname is IP_MULTICAST_LOOP.
 
-	* ext/tk/lib/tk.rb (array2tk_list): change from private module method
-	  of TkComm to public module method.
+	* ext/socket/option.c (sockopt_ip_multicast_loop): getter for above.
 
-	* ext/tk/lib/tk.rb (cget): add check that slot argument is not
-	  empty string.
+	* ext/socket/option.c (sockopt_s_ip_multicast_ttl): constructor of
+	  the sockopt whose optname is IP_MULTICAST_TTL.
 
-	* ext/tk/lib/tk.rb (configinfo): ditto.
+	* ext/socket/option.c (sockopt_ip_multicast_ttl): getter for above.
 
-	* ext/tk/lib/tk/itemconfig.rb (itemcget): add check that slot argument
-	  is not empty string.
+	* ext/socket/option.c (sockopt_inspect): use above.
 
-	* ext/tk/lib/tk/itemconfig.rb (itemconfiginfo): ditto.
+Sat Jun 01 01:50:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* ext/tk/lib/tk/entry.rb: add TkEntry#icursor and icursor= (alias of
-	  cursor and cursor= method).
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_power): use rb_dbl2big
+	  to convert a double value to a Bignum.
 
-	* ext/tk/lib/tk/font.rb: improve font treatment when the font name is
-	  empty string.
+Sat Jun  1 00:19:50 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/variable.rb: add :variable, :window and :procedure
-	  type.
+	* bignum.c (calc_hbase): Make hbase the maximum power of base
+	  representable in BDIGIT.
 
-	* ext/tk/lib/tk/variable.rb: improve treatment of array-type
-	  tkvariable.
+Fri May 31 23:56:13 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tkextlib/blt.rb: add commands for zooming.
+	* bignum.c (calc_hbase): Extracted from rb_big2str0.
 
-	* ext/tk/lib/tkextlib/blt/*: bug fix.
+Fri May 31 23:22:24 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and add methods
-	  to call TreeCtrl commands for bindings.
+	* bignum.c: Don't hard code SIZEOF_BDIGITS for log_base(hbase).
+	  (big2str_orig): hbase_numdigits argument added.
+	  (big2str_karatsuba): Ditto.
+	  (rb_big2str0): Calculate hbase_numdigits.
 
-	* ext/tk/sample/tkextlib/blt/*: new sample scripts.
+Fri May 31 17:57:21 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/tk/sample/tkextlib/treectrl/*: ditto.
+	* process.c: Improve Process::exec documentation
 
-Fri Mar 25 10:53:16 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri May 31 17:26:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in (WIN32_LEAN_AND_MEAN): removed because a lot of
-	  troubles.  [ruby-list:40721]
+	* vm_eval.c (rb_funcallv): add better names of rb_funcall2.
 
-Thu Mar 24 23:10:44 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_eval.c (rb_funcallv_public): ditto for rb_funcall3.
 
-	* lib/mkmf.rb (macro_defined?): try to compile for an old compiler
-	  which doesn't bail out at #error directive.  [ruby-dev:25818]
+Fri May 31 17:04:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (check_sizeof): refine logging messages.
+	* array.c (rb_ary_new_capa): add better names of rb_ary_new2.
 
-Thu Mar 24 03:57:48 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* array.c (rb_ary_new_from_args): ditto for rb_ary_new3.
 
-	* lib/webrick/utils.rb (WEBrick::Utils.create_listeners):
-	  - should raise ArgumentError if no port is specified.
-	  - even if the specified port is 0, all TCPServers should be
-	  initialized with the port given to the first one.
+	* array.c (rb_ary_new_from_values): ditto for rb_ary_new4.
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#initialize): if :Port
-	  parameter is 0, it should be updated with the port number which
-	  actually listened.
+Fri May 31 16:35:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Mar 23 00:35:10 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* configure.in (HAVE_ATTRIBUTE_FUNCTION_ALIAS): define to tell if
+	  alias attribute is available.
 
-	* test/ruby/test_settracefunc.rb (test_event): added tests for
-	  "class" and "end" and "raise".
+Fri May 31 16:03:23 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Mar 22 22:40:18 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* object.c, proc.c: s/call_seq/call-seq in rdoc. [Fixes GH-322]
 
-	* eval.c (rb_call0): check event_hooks instead of trace_func.
+Fri May 31 15:56:36 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Mar 22 17:30:44 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* ext/openssl/ossl_ssl.c: Add missing paren in rdoc [Fixes GH-321]
 
-	* eval.c (rb_add_event_hook): new function to add a hook function for
-	  interpreter events. (backported form HEAD)
+Fri May 31 11:58:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Mar 20 22:51:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_method.c (set_visibility): extract from rb_mod_public(),
+	  rb_mod_protected() and rb_mod_private().
 
-	* lib/mkmf.rb (mkmf_failed): check if Makefile is created without
-	  create_makefile.
+Thu May 30 19:47:42 2013  Yusuke Endoh  <mame@tsg.ne.jp>
 
-Sat Mar 19 23:48:10 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg,
+	  vm_callee_setup_arg_complex): consider a hash argument for keyword
+	  only when the number of arguments is more than the expected
+	  mandatory parameters.  [ruby-core:53199] [ruby-trunk - Bug #8040]
 
-	* misc/ruby-mode.el (ruby-expr-beg): returned true always.
-	  fixed: [ruby-list:40683]
+	* test/ruby/test_keyword.rb: update a test for above.
 
-Sat Mar 19 00:41:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu May 30 17:55:04 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/tk/lib/tk/font.rb: add some TkFont class methods to get font
-	  information without creating a TkFont object.
+	* process.c: RDoc on Process.spawn
 
-	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: bug fix and define some
-	  classes for components of Tk::TreeCtrl
+Thu May 30 00:08:14 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Mar 17 17:42:13 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (gc_profile_enable): rest_sweep() to finish last GC.
+	  Profiling record is allocated at first of marking phase.
+	  Enable at lazy sweeping may cause an error (SEGV).
 
-	* struct.c (make_struct): allow non local-id field
-	  names. [ruby-core:04575]
+Wed May 29 10:33:27 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* struct.c (inspect_struct): ditto.
+	* hash.c: fix WB bug.
+	  (1) Hash's key also needs WB.
+	  (2) callback parameter *key and *value of st_update() is not a
+	      storage of st_table itself (only local variable). So that
+	      OBJ_WRITE() is not suitable, especially for `!existing'.
+	      OBJ_WRITTEN() is used instead of OBJ_WRITE().
 
-Wed Mar 16 23:36:02 2005  Shugo Maeda  <shugo@ruby-lang.org>
+Tue May 28 12:31:21 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_call0): call_cfunc() should be protected.
+	* ext/objspace/object_tracing.c: fix a bug reported at
+	  "[ruby-core:55182] [ruby-trunk - Bug #8456][Open] Sugfault in Ruby Head"
+	  Care about the case TracePoint#path #=> `nil'.
 
-	* test/ruby/test_settracefunc.rb: added test for c-return.
+	* ext/objspace/object_tracing.c: add two new methods:
+	  * ObjectSpace.allocation_class_path(o)
+	  * ObjectSpace.allocation_method_id(o)
+	  They are not useful for Object.new because they are always
+	  "Class" and :new.
+	  To trace more useful information, we need to maintain call-tree
+	  using call/return hooks, which is implemented by
+	  ll-prof <http://sunagae.net/wiki/doku.php?id=software:llprof>
 
-Wed Mar 16 22:20:25 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* test/objspace/test_objspace.rb: add a test.
 
-	* object.c (str_to_id): fixed typo.
+Tue May 28 11:30:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Mar 16 18:08:32 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb (extmake): leave makefiles untouched if the content is
+	  not changed, to get rid of unnecessary re-linking.
 
-	* eval.c (rb_call0): reorganize "return" event post.
+Tue May 28 03:11:02 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Mar 15 23:49:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/objspace/gc_hook.c, ext/objspace/objspace.c: add new methods to
+	  hook GC invocation.
+	  * ObjectSpace.after_gc_start_hook=(proc)
+	  * ObjectSpace.after_gc_end_hook=(proc)
 
-	* ext/iconv/iconv.c (Init_iconv): InvalidEncoding also should include
-	  Iconv::Failure.
+	  Note that hooks are not kicked immediately. Procs are kicked
+	  at postponed_job.
 
-Tue Mar 15 16:38:11 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	  This feature is a sample of new internal event and
+	  rb_postponed_job API.
 
-	* ext/tk/tkutil.c (ary2list): give wrong arguments to hash2kv()
+Tue May 28 02:56:15 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Mar 14 19:39:33 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (gc_stat): remove wrong rest_sweep().
 
-	* ext/tk/lib/tk/timer.rb (TkTimer): forgot to clear @return_value
-	  when restarting
+Tue May 28 02:44:23 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/sample/cd_timer.rb: new sample of TkRTTimer
+	* gc.c (garbage_collect_body): fix GC_ENABLE_LAZY_SWEEP condition.
 
-Mon Mar 14 12:21:03 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c (GC_NOTIFY): move debug print location and use stderr instead
+	  of stdout.
 
-	* ext/tk/lib/tk/timer.rb (TkRTTimer): forgot to reset the callback
-	  time. So, 'continue' do all callbacks between 'stop' and 'continue'.
+Tue May 28 02:07:21 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Mar 14 08:14:56 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* vm_trace.c (rb_postponed_job_register_one): fix iteration bug.
 
-	* object.c (str_to_id): warn for NUL containing strings.
+	* ext/-test-/postponed_job/postponed_job.c,
+	  test/-ext-/postponed_job/test_postponed_job.rb: add a test.
 
-Mon Mar 14 00:13:49 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Tue May 28 00:34:23 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/timer.rb (TkRTTimer): correct calculation of offset
-	  value. get a little better accuracy.
+	* include/ruby/ruby.h, gc.c: add new internal event
+	  RUBY_INTERNAL_EVENT_GC_END. This event invokes at the end of
+	  after_sweep().
+	  Time chart with lazy sweep is:
+	    (1) Kick RUBY_INTERNAL_EVENT_GC_START
+	    (2) [gc_marks()]
+	    (3) [lazy_sweep()]
+	    (4) [... run Ruby program (mutator) with lazy_sweep() ...]
+	    (5) [after_sweep()]
+	    (6) Kick RUBY_INTERNAL_EVENT_GC_END
+	    (7) [... run Ruby program (mutator), and go to (1) ...]
+	  Time chart without lazy sweep (GC.start, etc) is:
+	    (1) Kick RUBY_INTERNAL_EVENT_GC_START
+	    (2) [gc_marks()]
+	    (3) [gc_sweep()]
+	    (4) [after_sweep()]
+	    (5) Kick RUBY_INTERNAL_EVENT_GC_END
+	    (6) [... run Ruby program (mutator), and go to (1) ...]
 
-	* ext/tk/sample/demos-en/widget: use a binding with no local variables
-	  when eval a sample script.
+	* ext/-test-/tracepoint/tracepoint.c,
+	  test/-ext-/tracepoint/test_tracepoint.rb: modify a test.
 
-	* ext/tk/sample/demos-en/bind.rb: ditto.
+Tue May 28 00:18:57 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/sample/demos-en/tcolor: ditto.
+	* vm_trace.c (rb_postponed_job_flush): remove a wrong comment.
 
-	* ext/tk/sample/demos-jp/widget: ditto.
+Mon May 27 22:09:33 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/sample/demos-jp/bind.rb: ditto.
+	* include/ruby/ruby.h (RHASH_SIZE): Add a cast to suppress a
+	  warning, comparison between signed and unsigned integer
+	  expressions [-Wsign-compare], on ILP32.
 
-	* ext/tk/sample/demos-jp/tcolor: ditto.
+Mon May 27 19:25:47 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Mar 13 10:04:17 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* include/ruby/ruby.h: rename RUBY_INTERNAL_EVENT_FREE to
+	  RUBY_INTERNAL_EVENT_FREEOBJ.
 
-	* test/rinda/test_rinda.rb: remove test_gc. [ruby-dev:25871]
+	* ext/-test-/tracepoint/tracepoint.c,
+	  ext/objspace/object_tracing.c,
+	  gc.c, vm_trace.c: catch up this change.
 
-Thu Mar 10 19:12:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon May 27 18:57:28 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tcltklib/tcltklib.c (lib_eventloop_ensure): mis-delete a timer
-	  handler when exit from a recursive called eventloop
+	* ext/objspace/objspace.c: support ObjectSpace.trace_object_allocations.
+	  Read the following test to know HOWTO.
+	  This feature is a sample of RUBY_INTERNAL_EVENT.
 
-	* ext/tk/lib/tk/timer.rb: new TkRTTimer class, which can works for a
-	  realtime operation
+	* test/objspace/test_objspace.rb: add a test.
 
-	* ext/tk/sample/tkrttimer.rb: sample of TkRTTimer class
+	* ext/objspace/object_tracing.c: ditto.
 
-	* ext/tk/lib/tk/textmark.rb: move  TkTextMark#+ and TkTextMark#- to
-	  TkText::IndexModMethods
+	* gc.c (rb_gc_count): add. This function returns GC count.
 
-	* ext/tk/lib/tk/text.rb: improve TkTextMark#+ and TkTextMark#-, and
-	  add them to TkText::IndexModMethods module
+	* internal.h: add decl. of rb_gc_count(). Same as `GC.count'.
 
-	* ext/tk/sample/tktextio.rb: add test part of "seek by text index
-	  modifiers"
+Mon May 27 17:33:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Mar 10 08:10:11 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* tool/rbinstall.rb (install_recursive): add maxdepth option.
 
-	* re.c (make_regexp): need to free internal regexp structure when
-	  compilation fails.  [ruby-talk:133228]
+	* tool/rbinstall.rb (bin-comm): limit depth of bindir and reject empty
+	  files.  [ruby-core:55101] [Bug #8432]
 
-Wed Mar  9 20:25:58 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon May 27 16:16:18 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_write): call
-	  rb_sys_fail if errno isn't 0. [ruby-dev:25831]
+	* vm_trace.c (rb_postponed_job_flush, rb_postponed_job_register): use
+	  ruby_xmalloc/xfree. It is safe during GC.
 
-	* ext/openssl/lib/openssl/cipher.rb: fix typo. [ruby-dev:24285]
+Mon May 27 09:24:03 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Mar  9 15:46:35 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/-ext-/postponed_job/test_postponed_job.rb: fix typo and class name.
 
-	* lib/webrick/server.rb (WEBrick::GenericServer#start): should
-	  restore @token if accept failure. suggested by Dominique Brezinski.
-	  [ruby-core:04518]
+Mon May 27 09:05:17 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Mar  9 13:37:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* include/ruby/ruby.h, gc.c, vm_trace.c: add internal events.
+	  * RUBY_INTERNAL_EVENT_NEWOBJ: object created.
+	  * RUBY_INTERNAL_EVENT_FREE: object freed.
+	  * RUBY_INTERNAL_EVENT_GC_START: GC started.
+	  And rename `RUBY_EVENT_SWITCH' to `RUBY_INTERNAL_EVENT_SWITCH'.
 
-	* ext/tk/sample/tktextio.rb: fix bug of handling 'end' position.
-	  support initial text, overwrite setting and pos_gravity control.
+	  Internal events can not invoke any Ruby program because the tracing
+	  timing may be critical (under huge restriction).
+	  These events can be hooked only by C-extensions.
+	  We recommend to use rb_postponed_job_register() API to call Ruby
+	  program safely.
 
-Tue Mar  8 18:16:55 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	  This change is mostly written by Aman Gupta (tmm1).
+	  https://bugs.ruby-lang.org/issues/8107#note-12
+	  [Feature #8107]
 
-	* ext/tk/sample/tktextio.rb: New sample script. TkTextIO class in this
-	  sample supports to use a text widget as if it is a I/O stream (such
-	  like as StringIO class).
+	* include/ruby/debug.h, vm_trace.c: added two new APIs.
+	  * rb_tracearg_event_flag() returns rb_event_flag_t of this event.
+	  * rb_tracearg_object() returns created/freed object.
 
-Tue Mar  8 13:54:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/-test-/tracepoint/extconf.rb,
+	  ext/-test-/tracepoint/tracepoint.c,
+	  test/-ext-/tracepoint/test_tracepoint.rb: add a test.
 
-	* ext/socket/socket.c: workaround for some of 4.4BSD-Lite derived OSs.
+Mon May 27 08:38:21 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Mar  8 12:36:17 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/-test-/postponed_job/postponed_job.c: fix `init' function name.
 
-	* ext/socket/socket.c: document from Sam Roberts
-	  <sroberts@uniserve.com> for getsockopt and setsockopt is merged.
-	  [ruby-doc:824]
+Mon May 27 06:22:41 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Mar  8 01:27:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+	* include/ruby/debug.h, vm_trace.c: add rb_postponed_job API.
+	  Postponed jobs are registered with this API. Registered jobs
+	  are invoked at `ruby-running-safe-point' as soon as possible.
+	  This timing is completely same as finalizer timing.
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.66
-	  fixed: [ruby-dev:25828]
+	  There are two APIs:
+	  * rb_postponed_job_register(flags, func, data): register a
+	    postponed job with data. flags are reserved.
+	  * rb_postponed_job_register_one(flags, func, data): same as
+	    `rb_postponed_job_register', but only one `func' job is
+	    registered (skip if `func' is already registered).
 
-Mon Mar  7 21:35:02 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	  This change is mostly written by Aman Gupta (tmm1).
+	  https://bugs.ruby-lang.org/issues/8107#note-15
+	  [Feature #8107]
 
-	* sample/webrick/httpsd.rb: fix typo in comment. suggested by
-	  Kazuhiko Shiozaki.
+	* gc.c: use postponed job API for finalizer.
 
-Mon Mar  7 14:55:43 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* common.mk: add dependency from vm_trace.c to debug.h.
 
-	* eval.c (block_pass): should not push unique number if a block is
-	  not an orphan.  [ruby-dev:25808]
+	* ext/-test-/postponed_job/extconf.rb, postponed_job.c,
+	  test/-ext-/postponed_job/test_postponed_job.rb: add a test.
 
-Wed Feb 16 02:55:21 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* thread.c: implement postponed API.
 
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl, ossl_ssl_read,
-	  ossl_ssl_write):
-	  - need to set errno on Win32 platform.
-	  - should call rb_sys_fail instead of rasing SSLError if
-	    SSL_ERROR_SYSCALL occured.
-	  - should wait for that the underlying IO become readable or
-	    writable if the error was SSL_ERROR_WANT_READ or
-	    SSL_ERROR_WANT_WRITE. [ruby-dev:25795]
+	* vm_core.h: ditto.
 
-	* ext/openssl/lib/openssl/buffering.rb
-	  (Buffering#initialize): should set @eof and @rbuffer.
-	  (Buffering#fill_rbuff): should rescue Errno::EAGAIN.
-	  (Buffering#consume_rbuf): pointless eof flag resetting is deleted.
-	  (Buffering#read): should return an empty string if the specified
-	  size is zero.
-	  (Buffering#readpartial): new method.
-	  (Buffering#readline): fix typo.
-	  (Buffering#getc): return the first character of string correctly.
-	  (Buffering#each): fix typo.  suggested by Brian Ollenberger.
-	  (Buffering#readchar): fix typo.
-	  (Buffering#eof?): should read again it the input buffer is empty.
-	  (Buffering#do_write): should rescue Errno::EAGAIN.
-	  (Buffering#puts): use "\n" as the output field separator.
+Mon May 27 02:26:02 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/lib/openssl/ssl.rb: set non-blocking flag to the
-	  underlying IO.
+	* gc.c (gc_stat): collect promote_operation_count and
+	  types (RGENGC_PROFILE >= 2).
 
-	* ext/openssl/extconf.rb: get rid of GNUmakefile generation.
+Mon May 27 01:40:58 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* text/openssl/test_pair.rb: test for IO like methods.
+	* gc.c (gc_stat): collect shade_operation_count,
+	  remembered_sunny_object_count and remembered_shady_object_count
+	  for each types when RGENGC_PROFILE >= 2.
+	  They are informative for optimization.
 
-	* test/ruby/ut_eof.rb: test about empty file.
+Mon May 27 01:15:22 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Mar  7 10:22:06 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* hash.c (rb_hash_tbl_raw), internal.h: added.
+	  Returns st_table without shading hash.
 
-	* lib/un.rb: should use OptionParser. (backported form HEAD)
+	* array.c: use rb_hash_tbl_raw() for read-only purpose.
 
-Mon Mar  7 09:18:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* compile.c (iseq_compile_each): ditto.
 
-	* string.c (rb_str_cmp_m): should not return false but nil.
-	  fixed: [ruby-dev:25811]
+	* gc.c (count_objects): ditto.
 
-Mon Mar  7 01:22:14 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* insns.def: ditto.
 
-	* ext/tk/tkutil.c: remove the some codes which depend on the
-	  difference between Ruby1.8 and 1.9, because st.c on Ruby1.9
-	  was changed.
+	* process.c: ditto.
 
-Mon Mar  7 00:01:04 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* thread.c (clear_coverage): ditto.
 
-	* ext/tcltklib/tcltklib.c: fail to call TclTkLib.mainloop when $SAFE==4
+	* vm_insnhelper.c: ditto.
 
-Sun Mar  6 16:41:33 2005  Minero Aoki  <aamine@loveruby.net>
+Mon May 27 00:31:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/net/http.rb: HTTPHeader holds its header fields as an array
-	  (backport from CVS HEAD rev 1.112-1.123). [ruby-list:40629]
+	* tool/make-snapshot: use ENV["AUTOCONF"] instead of directly using
+	  literal "autoconf".
 
-	* test/net/http/test_httpheader.rb: new file.
+Sun May 26 21:31:46 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Mar  6 11:47:10 2005  Sam Roberts  <sroberts@uniserve.com>
+	* hash.c, include/ruby/ruby.h: support WB protected hash.
+	  * constify RHash::ifnone and make new macro RHASH_SET_IFNONE().
+	  * insert write barrier for st_update().
 
-	* lib/pp.rb: rdoced.  [ruby-core:4490]
+	* include/ruby/intern.h: declare rb_hash_set_ifnone(hash, ifnone).
 
-Sun Mar  6 11:36:37 2005  Tanaka Akira  <akr@m17n.org>
+	* marshal.c (r_object0): use RHASH_SET_IFNONE().
 
-	* lib/pp.rb (File::Stat#pretty_print): Etc.getpwuid and Etc.getgrgid
-	  may return nil.  [ruby-talk:129826]
-	  reported by Daniel Berger.
+	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): ditto.
 
-Sat Mar  5 18:06:21 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat May 25 23:22:38 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* dir.c (fnmatch): removed unnecessary code. (ruby_1_8 didn't have
-	  String#clear, so [ruby-dev:24749] didn't affect it)
+	* test/fiddle/test_c_struct_entry.rb,
+	  test/fiddle/test_c_union_entity.rb,
+	  test/fiddle/test_cparser.rb, test/fiddle/test_func.rb,
+	  test/fiddle/test_handle.rb, test/fiddle/test_import.rb,
+	  test/fiddle/test_pointer.rb: don't run test if the system
+	  don't support fiddle.
 
-	* win32/win32.c (NtInitialize): ditto. (by numeric.c 1.101.2.14)
+Sat May 25 21:29:34 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sat Mar  5 16:29:26 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/pty/pty.c (get_device_once): FreeBSD 10-current and 9-stable
+	  added O_CLOEXEC support to posix_openpt, so assume FreeBSD 9.2 or
+	  later supports it.
+	  http://www.freebsd.org/cgi/query-pr.cgi?pr=162374
 
-	* ext/tk/lib/multi-tk.rb: freeze callback-entry objects
+Sat May 25 18:46:23 2013  Yusuke Endoh  <mame@tsg.ne.jp>
 
-	* ext/tk/lib/tkextlib/tile.rb: support tile-0.6
+	* proc.c (rb_method_entry_min_max_arity): fix missing break in switch.
+	  This was introduced in r38236, which is not intentional apparently.
+	  This has caused no actual harm because VM_METHOD_TYPE_OPTIMIZED is
+	  not used except for OPTIMIZED_METHOD_TYPE_SEND, but may do in
+	  future.  Coverity Scan found this inadequacy.
 
-Fri Mar  4 19:39:28 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat May 25 18:08:06 2013  Yusuke Endoh  <mame@tsg.ne.jp>
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser#do_includes): replace
-	  also locally defined modules.
+	* dir.c (bracket): fix copy-paste error.  When the first and last
+	  characters of fnmatch range have different length, fnmatch may
+	  have wrongly matched a path that does not really match.
+	  Coverity Scan found this bug.
 
-	* ext/iconv/iconv.c: backport Iconv::InvalidEncoding from CVS HEAD.
+Sat May 25 17:06:25 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/strscan/strscan.c: moved misplaced rdoc.
+	* gc.c (after_gc_sweep): reduce full GC timing.
 
-Fri Mar  4 15:58:12 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat May 25 11:28:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/cgi-lib.rb: add deprecation warning. [ruby-dev:25499]
-	  getopts.rb, parsearg.rb, importenv.rb as well.
+	* variable.c (set_const_visibility): return without clearing method
+	  cache if no arguments.
 
-Fri Mar  4 11:17:06 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* vm_method.c (set_method_visibility): ditto.
 
-	* ext/tcltklib/tcltklib.c (ip_rbUpdateCommand): get rid of
-	  warnings with Tcl/Tk 8.3 or former (backport from CVS_HEAD).
+Sat May 25 11:27:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c (ip_rb_threadUpdateCommand): ditto.
+	* vm_method.c (set_method_visibility): quote unprintable method name.
 
-Fri Mar  4 10:15:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat May 25 11:24:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/set.rb (SortedSet::setup): a hack to shut up warning.
-	  [ruby-talk:132866]
+	* eval.c (rb_frame_callee): returns the called name of the current
+	  frame, not the previous frame.
 
-Fri Mar  4 07:07:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+	* eval.c (prev_frame_callee, prev_frame_func): rename and make static,
+	  as these are used by rb_f_method_name() and rb_f_callee_name() only.
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.63
+	* variable.c (set_const_visibility): use the called name.
 
-Thu Mar  3 23:49:00 2005  NARUSE, Yui  <naruse@ruby-lang.org>
+Sat May 25 08:58:23 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/nkf/nkf-utf8/nkf.c: follow nkf 1.62
+	* string.c (rb_str_quote_unprintable): check if argument is a string.
 
-Thu Mar  3 11:49:51 2005  Kouhei Sutou  <kou@cozmixng.org>
+Fri May 24 19:32:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-	* sample/rss/tdiary_plugin/rss-recent.rb: added site information.
+	* variable.c (set_const_visibility): use rb_frame_this_func() instead
+	  of rb_frame_callee() for getting the name of the called method
 
-Wed Mar  2 19:53:07 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_module.rb: add test for private_constant with no args
 
-	* ext/extmk.rb (parse_args): add DESTDIR only when not directed
-	  already.  fixed: [ruby-dev:25781]
+Fri May 24 18:53:10 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Mar  2 17:14:18 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* gc.c: do major/full GC when:
+	  * number of oldgen object is bigger than twice of
+	    number of oldgen object at last full GC.
+	  * number of remembered shady object is bigger than twice of
+	    number of remembered shady object at last full GC.
+	  * number of oldgen object and remembered shady object is bigger
+	    than half of total object space.
+	  (please fix my English!)
 
-	* ext/tcltklib/tcltklib.c (lib_eventloop_core): fix typo
+Fri May 24 17:07:00 2013  Charlie Somerville  <charliesome@ruby-lang.org>
 
-Wed Mar  2 16:00:02 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* intern.h: remove dangling rb_class_init_copy declaration
+	  [ruby-core:55120] [Bug #8434]
 
-	* ext/tcltklib/tcltklib.c: enforce thread-check and exception-handling
-	  to avoid SEGV trouble.
-	  [KNOWN BUG] When supports pthread and running multiple Tk
-	  interpreters, an interrupt signal causes SEGV frequently. That
-	  may be a trouble of Ruby's signal handler.
+Fri May 24 16:31:23 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/tk/tkutil/tkutil.c; fix a bug on converting a SJIS string array
-	  to a Tcl's list string.
+	* ext/strscan/strscan.c (strscan_aref): raise error if given
+	  name reference is not found.
 
-	* ext/tk/tcltklib.c: wrap Tcl's original "namespace" command to
-	  protect from namespace crash.
+Fri May 24 15:48:18 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/multi-tk.rb: enforce exception-handling.
+	* gc.c (after_gc_sweep, garbage_collect_body): do major GC (full GC)
+	  before extending heaps.
+	  TODO: do major GC when there are many old (promoted) objects.
 
-	* ext/tk/lib/multi-tk.rb: catch IRB_EXIT to work on irb.
+	* gc.c (after_gc_sweep): remove TODO comments.
 
-	* ext/tk/lib/tk.rb: ditto.
+Fri May 24 11:04:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/tcltklib.c: add TclTkLib.mainloop_thread?
+	* configure.in (LIBRUBY_RPATHFLAGS): do not append -L option with
+	  runtime library directory if cross compiling, but only -R option.
+	  runtime path makes no sense on the host system.  [ruby-dev:47363]
+	  [Bug #8443]
 
-	* ext/tk/lib/multi-tk.rb: (bug fix) callback returns a value.
+Fri May 24 02:57:17 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/canvas.rb (delete): bug fix when multiple arguments.
+	* object.c (rb_obj_clone): should not propagate OLDGEN status.
+	  This propagation had caused WB miss for class.
 
-	* ext/tk/lib/clock.rb: fix 'no method error'.
+Thu May 23 17:35:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/clock.rb (self.clicks): accept a Symbol argument.
+	* load.c (loaded_feature_path): fix invalid read by index underflow.
+	  the beginning of name is also a boundary as well as just after '/'.
 
-	* ext/tk/lib/variable.rb: be able to set default_value_type; :numeric,
-	  :bool, :string, :symbol, :list, :numlist or nil (default; same to
-	  :string). If set a type, TkVariable#value returns a value of the
-	  type.
+Thu May 23 17:21:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/tclx/tclx.rb: add Tk::TclX.signal to warn the
-	  risk of using TclX extension's 'signal' command.
+	* gc.c (gc_profile_dump_on): revert r40898.  ok to show the record
+	  accumulating while lazy_sweep().
 
-	* ext/tk/sample/irbtk.rb: irb with Ruby/Tk.
+Wed May 22 16:50:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/sample/demos-*/anilabel.rb: bug fix on 'show code'
+	* gc.c (gc_profile_dump_on): use size_t to get rid of overflow and
+	  show the header when next_index > 0, instead of next_index != 1.
 
-	* ext/tk/sample/demos-*/aniwave.rb: new Ruby/Tk animation demo.
+Wed May 22 15:18:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/sample/demos-*/pendulum.rb: ditto.
+	* win32/win32.c (setup_overlapped): check the error code in addition
+	  to the result of SetFilePointer() to determine if an error occurred,
+	  because INVALID_SET_FILE_POINTER is a valid value.
+	  [ruby-core:55098] [Bug #8431]
 
-	* ext/tk/sample/demos-*/goldberg.rb: ditto.
+	* win32/win32.c (setup_overlapped, finish_overlapped): extract from
+	  rb_w32_read() and rb_w32_write().
 
-	* ext/tk/sample/demos-*/widget: add entries of animation demos.
+Wed May 22 14:19:56 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Mar  1 00:47:43 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* gc.c (gc_prepare_free_objects, rest_sweep, lazy_sweep): fix position
+	  of `during_gc' setting.
 
-	* test/rinda/test_rinda.rb: backport from CVS_HEAD. use
-	  MockClock.sleep instead of Kernel.sleep [ruby-dev:25387]
+Wed May 22 07:36:08 2013  Koichi Sasada  <ko1@atdot.net>
 
-Tue Mar  1 00:34:24 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* gc.c (garbage_collect): all GC is start from garbage_collect()
+	  (or garbage_collect_body()). `garbage_collect()' accept additional
+	  two parameters `full_mark' and `immediate_sweep'.
+	  If `full_mark' is TRUE, then force it full gc (major gc), otherwise,
+	  it depends on status of object space. Now, it will be minor gc.
+	  If `immediate_sweep' is TRUE, then disable lazy sweep.
+	  To allocate free memory, `full_mark' and `immediate_sweep' should be
+	  TRUE. Otherwise, they should be FALSE.
 
-	* lib/rinda/tuplespace.rb (Rinda::TupleSpace): improved keeper thread.
+	* gc.c (gc_prepare_free_objects): use `garbage_collect_body()'.
 
-	* test/rinda/test_rinda.rb: ditto.
+	* gc.c (slot_sweep, before_gc_sweep, after_gc_sweep): add logging code.
 
-Mon Feb 28 11:42:23 2005  Ian Macdonald  <ian@caliban.org>
+Tue May 21 22:47:06 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* exception error messages updated.  [ruby-core:04497]
+	* ext/strscan/strscan.c (strscan_aref): support named captures.
+	  patched by Konstantin Haase [ruby-core:54664] [Feature #8343]
 
-Mon Feb 28 09:03:09 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May 21 21:48:44 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/socket/socket.c (Init_socket): add bunch of Socket
-	  constants.  Patch from Sam Roberts <sroberts@uniserve.com>.
-	  [ruby-core:04409]
+	* test/ruby/test_dir_m17n.rb (TestDir_M17N#test_entries_compose):
+	  Use #each instead of #map just for iteration.
 
-Wed Feb 23 15:04:32 2005  akira yamada  <akira@ruby-lang.org>
+Tue May 21 19:57:22 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/uri/generic.rb (split_userinfo): should split ":pass" into ""
-	  and "pass".  [ruby-dev:25667]
+	* ext/digest/lib/digest.rb (Digest::Class.file): Take optional
+	  arguments that are passed to the constructor of the digest
+	  class.
 
-Wed Feb 23 08:00:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May 21 17:21:12 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* array.c (rb_ary_s_create): no need for negative argc check.
-	  [ruby-core:04463]
+	* gc.c: remove gc_profile_record::is_marked. always true.
 
-	* array.c (rb_ary_unshift_m): ditto.
+Tue May 21 17:13:40 2013  Koichi Sasada  <ko1@atdot.net>
 
-Wed Feb 23 01:57:46 2005  Shugo Maeda  <shugo@ruby-lang.org>
+	* gc.c: fix to collect additional information for GC::Profiler.
+	  * major/minor GC
+	  * trigger reason of GC
 
-	* lib/net/imap.rb (initialize): handle certs correctly. Thanks,
-	  NABEYA Kenichi. (backported from CVS HEAD)
+	* gc.c (gc_profile_dump_on): change reporting format with
+	  added information.
 
-Tue Feb 22 07:25:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (gc_profile_record_get): return added information by
+	  :GC_FLAGS => array.
 
-	* parse.y (parser_yylex): identfier after dot must not be a variable.
+Tue May 21 16:45:31 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Feb 21 10:04:49 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c: GC::Profiler's sweeping time is accumulated all slot
+	  sweeping time. At lazy GC, GC::Profiler makes new record entry
+	  for each lazy_sweep(). In this change, accumulating all
+	  slot_sweep() time.
+	  And change indentation.
 
-	* {bcc32,win32,wince}/Makefile.sub (config.h): add fcntl.
+Tue May 21 16:29:09 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* win32/win32.[ch] (fcntl): ditto.
+	* common.mk (rdoc-bench): add a benchmark rule
+	  using RDoc. Generate all rdoc related files
+	  (same as `make rdoc') in temporary directory
+	  and remove them. Execution time, GC::Profiler
+	  and results of GC.stat are printed.
 
-	* win32/win32.c (rb_w32_connect): support nonblocking mode.
+	* tool/rdocbench.rb: added for `rdoc-bench'.
 
-	* ext/socket/socket.c (wait_connectable, ruby_connect): support
-	  nonblocking connect on various platforms.
-	  all changes are backported from CVS HEAD. [ruby-core:3154],
-	  [ruby-core:4364].
+Tue May 21 16:25:05 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sun Feb 20 00:48:48 2005  Tanaka Akira  <akr@m17n.org>
+	* gc.c (gc_profile_dump_on): `count' should be (int) because it
+	  can be negative number.
+	  And use pointer for `record' (don't copy).
 
-	* lib/open-uri.rb (URI::FTP#buffer_open): access mechanism
-	  re-implemented according to RFC 1738.
-	  reported by Guillaume Marcais.  [ruby-talk:131650]
+Tue May 21 03:11:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Feb 19 18:11:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* dir.c (dir_each): compose HFS file names from
+	  UTF8-MAC. [ruby-core:48745] [Bug #7267]
 
-	* lib/drb/drb.rb (DRbObject#respond_to?): take two arguments.
-	  [ruby-dev:25722]
+Tue May 21 03:08:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/drb/drbtest.rb: ditto.
+	* test/ruby/envutil.rb (assert_separately): require envutil in the
+	  child process too.
 
-Sat Feb 19 13:52:02 2005  Tanaka Akira  <akr@m17n.org>
+Tue May 21 03:07:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/open-uri.rb: call OpenSSL::SSL::SSLSocket#post_connection_check
-	  after connection is made.
+	* string.c (rb_str_conv_enc_opts): should infect.
 
-Sat Feb 19 01:32:03 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Mon May 20 22:24:45 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/bigdecimal/lib/bigdecimal/newton.rb: resolved LoadError.
-	  [ruby-dev:25685]
+	* lib/set.rb (Set#delete_if, Set#keep_if): Avoid blockless call of
+	  proc, which is not portable to JRuby.  Replace &method() with
+	  faster and simpler literal blocks while at it.
 
-	* ext/bigdecimal/sample/linear.rb: ditto.
+Mon May 20 22:00:31 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/bigdecimal/sample/nlsolve.rb: ditto.
+	* lib/e2mmap.rb: Format of E2MM documentation
 
-	* ext/bigdecimal/lib/bigdecimal/nlsolve.rb: removed because this file
-	  is sample script and same file exists in ext/bigdecimal/sample.
+Mon May 20 21:41:15 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Fri Feb 18 17:14:00 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/extmk.rb: nodoc this file
 
-	* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
-	  of StandardError class, not Exception class.  [ruby-core:04429]
+Mon May 20 20:43:32 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Thu Feb 17 20:11:18 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* lib/cmath.rb: Remove duplicate RDoc heading from overview
 
-	* lib/drb/drb.rb (DRbServer.default_safe_level): fix typo.
+Mon May 20 20:36:19 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Thu Feb 17 20:11:18 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/securerandom.rb: Update position of overview for RDoc
 
-	* test/digest/test_digest.rb: separate test case for each algorithms.
-	  [ruby-dev:25412]
+Mon May 20 19:33:55 2013  Benoit Daloze  <eregontp@gmail.com>
 
-Thu Feb 17 11:54:00 2005  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* math.c: improve and fix documentation of sin, tan and log
 
-	* lib/test/unit/collector.rb (collect_file): now deletes paths added
-	  to $LOAD_PATH instead of restoring it verbatim.
+Mon May 20 19:31:49 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* lib/test/unit/autorunner.rb (AutoRunner.run): fixed so that
-	  'ruby -rtest/unit -rtest1 -rtest2 -e0' will use the objectspace
-	  collector again. Also tried to simplify the calling convention.
+	* lib/logger.rb (Logger::Application): show namespace in documentation
 
-	* test/runner.rb: adjusted for new AutoRunner semantics.
+Mon May 20 11:50:12 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/test/unit.rb: ditto.
+	* lib/pp.rb: Revert part of r40834 and nodoc PP::ObjectMixin
+	  [ruby-core:55068]
 
-Thu Feb 17 04:21:47 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon May 20 10:40:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
-	  fixed: [ruby-core:04444]
+	* lib/webrick/htmlutils.rb (WEBrick::HTMLUtils#escape): replace HTML
+	  meta chars even in non-ascii string.  [Bug #8425] [ruby-core:55052]
 
-Thu Feb 17 00:09:45 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#{_escape,_unescape}):
+	  fix %-escape encodings.  [Bug #8425] [ruby-core:55052]
 
-	* test/drb/ignore_test_drb.rb: move TestDRbReusePort to new file
-	  [ruby-dev:25238]
+	* lib/webrick/httpservlet/filehandler.rb (set_dir_list): revert r20152
+	  partially and fix misuse of bytesize and regexp repetition operator.
 
-	* test/drb/test_drb.rb: add method DRbService.ext_service, move
-	  TestDRbReusePort to new file [ruby-dev:25238]
+Mon May 20 08:03:51 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* test/drb/test_drb.rb: ditto.
+	* lib/profiler.rb: Document Profiler__ methods
 
-	* test/drb/test_drbssl.rb: ditto.
+Mon May 20 08:02:13 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* test/drb/test_drbunix.rb: ditto.
+	* lib/tempfile.rb: nodoc Tempfile#inspect
 
-	* test/drb/ut_drb.rb: reduce sleep.
+Mon May 20 07:48:24 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Thu Feb 17 00:02:27 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/stringio/stringio.c: Correct position of method rdoc
 
-	* eval.c (is_defined): NODE_IASGN is an assignment.
+Mon May 20 07:27:41 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Wed Feb 16 23:34:30 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* math.c: RDoc formatting of Math core docs with domains and codomains
+	  Patch by @eLobato [Fixes GH-309]
 
-	* lib/drb/drb.rb: add lazy stop_service. ([druby-ja:109])
+Mon May 20 05:58:12 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/drb/extserv.rb: ditto.
+	* ext/bigdecimal/bigdecimal.c: Formatting for BigMath [Fixes GH-306]
+	  Based on a patch by @eLobato.
+	* ext/bigdecimal/lib/bigdecimal/math.rb: ditto
 
-Wed Feb 16 17:07:57 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon May 20 04:56:59 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/tk/tkutil.c: Follow the change of st.c (st_foreach)
-	  [ruby-list:40623].
-	  Sometimes mis-convert from a Ruby's Array of SJIS Strings, which
-	  includes some kind of SJIS characters, to a Tcl's UTF8 list string.
+	* lib/forwardable.rb: Forwardable examples in overview were broken
+	  Based on patch by @joem [Fixes GH-303] [Bug #8392]
 
-Mon Feb 14 23:58:17 2005  Kouhei Sutou  <kou@cozmixng.org>
+Mon May 20 03:35:26 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/rss/parser.rb (RSS::ListenerMixin::tag_end):
-	  fixed invalid namespace handling bug.
+	* lib/optparse.rb: nodoc OptionParser::Version and SPLAT_PROC
 
-Mon Feb 14 13:12:38 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon May 20 03:16:52 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/openssl/lib/openssl/ssl.rb
-	 (OpenSSL::SSL::SSLSocket#post_connection_check): new method.
+	* lib/pp.rb: Document PP::ObjectMixin [Fixes GH-312]
 
-Mon Feb 14 00:40:49 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun May 19 23:52:22 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-	* lib/drb/drb.rb (InvokeMethod.perform): pass DRb info to sub thread.
+	* test/webrick/test_htmlutils.rb: add test for WEBrick::HTMLUtils.
 
-	* test/drb/test_drb.rb (test_01_safe1_safe4_eval): fix test case.
+Sun May 19 23:12:07 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-Sun Feb 13 23:13:46 2005  Kouhei Sutou  <kou@cozmixng.org>
+	* encoding.c: document fix, change default script encoding.
+	  patched by @windwiny [Fixes GH-310]
 
-	* lib/rss/dublincore.rb (RSS::DublicCoreModel#date{,=}): added
-	  convenient methods.
+Sun May 19 17:29:07 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/rss/0.9.rb (RSS::Rss::Channel#date{,=}): ditto.
+	* lib/set.rb (Set#delete_if, Set#keep_if): Add comments.
 
-	* lib/rss/2.0.rb (RSS::Rss::Channel::Item#date{,=}): ditto.
+Sun May 19 11:37:36 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* test/rss/: added tests for the convenient methods.
+	* ext/fiddle/extconf.rb: ignore rc version of libffi to fix build failure.
 
-Sun Feb 13 22:43:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sun May 19 10:38:50 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/drb/drb.rb (DRbServer): add default_safe_level, safe_level,
-	  config[:safe_level] ([druby-ja:120])
+	* misc/ruby-electric.el (ruby-electric-delete-backward-char): Use
+	  delete-char instead of delete-backward-char, which is an
+	  interactive function.
 
-	* test/drb/test_drb.rb, ut_eval.rb, ut_safe1.rb: ditto.
+Sun May 19 03:59:29 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun Feb 13 16:56:52 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* string.c (str_scrub0): added for refactoring.
 
-	* lib/webrick/cgi.rb (WEBrick::CGI.start): should set reason-phrase
-	  to the value of status header field. ([ruby-dev:40617])
+Sun May 19 03:48:26 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sun Feb 13 00:52:33 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* lib/uri/common.rb (URI.decode_www_form): scrub string if decoded
+	  bytes are invalid for the encoding.
 
-	* lib/erb.rb (ERB::Util.h, u): make it module_function.
+Sun May 19 02:46:32 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Sat Feb 12 17:29:19 2005  Tanaka Akira  <akr@m17n.org>
+	* lib/set.rb (Set#delete_if, Set#keep_if): Make Set#delete_if and
+	  Set#keep_if more space and time efficient by avoiding to_a.
 
-	* lib/open-uri.rb (OpenURI.open_loop): send authentication only for
-	  the URI directly specified.
+Sun May 19 02:33:09 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Sat Feb 12 15:07:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* misc/ruby-electric.el (ruby-electric-setup-keymap): Make
+	  backquotes electric as well.  It was listed in
+	  ruby-electric-expand-delimiters-list but not activated.
 
-	* random.c (rand_init): suppress warning.
+	* misc/ruby-electric.el (ruby-electric-delete-backward-char):
+	  Introduce electric DEL that deletes what the previous electric
+	  command has input.
 
-Sat Feb 12 13:54:03 2005  Tanaka Akira  <akr@m17n.org>
+	* misc/ruby-electric.el (ruby-electric-matching-char): Make
+	  electric quotes work again at the end of buffer.
 
-	* lib/open-uri.rb: support https if the platform provides CA
-	  certificates.
+Sun May 19 01:39:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Feb 12 06:18:28 2005  URABE Shyouhei  <shyouhei@ice.uec.ac.jp>
+	* configure.in (setjmp-type): check if setjmpex() is really available.
+	  workaround for i686-w64-mingw32 which declares it but lacks its
+	  definition.
 
-	* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check.
-	  [ruby-dev:25675]
+	* include/ruby/defines.h: include setjmpex.h only if also setjmpex()
+	  is available.
 
-Fri Feb 11 17:40:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat May 18 23:57:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_x509store.c (ossl_x509store_set_default_paths):
-	  new method OpenSSL::X509::Store#set_default_paths.
+	* configure.in (setjmp-type): use setjmpex() on w64-mingw32 to get rid
+	  of -Wclobbered warnings.
 
-Fri Feb 11 11:33:53 2005  Tanaka Akira  <akr@m17n.org>
+	* include/ruby/defines.h: include setjmpex.h here becase setjmp.h is
+	  included from win32.h via intrin.h, winnt.h, and so on.
 
-	* lib/open-uri.rb (URI::HTTP#proxy_open): new option supported:
-	  :http_basic_authentication.
-	  suggested by Kent Sibilev.  [ruby-core:4392]
+Sat May 18 20:28:12 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Feb 11 06:30:07 2005  George Ogata  <g_ogata@optushome.com.au>
+	* ext/socket/mkconstants.rb (INTEGER2NUM): Make less comparisons.
 
-	* misc/ruby-mode.el: ignore parenthesis inside heredoc.
-	  [ruby-core:04415]
+Sat May 18 20:15:28 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Feb 11 04:54:13 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
+	* string.c (str_scrub_bang): add String#scrub!. [Feature #8414]
 
-	* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
+Sat May 18 16:59:52 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rdoc/generators/ri_generator.rb: ditto.
+	* ext/socket/mkconstants.rb (INTEGER2NUM): Renamed from INTEGER2VALUE.
 
-Thu Feb 10 11:14:17 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat May 18 16:57:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/Makefile.sub (COMMON_HEADERS): shouldn't include winsock2.h.
+	* ext/socket/mkconstants.rb (INTEGER2VALUE): Suppress a warning:
+	  comparison between signed and unsigned integer expressions
 
-	* ext/socket/extconf.rb (sockaddr_storage): remove workaround for
-	  mswin32.
+Sat May 18 16:38:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Feb 10 10:29:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* compile.c (iseq_compile_each): forward anonymous and first keyword
+	  rest argument one.  [ruby-core:55033] [Bug #8416].
 
-	* ext/curses/curses.c: don't need to check HAVE_WCOLOR_SET excluding
-	  window_color_set().
+Sat May 18 15:49:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Feb 10 00:47:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* vm_core.h (rb_vm_tag): move jmpbuf between tag and prev so ensure to
+	  be accessible.
 
-	* struct.c (make_struct): fixed: [ruby-core:04402]
+Sat May 18 11:05:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Feb  9 08:07:08 2005  Paul Duncan  <pabs@pablotron.org>
+	* enumerator.c (inspect_enumerator): use VALUE instead of mere char*
+	  by using rb_sprintf() and rb_id2str().
 
-	* ext/curses/curses.c (window_color_set): [ruby-core:04393]
+	* enumerator.c (append_method): extract from inspect_enumerator().
 
-Tue Feb  8 23:51:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat May 18 09:00:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/drb/drb.rb: reject :instance_eval, :class_eval, :module_eval
-	  [druby-ja:117]
+	* ext/socket/mkconstants.rb (INTEGER2VALUE): Use LONG2FIX if possible.
 
-Tue Feb  8 13:06:12 2005  Sam Roberts  <sroberts@uniserve.com>
+Sat May 18 00:38:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
-	  [ruby-talk:130092]
+	* ext/socket/mkconstants.rb: Convert integer constants bigger than int
+	  correctly.
 
-Tue Feb  8 09:30:01 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri May 17 22:02:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/cgi.rb (CGI::Cookie): [ruby-talk:130040]
+	* ext/socket/ifaddr.c: Use unsigned LONG_LONG to represent flags
+	  because SunOS 5.11 (OpenIndiana) defines ifa_flags as uint64_t.
 
-Tue Feb  8 00:19:02 2005  Tanaka Akira  <akr@m17n.org>
+Fri May 17 21:47:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/resolv.rb (Resolv::DNS::Name#subdomain_of?): new method.
-	  (Resolv::DNS::Name#inspect): ditto.
-	  Suggested by Sam Roberts.  [ruby-talk:129086]
+	* cont.c: Typo in constant MAX_MACHINE_STACK_CACHE from '..MAHINE..'
+	  patch by @schmurfy [Fixes GH-307]
 
-Mon Feb  7 10:06:30 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri May 17 19:18:24 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* object.c: [ruby-doc:818]
+	* misc/ruby-electric.el (ruby-electric-matching-char): Do not put
+	  a closing quote when the quote typed does not start a string, as
+	  in $', ?\' or ?\".
 
-Mon Feb  7 01:56:20 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri May 17 18:06:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* instruby.rb, rubytest.rb (srcdir): no longer embed srcdir into
-	  rbconfig.rb. (backported from CVS HEAD)
+	* configure.in: Consider error messages to find out version option of
+	  C compiler.
+	  The C compiler of Sun Studio C emits "Warning: Option -qversion
+	  passed to ld, if ld is invoked, ignored otherwise" and exit
+	  successfully.
 
-	* ext/socket/extconf.rb (sockaddr_storage): winsock2.h have the
-	  definition of struct sockaddr_storage, but socket.c doesn't
-	  include it because this version of ruby still has binary level
-	  compatibility with winsock1.
+Fri May 17 17:34:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (create_makefile): should support header files in
-	  depend file.
+	* gc.c (rb_gc_guarded_ptr): unoptimize on other compilers than gcc and
+	  msvc.
 
-Mon Feb  7 01:21:50 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri May 17 11:06:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/socket/extconf.rb: check if getaddrinfo() works fine only when
-	  wide-getaddrinfo option is not given.  fixed: [ruby-dev:25422]
+	* eval_intern.h (TH_PUSH_TAG): ensure jmpbuf to be accessible before
+	  pushing tag to get rid of unaccessible tag by stack overflow.
 
-	* lib/mkmf.rb ($extmk): check if under ext directory.
+Thu May 16 17:15:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/mkmf.rb (Logging.postpone): allow recursive operation.
+	* vm_eval.c (rb_catch_obj): add volatile to tag to prevent crash
+	  experimentally.
+	  http://www.rubyist.net/~akr/chkbuild/debian/ruby-trunk/log/20130515T133500Z.log.html.gz
 
-	* lib/mkmf.rb (try_constant): make sure if really a constant, reduce
-	  the number of times of compile.
+Thu May 16 16:19:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (have_macro, have_var, byte_order): new functions.
+	* win32/Makefile.sub (verconf.in): no longer used.
 
-	* lib/mkmf.rb (find_library): allow directory list with separators.
+	* win32/Makefile.sub (config.status): fix typo.
 
-	* lib/mkmf.rb (arg_config): manage provided configuration options.
+	* configure.in, template/verconf.h.in (RUBY_EXEC_PREFIX): fix for
+	  default prefix.
 
-	* lib/mkmf.rb (dir_config): accept arrays of directory names as
-	  default values.
+Thu May 16 13:12:27 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* mkconfig.rb: no longer embed srcdir and compile_dir into
+	* template/verconf.h.in: generate verconf.h from the template and
 	  rbconfig.rb.
 
-	* lib/mkmf.rb (create_makefile): fix unbalanced parens.
-
-Sun Feb  6 19:23:01 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (stack_extend): add prototype because VC++8 doesn't
-	  accept __declspec(noinline) with K&R style function definitions.
-	  (backported from CVS HEAD)
-
-Sun Feb  6 14:14:26 2005  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (new_with_hash): changed messages of exception.
-
-	* lib/date/format.rb (str[fp]time): undocumented conversion
-	  specifications %[1-3] are now deprecated.
-
-Sun Feb  6 12:20:11 2005  Akinori MUSHA  <knu@iDaemons.org>
-
-	* bignum.c (rb_big2ulong_pack): One too many arguments are passed
-	  to big2ulong().
-
-	* re.c (rb_reg_init_copy, rb_reg_initialize_m): One too many
-	  arguments are passed to rb_reg_initialize().
-
-Sun Feb  6 03:24:20 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Resource::TXT): multiple strings was not
-	  handled.
-	  (Resolv::DNS::Resource::TXT#strings): new method to return all
-	  strings.
-	  (Resolv::DNS::Message::MessageEncoder#put_string_list): new method.
-	  (Resolv::DNS::Message::MessageDecoder#get_string_list): ditto.
-	  based on [ruby-talk:129732] by Sam Roberts.
-
-Fri Feb  4 00:30:45 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss: supported Image module.
-	  http://web.resource.org/rss/1.0/modules/image/
-
-Thu Feb  3 23:42:36 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_close, strio_close_read, strio_close_write):
-	  should return nil instead of self as well as IO.  [ruby-dev:25623]
-
-	* ext/stringio/stringio.c (strio_extend, strio_putc): fill with zero
-	  extended portion.  [ruby-dev:25626]
-
-Wed Feb  2 23:52:53 2005  sheepman  <sheepman@tcn.zaq.ne.jp>
-
-	* ext/stringio/stringio.c (strio_truncate): should MEMZERO an extended
-	  part.  [ruby-dev:25618]
-
-Wed Feb  2 21:56:01 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::Element#convert): added.
-
-	* lib/rss/rss.rb: convert -> need_convert.
-
-	* lib/rss/1.0.rb: ditto.
-
-	* lib/rss/0.9.rb: ditto.
-
-	* lib/rss/2.0.rb: ditto.
-
-	* lib/rss/trackback.rb: ditto.
-
-Tue Feb  1 22:48:48 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb (DRb::DRbObject#respond_to?): check marshal_dump and
-	  _dump.
-
-Tue Feb  1 00:20:23 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (aix): fix linker flags on AIX.  [ruby-talk:125460]
-
-Mon Jan 31 13:33:21 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: add invalid namespace check
-
-	* ext/tk/lib/multi-tk.rb: add invalid_namespace? method
-
-	* ext/tk/lib/remote-tk.rb: ditto
-
-Mon Jan 31 10:29:18 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
-
-Sat Jan 29 09:42:12 2005  Sam Roberts  <sroberts@uniserve.com>
-
-	* lib/resolv.rb (Resolv::DNS::Resource::IN::SRV): Added RFC2782 SRV
-	  resource record for specifying location of services.
-
-Fri Jan 28 17:16:55 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf):
-	  parse options line for ndots option.
-	  (Resolv::Hosts#lazy_initialize): return self.
-	  (Resolv::DNS#lazy_initialize): ditto.
-	  (Resolv::DNS::Config#lazy_initialize): ditto.
-	  Suggested by Sam Roberts.
-
-Thu Jan 27 13:18:03 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* st.c (st_foreach): report success/failure by return value.
-	  [ruby-Bugs-1396]
-
-Thu Jan 27 00:15:29 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb (setup): support BSD-style
-	  directory group inheritance. (backport from HEAD, rev 1.32)
-
-	* test/fileutils/fileasserts.rb (assert_same_entry): show entry
-	  difference. (backport from HEAD, rev 1.4)
-
-Wed Jan 26 23:09:11 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb (WriteAdapter#puts): should append \n, not
-	  prepend. [ruby-talk:128302] (backport from HEAD, rev 1.75)
-
-Wed Jan 26 10:51:50 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (flock_winnt, flock_win95): unlock file even if
-	  LOCK_NB is specified. (backported from CVS HEAD)
-
-Tue Jan 25 17:11:51 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ruby.c (proc_options): correct -T option in RUBYOPT. (backported
-	  from CVS HEAD)
-
-Tue Jan 25 14:05:52 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fix SEGV bug; trouble on canceling remained
-	  after scripts [ruby-dev:25479]: NULL current namespace when deleting
-	    Tk interpreter [ruby-talk:126225]
-
-	* ext/tcltklib/extconf.rb: bug fix; TCL_ENABLE_THREAD flag is inverted
-	  [ruby-talk:126360]
-
-	* ext/tcltklib/extconf.rb: add yet another native-thread check
-
-	* ext/tk/tkutil.c: fix SEGV bug; NULL string pointer when finalize
-	  Ruby interpreter
-
-	* ext/tk/lib/multi-tk.rb: avoid warning for deleted safeTk ip frame
-
-	* ext/tk/lib/tk/bindtag.rb: bug fix; new method of named bindtag
-	  doesn't return the created object [ruby-dev:25479]
-
-	* ext/tk/lib/tk/menu.rb: bug on treating arguments [ruby-dev:25479]
-
-	* ext/tk/lib/tk.rb: bug fix; cannot accept a callback ID string for
-	  a command argument [ruby-dev:25479]
-
-	* ext/tk/lib/multi-tk.rb: ditto
-
-	* ext/tk/lib/tk/*.rb: ditto
-
-	* ext/tk/lib/tkextlib/*.rb: ditto
-
-	* ext/tk/sample/demos-jp/anilabel.rb: new demo script
-
-	* ext/tk/sample/demos-en/anilabel.rb: ditto
-
-	* ext/tk/sample/tkHTML/ss.rb: local variable scope bug fix
-	  [ruby-dev:25479]
-
-Mon Jan 24 15:44:25 2005  Tilman Sauerbeck  <tilman@code-monkey.de>
-
-	* lib/rdoc/parsers/parse_c.rb: allow whitespace after function names.
-	  [ruby-core:4296]
-
-	* lib/rdoc/parsers/parse_simple.rb: adds support for private comments
-	  in the "simple" parser. [ruby-core:4301]
-
-Mon Jan 24 15:44:25 2005  Charles Mills  <cmills@freeshell.org>
-
-	* lib/rdoc/parsers/parse_c.rb: adds support for constants
-	  (rb_define_const), accessors (rb_define_attr), and makes a
-	  couple fixes. [ruby-core:4307]
-
-Mon Jan 24 15:44:25 2005  Florian Gro  <florgro@gmail.com>
-
-	* lib/rdoc/parsers/parse_rb.rb: Logic for def Builtin.method() end
-	  [ruby-core:4302]
-
-Mon Jan 24 15:44:25 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* document updates - [ruby-core:04296], [ruby-core:04301],
-	  [ruby-core:04302], [ruby-core:04307]
-
-Sun Jan 23 12:41:16 2005  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/wsdlDriver.rb: from 1.5.3-ruby1.8.2, operation which has
-	  capitalized name (such as KeywordSearchRequest in AWS) is defined as
-	  a method having uncapitalized name. (converted with
-	  GenSupport.safemethodname to handle operation name 'foo-bar').  it
-	  introduced serious incompatibility; in the past, it was defined as a
-	  capitalized.
-
-	  define capitalized method as well under that circumstance.
-
-Sun Jan 23 05:24:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_to_der): should call
-	  GetOCSPReq at first.
-
-Sat Jan 22 23:09:47 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/ssl.rb (accept): rescue SSLError. [druby-ja:110]
-
-Sat Jan 22 22:35:03 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/unix.rb: fail if UNIXFileOwner is set. [druby-ja:111]
-
-Fri Jan 21 23:58:42 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_set_pos): clear EOF flag.
-	  [ruby-talk:127511]
-
-Fri Jan 21 20:07:02 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Config.resolv): don't raise ResolvError.
-	  reported by Sam Roberts.  [ruby-talk:127133]
-
-Fri Jan 21 16:58:10 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (rb_push_glob): should work for NUL delimited patterns.
-
-Fri Jan 21 13:58:37 2005  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (u8tou16): fixed typo. fixed: [ruby-list:40546]
-	  (backported from CVS HEAD)
-
-Fri Jan 21 09:30:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* rubyio.h (rb_eof_error): should mark as NORETURN. (backported
-	  from CVS HEAD)
-
-Fri Jan 21 00:31:36 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/syck/rubyext.c (syck_parser_bufsize_set): avoid VC++ warning
-	  "local variable 'size' used without having been initialized".
-
-Thu Jan 20 19:03:24 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/extmk.rb (extmake): shouldn't set $extflags on mswin32.
-
-	* win32/Makefile.sub (LIBRUBY_SO): should use $DLDOBJS instead of
-	  $EXTOBJS.
-	  fixed: [ruby-core:04290] (backported from CVS HEAD)
-
-Thu Jan 20 11:42:02 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_new4): should propagate taintedness.
-
-	* struct.c (rb_struct_set): use original method name, not callee
-	  name, to retrieve member slot.  [ruby-core:04268]
-
-	* time.c (time_strftime): protect from format modification from GC
-	  finalizers.
-
-Wed Jan 19 18:06:40 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/ipaddr.rb (to_s, test_to_s): too many colons with some cases.
-	  (backported from CVS HEAD)
-
-Wed Jan 19 01:16:30 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb (Resolv::DNS::Config.parse_resolv_conf): ignore
-	  domain and search directive without an argument.
-	  reported by Sam Roberts.  [ruby-talk:126781]
-
-Tue Jan 18 15:03:05 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/ssl.rb (WEBrick::Config::SSL): the default value
-	  of :SSLEnable is false.
-
-	* lib/webrick/server.rb (WEBrick::Daemon.start): prepared stdio
-	  don't allow changing its mode.
-
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_service):
-	  should delete trailing LF from the result of pack("m*").
-
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
-	  - should delete trailing LF from the result of pack("m*").
-	  - clear Request-Line not to send the response by HTTPServer#run.
-
-	* lib/webrick/httputils (WEBrick::HTTPUtils.parse_qvalues):
-	  refine regexp (and change the name of a local variable).
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils#escape_path): add
-	  new method to escape URI path component.
-
-	* lib/webrick/cgi.rb (WEBrick::CGI::Socket#request_line): should
-	  escape SCRIPT_NAME and PATH_INFO before being parsed as a URI.
-
-	* test/webrick/*, sample/webrick/httpproxy.rb: add new file.
-
-Mon Jan 17 23:33:46 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (aix): fix typo.  [ruby-talk:126401]
-
-Mon Jan 17 07:08:51 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/readline/readline.c: suppress warnings.
-
-	* lib/irb/extend-command.rb (IRB::ContextExtender.def_extend_command):
-	  ditto.
-
-	* lib/irb/ext/history.rb (IRB::Context::set_last_value): ditto.
-
-	* lib/irb/ext/history.rb (IRB::Context::eval_history): ditto.
-
-	* lib/irb/locale.rb (IRB::Locale::real_load): ditto.
-
-	* lib/irb/slex.rb (SLex::Node::create_subnode): remove garbage.
-
-Mon Jan 17 00:09:42 2005  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/uri/common.rb (PORT): typo fix. fixed: [ruby-core:04256]
-
-Sat Jan 15 14:57:22 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (proc_options): ignore trailing CRs at the end of short
-	  options as well as long options.  fixed: [ruby-core:04232]
-
-Sat Jan 15 13:35:16 2005  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb (RSS::VERSION): 0.1.2 -> 0.1.3.
-
-	* lib/rss/rss.rb: accept inheritance. [ruby-talk:126104]
-
-Thu Jan 13 04:48:53 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (io_fread): don't warn nonblocking behavior by default.
-
-Wed Jan 12 00:36:29 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_class_superclass): superclass of singleton class also
-	  should be a singleton class.  fixed: [ruby-list:40519]
-
-Tue Jan 11 09:44:40 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* numeric.c (Init_Numeric): turn off floating point exceptions
-	  on bcc32. "1e300".to_f had crashed by overflow.
-
-Tue Jan 11 03:10:10 2005  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (copy_entry): could not copy symbolic link.
-	  [ruby-talk:125733]
-
-	* lib/fileutils.rb (copy_stream): use read/write instead of
-	  sysread/syswrite.
-
-Mon Jan 10 23:08:15 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_autoload): hide internal data from ruby level.
-	  fixed: [ruby-dev:25435], [ruby-list:40498]
-
-Mon Jan 10 01:22:55 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (rb_data_object_alloc): klass may be NULL.
-	  [ruby-list:40498]
-
-Sun Jan  9 03:12:58 2005  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (io_fread): warn nonblocking behavior.
-	  (io_readpartial): new method IO#readpartial.
-
-Sat Jan  8 04:38:47 2005  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml.rb: Kernel#y requires an argument.
-
-Fri Jan  7 21:12:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
-
-	* random.c (rand_init): use ALLOC_N instead of ALLOCA_N
-	  [ruby-dev:25426]
-
-Fri Jan  7 18:03:35 2005  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (mark_locations_array): avoid core dump with -O3.
-	  [ruby-dev:25424]
-
-Thu Jan  6 20:31:07 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/zlib/zlib.c (zstream_end): should return value. (backported
-	  from CVS HEAD)
-
-Thu Jan  6 19:55:13 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.c (rb_w32_close): didn't close socket handle.
-	  [ruby-dev:25414]
-
-	* win32/win32.c (rb_w32_open_osfhandle): bcc32's _open_osfhandle
-	  never set EMFILE.
-
-Thu Jan  6 17:14:31 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* random.c (random_seed): O_NONBLOCK isn't defined on some
-	  platforms. [ruby-dev:25417]
-
-Thu Jan  6 13:45:35 2005  Tanaka Akira  <akr@m17n.org>
-
-	* lib/time.rb: recognize +00:00 and GMT as a localtime.
-
-Thu Jan  6 07:58:28 2005  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/usage.rb (RDoc::RDoc.usage_no_exit): Allow for colons
-	  in path names on DOS machines. (thanks to Johan Nilsson)
-
-Wed Jan  5 20:16:32 2005  Tanaka Akira  <akr@m17n.org>
-
-	* random.c (limited_big_rand): didn't work if SIZEOF_BDIGITS == 2.
-	  [ruby-dev:25408]
-
-	* random.c (random_seed): refined.
-
-Wed Jan  5 12:49:39 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_initialize): Thread objects cannot be initialized
-	  again.  fixed: [ruby-core:04067]
-
-Wed Jan  5 10:48:16 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* dir.c (dir_s_mkdir): win32 special processing doesn't need any
-	  longer. (backported from CVS HEAD)
-
-	* win32/win32.[ch] (rb_w32_mkdir): new function. POSIX.1 compatible
-	  interface. (backported from CVS HEAD)
-
-	* win32/win32.[ch] (rb_w32_rmdir): new function. (backported from CVS
-	  HEAD)
-
-Wed Jan  5 02:30:11 2005  Tanaka Akira  <akr@m17n.org>
-
-	* random.c (init_by_array): imported from mt19937ar-cok.tgz.
-	  (genrand_int32): ditto.
-	  (genrand_real): replaced with genrand_res53 in mt19937ar-cok.
-	  (rand_init): support bignum for longer seed.
-	  (random_seed): generate longer seed.
-	  (make_mask): new function.
-	  (limited_rand): ditto.
-	  (limited_big_rand): ditto.
-	  (rb_f_rand): call limited_rand and limited_big_rand.
-	  [ruby-dev:25403]
-
-Tue Jan  4 23:25:29 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_rand): should return positive random number.
-	  [ruby-dev:25401]
-
-Tue Jan  4 11:15:29 2005  TAMURA Takashi  <sheepman@tcn.zaq.ne.jp>
-
-	* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
-	  random bignums.  [ruby-dev:25396]
-
-Mon Jan  3 14:01:54 2005  Tanaka Akira  <akr@m17n.org>
-
-	* random.c (random_seed): don't use /dev/urandom if it is not
-	  character device.
-
-Mon Jan  3 11:37:42 2005  Tanaka Akira  <akr@m17n.org>
-
-	* random.c (random_seed): use /dev/urandom if available.
-	  [ruby-dev:25392]
-
-Mon Jan  3 07:46:42 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpauth/htpasswd.rb (WEBrick::Htpasswd#reload):
-	  raise NotImplementedError if password is encrypted by digest
-	  algorithms. This patch is contributed by sheepman. [ruby-list:40467]
-
-	* lib/webrick/httpauth/digestauth.rb
-	  (WEBrick::HTTPAuth::DigestAuth#_authenticate): fix digest calculation.
-	  This patch is contributed by sheepman. [ruby-list:40482]
-
-	* lib/webrick/{httpauth.rb,httpauth/basicauth.rb,httpproxy.rb}: use
-	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
-	  encoding/decoding. fixed: [ruby-dev:25336]
-
-	* test/webrick/test_httpauth.rb: new file.
-
-Sat Jan  1 04:20:23 2005  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ns_spki.c (ossl_spki_set_challenge): should call
-	  StringValue before GetSPKI. fixed: [ruby-dev:25359].
-
-Sat Jan  1 01:13:28 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_autoload): [ruby-dev:25373]
-
-Fri Dec 31 14:10:43 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item): Fix problem
-	  if heading contains formatting.
-
-Thu Dec 30 00:41:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (svalue_to_avalue): [ruby-dev:25366]
-
-	* string.c (rb_str_justify): [ruby-dev:25367]
-
-Wed Dec 29 11:07:07 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/template/html/kilmer.rb: Update to use new
-	  sections.
-
-Tue Dec 28 22:31:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_justify): create buffer string after argument type
-	  conversion.  fixed: [ruby-dev:25341]
-
-Tue Dec 28 15:41:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c (reinit): should initialize all static
-	  variables.  fixed: [ruby-list:40445]
-
-Tue Dec 28 15:25:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/nkf/lib/kconv.rb (Kconv::RegexpEucjp): second byte is up to
-	  0xfe.
-
-	* ext/nkf/lib/kconv.rb (Kconv#kconv): should handle UTF8 and UTF16
-	  properly.
-
-Tue Dec 28 13:35:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate): ensure
-	  freeing internal zstreams.  fixed: [ruby-dev:25309]
-
-	* ext/zlib/zlib.c (rb_deflate_init_copy): replace rb_deflate_clone.
-
-Tue Dec 28 12:26:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub, win32/setup.mak (RDOCTARGET, install,
-	  install-nodoc, install-doc): rdoc support for mswin32.
-
-	* win32/configure.bat (--enable-install-doc, --disable-install-doc):
-	  ditto.
-
-Mon Dec 27 20:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fix SEGV bug when deleting Tk interp
-
-	* ext/tk/lib/multi-tk.rb: ditto
-
-Mon Dec 27 16:55:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): should use
-	  rb_hash_new to get exactly a Hash. fix [ruby-dev:25325].
-
-Mon Dec 27 16:29:56 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_justify): [ruby-dev:25341]
-
-Mon Dec 27 15:47:48 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/fileasserts.rb: sync with HEAD.
-
-	* test/fileutils/test_fileutils.rb: ditto.
-
-	* test/fileutils/test_nowrite.rb: ditto.
-
-Mon Dec 27 15:21:07 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mv): should raise error when moving a
-	  directory to the (empty) directory. [ruby-talk:124368]
-	  (backport from HEAD 1.48)
-
-	* lib/fileutils.rb (mv): wrongly did not overwrite file on Win32
-	  platforms. (backport from HEAD 1.48)
-
-Sat Dec 25 11:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* stable version 1.8.2 released.
-
-Sat Dec 25 04:23:49 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mkdir, mkdir_p): should ensure directory
-	  permission. (backportted from HEAD, 1.47)
-
-	* lib/fileutils.rb (traverse, remove_dir): untaint trasted
-	  objects. (backportted from HEAD, 1.46)
-
-Sat Dec 25 01:28:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c: cancel io_reopen() change on Dec. 24th.
-
-	* dln.c: use <dlfcn.h> for NetBSD.  [ruby-dev:25313]
-
-	* io.c (rb_f_select): IO list could be altered.  [ruby-dev:25312]
-
-Fri Dec 24 23:51:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
-	  [ruby-dev:25306]
-
-	* win32/win32.[ch]: ditto.
-
-Fri Dec 24 23:27:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
-
-Fri Dec 24 18:39:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
-	  [ruby-dev:25306]
-
-Fri Dec 24 02:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_reopen, rb_io_reopen): prohibit to change access mode for
-	  special IO ports.  [ruby-dev:25225]
-
-Fri Dec 24 02:22:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/rubyext.c (rb_syck_io_str_read): [ruby-core:03973]
-
-	* ext/syck/rubyext.c (syck_loader_transfer): check type conversion.
-
-	* ext/syck/rubyext.c (syck_parser_assign_io, rb_new_syck_node): duck
-	  typing.
-
-	* ext/syck/rubyext.c (syck_parser_s_alloc, syck_parser_initialize):
-	  allocation framework.
-
-	* ext/syck/rubyext.c (syck_emitter_s_alloc, syck_emitter_initialize):
-	  ditto.
-
-Fri Dec 24 01:21:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkextlib/blt.rb: add BLT extension support
-
-	* ext/tk/lib/tkextlib/blt/*.rb: ditto
-
-	* ext/tk/lib/tkextlib/blt/tile/*.rb: ditto
-
-Thu Dec 23 23:36:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (proc_setgroups): check if the argument lenght is
-	  modified.  fixed: [ruby-dev:25285]
-
-Thu Dec 23 13:13:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: define TclTkLib::COMPILE_INFO and
-	  RELEASE_DATE
-
-	* ext/tcltklib/extconf.rb: ditto
-
-	* ext/tk/tkutil.c: define TkUtil::RELEASE_DATE
-
-	* ext/tk/lib/tk.rb: define Tk::RELEASE_DATE
-
-Thu Dec 23 09:38:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_reopen): restore exact mode.  fixed: [ruby-core:04003]
-
-Thu Dec 23 00:16:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (bsdi): use $(CC) for LDSHARED.  fixed [ruby-dev:25270]
-
-Wed Dec 22 11:14:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_mode_modenum): replace O_ACCMODE with O_RDWR.
-	  fixed: [ruby-dev:25273]
-
-Wed Dec 22 08:34:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/dl/sym.c (rb_dlsym_initialize): extract internal pointers after
-	  all argument conversion.  fixed: [ruby-dev:25271]
-
-Wed Dec 22 00:08:01 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/*, test/soap/*, sample/soap/authheader/*: eval cleanup.
-
-Tue Dec 21 22:07:33 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
-	  ossl_asn1_decode_all): temporary value should be marked volatile.
-
-Tue Dec 21 14:40:02 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
-	  ossl_asn1_decode_all): use rb_str_new4 to avoid SEGV.
-	  fix [ruby-dev:25261]
-
-	* test/openssl/test_asn1.rb: add tests for OpenSSL::ASN1.
-
-Tue Dec 21 12:22:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (io_reopen): keep duplex pipe in correct mode for exception
-	  safeness.  fixed: [ruby-dev:25152]
-
-Tue Dec 21 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/grid.rb: rescue bug of 'grid configure' on Tcl/Tk8.3-
-
-Tue Dec 21 00:53:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.
-
-Mon Dec 20 23:22:26 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* added files:
-	  * lib/soap/mapping/wsdl*.rb
-	  * lib/wsdl/soap/element.rb
-	  * lib/wsdl/xmlSchema/simpleContent.rb
-
-	* modified files:
-	  * lib/soap/*
-	  * lib/wsdl/*
-	  * lib/xsd/*
-	  * test/soap/*
-	  * test/wsdl/*
-	  * test/xsd/*
-	  * sample/soap/*
-	  * sample/sdl/*
-
-	* summary
-	  * imported from the soap4r repository.  Version: 1.5.3-ruby1.8.2
-
-	  * added several XSD basetype support: nonPositiveInteger,
-	    negativeInteger, nonNegativeInteger, unsignedLong, unsignedInt,
-	    unsignedShort, unsignedByte, positiveInteger
-
-	  * HTTP client connection/send/receive timeout support.
-
-	  * HTTP client/server gzipped content encoding support.
-
-	  * improved WSDL schema definition support; still is far from
-	    complete, but is making step by step improovement.
-
-Mon Dec 20 22:56:39 2004  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (stack_end_address): gcc noinline attribute is available since
-	  gcc-3.1.
-
-Mon Dec 20 14:07:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: supports new features of Tcl/Tk8.5a2
-
-	* ext/tk/lib/tk/clock.rb: ditto
-
-	* ext/tk/lib/tk/text.rb: ditto
-
-	* ext/tk/lib/tk/panedwindow.rb: ditto
-
-Mon Dec 20 12:47:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/net/https.rb,protocols.rb,telnets.rb: delete
-	  doc and code about SSLContext#{key_file,cert_file}.
-	  fixed: [ruby-dev:25243]
-
-Mon Dec 20 12:42:17 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (io_fwrite): workaround for MSVCRT's bug.
-	  fixed: [ruby-core:03982]
-
-Mon Dec 20 11:21:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_eof): check if closed before clearerr().
-	  fixed: [ruby-dev:25251]
-
-Mon Dec 20 03:30:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session#initialize): empty session id was
-	  used if request had no session key.  fixed: [ruby-core:03981]
-
-Mon Dec 20 01:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (make_struct): [ruby-dev:25249]
-
-Mon Dec 20 00:28:20 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rexml/encodings/SHIFT-JIS.rb: backported from CVS HEAD.
-
-	* lib/rexml/encodings/SHIFT_JIS.rb: ditto.
-
-Sun Dec 19 17:19:48 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509store.c
-	  (ossl_x509store_set_time): add OpenSSL::X509::Store#time=.
-	  (ossl_x509stctx_set_time): add OpenSSL::X509::StoreContext#time=.
-
-	* test/openssl/ossl_x509store.rb: test certificate validity times.
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_s): add optional
-	  second argument to specify the output format (see also
-	  X509_NAME_print_ex).
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_init): new constants:
-	  OpenSSL::X509::Name::COMPAT, OpenSSL::X509::Name::RFC2253,
-	  OpenSSL::X509::ONELINE, OpenSSL::X509::MULTILINE.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name::RFC2253DN):
-	  new module to provide the parse for RFC2253 DN format.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name.parse_rfc2253):
-	  new method to parse RFC2253 DN format.
-
-	* test/openssl/ossl_x509name.rb: add tests about RFC2253 DN.
-
-	* text/openssl/ssl_server.rb: try to listen ports from 20443 to 20542
-	  while EADDRINUSE is raised.
-
-	* all changes in this entry are backport from 1.9.
-
-Sun Dec 19 17:24:59 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (enable_rpath): use rpath flag to embed the library
-	  path into extensions on ELF environment.  [ruby-dev:25035]
-
-Sun Dec 19 11:01:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit.rb: use standalone runner for -e.
-
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner#options): accept
-	  multiple -p and -x options.
-
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#recursive_collect):
-	  ditto.
-
-Sat Dec 18 16:36:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/zlib/zlib.c (rb_deflate_s_deflate, rb_inflate_s_inflate):
-	  disallow interrupt by type conversion.  fixed: [ruby-dev:25226]
-
-Sat Dec 18 15:16:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/webrick/httpauth.rb,
-	  lib/webrick/httpauth/{basicauth.rb,digestauth.rb}: use
-	  pack/unpack-template char "m" instead of lib/base64.rb to do base64
-	  encoding/decoding.
-
-Sat Dec 18 10:51:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_open_dir): new function.  [ruby-dev:25242]
-
-Fri Dec 17 18:07:01 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* test/readline/test_readline.rb: fix for BSD. Thanks, GOTOU Yuuzou.
-	  fixed: [ruby-dev:25218]
-
-Fri Dec 17 16:28:12 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: fix bug on setting up system encoding
-
-	* ext/tk/lib/tk/event.rb: fix error on require process
-
-	* ext/tk/lib/tk/font.rb: fix abnormal termination error on Windows
-
-	* ext/tk/lib/tk/virtevent.rb: TkVirtualEvent::PreDefVirtEvent.new()
-	  accepts event-sequence arguments
-
-	* ext/tk/lib/tk/text.rb: fail to dump embedded images
-
-	* ext/tk/lib/tk/text.rb: tag_nextrange and tag_prevrange returns wrong
-	  types of values
-
-	* ext/tk/lib/tk/texttag.rb: nextrange and prevrange returns wrong
-	  types of values
-
-	* ext/tk/lib/tk/text.rb: add TkText::IndexModMethods module and
-	  TkText::IndexString class to treat text index modifiers
-
-	* ext/tk/lib/tk/texttag.rb: use TkText::IndexModMethods module
-
-	* ext/tk/lib/tk/textmark.rb: ditto
-
-	* ext/tk/lib/tk/textimage.rb: ditto
-
-	* ext/tk/lib/tk/textwindow.rb: ditto
-
-	* ext/tk/lib/tk/textimage.rb: wrong gravity of text mark for embedded
-	  image
-
-	* ext/tk/lib/tk/textwindow.rb: wrong gravity of text mark for
-	  embedded window
-
-Fri Dec 17 13:50:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* vms/vmsruby_private.c, vms/vmsruby_private.h: private routines
-	  for VMS port are added.
-
-	* eval.c (ruby_init): change to call VMS private intialization routine.
-
-Fri Dec 17 13:33:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session#initialize): control adding
-	  session_id hidden fields.  fixed: [ruby-talk:123850]
-
-Thu Dec 16 23:25:25 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb, lib/drb/ssl.rb: backported from CVS HEAD.
-	  [druby-ja:101]
-
-	* test/drb/test_drb.rb: adjust and reduce sleep (backported from
-	  CVS HEAD.)
-
-Thu Dec 16 18:44:58 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): should wait
-	  for reading request till data arrive. [ruby-talk:121068]
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#start_thread):
-	  should log about all accepted socket. [ruby-core:03962]
-
-	* lib/webrick/accesslog.rb (WEBrick::AccessLog#setup_params):
-	  "%%" and "%u" are supported. [webricken:135]
-
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#check_filename):
-	  :NondisclosureName is acceptable if it is Enumerable.
-
-	* lib/webrick/config.rb (WEBrick::Config::FileHandler):
-	  default value of :NondisclosureName is [".ht*", "*~"].
-
-Thu Dec 16 18:36:52 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.c (ossl_raise): refine message format.
-
-Thu Dec 16 16:29:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/demos-en/widget: modify version check for
-	  supporting features
-
-Thu Dec 16 16:03:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/bindtag.rb: bug fix [ruby-talk: 123667]
-
-	* ext/tk/lib/tk/timer.rb: accept :idle for the interval argument
-
-	* ext/tk/lib/tk.rb: add TkComm._callback_entry?()
-
-	* ext/tk/lib/multi-tk.rb: add MultiTkIp.cb_entry_class
-
-	* ext/tk/lib/tk/canvas.rb: use TkComm._callback_entry?()
-
-	* ext/tk/lib/tk/canvastag.rb: ditto
-
-	* ext/tk/lib/tk/dialog.rb: ditto
-
-	* ext/tk/lib/tk/optiondb.rb: ditto
-
-	* ext/tk/lib/tk/text.rb: ditto
-
-	* ext/tk/lib/tk/texttag.rb: ditto
-
-	* ext/tk/lib/tk/textwindow.rb: ditto
-
-	* ext/tk/lib/tk/timer.rb: ditto
-
-	* ext/tk/lib/tk/validation.rb: ditto
-
-	* ext/tk/lib/tkextlib/*: ditto
-
-Thu Dec 16 03:14:28 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (basic_encode): return value of pack('m') may
-	  include multiple CR/LFs.  Backported from main trunk (rev 1.112).
-	  [ruby-dev:25212]
-
-Thu Dec 16 00:33:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (Init_Hash): remove custom "hash" and "eql?".
-
-Wed Dec 15 18:57:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/set.rb (Set::eql): wrong definition.  [ruby-dev:25207]
-
-Wed Dec 15 18:48:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/curses/curses.c (window_subwin): call NUM2INT() before
-	  GetWINDOW(). (backported from CVS HEAD)
-
-Wed Dec 15 17:03:50 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.[ch] (rb_w32_isatty): new function to replace MSVCRT's
-	  isatty because it never sets errno. (backported from CVS HEAD)
-
-Wed Dec 15 15:39:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): avoid SEGV
-	  (rollback the previous commit).
-
-Wed Dec 15 16:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_obj_id_obsolete): warn always.
-
-	* eval.c (rb_enable_super): ditto.
-
-Wed Dec 15 15:31:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/set.rb (Set#==): [ruby-dev:25206]
-
-Wed Dec 15 14:22:10 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_fdisset): check whether the handle is valid.
-	  fixed: [ruby-core:03959]
-
-Wed Dec 15 10:30:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/openssl/ossl_digest.c (ossl_digest_initialize): [ruby-dev:25198]
-
-Tue Dec 14 17:10:09 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_close): need to reset osfhnd().
-
-Tue Dec 14 14:03:57 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.c (ossl_raise): avoid buffer overrun.
-	  [ruby-dev:25187]
-
-Tue Dec 14 12:36:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session::initialize): generate new
-	  session if given session_id does not exist.  [ruby-list:40368]
-
-Mon Dec 13 18:13:52 2004  Tanaka Akira  <akr@m17n.org>
-
-	* gc.c (stack_end_address): new function to obtain stack end address.
-	  stack_end_address calls __builtin_frame_address(0) to obtain the
-	  frame pointer of a stack frame of stack_end_address.  The address
-	  is the stack pointer of the caller's stack frame.
-	  (SET_STACK_END): use stack_end_address.
-	  This makes the conservative garbage collector to scan a stack frame
-	  of the garbage_collect function itself.  This is required because
-	  callee-save registers may be stored in the frame.
-	  [ruby-dev:25158]
-
-Mon Dec 13 00:58:02 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (cleanpath_aggressive): make it private.
-	  (cleanpath_conservative): ditto.
-	  Suggested by Daniel Berger.  [ruby-core:3914]
-
-Sun Dec 12 20:06:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: backported from CVS HEAD.
-
-Sun Dec 12 10:35:10 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Don't
-	  show an accessor's r/w flag if none was specified
-
-Sun Dec 12 10:14:03 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb (RDoc::RDoc::parse_files): Never exclude files
-	  explicitly given on the command line.
-
-Sun Dec 11 23:54:07 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/*: update to support libraries in ActiveTcl8.4.12.0
-	  (see ext/tk/ChangeLog.tkextlib).
-
-	* ext/tk/sample/scrollframe.rb: add a new sample.
-
-Sat Dec 11 20:12:21 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: add DRbRemoteError. [ruby-list:40348],
-	  [ruby-list:40390]
-
-	* test/drb/drbtest.rb: ditto.
-
-	* test/drb/ut_drb.rb: ditto.
-
-Sat Dec 11 15:38:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/jcode.rb (String::succ): [ruby-dev:25156]
-
-Sat Dec 11 12:41:55 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (run_trap_eval): prototype; avoid VC++ warnings.
-
-	* ext/socket/getaddrinfo.c: fix typo. fixed: [ruby-core:03947]
-
-	* win32/win32.c: need to include dln.h.
-
-Sat Dec 11 00:10:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_reopen): [ruby-dev:25150]
-
-Fri Dec 10 08:39:27 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_listen): get OpenFile just before calling
-	  listen(2).  fixed: [ruby-dev:25149]
-
-Thu Dec  9 17:00:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* ext/socket/socket.c, ext/socket/getaddrinfo.c: port to VMS
-
-Thu Dec  9 16:31:02 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/sdbm/init.c (GetDBM): typo.
-
-Thu Dec  9 16:05:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* defines.h: change path of vms.h
-	* vms/vms.h: delete reference for snprintf()
-	* vms/config.h: new file
-	* vms/config.h_in: deleted
-
-Thu Dec  9 14:38:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_inspect): escape # which starts an expression
-	  substitution.  fixed: [ruby-core:03922]
-
-	* string.c (rb_str_dump): not escape # which isn't a substitution.
-
-Thu Dec  9 10:54:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dbm/dbm.c (fdbm_select): [ruby-dev:25132]
-
-	* ext/sdbm/init.c: ditto.
-
-	* ext/gdbm/gdbm.c: ditto.
-
-Thu Dec  9 03:08:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_init): set root-win title to "ruby" when
-	  the running script is '-e one-liner' or '-' (stdin).
-
-	* ext/tcltklib/extconf.rb: add find_library("#{lib}#{ver}",..) for
-	  stub libs
-
-	* ext/tk/lib/tk/textmark.rb: TkTextMarkCurrent and TkTextMarkAnchor
-	  have a wrong parent class.
-
-	* ext/tk/lib/tk/dialog.rb: rename TkDialog2 --> TkDialogObj and
-	  TkWarning2 --> TkWarningObj (old names are changed to alias names)
-
-	* ext/tk/lib/tk/dialog.rb: bug fix of treatment of 'prev_command'
-	  option and hashes for configuration
-
-	* ext/tk/lib/tk/dialog.rb: add TkDialogObj#name to return the
-	  button name
-
-	* ext/tk/lib/tk/radiobutton.rb: rename enbugged method value() ==>
-	  get_value() and value=(val) ==> set_value(val).
-
-	* ext/tk/lib/tk/menu.rb: add TkMenu.new_menuspec
-
-	* ext/tk/lib/tk/menu.rb: add alias (TkMenuButton = TkMenubutton,
-	  TkOptionMenuButton = TkOptionMenubutton)
-
-	* ext/tk/lib/tk/event.rb: new method aliases (same as option keys of
-	  event_generate) for Event object
-
-	* ext/tk/lib/tk/font.rb: configinfo returns proper types of values
-
-	* ext/tk/lib/tk.rb: bind methods accept subst_args + block
-
-	* ext/tk/lib/tk/canvas.rb: ditto
-
-	* ext/tk/lib/tk/canvastag.rb: ditto
-
-	* ext/tk/lib/tk/frame.rb: ditto
-
-	* ext/tk/lib/tk/text.rb: ditto
-
-	* ext/tk/lib/tk/texttag.rb: ditto
-
-	* ext/tk/lib/tk/toplevel.rb: ditto
-
-	* ext/tk/lib/tkextlib/*: ditto and bug fix
-
-Wed Dec  8 23:54:29 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Typo
-	  meant that h2 tag was invisible.
-
-Wed Dec  8 21:56:31 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss, test/rss, sample/rss: backported from CVS HEAD.
-
-Wed Dec  8 14:31:36 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_fwrite): change dereference for cosmetic reason.
-
-	* sprintf.c (rb_f_sprintf): [ruby-dev:25104]
-
-Tue Dec  7 19:08:00 2004  Akiyoshi, Masamichi  <akiyoshi@hp.com>
-
-	* io.c (io_fwrite): fix offset incrementation (for VMS and Human68k)
-
-Tue Dec  7 00:27:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_setgroups): [ruby-dev:25081]
-
-Mon Dec  6 18:08:10 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* re.c (rb_reg_eqq): document fix.  [ruby-talk:122541]
-
-Mon Dec  6 17:19:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* rubysig.h (TRAP_BEG, TRAP_END): safe errno around CHECK_INTS.
-	  (backported from CVS HEAD)  [ruby-dev:24993]
+Thu May 16 05:47:18 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-Mon Dec  6 10:18:17 2004  Dave Thomas  <dave@pragprog.com>
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix syntax error.
+	  Thanks @spastorino! [ruby-core:55011]
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in):
-	  Oops - 1.8 doesn't have String#clear
+Thu May 16 03:05:45 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Dec  6 09:59:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (rb_node_newnode): use newobj_of() instead of rb_newobj().
 
-	* ext/socket/socket.c (sock_connect): use rb_str_new4().
-	  [ruby-dev:25052]
+Thu May 16 02:03:39 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Dec  6 01:42:08 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/socket/depend: Add a dependency for ifaddr.o.
 
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
-	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
-	  ossl_rsa_private_decrypt): should take an optional argument
-	  to specify padding mode. [ruby-talk:122539]
+Thu May 16 01:44:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_pkey_rsa.c (Init_ossl_rsa): add new constants
-	  PKCS1_PADDING, SSLV23_PADDING, NO_PADDING and PKCS1_OAEP_PADDING
-	  under OpenSSL::PKey::RSA.
+	* common.mk (verconf.h): $< cannot be used in explicit rules with
+	  nmake.
 
-	* test/openssl/test_pkey_rsa.rb: new file.
+	* win32/Makefile.sub (CONFIG_H): create verconf.in instead of
+	  verconf.h.
 
-Sun Dec  5 19:39:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu May 16 01:25:07 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* lib/optparse.rb (OptionParser::Completion#complete): new parameter
-	  to direct case insensitiveness.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: only emit warnings when
+	  -w is enabled.
 
-	* lib/optparse.rb (OptionParser#order!): ignore case only for long
-	  option.  [ruby-dev:25048]
+Wed May 15 18:58:17 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sat Dec  4 22:54:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (newobj): rename to `newobj_of' and accept additional
+	  three parameters v1, v2, v3. newobj_of() do OBJSETUP() and
+	  fill values with v1, v2, v3.
 
-	* io.c (io_write): remove rb_str_locktmp().  [ruby-dev:25050]
+	* gc.c (rb_data_object_alloc, rb_data_typed_object_alloc):
+	  use newobj_of().
 
-	* io.c (io_fwrite): takes VALUE string as an argument.
-	  [ruby-dev:25050]
+Wed May 15 17:55:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/socket/socket.c (sock_connect): remove rb_str_locktmp().
-	  [ruby-dev:25050]
+	* configure.in (RUBY_PLATFORM): move to config.h as needed by
+	  version.c.
 
-	* ext/socket/socket.c (udp_connect): [ruby-dev:25045]
+Wed May 15 17:04:11 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/socket/socket.c (udp_bind): ditto.
+	* gc.c: add an additional RGENGC_PROFILE mode (2).
+	  Profiling result can be check by GC.stat.
 
-	* ext/socket/socket.c (udp_send): ditto.
+	* gc.c (type_name): separate from obj_type_name().
 
-	* ext/socket/socket.c (bsock_send): ditto.
+Wed May 15 16:58:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/socket/socket.c (s_recvfrom): ditto.
+	* configure.in: save configured load path values into verconf.in.
 
-	* hash.c (rb_hash_hash): should provide "hash" method where "eql?"
-	  is redefined.  [ruby-talk:122482]
+	* common.mk (verconf.h): create from verconf.in with shvar_to_cpp.rb.
 
-Sat Dec  4 14:54:52 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* tool/shvar_to_cpp.rb: turn shell variables into C macros.
+	  [Bug #7959]
 
-	* eval.c (proc_invoke): use volatile `tmp' rather than `args'.
-	  [ruby-core:03882]
+	* loadpath.c: split load path staffs from version.c.
 
-Sat Dec  4 14:28:56 2004  Dave Thomas  <dave@pragprog.com>
+	* dmyloadpath.c: miniruby has no builtin load paths, so verconf.h is
+	  not needed.
 
-	* lib/rdoc/code_objects.rb (RDoc::Context::Section::set_comment):
-	  Section comments may now be bracketed by lines which are
-	  ignored. You can now write
-	      # -----------
-	      # :section: Dave's Section
-	      # comment material
-	      # -----------
-	   The lines before :section: are removed, and identical lines at the end are
-	   also removed if present.
+Wed May 15 03:56:09 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-Sat Dec  4 03:33:45 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: adding backwards
+	  compatible YAMLTree.new method
 
-	* ext/readline/readline.c: check $SAFE. (backported from CVS HEAD)
+Wed May 15 02:22:16 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* test/readline/test_readline.rb: added tests for readline.
-	  (backported from CVS HEAD)
+	* ext/psych/lib/psych.rb: Adding Psych.safe_load for loading a user
+	  defined, restricted subset of Ruby object types.
+	* ext/psych/lib/psych/class_loader.rb: A class loader for
+	  encapsulating the logic for which objects are allowed to be
+	  deserialized.
+	* ext/psych/lib/psych/deprecated.rb: Changes to use the class loader
+	* ext/psych/lib/psych/exception.rb: ditto
+	* ext/psych/lib/psych/json/stream.rb: ditto
+	* ext/psych/lib/psych/nodes/node.rb: ditto
+	* ext/psych/lib/psych/scalar_scanner.rb: ditto
+	* ext/psych/lib/psych/stream.rb: ditto
+	* ext/psych/lib/psych/streaming.rb: ditto
+	* ext/psych/lib/psych/visitors/json_tree.rb: ditto
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ditto
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
+	* ext/psych/psych_to_ruby.c: ditto
+	* test/psych/helper.rb: ditto
+	* test/psych/test_safe_load.rb: tests for restricted subset.
+	* test/psych/test_scalar_scanner.rb: ditto
+	* test/psych/visitors/test_to_ruby.rb: ditto
+	* test/psych/visitors/test_yaml_tree.rb: ditto
 
-Sat Dec  4 02:24:00 2004  NARUSE, Yui  <naruse@ruby-lang.org>
+Wed May 15 02:06:35 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* ext/nkf/nkf.c: add constant NKF::VERSION
+	* test/psych/helper.rb: envutil is not available outside Ruby, so
+	  port the functions from envutil to the test helper.
 
-	* ext/nkf/nkf.c(guess): this becomes an alias of guess2
+	* test/psych/test_deprecated.rb: ditto
 
-	* ext/nkf/test.rb(mime_out2): add --no-cp932
+	* test/psych/test_encoding.rb: ditto
 
-	* ext/nkf/nkf-utf8/nkf.c: original nkf2 revision 1.47
+Wed May 15 00:42:54 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Dec  4 00:35:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* signal.c: need to include unistd.h for write(2).
+	  unistd.h is now included via ruby/defines.h, but should explicitly
+	  include here.  (suggested by kosaki)
 
-	* ext/socket/socket.c (bsock_setsockopt): [ruby-dev:25039]
+Tue May 14 23:43:05 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Dec  3 18:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/.document: Add ifaddr.c.
 
-	* lib/ostruct.rb: 1.9 marshaling support back-ported.
-	  [ruby-core:03871]
+Tue May 14 23:24:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Dec  3 13:45:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/extconf.rb: check for if_nametoindex() for
+	  i686-w64-mingw32, and check for declarations of if_indextoname() and
+	  if_nametoindex().
 
-	* eval.c (proc_invoke): copy arguments to frame.argv.
-	  [ruby-core:03861]
+	* ext/socket/ifaddr.c (ifaddr_ifindex): not-implement unless
+	  if_nametoindex() is available.
 
-Fri Dec  3 12:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/rubysocket.h: declare if_indextoname() and
+	  if_nametoindex() if available but not declared.
 
-	* st.h: fix prototypes.
+Tue May 14 19:58:17 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-Fri Dec  3 00:21:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/dl/lib/dl/func.rb (DL::Function#call): check tainted when
+	  $SAFE > 0.
+	* ext/fiddle/function.c (function_call): check tainted when $SAFE > 0.
+	* test/fiddle/test_func.rb (module Fiddle): add test for above.
 
-	* object.c (convert_type): use rb_respond_to() again.
-	  [ruby-dev:25021]
 
-	* eval.c (rb_respond_to): funcall respond_to? if it's redefined.
-	  [ruby-dev:25021]
+Tue May 14 14:51:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Dec  3 01:55:24 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* include/ruby/win32.h (INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX): split
+	  from intptr_t and uintptr_t, since VC9 defines the latter only in
+	  crtdefs.h.
 
-	* ext/tk/lib/tk.rb: widget configuration by TkWindow#method_missing
-	  returns proper object. "widget.option = val" returns val, and
-	  "widget.option(val)" returns self.
+Tue May 14 12:21:28 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/tk/lib/tk/font.rb: TkFont#replace accepts only one font argument.
+	* win32/win32.c (NET_LUID): mingw may have NET_LUID and not defined
+	  _IFDEF_.
 
-	* ext/tk/lib/tk/radiobutton.rb: add TkRadiobutton#value and
-	  TkRadiobutton#value=(val).
+Tue May 14 03:33:17 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/spinbox.rb: callback substitution support on
-	  command option.
+	* string.c (rb_str_new_frozen): remove debug print.
 
-	* ext/tk/sample/demos-en/widget: bug fix (wrong image height)
+Tue May 14 03:22:51 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/sample/demos-jp/widget: ditto.
+	* include/ruby/ruby.h: enable to generate write barrier protected
+	  arrays (T_ARRAY).
 
-Fri Dec  3 00:11:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May 14 03:21:42 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* io.c (rb_file_initialize): [ruby-dev:25032]
+	* include/ruby/ruby.h: enable to generate write barrier protected
+	  strings (T_STRING).
 
-Thu Dec  2 16:41:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 14 03:19:59 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (rb_protect): prevent continuations created inside from being
-	  called from the outside.  [ruby-dev:25003]
+	* include/ruby/ruby.h: enable to generate write barrier protected
+	  objects (T_OBJECT).
 
-	* eval.c (rb_callcc, rb_cont_call): prohibit calling from different
-	  signal contexts.  [ruby-dev:25022]
+Tue May 14 03:17:15 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Dec  2 09:57:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* include/ruby/ruby.h: enable to generate write barrier protected
+	  objects for numeric types (Float, Complex, Rational, Bignum).
 
-	* lib/ostruct.rb (OpenStruct::Marshaler): OpenStruct can be
-	  marshaled again.  [ruby-core:03862]
+Tue May 14 03:10:59 2013  Koichi Sasada  <ko1@atdot.net>
 
-Thu Dec  2 09:30:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/ruby.h: enable RGENGC (USE_RGENGC)
+	  but no type creates write protected (sunny) objects
+	  (RGENGC_WB_PROTECTED_* == 0).
 
-	* eval.c (thread_mark): mark thread group.  [ruby-dev:25020]
+Tue May 14 02:47:30 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* eval.c (thgroup_add): check whether the argument is really a Thread.
+	* gc.c: support RGENGC. [ruby-trunk - Feature #8339]
+	  See this ticket about RGENGC.
 
-Thu Dec  2 07:57:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c: Add several flags:
+	  * RGENGC_DEBUG: if >0, then prints debug information.
+	  * RGENGC_CHECK_MODE: if >0, add assertions.
+	  * RGENGC_PROFILE: if >0, add profiling features.
+	    check GC.stat and GC::Profiler.
 
-	* io.c (rb_io_ctl): [ruby-dev:25019]
+	* include/ruby/ruby.h: disable RGENGC by default (USE_RGENGC == 0).
 
-Wed Dec  1 02:21:02 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* array.c: add write barriers for T_ARRAY and generate sunny objects.
 
-	* signal.c (sighandler): call handler immediately only for default
-	  handlers.  [ruby-dev:25003]
+	* include/ruby/ruby.h (RARRAY_PTR_USE): added. Use this macro if
+	  you want to access raw pointers. If you modify the contents which
+	  pointer pointed, then you need to care write barrier.
 
-Tue Nov 30 23:38:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c, marshal.c, random.c: generate T_BIGNUM sunny objects.
 
-	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
+	* complex.c, include/ruby/ruby.h: add write barriers for T_COMPLEX
+	  and generate sunny objects.
 
-	* io.c (read_all): remove unnecessary rb_str_resize().
-	  [ruby-dev:24996]  (backported from CVS HEAD)
+	* rational.c (nurat_s_new_internal), include/ruby/ruby.h: add write
+	  barriers for T_RATIONAL and generate sunny objects.
 
-	* io.c (io_readpartial): ditto.
+	* internal.h: add write barriers for RBasic::klass.
 
-	* io.c (io_read): ditto.
+	* numeric.c (rb_float_new_in_heap): generate sunny T_FLOAT objects.
 
-Tue Nov 30 16:18:50 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* object.c (rb_class_allocate_instance), range.c:
+	  generate sunny T_OBJECT objects.
 
-	* io.c (io_fread): need not to null terminate.  [ruby-dev:24998]
+	* string.c: add write barriers for T_STRING and generate sunny objects.
 
-	* io.c (read_all): remove unnecessary rb_str_resize().
-	  [ruby-dev:24996]
+	* variable.c: add write barriers for ivars.
 
-	* io.c (io_read): ditto.
+	* vm_insnhelper.c (vm_setivar): ditto.
 
-Tue Nov 30 00:49:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* include/ruby/ruby.h, debug.c: use two flags
+	  FL_WB_PROTECTED and FL_OLDGEN.
 
-	* io.c (rb_io_sysread): use temporary lock.  [ruby-dev:24992]
+	* node.h (NODE_FL_CREF_PUSHED_BY_EVAL, NODE_FL_CREF_OMOD_SHARED):
+	  move flag bits.
 
-Mon Nov 29 16:06:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue May 14 01:54:48 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/stringio/stringio.c (strio_write): insufficiently filled string
-	  being extended when overwriting.  [ruby-core:03836]
+	* gc.c: remove rb_objspace_t::marked_num.
+	  We can use `objspace_live_num()' instead of removed `marked_num'
+	  if it is after `after_gc_sweep()' function call.
 
-Mon Nov 29 15:59:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* gc.c (after_gc_sweep): use objspace_live_num() instead of removed
+	  rb_objspace_t::marked_num.
 
-	* lib/ostruct.rb (OpenStruct::method_missing): check method
-	  duplication for -d.
+	* gc.c (gc_mark_ptr, gc_marks): remove rb_objspace_t::marked_num code.
 
-	* lib/ostruct.rb (OpenStruct::initialize): ditto.
+	* gc.c (gc_prepare_free_objects): do not call set_heaps_increment()
+	  with checking objspace->heap.marked_num. At this point, we only
+	  need to check availability of free-cell.
 
-Mon Nov 29 15:22:28 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* gc.c (lazy_sweep): call after_gc_sweep() if there are no sweep_able entry.
 
-	* test/io/nonblock/test_flush.rb: abandon tests when io/nonblock is
-	  not supported.
+	* gc.c (rest_sweep, gc_prepare_free_objects): remove after_gc_sweep() call.
 
-Mon Nov 29 03:08:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue May 14 01:50:41 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* object.c (convert_type): direct call conversion methods for the
-	  performance.  [ruby-core:03845]
+	* gc.c: disable GC_PROFILE_MORE_DETAIL (fix last commit).
 
-	* eval.c (rb_funcall_rescue): new function.
+	* gc.c (gc_prof_set_malloc_info): fix "objspace->heap.live_num" to
+	  "objspace_live_num(objspace)". There is no such member variable.
 
-	* object.c (rb_Array): avoid using rb_respond_to().
+Tue May 14 01:25:55 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* object.c (rb_Integer): ditto.
+	* gc.c: refactoring GC::Profiler.
 
-	* parse.y (reduce_nodes): empty body should return nil.
+	* gc.c (gc_prof_sweep_timer_start/stop): removed because
+	  they doesn't support lazy sweep.
 
-	* string.c (rb_str_aset): the original string should not be
-	  affected by modifying duplicated string.  [ruby-dev:24981]
+	* gc.c (gc_prof_sweep_slot_timer_start/stop): added.
+	  redefine `sweeping time' to accumulated time of all of
+	  slot_sweep().
 
-Mon Nov 29 13:57:38 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c (rb_objspace_t::profile::count): renamed to
+	  rb_objspace_t::profile::next_index. `counter' seems ambiguous.
+	  increment it when next record is acquired.
 
-	* win32/win32.c (CreateChild): search executable file if no program
-	  name given. (backported from CVS HEAD)
+Tue May 14 00:48:55 2013  Koichi Sasada  <ko1@atdot.net>
 
-Mon Nov 29 13:37:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/ruby.h: constify RRational::(num,den) and
+	  RComplex::(real,imag).
+	  Add macro to set these values:
+	    * RRATIONAL_SET_NUM()
+	    * RRATIONAL_SET_DEN()
+	    * RCOMPLEX_SET_REAL()
+	    * RCOMPLEX_SET_IMAG()
+	  This change is a part of RGENGC branch [ruby-trunk - Feature #8339].
 
-	* io.c (fptr_finalize): must not use FILE after fclose().
-	  [ruby-dev:24985]
+	  TODO: API design. RRATIONAL_SET(rat,num,den) is enough?
+	  TODO: Setting constify variable with cast has same issue of r40691.
 
-Mon Nov 29 13:16:31 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* complex.c, rational.c: use above macros.
 
-	* win32/win32.c (CreateChild): push back the last space before next
-	  loop because CharNext() eats it.
+Mon May 13 21:49:17 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Nov 29 01:18:18 2004  Tanaka Akira  <akr@m17n.org>
+	* ext/socket/extconf.rb: Check socketpair again.
+	  It is required on Unix.
 
-	* io.c (rb_io_check_writable): call io_seek regardless of
-	  NEED_IO_SEEK_BETWEEN_RW.  [ruby-dev:24986]
+Mon May 13 21:20:32 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Nov 27 21:43:39 2004  Tanaka Akira  <akr@m17n.org>
+	* win32/win32.c (getipaddrs): use alternative interface name if
+	  available, because if_nametoindex() requires them.
 
-	* io.c: avoid data lost with nonblocking fd and
-	  stdio buffering in sync mode.  [ruby-dev:24966]
-	  based on matz's patch [ruby-dev:24967]
-	  (io_fwrite): new primitive writing function which writes
-	  directly if sync mode.
-	  (rb_io_fwrite): wrapper for io_fwrite now.
-	  (io_write): call io_fwrite instead of rb_io_fwrite.
+Mon May 13 20:23:24 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Sat Nov 27 14:44:15 2004  Kent Sibilev  <ksibilev@bellsouth.net>
+	* win32/win32.c, include/ruby/win32.h (getipaddrs): [experimental]
+	  emulate getipaddrs(3) on Unix.
 
-	* lib/cgi/session.rb (CGI::Session::initialize): create_new_id is
-	  now a instance method.  [ruby-core:03832]
+	* win32/Makefile.sub, configure.in (LIBS): need iphlpapi.lib for above
+	  function.
 
-Sat Nov 27 09:41:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* include/ruby/win32.h (socketpair): rb_w32_socketpair() doesn't
+	  substitute for any function, so use non-prefixed name.
 
-	* io.c (io_fread): old rb_io_fread with file closing checking.
-	  (rb_io_fread): wrapper for io_fread now.
-	  [ruby-dev:24964]
+	* ext/socket/extconf.rb (socketpair); follow above change.
 
-Fri Nov 26 18:02:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon May 13 20:11:06 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk.rb: Tk.destroy uses TkWindow#epath
+	* iseq.c (prepare_iseq_build): remove additional line break.
 
-	* ext/tk/lib/tk/image.rb: bug fix
+Mon May 13 19:29:54 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/wm.rb: add 'iconphoto' method(Windows only)
+	* include/ruby/ruby.h: constify RBasic::klass and add
+	  RBASIC_CLASS(obj) macro which returns a class of `obj'.
+	  This change is a part of RGENGC branch [ruby-trunk - Feature #8339].
 
-	* ext/tk/lib/tkextlib/*: some methods uses TkWindow#epath
+	* object.c: add new function rb_obj_reveal().
+	  This function reveal internal (hidden) object by rb_obj_hide().
+	  Note that do not change class before and after hiding.
+	  Only permitted example is:
+	    klass = RBASIC_CLASS(obj);
+	    rb_obj_hide(obj);
+	    ....
+	    rb_obj_reveal(obj, klass);
 
-Fri Nov 26 13:49:06 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	  TODO: API design. rb_obj_reveal() should be replaced with others.
 
-	* eval.c (method_missing): raise TypeError for classes do not
-	  have allocators.  [ruby-core:03752]
+	  TODO: modify constified variables using cast may be harmful for
+	        compiler's analysis and optimization.
+	        Any idea to prohibit inserting RBasic::klass directly?
+	        If rename RBasic::klass and force to use RBASIC_CLASS(obj),
+	        then all codes such as `RBASIC(obj)->klass' will be
+	        compilation error. Is it acceptable? (We have similar
+	        experience at Ruby 1.9,
+	        for example "RARRAY(ary)->ptr" to "RARRAY_PTR(ary)".
 
-	* lib/erb.rb: add RDoc by James Edward Gray II.  [ruby-core:03786]
-
-Fri Nov 26 13:29:02 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::look_for_directives_in): Break
-	  out of preprocessing when we find a :section: directive (previously cleared out the
-	  comment, but this apparently now generates an error in gsub!)
-
-Fri Nov 26 00:17:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_read): move StringValue() check before GetOpenFile().
-	  [ruby-dev:24959]
-
-Thu Nov 25 20:14:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/thwait.rb (ThreadsWait#join_nowait): abnormally terminated
-	  threads should be also processed.  [ruby-talk:121320]
-
-Thu Nov 25 10:14:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (push_braces): do not reuse buffer strings.  [ruby-core:03806]
-
-Thu Nov 25 07:59:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (read_all): stringify non-nil buffer argument, and always
-	  taint the result.  [ruby-dev:24955]
-
-Wed Nov 24 01:01:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_read): integer conversion should be prior to
-	  GetOpenFile().  [ruby-dev:24952]
-
-	* configure.in, io.c: cancel [ ruby-Patches-1074 ].
-
-Tue Nov 23 08:09:50 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/menu.rb: improve usability of TkOptionMenubutton
-
-Tue Nov 23 02:00:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_file_chown): integer conversion should be prior to
-	  GetOpenFile().  [ruby-dev:24949]
-
-Tue Nov 23 00:10:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (rb_file_chown): integer conversion should be prior to
-	  GetOpenFile().  [ruby-dev:24947]
-
-	* file.c (rb_file_truncate): ditto.
-
-	* file.c (rb_file_s_truncate): ditto.
-
-	* dir.c (dir_seek): use NUM2OFFT().
-
-	* misc/ruby-mode.el (ruby-non-block-do-re): should not match words
-	  start with block keyword and underscore.  [ruby-core:03719]
-
-Mon Nov 22 22:33:02 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Don't use names
-	  of variables or constants when oarsing 'require'
-
-Mon Nov 22 00:13:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_seek): should retrieve dir_data after NUM2INT().
-	  [ruby-dev:24941]
-
-Sat Nov 20 23:57:33 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/README (et al): Add a new directive, :section:, and
-	  change the output format to accomodate. :section: allows to to
-	  group together methods, attributes, constants, etc under
-	  headings in the output. If used, a table of contents is
-	  generated.
-
-Sat Nov 20 23:56:54 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/options.rb (Options::parse): Force --inline-source if
-	  --one-file option given
-
-Sat Nov 20 23:55:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_splice): should place index wrapping after
-	  possible modification.  [ruby-dev:24940]
-
-Sat Nov 20 13:26:03 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/utf8tbl.c: original revision 1.7
-
-Sat Nov 20 05:34:24 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf/nkf-utf8/nkf.c: original nkf.c rev:1.40
-
-	* ext/nkf/test.rb: add test for mime encode/decode
-
-Sat Nov 20 01:37:34 2004  Johan Holmberg  <holmberg@iar.se>
-
-	* eval.c (error_print): nicer traceback at interrupt.
-	  [ruby-core:03774]
-
-Sat Nov 20 00:07:16 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): internal buffer should not be listed by
-	  ObjectSpace.each_object() by String#gsub.  [ruby-dev:24931]
-
-Fri Nov 19 01:20:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/cgi/session.rb (CGI::Session::FileStore::initialize): raise
-	  exception if data corresponding to session specified from the
-	  client does not exist.
-
-Fri Nov 19 00:59:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): internal buffer should not be listed by
-	  ObjectSpace.each_object().  [ruby-dev:24919]
-
-Thu Nov 18 18:41:08 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* test/ruby/test_stringchar.rb (test_bang): added.
-
-	* string.c (rb_str_upcase_bang, rb_str_capitalize_bang)
-	  (rb_str_swapcase_bang): missing rb_str_modify().  [ruby-dev:24915]
-
-Thu Nov 18 00:21:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (proc_getpgrp): prohibit for $SAFE=2.
-	  [ruby-dev:24899]
-
-	* process.c (get_pid): ditto.  [ruby-dev:24904]
-
-	* process.c (get_ppid): ditto.
-
-	* array.c (rb_ary_delete): defer rb_ary_modify() until actual
-	  modification.  [ruby-dev:24901]
-
-Thu Nov 18 10:10:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c, rubyio.h (rb_io_modenum_flags): exported.
-
-	* ext/stringio/stringio.c (strio_initialize): allow Fixnum as mode as
-	  well as IO.new does.  [ruby-dev:24896]
-
-Wed Nov 17 23:42:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_settracefunc.rb: added.  [ruby-dev:24884]
-
-Wed Nov 17 13:56:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (newline_node): should not use FL_SET. [ruby-dev:24874]
-
-	* parse.y (string_content): should not use FL_UNSET.
-
-	* node.h (NODE_NEWLINE): remove unused bit to utilize flag field
-	  in nodes.
-
-Wed Nov 17 13:09:40 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32,wince}/Makefile.sub (test): should build ruby.exe
-	  before running test. [ruby-core:03756]
-
-Wed Nov 17 04:33:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* pack.c: all features are backport from 1.9. [ruby-dev:24826]
-
-	* bignum.c (rb_big2ulong_pack): new function to pack Bignums.
-
-Wed Nov 17 03:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_splice): move rb_str_modify() after
-	  StringValue(), which may alter the receiver.  [ruby-dev:24878]
-
-Tue Nov 16 23:45:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (flo_divmod): protect float values from GC by
-	  assignment to local variables.  [ruby-dev:24873]
-
-Tue Nov 16 16:30:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32,wince}/setup.mak (-epilogue-): remove config.h and
-	  config.status to force updating them.
-
-Tue Nov 16 16:20:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_read): position was ignored when a
-	  buffer was passed.  http://www.yo.rim.or.jp/~nov/d/?date=20041116#p03
-
-Tue Nov 16 11:19:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::options): use
-	  Regexp conversion.
-
-Tue Nov 16 01:41:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_mod_check): frozen check should be separated.
-	  [ruby-core:3742]
-
-	* array.c (rb_ary_update): pedantic check to detect
-	  rb_ary_to_ary() to modify the receiver.  [ruby-dev:24861]
-
-Mon Nov 15 13:50:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_justify): typo fixed.  [ruby-dev:24851]
-
-Mon Nov 15 11:50:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-special-char-p, ruby-parse-partial): handle
-	  operator symbols.  [ruby-talk:120177]
-
-Sun Nov 14 13:27:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/pp.rb (PP#object_address_group): remove odd number of 'f'
-	  prefixed to negative address.
-
-Sun Nov 14 08:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/logger/test_logger.rb: Logger just expects
-	  Logger#datetime_format to be used for Time#strftime independently of
-	  locale. [ruby-dev:24828]
-
-Fri Nov 12 15:03:26 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (ruby_options): now we cannot call rb_glob() before
-	  ruby_init(), so call rb_w32_cmdvector() at ruby_options().
-
-	* win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
-	  export it.
-
-Fri Nov 12 14:08:01 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/event.rb: remove $LOADED_FEATURES trick
-
-	* ext/tk/lib/tk.rb: ditto
-
-Fri Nov 12 00:31:05 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/gdbm/gdbm.c (fgdbm_store): StringValue() may alter string
-	  pointer.  [ruby-dev:24783]
-
-Thu Nov 11 17:36:12 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* dir.c (rb_globi): also should call back via rb_glob_caller().
-	  [ruby-dev:24775]
-
-Thu Nov 11 16:47:21 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* test/ruby/test_file.rb (test_truncate_wbuf): we want to test
-	  only File#truncate, not behaviour of seek(2).
-
-Thu Nov 11 09:41:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (push_braces): was confusing VALUE and char*.
-
-	* dir.c (rb_push_glob): Dir.glob should have called its block.
-
-Thu Nov 11 01:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (syserr_initialize): use stringified object.
-	  [ruby-dev:24768]
-
-Wed Nov 10 22:49:01 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb (SimpleDelegator::dup): wrong number of
-	  arguments.
-
-	* lib/delegate.rb (DelegateClass::dup): ditto.
-
-Wed Nov 10 12:31:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* README.EXT (Example): extconf.rb is indispensable now.
-
-Wed Nov 10 03:33:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fix SEGV when compiled with Tcl/Tk8.3.x
-	  or older
-
-	* ext/tk/lib/tkextlib/tile/style.rb: bug fix
-
-Tue Nov  9 14:27:18 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser::Officious): moved from DefaultList.
-
-Tue Nov  9 01:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (rb_glob2): do not allocate buffer from heap to avoid
-	  memory leaks.  use string object for buffering instead.
-	  [ruby-dev:24738]
-
-	* dir.c (join_path): ditto.
-
-	* io.c (io_read): external input buffer may be modified even after
-	  rb_str_locktmp().  [ruby-dev:24735]
-
-	* dir.c (fnmatch): p or s may be NULL.  [ruby-dev:24749]
-
-Tue Nov  9 00:53:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* regex.c (slow_match): avoid GCC 3.4.x warnings.
-
-Tue Nov  9 00:50:06 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb: Change version numbering of RDoc and ri
-
-Mon Nov  8 23:38:35 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/extservm.rb: add DRb::ExtServManager#uri=.
-	  [ruby-dev:24743]
-
-Mon Nov  8 22:20:19 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
-	  Fix bug where parent class wasn't being detected if the
-	  child class was defined using the A::B notation.
-
-Mon Nov  8 00:14:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: add setup for mignw32 cross compiling.
-	  [ruby-talk:119413]
-
-Sun Nov  7 23:49:26 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bind-event methods accept multi substitution
-	  arguments.
-
-	* ext/tk/lib/tk/canvas.rb: ditto.
-
-	* ext/tk/lib/tk/canvastag.rb: ditto.
-
-	* ext/tk/lib/tk/text.rb: ditto.
-
-	* ext/tk/lib/tk/texttag.rb: ditto.
-
-	* ext/tk/lib/tkextlib: ditto.
-
-Sat Nov  6 14:58:44 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/server.rb (WEBrick::HTTPServer#start): remove
-	  :DoNotReverseLookup option. (Socket#do_not_reverse_lookup is a
-	  ruby 1.9 feature)
-
-Sat Nov  6 11:31:04 2004  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb (_parse): checks whether zone was given.
-
-Sat Nov  6 00:46:27 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_locktmp): check STR_TMPLOCK flag before
-	  locking.  [ruby-dev:24727]
-
-Fri Nov  5 18:12:42 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/scrollable.rb: divide Scrollable module into
-	  X_Scrollable and Y_Scrollable
-
-	* ext/tk/lib/tk/entry.rb: include X_Scrollable instead of Scrollable
-
-	* ext/tk/lib/tk/autoload.rb: define autoload for X_Scrollable and
-	  Y_Scrollable
-
-Fri Nov  5 16:05:32 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: TkComm._at() supprts both of "@x,y" and "@x"
-
-Fri Nov  5 13:22:58 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/text.rb: sorry. bug fix again.
-
-Fri Nov  5 13:17:54 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/text.rb: bug fix
-
-Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_mark): stricter GC stack check.
-
-Fri Nov  5 08:52:48 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_mark): stricter GC stack check.
-
-Fri Nov  5 08:34:43 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): should have removed rb_str_unlocktmp(str).
-	  [ruby-dev:24708]
-
-Thu Nov  4 21:25:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): string modify check no longer based on
-	  tmplock.  [ruby-dev:24706]
-
-Thu Nov  4 19:27:46 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* io.c (rb_f_open): fix typo.
-
-Thu Nov  4 15:02:14 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/variable.rb: forget to initialize instance_variables
-	  of TkVarAccess objects
-
-Thu Nov  4 09:11:35 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_mark): enable GC stack checking.
-
-Thu Nov  4 03:11:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): lock strings temporarily.  [ruby-dev:24687]
-
-	* ext/socket/socket.c (s_recvfrom): tmplock input buffer.
-	  [ruby-dev:24705]
-
-Wed Nov  3 22:32:12 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* process.c: On NetBSD don't use setruid() and setrgid().
-
-Wed Nov  3 22:24:17 2004  Daigo Moriwaki  <techml@sgtpepper.net>
-
-	* lib/webrick/httpauth/digestauth.rb: use Base64.encode64 to
-	  avoid warnings.
-
-Wed Nov  3 17:19:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_uniq_bang): do not push frozen string from hash
-	  table.  [ruby-dev:24695]
-
-	* array.c (rb_ary_and): ditto.
-
-	* array.c (rb_ary_or): ditto.
-
-Wed Nov  3 17:13:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* io.c (pipe_open): fix compile error
-
-Wed Nov  3 16:58:07 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: support to use different Tcl commands between
-	  configure and configinfo
-
-	* ext/tk/lib/font.rb: ditto.
-
-	* ext/tk/lib/itemconfig.rb: support to use different Tcl commands
-	  between item_configure and item_configinfo
-
-	* ext/tk/lib/itemfont.rb: ditto.
-
-	* ext/tk/extconf.rb: install SUPPORT_STATUS
-
-	* ext/tk/lib/tkextlib: some bug fixes (see ext/tk/ChangeLog.tkextlib)
-
-Wed Nov  3 16:30:41 2004  NARUSE, Yui  <naruse@ruby-lang.org>
-
-	* ext/nkf: follow nkf 2.0.4
-
-Wed Nov  3 15:53:34 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* test/rss/test_maker_*.rb: added tests for RSS Maker.
-
-	* lib/rss/maker.rb: added RSS Maker.
-
-	* lib/rss/maker/*.rb: ditto.
-
-Tue Nov  2 16:35:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/enumerator/enumerator.c (each_cons_i): pass copy of an
-	  internal consequent array.  [ruby-talk:118691]
-
-Tue Nov  2 16:05:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (rb_f_fork): need to flush stdout and stderr before
-	  fork(2).  [ruby-talk:117715]
-
-Tue Nov  2 01:20:09 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): nail down dyna_var node when Proc object
-	  or continuation is created.  [ruby-dev:24671]
-
-Mon Nov  1 13:59:28 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/extmk.rb (MANIFEST): do not use anymore, use extconf.rb instead.
-
-	* ext/enumerator/extconf.rb, ext/fcntl/extconf.rb,
-	  ext/stringio/extconf.rb: added.
-
-	* MANIFEST, ext/**/MANIFEST: removed.
-
-	* README.EXT, README.EXT.ja: remove MANIFEST stuff.
-
-Mon Nov  1 01:14:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_open): create copy of popen specifier.  [ruby-dev:24656]
-
-Mon Nov  1 00:36:48 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* main.c (_stklen): move to gc.c.
-
-Sun Oct 31 00:22:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_locktmp): lock string temporarily.
-
-	* string.c (str_independent): add tmplock check.
-
-	* io.c (io_write): lock output string temporarily.
-	  [ruby-dev:24649]
-
-	* io.c (io_write): use rb_str_locktmp().
-
-	* io.c (read_all): ditto.
-
-Sat Oct 30 06:53:24 2004  Peter Vanbroekhoven  <peter.vanbroekhoven@cs.kuleuven.ac.be>
-
-	* eval.c (rb_eval): NODE_XSTR should pass copy of literal string.
-
-Sat Oct 30 00:19:40 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_sort_by): protect continuation jump in.
-	  [ruby-dev:24642]
-
-Fri Oct 29 21:27:51 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_check_initialized): new function to check uninitialized
-	  object.  [ruby-talk:118234]
-
-	* file.c (rb_file_path), io.c (rb_io_closed): check if initialized.
-
-Fri Oct 29 10:00:30 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_start_0): forget to free some memory chunks.
-	  [ruby-core:03611]
-
-	* eval.c (ruby_cleanup): ruby_finalize_1 may cause exception,
-	  should be wrapped by PUSH_TAG/POP_TAG().  [ruby-dev:24627]
-
-Thu Oct 28 08:42:02 2004  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (argf_forward): use ANSI style.
-	  (argf_read): call argf_forward with argv argument.
-	  [ruby-dev:24624]
-
-Thu Oct 28 23:32:54 2004  akira yamada  <akira@ruby-lang.org>
-
-	* ext/zlib/zlib.c (zstream_detach_input): resets klass of z->input if
-	  z->input isn't nil.
-
-Thu Oct 28 23:19:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: prefer relative path.  [ruby-talk:93037]
-
-Wed Oct 27 18:49:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* gc.c: prototype; rb_io_fptr_finalize() doesn't return any value
-	  at this version.
-
-Wed Oct 27 17:27:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_sweep): recover ruby_in_compile variable.
-
-Wed Oct 27 09:17:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_gsub): use a string object for exception safeness.
-	  [ruby-dev:24601]
-
-Tue Oct 26 23:52:32 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_getline): rs modification check should not interfere in the loop.
-
-Tue Oct 26 23:30:39 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/code_objects.rb (RDoc::Context::add_class_or_module):
-	  Restore correct :nopdoc: behavior with nested classes and modules.
-
-Tue Oct 26 18:21:29 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (RESIZE_CAPA): check string attribute before modifying
-	  capacity member of string structure.  [ruby-dev:24594]
-
-Tue Oct 26 11:33:26 2004  David G. Andersen  <dga@lcs.mit.edu>
-
-	* ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
-	  performance.  [ruby-talk:117701]
-
-Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
-	  arguments, unless (digit)$ style used.
-
-Tue Oct 26 11:33:26 2004  David G. Andersen  <dga@lcs.mit.edu>
-
-	* ext/zlib/zlib.c (gzreader_gets): use memchr() to to gain
-	  performance.  [ruby-talk:117701]
-
-Tue Oct 26 10:56:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): raise ArgumentError for extra
-	  arguments, unless (digit)$ style used.
-
-Mon Oct 25 18:35:39 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c (isUNCRoot): should check NUL after '.'.
-	  [ruby-dev:24590]
-
-	* win32/win32.c (isUNCRoot): fixed buffer overrun.
-
-Mon Oct 25 08:03:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (get_backtrace): ignore illegal backtrace.  [ruby-dev:24587]
-
-Sun Oct 24 00:41:09 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_load, search_required, rb_require_safe, rb_require): use
-	  frozen shared string to avoid outside modification.  [ruby-dev:24580]
-
-Sat Oct 23 22:18:32 2004  Guy Decoux  <ts@moulon.inra.fr>
-
-	* eval.c (frame_free): Guy Decoux solved the leak problem.
-	  Thanks.  [ruby-core:03549]
-
-Sat Oct 23 00:20:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/zlib/zlib.c (zstream_append_input): clear klass for z->input
-	  to avoid potential vulnerability.
-
-	* ext/zlib/zlib.c (zstream_run): always use zstream_append_input()
-	  to avoid SEGV.  [ruby-dev:24568]
-
-Fri Oct 22 12:02:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_alias): was warning for wrong condition.
-	  [ruby-dev:24565]
-
-Fri Oct 22 10:36:37 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httprequest.rb (WEBrick::HTTPRequest#meta_vars):
-	  should check if path_info is not nil.
-
-Fri Oct 22 00:22:31 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/zlib/zlib.c (zstream_shift_buffer): should restore class
-	  field of a buffer.  [ruby-dev:24562]
-
-Fri Oct 22 00:20:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_include): should not treat char as negative value.
-	  [ruby-dev:24558]
-
-Thu Oct 21 21:32:30 2004  IWATSUKI Hiroyuki  <don@na.rim.or.jp>
-
-	* lib/pstore.rb (PStore#transaction): Use the empty content when a
-	  file is not found.  [ruby-dev:24561]
-
-Thu Oct 21 19:06:15 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
-	  ensure to close @body. (http://bugs.debian.org/277520)
-
-Thu Oct 21 00:36:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_alias): should warn on method discarding.
-	  [ruby-dev:24546]
-
-	* ext/zlib/zlib.c (zstream_expand_buffer_into): hide internal
-	  string buffer by clearing klass.  [ruby-dev:24548]
-
-Wed Oct 20 19:45:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (str_gsub): 	reentrant check.  [ruby-dev:24432]
-
-	* backport all SEGV bug fixes from CVS HEAD.  [ruby-dev:24536]
-
-Wed Oct 20 04:17:55 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/dbm/dbm.c (fdbm_delete_if): should check if deleting element
-	  is a string.  [ruby-dev:24490]
-
-	* ext/sdbm/init.c (fsdbm_delete_if): ditto.
-
-Wed Oct 20 01:37:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_times): Array#* should return an instance of
-	  the class of right operand.  [ruby-dev:24526]
-
-	* ext/zlib/zlib.c (zstream_detach_buffer): should not expose
-	  class-less object to Ruby world. [ruby-dev:24530]
-
-	* eval.c (proc_dup): provide Proc#dup as well.  [ruby-talk:116915]
-
-	* eval.c (ruby_exec): stack marking position may be higher than
-	  expected.  thanks to Guy Decoux.  [ruby-core:03527]
-
-Tue Oct 19 22:43:12 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_attr): If
-	  we come across 'attr' in a context where it isn't
-	  followed by a symbol, just issue a warning.
-
-Tue Oct 19 20:41:37 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole.c(ole_invoke): retrieve the result value when
-	  retrying the IDispatch::invoke.
-
-Tue Oct 19 17:24:11 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (read_all): block string buffer modification during
-	  rb_io_fread() by freezing it temporarily. [ruby-dev:24479]
-
-	* dir.c (rb_push_glob): block call at once the end of method.
-	  [ruby-dev:24487]
-
-	* ext/enumerator/enumerator.c (enum_each_slice): remove
-	  rb_gc_force_recycle() to prevent potential SEGV.
-	  [ruby-dev:24499]
-
-	* ext/zlib/zlib.c (zstream_expand_buffer): hide internal string
-	  buffer by clearing klass.  [ruby-dev:24510]
-
-Tue Oct 19 16:12:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c: backport from CVS HEAD
-
-Tue Oct 19 08:54:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h, object.c (rb_class_inherited_p): export.
-
-Tue Oct 19 08:46:57 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (rb_str_upto): method result must be checked.  [ruby-dev:24504]
-
-	* eval.c (error_print): ditto.  [ruby-dev:24519]
-
-Mon Oct 18 23:37:05 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (r_object0): check inheritance by the internal function.
-	  [ruby-dev:24515]
-
-Mon Oct 18 15:58:01 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* range.c (range_step, range_each): need cast.
-
-Fri Oct 29 16:34:19 2004  Daiki Ueno  <ueno@unixuser.org>
-
-	* misc/ruby-mode.el (ruby-parse-partial): Parse the rest of the
-	  line after opening heredoc identifier.  [ruby-dev:24635]
-
-Mon Oct 18 07:26:21 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* file.c (rb_file_truncate): discard read buffer before truncation.
-	  [ruby-dev:24197]
-
-Mon Oct 18 02:11:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/config.rb (WEBrick::Config::General): add default values:
-	  - WEBrick::Config[:DoNotReverseLookup]
-	  - WEBrick::Config[:RequestCallback] (it used as an alias of
-	    :RequestHandler in WEBrick::HTTPServer#run)
-	  - WEBrick::Config::FileHandler[:AcceptableLanguages]
-
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#set_filename): search files
-	  having suffix of language-name which Accept-Language header field
-	  includes if :AcceptableLanguages options is present.
-
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#get_servlet): new method to
-	  search servlet correspond to the suffix of filename.
-
-	* lib/webrick/httprequest.rb: add attributes access methods: accept,
-	  accept_charset, accept_encoding, accept_language, content_length
-	  and content_type.
-
-	* lib/webrick/httpresponse.rb: add attribute access methods:
-	  content_length, content_length=, content_type and content_type=.
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.mime_types):
-	  use the second suffix to detect media type. (the first suffix
-	  may be a language name.)
-
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_qvalues):
-	  add method to parse Accept header field. it returns an Array of
-	  values sorted by the qvalues.
-
-Mon Oct 18 02:04:11 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#virtual_host): new
-	  method to register virtual hosting servers.
-
-	* lib/webrick/server.rb (WEBrick::GenericServer#accept): call
-	  do_not_reverse_lookup for each socket if :DoNotReverseLookup
-	  is set.  [ruby-core:02357]
-
-Mon Oct 18 00:42:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (sock_s_getservbyaname): protocol string
-	  might be altered.  [ruby-dev:24503]
-
-	* string.c (rb_str_upto): check if return value from succ is a
-	  string.  [ruby-dev:24504]
-
-Sun Oct 17 23:03:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/timer.rb: TkTimer#start and restart accept a block
-
-Sun Oct 17 13:05:04 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (fole_func_methods): correct argument mismatch.
-	* ext/win32ole/win32ole.c (fole_get_methods): ditto.
-	* ext/win32ole/win32ole.c (fole_put_methods): ditto.
-	* ext/win32ole/tests/testWIN32OLE.rb: add test for WIN32OLE#ole_func_methods
-	  WIN32OLE#ole_get_methods, WIN32OLE#ole_put_methods
-
-Sat Oct 16 14:45:28 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/0.9.rb (RSS::Rss#to_s): removed garbage.
-
-Sat Oct 16 13:42:49 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/: untabified.
-	* test/rss/: untabified.
-	* lib/rss/0.9.rb (RSS::Rss#to_s): inent -> indent.
-
-Sat Oct 16 13:34:56 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss: supported prety print.
-	* test/rss/test_1.0.rb: added test for calculating default indent size.
-
-Fri Oct 15 18:04:35 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/timer.rb: TkTimer.new(interval, loop){ ... } is
-	  acceptable. Add TkTimer.start ( == new + start ).
-
-Fri Oct 15 12:43:09 2004  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (Init_stack): make prototype declaration consistent with
-	  the definition in gc.c.
-
-Thu Oct 14 14:34:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (MODE_BINMODE, MODE_BINARY): fixed reversed condition.
-
-Thu Oct 14 13:33:59 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: added link to Tutorial.
-
-Mon Oct 11 13:48:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/*: untabify
-
-Sun Oct 10 12:32:08 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_require): Allow 'require'
-	  to be used as a variable name
-
-Sat Oct  9 21:23:37 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/converter.rb: changed to try to use Iconv for default
-	  conversion.
-
-	* lib/rss/rss.rb: 0.0.9 -> 0.1.0.
-
-Sat Oct  9 19:50:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_getline): should not treat char as negative value.
-	  [ruby-dev:24460]
-
-Fri Oct  8 09:49:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (pack_pack): pointer modification check before each
-	  iteration.  [ruby-dev:24445]
-
-Fri Oct  8 01:13:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/optiondb.rb: make it more secure
-
-Thu Oct  7 23:47:57 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/scrollbar.rb: When 'set' operation, a scrollbar
-	  cannot propagate view port information from the source widget
-	  (that calls 'set') to other assigned widgets.
-
-Thu Oct  7 17:36:25 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: When CHILDKILLED and so on, Tk.errorCode returns
-	  a Fixnum for 2nd element (it's pid) of the return value.
-
-Thu Oct  7 12:55:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (io_read): should freeze buffer before thread context
-	  switch. [ruby-dev:24442]
-
-	* pack.c (pack_unpack): string conversion should at the top of the
-	  method.  [ruby-dev:24439]
-
-	* io.c (io_read): buffer should be frozen only after the length
-	  check.  [ruby-dev:24440]
-
-Thu Oct  7 02:56:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c: use FMODE_APPEND.
-
-Thu Oct  7 01:05:33 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add Tk.errorInfo and Tk.errorCode
-
-Thu Oct  7 00:08:37 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_s_sysopen): preserve path in the buffer allocated by
-	  ALLOCA_N() to prevent modification.  [ruby-dev:24438]
-
-Wed Oct  6 09:21:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_mode_flags): preserve append mode flag.
-	  [ruby-dev:24436]
-
-	* io.c (rb_io_modenum_mode): do not use external output buffer.
-
-	* string.c (rb_str_justify): differ pointer retrieval to prevent
-	  padding string modification.  [ruby-dev:24434]
-
-	* range.c (range_each_func): allow func to terminate loop by
-	  returning RANGE_EACH_BREAK.
-
-	* range.c (member_i): use RANGE_EACH_BREAK. [ruby-talk:114959]
-
-Mon Oct  4 14:04:14 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_file_open_internal, rb_io_reopen): fname might be altered
-	  while GC.  [ruby-dev:24408]
-
-Mon Oct  4 12:53:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/optiondb.rb: support definition of command
-	  resources on widgets
-
-	* ext/tk/lib/tk/image.rb: bug fix
-
-Sun Oct  3 21:20:03 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (TEXT_REGEXP): allow 8-bit characters for the german
-	  version of Microsoft Exchange Server. (backported from HEAD)
-
-	* lib/net/imap.rb (RTEXT_REGEXP): ditto.
-
-	* lib/net/imap.rb (CTEXT_REGEXP): ditto.
-
-Sat Oct  2 20:34:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* node.h (NEW_DVAR): extra semicolon.
-
-Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_byte): retrieve pointer from string value for each
-	  time.  [ruby-dev:24404]
-
-	* marshal.c (r_bytes0): ditto.
-
-	* enum.c (sort_by_i): re-entrance check added.  [ruby-dev:24399]
-
-	* io.c (io_read): should freeze all reading buffer.
-	  [ruby-dev:24400]
-
-	* string.c (rb_str_sum): should use bignums when bits is greater
-	  than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
-
-	* eval.c (specific_eval): defer pointer retrieval to prevent
-	  unsafe sourcefile string modification.  [ruby-dev:24382]
-
-	* eval.c (specific_eval): defer pointer retrieval to prevent
-	  unsafe sourcefile string modification.  [ruby-dev:24382]
-
-	* string.c (rb_str_sum): wrong cast caused wrong result.
-	  [ruby-dev:24385]
-
-	* enum.c (enum_sort_by): hide temporary array from
-	  ObjectSpace.each_object.  [ruby-dev:24386]
-
-	* string.c (rb_str_sum): check was done with false pointer.
-	  [ruby-dev:24383]
-
-	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
-
-Mon Oct 11 17:51:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_popen): get mode string via rb_io_flags_mode() to
-	  avoid mode string modification.  [ruby-dev:24454]
-
-	* io.c (rb_io_getline_fast): should take delim as unsigned char to
-	  distinguish EOF and '\377'.  [ruby-dev:24460]
-
-	* io.c (rb_io_getline): add check for RS modification.
-	  [ruby-dev:24461]
-
-	* enum.c (enum_sort_by): use qsort() directly instead using
-	  rb_iterate().  [ruby-dev:24462]
-
-	* enum.c (enum_each_with_index): remove rb_gc_force_recycle() to
-	  prevent access to recycled object (via continuation for
-	  example).  [ruby-dev:24463]
-
-Fri Oct  1 11:40:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_eval): defer pointer retrieval to prevent unsafe
-	  sourcefile string modification.  [ruby-dev:24373]
-
-	* io.c (io_read): block string buffer modification during
-	  rb_io_fread() by freezing it temporarily. [ruby-dev:24366]
-
-	* io.c (rb_io_s_popen): mode argument may be altered.
-	  [ruby-dev:24375]
-
-	* file.c (rb_file_s_basename): ext argument may be altered.
-	  [ruby-dev:24377]
-
-	* enum.c (enum_sort_by): use NODE instead of 2 element arrays.
-	  [ruby-dev:24378]
-
-	* string.c (rb_str_chomp_bang): StringValue() may change the
-	  receiver.  [ruby-dev:24371]
-
-Fri Oct  1 11:25:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/grid.rb: revive TkGrid.grid
-
-	* ext/tk/lib/tk/pack.rb: revive TkPack.pack
-
-	* ext/tk/lib/tk/place.rb: revive TkPlace.place
-
-Thu Sep 30 00:50:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (ip_init): bug fix
-
-	* ext/tk/tkutil.c (get_eval_string_core): accept a Regexp object
-
-	* ext/tk/lib/multi-tk.rb: fix bug on 'exit' operation
-
-	* ext/tk/lib/tk/text.rb: 'tksearch' accepts a Regexp object as a
-	  matting pattern argument
-
-Wed Sep 29 10:58:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* enum.c (sort_by_i): internally used object must not be changed
-	  outside.  [ruby-dev:24368]
-
-Mon Sep 27 13:46:45 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h, struct.c (rb_struct_s_members, rb_struct_members): public
-	  accessors.  [ruby-dev:24342]
-
-	* marshal.c (w_object, r_object0): use accessors.
-
-Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
-	  [ruby-talk:113807]
-
-Fri Sep 24 16:09:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): propagate DVAR_DONT_RECYCLE on termination
-	  to avoid double call to rb_gc_force_recycle(). [ruby-dev:24311]
-
-Fri Sep 24 08:29:45 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_subseq): original object might be modified after
-	  sharing data creation.  [ruby-dev:24327]
-
-	* array.c (rb_ary_replace): ditto.
-
-	* array.c (ary_make_shared): freeze shared array. [ruby-dev:24325]
-
-	* struct.c (struct_members): always check struct size and size of
-	  members list in the class.  [ruby-dev:24320]
-
-Thu Sep 23 09:29:14 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_sub_bang): check if string is not modified
-	  during iteration.  [ruby-dev:24315]
-
-	* hash.c (rb_hash_rehash): replace st_foreach() by its deep
-	  checking counterpart.  [ruby-dev:24310]
-
-Wed Sep 22 13:38:12 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_rehash): add iteration check.  [ruby-dev:24301]
-
-	* st.c (st_foreach): add deep check.
-
-Wed Sep 22 13:06:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_call_handler): workaround for Ctrl-C.
-	  merge from HEAD.
-
-Wed Sep 22 00:11:12 2004  Dave Thomas  <dave@pragprog.com>
-
-	* process.c: Add documentation for fork()
-
-Wed Sep 22 09:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_collect_bang): element size might change during
-	  comparison.  [ruby-dev:24300]
-
-	* array.c (rb_ary_reject_bang): ditto. [ruby-dev:24300]
-
-	* array.c (rb_ary_eql): ditto. [ruby-dev:24300]
-
-Tue Sep 21 18:29:49 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_equal): merge miss.
-
-	* array.c (rb_ary_uniq_bang): element size might change during
-	  comparison.  [ruby-dev:24298]
-
-Mon Sep 20 00:24:19 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* enum.c (enum_sort_by): do not use qsort directly.  use
-	  rb_ary_sort_bang() instead.  [ruby-dev:24291]
-
-	* enum.c (enum_sort_by): pedantic type check added.
-	  [ruby-dev:24291]
-
-	* hash.c (rb_hash_foreach_iter): check iter_lev after each
-	  iteration.  [ruby-dev:24289]
-
-	* array.c (rb_ary_and): element size might change during
-	  comparison.  [ruby-dev:24290]
-
-	* array.c (rb_ary_or): ditto. [ruby-dev:24292]
-
-	* array.c (rb_ary_equal): wrong fix. [ruby-dev:24286]
-
-Sat Sep 18 15:02:22 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_equal): element size might change during
-	  comparison.  [ruby-dev:24254]
-
-	* array.c (rb_ary_diff): ditto. [ruby-dev:24274]
-
-	* array.c (rb_ary_select): ditto. [ruby-dev:24278]
-
-	* array.c (rb_ary_delete): ditto. [ruby-dev:24283]
-
-	* array.c (rb_ary_rindex): ditto. [ruby-dev:24275]
-
-	* array.c (rb_ary_initialize): element size might change during
-	  initializing block.  [ruby-dev:24284]
-
-Sat Sep 18 14:10:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* dir.c (dir_s_chdir): avoid memory leak and unnecessary chdir to
-	  the original directory when exception has caused in changing
-	  direcotry or within block.  thanks to Johan Holmberg
-	  <holmberg@iar.se> [ruby-core:03446]
-
-Fri Sep 17 20:20:27 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (mkdir_p): backport from CVS HEAD 1.45. [ruby-core:03420]
-
-Fri Sep 17 17:11:08 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_delete): element comparison might change array
-	  size. [ruby-dev:24273]
-
-	* file.c (rb_file_truncate): clear stdio buffer before truncating
-	  the file.  [ruby-dev:24191]
-
-	* ext/digest/digest.c: use rb_obj_class() instead of CLASS_OF
-	  which might return singleton class.  [ruby-dev:24202]
-
-Fri Sep 17 16:07:09 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: improve exit operation
-
-Fri Sep 17 15:01:57 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fix SEGV when (thread_)vwait or
-	  (thread_)tkwait
-
-	* ext/tk/lib/tk.rb: add alias wait_window to wait_destroy
-
-	* ext/tk/lib/multi-tk.rb: support calling 'mainloop' on slave
-	  interpreters (however, the 'real' eventloop must be run on the
-	  Default Master IP)
-
-	* ext/tk/lib/remote-tk.rb: follow the changes of ext/tk/lib/multi-tk.rb
-
-	* ext/tk/sample/remote-ip_sample2.rb: ditto
-
-	* ext/tk/sample/tkoptdb-safeTk.rb: ditto
-
-Thu Sep 16 18:12:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb (WEBrick::CGI#start): should set REMOTE_USER
-	  to request.user attribute.
-
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::FileHandler#initialize): should expand
-	  the pathname of document root directory.
-
-Thu Sep 16 15:49:28 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_intern): protect string argument from GC.
-	  [ruby-core:03411]
-
-Wed Sep 15 20:22:23 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/tkoptdb-safeTk.rb: fix a bug depend on the changes
-	  of MultiTkIp
-
-Tue Sep 14 23:54:11 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string was en-bugged by
-	  the previous changes.
-
-Tue Sep 14 23:45:44 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::TextFormatter.for):
-	  Add Eric Hodel's simpleformatter.
-
-Tue Sep 14 16:59:37 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: fix SEGV
-
-	* ext/tk/lib/multi-tk.rb: improve safe-level handling of argument proc
-
-	* ext/tk/sample/multi-ip_sample.rb: rename of old 'safe-tk.rb'
-
-	* ext/tk/sample/safe-tk.rb: new sample script
-
-Tue Sep 14 00:15:15 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/zlib/zlib.c: backported from HEAD.
-
-Mon Sep 13 19:16:33 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* eval.c (blk_copy_prev): need frame_dup().  [ruby-dev:24103]
-
-Mon Sep 13 16:23:27 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_master and new_slave accept
-	  safe-level value argument
-
-Mon Sep 13 10:20:45 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* object.c (nil_inspect): fix typo.
-
-Mon Sep 13 01:03:02 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: improve control of preserv/release tcltkip
-
-	* ext/tcltklib/tcltklib.c: store original 'exit' command
-
-	* ext/tk/tkutil.c: fix(?) SEGV
-
-Sun Sep 12 23:46:23 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* util.c (ruby_strdup): remove unnecessary code. (xmalloc never
-	  returns NULL.)
-
-	* util.c (ruby_getcwd): fix memory leak on failure.
-
-Sun Sep 12 02:41:58 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: add TclTkIp#allow_ruby_exit? and
-	  allow_ruby_exit=
-
-	* ext/tk/lib/multi-tk.rb: ditto.
-
-	* ext/tk/lib/remote-tk.rb: ditto.
-
-	* ext/tcltklib/MANUAL.euc: ditto.
-
-	* ext/tcltklib/MANUAL.eng: ditto.
-
-	* ext/tcltklib/tcltklib.c: fix some reasons of SEGV
-
-	* ext/tk/tkutil.c: ditto.
-
-	* ext/tk/lib/multi-tk.rb: ditto.
-
-	* ext/tk/lib/tk/timer.rb: ditto.
-
-Sat Sep 11 16:09:46 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb: Fix up cross-file class merging.
-
-Fri Sep 10 20:20:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious
-	  pointer conversion.
-
-Fri Sep 10 02:43:54 2004  Dave Thomas  <dave@pragprog.com>
+	* internal.h: add some macros.
+	  * RBASIC_CLEAR_CLASS(obj) clear RBasic::klass to make it internal
+	    object.
+	  * RBASIC_SET_CLASS(obj, cls) set RBasic::klass.
+	  * RBASIC_SET_CLASS_RAW(obj, cls) same as RBASIC_SET_CLASS
+	    without write barrier (planned).
+	  * RCLASS_SET_SUPER(a, b) set super class of a.
 
-	* lib/rdoc/generators/template/kilmer.rb: James Buck's
-	  patch for call-seq.
+	* array.c, class.c, compile.c, encoding.c, enum.c, error.c, eval.c,
+	  file.c, gc.c, hash.c, io.c, iseq.c, marshal.c, object.c,
+	  parse.y, proc.c, process.c, random.c, ruby.c, sprintf.c,
+	  string.c, thread.c, transcode.c, vm.c, vm_eval.c, win32/file.c:
+	  Use above macros and functions to access RBasic::klass.
 
-Thu Sep  9 13:58:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/coverage/coverage.c, ext/readline/readline.c,
+	  ext/socket/ancdata.c, ext/socket/init.c,
+	* ext/zlib/zlib.c: ditto.
 
-	* ext/tcltklib/tcltklib.c (ip_init): change flag value for setting
-	  'argv' and 'argv0' variable
+Mon May 13 18:44:14 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/remote-tk.rb: follow changes of multi-tk.rb
+	* *.c, parse.y, insns.def: use RARRAY_AREF/ASET macro
+	  instead of using RARRAY_PTR().
 
-Thu Sep  9 11:46:18 2004  Dave Thomas  <dave@pragprog.com>
+Mon May 13 16:53:53 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_classes): Allow
-	  spaces aroun parameter to define_method_under (James Buck)
+	* include/ruby/ruby.h: add new utility macros to access
+	  Array's element.
+	  * RARRAY_AREF(a, i) returns i-th element of an array `a'
+	  * RARRAY_ASET(a, i, v) set i-th element of `a' to `v'
+	  This change is a part of RGENGC branch [ruby-trunk - Feature #8339].
 
-Wed Sep  8 18:44:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon May 13 15:31:10 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/stringio/stringio.c (strio_write): zero fill a gap if exsts.
-	  [ruby-dev:24190]
+	* object.c (rb_obj_setup): added.
 
-Wed Sep  8 15:19:49 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* include/ruby/ruby.h (OBJSETUP): use rb_obj_setup() instead of
+	  a macro.
 
-	* ext/tcltklib/tcltklib.c (ip_init): cannot create a IP at level 4
+Mon May 13 15:24:16 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/multi-tk.rb: improve 'exit' operation, security check,
-	  and error treatment
+	* gc.c (rb_data_object_alloc): check klass only if klass is not 0.
+	  klass==0 means internal object.
 
-	* ext/tk/lib/multi-tk.rb: allow a trusted slave IP to create slave IPs
+Mon May 13 14:57:28 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/tk/lib/tk/listbox.rb: add TkListbox#value, value=, clear,	and
-	  erase
+	* gc.c (rb_data_object_alloc, rb_data_typed_object_alloc):
+	  use NEWOBJ_OF() instead of NEWOBJ().
 
-	* ext/tk/lib/tk/text.rb: add TkText#clear and erase
+Mon May 13 14:51:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Sep  7 15:17:49 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* proc.c (rb_obj_singleton_method): new method Kernel#singleton_method
+	  which returns a Method object of the singleton method.
+	  non-singleton method causes NameError, but not aliased or zsuper
+	  method, right now.
+	  [ruby-core:54914] [Feature #8391]
 
-	* ext/socket/socket.c (ruby_connect): break immediately if a
-	  socket is non-blocking.  [ruby-talk:111654]
+	* vm_method.c (rb_method_entry_at): return the method entry for id at
+	  klass, without ancestors.
 
-Mon Sep  6 11:08:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* class.c (rb_singleton_class_get): get the singleton class if exists,
+	  or nil.
 
-	* ext/tk/lib/tk/menu.rb(TkOptionMenubutton#insert): call correct method
+Mon May 13 10:20:59 2013  Yuki Yugui Sonoda  <yugui@google.com>
 
-Mon Sep  6 11:00:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/openssl/ossl_ssl.c: Disabled OpenSSL::SSL::SSLSocket if
+	  defined(OPENSSL_NO_SOCK).
 
-	* dir.c (dir_s_chdir): the patch to shut up false warning when
-	  exception occurred within a block.  a patch was given from Johan
-	  Holmberg <holmberg at iar.se>.  [ruby-core:03292]
+	  This fixes a linkage error on platforms which do not have socket.
+	  OpenSSL itself is still useful as a set of cryptographic functions
+	  even on such platforms.
 
-Mon Sep  6 07:51:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon May 13 10:30:04 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* eval.c (cvar_cbase): singletons should refer outer cvar scope.
-	  [ruby-dev:24223]
+	* hash.c: Hash[] and {} are not equivalent by @eam [Fixes GH-301]
 
-	* eval.c (rb_load): should preserve previous ruby_wrapper value.
-	  [ruby-dev:24226]
+Mon May 13 10:04:22 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Sat Sep  4 01:14:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* random.c: Document Random::DEFAULT by @eLobato [Fixes GH-304]
 
-	* eval.c (cvar_cbase): class variables cause SEGV in
-	  instance_eval() for fixnums and symbols. [ruby-dev:24213]
+Sun May 12 21:12:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep  3 17:47:58 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* include/ruby/ruby.h (OFFT2NUM): RUBY_REPLACE_TYPE also defines macro
+	  to convert int type to VALUE if found.
 
-	* struct.c (make_struct): remove redefining constant when
-	  conflict.  [ruby-dev:24210]
+Wed May  8 13:46:52 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Fri Sep  3 11:31:44 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* include/ruby/intern.h (rb_iv_set, rb_iv_get): removed. Because
+	  ruby.h has a declaration for that.
 
-	* ext/tk/lib/tk.rb: Tk.after makes TkCore::INTERP.tk_cmd_tbl grow
-	  [ruby-dev:24207]
+Wed May  8 13:49:06 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Fri Sep  3 02:12:48 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* include/ruby/intern.h (rb_uint2big, rb_int2big, rb_uint2inum)
+	(rb_int2inum, rb_ll2inum, rb_ull2inum): removed because ruby.h
+	  has a declaration for these.
 
-	* ext/tcltklib/tcltklib.c: fix typo [ruby-talk:111266]
+Sun May 12 17:52:23 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/tk/lib/tk/text.rb: fix typo
+	* configure.in: removes 'ac_cv_func_fseeko=yes' form MinGW
+	  specific definitions.
 
-	* ext/tk/lib/multi-tk.rb: improve safe-level treatment on slave IPs
+Sun May 12 17:25:46 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Fri Sep  3 01:54:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (rb_file_s_truncate): use correct type. chsize takes
+	  a long.
 
-	* ext/extmk.rb: already built-in libraries satisfy dependencies.
-	  [ruby-dev:24028]
+Sun May 12 17:18:46 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Thu Sep  2 11:36:20 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* process.c: move '#define HAVE_SPAWNV 1' to win32/Makefile.sub.
+	* win32/Makefile.sub: see above.
 
-	* eval.c (rb_obj_instance_eval): backported from HEAD.
+Sun May 12 17:13:32 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Wed Sep  1 21:18:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* configure.in: removes AC_CHECK_FUNCS(setitimer) because it's
+	  unused.
 
-	* ext/tk/lib/tk/spinbox.rb: fix typo
+Sun May 12 17:08:16 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Tue Aug 31 18:24:04 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* configure.in: removes AC_CHECK_FUNCS(pause) because it's unused.
 
-	* ext/tk/tkutil.c (cbsubst_init): fix memory leak
+Sun May 12 17:05:18 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/tk/tkutil.c (cbsubst_get_all_subst_keys): fix SEGV
+	* signal.c (rb_f_kill): fixes typo. s/HAS_KILLPG/HAVE_KILLPG/.
 
-Tue Aug 31 16:04:22 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sun May 12 17:03:27 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/tcltklib/tcltklib.c (ip_delete): when a tcltkip is deleted,
-	  destroy its root widget
+	* configure.in: abort if gettimeofday doesn't exist.
 
-Tue Aug 31 12:30:36 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sun May 12 16:31:27 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/tcltklib/tcltklib.c (del_root): fix SEGV
+	* configure.in: adds RUBY_REPLACE_TYPE(off_t) for creating
+	  NUM2OFFT.
+	* file.c (rb_file_truncate): use correct type. chsize() take
+	  a long.
+	* include/ruby/ruby.h (NUM2OFFT): use a definition created by
+	  a configure script by default.
 
-Mon Aug 30 23:11:06 2004  Dave Thomas  <dave@pragprog.com>
+Sun May 12 16:03:41 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* lib/rdoc/ri/ri_driver.rb (and others): ri now merges documentation
-	  if it finds the same class in multiple places.
+	* configure.in: removes AC_CHECK_FUNC(fseeko, fseeko64, ftello,
+	  ftello64). They are not used from anywhere.
 
-Mon Aug 30 22:40:30 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* win32/win32.c (fseeko): removes.
+	* win32/win32.c (rb_w32_ftello): removes.
+	* include/ruby/win32.h: removes declarations of rb_w32_ftello and
+	  rb_w32_fseeko.
+	* win32/Makefile.sub: removes '#define HAVE_FTELLO 1'.
 
-	* ext/tk/lib/multi-tk.rb: 'restart' method accepts arguments
+Sun May 12 15:51:47 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Mon Aug 30 21:50:14 2004  Dave Thomas  <dave@pragprog.com>
+	* configure.in: remove AC_CHECK_FUNC(close). It is not used from
+	  anywhere.
 
-	* object.c: Add RDoc for Module.included.
+Sun May 12 15:50:45 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Mon Aug 30 15:10:46 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* configure.in: adds comments for setjmp check.
 
-	* configure.in (GNU/k*BSD): fixed FTBFS on GNU/k*BSD. [ruby-dev:24051]
+Sun May 12 15:38:09 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Mon Aug 30 11:29:35 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in: move clock_gettime() check into regular place.
 
-	* win32/win32.c (CreateChild): strip trailing spaces. [ruby-dev:24143]
-	  merge from HEAD.
+Wed May  8 13:45:53 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Sun Aug 29 14:08:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* configure.in: add getenv() declaration check.
+	* dln_find.c: add HAVE_DECL_GETENV test.
 
-	* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]
+Sun May 12 15:33:18 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string does not work
+	* configure.in: sorts AC_CHECK_FUNCS()s as alphabetical order.
 
-Sat Aug 28 23:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed May  8 13:41:57 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* bignum.c (rb_big_and): protect parameters from GC.
-	  [ruby-talk:110664]
+	* bignum.c: remove redundant decl for big_lshift() big_rshift().
 
-Thu Aug 26 04:38:29 2004  Dave Thomas  <dave@pragprog.com>
+Sun May 12 16:06:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* eval.c (return_jump): Minor typo in error message. Now reads
-	  "return can't jump across threads".
+	* ext/socket/rubysocket.h (rsock_inspect_sockaddr): as r40646
+	  check HAVE_TYPE_STRUCT_SOCKADDR_DL.
 
-Tue Aug 24 17:30:00 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Sat May 11 23:01:58 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): do not
-	  use a session id as a filename. (backported from HEAD)
+	* ext/socket/rubysocket.h (HAVE_TYPE_STRUCT_SOCKADDR_DL):
+	  MSVC has struct sockaddr_dl, but its content is broken.
+	  http://ruby-mswin.cloudapp.net/vc10-x64/ruby-trunk/log/20130511T103938Z.log.html.gz
 
-	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): ditto.
+Sat May 11 22:07:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/cgi/session/pstore.rb (CGI::Session::PStore#initialize): use
-	  Dir::tmpdir. (backported from HEAD)
+	* test/rinda/test_rinda.rb: Socket.getifaddrs may returns an interface
+	  which #addr method returns nil for venet0 in OpenVZ.
 
-Tue Aug 24 14:40:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
+Sat May 11 21:56:34 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/cgi/session.rb (CGI::Session::FileStore#initialize): untaint
-	  session id after check. (backported from HEAD)
+	* ext/socket/raddrinfo.c (rsock_inspect_sockaddr): Add casts to
+	  suppress warnings.
 
-Tue Aug 24 09:09:01 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sat May 11 17:28:51 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): d2i
-	  functions may replace the pointer indicated by the first argument.
+	* ext/socket: New method, Socket.getifaddrs, implemented.
+	  [ruby-core:54777] [Feature #8368]
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
+Sat May 11 00:47:22 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto.
+	* gc.h (SET_MACHINE_STACK_END): Add !defined(_ILP32) to a defining
+	  condition to avoid compilation error on x32.
+	  https://sites.google.com/site/x32abi/
 
-Mon Aug 23 14:04:51 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri May 10 23:56:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read):
-	  - should return an empty string if specified length to read is 0.
-	  - should check for pending data and wait for fd before reading.
-	  - call underlying IO's sysread if SSL session is not started.
-	  [ruby-dev:24072], [ruby-dev:24075]
+	* parse.y (parser_peek_variable_name): treat invalid global, class,
+	  and instance variable names as mere strings rather than errors.
+	  [ruby-core:54885] [Bug #8375]
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_write):
-	  - call underlying IO's syswrite if SSL session is not started.
+Fri May 10 20:22:40 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_pending): new method
-	  OpenSSL::SSL#pending.
+	* configure.in: Move library checks into "Checks for libraries." part.
 
-	* ext/openssl/lib/openssl/buffering.rb: should not use select.
+Fri May 10 19:32:01 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon Aug 23 12:40:56 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* configure.in: Reformat arguments of AC_CHECK_HEADERS and
+	  AC_CHECK_FUNCS to track modifications easily.
 
-	* lib/resolv.rb (Config.default_config_hash): when multiple domains
-	  are set, Win32::Resolv.get_resolv_info returns Array.
+Fri May 10 12:01:36 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Aug 22 01:15:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* configure.in: Don't link librt if clock_gettime is available in
+	  the main C library.
+	  glibc 2.17 moves clock_* from librt to the main C library.
+	  http://sourceware.org/ml/libc-announce/2012/msg00001.html
 
-	* lib/webrick/httpproxy.rb (WEBrick::HTTPProxyServer#proxy_connect):
-	  should call :ProxyContentHandler before finishing CONNECT.
+Thu May  9 22:00:35 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Aug 21 06:41:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): controls_num should
+	  not be negative.
 
-	* ext/tcltklib/extconf.rb (find_tcl, find_tk): find stub library.
+Thu May  9 21:09:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (arg_config, with_config): deal with '-' and '_'
-	  uniformly.  [ruby-dev:24118]
+	* file.c, ext/etc/etc.c, ext/socket/unixsocket.c,
+	  ext/openssl/ossl.h, ext/openssl/openssl_missing.c: Use
+	  HAVE_AGGREGATE_MEMBER instead of HAVE_ST_MEMBER.
 
-Thu Aug 19 16:29:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu May  9 20:43:41 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option.
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): Always set
+	  controls_num to raise NotImplementedError appropriately.
+	  (bsock_recvmsg_internal): Raise NotImplementedError if
+	  :scm_rights=>true is given on platforms which don't have
+	  4.4BSD style control message.
 
-	* ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation.
+Thu May  9 12:06:07 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/menu.rb: typo bug.
+	* ext/socket/rubysocket.h, ext/socket/unixsocket.c,
+	  ext/socket/ancdata.c: Use HAVE_STRUCT_MSGHDR_MSG_CONTROL instead
+	  of HAVE_ST_MSG_CONTROL.
 
-Thu Aug 19 15:15:24 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu May  9 11:30:02 2013  Zachary Scott	 <zachary@zacharyscott.net>
 
-	* dir.c (free_dir): fix memory leak.  reported by yamamoto
-	  madoka.
+	* string.c: Add call-seq alias for String#=== [Bug #8381]
 
-Thu Aug 19 11:00:00 2004  Akiyoshi, Masamichi  <masamichi.akiyoshi@hp.com>
+Thu May  9 11:14:18 2013  Zachary Scott	 <zachary@zacharyscott.net>
 
-	* dln.c (dln_load): Modify to call lib$find_image_symbol for VMS.
-	* io.c (rb_io_fwrite): Use fputc() for VMS non-stream file.
+	* doc/contributing.rdoc: Add guide for contributing to CRuby
 
-Thu Aug 19 06:07:45 2004  why the lucky stiff  <why@ruby-lang.org>
+Thu May  9 04:55:49 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/syck/token.c: re2c no longer compiled with bit vectors.  caused
-	  problems for non-ascii characters. [ruby-core:03280]
-	* ext/syck/implicit.c: ditto.
-	* ext/syck/bytecode.c: ditto.
+	* configure.in: Check socket library again.  shutdown() is used in
+	  io.c.
 
-	* lib/yaml/baseemitter.rb: folding now handles double-quoted strings,
-	  fixed problem with extra line feeds at end of folding, whitespace
-	  opening scalar blocks.
+Thu May  9 01:52:31 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/yaml/rubytypes.rb: subtelties in handling strings with
-	  non-printable characters and odd whitespace patterns.
+	* configure.in: Don't check socketpair.  socketpair is not used in
+	  ruby command itself.
 
-Wed Aug 18 23:41:33 2004  Minero Aoki  <aamine@loveruby.net>
+Thu May  9 01:05:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/protocol.rb (rbuf_fill): OpenSSL::SSL::SSLSocket has its own
-	  buffer, select(2) might not work. [ruby-dev:24072]
+	* class.c (rb_mod_included_modules): should not include non-modules.
+	  [ruby-core:53158] [Bug #8025]
 
-Wed Aug 18 17:10:12 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed May  8 22:46:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call
-	  Tcl_FindExecutable() for Tcl/Tk 8.4.
+	* class.c (rb_mod_included_modules): should not include the original
+	  module itself.  [ruby-core:53158] [Bug #8025]
 
-Wed Aug 18 12:52:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May  8 17:43:55 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* eval.c (rb_obj_instance_eval): evaluates under special singleton
-	  classes as for special constants.
+	* io.c (rb_io_ext_int_to_encs): ignore internal encoding if external
+	  encoding is ASCII-8BIT. [Bug #8342]
 
-Tue Aug 17 17:20:59 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed May  8 13:49:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* io.c (rb_io_reopen): should clear allocated OpenFile.  pointed
-	  out by Guy Decoux. [ruby-core:03288]
+	* ext/json/generator/generator.c (isArrayOrObject): cast char to
+	  unsigned char. [Bug #8378]
 
-Tue Aug 17 01:36:32 2004  Dave Thomas  <dave@pragprog.com>
+Wed May  8 13:46:10 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rdoc/usage.rb: Remove extra indent. Tidy 'ri' option
-	  parsing so RDoc::usage plays better with OptionParser.
+	* ext/json/generator/depend: fix dependencies [Bug #8379]
 
-Sat Aug 14 13:09:10 2004  Minero Aoki  <aamine@loveruby.net>
+	* ext/json/parser/depend: ditto.
 
-	* lib/fileutils.rb: backport from CVS HEAD (rev1.44).
+Wed May  8 13:07:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/fileutils.rb: cp_r should copy symlink itself, except cp_r
-	  root.
+	* parse.y (parser_yylex): fail if $, @, @@ are not followed by a valid
+	  name character.  [ruby-core:54846] [Bug #8375].
 
-	* lib/fileutils.rb: new option mv :force.
+Wed May  8 13:06:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/fileutils.rb: new module FileUtils::DryRun.
+	* include/ruby/ruby.h (ISGRAPH): add missing macro.
 
-Sat Aug 14 02:48:16 2004  Dave Thomas  <dave@pragprog.com>
+Wed May  8 06:42:56 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rdoc/usage.rb: Added. Allows command line programs
-	  to report usage using their initial RDoc comment.
+	* ext/socket/socket.c (socket_s_ip_address_list): fix wrongly filled
+	  sin6_scope_id on KAME introduced by r40593 for OpenIndiana.
+	  KAME uses fe80:<scope_id>::<interface id> for link-local address
+	  internally.
+	  Setting sin6_scope_id causes it leaked.
+	  see also comments of sockaddr_obj().
 
-Fri Aug 13 13:23:17 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue May  7 22:12:34 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.parse_range_header):
-	  fix regex for range-spec.
+	* ext/readline/readline.c (insert_ignore_escape): Add a cast to
+	  unsigned char * before dereference.
+	  This suppress a warning on Cygwin.
 
-	* lib/webrick/httpservlet/filehandler.rb
-	  (WEBrick::HTTPServlet::DefaultFileHandler#make_partial_content):
-	  multipart/byteranges response was broken.
+Tue May  7 12:15:24 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/webrick/httpservlet/erbhandler.rb
-	  (WEBrick::HTTPServlet::ERBHandler#do_GET): should select media type
-	  by suffix of script filename.
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): Add a cast to
+	  suppress warning.
+	  Bionic defines socklen_t as int.
+	  Bionic defines msg_controllen as unsigned int (__kernel_size_t)
+	  instead of socklen_t as POSIX.
 
-	* lib/xmlrpc/server.rb: refine example code.
+Tue May  7 12:12:42 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Aug 11 17:17:50 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/socket/ancdata.c (ancillary_inspect): Don't call
+	  anc_inspect_ipv6_pktinfo if !HAVE_TYPE_STRUCT_IN6_PKTINFO.
+	  anc_inspect_ipv6_pktinfo is not defined in the case.
 
-	* configure.in (RPATHFLAG): stop setting RPATHFLAG on Interix.
+Tue May  7 12:10:52 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Aug  8 00:43:31 2004  why the lucky stiff  <why@ruby-lang.org>
+	* ext/socket/socket.c (socket_s_ip_address_list): Cast EXTRA_SPACE as
+	  int.  This suppress a warning.
 
-	* lib/implicit.c: added sexagecimal float#base60.
+Tue May  7 12:09:29 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/syck/rubyext.c (yaml_org_handler): ditto.
+	* ext/socket/extconf.rb: Set close_fds false for Cygwin.
+	  Cygwin doesn't support fd passing.
+	  This enables socket extension library cross-compilable by default.
 
-	* lib/token.c: indentation absolutely ignored when processing flow
-	  collections.  plain scalars are trimmed if indentation follows in
-	  an ambiguous flow collection.
+Tue May  7 12:07:35 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Aug  7 00:50:01 2004  Tanaka Akira  <akr@m17n.org>
+	* pack.c (swap32): Don't redefine it if it is already defined.
+	  Bionic defines it.
+	  (swap64): Ditto.
 
-	* ext/zlib/zlib.c: Zlib::GzipReader#read(0) returns "" instead of nil.
+Mon May  6 20:50:37 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Aug  3 13:49:20 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/socket/socket.c (socket_s_ip_address_list): Fill sin6_scope_id
+	  if getifaddrs() returns an IPv6 link local address which
+	  sin6_scope_id is zero, such as on OpenIndiana SunOS 5.11.
 
-	* ext/tk/lib/tk/namespace.rb: bug fix
+Sun May  5 18:56:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tkextlib/treectrl/tktreectrl.rb: add Tk::TreeCtrl.loupe
+	* insns.def (defined): use vm_search_superclass() like as normal super
+	  call.  based on a patch <https://gist.github.com/wanabe/5520026> by
+	  wanabe.
 
-Mon Aug  2 18:04:21 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* vm_insnhelper.c (vm_search_superclass): return error but not raise
+	  exceptions.
 
-	* ext/tk/lib/tk/msgcat.rb (set_translation): bug fix (fail to set
-	  trans_str to the same as src_str when trans_str is not given.)
+	* vm_insnhelper.c (vm_search_super_method): check the result of
+	  vm_search_superclass and raise exceptions on error.
 
-Mon Aug  2 11:53:06 2004  Dave Thomas  <dave@pragprog.com>
+Sun May  5 16:29:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): Fix infinite recursion
-	  looking up some top level symbols (batsman)
+	* insns.def (defined): get method entry from the method top level
+	  frame, not block frame.  [ruby-core:54769] [Bug #8367]
 
-Mon Aug  2 11:48:29 2004  Dave Thomas  <dave@pragprog.com>
+Sun May  5 13:28:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Allow '.'s in
-	  variable names to support SWIG generated files (Hans Fugal)
+	* template/ruby.pc.in (Cflags): use rubyarchhdrdir for multiarch.
+	  [Bug #7874]
 
-Sat Jul 31 17:40:16 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat May  4 07:20:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* misc/ruby-mode.el (ruby-expr-beg, ruby-parse-partial,
-	  ruby-calculate-indent, ruby-move-to-block, ruby-forward-sexp,
-	  ruby-backward-sexp): keywords must match word-wise.
+	* doc/security.rdoc: Add note about reporting security vulns
 
-Sat Jul 31 05:47:37 2004  why the lucky stiff  <why@ruby-lang.org>
+Sat May  4 04:13:27 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* lib/yaml.rb (YAML::load_file, YAML::parse_file): added.
+	* include/ruby/defines.h (RUBY_ATTR_ALLOC_SIZE): New for
+	  attribute((alloc_size(params))).
 
-	* lib/yaml/rubytypes.rb: exceptions were using an older
-	  YAML.object_maker. [ruby-core:03080]
+	* include/ruby/defines.h (xmalloc, xmalloc2, xcalloc)
+	(xrealloc, xrealloc2): Annotated by RUBY_ATTR_ALLOC_SIZE.
+	* include/ruby/ruby.h (rb_alloc_tmp_buffer): ditto.
 
-	* ext/syck/token.c (sycklex_yaml_utf8): using newline_len to
-	  handline CR-LFs.  "\000" was showing up on folded blocks which
-	  stopped at EOF.
+Fri May  3 19:32:13 2013  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
 
-	* ext/syck/token.c: re2c compiled with bit vectors now.
-	* ext/syck/implicit.c: ditto.
-	* ext/syck/bytecode.c: ditto.
+	* lib/cgi/util.rb: All class methods modulized.
+	  We can use these methods like a function when "include CGI::Util".
+	  [Feature #8354]
 
-Fri Jul 30 16:10:54 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri May  3 14:09:45 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tcltklib/tcltklib.c (lib_fromUTF8_core): raise ArgumentError when
-	  the unknown encoding name is given.
+	* ext/socket/extconf.rb: Make default_ipv6 true for Cygwin.
+	  Cygwin supports IPv6 since Cygwin 1.7.1 (2009-12).
+	  http://cygwin.com/ml/cygwin-announce/2009-12/msg00027.html
 
-	* ext/tcltklib/tcltklib.c (lib_toUTF8_core): ditto.
+Fri May  3 13:35:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertfrom): bug fix.
+	* ext/socket/{getaddrinfo,getnameinfo}.c: define socklen_t if not
+	  defined, e.g., older VC.
 
-	* ext/tk/lib/tk.rb (Tk::Encoding.encoding_convertto): ditto.
+Fri May  3 13:29:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jul 28 18:59:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* include/ruby/win32.h (INTPTR_MAX, INTPTR_MIN, UINTPTR_MAX): also
+	  should be defined when defining intptr_t and uintptr_t.
+	  bigdecimal.c requires the former two now.
 
-	* lib/cgi.rb (CGI::initialize): remove at_exit code for CGI_PARAMS
-	  and CGI_COOKIES.  they will no longer be used.
+Fri May  3 13:22:12 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Jul 28 01:04:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (poll_child_status): fix build error on older mingw.
 
-	* gc.c (run_final): wrong order of data. [ruby-dev:23984]
+Fri May  3 00:15:58 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-Tue Jul 27 07:05:04 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* common.mk: remove timestamps in distclean-ext realclean-ext.
 
-	* eval.c (rb_eval): copy on write for argument local variable
-	  assignment.
+Thu May  2 23:23:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (assign): ditto.
+	* object.c (rb_obj_is_kind_of): skip prepending modules.
+	  [ruby-core:54742] [Bug #8357]
 
-	* eval.c (rb_call0): update ruby_frame->argv with the default
-	  value used for the optional arguments.
+	* object.c (rb_class_inherited_p): ditto.
+	  [ruby-core:54736] [Bug #8357]
 
-	* object.c (Init_Object): "===" calls rb_obj_equal() directly.
-	  [ruby-list:39937]
+Thu May  2 22:11:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Jul 26 11:22:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* bin/irb: remove dead code from sample/irb.rb.
 
-	* lib/webrick/httputils.rb (WEBrick::HTTPUtils.escape): should
-	  escape space.
+Thu May  2 17:32:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Jul 25 11:05:21 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* marshal.c (copy_ivar_i): get rid of overwriting already copied
+	  instance variables.  c.f. [Bug #8276]
 
-	* win32/win32.{h,c} (rb_w32_{f,fd,fs}open): workaround for bcc32's
-	  {f,fd,fs}open bug. set errno EMFILE and EBADF. [ruby-dev:23963]
+Thu May  2 16:55:43 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Jul 24 13:32:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* thread.c (id_locals): use cached ID.
 
-	* range.c (rb_range_beg_len): returns Qnil only when "beg" points
-	  outside of a range.  No boundary check for "end".
+	* vm.c (ruby_thread_init): ditto.
 
-Fri Jul 23 16:40:25 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* defs/id.def: add more predefined IDs used in core.
 
-	* gc.c (define_final): should not disclose NODE* to Ruby world.
-	  [ruby-dev:23957]
+Thu May  2 13:42:42 2013  Ryan Davis  <ryand-ruby@zenspider.com>
 
-Fri Jul 23 09:03:16 2004  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/minitest/*: Imported minitest 4.7.4 (r8483)
+	* test/minitest/*: ditto
 
-	* lib/net/imap.rb (disconnected?): new method. (backported from HEAD)
+Thu May  2 11:32:22 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Thu Jul 22 16:41:54 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/win32.c (poll_child_status): [experimental] set the cause of
+	  a child's death to status if its exitcode seems to be an error.
 
-	* lib/cgi/session.rb (CGI::Session::FileStore#update): sets the
-	 permission of the session data file to 0600.
+	* test/ruby/test_process.rb (TestProcess#test_no_curdir): maybe now
+	  we can test it.
 
-	* lib/cgi/session/pstore.rb (CGI::Session::Pstore#initialize):
+	* test/ruby/test_thread.rb (TestThread#test_thread_timer_and_interrupt):
 	  ditto.
 
-Thu Jul 22 00:02:21 2004  Masahiro Kitajima  <katonbo@katontech.com>
-
-	* process.c (rb_f_system): not need to call last_status_set() any
-	  longer on _WIN32.
-
-Tue Jul 20 09:15:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* test/fileutils/test_fileutils.rb: File.link raises EINVAL on BeOS.
-
-Mon Jul 19 01:15:07 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservlet/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIhandler#do_GET): set SystemRoot environment
-	  variable to CGI process on Windows native platforms. [ruby-dev:23936]
-
-	* lib/webrick/httpservlet/cgihandler.rb
-	  (WEBrick::HTTPServlet::CGIhandler#do_GET): use $?.exitstatus and
-	  refine log message.
-
-Sun Jul 18 16:14:29 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/msgcat.rb (TkMsgCatalog.callback): bug fix
-	  ( wrong number of argument )
-
-Sun Jul 18 08:13:58 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): remove extra sign digit.
-
-Sun Jul 18 03:21:42 2004  Akinori MUSHA  <knu@iDaemons.org>
-
-	* dir.c (range): use NULL instead of 0.
-
-	* dir.c (range): get rid of a gcc 3.4 warning.
-
-Sun Jul 18 03:12:11 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (receive_responses): return if a LOGOUT response
-	  received. (backported from HEAD)
-	* lib/net/imap.rb (send_string_data): wait command continuation
-	  requests before sending octet data of literals. (backported from HEAD)
-
-Sat Jul 17 23:54:59 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk/variable.rb: TkVariable#ref returns a TkVariable object
-
-Sat Jul 17 22:04:44 2004  akira yamada  <akira@ruby-lang.org>
-
-	* lib/uri/ldap.rb: method hierarchical? should be in URI::LDAP.
-
-Sat Jul 17 18:29:07 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt): not to show same error messages twice.
-
-Sat Jul 17 13:13:32 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/ruby-lex.rb (RubyLex::identify_string): %s string do not
-	  process expression interpolation.  [ruby-talk:106691]
-
-Sat Jul 17 05:26:27 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/diagram.rb: Incorporate Micheal Neuman's
-	  client-side imagemao patch
-
-Sat Jul 17 01:57:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (THREAD_ALLOC): th->thread should be initialized to NULL.
-	  [ruby-talk:106657]  The solution was found by Guy Decoux.
-
-Fri Jul 16 22:30:28 2004  Michael Neumann  <mneumann@ntecs.de>
-
-	* file.c (rb_stat_dev_major): new methods File::Stat#dev_major and
-	  #dev_minor. [ruby-core:03195]
-
-Fri Jul 16 15:23:53 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (return_jump, break_jump): raise unexpceted local jump
-	  exception directly.  [ruby-dev:23740]
-
-	* lib/base64.rb (Deprecated): super in bound method calls original
-	  name method in stable version.  [ruby-dev:23916]
-
-Fri Jul 16 11:31:49 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/test/unit/ui/{fox,gtk,gtk2}/testrunner.rb: remove
-	  garbage (patch from akira yamada) [ruby-dev:23911]
-
-Fri Jul 16 11:20:00 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): fix output of NaN, Inf and -Inf with
-	  "%f" or etc on MSVCRT platforms. (backported from HEAD)
-
-Fri Jul 16 11:17:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* error.c (exit_initialize): use EXIT_SUCCESS instead of 0.
-	  [ruby-dev:23913]
-
-	* error.c (exit_success_p): new method SystemExit#success?.
-	  [ruby-dev:23912]
-
-	* error.c (syserr_initialize): initialization for subclasses.
-	  [ruby-dev:23912]
-
-Thu Jul 15 23:53:38 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (OptionParser#warn, OptionParser#abort): Exception
-	  no longer has to_str method.
-
-Thu Jul 15 22:59:48 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* ext/readline/extconf.rb: added dir_config for curses, ncurses,
-	  termcap. (backported from HEAD)
-
-Thu Jul 15 20:29:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* class.c, error.c, eval.c, intern.h, object.c, variable.c:
-	  do not set path if it is a singleton class.  [ruby-dev:22588]
-	  (backport from 1.9)
-
-Thu Jul 15 10:15:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/, ext/tcltklib/: bug fix
-
-	* ext/tk/lib/tk.rb: better operation for SIGINT when processing
-	  callbacks.
-	* ext/tk/lib/tk/msgcat.rb: ditto.
-	* ext/tk/lib/tk/variable.rb: ditto.
-	* ext/tk/lib/tk/timer.rb: ditto.
-
-	* ext/tk/lib/tk/validation.rb: add Tk::ValidateConfigure.__def_validcmd
-	  to define validatecommand methods easier
-
-	* ext/tk/lib/tk.rb (_genobj_for_tkwidget): support autoload Tk ext
-	  classes
-
-	* ext/tk/lib/tk/canvas.rb and so on: remove the parent widget type
-	  check for items (e.g. canvas items; depends on the class) to
-	  avoid some troubles on Tk extension widget class definition.
-
-	* ext/tk/lib/tkextlib/: add Iwidget and TkTable extension support
-
-	* ext/tk/sample/tkextlib/: add samples of Iwidget and TkTable
-
-Wed Jul 14 18:08:37 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_asn1cons_to_der): fix type of
-	  argument. [ruby-dev:23891]
-
-	* test/openssl/test_x509store.rb: prune tests for CRL checking
-	  unless X509::V_FLAG_CRL_CHECK is defined.
-
-Wed Jul 14 12:29:07 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* util.c (ruby_strtod): should not convert string in the form of
-	  "-I.FE-X" which both "I" and "F" are ommitted. [ruby-dev:23883]
-
-	* test/ruby/test_float.rb (test_strtod): add test for bug fix.
-
-Wed Jul 14 00:31:15 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* array.c: rdoc patch. merged patch from Johan Holmberg
-	  <holmberg@iar.se> [ruby-core:3170]
-
-Tue Jul 13 19:39:12 2004  akira yamada  <akira@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic#merge_path):
-	  "URI('http://www.example.com/foo/..') + './'" should return
-	  "URI('http://www.example.com/')".  [ruby-list:39838]
-	  "URI('http://www.example.com/') + './foo/bar/..'" should return
-	  "URI('http://www.example.com/foo/')".  [ruby-list:39844]
-
-	* test/uri/test_generic.rb (TestGeneric#test_merge): added tests.
-
-Tue Jul 13 15:51:45 2004  Akinori MUSHA  <knu@iDaemons.org>
-
-	* lib/mkmf.rb (init_mkmf): Do not add $(libdir) to $LIBPATH in
-	   extmk mode.
-
-	* lib/mkmf.rb (dir_config): Prepend a new library path instead of
-	  appending so it is tried first.
-
-Tue Jul 13 00:50:48 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb: Support call-seq: for Ruby files.
-
-Mon Jul 12 21:20:36 2004  Dave Thomas  <dave@pragprog.com>
-
-	* html_generator.rb: Support hyperlinks of the form {any text}[xxx]
-	  as well as stuff[xxx]
-
-Sat Jul 10 09:30:24 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/soap/marshal/test_struct.rb: use qualified build-tin class name
-	  (::Struct) to avoid name crash.
-
-Sat Jul 10 04:21:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: better operation for SIGINT when processing
-	  callbacks.
-	* ext/tk/lib/tk/msgcat.rb: ditto.
-	* ext/tk/lib/tk/variable.rb: ditto.
-	* ext/tk/lib/tk/timer.rb: ditto.
-
-	* ext/tk/lib/tk/validation.rb (__def_validcmd):  add a module
-	  function of Tk::ValidateConfigure to define validatecommand
-	  methods easier
-
-Fri Jul  9 22:36:36 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* array.c, enum.c, pack.c: rdoc patch from Johan Holmberg
-	  <holmberg@iar.se> [ruby-core:3132] [ruby-core:3136]
-
-	* numeric.c: rdoc patch.
-
-Fri Jul  9 19:26:39 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (URI::HTTPS#proxy_open): raise ArgumentError to
-	  notice https is not supported.
-
-Fri Jul  9 14:28:54 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_raise): accept third argument as well as
-	  Kernel#raise, and evaluate the arguments to create an exception in
-	  the caller's context.  [ruby-talk:105507]
-
-Fri Jul  9 01:47:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib : bug fix
-	* ext/tk/lib/tkextlib/itcl : add [incr Tcl] support
-	* ext/tk/lib/tkextlib/itk  : add [incr Tk] support
-	* ext/tk/lib/tkextlib/iwidgets : midway point of [incr Widgets] support
-	* ext/tk/sample/tkextlib/iwidgets : very simple examples of
-	  [incr Widgets]
-
-Thu Jul  8 22:52:19 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/{rss,parser,0.9,1.0,2.0}.rb: supported RSS 0.9x/2.0
-	  validation and validation which disregard order of elements.
-	* test/rss/test_parser.rb: added tests for RSS 0.9x/2.0
-	  validation.
-	* test/rss/{test_trackback,rss-testcase}.rb: fixed no good method
-	  name.
-
-Thu Jul  8 00:05:23 2004  akira yamada  <akira@ruby-lang.org>
-
-	* lib/tempfile.rb (Tempfile::initialize): got out code of
-	  generating tmpname.  [ruby-dev:23832][ruby-dev:23837]
-
-Wed Jul  7 15:53:14 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* string.c (rb_str_match): raise TypeError when both arguments are
-	  strings. [ruby-dev:22869] (backported from HEAD)
-
-	* string.c (rb_str_match2): removed.
-
-	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
-	  wince/Makefile.sub (string.c): now not depend on version.h.
-
-Wed Jul  7 00:48:34 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/tktrans.rb,
-	  ext/tk/lib/tkextlib/treectrl.rb: fix syntax errors.
-
-Tue Jul  6 18:38:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib : improve framework of developping Tcl/Tk extension
-	  wrappers
-
-Mon Jul  5 23:56:42 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/{trackback,syndication,dublincore,content}.rb: worked
-	  with ruby 1.6 again.
-
-	* test/rss/rss-assertions.rb: ditto.
-
-Mon Jul  5 22:54:39 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/uri/common.rb (Kernel#URI): new global method for parsing URIs.
-
-Mon Jul  5 09:02:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_thread_yield, rb_f_catch): 4th argument to rb_yield_0()
-	  is a set of bit flags.  [ruby-dev:23859]
-
-Mon Jul  5 01:27:32 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* lib/drb/drb.rb(DRbConn self.open): If socket pool is full, close
-	  the socket whose last-access-time is oldest. (and add new one)
-	  [ruby-dev:23860]
-
-Sun Jul  4 12:24:50 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* lib/rss/rss.rb: added copyright header.
-
-Sun Jul  4 00:24:40 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* added files
-	  * lib/soap/attachment.rb
-	  * lib/soap/header
-	  * lib/soap/mimemessage.rb
-	  * lib/soap/rpc/httpserver.rb
-	  * lib/wsdl/soap/cgiStubCreator.rb
-	  * lib/wsdl/soap/classDefCreator.rb
-	  * lib/wsdl/soap/classDefCreatorSupport.rb
-	  * lib/wsdl/soap/clientSkeltonCreator.rb
-	  * lib/wsdl/soap/driverCreator.rb
-	  * lib/wsdl/soap/mappingRegistryCreator.rb
-	  * lib/wsdl/soap/methodDefCreator.rb
-	  * lib/wsdl/soap/servantSkeltonCreator.rb
-	  * lib/wsdl/soap/standaloneServerStubCreator.rb
-	  * lib/wsdl/xmlSchema/enumeration.rb
-	  * lib/wsdl/xmlSchema/simpleRestriction.rb
-	  * lib/wsdl/xmlSchema/simpleType.rb
-	  * lib/xsd/codegen
-	  * lib/xsd/codegen.rb
-	  * sample/soap/authheader
-	  * sample/soap/raa2.4
-	  * sample/soap/ssl
-	  * sample/soap/swa
-	  * sample/soap/whois.rb
-	  * sample/soap/calc/samplehttpd.conf
-	  * sample/soap/exchange/samplehttpd.conf
-	  * sample/soap/sampleStruct/samplehttpd.conf
-	  * sample/wsdl/raa2.4
-	  * sample/wsdl/googleSearch/samplehttpd.conf
-	  * test/openssl/_test_ssl.rb
-	  * test/soap/header
-	  * test/soap/ssl
-	  * test/soap/struct
-	  * test/soap/swa
-	  * test/soap/wsdlDriver
-	  * test/wsdl/multiplefault.wsdl
-	  * test/wsdl/simpletype
-	  * test/wsdl/test_multiplefault.rb
-
-	* modified files
-	  * lib/soap/baseData.rb
-	  * lib/soap/element.rb
-	  * lib/soap/generator.rb
-	  * lib/soap/marshal.rb
-	  * lib/soap/netHttpClient.rb
-	  * lib/soap/parser.rb
-	  * lib/soap/processor.rb
-	  * lib/soap/property.rb
-	  * lib/soap/soap.rb
-	  * lib/soap/streamHandler.rb
-	  * lib/soap/wsdlDriver.rb
-	  * lib/soap/encodingstyle/handler.rb
-	  * lib/soap/encodingstyle/literalHandler.rb
-	  * lib/soap/encodingstyle/soapHandler.rb
-	  * lib/soap/mapping/factory.rb
-	  * lib/soap/mapping/mapping.rb
-	  * lib/soap/mapping/registry.rb
-	  * lib/soap/mapping/rubytypeFactory.rb
-	  * lib/soap/mapping/wsdlRegistry.rb
-	  * lib/soap/rpc/cgistub.rb
-	  * lib/soap/rpc/driver.rb
-	  * lib/soap/rpc/element.rb
-	  * lib/soap/rpc/proxy.rb
-	  * lib/soap/rpc/router.rb
-	  * lib/soap/rpc/soaplet.rb
-	  * lib/soap/rpc/standaloneServer.rb
-	  * lib/wsdl/data.rb
-	  * lib/wsdl/definitions.rb
-	  * lib/wsdl/operation.rb
-	  * lib/wsdl/parser.rb
-	  * lib/wsdl/soap/definitions.rb
-	  * lib/wsdl/xmlSchema/complexContent.rb
-	  * lib/wsdl/xmlSchema/complexType.rb
-	  * lib/wsdl/xmlSchema/data.rb
-	  * lib/wsdl/xmlSchema/parser.rb
-	  * lib/wsdl/xmlSchema/schema.rb
-	  * lib/xsd/datatypes.rb
-	  * lib/xsd/qname.rb
-	  * sample/soap/calc/httpd.rb
-	  * sample/soap/exchange/httpd.rb
-	  * sample/soap/sampleStruct/httpd.rb
-	  * sample/soap/sampleStruct/server.rb
-	  * sample/wsdl/amazon/AmazonSearch.rb
-	  * sample/wsdl/amazon/AmazonSearchDriver.rb
-	  * sample/wsdl/googleSearch/httpd.rb
-	  * test/soap/test_basetype.rb
-	  * test/soap/test_property.rb
-	  * test/soap/test_streamhandler.rb
-	  * test/soap/calc/test_calc.rb
-	  * test/soap/calc/test_calc2.rb
-	  * test/soap/calc/test_calc_cgi.rb
-	  * test/soap/helloworld/test_helloworld.rb
-	  * test/wsdl/test_emptycomplextype.rb
-	  * test/wsdl/axisArray/test_axisarray.rb
-	  * test/wsdl/datetime/test_datetime.rb
-	  * test/wsdl/raa/test_raa.rb
-	  * test/xsd/test_xmlschemaparser.rb
-	  * test/xsd/test_xsd.rb
-
-	* summary
-	  * add SOAP Header mustUnderstand support.
-
-	  * add HTTP client SSL configuration and Cookies support (works
-	    completely with http-access2).
-
-	  * add header handler for handling sending/receiving SOAP Header.
-
-	  * map Ruby's anonymous Struct to common SOAP Struct in SOAP Object
-	    Model.  it caused error.
-
-	  * add WSDL simpleType support to restrict lexical value space.
-
-	  * add SOAP with Attachment support.
-
-Sat Jul  3 17:19:44 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/tk/lib/tkextlib/tkDND.rb: fix syntax error.
-
-Thu Jul  1 23:15:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/pstore.rb (transaction): safer backup scheme.  [ruby-list:39102]
-
-	* lib/pstore.rb (commit_new): use FileUtils.copy_stream for Cygwin.
-	  [ruby-dev:23157]
-
-	* lib/pstore.rb (transaction): allow overriding dump and load.
-	  [ruby-dev:23567]
-
-	* lib/pstore.rb (PStore#transaction): get rid of opening in write mode
-	  when read only transaction.  [ruby-dev:23842]
-
-	* lib/yaml/store.rb: follow lib/pstore.rb's change.
-
-Thu Jul  1 18:36:08 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tcltklib : bug fix
-
-	* ext/tk/lib/tk : bug fix and add Tcl/Tk extension support libraries
-
-Thu Jul  1 11:59:45 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: check for EVP_CIPHER_CTX_copy, ENGINE_add,
-	  EVP_CIPHER_CTX_set_padding, EVP_CipherFinal_ex, EVP_CipherInit_ex,
-	  EVP_DigestFinal_ex and EVP_DigestInit_ex.
-
-	* ext/openssl/openssl_missing.c (EVP_CIPHER_CTX_copy): new function.
-
-	* ext/openssl/openssl_missing.h (EVP_DigestInit_ex, EVP_DigestFinal_ex,
-	  EVP_CipherInit_ex, EVP_CipherFinal_ex, HMAC_Init_ex): new macro for
-	  OpenSSL 0.9.6.
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_encrypt, ossl_cipher_decrypt):
-	  re-implemnt (the arguments for this method is ).
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_pkcs5_keyivgen): new method
-	  OpenSSL::Cipher::Cipher#pkcs5_keyivgen. it calls EVP_BytesToKey().
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_alloc, ossl_cipher_initialize,
-	  ossl_cipher_copy, ossl_cipher_reset ossl_cipher_final,
-	  ossl_cipher_set_key, ossl_cipher_set_iv): replace all EVP_CipherInit
-	  and EVP_CipherFinal into EVP_CipherInit_ex and EVP_CipherFinal_ex.
-	  and EVP_CIPHER_CTX_init should only be called once.
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_set_key_length): new method
-	  OpenSSL::Cipher::Cipher#key_len=.
-
-	* ext/openssl/ossl_cipher.c (ossl_cipher_init_deprecated): new
-	  finction; print warning for Cipher#<<.
-
-	* ext/openssl/ossl_digest.c: replace all EVP_DigestInit and
-	  EVP_DigestFinal into EVP_DigestInit_ex and EVP_DigestFinal_ex.
-	  and EVP_MD_CTX_init should only be called once.
-
-	* ext/openssl/ossl_digest.c (digest_final): should call
-	  EVP_MD_CTX_cleanup to avoid memory leak.
-
-	* ext/openssl/ossl_hmac.c (ossl_hmac_initialize): repalce HMAC_init
-	  into HMAC_init_ex. and HMAC_CTX_init is moved to ossl_hmac_alloc.
-
-	* ext/openssl/ossl_hmac.c (hmac_final): should call
-	  HMAC_CTX_cleanup to avoid memory leak.
-
-	* test/openssl/test_cipher.rb, test/openssl/test_digest.rb,
-	  test/openssl/test_hmac.rb: new file.
-
-Thu Jul  1 04:08:30 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (ossl_i2d_ASN1_TYPE, ossl_ASN1_TYPE_free):
-	  workaround for the versions earlier than OpenSSL-0.9.7.
-
-Thu Jul  1 03:33:55 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_initialize): should create
-	  empty pkey object if no argument is passed. [ruby-talk:103328]
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_initialize): ditto.
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_initialize): ditto.
-
-	* ext/openssl/ossl_pkey_dh.c: add new methods: OpenSSL::PKey::DH#p,
-	  OpenSSL::PKey::DH#p=, OpenSSL::PKey::DH#g, OpenSSL::PKey::DH#g=,
-	  OpenSSL::PKey::DH#pub_key, OpenSSL::PKey::DH#pub_key=,
-	  OpenSSL::PKey::DH#priv_key and OpenSSL::PKey::DH#priv_key=.
-
-	* ext/openssl/ossl_pkey_dsa.c: add new methods: OpenSSL::PKey::DSA#p,
-	  OpenSSL::PKey::DSA#p=, OpenSSL::PKey::DSA#q, OpenSSL::PKey::DSA#q=,
-	  OpenSSL::PKey::DSA#g, OpenSSL::PKey::DSA#g=,
-	  OpenSSL::PKey::DSA#pub_key, OpenSSL::PKey::DSA#pub_key=,
-	  OpenSSL::PKey::DSA#priv_key and OpenSSL::PKey::DSA#priv_key=.
-
-Thu Jul  1 03:16:09 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read): take optional second argument
-	  to specify a string to be written.
-
-	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#read):
-	  take optional second argument to specify a string to be written.
-
-	* ext/openssl/lib/openssl/buffering.rb (OpenSSL::Buffering#gets):
-	  refine regexp for end-of-line.
-
-	* ext/opnessl/lib/openssl/ssl.rb
-	  (OpenSSL::SSL::SocketForwarder#listen): fix typo.
-
-Wed Jun 30 11:38:51 2004  Mikael Brockman  <phubuh@phubuh.org>
-
-	* parse.y (primary): should not be NULL.  [ruby-core:03098]
-
-Wed Jun 30 02:53:24 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_emitter_new): set buffer after
-	  Data_Wrap_Struct to avoid possible GC. [ruby-talk:104835]
-
-Tue Jun 29 10:31:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval_cmd, rb_thread_trap_eval): restore safe level.
-
-	* gc.c (define_final, run_final): preserve and restore safe level for
-	  finalizers.  [ruby-core:03058]
-
-	* signal.c (signal_exec, rb_trap_exit, trap): preserve and restore
-	  safe level for signal handlers.  [ruby-dev:23829]
-
-Mon Jun 28 14:57:56 2004  Jeff Mitchell  <quixoticsycophant@yahoo.com>
-
-	* configure.in, lib/mkmf.rb (LIBPATHFLAG): use double quotes due to
-	  DOSISH compilers.  [ruby-core:03107]
-
-Mon Jun 28 00:30:19 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* sample/drb/*.rb: using 'DRb.thread.join' instead of 'gets'
-
-Sun Jun 27 22:39:51 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* sample/rss/tdiary_plugin/rss-recent.rb: supported Hiki.
-
-Sun Jun 27 12:19:46 2004  Kouhei Sutou  <kou@cozmixng.org>
-
-	* {lib,sample,test}/rss: added RSS Parser. [ruby-dev:23780]
-
-Sat Jun 26 11:07:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (aix): -b must come at the start of the command line,
-	  and -e must not appear while testing libraries.  [ruby-talk:104501]
-
-	* lib/mkmf.rb (dir_config): quote directory names if necessary.
-	  [ruby-talk:104505]
-
-Fri Jun 25 15:33:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/extconf.rb: check stricter.  [ruby-talk:104501]
-
-	* ext/iconv/extconf.rb: include iconv.h for libiconv.  [ruby-dev:22715]
-
-Fri Jun 25 08:31:29 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_atfork): remove "fork terminates thread"
-	  warning.  [ruby-dev:23768]
-
-	* object.c (rb_obj_clone): backport FL_FINALIZE patch from 1.9.
-	  [ruby-core:02786][ruby-core:03067]
-
-	* ext/socket/socket.c (sock_sockaddr): Socket#gethostbyname()
-	  should give us packed address, not struct sockaddr.
-	  [ruby-core:03053]
-
-Fri Jun 25 02:04:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* {bcc32,win32,wince}/setup.mak: remove RUBY_EXTERN lines when
-	  including version.h. [ruby-talk:104456] (backported from HEAD)
-
-Thu Jun 24 14:23:29 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_fread): return already read data when system call is
-	  interrupted.  [ruby-talk:97206]
-
-Thu Jun 24 01:32:43 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* version.h: added declarations of ruby_version,
-	  ruby_release_date, ruby_platform.
-	  (backported from HEAD)
-
-Wed Jun 23 22:23:37 2004  Dave Thomas  <dave@pragprog.com>
-
-	* ext/socket/socket.c (sock_s_gethostbyaddr): Work around problem
-	  with OS X not returning 'from' parameter to recvfrom for
-	  connection-oriented sockets.
-
-Wed Jun 23 01:45:27 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_quotation):
-	  Fix problem with the 'r' being dropped from %r{xxx}
-
-Wed Jun 23 00:20:20 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* ext/win32ole/win32ole.c (ole_hresult2msg): remove trailing
-	  CRs and LFs. (doesn't depend on CR+LF) [ruby-dev:23749]
-
-Wed Jun 23 00:00:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (rb_io_initialize): should check fcntl result.  [ruby-dev:23742]
-
-Tue Jun 22 21:11:36 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c (OLE_FREE): should not call CoFreeUnuse-
-	  dLibraries().
-
-	* ext/win32ole/win32ole.c (ole_event_free): ditto.
-
-	* ext/win32ole/win32ole.c (ole_hresult2msg): truncate error message
-	  before CR.
-
-Tue Jun 22 16:47:42 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/ftp.rb (MDTM_REGEXP): fix for demon's ftp server.
-	  Thanks, Rutger Nijlunsing.
-
-Mon Jun 21 10:19:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_opendir): use FindFirstFile()/FindNextFile()/
-	  FindClose() instead of _findfirst()/_findnext()/_findclose().
-	  merge from HEAD.
-
-Sat Jun 19 13:24:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (method_call): allow changing $SAFE.  [ruby-dev:23713]
-
-Fri Jun 18 23:12:22 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (proc_save_safe_level, rb_set_safe_level, safe_setter): limit
-	  safe level.
-
-Wed Jun 16 23:05:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* object.c (rb_mod_freeze): prepare string representation before
-	  freezing. [ruby-talk:103646]
-
-Wed Jun 16 16:04:40 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* object.c (rb_mod_le): singleton class inherits Class rather than its
-	  object's class.  [ruby-dev:23690]
-
-Wed Jun 16 16:01:17 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* gc.c (stack_grow_direction): memoize the direction.
-
-	* gc.c (Init_stack): should always move to end of VALUE.
-
-Tue Jun 15 12:10:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bug fix (TkWindow#grab)
-
-Mon Jun 14 18:23:27 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/remote-tk.rb: bug fix
-
-Sun Jun 13 00:23:04 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/extconf.rb: [EXPERIMENTAL] MacOS X (darwin) support
-
-	* ext/tcltklib/tcltklib.c: fix thread trouble on callback proc, and
-	  eliminate warning about instance variable access
-
-	* ext/tk/lib/tk/menubar.rb: improve supported menu_spec
-
-	* ext/tk/lib/tk/menuspec.rb: [add] menu_spec support library
-
-	* ext/tk/lib/tk/root.rb: add menu_spec support
-
-	* ext/tk/lib/tk/text.rb: bug fix
-
-	* ext/tk/lib/tk/toplevel.rb: add menu_spec support
-
-	* ext/tk/sample/menubar?.rb: [add] sample of menu_spec usage
-
-Sat Jun 12 11:15:53 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (target_os): strip -gnu suffix on Linux.
-
-Fri Jun 11 17:08:21 2004  Akinori MUSHA  <knu@iDaemons.org>
-
-	* config.guess: Restore a wrongly removed hyphen.
-
-Fri Jun 11 14:30:08 2004  Akinori MUSHA  <knu@iDaemons.org>
-
-	* config.guess: Attempt to avoid system name change on
-	  Darwin platforms also.
-
-Fri Jun 11 14:22:45 2004  Akinori MUSHA  <knu@iDaemons.org>
-
-	* config.guess, config.sub: Attempt to avoid system name change on
-	  Linux platforms.  We have been using "linux" instead of
-	  "linux-gnu" on this branch.
-
-Thu Jun 10 19:19:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
-	  [ruby-talk:103062]
-
-Wed Jun  9 18:04:14 2004  akira yamada  <akira@ruby-lang.org>
-
-	* lib/uri/generic.rb (URI::Generic::merge,
-	  URI::Generic::route_from): accepts non-hierarchical URI.
-	  [ruby-dev:23631]
-
-	* test/uri/test_generic.rb (TestGeneric::test_route,
-	  TestGeneric::test_merge): added tests for above changes.
-
-Wed Jun  9 17:39:37 2004  Akinori MUSHA  <knu@iDaemons.org>
-
-	* config.guess, config.sub: Update to a more recent version as of
-	  2004-01-20.
-
-	* configure.in: Add support for DragonFly BSD.
-
-Wed Jun  2 20:16:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* string.c (str_new4): should share shared instance if it already
-	  exists.  [ruby-dev:23665]
-
-Wed Jun  2 12:41:53 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_gets_m): set lastline ($_) even when read line is
-	  nil.  [ruby-dev:23663]
-
-Fri May 28 11:20:31 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval): bad influence on frame node.
-
-	* eval.c (eval): reverted wrongly removed condition.  [ruby-dev:23638]
-
-Thu May 27 23:15:18 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb: leading 0 padding of timestamp usec part.
-
-	* lib/csv.rb (CSV.parse): [CAUTION] behavior changed.  in the past,
-	  CSV.parse accepts a filename to be read-opened (it was just a
-	  shortcut of CSV.open(filename, 'r')).  now CSV.parse accepts a
-	  string or a stream to be parsed e.g.
-	  CSV.parse("1,2\n3,r") #=> [['1', '2'], ['3', '4']]
-
-	* lib/csv.rb: CSV::Row and CSV::Cell are deprecated.  these classes
-	  are removed in the future.  in the new csv.rb, row is represented
-	  as just an Array.  since CSV::Row was a subclass of Array, it won't
-	  hurt almost all programs except one which depended CSV::Row#match.
-	  and a cell is represented as just a String or nil(NULL).  this
-	  change will cause widespread destruction.
-
-	      CSV.open("foo.csv", "r") do |row|
-		row.each do |cell|
-		  if cell.is_null       # using Cell#is_null
-		    p "(NULL)"
-		  else
-		    p cell.data         # using Cell#data
-		  end
-		end
-	      end
-
-	    must be just;
-
-	      CSV.open("foo.csv", "r") do |row|
-		row.each do |cell|
-		  if cell.nil?
-		    p "(NULL)"
-		  else
-		    p cell
-		  end
-		end
-	      end
-
-	* lib/csv.rb: [CAUTION] record separator(CR, LF, CR+LF) behavior
-	  change.  CSV.open, CSV.parse, and CSV,generate now do not force
-	  opened file binmode.  formerly it set binmode explicitly.
-
-	  with CSV.open, binmode of opened file depends the given mode
-	  parameter "r", "w", "rb", and "wb".  CSV.parse and CSV.generate open
-	  file with "r" and "w".
-
-	  setting mode properly is user's responsibility now.
-
-	* lib/csv.rb: accepts String as a fs (field separator/column separator)
-	  and rs (record separator/row separator)
-
-	* lib/csv.rb (CSV.read, CSV.readlines): added.  works as IO.read and
-	  IO.readlines in CSV format.
-
-	* lib/csv.rb: added CSV.foreach(path, rs = nil, &block).  CSV.foreach
-	  now does not handle "| cmd" as a path different from IO.foreach.
-	  needed?
-
-	* test/csv/test_csv.rb: updated.
-
-	* test/ruby/test_float.rb: added test_strtod to test Float("0").
-
-Thu May 27 21:37:50 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (Pathname#initialize): refine pathname initialization
-	  by pathname.
-
-Thu May 27 20:22:05 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* io.c (rb_io_fwrite): check all case errno != 0 [ruby-dev:23648]
-
-Thu May 27 14:53:13 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (rb_io_fwrite): workaround for bcc32's fwrite bug.
-	  add errno checking.  [ruby-dev:23627]
-
-Wed May 26 14:19:42 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval, eval): make line number consistent on eval with
-	  Proc.  [ruby-talk:101253]
-
-Wed May 26 13:59:17 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::skip_for_variable): Allow for
-	  'do' after for statement
-
-Wed May 26 13:56:03 2004  Dave Thomas  <dave@pragprog.com>
+Thu May  2 11:24:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/rdoc/generators/html_generator.rb (Generators::MarkUp::style_url): Fix
-	  relative path to code CSS file
+	* lib/yaml.rb: nodoc EngineManager, add History doc #8344
 
-Wed May 26 13:14:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed May  1 21:11:17 2013  Tanaka Akira  <akr@fsij.org>
 
-	* io.c (rb_io_init_copy): copy also positions.  [ruby-talk:100910]
+	* time.c (localtime_with_gmtoff_zone): musl libc may return NULL for
+	  tm_zone.
 
-Wed May 26 00:00:00 2004  why the lucky stiff  <why@ruby-lang.org>
+Wed May  1 18:59:36 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* ext/syck/syck.c (syck_new_parser): clear parser on init.
-	  thanks, ts. [ruby-core:02931]
+	* enum.c (Enumerable#chunk): fix grammar of error message
+	  for symbols beginning with an underscore [Bug #8351]
 
-	* ext/syck/token.c (sycklex_yaml_utf8): buffer underflow.
-	  thanks, ts. [ruby-core:02929]
+Wed May  1 16:47:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/yaml/baseemitter.rb (indent_text): simpler flow block code.
+	* ext/curses/extconf.rb (curses_version): try once for each tests, a
+	  function or a variable.  fallback to variable for old SVR4.
 
-	* lib/yaml.rb: added rdoc to beginning of lib.
+Wed May  1 16:17:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon May 24 10:46:26 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+	* ext/extmk.rb (extmake): extensions not to be installed should not
+	  make static libraries, but make dynamic libraries always.
 
-	* lib/rdoc/generators/template/html/html.rb: SYSTEM identifiers
-	  must be absolute URIs
+Wed May  1 12:20:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Sat May 22 12:00:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rake/version.rb: Fix RDoc warning with  :include: [Bug #8347]
 
-	* MANIFEST: add new encodings in rexml.
+Wed May  1 11:40:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/MANIFEST: add recent files.
+	* defs/id.def (predefined): add "idProc".
 
-Sat May 22 05:37:11 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* eval.c (frame_func_id): use predefined IDs.
 
-	* ext/tk/lib/remote-tk.rb: (NEW library) controll Tk interpreters
-	  on the other processes by Tcl/Tk's 'send' command
+	* proc.c (mnew, mproc, mlambda): use predefined IDs.
 
-Fri May 21 09:22:05 2004  Dave Thomas  <dave@pragprog.com>
+	* vm.c (rb_vm_control_frame_id_and_class): ditto.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_parameters):
-	  Add ()'s around parameters that don't have them
+	* vm.c (Init_VM): ditto.
 
-Thu May 20 17:02:03 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr 30 23:18:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/mkmf.rb (check_sizeof): define result size.  [ruby-core:02911]
+	* lib/benchmark.rb: Update Benchmark results on newer CPU
 
-	* lib/mkmf.rb (create_header): macro name should not include equal
-	  sign.
+Tue Apr 30 12:31:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu May 20 15:59:50 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+	* proc.c (mproc, mlambda): use frozen core methods instead of plain
+	  global methods, so that methods cannot be overridden.
+	  [ruby-core:54687] [Bug #8345]
 
-	* ext/socket/socket.c: fix SEGV. [ruby-dev:23550]
+	* vm.c (Init_VM): define proc and lambda on the frozen core object.
 
-Thu May 20 14:35:52 2004  Tanaka Akira  <akr@m17n.org>
+	* include/ruby/intern.h (rb_block_lambda): add declaration instead of
+	  deprecated rb_f_lambda.
 
-	* ext/socket/socket.c: check SCM_RIGHTS macro addition to
-	  the msg_control field to test existence of file descriptor passing
-	  by msg_control.
+Mon Apr 29 17:02:30 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu May 20 12:38:06 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/nkf/nkf-utf8/nkf.h: Bionic libc doesn't have locale.
+	  [Feature #8338]
 
-	* numeric.c (flo_eq): always check if operands are NaN.
-	  [ruby-list:39685]
 
-Thu May 20 12:34:39 2004  Dave Thomas  <dave@pragprog.com>
+Mon Apr 29 06:58:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_visibility):
-	  At Ryan Davis' suggestion, honor visibility modifers if guarded by a
-	  statement modifier
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): no need of alloca for
+	  small fixed size array.
 
-Thu May 20 12:22:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): check overflow first,
+	  and use alloca for small size input.
 
-	* lib/mkmf.rb (have_type): do not check pointer to incomplete type,
-	  which always get compiled.  [ruby-list:39683]
+Mon Apr 29 00:40:13 2013  Benoit Daloze  <eregontp@gmail.com>
 
-Wed May 19 11:09:00 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* lib/yaml.rb: Clarify documentation about YAML being always Psych.
+	  Give a tip about using Syck. See #8344.
 
-	* ext/tk/lib/tk.rb: change permition of TkObject#tk_send from
-	  private to public
+Sun Apr 28 23:34:01 2013  Benoit Daloze  <eregontp@gmail.com>
 
-Tue May 18 14:00:46 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/yaml.rb: Use another trick to define the YAML module.
+	  https://twitter.com/n0kada/status/328342207511801856
 
-	* node.h (NEW_DSTR): adjust list length.
+Sun Apr 28 23:19:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* parse.y (literal_concat): ditto.
+	* lib/pp.rb: Update PP module overview by @geopet
 
-Mon May 17 16:14:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sun Apr 28 22:04:37 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* numeric.c (flo_to_s): it's preferable that "p 0.0" outputs "0.0"
-	  instead of "0.0e+00". [ruby-dev:23480]
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): fix buffer overflow on
+	  x64 Windows and memory leak when initializing with integer.
+	  [ruby-core:54615] [Bug #8337]
 
-	* numeric.c (flo_to_s): it's preferable that "p 0.00000000000000000001"
-	  outputs "1.0e-20" instead of "9.999999999999999e-21". (the precision
-	  is considered, but there is assumption DBL_DIG == 15 in current
-	  implementation)
+Sun Apr 28 12:38:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon May 17 10:13:33 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* README.EXT: correct method name to be used.  [Bug #7982]
 
-	* ext/socket/socket.c (setup_domain_and_type): honor duck typing.
-	  [ruby-dev:23522]
+	* README.EXT.ja: add notes too.
 
-	* ext/socket/socket.c (sock_s_getnameinfo): ditto.
+Sun Apr 28 10:35:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Mon May 17 01:15:23 2004  why the lucky stiff  <why@ruby-lang.org>
+	* object.c: With feedback from Steve Klabnik, reverted a change to
+	  #untrusted? and #tainted?. Also adjusted grammar for $SAFE levels
 
-	* lib/yaml.rb: removed fallback to pure Ruby parser.
+Sun Apr 28 10:10:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/yaml/baseemitter.rb (indent_text): was forcing a mod value
-	  of zero at times, which kept some blocks from getting indentation.
+	* lib/yaml.rb: Disable setting YAML const twice [ruby-core:54642]
 
-	* lib/yaml/baseemitter.rb (node_text): rewriting folded scalars.
+Sun Apr 28 09:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/syck/syck.h: reports style of scalars now, be they plain, block
-	  single-, or double-quoted.
+	* object.c: Documentation for taint and trust [Bug #8162]
 
-	* ext/syck/syck.c: ditto.
+Sun Apr 28 09:40:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/syck/gram.c: ditto.
+	* README.EXT: Copy note from r40505 for rb_sprintf() [Bug #7982]
 
-	* ext/syck/node.c: ditto.
+Sun Apr 28 08:28:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/syck/token.c: ditto.
+	* ext/curses/curses.c: Update Curses::Window example for nicer output
+	  Patch by Michal Suchanek [Bug #8121] [ruby-core:53520]
 
-	* ext/syck/rubyext.c (yaml_org_handler): symbols loaded only
-	  if scalar style is plain.
+Sun Apr 28 08:10:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/syck/rubyext.c (yaml_org_handler): some empty strings were
-	  loaded as symbols.
+	* README.EXT: Update note from r40504, by Jeremy Evans [Bug #7982]
 
-	* test/yaml/test_yaml.rb (test_perl_regexp): updated test to
-	  match new regexp serialization.
+Sun Apr 28 08:02:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Mon May 17 00:03:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* README.EXT: Add note to warn use of %i in Exceptions [Bug #7982]
 
-	* lib/drb/drb.rb: Cosmetic documentation changes.
+Sun Apr 28 02:41:05 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun May 16 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* configure.in: Fix a typo.  Should check endgrent() instead of
+	  endgrnam().
 
-	* lib/test/unit.rb: Removed :nodoc: directive (it prevented effective
-	  RDoc operation), and added file-level comment.
+Sun Apr 28 00:35:45 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun May 16 20:55:49 2004  Tanaka Akira  <akr@m17n.org>
+	* process.c (obj2gid): Don't call endgrent() if not exist.
+	  Bionic (Android's libc) don't have endgrent().
 
-	* ext/dbm/dbm.c (fdbm_initialize): accept optional 3rd argument to
-	  specify an open flag.
-	  (Init_dbm): define open flags: DBM::READER, DBM::WRITER, DBM::WRCREAT
-	  and DBM::NEWDB.
+	* configure.in: Check endgrnam function.
 
-Sun May 16 13:10:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
+Sat Apr 27 23:53:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
 
-	* lib/test/unit/**/*.rb: Removed :nodoc: directives (many were
-	  generating warnings, many were on private methods).
+	* lib/yaml.rb: add security warning to YAML documentation
 
-Sat May 15 01:41:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Apr 27 23:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* eval.c (eval): forgot to restore $SAFE value before evaluating
-	  compiled node.  [ruby-core:02872]
+	* lib/yaml.rb: Documentation for YAML module [Bug #8213]
 
-Sat May 15 01:33:12 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Apr 27 20:19:21 2013  Tanaka Akira  <akr@fsij.org>
 
-	* range.c (range_each_func): terminates loop if generating value
-	  is same to @end.  [ruby-talk:100269]
+	* thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION.
+	  This fixes a compilation failure while cross-compiling for Tensilica
+	  Xtensa Processor.
 
-Fri May 14 22:08:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Apr 27 19:32:44 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* string.c (rb_str_new4): should not reuse frozen shared string if
-	  the original is not an instance of String. [ruby-talk:100193]
+	* thread.c: fix typos and documentation
 
-Fri May 14 18:39:25 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Apr 27 19:04:55 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/canvas.rb: improve coords support for canvas items.
-	  Now, supports all of the followings.
-	    TkcLine.new(c, 0, 0, 100, 100, :fill=>'red')
-	    TkcLine.new(c, [0, 0, 100, 100], :fill=>'red')
-	    TkcLine.new(c, [0, 0], [100, 100], :fill=>'red')
-	    TkcLine.new(c, [[0, 0], [100, 100]], :fill=>'red')
-	    TkcLine.new(c, :coords=>[0, 0, 100, 100], :fill=>'red')
-	    TkcLine.new(c, :coords=>[[0, 0], [100, 100]], :fill=>'red')
+	* sparc.c: Use __asm__ instead of asm for gcc.
+	  gcc doesn't provide asm keyword if -ansi option is given.
+	  http://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html
 
-Fri May 14 12:11:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+Sat Apr 27 17:22:50 2013  Tanaka Akira  <akr@fsij.org>
 
-	* util.c (ruby_strtod): strtod("0", &end); => end should point '\0'.
-	 [ruby-dev:23498]
+	* ext/socket/extconf.rb: Redundant test removed.
 
-Thu May 13 15:47:30 2004  akira yamada  <akira@ruby-lang.org>
+Sat Apr 27 16:00:10 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/net/telnet.rb (Net::Telnet::login): "options" can specify
-	  regexps for login prompt and/or password prompt.
+	* ext/socket/extconf.rb (test_recvmsg_with_msg_peek_creates_fds):
+	  Extracted.
 
-Thu May 13 14:23:45 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Apr 27 15:50:40 2013  Tanaka Akira  <akr@fsij.org>
 
-	* hash.c (delete_if_i): use st_delete_safe() (via
-	  rb_hash_delete()) instead of returning ST_DELETE.
-	  backport from HEAD.  [ruby-dev:23487]
+	* internal.h (SIGNED_INTEGER_TYPE_P): New macro.
+	  (SIGNED_INTEGER_MAX): Ditto.
+	  (SIGNED_INTEGER_MIN): Ditto.
+	  (UNSIGNED_INTEGER_MAX): Ditto.
+	  (TIMET_MAX): Use SIGNED_INTEGER_MAX and UNSIGNED_INTEGER_MAX.
+	  (TIMET_MIN): Use SIGNED_INTEGER_MIN.
 
-Thu May 13 13:01:30 2004  akira yamada  <akira@ruby-lang.org>
+	* thread.c (TIMEVAL_SEC_MAX): Use SIGNED_INTEGER_MAX.
+	  (TIMEVAL_SEC_MIN): Use SIGNED_INTEGER_MIN.
 
-	* lib/uri/mailto.rb (URI::MailTo::to_s): should include fragment.
+Sat Apr 27 10:52:52 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu May 13 11:04:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c (TIMEVAL_SEC_MAX, TIMEVAL_SEC_MIN): Consider environments,
+	  sizeof(time_t) is smaller than sizeof(tv_sec), such as
+	  OpenBSD 5.2 (amd64).
 
-	* pack.c (pack_pack): always add with null for 'Z'.
+Fri Apr 26 23:34:59 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* pack.c (pack_unpack): terminated by null for 'Z'.  [ruby-talk:98281]
+	* lib/rexml/text.rb (REXML::Text.normalize): Fix a bug that all
+	  entity filters are ignored. [ruby-dev:47278] [Bug #8302]
+	  Patch by Ippei Obayashi. Thanks!!!
+	* test/rexml/test_entity.rb (EntityTester#test_entity_filter): Add
+	  a test of the above change.
 
-Wed May 12 19:59:43 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 26 22:53:55 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/mkmf.rb (have_type, check_sizeof): replace unusable characters.
-	  [ruby-talk:99788]
+	* lib/rexml/element.rb (REXML::Attributes#to_a): Support
+	  namespaced attributes. [ruby-dev:47277] [Bug #8301]
+	  Patch by Ippei Obayashi. Thanks!!!
+	* test/rexml/test_attributes.rb
+	  (AttributesTester#test_to_a_with_namespaces): Add a test of the
+	  above change.
 
-Wed May 12 17:41:42 2004  Tanaka Akira  <akr@m17n.org>
+Fri Apr 26 21:48:29 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/resolv.rb (Resolv::DNS::Config): make it configurable without
-	  external file such as /etc/resolv.conf.
+	* lib/rss/atom.rb (RSS::Atom::Entry): Fix indent of document comment.
 
-Wed May 12 14:37:27 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Fri Apr 26 21:21:17 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/openssl/ossl_x509name.c: attribute value of DC (short name of
-	  domainComponent) should be IA5String.
+	* lib/rss/maker.rb (RSS::Maker): Fix indent of document comment.
 
-Wed May 12 13:20:19 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Fri Apr 26 18:41:04 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tk/composite.rb: improve configure methods (based on
-	  the proposal of [ruby-talk:99671]).
+	* ext/socket/extconf.rb: Use a block of enable_config() for
+	  --{enable,disable}-close-fds-by-recvmsg-with-peek configure option
 
-Wed May 12 11:51:08 2004  Dave Thomas  <dave@pragprog.com>
+Fri Apr 26 18:08:08 2013  Tanaka Akira  <akr@fsij.org>
 
-	* class.c (rb_obj_singleton_methods): fix rdoc
+	* dir.c (dir_set_pos): Fix a compilation error when seekdir() is not
+	  exist.
 
-Mon May 10 21:44:42 2004  Dave Thomas  <dave@pragprog.com>
+Fri Apr 26 17:41:17 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rdoc/generators/html_generator.rb: Change scheme for
-	  looking up symbols in  HTML generator.
+	* thread_pthread.c (ruby_init_stack): Add STACK_GROW_DIR_DETECTION.
+	  This fixes a compilation failure while cross-compiling for ARM.
 
-Mon May 10 16:45:21 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Apr 26 14:35:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* eval.c (eval): warning during eval should not cause deadlock.
-	  [ruby-talk:98651]
+	* lib/rss/atom.rb: Documentation for RSS::Atom based on a patch by
+	  Michael Denomy
+	* lib/rss/maker.rb: Documentation for RSS::Maker also by @mdenomy
 
-	* eval.c (rb_eval): raise TypeError exception for superclass
-	  mismatch.  [ruby-list:39567]
+Fri Apr 26 12:41:22 2013  Tanaka Akira  <akr@fsij.org>
 
-Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
+	* ext/curses/extconf.rb: Test linkability of curses_version at first.
 
-	* lib/rdoc/generators/html_generator.rb: Hack to search parents
-	  for unqualified constant names.
-
-Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb: Hack to search parents
-	  for unqualified constant names.
-
-Sun May  9 22:37:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/net/ftp.rb: improved documentation
-	* lib/net/imap.rb: ditto
-	* lib/net/pop.rb: ditto
-	* lib/net/smtp.rb: ditto
-	* lib/net/telnet.rb: ditto
-
-Fri May  7 21:50:21 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::parse_include): Allow
-	  multiple arguments to 'include'
-
-Fri May  7 21:31:56 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (fu_list): Array() breaks pathes including "\n".
-	  [ruby-core:02843]
-
-Fri May  7 11:25:53 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* util.c (ruby_strtod): "0.0000000000000000001" should be converted
-	  to 1.0e-19 instead of 0.0. (leading zeros aren't significant digits)
-	  [ruby-talk:99318] [ruby-dev:23465]
-
-Fri May  7 10:00:05 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/tkutil.c (get_eval_string_core): bug fix. [ruby-dev:23466]
-
-Thu May  6 22:13:17 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* ext/socket/socket.c (ippaddr): use NUMERICHOST if can not resolve
-	  hostname.
-
-Thu May  6 14:22:29 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml/rubytypes.rb (to_yaml): added instance variable handling
-	  for Ranges, Strings, Structs, Regexps.
-
-	* lib/yaml/rubytypes.rb (to_yaml_fold): new method for setting a
-	  String's flow style.
-
-	* lib/yaml.rb (YAML::object_maker): now uses Object.allocate.
-
-	* ext/syck/gram.c: fixed transfer methods on structs, broke it
-	  last commit.
-
-Thu May  6 11:40:28 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (string): accept NIL.
-
-	* lib/net/imap.rb (body_type_basic): allow body-fields omissions.
-
-Thu May  6 01:59:04 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params):
-	  Don't include the &block parameter if we have explicit
-	  yield parameters.
-
-Wed May  5 03:40:29 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/ring.rb: use recv instead of recvfrom.
-
-Tue May  4 23:52:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/gserver.rb: documented
-
-Tue May  4 23:46:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/xmlrpc/README.txt: introduced for documentation purposes
-
-Mon May  3 09:47:24 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
-	  Fix parsing bug if yield called within 1 line block
-
-Sun May  2 01:04:38 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib, ext/tk: renewal Ruby/Tk
-
-Fri Apr 30 20:08:41 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* time.c (SIZEOF_TIME_T): support SIZEOF_TIME_T == SIZEOF_INT.
-
-Tue Apr 27 13:12:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_eval): too many line trace call. (ruby-bugs PR#1320)
-
-Tue Apr 27 08:41:28 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* lib/yaml/rubytypes.rb: passing Range tests.
-
-	* ext/syck/syck.h: version 0.44.
-
-	* ext/syck/gram.c: transfers no longer open an indentation.
-	  fixed transfers which precede blocks.
-
-	* ext/syck/token.c: ditto.
-
-	* ext/syck/syck.c: fixed segfault if an anchor has been released already.
-
-	* ext/syck/node.c (syck_free_members): organized order of free'd nodes.
-
-	* ext/syck/rubyext.c (syck_emitter_write_m): test for proper string with
-	  StringValue.
-
-Mon Apr 26 23:56:54 2004  Daniel Kelley  <news-1082945587@dkelley.gmp.san-jose.ca.us>
-
-	* README.EXT, README.EXT.ja: fixed wrong function signature.
-	  [ruby-talk:98349]
-
-Mon Apr 26 21:40:09 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/code_objects.rb (RDoc::Context::add_alias): Only alias
-	  to instance methods.
-
-Sat Apr 24 10:38:31 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/markup/simple_markup.rb (SM::SimpleMarkup::group_lines):
-	  Fix bug where consecutive headings are merged.
-
-Fri Apr 23 23:26:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb: $hdrdir should not contain macros for backward
-	  compatibility.  [bruby-dev:28]
-
-	* version.c (ruby_show_copyright): obtain copyright year from
-	  RUBY_RELEASE_YEAR.
-
-	* win32/resource.rb: ditto.
-
-	* win32/resource.rb: default rubyw icon to ruby.ico, and let DLL also
-	  include them.
-
-	* win32/resource.rb: include winver.h for older WindowsCE.
-
-Fri Apr 23 16:38:46 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb: sync taint/freeze flag between
-	  a pathname object and its internal string object.
-
-Fri Apr 23 14:52:08 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (stmt, arg, aref_args): should not make sole splat into
-	  array, in aref_args other than aref with op_asgn.
-
-Fri Apr 23 14:14:38 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/resolv.rb: don't use Regexp#source to embed regexps.
-	  [ruby-dev:23432]
-
-Thu Apr 22 04:15:36 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (aref_args): should pass expanded list.  [ruby-core:02793]
-
-Thu Apr 22 01:12:57 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (flo_to_s): tweak output string based to preserve
-	  decimal point and to remove trailing zeros.  [ruby-talk:97891]
-
-	* string.c (rb_str_index_m): use unsigned comparison for T_FIXNUM
-	  search.  [ruby-talk:97342]
-
-Wed Apr 21 22:57:27 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/rinda.rb, test/rinda/test_rinda.rb: check Hash tuple size.
-
-Wed Apr 21 20:05:00 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (URI::HTTP#proxy_open): set Host: field explicitly.
-	  [ruby-list:39542]
-
-Mon Apr 19 18:11:15 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* hash.c (rb_hash_equal): returns true if two hashes have same set
-	  of key-value set.  [ruby-talk:97559]
-
-	* hash.c (rb_hash_eql): returns true if two hashes are equal and
-	  have same default values.
-
-Mon Apr 19 08:19:58 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
-
-	* dln.c, io.c, lib/benchmark.rb, lib/cgi.rb, lib/csv.rb, lib/date.rb,
-	  lib/ftools.rb, lib/getoptlong.rb, lib/logger.rb, lib/matrix.rb,
-	  lib/monitor.rb, lib/set.rb, lib/thwait.rb, lib/timeout.rb,
-	  lib/yaml.rb, lib/drb/drb.rb, lib/irb/workspace.rb, lib/net/ftp.rb,
-	  lib/net/http.rb, lib/net/imap.rb, lib/net/telnet.rb,
-	  lib/racc/parser.rb, lib/rinda/rinda.rb, lib/rinda/tuplespace.rb,
-	  lib/shell/command-processor.rb, lib/soap/rpc/soaplet.rb,
-	  lib/test/unit/testcase.rb, lib/test/unit/testsuite.rb: typo fix.
-
-Mon Apr 19 08:14:18 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Allow for
-	  #ifdef HAVE_PROTOTYPES
-
-Fri Apr 16 22:33:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* ext/iconv/iconv.c: nearly finished RDoc comments.
-
-Fri Apr 16 17:04:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* string.c (rb_str_equal): always returns true or false, never
-	  returns nil. [ruby-dev:23404]
-
-Fri Apr 16 08:27:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: skip linking when libraries to be preloaded not
-	  compiled.  [ruby-list:39561]
-
-Thu Apr 15 23:21:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* process.c (pst_success_p): new method Process::Status#success?.
-	  [ruby-dev:23385]
-
-Thu Apr 15 17:12:13 2004  Tanaka Akira  <akr@m17n.org>
-
-	* ext/gdbm/gdbm.c (Init_gdbm): define GDBM::READER, GDBM::WRITER,
-	  GDBM::WRCREAT and GDBM::NEWDB.
-	  (fgdbm_initialize): use specified read/write flag.
-
-Wed Apr 14 11:29:56 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* numeric.c (flo_eq): workaround for bcc32's bug.
-	  (ruby-bugs-ja:PR#594)
-
-Wed Apr 14 13:06:35 2004  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
-
-	* array.c, enum.c, eval.c, file.c, io.c, numeric.c, object.c, prec.c,
-	  process.c, re.c, string.c: typos in RDoc comments.  [ruby-core:02783]
-
-Wed Apr 14 11:06:38 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::scan): Changed
-	  behavior of :enddoc: -- it now unconditionally terminates
-	  processing of the current file.
-
-Wed Apr 14 11:03:22 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* defines.h: include <net/socket.h> to get fd_set definition in BeOS.
-
-Tue Apr 13 23:06:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/rinda.rb: change pattern matching.
-	  a === b -> a == b || a === b. [druby-ja:98]
-
-	* test/rinda/test_rinda.rb: ditto.
-
-Tue Apr 13 19:54:29 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: should not overwrite HTTP request header.
-	  [ruby-list:39543]
-
-Tue Apr 13 01:30:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* ext/iconv/iconv.c: RDoc documentation (from RD; nearly finished).
-	* ext/iconv/charset_alias.rb: Prevent from RDoc'ing.
-
-Mon Apr 12 19:11:29 2004  Eric Hodel  <drbrain@segment7.net>
-
-	* gc.c (rb_gc_copy_finalizer): typo.  [ruby-core:02774]
-
-Mon Apr 12 18:52:32 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_init_i): should return
-	  a value.
-
-Mon Apr 12 10:43:47 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (rb_glob2, rb_glob, rb_globi, push_globs, push_braces,
-	  rb_push_glob): fix memory leak. (leaked when block was interrupted)
-
-Mon Apr 12 10:27:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: backport SIZEOF_TIME_T definition from 1.9.
-
-	* win32/Makefile.sub: ditto.
-
-	* wince/Makefile.sub: ditto.
-
-Sun Apr 11 19:12:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ruby.c (require_libraries): restore source file/line after
-	  statically linked extensions initialized.  [ruby-dev:23357]
-
-Sun Apr 11 10:47:04 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/code_objects.rb (RDoc::TopLevel::add_class_or_module): Toplevel
-	  classes and modules are a special case too... (handle extending existing
-	  classes with or without :enddoc:)
-
-Sat Apr 10 23:51:13 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/code_objects.rb (RDoc::Context::add_to): Implementation of :enddoc:
-	  made one too many assumptions...
-
-Sat Apr 10 00:00:19 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/markup/simple_markup/inline.rb: Fix problem
-	  with \_cat_<b>dog</b>
+	* ext/socket/extconf.rb: Test the behavior of fd passing with MSG_PEEK
+	  only if recvmsg(), msg_control member, AF_UNIX and SCM_RIGHTS are
+	  available.
 
-Wed Apr  7 00:19:50 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Fri Apr 26 00:07:52 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* lib/rinda/rinda.rb: fix hash tuple bug.
+	* lib/rinda/ring.rb (Rinda::RingServer#initialize): accept array
+	  arguments of address to specify multicast interface.
 
-	* lib/rinda/tuplespace.rb: ditto.
+	* lib/rinda/ring.rb (Rinda::RingServer#make_socket): add optional
+	  arguments for multicast interface.
 
 	* test/rinda/test_rinda.rb
+	  (TestRingFinger#test_ring_server_ipv4_multicast,
+	   TestRingFinger#test_ring_server_ipv6_multicast): add tests for
+	  above change.
 
-Tue Apr  6 18:24:18 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_reopen): should use rb_io_check_io().
-
-Tue Apr  6 16:46:09 2004  Tanaka Akira  <akr@m17n.org>
-
-	* configure.in: check the size of time_t.
-
-	* time.c (time_add): new function.
-	  (time_plus): use time_add.
-	  (time_minus): use time_add.
-
-Tue Apr  6 13:21:30 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (make_hostent): must return value.
-
-Tue Apr  6 00:05:30 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/rinda.rb: add require 'drb/drb'
-
-Mon Apr  5 08:18:23 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb: Remove leading ./ from file names so that cross
-	  references work properly.
-
-Sun Apr  4 20:33:42 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* eval.c (Init_load): make $LOADED_FEATURES built-in.
-	  [ruby-dev:23299]
-
-	* ruby.c (ruby_prog_init): make $PROGRAM_NAME built-in.
-
-	* lib/English.rb: remove $LOADED_FEATURES and $PROGRAM_NAME.
-
-Sun Apr  4 14:01:20 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/options.rb (Options::parse): Allow multiple -x options to RDoc.
-	  Fix bug where files weren't being excluded properly
-
-Sat Apr  3 17:11:05 2004  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/syck.h: version 0.43.
-
-	* ext/syck/lib/gram.c: allow root-level inline collections.
-	 [ruby-talk:94922]
-
-	* lib/yaml/rubytypes.rb (Symbol#to_yaml): emit symbols as implicits.
-	 [ruby-talk:94930]
-
-	* ext/syck/bytecode.c: turn off default implicit typing.
-
-	* ext/syck/implicit.c: detect base60 integers.
-
-	* ext/syck/rubyext.c: handle base60, as well as hex and octal
-	  with commas.  implicit typing of ruby symbols.
-
-Fri Apr  2 17:27:17 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (top_include): include in the wrapped load is done for
-	  the wrapper, not for a singleton class for wrapped main.
-	  [ruby-dev:23305]
-
-Fri Apr  2 15:13:44 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_eq): use temporary double variable to save the
-	  result (internal float register may be bigger than 64 bits, for
-	  example, 80 bits on x86).  [ruby-dev:23311]
-
-Fri Apr  2 14:35:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (block_pass): should generate unique identifier of the
-	  pushing block.  [ruby-talk:96363]
-
-Fri Apr  2 07:31:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* ext/socket/socket.c (make_hostent): fix memory leak, based on
-	  the patch from HORIKAWA Hisashi <vzw00011@nifty.ne.jp>.
-
-Thu Apr  1 22:55:33 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb: Allow rdoc comments in
-	  =begin rdoc/=end
-
-	* lib/rdoc/parsers/parse_rb.rb: Fix problem with comment in
-	  top-level method being taken as file comment.
-
-Thu Apr  1 22:55:04 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_options.rb: Fix undefined variable warning.
-
-Thu Apr  1 19:58:37 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/mapping/{factory.rb,registry.rb}: fixed illegal mapped URI
-	  object with soap/marshal.
-	  added URIFactory class for URI mapping.  BasetypeFactory checks
-	  instance_variables when original mapping is not allowed (ivar must
-	  be empty).  Instance of URI have instance_variables but it must be
-	  llowed whenever original mapping is allowed or not.
-
-	* lib/xsd/datatypes.rb: check the smallest positive non-zero
-	  single-precision float exactly instead of packing with "f".
-	  [ruby-talk:88822]
-
-	* lib/soap/mapping/rubytypeFactory.rb: should not dump singleton class.
-	  [ruby-dev:22588]
-	  c = class << Object.new; class C; self; end; end; SOAPMarshal.dump(c)
-
-Wed Mar 31 19:06:23 2004  Tanaka Akira  <akr@m17n.org>
-
-	* time.c (year_leap_p): new function.
-	  (timegm_noleapsecond): ditto.
-	  (search_time_t): use timegm_noleapsecond instead of
-	  mktime for first guess.
-
-Wed Mar 31 12:04:04 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/delegate.rb (DelegateClass): define internal methods of the
-	  result class, but not metaclass of the caller.  [ruby-talk:96156]
-
-	* intern.h: provide proper prototypes.  [ruby-core:02724]
-
-	* ruby.h: missing.h is now prerequisite to intern.h.
-
-Tue Mar 30 20:25:34 2004  Tanaka Akira  <akr@m17n.org>
-
-	* time.c (search_time_t): limit guess range by mktime if it is
-	  available.  [ruby-dev:23274]
-
-Sun Mar 28 14:16:59 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/pop.rb (auth): failed when account/password include "%".
-	  [ruby-talk:95933]
-
-Sat Mar 27 21:40:41 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb: permit extra semicolon in content-type field.
-
-Sat Mar 27 10:40:48 2004  Tanaka Akira  <akr@m17n.org>
-
-	* (lib/pp.rb, lib/prettyprint.rb): define seplist in PP::PPMethods
-	  instead of PrettyPrint.
-
-Thu Mar 25 23:28:52 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_overflow_p): backport 1.9 usec overflow function.
-	  (ruby-bugs PR#1307)
-
-Thu Mar 25 23:15:24 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_options.rb (RI::Options::show_version):
-	  Add --version option
-
-Thu Mar 25 04:16:18 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_options.rb (RI::Options): Add the --list-names option,
-	  which dumps our all known names
-
-Thu Mar 25 03:57:47 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_util.rb (NameDescriptor::initialize): No longer
-	  allow nested classes to be designated using "."--you must
-	  now use "::"
-
-Thu Mar 25 02:00:18 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/template/html/one_page_html.rb (Page):
-	  Fix to work with C modules.
-
-Wed Mar 24 21:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/uri.rb: Documented (thanks Dmitry V. Sabanin).
-	* lib/uri/common.rb: Ditto.
-	* lib/uri/ftp.rb: Ditto.
-	* lib/uri/generic.rb: Ditto.
-	* lib/uri/http.rb: Ditto.
-	* lib/uri/https.rb: Ditto.
-	* lib/uri/ldap.rb: Ditto.
-	* lib/uri/mailto.rb: Ditto.
-	  (All backported from 1.9)
-
-Wed Mar 24 18:48:26 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb ($ruby, $topdir, $hdrdir): should not be affected by
-	  DESTDIR after installed.
-
-	* lib/mkmf.rb (RUBY): / is not recognized as path separator on
-	  nmake/bmake. [ruby-list:39388]
-
-	* lib/mkmf.rb (init_mkmf): $INCFLAGS also should be lazy-evaluated.
-
-Wed Mar 24 12:32:56 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::handle_class_module):
-	  Don't document methods if we don't know for sure the
-	  class or module.
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
-	  Don't store documentation for singleton classes if we
-	  don't know the real class.
-
-Wed Mar 24 11:11:26 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb (Generators::HTMLGenerator::load_html_template):
-	  Allow non-RDoc templates by putting a slash in the template name
-
-Mon Mar 22 16:19:57 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ruby.1: add -width option to .Bl for old groff.
-
-Sun Mar 21 21:11:16 2004  Keiju Ishitsuka  <keiju@ishitsuka.com>
-
-	* lib/shell/*: bug fix for Shell#system(command_line_string).
-
-Sat Mar 20 20:57:10 2004  David Black  <dblack@wobblini.net>
-
-	* lib/scanf.rb: Backported 1.9 branch
-	  modifications/corrections to 1.8 branch
-
-Sat Mar 20 23:51:03 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* eval.c (rb_require_safe): preserve old ruby_errinfo.
-	  [ruby-talk:95409]
-
-	* eval.c (rb_f_raise): should not clear backtrace information if
-	  exception object already have one.
-
-Sat Mar 20 15:25:36 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/template/html/html.rb (RDoc::Page): Force
-	  page background to white.
-
-Sat Mar 20 09:52:33 2004  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb, lib/date/format.rb: _parse() now accepts fractional
-	  part of second minute that follows a comma or a full stop.
-
-Fri Mar 19 01:55:57 2004  Mauricio Fernandez  <batsman.geo@yahoo.com>
-
-	* io.c (rb_io_sync): need not to check writable. [ruby-core:02674]
-
-Thu Mar 18 21:44:38 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: backport drb.rb 1.16.
-
-Fri Mar 18 17:49:51 2005  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* struct.c (make_struct): allow const_id for accessor names.
-	  [ruby-core:04585]
-
-	* eval.c (rb_attr): check if attribute name is local_id or
-	  const_id.
-
-Thu Mar 18 16:22:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_eq): avoid false positive by using scope and
-	  dyna_vars.  no longer use frame.uniq.
-
-Wed Mar 17 14:44:43 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (range): fix possible "\0" overrun. (in case of "\0-")
-
-Mon Mar 15 07:39:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_yield_0): should not re-submit TAG_BREAK if this
-	  yield is not break destination. [ruby-dev:23197]
-
-Sat Mar 13 14:28:16 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/test_drbssl.rb: rescue LoadError. (Barkport from main
-	  trunk)
-
-	* test/drb/test_drbunix.rb: ditto.
-
-Wed Mar 10 22:28:09 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (remove_dir): should handle symlink correctly.
-	  This patch is contributed by Christian Loew.  [ruby-talk:94635]
-	  (Backport from main trunk)
-
-Wed Mar 10 16:28:42 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (return_jump): set return value to the return
-	  destination.  separated from localjump_destination().
-
-	* eval.c (break_jump): break innermost loop (or thread or proc).
-
-	* eval.c (rb_yield_0): set exit_value for block break.
-
-Wed Mar 10 15:58:43 2004  Ryan Davis  <ryand@zenspider.com>
-
-	* eval.c (eval): Only print backtrace if generating the backtrace
-	  doesn't generate an exception.  [ruby-core:02621]
-
-Tue Mar  9 13:04:26 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_io_ungetc): raise IOError instead of calling
-	  rb_sys_fail().  [ruby-talk:23181]
-
-Mon Mar  8 19:32:28 2004  akira yamada  <akira@ruby-lang.org>
-
-	* lib/uri/common.rb (URI::REGEXP::PATTERN::HOSTPORT): (?:#{PORT})
-	  -> (?::#{PORT}).  [ruby-dev:23170]
-
-Mon Mar  8 15:31:41 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (range): treat incomplete '[' as ordinary character (like
-	  has_magic does).
-
-	* dir.c (range):  Cancel above change. More discussion is needed.
-
-Sun Mar  7 22:37:46 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/drb/ut_drb.rb: use 'druby://localhost:0'. [ruby-dev:23078]
-
-	* test/drb/ut_eval.rb: ditto.
-
-	* test/drb/ut_large.rb: ditto.
-
-	* test/drb/ut_safe1.rb: ditto.
-
-	* test/drb/ut_drb_drbssl.rb: use 'drbssl://localhost:0'.
-
-Sun Mar  7 16:22:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* Makefile.in (lex.c): use $? instead of $<.
-
-Fri Mar  5 00:54:14 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/test/unit.rb: MOve RDoc documentation so that you can
-	  now say 'ri Test::Unit'
-
-Tue Mar  2 12:32:59 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub, wince/Makefile.sub (config.h): shouldn't check
-	  defined? NORETURN. [ruby-dev:23100]
-
-Mon Mar  1 12:24:10 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_alias):
-	  Allow aliases to have parentheses
-
-Sun Feb 29 23:14:53 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_class):
-	  Handle :nodoc: on singleton classes.
-
-Sat Feb 28 10:58:49 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* MANIFEST: add test_erb.rb
-
-	* lib/erb.rb, test/erb/test_erb.rb: don't forget filename,
-	  if both filename and safe_level given. [ruby-dev:23050]
-
-Fri Feb 27 01:00:09 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb, test/drb/drbtest.rb: require drb/eq.rb by default
-
-Wed Feb 25 21:16:25 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (with_destdir): should return the given argument if no
-	  DESTDIR is given.
-
-	* instruby.rb: use path name expansion of cmd.exe.
-
-Wed Feb 25 09:35:22 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* error.c (NameError::Message): new class for lazy evaluation of
-	  message to ensure replaced before marshalling. merge from HEAD.
-	  (ruby-bugs-ja:PR#588)
-
-	* eval.c (rb_method_missing): use NameError::Message. merge from
-	  HEAD. (ruby-bugs-ja:PR#588)
-
-Tue Feb 24 18:59:37 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (glob_helper): '**/' should not match leading period
-	  unless File::FNM_DOTMATCH is set. (like '*/') [ruby-dev:23014]
-
-Tue Feb 24 13:22:21 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb (RDoc::RDoc::normalized_file_list): Attempt to get better
-	  heuristics on which files to include and exclude. Now only include
-	  non-standard files if they are explicitly named in ARGV.
-
-Tue Feb 24 07:23:30 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb: Deal with :stopdoc: when
-	  choosing a default main page to display (ie. don't select a page
-	  if we don't have documentation for it).
-
-Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
-	  class variables in code listings
-
-Tue Feb 24 06:40:14 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RubyLex::identify_identifier): Handle
-	  class variables in code listings
-
-Tue Feb 24 06:32:27 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_aliases): Handle
-	  aliases in C files.
-
-Tue Feb 24 06:16:22 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb (RDoc::RDoc::document): Now create op dir _before_
-	  parsing files.
-
-Tue Feb 24 06:08:47 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_constant):
-	  Start collecting text of constant values earlier: was missing
-	  values in output if there was no space after '='
-
-Tue Feb 24 06:08:25 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb: Escape contant values.
-
-Tue Feb 24 03:45:06 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_config.c (ossl_config_each): add new method
-	  OpenSSL::Config#each. it iterates with section name, field name
-	  and value.
-
-	* ext/openssl/ossl_config.c (Init_ossl_config): include Enumerable.
-
-Mon Feb 23 09:16:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* instruby.rb (DOSISH): embedded path in batch files should not be
-	  prefixed by DESTDIR.  [ruby-core:02186]
-
-Sun Feb 22 09:54:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* re.c: corrected documentation format (again)
-
-Sun Feb 22 09:43:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* re.c: corrected documentation format (rb_reg_initialize_m)
-
-Sat Feb 21 22:36:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* ext/zlib/zlib.c: documented, but needs more effort.
-
-Sat Feb 21 11:12:15 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* missing/os2.c, missing/x68.c: typo fix.  pointed out by greentea.
-
-Fri Feb 20 18:59:47 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/init.rb (IRB::IRB.parse_opts): add -I option to
-	  irb. [ruby-dev:39243]
-
-Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
-	  Support visibility modifiers for attributes
-
-Thu Feb 19 23:24:16 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb (Generators::HtmlClass::build_attribute_list):
-	  Support visibility modifiers for attributes
-
-Thu Feb 19 22:39:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/rinda/test_rinda.rb: DRb.start_service only once in testsuites.
-	  DRb.start_service could handle this.
-
-Thu Feb 19 22:19:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/ostruct.rb: documented
-
-Thu Feb 19 21:28:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* ext/strscan/strscan.c: improved documentation
-
-Thu Feb 19 03:10:52 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: synchronized with main trunk (rev 1.11).
-
-Thu Feb 19 02:30:34 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* ext/strscan/strscan.c: documentation checked.
-
-Thu Feb 19 00:11:05 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/markup/simple_markup/preprocess.rb (SM::PreProcess::handle):
-	  Strip extraneous space from filenames in :include:
-
-Wed Feb 18 22:52:00 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/unix.rb: remove O_NONBLOCK, thanks \ay
-
-Wed Feb 18 22:47:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* ext/strscan/strscan.c: documented
-
-Wed Feb 18 22:03:11 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/*: should not depend on $KCODE.
-
-Wed Feb 18 17:18:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c: need to include <olectl.h> on Cygwin.
-
-Wed Feb 18 10:40:38 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* sprintf.c (rb_f_sprintf): do not prepend dots for negative
-	  numbers if FZERO is specified.  [ruby-list:39218]
-
-Tue Feb 17 23:40:34 2004  Guy Decoux  <ts@moulon.inra.fr>
-
-	* sprintf.c (rb_f_sprintf): preserve original val for
-	  format_integer. [ruby-talk:92975]
-
-Tue Feb 17 23:28:45 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/marshaltestlib.rb: common marshal testcase added.
-
-	* test/ruby/test_marshal.rb: use above testsuite.
-
-	* test/soap/marshal/test_marshal.rb: ditto.
-
-	* test/soap/marshal/cmarshal.rb: removed (not used).
-
-Tue Feb 17 10:51:23 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/syck/rubyext.c (syck_emitter_end_object): takes only one arg.
-
-Tue Feb 17 01:35:28 2004  Tanaka Akira  <akr@m17n.org>
-
-	* eval.c (rb_eval): care that another thread replace NODE_DREGX_ONCE
-	  to NODE_LIT.  [ruby-dev:22920]
-
-Tue Feb 17 01:24:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): define
-	  STACK_GROW_DIRECTION. [ruby-dev:22910]
-
-	* bcc32/Makefile.sub (config.h): add newer checks.
-
-	* wince/Makefile.sub (config.h): define NEED_IO_SEEK_BETWEEN_RW.
-
-Tue Feb 17 00:38:10 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb: TupleSpace#initialize, stop doubling timeout
-
-Tue Feb 17 00:18:03 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* test/rinda/test_rinda.rb: import test_rinda.rb
-
-Tue Feb 17 00:14:30 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: avoid warning "Redefinition of macro
-	  'HAVE_GETLOGIN'".
-
-	* vms/config.h_in: ditto.
-
-Mon Feb 16 23:28:14 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/csv.rb: document reduction.  [ruby-core:02429]
-
-Mon Feb 16 22:08:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/generator.rb: corrected doc format
-	* lib/rinda/rinda.rb: added documentation (from Hugh Sasse)
-	* lib/rinda/tuplespace.rb: ditto
-
-Mon Feb 16 20:41:32 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: show more warnings. (refering to mingw)
-
-	* bcc32/setup.mak: ditto.
-
-Mon Feb 16 13:39:44 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (rb_glob, rb_globi): add const.
-
-	* ruby.h: ditto.
-
-Mon Feb 16 02:16:33 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* bcc32/Makefile.sub: should warn suspicious pointer conversion.
-
-	* bcc32/setup.mak: ditto.
-
-Sun Feb 15 19:06:42 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/tuplespace.rb: TupleSpace#read(tpl, 0), raise
-	  RequestExpiredError if not found.
-
-Sun Feb 15 15:56:46 2004  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
-
-	* ext/win32ole/win32ole.c: add IDispatch wrapper in val2variant.
-	  Thanks, arton.
-
-Sun Feb 15 01:46:05 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/mkmf.rb: absolute path of ruby is assigned to $(RUBY).
-	  [ruby-dev:22870]
-
-Sat Feb 14 11:29:41 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* sample/drb/*: import lib/drb/sample
-
-Sat Feb 14 11:08:23 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: add pretty_print, thanks gotoken.
-
-Fri Feb 13 12:35:08 2004  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb: File.link may raise EINVAL and
-	  EACCES on Windows.
-
-Thu Feb 12 21:45:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/ftools.rb: documented
-
-Thu Feb 12 21:25:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/base64.rb: backported from HEAD (modularised and documented)
-
-Thu Feb 12 20:31:48 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (create_tmpsrc): cpp32 of Borland C++ ignores #error
-	  directives in DOS line-ending files at all.
-
-Thu Feb 12 02:23:56 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb: use assert_raise instead of assert_raises.
-
-	* lib/pp.rb: ditto.
-
-	* lib/time.rb: ditto.
-
-	* lib/tsort.rb: ditto.
-	  use TSortHash and TSortArray instead of Hash and Array in test.
-
-Wed Feb 11 20:01:12 2004  akira yamada  <akira@ruby-lang.org>
-
-	* test/ruby/test_file.rb (TestFile::test_fnmatch): added tests for
-	  File.fnmatch. [ruby-dev:22815][ruby-dev:22819]
-
-	* test/ruby/test_proc.rb (TestProc::test_eq): added a
-	  test.  [ruby-dev:22599]
-
-	* test/ruby/test_proc.rb (TestProc::test_eq): added tests for
-	   Proc#==.  [ruby-dev:22592], [ruby-dev:22601]
-
-Tue Feb 10 16:43:56 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (umethod_bind): purge unused check.  [ruby-dev:22850]
-
-Mon Feb  9 17:16:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/rdoc/parsers/parse_c.rb: escape '{' and '}' to avoid warnings.
-
-Mon Feb  9 13:00:55 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
-
-	* dir.c (fnmatch): File.fnmatch('*?', 'a') should return true.
-	  [ruby-dev:22815]
-
-	* dir.c (fnmatch): File.fnmatch('\[1\]' , '[1]') should return true.
-	  [ruby-dev:22819]
-
-Sun Feb  8 16:46:13 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/pp.rb (PP::PPMethods::object_address_group): suppress negative
-	  sign for higher heap areas.
-
-Fri Feb  6 22:48:16 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb (gen_url): Support
-	  https in RDoc hyperlinks
-
-Fri Feb  6 22:41:22 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): rollback the previous
-	  commit.  [ruby-dev:22813]
-
-Fri Feb  6 22:22:50 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/pp.rb (PPInspectTest#test_to_s_with_iv): remove instance
-	  variable which is defined in the test.
-
-Fri Feb  6 00:48:37 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/prettyprint.rb (PrettyPrint#first?): obsoleted.
-
-Thu Feb  5 23:56:55 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/prettyprint.rb (PrettyPrint#seplist): added.
-
-	* lib/pp.rb (PPMethods#pp_object): use seplist.
-	  (PPMethods#pp_hash): ditto.
-	  (Array#pretty_print): ditto.
-	  (Struct#pretty_print): ditto.
-	  (MatchData#pretty_print): ditto.
-
-	* lib/set.rb (Set#pretty_print): use seplist.
-
-Wed Feb  4 02:12:06 2004  Tanaka Akira  <akr@m17n.org>
-
-	* file.c (test_l): fix wrong method name in document.
-	  (test_S): ditto.
-	  (test_b): ditto.
-	  (test_c): ditto.
-	  (test_suid): ditto.
-	  (test_sgid): ditto.
-	  (test_sticky): ditto.
-
-Tue Feb  3 08:04:57 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (Struct#pretty_print_cycle): follow 1.8 style.
-
-Mon Feb  2 19:33:49 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: backport from 1.9 for Interix.
-
-	* dln.c (dln_load): ditto.
-
-Mon Feb  2 13:31:51 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* lib/net/http.rb (canonical_each): fix merge miss.
-
-Mon Feb  2 01:54:00 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pp.rb (Struct#pretty_print): make it 1.8 style.
-	  (Numeric#pretty_print, FalseClass#pretty_print)
-	  (TrueClass#pretty_print, Module#pretty_print): fix pp for objects
-	  with instance variables.  [ruby-talk:91157]
-
-	* lib/open-uri.rb (URI::Generic#find_proxy): return nil on loopback
-	  address.
-
-	* lib/resolv-replace.rb (BasicSocket#send): don't replace because
-	  it has no hostname argument.
-	  (IPSocket.getaddress): raise SocketError instead of
-	  Resolv::ResolvError for errors.
-	  (TCPSocket#initialize, UDPSocket#bind, UDPSocket#connect)
-	  (SOCKSSocket#initialize): use IPSocket.getaddress instead of
-	  Resolv.getaddress.
-	  (UDPSocket#send): recognize 3 arguments form.  try all addresses on
-	  4 arguments form.
-
-Sun Feb  1 18:17:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/net/http.rb: merged coding style changes from HEAD.
-
-Sun Feb  1 16:15:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/test/unit.rb: rearranged documentation for RDoc's sake.
-	* lib/matrix.rb: improved documentation.
-	* lib/net/http.rb: slight documentation formatting improvement.
-
-Sun Feb  1 05:30:06 2004  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (URI::Generic#find_proxy): warn HTTP_PROXY.
-	 raise an errror on non-http proxy URI.
-	 (OpenURI::Buffer#<<): make a tempfile binmode.  [ruby-talk:90793]
-
-Sat Jan 31 09:20:32 2004  NAKAMURA, Hiroshi  <nakahiro@sairon.co.jp>
-
-	* sample/openssl/gen_csr.rb: wrong usage string.
-
-Sat Jan 31 01:00:32 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/wsdlDriver.rb, lib/wsdl/soap/operation.rb: add support of
-	  "parts" attribute of soap:body element in WSDL.
-
-	* lib/wsdl/xmlSchema/schema.rb: friendly warning message for
-	  simpleType element which is not supported for now.
-
-	* lib/soap/mapping/factory.rb: deleted unused methods.
-
-	* lib/soap/mapping/rubytypeFactory.rb: do no ignore case while xsi:type
-	  string <-> Ruby class name matching.
-
-	* test/wsdl/soap/{soapbodyparts.wsdl,test_soapbodyparts.wsdl}: new
-	  files.
-
-Thu Jan 29 23:56:00 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* util.c (mblen): fix overrun.  [ruby-dev:22672]
-
-Thu Jan 29 22:41:53 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb: Allow 'link:' in Tidylinks.
-	  THis means you can write "see f1[link:files/f1_rb.html]".
-
-Thu Jan 29 15:33:23 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_x509hame.c (ossl_x509name_initialize): change
-	  second argument. it expected to be a Hash not an Integer.
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_add_entry): add new
-	  function for OpenSSL::X509::Name#add_entry.
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_a): append ASN.1
-	  tag number to each element of return value.
-
-	* ext/openssl/ossl_x509name.c (Init_ossl_x509name): add constants
-	  OpenSSL::X509::Name::DEFAULT_OBJECT_TYPE and OBJECT_TYPE_TEMPLATE.
-
-	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#initialize):
-	  second argument takes OBJECT_TYPE_TEMPLATE by default.
-
-	* sample/openssl/gen_csr.rb: use OpenSSL::X509::Name.parse.
-
-Wed Jan 28 04:29:41 2004  Eric Schwartz  <emschwar@fc.hp.com>
-
-	* lib/cgi/session.rb: use LOCK_SH to read, and a few other
-	  improvements.  [ruby-core:02328]
-
-Tue Jan 27 11:09:29 2004  FUKUMOTO Atsushi  <fukumoto@nospam.imasy.or.jp>
-
-	* ext/socket/socket.c (s_recvfrom): sending length should be an
-	  invariant while retrying on EAGAIN.  [ruby-talk:89962]
-
-Tue Jan 27 10:35:18 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c (set_argv): fix condition.
-
-Tue Jan 27 02:26:31 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httputils.rb (WEBrick:HTTPUtils::parse_header):
-	  refine regex for header-name.
-
-Tue Jan 27 00:30:11 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/Makefile.sub: rollback.
-
-Mon Jan 26 22:53:04 2004  Dave Thomas  <dave@pragprog.com>
-
-	* io.c: Remove documentation references to $defout.
-
-Mon Jan 26 15:11:47 2004  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* sample/exyacc.rb: escape '}' to avoid warning.
-
-Mon Jan 26 14:41:46 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/delegate.rb (Delegator::initialize): preserve
-	  singleton_method_added method [ruby-dev:22685]
-
-	* lib/delegate.rb (Delegator::initialize): use Kernel::raise
-	  instead of mere raise.  [ruby-dev:22681]
-
-Mon Jan 26 12:47:17 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c: define CONST84 when TCL_MAJOR_VERSION == 7
-
-Mon Jan 26 11:35:23 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/extmk.rb: Makefiles should depend on also rbconfig.rb.
-	  (ruby-bugs:PR#1256)
-
-	* ext/win32ole/win32ole.c (set_argv): set real arguments to
-	  WIN32OLE::ARGV.  [ruby-list:39073]
-
-Thu Jan 22 22:54:53 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (BEG_REGEXP): allow 8-bit characters in quoted
-	  strings for Novell GroupWise Internet Agent.
-	* lib/net/imap.rb (DATA_REGEXP): ditto.
-
-Thu Jan 22 16:21:33 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (string_content): reset lexical states at the beginning of
-	  string contents.  [ruby-list:39061]
-
-Wed Jan 21 21:55:51 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: remove O_NONBLOCK, thanks \ay
-	* lib/drb/extserv.rb: typo
-
-Wed Jan 21 17:57:56 2004  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/net/imap.rb (envelope): allow NIL.
-	* lib/net/imap.rb (body): ditto.
-	* lib/net/imap.rb (number): ditto.
-	* lib/net/imap.rb (ensure_nz_number): show a detailed error
-	  message.
-
-Wed Jan 21 16:44:20 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/mkmf.rb (merge_libs): squeeze successive same libraries.
-	  [ruby-dev:22652]
-
-Wed Jan 21 16:01:37 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/digest/rmd160/extconf.rb: have_library appends found library.
-
-Wed Jan 21 11:36:00 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* parse.y (block_append): update nd_end for "real" head node.
-	  [ruby-list:39058]
-
-Tue Jan 20 14:48:13 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: should check <openssl/conf_api.h> instead
-	  of OPENSSL_VERSION_NUMBER. [ruby-list:39056]
-
-Tue Jan 20 14:43:17 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/base64.rb: Add RDoc
-
-Tue Jan 20 14:25:51 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/abbrev.rb: Add RDoc
-
-Tue Jan 20 13:22:39 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb: Document aliases at
-	  top-most level.
-
-	* lib/English.rb: Document English.rb.
-
-Tue Jan 20 02:49:22 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: add check for OpenSSL version.
-	  [ruby-list:39054]
-
-Tue Jan 20 02:38:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_class): should not dump singleton class.
-	  [ruby-dev:22631]
-
-Tue Jan 20 01:31:36 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (lineno): typo fix(FIX2INT -> INT2FIX).
-
-Mon Jan 19 21:53:38 2004  akira yamada  <akira@ruby-lang.org>
-
-	* io.c, re.c, string.c, time.c: fixed up positions of RDocs.
-
-Mon Jan 19 07:09:20 2004  Tadayoshi Funaba  <tadf@dotrb.org>
-
-	* lib/date.rb: zone was wrong when it was behind UTC.
-	  Thanks Mark J. Reed.
-
-	* lib/date/format.rb: %z is now always replaced by four digits
-	  with a leading plus or minus sign.
-
-	* sample/cal.rb: added a class, anyway.
-
-Sun Jan 18 20:47:35 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ruby.c: use translate_char() on Cygwin.
-
-Sun Jan 18 02:33:26 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* defines.h (_WIN32): undef _WIN32 on Cygwin before defining DOSISH.
-
-Sun Jan 18 00:23:55 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (class2path): check anonymous class/module before
-	  checking referable, and allow singleton classes.
-
-Fri Jan 16 14:33:35 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* marshal.c (class2path): get class path and check referable.
-	  [ruby-dev:22588]
-
-Fri Jan 16 09:52:23 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_eq): Proc with empty body may not be equal.
-	  [ruby-dev:22590]
-
-Thu Jan 15 13:03:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (argf_read): do not append EOF.  (ruby-bugs-ja:PR#585)
-
-	* io.c (rb_io_fwrite): ad-hockery hack to get rid of HP-UX stdio
-	  weird behavior.  [ruby-dev:22424]
-
-Wed Jan 14 13:31:06 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/extconf.rb: wrapper iconv.rb is dependent on platform.
-
-Tue Jan 13 18:54:28 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb(Logger#msg2str): no special treatment for the object
-	  which responds to :to_str.  commited at 2004-01-11T21:46:27 by
-	  gsinclair.
-
-	* lib/logger.rb(LogDevice#initialize): remove type checking if the
-	  given object is a String.  Kernel.open handles it correctly.
-	  commited at 2004-01-11T21:46:27 by gsinclair.
-
-	* test/logger/test_logger.rb: follow above change (ArgumentError ->
-	  TypeError.)  follow above commit.
-
-Tue Jan 13 14:27:13 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
-
-	* lib/test/unit/ui/testrunnerutilities.rb (TestRunnerUtilities):
-	  moved run method which allows output level.  [ruby-dev:22554]
-
-Tue Jan 13 04:29:52 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_driver.rb (RiDriver::report_method_stuff):
-	  Show fully-qualified class names in class list.
-
-Tue Jan 13 01:04:37 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_paths.rb (RI::Paths): First attempt at
-	  incorporating DESTDIR in the rdoc installation.
-
-Mon Jan 12 23:27:19 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (primary): fix position after FCALL.  [ruby-dev:22574]
-
-Mon Jan 12 12:07:22 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods):
-	  Someone changed the "// in eval.c" comments to "/*...*/" style,
-	  so the parsing of the source file name broke.
-
-	* object.c: Remove spurious space in TrueClass documentation.
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body): Fix
-	  bad regexp: if the code before a documented method contained
-	  a comment that wasn't terminated by whitespace, that comment
-	  and all intervening code was included in the following
-	  method's documentation.
-
-	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter::break_to_newline):
-	  HTML formats need explicit line breaks.
-
-Mon Jan 12 11:46:30 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
-	  quotes.  [ruby-dev:22564]
-
-	* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
-
-	* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
-
-Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
-	  generation support to ri (Elliot Hughes)
-
-Mon Jan 12 02:24:07 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML
-	  generation support to ri (Elliot Hughes)
-
-Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
-	  Also accept command line options via the 'RI' environment variable.
-
-Sun Jan 11 02:07:47 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList):
-	  Also accept command line options via the 'RI' environment variable.
-
-Sat Jan 10 21:27:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): need to add message delimiter. [ruby-dev:22561]
-
-Sat Jan 10 01:54:50 2004  Eric Sunshine  <sunshine@sunshineco.com>
-
-	* defines.h (__NeXT__): Ensure that all standard S_IRUSR, S_IWGRP,
-	  S_IRWXO, etc. macros are defined since future code might require
-	  them (even though present code only requires a subset).
-
-	* defines.h (__NeXT__): Bug fix: WORDS_BIGENDIAN was not being set
-	  correctly on Rhapsody when -arch compiler flag was used (via
-	  configure's --enable-fat-binary option).
-
-Fri Jan  9 10:05:14 2004  Siena.  <siena@faculty.chiba-u.jp>
-
-	* lib/mkmf.rb (libpathflag): use single quotes.  [ruby-dev:22440]
-
-Thu Jan  8 23:49:21 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in (RDOCTARGET): new macro.  if you want to install
-	  rdoc documentation, you need to run configure with
-	  --enable-install-doc.
-
-Thu Jan  8 21:29:43 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_pkey.c (ossl_pkey_to_der): removed; it returns
-	  public key only.
-
-	* ext/openssl/ossl_pkey_dh.c (ossl_dh_to_der): new function for
-	  OpenSSL::PKey::DH#to_der.
-
-	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_to_der): new function for
-	  OpenSSL::PKey::DSA#to_der.
-
-	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_to_der): new function for
-	  OpenSSL::PKey::RSA#to_der.
-
-Thu Jan  8 16:51:04 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/wsdl/datetime/test_datetime.rb: fixed a stupid testcase which
-	  dumps "E" at month-end.
-
-Thu Jan  8 11:20:01 2004  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* eval.c, object.c, process.c, re.c: don't use C++ style comments.
-
-Thu Jan  8 04:36:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/cgi.rb (WEBrick::CGI#initialize): should create
-	  @config[:Logger] if it was not given.
-
-	* sample/webrick/*: new files.
-
-	* MANIFEST: add sample/webrick/*
-
-Wed Jan  7 13:00:18 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/ri/ri_driver.rb: Fix problem where ri was
-	  being too eager to find matches of ambiguous method
-	  names (such as "ri Thread.join" would return both
-	  Thread.join and ThreadsWait.join)
-
-Wed Jan  7 12:35:41 2004  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/debug.rb: revert command parse regexps.  [ruby-list:39014] by
-	  Shirai,Kaoru.
-
-Wed Jan  7 08:21:04 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parserfactory.rb: Check for shebang
-	  line in files that would otherwise be treated as
-	  plain text.
-
-Tue Jan  6 22:13:34 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_mod_modfunc): should break if m has no super class.
-	  [ruby-dev:22498]
-
-Tue Jan  6 21:55:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* io.c (fptr_finalize): should save errno just after failure.
-	  [ruby-dev:22492]
-
-Tue Jan  6 14:53:14 2004  Dave Thomas  <dave@pragprog.com>
-
-	* bin/ri: split out the display side, making it pluggable. Added
-	  new ri_driver and ri_display files in lib/rdoc/ri.
-
-Tue Jan  6 06:37:53 2004  Dave Thomas  <dave@pragprog.com>
-
-	* bin/rdoc: Add --ri-system switch
-
-	* lib/.document: Update with list of files that seem to have
-	  documentation
-
-	* lib/test/unit.rb: Reorder comment to make it RDoc friendly.
-
-	* Makefile.in: add install-nodoc target, and make it
-	  generate RDoc on default install.
-
-	* lib/rdoc/ri/ri_options.rb (RI::Options::parse): Add
-	  --doc-dir option to ri.
-
-Tue Jan  6 00:04:40 2004  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method_or_yield_parameters):
-	  fix parsing if there are braces in a method parameter list
-
-Fri Jan  2 14:54:11 2004  Dave Thomas  <dave@pragprog.com>
-
-	* bin/ri: Add new --classes option, and arrange for
-	  help messages to be paged too.
-
-	* bin/rdoc: Add statistics.
-
-	* process.c: (MG) Added Process documentation
-
-	* lib/rdoc/ri/ri_formatter.rb (RI::AttributeFormatter::wrap):
-	  Fix problem with labels not displaying in RI labeled
-	  lists using BS and ANSI modes.
-
-Fri Jan  2 01:50:13 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_eof): ARGF.eof? should not have any side effect.
-	  [ruby-dev:22469]
-
-Wed Dec 31 17:25:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_each_byte): should return self.  [ruby-dev:22465]
-
-Wed Dec 31 11:20:34 2003  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::do_methods): Make
-	  file referenced in "// in sss.c" relative to current file.
-
-Wed Dec 31 11:17:37 2003  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/generators/html_generator.rb: Fix problem when
-	  a public method was aliased, but the alias is then
-	  made private, and hence doesn't appear in RDoc output.
-
-Wed Dec 31 01:33:05 2003  Dave Thomas  <dave@pragprog.com>
-
-	* array.c, error.c, eval.c, io.c, prec.c, range.c, re.c,
-	  string.c, time.c: Add RDoc for Kernel functions, and tidy.
-
-Tue Dec 30 19:39:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (rb_f_readline): should raise EOFError at the end of
-	  files.  [ruby-dev:22458]
+	* test/rinda/test_rinda.rb
+	  (TestRingServer#test_make_socket_ipv4_multicast,
+	   TestRingServer#test_make_socket_ipv6_multicast): change bound
+	  interface address because multicast address is not allowed on Linux
+	  or Windows.
+	  [ruby-core:53692] [Bug #8159]
 
-	* io.c (argf_read): should concatenate input files when length
-	  argument is nil. [ruby-dev:22450]
+Thu Apr 25 23:45:02 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* io.c (argf_read): should update supplied string buffer (2nd
-	  argument) even when IO#read is called multiple times.
+	* lib/rinda/ring.rb (Rinda::RingServer#initialize): add a socket
+	  to @sockets in make_socket() to close sockets on shutdown even if
+	  make_socket() is called after initialize.
 
-	* io.c: should initialize lineno by zero. [ruby-dev:22460]
+	* lib/rinda/ring.rb (Rinda::RingServer#make_socket): ditto.
 
-Tue Dec 30 12:30:30 2003  Dave Thomas  <dave@pragprog.com>
+Thu Apr 25 23:39:42 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): If a
-	  class and a method have the same name, finding Xxx.abc was trying
-	  to find 'abc' in method 'Xxx', not class 'Xxx'.
+	* test/rinda/test_rinda.rb (TupleSpaceProxyTest#test_take_bug_8215):
+	  use KILL on Windows since TERM doen't work and ruby process remains
+	  after test-all on Windows.
 
-Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
+Thu Apr 25 23:16:28 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
-	  Handle undoing nesting of yield parameters correctly for:
+	* ext/curses/extconf.rb: Implement
+	  --with-curses-version={function,variable} configure option for
+	  cross-compiling.
 
-	  def each_entry(&b) Dir.foreach(@path) {|f| yield P.new(f) } end
+Thu Apr 25 18:15:46 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
+	* ext/socket/extconf.rb: Don't use WIDE getaddrinfo by default.
 
-	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method):
-	  Handle undoing nesting of yield parameters correctly for:
+Thu Apr 25 17:56:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	    def each_entry(&block) Dir.foreach(@path) {|f| yield Pathname.new(f) } end
+	* ext/socket/extconf.rb: Remove obsolete options: ---with-ipv6-lib and
+	  --with-ipv6-libdir.
 
-Mon Dec 29 12:51:02 2003  Dave Thomas  <dave@pragprog.com>
+Thu Apr 25 17:43:49 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c: Add RDoc for Kernel global functions.
+	* ext/socket/extconf.rb: Implement
+	  --{enable,disable}-close-fds-by-recvmsg-with-peek configure option
+	  for cross-compiling.
+	  Make --{enable,disable}-wide-getaddrinfo configure option
+	  cross-compiling friendly.
 
-Mon Dec 29 11:00:16 2003  Dave Thomas  <dave@pragprog.com>
+Thu Apr 25 16:11:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* array.c: Tidy up RDoc loose ends.
+	* io.c (rb_io_ext_int_to_encs, parse_mode_enc): bom-prefixed name is
+	  not a real encoding name, just a fallback.  so the proper conversion
+	  should take place even if if the internal encoding is equal to the
+	  bom-prefixed name, unless actual encoding is equal to the internal
+	  encoding.  [ruby-core:54563] [Bug #8323]
 
-Mon Dec 29 05:05:51 2003  Dave Thomas  <dave@pragprog.com>
+	* io.c (io_set_encoding_by_bom): reset extenal encoding if no BOM
+	  found.  [ruby-core:54569]
 
-	* struct.c, random: Add RDoc comments
+Thu Apr 25 14:35:01 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Dec 29 02:20:54 2003  Dave Thomas  <dave@pragprog.com>
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): allow Fixnum and Bignum.
+	  [ruby-core:53986] [Feature #8217]
 
-	* eval.c: Add RDoc for class Proc, Method, UnboundMethod
+Thu Apr 25 14:26:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Dec 29 00:41:44 2003  Dave Thomas  <dave@pragprog.com>
+	* lib/uri/common.rb (URI.decode_www_form): follow current URL Standard.
+	  It gets encoding argument to specify the character encoding.
+	  It now allows loose percent encoded strings, but denies ;-separator.
+	  [ruby-core:53475] [Bug #8103]
 
-	* math.c: Add RDoc comments
+	* lib/uri/common.rb (URI.decode_www_form): follow current URL Standard.
+	  It gets encoding argument to convert before percent encode.
+	  Now UTF-16 strings aren't converted to UTF-8 before percent encode
+	  by default.
 
-Sun Dec 28 20:19:11 2003  Tanaka Akira  <akr@m17n.org>
+Wed Apr 25 14:26:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
 
-	* ext/stringio/stringio.c (strio_sysread): StringIO.new.sysread didn't
-	  raise EOFError.
+	* benchmark/bm_hash_shift.rb: add benchmark for Hash#shift
 
-	* ext/zlib/zlib.c (gzreader_gets): don't increment lineno when
-	  gzfile_read_all returns "".
+	* hash.c (rb_hash_shift): use st_shift if hash is not being iterated to
+	  delete element without iterating the whole hash.
 
-Sun Dec 28 15:25:08 2003  Dave Thomas  <dave@pragprog.com>
+	* hash.c (shift_i): remove function
 
-	* class.c,object.c,parse.y,sprintf.c,variable.c: Document classes
-	  Object, Module, etc...
+	* include/ruby/st.h (st_shift): add st_shift function
 
-Sun Dec 28 11:55:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* st.c (st_shift): ditto
 
-	* test/csv/test_csv.rb: generate bom.csv and mac.csv files on the fly.
-	  [ruby-talk:88852]
+	[Bug #8312] [ruby-core:54524] Patch by funny-falcon
 
-	* test/csv/{bom.csv,mac.csv}: removed.
+Thu Apr 25 12:03:38 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Dec 28 08:56:51 2003  Dave Thomas  <dave@pragprog.com>
+	* ext/socket/extconf.rb: Extract C programs as toplevel constants.
 
-	* eval.c: Thead[Group] RDoc (thanks to MG)
+Thu Apr 25 02:23:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Dec 28 03:50:05 2003  Dave Thomas  <dave@pragprog.com>
+	* configure.in (RUBY_RM_RECURSIVE): this hack is needed by only
+	  autoconf 2.69 or earlier on darwin.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_override_comment):
-	  Escape method names used in regexp
+Thu Apr 25 01:22:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Dec 28 01:46:02 2003  Dave Thomas  <dave@pragprog.com>
+	* lib/tracer.rb (get_line): simply read by File.readlines.
 
-	* lib/rdoc/ri/ri_formatter.rb (RI::TextFormatter::display_flow_item):
-	  Add support for rules in 'ri' output.
+	* lib/debug.rb (script_lines): get source lines from SCRIPT_LINES__ or
+	  read from the file.
 
-Sun Dec 28 01:35:35 2003  Dave Thomas  <dave@pragprog.com>
+	* lib/debug.rb (display_list): use script_lines instead of recursion.
+	  [Bug #8318]
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_body):
-	  Sometimes the Ruby source aliases two otherwise
-	  unrelated methods (for example Kernel#object_id and
-	  Kernel#hash are both the same C function). Provide a
-	  facility to allow the methods to be documented
-	  separately.
+	* lib/debug.rb (line_at): use script_lines same as display_list.
 
-Sun Dec 28 01:05:31 2003  Dave Thomas  <dave@pragprog.com>
+	* lib/debug.rb (display_list): Fix debug listing when called from the
+	  same file it has been required.  patch by Dario Bertini <berdario AT
+	  gmail.com> [Bug #8318] [fix GH-280]
 
-	* marshal.c, signal.c: RDoc collemts added by Elliott Hughes
+Wed Apr 24 21:51:13 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Dec 28 00:48:47 2003  Dave Thomas  <dave@pragprog.com>
+	* configure.in: Check mblen().
+	  mblen() is optional in uClibc.
 
-	* lib/rdoc/parsers/parse_c.rb (RDoc::C_Parser::find_class_comment):
-	  Some source files use lower case class or module names
-	  when naming the Init_XXX function in C.
+	* eval_intern.h (CharNext): Don't use mblen() is not available.
 
-Sat Dec 27 23:41:46 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Apr 24 15:55:06 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* configure.in: fix "test: too many arguments" error.
+	* io.c (rb_fd_fix_cloexec): use rb_update_max_fd().
 
-Sat Dec 27 15:32:19 2003  Dave Thomas  <dave@wireless_3.local.thomases.com>
+Wed Apr 24 14:08:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* time.c: RDoc comments added
+	* numeric.c: Fix wiki link on Float imprecision in overview, patched
+	  by Makoto Kishimoto [Bug #8304] [ruby-dev:47280]
 
-Sat Dec 27 15:07:57 2003  Dave Thomas  <dave@pragprog.com>
+Wed Apr 24 14:03:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* object.c: Add RDoc comments for Symbol class.
+	* parse.y (parser_yylex): disallow $- without following identifier
+	  character.  [ruby-talk:406969]
 
-Sat Dec 27 14:42:30 2003  Dave Thomas  <dave@pragprog.com>
+	* parse.y (is_special_global_name): mere $- is not a valid global
+	  variable name.
 
-	* numeric.c: Add RDoc comments.
+Wed Apr 24 13:54:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Sat Dec 27 00:44:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c: Document String#setbyte return value by @gjmurakami-10gen
+	  [Fixes GH-294]
 
-	* io.c (next_argv): warn always for stdin on inplace edit mode.
+Wed Apr 24 13:45:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* io.c (read_all): need to check string value.
+	* class.c: Example of Object#methods by @windwiny [Fixes GH-293]
+	* ruby.c: Document return values of Kernel #sub, #gsub, and #chop
 
-	* io.c (argf_read): allow ARGF.read(nil).  [ruby-dev:22433]
+Wed Apr 24 12:54:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Fri Dec 26 23:02:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]
 
-	* io.c (rb_f_backquote): need not to check nil result.
-	  [ruby-core:02078]
 
-	* io.c (rb_io_getline): should return nil when read_all gives
-	  empty string, even when nil rs is specified. [ruby-core:02077]
+Wed Apr 24 12:54:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Fri Dec 26 18:50:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/lib/socket.rb: Doc typos by @vipulnsward [Fixes GH-292]
 
-	* configure.in: check if getcontext and setcontext are available.
+Wed Apr 24 12:27:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* eval.c: use presence of getcontext/setcontext.
+	* array.c: Fix documentation for Array#index and #replace aliases
+	  Based on a patch by @phiggins [Fixes GH-282]
 
-Fri Dec 26 16:40:53 2003  Tanaka Akira  <akr@m17n.org>
+Tue Apr 23 21:14:38 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/pathname.rb (PathnameTest#test_plus): add 2 assertions.
+	* string.c (rb_str_inspect): refix r40413, on Ruby 1.9 usual character
+	  escape uses hex/Unicode escapes, so fix to use Unicode escape on
+	  Unicode strings and hex on others. [ruby-core:54458] [Bug #8290]
 
-Fri Dec 26 09:26:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Apr 23 20:10:02 2013  Tanaka Akira  <akr@fsij.org>
 
-	* pack.c (pack_pack): add sign check for 'i', and 'l'.
-	  [ruby-dev:22427]
+	* missing/isnan.c (isnan): Don't define if isnan() macro is defined.
+	  This fixes a compilation failure on uClibc based Gentoo system.
 
-	* bignum.c (rb_quad_pack): add range check for 'quad int'.
+Tue Apr 23 17:40:40 2013  Martin Duerst <duerst@it.aoyama.ac.jp>
 
-Thu Dec 25 22:39:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* lib/rexml/document.rb, lib/rexml/element.rb,
+	  lib/rexml/formatters/pretty.rb: remove opinionated
+	  language in documentation. [Bug #8309],
+	  reported by Charles Beckmann
 
-	* string.c (rb_str_update): don't return any value.
+Tue Apr 23 14:04:44 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-Thu Dec 25 15:30:17 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/net/imap.rb (getacl_response): parse the mailbox of an ACL
+	  response correctly.  [ruby-core:54365] [Bug #8281]
 
-	* string.c (rb_str_update): call rb_str_modify().
+Tue Apr 23 11:58:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Dec 25 05:08:09 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (rb_str_scrub): fix for UTF-32.  strlen() on strings
+	  contain NUL returns wrong result, use sizeof operator instead.
+	  [ruby-dev:45975] [Feature #6752]
 
-	* eval.c (search_required): search actual file name once when no
-	  extension specified.
+Tue Apr 23 10:26:50 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Dec 25 04:00:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/ruby/test_module.rb
+	  (TestModule#test_const_get_invalid_name)
+	  (test_const_defined_invalid_name): Fix expected values.
 
-	* stable version 1.8.1 released.
+Tue Apr 23 09:51:26 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Dec 25 00:17:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_inspect): NUL should not be represented as "\0"
+	  when octal digits may follow.  [ruby-core:54458] [Bug #8290]
 
-	* configure.in: check for nanosleep, -lrt if required.
-	  [ruby-core:02059]
+Mon Apr 22 22:54:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
 
-	* eval.c (thread_timer): use select(2) if nanosleep(2) is not
-	  available.
+	* insns.def (opt_mod): Use % operator if both operands are positive for
+	  a significant performance improvement. Thanks to @samsaffron.
 
-	* eval.c: check __stub_getcontext for glibc on some platforms.
-	  [ruby-list:38984]
+Mon Apr 22 17:09:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Dec 24 23:48:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* marshal.c (r_object0): copy all instance variables not only generic
+	  ivars, before calling post proc.  [ruby-core:51163] [Bug #7627]
 
-	* test/soap/test_basetype.rb, test/soap/marshal/test_marshal.rb
-	  test/xsd/test_xsd.rb: use "(-1.0 / (1.0 / 0.0))" instead of "-0.0"
-	  to express -0.0.  [ruby-talk:88786]
+Mon Apr 22 10:25:21 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Dec 24 23:29:30 2003  Tanaka Akira  <akr@m17n.org>
+	* util.c (ruby_hdtoa): revert r29729.
+	  If you want ruby to behave as before on x86, specify to use SSE like
+	  -msse2 -mfpmath=sse for gcc.
 
-	* lib/tsort.rb (test_orphaned_break): removed.
+Sun Apr 21 23:19:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
 
-Wed Dec 24 20:53:06 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* configure.in: Revert using sigsetjmp by default due to performance
+	  problems on some systems (eg. older Linux)
 
-	* ext/tk/sample/tkmulticolumnlist.rb: new sample
+Sun Apr 21 21:35:00 2013  Charlie Somerville  <charlie@charliesomerville.com>
 
-	* ext/tk/sample/tkmultilistframe.rb: bug fix
+	* configure.in: Use sigsetjmp by default so jumping out of signal
+	  handlers properly restores the signal mask and SS_ONSTACK flag.
+	  [ruby-core:54175] [Bug #8254]
 
-Wed Dec 24 20:37:37 2003  Eric Sunshine  <sunshine@sunshineco.com>
+	* configure.in: Manually check for presence of sigsetjmp. It is not a
+	  function on some systems, so AC_CHECK_FUNCS cannot be used.
 
-	* configure.in (LDSHARED): Fixed typographical error in assignment of
-	  LDSHARED for Rhapsody which caused linking of extension modules to
-	  fail.
+Sun Apr 21 08:00:55 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Dec 24 17:51:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/csv/test_features.rb, test/logger/test_logger.rb
+	  test/mkmf/test_have_macro.rb, test/net/http/test_http.rb,
+	  test/openssl/test_config.rb, test/psych/test_encoding.rb,
+	  test/psych/test_exception.rb, test/psych/test_psych.rb,
+	  test/psych/test_tainted.rb, test/readline/test_readline.rb,
+	  test/rexml/test_contrib.rb, test/ruby/test_autoload.rb,
+	  test/ruby/test_beginendblock.rb, test/ruby/test_exception.rb,
+	  test/ruby/test_file.rb, test/ruby/test_io.rb,
+	  test/ruby/test_marshal.rb, test/ruby/test_process.rb,
+	  test/ruby/test_require.rb, test/ruby/test_rubyoptions.rb,
+	  test/syslog/test_syslog_logger.rb, test/webrick/test_httpauth.rb,
+	  test/zlib/test_zlib.rb: Use Tempfile.create.
 
-	* file.c (rb_thread_flock): enable thread support again.
+Sun Apr 21 00:15:36 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Dec 24 16:46:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/tempfile.rb (Tempfile.create): Close when the block exits.
 
-	* eval.c (catch_timer): do not call rb_thread_schedule() inside to
-	  avoid pthread_mutex_lock() deadlock.  interrupts to system calls
-	  are detected by TRAP_END via EINTR error.
+Sat Apr 20 23:38:14 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (thread_timer): do not post signal unless it is
-	  absolutely necessary.
+	* lib/webrick/httpauth/htpasswd.rb: Use Tempfile.create to avoid
+	  unintentional unlink() by the finalizer.
+	  lib/webrick/httpauth/htdigest.rb: Ditto.
 
-	* rubysig.h (TRAP_END): add CHECK_INTS to switch thread.
+Sat Apr 20 22:47:48 2013  Tanaka Akira  <akr@fsij.org>
 
-	* regex.c (re_compile_pattern): check if nextp is smaller than
-	  pend.  [ruby-dev:22372]
+	* lib/tempfile.rb (Tempfile.create): New method.
+	  The method name is proposed by Shugo Maeda.  [ruby-dev:47220]
+	  [ruby-core:41478] [Feature #5707]
 
-	* eval.c (umethod_bind): remove method overridden check.
-	  [ruby-dev:22366]
+Sat Apr 20 14:22:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Dec 24 16:13:05 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* marshal.c (w_object): dump no ivars to the original by marshal_dump.
+	  [ruby-core:54334] [Bug #8276]
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read): should check for error
-	  status by SSL_get_error().
+	* marshal.c (r_object0): copy all ivars of marshal_dump data to the
+	  result object instead.  [ruby-core:51163] [Bug #7627]
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_write): ditto.
+Sat Apr 20 02:33:27 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Dec 24 14:23:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* string.c (str_scrub): add ruby method String#scrub which verify and
+	  fix invalid byte sequence. [ruby-dev:45975] [Feature #6752]
 
-	* ext/stringio/stringio.c (strio_read): clear the buffer argument
-	  when returning nil.  [ruby-dev:22363]
+	* string.c (str_compat_and_valid): check given string is compatible
+	  and valid with given encoding.
 
-	* test/ruby/ut_eof.rb (TestEOF::test_eof_0, TestEOF::test_eof_1):
-	  add buffer argument tests.
+	* transcode.c (str_transcode0): If invalid: :replace is specified for
+	  String#encode, replace invalid byte sequence even if the destination
+	  encoding equals to the source encoding.
 
-Wed Dec 24 14:07:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 19 21:55:40 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* lib/test/unit/assertions.rb: Modules are allowed to rescue.
+	* README.EXT.ja (Data_Wrap_Struct): Remove a description about
+	  orphan argument. Oh, I renamed the argument name without
+	  changing description at r36180... Sorry....
+	  Patch by Makoto Kishimoto. Thanks!!! [ruby-dev:47269] [Bug #8292]
+	* README.EXT.ja (Data_Make_Struct): Add a sample code that describes
+	  how it works.
+	  Patch by Makoto Kishimoto. Thanks!!! [ruby-dev:47269] [Bug #8292]
 
-	* lib/test/unit/autorunner.rb: show output_level in order.
+Fri Apr 19 17:54:57 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-	* lib/test/unit/collector/dir.rb: get rid of successive same
-	  directories in load path.
+	* lib/net/imap.rb (body_type_msg): should accept
+	  message/delivery-status with extra data.
+	  [ruby-core:53741] [Bug #8167]
 
-	* test/testunit/test_assertions.rb (test_assert_nothing_raised,
-	  test_assert_raise): test for modules.
+	* test/net/imap/test_imap_response_parser.rb: related test.
 
-Wed Dec 24 13:43:34 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Fri Apr 19 13:03:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/imap.rb (authenticate): remove "\n" from base64 encoded
-	  strings.
+	* marshal.c (w_object): do not dump encoding which is dumped with
+	  marshal_dump data.  [ruby-core:54334] [Bug #8276]
 
-Wed Dec 24 11:26:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr 19 11:36:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/fileutils/test_fileutils.rb: should not create any
-	  files or directories in current directory.  [ruby-talk:88724]
+	* configure.in (stack_protector): control use of -fstack-protector.
 
-Wed Dec 24 10:29:53 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in (debugflags): let -fstack-protector precede and disable
+	  debugflags, because they can't work together on SmartOS.  [Bug #8268]
 
-	* ext/stringio/stringio.c (strio_read): never return nil at
-	  unlimited read.  [ruby-dev:22334]
+Fri Apr 19 07:43:52 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/stringio/stringio.c (strio_read): support second
-	  argument.  [ruby-dev:22350]
+	* test/openssl/test_cipher.rb: Correct a typo
+	  by jgls <joerg@joergleis.com>
+	  https://github.com/ruby/ruby/pull/291 fix GH-291
 
-Wed Dec 24 09:38:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr 18 16:58:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (arg): should return 0 after error.  [ruby-dev:22360]
+	* vm_method.c (rb_mod_public_method): fix visibility on anonymous
+	  module. set visibility of singleton method, not method in base
+	  class.  [ruby-core:54404] [Bug #8284]
 
-Wed Dec 24 00:56:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Apr 18 16:20:51 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* io.c (read_all): do not return nil at the end of file.
-	  [ruby-dev:22334]
+	* dir.c (glob_helper): should skip dot directories only for recursion,
+	  but should not if matching to the given pattern.  [ruby-core:54387]
+	  [Bug #8283]
 
-	* io.c (argf_read): do not depend on nil at eof behavior of
-	  IO#read().
+Thu Apr 18 16:20:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_thread_join): dup exception before re-raising it.
+	* pack.c (pack_unpack): increase buffer size to fix buffer overflow,
+	  and fix garbage just after unpacking without missing paddings.
+	  [Bug #8286]
 
-	* io.c (rb_io_eof): call clearerr() to prevent side effect.  this
-	  patch is supplied by Masahiro Sakai <sakai@tom.sfc.keio.ac.jp>.
-	  [ruby-dev:22234]
+Thu Apr 18 13:35:54 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* pack.c (OFF16): get offset for big endian machines.
+	* pack.c (pack_unpack): output characters even if the input doesn't
+	  have paddings. [Bug #8286]
 
-	* pack.c (pack_pack): use OFF16 instead of OFF16B.
-	  [ruby-dev:22344]
+Thu Apr 18 08:20:48 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* pack.c (pack_unpack): ditto.
+	* common.mk (clean-ext): remove timestamps.
 
-Tue Dec 23 22:47:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Apr 17 22:07:50 2013  Tanaka Akira  <akr@fsij.org>
 
-	* io.c (rb_io_check_readable): set FMODE_RBUF always, even if
-	  NEED_IO_SEEK_BETWEEN_RW is not defined. [ruby-dev:22340]
+	* ext/socket/rubysocket.h (SOCKLEN_MAX): Expression simplified.
 
-	* io.c (rb_io_check_writable): clear FMODE_RBUF before writing
-	  something.
+Wed Apr 17 20:09:19 2013  Aman Gupta  <ruby@tmm1.net>
 
-Tue Dec 23 22:25:00 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
+	* compile.c (iseq_add_mark_object): Use new rb_iseq_add_mark_object().
 
-	* lib/optparse.rb: incomplete RDoc documentation added in place of
-	  existing RD comments.  Tabs converted to spaces.
+	* insns.def (setinlinecache): Ditto.
 
-Tue Dec 23 19:44:47 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* iseq.c (rb_iseq_add_mark_object): New function to allocate
+	  iseq->mark_ary on demand. [Bug #8142]
 
-	* test/soap/test_streamhandler.rb (test_basic_auth): removed.
-	  soap4r + basic_auth is not officially supported in ruby/1.8.1 even
-	  though soap4r + basic_auth + http-access2 should run fine.
+	* iseq.h (rb_iseq_add_mark_object): Ditto.
 
-Tue Dec 23 19:42:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* iseq.c (prepare_iseq_build): Avoid allocating mark_ary until needed.
 
-	* io.c (rb_io_ungetc): raise an exception at unread stream to
-	  avoid unspecified behavior.  [ruby-dev:22330]
+	* iseq.c (rb_iseq_build_for_ruby2cext): Ditto.
 
-	* test/ruby/test_system.rb (test_syntax): glob relatively from
-	  __FILE__.
+Wed Apr 17 20:00:18 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Dec 23 18:09:40 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/rubysocket.h (SOCKLEN_MAX): Defined.
 
-	* pack.c (pack_pack): remove unnecessary negative value check.
-	  [ruby-dev:22329]
+	* ext/socket/raddrinfo.c (ext/socket/raddrinfo.c): Reject too long
+	  Linux abstract socket name.
 
-Tue Dec 23 17:26:55 2003  KONISHI Hiromasa  <konishih@fd6.so-net.ne.jp>
+Wed Apr 17 19:45:27 2013  Aman Gupta  <tmm1@ruby-lang.org>
 
-	* bcc32/Makefile.sub (config.h): bcc has finite(). [ruby-list:38940]
+	* iseq.c (iseq_location_setup): re-use existing string when iseq has
+	  the same path and absolute_path. [Bug #8149]
 
-Tue Dec 23 16:08:16 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Apr 17 11:38:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rexml/encodings/US-ASCII.rb: typo.  [ruby-talk:88650]
+	* lib/test/unit/assertions.rb (Test::Unit::Assertions#assert):
+	  UNASSIGNED is not a valid message.
 
-	* test/ruby/test_system.rb: num of asserts depended on running dir.
+Wed Apr 17 10:58:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/xsd/test_noencoding.rb: rexml + without iconv/uconv cannot
-	  handle euc-jp.  install iconv, uconv or xmlscan.
+	* thread.c (sleep_timeval): get rid of overflow on Windows where
+	  timeval.tv_sec is not time_t but mere long.
 
-Tue Dec 23 14:13:51 2003  akira yamada  <akira@ruby-lang.org>
+Tue Apr 16 23:07:12 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/uri/generic.rb (URI::Generic::check_userinfo,
-	  URI::Generic::check_user, URI::Generic::check_password): tests
-	  conflicts/depends with other components closely.
+	* ext/socket/unixsocket.c (unix_send_io): Suppress a warning by clang.
+	  (unix_recv_io): Ditto.
 
-	* test/uri/test_generic.rb (TestGeneric::test_set_component):
-	  added tets.
+Tue Apr 16 12:27:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Dec 23 11:08:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/sdbm/init.c: Fix comment indentation, by windwiny [Fixes GH-277]
 
-	* test/xsd/test_noencoding.rb: rescue Errno::EINVAL and do not test.
-	  "euc-jp" might not be in supported encoding name list.
-	  [ruby-talk:88650]
+Tue Apr 16 12:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Dec 23 06:10:31 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/socket/option.c: Document synonymous methods, by windwiny [GH-277]
+	* ext/stringio/stringio.c: ditto
+	* ext/io/wait/wait.c: ditto
+	* ext/gdbm/gdbm.c: ditto
+	* ext/dl/cfunc.c: ditto
+	* ext/zlib/zlib.c: ditto
+	* ext/win32ole/win32ole.c: ditto
+	* ext/dbm/dbm.c: ditto
+	* ext/json/generator/generator.c: ditto
+	* ext/date/date_core.c: ditto
 
-	* lib/webrick/cgi.rb (CGI): add support for mod_ruby.
+Tue Apr 16 11:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/webrick/cgi.rb (CGI::Socket): add check for existence of
-	  OpenSSL module in all HTTPS related methods.
+	* ext/openssl/*: Document synonymous methods, by windwiny [GH-277]
 
-	* lib/webrick/cgi.rb (CGI::Socket#cipher): should create similar
-	  value to OpenSSL::SSLSocket#cipher.
+Mon Apr 15 22:21:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/webrick/httpresponse.rb (HTTPResponse#setup_header): should
-	  set "connection: close" if @keep_alive is false.
+	* ext/fiddle/depend: New file.
 
-	* lib/webrick/https.rb (HTTPrequest#meta_vars): add supprt for
-	  SSL_PROTOCOL, SSL_CIPHER_USEKEYSIZE and SSL_CIPHER_ALGKEYSIZE.
+Mon Apr 15 22:01:02 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Dec 22 23:00:05 2003  akira yamada  <akira@ruby-lang.org>
+	* misc/ruby-electric.el (ruby-electric-insert): Check
+	  ruby-electric-is-last-command-char-expandable-punct-p here.
 
-	* lib/uri/generic.rb (URI::Generic::check_opaque): fixed typo.
+	* misc/ruby-electric.el (ruby-electric-closing-char): New
+	  interactive function bound to closing characters.  Typing one of
+	  those closing characters right after the matching counterpart
+	  cancels the effect of automatic closing.  For example, typing
+	  "{" followed by "}" simply makes "{}" instead of "{ } }".
 
-Mon Dec 22 21:59:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Apr 15 12:54:42 2013  Martin Bosslet  <Martin.Bosslet@gmail.com>
 
-	* ext/iconv/iconv.c (map_charset): always ensure code is a String.
+	* ext/openssl/ossl_ssl.c: Correct shutdown behavior w.r.t GC.
 
-Mon Dec 22 21:15:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/openssl/test_ssl.rb: Add tests to verify correct behavior.
 
-	* class.c (rb_mod_init_copy): always copy singleton class.
-	  [ruby-dev:22325]
+	[Bug #8240] Patch provided by Shugo Maeda. Thanks!
 
-Mon Dec 22 20:44:36 2003  akira yamada  <akira@ruby-lang.org>
+Mon Apr 15 10:23:39 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/uri/generic.rb (URI::Generic#route_from): accepts urls which
-	  has no host-part.
+	* ext/coverage/depend: fix id.h place as r40283.
 
-	* test/uri/test_generic.rb (TestGeneric::test_route): added a test.
+	* ext/coverage/extconf.rb: add topdir and topsrcdir to VPATH.
 
-Mon Dec 22 20:38:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Apr 14 19:46:14 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/cgi.rb: reduce eval.
+	* ext/-test-/debug/depend: New file.
 
-	* lib/cgi.rb (CGI::QueryExtension::read_multipart): alias path to
-	  local_path.  [ruby-list:38883]
+	* ext/-test-/exception/depend: Ditto.
 
-Mon Dec 22 20:09:31 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/-test-/printf/depend: Ditto.
 
-	* test/soap/test_property.rb: remove duplicated test method.
+	* ext/-test-/string/depend: Ditto.
 
-Mon Dec 22 18:22:04 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/coverage/depend: Ditto.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub (config.h): remove
-	  HAVE_ISINF definition to follow previous commits of missing.h
-	  and win32/win32.h.
+	* ext/io/console/depend: Ditto.
 
-Mon Dec 22 17:23:42 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/io/nonblock/depend: Ditto.
 
-	* configure.in (ac_cv_func_setitimer): moved from defines.h
+	* ext/io/wait/depend: Ditto.
 
-	* defines.h, rubysig.h, signal.c: removed macro handling which
-	  should be done in configure.
+	* ext/openssl/depend: Ditto.
 
-	* configure.in (intrinsics.h): check if present.
+	* ext/pathname/depend: Ditto.
 
-	* ruby.h: include intrinsics.h if available.
+	* ext/psych/depend: Ditto.
 
-	* bignum.c, marshal.c: include ieeefp.h if available.
+	* ext/zlib/depend: Ditto.
 
-	* missing.h (isinf): define as a macro if finite() and isnan()
-	  are available.  [ruby-core:02032]
+Sun Apr 14 02:46:50 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Dec 22 17:07:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/mkmf.rb (MakeMakefile#create_makefile): remove {$(VPATH)} other
+	  than nmake.
 
-	* configure.in (mingw): set isnan, finite and isinf to yes.
+	* ext/ripper/depend: use VPATH expecting removed by above.
 
-Mon Dec 22 13:40:19 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Apr 13 23:06:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/soap/property.rb: passing block by reference.
+	* lib/mkmf.rb (timestamp_file): gather timestamp files in one
+	  directory from each extension directories.
 
-Mon Dec 22 00:32:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Apr 13 21:09:02 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* eval.c (rb_with_disable_interrupt): use ENABLE_INTS instead of
-	  ALLOW_INTS which may switch context.  [ruby-dev:22319]
+	* lib/mkmf.rb (MakeMakefile#create_makefile): output new macro
+	  disthdrdir to specify the path of id.h, parse.h and etc.
 
-	* ext/syck/emitter.c (syck_emitter_write): str bigger than
-	  e->bufsize causes buffer overflow.  [ruby-dev:22307]
+	* ext/ripper/depend: use above macro.
 
-Sun Dec 21 17:29:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr 13 20:28:08 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* class.c (rb_check_inheritable): new function.  [ruby-dev:22316]
+	* Merge Onigmo 5.13.4 f22cf2e566712cace60d17f84d63119d7c5764ee.
+	  [bug] fix problem with optimization of \z (Issue #16) [Bug #8210]
 
-	* intern.h: add prototype.
+Sat Apr 13 18:56:15 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* eval.c (superclass): use rb_check_inheritable().
+	* ext/ripper/depend: parse.h and id.h may be created on topdir.
 
-	* object.c (rb_class_initialize): check argument validity.
+Sat Apr 13 12:08:16 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-Sun Dec 21 16:25:10 2003  Tanaka Akira  <akr@m17n.org>
+	* lib/matrix.rb: Add Vector#cross_product, patch by Luis Ezcurdia
+	  [fix GH-276] [rubyspec:81eec89a124]
 
-	* lib/pathname.rb (Pathname#+): re-implemented to resolve ".." in
-	  beginning of the argument.
-	  (Pathname#join): concatenate from the last argument.
-	  (Pathname#parent): just use Pathname#+.
+Sat Apr 13 10:20:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Dec 21 00:12:37 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* struct.c (rb_struct_define_without_accessor, rb_struct_define),
+	  (rb_struct_s_def): hide member names array.
 
-	* ext/tk/lib/tk.rb: add new methods (TkScrollbar#assign, assign_list)
+	* struct.c (anonymous_struct, new_struct, setup_struct): split
+	  make_struct() for each purpose.
 
-	* ext/tk/sample/tkmultilistframe.rb: use TkScrollbar#assign method
+Sat Apr 13 09:34:31 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Dec 20 21:59:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/mkmf.rb: Add ruby/ruby.h, ruby/missing.h, ruby/intern.h,
+	  ruby/st.h and ruby/subst.h for ruby_headers in generated Makefile.
 
-	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): refine regexp.
+	* ext/-test-/old_thread_select/depend: Update dependencies.
 
-	* lib/webrick/cgi.rb (CGI#start): NPH scripts return status line
-	  instead of Status: header field.
+	* ext/-test-/wait_for_single_fd/depend: Ditto.
 
-	* lib/webrick/cgi.rb (CGI::Socket): refine some coditions.
+	* ext/bigdecimal/depend: Ditto.
 
-Sat Dec 20 16:07:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/curses/depend: Ditto.
 
-	* lib/optparse.rb (OptionParser::Completion::complete): wrong
-	  Regexp for word boundary.  pointed out by Gavin Sinclair.
+	* ext/digest/bubblebabble/depend: Ditto.
 
-	* lib/optparse.rb (OptionParser::make_switch): [no-] prefix was
-	  missing.
+	* ext/digest/depend: Ditto.
 
-Sat Dec 20 11:40:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/digest/md5/depend: Ditto.
 
-	* lib/yaml.rb (YAML::YAML): adjust Marshal version.
+	* ext/digest/rmd160/depend: Ditto.
 
-Sat Dec 20 03:56:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/digest/sha1/depend: Ditto.
 
-	* eval.c (rb_with_disable_interrupt): prohibit thread context
-	  switch during proc execution.  [ruby-dev:21899]
+	* ext/digest/sha2/depend: Ditto.
 
-Sat Dec 20 02:41:02 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/dl/callback/depend: Ditto.
 
-	* lib/webrick/cgi.rb: add file. (yet another CGI library)
+	* ext/dl/depend: Ditto.
 
-	* MANIFEST: add lib/webrick/cgi.rb.
+	* ext/etc/depend: Ditto.
 
-Sat Dec 20 02:18:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/nkf/depend: Ditto.
 
-	* misc/ruby-mode.el (ruby-calculate-indent): proper indentation
-	  inside of parentheses.  [ruby-dev:22308]
+	* ext/objspace/depend: Ditto.
 
-Fri Dec 19 21:24:22 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/pty/depend: Ditto.
 
-	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): should not set
-	  HTTP_CONTENT_TYPE and HTTP_CONTENT_LENGTH.
+	* ext/readline/depend: Ditto.
 
-	* lib/webrick/https.rb (HTTPRequest#parse): should check presence
-	  of cert() method to detect SSLSocket.
+	* ext/ripper/depend: Ditto.
 
-Fri Dec 19 22:56:46 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/sdbm/depend: Ditto.
 
-	* lib/soap/property.rb (SOAP::Property#load): new method for loading
-	  property value into existing property tree.
+	* ext/socket/depend: Ditto.
 
-	* test/soap/test_property.rb: add test.
+	* ext/stringio/depend: Ditto.
 
-Fri Dec 19 19:21:49 2003  akira yamada  <akira@ruby-lang.org>
+	* ext/strscan/depend: Ditto.
 
-	* lib/runit/cui/testrunner.rb (RUNIT::CUI::TestRunner::run):
-	  should use Test::Unit::UI::{PROGRESS_ONLY,VERBOSE}.
+	* ext/syslog/depend: Ditto.
 
-Fri Dec 19 17:36:49 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/-test-/num2int/depend: Removed.
 
-	* ext/tk/sample/tkmultilistbox.rb: bug fix
+	* ext/dbm/depend: Ditto.
 
-	* ext/tk/sample/tkmultilistframe.rb: new sample script
+	* ext/fcntl/depend: Ditto.
 
-Fri Dec 19 03:44:27 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/gdbm/depend: Ditto.
 
-	* lib/webrick/httputils.rb (parse_form_data): should return an
-	  empty Hash if the body is empty.
+	* ext/racc/cparse/depend: Ditto.
 
-Thu Dec 18 21:47:35 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Apr 13 00:15:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/mkmf.rb (create_makefile): should remove deffile if it's
-	  made by miniruby. based on nobu's patch.
+	* ext/etc/etc.c (Init_etc): move Passwd and Group under Etc namespace
+	  as primary names.
 
-Thu Dec 18 21:44:21 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Fri Apr 12 21:06:55 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (stack_extend): ignore inline optimization on VC7.
+	* common.mk: pack.o depends on internal.h.
 
-	* win32/Makefile.sub (OS, RT): can override.
+Fri Apr 12 20:59:24 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/Makefile.sub (LDFLAGS): ditto. shouldn't use pdb:none
-	  option. based on Tietew's patch [ruby-dev:22289]
+	* bignum.c (ones): Use __builtin_popcountl if available.
 
-Thu Dec 18 16:38:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* internal.h (GCC_VERSION_SINCE): Macro moved from pack.c.
 
-	* dir.c (fnmatch): unlike find_dirsep(), rb_path_next() never
-	  return NULL.
+	* pack.c: Include internal.h for GCC_VERSION_SINCE.
 
-Thu Dec 18 15:27:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri Apr 12 18:29:42 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/ipaddr.rb (IPSocket::getaddress): merge usa's patch.
-	  [ruby-dev:21678]
+	* common.mk: version.o depends on $(srcdir)/include/ruby/version.h
+	  instead of {$(VPATH)}version.h to avoid confusion by VPATH between
+	  top level version.h and include/ruby/version.h for build in-place.
+	  [ruby-dev:47249] [Bug #8256]
 
-Wed Dec 17 15:15:30 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Apr 12 15:21:24 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/cgi.rb (CGI::QueryExtension::Value::[]): should work like
-	  String#[] if more than one arguments are specified.
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): non-symbol key is not
+	  a keyword argument, keep it as a positional argument.
 
-	* lib/delegate.rb: avoid using common instance name as "@obj".
+Fri Apr 12 11:58:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/cgi.rb (CGI::QueryExtension::Value): Value is no longer
-	  subclass of String, but DelegateClass(String).
+	* array.c: Document synonymous methods, by windwiny [GH-277]
+	* bignum.c: ditto
+	* complex.c: ditto
+	* dir.c: ditto
+	* encoding.c: ditto
+	* enumerator.c: ditto
+	* numeric.c: ditto
+	* proc.c: ditto
+	* re.c: ditto
+	* string.c: ditto
 
-	* ext/curses/extconf.rb: restore function check for init_color.
-	  [ruby-list:38905]
+Thu Apr 11 23:41:46 2013  Tanaka Akira  <akr@fsij.org>
 
-	* Makefile.in: need to specify $(MAINLIBS) for the miniruby
-	  generation rule.
+	* common.mk: Add dependencies for include/ruby.h
 
-	* configure.in: better FreeBSD -lc_r support.
+	* tool/update-deps: Use "make -p all miniruby ruby golf" to extract
+	  dependencies in makefiles.
 
-Wed Dec 17 00:16:14 2003  Minero Aoki  <aamine@loveruby.net>
+Thu Apr 11 23:21:17 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/strscan/strscan.c: new method
-	  StringScanner#beginning_of_line? (alias #bol?)
+	* tool/update-deps: Use "make -p all golf" to extract dependencies in
+	  makefiles.
 
-	* ext/strscan/strscan.c: new method StringScanner#concat and #<<.
+Thu Apr 11 21:02:19 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/strscan/strscan.c: StringScanner#new(str) does not duplicate
-	  nor freeze STR (allow destructive modification).
+	* common.mk: Dependency updated.
 
-	* test/strscan/test_stringscanner.rb: test new methods above.
+	* tool/update-deps: Rewritten.
 
-	* test/strscan/test_stringscanner.rb: test destructive string
-	  modification.
+Thu Apr 11 19:59:48 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Dec 16 21:20:47 2003  Tanaka Akira  <akr@m17n.org>
+	* common.mk: partially revert r40183, which breaks building on
+	  other than source directory. (its commit log also says the same
+	  thing, but such failure is not reproducible on my environment
+	  and the commit breaks build on my environment)
 
-	* lib/pp.rb: don't use local variable `pp'.
+Thu Apr 11 16:10:01 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/prettyprint.rb: ditto.
+	* ext/fiddle/closure.c (USE_FFI_CLOSURE_ALLOC): define 0 on
+	  Mac OS X and Linux [Bug #3371]
 
-Tue Dec 16 13:20:43 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Thu Apr 11 13:19:22 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: condition bug of if statement on
-	  {pack,grid}_propagate methods
+	* test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill
+	  if it fails with Errno::EPERM on Windows (workaround).
+	  [ruby-dev:47245] [Bug #8251]
 
-Tue Dec 16 03:17:29 2003  why the lucky stiff  <why@ruby-lang.org>
+Thu Apr 11 11:11:38 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/yaml/rubytypes.rb: comments in strings. [ruby-talk:88012]
+	* dir.c: Fix a typo.
 
-	* test/yaml/test_yaml.rb: add test.
+Thu Apr 11 10:39:34 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Dec 16 01:14:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/fiddle/closure.c (USE_FFI_CLOSURE_ALLOC): add missing case:
+	  RUBY_LIBFFI_MODVERSION is not defined (usually on Windows).
 
-	* eval.c (catch_timer): check rb_thread_crtical in main native
-	  thread.
+Thu Apr 11 09:27:04 2013  Konstantin Haase  <me@rkh.im>
 
-	* eval.c (thread_timer): just sends signals periodically, to
-	  prevent main native thread from receiving them in critical
-	  section.  [ruby-core:01959]
+	* dir.c (file_s_fnmatch): Document File::FNM_EXTGLOB flag.
 
-Mon Dec 15 13:32:22 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr 11 09:17:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* dir.c (check_dirname): check string safety and remove extraneous
-	  trailing directory separators.  [ruby-dev:22279]
+	* README: Fix typo by Benjamin Winkler [Fixes GH-281]
 
-	* file.c: renamed and externalized rb_path_next,
-	  rb_path_skip_prefix, rb_path_last_separator, rb_path_end.
+Thu Apr 11 06:15:51 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* intern.h: prototypes for rb_path_next, rb_path_skip_prefix,
-	  rb_path_last_separator, rb_path_end.
+	* regint.h: fix typo: _M_AMD86 -> _M_AMD64.
 
-Mon Dec 15 09:27:46 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* siphash.c: ditto.
 
-	* ext/openssl/ossl_pkcs12.c (ossl_pkcs12_initialize): first argument
-	  of rb_protect should take an argument of VALUE.
+	* st.c: ditto.
 
-Sun Dec 14 18:46:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Thu Apr 11 06:09:57 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/socket/socket.c (Init_socket): IPv6 is not supported although
-	  AF_INET6 is defined on MinGW.
+	* ext/fiddle/extconf.rb: define RUBY_LIBFFI_MODVERSION macro.
 
-	* lib/ipaddr.rb (AF_INET6): workaround in the environment which does
-	  not support IPv6.
+	* ext/fiddle/closure.c (USE_FFI_CLOSURE_ALLOC): define 0 or 1
+	  with platform and libffi's version. [Bug #3371]
 
-Sat Dec 13 18:55:16 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr 11 05:30:43 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/iconv/charset_alias.rb: preserve original order.
+	* lib/mkmf.rb (pkg_config): Add optional argument "option".
+	  If it is given, it returns the result of
+	  `pkg-config --<option> <pkgname>`.
 
-	* ext/iconv/extconf.rb: remove wrapper file at clean.
+Thu Apr 11 03:33:05 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sat Dec 13 18:09:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/fiddle/closure.c (initialize): check mprotect's return value.
+	  If mprotect is failed because of PaX or something, its function call
+	  will cause SEGV.
+	  http://c5664.rubyci.org/~chkbuild/ruby-trunk/log/20130401T210301Z.diff.html.gz
 
-	* eval.c (thread_timer): use timer by sub-thread and nanosleep.
-	  [ruby-talk:87519]
+Wed Apr 10 17:39:13 2013  Tanaka Akira  <akr@fsij.org>
 
-	* gc.c (Init_stack): no stack adjustment for THREAD_SAFE.
+	* ext/bigdecimal/bigdecimal.c (VpCtoV): Initialize a local variable
+	  even when overflow.
 
-Sat Dec 13 17:17:59 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Apr 10 12:32:37 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (proc_alloc): cache the created object at first time.
-	  [ruby-talk:61288], [ruby-dev:22240]
+	* bignum.c (rb_ll2big): Don't overflow on signed integer negation.
 
-Sat Dec 13 09:01:23 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/bigdecimal/bigdecimal.c (MUL_OVERFLOW_SIGNED_VALUE_P): New
+	  macro.
+	  (AddExponent): Don't overflow on signed integer multiplication.
+	  (VpCtoV): Don't overflow on signed integer arithmetic.
+	  (VpCtoV): Don't overflow on signed integer arithmetic.
 
-	* configure.in: check ucontext.h.
+Wed Apr 10 06:32:12 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c: use getcontext/setcontext() instead of setjmp/longjmp()
-	  on ia64 or with native thread enabled.  [ruby-core:01932]
+	* internal.h (MUL_OVERFLOW_INT_P): New macro.
 
-Sat Dec 13 03:09:14 2003  why the lucky stiff  <why@ruby-lang.org>
+	* sprintf.c (GETNUM): Don't overflow on signed integer multiplication.
 
-	* lib/yaml/rubytypes.rb: anonymous struct fix. [ruby-core:01946]
+Tue Apr  9 20:38:20 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/yaml/test_yaml.rb: add test.
+	* internal.h (MUL_OVERFLOW_SIGNED_INTEGER_P): New macro.
+	  (MUL_OVERFLOW_FIXNUM_P): Ditto.
+	  (MUL_OVERFLOW_LONG_P): Ditto.
 
-Fri Dec 12 22:36:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* array.c (rb_ary_product): Don't overflow on signed integer
+	  multiplication.
 
-	* lib/csv.rb: add Cell#to_str and Cell#to_s for /.../ =~ aCell,
-	  "#{aCell}" and so on.
+	* numeric.c (fix_mul): Ditto.
+	  (int_pow): Ditto.
 
-	* test/csv/test_csv.rb: add tests.
+	* rational.c (f_imul): Ditto.
 
-Fri Dec 12 19:33:06 2003  Minero Aoki  <aamine@loveruby.net>
+	* insns.def (opt_mult): Ditto.
 
-	* lib/fileutils.rb (mkdir): remove trailing `/' from pathes.
+	* thread.c (sleep_timeval): Don't overflow on signed integer addition.
 
-	* lib/fileutils.rb (rmdir): ditto. [ruby-dev:22238]
+	* bignum.c (rb_int2big): Don't overflow on signed integer negation.
+	  (rb_big2ulong): Ditto.
+	  (rb_big2long): Ditto.
+	  (rb_big2ull): Ditto.
+	  (rb_big2ll): Ditto.
 
-	* lib/fileutils.rb (rmdir_r): ditto.
+Tue Apr  9 19:45:44 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/fileutils.rb (fu_copy_dir): check if it is a directory after
-	  mkdir(2).
+	* lib/open-uri.rb: Support multiple fields with same field
+	  name (like Set-Cookie).
+	  (OpenURI::Meta#metas): New accessor to obtain fields as a Hash from
+	  field name (string) to field values (array of strings).
+	  [ruby-core:37734] [Bug #4964] reported by ren li.
 
-Fri Dec 12 06:06:09 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Apr  9 15:26:12 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (proc_invoke): fix class name in warning message for
-	  define_method.  [ruby-dev:22235]
+	* compile.c (iseq_compile_each): append keyword hash to argument array
+	  to splat if needed.  [ruby-core:54094] [Bug #8236]
 
-Thu Dec 11 21:24:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Apr  9 10:02:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_pkcs12.[ch]: new files. add OpenSSL::PKCS12.
+	* lib/mkmf.rb (timestamp_file): gather timestamp files in one
+	  directory from each extension directories, with considering
+	  target_prefix.
 
-	* ext/openssl/ossl.[ch]: ditto.
+Tue Apr  9 04:57:59 JST 2013  Charles Oliver Nutter  <headius@headius.com>
 
-	* ext/openssl/MANIFEST: add ossl_pkcs12.[ch].
+	* error.c: Capture EAGAIN, EWOULDBLOCK, EINPROGRESS exceptions and
+	  export them for use in WaitReadable/Writable exceptions.
+	* io.c: Create versions of EAGAIN, EWOULDBLOCK, EINPROGRESS that
+	  include WaitReadable and WaitWritable. Add rb_readwrite_sys_fail
+	  for nonblocking failures using those exceptions. Use that
+	  function in io_getpartial and io_write_nonblock instead of
+	  rb_mod_sys_fail
+	* ext/openssl/ossl_ssl.c: Add new SSLError subclasses that include
+	  WaitReadable and WaitWritable. Use those classes for
+	  write_would_block and read_would_block instead of rb_mod_sys_fail.
+	* ext/socket/ancdata.c: Use rb_readwrite_sys_fail instead of
+	  rb_mod_sys_fail in bsock_sendmsg_internal and
+	  bsock_recvmsg_internal.
+	* ext/socket/init.c: Use rb_readwrite_sys_fail instead of
+	  rb_mod_sys_fail in rsock_s_recvfrom_nonblock and
+	  rsock_s_connect_nonblock.
+	* ext/socket/socket.c: Use rb_readwrite_sys_fail instead of
+	  rb_mod_sys_fail in sock_connect_nonblock.
+	* include/ruby/ruby.h: Export rb_readwrite_sys_fail for use instead
+	  of rb_mod_sys_fail. Introduce new constants RB_IO_WAIT_READABLE and
+	  RB_IO_WAIT_WRITABLE for first arg to rb_readwrite_sys_fail.
 
-Thu Dec 11 20:54:28 2003  Minero Aoki  <aamine@loveruby.net>
+Tue Apr  9 02:44:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/fileutils.rb (mkdir_p): remove trailing `/' befere mkdir(2).
-	  mkdir("nonexistdir/") does not work on NetBSD/Alpha 1.6.1.
+	* ext/socket/extconf.rb: $defs needs -D or -U.  nothing is added
+	  otherwize.
 
-	* lib/fileutils.rb (fu_list): call to_str for all arguments.
+	* ext/socket/extconf.rb: check struct in_addr6, which is defined in
+	  VC6 instead of in6_addr.
 
-Thu Dec 11 20:07:01 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/socket/option.c (optname_to_sym): fix macro name.
 
-	* lib/ftools.rb (makedirs): sync with fileutils.
+	* ext/socket/constants.c (rsock_cmsg_type_arg): fix macro name.
 
-Thu Dec 11 19:53:03 2003  Minero Aoki  <aamine@loveruby.net>
+Mon Apr  8 23:57:21 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/fileutils.rb (mkdir_p): catch all SystemCallErrors.
-	  (mkdir("C:\") causes EACCESS on Windows 2000/NTFS)
+	* object.c (id_for_setter): extract common code from const, class
+	  variable, instance variable setters.
 
-Thu Dec 11 19:08:02 2003  Minero Aoki  <aamine@loveruby.net>
+Mon Apr  8 23:55:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/fileutils.rb (mkdir_p): check if it is a directory after
-	  mkdir(2) instead of before mkdir(2), to avoid race condition.
-	  [ruby-talk:87730]
-	  Refer: mkinstalldirs sh script, GNU mkdir(1) (coreutils 5.0)
+	* ext/depend (ENCOBJS, TRANSOBJS): use explicit path to ruby.h for
+	  nmake.
 
-Thu Dec 11 18:49:30 2003  Minero Aoki  <aamine@loveruby.net>
+	* ext/depend (ENCOBJS, TRANSOBJS): fix header dependency, VPATH has
+	  $(srcdir)/include/ruby but not $(srcdir)/include, so cannot find out
+	  ruby/ruby.h.  use ruby.h instead and ../ruby for include/ruby.h.
 
-	* lib/fileutils.rb: def m( arg ) -> def m(arg).
+Mon Apr  8 20:30:37 2013  Yuki Yugui Sonoda  <yugui@google.com>
 
-Thu Dec 11 11:39:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/depend (ENCOBJS, TRANSOBJS): Add missing dependencies.
 
-	* configure.in (ieeefp.h), numeric.c: needed for finite() on
-	  Solaris.  [ruby-core:01921]
+Mon Apr  8 17:19:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* file.c (rb_stat_inspect): adjust format specifier.
+	* ext/win32ole/win32ole.c (fole_missing): should check actual argument
+	  count before accessing.
 
-	* parse.c (arg_prepend): nodetype() is for debug use.
+Mon Apr  8 16:03:55 2013  Yuki Yugui Sonoda  <yugui@google.com>
 
-	* ruby.h (ISASCII, etc): cast to int to get rid of warning.
+	Fixes a build failure of ext/ripper/ripper.c on building out of place.
+	* common.mk (id.h, id.c): Always generated in $(srcdir).
+	(ext/ripper/ripper.c): Passes $(PATH_SEPARATOR) too to the sub make.
 
-	* ruby.h (alloca.h): include even in GCC.  [ruby-core:01925]
+Mon Apr  8 12:05:02 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/bigdecimal/bigdecimal.c (GetVpValue): adjust format
-	  specifier.
+	* object.c (rb_obj_ivar_set): call to_str for string only once.
+	  to_str was called from rb_is_const_name and rb_to_id before.
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_prec, BigDecimal_coerce,
-	  BigDecimal_divmod): use rb_assoc_new() to suppress memory usage.
+	* object.c (rb_mod_const_set): ditto.
 
-	* ext/bigdecimal/bigdecimal.c (BigDecimal_split): ditto.
+	* object.c (rb_mod_cvar_set): ditto.
 
-	* ext/dl/sym.c (rb_dlsym_guardcall): guard itself should be
-	  volatile.
+Sun Apr  7 13:56:16 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* ext/iconv/iconv.c (iconv_convert): ensure actual parameter with
-	  format specifier.
+	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
+	  RUBY_PLATFORM should escape as Regexp,
+	  because RUBY_PLATFORM may contain '.'.
 
-	* ext/pty/pty.c (MasterDevice, SlaveDevice, deviceNo): do not
-	  define unless used.
+Sun Apr  7 10:44:01 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/pty/pty.c (getDevice): get rid of warning.
+	* include/ruby/defines.h: Simplify the logic to include sys/select.h.
+	  This fixes a compilation error on Haiku (gcc2 and gcc4).
 
-	* ext/socket/socket.c (port_str, sock_s_getaddrinfo,
-	  sock_s_getnameinfo): FIX2INT() now returns long.
+	* configure.in: Use shared linker as $(CC) for Haiku.
+	  This fixes a build error on Haiku (gcc2).
 
-	* ext/socket/socket.c (init_inetsock_internal): uninitialized
-	  variable.
+Sun Apr  7 10:41:30 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/syck/rubyext.c (syck_parser_assign_io): add prototype.
+	* lib/resolv.rb (MDNSOneShot#sender): Delete an unused variable.
 
-	* ext/syck/rubyext.c (rb_syck_mktime, yaml_org_handler): use
-	  ISDIGIT() instead of isdigit() to avoid warnings and for
-	  platforms which don't support non-ascii charater.
+Sun Apr  7 03:24:36 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Dec 10 19:28:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* addr2line.c: use more generic type:
+	  * u_char -> unsigned char
+	  * u_short -> unsigned short
+	  * u_int -> unsigned int
+	  * u_long -> unsigned long
+	  * quad_t -> int64_t
+	  * u_quad_t -> uint64_t
 
-	* ext/stringio/stringio.c (strio_read): set EOF flag at short read.
-	  [ruby-dev:22223], [ruby-dev:22224]
+	* addr2line.c (imax): inline is defined by configure.
 
-Wed Dec 10 18:07:25 2003  Minero Aoki  <aamine@loveruby.net>
+Sun Apr  7 01:40:39 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/erb.rb: new method ERB#filename(=). [ruby-dev:22208]
+	* misc/ruby-electric.el (ruby-electric-hash): New electric
+	  function that expands a hash sign inside a string or regexp to
+	  "#{}".
 
-Wed Dec 10 17:54:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* misc/ruby-electric.el (ruby-electric-curlies): Do not insert
+	  spaces inside when the curly brace is a delimiter of %r, %w,
+	  etc.
 
-	* ext/stringio/stringio.c (strio_read): do not set EOF flag when
-	  requested length is zero.  [ruby-dev:22214]
+	* misc/ruby-electric.el (ruby-electric-curlies): Insert another
+	  space before a closing curly brace when
+	  ruby-electric-newline-before-closing-bracket is nil.
 
-Wed Dec 10 17:17:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Apr  7 01:01:26 2013  Tanaka Akira  <akr@fsij.org>
 
-	* io.c (read_all): should return given string even if data read is
-	  empty.  [ruby-dev:22207]
+	* strftime.c (rb_strftime_with_timespec): Test yday range.
+	  [ruby-core:44088] [Bug #6247] reported by Ruby Submit.
 
-Wed Dec 10 17:16:06 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr  6 23:46:54 2013  Naohisa Goto  <ngotogenome@gmail.com>
 
-	* ext/stringio/stringio.c (strio_read): adjust behavior at reading
-	  beyond EOF to IO.  [ruby-dev:22205]
+	* configure.in (AC_CHECK_HEADERS): atomic.h for Solaris atomic_ops.
 
-	* test/ruby/ut_eof.rb (TestEOF::Seek): test behaviors at reading
-	  beyond EOF.
+	* ruby_atomic.h: Skip using Solaris10 atomic_ops on Solaris 9 or
+	  earlier if atomic.h is not available. [ruby-dev:47229] [Bug #8228]
 
-	* test/ruby/test_file.rb, test/stringio/test_stringio.rb: include
-	  TestEOF::Seek test case.
+Sat Apr  6 23:40:40 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Dec 10 15:01:19 2003  Shugo Maeda  <shugo@ruby-lang.org>
+	* lib/resolv.rb: Support LOC resources.
+	  [ruby-core:23361] [Feature #1436] by JB Smith.
 
-	* test/monitor/test_monitor.rb (test_cond): use Queue#deq
-	  instead of sleep.
+Sat Apr  6 23:38:09 2013  Naohisa Goto  <ngotogenome@gmail.com>
 
-Wed Dec 10 14:45:39 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* addr2line.c: quad_t and u_quad_t is not available on Solaris.
+	  __inline is not available with old compilers on Solaris.
+	  [ruby-dev:47229] [Bug #8227]
 
-	* ext/pty/pty.c (HAVE_SYS_IOCTL_H): need to include <sys/ioctl.h>
-	  for TIOCSCTTY on *BSD.  based on gotoyuzo's patch.
-	  (ruby-bugs:PR#1211)
+Sat Apr  6 23:31:38 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/pty/pty.c (establishShell): should close descriptors if fork
-	  failed.
+	* lib/resolv.rb: Add one-shot multicast DNS support.
+	  [ruby-core:53387] [Feature #8089] by Eric Hodel.
 
-Wed Dec 10 12:53:05 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Apr  6 22:12:01 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/win32.h: define execv() using do_aspawn().
+	* lib/resolv.rb (Resolv::DNS.fetch_resource): New method to obtain
+	  full result.
+	  [ruby-dev:43587] [Feature #4788] proposed by Makoto Kishimoto.
 
-	* process.c (proc_exec_v): remove #ifdef's which stopped needing.
+Sat Apr  6 20:17:51 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Dec  9 23:32:23 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/socket/socket.c (rsock_sys_fail_raddrinfo): Renamed from
+	  rsock_sys_fail_addrinfo.
+	  (rsock_sys_fail_raddrinfo_or_sockaddr): Renamed from
+	  rsock_sys_fail_addrinfo_or_sockaddr.
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tkcanvas.rb, ext/tk/lib/tkdialog.rb,
-	  ext/tk/lib/tkentry.rb, ext/tk/lib/tkscrollbox.rb, ext/tk/lib/tktext.rb,
-	  ext/tk/sample/tkalignbox.rb, ext/tk/sample/tkcombobox.rb,
-	  ext/tk/sample/tkmultilistbox.rb, ext/tk/sample/tkoptdb.rb, ext/tk/sample/tktextframe.rb,
-	  ext/tk/sample/demos-en/dialog1.rb, ext/tk/sample/demos-en/dialog2.rb,
-	  ext/tk/sample/demos-jp/dialog1.rb, ext/tk/sample/demos-jp/dialog2.rb:
-	  overrided instance methods, which are private methods on the super
-	  class, are changed to 'private'
+	* ext/socket/rubysocket.h: Follow the above change.
 
-Tue Dec  9 19:53:02 2003  akira yamada  <akira@ruby-lang.org>
+Sat Apr  6 19:24:59 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/uri/generic.rb (URI::Generic#route_from0): make case insensitive
-	  for host-part.
+	* ext/socket/socket.c (rsock_sys_fail_sockaddr): Takes struct sockaddr
+	  and socklen_t instead of String object.
+	  (rsock_sys_fail_addrinfo_or_sockaddr): Follow the above change.
 
-	* test/uri/test_generic.rb (test_route): added tests for the above
+	* ext/socket/rubysocket.h (rsock_sys_fail_sockaddr): Follow the above
 	  change.
 
-Tue Dec  9 14:10:48 2003  Tanaka Akira  <akr@m17n.org>
-
-	* io.c (rb_io_check_readable): don't call io_seek if EOF flag is set,
-	  to avoid clearing EOF flag.
-	  (rb_io_check_writable): ditto.
-
-Tue Dec  9 02:53:55 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/sample/tkalignbox.rb: new sample script
-
-Tue Dec  9 00:45:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb: renamed #assert_raises to #assert_raise
-	  and made the former call the latter. [ruby-core:01890]
-
-	* test/testunit/test_assertions.rb: ditto.
-
-Tue Dec  9 00:07:35 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/rpc/standaloneServer.rb: add 'shutdown' and 'status'
-	  methods as delegates to WEBrick.
-
-	* test/soap/calc/{test_calc.rb,test_calc2.rb},
-	  test/soap/helloworld/test_helloworld.rb,
-	  test/wsdl/datetime/test_datetime.rb, test/wsdl/raa/test_raa.rb:
-	  follow the change.
-
-Mon Dec  8 22:48:03 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/autorunner.rb: remove dependency to a particular
-	  runner.  [ruby-core:01901], [ruby-list:38869]
-
-	* lib/test/unit/ui/testrunnerutilities.rb: moved output level
-	  constants from Console.
-
-	* lib/test/unit/ui/console/testrunner.rb: ditto.
-
-	* lib/test/unit/ui/{fox,gtk,gtk2,tk}/testrunner.rb (initialize):
-	  accept output_level.
-
-Mon Dec  8 15:03:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/syck/syck.c (syck_io_str_read): get rid of buffer overflow.
-
-Mon Dec  8 13:02:11 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/uri/common.rb: new method URI.regexp. [ruby-dev:22121]
-
-	* test/uri/test_common.rb: add test for URI.regexp.
-
-Mon Dec  8 12:44:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c: define swap16 and swap32 only if they are not
-	  defined. OpenBSD defines these macros. [ruby-dev:22181]
-
-Sun Dec  7 20:54:17 2003  Tanaka Akira  <akr@m17n.org>
-
-	* ext/iconv/iconv.c (map_charset): make case sensitive.
-	  ext/iconv/charset_alias.rb (charset_alias): don't ignore
-	  config.charset's information.  sort aliases.
-
-Sat Dec  6 22:58:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ssl.c (ossl_start_ssl): new function to wrap
-	  SSL_connect and SSL_accept; if SSL_connect (or SSL_accept) returned
-	  but not finished the handshake process, we should retry it.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_connect): call ossl_start_ssl.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_accept): ditto.
-
-	* ext/openssl/ossl_ssl.c (ossl_ssl_read): allow signal traps.
-
-Sat Dec  6 21:45:10 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* io.c (flush_before_seek): flush before seek on any platform.
-
-	* configure.in: ditto.
-
-Sat Dec  6 17:23:00 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/soap.rb(SOAP::Env.getenv): allow upcase environment variable
-	  as well as downcase one.
-
-	* lib/soap/netHttpClient.rb(SOAP::NetHttpClient#proxy=): check URI.
-
-Fri Dec  5 23:22:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises,
-	  Test::Unit::Assertions::assert_nothing_raised): use the last
-	  argument as message unless class object.
-
-	* test/testunit/test_assertions.rb (test_assert_raises): test for
-	  multiple exception list.  [ruby-core:01891]
-
-	* test/testunit/test_assertions.rb (test_assert_nothing_raised): test
-	  for non-exception classes.
-
-Fri Dec  5 22:23:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/netHttpClient.rb: proxy support did not work.  fixed.
-
-	* lib/soap/property.rb: add class methods for loading property from
-	  stream/file/propertyfile.  propertyfile is a file which is located at
-	  somedir in $:.
-
-	* lib/soap/soap.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb,
-	  lib/wsdl/importer.rb: load property from propertyfile 'soap/property'
-	  e.g. /usr/local/lib/ruby/site_ruby/1.8/soap/property.
-
-	* test/soap/test_property.rb, test/soap/test_streamhandler.rb: new file.
-
-Fri Dec  5 17:26:23 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_exec_end_proc): maintain tmp_end_procs.
-	  [ruby-dev:22154]
-
-Fri Dec  5 13:36:59 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_exec_end_proc): should not clear end_procs and
-	  ephemeral_end_procs before execution. [ruby-dev:22144]
-
-	* eval.c (rb_obj_extend): call Module#extended hook after
-	  extended_object.  [ruby-list:38866]
-
-	* object.c (Init_Object): Module#extended defined.
-
-Fri Dec  5 13:17:30 2003  Tanaka Akira  <akr@m17n.org>
-
-	* test/ruby/test_pipe.rb: use IO.pipe instead of IO.popen.
-
-Fri Dec  5 11:54:45 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/stringio/stringio.c (strio_read): follow IO#read.
-
-	* test/ruby/ut_eof.rb, test/ruby/test_file.rb, test/ruby/test_pipe.rb,
-	  test/stringio/test_stringio.rb: add EOF test.
-
-Fri Dec  5 02:49:35 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_raises):
-	  allow multiple exception list.  [ruby-core:01884]
-
-	* lib/test/unit/assertions.rb (Test::Unit::Assertions::assert_nothing_raised):
-	  check whether arguments are subclass of Exception.
-
-Thu Dec  4 23:54:00 2003  Rick Ohnemus  <rick.ohnemus@systemware.com>
-
-	* dln.c (aix_loaderror): should not use member named 'errno' which
-	  might be a macro (e.g. on AIX).
-
-Thu Dec  4 23:32:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (read_all): do not depend on lseek position.
-	  [ruby-dev:22026]
-
-Thu Dec  4 22:37:26 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval): preserve $! value when retry happens in the
-	  rescue clause.  [ruby-talk:86697]
-
-Thu Dec  4 21:50:07 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/drb/drb.rb (DRb::DRbMessage::send_request, send_reply):
-	  should rescue errors and re-raise DRbConnError on write too.
-	  [ruby-dev:22132]
-
-Thu Dec  4 16:41:17 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (exc_list): allow expanding list.  [ruby-dev:22134]
-
-Thu Dec  4 14:09:24 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb (test_cp): test if the error is
-	  kind of SystemCallError.  It is needless details that which errno
-	  is set on each systems.
-
-Thu Dec  4 13:24:13 2003  Shugo Maeda  <shugo@ruby-lang.org>
-
-	* lib/monitor.rb: use Object#__send__ instead of Object#send.
-
-Thu Dec  4 13:17:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/streamHandler.rb: support latest released version of
-	  http-access2.
-
-Thu Dec  4 13:04:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/soap.rb: add SOAP::Env module for environment repository
-	  such as HTTP_PROXY.
-
-	* lib/soap/property.rb: property implementation.
-
-	* lib/soap/streamHandler.rb, lib/soap/wsdlDriver.rb,
-	  lib/soap/rpc/driver.rb: use soap/property.rb.
-
-	* lib/wsdl/importer.rb, lib/soap/wsdlDriver.rb, lib/soap/rpc/driver.rb:
-	  use SOAP::Env.
-
-	* lib/soap/netHttpClient.rb: add basic_auth, ssl_config, and cookie
-	  management interface, but ignored for now.
-
-	* lib/xsd/charset.rb: add XSD::Charset.encoding= interface to set
-	  wiredump charset explicitly.  it was fixed to 'utf-8' when iconv or
-	  uconv module was found.
-
-Thu Dec  4 10:43:58 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/dl/sym.c (rb_dlsym_guardcall): __declspec(noinline) is VC7
-	  feature.
-
-Thu Dec  4 10:27:12 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: update hyperlink to the Japanese document.
-
-Thu Dec  4 09:12:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c (asn1time_to_time): should check that
-	  the underlying value of ASN1_TIME isn't NULL. [ruby-core:01881]
-
-Thu Dec  4 08:29:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/server.rb (GenericServer#start): should rescue
-	  Exception to avoid unexpected aborting. [ruby-core:01853]
-
-	* lib/webrick/server.rb (GenericServer#start_thread): should check
-	  that peeraddr isn't nil before printing.
-
-	* lib/webrick/httpresponse.rb (HTTPResponse#start_thread): should
-	  rescue Exception to avoid unexpected aborting of thread.
-
-Thu Dec  4 03:48:59 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (Pathname#link, Pathname#symlink): obsoleted.
-	  (Pathname#make_link, Pathname#make_symlink): new method.
-
-Thu Dec  4 01:45:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* io.c (argf_read): should not terminate on empty string; wait
-	  until real EOF.  [ruby-dev:21969]
-
-	* io.c (argf_read): should adjust length to read, when length is
-	  specified and read spans command line argument files.
-
-Wed Dec  3 19:38:36 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/drb/drb.rb: correct fcntl parameter. [ruby-dev:22120]
-
-Wed Dec  3 13:49:07 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: 'format'==>'Kernel.format' (avoid override trouble)
-
-	* ext/tk/lib/tkafter.rb: ditto.
-
-	* ext/tk/lib/tkcanvas.rb: ditto.
-
-	* ext/tk/lib/tkdialog.rb: ditto.
-
-	* ext/tk/lib/tktext.rb: ditto.
-
-Wed Dec  3 13:28:13 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* Makefile.in (lex.c): try gperf first, and copy from the source
-	  directory if failed.  [ruby-dev:22123]
-
-	* ext/extmk.rb (MTIMES): let makefiles depend to mkmf.rb.
-
-	* lib/mkmf.rb (configuration): DLDFLAGS was duplicated.
-
-Tue Dec  2 23:18:12 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb: wrote the warning about HTTP_PROXY environment
-	  variable.
-
-Tue Dec  2 21:31:42 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* bin/testrb: new test runner.  [ruby-core:01845]
-
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner.run,
-	  Test::Unit::AutoRunner#process_args): take test list to run and
-	  options.
-
-	* lib/test/unit/autorunner.rb (Test::Unit::AutoRunner::RUNNERS,
-	  Test::Unit::AutoRunner#run): should not exit inside a library,
-	  just return the result instead.
-
-	* lib/test/unit.rb: ditto.
-
-	* test/runner.rb: exit with the test result.
-
-Tue Dec  2 20:18:48 2003  Eric Sunshine  <sunshine@sunshineco.com>
-
-	* configure.in (AC_PROG_YACC): AC_DEFINE(OLD_YACC) if Yacc is found
-	  instead of Bison or byacc.
-
-	* parse.y: If OLD_YACC is defined, ensure that YYMAXDEPTH is at least
-	  10000 (Bison's default) since some old versions of Yacc define it as
-	  low as 150 by default, which is too low for Ruby to parse some files,
-	  such as date/format.rb.  Among other issues, the parse problem causes
-	  "make test" to fail.
-
-Tue Dec  2 20:03:20 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb: check if Pathnames are usable
-	  for arguments.
-
-Tue Dec  2 04:22:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb: fixed #assert_no_match message.
-
-	* test/testunit/test_assertions.rb: ditto.
-
-Tue Dec  2 00:43:00 2003  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/syck.c: string buffering bug.  decrementing by full
-	  max_size now. [ruby-core:01834]
-
-Mon Dec  1 21:33:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* numeric.c (num_sadded): prohibit singleton method definition for
-	  Numerics.  fill yet another gap between Fixnum and Bignum.
-
-Mon Dec  1 17:33:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* pack.c (htov16): converts endian using swap16. htov32(), hton16,
-	  hton32 as well. [ruby-talk:85377]
-
-	* pack.c (swap16): swap 2 bytes no matter how big short is on the
-	  platform.  swap32() is also prepared.
-
-	* numeric.c (rb_num2int): returns long to preserve information.
-	  rb_fix2int(), rb_num2uint(), rb_fix2uint() as well.
-	  [ruby-talk:85377]
-
-	* numeric.c (rb_num2uint): should not check for value range if the
-	  source value is negative.
-
-Mon Dec  1 17:14:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* sample/optparse/opttest.rb: added.
-
-Mon Dec  1 16:10:52 2003  Dave Thomas  <dave@pragprog.com>
-
-	* lib/rdoc/rdoc.rb: (etc) initial merge into main tree.
-
-Mon Dec  1 14:17:49 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (fu_each_src_dest0): call #to_str to allow
-	  Pathname for arguments. [ruby-core:01795]
-
-	* test/fileutils/test_fileutils.rb: does much strict test on
-	  "same" files detecting.
-
-Mon Dec  1 09:28:14 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (XCFLAGS): re-export $(XCFLAGS).
-
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (ARCH_FLAG): export $(ARCH_FLAG) (perhaps empty value).
-
-Mon Dec  1 01:03:27 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* lib/mkmf.rb (TRY_LINK, link_command): added support for DLDFLAGS
-	  and ARCH_FLAG.  [ruby-dev:22085]
-
-Sun Nov 30 20:18:07 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: keep ARCH_FLAG separate. export ARCH_FLAG.
-	  [ruby-core:01819]
-
-	* Makefile.in: add ARCH_FLAG to CFLAGS.
-
-	* Makefile.in: add @CPPFLAGS@ to CPPFLAGS.
-
-	* lib/mkmf.rb (link_command, cc_command): use ARCH_FLAG.
-
-	* lib/mkmf.rb (configuration): add ARCH_FLAG to DLDFLAGS.
-
-	* Makefile.in: add ARCH_FLAG to DLDFLAGS.
-
-	* configure.in: should put getcwd in AC_CHECK_FUNCS, not
-	  AC_REPLACE_FUNCS.  [ruby-core:01826]
-
-Sun Nov 30 18:22:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: do not override CCDLDFLAGS, LDFLAGS, XLDFLAGS,
-	  DLDFLAGS and LDSHARED.
-
-	* configure.in: XCFLAGS for compiling ruby itself.  ARCH_FLAG is
-	  reflected in CFLAGS.
-
-	* lib/mkmf.rb: ditto.  do not import XCFLAGS from config.status.
-
-Sun Nov 30 17:37:36 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: bug fix [ruby-talk:86746]
-
-Sun Nov 30 13:02:00 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Apr  6 14:28:23 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/soap/encodingstyle/soapHandler.rb: refactoring - Simplifying
-	  Conditional Expressions.
+	* ext/socket/rubysocket.h (SockAddrStringValueWithAddrinfo): New macro.
+	  (rsock_sockaddr_string_value_with_addrinfo): New declaration.
+	  (rsock_addrinfo_inspect_sockaddr): Ditto.
+	  (rsock_sys_fail_addrinfo): Ditto.
+	  (rsock_sys_fail_sockaddr_or_addrinfo): Ditto.
 
-	* lib/wsdl/soap/definitions.rb: refactoring - Move Method.
+	* ext/socket/raddrinfo.c (rsock_addrinfo_inspect_sockaddr): Renamed
+	  from addrinfo_inspect_sockaddr and exported.
+	  (rsock_sockaddr_string_value_with_addrinfo): New function to obtain
+	  string and possibly addrinfo object.
 
-	* test/xsd/{test_noencoding.rb,noencoding.xml}: new files.  test for
-	  encoding unspecified XML file parsing.
+	* ext/socket/socket.c (rsock_sys_fail_sockaddr): Don't use
+	  rsock_sys_fail_host_port which is IP dependent.  Invoke
+	  rsock_sys_fail_addrinfo.
+	  (rsock_sys_fail_addrinfo): New function using
+	  rsock_addrinfo_inspect_sockaddr.
+	  (rsock_sys_fail_addrinfo_or_sockaddr): New function.
+	  (sock_connect): Use SockAddrStringValueWithAddrinfo and
+	  rsock_sys_fail_addrinfo_or_sockaddr.
+	  (sock_connect_nonblock): Ditto.
+	  (sock_bind): Ditto.
 
-	* test/wsdl/{test_fault.rb,map,datetime}: new files.  test of
-	  SOAPFault, dateTime and Apache's Map.
+Sat Apr  6 13:34:20 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Nov 30 09:35:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/socket.c (rsock_sys_fail_sockaddr): Delete 2nd argument.
 
-	* string.c (rb_str_update): get rid of SEGV at just allocated String.
-	  [ruby-core:01812]
-
-Fri Nov 28 23:19:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (gc_mark): explicitly check mark recursion levels, instead
-	  of unreliable stack length.
-
-Fri Nov 28 22:49:56 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
-
-	* lib/rinda/rinda.rb: fix TupleSpaceProxy#read, read_all.
+	* ext/socket/rubysocket.h (rsock_sys_fail_sockaddr): Follow above
+	  change.
 
-Fri Nov 28 21:44:40 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Apr  6 13:13:39 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/fileutils/test_fileutils.rb (test_ln_s): should be a file, not
-	  a directory for FreeBSD.
+	* ext/socket/socket.c (rsock_sys_fail_path): Use rb_str_inspect only
+	  for String to avoid SEGV.
 
-Fri Nov 28 19:37:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Apr  6 12:40:16 2013  Tanaka Akira  <akr@fsij.org>
 
-	* hash.c (env_has_value, env_index): must match exactly.
+	* ext/socket/rubysocket.h (rsock_sys_fail_host_port): Wrap by NORETURN.
+	  (rsock_sys_fail_path): Ditto.
+	  (rsock_sys_fail_sockaddr): Ditto.
 
-	* test/ruby/test_env.rb (test_has_value, test_index): condition for
-	  aboves.
+Sat Apr  6 11:49:35 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Nov 28 17:59:20 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/socket/socket.c (rsock_sys_fail_path): Use rb_str_inspect if the
+	  path contains a NUL.
 
-	* test/ruby/test_env.rb: add tests for ENV.
+Sat Apr  6 11:39:19 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Nov 28 17:47:46 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* ext/socket: Improve socket exception message to show socket address.
+	  [ruby-core:45617] [Feature #6583] proposed Eric Hodel.
 
-	* lib/drb/drb.rb (DRbMessage#load): rescue Errno::* and raise
-	  DRbConnError.
+	* ext/socket/rubysocket.h (rsock_sys_fail_host_port): Declared.
+	  (rsock_sys_fail_path): Ditto.
+	  (rsock_sys_fail_sockaddr): Ditto.
 
-Fri Nov 28 15:41:15 2003  Tanaka Akira  <akr@m17n.org>
+	* ext/socket/udpsocket.c (udp_connect): Use rsock_sys_fail_host_port.
+	  (udp_bind): Ditto.
+	  (udp_send): Ditto.
 
-	* lib/pathname.rb (Pathname#realpath): obsolete the force_absolute
+	* ext/socket/init.c (rsock_init_sock): Specify a string for rb_sys_fail
 	  argument.
+	  (make_fd_nonblock): Ditto.
+	  (rsock_s_accept): Ditto.
 
-Fri Nov 28 14:41:52 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/streamHandler.rb: drop unused http parameters.
-
-	* lib/soap/encodingstyle/soapHandler.rb, lib/soap/mapping/factory.rb,
-	  lib/soap/mapping/mapping.rb, lib/soap/mapping/registry.rb,
-	  lib/wsdl/soap/complexType.rb: ApacheSOAP's map support was broken
-	  under WSDL dynanic client environment.  fixed.
-
-	* test/wsdl/raa/*: add tests.
-
-	* lib/xsd/datatypes.rb: dateTime precision bug fix (at least, I hope.)
-	  bug of soap4r.  XSDDateTimeImple.to_time passed a Float to
-	  Time.local/Time.gm as an usec, and NUM2LONG(rb_num2long for Float)
-	  causes rounding error.
-
-	* test/soap/test_basetype.rb, test/xsd/test_xsd.rb: add tests.
-
-Fri Nov 28 04:15:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (method_arity): used wrong Proc object.  [ruby-talk:86504]
-
-Fri Nov 28 00:47:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_f_exit), process.c (rb_f_exit_bang): treat true as
-	  success, false as failure.  [ruby-dev:22067]
-
-	* eval.c (rb_f_abort, rb_thread_switch), process.c (rb_f_system): use
-	  ANSI macro instead of hard coded value.
-
-	* eval.c (rb_f_exit), process.c (rb_f_exit_bang): use VALUEs not but
-	  TYPEs.
-
-Thu Nov 27 22:05:48 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* eval.c, gc.c: FreeBSD/ia64 currently does not have a way for a
-	  process to get the base address for the RSE backing store, so
-	  hardcode it for the moment.
-	  [submitted by: Marcel Moolenaar <marcel@FreeBSD.org>]
-
-Thu Nov 27 17:36:42 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkafter.rb: bug fix on TkTimer#cancel_on_exception=(mode).
-	  TkTimer#wait recieves the exception of the callback.
-	  The exception is kept on @return_value.
-
-Thu Nov 27 16:58:48 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* win32/win32.c (rb_w32_stat): remove _fullpath() for NUL: device.
-
-Wed Nov 26 15:38:47 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* test/fileutils/test_fileutils.rb (test_ln_s): should take the
-	  existing symbolic link for OpenBSD.
-
-Wed Nov 26 04:48:42 2003  why the lucky stiff  <why@ruby-lang.org>
-
-	* ext/syck/token.c: removed YYTOKTMP references which
-	  were causing buffer overflows on large block scalars,
-	  comments, quoted scalars and plain scalars.
-
-	* ext/syck/rubyext.c: dynamic changing of buffer size.
-
-	* ext/syck/syck.h: default buffer size of 4k.
-
-Wed Nov 26 00:55:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpresponse.rb: add HTTPResponse#keep_alive=.
-
-	* lib/webrick/httpserver.rb (HTTPServer#run): should pass the
-	  request's keep_alive flag to the response.
-
-Tue Nov 25 21:41:35 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* defines.h (ENV_IGNORECASE): should define when DOSISH without
-	  human68k. [ruby-dev:22047]
-
-	* hash.c (env_has_value, env_index): don't ignore case of value.
-	  [ruby-dev:22048]
-
-Tue Nov 25 21:39:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* file.c (path_check_1): honor sticky bits always.
-	  [ruby-talk:86273]
-
-Tue Nov 25 20:02:14 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb: do test in more deep
-	  directory.
-
-	* test/fileutils/test_nowrite.rb: ditto.
-
-Tue Nov 25 19:04:23 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (URI::Generic#find_proxy): ENV case sensitivity test
-	  refined.
-
-Tue Nov 25 18:13:30 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb: chdir Dir.tmpdir before each
-	  test. [ruby-dev:22045]
-
-	* test/fileutils/test_nowrite.rb: ditto.
-
-Tue Nov 25 17:52:11 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (URI::Generic#find_proxy): use http_proxy under CGI
-	  if the environment variable is case sensitive.
-
-Tue Nov 25 16:41:33 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb:
-	  removed.  this test requires extra libraries in soap4r/1.5.*.
-
-Tue Nov 25 16:24:42 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/**/*.rb, lib/wsdl/**/*.rb, lib/xsd/**/*.rb: changed license;
-	  GPL2 -> Ruby's.
-
-	* lib/soap/rpc/driver.rb, lib/soap/wsdlDriver.rb,
-	  lib/soap/streamHandler.rb: add interface to streamhandler.
-
-	* lib/soap/marshal.rb: raise error if parse fails.
-
-	* lib/soap/netHttpClient.rb: add https support.  Patched by
-	  Oliver M. Bolzer.
-
-	* lib/soap/netHttpClient.rb: dump HTTP response message body by itself.
-
-	* lib/soap/rpc/driver.rb, lib/soap/rpc/proxy.rb,
-	  lib/soap/wsdlDriver.rb: add driver#mandatorycharset interface to foce
-	  using charset for parsing response from buggy server.
-
-	* lib/soap/encodingstyle/soapHandler.rb: support Apache Axis's half
-	  typed multi-ref array.
-
-	* lib/soap/mapping/factory.rb, lib/soap/mapping/registry.rb: map
-	  SOAPStruct which has multi-accessors which name are the same, to an
-	  array.
-
-	* lib/soap/rpc/element.rb: fixed illegal parameter order.
-
-	* lib/soap/rpc/element.rb: element name of response message could have
-	  the name other than 'return'.
-
-	* lib/wsdl/operation.rb, lib/wsdl/operationBinding.rb,
-	  lib/wsdl/soap/classDefCreator.rb, lib/wsdl/soap/methodDefCreator.rb,
-	  lib/wsdl/soap/methodDefCreatorSupport.rb: WSDL/1.1 allows plural
-	  fault definition in a operation. [ruby-talk:84948]
-
-	* test/wsdl/multiplefault.wsdl, test/wsdl/test_multiplefault.rb: add
-	  test for above fix.
-
-	* lib/wsdl/soap/complexType.rb: support WSDL array definition with
-	  maxOccures="unbound".
-
-	* lib/xsd/charset.rb: use cp932 under emx.  Patched by
-	  Siena. / SHINAGAWA, Norihide in [ruby-dev:21972]
-
-	* lib/xsd/xmlparser/parser.rb: set @charset nil by default.  Nil means
-	  'follow encoding declaration in XML'.
-
-	* sample/soap/digraph.rb, sample/wsdl/amazon/wsdlDriver.rb,
-	  sample/wsdl/googleSearch/sampleClient.rb,
-	  sample/wsdl/googleSearch/wsdlDriver.rb,
-	  test/wsdl/test_emptycomplextype.rb,
-	  test/wsdl/marshal/test_wsdlmarshal.rb,
-	  test/xsd/test_xmlschemaparser.rb: use File.open(...) { |f| f.read }
-	  instead of File.open(...).read. [ruby-dev:21964]
-
-	* test/wsdl/emptycomplextype.wsdl, test/wsdl/test_emptycomplextype.rb:
-	  simplify the test case.
-
-	* test/wsdl/axisArray/*: add tests for axis's array encoding.
-
-Tue Nov 25 16:15:29 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ruby.h: don't treat Cygwin as Windows.
-
-Tue Nov 25 15:18:28 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* configure.in: change default value of --enable-pthread (default: no)
-
-Tue Nov 25 07:31:16 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (primary): allow newlines just before right argument
-	  parenthesis.  (ruby-bugs:PR#1221)
-
-Mon Nov 24 23:32:06 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (OpenURI.open_loop, URI::HTTP#proxy_open): use
-	  catch/throw for redirection instead of exception.
-	  (OpenURI.open_loop, OpenURI.redirectable?): restrict redirection.
-
-Mon Nov 24 19:59:48 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (URI::Generic#find_proxy): use CGI_HTTP_PROXY
-	  instead of HTTP_PROXY in the CGI environment.
-
-Mon Nov 24 19:32:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* ext/etc/extconf.rb: check for pw_passwd in struct passwd and
-	  gr_passwd in struct group for DJGPP.
-
-	* ext/etc/etc.c: ditto.
-
-	* ext/Setup.dj: support for curses, etc, zlib.
-
-Mon Nov 24 17:00:00 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb: validate option names.
-	  :content_length_proc and :progress_proc option implemented.
-
-Mon Nov 24 14:53:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (XCFLAGS): output empty value instead of `-DRUBY_EXPORT'.
-
-Sat Nov 22 23:09:45 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: set enable_pthread to no on MinGW.
-
-Sat Nov 22 22:56:20 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* configure.in: add --enable-pthread option (default: yes)
-
-Sat Nov 22 22:48:46 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tk.rb: add Tk.grab_release and fix bug of TkComposite
-
-	* ext/tk/lib/tkafter.rb: bug fix of TkAfter#start
-
-	* ext/tk/sample/tkcombobox.rb: new sample script
-
-	* ext/tcltklib/tcltklib.c: add native thread check
-
-Sat Nov 22 18:49:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/curses/curses.c (window_nodelay): nodelay() of NetBSD's
-	  libcruses returns no value, just like keypad().
-
-Sat Nov 22 17:36:36 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (HAVE_GETCWD): output to config.h.
-
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub
-	  (XCFLAGS): output to config.status.
-
-Sat Nov 22 13:10:10 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (have_st_ino?): djgpp has valid st_ino.
-
-Sat Nov 22 11:28:48 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* gc.c (Init_stack): stack region is far smaller than usual if
-	  pthread is used.
-
-Sat Nov 22 07:30:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit/util/backtracefilter.rb: fixed a bug that occurred
-	  when an exception had no backtrace.
-
-	* test/testunit/util/test_backtracefilter.rb: ditto.
-
-Fri Nov 21 16:44:18 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/tkentry.rb: fix the encoding trouble of percent
-	  substitutions on validatecommand option of TkEntry widget
-
-	* ext/tk/lib/tk.rb: fix bug on {pack|grid}_propagate() method
-
-Fri Nov 21 16:12:11 2003  Akinori MUSHA  <knu@iDaemons.org>
-
-	* ruby.1: Fix markups and grammar.
-
-Fri Nov 21 14:49:42 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* ruby.1: wrote about ruby related environment variables.
-
-Fri Nov 21 12:28:03 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (w_extended): singleton methods should not be checked
-	  when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
-
-Fri Nov 21 01:40:00 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* configure.in: check <pthread.h>
-
-	* ruby.h: include pthread.h if existence.
-	  define is_ruby_native() macro when not HAVE_NATIVETHREAD
-
-	* eval.c: undef is_ruby_native() function when not HAVE_NATIVETHREAD
-
-Fri Nov 21 00:43:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb: use #__send__ instead of #send.
-
-	* lib/test/unit/testcase.rb: ditto.
-
-Thu Nov 20 19:19:22 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* configure.in: don't find the Cygwin's pthread library on MinGW.
-
-Thu Nov 20 19:15:50 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/fileutils.rb (have_st_ino?): emx (OS/2 with EMX) does not
-	  have st_ino (always 0). [ruby-dev:21972]
-
-	* lib/fileutils.rb (rename_cannot_overwrite_file?): emx does not
-	  allow overwriting files by rename(2).
-
-	* test/fileutils/test_fileutils.rb: windows? ->
-	  have_drive_letter?, have_file_perm?
-
-Thu Nov 20 17:50:58 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/socket/ipsocket.c (init_inetsock_internal): Use
+	  rsock_sys_fail_host_port.
 
-	* ext/tk/sample/tkballoonhelp.rb: new sample script
+	* ext/socket/socket.c (rsock_sys_fail_host_port): Defined.
+	  (rsock_sys_fail_path): Ditto.
+	  (rsock_sys_fail_sockaddr): Ditto.
+	  (setup_domain_and_type): Use rsock_sys_fail_sockaddr.
+	  (sock_connect_nonblock): Ditto.
+	  (sock_bind): Ditto.
+	  (sock_gethostname): Specify a string for rb_sys_fail argument.
+	  (socket_s_ip_address_list): Ditto.
 
-	* ext/tk/sample/tkmultilistbox.rb: ditto
+	* ext/socket/basicsocket.c (bsock_shutdown): Specify a string for
+	  rb_sys_fail argument.
+	  (bsock_setsockopt): Use rsock_sys_fail_path.
+	  (bsock_getsockopt): Ditto.
+	  (bsock_getpeereid): Refine the argument for rb_sys_fail.
 
-	* ext/tk/sample/tktextframe.rb: ditto
+	* ext/socket/unixsocket.c (rsock_init_unixsock): Use
+	  rsock_sys_fail_path.
+	  (unix_path): Ditto.
+	  (unix_send_io): Ditto.
+	  (unix_recv_io): Ditto.
+	  (unix_addr): Ditto.
+	  (unix_peeraddr): Ditto.
 
-Thu Nov 20 13:37:34 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Apr  6 11:23:18 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* ruby.h: define is_ruby_native_thread() for no native thread
-	  environment
+	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
+	  fix load path for encoding to run the test as stand-alone.
 
-	* eval.c: ditto
+Sat Apr  6 09:54:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Nov 20 12:42:47 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* pack.c (NATINT_LEN): fix definition order, must be after
+	  NATINT_PACK.
 
-	* configure.in: always check existence of the pthread library
+Sat Apr  6 03:11:07 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* ruby.h: define macros for ruby's native thread check
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix symbol keys in coder
+	  emission.  Thanks @tjwallace
+	* test/psych/test_coder.rb: test for change
 
-	* eval.c: add ruby's native thread check
+Sat Apr  6 02:54:08 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* gc.c: ditto
+	* ext/psych/lib/psych/exception.rb: there should be only one exception
+	  base class. Fixes tenderlove/psych #125
+	* ext/psych/lib/psych.rb: require the correct exception class
+	* ext/psych/lib/psych/syntax_error.rb: ditto
+	* ext/psych/lib/psych/visitors/to_ruby.rb: ditto
 
-Wed Nov 19 14:45:18 2003  Minero Aoki  <aamine@loveruby.net>
+Sat Apr  6 02:30:28 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/http.rb (to_ary): print more friendly warning message.
+	* parse.y (new_defined): remove all extra parentheses, and return
+	  "nil" for defined? with empty expression.
+	  [ruby-core:54024] [Bug #8224]
 
-Wed Nov 19 14:32:08 2003  Minero Aoki  <aamine@loveruby.net>
+Sat Apr  6 02:06:04 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* lib/fileutils.rb (fu_same?): add djgpp and wince.
+	* ext/psych/lib/psych/visitors/to_ruby.rb: correctly register
+	  self-referential strings. Fixes tenderlove/psych #135
 
-	* lib/fileutils.rb (cannot_overwrite_file?): add wince.
+	* test/psych/test_string.rb: appropriate test.
 
-Wed Nov 19 11:04:47 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sat Apr  6 01:21:56 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/fileutils.rb (cannot_overwrite_file?, have_st_ino?): bccwin32
-	  is same as mswin32.
+	* ext/socket/init.c (cloexec_accept): Fix a compile error on
+	  Debian GNU/kFreeBSD.  Consider HAVE_ACCEPT4 is defined
+	  but SOCK_CLOEXEC is not defined.
 
-Wed Nov 19 07:54:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Sat Apr  6 00:19:30 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* lib/test/unit.rb: do not run tests if $! is set.
+	* load.c (features_index_add): use rb_str_subseq() to specify C string
+	  position properly to fix require non ascii path.
+	  [ruby-core:53733] [Bug #8165]
 
-	* lib/test/unit/assertionfailederror.rb: extend StandardError instead
-	  Exception (irb catches the former but not the latter).
+	* test/ruby/test_require.rb (TestRequire#test_require_nonascii_path):
+	  a test for the above.
 
-Tue Nov 18 23:31:36 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Fri Apr  5 20:41:49 2013  Tanaka Akira  <akr@fsij.org>
 
-	* missing/memmove.c (memmove): take void *, not char *.
+	* include/ruby/defines.h (HAVE_TRUE_LONG_LONG): Defined to distinguish
+	  availability of long long and availability of 64bit integer type.
 
-	* missing.h (memmove): ditto.
+	* pack.c: Use HAVE_TRUE_LONG_LONG to distinguish q! and Q! support.
 
-	* missing.h (strchr, strrchr): return char *, not int.
+Fri Apr  5 20:19:42 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Nov 18 22:20:10 2003  Minero Aoki  <aamine@loveruby.net>
+	* addr2line.c: Include ruby/missing.h to fix compile error on Debian.
 
-	* lib/fileutils.rb (fu_same?): temporal fix for windows.
+Fri Apr  5 19:39:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Nov 18 19:05:04 2003  Minero Aoki  <aamine@loveruby.net>
+	* compile.c (iseq_compile_each): fix of defined? with empty
+	  expression.  [ruby-core:53999] [Bug #8220]
 
-	* lib/fileutils.rb (fu_same?): check by inode instead of path
-	  name, to detect two hard links pointing to the same content.
+Fri Apr  5 13:22:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/fileutils.rb: did not create correctly looped symlinks.
+	* ext/curses/curses.c (Init_curses): fix implementation function,
+	  crmode should be same as cbreak.  [ruby-core:54013] [Bug #8222]
 
-Tue Nov 18 18:23:05 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Apr  5 12:06:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/stringio/stringio.c (strio_read): behave as IO at empty string.
-	  [ruby-dev:21939], [ruby-dev:21941]
+	* ext/curses/hello.rb: Typo in Curses example by Drew Blas
+	  [Fixes GH-273]
 
-	* ext/stringio/stringio.c (strio_getc, strio_getline): set EOF flag.
+Thu Apr  4 23:45:13 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/stringio/stringio.c (strio_rewind, strio_seek, strio_ungetc):
-	  clear EOF flag.
+	* lib/resolv.rb (bind_random_port): Rescue EACCES for SunOS.
+	  bind() on SunOS for port 2049 (nfs) and 4045 (lockd) causes
+	  EACCES with unprivileged process.  cf. PRIV_SYS_NFS in privileges(5)
+	  [ruby-core:48064] [Bug #7183] reported by Frank Meier.
 
-	* test/stringio/test_stringio.rb: imported from [ruby-dev:21941].
+Thu Apr  4 23:24:45 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Nov 18 14:06:35 2003  Minero Aoki  <aamine@loveruby.net>
+	* ext/socket/extconf.rb: Remove condition for bcc.
 
-	* lib/fileutils.rb (fu_each_src_dest): raise if src==dest.
-	  [ruby-talk:85344] [ruby-core:01699]
+Thu Apr  4 22:53:23 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/fileutils.rb: use Object#is_a? instead of Class#=== to allow
-	  e.g. remote objects for receivers.
+	* include/ruby/ruby.h (FIX2LONG): Parenthesize the macro body.
 
-	* lib/fileutils.rb: FileTest -> File.
+Thu Apr  4 22:32:32 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/fileutils.rb: put parentheses for arguments of File.xxxx?
+	* time.c (time_strftime): Describe %L and %N truncates digits under
+	  the specified length.
+	  [ruby-core:52130] [Bug #7829]
 
-	* test/fileutils/test_fileutils.rb (test_cp): test "cp a a".
+Thu Apr  4 22:08:46 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/fileutils/test_fileutils.rb (test_mv): test "mv a a".
+	* object.c (rb_mod_cvar_set): Reverted "avoid inadvertent
+	  symbol creation" to avoid SEGV by
+	  Class.new.class_variable_set(1, 2).
 
-	* test/fileutils/test_fileutils.rb (test_ln): test "ln a a".
+Thu Apr  4 20:07:19 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/fileutils/test_fileutils.rb (test_ln_s): test "ln_s a a".
+	* ext/pathname/pathname.c (path_write): New method.
+	  (path_binwrite): Ditto.
+	  [ruby-core:49468] [Feature #7378]
 
-	* test/fileutils/test_fileutils.rb (test_install): test "install a a".
+Thu Apr  4 16:51:29 2013  Yuki Yugui Sonoda  <yugui@google.com>
 
-	* test/fileutils/fileasserts.rb: new method assert_symlink.
+	* thread_pthread.c: Fixes wrong scopes of #if USE_SLEEPY_TIMER_THREAD
+	  .. #endif sections.  This fixes a build error on NativeClient.
 
-	* test/fileutils/fileasserts.rb: assert_is_directory -> assert_directory.
+Wed Apr  3 17:25:31 2013  Yuki Yugui Sonoda  <yugui@google.com>
 
-Mon Nov 17 19:38:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* thread_pthread.c (ruby_init_stack): Avoid using uninitialized value.
+	  stackaddr and size are not set if get_stack() fails.
 
-	* file.c (getcwdofdrv): avoid using getcwd() directly, use
-	  my_getcwd() instead.
+Thu Apr  4 16:55:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
-	  <sunshine@sunshineco.com>.  [ruby-core:01596]
+	* struct.c (make_struct): avoid inadvertent symbol creation.
+	  (rb_struct_aref): ditto.
+	  (rb_struct_aset): ditto.
 
-Mon Nov 17 10:50:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr  4 16:54:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/optparse.rb (OptionParser::Completion::complete): allow least
-	  common completion for three or more candidates.
+	* object.c (rb_mod_const_set): avoid inadvertent symbol creation.
+	  (rb_obj_ivar_set): ditto.
+	  (rb_mod_cvar_set): ditto.
 
-Mon Nov 17 09:41:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr  4 15:46:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit/ui/tk/testrunner.rb,
-	  lib/test/unit/ui/gtk/testrunner.rb:
-	  run GUI main loop in sub thread.
+	* enum.c (enum_inject): avoid inadvertent symbol creation.
 
-	* lib/test/unit/ui/gtk2/testrunner.rb: imported from rough.
+Thu Apr  4 14:37:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit/autorunner.rb (keyword_display): sort keywords.
+	* thread.c (rb_thread_aref): avoid inadvertent symbol creation.
+	  (rb_thread_variable_get): ditto.
+	  (rb_thread_key_p): ditto.
+	  (rb_thread_variable_p): ditto.
 
-Sun Nov 16 18:10:57 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Apr  4 11:33:57 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* eval.c (rb_eval): iterator should return value from next inside
-	  begin/rescue/end.  (ruby-bugs:PR#1218)
+	* ext/openssl/ossl_bn.c (ossl_bn_to_i): Use bn2hex to speed up.
+	  In general, binary to/from decimal needs extra cost.
 
-Sun Nov 16 13:26:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Apr  4 07:24:18 2013  Tanaka Akira  <akr@fsij.org>
 
-	* marshal.c (w_object): LINK check earlier than anything else,
-	  i.e. do not dump TYPE_IVAR for already dumped objects.
-	  (ruby-bugs:PR#1220)
+	* ext/socket/extconf.rb: Specify arguments to test functions.
 
-	* eval.c (rb_eval): call "inherited" only when a new class is
-	  generated; not on reopening.
+Thu Apr  4 03:25:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* eval.c (eval): prepend error position in evaluating string to
-	  "mesg" attribute string only when it's available and is a
-	  string.
-
-Sun Nov 16 12:16:10 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/protocol.rb: logging response body. [experimental]
-	  [ruby-list:38800]
-
-Sun Nov 16 10:49:38 2003  Gavin Sinclair  <gsinclair@soyabean.com.au>
-
-	* lib/thread.rb (Thread.exclusive): wrap method definition in
-	  class Thread to enable rdoc to process.
-
-Sun Nov 16 09:45:23 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/net/http.rb (set_debug_output): warn if method is called
-	  after #start.  [ruby-dev:38798]
-
-Sun Nov 16 04:41:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (eval): do not re-raise exception to avoid unnecessary
-	  exception copying, instead modify exception and internal
-	  information to adjust eval().
-
-	* eval.c (backtrace): can return the current frame information
-	  only if lev < -1.
-
-Sat Nov 15 22:16:42 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* /ext/openssl/ossl_x509ext.c (ossl_x509extfactory_create_ext):
-	  refine error message.
-
-Sat Nov 15 10:05:40 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/open-uri.rb (OpenURI.open_loop, OpenURI::HTTP#proxy_open):
-	  refactored to support options.
-	  (Buffer): maintain size by this class.
-
-Sat Nov 15 07:40:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_method_node): new API to retrieve method body.
-
-Fri Nov 14 13:21:30 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* ext/openssl/ossl_bn.c (ossl_bn_initialize): fix can't create from bn.
 
-	* ext/tcltklib/tcltklib.c: fix (en-bugged at 2003/11/07)
+Wed Apr  3 22:09:25 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tk/lib/tkdialog.rb: TkDialog.new accepts a parent widget
-	  argument [ruby-talk:85066]
+	* ext/socket/extconf.rb: Test functions and libraries after headers.
 
-Thu Nov 13 20:53:35 2003  Tanaka Akira  <akr@m17n.org>
+Wed Apr  3 21:23:29 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/open-uri.rb (Kernel[#.]open): hard coded URI schemes removed.
-	  [ruby-ext:02251]
+	 * io.c (rb_io_seek_m): Accept :CUR, :END, :SET as "whence" argument.
+	   (interpret_seek_whence): New function.
+	   [ruby-dev:45818] [Feature #6643]
 
-Thu Nov 13 19:17:00 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Apr  3 20:52:49 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/test/unit/ui/tk/testrunner.rb: use grid and panedwindow
-	  (if available)
+	* process.c: Describe the behavior which Ruby invokes a commandline
+	  directly without shell if the commandline is simple enough.
+	  [ruby-core:50459] [Bug #7489]
 
-Thu Nov 13 17:56:41 2003  Tanaka Akira  <akr@m17n.org>
+Wed Apr  3 20:27:37 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/open-uri.rb (OpenURI.open_uri): use File::RDONLY.
-	  reported by Take_tk <ggb03124@nifty.ne.jp>.
-	  [ruby-ext:02245]
+	* ext/extmk.rb (extmake): Invoke Logging::log_close in a ensure
+	  clause.
 
-Thu Nov 13 16:45:53 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Apr  3 18:53:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_x509req.c (ossl_x509req_to_der): add function for
-	  X509::Request#to_der.
+	* ext/extmk.rb (extmake): Use Logging.open to switch stdout and
+	  stderr.  Delay Logging::log_close until the failure message is
+	  written.  Write the failure message only if log file is opened.
 
-Thu Nov 13 11:31:14 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/mkmf.rb (Logging.log_opened?): New method.
 
-	* lib/optparse.rb (OptionParser::Completion#complete): prior shorter
-	  name to containing longer name.
+	  [ruby-dev:47215] [Bug #8209]
 
-Thu Nov 13 06:08:54 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Wed Apr  3 17:11:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: stop freezing some classes
+	* win32/win32.c (constat_apply): pass through unknown sequence which
+	  starts with ESC but is not followed by a bracket.  [ruby-core:53879]
+	  [Bug #8201]
 
-	* ext/tk/lib/multi-tk.rb: ditto.
+Wed Apr  3 16:35:32 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Nov 12 17:32:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* bignum.c (rb_big_eq): hide intermediate Bignums not just freeing
+	  memory.  [ruby-core:53893] [Bug #8204]
 
-	* lib/test/unit/assertions.rb (assert_throws, assert_nothing_thrown):
-	  uncaught throw in sub thread raises ThreadError.
+	* object.c (rb_obj_hide): hide an object by clearing klass.
 
-	* lib/test/unit/ui/tk/testrunner.rb (setup_ui): "expand" is not
-	  necessary.
+	* bignum.c (rb_big_eq): test as Fixnum if possible and get rid of zero
+	  length Bignum.  [ruby-core:53893] [Bug #8204]
 
-Wed Nov 12 14:09:43 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Apr  2 23:56:03 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/monitor/test_monitor.rb: fix the timing problem by Queue.
+	* lib/securerandom.rb (SecureRandom.random_bytes): Use
+	  OpenSSL::Random.random_add instead of OpenSSL::Random.seed and
+	  specify 0.0 as the entropy.
+	  [ruby-core:47308] [Bug #6928]
 
-Wed Nov 12 12:59:44 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Apr  2 20:24:52 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/monitor/test_monitor.rb: added.
+	* pack.c: Support Q! and q! for long long.
+	  (natstr): Moved to toplevel.  Add q and Q if there is long long type.
+	  (endstr): Moved to toplevel.
+	  (NATINT_PACK): Consider long long.
+	  (NATINT_LEN_Q): New macro.
+	  (pack_pack): Support Q! and q!.
+	  (pack_unpack): Ditto.
+	  [ruby-dev:43970] [Feature #3946]
 
-Wed Nov 12 10:14:28 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Tue Apr  2 19:24:26 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/monitor.rb: refactored. Thanks, Gennady Bystritsky.
+	* ext/-test-/num2int/num2int.c: Define utility methods
+	  as module methods of Num2int.
 
-Wed Nov 12 06:11:39 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/-ext-/num2int/test_num2int.rb: Follow the above change.
 
-	* ext/openssl/ossl.c (ossl_x509_sk2ary, ossl_x509crl_sk2ary):
-	  add functions to convert STACK into Array.
+Tue Apr  2 18:49:01 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl.h: add prototypes.
+	* lib/securerandom.rb: Don't use Array#to_s.
+	   [ruby-core:52058] [Bug #7811] fixed by zzak (Zachary Scott).
 
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_set_certificates,
-	  ossl_pkcs7_get_certificates, ossl_pkcs7_get_crls,
-	  ossl_pkcs7_set_crls): add functions for PKCS7#certificates=
-	  PKCS7#certificates, PKCS7#crls= and PKCS7#crls.
+Tue Apr  2 17:38:20 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Nov 12 00:47:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* re.c (rb_reg_to_s): suppress duplicated charclass warning.
+	  Regexp#to_s suppress extra its whole regexp options by calling
+	  onig_new with its source, but it doesn't call rb_reg_preprocess.
+	  Therefore its Unicode escapes (\u{XXXX}) are given as is,
+	  and it may cause duplicated charclass warning for example
+	  "[\u{33}]" (3 is duplicated) or "[\u{a}\u{b}]" (u is duplicated).
+	  [ruby-core:53649] [Bug #8151]
 
-	* lib/test/unit/ui/testrunnermediator.rb: should require 'test/unit'.
+Tue Apr  2 16:00:06 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Nov 11 23:54:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* vm_dump.c (rb_print_backtrace): separate to ease showing C backtrace.
 
-	* lib/test/unit/ui/gtk/testrunner.rb: added a rescue clause to handle
-	  the case when the requested font is not available.
+	* internal.h (rb_print_backtrace): ditto.
 
-Tue Nov 11 22:44:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Apr  2 15:22:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* io.c (appendline): file may not end with newline.  a bug if
-	  READ_DATA_PENDING_PTR is defined. [ruby-talk:84925]
+	* test/ruby/envutil.rb (assert_separately): stop_auto_run of
+	  Test::Unit::Runner to prevent auto runner use ARGV.
 
-Tue Nov 11 10:42:41 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* test/ruby/envutil.rb (assert_separately): add $: to separate process.
 
-	* ext/tk/lib/tk.rb: raise an exception when creating TkWindow
-	  object, because TkWindow class is an abstract class.
+	* test/ruby/envutil.rb (assert_separately): fail if stderr is not
+	  empty and ignore_stderr is false.
 
-Tue Nov 11 03:30:43 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Tue Apr  2 06:46:59 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/ext/openssl/ossl_conf.c (ossl_config_get_value): return nil
-	  if the specified value doesn't exist.
+	* ext/-test-/num2int/num2int.c: Rename utility methods
+	  to global functions to ease manual experiments.
 
-	* lib/ext/openssl/ossl_conf.c (ossl_config_get_section): return
-	  a empty hash if the specified section doesn't exist.
+	* test/-ext-/num2int/test_num2int.rb: Follow the above change.
 
-Mon Nov 10 11:40:29 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Mon Apr  1 22:26:17 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/monitor.rb (wait): return true on signal/broadcastfalse and
-	  false on timeout. Thanks Gennady Bystritsky.
+	* ext/zlib/zlib.c (rb_gzfile_set_mtime): Use NUM2UINT.
+	  The old logic doesn't work well on LP64 platforms as:
+	  .. -2**63-1 => error,
+	  -2**63 .. -2**62-1 => success,
+	  -2**62 .. -2**31-1 => error,
+	  -2**31 .. 2**31-1 => success,
+	  2**31 .. 2**62-1 => error,
+	  2**62 .. 2**64-1 => success,
+	  2**64 ..  => error.
 
-Mon Nov 10 00:07:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Apr  1 22:08:02 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* parse.y (primary): primary_value may be 0 when syntax error.
-	  [ruby-talk:84893]
+	* ext/zlib/zlib.c (Zlib::Inflate.new):
+	  Fix documentation syntax and naming errors.
+	  Based on patch by Robin Dupret. Fix GH-271.
 
-Sun Nov  9 02:05:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Mon Apr  1 21:22:31 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/test/unit/assertions.rb: un-deprecated #assert_not_nil to
-	  maintain symmetry with #assert_nil. Also added better output for
-	  #assert_kind_of.
+	* test/-ext-/num2int/test_num2int.rb: Test small bignums.
 
-	* test/testunit/tc_assertions.rb: ditto.
+Mon Apr  1 21:10:56 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Nov  8 18:50:20 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* numeric.c (rb_num2ulong_internal): Don't cast a negative double value
+	  into unsigned long, which is undefined behavior.
+	  (rb_num2ull): Don't cast a value bigger than LLONG_MAX into
+	  long long, which is undefined behavior.
 
-	* test/wsdl/raa/*: add new testcase for WSDL loading, parsing and
-	  reading.
+Mon Apr  1 20:57:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/soap/marshal/*: backport from soap4r/1.5.1.  all differences are
-	  for ruby/1.6.
+	* ext/-test-/num2int/num2int.c: Return string for result, instead of
+	  printing.
 
-	* lib/soap/*: backport from soap4r/1.5.1.  all differences are for
-	  ruby/1.6.
+	* test/-ext-/num2int/test_num2int.rb: updated to follow above change.
 
-	* lib/wsdl/data.rb, lib/wsdl/xmlSchema/data.rb: move definition of
-	  ArrayTypeAttrName from ::WSDL::XMLSchema::* to ::WSDL::*.
-	  [ruby-talk:84813]
+Mon Apr  1 20:08:07 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/wsdl/soap/definitions.rb: element name typo in custom exception
-	  struct definition which is needed for wsdlDriver; camelCase ->
-	  underscore_name.
+	* numeric.c (rb_num2long): Don't use SIGNED_VALUE uselessly.
+	  (check_int): Ditto.
+	  (check_short): Ditto.
+	  (rb_num2fix): Ditto.
+	  (rb_num2ulong_internal): Add a cast.
 
-Sat Nov  8 13:49:50 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Apr  1 18:41:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* configure.in: improvement of pthread check
+	* configure.in: skip autoconf 2.64 and 2.66, 2.67 seems short-lived
+	  but stick on it for Debian Squeeze.
 
-Sat Nov  8 13:28:46 2003  Takaaki Tateishi  <ttate@ttsky.net>
+Mon Apr  1 14:22:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/sym.c: Add DL.win32_last_error and DL.last_error.
-	  Thanks, Kaoru Shirai.
+	* configure.in: check clang version by predefined macro values.
+	  [Bug #8192]
 
-Sat Nov  8 06:19:38 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Apr  1 12:05:15 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/tcltklib/tcltklib.c: To fix 'pthread-enabled Tcl/Tk' problem,
-	  TclTkIp#_eval calls Tcl_Eval() on the mainloop thread only
-	  (queueing a handler to the EventQueue).
+	* numeric.c (check_uint): Take the 1st argument as unsigned long,
+	  instead of VALUE.  Refine the validity test conditions.
+	  (check_ushort): Ditto.
 
-	* ext/tcltklib/README.1st: edit the description of '--with-pthread-ext'
+Mon Apr  1 07:15:03 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-Fri Nov  7 23:23:04 2003  Tanaka Akira  <akr@m17n.org>
+	* configure.in: use quadrigraph to put '[' or ']'. [Bug #8192]
 
-	* lib/pathname.rb (Pathname#+): if self or the argument is `.', return
-	  another.
-	  (Pathname#parent): if self is `.', return `..'.
-	  (Pathname#children): if self is `.', don't prepend self for a
-	  pathname in a result.
-	  (Pathname#join): re-implemented using Pathname#+.
-	  (Pathname#find): if self is `.', remove `./' prefix of yielding
-	  pathname.
+Mon Apr  1 04:16:41 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Nov  7 10:23:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in: kick old clang. [ruby-dev:47204] [Bug #8192]
 
-	* ext/socket/socket.c (make_hostent): get rid of SEGV on aliases
-	  lookup failure.  (ruby-bugs:PR#1215)
+Mon Apr  1 01:12:46 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Nov  7 04:08:05 2003  UENO Katsuhiro  <katsu@blue.sky.or.jp>
+	* include/ruby/ruby.h (FIX2ULONG): Make it consistent with NUM2ULONG.
 
-	* ext/zlib/zlib.c (Init_zlib): define Zlib::GzipReader#each_line as
-	  an alias of Zlib::GzipReader#each.
+	* ext/-test-/num2int/num2int.c: Add utility methods for FIX2XXX tests.
 
-Fri Nov  7 01:03:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/-ext-/num2int/test_num2int.rb: Add tests for FIX2XXX.
 
-	* eval.c (rb_load): save and restore rb_prohibit_interrupt.
-	  [ruby-dev:21857]
+Sun Mar 31 17:17:56 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Nov  6 18:05:07 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* proc.c (rb_mod_define_method): consider visibility in define_method.
+	  patch by mashiro <mail AT mashiro.org>.  fix GH-268.
 
-	* io.c (rb_io_inspect): show the path also at a closed file.
-	  [ruby-dev:21851]
+Sun Mar 31 15:40:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Nov  6 11:42:07 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* win32/configure.bat: try to fix option arguments split by commas and
+	  equals here.  this batch file no longer run with old command.com.
 
-	* ext/stringio/stringio.c (strio_set_string, strio_reopen): check
-	  tainted.
+	* tool/mkconfig.rb: no hacks for cmd.exe.
 
-	* ext/stringio/stringio.c (strio_copy, strio_ungetc, strio_write,
-	  strio_putc): add infection.
+Sun Mar 31 13:47:04 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/stringio/stringio.c (strio_path): just nil.  [ruby-dev:21846]
+	* numeric.c (rb_num2ulong_internal): New function similar to
+	  rb_num2ulong but integer wrap around flag is also returned.
+	  (rb_num2ulong): Use rb_num2ulong_internal.
+	  (rb_num2uint): Use rb_num2ulong_internal and the wrap around flag is
+	  used instead of negative_int_p(val).
+	  (rb_num2ushort): ditto.
 
-	* ruby.c (proc_options): reserve searched script path in the
-	  source file name table.  [ruby-list:38765]
+Sun Mar 31 06:27:17 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/optparse.rb (OptionParser::Completion#complete): default not to
-	  ignore case on completion.  [ruby-talk:84726]
+	* class.c (HAVE_METACLASS_P): should check FL_SINGLETON flag before get
+	  instance variable to get rid of wrong warning about __attached__.
+	  [ruby-core:53839] [Bug #8188]
 
-	* win32/win32.c (make_cmdvector): process backslashes even if a quote
-	  is not enclosed.
+Sat Mar 30 14:11:28 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Wed Nov  5 23:49:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* bcc32: removed. agreed at
+	  http://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20130223Japan
 
-	* sample/openssl/gen_csr.rb: there (at least) is a CA which does not
-	  accept DN in UTF8STRING format.  it's a sample.
+Sat Mar 30 03:58:00 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Wed Nov  5 22:55:16 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* win32/file.c (code_page): use cp1252 instead of cp20127 as US-ASCII.
+	  fix [ruby-core:53079] [Bug #7996]
+	  reported and patched by mmeltner (Michael Meltner).
 
-	* configure.in, eval.c, signal.c: : add '--with-pthread-ext'
-	  option to fix the pthread trouble on 'tcltklib'
+Sat Mar 30 03:49:21 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/tcltklib/README.1st: add the description of '--with-pthread-ext'
+	* win32/win32.c (wrename): use MoveFileExW instead of MoveFileW,
+	  because the latter fails on cross device file move of some
+	  environments.
+	  fix [ruby-core:53492] [Bug #8109]
+	  reported by mitchellh (Mitchell Hashimoto).
 
-	* ext/tk/lib/tktext.rb : add TkText#text_copy, text_cut, text_paste
-	  to support Tcl/Tk8.4's tk_textCopy, tk_textCut, tk_textPaste
+Fri Mar 29 22:09:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb : add TkMenu#set_focus support Tcl/Tk's
-	  tk_menuSetFocus
+	* thread.c (rb_mutex_synchronize_m): yield no block params.  patch by
+	  splattael (Peter Suschlik) in [ruby-core:53773] [Bug #8097].
+	  fix GH-266.
 
-Wed Nov  5 17:33:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Mar 29 16:51:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_load): allow interrupt during loaded program
-	  evaluation.  [ruby-dev:21834]
+	* io.c (argf_next_argv): set init flag if succeeded to forward, after
+	  skipping.
 
-	* hash.c (rb_hash_fetch): always warn if default argument and a
-	  block are supplied at the same time. [ruby-dev:21842]
+	* io.c (argf_block_call_i, argf_block_call): no more forwarding if
+	  forwarded after skipping.  [ruby-list:49185]
 
-	* hash.c (env_fetch): ditto.
+	* io.c (argf_close): deal with init flag.
 
-	* array.c (rb_ary_fetch): ditto.
+	* io.c (argf_block_call_i, argf_block_call): forward next file if
+	  skipped while iteration, to get rid of IOError.  [ruby-list:49185]
 
-Wed Nov  5 19:08:47 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar 29 11:09:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/optparse.rb (OptionParser::Switch::PlacedArgument::parse):
-	  do not remove next argument if empty value is placed.
+	* lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
+	  use different set than C for C++.  [ruby-core:45273] [Bug #6504]
 
-	* test/optparse: added.
+Fri Mar 29 10:24:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Nov  5 17:05:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/io.h: undef POSIX compliant names on AIX, which are no
+	  longer needed.  patch suggested by edelsohn (David Edelsohn) in
+	  [ruby-core:53815].  [Bug #8174]
 
-	* lib/test/unit/ui/gtk/testrunner.rb: typo.
+Fri Mar 29 06:39:42 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Nov  5 11:13:32 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* numeric.c (rb_num2ull): Cast double to unsigned LONG_LONG via
+	  LONG_LONG instead of double to unsigned LONG_LONG directly.
+	  This is a challenge to fix a test_num2ull(TestNum2int)
+	  failure (NUM2ULL(-1.0) should be "18446744073709551615" but was "0")
+	  on Mac OS X with 32bit clang.
+	  http://a.mrkn.jp/~mrkn/chkbuild/mountain_lion/ruby-trunk-m32-o0/log/20130328T191100Z.diff.html.gz
 
-	* string.c: add #include "version.h". this file still depends on it.
+Fri Mar 29 00:54:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* Makefile.in, bcc32/Makefile.sub, win32/Makefile.sub,
-	  wince/Makefile.sub: add version.h dependency to string.c.
+	* lib/mkmf.rb (MAIN_DOES_NOTHING): ensure symbols for tests to be
+	  preserved.  [ruby-core:53745] [Bug #8169]
 
-Wed Nov  5 09:14:23 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Thu Mar 28 23:11:25 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/monitor.rb: revert to the previous revision.
+	* lib/resolv.rb: Test Windows platform by detecting LoadError when
+	  require 'win32/resolv' suggested by Nobuyoshi Nakada [ruby-core:53389].
+	  [ruby-core:53388] [Feature #8090] Reported by Charles Nutter.
 
-Wed Nov  5 08:39:51 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Mar 28 23:10:10 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/webrick/https.rb (HTTPRequest#parse): set @client_cert_chain.
+	* include/ruby/io.h: rename SVR3,4 member names as POSIX compliant,
+	  to get rid of conflict on AIX.  [ruby-core:53765] [Bug #8174]
 
-	* lib/webrick/https.rb (HTTPRequest#meta_vars): create
-	  SSL_CLIENT_CERT_CHAIN_n from @client_cert_chain.
+Thu Mar 28 18:22:21 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_get_peer_cert_chain): return nil
-	  if no cert-chain was given.
+	* test/-ext-/num2int/test_num2int.rb: extract
+	  assert_num2i_success_internal and assert_num2i_error_internal and
+	  provide assertion messages as "NUM2XXX(NNN)".
 
-Tue Nov  4 23:44:48 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Mar 28 07:05:25 2013  Tanaka Akira  <akr@fsij.org>
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, wince/Makefile.sub:
-	  remove needless version.h dependency.
+	* include/ruby/intern.h: Delete redundant inclusions caused by
+	  AC_INCLUDES_DEFAULT in defines.h.
 
-Tue Nov  4 23:38:43 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* include/ruby/defines.h: Ditto.
 
-	* class.c, hash.c, string.c: remove #include "version.h".
+	* include/ruby/ruby.h: Ditto.
 
-	* Makefile.in: remove needless version.h dependency.
+	* include/ruby/st.h: Ditto.
 
-Tue Nov  4 06:54:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Mar 28 06:51:31 2013  Tanaka Akira  <akr@fsij.org>
 
-	* io.c (read_all): fptr->f may be NULL, if IO is closed in the
-	  signal handler.
+	* include/ruby/defines.h: Fix a compilation error on NetBSD,
+	  "type of formal parameter 1 is incomplete" for the rb_thread_wait_for
+	  invocation in rb_file_flock, by including header files as
+	  AC_INCLUDES_DEFAULT of autoconf.
 
-	* io.c (io_read): ditto.
+Wed Mar 27 22:09:14 2013  Tanaka Akira  <akr@fsij.org>
 
-	* string.c (get_pat): remove 1.8.0 warning code.
+	* numeric.c (LONG_MIN_MINUS_ONE_IS_LESS_THAN): New macro.
+	  (LLONG_MIN_MINUS_ONE_IS_LESS_THAN): Ditto.
+	  (rb_num2long): Use LONG_MIN_MINUS_ONE_IS_LESS_THAN.
+	  (rb_num2ulong): Ditto.
+	  (rb_num2ll): Use LLONG_MIN_MINUS_ONE_IS_LESS_THAN.
+	  (rb_num2ull): Ditto.
 
-	* string.c (rb_str_match): extend warning until 1.8.2.
+	* test/-ext-/num2int/test_num2int.rb (assert_num2i_success): Test the
+	  value converted into a Float if Float can represent the value
+	  exactly.
+	  (assert_num2i_error): Ditto.
 
-	* string.c (rb_str_match2): ditto.
+Wed Mar 27 20:59:47 2013  Tanaka Akira  <akr@fsij.org>
 
-	* class.c (class_instance_method_list): remove 1.8.0 warnings.
-	  method_list now recurs.  [ruby-dev:21816]
+	* test/-ext-/num2int/test_num2int.rb (assert_num2i_success): New
+	  utility method.
+	  (assert_num2i_error): Ditto.
 
-	* class.c (rb_obj_singleton_methods): ditto.
+Wed Mar 27 20:37:59 2013  Tanaka Akira  <akr@fsij.org>
 
-	* array.c (rb_ary_select): remove select with block.
-	  [ruby-dev:21824]
-
-	* hash.c (rb_hash_select): ditto.
-
-	* hash.c (env_select): ditto.
-
-	* re.c (match_select): ditto.
-
-	* struct.c (rb_struct_select): ditto.
-
-Mon Nov  3 22:53:21 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* lib/racc/parser.rb: synchronize with Racc 1.4.4.
-
-	* ext/racc/cparse/cparse.c: ditto.
-
-	* ext/racc/cparse/cparse.c (parse_main): should abort when
-	  the length of LR state stack <=1, not ==0.
-
-Mon Nov  3 08:50:47 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* process.c (check_uid_switch): remove duplicated error messages.
-
-	* process.c (check_gid_switch): ditto.
-
-Sun Nov  2 02:28:33 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/ssl.rb: new option :SSLExtraChainCert.
-
-Sun Nov  2 01:02:04 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* time.c (num_exact): Use to_r method only if to_int method is
+	  available.
+	  [ruby-core:53764] [Bug #8173] Reported by Hiro Asari.
 
-	* string.c (rb_str_hash): Update the HASH_PERL alternative hash
-	  algorithm in sync with Perl 5.8.
+Wed Mar 27 12:07:40 2013  Tanaka Akira  <akr@fsij.org>
 
-	* st.c (strhash): Ditto.
+	* test/-ext-/num2int/test_num2int.rb (test_num2ll): test LLONG_MIN,
+	  not LONG_MIN.
 
-Sat Nov  1 18:21:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Wed Mar 27 12:02:45 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/ossl_ssl.c (ossl_ssl_peer_cert_chain): add new method
-	  SSLSocket#peer_cert_chain.
+	* internal.h (TIMET_MAX_PLUS_ONE): definition simplified.
 
-	* ext/openssl/ossl_x509req.c (GetX509ReqPtr): new function
-	  which returns underlying X509_REQ.
+Wed Mar 27 06:39:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_issuer_cert,
-	  ossl_x509extfactory_set_subject_cert, ossl_x509extfactory_set_crl,
-	  ossl_x509extfactory_set_subject_req, ossl_x509extfactory_set_config):
-	  use underlying C struct without duplication not to leak momory.
+	* lib/mkmf.rb (MAIN_DOES_NOTHING): force to refer symbols for tests
+	  to be preserved.  [ruby-core:53745] [Bug #8169]
 
-Sat Nov  1 01:49:03 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Wed Mar 27 05:15:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/soap/mapping/factory.rb: mark marshalled basetype objects when
-	  @allow_original_mapping is true.  multi-referencing basetype node is
-	  prohibited in SOAP/1.1 encoding but soap4r's original ruby object
-	  mapping requires basetype to be marked to detect self referencing
-	  loop.  e.g. o = 1; o.instance_eval { @iv = o }  soap4r's original
-	  mapping is only used through soap/marshal API.
+	* configure.in (RUBY_REPLACE_TYPE): define SIGNEDNESS_OF_type same as
+	  check_signedness of mkmf.rb.
 
-	* test/soap/marshal/test_marshal.rb: add tests for self referencing
-	  immutable objects.
+	* internal.h (TIMET_MAX, TIMET_MIN, TIMET_MAX_PLUS_ONE): use
+	  SIGNEDNESS_OF_TIME_T.
 
-	* test/soap/calc/test_calc_cgi.rb: fix test name.
+Wed Mar 27 00:28:45 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Oct 31 22:26:29 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+	* internal.h (TIMET_MAX_PLUS_ONE): Defined.
 
-	* wince/string_wce.c (strrchr): should decrement pointer.
+	* thread.c (double2timeval): Saturate out-of-range values.
 
-	* wince/Makefile.sub: correct a range of isdigit().
+Tue Mar 26 23:41:18 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Oct 31 12:55:24 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* internal.h: Define TIMET_MAX and TIMET_MIN here.
 
-	* configure.in, lib/mkmf.rb: add RPATHFLAG for NetBSD.
-	  [ruby-dev:21791]
+	* time.c: Remove TIMET_MAX and TIMET_MIN definitions.
 
-	* bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.
+	* thread.c: Ditto.
 
-Fri Oct 31 01:38:14 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* thread_pthread.c: Remove TIMET_MAX definition.
 
-	* wince/Makefile.sub, win32/Makefile.sub (.y.c): allow white spaces
-	  at the beginning of line to remove by sed. (ruby-bugs-ja:PR#580)
+	* thread_win32.c: Ditto.
 
-Fri Oct 31 01:02:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Tue Mar 26 22:31:10 2013  Tanaka Akira  <akr@fsij.org>
 
-	* compar.c (cmp_equal): protect exceptions from <=> comparison
-	  again.  returns nil if any exception or error happened during
-	  comparison.
+	* ext/socket/socket.c (sockaddr_len): return the shortest length for
+	  unknown socket address.
 
-	* eval.c (search_required): should update *featurep when DLEXT2 is
-	  defined. (ruby-bugs-ja:PR#581)
+Tue Mar 26 22:14:46 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Oct 30 23:41:04 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* thread.c (double2timeval): convert the infinity to TIME_MAX to avoid
+	  SEGV by Thread.new {}.join(Float::INFINITY) on
+	  Debian GNU/Linux (amd64).
 
-	* lib/drb/drb.rb: add DRbArray
+Mon Mar 25 07:09:20 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/drb/invokemethod.rb: fix Hash#each problem. [ruby-dev:21773]
+	* lib/rinda/tuplespace.rb:  Only return tuple entry once on move,
+	  either through port or regular return, not both.  This results in a
+	  120% speedup when combined with #8125.  Patch by Joel VanderWerf.
+	  [ruby-trunk - Feature #8119]
 
-	* lib/drb/unix.rb: add LoadError. [ruby-dev:21743]
+Mon Mar 25 06:59:01 2013  Eric Hodel  <drbrain@segment7.net>
 
-Thu Oct 30 23:19:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* test/rinda/test_rinda.rb:  Skip IPv6 tests if no IPv6 addresses
+	  exist.  Skip fork-dependent test if fork is not available.
+	  [ruby-trunk - Bug #8159]
 
-	* lib/soap/generator.rb: better XML pretty printing.
+Sun Mar 24 10:38:24 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* lib/soap/encodingstyle/soapHandler.rb: remove unnecessary namespace
-	  assignment in the element which has "encodingStyle" attribute, and
-	  add necessary namespace assignment for "arrayType" attribute.
+	* addr2line.c (putce): suppress unused return value warning.
 
-	* test/soap/calc/test_calc_cgi.rb: take over $DEBUG to ruby process
-	  through CGI.
+Mon Mar 25 02:01:03 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-Thu Oct 30 22:59:39 2003  why the lucky stiff  <why@ruby-lang.org>
+	* proc.c (bm_free): need to clean up the mark flag of a free and
+	  unlinked method entry. [Bug #8100] [ruby-core:53439]
 
-	* ext/syck/yaml2byte.c: HASH const too long.  Thanks, matz.
+Sun Mar 24 22:13:51 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Thu Oct 30 19:13:53 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* string.c (rb_str_rpartition): revert r39903, and convert byte offset
+	  to char offset; the return value of rb_reg_search is byte offset,
+	  but other than it of rb_str_rpartition expects char offset.
+	  [Bug #8138] [ruby-dev:47183]
 
-	* ext/syck/MANIFEST: Add yamlbyte.h.
+Sun Mar 24 18:29:46 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Thu Oct 30 14:25:31 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* string.c (rb_str_rpartition): Fix String#rpartition(/re/)
+	  against a multibyte string. [Bug #8138] [ruby-dev:47183]
 
-	* io.c (READ_DATA_BUFFERED): new macro to detect whether stdio
-	  buffer filled.
+Sun Mar 24 13:42:24 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-	* io.c (rb_io_fptr_cleanup): move path deallocation to
-	  rb_io_fptr_finalize (finalizer called by GC).
+	* gc.c (GC_ENABLE_LAZY_SWEEP): new macro to switch lazy sweeping
+	  for debugging. [Feature #8024] [ruby-dev:47135]
 
-Thu Oct 30 13:23:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Mar 24 12:55:47 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-	* parse.y (logop): left may be NULL. [ruby-talk:84539]
+	* gc.c: We have no chance to expand the heap when lazy sweeping is
+	  restricted. So collecting is often invoked if there is not
+	  enough free space in the heap. Try to expand heap when this is
+	  the case.
 
-	* eval.c (rb_eval): NODE_CASE nd_head may be NULL.
+Sun Mar 24 11:03:31 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Oct 30 10:14:51 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* test/ruby/test_require.rb: Remove temporally files in the tests.
 
-	* lib/test/unit/autorunner.rb: make fox runner work.
+	* test/ruby/test_rubyoptions.rb: Ditto.
 
-Thu Oct 30 09:32:26 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* test/logger/test_logger.rb: Ditto.
 
-	* process.c (rb_f_system): fixed lack of security check before
-	  calling do_spawn() on win32. [ruby-talk:84555]
+	* test/psych/test_psych.rb: Ditto.
 
-Thu Oct 30 02:46:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* test/readline/test_readline.rb: Ditto.
 
-	* eval.c (proc_invoke): single array value to normal Proc#call
-	  (i.e. not via lambda call), should be treated just like yield.
-	  [ruby-dev:21726]
+	* test/syslog/test_syslog_logger.rb: Ditto.
 
-Thu Oct 30 02:25:48 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* test/webrick/test_httpauth.rb: Ditto.
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#initialize):
-	  add new method to inherit @sync from @io.sync.
+	* test/zlib/test_zlib.rb: Ditto.
 
-	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): no need to
-	  set sync flag explicitly.
+Sun Mar 24 05:36:29 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_initialize): call super.
+	* lib/rinda/ring.rb:  Added documentation for multicast support.
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): set extra chain
-	  certificates in @extra_chain_cert.
+	* NEWS:  Point to above documentation.
 
-Wed Oct 29 22:02:04 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Mar 24 05:32:39 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* test/drb/drbtest.rb: use rbconfig.rb to make the path of ruby
-	  interpreter to exec, instead of test/ruby/envutil.rb,
+	* test/rinda/test_rinda.rb:  Restore tests commented out while fixing
+	  test slowdown bug before r39895.
 
-Wed Oct 29 19:58:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Sun Mar 24 05:03:36 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/tcltklib/tcltklib.c (CONST84): define CONST84 when it is not
-	  defined and TCL_MAJOR_VERSION >= 8.
+	* lib/rinda/ring.rb:  Add multicast support to Rinda::RingFinger and
+	  Rinda::RingServer.  [ruby-trunk - Bug #8073]
+	* test/rinda/test_rinda.rb:  Test for the above.
 
-	* ext/tcltklib/tcltklib.c (VwaitVarProc, WaitVariableProc,
-	  rb_threadVwaitProc): use CONST84 instead of CONST.
+	* NEWS: Update with Rinda multicast support
 
-	* ext/tcltklib/tcltklib.c (ip_rbTkWaitCommand,
-	  ip_rb_threadTkWaitCommand): use CONST84 always.
+Sun Mar 24 04:13:27 2013  Eric Hodel  <drbrain@segment7.net>
 
-Wed Oct 29 17:27:05 2003  Tanaka Akira  <akr@m17n.org>
+	* test/rinda/test_rinda.rb:  Fixed test failures in r39890 and r39891
+	  due to stopping DRb service.
 
-	* re.c (rb_reg_s_union, Init_Regexp): new method `Regexp.union'.
+Sun Mar 24 03:34:02 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/pathname.rb (realpath): examine Dir.pwd because it may have
-	  symlinks.
+	* lib/rinda/rinda.rb:  Fixed loss of tuple when remote is alive but the
+	  call stack was unwound.  Patch by Joel VanderWerf.
+	  [ruby-trunk - Bug #8125]
+	* test/rinda/test_rinda.rb:  Test for the above.
 
-Wed Oct 29 17:16:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Mar 24 02:14:53 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_longjmp): must not disturb original jump.
-	  [ruby-dev:21733]
+	* test/mkmf/test_have_macro.rb: remove temporally files in the tests.
 
-Wed Oct 29 15:28:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sat Mar 23 23:50:04 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* eval.c (Init_Proc): taint preallocated exception object
-	  sysstack_error. [ruby-talk:84534]
+	* addr2line.c (kprintf): added from FreeBSD libstand's printf.
+	  this is consided as async signal safe function.
 
-Wed Oct 29 11:27:39 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* addr2line.c (rb_dump_backtrace_with_lines): use kfprintf.
+	  [Bug #8144] [ruby-core:53632]
 
-	* parse.y (ret_args): node may be NULL. [ruby-talk:84530]
+Sat Mar 23 23:28:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-Tue Oct 28 15:20:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divide): Use Qnil and NIL_P
+	  instead of (VALUE)0 as a return value.
 
-	* ext/tcltklib/tcltklib.c (VwaitVarProc, ip_rbVwaitObjCmd,
-	  WaitVariableProc, WaitVisibilityProc, WaitWindowProc,
-	  ip_rbTkWaitObjCmd, ip_rbTkWaitCommand, rb_threadVwaitProc,
-	  rb_threadWaitVisibilityProc, rb_threadWaitWindowProc,
-	  ip_rb_threadVwaitObjCmd, ip_rb_threadTkWaitObjCmd): prototype;
-	  avoid VC++ warnings.
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_div): ditto.
 
-Mon Oct 27 19:19:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_divremain): ditto.
 
-	* eval.c (rb_longjmp): ignore reentering error while warning.
-	  [ruby-dev:21730]
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_remainder): ditto.
 
-Mon Oct 27 00:23:50 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sat Mar 23 17:39:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c (ip_ruby): bug fix on Win : hang-up when
-	  calling 'exit' in the Tk callback procedure. [ruby-list:38656]
+	* vm_eval.c (check_funcall_respond_to): preserve passed_block, which
+	  is modified in vm_call0_body() via vm_call0(), and caused a bug of
+	  rb_check_funcall() by false negative result of rb_block_given_p().
+	  re-fix [ruby-core:53650] [Bug #8153].
+	  [ruby-core:53653] [Bug #8154]
 
-Sat Oct 25 09:18:04 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Mar 22 17:48:34 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_method_missing): protect exception from within
-	  "inspect".  (ruby-bugs:PR#1204)
+	* lib/forwardable.rb (Forwardable::FILE_REGEXP): create regexp object
+	  outside sources for eval, to reduce allocations in def_delegators
+	  wrappers.  //o option does not make each regexps shared.  patch by
+	  tmm1 (Aman Gupta) in [ruby-core:53620] [Bug #8143].
 
-Fri Oct 24 23:26:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Mar 22 17:38:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* hash.c (rb_hash_each): Hash#each should yield single value.
-	  [ruby-talk:84420]
+	* load.c (rb_feature_p), vm_core.h (rb_vm_struct): turn
+	  loaded_features_index into st_table.  patches by tmm1 (Aman Gupta)
+	  in [ruby-core:53251] and [ruby-core:53274] [Bug #8048]
 
-	* hash.c (env_each): ditto for ENV.each.
+Fri Mar 22 10:29:00 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Oct 23 20:25:32 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* ext/bigdecimal/bigdecimal.c: Fix style.
 
-	* lib/webrick/server.rb (GenericServer#start): should rescue
-	  IOError from IO::accept. [ruby-dev:21692]
+Fri Mar 22 05:30:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Oct 23 17:59:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* parse.y (ambiguous_operator): refine warning message, since this
+	  warning is shown after literal too.
 
-	* eval.c (ruby_cleanup): initialize stack bottom for embedding.
-	  [ruby-dev:21686]
+Fri Mar 22 04:51:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/dl/extconf.rb: move list of files to clean from DEPEND file,
-	  to get rid of macro redefinitions.
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): should check required
+	  keyword arguments even if rest hash is defined.  [ruby-core:53608]
+	  [Bug #8139]
 
-Thu Oct 23 13:44:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar 22 01:00:17 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* parse.y: integrate operations for stack_type.  [ruby-dev:21681]
+	* process.c (rb_execarg_addopt, run_exec_pgroup): use rb_pid_t
+	  instead of pid_t.
 
-Thu Oct 23 00:41:45 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/pty/pty.c (raise_from_check, pty_check): ditto.
 
-	* test/soap/calc/*, test/soap/helloworld/*: set logging threshold
-	  to ERROR.
+Fri Mar 22 00:04:15 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Wed Oct 22 12:53:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* addr2line.c (rb_dump_backtrace_with_lines): output line at once.
 
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
-	  ignore tests which raised LoadError.
+Thu Mar 21 23:17:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/drb/drbtest.rb, test/ruby/test_beginendblock.rb,
-	  test/ruby/test_system.rb: avoid requiring same file twice.
+	* thread.c (ruby_kill): get rid of deadlock on signal 0.
+	  [ruby-dev:47182] [Bug #8137]
 
-	* test/drb/test_drbssl.rb, test/drb/test_drbunix.rb: should not use
-	  ARGV unless invoked directly.  do not create test cases unless
-	  required libraries are available.
+Thu Mar 21 22:39:46 2013  Naohisa Goto  <ngotogenome@gmail.com>
 
-Wed Oct 22 02:31:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* marshal.c (marshal_dump, marshal_load): workaround for segv on
+	  Intel Solaris compiled with Oracle SolarisStudio 12.3.
+	  Partly revert r38174. [ruby-core:52042] [Bug #7805]
 
-	* eval.c (ruby_cleanup): should not ignore exit_value in END
-	  execution. [ruby-dev:21670]
+Thu Mar 21 16:48:06 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Oct 21 23:16:26 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* parse.y (simple_re_meta): escape all closing characters, not only
+	  round parenthesis.  [ruby-core:53578] [Bug #8133]
 
-	* eval.c (ruby_cleanup): call finalizers and exit procs before
-	  terminating threads.
+Thu Mar 21 13:50:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (ruby_cleanup): preserve ruby_errinfo before ruby_finalize_0().
+	* vm_core.h (UNINITIALIZED_VAR): suppress warnings by clang 4.2.
+	  [ruby-core:51742] [Bug #7756]
 
-Tue Oct 21 15:57:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar 21 07:34:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/test/unit/collector/dir.rb (Test::Unit::Collector::Dir#collect_file):
-	  prepend the directory of target file to the load path.
+	* ext/date/date_core.c: Typo in Date::MONTHNAMES by Matt Gauger
+	  [GH fixes #261]
 
-Tue Oct 21 15:08:53 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Wed Mar 20 22:53:14 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* win32/win32.c (do_spawn, do_aspawn): should wait child process even
-	  if callded with P_OVERLAY.
+	* lib/mkmf.rb (find_library): fix to format message.
+	  [ruby-core:53568] [Bug #8130]
 
-	* win32/win32.c (do_spawn, do_aspawn): should return child's exit
-	  status to parent.
+Wed Mar 20 22:52:52 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Oct 21 00:35:02 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/mkmf.rb (install_dirs, with_destdir): prefix with DESTDIR
+	  directories to install only unless bundled extension libraries.
+	  [ruby-core:53502] [Bug #8115]
 
-	* test/soap/calc/*, test/soap/helloworld/*: catch the exception from
-	  test server thread and recover.
+Wed Mar 20 17:47:53 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-Tue Oct 21 00:22:57 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+	* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup):
+	  allow using different root for source and build directories.
+	  this may fixes a minor problem of r39834.
 
-	* test/drb/*: import drb/runit.
+Wed Mar 20 16:40:48 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-Mon Oct 20 23:55:47 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_signal.rb (test_hup_me): skip if HUP isn't supported.
+	  On Windows this test causes ArgumentError.
 
-	* eval.c (rb_eval): set current node after arguments evaluation.
-	  [ruby-dev:21632]
+Wed Mar 20 16:24:12 2013  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
-	* eval.c (rb_yield_0): set current node and keep it at local jump.
+	* test/rubygems/test_gem_installer.rb (test_install_extension_flat):
+	  use ruby in build directory in case ruby is not installed.
+	  [ruby-core:53265] [Bug #8058]
 
-Mon Oct 20 22:01:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 20 15:22:07 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* eval.c (rb_thread_cleanup): keep thread group for main thread.
-	  [ruby-dev:21644]
+	* test/win32ole/test_err_in_callback.rb (TestErrInCallBack#setup): use
+	  relative path to get rid of "too long commandline" error.
 
-Mon Oct 20 18:28:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 20 04:27:42 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-	* eval.c (rb_catch): backout.
+	* test/rinda/test_rinda.rb: remove unused variables.
+	  patched by Vipul A M <vipulnsward@gmail.com>
 
-Mon Oct 20 17:31:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Mar 20 04:15:32 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-	* eval.c (PUSH_FRAME): generate unique number to be TAG_JUMP()
-	  destination.
+	* ext/bigdecimal/bigdecimal.c: fixed typo.
+	  patched by Vipul A M <vipulnsward@gmail.com>
 
-	* eval.c (localjump_destination): use unique number in ruby_frame
-	  for localjump destination.
+Sat Mar 16 03:40:49 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Mon Oct 20 11:31:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/ruby/test_signal.rb (test_hup_me): added a few comments.
 
-	* test/ruby/test_signal.rb (test_signal): restore old trap.
+Sat Mar 16 03:39:38 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Mon Oct 20 11:00:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* thread.c (ruby_kill): added a few comments.
 
-	* gc.c (gc_sweep): loosen page free condition to avoid add_heap()
-	  race condition. [ruby-dev:21633]
+Sat Mar 16 03:36:56 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* gc.c (gc_sweep): do not update malloc_limit when malloc_increase
-	  is smaller than malloc_limit.
+	* thread.c (ruby_kill): release GVL while waiting signal delivered.
 
-Mon Oct 20 09:45:12 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Tue Mar 19 19:50:48 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* lib/debug.rb (debug_command): remove debug print.
+	* ruby_kill (internal.h, thread.c): use rb_pid_t instead of pid_t.
+	  this fixes the build failure of mswin introduced at r39819.
 
-Wed Oct 20 00:25:41 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 19 17:09:30 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (search_required): required name must not be changed before
-	  loading.  [ruby-dev:24492]
+	* string.c (rb_str_conv_enc_opts): convert with one converter, instead
+	  of re-creating converters for each buffer expansion.
 
-Sun Oct 19 13:12:30 2003  Tanaka Akira  <akr@m17n.org>
+Tue Mar 19 17:06:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/pathname.rb (foreachline, dir_foreach): add obsolete warning.
+	* dir.c (glob_helper): compose HFS file names from UTF8-MAC.
+	  [ruby-core:48745] [Bug #7267]
 
-Sun Oct 19 00:14:22 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sat Mar 16 01:44:29 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* test/soap/calc/*, test/soap/helloworkd/*: changed port# of test
-	  server. (17171)
+	* internal.h: added a declaration of ruby_kill().
+	* thread.c (ruby_kill): helper function of kill().
 
-Sat Oct 18 23:01:32 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* signal.c (rb_f_kill): use ruby_kill() instead of kill().
+	* signal.c (rb_f_kill): call rb_thread_execute_interrupts()
+	  to ensure that make SignalException if sent a signal
+	  to myself. [Bug #7951] [ruby-core:52864]
 
-	* missing/acosh.c (DBL_MANT_DIG): typo fix(ifdef -> ifndef).
+	* vm_core.h (typedef struct rb_thread_struct): added
+	  th->interrupt_cond.
+	* thread.c (rb_threadptr_interrupt_common): added to
+	  initialization of th->interrupt_cond.
+	* thread.c (thread_create_core): ditto.
 
-Sat Oct 18 05:48:59 2003  why the lucky stiff  <why@ruby-lang.org>
+	* test/ruby/test_signal.rb (TestSignal#test_hup_me): test for
+	  the above.
 
-	* ext/syck/rubyext.c: YAML::Syck::compile method.
+Sat Mar 16 00:42:39 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/syck/syck.c: Buffer edge bug.
+	* io.c (linux_iocparm_len): enable only exist _IOC_SIZE().
+	  Because musl libc doesn't have it. [Bug #8051] [ruby-core:53229]
 
-	* ext/syck/yaml2byte.c: YAML to bytecode converter.
+Tue Mar 19 10:05:04 2013  Shota Fukumori  <her@sorah.jp>
 
-	* ext/syck/yamlbyte.h: Ditto.
+	* ext/objspace/objspace.c: Fix typo in doc. Patch by Sho Hashimoto.
+	  [Bug #8116] [ruby-dev:47177]
 
-	* ext/syck/bytecode.c: Bytecode parser fixes to empty collections
-	  and empty strings.
+Tue Mar 19 02:13:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* ext/syck/token.c: Ditto.
+	* configure.in: set ac_cv_prog_cxx if CXX is supplied.
 
-Fri Oct 17 23:07:38 2003  Akinori MUSHA  <knu@iDaemons.org>
+Tue Mar 19 01:18:00 2013  Kenta Murata  <mrkn@mrkn.jp>
 
-	* ext/enumerator/enumerator.c, ext/enumerator/enumerator.txt:
-	  Provide Kernel#to_enum as an alias for Kernel#enum_for.  Maybe
-	  this is a better name.
+	* configure.in: Fix c++ compiler auto-selection not only for
+	  Darwin 11.x, but also the other versions of Darwin.
 
-Fri Oct 17 23:00:30 2003  Akinori MUSHA  <knu@iDaemons.org>
+Tue Mar 19 00:26:22 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-	* lib/generator.rb: Add rdoc documentation.
+	* gc.c: Improve accuracy of objspace_live_num() and
+	  allocated/freed counters. patched by tmm1(Aman Gupta).
+	  [Bug #8092] [ruby-core:53392]
 
-Fri Oct 17 22:16:42 2003  Akinori MUSHA  <knu@iDaemons.org>
+Mon Mar 18 21:42:48 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-	* lib/set.rb: Reword and fix Overview.
+	* gc.c: Avoid unnecessary heap growth. patched by tmm1(Aman Gupta).
+	  [Bug #8093] [ruby-core:53393]
 
-	* lib/set.rb: It is not necessary to require
-	  'test/unit/ui/console/testrunner'.
+Mon Mar 18 17:58:36 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-Fri Oct 17 11:15:22 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.c: Fix unlimited memory growth with large values of
+	  RUBY_FREE_MIN. patched by tmm1(Aman Gupta).
+	  [Bug #8095] [ruby-core:53405]
 
-	* test/ruby/test_range.rb: added.
+Mon Mar 18 14:46:19 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* MANIFEST: add test/ruby/test_range.rb.
+	* test/win32ole/test_err_in_callback.rb
+	  (TestErrInCallBack#test_err_in_callback): shouldn't create a file in
+	  the top of build directory.
 
-Fri Oct 17 03:21:23 2003  William Sobel  <will.sobel@barra.com>
+Mon Mar 18 13:29:52 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/socket/socket.c (make_hostent): h_aliases may be NULL.
-	  (ruby-bugs:PR#1195)
+	* vm_dump.c (backtrace): on darwin use custom backtrace() to trace
+	  beyond _sigtramp. darwin's backtrace can't trace beyond signal
+	  trampoline with sigaltstack.
 
-	* ext/socket/socket.c (sock_s_gethostbyaddr): ditto.
+	* configure.in: check execinfo.h on darwin.
 
-Fri Oct 17 00:12:41 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Mar 18 11:03:23 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: (bug fix) instance variable @frame was used
-	  without initializing on TkComposite module.
+	* vm_exec.h (END_INSN): revert r39517 because the segv seems fixed by
+	  r39806.
 
-Thu Oct 16 23:51:04 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Mon Mar 18 10:41:06 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/tk/lib/tk.rb: If $DEBUG == true and some exception is caused
-	  in a callback operation, Ruby/Tk shows a (verbose) backtrace
-	  information on the callback process.
+	* vm_exec.c: Correct predefined macro name. This typo is introduced by
+	  r36534 and should be backported to ruby_2_0_0.
 
-Thu Oct 16 17:09:19 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Mar 18 03:18:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/debug.rb (DEBUGGER__::Context::debug_command): do not call
-	  debug_silent_eval() when $1 is not set. (ruby-bugs:PR#1194)
+	* array.c: Typo in Array#delete by Timo Sand [GH fixes #258]
 
-Thu Oct 16 16:54:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Mar 18 01:14:56 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* string.c (rb_str_upto): ("a"..."a").to_a should return [].
-	  [ruby-core:01634]
+	* io.c (io_fillbuf): show fd number on failure to debug.
+	  http://c5632.rubyci.org/~chkbuild/ruby-trunk/log/20130316T050302Z.diff.html.gz
 
-Thu Oct 16 16:40:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+Sun Mar 17 02:38:21 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/tk/lib/tk.rb:
-	  Add Tk::EncodedString and Tk::UTF8_String class to support
-	  characters using the \uXXXX escape to the UNICODE string.
+	* ext/date/date_core.c: include sys/time.h for avoiding implicit
+	  declaration of gettimeofday().
 
-	* ext/tk/sample/{demos-en,demos-jp}/unicodeout.rb
-	  new demo-scripts (samples of Tk::UTF8_String)
+Sun Mar 17 00:55:31 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/tk/sample/{demos-en,demos-jp}/widget
-	  add entries for 'unicodeout.rb'
+	* include/ruby/missing.h: removed __linux__. it's unnecessary.
 
-Thu Oct 16 08:38:06 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Mar 15 14:57:16 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* test/digest/test_digest.rb (test_eq): show failed class.
+	* thread.c: disabled _FORTIFY_SOURCE for avoid to hit glibc bug.
+	  [Bug #8080] [ruby-core:53349]
+	* test/ruby/test_io.rb (TestIO#test_io_select_with_many_files):
+	  test for the above.
 
-	* test/ruby/test_iterator.rb (test_break, test_return_trace_func):
-	  test localjump destination.
+Wed Mar 13 15:16:35 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Wed Oct 15 20:22:31 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* include/ruby/missing.h (__syscall): moved to...
+	* io.c: here. because __syscall() is only used from io.c.
 
-	* lib/soap/netHttpClient.rb: use URI::HTTP#request_uri instead of
-	  instance_eval('path_query').  [ruby-list:38575]
+	* include/ruby/missing.h: move "#include <sys/type.h>" to ....
+	* include/ruby/intern.h: here. because it was introduced for
+	  fixing NFDBITS issue. [ruby-core:05179].
 
-Wed Oct 15 17:24:45 2003  URABE Shyouhei  <root@mput.dip.jp>
+Wed Mar 13 14:38:53 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* lib/cgi.rb (CGI::Cookie): tiny typo fix.
+	* include/ruby/missing.h (struct timespec): include <sys/time.h>
 
-Wed Oct 15 15:00:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar 13 13:54:45 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* eval.c (ruby_run): just return FAILURE instead of parse error
-	  count.  [ruby-list:38569]
+	* configure.in: check struct timeval exist or not.
+	* include/ruby/missing.h (struct timeval): check HAVE_STRUCT_TIMEVAL
+	  properly. and don't include sys/time.h if struct timeval exist.
 
-Wed Oct 15 13:17:02 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* file.c: include sys/time.h explicitly.
+	* random.c: ditto.
+	* thread_pthread.c: ditto.
+	* time.c: ditto.
+	* ext/date/date_strftime.c: ditto.
 
-	* ext/digest/digest.c (rb_digest_base_alloc): need to initialize
-	  buffer. [ruby-dev:21622]
+Fri Mar 15 14:45:02 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Wed Oct 15 11:23:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (_FORTIFY_SOURCE): added a few comments.
 
-	* marshal.c (w_object): dump extended modules as well.
+Fri Mar 15 14:17:55 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* marshal.c (r_object0): TYPE_USRMARSHAL should restore extended
-	  modules before invoking marshal_load.  these two fixes are done
-	  by Masatoshi Seki <m_seki@mva.biglobe.ne.jp>.
+	* thread_pthread.c (numberof): renamed from ARRAY_SIZE() because
+	  other all files use numberof().
 
-Wed Oct 15 09:30:34 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Say Mar 15 01:33:00 2013  Charles Oliver Nutter <headius@headius.com>
 
-	* ext/enumerator/enumerator.c (enumerator_each): avoid VC++ warning.
+	* test/ruby/test_lazy_enumerator.rb (TestLazyEnumerator#test_drop_while):
+	  Modify while condition to show dropping remains off after first false
+	  value. This change was made in 39711.
 
-	* ext/syck/syck.h: include stdio.h for definition of FILE.
+Fri Mar 15 23:06:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Oct 15 08:09:07 2003  why the lucky stiff  <why@ruby-lang.org>
+	* time.c (GetTimeval): check if already initialized instance.
 
-	* ext/syck/bytecode.c: Checkin of YAML bytecode support.
+	* time.c (GetNewTimeval): check if newly created instance.
 
-	* ext/syck/gram.c: Ditto.
+	* time.c (time_init_0, time_init_1, time_init_copy, time_mload): must
+	  be newly created instance.  [ruby-core:53436] [Bug #8099]
 
-	* ext/syck/syck.c: Ditto.
+Fri Mar 15 14:51:33 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/syck/token.c: Ditto.
+	* file.c (rb_sys_fail_path_with_func): share same function, and path
+	  may be nil.
 
-	* ext/syck/handler.c: Ditto.
+Fri Mar 15 08:24:51 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/syck/handler.c: Now using 'tag' rather than 'taguri' in type URIs.
+	* io.c (rb_sys_fail_path): define & use rb_sys_fail_path0 like r39752
 
-	* ext/syck/rubyext.c: Ditto (on both counts).
+Fri Mar 15 04:08:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Wed Oct 15 05:05:53 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* proc.c: Typo in Proc.arity found by Jack Nagel [Bug #8094]
 
-	* lib/generator.rb: A new library which converts an internal
-	  iterator to an external iterator.
+Thu Mar 14 16:59:09 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/abbrev.rb: A new library which creates an abbreviation table
-	  from a list.
+	* configure.in (rb_cv_function_name_string): macro for function name
+	  string predefined identifier, __func__ in C99, or __FUNCTION__ in
+	  gcc.
 
-Wed Oct 15 04:31:51 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* file.c (rb_sys_fail_path): use RUBY_FUNCTION_NAME_STRING.
 
-	* ext/tk/sample/demos-en/entry3.rb, ext/tk/sample/demos-jp/entry3.rb :
-	  new demo-scripts
+Thu Mar 14 14:12:34 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/tk/sample/demos-en/widget, ext/tk/sample/demos-jp/widget :
-	  add entries for 'entry3.rb'
+	* file.c (rb_sys_fail_path): use rb_sys_fail_path0 only on GCC.
+	  __func__ is C99 feature.
 
-Wed Oct 15 04:31:47 2003  Akinori MUSHA  <knu@iDaemons.org>
+Thu Mar 14 12:59:59 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* test/digest/test_digest.rb: Moved from ext/digest/test.rb.
+	* file.c (rb_sys_fail_path0): add to append the name of called function
+	  to ease debugging for example blow umask_spec failure.
+	  http://fbsd.rubyci.org/~chkbuild/ruby-trunk/log/20130309T010202Z.diff.html.gz
 
-Wed Oct 15 03:53:20 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* file.c (rb_sys_fail_path): use rb_sys_fail_path0.
 
-	* ext/tk/lib/tk.rb: fixed trouble on auto-load Tcl commands (enbug
-	  on the last commit).
+Thu Mar 14 12:53:15 2013  Luis Lavena  <luislavena@gmail.com>
 
-Wed Oct 15 00:25:00 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* win32/file.c (get_user_from_path):  add internal function that retrieves
+	  username from supplied path (refactored).
+	* win32/file.c (rb_file_expand_path_internal):  refactor expansion of user
+	  home to use get_user_from_path and cover dir_string corner cases.
+	  [ruby-core:53168] [Bug #8034]
 
-	* parse.y (yylex): argument parentheses preceded by spaces should
-	  be warned; not error.  [ruby-talk:84103]
+Thu Mar 14 11:53:01 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-Wed Oct 15 00:20:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* NEWS: describe RUBY_HEAP_SLOTS_GROWTH_FACTOR.
 
-	* ext/tcltklib/tcltklib.c: replace Tcl/Tk's vwait and tkwait to
-	  switch on threads smoothly and avoid seg-fault.
+Thu Mar 14 10:01:12 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp._thread_vwait and
-	  _thread_tkwait for waiting on a thread. (Because Tcl/Tk's vwait
-	  and tkwait command wait on an eventloop.)
+	* doc/globals.rdoc:  $? is thread-local
 
-	* ext/tk/lib/multi-tk.rb: support TclTkIp._thread_vwait and
-	  _thread_tkwait.
+Wed Mar 13 23:25:59 2013  Narihiro Nakamura  <authornari@gmail.com>
 
-	* ext/tk/lib/tk.rb: now, TkVariable#wait has 2 arguments.
-	  If 1st argument is true, waits on a thread. If false, waits on
-	  an eventloop. If 2nd argument is true, checks existence of
-	  rootwidgets. If false, doesn't. Default is wait(true, false).
+	* gc.c: allow to tune growth of heap by environment variable
+	  RUBY_HEAP_SLOTS_GROWTH_FACTOR. patched by tmm1(Aman Gupta).
+	  [Feature #8015] [ruby-core:53131]
 
-	* ext/tk/lib/tk.rb: add TkVariable#tkwait(arg) which is equal to
-	  TkVariable#wait(arg, true). wait_visibility and wait_destroy
-	  have an argument for waiting on a thread or an eventloop.
+Wed Mar 13 19:43:46 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-	* ext/tk/lib/tk.rb: improve of accessing Tcl/Tk's special variables.
+	* doc/irb/irb.rd.ja: fix typo
 
-	* ext/tk/lib/tkafter.rb: support 'wait on a thread' and 'wait on
-	  an eventloop'.
+	* ext/tk/MANUAL_tcltklib.eng: fix typos
 
-Wed Oct 15 00:10:24 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/tk/sample/tktextframe.rb (Tk#component_delegates): fix typo
 
-	* lib/soap/baseData.rb: Introduce SOAPType as the common ancestor of
-	  SOAPBasetype and SOAPCompoundtype.
+Wed Mar 13 15:13:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/soap/generator.rb, lib/soap/element.rb, lib/soap/encodingstyle/*:
-	  Encoding methods signature change.  Pass SOAPGenerator as a parameter.
+	* class.c (rb_obj_singleton_methods): collect methods from the origin
+	  class.  [ruby-core:53207] [Bug #8044]
 
-	* lib/soap/mapping/*, test/soap/marshal/test_marshal.rb: Refactoring
-	  for better marshalling/unmarshalling support.  Now I think SOAP
-	  marshaller supports all kind of object graph which is supported by
-	  Ruby's original marshaller.  Of course there could be bugs as always.
-	  Find it.  :-)
+Wed Mar 13 14:51:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/soap/rpc/standaloneServer.rb: Set severity threshould to INFO.
-	  DEBUG is too noisy.
+	* vm_method.c (rb_export_method): directly override the flag of method
+	  defined in prepending class too, not adding zsuper entry.
+	  [ruby-core:53106] [Bug #8005]
 
-	* lib/xsd/datatypes.rb: DateTime#of is obsoleted.  Use DateTime#offset.
+Wed Mar 13 13:06:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/wsdl/emptycomplextype.wsdl, test/xsd/xmlschema.xml: Avoid
-	  useless warning.
+	* configure.in (rm, shvar_to_cpp, unexpand_shvar): local is not
+	  available on old shells.
 
-Tue Oct 14 19:09:35 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* configure.in (shvar_to_cpp): escape quotes for old shells.
+	  [Bug #7959] [Bug #8071]
 
-	* eval.c (ruby_finalize_0): return the given exit status unless
-	  SystemExit got raised.
+Wed Mar 13 11:11:07 2013  Shugo Maeda  <shugo@ruby-lang.org>
 
-Tue Oct 14 11:53:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c (Init_Object): remove Module#used, which has been
+	  introduced in Ruby 2.0 by mistake.  [Bug #7916] [ruby-core:52719]
 
-	* intern.h (ruby_stop): never return.
+Wed Mar 13 05:49:29 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ruby.h (ruby_run): ditto.
+	* lib/irb.rb:  Fix typo
 
-Tue Oct 14 04:43:55 2003  Tanaka Akira  <akr@m17n.org>
+Tue Mar 12 22:20:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/pathname.rb (realpath): make ELOOP check bit more robust.
-	  (children): prepend self by default.
-	  (chroot): obsoleted.
+	* compile.c (iseq_set_arguments, iseq_compile_each): support required
+	  keyword arguments.   [ruby-core:51454] [Feature #7701]
 
-Tue Oct 14 02:29:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* iseq.c (rb_iseq_parameters): ditto.
 
-	* eval.c (rb_require_safe): segfault after loading .so.
+	* parse.y (f_kw, f_block_kw): ditto.  this syntax is still
+	  experimental, the notation may change.
 
-Tue Oct 14 02:05:23 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* vm_core.h (rb_iseq_struct): ditto.
 
-	* ext/Setup*, ext/enumerator/*: Add ext/enumerator, a helper
-	  module for the Enumerable interface.
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): ditto.
 
-Mon Oct 13 23:55:59 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Tue Mar 12 17:02:53 2013  TAKANO Mitsuhiro <tak@no32.tk>
 
-	* test/ruby/envutil.rb: use Config::CONFIG["ruby_install_name"],
-	  not "ruby".
+	* date_core.c: clearly specify operator precedence.
 
-Mon Oct 13 23:57:29 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar 12 17:00:45 2013  TAKANO Mitsuhiro <tak@no32.tk>
 
-	* eval.c (rb_feature_p): match by classified suffix.
+	* insns.def: fix condition.
 
-	* eval.c (rb_require_safe): require library in the specified safe
-	  level.
+Tue Mar 12 16:48:19 2013  TAKANO Mitsuhiro <tak@no32.tk>
 
-	* variable.c (rb_autoload, rb_autoload_load): restore safe level
-	  when autoload was called.  [ruby-dev:21338]
+	* rational.c: fix dangling if, else-if and else.
 
-	* intern.h: prototypes; rb_require_safe.
+Tue Mar 12 06:27:59 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* test/runner.rb: accept non-option arguments.
+	* lib/rubygems/commands/setup_command.rb:  Don't delete non-rubygems
+	  files when installing RubyGems.
+	* test/rubygems/test_gem_commands_setup_command.rb:  Test for the
+	  above.
 
-Mon Oct 13 20:49:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rubygems/ext/ext_conf_builder.rb:  Use full path to siteconf.rb
+	  in case the extconf.rb changes directories (like memcached does).
 
-	* string.c (str_new4): should not preserve FL_TAINT status in the
-	  internal shared string. [ruby-dev:21601]
+	* lib/rubygems/package.rb:  Remove double slash from path.
+	* test/rubygems/test_gem_package.rb:  Test for the above.
+	* test/rubygems/test_gem_package_old.rb:  ditto.
 
-	* string.c (rb_str_new4): ditto.
+	* lib/rubygems/source.rb:  Revert automatic HTTPS upgrade
+	* lib/rubygems/spec_fetcher.rb:  ditto.
+	* test/rubygems/test_gem_remote_fetcher.rb:  ditto.
+	* test/rubygems/test_gem_source.rb:  ditto.
+	* test/rubygems/test_gem_spec_fetcher.rb:  ditto.
 
-	* eval.c: use EXIT_SUCCESS and EXIT_FAILURE for exit values.
+Tue Mar 12 02:25:19 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* process.c: ditto. [ruby-list:38521]
+	* lib/net/smtp.rb:  Added Net::SMTP#rset method to implement the SMTP
+	  RSET command.  [ruby-trunk - Feature #5373]
+	* NEWS:  ditto.
+	* test/net/smtp/test_smtp.rb:  Test for the above.
 
-Mon Oct 13 19:51:02 2003  Koji Arai  <jca02266@nifty.ne.jp>
+Mon Mar 11 22:44:57 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/debug.rb (debug_command): should enter emacs mode when
-	  assigned any value to the environment variable "EMACS".
-	  On Meadow, (getenv "EMACS") is "meadow".
+	* lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
+	  argument only if non-nil value is given.
+	  [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
+	  mrkn.
 
-Sun Oct 12 14:45:03 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Mon Mar 11 19:22:54 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/win32ole/extconf.rb: check "windows.h", not "windows".
-	  [ruby-talk:84051]
+	* test/mkmf/base.rb: class name conflict.
 
-Sat Oct 11 20:41:03 2003  Corinna Vinschen  <corinna@vinschen.de>
+Mon Mar 11 18:45:09 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* file.c (eaccess): Use access(2) on Cygwin.
+	* enumerator.c (enumerator_with_index): try to convert given offset to
+	  integer. fix bug introduced in r39594.
 
-Sat Oct 11 17:09:21 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Mon Mar 11 17:27:57 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* lib/rexml/quickpath.rb (REXML::QuickPath::match):
-	  escape '[' to avoid warning.
+	* test/ruby/envutil.rb (EnvUtil.with_default_external): add for
+	  changing Encoding.default_external without warnings.
 
-Sat Oct 11 16:08:41 2003  Tanaka Akira  <akr@m17n.org>
+	* test/ruby/envutil.rb (EnvUtil.with_default_internal): ditto.
 
-	* lib/pathname.rb (realpath): check existence of the file.
+	* test/ruby/test_io_m17n.rb: use above with_default_external.
 
-	* lib/pathname.rb (realpath): re-implemented.
-	  (realpath_root?, realpath_rec): removed
+Mon Mar 11 16:57:00 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sat Oct 11 10:19:39 2003  Shugo Maeda  <shugo@ruby-lang.org>
+	* io.c (extract_binmode): raise error even if binmode and textmode
+	  don't conflict. [Bug #5918] [ruby-core:42199]
 
-	* lib/monitor.rb: handle exceptions correctly. Thanks, Gennady
-	  Bystritsky.
+Mon Mar 11 12:25:12 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Oct 10 07:50:54 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518.
+	  fix lookbehind assertion fails with /m mode enabled. [Bug #8023]
+	  fix \Z matches where it shouldn't. [Bug #8001]
 
-	* eval.c (is_defined): inheritance line adjustment as like as
-	  rb_call_super().
+Mon Mar 11 11:53:35 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Oct 10 01:19:00 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/mkmf.rb (MakeMakefile#dir_config, MakeMakefile#_libdir_basename):
+	  defer use of instance variable until needed.  [Bug #8074]
 
-	* ext/openssl/ossl_x509name.c (ossl_x509name_initialize): add
-	  optional argument to specify the DirectoryString type
-	  (ASN1::UTF8STRING by default). RFC3280 deprecates PrintableString
-	  for DirectoryString, and strongly requires to use UTF8String for
-	  all certificates issued after December, 31 2003.
+Thu Mar  7 10:42:28 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/openssl/lib/openssl/x509.rb (X509::Name::parse): ditto.
+	* lib/thread.rb (Queue#clear): return self.
+	  Patch by Cubing Cube. Thank you! [Bug #7947] [ruby-dev:47098]
+	* lib/thread.rb (Queue#push): ditto.
+	* lib/thread.rb (SizedQueue#push): ditto.
+	* test/thread/test_queue.rb: add tests for the above.
 
-Thu Oct  9 23:50:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  7 10:40:49 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* eval.c (rb_thread_start_0): prevent thread from GC.
-	  [ruby-dev:21572]
+	* tool/change_maker.rb (#diff2index): check Encoding::BINARY.
+	  BASERUBY may still be 1.8.x.
 
-Thu Oct  9 19:11:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  7 08:47:42 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* eval.c (rb_thread_start_0): non-volatile should be restored from
-	  volatile.
+	* NEWS (Mutex#owned?): no longer experimental.
 
-Thu Oct  9 17:43:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Mar 10 23:38:15 2013  Luis Lavena  <luislavena@gmail.com>
 
-	* eval.c (proc_save_safe_level, proc_get_safe_level,
-	  proc_set_safe_level): save/restore safe level 1..4.
+	* win32/file.c (rb_file_expand_path_internal):  Expand home directory when
+	  used as second parameter (dir_string).  [ruby-core:53168] [Bug #8034]
+	* test/ruby/test_file_exhaustive.rb: add test to verify.
 
-Thu Oct  9 16:33:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Mar 10 23:27:05 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* marshal.c (r_object0): remove unnecessary iv restoration for
-	  USRMARSHAL. [ruby-dev:21582]
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  it is impossible to predict which file will be installed to where,
+	  by the arguments, so use intermediate destination directory always.
+	  [Bug #7698]
 
-	* marshal.c (w_object): dump generic instance variables from
-	  a string from '_dump'.
+Sun Mar 10 17:00:22 2013  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* variable.c (rb_generic_ivar_table): return 0 if obj's FL_EXIVAR
-	  is not set.
+	* complex.c: edited rdoc.
+	* rational.c: ditto.
 
-	* time.c (time_dump): copy instance variables to dumped string, to
-	  be included in the marshaled data.
+Sun Mar 10 15:02:39 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* bignum.c (rb_big2ulong): add range check to ensure round trip.
+	* process.c (setup_communication_pipe): remove unused function.
+	  it was unintentionally added r39683.
 
-Thu Oct  9 15:45:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Mar  6 00:30:40 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* pack.c (uv_to_utf8): change message to "out of range", since
-	  negative values are not "too big". [ruby-dev:21567]
+	* tool/gen_ruby_tapset.rb: add tapset generator.
 
-Thu Oct  9 14:05:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Mar  6 03:27:43 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* eval.c (rb_set_end_proc, rb_exec_end_proc): restore safe level.
-	  [ruby-dev:21557]
+	* probes.d (symbol-create): change argument name `string' to
+	  `str'. `string' is a keyword for systemtap.
 
-Thu Oct  9 10:51:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Mar  5 22:23:01 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* eval.c (rb_yield_0): no error if block is empty.
+	* probes.d: added argument name
 
-Thu Oct  9 06:43:33 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Mar  7 01:17:00 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* eval.c (localjump_error): id should be ID.
+	* test/thread/test_queue.rb (TestQueue#test_thr_kill): reduce
+	  iterations from 2000 to 250. When running on uniprocessor
+	  systems, every th.kill needs TIME_QUANTUM_USEC time (i.e.
+	  100msec on posix systems). Because, "r.read 1" is 3 steps
+	  operations that 1) release GVL 2) read 3) acquire gvl and
+	  (1) invoke context switch to main thread. and then, main
+	  thread's th.kill resume (1), but not (2). Thus read interrupt
+	  need TIME_QUANTUM_USEC. Then maximum iteration is 30sec/100msec
+	  = 300.
 
-	* eval.c (rb_eval): nd_rval is set in copy_node_scope().
+Thu Mar  7 00:14:51 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* eval.c (rb_yield_0): unused variable.
+	* io.c (rb_update_max_fd): use ATOMIC_CAS because this function
+	  is used from timer thread too.
 
-	* eval.c (rb_yield_0): nothing to do for empty node.
+Wed Mar  6 23:30:21 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* eval.c (call_end_proc, proc_invoke): adjust backtrace in END.
-	  [ruby-dev:21551]
+	* thread_pthread.c (ARRAY_SIZE): new.
+	* thread_pthread.c (gvl_acquire_common): use low priority
+	  notification for avoiding timer thread interval confusion.
+	  If we use timer_thread_pipe[1], every gvl_yield() request
+	  one more gvl_yield(). It lead to thread starvation.
+	  [Bug #7999] [ruby-core:53095]
+	* thread_pthread.c (rb_reserved_fd_p): adds timer_thread_pipe_low
+	  to reserved fds.
 
-	* eval.c (rb_thread_start_0): set the value by break as the result.
-	  [ruby-dev:21552]
+Wed Mar  6 22:36:19 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* eval.c (rb_thread_start_0, rb_thread_raise, rb_callcc): save
-	  variables across THREAD_SAVE_CONTEXT.
+	* thread_pthread.c (rb_thread_wakeup_timer_thread_fd): add fd
+	  argument and remove hardcoded dependency of timer_thread_pipe[1].
+	* thread_pthread.c (consume_communication_pipe): add fd argument.
+	* thread_pthread.c (close_communication_pipe): ditto.
 
-Thu Oct  9 12:05:46 2003  Eric Sunshine  <sunshine@sunshineco.com>
+	* thread_pthread.c (timer_thread_sleep): adjust the above changes.
 
-	* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
-	  had become unbuildable; enhanced --enable-fat-binary option so that
-	  it accepts a list of desired architectures (rather than assuming a
-	  fixed list), or defaults to a platform-appropriate list if user does
-	  not provide an explicit list; made the default list of architectures
-	  for MAB (fat binary) more comprehensive; now uses -fno-common even
-	  when building the interpreter (in addition to using it for
-	  extensions), thus allowing the interpreter to be embedded into a
-	  plugin module of an external project (in addition to allowing
-	  embedding directly into an application); added checks for
-	  <netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
-	  ensures that -I/usr/local/include is employed when extensions'
-	  extconf.rb scripts invoke have_header() since extension checks on
-	  NextStep and OpenStep will fail without it if the desired resource
-	  resides in the /usr/local tree; fixed formatting of --help message.
+	* thread_pthread.c (setup_communication_pipe_internal): factor
+	  out pipe initialize logic.
 
-	* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
-	  invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
-	  (see configure's --enable-fat-binary option); added rule for new
-	  missing/getcwd.c.
+Wed Mar  6 22:56:14 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* defines.h: fixed endian handling during MAB build (see configure's
-	  --enable-fat-binary option) to ensure that all portions of the
-	  project see the correct WORDS_BIGENDIAN value (some extension modules
-	  were getting the wrong endian setting); added missing constants
-	  GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
-	  and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
-	  define in NeXT section.
+	* thread_pthread.c (ubf_select): add to small comments why we
+	  need to call rb_thread_wakeup_timer_thread().
 
-	* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
-	  NextStep since, on some installations, this value always resolves
-	  uselessly to zero.
+Wed Mar  6 21:42:24 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* dln.c: added error reporting to NextStep extension loader since the
-	  previous behavior of failing silently was not useful; now ensures
-	  that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
-	  for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
-	  on Rhapsody since this header lacks multiple-include protection,
-	  which resulted in "redefinition" compilation errors.
+	* thread_pthread.c (rb_thread_create_timer_thread): factor out
+	  creating communication pipe logic into separate function.
+	* thread_pthread.c (setup_communication_pipe): new helper function.
+	* thread_pthread.c (set_nonblock): moves a definition before
+	  setup_communication_pipe.
 
-	* main.c: also create hard reference to objc_msgSend() on NeXT
-	  platforms (in addition to Apple platforms).
+Sun Mar  3 02:42:29 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
-	  makefiles so that extensions can be built MAB (see configure's
-	  --enable-fat-binary option); also utilize XCFLAGS in cc_command()
-	  (but not cpp_command() because MAB flags are incompatible with
-	  direct invocation of `cpp').
+	* thread_pthread.c (consume_communication_pipe): retry when
+	  read returned CCP_READ_BUFF_SIZE.
 
-	* ext/curses/extconf.rb: now additionally checks for presence of these
-	  curses functions which are not present on NextStep or Openstep:
-	  bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
-	  setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
-	  wscrl(), wsetscrreg()
+Wed Mar  6 21:31:35 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/curses/curses.c: added appropriate #ifdef's for additional set of
-	  curses functions now checked by extconf.rb; fixed curses_bkgd() and
-	  window_bkgd() to correctly return boolean result rather than numeric
-	  result; fixed window_getbkgd() to correctly signal an error by
-	  returning nil rather than -1.
+	* thread_pthread.c (timer_thread_sleep): use poll() instead of
+	  select(). select doesn't work if timer_thread_pipe[0] is
+	  greater than FD_SETSIZE.
+	* thread_pthread.c (USE_SLEEPY_TIMER_THREAD): add a dependency
+	  against poll.
 
-	* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
-	  pointers before invoking rb_tainted_str_new2() upon fields extracted
-	  from `struct passwd' and `struct group' since null pointers in some
-	  fields are common on NextStep/OpenStep (especially so for the
-	  `pw_comment' field) and rb_tainted_str_new2() throws an exception
-	  when it receives a null pointer.
+Wed Mar  6 21:00:23 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
-	  platforms such as NextStep and OpenStep which lack strdup().
+	* thread_pthread.c (USE_SLEEPY_TIMER_THREAD): use more accurate
+	  ifdef conditions.
 
-	* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
-	  gethostbyaddr(), and gethostbyname() from (const char*) to non-const
-	  (char*) for older platforms such as NextStep and OpenStep.
+Sun Mar  3 02:30:36 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
-	  platforms such as NextStep and OpenStep which lack strdup(); include
-	  <netinet/in_systm.h> if present for NextStep and OpenStep; cast first
-	  argument of gethostbyaddr() and getservbyname() from (const char*) to
-	  non-const (char*) for older platforms.
+	* thread_pthread.c (set_nonblock): new helper function for set
+	  O_NONBLOCK.
+	* thread_pthread.c (rb_thread_create_timer_thread): set O_NONBLOCK
+	  to timer_thread_pipe[0] too.
 
-	* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
-	  platforms such as NextStep and OpenStep which lack strdup().
+Sun Mar 10 09:12:51 2013  Tadayoshi Funaba  <tadf@dotrb.org>
 
-Wed Oct  8 22:19:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* complex.c: described syntax of string form.
+	* rational.c: ditto.
 
-	* lib/test/unit.rb: removed installation instructions.
+Sat Mar  9 11:58:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit/ui/testrunnermediator.rb: moved the run flag to a more
-	  central location.
+	* marshal.c (w_extended): check for prepended object.
+	  [ruby-core:53206] [Bug #8043]
 
-	* lib/test/unit.rb: ditto.
+Sat Mar  9 08:36:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit.rb: extracted the running code in to AutoRunner.
+	* load.c (features_index_add_single, rb_feature_p): store single index
+	  as Fixnum to reduce the number of arrays for the indexes.  based on
+	  the patch by tmm1 (Aman Gupta) in [ruby-core:53216] [Bug #8048].
 
-	* lib/test/unit/autorunner.rb: added.
+Sat Mar  9 00:25:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit/collector/objectspace.rb: extracted common test
-	  collection functionality in to a module.
+	* marshal.c (r_object0): load prepended objects.  treat the class of
+	  extended object in the included modules as prepended singleton
+	  class. [ruby-core:53202] [Bug #8041]
 
-	* lib/test/unit/collector.rb: ditto; added.
+Fri Mar  8 19:44:00 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* test/testunit/collector/test_objectspace.rb: ditto.
+	* man/rake.1, man/ruby.1: Use the Pa macro to make URLs stand out.
 
-	* lib/test/unit/collector/dir.rb: added. Supports collecting tests out
-	  of a directory structure.
+Fri Mar  8 13:20:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* test/testunit/collector/test_dir.rb: added.
+	* ext/pathname/pathname.c (path_f_pathname): rdoc for Pathname()
 
-	* test/runner.rb: simplified to use the new capabilities.
+Fri Mar  8 12:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Oct  7 15:23:09 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* man/rake.1: Document ENVIRONMENT variables on RAKE(1) manpage
 
-	* test/ruby/test_beginendblock.rb: add tests for nested BEGIN/END.
+Fri Mar  8 10:44:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* test/ruby/beginmainend.rb: add tests for nested BEGIN/END.
+	* lib/webrick/httpproxy.rb: Fix typos in HTTPProxyServer [Bug #8013]
+	  Patch by Nobuhiro IMAI [ruby-core:53127]
 
-	* test/ruby/endblockwarn.rb: new file added to test of END-in-method
-	  warning.
+Fri Mar  8 03:16:15 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-Tue Oct  7 12:23:47 2003  Tanaka Akira  <akr@m17n.org>
+	* class.c (rb_mod_ancestors): Include singleton_class in ancestors
+	  list [Feature #8035]
 
-	* ext/fcntl/fcntl.c (Init_fcntl): define Fcntl::O_ACCMODE.
+	* test/ruby/test_module.rb (class): test for above
 
-	* ext/socket/extconf.rb: useless assignment removed.
+	* test/ruby/marshaltestlib.rb (module): adapt test
 
-Tue Oct  7 09:13:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* NEWS: list change
 
-	* test/ruby/test_beginendblock.rb (test_endinmethod): END{} is now
-	  allowed in eval.
+Thu Mar  7 14:21:37 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Oct  7 04:15:25 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* compile.c (iseq_compile_each): pass keyword arguments to zsuper,
+	  with current values.  [ruby-core:53114] [Bug #8008]
 
-	* parse.y (stmt): should not expand mrhs if lhs is solely starred.
+Thu Mar  7 12:53:47 2013  Eric Hodel  <drbrain@segment7.net>
 
-Tue Oct  7 02:57:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rubygems/commands/setup_command.rb:  Install .pem files.
+	* test/rubygems/test_gem_commands_setup_command.rb:  Test for the
+	  above.
 
-	* parse.y (stmt): rhs of multiple assignment should not be
-	  expanded using "to_a". [ruby-dev:21527]
+	* lib/rubygems/spec_fetcher.rb:  Test HTTPS upgrade with URI::HTTPS,
+	  not URI::HTTP.  Fixes bug in automatic HTTPS upgrade.
+	* test/rubygems/test_gem_spec_fetcher.rb:  Test for the above.
 
-Tue Oct  7 01:42:34 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/rubygems.rb:  Version 2.0.2
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): use appropriate
-	  free function for ASN1_OBJECT.
+	* lib/rubygems/test_utilities.rb:  Ensure scheme and uri class match.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_sn): add new function for
-	  ASN1::ObjectId#sn; it returns short name text representation of OID.
+Thu Mar  7 10:39:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_ln): add new function for
-	  ASN1::ObjectId#ln; it returns long name text representation of OID.
+	* tool/rbinstall.rb (gem): Gem.ensure_gem_subdirectories now has mode
+	  option since r39607.  refix of r38870.
 
-	* ext/openssl/ossl_asn1.c (ossl_asn1obj_get_oid): add new function for
-	  ASN1::ObjectId#oid; it returns numerical representation of OID.
+Wed Mar  6 13:14:28 2013  Eric Hodel  <drbrain@segment7.net>
 
-Mon Oct  6 22:59:46 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* test/rubygems/test_gem_spec_fetcher.rb:  Removed unused variable.
 
-	* lib/csv.rb (IOReader, BasicWriter): call binmode when a given IO
-	  respond_to?(:binmode).  record separator was wrong when you gave
-	  text mode IO to Reader.parse and Writer.generate.
+Wed Mar  6 08:10:15 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* test/csv/test_csv.rb: add tests for above change.
+	* test/rubygems/test_require.rb:  Fix tests when 'a.rb' exists.
+	  [ruby-trunk - Bug #7749]
 
-Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
+Wed Mar  6 08:00:59 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/socket/extconf.rb: check recvmsg even if sendmsg is exists.
+	* lib/rubygems.rb:  Allow specification of directory permissions.
+	  [ruby-trunk - Bug #7713]
+	* test/rubygems/test_gem.rb:  Test for the above.
 
-	* ext/socket/socket.c (thread_read_select): restored.
+Wed Mar  6 07:40:21 2013  Eric Hodel  <drbrain@segment7.net>
 
-Mon Oct  6 16:23:38 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rubygems/commands/query_command.rb:  Only fetch remote specs when
+	  showing details.  [ruby-trunk - Bug #8019]  RubyGems bug #487
+	* lib/rubygems/remote_fetcher.rb:  ditto.
+	* lib/rubygems/security/policy.rb:  ditto.
+	* test/rubygems/test_gem_commands_query_command.rb:  Test for the
+	  above.
 
-	* marshal.c (w_object): wrong method name in the message.
+	* lib/rubygems/security.rb:  Make OpenSSL optional for RubyGems.
+	* lib/rubygems/commands/cert_command.rb:  ditto.
 
-Mon Oct  6 16:02:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rubygems/config_file.rb:  Display file with YAML error, not
+	  ~/.gemrc
 
-	* parse.y (stmt): END in method should cause warning.
-	  [ruby-dev:21519]
+	* lib/rubygems/remote_fetcher.rb:  Only create gem subdirectories when
+	  installing gems.
+	* lib/rubygems/dependency_resolver.rb:  ditto.
+	* lib/rubygems/test_utilities.rb:  ditto.
+	* test/rubygems/test_gem_commands_fetch_command.rb:  Test for the
+	  above.
 
-Mon Oct  6 15:17:23 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/rubygems/spec_fetcher.rb:  Only try to upgrade
+	  http://rubygems.org to HTTPS
+	* test/rubygems/test_gem_spec_fetcher.rb:  Test for the above.
 
-	* test/ruby/test_iterator.rb (test_block_argument_without_paren):
-	  added. (follows sample/test.rb)
+	* lib/rubygems.rb:  Update win_platform? check for JRuby compatibility.
 
-Mon Oct  6 11:57:06 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* test/rubygems/test_gem_installer.rb:  Update for Ruby 1.9.2
+	  compatibility
 
-	* test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: added
-	  test for eval-ed BEGIN END order.
+Wed Mar  6 01:19:28 2013  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
-Mon Oct  6 09:19:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* enumerator.c (enumerator_with_index, lazy_take): use INT2FIX(0)
+	  instead of INT2NUM(0).
 
-	* marshal.c (w_object): should pass "weak" value to next level.
-	  [ruby-dev:21496]
+	* ext/bigdecimal/bigdecimal.c (BigMath_s_exp): ditto.
 
-	* eval.c (proc_alloc): should not use cached object if klass is
-	  different. [ruby-talk:83685]
+	* ext/fiddle/function.c (function_call): ditto.
 
-Sun Oct  5 23:27:09 2003  Tanaka Akira  <akr@m17n.org>
+	* ext/openssl/ossl_x509store.c (ossl_x509store_initialize): ditto.
 
-	* lib/pathname.rb: version information is added in document.
+	* process.c (proc_getsid): ditto.
 
-Sun Oct  5 23:07:03 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* transcode.c (econv_finish): ditto.
 
-	* eval.c (rb_f_END): block should be given.  [ruby-dev:21497]
+Tue Mar  5 21:36:43 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Oct  5 22:51:23 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* class.c (rb_prepend_module): check redefinition of built-in optimized
+	  methods.  [ruby-dev:47124] [Bug #7983]
 
-	* lib/ext/openssl/extconf.rb: add check for some engine functions
-	  unavailable in OpenSSL-0.9.6.
+	* vm.c (rb_vm_check_redefinition_by_prepend): ditto.
 
-	* lib/ext/openssl/ossl_engine.c: ditto.
+Tue Mar  5 20:29:25 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Oct  5 17:56:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* proc.c (mnew): revert r39224.  [ruby-core:53038] [Bug #7988]
 
-	* eval.c (rb_eval): fix evaluation order.  [ruby-list:38431]
+Tue Mar  5 20:23:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Oct  5 15:05:06 2003  akira yamada  <akira@ruby-lang.org>
+	* include/ruby/intern.h (rb_check_arity): make a static inline
+	  function so it can be used as an expression and argc would be
+	  evaluated only once.
 
-	* test/uri/*: translated RUNIT to Test::Unit.
+Tue Mar  5 12:30:55 2013  Eric Hodel  <drbrain@segment7.net>
 
-Sun Oct  5 14:37:39 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/rubygems.rb:  Bump version to 2.0.1 for upcoming bugfix release
 
-	* lib/xsd/datatypes.rb: Rational -> Decimal string bug fix.
+	* lib/rubygems/ext/ext_conf_builder.rb:  Restore ruby 1.8 compatibility
+	  for [Bug #7698]
+	* test/rubygems/test_gem_installer.rb:  Ditto.
 
-	* test/soap/marshal/test_marshal.rb: ditto.
+	* lib/rubygems/package.rb:  Restore ruby 1.8 compatibility.
 
-	* test/soap/calc/test_calc_cgi.rb: add Config::CONFIG["EXEEXT"] to
-	  RUBYBIN.
+	* test/rubygems/test_gem_dependency_installer.rb:  Fix warnings
 
-Sun Oct  5 13:47:22 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Mar  5 12:24:23 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* test/ruby/test_beginendblock.rb, test/ruby/beginmainend.rb: add tests
-	  about scope, order and allowed syntax.
+	* enumerator.c (enumerator_with_index):  Restore handling of a nil memo
+	  from r39594.
 
-Sun Oct  5 11:54:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Tue Mar  5 10:40:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/ruby/envutil.rb: added.  split "rubybin" from test_system.rb.
+	* ext/objspace/objspace.c (count_nodes): count also newly added nodes,
+	  and fix key for unknown node.  patch by tmm1 (Aman Gupta) in
+	  [ruby-core:53130] [Bug #8014]
 
-	* test/ruby/test_system.rb: use envutil.rb
+Tue Mar  5 10:20:16 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/ruby/test_beginendblock.rb: added.
+	* enumerator.c (enumerator_with_index_i): allow Bignum as offset, to
+	  get rid of conversion exception and integer overflow.
+	  [ruby-dev:47131] [Bug #8010]
 
-	* test/ruby/beginmainend.rb: added.  used in test_beginendblock.rb.
+	* numeric.c (rb_int_succ, rb_int_pred): shortcut optimization for
+	  Bignum.
 
-Sun Oct  5 11:23:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Tue Mar  5 10:02:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/testunit/runit/test_testresult.rb: removed some unnecessary
-	  cruft.
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  clear DESTDIR so RUBYARCHDIR and RUBYLIBDIR are not be overridden.
+	  [Bug #7698]
 
-Sun Oct  5 11:14:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Mon Mar  4 15:33:40 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/rubyunit.rb: aliasing TestCase into the top level is
-	  problematic.
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  fix for unusual cases again.  install to a temporary directory once
+	  and move installed files to the destination directory, if it is same
+	  as the current directory.  [Bug #7698]
 
-	* lib/runit/assert.rb: fixed a couple of bugs caused by recent
-	  refactoring in Test::Unit.
+Mon Mar  4 14:13:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/testunit/runit/*: added.
+	* Makefile.in (miniruby, ruby): move MAINLIBC because linker arguments
+	  must appear after object files with newer versions of gcc.  patch by
+	  tmm1 (Aman Gupta) in [ruby-core:53121] [Bug #8009]
 
-Sun Oct  5 10:55:29 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Mar  4 10:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/open-uri.rb (URI::Generic#find_proxy): no_proxy support did not
-	  work.  [ruby-dev:21484]
+	* encoding.c: Typo in Encoding overview by Tom Wardrop [GH fixes #255]
 
-Sun Oct  5 09:52:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Sun Mar  3 12:35:08 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/test/unit/assertions.rb: will use pp for output if available.
-	  Can be disabled by setting Assertions.use_pp = false.
+	* lib/mkmf.rb (MakeMakefile#libpath_env): set runtime library path for
+	  the case rpath is disabled.
 
-	* test/testunit/test_assertions.rb: made a small change to exception
-	  formatting.
+Sun Mar  3 12:17:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Oct  5 07:42:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* lib/rubygems/ext/ext_conf_builder.rb
+	  (Gem::Ext::ExtConfBuilder.hack_for_obsolete_style_gems): remove
+	  circular dependencies in install-so too.  [ruby-core:52882]
+	  [Bug #7698]
 
-	* lib/test/unit/assertions.rb: made small improvements to assertion
-	  messages. Deprecated Assertions#assert_not_nil; use #assert instead.
+Sun Mar  3 07:33:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* test/testunit/test_assertions.rb: ditto.
+	* ext/socket/tcpserver.c: Grammar for TCPServer.new from r39554
 
-	* test/testunit/util/test_procwrapper.rb: use #assert instead of
-	  #assert_not_nil.
+Sun Mar  3 01:17:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Oct  5 04:10:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* lib/rubygems/ext/ext_conf_builder.rb
+	  (Gem::Ext::ExtConfBuilder.hack_for_obsolete_style_gems): remove
+	  circular dependencies for old style gems which locate extconf.rb on
+	  the toplevel.  [ruby-core:53059] [ruby-trunk - Bug #7698]
 
-	* lib/test/unit/assertions.rb: refactored message building.
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  use RUBYOPT instead of -r option, and revert some tests.  [Bug #7698]
 
-Sun Oct  5 03:40:22 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/rubygems/ext/ext_conf_builder.rb (Gem::Ext::ExtConfBuilder.build):
+	  revert use of temporary directory for build, to work some buggy
+	  extconf.rb which cannot build outside the source directory.
+	  [ruby-core:53056] [Bug #7698]
 
-	* ext/openssl/ossl_asn1.h: global symbols should be declared
-	  as external.
+Sun Mar  3 00:04:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Oct  5 03:03:20 2003  akira yamada  <akira@ruby-lang.org>
+	* enc/depend (CPPFLAGS), lib/mkmf.rb (MakeMakefile#create_makefile):
+	  define RUBY_EXPORT for static-linked-ext mswin.  [Bug #7960]
 
-	* test/ruby/test_exception.rb (test_else): added.
+Sat Mar  2 22:49:47 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Oct  5 02:12:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+	* win32/Makefile.sub (ENCOBJS, EXTOBJS, config.h): definitions for
+	  static-linked-ext.  [Bug #7960]
 
-	* lib/test/unit/assertions.rb: changed assertion messages to rely more
-	  heavily on #inspect. Added backtrace filtering for exceptions in
-	  assertion messages.
+Sat Mar  2 17:34:19 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/testunit/test_assertions.rb: ditto.
+	* lib/webrick/utils.rb: use Socket.tcp_server_sockets to create server
+	  sockets.
+	  fix [Bug #7100] https://bugs.ruby-lang.org/issues/7100
+	  reported by sho-h (Sho Hashimoto).
 
-Sun Oct  5 02:12:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+Sat Mar  2 02:45:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/drb/acl.rb, lib/drb/ssl.rb: added.
+	* array.c: typo in comment patch by Nami-Doc [Github fixes #253]
 
-	* lib/drb/drb.rb: exit from a thread using 'break'.
+Sat Mar  2 01:33:17 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Sat Oct  4 21:49:14 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* Merge Onigmo 0fe387da2fee089254f6b04990541c731a26757f
+	  v5.13.3 [Bug#7972] [Bug#7974]
 
-	* gc.c (Init_stack): the type of space is changed to unsigned int
-	  from double.  [ruby-dev:21483]
+Fri Mar  1 11:09:06 2013  Eric Hodel  <drbrain@segment7.net>
 
-Sat Oct  4 17:52:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/fileutils.rb:  Revert r34669 which altered the way
+	  metaprogramming in FileUtils occurred.  [ruby-trunk - Bug #7958]
 
-	* lib/soap/netHttpClient.rb: follow http-access2.  hosts which matches
-	  ENV['no_proxy'] or ENV['NO_PROXY'] are not proxyed.
-	  - [,:] separated. ("ruby-lang.org:rubyist.net")
-	  - no regexp. (give "ruby-lang.org", not "*.ruby-lang.org")
-	  - if you want specify host by IP address, give full address.
-	    ("192.168.1.1, 192.168.1.2")
+	* test/fileutils/visibility_tests.rb:  Refactored tests of FileUtils
+	  options modules to expose bug found in #7958
+	* test/fileutils/test_dryrun.rb:  ditto.
+	* test/fileutils/test_nowrite.rb:  ditto.
+	* test/fileutils/test_verbose.rb:  ditto.
 
-	* lib/soap/rpc/cgistub.rb: return "Status: XXX MMM" line.
+Fri Mar  1 09:18:00 2013  Zachary Scott <zachary@zacharyscott.net>
 
-	* test/runner.rb: give testsuite name.
+	* lib/psych.rb: specify in rdoc what object is returned in parser
+	  By Adam Stankiewicz [Github tenderlove/psych#133]
 
-Sat Oct  4 15:16:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Mar  1 07:21:41 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* marshal.c (w_object): instance variable dump do not cause error
-	  for objects that cannot be dumped, if they traversed from
-	  marshal_dump.  they are just ignored.
+	* lib/rubygems/ext/builder.rb:  Fix incompatibilities when installing
+	  extensions.  Patch by Nobu.
+	  [ruby-trunk - Bug #7698] [ruby-trunk - Bug #7971]
+	* lib/rubygems/ext/ext_conf_builder.rb:  ditto.
+	* lib/rubygems/installer.rb:  ditto.
+	* test/rubygems/test_gem_ext_ext_conf_builder.rb:  Test for the above.
+	* test/rubygems/test_gem_installer.rb:  ditto.
 
-	* gc.c (Init_stack): cast "space" (doble value) into unsigned
-	  int.  should run on PowerPC.
+	* lib/rubygems/commands/sources_command.rb:  Prefer HTTPS over HTTP.
+	* lib/rubygems/defaults.rb:  ditto
+	* lib/rubygems/dependency_resolver.rb:  Ditto.
+	* lib/rubygems/source.rb:  ditto.
+	* lib/rubygems/spec_fetcher.rb:  ditto.
+	* lib/rubygems/specification.rb:  ditto.
+	* lib/rubygems/test_utilities.rb:  ditto.
+	* test/rubygems/test_gem.rb:  Test for the above.
+	* test/rubygems/test_gem_commands_sources_command.rb:  ditto.
+	* test/rubygems/test_gem_dependency_resolver_api_set.rb:  ditto.
+	* test/rubygems/test_gem_remote_fetcher.rb:  ditto.
+	* test/rubygems/test_gem_source.rb:  ditto.
+	* test/rubygems/test_gem_spec_fetcher.rb:  ditto.
 
-	* eval.c (rb_eval): should not execute else part if any exception
-	  is caught. [ruby-dev:21482]
+Fri Mar 1 03:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* parse.y (f_args): should allow unparenthesized block argument.
+	* ext/psych/lib/psych.rb: rdoc for Psych overview by Adam Stankiewicz
+	  [Github tenderlove/psych#134]
 
-	* parse.y (f_rest_arg): should allow unparenthesized rest
-	  argument.
+Thu Feb 28 22:57:48 2013  Koichi Sasada  <ko1@atdot.net>
 
-Sat Oct  4 14:59:51 2003  Tanaka Akira  <akr@m17n.org>
+	* compile.c (iseq_compile_each): remove redundant trace(line)
+	  instruction. for example, at the following script
+	    def m()
+	      p:xyzzy
+	      1
+	      2
+	    end
+	  compiler ignores `1' because there is no effect. However,
+	  `trace(line)' instruction remains in bytecode.
+	  This modification removes such redundant trace(line) instruction.
 
-	* lib/pathname.rb (initialize): raise ArgumentError if argument has
-	  '\0' character.
-	  (relative_path_from): new method.
-	  (each_entry): new method for replacement of dir_foreach.
-	  (foreach, foreachline, dir_foreach, chdir): obsoleted.
+	* test/ruby/test_iseq.rb: add a test.
 
-Sat Oct  4 12:58:48 2003  akira yamada  <akira@ruby-lang.org>
+Thu Feb 28 22:23:27 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/uri/* (6 files): added.
+	* ext/socket/raddrinfo.c (inspect_sockaddr): don't show that Unix
+	  domain socket filename is bigger than sizeof(sun_path).
+	  This limit is not rigid on some platforms such as Darwin and SunOS.
 
-Sat Oct  4 12:44:45 2003  akira yamada  <akira@ruby-lang.org>
+Thu Feb 28 21:33:01 2013  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/uri/ftp.rb, lib/uri/mailto.rb: renamed to #to_s from #to_str.
+	* configure.in(AC_DISABLE_OPTION_CHECKING): avoid warning "WARNING:
+	  Unrecognized options: --with-PACKAGE".
 
-Sat Oct  4 07:33:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Thu Feb 28 20:22:04 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* lib/test/unit/testsuite.rb: changed #<< to return self, and added
-	  #delete.
+	* iseq.c (iseq_data_to_ary): fix condition.
+	  r34303 introduces a bug to avoid all line information from
+	  a result of ISeq#to_a. This is a regression problem from 2.0.0p0.
 
-	* test/testunit/test_testsuite.rb: ditto. Also slightly refactored
-	  #test_size.
+	* test/ruby/test_iseq.rb: add a test of lines after ISeq#to_a.
 
-	* lib/test/unit/collector/objectspace.rb: collector now preserves the
-	  hierarchy of suites.
+Thu Feb 28 08:20:33 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* test/testunit/collector/test_objectspace.rb: ditto.
+	* lib/rubygems/available_set.rb:  Undent for style
 
-Sat Oct  4 04:48:49 2003  why the lucky stiff  <why@ruby-lang.org>
+	* lib/rubygems/dependency_installer.rb:  Pick latest prerelease gem to
+	  install.  Fixes RubyGems bug #468.
+	* test/rubygems/test_gem_dependency_installer.rb:  Test for the above.
 
-	* ext/syck/rubyext.c: default keys handled.
+	* lib/rubygems/dependency_installer.rb:  Don't display "Done installing
+	  documentation" if documentation will not be installed.
+	* lib/rubygems/rdoc.rb:  ditto
 
-	* ext/syck/syck.h: lowered default buffer size to 16k for increased
+	* lib/rubygems/dependency_list.rb:  Use Array#concat for Ruby 1.x
 	  performance.
 
-	* test/yaml: checkin of basic unit tests.
-
-Sat Oct  4 04:24:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/extconf.rb: add check for X509V3_set_nconf.
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_set_config):
-	  cannot implement if X509V3_set_nconf doesn't exist.
-
-Sat Oct  4 02:12:44 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/xsd/datatypes.rb: dump sign by itself.  under the problematic
-	  platform, sprintf("%+.10g", -0.0) => +0.  sigh.
-
-	* sample/wsdl/amazon/*: update schema ver2 to ver3.
-
-Sat Oct  4 01:33:46 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb (initialize): duplicate and freeze argument.
-	  (to_s): return duplicated string.
-	  (children): new method.
-	  (each_line): new alias to foreachline.
-
-Fri Oct  3 16:13:19 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_asn1.c: add DER encoder and decoder.
-
-	* ext/openssl/ossl_asn1.h: add OpenSSL::ASN1 module.
-
-	* ext/openssl/ossl.c (Init_openssl): call Init_ossl_asn1.
-
-	* ext/openssl/extconf.rb: check if X509_ATTRIBUTE has field "single".
-
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_set_value): accept
-	  DER encoded data argument.
-
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_get_value): return
-	  DER encoded data in OpenSSL::ASN1 types.
-
-Fri Oct  3 13:02:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit.rb: refactored to use optparse.
-
-	* lib/test/unit.rb: added support for selecting the output
-	  level from the command-line.
-
-	* lib/test/unit.rb: added a command-line switch to stop processing
-	  the command-line, allowing arguments to be passed to tests.
-
-	* lib/test/unit.rb: changed the method for specifying a runner or a
-	  filter from the command-line.
-
-	* lib/test/unit/collector/objectspace.rb: fixed a bug causing all
-	  tests to be excluded when the filter was set to an empty array.
-
-	* test/testunit/collector/test_objectspace.rb: ditto.
-
-Fri Oct  3 08:14:32 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* lib/irb/ruby-lex.rb (RubyLex::identify_identifier): support
-	  'class ::Foo' syntax. [ruby-talk:83514]
-
-Fri Oct  3 08:01:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb: added a default message for #assert,
-	  #assert_block, and #flunk.
-
-	* test/testunit/test_assertions.rb: ditto.
-
-	* lib/test/unit/failure.rb: failures now show a better trace of where
-	  they occurred.
-
-	* test/testunit/test_failure.rb: ditto (added).
-
-	* lib/test/unit/testcase.rb: ditto.
-
-	* test/testunit/test_testcase.rb: ditto.
-
-	* lib/test/unit/util/backtracefilter.rb: added.
-
-	* test/testunit/util/test_backtracefilter.rb: added.
-
-	* lib/test/unit/error.rb: changed to use BacktraceFilter and improved
-	  output.
-
-	* test/testunit/test_error.rb: ditto.
-
-Thu Oct  2 20:33:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_failure_initialize): conform with
-	  orthodox initialization method.
-
-	* ext/iconv/iconv.c (iconv_fail): initialize exception instance
-	  from the class, and do not share instance variables with the
-	  others.  [ruby-dev:21470]
-
-Thu Oct  2 18:20:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* time.c (Init_Time): define initialize.  [ruby-dev:21469]
-
-Thu Oct  2 17:39:38 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_engine.c: add a new module OpenSSL::Engine.
-	  it supports OpenSSL hardware cryptographic engine interface.
-
-	* ext/openssl/ossl_engine.h: ditto.
-
-	* ext/openssl/MANIFEST: add ossl_engine.c and ossl_engine.h.
-
-	* ext/openssl/extconf.rb: add check for openssl/engine.h.
-
-	* ext/openssl/ossl.c: call Init_ossl_engine().
-
-	* ext/openssl/ossl.h: include openssl/engine.h.
-
-	* ext/openssl/ossl_pkey_{rsa,dsa,dh}.c: check if underlying
-	  EVP_PKEY referes engine.
-
-Thu Oct  2 17:22:37 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_load): restore instance variables (if any) before
-	  loading from marshaled data.
-
-Thu Oct  2 14:19:15 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/iconv/iconv.c (iconv_fail): now yield erred substring, and
-	  set error object to $!.
-
-	* ext/iconv/iconv.c (iconv_convert): error handler block should
-	  return appended part and the rest.  if rest is nil, the
-	  conversion stops.
-
-Thu Oct  2 12:00:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* variable.c (rb_const_defined_0): look up constants in Object as
-	  well.  [ruby-dev:21458]
-
-	* test/ruby/test_defined.rb (TestDefined::test_defined): test for
-	  constants.
-
-Thu Oct  2 11:17:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/test/unit/assertions.rb: should not capture an
-	  AssertionFailedError unless explicitly requested.
-
-	* test/testunit/test_assertions.rb: ditto.
-
-	* test/testunit/collector/test_objectspace.rb: fixed a test failure
-	  caused by methods being returned in different orders on different
-	  platforms by moving test sorting from TestSuite into the locations
-	  where suites are constructed. [ruby-talk:83156]
-
-	* lib/test/unit/testcase.rb: ditto.
-
-	* lib/test/unit/testsuite.rb: ditto.
-
-	* lib/test/unit/collector/objectspace.rb: ditto.
-
-Thu Oct  2 03:25:01 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* eval.c (rb_thread_raise): prototype; avoid VC++ warning.
-
-Thu Oct  2 01:37:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* time.c (time_mdump): new marshal dumper. _dump is still
-	  available for compatibility.
-
-	* time.c (time_mload): new marshal loader.
-
-	* marshal.c (w_object): preserve instance variables for objects
-	  with marshal_dump.
-
-	* marshal.c (r_object0): restore instance variables before calling
-	  marshal_load.
-
-	* error.c (rb_warn_m): always return nil.
-
-Thu Oct  2 01:32:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_block_given_p): real required condition is
-	  ruby_frame->prev->iter == ITER_CUR.
-
-	* eval.c (rb_block_given_p): ditto.
-
-	* eval.c (block_pass): update ruby_frame->iter only when previous
-	  value is ITER_NOT.
-
-Thu Oct  2 01:02:35 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* variable.c (rb_const_defined_at): should exclude constants from
-	  Object when TYPE(klass) == T_MODULE *and* exclude is on.
-	  [ruby-dev:21458]
-
-	* variable.c (rb_const_get_0): do not lookup constants from Object
-	  when TYPE(klass) == T_MODULE *and* exclude is on.
-
-Thu Oct  2 00:21:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/logger/test_logger.rb: unlinking file before close causes
-	  problem under win32 box.
-
-	* lib/xsd/datatypes.rb(XSDFloat, XSDDouble): add +/- sign explicitly
-	  when stringified and embedded into XML instance.  Ruby's sprintf may
-	  format -0.0 as "0.0" (no minus sign) depending on underlying C
-	  sprintf implementation.
-
-	* test/xsd/test_xsd.rb, test/soap/test_basetype.rb: follow above change.
-
-	* test/soap/calc/*: give httpd config param "CGIInterpreter".
-	  "/usr/bin/env ruby" thing does not work under non-Unix boxes.
-
-Sat Oct  2 00:42:20 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* marshal.c (r_byte): retrieve pointer from string value for each
-	  time.  [ruby-dev:24404]
-
-	* marshal.c (r_bytes0): ditto.
-
-	* enum.c (sort_by_i): re-entrance check added.  [ruby-dev:24399]
-
-	* io.c (io_read): should freeze all reading buffer.
-	  [ruby-dev:24400]
-
-	* string.c (rb_str_sum): should use bignums when bits is greater
-	  than or equals to sizeof(long)*CHAR_BITS. [ruby-dev:24395]
-
-	* eval.c (specific_eval): defer pointer retrieval to prevent
-	  unsafe sourcefile string modification.  [ruby-dev:24382]
-
-	* string.c (rb_str_sum): wrong cast caused wrong result.
-	  [ruby-dev:24385]
-
-	* enum.c (enum_sort_by): hide temporary array from
-	  ObjectSpace.each_object.  [ruby-dev:24386]
-
-	* string.c (rb_str_sum): check was done with false pointer.
-	  [ruby-dev:24383]
-
-	* string.c (rb_str_sum): string may be altered.  [ruby-dev:24381]
-
-Thu Oct  2 00:25:21 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* lib/rubygems/installer.rb:  Use formatted program name when comparing
+	  executables.  RubyGems pull request #471
+	* test/rubygems/test_gem_installer.rb:  Test for the above.
 
-	* signal.c (ruby_signal_name): adjust to the prototype.
+	* lib/rubygems/package.rb:  Use more explicit feature check to work
+	  around JRuby bug #552
 
-	* process.c (pst_inspect): ditto.
+	* lib/rubygems/ssl_certs/GeoTrust_Global_CA.pem:  Added GeoTrust root
+	  certificate.
 
-	* ext/etc/etc.c (etc_getgrent, Init_etc): typo.
+	* test/rubygems/test_gem_source_list.rb:  Use "example" instead of real
+	  hostname
 
-Wed Oct  1 20:49:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Feb 28 05:57:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* gc.c (heaps): manage slots and limits together.  [ruby-dev:21453]
+	* thread.c: rdoc formatting for Thread, ThreadGroup, and ThreadError
 
-	* gc.c (add_heap): should not clear heaps slot even if realloc()
-	  failed.
+Thu Feb 28 02:42:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Wed Oct  1 20:36:49 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* vm.c: Typo in overview for example of Thread#status returning false
+	  Reported by Lee Jarvis
 
-	* MANIFEST: add wince/mkconfig_wce.rb.
+Wed Feb 27 22:54:27 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Oct  1 17:22:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/rubysocket.h (union_sockaddr): make it longer for SunOS
+	  and Darwin.
 
-	* ext/etc/etc.c: add new functions: setpwent, getpwent, endpwent,
-	  setgrent, getgrent, endgrent.
+Wed Feb 27 21:14:34 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-	* ext/socket/socket.c (sock_s_gethostbyname): do not reverse lookup.
+	* lib/rexml/security.rb (REXML::Security): create.
+	* lib/rexml/rexml.rb: move entity_expansion_limit and
+	  entity_expansion_text_limit accessors to ...
+	* lib/rexml/security.rb: ... here.
+	* lib/rexml/document.rb: use REXML::Security.
+	* lib/rexml/text.rb: use REXML::Security.
+	* test/rexml/test_document.rb: use REXML::Security.
 
-Wed Oct  1 17:01:30 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Wed Feb 27 19:53:32 2013  Benoit Daloze  <eregontp@gmail.com>
 
-	* eval.c (rb_load): Object scope had priority over required file
-	  scope.  [ruby-dev:21415]
+	* vm.c (Thread): fix typos in overview
 
-Wed Oct  1 14:09:53 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+Wed Feb 27 13:21:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* wince/mkconfig_wce.rb: sorry, forget to commit.
+	* vm.c (Thread): Typo in overview, swap setting and getting
 
-Wed Oct  1 10:08:42 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+Wed Feb 27 13:02:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* wince/setup.mak: add sigmarionIII SDK support.
+	* vm.c (Thread): Documentation overview of Thread class
 
-	* wince/Makefile.sub: ditto.
+Wed Feb 27 12:57:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* wince/mkexports.rb: fix linker error in SH4.
+	* thread.c (rb_thread_wakeup): rdoc formatting
 
-	* wince/mkconfig_wce.rb: camouflage RUBY_PLATFORM for compiling ext.
+Wed Feb 27 12:53:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Wed Oct  1 08:02:52 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
+	* thread.c (rb_thread_group): rdoc formatting
 
-	* wince/time_wce.c (time): add zero check.
+Wed Feb 27 12:33:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Sep 30 16:11:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/ostruct.rb: Typo in OpenStruct overview [Github Fixes #251]
+	  Patch by Chun-wei Kuo
 
-	* Makefile.in: copy lex.c from $(srcdir) if it's not the current
-	  directory.  [ruby-dev:21437]
+Wed Feb 27 12:13:32 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Tue Sep 30 11:29:23 2003  Tanaka Akira  <akr@m17n.org>
+	* vm_exec.h (END_INSN): llvm-gcc may optimize out reg_cfp and cause
+	  Stack/cfp consistency error when the instruction doesn't use reg_cfp.
+	  Usually instructions use PUSH() but for example trace doesn't.
+	  This hack cause speed down but you shouldn't use llvm-gcc, use clang.
+	  [Bug #7938]
 
-	* process.c (pst_inspect): describe stopped process "stopped".
+Wed Feb 27 10:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Sep 30 09:31:56 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* thread.c (thread_raise_m): rdoc formatting
 
-	* test/runner.rb: glob for directories.
+Tue Feb 26 23:32:44 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Tue Sep 30 09:11:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rexml/document.rb: move entity_expansion_limit accessor to ...
+	* lib/rexml/rexml.rb: ... here for consistency.
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit):
+	  deprecated.
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_limit=):
+	  deprecated.
 
-	* eval.c (rb_eval): while/until should not capture break unless
-	  they are destination of the break.
+Tue Feb 26 23:26:13 2013  Kouhei Sutou  <kou@cozmixng.org>
 
-Tue Sep 30 03:12:02 2003  Minero Aoki  <aamine@loveruby.net>
+	* lib/rexml/document.rb: move entity_expansion_text_limit accessor to ...
+	* lib/rexml/rexml.rb: ... here to make rexml/text independent from
+	  REXML::Document. It causes circular require.
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
+	  deprecated.
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit=):
+	  deprecated.
+	* lib/rexml/text.rb: add missing require "rexml/rexml" for
+	  REXML.entity_expansion_text_limit.
+	  Reported by Robert Ulejczyk. Thanks!!! [ruby-core:52895] [Bug #7961]
 
-	* lib/net/http.rb (finish): revert to 1.93.
+Tue Feb 26 15:12:11 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/pop.rb (finish): revert to 1.60.
+	* tool/mkconfig.rb: reconstruct comma separated list values.  a
+	  command line to Windows batch file is split not only by spaces
+	  and equal signs but also by commas and semicolons.
 
-	* lib/net/smtp.rb (finish): revert to 1.67.
+Tue Feb 26 15:04:19 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/http.rb (do_start): ensure to close socket if failed to
-	  start session.
+	* configure.in (unexpand_shvar): get rid of non-portable shell
+	  behavior on OpenBSD, so no extra quotes.  [Bug #7959]
 
-	* lib/net/pop.rb (do_start): ditto.
+Tue Feb 26 10:24:49 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/smtp.rb (do_start): ditto.
+	* parse.y (IS_LABEL_POSSIBLE): allow labels for keyword arguments just
+	  after method definition without a parenthesis.  [ruby-core:52820]
+	  [Bug #7942]
 
-	* lib/net/smtp.rb: SMTP#started? wrongly returned false always.
+Tue Feb 26 04:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Sep 30 02:54:49 2003  Minero Aoki  <aamine@loveruby.net>
+	* error.c: clarify reason for sleep in SignalException example
 
-	* test/ruby/test_iterator.rb: new test
-	  test_break__nested_loop[123].
+Tue Feb 26 03:47:00 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Mon Sep 29 23:39:13 2003  Minero Aoki  <aamine@loveruby.net>
+	* error.c: clarify a document of SignalException. Process.kill()
+	  doesn't have any guarantee when signal will be delivered.
+	  [Bug #7951] [ruby-core:52864]
 
-	* lib/net/http.rb (finish): does not raise IOError even if
-	  !started?, to allow closing socket which was opened before
-	  session started.
+Mon Feb 25 23:51:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/pop.rb (finish): ditto.
+	* include/ruby/version.h: bump RUBY_API_VERSION same as RUBY_VERSION.
 
-	* lib/net/smtp.rb (finish): ditto.
+Mon Feb 25 21:03:34 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Mon Sep 29 19:06:51 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* string.c (str_byte_substr): don't set coderange if it's not known.
+	  [Bug #7954] [ruby-dev:47108]
 
-	* ext/win32ole/extconf.rb: add windows.h checking.
-	  (ruby-bugs:PR#1185)
+Mon Feb 25 16:47:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Sep 29 16:18:30 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* common.mk (realclean-local): miniprelude.c is made by srcs, so it
+	  should not removed by distclean but by realclean.  [Bug #6807]
 
-	* lib/logger.rb: check if the given logdevice object respond_to :write
-	  and :close, not is_a? IO.  duck duck.
+Mon Feb 25 16:30:30 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* test/logger/test_logger.rb: self IO.pipe reading/writing may be
-	  locked by the flood.  use tempfile.
+	* lib/rubygems/config_file.rb:  Lazily load .gem/credentials to only
+	  check permissions when necessary.  RubyGems bug #465
+	* test/rubygems/test_gem_config_file.rb:  Test for the above.
 
-	* lib/wsdl/xmlSchema/data.rb: wrong constant reference.
-
-Mon Sep 29 16:11:23 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb: clean up temporary symlink.
-	  Patched by NaHi.  [ruby-dev:21420]
-
-Mon Sep 29 11:16:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_thread_atfork): wrong format specifier.
-	  [ruby-dev:21428]
-
-	* process.c (pst_inspect): better description.
-
-Mon Sep 29 02:31:44 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/utils.rb (Utils::su): use setgid and setuid to
-	  set real and effective IDs. and setup group access list by
-	  initgroups.
-
-Sun Sep 28 11:14:19 2003  Koji Arai  <jca02266@nifty.ne.jp>
-
-	* ext/digest/digest.c (Init_digest): `copy_object' was deprecated.
-	  `initialize_copy' should be defined.
-
-	* ext/stringio/stringio.c (Init_stringio): ditto.
-
-Sat Sep 27 18:25:13 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/xsd/charset.rb: XSD::Charset.is_ces did return always true under
-	  $KCODE = "NONE" environment.  check added.
-
-	* test/xsd/test_xsd.rb: add tests for above fix.
-
-Sat Sep 27 15:58:50 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/rpc/cgistub.rb: make logging severity threshold higher.
-
-	* lib/soap/rpc/standaloneServer.rb: defer WEBrick server start to give
-	  a chance to reset logging severity threshold.
-
-	* test/soap/calc/test_*, test/soap/helloworld/test_helloworld.rb: run
-	  silent.
-
-Sat Sep 27 09:44:18 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/test_fileutils.rb: clear all errors on Windows.
-	  [ruby-dev:21417]
-
-	* test/fileutils/test_nowrite.rb: ditto.
-
-Mon Sep 27 09:14:03 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* array.c (rb_ary_delete): comparison may change the capacity.
-	  [ruby-dev:24348]
-
-	* array.c (rb_ary_fill): fill should honor length argument.
-	  [ruby-dev:24346]
-
-	* array.c (rb_ary_replace): should not use ptr from shared array.
-	  [ruby-dev:24345]
-
-	* ext/socket/socket.c (s_accept): don't retry for EWOULDBLOCK.
-	  [ruby-talk:113807]
-
-Sat Sep 27 04:57:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_file.rb: new file.  only asserts unlink-before-close
-	  behaviour now.
-
-	* test/soap/marshal/test_digraph.rb: should close before unlink.
-	  unlink-before-close pattern is not needed here.
-
-Sat Sep 27 03:32:37 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/soap/*, test/wsdl/*, test/xsd/*: move TestCase classes into
-	  each module namespace.  TestMarshal in
-	  test/soap/marshal/test_marshal.rb crashed with
-	  test/ruby/test_marshal.rb.
-
-Sat Sep 27 01:30:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/socket/socket.c (ruby_connect): on win32, type of the 4th
-	  argument of getsockopt is char *.
-
-Fri Sep 26 18:35:40 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/resolv-replace.rb: 1.8 compliance.  [ruby-talk:82946]
-
-Fri Sep 26 17:39:27 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_marshal.rb: add test for ruby's objects.
-
-Fri Sep 26 09:52:44 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* defines.h (flush_register_windows): use volatile only for gcc on
-	  Solaris.  [ruby-dev:21403]
-
-	* lib/mkmf.rb (xsystem): use system directly to honor shell meta
-	  charaters.
-
-Fri Sep 26 00:10:13 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/README: updated.
-
-Thu Sep 25 17:48:10 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
-	  rb_protect.
-
-	* ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful
-	  value.
-
-Thu Sep 25 09:00:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* lib/ostruct.rb: Added OpenStruct#==.
-
-	* test/ostruct/test_ostruct.rb: Added.
-
-Thu Sep 25 07:55:26 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* ext/win32ole/win32ole.c, ext/openssl/ossl_pkey_dsa.c,
-	  ext/openssl/ossl_pkey_rsa.c, ext/bigdecimal/bigdecimal.h: must
-	  not use C++ or C99 style comment yet.  (ruby-bugs:PR#1184)
-
-Thu Sep 25 00:23:22 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* MANIFEST: add SOAP4R.
-
-Thu Sep 25 00:13:15 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/soap/* (29 files): SOAP4R added.
-
-	* lib/wsdl/* (42 files): WSDL4R added.
-
-	* lib/xsd/* (12 files): XSD4R added.
-
-	* test/soap/* (16 files): added.
-
-	* test/wsdl/* (2 files): added.
-
-	* test/xsd/* (3 files): added.
-
-	* sample/soap/* (27 files): added.
-
-	* sample/wsdl/* (13 files): added.
-
-Wed Sep 24 02:08:11 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpservlet/cgihandler.rb: conform to mswin32.
-	  [ruby-talk:82735], [ruby-talk:82748], [ruby-talk:82818]
-
-Tue Sep 23 23:10:16 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb: add Logger#<<(msg) for writing msg without any
-	  formatting.
-
-	* test/logger/test_logger.rb: ditto.
-
-Tue Sep 23 20:47:51 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (rb_warn_m): should not warn if -W0 is specified.
-	  [ruby-talk:82675]
-
-Mon Sep 22 21:28:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* MANIFEST: updated.
-
-Mon Sep 22 19:22:26 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* configure.in (AC_CHECK_FUNCS): add setuid and setgid.
-
-Mon Sep 22 12:34:55 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* util.c (ruby_strtod): skip preceding zeros before counting
-	  digits in the mantissa. (ruby-bugs:PR#1181)
-
-Sun Sep 21 04:12:36 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): the argument
-	  should be a String.
-
-	* ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): ditt.
-
-	* ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): ditto.
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_initialize): ditto.
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto.
-
-Sat Sep 20 11:49:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb: typo fixed.
-
-	* test/logger/test_logger.rb: new file.
-
-Fri Sep 19 11:39:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
-
-	* test/testunit/*: Added.
-
-	* lib/test/unit.rb: Documentation update.
-
-	* lib/test/unit/ui/console/testrunner.rb (TestRunner#initialize):
-	  Ditto.
-
-	* lib/test/unit.rb: Factored out an ObjectSpace collector.
-
-	* lib/test/unit/collector/objectspace.rb: Ditto.
-
-	* sample/testunit/*: Added.
-
-Fri Sep 19 01:00:48 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/log.rb (BasicLog#log): get rid of as ineffectual
-	  condition.
-
-	* lib/webrick/log.rb (BasicLog#format): add "\n" to message.
-
-Thu Sep 18 22:43:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (proc_invoke): should push PROT_PCALL tag for orphans.
-
-	* eval.c (proc_invoke): should update "result" for orphans.
-
-Thu Sep 18 20:33:03 2003  Tietew  <tietew-ml-ruby-list@tietew.net>
-
-	* parse.y (str_xquote): do not prepend escapes in
-	  backqoute literals.  [ruby-list:38409]
-
-Thu Sep 18 20:30:17 2003  Tanaka Akira  <akr@m17n.org>
-
-	* lib/pathname.rb: update document.
-
-Thu Sep 18 15:27:05 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/logger.rb: new file.  Logger, formerly called devel-logger or
-	  Devel::Logger.
-
-	* sample/logger/*: new file.  samples of logger.rb.
-
-Wed Sep 17 23:41:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (localjump_destination): should not raise ThreadError
-	  exception for "break". [ruby-dev:21348]
-
-	* eval.c (proc_invoke): use result instead of prot_tag->retval.
-	  retval is no longer propagated to the ancestors.
-
-Wed Sep 17 20:34:00 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* parse.y (tokadd_string, parse_string, yylex): escaped terminator
-	  is now interpreted as is.  [ruby-talk:82206]
-
-Wed Sep 17 18:52:36 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/fileutils/fileassertions.rb: new file.
-
-	* test/fileutils/test_fileutils.rb: new file.
-
-	* test/fileutils/test_nowrite.rb: new file.
-
-Wed Sep 17 18:51:02 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/strscan/test_stringscanner.rb: require test/unit.
-
-Wed Sep 17 18:35:34 2003  Minero Aoki  <aamine@loveruby.net>
-
-	* test/strscan/test_stringscanner.rb: new file.
-
-Wed Sep 17 18:03:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl: all files are reviewed to simplify and avoid memory leak.
-
-	* ext/openssl/extconf.rb: add check for assert.h.
-
-	* ext/openssl/ossl.c (ossl_buf2str): new function to convert
-	  C buffer to String and free buffer.
-
-	* ext/openssl/ossl.c (ossl_x509_ary2sk): new function to convert
-	  Array of OpenSSL::X509 to STACK_OF(X509) with exception safe.
-
-	* ext/openssl/ossl.c (ossl_to_der, ossl_to_der_if_possible): new
-	  functions to convert object to DER string.
-
-	* ext/openssl/ossl.h: ditto.
-
-	* ext/openssl/ossl_bio.c (ossl_membio2str): new function to convert
-	  BIO to String object and free BIO.
-
-	* ext/openssl/ossl_bio.h: ditto.
-
-	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_to_der): add for "to_der".
-
-	* ext/openssl/ossl_x509name.c (ossl_x509name_to_der): ditto.
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509ext_to_der): ditto.
-
-	* ext/openssl/ossl_x509ext.c (create_ext_from_array): removed
-	  and reimplement in openssl/x509.rb.
-
-	* ext/openssl/ossl_x509attr.c: reimplemented and disable some
-	  method temporarily. this class doesn't work fine without ASN.1
-	  data support;-) I'll rewrite in near future.
-
-	* ext/openssl/lib/openssl/x509.c (X509::Attribute): get rid off
-	  unused code.
-
-	* ext/openssl/lib/openssl/x509.c (X509::ExtensionFactory): refine all.
-
-Tue Sep 16 22:25:06 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/csv/test_csv.rb: add negative tests of row_sep.
-
-Tue Sep 16 18:02:36 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* regex.c (re_compile_pattern): should not translate character
-	  class range edge. [ruby-list:38393]
-
-Tue Sep 16 16:47:56 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* MANIFEST: add test/csv/mac.csv.
-
-	* win32/Makefile.sub, bcc32/Makefile.sub (test): add phony NUL target.
-
-Mon Sep 15 19:02:52 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* lib/csv.rb: add extra pamameter to specify row(record) separater
-	  character.  To parse Mac's CR separated CSV, do like this.
-	    CSV.open("mac.csv", "r", ?,, ?\r) { |row| p row.to_a }
-	  The 3rd parameter in this example ?, is for column separater and the
-	  4th ?\r is for row separater.  Row separater is nil by default.  Nil
-	  separater means "\r\n" or "\n".
-
-	* test/csv/test_csv.rb: add tests for above feature.
-
-	* test/csv/mac.csv: added.  Sample CR separated CSV file.
-
-Fri Sep 12 22:41:48 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
-
-	* ext/openssl/ossl.c: move ASN.1 stuff to ossl_asn1.[ch]
-
-	* ext/openssl/ossl.c: move BIO stuff to ossl_bio.[ch]
-
-	* ext/openssl/ossl_asn1.[ch]: new files
-
-	* ext/openssl/ossl_bio.[ch]: new files
-
-Fri Sep 12 12:30:41 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* intern.h (rb_disable_super, rb_enable_super): replace with dummy
-	  expressions instead of prototypes.  the functions remain yet for
-	  binary compatibility.  [ruby-talk:81758]
-
-Fri Sep 12 12:09:54 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* bignum.c (rb_big_and): convert argument using 'to_int'.
-
-	* bignum.c (rb_big_or): ditto.
-
-	* bignum.c (rb_big_xor): ditto.
-
-Fri Sep 12 07:06:14 2003  David Black  <dblack@superlink.net>
-
-	* lib/scanf.rb: Took out useless @matched_item variable; some small
-	  refactoring.
-
-Thu Sep 11 08:43:44 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* eval.c (rb_f_require): allow "require" on $SAFE>0, if feature
-	  name is not tainted.
-
-	* lib/rexml/parsers/baseparser.rb (REXML::Parsers::BaseParser::stream):
-	  Supports StringIO.
-
-Wed Sep 10 22:47:30 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.h: add a workaround for win32 platform.
-	  libeay32.dll doesn't export functions defined in conf_api.h.
-
-	* ext/openssl/ossl_config.c (ossl_config_initialize): ditto.
-
-	* ext/openssl/ossl_config.c (ossl_config_add_value): ditto.
-
-	* ext/openssl/ossl_config.c (set_conf_section_i): should check
-	  if the argument is Array.
-
-Wed Sep 10 22:41:54 2003  Tietew  <tietew@tietew.net>
-
-	* eval.c (win32_get_exception_list): avoid VC7 warning.
-	  [ruby-win32:577]
-
-Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (struct tag): dst should be VALUE.
-
-Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (localjump_destination): stop at the scope where the current
-	  block was created.  [ruby-dev:21353]
-
-Tue Sep  9 05:17:04 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
-
-Tue Sep  9 02:41:35 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
-
-	* ext/openssl/ossl_config.c: Refine compatibility.
-
-Tue Sep  9 01:50:45 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/httpserver.rb (HTTPServer#access_log): add "\n" to
-	  the message.
-
-	* lib/webrick/log.rb (BasicLog#log): add "\n" only if needed.
-
-Mon Sep  8 22:15:33 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tk/lib/multi-tk.rb: modify security check at creating
-	  a new interpreter
-
-Mon Sep  8 20:00:12 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb, lib/optparse/version.rb: search also all
-	  capital versions.
-
-Mon Sep  8 19:26:33 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ossl.h: include openssl/conf.h and openssl/conf_api.h.
-
-	* ext/openssl/ossl_config.c: refine all with backward compatibility.
-
-	* ext/openssl/ossl_config.h: export GetConfigPtr() and DupConfigPtr().
-
-	* ext/openssl/ossl_x509.c: added new constants under X509 module.
-	  DEFAULT_CERT_AREA, DEFAULT_CERT_DIR, DEFAULT_CERT_FILE,
-	  DEFAULT_CERT_DIR_ENV, DEFAULT_CERT_FILE_ENV and DEFAULT_PRIVATE_DIR.
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509extfactory_free): don't free
-	  the members of the struct. it's left to GC.
-
-	* ext/openssl/ossl_x509ext.c (ossl_x509_set_config): add for config=.
-
-	* ext/openssl/ossl_x509ext.c (Xossl_x509extfactory_initialize):
-	  add attr readers: issuer_certificate, subject_certificate,
-	  subject_request, crl and config.
-
-Mon Sep  8 18:26:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* lib/webrick/accesslog.rb (AccessLog::setup_params): use req.port
-	  instead of config[:Port] or req.request_uri.port.
-
-	* lib/webrick/httprequest.rb (HTTPRequest#meta_vars): ditto.
-
-	* lib/webrick/httpservlet/filehandler.rb (FileHandler#dir_list): ditto.
-
-	* lib/webrick/config.rb: :Listen option never be used.
-
-	* lib/webrick/server.rb (GenericServer#initialize): don't use :Listen
-	  option and add warning message.
-
-	* lib/webrick/log.rb (BasicLog#<<): shortcut of log(INFO, ...).
-
-	* lib/webrick/httpserver.rb (HTTPServer#accesslog): use << for logging.
-
-Sun Sep  7 16:08:28 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
-
-	* ext/tcltklib/tcltklib.c (lib_mainloop_core): fixed signal-trap bug
-
-	* ext/tk/lib/*.rb : Ruby/Tk works at $SAFE == 4
-
-Sat Sep  6 02:26:34 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_*.rb: assert_same, assert_match, and so on.
-
-Sat Sep  6 18:45:46 2003  Mauricio Fernandez  <batsman.geo@yahoo.com>
-
-	* parse.y (assignable): call rb_compile_error(), not rb_bug().
-	  [ruby-core:01523]
-
-Sat Sep  6 17:40:41 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/ruby_missing.c: rid of unnecessary backward
-	  compatibility stuff. and remove DEFINE_ALLOC_WRAPPER from
-	  all sources.
-
-	* ext/openssl/ossl_x509ext.c (X509::Extension.new): new method.
-
-	* ext/openssl/ossl_x509ext.c (X509::Extension#oid=): new method.
-
-	* ext/openssl/ossl_x509ext.c (X509::Extension#value=): new method.
-
-	* ext/openssl/ossl_x509ext.c (X509::Extension#critical=): new method.
-
-Sat Sep  6 01:23:22 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
-
-	* win32/win32.c (CreateChild): need to quote cmd if RUBYSHELL is set.
-
-	* win32/win32.c (CreateChild): fix condition about whether to call
-	  shell or not.
-
-Sat Sep  6 00:36:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
-
-	* Makefile.in (test): phony target.
-
-	* lib/mkmf.rb (have_library, find_library): configure by library
-	  name.
-
-	* lib/optparse.rb (OptionParser#order, #permute, #parse): allow an
-	  array as argument.
-
-	* test/ruby/test_*.rb: moved invariants to left side in
-	  assert_equal, and use assert_nil, assert_raises and so on.
-
-	* win32/win32.c (isInternalCmd): distinguish command.com and
-	  cmd.exe.
-
-	* win32/win32.c (make_cmdvector): a character just after wildcard
-	  was ignored.  [ruby-core:01518]
-
-Fri Sep  5 20:27:08 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_*.rb: replace 'assert(a == b)' with assert_equal(a, b)'
-
-Fri Sep  5 18:00:51 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
-
-	* ext/openssl/lib/openssl/x509.rb: new method X509::Name::parse.
-
-	* ext/openssl/ossl_digest.c: add ossl_digest_new().
-
-	* ext/openssl/ossl_digest.h: ditto.
-
-	* ext/openssl/ossl_cipher.c: add ossl_cipher_new().
-
-	* ext/openssl/ossl_cipher.h: ditto.
-
-Fri Sep  5 15:32:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): should not
-	  search delimiter forward if found in backward.
-
-Fri Sep  5 13:32:48 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/runner.rb: arguments should be keys.
-
-Fri Sep  5 12:09:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
-
-	* test/ruby/test_system.rb (test_system): check existence of ruby
-	  interpreter.
-
-Fri Sep  5 11:32:17 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* lib/optparse.rb (--version): fix assignment/reference order.
-
-	* lib/optparse.rb (OptionParser#help): new; OptionParser#to_s may
-	  be deprecated in future.
-
-	* lib/optparse/version.rb (OptionParser#show_version): hide Object.
-
-	* test/runner.rb: fix optparse usage.
-
-	* test/runner.rb: glob all testsuits if no tests given.
-
-Fri Sep  5 10:42:58 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/runner.rb: added.  gets testcases from command line and runs it.
-
-	* test/ruby/test_gc.rb: remove useless part which was for dumping test
-	  result.
-
-Fri Sep  5 09:28:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
-
-	* test/ruby/test_gc.rb: added.  splitter.rb which I made to split
-	  sample/test.rb into test/ruby/test_* kindly removed GC test (the
-	  last section in the original test) to reduce things to be worried.
-
-Fri Sep  5 03:00:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* test/ruby/test_iterator.rb (test_block_in_arg): add no block
-	  given tests.
-
-	* test/ruby/test_iterator.rb (test_ljump): uncomment LocalJumpError
+	* test/rubygems/test_gem_commands_push_command.rb:  Remove duplicated
 	  test.
 
-Fri Sep  5 01:10:11 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Feb 25 15:47:18 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test/ruby: tests for ruby itself.
+	* enc/depend (ARFLAGS): VisualC++ linker does not allow spaces between
+	  output option and the output file name.  [Bug #7950]
 
-	* test/ruby/test_*.rb: split sample/test.rb into 28 test/unit testcases.
-	  some tests could not be translates...  search '!!' mark to see it.
+	* enc/depend (RANLIB): set default command to do nothing, or make the
+	  entire line a label on Windows.
 
-	* test/csv/test_csv.rb: should require 'csv', not '../lib/csv'.  test
-	  runner should set load path correctly.
+Mon Feb 25 14:41:07 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Sep  5 01:03:59 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/mkmf.rb (MakeMakefile#init_mkmf): default libdirname to libdir.
 
-	* test/csv/test_csv.rb: close opened files for CSV::IOBuf explicitly.
-	  opened file cannot be removed under win32 box.
+	* tool/rbinstall.rb: ditto.
 
-Thu Sep  4 23:59:40 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Mon Feb 25 13:12:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* parse.y (tokadd_string): newlines have no special meanings in
-	  %w/%W, otherwise they are ignored only when interpolation is
-	  enabled.  [ruby-dev:21325]
+	* configure.in (setup): find Setup file from target_os 1. by
+	  suffix (e.g. Setup.nacl, Setup.atheos), 2. by "platform"
+	  option (e.g. Setup.nt, Setup.emx), and 3. default Setup.  And
+	  Setup.dj had been removed.
 
-Thu Sep  4 19:38:25 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Feb 25 12:48:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/io/wait/.cvsignore: added.
+	* thread.c: Document Thread::new, clean up ::fork and mention calling
+	  super if subclassing Thread
 
-	* ext/openssl/.cvsignore: added.
+Mon Feb 25 12:38:50 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Sep  4 19:28:24 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/socket/extconf.rb: don't test ss_family and ss_len member of
+	  struct sockaddr_storage.  They are not used now except SunOS
+	  specific code.
 
-	* sample/openssl: added.  Sample of standard distribution library
-	  should be locate in sample/{module_name}/*.
+Mon Feb 25 11:03:38 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/openssl/sample/*: removed.  move to sample/openssl/*.
+	* configure.in (unexpand_shvar): Use the numeric comparison
+	  operator instead of '==' which is a ksh extension. [Bug #7941]
 
-Thu Sep  4 18:02:15 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Mon Feb 25 02:37:56 2013  Tanaka Akira  <akr@fsij.org>
 
-	* test/csv/test_csv.rb: use remove_const to reduce warnings.  use
-	  Dir.tmpdir to locate working files.
+	* ext/socket: define and use union_sockaddr instead of struct
+	  sockaddr_storage for less casts.
 
-Thu Sep  4 17:41:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/rubysocket.h (union_sockaddr): defined.
 
-	* misc/ruby-mode.el (ruby-here-doc-beg-re): underscore also is
-	  valid delimiter.
+	* ext/socket/socket.c (sock_accept): use union_sockaddr.
+	  (sock_accept_nonblock): ditto.
+	  (sock_sysaccept): ditto.
+	  (sock_s_getnameinfo): ditto.
 
-	* misc/ruby-mode.el (ruby-here-doc-end-match): must quote
-	  arbitrary string to use as regexp.
+	* ext/socket/basicsocket.c (bsock_getsockname): ditto.
+	  (bsock_getpeername): ditto.
+	  (bsock_local_address): ditto.
+	  (bsock_remote_address): ditto.
 
-	* misc/ruby-mode.el (ruby-font-lock-maybe-here-docs): must not
-	  call `ruby-here-doc-end-match' unless `ruby-here-doc-beg-re'
-	  matched.
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): ditto.
 
-Thu Sep  4 15:40:07 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* ext/socket/init.c (recvfrom_arg): ditto.
+	  (recvfrom_blocking): ditto.
+	  (rsock_s_recvfrom): ditto.
+	  (rsock_s_recvfrom_nonblock): ditto.
+	  (rsock_getfamily): ditto.
 
-	* test/csv/test_csv.rb: run on test/unit original layer.
+	* ext/socket/raddrinfo.c (rb_addrinfo_t): ditto.
+	  (ai_get_afamily): ditto.
+	  (inspect_sockaddr): ditto.
+	  (addrinfo_mdump): ditto.
+	  (addrinfo_mload): ditto.
+	  (addrinfo_getnameinfo): ditto.
+	  (addrinfo_ip_port): ditto.
+	  (extract_in_addr): ditto.
+	  (addrinfo_ipv6_to_ipv4): ditto.
+	  (addrinfo_unix_path): ditto.
 
-Thu Sep  4 12:54:50 2003  why the lucky stiff  <why@ruby-lang.org>
+	* ext/socket/tcpserver.c (tcp_accept): ditto.
+	  (tcp_accept_nonblock): ditto.
+	  (tcp_sysaccept): ditto.
 
-	* ext/syck/token.c: headerless documents with root-level spacing now
-	  honored.
+	* ext/socket/ipsocket.c (ip_addr): ditto.
+	  (ip_peeraddr): ditto.
+	  (ip_s_getaddress): ditto.
 
-Thu Sep  4 00:06:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Sun Feb 24 21:15:05 2013  Tadayoshi Funaba  <tadf@dotrb.org>
 
-	* eval.c (mark_frame_adj): need to adjust argv pointer if using
-	  system's alloca. [ruby-core:01503]
+	* ext/date/date_core.c: [ruby-core:52303]
 
-Wed Sep  3 21:33:20 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+Sun Feb 24 15:33:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* test: add test directory.  Test::Unit aware testcases and needed
-	  files should be located in this directory.  dir/file name convention;
-	    test/{module_name}/test_{testcase_name}.rb
-	    test/{module_name}/{needed_files}
-	  someday, someone will write testrunner which searches test_*.rb and
-	  run testcases automatically.
+	* random.c (rb_random_ulong_limited): limit is inclusive, but generic
+	  rand method should return a number less than it, so increase for the
+	  difference.  [ruby-core:52779] [Bug #7935]
 
-	* test/csv/*: add testcase for lib/csv.rb.
+Sun Feb 24 15:32:36 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Wed Sep  3 01:37:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* random.c (rb_random_ulong_limited): limit is inclusive, but generic
+	  rand method should return a number less than it, so increase for the
+	  difference.  [ruby-core:52779] [Bug #7935]
 
-	* io.c (rb_f_gets): should call next_argv() before type check
-	  current_file. [ruby-list:38336]
+Sun Feb 24 15:14:43 2013  Eric Hodel  <drbrain@segment7.net>
 
-Tue Sep  2 20:37:15 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* lib/net/http.rb:  Removed duplicate Accept-Encoding in Net::HTTP#get.
+	  [ruby-trunk - Bug #7924]
+	* test/net/http/test_http.rb:  Test for the above.
 
-	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): warning
-	  for skipping server verification.
+Wed Feb 20 14:28:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Sep  2 23:36:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* thread.c: Document ThreadGroup::Default
 
-	* eval.c (proc_invoke): should retrieve retval when pcall is true.
+Wed Feb 20 14:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Sep  2 14:09:20 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* thread.c: Grammar for #backtrace_locations and ::handle_interrupt
 
-	* ext/socket/extconf.rb: check s6_addr8 in in6_addr (Tru64 UNIX).
-	  the patch is submitted by nmu <nmu@users.sourceforge.jp>.
+Sun Feb 24 13:35:57 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/socket/getaddrinfo.c (getaddrinfo): should use in6_addr8 on
-	  some platforms.
+	* vm_insnhelper.c (vm_call_method): block level control frame does not
+	  have method entry, so obtain the method entry from method top-level
+	  control frame to be compared with refined method entry.
+	  [ruby-core:52750] [Bug #7925]
 
-	* ext/socket/getnameinfo.c (getnameinfo): ditto.
+Wed Feb 20 13:23:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Tue Sep  2 14:02:19 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* object.c: Document methods receiving string and convert to symbol
+	  Patch by Stefan Rusterholz
+	* vm_eval.c: ditto
+	* vm_method.c: ditto
 
-	* ext/tcltklib/tcltklib.c (ip_invoke): fixed bug on passing a exception
+Wed Feb 20 07:20:56 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* ext/tk/lib/{tk.rb, tkcanvas.rb, tkfont.rb, tktext.rb} :
-	  bug fix and improvement of font control
+	* signal.c (sigsegv): suppress unused result warning. Because
+	  write(2) is marked __warn_unused_result__ on Linux glibc.
 
-Tue Sep  2 09:51:36 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 24 07:50:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_eval): should not handle exceptions within rescue
-	  argument.  [ruby-talk:80804]
+	* compile.c (iseq_set_arguments): no keyword check if any keyword rest
+	  argument exists, even unnamed.  [ruby-core:52744] [Bug #7922]
 
-Tue Sep  2 00:44:37 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 23 16:51:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* re.c (rb_memsearch): fix overrun.  [ruby-talk:80759]
+	* thread.c: Documentation for Thread#backtrace_locations
 
-Tue Sep  2 00:41:27 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 23 16:05:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/iconv/iconv.c (map_charset): use lower case keys.
+	* vm.c: Typo in ObjectSpace::WeakMap overview
 
-	* ext/iconv/iconv.c (iconv_fail): just yield error and return the
-	  result if a block is given.
+Sat Feb 23 16:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/iconv/iconv.c (iconv_convert): yield error and append the
-	  result if a block is given.
+	* thread.c: Improved rdoc for ::handle_interrupt, ::pending_interrupt?
+	  and #pending_interrupt?
 
-	* ext/iconv/charset_alias.rb (charset_alias): optional third
-	  argument.
-
-	* ext/iconv/charset_alias.rb (charset_alias): use CP932 instead of
-	  SHIFT_JIS on cygwin.
-
-Mon Sep  1 18:34:25 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
-
-	* eval.c (rb_eval): make tail recursion in ELSE clause of
-	  RESCUE a jump.
+Sat Feb 23 12:26:43 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Mon Sep  1 18:00:02 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* misc/ruby-electric.el (ruby-electric-curlies)
+	  (ruby-electric-matching-char, ruby-electric-bar): Avoid electric
+	  insertion when there is a prefix argument.
 
-	* parse.y (aref_args): forgot to call NEW_SPLAT(). reported by
-	  Dave Butcher.
+	* misc/ruby-electric.el (ruby-electric-insert)
+	  (ruby-electric-cua-replace-region-p)
+	  (ruby-electric-cua-replace-region): Avoid electric insertion and
+	  fall back when cua-mode is enabled and a region is active.
 
-	* eval.c (Init_Thread): protect thgroup_default.  suggested by Guy
-	  Decoux in [ruby-talk:80623]
+Sat Feb 23 12:35:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Mon Sep  1 16:59:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* array.c: Document #<=> return values and formatting
+	* bignum.c: ditto
+	* file.c: ditto
+	* object.c: ditto
+	* numeric.c: ditto
+	* rational.c: ditto
+	* string.c: ditto
+	* time.c: ditto
 
-	* eval.c (rb_thread_switch): add RESTORE_EXIT; exit by another
-	  thread termination.
+Sat Feb 23 10:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* eval.c (rb_thread_start_0): should not error_print() within
-	  terminated thread, because $stderr used by it might be
-	  overriden now.  [ruby-dev:21280]
+	* array.c (rb_ary_diff, rb_ary_and, rb_ary_or): Document return order
+	  [RubySpec #7803]
 
-Sun Aug 31 22:46:55 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Feb 23 10:17:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* eval.c (TAG_DST()): take no argument.
+	* object.c (rb_obj_comp): Documenting Object#<=> return values
+	  Patch by Stefan Rusterholz
 
-	* process.c (p_gid_sw_ensure): return VALUE.
+Sat Feb 23 09:48:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Aug 31 22:27:10 2003  Hidetoshi NAGAI  <nagai@dumbo.ai.kyutech.ac.jp>
+	* dir.c (file_s_fnmatch, fnmatch_brace): encoding-incompatible pattern
+	  and string do not match, instead of exception.  [ruby-dev:47069]
+	  [Bug #7911]
 
-	* process.c (p_gid_sw_ensure): lack of function type
+Sat Feb 23 08:57:46 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-Sun Aug 31 12:25:06 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+	* doc/NEWS-*: Update NEWS from their respective branches
 
-	* lib/optparse.rb: --version takes an optional argument; "all" or
-	  a list of package names.
+Sat Feb 23 08:14:43 2013  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
 
-Sun Aug 31 10:17:02 2003  Tadayoshi Funaba  <tadf@dotrb.org>
+	* NEWS: many additions for Ruby 2.0.0
 
-	* lib/date/format.rb: yyyy/mm is not an acceptable format.
+	* object.c: Add doc for Module.prepended
 
-	* lib/time.rb: follow above.
+Sat Feb 23 07:52:53 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Aug 30 14:25:43 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* template/ruby.pc.in: reorder library flags which may refer library
+	  names.  [Bug #7913]
 
-	* eval.c (rb_iter_break): should not call TAG_JUMP directly.
+Fri Feb 22 23:46:20 2013  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
 
-Sat Aug 30 03:58:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
+	  fix a typo in comment in r39384.
 
-	* eval.c (struct BLOCK): remove BLOCKTAG, use scope instead.
+Fri Feb 22 18:31:46 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* eval.c (POP_TAG): no longer propagate retval.  retval is now set
-	  directly by localjump_destination().
+	* lib/rexml/document.rb (REXML::Document.entity_expansion_text_limit):
+	  new attribute to read/write entity expansion text limit.  the default
+	  limit is 10Kb.
 
-	* eval.c (localjump_destination): new function to cast
-	  return/break local jump.
+	* lib/rexml/text.rb (REXML::Text.unnormalize): check above attribute.
 
-	* eval.c (rb_yield_0): stop TAG_RETURN/TAG_BREAK escaping.
+Fri Feb 22 17:36:23 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-Fri Aug 29 22:35:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* test/test_rbconfig.rb (TestRbConfig): fix r39372.
+	  It must see RbConfig::CONFIG instead of CONFIG.
 
-	* bigdecimal.c *.html: The 2nd arg. for add,sub,mult, and div is 0,
-	  then result will be the same as +,-,*,/ respectively.
+Fri Feb 22 14:55:41 2013  Naohisa Goto  <ngotogenome@gmail.com>
 
-Fri Aug 29 17:30:15 2003  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+	* signal.c (ruby_abort): fix typo in r39354 [Bug #5014]
 
-	* process.c: bug fix
+Fri Feb 22 12:46:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* process.c: add rb_secure(2) to methods of Process::{UID,GID,Sys}
+	* random.c (rb_random_ulong_limited): fix error message for negative
+	  value.  [ruby-dev:47061] [Bug #7903]
 
-	* process.c: deny handling IDs during evaluating the block given to
-	  the Process::{UID,GID}.switch method
+Fri Feb 22 11:36:45 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c : some methods have no effect if on slave-IP
+	* test/test_rbconfig.rb (TestRbConfig): skip user defined values by
+	  configuration options.  [Bug #7902]
 
-	* ext/tcltklib/tcltklib.c : can create a interpreter without Tk
+Fri Feb 22 11:33:42 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/tcltklib/tcltklib.c : bug fix on handling exceptions
+	* lib/mkmf.rb (MakeMakefile#init_mkmf): adjust default library path
+	  for multiarch.  [Bug #7874]
 
-	* ext/tcltklib/MANUAL.euc : modify
+Fri Feb 22 11:10:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/tk/lib/tk.rb : freeze some core modules
+	* enum.c (Enumerable#chunk: Improved examples, grammar, and formatting
+	  Patch by Dan Bernier and Rich Bruchal of newhaven.rb
+	  [Github documenting-ruby/ruby#8]
 
-	* ext/tk/lib/multi-tk.rb : more secure
+Fri Feb 22 11:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/tk/lib/tk.rb: TkVariable.new(array) --> treat the array as the
-	  Tk's list
+	* numeric.c: Examples and formatting for Numeric and Float
+	  Based on a patch by Zach Morek and Oren K of newhaven.rb
+	  [Github documenting-ruby/ruby#5]
 
-	* ext/tk/lib/tk.rb: improve accessibility of TkVariable object
+Fri Feb 22 07:04:41 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tkfont.rb, ext/tk/lib/tkcanvas.rb,
-	  ext/tk/lib/tktext.rb : fix bug of font handling
+	* lib/rubygems/installer.rb (build_extensions):  Create extension
+	  install destination before building extension.  Patch by Kenta Murata.
+	  [ruby-trunk - Bug #7897]
+	* test/rubygems/test_gem_installer.rb:  Test for the above.
 
-	* ext/tk/lib/tkfont.rb TkFont.new() accepts compound fonts
+Fri Feb 22 06:30:57 2013  Eric Hodel  <drbrain@segment7.net>
 
-Thu Aug 28 22:07:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* doc/globals.rdoc:  Document what setting $DEBUG does.
 
-	* variable.c (rb_autoload_load): call const_missing if autoloading
-	  constant is not defined to allow hook.
+	* doc/globals.rdoc:  Added pointer to $-d for full documentation.
 
-	* eval.c (rb_eval): use rb_const_get_from() instead of
-	  rb_const_get_at().
+Fri Feb 22 06:27:07 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* eval.c (is_defined): forgot to check NODE_COLON3.
+	* doc/globals.rdoc:  Document what setting $VERBOSE does.  [Bug #7899]
 
-Thu Aug 28 17:30:24 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* doc/globals.rdoc:  Added pointer to $-w and $-v for full
+	  documentation.
 
-	* variable.c (rb_const_get_0): should check constants defined in
-	  included modules, if klass is Object. [ruby-talk:79302]
+Fri Feb 22 02:33:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* numeric.c (check_uint): check should be done using UINT_MAX, not
-	  INT_MAX. this fix is submitted by Lyle Johnson
-	  <lyle@knology.net> in [ruby-core:01486]
+	* lib/abbrev.rb: Add words parameter to Abbrev::abbrev
+	  Patch by Devin Weaver [Github documenting-ruby/ruby#7]
 
-Thu Aug 28 05:02:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Feb 21 17:28:14 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* parse.y (singleton): typo fixed (ruby-bugs-ja:PR#562)
+	* tool/merger.rb: add interaction when only ChangeLog is modified.
 
-Thu Aug 28 02:37:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Thu Feb 21 16:34:46 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (rb_eval): *a = [1,2] now assigns [[1,2]] to a.
-	  consistent with *a = [1], which set [[1]] to a.
+	* signal.c (check_stack_overflow): extract duplicated code and get rid
+	  of declaration-after-statement.  [Bug #5014]
 
-	* node.h: merge NODE_RESTARY to NODE_SPLAT.
+Thu Feb 21 14:14:13 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* parse.y: rules simplified a bit by removing NODE_RESTARY.
+	* signal.c (sigsegv): avoid to use async signal unsafe functions
+	  when nested sigsegv is happen.
+	  [Bug #5014] [ruby-dev:44082]
 
-	* sample/test.rb: updated for new assignment behavior.
+Thu Feb 21 13:47:59 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Wed Aug 27 22:33:24 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* file.c (rb_group_member): added an error check. SUS says,
+	  getgroups(small_value) may return EINVAL.
 
-	* error.c (rb_bug): should not use other methods; this function is
-	  not for ordinary use.  [ruby-dev:21259]
+Thu Feb 21 13:37:07 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Wed Aug 27 15:07:57 2003  Minero Aoki  <aamine@loveruby.net>
+	* process.c (RB_MAX_GROUPS): moved to
+	* internal.h (RB_MAX_GROUPS): here.
 
-	* lib/net/smtp.rb (check_response): AUTH CRAM-MD5 returns 334
-	  response. [ruby-list:38279]
+	* file.c (rb_group_member): use RB_MAX_GROUPS instead of
+	  RUBY_GROUP_MAX. They are the same.
 
-Wed Aug 27 05:10:15 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+Thu Feb 21 13:15:40 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* win32/win32.c (map_errno): support winsock error.
+	* file.c (access_internal): removed.
+	* file.c (rb_file_readable_real): use access() instead of
+	  access_internal().
+	* file.c (rb_file_writable_real): ditto.
+	* file.c (rb_file_executable_real): ditto.
 
-	* win32/win32.c (pipe_exec, CreateChild, poll_child_status, waitpid,
-	  kill, link, rb_w32_rename, unixtime_to_filetime, rb_w32_utime):
-	  pass errno to map_errno().
+Thu Feb 21 13:04:59 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-	* win32/win32.c (rb_w32_select, rb_w32_accept, rb_w32_bind,
-	  rb_w32_connect, rb_w32_getpeername, rb_w32_getsockname,
-	  rb_w32_getsockopt, rb_w32_ioctlsocket, rb_w32_listen, rb_w32_recv,
-	  rb_w32_recvfrom, rb_w32_send, rb_w32_sendto, rb_w32_setsockopt,
-	  rb_w32_shutdown, rb_w32_socket, rb_w32_gethostbyaddr,
-	  rb_w32_gethostbyname, rb_w32_gethostname, rb_w32_getprotobyname,
-	  rb_w32_getprotobynumber, rb_w32_getservbyname, rb_w32_getservbyport,
-	  rb_w32_fclose, rb_w32_close): use map_errno().
+	* file.c (eaccess): use access() when not using setuid nor setgid.
+	  This is minor optimization.
 
-	* win32/win32.h: add winsock errors.
+Thu Feb 21 12:56:19 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Tue Aug 26 23:53:23 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* file.c (rb_group_member): get rid of NGROUPS dependency.
+	  [Bug #7886] [ruby-core:52537]
 
-	* lib/ostruct.rb (OpenStruct::method_missing): prohibit modifying
-	  frozen OpenStruct. [ruby-talk:80214]
+Thu Feb 21 12:45:03 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Tue Aug 26 20:03:50 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ruby.c (ruby_init_loadpath_safe): try two levels upper for stripping
+	  libdir name.  [Bug #7874]
 
-	* lib/mkmf.rb (create_tmpsrc): add the hook for source.
-	  [ruby-list:38122]
+	* configure.in (libdir_basename): expand with multiarch in configure,
+	  not to defer the expansion till ruby.pc.in and mkmf.rb.  [Bug #7874]
 
-Tue Aug 26 15:59:53 2003  why the lucky stiff  <why@ruby-lang.org>
+	* configure.in (libdir_basename): also -rpath and -install_name flags
+	  are affected when libruby directory changes.  [Bug #7874]
 
-	* implicit.c (syck_type_id_to_taguri): corrected detection of
-	  x-private types.
+Wed Feb 20 19:27:02 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sun Aug 24 01:02:48 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* include/ruby/ruby.h (HAVE_RB_SCAN_ARGS_OPTIONAL_HASH): for
+	  rb_scan_args() optional hash feature.  [Bug #7861]
 
-	* file.c (file_expand_path): performance improvement.
-	  [ruby-talk:79748]
+Wed Feb 20 18:02:26 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Sat Aug 23 23:41:16 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in (target_os): do not strip -gnu suffix on Linux if
+	  --target is given explicitly.  [Bug #7874]
 
-	* file.c (rb_file_s_expand_path): avoid calling rb_scan_args() for
-	  apparent cases. [ruby-talk:79748]
+	* configure.in (libdirname): adjust library path name which libruby
+	  files will be installed.  [Bug #7874]
 
-Sat Aug 23 18:56:53 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* tool/rbinstall.rb (libdir): ditto.
 
-	* ext/nkf/nkf.c (rb_nkf_putchar): should use rb_str_resize() to just
-	  resize a string, rb_str_cat() disallows NULL.  [ruby-dev:21237]
+Wed Feb 20 13:37:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Sat Aug 23 16:48:41 2003  Keiju Ishitsuka  <keiju@ishitsuka.com>
+	* ext/pty/pty.c: Documentation for the PTY module
 
-	* lib/irb/ruby-lex.rb: bug fix for "foo" !~ /bar/. [ruby-talk:79942]
+Wed Feb 20 12:18:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Sat Aug 23 15:59:58 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* object.c: Document Data class [Bug #7890] [ruby-core:52549]
+	  Patch by Matthew Mongeau
 
-	* eval.c (rb_eval, rb_iterate, block_pass): reduce PUSH/POP_TAG and
-	  EXEC_TAG() for retry.  [ruby-dev:21216]
+Wed Feb 20 11:50:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Sat Aug 23 02:32:33 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* lib/mutex_m.rb: Add rdoc for Mutex_m module
 
-	* eval.c (rb_yield_splat): should check if "values" is array.
+Wed Feb 20 09:34:43 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* enum.c (each_with_index_i): typo.
+	* lib/rubygems/commands/update_command.rb:  Create the installer after
+	  options are processed.  [ruby-trunk - Bug #7779]
+	* test/rubygems/test_gem_commands_update_command.rb:  Test for the
+	  above.
 
-Fri Aug 22 17:07:05 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Wed Feb 20 07:51:19 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* enum.c (inject_i): use rb_yield_values.
+	* lib/rubygems/installer.rb:  Use gsub instead of gsub! to avoid
+	  altering @bin_dir.  Fixes tests on windows.  [ruby-trunk - Bug #7885]
 
-	* enum.c (each_with_index_i): ditto.
+Tue Feb 19 20:50:00 2013  Kenta MURATA  <mrkn@mrkn.jp>
 
-	* eval.c (rb_yield_splat): new function to call "yield *values".
+	* ext/bigdecimal/bigdecimal.gemspec: bump to 1.2.0.
+	  [ruby-core:51777] [Bug #7761]
 
-	* string.c (rb_str_scan): use rb_yield_splat().
+Tue Feb 19 13:07:25 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-Fri Aug 22 06:13:22 2003  why the lucky stiff  <why@ruby-lang.org>
+	* ext/syslog/syslog.c (Init_syslog): Define inspect as a singleton
+	  method and remove it as an instance method. [Bug #6502]
 
-	* ext/syck/rubyext.c: refactoring of the transfer method
-	  dispatch.  added yaml_org_handler for faster dispatch of
-	  transfers to base types.
+Tue Feb 19 12:30:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/yaml/rubytypes.rb: removed handling of builtins from
-	  Ruby library.
+	* object.c: rdoc formatting for Kernel#Array()
+	* array.c: Add rdoc for Array() method to Creating Arrays section
 
-	* ext/syck/token.c: quoted and block scalars are now implicit !str
+Tue Feb 19 10:35:52 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/syck/implicit.c: empty string detected as !null.
+	* ext/openssl/ossl.c (class OpenSSL):  Use only inner parenthesis in
+	  create_extension examples.
 
-Fri Aug 22 01:00:31 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb 19 10:27:12 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* eval.c (block_pass): improve passing current block.
+	* ext/openssl/ossl.c (class OpenSSL):  Fixed ExtensionFactory example.
+	  Patch by Richard Bradley.  [ruby-trunk - Bug #7551]
 
-Fri Aug 22 00:13:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Tue Feb 19 08:32:11 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/bigdecimal/bigdecimal.c: Int. overflow bug in multiplication
-	  fixed, and VpNmlz() speed up.
+	* vm_eval.c (vm_call0_body): check interrupts after method dispatch
+	  from C methods. [Bug #7878]
 
-Wed Aug 20 16:44:49 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Feb 19 08:14:40 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/socket/socket.c (ruby_connect): many systems seem to have
-	  a problem in select() after EINPROGRESS.  [ruby-list:38080]
+	* lib/rubygems/installer.rb:  Fixed placement of executables with
+	  --user-install.  [ruby-trunk - Bug #7779]
+	* test/rubygems/test_gem_installer.rb:  Test for above.
 
-Wed Aug 20 01:31:17 2003  why the lucky stiff  <why@ruby-lang.org>
+Tue Feb 19 06:04:06 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/syck/syck.h: Parser definition problems on HP-UX.
-	  [ruby-talk:79389]
+	* vm_dump: FreeBSD ports' libexecinfo's backtrace(3) can't trace
+	  beyond signal trampoline, and as described in r38342 it can't
+	  trace on -O because it see stack frame pointers.
+	  libunwind unw_backtrace see dwarf information in the binary
+	  and it works with -O (without frame pointers).
 
-	* ext/syck/handler.c (syck_hdlr_get_anchor): Memory leak.
+	* configure.in: remove r38342's hack and check libunwind.
 
-	* ext/syck/syck.s (syck_io_file_read): Bad arguments to fread.
+Tue Feb 19 04:26:29 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/syck/rubyext.c: Tainting issues.
+	* configure.in: check whether backtrace(3) works well or not.
 
-Tue Aug 19 23:20:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* vm_dump.c: set HAVE_BACKTRACE 0 if BROKEN_BACKTRACE.
 
-	* ext/bigdecimal/bigdecimal.c .h .html: to_s("+") implemented.
+Mon Feb 18 16:30:18 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/bigdecimal/lib/bigdecimal/math.rb: E implemented.
+	* lib/ipaddr.rb (IPAddr#in6_addr): Fix a typo with the closing
+	  parenthesis.
 
-Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Mon Feb 18 12:32:24 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* lib/webrick/ssl.rb: new file; SSL/TLS enhancement for GenericServer.
+	* lib/ipaddr.rb (IPAddr#in6_addr): Fix the parser so that it can
+	  recognize IPv6 addresses with only one edge 16-bit piece
+	  compressed, like [::2:3:4:5:6:7:8] or [1:2:3:4:5:6:7::].
+	  [Bug #7477]
 
-	* lib/webrick/https.rb: SSLSocket handling is moved to webrick/ssl.rb.
+Mon Feb 18 10:09:54 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/webrick/compat.rb (File::fnmatch): remove old migration code.
+	* configure.in (unexpand_shvar): regularize a shell variable by
+	  unexpanding shell variables in it.
 
-	* lib/webrick/httpserver.rb (HTTPServer#run): ditto.
+Sun Feb 17 20:55:44 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/webrick/server.rb (GenericServer#listen): the body of this
-	  method is pull out as Utils::create_lisnteners.
+	* compar.c (rb_invcmp): compare by inversed comparison, with preventing
+	  from infinite recursion.  [ruby-core:52305] [Bug #7870]
 
-	* lib/webrick/utils.rb (Utils::create_lisnteners): new method.
+	* string.c (rb_str_cmp_m), time.c (time_cmp): get rid of infinite
+	  recursion.
 
-	* lib/webrick/server.rb (GenericServer#start): should rescue
-	  unknown errors. and refine comments.
+Sun Feb 17 17:23:22 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): should close
-	  socket if SSLSocket raises error.
+	* lib/mkmf.rb: remove extra topdir in VPATH, which was in
+	  win32/Makefile.sub for some reason and moved from there.
+	  [ruby-dev:46998] [Bug #7864]
 
-Tue Aug 19 11:19:33 2003  Shugo Maeda  <shugo@ruby-lang.org>
+Sun Feb 17 01:19:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* io.c (next_argv): should not call GetOpenFile() if rb_stdout is
-	  not a IO (T_FILE).
+	* ext/psych/lib/psych/y.rb: Document Kernel#y by Adam Stankiewicz
+	  [Github tenderlove/psych#127]
 
-Tue Aug 19 07:47:09 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Sun Feb 17 00:52:14 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* ext/openssl/ossl_ssl.c: sync_close is moved to SSLSocket as
-	  a builtin.
+	* tool/mkconfig.rb: remove prefix from rubyarchdir.
+	  r39267 expands variables, it changes expansion timing,
+	  breaks RbConfig::CONFIG["includedir"] and building
+	  extension libraries with installed ruby.
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#close): ditto.
+Sat Feb 16 20:51:17 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* ext/openssl/lib/openssl/buffering.rb (Buffering#puts): should
-	  add a return to the tails of each line.
+	* vm.c (ENV_IN_HEAP_P): fix off-by-one error.
 
-	* ext/openssl/lib/openssl/ssl.rb: new class OpenSSL::SSL::SSLServer.
+Sat Feb 16 20:47:16 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/openssl/lib/net/protocols.rb (SSLIO#ssl_connect): use sync_close.
+	* configure.in (LIBRUBY_DLDFLAGS): Fix a bug where --with-opt-dir
+	  options given were not reflected to LIBRUBY_DLDFLAGS on many
+	  platforms including Linux and other GNU-based systems, NetBSD,
+	  AIX and BeOS.
 
-	* ext/openssl/sample/echo_svr.rb: use SSLServer.
+Sat Feb 16 20:43:20 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/openssl/sample/echo_cli.rb: add example of SSLSocket#sync_close.
+	* ext/socket/ancdata.c (rsock_recvmsg): ignore truncated part of
+	  socket address returned from recvmsg().
 
-Tue Aug 19 01:24:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/init.c (recvfrom_blocking): ignore truncated part of
+	  socket address returned from recvfrom().
+	  (rsock_s_recvfrom_nonblock): ditto.
 
-	* ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): Mac OS X standard
-	  headers are inconsistent at this macro.  [ruby-core:01432]
+Sat Feb 16 20:05:26 2013  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
 
-	* ext/curses/extconf.rb: check if _XOPEN_SOURCE_EXTENDED breaks.
+	* test/ruby/test_thread.rb: fixed typo
+	  patched by Hiroki Matsue via https://github.com/ruby/ruby/pull/248
 
-	* ext/tcltklib/stubs.c: Status macro in X11/Xthreads.h bothers
-	  winspool.h
+Sat Feb 16 16:08:35 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* instruby.rb: make list at first instead of iterator.
-	  [ruby-talk:79347]
+	* vm.c (rb_thread_mark): mark a working Proc of bmethod
+	  (a method defined by define_method) even if the method was removed.
+	  We could not trace working Proc object which represents the body
+	  of bmethod if the method was removed (alias/undef/overridden).
+	  Simply, it was mark miss.
+	  This patch by Kazuki Tsujimoto. [Bug #7825]
 
-Mon Aug 18 11:23:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	  NOTE: We can brush up this marking because we do not need to mark
+	  `me' on each living control frame. We need to mark `me's
+	  only if `me' was free'ed. This is future work after Ruby 2.0.0.
 
-	* dir.c (glob_helper): preserve raw order for **.
+	* test/ruby/test_method.rb: add a test.
 
-Sun Aug 17 23:39:55 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 16 15:45:56 2013  Koichi Sasada  <ko1@atdot.net>
 
-	* ext/openssl/extconf.rb (HAVE_VA_ARGS_MACRO): need to compile.
-
-Sun Aug 17 17:10:03 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* proc.c (rb_binding_new_with_cfp): create binding object even if
+	  the frame is IFUNC. But return a ruby-level binding to keep
+	  compatibility.
+	  This patch fix degradation introduced from r39067.
+	  [Bug #7774] [ruby-dev:46960]
 
-	* ext/openssl/lib/openssl/ssl.rb (SSLSocket#sync_close=): add a
-	  method to specify if the underlying IO will be closed in
-	  SSLSocket#close.
+	* test/ruby/test_settracefunc.rb: add a test.
 
-	* ext/openssl/lib/openssl/buffering.rb: add forwarders to
-	  setsockopt, getsockopt and fcntl.
+Sat Feb 16 13:40:13 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/openssl/lib/net/protocols.rb: enable sync for SSLSocket.
+	* configure.in (shvar_to_cpp): do not substitute exec_prefix itself
+	  with RUBY_EXEC_PREFIX, which cause recursive definition.
+	  [ruby-core:52296] [Bug #7860]
 
-Sun Aug 17 11:32:04 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 16 13:13:04 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/extmk.rb (extmake): should not force to remake Makefile when
-	  installation and so on.
+	* ext/io/console/io-console.gemspec: bump to 0.4.2.  now explicitly
+	  requires ruby 1.9.3 or later.  [Bug #7847]
 
-Sat Aug 16 23:58:18 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/io/console/console.c (console_dev): compatibility with ruby 1.8.
 
-	* marshal.c (w_symbol, w_object): get rid of warnings.
+	* ext/io/console/console.c (rawmode_opt, console_dev): compatibility
+	  with ruby 1.9.  [ruby-core:52220] [Bug #7847]
 
-	* re.c (rb_memsearch): ditto.
+Sat Feb 16 12:45:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* time.c (time_dump): ditto.
+	* configure.in: unexpand arch sitearch and exec_prefix values, so
+	  directly specified bindir, libdir, rubyprefix, etc can be properly
+	  substituted.  [ruby-core:52296] [Bug #7860]
 
-	* ext/extmk.rb (extmake): not continue making when extconf.rb
-	  failed.
+Sat Feb 16 12:15:20 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
-	* ext/openssl/extconf.rb: check __VA_ARGS__ macro more precisely.
+	* parse.y: add dtrace probe for symbol create.
 
-	* ext/openssl/ossl.h: remove version.h dependency.
+	* probes.d: ditto
 
-	* ext/openssl/ruby_missing.h: ditto.
+Sat Feb 16 09:27:37 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (pkg_config): use --libs output except with
-	  only-L for other options.  [ruby-list:38099]
+	* ext/socket/extconf.rb: don't test sys/feature_tests.h which is not
+	  used now.
+	  It was included in r7901 as "bug of gcc 3.0 on Solaris 8 ?".
 
-	* lib/mkmf.rb (create_makefile): separate rule for static
-	  library from shared object.
+Sat Feb 16 09:24:37 2013  Tanaka Akira  <akr@fsij.org>
 
-	* win32/Makefile.sub, bcc32/Makefile.sub, wince/Makefile.sub:
-	  define exec_prefix and libdir.
+	* ext/socket/extconf.rb: reorder header tests to consider inclusion
+	  order in rubysocket.h.
 
-Fri Aug 15 23:15:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Sat Feb 16 08:42:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/bigdecimal/bigdecimal.c .h: Bug in combination of limit & div
-	  method fixed.
+	* configure.in, ext/socket/extconf.rb: test netinet/in_systm.h in
+	  ext/socket/extconf.rb instead of configure.in.
 
-	* ext/bigdecimal/lib/bigdecimal/math.rb: atan() & sqrt() added.
+	  Originally, netinet/in_systm.h is included for NextStep, OpenStep,
+	  and Rhapsody.  [ruby-core:1596]
 
-Fri Aug 15 12:01:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sat Feb 16 07:55:40 2013  Tanaka Akira  <akr@fsij.org>
 
-	* configure.in (HUGE_ST_INO): check whether struct stat.st_ino
-	  is larger than long.  [ruby-dev:21194]
-	  http://www.geocities.co.jp/SiliconValley-PaloAlto/1409/ruby/beos.html
+	* configure.in: don't test xti.h here.
 
-	* error.c (syserr_eqq): errno might exceed Fixnum limit.
+	* ext/socket/extconf.rb: test xti.h here.
 
-	* error.c (Init_Exception): moved base initialization from
-	  init_syserr().
+	  Originally, xti.h is included for IRIX [ruby-core:14447].
 
-	* inits.c (rb_call_inits): postpone initializing errnos until
-	  Bignum is available.
+Sat Feb 16 07:16:49 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Aug 15 12:01:43 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/extconf.rb: test struct sockaddr_un and its member,
+	  sun_len.
 
-	* ext/curses/curses.c (_XOPEN_SOURCE_EXTENDED): needed to let
-	  keyname() and so on be declared.
+	* ext/socket/sockport.h (INIT_SOCKADDR_UN): new macro defined.
 
-	* ext/curses/curses.c (curses_resizeterm, window_resize):
-	  arguments conflicted with macros in term.h.
+	* ext/socket/socket.c (sock_s_pack_sockaddr_un): use INIT_SOCKADDR_UN.
 
-	* ext/curses/curses.c (Curses module methods): ensure
-	  initialized.  [ruby-dev:21191]
+	* ext/socket/unixsocket.c (rsock_init_unixsock): ditto.
 
-Fri Aug 15 02:08:53 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/raddrinfo.c (init_unix_addrinfo): ditto.
+	  (addrinfo_mload): ditto.
 
-	* gc.c (id2ref): recycle check should be done by klass == 0.
-	  [ruby-core:01408]
+Sat Feb 16 07:05:59 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Aug 15 01:34:23 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
+	* ext/socket/sockport.h (INIT_SOCKADDR_IN): don't need family
+	  argument.  it is always AF_INET.
 
-	* ext/openssl/ossl_pkey.c: move generate_cb here
+	* ext/socket/raddrinfo.c (make_inetaddr): follow INIT_SOCKADDR_IN
+	  change.
+	  (addrinfo_ipv6_to_ipv4): ditto.
 
-	* ext/openssl/ossl_pkey_{dh|dsa|rsa}.c: adapt to this cb
+Sat Feb 16 04:21:07 2013  NAKAMURA Usaku  <usa@ruby-lang.org>
 
-	* ext/openssl/openssl_missing.[ch]: add (0.9.6x, x<j) missing BN funcs
+	* ext/socket/extconf.rb: workaround for mswin/mingw build problem.
+	  sendmsg emulation in win32/win32.c is not enough.
 
-	* ext/openssl/ossl_bn.c: use supplied funcs from openssl_missing.c
+Sat Feb 16 00:19:20 2013  Tanaka Akira  <akr@fsij.org>
 
-Fri Aug 15 00:38:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* ext/socket/extconf.rb: use all all tested available headers for
+	  have_func.
 
-	* ext/bigdecimal/bigdecimal.c: Bug in div method fixed.
+Fri Feb 15 22:21:37 2013  Akinori MUSHA  <knu@iDaemons.org>
 
-	* ext/bigdecimal/lib/bigdecimal/math.rb: Newly added.
+	* configure.in: Fix a bug introduced in r38342 that the cflagspat
+	  substitution is messed up by the way CFLAGS and optflags are
+	  modified, which affected FreeBSD and NetBSD/amd64 when
+	  configured to use libexecinfo.  This bug resulted in CFLAGS and
+	  CXXFLAGS in RbConfig::CONFIG having warnflags expanded in them,
+	  forcing third-party C/C++ extensions to follow what warnflags
+	  demands, like ANSI/ISO-C90 conformance.  ref [Bug #7101]
 
-	* ext/bigdecimal/sample/pi.rb: Changed so as to use math.rb.
+Fri Feb 15 20:29:11 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Aug 14 21:19:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/sockport.h (SET_SIN_LEN): defined for strict-aliasing
+	  rule.
+	  (INIT_SOCKADDR_IN): ditto.
 
-	* eval.c (Init_Thread): Continuation#[] added.  [ruby-talk:79028]
+	* ext/socket/raddrinfo.c (make_inetaddr): use INIT_SOCKADDR_IN.
+	  (addrinfo_ipv6_to_ipv4): ditto.
 
-Thu Aug 14 20:03:34 2003  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
+Fri Feb 15 18:24:48 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/win32ole/win32ole.c (OLE_FREE): should not call
-	  ole_message_loop.
+	* lib/mkmf.rb (MakeMakefile#try_run): bail out explicitly if cross
+	  compiling, because it cannot work of course.
 
-	* ext/win32ole/win32ole.c (ole_event_free): ditto.
+Fri Feb 15 12:34:58 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/win32ole/win32ole.c (ole_initialize): stop calling
-	  OleUninitialize at exit.
+	* ext/socket/extconf.rb: test struct sockaddr_storage directly.
 
-Thu Aug 14 11:27:37 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/socket/rubysocket.h: use HAVE_TYPE_STRUCT_SOCKADDR_STORAGE.
 
-	* gc.c (rb_data_object_alloc): check type of 1st argument.
-	  [ruby-dev:21192]
+Fri Feb 15 12:26:13 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Aug 14 00:21:14 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/getaddrinfo.c (GET_AI): don't cast 1st argument for
+	  INIT_SOCKADDR.
 
-	* parse.y (mlhs_node): should allow "::Foo" (colon3) as lhs.
+Fri Feb 15 08:12:11 2013  Tanaka Akira  <akr@fsij.org>
 
-	* parse.y (lhs): ditto.
+	* ext/socket/sockport.h (SET_SS_LEN): removed.
+	  (SET_SIN_LEN): removed.
+	  (INIT_SOCKADDR): new macro.
 
-	* parse.y (yylex): should return tCOLON3 right after kCLASS.
-	  [ruby-talk:78918]
+	* ext/socket/ancdata.c (extract_ipv6_pktinfo): use INIT_SOCKADDR.
 
-	* error.c (exc_initialize): was converting argument to string too
-	  eagerly.  Only check was needed. [ruby-talk:78958]
+	* ext/socket/raddrinfo.c (make_inetaddr): use INIT_SOCKADDR.
+	  (addrinfo_ipv6_to_ipv4): ditto.
 
-Wed Aug 13 23:31:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+	* ext/socket/getaddrinfo.c (GET_AI): use INIT_SOCKADDR.
 
-	* ext/bigdecimal/bigdecimal.c .h .html: Ambiguity of
-	  BigDecimal::limit removed.
+Fri Feb 15 07:49:27 2013  Eric Hodel  <drbrain@segment7.net>
 
-Wed Aug 13 19:21:34 2003  Christian Neukirchen  <chneukirchen@yahoo.de>
+	* lib/rdoc.rb:  Update to release version of 4.0.0
 
-	* lib/webrick/https.rb (HTTPServer#run): should set syncing-mode
-	  to SSLSocket. [ruby-talk:78919]
+	* lib/rubygems.rb:  Update to release version of 2.0.0
 
-Wed Aug 13 18:13:49 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Feb 15 07:07:27 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (POP_BLOCK): turn on BLOCK_LEFT flag when leaving block.
+	* ext/socket/sockport.h (SA_LEN): removed because unused now.
+	  (SS_LEN): ditto.
+	  (SIN_LEN): ditto.
 
-	* eval.c (proc_invoke): unpack return/break destination when block
-	  is already left.
+Thu Feb 14 10:45:31 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Wed Aug 13 15:58:31 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* test/ruby/test_process.rb (test_setsid): Added a workaround for
+	  MacOS X. Patch by nagachika. [Bug #7826] [ruby-core:52126]
 
-	* object.c (rb_class_s_alloc): add function prototype to avoid VC++
-	  warning.
+Fri Feb 15 00:15:31 2013  Tanaka Akira  <akr@fsij.org>
 
-Wed Aug 13 13:50:59 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* ext/socket/sockport.h (VALIDATE_SOCKLEN): new macro to validate
+	  sa_len member of 4.4BSD socket address.
 
-	* ext/Win32API/Win32API.c (Win32API_initialize): should pass some
-	  class to first argument of Data_Wrap_Struct(). (ruby-bugs:PR#1109)
+	* ext/socket/getnameinfo.c (getnameinfo): use VALIDATE_SOCKLEN,
+	  instead of SA_LEN.
 
-Tue Aug 12 16:55:11 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* ext/socket/socket.c (sock_s_getnameinfo): use VALIDATE_SOCKLEN
+	  instead of SS_LEN.
 
-	* Makefile.in: static link libraries to LIBRUBY_SO with static linked
-	  ext.  [ruby-dev:21157]
+Thu Feb 14 22:25:54 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/extmk.rb (extmake): sort extension library initialization order.
+	* ext/socket/socket.c (sockaddr_len): extracted from sockaddr_obj.
+	  (sockaddr_obj): add an argument to length of socket address.
+	  (socket_s_ip_address_list): call sockaddr_obj with actual socket
+	  address length if given, use sockaddr_len otherwise.
 
-	* ext/extmk.rb (extmake): compact $extlibs.
+Thu Feb 14 20:11:23 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Aug 12 02:48:56 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket: always operate length of socket address companion with
+	  socket address.
 
-	* eval.c (THREAD_SAVE_CONTEXT): should explicitly turn off the
-	  flag before calling getcontext(2).
+	* ext/socket/rubysocket.h (rsock_make_ipaddr): add an argument for
+	  socket address length.
+	  (rsock_ipaddr): ditto.
 
-	* eval.c (struct thread): add member to save backing store on
-	  IA64. (ruby-bugs PR1086)
+	* ext/socket/ipsocket.c (ip_addr): pass length to rsock_ipaddr.
+	  (ip_peeraddr): ditto.
+	  (ip_s_getaddress): pass length to rsock_make_ipaddr.
 
-	* eval.c (thread_mark): mark IA64 backing store region.
+	* ext/socket/socket.c (make_addrinfo): pass length to rsock_ipaddr.
+	  (sock_s_getnameinfo): pass actual address length to rb_getnameinfo.
+	  (sock_s_unpack_sockaddr_in): pass length to rsock_make_ipaddr.
 
-	* eval.c (thread_free): free saved IA64 backing store.
+	* ext/socket/init.c (rsock_s_recvfrom): pass length to rsock_ipaddr.
+	  (rsock_s_recvfrom_nonblock): ditto.
 
-	* eval.c (rb_thread_save_context): save IA64 backing store as well.
+	* ext/socket/tcpsocket.c (tcp_sockaddr): pass length to
+	  rsock_make_ipaddr.
 
-	* eval.c (rb_thread_restore_context): restore IA64 backing store.
+	* ext/socket/raddrinfo.c (make_ipaddr0): add an argument for socket
+	  address length.  pass the length to rb_getnameinfo.
+	  (rsock_ipaddr): ditto.
+	  (rsock_make_ipaddr): add an argument for socket address length.
+	  pass the length to make_ipaddr0.
+	  (make_inetaddr): pass length to make_ipaddr0.
+	  a local variable renamed.
+	  (host_str): a local variable renamed.
+	  (port_str): ditto.
 
-	* eval.c (THREAD_ALLOC): initialize IA64 members.
+Thu Feb 14 14:31:43 2013  Eric Hodel  <drbrain@segment7.net>
 
-Mon Aug 11 22:31:50 2003  NAKAMURA, Hiroshi  <nahi@ruby-lang.org>
+	* lib/net/http.rb:  Removed OpenSSL dependency from Net::HTTP.
 
-	* lib/debug.rb(debug_command): inspection command should inspect
-	  resulting value even if it's nil.  [ruby-dev:21180] by OMAE, jun
-	  <jun66j5@ybb.ne.jp>.
+	* test/net/http/test_http.rb:  Remove Zlib dependency from tests.
+	* test/net/http/test_http_request.rb:  ditto.
 
-	* lib/debug.rb(debug_command): incomplete regexp.
+Thu Feb 14 11:08:15 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Mon Aug 11 17:33:07 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* class.c (include_modules_at): detect cyclic prepend with original
+	  method table.  [ruby-core:52205] [Bug #7841]
 
-	* eval.c (rb_call_super): do not use rb_block_given_p() for
-	  check. [ruby-talk:78656]
+Thu Feb 14 10:30:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* eval.c (BEGIN_CALLARGS): push ITER_NOT only when ITER_PRE.
+	* vm_method.c: call method_removed hook on called class, not on
+	  prepending iclass.  [ruby-core:52207] [Bug #7843]
 
-Sun Aug 10 10:43:05 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+Thu Feb 14 10:05:57 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* ext/openssl/lib/openssl/buffering.rb: increase BLOCK_SIZE
-	  from 1k to 16k bytes. [ruby-talk:78603]
+	* lib/net/http:  Do not handle Content-Encoding when the user sets
+	  Accept-Encoding.  This allows users to handle Content-Encoding for
+	  themselves.  This restores backwards-compatibility with Ruby 1.x.
+	  [ruby-trunk - Bug #7831]
+	* lib/net/http/generic_request.rb:  ditto.
+	* lib/net/http/response.rb:  ditto
+	* test/net/http/test_http.rb:  Test for the above.
+	* test/net/http/test_http_request.rb:  ditto.
+	* test/net/http/test_httpresponse.rb:  ditto.
 
-	* ext/openssl/ossl_ssl.c (ossl_sslctx_s_alloc): enable
-	  partial write to allow interruption in SSLSocket#write.
+Thu Feb 14 08:18:47 2013  Tanaka Akira  <akr@fsij.org>
 
-Sun Aug 10 00:34:16 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* ext/socket/extconf.rb: don't define HAVE_SA_LEN and HAVE_SA_LEN.
+	  use HAVE_STRUCT_SOCKADDR_SA_LEN and HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+	  instead.
 
-	* cygwin/GNUmakefile: remove unnecessary '--drive-name=$(CC)'
-	  for ccache.
+Wed Feb 13 20:59:48 2013  Tanaka Akira  <akr@fsij.org>
 
-Sat Aug  9 10:36:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* ext/socket/extconf.rb: don't define socklen_t here, just test.
 
-	* marshal.c (w_object): do not dump generic instance variable when
-	  marshal_dump is defined.
+	* ext/socket/rubysocket.h: define socklen_t if not available.
 
-Sat Aug  9 00:35:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Wed Feb 13 18:37:50 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* ext/bigdecimal.c: F style output(like 1234.56789) implemented
-	  to to_s method.
-	* ext/bigdecimal_??.html: F style output(like 1234.56789)
-	  implemented to to_s method.
+	* proc.c (mnew): skip prepending modules and return the method bound
+	  on the given class.  [ruby-core:52160] [Bug #7836]
 
-Fri Aug  8 12:33:17 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Wed Feb 13 18:11:59 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* bcc32/Makefile.sub: rubyw.exe should be a Windows GUI program.
-	  add the -aa option to WLDFLAGS.
+	* proc.c (method_original_name): new methods Method#original_name and
+	  UnboundMethod#original_name.  [ruby-core:52048] [Bug #7806]
+	  [EXPERIMENTAL]
 
-Fri Aug  8 11:29:26 2003  Koji Arai  <jca02266@nifty.ne.jp>
+	* proc.c (method_inspect): show the given name primarily, and
+	  original_id if aliased.  [ruby-core:52048] [Bug #7806]
 
-	* marshal.c (w_object): should set `c_arg' at first.
+Wed Feb 13 17:56:39 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Fri Aug  8 03:22:28 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+	* configure.in (warnflags): disable -Werror by default unless
+	  development.  [ruby-core:52131] [Bug #7830]
 
-	* lib/webrick/httputils.rb (FormData#list): should not take
-	  a side effect for the receiver.
+Wed Feb 13 06:05:52 2013  Eric Hodel  <drbrain@segment7.net>
 
-Thu Aug  7 14:40:37 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+	* lib/rubygems.rb:  Return BINARY strings from Gem.gzip and Gem.gunzip.
+	  Fixes intermittent test failures.  RubyGems issue #450 by Jeremey
+	  Kemper.
+	* test/rubygems/test_gem.rb:  Test for the above.
 
-	* cygwin/GNUmakefile: better --disbale-shared option support.
+Wed Feb 13 05:49:21 2013  Tanaka Akira  <akr@fsij.org>
 
-	* cygwin/GNUmakefile: add forwarding DLL target for cygwin.
+	* ext/socket/extconf.rb: test functions just after struct members.
 
-Thu Aug  7 14:21:05 2003  Corinna Vinschen  <vinschen@redhat.com>
+Tue Feb 12 12:02:35 2013  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* configure.in: Fix Cygwin specific naming of libraries to
-	  be net distribution compliant. (ruby-bugs:PR#1077)
-	  cygwin-ruby18.dll -> cygruby18.dll
+	* ext/json: merge JSON 1.7.7.
+	  This includes security fix. [CVE-2013-0269]
+	  https://github.com/flori/json/commit/d0a62f3ced7560daba2ad546d83f0479a5ae2cf2
+	  https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
 
-Thu Aug  7 12:51:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Feb 11 23:08:48 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_f_at_exit): should not be called without a block.
-	  block_given check added.
+	* configure.in: enable rb_cv_page_size_log test for MirOS BSD.
 
-Thu Aug  7 06:46:06 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Mon Feb 11 20:06:38 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_call0): forgot to pop ruby_class.
+	* configure.in: use -pthread on mirbsd*.
 
-	* eval.c (rb_call0): update ruby_class as well as ruby_cref.
-	  (ruby-bugs-ja:PR#540)
+Mon Feb 11 16:07:09 2013  Tanaka Akira  <akr@fsij.org>
 
-Thu Aug  7 04:52:50 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* configure.in: add SOLIBS and LIBRUBY_SO definition for mirbsd*.
 
-	* eval.c (rb_yield_0): remove ruby_frame->cbase and unify to
-	  ruby_cref.  [ruby-talk:78141]
+Mon Feb 11 13:17:20 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-Thu Aug  7 04:19:15 2003  Akinori MUSHA  <knu@iDaemons.org>
+	* configure.in (rubysitearchprefix): sitearchdir and vendorarchdir
+	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]
 
-	* gc.c: FreeBSD/ia64's mcontext_t is a bit different from that of
-	  Linux/ia64.  This makes gc.c compile but miniruby coredumps for
-	  the moment.
+	* win32/Makefile.sub (config.status): site and vendor directories
+	  should use sitearch, not arch.  [ruby-dev:46964] [Bug #7823]
 
-Thu Aug  7 00:15:00 2003  Shigeo Kobayashi  <shigek@ruby-lang.org>
+Mon Feb 11 12:31:25 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/bigdecimal.c: Comparison results adjusted to Float's.
-	* ext/bigdecimal.c: Use rb_num_coerce_????(x,y) instead of own.
+	* configure.in: move OS specific header/function knowledge before
+	  automatic header tests.
 
-Wed Aug  6 22:58:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
+Mon Feb 11 11:04:29 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/test/unit/testcase.rb: Added equality checking.
-	* lib/test/unit/testsuite.rb: Added equality checking.
-	* lib/test/unit/assertions.rb: Fixed a warning.
+	* configure.in: move the test for -march=i486 just after
+	  RUBY_UNIVERSAL_ARCH/RUBY_DEFAULT_ARCH.
 
-Wed Aug  6 17:28:10 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Sun Feb 10 23:42:26 2013  Tanaka Akira  <akr@fsij.org>
 
-	* ext/extmk.rb (extmake): pass LIBPATH to make ruby.  [ruby-dev:21137]
+	* ext/socket/extconf.rb: test structure members just after types test.
 
-	* ext/extmk.rb (extmake): set library name as source file name in
-	  Init_ext().  [ruby-dev:21137]
+Sun Feb 10 20:58:17 2013  Tanaka Akira  <akr@fsij.org>
 
-	* lib/mkmf.rb (Logging::postpone): postpone logging messages after
-	  heading message as the result of the block.
+	* ext/socket/extconf.rb: test types just after headers test.
 
-	* lib/mkmf.rb (macro_defined?): append newline to src unless ended
-	  with it.
+Sun Feb  10 16:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/mkmf.rb (have_library): treat nil function name as "main".
-	  (ruby-bugs:PR#1083)
+	* lib/rake/doc/MIT-LICENSE: Add license file from upstream
+	* lib/rake/doc/README.rdoc: Link to license file from Rake README
+	* lib/rake/version.rb: Include README rdoc for Rake module overview
 
-	* lib/mkmf.rb (pkg_config): should append additional libraries to
-	  $libs but not $LIBS.  [ruby-dev:21137]
+Sun Feb  10 15:26:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* ext/io/wait/extconf.rb: check DOSISH macro instead of platform.
+	* lib/rake/doc/*: Sync Rake rdoc files from upstream
 
-	* ext/digest/sha1/extconf.rb: have_library already appends library
-	  name.
+Sun Feb 10 15:50:02 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Wed Aug  6 17:23:57 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* vm_exec.h (DISPATCH_ARCH_DEPEND_WAY): use __asm__ __volatile__
+	  instead of asm volatile.
 
-	* eval.c: initialize /* OK */ variables by Qnil to stop warnings.
+Sun Feb 10 15:50:02 2013  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
-Wed Aug  6 04:58:32 2003  NAKAMURA Usaku  <usa@ruby-lang.org>
+	* gc.h (SET_MACHINE_STACK_END): use __volatile__ instead of volatile.
 
-	* ext/Setup*: add io/wait and openssl.
+Sun Feb 10 14:25:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-Wed Aug  6 01:13:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+	* doc/rake/, lib/rake/doc/: Move Rake rdoc files to lib/rake
 
-	* eval.c (rb_f_autoload): use ruby_cbase instead of ruby_class.
+Sun Feb 10 12:10:25 2013  Tanaka Akira  <akr@fsij.org>
 
-	* eval.c (rb_f_autoload_p): ditto.
+	* ext/socket/extconf.rb: test headers at first.
 
-	* class.c (rb_mod_init_copy): no longer implements independent
-	  clone and dup methods.  override "initialize_copy" instead.
-	  [ruby-core:01352]
+Sun Feb  10 12:00:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* object.c (rb_class_s_alloc): define Class allocation function.
-	  this makes Classes to follow clone framework that uses
-	  initialize_copy.
+	* doc/rake/*: Removed stale Rake static files
 
-	* object.c (rb_class_initialize): separate instantiation and
-	  initialization.
+Sun Feb  10 09:10:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* object.c (rb_obj_alloc): prohibit instantiation from
-	  uninitialized class.
+	* lib/pp.rb, lib/prettyprint.rb: Documentation for PP and PrettyPrint
+	  Based on a patch by Vincent Batts [ruby-core:51253] [Bug #7656]
 
-	* object.c (rb_class_superclass): check uninitialized class.
+Sat Feb  9 21:11:21 2013  Tanaka Akira  <akr@fsij.org>
 
-	* array.c (rb_ary_fill): wrong index processing with block.  this
-	  fix was done by Koji Arai <JCA02266@nifty.ne.jp> [ruby-list:38029]
+	* configure.in: move header files check to the beginning of
+	  "header and library section".
+	  test rlim_t with sys/types.h and sys/time.h for MirOS BSD.
+	  sys/types.h and sys/time.h is guarded by #ifdef and the above
+	  move is required for this change.
 
-	* marshal.c (w_object): should preserve generic ivar for nil,
-	  true, false, symbols, and fixnums.
+Sat Feb  9 17:45:58 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* marshal.c (w_uclass): base_klass check should be done after
-	  rb_class_real().
+	* configure.in, version.c: prevent duplicated load paths by empty
+	  version string, it does not work right now.
 
-Wed Aug  6 01:18:50 2003  Minero Aoki  <aamine@loveruby.net>
+Sat Feb  9 17:38:41 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
-	* lib/net/http.rb: update document.
+	* configure.in: fix arch parameters in help message.  [Bug #7804]
 
-	* lib/net/pop.rb: ditto.
+Sat Feb  9 13:13:00 2013  Zachary Scott  <zachary@zacharyscott.net>
 
-	* lib/net/protocol.rb: ditto.
+	* vm_trace.c: Note about TracePoint events set, and comment on
+	  Kernel#set_trace_func to prefer new TracePoint API
 
-Wed Aug  6 00:48:37 2003  Koji Arai  <jca02266@nifty.ne.jp>
+Sat Feb  9 10:07:47 2013  Kazuki Tsujimoto  <kazuki@callcc.net>
 
-	* marshal.c (w_object): should recommend marshal_dump rather than
-	  _dump_data.
+	* BSDL: update copyright notice for 2013.
 
-Tue Aug  5 17:58:57 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
+Sat Feb  9 09:24:38 2013  Eric Hodel  <drbrain@segment7.net>
 
-	* lib/fileutils.rb (install): should preserve timestamp only.
+	* lib/rubygems/package/old.rb:  Fix behavior only on ruby 1.8.
 
-Tue Aug  5 17:31:59 2003  Ian Macdonald  <ian@caliban.org>
+	* lib/rubygems/package.rb:  Include checksums.yaml.gz signatures for
+	  verification.
+	* test/rubygems/test_gem_package.rb:  Test for the above.
 
-	* lib/shell/command-processor.rb (Shell::CommandProcessor::rmdir):
-	  simple typo.
+Sat Feb  9 01:23:24 2013  Tanaka Akira  <akr@fsij.org>
 
-Tue Aug  5 15:47:34 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+	* test/fiddle/helper.rb: specify libc and libm locations for MirOS BSD.
 
-	* eval.c (rb_load): should preserve current source file/line.
+	* test/dl/test_base.rb: ditto.
 
-Tue Aug  5 10:04:42 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Feb  8 23:25:33 2013  Tanaka Akira  <akr@fsij.org>
 
-	* string.c (str_new4): ptr may refer null_str.
+	* configure.in: change CFLAGS temporally to test
+	  ARCH_FLAG="-march=i486".
 
-Mon Aug  4 17:25:18 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
+Fri Feb  8 21:19:41 2013  Tanaka Akira  <akr@fsij.org>
 
-	* stable version 1.8.0 released.
+	* configure.in: don't define ARCH_FLAG="-march=i486" if it causes
+	  compilation problem.
 
+For the changes before 2.0.0, see doc/ChangeLog-2.0.0
+For the changes before 1.9.3, see doc/ChangeLog-1.9.3
 For the changes before 1.8.0, see doc/ChangeLog-1.8.0
 
 Local variables:
+coding: us-ascii
 add-log-time-format: (lambda ()
   (let* ((time (current-time))
 	 (system-time-locale "C")
@@ -25487,4 +16186,6 @@ add-log-time-format: (lambda ()
   (format-time-string "%a %b %e %H:%M:%S %Y" (list hi lo) t)))
 indent-tabs-mode: t
 tab-width: 8
+change-log-indent-text: 2
 end:
+vim: tabstop=8 shiftwidth=2
diff --git a/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
new file mode 100644
index 0000000000..b97a08d928
--- /dev/null
+++ b/KNOWNBUGS.rb
@@ -0,0 +1,5 @@
+#
+# This test file concludes tests which point out known bugs.
+# So all tests will cause failure.
+#
+
diff --git a/LEGAL b/LEGAL
index c66513b4b5..65706459cd 100644
--- a/LEGAL
+++ b/LEGAL
@@ -5,34 +5,59 @@ 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.
 
-regex.[ch]:
-
-  These files are under LGPL.  Treat them as LGPL says. (See the file
-  LGPL for details)
-
-    Extended regular expression matching and search library.
-    Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
-
-    The GNU C Library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public License as
-    published by the Free Software Foundation; either version 2 of the
-    License, or (at your option) any later version.
-
-    The GNU C Library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public
-    License along with the GNU C Library; see the file LGPL.  If not,
-    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-    Boston, MA 02111-1307, USA.  */
-
-    Multi-byte extension added May, 1993 by t^2 (Takahiro Tanimoto)
-    Last change: May 21, 1993 by t^2
-    removed gapped buffer support, multiple syntax support by matz <matz@nts.co.jp>
-    Perl5 extension added by matz <matz@caelum.co.jp>
-    UTF-8 extension added Jan 16 1999 by Yoshida Masato  <yoshidam@tau.bekkoame.ne.jp>
+include/ruby/oniguruma.h:
+regcomp.c:
+regenc.[ch]:
+regerror.c:
+regexec.c:
+regint.h:
+regparse.[ch]:
+enc/ascii.c
+enc/big5.c
+enc/cp949.c
+enc/emacs_mule.c
+enc/encdb.c
+enc/euc_jp.c
+enc/euc_kr.c
+enc/euc_tw.c
+enc/gb18030.c
+enc/gb2312.c
+enc/gbk.c
+enc/iso_8859_1.c
+enc/iso_8859_10.c
+enc/iso_8859_11.c
+enc/iso_8859_13.c
+enc/iso_8859_14.c
+enc/iso_8859_15.c
+enc/iso_8859_16.c
+enc/iso_8859_2.c
+enc/iso_8859_3.c
+enc/iso_8859_4.c
+enc/iso_8859_5.c
+enc/iso_8859_6.c
+enc/iso_8859_7.c
+enc/iso_8859_8.c
+enc/iso_8859_9.c
+enc/koi8_r.c
+enc/koi8_u.c
+enc/shift_jis.c
+enc/unicode.c
+enc/us_ascii.c
+enc/utf_16be.c
+enc/utf_16le.c
+enc/utf_32be.c
+enc/utf_32le.c
+enc/utf_8.c
+enc/windows_1251.c
+
+Oniguruma  ----   (C) K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
+
+http://www.geocities.jp/kosako3/oniguruma/
+http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/oniguruma/
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/
+
+   When this software is partly used or it is distributed with Ruby, 
+   this of Ruby follows the license of Ruby.
 
 configure:
 
@@ -43,8 +68,8 @@ configure:
     This configure script is free software; the Free Software Foundation
     gives unlimited permission to copy, distribute and modify it.
 
-config.guess:
-config.sub:
+tool/config.guess:
+tool/config.sub:
 
   As long as you distribute these files with the file configure, they
   are covered under the Ruby's license.
@@ -109,6 +134,20 @@ parse.c:
      version 2.2 of Bison.  */
 
 util.c (partly):
+
+    Copyright (c) 1991, 2000, 2001 by Lucent Technologies.
+
+    Permission to use, copy, modify, and distribute this software for any
+    purpose without fee is hereby granted, provided that this entire notice
+    is included in all copies of any software which is or includes a copy
+    or modification of this software and in all copies of the supporting
+    documentation for such software.
+
+    THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+    WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR LUCENT MAKES ANY
+    REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+    OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+
 win32/win32.[ch]:
 
   You can apply the Artistic License to these files. (or GPL,
@@ -119,6 +158,32 @@ win32/win32.[ch]:
     You may distribute under the terms of either the GNU General Public
     License or the Artistic License, as specified in the perl README file.
 
+util.c (partly):
+
+   Copyright (c) 2004-2008 David Schultz <das@FreeBSD.ORG>
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+   ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+   FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+   DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+   OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+   HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+   OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+   SUCH DAMAGE.
+
 random.c
 
   This file is under the new-style BSD license.
@@ -166,72 +231,109 @@ random.c
     http://www.math.keio.ac.jp/matumoto/emt.html
     email: matumoto@math.keio.ac.jp
 
+vsnprintf.c:
+
+  This file is under the old-style BSD license.  Note that the
+  paragraph 3 below is now null and void.
+
+    Copyright (c) 1990, 1993
+         The Regents of the University of California.  All rights reserved.
+
+    This code is derived from software contributed to Berkeley by
+    Chris Torek.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of the University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
+
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
+
+    IMPORTANT NOTE:
+    --------------
+    From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
+    paragraph 3 above is now null and void.
+
 st.[ch]:
-x68/*:
 missing/alloca.c:
 missing/dup2.c:
+missing/erf.c:
 missing/finite.c:
 missing/hypot.c:
 missing/isinf.c:
 missing/isnan.c:
+missing/lgamma_r.c:
 missing/memcmp.c:
 missing/memmove.c:
-missing/strcasecmp.c:
 missing/strchr.c:
-missing/streror.c:
-missing/strftime.c:
-missing/strncasecmp.c:
 missing/strstr.c:
 missing/strtol.c:
+missing/tgamma.c:
 ext/digest/sha1/sha1.[ch]:
 
   These files are all under public domain.
 
-missing/strtod.c:
-
-  This file will not be used on most platforms depending on how the
-  configure script results.  In any case you must not receive any fee
-  with the file itself.
-
-    Copyright (c) 1988-1993 The Regents of the University of California.
-    Copyright (c) 1994 Sun Microsystems, Inc.
+missing/crypt.c:
 
-    Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without
-    fee is hereby granted, provided that the above copyright
-    notice appear in all copies.  The University of California
-    makes no representations about the suitability of this
-    software for any purpose.  It is provided "as is" without
-    express or implied warranty.
+  This file is under the old-style BSD license.  Note that the
+  paragraph 3 below is now null and void.
 
-missing/strtoul.c:
+    Copyright (c) 1989, 1993
+    	The Regents of the University of California.  All rights reserved.
 
-  This file will not be used on most platforms depending on how the
-  configure script results.  In any case you must not receive any fee
-  with the file itself.
+    This code is derived from software contributed to Berkeley by
+    Tom Truscott.
 
-    Copyright 1988 Regents of the University of California
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+    3. Neither the name of the University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
 
-    Permission to use, copy, modify, and distribute this
-    software and its documentation for any purpose and without
-    fee is hereby granted, provided that the above copyright
-    notice appear in all copies.  The University of California
-    makes no representations about the suitability of this
-    software for any purpose.  It is provided "as is" without
-    express or implied warranty.
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
 
-missing/erf.c:
-missing/crypt.c:
-missing/vsnprintf.c:
+missing/setproctitle.c
 
   This file is under the old-style BSD license.  Note that the
   paragraph 3 below is now null and void.
 
-    Copyright (c) 1990, 1993
-         The Regents of the University of California.  All rights reserved.
-
-    This code is derived from software contributed to Berkeley by
-    Chris Torek.
+    Copyright 2003 Damien Miller
+    Copyright (c) 1983, 1995-1997 Eric P. Allman
+    Copyright (c) 1988, 1993
+    	The Regents of the University of California.  All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -257,10 +359,46 @@ missing/vsnprintf.c:
     OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     SUCH DAMAGE.
 
-    IMPORTANT NOTE:
-    --------------
-    From ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
-    paragraph 3 above is now null and void.
+missing/strlcat.c
+missing/strlcpy.c
+
+  These files are under the new-style BSD license.
+
+   Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+   1. Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+   2. Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+   3. The name of the author may not be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+   THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+missing/langinfo.c
+
+  This file is from http://www.cl.cam.ac.uk/~mgk25/ucs/langinfo.c.
+  Ruby uses a modified version. The file contains the following
+  author/copyright notice:
+
+  Markus.Kuhn@cl.cam.ac.uk -- 2002-03-11
+  Permission to use, copy, modify, and distribute this software
+  for any purpose and without fee is hereby granted. The author
+  disclaims all warranties with regard to this software.
 
 ext/digest/md5/md5.[ch]:
 
@@ -300,18 +438,7 @@ ext/digest/rmd160/rmd160.[ch]:
     Copyright (c) Katholieke Universiteit Leuven
     1996, All Rights Reserved
 
-ext/digest/rmd160/rmd160hl.c:
-ext/digest/sha1/sha1hl.c:
-
-  These files are under the beer-ware license.
-
-    "THE BEER-WARE LICENSE" (Revision 42):
-    <phk@login.dkuug.dk> wrote this file.  As long as you retain this notice you
-    can do whatever you want with this stuff. If we meet some day, and you think
-    this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
-
 ext/digest/sha2/sha2.[ch]:
-ext/digest/sha2/sha2hl.c:
 
   These files are under the new-style BSD license.
 
diff --git a/LGPL b/LGPL
deleted file mode 100644
index b1e3f5a263..0000000000
--- a/LGPL
+++ /dev/null
@@ -1,504 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes 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
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/Makefile.in b/Makefile.in
index 6271138fbb..98749dec61 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,17 +1,33 @@
 SHELL = /bin/sh
-NULLCMD = :
+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@
-VPATH = $(srcdir):$(srcdir)/missing
+top_srcdir = $(srcdir)
+hdrdir = $(srcdir)/include
+PLATFORM_DIR = @PLATFORM_DIR@
 
 CC = @CC@
-YACC = @YACC@
+CPP = @CPP@
+LD = @LD@
+YACC = bison
 PURIFY =
 AUTOCONF = autoconf
 @SET_MAKE@
 MKFILES = @MAKEFILES@
+BASERUBY = @BASERUBY@
+TEST_RUNNABLE = @TEST_RUNNABLE@
+CROSS_COMPILING = @CROSS_COMPILING@
+DOXYGEN = @DOXYGEN@
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -24,40 +40,79 @@ datadir = @datadir@
 arch = @arch@
 sitearch = @sitearch@
 sitedir = @sitedir@
+archlibdir = @archlibdir@
+ruby_version = @ruby_version@
 
 TESTUI = console
 TESTS =
-RDOCTARGET = @RDOCTARGET@
+INSTALLDOC = @INSTALLDOC@
+DOCTARGETS = @RDOCTARGET@ @CAPITARGET@
 
 EXTOUT = @EXTOUT@
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
+arch_hdrdir = $(EXTOUT)/include/$(arch)
+VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/enc:$(srcdir)/missing
 
 empty =
+CC_VERSION = @CC_VERSION@
 OUTFLAG = @OUTFLAG@$(empty)
-CFLAGS = @CFLAGS@ @XCFLAGS@ @ARCH_FLAG@
+COUTFLAG = @COUTFLAG@$(empty)
+ARCH_FLAG = @ARCH_FLAG@
+CFLAGS = @CFLAGS@ $(ARCH_FLAG)
 cflags = @cflags@
 optflags = @optflags@
 debugflags = @debugflags@
-CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@
+warnflags = @warnflags@ @strict_warnflags@
+INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir)
+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@
-MINIOBJS = @MINIOBJS@
-
+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@
+RUBY_RELEASE_DATE=@RUBY_RELEASE_DATE@
 EXEEXT = @EXEEXT@
+LIBEXT = @LIBEXT@
 PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT)
 RUBY = $(RUBY_INSTALL_NAME)
-MINIRUBY = @MINIRUBY@ $(MINIRUBYOPT)
-RUNRUBY = @RUNRUBY@ $(RUNRUBYOPT) --
+MINIRUBY = @MINIRUBY@\
+	$(MINIRUBYOPT)
+# RUNRUBY_COMMAND:: runruby.rb or baseruby. do not append options directly
+RUNRUBY_COMMAND = @RUNRUBY_COMMAND@
+# RUNRUBY:: run ruby with RUN_OPTS which is passed to ruby
+RUNRUBY = @RUNRUBY@ $(RUN_OPTS)
+# RUNRUBY_DEBUGGER:: debugging option for runruby.rb
+RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args'
+XRUBY = @XRUBY@
+BTESTRUBY = @BTESTRUBY@\
+	$(MINIRUBYOPT)
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+XRUBY_LIBDIR = @XRUBY_LIBDIR@
+XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
+XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
+
+DEFAULT_PRELUDES = $(GEM_PRELUDE)
 
 #### End of system configuration section. ####
 
@@ -72,26 +127,70 @@ LIBRUBY	      = @LIBRUBY@
 LIBRUBYARG    = @LIBRUBYARG@
 LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@
 LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
+LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@
+LIBRUBY_A_OBJS = @LIBRUBY_A_OBJS@
+
+THREAD_MODEL  = @THREAD_MODEL@
 
 PREP          = @PREP@
 ARCHFILE      = @ARCHFILE@
 SETUP         =
 EXTSTATIC     = @EXTSTATIC@
+SET_LC_MESSAGES = env LC_MESSAGES=C
 
+MAKEDIRS      = @MKDIR_P@
+CP            = cp
+MV            = mv
 RM            = rm -f
+RMDIR         = @RMDIR@
+RMDIRS        = @RMDIRS@
+RMALL         = @RMALL@
 NM            = @NM@
 AR            = @AR@
 ARFLAGS       = rcu
 RANLIB        = @RANLIB@
 AS            = @AS@
-ASFLAGS       = @ASFLAGS@
+ASFLAGS       = @ASFLAGS@ $(INCFLAGS)
+IFCHANGE      = $(srcdir)/tool/ifchange
+SET_LC_MESSAGES = env LC_MESSAGES=C
+OBJDUMP       = @OBJDUMP@
+OBJCOPY       = @OBJCOPY@
+VCS           = @VCS@
+VCSUP         = @VCSUP@
+DTRACE        = @DTRACE@
+DTRACE_EXT    = @DTRACE_EXT@
+DTRACE_OBJ   = @DTRACE_OBJ@
+DTRACE_GLOMMED_OBJ = @DTRACE_GLOMMED_OBJ@
 
 OBJEXT        = @OBJEXT@
+ASMEXT        = S
+DLEXT         = @DLEXT@
 MANTYPE	      = @MANTYPE@
+SYMBOL_PREFIX = @SYMBOL_PREFIX@
 
 INSTALLED_LIST= .installed.list
+
+MKMAIN_CMD    = mkmain.sh
+
+NEWLINE_C     = newline.c
+MINIPRELUDE_C = miniprelude.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
+
+configure_args = @configure_args@
 #### End of variables
 
+.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
+
 all:
 
 .DEFAULT: all
@@ -100,110 +199,281 @@ all:
 .NOEXPORT:
 
 miniruby$(EXEEXT):
-		@$(RM) $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(LIBRUBY_A) $(LIBS) $(OUTFLAG)$@
+		@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
+		$(ECHO) linking $@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(DTRACE_OBJ) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
-		$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) $(OUTFLAG)$@
+		$(ECHO) linking $@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@
+		$(Q) $(POSTLINK)
 
 # We must `rm' the library each time this rule is invoked because "updating" a
 # MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not
 # supported.
 $(LIBRUBY_A):
 		@$(RM) $@
-		$(AR) $(ARFLAGS) $@ $(OBJS) $(DMYEXT)
+		$(ECHO) linking static-library $@
+		$(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(DMYEXT)
 		@-$(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)
-		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
-		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
+		$(ECHO) linking shared-library $@
+		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(DTRACE_OBJ) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
+		-$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -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.rb:	Makefile
-		@echo ' \
-		class Object; \
-		  CROSS_COMPILING = RUBY_PLATFORM; \
-		  remove_const :RUBY_PLATFORM; \
-		  remove_const :RUBY_VERSION; \
-		  RUBY_PLATFORM = "@arch@"; \
-		  RUBY_VERSION = "@MAJOR@.@MINOR@.@TEENY@"; \
-		end; \
-		if RUBY_PLATFORM =~ /mswin|bccwin|mingw/; \
-		  class File; \
-		    remove_const :ALT_SEPARATOR; \
-		    ALT_SEPARATOR = "\\\\"; \
-		  end; \
-		end; \
-		prehook = proc do |e|; \
-		  builddir = File.expand_path(File.dirname(__FILE__)); \
-		  Config::MAKEFILE_CONFIG["top_srcdir"] = $$top_srcdir = \
-		    File.expand_path("@top_srcdir@", builddir) unless e; \
-		  untrace_var(:$$extmk, prehook); \
-		end; \
-		trace_var(:$$extmk, prehook); \
-		' > $@
-
-Makefile:	$(srcdir)/Makefile.in
-
-$(MKFILES): config.status $(srcdir)/common.mk
-		MAKE=$(MAKE) $(SHELL) ./config.status
-		@{ \
+$(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
+
+install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/config.h \
+	$(LIBRUBY_A) $(LIBRUBY_SO) $(ARCHFILE)
+	$(ECHO) installing cross-compiling stuff
+	$(Q) $(MAKEDIRS) $(XRUBY_RUBYLIBDIR)/$(arch) $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
+	$(Q) sed '/^\$$:\.unshift/q' $(arch)-fake.rb > fake.rb
+	$(Q) $(BASERUBY) -p \
+	-e '~/^\s*CONFIG\["LDFLAGS"\]/ and' \
+	-e '$$_[/(?=\s*"$$)/] = %q[ #{(CONFIG["LIBPATHFLAG"]%File.dirname(__FILE__)).strip}]' \
+	rbconfig.rb > fake-rbconfig.rb
+	$(INSTALL_SCRIPT) fake.rb $(XRUBY_RUBYLIBDIR)/$(arch)/fake.rb
+	$(INSTALL_SCRIPT) fake-rbconfig.rb $(XRUBY_RUBYLIBDIR)/$(arch)/rbconfig.rb
+	@$(RM) fake.rb fake-rbconfig.rb
+	$(INSTALL_DATA) $(arch_hdrdir)/ruby/config.h $(XRUBY_RUBYHDRDIR)/$(arch)/ruby
+	$(INSTALL_DATA) $(top_srcdir)/include/ruby/win32.h $(XRUBY_RUBYHDRDIR)/ruby
+	$(INSTALL_DATA) $(LIBRUBY) $(LIBRUBY_A) $(XRUBY_RUBYLIBDIR)/$(arch)
+	$(INSTALL_PROGRAM) $(LIBRUBY_SO) $(XRUBY_RUBYLIBDIR)/$(arch)
+
+Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
+
+$(MKFILES): config.status
+		@[ -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; }
 
-config.status:	$(srcdir)/configure
-		MINIRUBY="$(MINIRUBY)" $(SHELL) ./config.status --recheck
+uncommon.mk: $(srcdir)/common.mk
+		sed 's/{\$$([^(){}]*)[^{}]*}//g' $< > $@
 
-$(srcdir)/configure: $(srcdir)/configure.in
-		cd $(srcdir) && $(AUTOCONF)
+.PHONY: reconfig
+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-1 = set -x; "$$@"
 
-lex.c: keywords
-	( gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && mv $@.tmp $@ ) || \
-	if test -f $@; then \
-	  touch $@ && echo $@ touched.; \
+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)
+
+incs: id.h
+all-incs: probes.h
+
+# Things which should be considered:
+# * with gperf v.s. without gperf
+# * committers may have various versions of gperf
+# * ./configure v.s. ../ruby/configure
+# * GNU make v.s. HP-UX make	# HP-UX make invokes the action if lex.c and keywords has same mtime.
+# * svn checkout generate a file with mtime as current time
+# * ext4 and XFS has a mtime with fractional part
+lex.c: defs/keywords
+	@\
+	if cmp -s $(srcdir)/defs/lex.c.src $?; then \
+	  [ $(Q) ] && echo copying $@ || set -x; \
+	  $(CP) $(srcdir)/lex.c.blt $@; \
 	else \
-	  cp $(srcdir)/lex.c $@ && echo $@ copied.; \
+	  [ $(Q) ] && echo generating $@ || set -x; \
+	  gperf -C -p -j1 -i 1 -g -o -t -N rb_reserved_word -k1,3,$$ $? > $@.tmp && \
+	  $(MV) $@.tmp $@ && \
+	  $(CP) $? $(srcdir)/defs/lex.c.src && \
+	  $(CP) $@ $(srcdir)/lex.c.blt; \
 	fi
 
-.y.c:
-	$(YACC) $<
-	sed '/^#/s|y\.tab\.c|$@|' y.tab.c > $@
-	rm -f y.tab.c
+NAME2CTYPE_OPTIONS = -7 -c -j1 -i1 -t -C -P -T -H uniname2ctype_hash -Q uniname2ctype_pool -N uniname2ctype_p
+
+enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
+	$(MAKEDIRS) $(@D)
+	@set +e; \
+	if cmp -s $(?:.kwd=.src) $?; then \
+	  set -x; \
+	  $(CP) $(?:.kwd=.h.blt) $@; \
+	else \
+	  trap '$(RM) $@-1.h $@-2.h' 0 && \
+	  set -x; \
+	  sed '/^#ifdef USE_UNICODE_PROPERTIES/,/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-1.h && \
+	  sed '/^#ifdef USE_UNICODE_PROPERTIES/d;/^#endif/d' $? | gperf $(NAME2CTYPE_OPTIONS) > $@-2.h && \
+	  diff -DUSE_UNICODE_PROPERTIES $@-1.h $@-2.h > $@.tmp || :; \
+	  $(MV) $@.tmp $@ && \
+	  $(CP) $? $(?:.kwd=.src) && \
+	  $(CP) $@ $(?:.kwd=.h.blt); \
+	fi
 
 .c.@OBJEXT@:
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
+	@$(ECHO) compiling $<
+	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
 
 .s.@OBJEXT@:
-	$(AS) $(ASFLAGS) -o $@ $<
+	@$(ECHO) assembling $<
+	$(Q) $(AS) $(ASFLAGS) -o $@ $<
+
+.c.S:
+	@$(ECHO) translating $<
+	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -S $<
+
+.c.i:
+	@$(ECHO) preprocessing $<
+	$(Q) $(CPP) $(warnflags) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -E $< > $@
+
+.d.h:
+	@$(ECHO) translating probes $<
+	$(Q) $(DTRACE) -o $@.tmp -h -C $(INCFLAGS) -s $<
+	$(Q) sed -e 's/RUBY_/RUBY_DTRACE_/g' -e 's/PROBES_H_TMP/PROBES_H/g' -e 's/(char \*/(const char */g' -e 's/, char \*/, const char */g' $@.tmp > $@
+	$(Q) $(RM) $@.tmp
+
+.dmyh.h:
+	@$(ECHO) copying dummy $(DEST_FILE)
+	$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
+
+probes.@OBJEXT@: $(srcdir)/probes.d
+	@$(ECHO) processing probes in object files
+	$(Q) stamp="$*.stamp"; \
+	  if test -f "$$stamp" -o -f "$@"; then \
+	  $(RM) $(DTRACE_DEPENDENT_OBJS) "$$stamp"; \
+	  for o in $(DTRACE_DEPENDENT_OBJS); do \
+	    echo "rebuilding $$o which was modified by \"dtrace -G\""; \
+	    $(MAKE) "$$o"; \
+	  done; \
+	fi; \
+	touch "$$stamp"
+	$(RM) $@
+	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_DEPENDENT_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) $(DTRACE_OBJ)
 
 clean-local::
-	@$(RM) ext/extinit.c ext/extinit.$(OBJEXT)
+	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
+		enc/encinit.c enc/encinit.$(OBJEXT)
+	-$(Q)$(RM) $(pkgconfig_DATA)
 
 distclean-local::
-	@$(RM) ext/config.cache $(RBCONFIG)
+	$(Q)$(RM) ext/config.cache $(RBCONFIG) Doxyfile
+	-$(Q)$(RM) run.gdb
+	-$(Q)$(RM) $(INSTALLED_LIST) $(arch_hdrdir)/ruby/config.h verconf.h
+	-$(Q)$(RMDIRS) $(arch_hdrdir)/ruby 2> /dev/null || true
+
+clean-ext distclean-ext realclean-ext::
+	@cd ext 2>/dev/null || exit 0; set dummy `echo "${EXTS}" | tr , ' '`; shift; \
+	test "$$#" = 0 && set .; \
+	set dummy `\
+	    find "$$@" -name Makefile -print | sed 's:^\./::;s:/Makefile$$:~:' | sort | sed 's:~$$::'; \
+	`; shift; \
+	cd ..; \
+	for dir do \
+	    echo $(@:-ext=)ing "$$dir"; \
+	    (cd "ext/$$dir" && exec $(MAKE) $(MFLAGS) $(@:-ext=)) && \
+	    case "$@" in \
+	    *distclean-ext*|*realclean-ext*) \
+		$(RMDIRS) "ext/$$dir" 2> /dev/null || true;; \
+	    esac; \
+	done
+	-$(Q)$(RM) ext/extinit.$(OBJEXT)
+
+distclean-ext realclean-ext::
+	-$(Q)$(RM) ext/extinit.c
+	-$(Q)$(RMDIR) ext 2> /dev/null || true
+
+clean-extout:
+	-$(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)
+
+clean-platform:
+	@$(RM) $(PLATFORM_D)
+	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> /dev/null || true
 
 ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c
-
-update-rubyspec: 
-	if [ -d $(srcdir)/rubyspec ]; then \
-	  cd $(srcdir)/rubyspec/mspec; \
-	  git pull; \
-	  cd ../spec; \
-	  git pull; \
+	$(ECHO) compiling $@
+	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
+
+enc/encinit.$(OBJEXT): enc/encinit.c $(SETUP)
+
+up::
+	@$(CHDIR) "$(srcdir)" && LC_TIME=C exec $(VCSUP)
+
+up::
+	-$(Q)$(MAKE) $(MFLAGS) after-update
+
+after-update:: update-config_files
+
+update-mspec:
+	@$(CHDIR) $(srcdir); \
+	if [ -d spec/mspec ]; then \
+	  cd spec/mspec; \
+	  echo updating mspec ...; \
+	  exec git pull; \
 	else \
-	  mkdir $(srcdir)/rubyspec; \
-	  git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec; \
-	  git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec; \
+	  echo retrieving mspec ...; \
+	  exec git clone $(MSPEC_GIT_URL) spec/mspec; \
 	fi
 
-test-rubyspec:
-	@if [ ! -d $(srcdir)/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
-	RUBY_EXE="$(RUNRUBY)" $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec-run --background --prefix $(srcdir)/rubyspec/spec -B $(srcdir)/rubyspec/spec/ruby.$(MAJOR).$(MINOR).mspec
+update-rubyspec: update-mspec
+	@$(CHDIR) $(srcdir); \
+	if [ -d spec/rubyspec ]; then \
+	  cd spec/rubyspec; \
+	  echo updating rubyspec ...; \
+	  exec git pull; \
+	else \
+	  echo retrieving rubyspec ...; \
+	  exec git clone $(RUBYSPEC_GIT_URL) spec/rubyspec; \
+	fi
+
+test-rubyspec-precheck:
+	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
+
+INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
+	  vmtc.inc vm.inc
+
+$(INSNS): $(srcdir)/insns.def vm_opts.h \
+	  $(srcdir)/defs/opt_operand.def $(srcdir)/defs/opt_insn_unif.def \
+	  $(srcdir)/tool/instruction.rb $(srcdir)/tool/insns2vm.rb
+	$(ECHO) generating $@
+	$(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
+
+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'
diff --git a/NEWS b/NEWS
index 1ef8a1b453..ae44d7effb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
-= NEWS
+# -*- rdoc -*-
+
+= NEWS for Ruby 2.1.0
 
 This document is a list of user visible feature changes made between
 releases except for bug fixes.
@@ -7,642 +9,304 @@ Note that each entry is kept so brief that no reason behind or
 reference information is supplied with.  For a full list of changes
 with all sufficient information, see the ChangeLog file.
 
-* REXML
-
-  * REXML::Document.entity_expansion_limit=
-
-    New method to set the entity expansion limit. By default the limit is
-    set to 10000.  See the following URL for details.
-
-    http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/
-
-== Changes since the 1.8.6 release
-
-=== Configuration changes
-
-* vendor_ruby directory
-
-  A new library directory named `vendor_ruby' is introduced in
-  addition to `site_ruby'.  The idea is to separate libraries
-  installed by the package system (`vendor') from manually (`site')
-  installed libraries preventing the former from getting overwritten
-  by the latter, while preserving the user option to override vendor
-  libraries with site libraries. (`site_ruby' takes precedence over
-  `vendor_ruby')
-
-  If you are a package maintainer, make each library package configure
-  the library passing the `--vendor' option to `extconf.rb' so that
-  the library files will get installed under `vendor_ruby'.
-
-  You can change the directory locations using configure options such
-  as `--with-sitedir=DIR' and `--with-vendordir=DIR'.
-
-=== Global constants
-
-* new constants
-
-  * RUBY_COPYRIGHT
-  * RUBY_DESCRIPTION
-
-=== Library updates (outstanding ones only)
-
-* new library
-
-  * securerandom
-
-* builtin classes
-
-  * Array#flatten
-  * Array#flatten!
-
-    Takes an optional argument that determines the level of recursion
-    to flatten.
-
-  * Array#eql?
-  * Array#hash
-  * Array#==
-  * Array#<=>
-
-    Handle recursive data properly.
-
-  * Array#index
-  * Array#rindex
-
-    Take a block instead of an argument.
-
-  * Array#collect!
-  * Array#map!
-  * Array#each
-  * Array#each_index
-  * Array#reverse_each
-  * Array#reject
-  * Array#reject!
-  * Array#delete_if
-  * Array#select
-
-    Return an enumerator if no block is given.
-
-    Note that #map and #collect still return an array unlike Ruby 1.9
-    to keep compatibility.
-
-  * Array#pop
-  * Array#shift
-
-    Take an optional argument specifying the number of elements to
-    remove.
-
-  * Array#choice
-  * Array#combination
-  * Array#cycle
-  * Array#drop
-  * Array#drop_while
-  * Array#permutation
-  * Array#product
-  * Array#shuffle
-  * Array#shuffle!
-  * Array#take,
-  * Array#take_while
-
-    New methods.
-
-  * Binding#eval
-
-    New method.
-
-  * Dir#each
-  * Dir#foreach
-
-    Return an enumerator if no block is given.
-
-  * Enumerable::Enumerator
-
-    New class for various enumeration defined by the enumerator library.
-
-  * Enumerable#each_slice
-  * Enumerable#each_cons
-  * Object#to_enum
-  * Object#enum_for
-
-    New methods for various enumeration defined by the enumerator library.
-
-  * Enumerable#count
-  * Enumerable#cycle
-  * Enumerable#drop
-  * Enumerable#drop_while
-  * Enumerable#find_index
-  * Enumerable#first
-  * Enumerable#group_by
-  * Enumerable#max_by
-  * Enumerable#min_by
-  * Enumerable#minmax
-  * Enumerable#minmax_by
-  * Enumerable#none?
-  * Enumerable#one?
-  * Enumerable#take
-  * Enumerable#take_while
-
-    New methods.
-
-  * Enumerable#find
-  * Enumerable#find_all
-  * Enumerable#partition
-  * Enumerable#reject
-  * Enumerable#select
-  * Enumerable#sort_by
-
-    Return an enumerator if no block is given.
-
-    Note that #map and #collect still return an array unlike Ruby 1.9
-    to keep compatibility.
-
-  * Enumerable#inject
-
-    Accepts a binary operator instead of a block.
-
-  * Enumerable#reduce
-
-    New alias to #inject.
-
-  * Enumerable#to_a
-
-    Can take optional arguments and pass them to #each.
-
-  * Hash#eql?
-  * Hash#hash
-  * Hash#==
-
-    Handle recursive data properly.
+== Changes since the 2.0.0 release
 
-  * Hash#delete_if
-  * Hash#each
-  * Hash#each_key
-  * Hash#each_pair
-  * Hash#each_value
-  * Hash#reject!
-  * Hash#select
-  * ENV.delete_if
-  * ENV.each
-  * ENV.each_key
-  * ENV.each_pair
-  * ENV.each_value
-  * ENV.reject!
-  * ENV.select
+=== Language changes
 
-    Return an enumerator if no block is given.
+* Now the default values of keyword arguments can be omitted.  Those
+  "required keyword arguments" need giving explicitly at the call time.
 
-  * GC.stress
-  * GC.stress=
+* Added suffixes for integer and float literals: 'r', 'i', and 'ri'.
+  * "42r" and "3.14r" are evaluated as Rational(42, 1) and 3.14.rationalize,
+    respectively.  But exponential form with 'r' suffix like "6.022e+23r" is
+    not accepted because it is misleading.
+  * "42i" and "3.14i" are evaluated as Complex(0, 42) and Complex(0, 3.14),
+    respectively.
+  * "42ri" and "3.14ri" are evaluated as Complex(0, 42r) and Complex(0, 3.14r),
+    respectively.
 
-    New methods.
+* def-expr now returns the symbol of its name instead of nil.
 
-  * Integer#ord
-  * Integer#odd?
-  * Integer#even?
-  * Integer#pred
-
-    New methods.
-
-  * Integer#downto
-  * Integer#times
-  * Integer#upto
-
-    Return an enumerator if no block is given.
-
-  * IO#each
-  * IO#each_line
-  * IO#each_byte
-  * IO.foreach
-  * ARGF.each
-  * ARGF.each_line
-  * ARGF.each_byte
-
-    Return an enumerator if no block is given.
-
-  * IO#bytes
-  * IO#chars
-  * IO#each_char
-  * IO#getbyte
-  * IO#lines
-  * IO#readbyte
-  * ARGF.bytes
-  * ARGF.chars
-  * ARGF.each_char
-  * ARGF.getbyte
-  * ARGF.lines
-  * ARGF.readbyte
-
-    New methods. 
-
-  * Method#name
-  * Method#owner
-  * Method#receiver
-  * UnboundMethod#name
-  * UnboundMethod#owner
-
-    New methods.
-
-  * Module#class_exec
-  * Module#module_exec
-
-    New methods.
-
-  * Numeric#step
-
-    Return an enumerator if no block is given.
-
-  * Object#instance_exec
-  * Object#tap
-
-    New methods.
-
-  * ObjectSpace.each_object
-
-    Return an enumerator if no block is given.
-
-  * Process.exec implemented.
-
-  * Range#each
-  * Range#step
-
-    Return an enumerator if no block is given.
-
-  * Regexp.union accepts an array of patterns.
-
-  * String#bytes
-
-    New method
-
-  * String#bytesize
-
-    New method, returning the size in bytes. (alias length and size)
-
-  * String#chars
-  * String#each_char
-  * String#lines
-  * String#partition
-  * String#rpartition
-  * String#start_with?
-  * String#end_with?
-
-    New methods.  These are $KCODE aware unlike #index, #rindex and
-    #include?.
-
-  * String#each_byte
-  * String#each
-  * String#each_line
-  * String#gsub(pattern)
-
-    Return an enumerator if no block is given.
-
-  * String#upto
-
-    An optional second argument is added to specify if the last value
-    should be included.
-
-  * StopIteration
-
-    New exception class that causes Kernel#loop to stop iteration when
-    raised.
-
-  * Struct#each
-  * Struct#each_pair
-
-    Return an enumerator if no block is given.
-
-  * Symbol#to_proc
-
-    New method.
-
-  * __method__
-
-    New global function that returns the name of the current method as
-    a Symbol.
-
-* enumerator
-
-  * Enumerator is now a built-in module.  The #next and #rewind
-    methods are implemented using the "generator" library.  Use with
-    care and be aware of the performance loss.
-
-* ipaddr
+=== Core classes updates (outstanding ones only)
 
+* Array
   * New methods
-    * IPAddr#<=>
-    * IPAddr#succ
-
-      IPAddr objects are now comparable and enumerable having these
-      methods.  This also means that it is possible to have a Range
-      object between two IPAddr objects.
-
-    * IPAddr#to_range
-
-      A new method to create a Range object for the (network) address.
-
-  * Type coercion support
-    * IPAddr#&
-    * IPAddr#|
-    * IPAddr#==
-    * IPAddr#include?
-
-      These methods now accept a string or an integer instead of an
-      IPAddr object as the argument.
-
-* net/smtp
-
-  * Support SSL/TLS.
-
-* openssl
-
-  * New classes
-    * OpenSSL::PKey::EC
-    * OpenSSL::PKey::EC::Group
-    * OpenSSL::PKey::EC::Point
-    * OpenSSL::PKey::PKCS5
-    * OpenSSL::SSL::Session
+    * Array#to_h converts an array of key-value pairs into a Hash.
 
-  * Documentation!
-
-  * Various new methods (see documentation).
-
-  * Remove redundant module namespace in Cipher, Digest, PKCS7, PKCS12.
-    Compatibility classes are provided which will be removed in Ruby 1.9.
-
-* shellwords
-
-  * Add methods for escaping shell-unsafe characters:
-    * Shellwords.join
-    * Shellwords.escape
-    * Array#shelljoin
-    * String#shellescape
-
-  * Add shorthand methods:
-    * Shellwords.split (alias shellwords)
-    * String#shellsplit
-
-* stringio
-
-  * StringIO#getbyte
-  * StringIO#readbyte
-
-    New methods. (aliases for compatibility with 1.9)
-
-  * StringIO#each_char
-  * StringIO#chars
-
-    New methods.
-
-  * StringIO#each
-  * StringIO#each_line
-  * StringIO#each_byte
-
-    Return an enumerator if no block is given.
-
-* tempfile
-
-  * Tempfile.open and Tempfile.new now accept a suffix for the
-    temporary file to be created.  To specify a suffix, pass an array
-    of [basename, suffix] as the first argument.
-
-      Tempfile.open(['image', 'jpg']) { |tempfile| ... }
-
-* tmpdir
-
-  * New method:
-
-    * Dir.mktmpdir
-
-* uri
-
-  * added LDAPS scheme.
-  * Change for RFC3986:
-    * FTP
-      * URI('ftp://example.com/foo').path #=> 'foo'
-      * URI('ftp://example.com/%2Ffoo').path #=> '/foo'
-      * URI::FTP.build([nil, 'example.com', nil, '/foo', 'i').to_s #=> 'ftp://example.com/%2Ffoo;type=i'
-    * URI merge
-      * URI('http://a/b/c/d;p?q').merge('?y') == URI('http://a/b/c/d;p?y')
-      * URI('http://a/b/c/d;p?q').merge('/./g') == URI('http://a/g')
-      * URI('http://a/b/c/d;p?q').merge('/../g') == URI('http://a/g')
-      * URI('http://a/b/c/d;p?q').merge('../../../g') == URI('http://a/g')
-      * URI('http://a/b/c/d;p?q').merge('../../../../g') == URI('http://a/g')
-
-* rss
-
-  * 0.1.6 -> 0.2.4
-
-  * Fix image module URI
-
-  * Atom support
-
-  * ITunes module support
-
-  * Slash module support
-
-  * content:encoded with RSS 2.0 support
-
-=== Interpreter Implementation
-
-* passing a block to a Proc [experimental]
-
-  This implementation in current shape is known to be buggy/broken,
-  especially with nested block invocation.  Take this as an
-  experimental feature.
-
-* stack trace
-
-  On non-SystemStackError exception, full stack trace is shown.
-
-=== Compatibility issues (excluding feature bug fixes)
-
-* String#slice! had some unintentional bugs and they have been fixed
-  because either they disagreed with documentation or their respective
-  behavior of #slice.  Unfortunately, this causes some
-  incompatibilities in the following (somewhat rare) cases.
-
-  * #slice! no longer expands the array when an out-of-boundary value
-    is given.
-
-      # Ruby 1.8.6
-      a = [1,2]
-      a.slice!(4,0)   #=> nil
-      a               #=> [1,2,nil,nil]
-
-      # Ruby 1.8.7
-      a = [1,2]
-      a.slice!(4,0)   #=> nil
-      a               #=> [1,2]
-
-  * #slice! no longer raises an exception but returns nil when a
-    negative length or out-of-boundary negative position is given.
-
-      # Ruby 1.8.6
-      a = [1,2]
-      a.slice!(1,-1)  #=> (raises IndexError)
-      a.slice!(-5,1)  #=> (raises IndexError)
-
-      # Ruby 1.8.7
-      a = [1,2]
-      a.slice!(1,-1)  #=> nil
-      a.slice!(-5,1)  #=> nil
-
-* String#to_i, String#hex and String#oct no longer accept a sequence
-  of underscores (`__') as part of a number.
-
-    # Ruby 1.8.6
-    '1__0'.to_i     #=> 10
-    '1__0'.to_i(2)  #=> 2  # 0b10
-    '1__0'.oct      #=> 8  # 010
-    '1__0'.hex      #=> 16 # 0x10
-
-    # Ruby 1.8.7
-    '1__0'.to_i     #=> 1
-    '1__0'.to_i(2)  #=> 1
-    '1__0'.oct      #=> 1
-    '1__0'.hex      #=> 1
-
-  The old behavior was inconsistent with Ruby syntax and considered as
-  a bug.
-
-* date
-
-  * Date.parse
-
-    '##.##.##' (where each '#' is a digit) is now taken as 'YY.MM.DD'
-    instead of 'MM.DD.YY'.  While the change may confuse you, you can
-    always use Date.strptime() when you know what you are dealing
-    with.
-
-* stringio
-
-  * StringIO#each_byte
-
-    The return value changed from nil to self.  This is what the
-    document says and the same as each_line() does.
-
-* tempfile
-
-  * The file name format has changed.  No dots are included by default
-    in temporary file names any more.  See above for how to specify a
-    suffix.
-
-* uri
-
-  * See above for details.
-
-== Changes since the 1.8.5 release
-
-=== New platforms/build tools support
-
-* IA64 HP-UX
-
-* Visual C++ 8 SP1
-
-* autoconf 2.6x
-
-=== Global constants
-
-* RUBY_PATCHLEVEL
-
-  New constant since 1.8.5-p1.
-
-=== Library updates (outstanding ones only)
-
-* builtin classes
-
-  * New method: Kernel#instance_variable_defined?
-
-  * New method: Module#class_variable_defined?
-
-  * New feature: Dir::glob() can now take an array of glob patterns.
-
-* date
-
-  * Updated based on date2 4.0.3.
-
-* digest
-
-  * New internal APIs for C and Ruby.
-
-  * Support for autoloading.
-
-      require 'digest'
-
-      # autoloads digest/md5
-      md = Digest::MD5.digest("string")
-
-  * New digest class methods: file
-
-  * New digest instance methods: clone, reset, new, inspect,
-    digest_length (alias size or length), block_length()
-
-  * New library: digest/bubblebabble
-
-  * New function: Digest(name)
-
-* fileutils
-
-  * New option for FileUtils.cp_r(): :remove_destination
-
-* nkf
-
-  * Updated based on nkf as of 2007-01-28.
-
-* thread
-
-  * Replaced with much faster mutex implementation in C.  The former
-    implementation, which is slow but considered to be stable, is
-    available with a configure option `--disable-fastthread'.
-
-* tk
-
-  * Updated Tile extension support based on Tile 0.7.8.
-
-  * Support --without-X11 configure option for non-X11 versions of
-    Tcl/Tk (e.g. Tcl/Tk Aqua).
-
-  * New sample script: irbtkw.rbw -- IRB on Ruby/Tk. It has no trouble
-    about STDIN blocking on Windows.
-
-* webrick
-
-  * New method: WEBrick::Cookie.parse_set_cookies()
-
-=== Compatibility issues (excluding feature bug fixes)
-
-* builtin classes
-
-  * String#intern now raises SecurityError when $SAFE level is greater
-    than zero.
-
-* date
-
-  * Time#to_date and Time#to_datetime are added as private methods.
-    They cause name conflict error in ActiveSupport 1.4.1 and prior,
-    which comes with Rails 1.2.2 and prior.  Updating ActiveSupport
-    and/or Rails to the latest versions fixes the problem.
-
-* digest
-
-  * The constructor does no longer take an initial string to feed.
-    The following examples show how to migrate:
-
-      # Before
-      md = Digest::MD5.new("string")
-      # After (works with any version)
-      md = Digest::MD5.new.update("string")
-        
-      # Before
-      hd = Digest::MD5.new("string").hexdigest
-      # After (works with any version)
-      hd = Digest::MD5.hexdigest("string")
+* Binding
+  * New methods
+    * Binding#local_variable_get(symbol)
+    * Binding#local_variable_set(symbol, obj)
+    * Binding#local_variable_defined?(symbol)
 
-* fileutils
+* Enumerable
+  * New methods
+    * Enumerable#to_h converts a list of key-value pairs into a Hash.
 
-  * A minor implementation change breaks Rake <=0.7.1.
-    Updating Rake to 0.7.2 or higher fixes the problem.
+* Exception
+  * New methods
+    * Exception#cause provides the previous exception which has been caught
+      at where raising the new exception.
 
-* tk
+* GC
+  * added environment variable:
+    * RUBY_HEAP_SLOTS_GROWTH_FACTOR: growth rate of the heap.
 
-  * Tk::X_Scrollable (Y_Scrollable) is renamed to Tk::XScrollable
-    (YScrollable). Tk::X_Scrollable (Y_Scrollable) is still available,
-    but it is an alias name.
+* Integer
+  * New methods
+    * Fixnum#bit_length
+    * Bignum#bit_length
+  * Bignum performance improvement
+    * Use GMP if available.
+      GMP is used only for several operations:
+      multiplication, division, radix conversion, GCD
+
+* IO
+  * extended methods:
+    * IO#seek supports SEEK_DATA and SEEK_HOLE as whence.
+    * IO#seek accepts symbols (:CUR, :END, :SET, :DATA, :HOLE) for 2nd argument.
+    * IO#read_nonblock accepts optional `exception: false` to return symbols
+    * IO#write_nonblock accepts optional `exception: false` to return symbols
+
+* Kernel
+  * New methods:
+    * Kernel#singleton_method
+
+* Module
+  * New methods:
+    * Module#using, which activates refinements of the specified module only
+      in the current class or module definition.
+    * Module#singleton_class? returns true if the receiver is a singleton class
+      or false if it is an ordinary class or module.
+  * extended methods:
+    * Module#refine is no longer experimental.
+    * Module#include and Module#prepend are now public methods.
+
+* Mutex
+  * misc
+    * Mutex#owned? is no longer experimental.
+
+* Numeric
+  * extended methods:
+    * Numeric#step allows the limit argument to be omitted, in which
+      case an infinite sequence of numbers is generated.  Keyword
+      arguments `to` and `by` are introduced for ease of use.
+
+* Process
+  * New methods:
+    * alternative methods to $0/$0=:
+      * Process.argv0() returns the original value of $0.
+      * Process.setproctitle() sets the process title without affecting $0.
+    * Process.clock_gettime
+    * Process.clock_getres
+
+* RbConfig
+  * New constants:
+    * RbConfig::SIZEOF is added to provide the size of C types.
+
+* String
+  * New methods:
+    * String#scrub and String#scrub! verify and fix invalid byte sequence.
+  * extended methods:
+    * If invalid: :replace is specified for String#encode, replace
+      invalid byte sequence even if the destination encoding equals to
+      the source encoding.
+
+* Symbol
+  * All symbols are now frozen.
+
+* pack/unpack (Array/String)
+  * Q! and q! directives for long long type if platform has the type.
+
+* toplevel
+  * extended methods:
+    * main.using is no longer experimental. The method activates refinements
+      in the ancestors of the argument module to support refinement
+      inheritance by Module#include.
+
+=== Core classes compatibility issues (excluding feature bug fixes)
+
+* IO
+  * incompatible changes:
+    * open ignore internal encoding if external encoding is ASCII-8BIT.
+
+* Kernel#eval, Kernel#instance_eval, and Module#module_eval.
+  * Copies the scope information of the original environment, which means
+    that private, protected, public, and module_function without arguments
+    do not affect the environment outside the eval string.
+    For example, `class Foo; eval "private"; def foo; end; end' doesn't make
+    Foo#foo private.
+
+* Kernel#untrusted?, untrust, and trust
+  * These methods are deprecated and their behavior is same as tainted?,
+    taint, and untaint, respectively.  If $VERBOSE is true, they show warnings.
+
+* Module#ancestors
+  * The ancestors of a singleton class now include singleton classes,
+    in particular itself.
+
+* Module#define_method and Object#define_singleton_method
+  * Now they return the symbols of the defined methods, not the methods/procs
+    themselves.
+
+* Numeric#quo
+  * Raises TypeError instead of ArgumentError if the receiver doesn't have
+    to_r method.
+
+* Proc
+  * Returning from lambda proc now always exits from the Proc, not from the
+    method where the lambda is created.  Returning from non-lambda proc exits
+    from the method, same as the former behavior.
+
+=== Stdlib updates (outstanding ones only)
+
+* CGI::Util
+  * All class methods modulized.
+
+* Digest
+  * extended methods:
+    * Digest::Class.file takes optional arguments for its constructor
+
+* Matrix
+  * Added Vector#cross_product.
+
+* Net::SMTP
+  * Added Net::SMTP#rset to implement the RSET command
+
+* objspace
+  * new method:
+    * ObjectSpace.trace_object_allocations
+    * ObjectSpace.trace_object_allocations_start
+    * ObjectSpace.trace_object_allocations_stop
+    * ObjectSpace.trace_object_allocations_clear
+    * ObjectSpace.allocation_sourcefile
+    * ObjectSpace.allocation_sourceline
+    * ObjectSpace.allocation_class_path
+    * ObjectSpace.allocation_method_id
+    * ObjectSpace.allocation_generation
+    * ObjectSpace.reachable_objects_from_root
+
+* OpenSSL::BN
+  * extended methods:
+    * OpenSSL::BN.new allows Fixnum/Bignum argument.
+
+* open-uri
+  * Support multiple fields with same field name (like Set-Cookie).
+
+* Pathname
+  * New methods:
+    * Pathname#write
+    * Pathname#binwrite
+
+* rake
+  * Updated to 10.1.0.  Major changes include removal of the class namespace,
+    Rake::DSL to hold the rake DSL methods and removal of support for legacy
+    rake features.
+
+    For a complete list of changes since rake 0.9.6 see:
+
+    http://rake.rubyforge.org/doc/release_notes/rake-10_1_0_rdoc.html
+
+    http://rake.rubyforge.org/doc/release_notes/rake-10_0_3_rdoc.html
+
+* RDoc
+  * Updated to 4.1.0.preview.2.  Major enhancements include a modified default
+    template and accessibility enhancements.
+
+    For a list of minor enhancements and bug fixes see:
+    https://github.com/rdoc/rdoc/blob/v4.1.0.preview.1/History.rdoc
+
+* Resolv
+  * New methods:
+    * Resolv::DNS.fetch_resource
+  * One-shot multicast DNS support
+  * Support LOC resources
+
+* REXML::Parsers::SAX2Parser
+  * Fixes wrong number of arguments of entitydecl event. Document of the event
+    says "an array of the entity declaration" but implementation passes two
+    or more arguments. It is an implementation bug but it breaks backword
+    compatibility.
+
+* REXML::Parsers::StreamParser
+  * Supports "entity" event.
+
+* REXML::Text
+  * REXML::Text#<< supports method chain like 'text << "XXX" << "YYY"'.
+  * REXML::Text#<< supports not "raw" mode.
+
+* Rinda::RingServer, Rinda::RingFinger
+  * Rinda now supports multicast sockets.  See Rinda::RingServer and
+    Rinda::RingFinger for details.
+
+* RubyGems
+  * Updated to 2.2.0.preview.2  For a list of enhancements and bug fixes see:
+    https://github.com/rubygems/rubygems/blob/v2.2.0.preview.1/History.txt
+
+* Set
+  * New methods:
+    * Set#intersect?
+    * Set#disjoint?
+
+* Socket
+  * New methods:
+    * Socket.getifaddrs
+
+* StringScanner
+  * extended methods:
+    * StringScanner#[] supports named captures.
+
+* Syslog::Logger
+  * Added facility.
+
+* Tempfile
+  * New methods:
+    * Tempfile.create
+
+* Timeout
+  * The exception to terminate the given block can no longer be rescued
+    inside the block, by default, unless the exception class is given
+    explicitly.
+
+* TSort
+  * New methods:
+    * TSort.tsort
+    * TSort.tsort_each
+    * TSort.strongly_connected_components
+    * TSort.each_strongly_connected_component
+    * TSort.each_strongly_connected_component_from
+
+* WEBrick
+  * The body of a response may now be a StringIO or other IO-like that responds
+    to #readpartial and #read.
+
+* XMLRPC::Client
+  * New methods:
+    * XMLRPC::Client#http. It returns Net::HTTP for the client. Normally,
+      it is not needed. It is useful when you want to change minor HTTP client
+      options. You can change major HTTP client options by XMLRPC::Client
+      methods. You should use XMLRPC::Client methods for changing major
+      HTTP client options instead of XMLRPC::Client#http.
+
+=== Stdlib compatibility issues (excluding feature bug fixes)
+
+* Set
+  * incompatible changes:
+    * Set#to_set now returns self instead of generating a copy.
+
+* URI
+  * incompatible changes:
+    * URI.decode_www_form follows current WHATWG URL Standard.
+      It gets encoding argument to specify the character encoding.
+      It now allows loose percent encoded strings, but denies ;-separator.
+    * URI.encode_www_form follows current WHATWG URL Standard.
+      It gets encoding argument to convert before percent encode.
+      UTF-16 strings aren't converted to UTF-8 before percent encode by default.
+
+=== Built-in global variables compatibility issues
+
+* $SAFE
+  * $SAFE=4 is obsolete.  If $SAFE is set to 4 or larger, an ArgumentError
+    is raised.
+
+=== C API updates
diff --git a/README b/README
index 1b79781367..3ffe3553a8 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-* What's Ruby
+= What's Ruby
 
 Ruby is the interpreted scripting language for quick and
 easy object-oriented programming.  It has many features to
@@ -6,113 +6,161 @@ process text files and to do system management tasks (as in
 Perl).  It is simple, straight-forward, and extensible.
 
 
-* Features of Ruby
+== 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 machines, and on DOS,
-    Windows, Mac, BeOS etc.)
+*   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://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatforms
 
 
-* How to get Ruby
+== How to get Ruby
 
-The Ruby distribution files can be found in the following FTP site:
+For a complete list of ways to install Ruby, including using third party
+tools like rvm, see:
 
-  ftp://ftp.ruby-lang.org/pub/ruby/
+http://www.ruby-lang.org/en/downloads/
 
-The latest source code of this version series can be checked out
-through SVN with the following command:
+The Ruby distribution files can be found in the following FTP site:
 
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
+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 and 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
+== Ruby home-page
 
 The URL of the Ruby home-page is:
 
-   http://www.ruby-lang.org/
+http://www.ruby-lang.org/
 
 
-* Mailing list
+== Mailing list
 
 There is a mailing list to talk about Ruby.
 To subscribe this list, please send the following phrase
 
-	subscribe YourFirstName YourFamilyName
+        subscribe YourFirstName YourFamilyName
 e.g.
         subscribe Joseph Smith
 
-in the mail body (not subject) to the address <ruby-talk-ctl@ruby-lang.org>.
+in the mail body (not subject) to the address <mailto:ruby-talk-ctl@ruby-lang.org>.
 
 
-* How to compile and install
+== 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,
+0.   If you want to use Microsoft Visual C++ to compile ruby,
+     read win32/README.win32 instead of this document.
+
+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.
+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.
+     environment.  Specify <tt>optflags=..</tt> and <tt>warnflags=..</tt> as
+     necessary to override them.
 
-  3. Edit defines.h if you need.  Usually this step will not be needed.
+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
+4.   Remove comment mark(<tt>#</tt>) 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.
+     remove comment mark from the line "<tt>#option nodynamic</tt>" in
+     +ext/Setup+.
+
+     Usually this step will not be needed.
 
-  5. Run make.
+5.   Run +make+.
 
-  6. Optionally, run 'make test' to check whether the compiled Ruby
-     interpreter works well.  If you see the message "test succeeded",
+6.   Optionally, run '<tt>make check</tt>' to check whether the compiled Ruby
+     interpreter works well. If you see the message "<tt>check succeeded</tt>",
      your ruby works as it should (hopefully).
 
-  7. Run 'make install'
+7.   Run '<tt>make install</tt>'
+
+     This command will create following directories and install files
+     onto them.
+
+     * <tt>${DESTDIR}${prefix}/bin</tt>
+     * <tt>${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
+     * <tt>${DESTDIR}${prefix}/lib</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/share/man/man1</tt>
+     * <tt>${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system</tt>
+
+     If Ruby's API version is '_x.y.z_', the <tt>${MAJOR}</tt> is '_x_', the
+     <tt>${MINOR}</tt> is '_y_', and the <tt>${TEENY}</tt> 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
+'<tt>make distclean-ext</tt>' to remove old configuration after
+installing them in such case.
+
+== Copying
+
+See the file +COPYING+.
 
-* Copying
+== Feedback
 
-See the file COPYING.
+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
 
-* The Author
+== The Author
 
-Feel free to send comments and bug reports to the author.  Here is the 
-author's latest mail address:
+Ruby was originally designed and developed by Yukihiro Matsumoto (Matz) in 1995.
 
-  matz@netlab.jp
+<mailto:matz@ruby-lang.org>
 
--------------------------------------------------------
-created at: Thu Aug  3 11:57:36 JST 1995
+--
 Local variables:
-mode: indented-text
+mode: rdoc
 end:
diff --git a/README.EXT b/README.EXT
index 637b19d25b..b7a1728110 100644
--- a/README.EXT
+++ b/README.EXT
@@ -1,8 +1,8 @@
-.\" README.EXT -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
+# README.EXT -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
 
 This document explains how to make extension libraries for Ruby.
 
-1. Basic knowledge
+= Basic Knowledge
 
 In C, variables have types and data do not have types.  In contrast,
 Ruby variables do not have a static type, and data themselves have
@@ -13,46 +13,46 @@ 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
+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
+== 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_FIXNUM	Fixnum(31bit integer)
-	T_HASH		associative array
-	T_STRUCT	(Ruby) structure
-	T_BIGNUM	multi precision integer
-	T_FILE		IO
-	T_TRUE		true
-	T_FALSE		false
-	T_DATA		data
-	T_SYMBOL        symbol
+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_VARMAP
-	T_SCOPE
-	T_NODE
+T_ICLASS    :: included module
+T_MATCH     :: MatchData object
+T_UNDEF     :: undefined
+T_NODE      :: syntax tree node
+T_ZOMBIE    :: object awaiting finalization
 
 Most of the types are represented by C structures.
 
-1.2 Check Data Type of the VALUE
+== Check Data Type of the VALUE
 
 The macro TYPE() defined in ruby.h shows the data type of the VALUE.
 TYPE() returns the constant number T_XXXX described above.  To handle
@@ -78,65 +78,80 @@ There is the data-type check function
 
   void Check_Type(VALUE value, int type)
 
-which raises an exception if the VALUE does not have the type specified.
+which raises an exception if the VALUE does not have the type
+specified.
 
 There are also faster check macros for fixnums and nil.
 
   FIXNUM_P(obj)
   NIL_P(obj)
 
-1.3 Convert VALUE into C data
+== Convert VALUE into C Data
 
-The data for type T_NIL, T_FALSE, T_TRUE are nil, true, false
+The data for type T_NIL, T_FALSE, T_TRUE are nil, false, true
 respectively.  They are singletons for the data type.
-
-The T_FIXNUM data is a 31bit length fixed integer (63bit length on
-some machines), which can be converted to a C integer by using the
-FIX2INT() macro.  There is also NUM2INT() which converts any Ruby
-numbers into C integers.  The NUM2INT() macro includes a type check, so
-an exception will be raised if the conversion failed.  NUM2DBL() can
-be used to retrieve the double float value in the same way.
-
-In version 1.7 or later it is recommended that you use the new macros
+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
+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.
 
-In version 1.6 or earlier, STR2CSTR() was used to do the same thing
-but now it is deprecated in version 1.7, because STR2CSTR() has a risk
-of a dangling pointer problem in the to_str() impliclit conversion.
+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".
-
-For example, `RSTRING(str)->len' is the way to get the size of the
-Ruby String object.  The allocated region can be accessed by
-`RSTRING(str)->ptr'.  For arrays, use `RARRAY(ary)->len' and
-`RARRAY(ary)->ptr' respectively.
+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".  However, we do not recommend
+to access RXXXX data directly because these data structure is complex.
+Use corresponding rb_xxx() functions to access internal struct.
+For example, to access an entry of array, use rb_ary_entry(ary, offset)
+and rb_ary_store(ary, offset, obj).
+
+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)'.
 
 Notice: Do not change the value of the structure directly, unless you
-are responsible for the result.  This ends up being the cause of interesting
-bugs.
+are responsible for the result.  This ends up being the cause of
+interesting bugs.
 
-1.4 Convert C data into VALUE
+== Convert C Data into VALUE
 
 To convert C data to Ruby values:
 
-  * FIXNUM
+FIXNUM ::
 
-    left shift 1 bit, and turn on LSB.
+  left shift 1 bit, and turn on LSB.
 
-  * Other pointer values
+Other pointer values::
 
-    cast to VALUE.
+  cast to VALUE.
 
-You can determine whether a VALUE is pointer or not by checking its LSB.  
+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
@@ -144,81 +159,161 @@ 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.
+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
+== 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.
+
+  Note: In the format string, %i is used for Object#to_s (or Object#inspect if
+  '+' flag is set) output (and related argument must be a VALUE).  For integers
+  in format strings, use %d.
 
-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:
+rb_str_cat(VALUE str, const char *ptr, long len) ::
 
- String functions
+  Appends len bytes of data from ptr to the Ruby string.
 
-  rb_str_new(const char *ptr, long len)
+rb_str_cat2(VALUE str, const char* ptr) ::
 
-    Creates a new Ruby string.
+  Appends C string ptr to Ruby string str.  This function is
+  equivalent to rb_str_cat(str, ptr, strlen(ptr)).
 
-  rb_str_new2(const char *ptr)
+rb_str_catf(VALUE str, const char* format, ...) ::
+rb_str_vcatf(VALUE str, const char* format, va_list ap) ::
 
-    Creates a new Ruby string from a C string.  This is equivalent to
-    rb_str_new(ptr, strlen(ptr)).
+  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_tainted_str_new(const char *ptr, long len)
+rb_enc_str_new(const char *ptr, long len, rb_encoding *enc) ::
+rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc) ::
 
-    Creates a new tainted Ruby string.  Strings from external data
-    sources should be tainted.
+  Creates a new Ruby string with the specified encoding.
 
-  rb_tainted_str_new2(const char *ptr)
+rb_usascii_str_new(const char *ptr, long len) ::
+rb_usascii_str_new_cstr(const char *ptr) ::
 
-    Creates a new tainted Ruby string from a C string.
+  Creates a new Ruby string with encoding US-ASCII.
 
-  rb_str_cat(VALUE str, const char *ptr, long len)
+rb_str_resize(VALUE str, long len) ::
 
-    Appends len bytes of data from ptr to the Ruby string.
+  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.
 
- Array functions
+rb_str_set_len(VALUE str, long len) ::
 
-  rb_ary_new()
+  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.
 
-    Creates an array with no elements.
+=== Array Functions
 
-  rb_ary_new2(long len)
+rb_ary_new() ::
 
-    Creates an array with no elements, allocating internal buffer
-    for len elements.
+  Creates an array with no elements.
 
-  rb_ary_new3(long n, ...)
+rb_ary_new2(long len) ::
+rb_ary_new_capa(long len) ::
 
-    Creates an n-element array from the arguments.
+  Creates an array with no elements, allocating internal buffer
+  for len elements.
 
-  rb_ary_new4(long n, VALUE *elts)
+rb_ary_new3(long n, ...) ::
+rb_ary_new_from_args(long n, ...) ::
 
-    Creates an n-element array from a C array.
+  Creates an n-element array from the arguments.
 
-  rb_ary_push(VALUE ary, VALUE val)
-  rb_ary_pop(VALUE ary)
-  rb_ary_shift(VALUE ary)
-  rb_ary_unshift(VALUE ary, VALUE val)
+rb_ary_new4(long n, VALUE *elts) ::
+rb_ary_new_from_values(long n, VALUE *elts) ::
 
-    Array operations.  The first argument to each functions must be an 
-    array.  They may dump core if other types are given.
+  Creates an n-element array from a C array.
 
-2. Extending Ruby with C
+rb_ary_to_ary(VALUE obj) ::
 
-2.1 Addding new features to Ruby
+  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) ::
+
+  Equivalent to Array#[].
+
+rb_ary_entry(VALUE ary, long offset) ::
+
+  ary[offset]
+
+rb_ary_store(VALUE ary, long offset, VALUE obj) ::
+
+  ary[offset] = obj
+
+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) ::
+
+rb_ary_cat(VALUE ary, const VALUE *ptr, long len) ::
+
+  Appends len elements of objects from ptr to the array.
+
+= Extending Ruby with C
+
+== 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
+* Classes, Modules
+* Methods, Singleton Methods
+* Constants
 
-2.1.1 Class/module definition
+=== Class and Module Definition
 
 To define a class or module, use the functions below:
 
@@ -233,21 +328,21 @@ 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
+=== Method and Singleton Method Definition
 
 To define methods or singleton methods, use these functions:
 
-  void rb_define_method(VALUE klass, const char *name, 
+  void rb_define_method(VALUE klass, const char *name,
 		        VALUE (*func)(), int argc)
 
-  void rb_define_singleton_method(VALUE object, const char *name, 
+  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.  
+the arguments.
 
 If argc is -1, the function will be called as:
 
@@ -264,15 +359,23 @@ will be called like:
 where obj is the receiver, and args is the Ruby array containing
 actual arguments.
 
-There are two more functions to define methods.  One is to define
-private methods:
+There are some more functions to define methods. One takes an ID
+as the name of method to be defined. See also ID or Symbol below.
+
+  void rb_define_method_id(VALUE klass, ID name,
+                           VALUE (*func)(ANYARGS), int argc)
 
-  void rb_define_private_method(VALUE klass, const char *name, 
+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)
 
-The other is to define 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:
+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)
 
@@ -283,10 +386,10 @@ or
 
 To define module functions, use:
 
-  void rb_define_module_function(VALUE module, const char *name, 
+  void rb_define_module_function(VALUE module, const char *name,
 				 VALUE (*func)(), int argc)
 
-Oh, in addition, function-like methods, which are private methods defined
+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)
@@ -295,16 +398,20 @@ 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 have to take the klass as the argument and return a newly
-allocated instance.  This instance should be empty as possible,
+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
+=== Constant Definition
 
 We have 2 functions to define constants:
 
@@ -314,11 +421,11 @@ We have 2 functions to define constants:
 The former is to define a constant under specified class/module.  The
 latter is to define a global constant.
 
-2.2 Use Ruby features from C
+== 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
+=== 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:
@@ -328,23 +435,46 @@ evaluate the string as Ruby program.  This function will do the job:
 Evaluation is done under the current context, thus current local variables
 of the innermost method (which is defined by Ruby) can be accessed.
 
-2.2.2 ID or Symbol
+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.
+
+=== ID or Symbol
 
-You can invoke methods directly, without parsing the string.  First I need
-to explain about ID.  ID is the integer number to represent Ruby's
-identifiers such as variable names.  The Ruby data type corresponding to ID
-is Symbol.  It can be accessed from Ruby in the form:
+You can invoke methods directly, without parsing the string.  First I
+need to explain about ID.  ID is the integer number to represent
+Ruby's identifiers such as variable names.  The Ruby data type
+corresponding to ID is Symbol.  It can be accessed from Ruby in the
+form:
 
- :Identifier
+  :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)
+  rb_intern_str(VALUE name)
 
 You can retrieve ID from Ruby object (Symbol or String) given as an
 argument by using
 
   rb_to_id(VALUE symbol)
+  rb_check_id(volatile VALUE *name)
+  rb_check_id_cstr(const char *name, long len, rb_encoding *enc)
+
+These functions try to convert the argument to a String if it was not
+a Symbol nor a String.  The second function stores the converted
+result into *name, and returns 0 if the string is not a known symbol.
+After this function returned a non-zero value, *name is always a
+Symbol or a String, otherwise it is a String if the result is 0.
+The third function takes NUL-terminated C string, not Ruby VALUE.
 
 You can convert C ID to Ruby Symbol by using
 
@@ -354,7 +484,7 @@ and to convert Ruby Symbol object to ID, use
 
   ID SYM2ID(VALUE symbol)
 
-2.2.3 Invoke Ruby method from C
+=== Invoke Ruby Method from C
 
 To invoke methods directly, you can use the function below
 
@@ -363,11 +493,11 @@ To invoke methods directly, you can use the function below
 This function invokes a method on the recv, with the method name
 specified by the symbol mid.
 
-2.2.4 Accessing the variables and constants
+=== Accessing the Variables and Constants
 
 You can access class variables and instance variables using access
-functions.  Also, global variables can be shared between both environments.
-There's no way to access Ruby's local variables.
+functions.  Also, global variables can be shared between both
+environments.  There's no way to access Ruby's local variables.
 
 The functions to access/modify instance variables are below:
 
@@ -380,13 +510,14 @@ To access the constants of the class/module:
 
   VALUE rb_const_get(VALUE obj, ID id)
 
-See 2.1.3 for defining new constant.
+See also Constant Definition above.
 
-3. Information sharing between Ruby and C
+= Information Sharing Between Ruby and C
 
-3.1 Ruby constants that C can be accessed from C
+=== Ruby Constants That C Can Be Accessed From C
 
-The following Ruby constants can be referred from C.
+As stated in section 1.3,
+the following Ruby constants can be referred from C.
 
   Qtrue
   Qfalse
@@ -397,7 +528,7 @@ Boolean values.  Qfalse is false in C also (i.e. 0).
 
 Ruby nil in C scope.
 
-3.2 Global variables shared between C and Ruby
+== Global Variables Shared Between C and Ruby
 
 Information can be shared between the two environments using shared global
 variables.  To define them, you can use functions listed below:
@@ -416,30 +547,37 @@ function below.
 You can defined hooked variables.  The accessor functions (getter and
 setter) are called on access to the hooked variables.
 
-  void rb_define_hooked_variable(constchar *name, VALUE *var,
+  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().
 
-  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, VALUE *var);
+  void (*setter)(VALUE val, ID id, VALUE *var);
 
-This function defines a Ruby global variable without a corresponding C
+
+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:
 
-  (*getter)(ID id, void *data, struct global_entry* entry);
-  (*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
+  VALUE (*getter)(ID id);
+  void (*setter)(VALUE val, ID id);
 
-3.3 Encapsulate C data into a Ruby object
+
+== 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(klass, mark, free, sval)
 
 Data_Wrap_Struct() returns a created DATA object.  The klass argument
 is the class for the DATA object.  The mark argument is the function
@@ -448,6 +586,10 @@ 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)
@@ -468,31 +610,34 @@ Data_Get_Struct().
 
 A pointer to the structure will be assigned to the variable sval.
 
-See the example below for details. 
+See the example below for details.
 
-4. Example - Creating dbm extension
+= 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
+== Make the Directory
 
   % mkdir ext/dbm
 
 Make a directory for the extension library under ext directory.
 
-(2) design the library
+== Design the Library
 
 You need to design the library features, before making it.
 
-(3) write C code.
+== Write the C Code
 
 You need to write C code for your extension library.  If your library
 has only one source file, choosing ``LIBRARY.c'' as a file name is
 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
@@ -500,53 +645,48 @@ the library.
 
 Here's the example of an initializing function.
 
---
-Init_dbm()
-{
-    /* 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.
+  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");
+  }
 
---
-struct dbmdata {
-    int  di_size;
-    DBM *di_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);
---
+  obj = Data_Make_Struct(klass, struct dbmdata, 0, free_dbm, dbmp);
 
-This code wraps the dbmdata structure into a Ruby object.  We avoid wrapping
-DBM* directly, because we want to cache size information.
+This code wraps the dbmdata structure into a Ruby object.  We avoid
+wrapping DBM* directly, because we want to cache size information.
 
 To retrieve the dbmdata structure from a Ruby object, we define the
 following macro:
 
---
-#define GetDBM(obj, dbmp) {\
-    Data_Get_Struct(obj, struct dbmdata, dbmp);\
-    if (dbmp->di_dbm == 0) closed_dbm();\
-}
---
+  #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.
@@ -554,14 +694,11 @@ 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(obj, keystr)
-    VALUE obj, keystr;
-{
-	:
-}
---
+  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.
@@ -569,52 +706,44 @@ arguments to the method.
 Second, methods with an arbitrary number of arguments receive
 arguments like this:
 
---
-static VALUE
-fdbm_s_open(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
-{
-	:
-    if (rb_scan_args(argc, argv, "11", &file, &vmode) == 1) {
-	mode = 0666;		/* default value */
-    }
-	:
-}
---
+  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.  For example, "11" means that the method requires at least one
-argument, and at most receives two arguments.
+arguments.  The third argument is a string that specifies how to
+capture method arguments and assign them to the following VALUE
+references.
 
-Methods with an arbitrary number of arguments can receive arguments
-by Ruby's array, like this:
 
---
-static VALUE
-fdbm_indexes(obj, args)
-    VALUE obj, args;
-{
-	:
-}
---
+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
+*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
+== Prepare extconf.rb
 
 If the file named extconf.rb exists, it will be executed to generate
 Makefile.
@@ -627,10 +756,26 @@ need to put
 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
+  have_macro(macro[, headers[, opt]]): check whether macro is defined
+  have_library(lib[, func[, headers[, opt]]]): check whether library containing function exists
+  find_library(lib[, func, *paths]): find library from paths
+  have_func(func[, headers[, opt]): check whether function exists
+  have_var(var[, headers[, opt]]): check whether variable exists
+  have_header(header[, preheaders[, opt]]): check whether header file exists
+  find_header(header, *paths): find header from paths
+  have_framework(fw): check whether framework exists (for MacOS X)
+  have_struct_member(type, member[, headers[, opt]]): check whether struct has member
+  have_type(type[, headers[, opt]]): check whether type exists
+  find_type(type, opt, *headers): check whether type exists in headers
+  have_const(const[, headers[, opt]]): check whether constant is defined
+  check_sizeof(type[, headers[, opts]]): check size of type
+  check_signedness(type[, headers[, opts]]): check signedness of type
+  convertible_int(type[, headers[, opts]]): find convertible integer type
+  find_executable(bin[, path]): find executable file path
+  create_header(header): generate configured header
+  create_makefile(target[, target_prefix]): generate Makefile
+
+See MakeMakefile for full documentation of these functions.
 
 The value of the variables below will affect the Makefile.
 
@@ -647,7 +792,7 @@ If a compilation condition is not fulfilled, you should not call
 ``create_makefile''.  The Makefile will not be generated, compilation will
 not be done.
 
-(5) prepare depend (optional)
+== Prepare Depend (Optional)
 
 If the file named depend exists, Makefile will include that file to
 check dependencies.  You can make this file by invoking
@@ -656,7 +801,7 @@ check dependencies.  You can make this file by invoking
 
 It's harmless.  Prepare it.
 
-(6) generate Makefile
+== Generate Makefile
 
 Try generating the Makefile by:
 
@@ -671,7 +816,7 @@ You don't need this step if you put the extension library under the ext
 directory of the ruby source tree.  In that case, compilation of the
 interpreter will do this step for you.
 
-(7) make
+== Run make
 
 Type
 
@@ -680,482 +825,672 @@ Type
 to compile your extension.  You don't need this step either if you have
 put the extension library under the ext directory of the ruby source tree.
 
-(8) debug
+== Debug
 
 You may need to rb_debug the extension.  Extensions can be linked
 statically by adding the directory name in the ext/Setup file so that
 you can inspect the extension with the debugger.
 
-(9) done, now you have the extension library
+== Done! Now You Have the Extension Library
 
 You can do anything you want with your library.  The author of Ruby
 will not claim any restrictions on your code depending on the Ruby API.
 Feel free to use, modify, distribute or sell your program.
 
-Appendix A. Ruby source files overview
+= Appendix A. Ruby Source Files Overview
 
-ruby language core
+== Ruby Language Core
 
-  class.c
-  error.c
-  eval.c
-  gc.c
-  object.c
-  parse.y
-  variable.c
+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
 
-utility functions
+== Ruby Syntax Parser
+
+parse.y  :: grammar definition
+parse.c  :: automatically generated from parse.y
+keywords :: reserved keywords
+lex.c    :: automatically generated from keywords
+
+== 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 switching
+  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)
 
-  dln.c
   regex.c
-  st.c
-  util.c
+  regcomp.c
+  regenc.c
+  regerror.c
+  regexec.c
+  regparse.c
+  regsyntax.c
+
+== Utility Functions
 
-ruby interpreter implementation
+debug.c    :: debug symbols for C debugger
+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
 
-class library
+  gem_prelude.rb
+  prelude.rb
 
-  array.c
-  bignum.c
-  compar.c
-  dir.c
-  enum.c
-  file.c
-  hash.c
-  io.c
-  marshal.c
-  math.c
-  numeric.c
-  pack.c
-  prec.c
-  process.c
-  random.c
-  range.c
-  re.c
-  signal.c
-  sprintf.c
-  string.c
-  struct.c
-  time.c
+== Class Library
 
-Appendix B. Ruby extension API reference
+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#sprintf
+string.c     :: String
+struct.c     :: Struct
+time.c       :: Time
 
-** Types
+defs/known_errors.def :: Errno::* exception classes
+-> known_errors.inc   :: automatically generated
 
- VALUE
+== Multilingualization
 
-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).
+encoding.c  :: Encoding
+transcode.c :: Encoding::Converter
+enc/*.c     :: encoding classes
+enc/trans/* :: codepoint mapping tables
 
-** Variables and constants
+== goruby Interpreter Implementation
 
- Qnil
+  goruby.c
+  golf_prelude.rb     : goruby specific libraries.
+    -> golf_prelude.c : automatically generated
 
-const: nil object
 
- Qtrue
+= Appendix B. Ruby Extension API Reference
 
-const: true object(default true value)
+== Types
 
- Qfalse
+VALUE ::
 
-const: false object
+  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).
 
-** C pointer wrapping
+== Variables and Constants
 
- Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
+Qnil::
+  nil object
 
-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.
+Qtrue::
+  true object (default true value)
 
- Data_Make_Struct(klass, type, mark, free, sval)
+Qfalse::
+  false object
 
-This macro allocates memory using malloc(), assigns it to the variable
-sval, and returns the DATA encapsulating the pointer to memory region.
+== C Pointer Wrapping
 
- Data_Get_Struct(data, type, sval)
+Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
 
-This macro retrieves the pointer value from DATA, and assigns it to
-the variable 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.
 
-** Checking data types
+Data_Make_Struct(klass, type, mark, free, sval) ::
 
-TYPE(value)
-FIXNUM_P(value)
-NIL_P(value)
-void Check_Type(VALUE value, int type)
-void Check_SafeStr(VALUE value)
+  This macro allocates memory using malloc(), assigns it to the variable
+  sval, and returns the DATA encapsulating the pointer to memory region.
 
-** Data type conversion
+Data_Get_Struct(data, type, sval) ::
 
-FIX2INT(value)
-INT2FIX(i)
-NUM2INT(value)
-INT2NUM(i)
-NUM2DBL(value)
-rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
-rb_str_new2(s)
+  This macro retrieves the pointer value from DATA, and assigns it to
+  the variable sval.
 
-** defining class/module
+== Checking Data Types
 
- VALUE rb_define_class(const char *name, VALUE super)
+TYPE(value) ::
 
-Defines a new Ruby class as a subclass of super.
+  Internal type (T_NIL, T_FIXNUM, etc.)
 
- VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
+FIXNUM_P(value) ::
 
-Creates a new Ruby class as a subclass of super, under the module's
-namespace.
+  Is +value+ a Fixnum?
 
- VALUE rb_define_module(const char *name)
+NIL_P(value) ::
 
-Defines a new Ruby module.
+  Is +value+ nil?
 
- VALUE rb_define_module_under(VALUE module, const char *name)
+void Check_Type(VALUE value, int type) ::
 
-Defines a new Ruby module under the module's namespace.
+  Ensures +value+ is of the given internal +type+ or raises a TypeError
 
- void rb_include_module(VALUE klass, VALUE module)
+SaveStringValue(value) ::
 
-Includes module into class.  If class already includes it, just
-ignored.
+  Checks that +value+ is a String and is not tainted
 
- void rb_extend_object(VALUE object, VALUE module)
+== Data Type Conversion
 
-Extend the object with the module's attributes.
+FIX2INT(value), INT2FIX(i) ::
 
-** Defining Global Variables
+  Fixnum <-> integer
 
- void rb_define_variable(const char *name, VALUE *var)
+FIX2LONG(value), LONG2FIX(l) ::
 
-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.
+  Fixnum <-> long
 
- void rb_define_readonly_variable(const char *name, VALUE *var)
+NUM2INT(value), INT2NUM(i) ::
 
-Defines a read-only global variable.  Works just like
-rb_define_variable(), except the defined variable is read-only.
+  Numeric <-> integer
 
- void rb_define_virtual_variable(const char *name,
-				 VALUE (*getter)(), VALUE (*setter)())
+NUM2UINT(value), UINT2NUM(ui) ::
 
-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:
+  Numeric <-> unsigned integer
 
-	VALUE getter(ID id)
-	void setter(VALUE val, ID id)
+NUM2LONG(value), LONG2NUM(l) ::
 
-The getter function must return the value for the access.
+  Numeric <-> long
 
- void rb_define_hooked_variable(const char *name, VALUE *var,
-				VALUE (*getter)(), VALUE (*setter)())
+NUM2ULONG(value), ULONG2NUM(ul) ::
 
-Defines hooked variable.  It's a virtual variable with a C variable.  
-The getter is called as
+  Numeric <-> unsigned long
 
-	VALUE getter(ID id, VALUE *var)
+NUM2LL(value), LL2NUM(ll) ::
 
-returning a new value.  The setter is called as
+  Numeric <-> long long
 
-	void setter(VALUE val, ID id, VALUE *var)
+NUM2ULL(value), ULL2NUM(ull) ::
 
-GC requires C global variables which hold Ruby values to be marked.
+  Numeric <-> unsigned long long
 
- void rb_global_variable(VALUE *var)
+NUM2OFFT(value), OFFT2NUM(off) ::
 
-Tells GC to protect these variables.
+  Numeric <-> off_t
 
-** Constant Definition
+NUM2SIZET(value), SIZET2NUM(size) ::
 
- void rb_define_const(VALUE klass, const char *name, VALUE val)
+  Numeric <-> size_t
 
-Defines a new constant under the class/module.
+NUM2SSIZET(value), SSIZET2NUM(ssize) ::
 
- void rb_define_global_const(const char *name, VALUE val)
+  Numeric <-> ssize_t
 
-Defines a global constant.  This is just the same as
+rb_integer_pack(value, words, numwords, wordsize, nails, flags), rb_integer_unpack(words, numwords, wordsize, nails, flags) ::
 
-     rb_define_const(cKernal, name, val)
+  Numeric <-> Arbitrary size integer buffer
 
-** Method Definition
+NUM2DBL(value) ::
 
- rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+  Numeric -> double
 
-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_float_new(f) ::
 
- rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+  double -> Float
 
-Defines a private method for the class.  Arguments are same as
-rb_define_method().
+StringValue(value) ::
 
- rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+  Object with #to_str -> String
 
-Defines a singleton method.  Arguments are same as rb_define_method().
+StringValuePtr(value) ::
 
- rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
+  Object with #to_str -> pointer to String data
 
-Retrieve argument from argc, argv.  The fmt is the format string for
-the arguments, such as "12" for 1 non-optional argument, 2 optional
-arguments.  If `*' appears at the end of fmt, it means the rest of
-the arguments are assigned to the corresponding variable, packed in
-an array.
+StringValueCStr(value) ::
 
-** Invoking Ruby method
+  Object with #to_str -> pointer to String data without NULL bytes
 
- VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
+rb_str_new2(s) ::
 
-Invokes a method.  To retrieve mid from a method name, use rb_intern().
+  char * -> String
 
- VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
+== Defining Class and Module
 
-Invokes a method, passing arguments by an array of values.
+VALUE rb_define_class(const char *name, VALUE super) ::
 
- VALUE rb_eval_string(const char *str)
+  Defines a new Ruby class as a subclass of super.
 
-Compiles and executes the string as a Ruby program.
+VALUE rb_define_class_under(VALUE module, const char *name, VALUE super) ::
 
- ID rb_intern(const char *name)
+  Creates a new Ruby class as a subclass of super, under the module's
+  namespace.
 
-Returns ID corresponding to the name.
+VALUE rb_define_module(const char *name) ::
 
- char *rb_id2name(ID id)
+  Defines a new Ruby module.
 
-Returns the name corresponding ID.
+VALUE rb_define_module_under(VALUE module, const char *name) ::
 
- char *rb_class2name(VALUE klass)
+  Defines a new Ruby module under the module's namespace.
 
-Returns the name of the class.
+void rb_include_module(VALUE klass, VALUE module) ::
 
- int rb_respond_to(VALUE object, ID id)
+  Includes module into class.  If class already includes it, just ignored.
 
-Returns true if the object responds to the message specified by id.
+void rb_extend_object(VALUE object, VALUE module) ::
 
-** Instance Variables
+  Extend the object with the module's attributes.
 
- VALUE rb_iv_get(VALUE obj, const char *name)
+== Defining Global Variables
 
-Retrieve the value of the instance variable.  If the name is not
-prefixed by `@', that variable shall be inaccessible from Ruby.
+void rb_define_variable(const char *name, VALUE *var) ::
 
- VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
+  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.
 
-Sets the value of the instance variable.
+void rb_define_readonly_variable(const char *name, VALUE *var) ::
 
-** Control Structure
+  Defines a read-only global variable.  Works just like
+  rb_define_variable(), except the defined variable is read-only.
 
- VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
+void rb_define_virtual_variable(const char *name, VALUE (*getter)(), VALUE (*setter)()) ::
 
-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.
- 
- VALUE rb_yield(VALUE val)
+  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:
 
-Evaluates the block with value val.
+    VALUE getter(ID id)
+    void setter(VALUE val, ID id)
 
- VALUE rb_rescue(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
+  The getter function must return the value for the access.
 
-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.
+void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), VALUE (*setter)()) ::
 
- VALUE rb_ensure(VALUE (*func1)(), void *arg1, void (*func2)(), void *arg2)
+  Defines hooked variable.  It's a virtual variable with a C variable.
+  The getter is called as
 
-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.
+    VALUE getter(ID id, VALUE *var)
 
-** Exceptions and Errors
+  returning a new value.  The setter is called as
 
- void rb_warn(const char *fmt, ...)
+    void setter(VALUE val, ID id, VALUE *var)
 
-Prints a warning message according to a printf-like format.
+  GC requires C global variables which hold Ruby values to be marked.
 
- void rb_warning(const char *fmt, ...)
+void rb_global_variable(VALUE *var)
 
-Prints a warning message according to a printf-like format, if
-$VERBOSE is true.
+  Tells GC to protect these variables.
 
-void rb_raise(rb_eRuntimeError, const char *fmt, ...)
+== Constant Definition
 
-Raises RuntimeError.  The fmt is a format string just like printf().
+void rb_define_const(VALUE klass, const char *name, VALUE val) ::
 
- void rb_raise(VALUE exception, const char *fmt, ...)
+  Defines a new constant under the class/module.
 
-Raises a class exception.  The fmt is a format string just like printf().
+void rb_define_global_const(const char *name, VALUE val) ::
 
- void rb_fatal(const char *fmt, ...)
+  Defines a global constant.  This is just the same as
 
-Raises a fatal error, terminates the interpreter.  No exception handling
-will be done for fatal errors, but ensure blocks will be executed.
+    rb_define_const(cKernal, name, val)
 
- void rb_bug(const char *fmt, ...)
+== Method Definition
 
-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.
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
 
-** Initialize and Start the Interpreter
+  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.
 
-The embedding API functions are below (not needed for extension libraries):
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
 
- void ruby_init()
+  Defines a private method for the class.  Arguments are same as
+  rb_define_method().
 
-Initializes the interpreter.
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
 
- void ruby_options(int argc, char **argv)
+  Defines a singleton method.  Arguments are same as rb_define_method().
 
-Process command line arguments for the interpreter.
+rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
 
- void ruby_run()
+  Retrieve argument from argc and argv to given VALUE references
+  according to the format string.  The format can be described in ABNF
+  as follows:
 
-Starts execution of the interpreter.
+    scan-arg-spec  := param-arg-spec [option-hash-arg-spec] [block-arg-spec]
 
- void ruby_script(char *name)
+    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
 
-Specifies the name of the script ($0).
+    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
 
-** Hooks for the Interpreter Events
+  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.
 
- void rb_add_event_hook(rb_event_hook_func_t func, rb_event_t events)
+  The number of given arguments, excluding an option hash or iterator
+  block, is returned.
 
-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
+== Invoking Ruby method
 
-The definition of rb_event_hook_func_t is below:
+VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
 
- typedef void (*rb_event_hook_func_t)(rb_event_t event, NODE *node,
- 				      VALUE self, ID id, VALUE klass)
+  Invokes a method.  To retrieve mid from a method name, use rb_intern().
+  Able to call even private/protected methods.
 
- int rb_remove_event_hook(rb_event_hook_func_t func)
+VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) ::
+VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) ::
 
-Removes the specified hook function.
+  Invokes a method, passing arguments as an array of values.
+  Able to call even private/protected methods.
+
+VALUE rb_funcallv_public(VALUE recv, ID mid, int argc, VALUE *argv) ::
+
+  Invokes a method, passing arguments as an array of values.
+  Able to call only public methods.
+
+VALUE rb_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) ::
 
-Appendix C. Functions Available in extconf.rb
+  Evaluates the block with value val.
 
-These functions are available in extconf.rb:
+VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
 
- have_macro(macro, headers)
+  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.
 
-Checks whether macro is defined with header.  Returns true if the macro
-is defined.
+VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
 
- have_library(lib, func)
+  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 occurred.
 
-Checks whether the library exists, containing the specified function.
-Returns true if the library exists.
+VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) ::
 
- find_library(lib, func, path...)
+  Calls the function func with arg as the argument.  If no exception
+  occurred during func, it returns the result of func and *state is zero.
+  Otherwise, it returns Qnil and sets *state to nonzero.  If state is
+  NULL, it is not set in both cases.
+  You have to clear the error info with rb_set_errinfo(Qnil) when
+  ignoring the caught exception.
 
-Checks whether a library which contains the specified function exists in
-path.  Returns true if the library exists.
+void rb_jump_tag(int state) ::
 
- have_func(func, header)
+  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.
 
-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().
+void rb_iter_break() ::
 
- have_var(var, header)
+  Exits from the current innermost block.  This function never return to
+  the caller.
 
-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().
+void rb_iter_break_value(VALUE value) ::
 
- have_header(header)
+  Exits from the current innermost block with the value.  The block will
+  return the given argument value.  This function never return to the
+  caller.
 
-Checks whether header exists.  Returns true if the header file exists.
+== Exceptions and Errors
 
- find_header(header, path...)
+void rb_warn(const char *fmt, ...) ::
 
-Checks whether header exists in path.  Returns true if the header file
-exists.
+  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.
+
+Note: In the format string, %i is used for Object#to_s (or Object#inspect if
+'+' flag is set) output (and related argument must be a VALUE).  For integers
+in format strings, use %d.
+
+== 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.
 
- have_struct_member(type, member, header)
+== Macros for Compatibility
 
-Checks whether type has member with header.  Returns true if the type
-is defined and has the member.
+Some macros to check API compatibilities are available by default.
 
- have_type(type, header, opt)
+NORETURN_STYLE_NEW ::
 
-Checks whether type is defined with header.  Returns true if the type
-is defined.
+  Means that NORETURN macro is functional style instead of prefix.
 
- check_sizeof(type, header)
+HAVE_RB_DEFINE_ALLOC_FUNC ::
 
-Checks the size of type in char with header.  Returns the size if the
-type is defined, otherwise nil.
+  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").
 
- create_makefile(target)
+HAVE_RB_REG_NEW_STR ::
 
-Generates the Makefile for the extension library.  If you don't invoke
-this method, the compilation will not be done.
+  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").
 
- find_executable(bin, path)
+HAVE_RB_IO_T ::
 
-Finds command in path, which is File::PATH_SEPARATOR-separated list of
-directories.  If path is nil or omitted, environment varialbe PATH
-will be used.  Returns the path name of the command if it is found,
-otherwise nil.
+  Means that type rb_io_t is provided.
 
- with_config(withval[, default=nil])
+USE_SYMBOL_AS_METHOD_NAME ::
 
-Parses the command line options and returns the value specified by
---with-<withval>.
+  Means that Symbols will be returned as method names, e.g.,
+  Module#methods, #singleton_methods and so on.
 
- enable_config(config, *defaults)
- disable_config(config, *defaults)
+HAVE_RUBY_*_H ::
 
-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.
+  Defined in ruby.h and means corresponding header is available.  For
+  instance, when HAVE_RUBY_ST_H is defined you should use ruby/st.h not
+  mere st.h.
 
- dir_config(target[, default_dir])
- dir_config(target[, default_include, default_lib])
+RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ::
 
-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]).
+  Means that rb_add_event_hook() takes the third argument `data', to be
+  passed to the given event hook function.
 
- pkg_config(pkg)
+= Appendix C. Functions available for use in extconf.rb
 
-Obtains the information for pkg by pkg-config command.  The actual
-command name can be overriden by --with-pkg-config command line
-option.
+See documentation for {mkmf}[rdoc-ref:MakeMakefile].
 
 /*
  * Local variables:
diff --git a/README.EXT.ja b/README.EXT.ja
index 73425c2cdb..9bba51a0d0 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -1,1261 +1,1631 @@
-.\" README.EXT.ja -  -*- Text -*- created at: Mon Aug  7 16:45:54 JST 1995
+# README.EXT.ja -  -*- RDoc -*- created at: Mon Aug  7 16:45:54 JST 1995
 
-Ruby�γ�ĥ�饤�֥��κ�������������ޤ���
+Rubyの拡張ライブラリの作り方を説明します．
 
-1�������μ�
+= 基礎知識
 
-C���ѿ��ˤϷ������ꡤ�ǡ����ˤϷ�������ޤ��󡥤Ǥ����顤��
-�Ȥ��Хݥ��󥿤�int���ѿ�����������ȡ������ͤ������Ȥ��Ƽ�
-�갷���ޤ����դ�Ruby���ѿ��ˤϷ����ʤ����ǡ����˷��������
-�������ΰ㤤�Τ��ᡤC��Ruby����ߤ��Ѵ����ʤ���С����ߤ���
-�ǡ����򥢥������Ǥ��ޤ���
+Cの変数には型があり，データには型がありません．ですから，た
+とえばポインタをintの変数に代入すると，その値は整数として取
+り扱われます．逆にRubyの変数には型がなく，データに型がありま
+す．この違いのため，CとRubyは相互に変換しなければ，お互いの
+データをアクセスできません．
 
-Ruby�Υǡ�����VALUE�Ȥ���C�η���ɽ������ޤ���VALUE���Υǡ�
-���Ϥ��Υǡ��������פ�ʬ���ΤäƤ��ޤ������Υǡ��������פ�
-�����Τϥǡ���(���֥�������)�μºݤι�¤���̣���Ƥ��ơ�Ruby
-�Υ��饹�ȤϤޤ���ä���ΤǤ���
+RubyのデータはVALUEというCの型で表現されます．VALUE型のデー
+タはそのデータタイプを自分で知っています．このデータタイプと
+いうのはデータ(オブジェクト)の実際の構造を意味していて，Ruby
+のクラスとはまた違ったものです．
 
-VALUE����C�ˤȤäư�̣�Τ���ǡ�������Ф�����ˤ�
+VALUEからCにとって意味のあるデータを取り出すためには
 
- (1) VALUE�Υǡ��������פ��Τ�
- (2) VALUE��C�Υǡ������Ѵ�����
+1. VALUEのデータタイプを知る
+2. VALUEをCのデータに変換する
 
-��ξ����ɬ�פǤ���(1)��˺���ȴְ�ä��ǡ������Ѵ����Ԥ��
-�ơ��ǰ��ץ�����बcore dump���ޤ���
+の両方が必要です．(1)を忘れると間違ったデータの変換が行われ
+て，最悪プログラムがcore dumpします．
 
-1.1 �ǡ���������
+== データタイプ
 
-Ruby�ˤϥ桼�����Ȥ���ǽ���Τ���ʲ��Υ����פ�����ޤ���
+Rubyにはユーザが使う可能性のある以下のタイプがあります．
 
-	T_NIL		nil
-	T_OBJECT	�̾�Υ��֥�������
-	T_CLASS		���饹
-	T_MODULE	�⥸�塼��
-	T_FLOAT		��ư��������
-	T_STRING	ʸ����
-	T_REGEXP	����ɽ��
-	T_ARRAY		����
-	T_FIXNUM	Fixnum(31bitĹ����)
-	T_HASH		Ϣ������
-	T_STRUCT	(Ruby��)��¤��
-	T_BIGNUM	¿��Ĺ����
-	T_FILE		������
-	T_TRUE		��
-	T_FALSE		��
-	T_DATA		�ǡ���
-	T_SYMBOL	����ܥ�
+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_VARMAP
-	T_SCOPE
-	T_NODE
+  T_ICLASS
+  T_MATCH
+  T_UNDEF
+  T_NODE
+  T_ZOMBIE
 
-�ۤȤ�ɤΥ����פ�C�ι�¤�ΤǼ�������Ƥ��ޤ���
+ほとんどのタイプはCの構造体で実装されています．
 
-1.2 VALUE�Υǡ��������פ�����å�����
+== VALUEのデータタイプをチェックする
 
-ruby.h�Ǥ�TYPE()�Ȥ����ޥ������������Ƥ��ơ�VALUE�Υǡ���
-�����פ��Τ뤳�Ȥ�����ޤ���TYPE()�ޥ����Ͼ�ǾҲ𤷤�T_XXXX
-�η�����������֤��ޤ���VALUE�Υǡ��������פ˱����ƽ�������
-���ˤϡ�TYPE()���ͤ�ʬ�����뤳�Ȥˤʤ�ޤ���
+ruby.hではTYPE()というマクロが定義されていて，VALUEのデータ
+タイプを知ることが出来ます．TYPE()マクロは上で紹介したT_XXXX
+の形式の定数を返します．VALUEのデータタイプに応じて処理する
+場合には，TYPE()の値で分岐することになります．
 
   switch (TYPE(obj)) {
     case T_FIXNUM:
-      /* 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�Υǡ��������פ����������ɤ��������å���
-�뤿��ˤϡ����δؿ���Ȥ��ޤ���
+この関数はvalueがtypeで無ければ，例外を発生させます．引数と
+して与えられたVALUEのデータタイプが正しいかどうかチェックす
+るためには，この関数を使います．
 
-FIXNUM��NIL�˴ؤ��ƤϤ���®��Ƚ�̥ޥ������Ѱդ���Ƥ��ޤ���
+FIXNUMとNILに関してはより高速な判別マクロが用意されています．
 
   FIXNUM_P(obj)
   NIL_P(obj)
 
-1.3 VALUE��C�Υǡ������Ѵ�����
+== 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()」があります．
 
-�ǡ��������פ�T_NIL, T_FALSE, T_TRUE�Ǥ�������ǡ����Ϥ��줾
-��nil, false, true�Ǥ������Υǡ��������פΥ��֥������ȤϤҤ�
-�Ĥ��Ĥ���¸�ߤ��ޤ���
+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 文字が含まれている可能性もあります．
 
-�ǡ��������פ�T_FIXNUM�λ��������31bit�Υ����������������
-����FIXNUM��C���������Ѵ����뤿��ˤϥޥ�����FIX2INT()�פ��
-���ޤ������줫�顤FIXNUM�˸¤餺Ruby�Υǡ������������Ѵ�����
-��NUM2INT()�פȤ����ޥ���������ޤ������Υޥ����ϥǡ�������
-�פΥ����å�̵���ǻȤ��ޤ�(�������Ѵ��Ǥ��ʤ����ˤ��㳰��
-ȯ������)��Ʊ�ͤ˥����å�̵���ǻȤ����Ѵ��ޥ�����double��
-���Ф���NUM2DBL()�פ�����ޤ���
+それ以外のデータタイプは対応するCの構造体があります．対応す
+る構造体のあるVALUEはそのままキャスト(型変換)すれば構造体の
+ポインタに変換できます．
 
-char* ����Ф���硢version 1.6 �����Ǥϡ�STR2CSTR()�פ�
-�����ޥ�����ȤäƤ��ޤ������������ to_str() �ˤ����ۤ�
-���Ѵ���̤� GC ������ǽ�������뤿�ᡢversion 1.7 �ʹߤǤ�
-obsolete �Ȥʤꡢ����� StringValue() �� StringValuePtr()
-��Ȥ�����侩���Ƥ��ޤ���StringValue(var) �� var �� String
- �Ǥ���в��⤻���������Ǥʤ���� var �� var.to_str() �η�̤�
-�֤�������ޥ�����StringValuePtr(var) ��Ʊ�ͤ� var ���֤�����
-�Ƥ��� var ��ʸ����ɽ�����Ф��� char* ���֤��ޥ����Ǥ���var ��
-���Ƥ�ľ���֤����������������Τǡ�var �� lvalue �Ǥ���ɬ�פ�
-����ޤ���
+構造体は「struct RXxxxx」という名前でruby.hで定義されていま
+す．例えば文字列は「struct RString」です．実際に使う可能性が
+あるのは文字列と配列くらいだと思います．
 
-����ʳ��Υǡ��������פ��б�����C�ι�¤�Τ�����ޤ����б���
-�빽¤�ΤΤ���VALUE�Ϥ��Τޤޥ��㥹��(���Ѵ�)����й�¤�Τ�
-�ݥ��󥿤��Ѵ��Ǥ��ޤ���
+ruby.hでは構造体へキャストするマクロも「RXXXXX()」(全部大文
+字にしたもの)という名前で提供されています(例: RSTRING())．た
+だし、構造体への直接のアクセスはできるだけ避け，対応する
+rb_xxxx() といった関数を使うようにして下さい．例えば，配列の
+要素へアクセスする場合は，rb_ary_entry(ary, offset)，
+rb_ary_store(ary, offset, obj) を利用するようにして下さい．
 
-��¤�Τϡ�struct RXxxxx�פȤ���̾����ruby.h���������Ƥ���
-�����㤨��ʸ����ϡ�struct RString�פǤ����ºݤ˻Ȥ���ǽ����
-����Τ�ʸ��������󤯤餤���Ȼפ��ޤ���
+構造体からデータを取り出すマクロが提供されています．文字列
+strの長さを得るためには「RSTRING_LEN(str)」とし，文字列strを
+char*として得るためには「RSTRING_PTR(str)」とします．
 
-ruby.h�ǤϹ�¤�Τإ��㥹�Ȥ���ޥ������RXXXXX()��(������ʸ
-���ˤ������)�Ȥ���̾�����󶡤���Ƥ��ޤ�(��: RSTRING())��
+Rubyの構造体を直接アクセスする時に気をつけなければならないこ
+とは，配列や文字列の構造体の中身は参照するだけで，直接変更し
+ないことです．直接変更した場合，オブジェクトの内容の整合性が
+とれなくなって，思わぬバグの原因になります．
 
-�㤨�С�ʸ����str��Ĺ�������뤿��ˤϡ�RSTRING(str)->len�פ�
-����ʸ����str��char*�Ȥ������뤿��ˤϡ�RSTRING(str)->ptr��
-�Ȥ��ޤ�������ξ��ˤϡ����줾���RARRAY(ary)->len�ס�
-��RARRAY(ary)->ptr�פȤʤ�ޤ���
+== CのデータをVALUEに変換する
 
-Ruby�ι�¤�Τ�ľ�ܥ�������������˵���Ĥ��ʤ���Фʤ�ʤ���
-�Ȥϡ������ʸ����ι�¤�Τ���Ȥϻ��Ȥ�������ǡ�ľ���ѹ���
-�ʤ����ȤǤ���ľ���ѹ�������硤���֥������Ȥ����Ƥ���������
-�Ȥ�ʤ��ʤäơ��פ�̥Х��θ����ˤʤ�ޤ���
+VALUEの実際の構造は
 
-1.4 C�Υǡ�����VALUE���Ѵ�����
+FIXNUMの場合 ::
 
-VALUE�μºݤι�¤��
+  1bit左シフトして，LSBを立てる．
 
-  * FIXNUM�ξ��
+その他のポインタの場合 ::
 
-    1bit�����եȤ��ơ�LSB��Ω�Ƥ롥
+  そのままVALUEにキャストする．
 
-  * ����¾�Υݥ��󥿤ξ��
+となっています．よって，LSBをチェックすればVALUEがFIXNUMかど
+うかわかるわけです(ポインタのLSBが立っていないことを仮定して
+いる)．
 
-    ���Τޤ�VALUE�˥��㥹�Ȥ��롥
+ですから，FIXNUM以外のRubyのオブジェクトの構造体は単にVALUE
+にキャストするだけでVALUEに変換出来ます．ただし，任意の構造
+体がVALUEにキャスト出来るわけではありません．キャストするの
+はRubyの知っている構造体(ruby.hで定義されているstruct RXxxx
+のもの)だけです．
 
-�ȤʤäƤ��ޤ�����äơ�LSB������å������VALUE��FIXNUM����
-�����狼��櫓�Ǥ�(�ݥ��󥿤�LSB��Ω�äƤ��ʤ����Ȥ��ꤷ��
-����)��
+FIXNUMに関しては変換マクロを経由する必要があります．Cの整数
+からVALUEに変換するマクロは以下のものがあります．必要に応じ
+て使い分けてください．
 
-�Ǥ����顤FIXNUM�ʳ���Ruby�Υ��֥������Ȥι�¤�Τ�ñ��VALUE
-�˥��㥹�Ȥ��������VALUE���Ѵ�����ޤ�����������Ǥ�դι�¤
-�Τ�VALUE�˥��㥹�Ƚ����櫓�ǤϤ���ޤ��󡥥��㥹�Ȥ����
-��Ruby���ΤäƤ��빽¤��(ruby.h���������Ƥ���struct RXxxx
-�Τ��)�����Ǥ���
+INT2FIX() :: もとの整数が31bitまたは63bit以内に収まる自信
+      	     がある時
+INT2NUM() :: 任意の整数からVALUEへ
 
-FIXNUM�˴ؤ��Ƥ��Ѵ��ޥ������ͳ����ɬ�פ�����ޤ���C������
-����VALUE���Ѵ�����ޥ����ϰʲ��Τ�Τ�����ޤ���ɬ�פ˱���
-�ƻȤ�ʬ���Ƥ���������
+INT2NUM()は整数がFIXNUMの範囲に収まらない場合，Bignumに変換
+してくれます(が，少し遅い)．
 
-  INT2FIX()	��Ȥ�������31bit����˼��ޤ뼫���������
-  INT2NUM()	Ǥ�դ���������VALUE��
+== Rubyのデータを操作する
 
-INT2NUM()��������FIXNUM���ϰϤ˼��ޤ�ʤ���硤Bignum���Ѵ�
-���Ƥ���ޤ�(���������٤�)��
+先程も述べた通り，Rubyの構造体をアクセスする時に内容の更新を
+行うことは勧められません．で，Rubyのデータを操作する時には
+Rubyが用意している関数を用いてください．
 
-1.5 Ruby�Υǡ���������
+ここではもっとも使われるであろう文字列と配列の生成/操作を行
+う関数をあげます(全部ではないです)．
 
-������Ҥ٤��̤ꡤRuby�ι�¤�Τ򥢥���������������Ƥι�����
-�Ԥ����Ȥϴ�����ޤ��󡥤ǡ�Ruby�Υǡ�����������ˤ�
-Ruby���Ѱդ��Ƥ���ؿ����Ѥ��Ƥ���������
+=== 文字列に対する関数
 
-�����ǤϤ�äȤ�Ȥ���Ǥ�����ʸ��������������/�����
-���ؿ��򤢤��ޤ�(�����ǤϤʤ��Ǥ�)��
+rb_str_new(const char *ptr, long len) ::
 
- ʸ������Ф���ؿ�
+  新しいRubyの文字列を生成する．
 
-  rb_str_new(const char *ptr, long len)
+rb_str_new2(const char *ptr)
+rb_str_new_cstr(const char *ptr)
 
-    ������Ruby��ʸ������������롥
+  Cの文字列からRubyの文字列を生成する．この関数の機能は
+  rb_str_new(ptr, strlen(ptr))と同等である．
 
-  rb_str_new2(const char *ptr)
+rb_tainted_str_new(const char *ptr, long len)
 
-    C��ʸ���󤫤�Ruby��ʸ������������롥���δؿ��ε�ǽ��
-    rb_str_new(ptr, strlen(ptr))��Ʊ���Ǥ��롥
+  汚染マークが付加された新しいRubyの文字列を生成する．外部
+  からのデータに基づく文字列には汚染マークが付加されるべき
+  である．
 
-  rb_tainted_str_new(const char *ptr, long len)
+rb_tainted_str_new2(const char *ptr)
+rb_tainted_str_new_cstr(const char *ptr)
 
-    �����ޡ������ղä��줿������Ruby��ʸ������������롥����
-    ����Υǡ����˴�Ť�ʸ����ˤϱ����ޡ������ղä����٤�
-    �Ǥ��롥
+  Cの文字列から汚染マークが付加されたRubyの文字列を生成する．
 
-  rb_tainted_str_new2(const char *ptr)
+rb_sprintf(const char *format, ...)
+rb_vsprintf(const char *format, va_list ap)
 
-    C��ʸ���󤫤�����ޡ������ղä��줿Ruby��ʸ������������롥
+  Cの文字列formatと続く引数をprintf(3)のフォーマットにしたがって
+  整形し，Rubyの文字列を生成する．
 
-  rb_str_cat(VALUE str, const char *ptr, long len)
+  注意: %iはObject#to_s('+'フラグが指定されているときはObject#inspect)を
+  使ったVALUEの出力に使用されているため，整数には%dを使用すること．
 
-    Ruby��ʸ����str��len�Х��Ȥ�ʸ����ptr���ɲä��롥
+rb_str_cat(VALUE str, const char *ptr, long len)
 
- ������Ф���ؿ�
+  Rubyの文字列strにlenバイトの文字列ptrを追加する．
 
-  rb_ary_new()
+rb_str_cat2(VALUE str, const char* ptr)
 
-    ���Ǥ�0��������������롥
+  Rubyの文字列strにCの文字列ptrを追加する．この関数の機能は
+  rb_str_cat(str, ptr, strlen(ptr))と同等である．
 
-  rb_ary_new2(long len)
+rb_str_catf(VALUE str, const char* format, ...)
+rb_str_vcatf(VALUE str, const char* format, va_list ap)
 
-    ���Ǥ�0��������������롥len����ʬ���ΰ�򤢤餫������
-    ���ƤƤ�����
+  Cの文字列formatと続く引数をprintf(3)のフォーマットにしたがって
+  整形し，Rubyの文字列strに追加する．この関数の機能は，それぞれ
+  rb_str_cat2(str, rb_sprintf(format, ...)) や
+  rb_str_cat2(str, rb_vsprintf(format, ap)) と同等である．
 
-  rb_ary_new3(long n, ...)
+rb_enc_str_new(const char *ptr, long len, rb_encoding *enc)
+rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc)
 
-    �����ǻ��ꤷ��n���Ǥ�ޤ�������������롥
+  指定されたエンコーディングでRubyの文字列を生成する.
 
-  rb_ary_new4(long n, VALUE *elts)
+rb_usascii_str_new(const char *ptr, long len)
+rb_usascii_str_new_cstr(const char *ptr)
 
-    �����Ϳ����n���Ǥ�������������롥
+  エンコーディングがUS-ASCIIのRubyの文字列を生成する.
 
-  rb_ary_push(VALUE ary, VALUE val)
-  rb_ary_pop(VALUE ary)
-  rb_ary_shift(VALUE ary)
-  rb_ary_unshift(VALUE ary, VALUE val)
+rb_str_resize(VALUE str, long len)
 
-    Array��Ʊ̾�Υ᥽�åɤ�Ʊ��Ư���򤹤�ؿ�����1������ɬ��
-    ����Ǥʤ���Фʤ�ʤ���
+  Rubyの文字列のサイズをlenバイトに変更する．strの長さは前
+  以てセットされていなければならない．lenが元の長さよりも短
+  い時は，lenバイトを越えた部分の内容は捨てられる．lenが元
+  の長さよりも長い時は，元の長さを越えた部分の内容は保存さ
+  れないでゴミになるだろう．この関数の呼び出しによって
+  RSTRING_PTR(str)が変更されるかもしれないことに注意．
 
-2��Ruby�ε�ǽ��Ȥ�
+rb_str_set_len(VALUE str, long len)
 
-����Ū��Ruby�ǽ񤱤뤳�Ȥ�C�Ǥ�񤱤ޤ���Ruby���Τ�Τ�C�ǵ�
-�Ҥ���Ƥ����Ǥ����顤�����Ȥ����������ʤ�Ǥ����ɡ�������
-��Ruby�γ�ĥ�˻Ȥ����Ȥ�¿����������ͽ¬����뵡ǽ���濴�˾�
-�𤷤ޤ���
+  Rubyの文字列のサイズをlenバイトにセットする．strが変更可
+  能でなければ例外が発生する．RSTRING_LEN(str)とは無関係に，
+  lenバイトまでの内容は保存される．lenはstrの容量を越えてい
+  てはならない．
 
-2.1 Ruby�˵�ǽ���ɲä���
 
-Ruby���󶡤���Ƥ���ؿ���Ȥ���Ruby���󥿥ץ꥿�˿�������ǽ
-���ɲä��뤳�Ȥ��Ǥ��ޤ���Ruby�Ǥϰʲ��ε�ǽ���ɲä���ؿ���
-�󶡤���Ƥ��ޤ���
+== 配列に対する関数
 
- * ���饹���⥸�塼��
- * �᥽�åɡ��ðۥ᥽�åɤʤ�
- * ���
+rb_ary_new()
 
-�ǤϽ�˾Ҳ𤷤ޤ���
+  要素が0の配列を生成する．
 
-2.1.1 ���饹/�⥸�塼�����
+rb_ary_new2(long len)
+rb_ary_new_capa(long len)
 
-���饹��⥸�塼���������뤿��ˤϡ��ʲ��δؿ���Ȥ��ޤ���
+  要素が0の配列を生成する．len要素分の領域をあらかじめ割り
+  当てておく．
+
+rb_ary_new3(long n, ...)
+rb_ary_new_from_args(long n, ...)
+
+  引数で指定したn要素を含む配列を生成する．
+
+rb_ary_new4(long n, VALUE *elts)
+rb_ary_new_from_values(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_store(VALUE ary, long offset, VALUE obj) ::
+
+  ary[offset] = obj
+
+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)
+
+rb_ary_cat(VALUE ary, const VALUE *ptr, long len)
+
+  配列aryにptrからlen個のオブジェクトを追加する．
+
+= Rubyの機能を使う
+
+原理的にRubyで書けることはCでも書けます．RubyそのものがCで記
+述されているんですから，当然といえば当然なんですけど．ここで
+はRubyの拡張に使うことが多いだろうと予測される機能を中心に紹
+介します．
+
+== Rubyに機能を追加する
+
+Rubyで提供されている関数を使えばRubyインタプリタに新しい機能
+を追加することができます．Rubyでは以下の機能を追加する関数が
+提供されています．
+
+* クラス，モジュール
+* メソッド，特異メソッドなど
+* 定数
+
+では順に紹介します．
+
+=== クラス/モジュール定義
+
+クラスやモジュールを定義するためには，以下の関数を使います．
 
   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_method(VALUE klass, const char *name,
+                        VALUE (*func)(), int argc)
 
-  void rb_define_singleton_method(VALUE object, 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多い引数を持つことになります．
 
-ǰ�Τ�����������ȡ��ðۥ᥽�åɡפȤϡ���������Υ��֥�����
-�Ȥ��Ф��Ƥ���ͭ���ʥ᥽�åɤǤ���Ruby�ǤϤ褯Smalltalk�ˤ�
-���륯�饹�᥽�åɤȤ��ơ����饹���Ф����ðۥ᥽�åɤ��Ȥ��
-�ޤ���
+argcが負の時は引数の数ではなく，形式を指定したことになります．
+argcが-1の時は引数を配列に入れて渡されます．argcが-2の時は引
+数はRubyの配列として渡されます．
 
-�����δؿ��� argc�Ȥ���������C�δؿ����Ϥ��������ο�(��
-����)����ޤ���argc��0�ʾ�λ��ϴؿ��˰����Ϥ������ο����
-̣���ޤ���16�İʾ�ΰ����ϻȤ��ޤ���(�����פ�ޤ����͡���
-��ʤ�)���ºݤδؿ��ˤ���Ƭ�ΰ����Ȥ���self��Ϳ�����ޤ���
-�ǡ����ꤷ�������1¿����������Ĥ��Ȥˤʤ�ޤ���
+メソッドを定義する関数はまだいくつかあります. ひとつはメソッド
+名としてIDを取ります. IDについては2.2.2を参照.
 
-argc����λ��ϰ����ο��ǤϤʤ�����������ꤷ�����Ȥˤʤ�ޤ���
-argc��-1�λ��ϰ����������������Ϥ���ޤ���argc��-2�λ��ϰ�
-����Ruby������Ȥ����Ϥ���ޤ���
+  void rb_define_method_id(VALUE klass, ID name,
+                           VALUE (*func)(ANYARGS), int argc)
 
-�᥽�åɤ��������ؿ��Ϥ⤦��Ĥ���ޤ����ҤȤĤ�private��
-���åɤ��������ؿ��ǡ�������rb_define_method()��Ʊ���Ǥ���
+private/protectedなメソッドを定義するふたつの関数があります.
 
-  void rb_define_private_method(VALUE klass, const char *name, 
+  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�᥽�åɤȤϴؿ������Ǥ����ƤӽФ����Ȥν���ʤ��᥽��
-�ɤǤ���
+privateメソッドとは関数形式でしか呼び出すことの出来ないメソッ
+ドです．
 
-�⤦�ҤȤĤϥ⥸�塼��ؿ�����������ΤǤ����⥸�塼��ؿ�
-�Ȥϥ⥸�塼����ðۥ᥽�åɤǤ��ꡤƱ����private�᥽�åɤ�
-�⤢���ΤǤ�����򤢤����Math�⥸�塼���sqrt()�ʤɤ�����
-���ޤ������Υ᥽�åɤ�
+最後に， rb_define_module関数はモジュール関数を定義します．
+モジュール関数とはモジュールの特異メソッドであり，同時に
+privateメソッドでもあるものです．例をあげるとMathモジュール
+のsqrt()などがあげられます．このメソッドは
 
   Math.sqrt(4)
 
-�Ȥ��������Ǥ�
+という形式でも
 
   include Math
   sqrt(4)
 
-�Ȥ��������Ǥ�Ȥ��ޤ����⥸�塼��ؿ����������ؿ��ϰʲ���
-�̤�Ǥ���
+という形式でも使えます．モジュール関数を定義する関数は以下の
+通りです．
 
-  void rb_define_module_function(VALUE module, const char *name, 
+  void rb_define_module_function(VALUE module, const char *name,
 		                 VALUE (*func)(), int argc)
 
-�ؿ�Ū�᥽�å�(Kernel�⥸�塼���private method)��������뤿
-��δؿ��ϰʲ����̤�Ǥ���
+関数的メソッド(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);
 
-���饹�᥽�å�allocate������������������ꤹ�뤿��δؿ���
-�ʲ����̤�Ǥ���
+属性の取得・設定メソッドを定義するには
+
+  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�ϥ��饹������Ȥ��Ƽ�����äơ�������������Ƥ�줿����
-�����󥹤��֤��ʤ��ƤϤʤ�ޤ��󡣤��Υ��󥹥��󥹤ϡ�������
-�������ʤɤ�ޤޤʤ����Ǥ�������ֶ��פΤޤޤˤ��Ƥ������ۤ�
-���褤�Ǥ��礦��
+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����ƤӽФ�
+== Rubyの機能をCから呼び出す
 
-���ˡ�1.5 Ruby�Υǡ���������٤ǰ����Ҳ𤷤��褦�ʴؿ���
-�Ȥ��С�Ruby�ε�ǽ��¸����Ƥ���ؿ���ľ�ܸƤӽФ����Ȥ�����
-�ޤ���
+既に『1.5 Rubyのデータを操作する』で一部紹介したような関数を
+使えば，Rubyの機能を実現している関数を直接呼び出すことが出来
+ます．
 
-# ���Τ褦�ʴؿ��ΰ���ɽ�Ϥ��ޤΤȤ�������ޤ��󡥥�������
-# �뤷���ʤ��Ǥ��͡�
+# このような関数の一覧表はいまのところありません．ソースを見
+# るしかないですね．
 
-����ʳ��ˤ�Ruby�ε�ǽ��ƤӽФ���ˡ�Ϥ����Ĥ�����ޤ���
+それ以外にもRubyの機能を呼び出す方法はいくつかあります．
 
-2.2.1 Ruby�Υץ�������eval����
+=== Rubyのプログラムをevalする
 
-C����Ruby�ε�ǽ��ƤӽФ���äȤ��ñ����ˡ�Ȥ��ơ�ʸ�����
-Ϳ����줿Ruby�Υץ�������ɾ������ʲ��δؿ�������ޤ���
+CからRubyの機能を呼び出すもっとも簡単な方法として，文字列で
+与えられたRubyのプログラムを評価する以下の関数があります．
 
   VALUE rb_eval_string(const char *str)
 
-����ɾ���ϸ��ߤδĶ��ǹԤ��ޤ����Ĥޤꡤ���ߤΥ��������ѿ�
-�ʤɤ�����Ѥ��ޤ���
+この評価は現在の環境で行われます．つまり，現在のローカル変数
+などを受け継ぎます．
 
-2.2.2 ID�ޤ��ϥ���ܥ�
+評価は例外を発生するかもしれないことに注意しましょう. より安全
+な関数もあります.
 
-C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ����Ȥ�Ǥ���
-�����������ˡ�Ruby���󥿥ץ꥿��ǥ᥽�åɤ��ѿ�̾����ꤹ��
-���˻Ȥ��Ƥ���ID�ˤĤ����������Ƥ����ޤ��礦��
+  VALUE rb_eval_string_protect(const char *str, int *state)
 
-ID�Ȥ��ѿ�̾���᥽�å�̾��ɽ�������Ǥ���Ruby�Ǥ�ID���б�����
-���֥������ȤȤ��ƥ���ܥ�(Symbol)�����ꡤ
+この関数はエラーが発生するとnilを返します．そして，成功時には
+*stateはゼロに，さもなくば非ゼロになります．
 
- :���̻�
+=== IDまたはシンボル
 
-�ǥ��������Ǥ��ޤ���C���餳�����������뤿��ˤϴؿ�
+Cから文字列を経由せずにRubyのメソッドを呼び出すこともできま
+す．その前に，Rubyインタプリタ内でメソッドや変数名を指定する
+時に使われているIDについて説明しておきましょう．
 
-  rb_intern(const char *name)
+IDとは変数名，メソッド名を表す整数です．Rubyの中では
 
-��Ȥ��ޤ���Ruby��������Ȥ���Ϳ����줿����ܥ�(�ޤ���ʸ��
-��)��ID���Ѵ�����ˤϰʲ��δؿ���Ȥ��ޤ���
+ :識別子
 
-  rb_to_id(VALUE symbol)
+または
+
+ :"任意の文字列"
 
-ID���饷��ܥ�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
+でアクセスできます．Cからこの整数を得るためには関数
 
-  VALUE ID2SYM(ID id)
+  rb_intern(const char *name)
+  rb_intern_str(VALUE name)
 
-����ܥ뤫��ID�����뤿��ˤϰʲ��Υޥ�����Ȥ��ޤ���
+を使います．Rubyから引数として与えられたシンボル(または文字
+列)をIDに変換するには以下の関数を使います．
+
+  rb_to_id(VALUE symbol)
+  rb_check_id(volatile VALUE *name)
+  rb_check_id_cstr(const char *name, long len, rb_encoding *enc)
 
-  ID SYM2ID(VALUE symbol)
+もし引数がシンボルでも文字列でもなければ、to_strメソッドで文
+字列に変換しようとします．第二の関数はその変換結果を*nameに保
+存し,その名前が既知のシンボルでない場合は0を返します．この関
+数が0以外を返した場合は*nameは常にシンボルか文字列であり、0を
+返した場合は常に文字列です．第三の関数はRubyの文字列ではなく
+NUL終端されたCの文字列を使います．
 
-2.2.3 C����Ruby�Υ᥽�åɤ�ƤӽФ�
+=== CからRubyのメソッドを呼び出す
 
-C����ʸ������ͳ������Ruby�Υ᥽�åɤ�ƤӽФ�����ˤϰʲ�
-�δؿ���Ȥ��ޤ���
+Cから文字列を経由せずにRubyのメソッドを呼び出すためには以下
+の関数を使います．
 
   VALUE rb_funcall(VALUE recv, ID mid, int argc, ...)
 
-���δؿ��ϥ��֥�������recv��mid�ǻ��ꤵ���᥽�åɤ�Ƥӽ�
-���ޤ�������¾�˰����λ���λ������㤦�ʲ��δؿ��⤢��ޤ���
+この関数はオブジェクトrecvのmidで指定されるメソッドを呼び出
+します．その他に引数の指定の仕方が違う以下の関数もあります．
 
   VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
+  VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv)
   VALUE rb_apply(VALUE recv, ID mid, VALUE args)
 
-apply�ˤϰ����Ȥ���Ruby�������Ϳ���ޤ���
+applyには引数としてRubyの配列を与えます．
 
-2.2.4 �ѿ�/����򻲾�/��������
+=== 変数/定数を参照/更新する
 
-C����ؿ���Ȥäƻ��ȡ������Ǥ���Τϡ���������󥹥�����
-���Ǥ�������ѿ��ϰ����Τ�Τ�C������ѿ��Ȥ��ƥ��������Ǥ�
-�ޤ������������ѿ��򻲾Ȥ�����ˡ�ϸ������Ƥ��ޤ���
+Cから関数を使って参照・更新できるのは，定数，インスタンス変
+数です．大域変数は一部のものはCの大域変数としてアクセスでき
+ます．ローカル変数を参照する方法は公開していません．
 
-���֥������ȤΥ��󥹥����ѿ��򻲾ȡ���������ؿ��ϰʲ�����
-��Ǥ���
+オブジェクトのインスタンス変数を参照・更新する関数は以下の通
+りです．
 
   VALUE rb_ivar_get(VALUE obj, ID id)
   VALUE rb_ivar_set(VALUE obj, ID id, VALUE val)
 
-id��rb_intern()���������Τ�ȤäƤ���������
+idはrb_intern()で得られるものを使ってください．
 
-����򻲾Ȥ���ˤϰʲ��δؿ���ȤäƤ���������
+定数を参照するには以下の関数を使ってください．
 
   VALUE rb_const_get(VALUE obj, ID id)
 
-����򿷤���������뤿��ˤϡ�2.1.3 �������٤ǾҲ�
-��Ƥ���ؿ���ȤäƤ���������
+定数を新しく定義するためには『2.1.3 定数定義』で紹介さ
+れている関数を使ってください．
 
-3��Ruby��C�Ȥξ���ͭ
+= RubyとCとの情報共有
 
-C�����Ruby�δ֤Ǿ����ͭ������ˡ�ˤĤ��Ʋ��⤷�ޤ���
+C言語とRubyの間で情報を共有する方法について解説します．
 
-3.1 C���黲�ȤǤ���Ruby�����
+== Cから参照できるRubyの定数
 
-�ʲ���Ruby�������C�Υ�٥뤫�黲�ȤǤ��ޤ���
+以下のRubyの定数はCのレベルから参照できます．
 
   Qtrue
   Qfalse
 
-    �����͡�Qfalse��C����Ǥ⵶�Ȥߤʤ���ޤ�(�Ĥޤ�0)��
+真偽値．QfalseはC言語でも偽とみなされます(つまり0)．
 
   Qnil
 
-    C���줫�鸫����nil�ס�
+C言語から見た「nil」．
 
-3.2 C��Ruby�Ƕ�ͭ���������ѿ�
+== CとRubyで共有される大域変数
 
-C��Ruby������ѿ���Ȥäƾ����ͭ�Ǥ��ޤ�����ͭ�Ǥ������
-�ѿ��ˤϤ����Ĥ��μ��ब����ޤ������Τʤ��Ǥ�äȤ��ɤ��Ȥ�
-���Ȼפ���Τ�rb_define_variable()�Ǥ���
+CとRubyで大域変数を使って情報を共有できます．共有できる大域
+変数にはいくつかの種類があります．そのなかでもっとも良く使わ
+れると思われるのはrb_define_variable()です．
 
   void rb_define_variable(const char *name, VALUE *var)
 
-���δؿ���Ruby��C�ȤǶ�ͭ��������ѿ���������ޤ����ѿ�̾��
-`$'�ǻϤޤ�ʤ����ˤϼ�ưŪ���ɲä���ޤ��������ѿ����ͤ���
-������ȼ�ưŪ��Ruby���б������ѿ����ͤ��Ѥ��ޤ���
+この関数はRubyとCとで共有する大域変数を定義します．変数名が
+`$'で始まらない時には自動的に追加されます．この変数の値を変
+更すると自動的にRubyの対応する変数の値も変わります．
 
-�ޤ�Ruby¦����Ϲ����Ǥ��ʤ��ѿ��⤢��ޤ�������read only��
-�ѿ��ϰʲ��δؿ���������ޤ���
+またRuby側からは更新できない変数もあります．このread onlyの
+変数は以下の関数で定義します．
 
   void rb_define_readonly_variable(const char *name, VALUE *var)
 
-������ѿ���¾��hook��Ĥ�������ѿ�������Ǥ��ޤ���hook�դ�
-������ѿ��ϰʲ��δؿ����Ѥ���������ޤ���hook�դ�����ѿ���
-�ͤλ��Ȥ������hook�ǹԤ�ɬ�פ�����ޤ���
+これら変数の他に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����ꤷ�ޤ���
+この関数はCの関数によってhookのつけられた大域変数を定義しま
+す．変数が参照された時には関数getterが，変数に値がセットされ
+た時には関数setterが呼ばれる．hookを指定しない場合はgetterや
+setterに0を指定します．
+# getterもsetterも0ならばrb_define_variable()と同じになる．
 
-# getter��setter��0�ʤ��rb_define_variable()��Ʊ���ˤʤ롥
+getterとsetterの仕様は次の通りです．
 
-���줫�顤C�δؿ��ˤ�äƼ¸������Ruby������ѿ����������
-�ؿ�������ޤ���
+  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���ƤФ�ޤ���
+この関数によって定義されたRubyの大域変数が参照された時には
+getterが，変数に値がセットされた時にはsetterが呼ばれます．
 
-getter��setter�λ��ͤϰʲ����̤�Ǥ���
+getterとsetterの仕様は以下の通りです．
 
-  (*getter)(ID id, void *data, struct global_entry* entry);
-  (*setter)(VALUE val, ID id, void *data, struct global_entry* entry);
+  (*getter)(ID id);
+  (*setter)(VALUE val, ID id);
 
-3.3 C�Υǡ�����Ruby���֥������Ȥˤ���
+== CのデータをRubyオブジェクトにする
 
-C��������������줿�ǡ���(��¤��)��Ruby�Υ��֥������ȤȤ���
-��갷��������礬���ꤨ�ޤ������Τ褦�ʾ��ˤϡ�Data�Ȥ���
-Ruby���֥������Ȥ�C�ι�¤��(�ؤΥݥ���)�򤯤�ळ�Ȥ�Ruby
-���֥������ȤȤ��Ƽ�갷����褦�ˤʤ�ޤ���
+Cの世界で定義されたデータ(構造体)をRubyのオブジェクトとして
+取り扱いたい場合がありえます．このような場合には，Dataという
+RubyオブジェクトにCの構造体(へのポインタ)をくるむことでRuby
+オブジェクトとして取り扱えるようになります．
 
-Data���֥������Ȥ��������ƹ�¤�Τ�Ruby���֥������Ȥ˥��ץ���
-�����뤿��ˤϡ��ʲ��Υޥ�����Ȥ��ޤ���
+Dataオブジェクトを生成して構造体をRubyオブジェクトにカプセル
+化するためには，以下のマクロを使います．
 
-  Data_Wrap_Struct(klass, mark, free, ptr)
+  Data_Wrap_Struct(klass, mark, free, sval)
 
-���Υޥ���������ͤ��������줿Data���֥������ȤǤ���
+このマクロの戻り値は生成されたDataオブジェクトです．
 
-klass�Ϥ���Data���֥������ȤΥ��饹�Ǥ���ptr�ϥ��ץ��벽����
-C�ι�¤�ΤؤΥݥ��󥿤Ǥ���mark�Ϥ��ι�¤�Τ�Ruby�Υ��֥���
-���Ȥؤλ��Ȥ�������˻Ȥ��ؿ��Ǥ������Τ褦�ʻ��Ȥ�ޤޤʤ�
-���ˤ�0����ꤷ�ޤ���
+klassはこのDataオブジェクトのクラスです．markはこの構造体が
+Rubyのオブジェクトへの参照がある時に使う関数です．そのような
+参照を含まない時には0を指定します．
 
-# ���Τ褦�ʻ��Ȥϴ�����ޤ���
+# そのような参照は勧められません．
 
-free�Ϥ��ι�¤�Τ��⤦���פˤʤä����˸ƤФ��ؿ��Ǥ�������
-�ؿ��������١������쥯������ƤФ�ޤ������줬-1�ξ��ϡ�ñ
-��˳�������ޤ���
+freeはこの構造体がもう不要になった時に呼ばれる関数です．この
+関数がガーベージコレクタから呼ばれます．これが-1の場合は，単
+純に開放されます．
 
-C�ι�¤�Τγ�����Data���֥������Ȥ�������Ʊ���˹Ԥ��ޥ�����
-���ưʲ��Τ�Τ��󶡤���Ƥ��ޤ���
+markおよびfree関数はGC実行中に呼び出されます.
+なお, GC実行中はRubyオブジェクトのアロケーションは禁止されま
+す. よって, markおよびfree関数でRubyオブジェクトのアロケーシ
+ョンは行わないでください.
+
+Cの構造体の割当とDataオブジェクトの生成を同時に行うマクロと
+して以下のものが提供されています．
 
   Data_Make_Struct(klass, type, mark, free, sval)
 
-���Υޥ���������ͤ��������줿Data���֥������ȤǤ���
+このマクロの戻り値は生成されたDataオブジェクトです．このマク
+ロは以下の式のように働きます:
+
+  (sval = ALLOC(type), Data_Wrap_Struct(klass, mark, free, sval))
 
-klass, mark, free��Data_Wrap_Struct��Ʊ��Ư���򤷤ޤ���type
-�ϳ�����Ƥ�C��¤�Τη��Ǥ���������Ƥ�줿��¤�Τ��ѿ�sval
-����������ޤ��������ѿ��η��� (type*) �Ǥ���ɬ�פ�����ޤ���
+klass, mark, freeはData_Wrap_Structと同じ働きをします．type
+は割り当てるC構造体の型です．割り当てられた構造体は変数sval
+に代入されます．この変数の型は (type*) である必要があります．
 
-Data���֥������Ȥ���ݥ��󥿤���Ф��Τϰʲ��Υޥ������Ѥ�
-�ޤ���
+Dataオブジェクトからポインタを取り出すのは以下のマクロを用い
+ます．
 
   Data_Get_Struct(obj, type, sval)
 
-C�ι�¤�ΤؤΥݥ��󥿤��ѿ�sval����������ޤ���
+Cの構造体へのポインタは変数svalに代入されます．
 
-������Data�λȤ����Ϥ���ä�ʬ����ˤ����Τǡ������������
-����򻲾Ȥ��Ƥ���������
+これらのDataの使い方はちょっと分かりにくいので，後で説明する
+例題を参照してください．
 
-4������ - dbm�ѥå���������
+= 例題 - dbmパッケージを作る
 
-�����ޤǤ������ǤȤꤢ������ĥ�饤�֥��Ϻ���Ϥ��Ǥ���
-Ruby��ext�ǥ��쥯�ȥ�ˤ��Ǥ˴ޤޤ�Ƥ���dbm�饤�֥������
-�����ʳ�Ū���������ޤ���
+ここまでの説明でとりあえず拡張ライブラリは作れるはずです．
+Rubyのextディレクトリにすでに含まれているdbmライブラリを例に
+して段階的に説明します．
 
-(1) �ǥ��쥯�ȥ����
+== ディレクトリを作る
 
   % mkdir ext/dbm
 
-Ruby 1.1�����Ǥ�դΥǥ��쥯�ȥ�ǥ����ʥߥå��饤�֥����
-�뤳�Ȥ��Ǥ���褦�ˤʤ�ޤ�����Ruby����Ū�˥�󥯤������
-��Ruby��Ÿ�������ǥ��쥯�ȥ�β���ext�ǥ��쥯�ȥ����˳�ĥ
-�饤�֥���ѤΥǥ��쥯�ȥ����ɬ�פ�����ޤ���̾����Ŭ����
-����ǹ����ޤ���
-
-(2) �߷פ���
-
-�ޤ��������ʤ�Ǥ����ɡ��ɤ�������ǽ��¸����뤫�ɤ����ޤ���
-�פ���ɬ�פ�����ޤ����ɤ�ʥ��饹��Ĥ��뤫�����Υ��饹�ˤ�
-�ɤ�ʥ᥽�åɤ����뤫�����饹���󶡤�������ʤɤˤĤ����߷�
-���ޤ���
-
-(3) C�����ɤ��
-
-��ĥ�饤�֥�����ΤȤʤ�C����Υ�������񤭤ޤ���C����Υ���
-�����ҤȤĤλ��ˤϡ֥饤�֥��̾.c�פ����֤��ɤ��Ǥ��礦��C
-����Υ�������ʣ���ξ��ˤϵդˡ֥饤�֥��̾.c�פȤ����ե�
-����̾���򤱤�ɬ�פ�����ޤ������֥������ȥե�����ȥ⥸�塼
-�������������Ū�����������֥饤�֥��̾.o�פȤ����ե�����
-�Ȥ����ͤ��뤫��Ǥ���
-
-Ruby�ϳ�ĥ�饤�֥�������ɤ�����ˡ�Init_�饤�֥��̾�פ�
-�����ؿ���ưŪ�˼¹Ԥ��ޤ���dbm�饤�֥��ξ���Init_dbm��
-�Ǥ������δؿ�����ǥ��饹���⥸�塼�롤�᥽�åɡ�����ʤɤ�
-�����Ԥ��ޤ���dbm.c����������Ѥ��ޤ���
-
---
-Init_dbm()
-{
-    /* 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(obj, keystr)
-    VALUE obj, keystr;
-{
-	:
-}
---
-
-�����ο�������Υ����פ���1������self����2�����ʹߤ��᥽�å�
-�ΰ����Ȥʤ�ޤ���
-
-�����ο�������Τ�Τ�C������Ǽ������Τ�Ruby������Ǽ���
-���ΤȤ�����ޤ���dbm�饤�֥�����ǡ�C������Ǽ�������
-��DBM�Υ��饹�᥽�åɤǤ���open()�Ǥ��������������Ƥ����
-��fdbm_s_open()�Ϥ����ʤäƤ��ޤ���
-
---
-static VALUE
-fdbm_s_open(argc, argv, klass)
-    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�ѿ��ʹߤ˻��ꤷ���ѿ����ͤ��������Ƥ���ޤ�������
-�ե����ޥåȤϡ���1ʸ���ܤ���ά�Ǥ��ʤ������ο�����2ʸ���ܤ�
-��ά�Ǥ�������ο�����3ʸ���ܤ��б�������̵꤬�����ޤ�ΰ�
-�������뤫�ɤ����򼨤�"*"�Ǥ���2ʸ���ܤ�3ʸ���ܤϾ�ά�Ǥ���
-����dbm.c����Ǥϡ��ե����ޥåȤ�"11"�Ǥ����顤�����Ϻ���1��
-�ǡ�2�Ĥޤǵ������Ȥ�����̣�ˤʤ�ޤ�����ά����Ƥ������
-�ѿ����ͤ�nil(C����Υ�٥�Ǥ�Qnil)�ˤʤ�ޤ���
-
-Ruby������ǰ������������Τ�indexes������ޤ��������Ϥ�
-���Ǥ���
-
---
-static VALUE
-fdbm_indexes(obj, args)
-    VALUE obj, args;
-{
-	:
-}
---
-
-��1������self����2������Ruby������Ǥ���
-
-** ���ջ���
-
-Ruby�ȶ�ͭ�Ϥ��ʤ���Ruby�Υ��֥������Ȥ��Ǽ�����ǽ���Τ���
-C������ѿ��ϰʲ��δؿ���Ȥä�Ruby���󥿥ץ꥿���ѿ���¸��
-�򶵤��Ƥ����Ƥ����������Ǥʤ���GC�ǥȥ�֥�򵯤����ޤ���
+Ruby 1.1からは任意のディレクトリでダイナミックライブラリを作
+ることができるようになりました．Rubyに静的にリンクする場合に
+はRubyを展開したディレクトリの下，extディレクトリの中に拡張
+ライブラリ用のディレクトリを作る必要があります．名前は適当に
+選んで構いません．
+
+== 設計する
+
+まあ，当然なんですけど，どういう機能を実現するかどうかまず設
+計する必要があります．どんなクラスをつくるか，そのクラスには
+どんなメソッドがあるか，クラスが提供する定数などについて設計
+します．
+
+== 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���Ѱդ���
+== extconf.rbを用意する
 
-Makefile������ο����ˤʤ�extconf.rb�Ȥ����ե��������
-�ޤ���extconf.rb�ϥ饤�֥��Υ���ѥ����ɬ�פʾ��Υ�����
-���ʤɤ�Ԥ����Ȥ���Ū�Ǥ����ޤ���
+Makefileを作る場合の雛型になるextconf.rbというファイルを作り
+ます．extconf.rbはライブラリのコンパイルに必要な条件のチェッ
+クなどを行うことが目的です．まず，
 
   require 'mkmf'
 
-��extconf.rb����Ƭ���֤��ޤ���extconf.rb����Ǥϰʲ���Ruby��
-����Ȥ����Ȥ�����ޤ���
+をextconf.rbの先頭に置きます．extconf.rbの中では以下のRuby関
+数を使うことが出来ます．
 
-  have_library(lib, func): �饤�֥���¸�ߥ����å�
-  have_func(func, header): �ؿ���¸�ߥ����å�
-  have_header(header): �إå��ե������¸�ߥ����å�
-  create_makefile(target): Makefile������
+  have_library(lib, func): ライブラリの存在チェック
+  have_func(func, header): 関数の存在チェック
+  have_header(header): ヘッダファイルの存在チェック
+  create_makefile(target[, target_prefix]): Makefileの生成
 
-�ʲ����ѿ���Ȥ����Ȥ��Ǥ��ޤ���
+以下の変数を使うことができます．
 
-  $CFLAGS: ����ѥ�������ɲ�Ū�˻��ꤹ��ե饰(-O�ʤ�)
-  $CPPFLAGS: �ץ�ץ����å����ɲ�Ū�˻��ꤹ��ե饰(-I��-D�ʤ�)
-  $LDFLAGS: ��󥯻����ɲ�Ū�˻��ꤹ��ե饰(-L�ʤ�)
-  $objs: ��󥯤���륪�֥������ȥե�����̾�Υꥹ��
+  $CFLAGS: コンパイル時に追加的に指定するフラグ(-Oなど)
+  $CPPFLAGS: プリプロセッサに追加的に指定するフラグ(-Iや-Dなど)
+  $LDFLAGS: リンク時に追加的に指定するフラグ(-Lなど)
+  $objs: リンクされるオブジェクトファイル名のリスト
 
-���֥������ȥե�����Υꥹ�Ȥϡ��̾�ϥ������ե�����򸡺���
-�Ƽ�ưŪ����������ޤ�����make������ǥ���������������褦��
-��������Ū�˻��ꤹ��ɬ�פ�����ޤ���
+オブジェクトファイルのリストは，通常はソースファイルを検索し
+て自動的に生成されますが，makeの途中でソースを生成するような
+場合は明示的に指定する必要があります．
 
-�饤�֥��򥳥�ѥ��뤹���郎·�鷺�����Υ饤�֥��򥳥�
-�ѥ��뤷�ʤ����ˤ�create_makefile��ƤФʤ����Makefile����
-�����줺������ѥ����Ԥ��ޤ���
+ライブラリをコンパイルする条件が揃わず，そのライブラリをコン
+パイルしない時にはcreate_makefileを呼ばなければMakefileは生
+成されず，コンパイルも行われません．
 
-(5) depend���Ѱդ���
+== dependを用意する
 
-�⤷���ǥ��쥯�ȥ��depend�Ȥ����ե����뤬¸�ߤ���С�
-Makefile����¸�ط�������å����Ƥ���ޤ���
+もし，ディレクトリにdependというファイルが存在すれば，
+Makefileが依存関係をチェックしてくれます．
 
   % gcc -MM *.c > depend
 
-�ʤɤǺ�뤳�Ȥ�����ޤ������ä�»��̵���Ǥ��礦��
+などで作ることが出来ます．あって損は無いでしょう．
 
-(6) Makefile����������
+== Makefileを生成する
 
-Makefile��ºݤ��������뤿��ˤ�
+Makefileを実際に生成するためには
 
   ruby extconf.rb
 
-�Ȥ��ޤ���extconf.rb�� require 'mkmf' �ιԤ��ʤ����ˤϥ��顼
-�ˤʤ�ޤ��Τǡ��������ɲä���
+とします．extconf.rbに require 'mkmf' の行がない場合にはエラー
+になりますので，引数を追加して
 
   ruby -r mkmf extconf.rb
 
-�Ȥ��Ƥ���������
+としてください．
 
-site_ruby �ǥ��쥯�ȥ�Ǥʤ���
-vendor_ruby �ǥ��쥯�ȥ�˥��󥹥ȡ��뤹����ˤ�
-�ʲ��Τ褦�� --vendor ���ץ�����ä��Ƥ���������
+site_ruby ディレクトリでなく，
+vendor_ruby ディレクトリにインストールする場合には
+以下のように --vendor オプションを加えてください．
 
   ruby extconf.rb --vendor
 
-�ǥ��쥯�ȥ��ext�ʲ����Ѱդ������ˤ�Ruby���Τ�make�λ���
-��ưŪ��Makefile����������ޤ��Τǡ����Υ��ƥåפ����פǤ���
+ディレクトリをext以下に用意した場合にはRuby全体のmakeの時に
+自動的にMakefileが生成されますので，このステップは不要です．
 
-(7) make����
+== makeする
 
-ưŪ��󥯥饤�֥�������������ˤϤ��ξ��make���Ƥ�����
-����ɬ�פǤ���� make install �ǥ��󥹥ȡ��뤵��ޤ���
+動的リンクライブラリを生成する場合にはその場でmakeしてくださ
+い．必要であれば make install でインストールされます．
 
-ext�ʲ��˥ǥ��쥯�ȥ���Ѱդ������ϡ�Ruby�Υǥ��쥯�ȥ��
-make��¹Ԥ����Makefile����������make��ɬ�פˤ�äƤϤ��Υ�
-���塼���Ruby�ؤΥ�󥯤ޤǼ�ưŪ�˼¹Ԥ��Ƥ���ޤ���
-extconf.rb��񤭴�����ʤɤ���Makefile�κ�������ɬ�פʻ��Ϥ�
-��Ruby�ǥ��쥯�ȥ��make���Ƥ���������
+ext以下にディレクトリを用意した場合は，Rubyのディレクトリで
+makeを実行するとMakefileを生成からmake，必要によってはそのモ
+ジュールのRubyへのリンクまで自動的に実行してくれます．
+extconf.rbを書き換えるなどしてMakefileの再生成が必要な時はま
+たRubyディレクトリでmakeしてください．
 
-��ĥ�饤�֥���make install��Ruby�饤�֥��Υǥ��쥯�ȥ��
-���˥��ԡ�����ޤ����⤷��ĥ�饤�֥��ȶ�Ĵ���ƻȤ�Ruby�ǵ�
-�Ҥ��줿�ץ�����ब���ꡤRuby�饤�֥����֤��������ˤϡ�
-��ĥ�饤�֥���ѤΥǥ��쥯�ȥ�β��� lib �Ȥ����ǥ��쥯�ȥ�
-���ꡤ������ ��ĥ�� .rb �Υե�������֤��Ƥ�����Ʊ���˥���
-���ȡ��뤵��ޤ���
+拡張ライブラリはmake installでRubyライブラリのディレクトリの
+下にコピーされます．もし拡張ライブラリと協調して使うRubyで記
+述されたプログラムがあり，Rubyライブラリに置きたい場合には，
+拡張ライブラリ用のディレクトリの下に lib というディレクトリ
+を作り，そこに 拡張子 .rb のファイルを置いておけば同時にイン
+ストールされます．
 
-(8) �ǥХå�
+== デバッグ
 
-�ޤ����ǥХå����ʤ���ư���ʤ��Ǥ��礦�͡�ext/Setup�˥ǥ���
-���ȥ�̾��񤯤���Ū�˥�󥯤���ΤǥǥХå����Ȥ���褦�ˤ�
-��ޤ�������ʬ����ѥ��뤬�٤��ʤ�ޤ����ɡ�
+まあ，デバッグしないと動かないでしょうね．ext/Setupにディレ
+クトリ名を書くと静的にリンクするのでデバッガが使えるようにな
+ります．その分コンパイルが遅くなりますけど．
 
-(9) �Ǥ�������
+== できあがり
 
-��Ϥ��ä���Ȥ��ʤꡤ������������ʤꡤ���ʤꡤ����ͳ�ˤ�
-�Ȥ�����������Ruby�κ�Ԥϳ�ĥ�饤�֥��˴ؤ��ư��ڤθ�����
-��ĥ���ޤ���
+後はこっそり使うなり，広く公開するなり，売るなり，ご自由にお
+使いください．Rubyの作者は拡張ライブラリに関して一切の権利を
+主張しません．
 
-Appendix A. Ruby�Υ����������ɤ�ʬ��
+= Appendix A. Rubyのソースコードの分類
 
-Ruby�Υ������Ϥ����Ĥ���ʬ�ह�뤳�Ȥ�����ޤ������Τ�������
-���饤�֥�����ʬ�ϴ���Ū�˳�ĥ�饤�֥���Ʊ��������ˤʤ�
-�Ƥ��ޤ��������Υ������Ϻ��ޤǤ������ǤۤȤ������Ǥ����
-�פ��ޤ���
+Rubyのソースはいくつかに分類することが出来ます．このうちクラ
+スライブラリの部分は基本的に拡張ライブラリと同じ作り方になっ
+ています．これらのソースは今までの説明でほとんど理解できると
+思います．
 
-Ruby����Υ���
+== Ruby言語のコア
 
-  class.c
-  error.c
-  eval.c
-  gc.c
-  object.c
-  parse.y
-  variable.c
+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         : 自動生成
+
+== 正規表現エンジン (鬼車)
 
-  dln.c
   regex.c
-  st.c
-  util.c
+  regcomp.c
+  regenc.c
+  regerror.c
+  regexec.c
+  regparse.c
+  regsyntax.c
 
-Ruby���ޥ�ɤμ���
+== ユーティリティ関数
+
+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#sprintf
+string.c     :: String
+struct.c     :: Struct
+time.c       :: Time
+defs/known_errors.def :: 例外クラス Errno::*
+-> known_errors.inc   :: 自動生成
 
-  array.c
-  bignum.c
-  compar.c
-  dir.c
-  enum.c
-  file.c
-  hash.c
-  io.c
-  marshal.c
-  math.c
-  numeric.c
-  pack.c
-  prec.c
-  process.c
-  random.c
-  range.c
-  re.c
-  signal.c
-  sprintf.c
-  string.c
-  struct.c
-  time.c
+== 多言語化
 
-Appendix B. ��ĥ�Ѵؿ���ե����
+encoding.c  :: Encoding
+transcode.c :: Encoding::Converter
+enc/*.c     :: エンコーディングクラス群
+enc/trans/* :: コードポイント対応表
 
-C���줫��Ruby�ε�ǽ�����Ѥ���API�ϰʲ����̤�Ǥ��롥
+== gorubyコマンドの実装
 
-** ��
+  goruby.c
+  golf_prelude.rb      : goruby固有のライブラリ
+    -> golf_prelude.c  : 自動生成
 
-VALUE
+= Appendix B. 拡張用関数リファレンス
 
-  Ruby���֥������Ȥ�ɽ�����뷿��ɬ�פ˱����ƥ��㥹�Ȥ����Ѥ��롥
-  �Ȥ߹��߷���ɽ������C�η���ruby.h�˵��Ҥ��Ƥ���R�ǻϤޤ빽¤
-  �ΤǤ��롥VALUE���򤳤��˥��㥹�Ȥ��뤿���R�ǻϤޤ빽¤��
-  ̾��������ʸ���ˤ���̾���Υޥ������Ѱդ���Ƥ��롥
+C言語からRubyの機能を利用するAPIは以下の通りである．
 
-** �ѿ������
+== 型
 
-Qnil
+VALUE ::
 
-  ���: nil���֥�������
+  Rubyオブジェクトを表現する型．必要に応じてキャストして用いる．
+  組み込み型を表現するCの型はruby.hに記述してあるRで始まる構造
+  体である．VALUE型をこれらにキャストするためにRで始まる構造体
+  名を全て大文字にした名前のマクロが用意されている．
 
-Qtrue
+== 変数・定数
 
-  ���: true���֥�������(���Υǥե������)
+Qnil ::
 
-Qfalse
+  定数: nilオブジェクト
 
-  ���: false���֥�������
+Qtrue ::
 
-** C�ǡ����Υ��ץ��벽
+  定数: trueオブジェクト(真のデフォルト値)
 
-Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval)
+Qfalse ::
 
-  C��Ǥ�դΥݥ��󥿤򥫥ץ��벽����Ruby���֥������Ȥ��֤�����
-  �Υݥ��󥿤�Ruby���饢����������ʤ��ʤä�����free�ǻ��ꤷ��
-  �ؿ����ƤФ�롥�ޤ������Υݥ��󥿤λؤ��ǡ�����¾��Ruby����
-  �������Ȥ�ؤ��Ƥ����硤mark�˻��ꤹ��ؿ��ǥޡ�������ɬ��
-  �����롥
+  定数: falseオブジェクト
 
-Data_Make_Struct(klass, type, mark, free, sval)
+== Cデータのカプセル化
 
-  type���Υ����malloc�����ѿ�sval�����������塤����򥫥ץ�
-  �벽�����ǡ������֤��ޥ�����
+Data_Wrap_Struct(VALUE klass, void (*mark)(), void (*free)(), void *sval) ::
 
-Data_Get_Struct(data, type, sval)
+  Cの任意のポインタをカプセル化したRubyオブジェクトを返す．こ
+  のポインタがRubyからアクセスされなくなった時，freeで指定した
+  関数が呼ばれる．また，このポインタの指すデータが他のRubyオブ
+  ジェクトを指している場合，markに指定する関数でマークする必要
+  がある．
 
-  data����type���Υݥ��󥿤���Ф��ѿ�sval����������ޥ�����
+Data_Make_Struct(klass, type, mark, free, sval) ::
 
-** �������å�
+  type型のメモリをmallocし，変数svalに代入した後，それをカプセ
+  ル化したデータを返すマクロ．
 
-TYPE(value)
-FIXNUM_P(value)
-NIL_P(value)
-void Check_Type(VALUE value, int type)
-void Check_SafeStr(VALUE value)
+Data_Get_Struct(data, type, sval) ::
+
+  dataからtype型のポインタを取り出し変数svalに代入するマクロ．
+
+== 型チェック
+
+  TYPE(value)
+  FIXNUM_P(value)
+  NIL_P(value)
+  void Check_Type(VALUE value, int type)
+  SafeStringValue(value)
 
-** ���Ѵ�
+== 型変換
 
-FIX2INT(value)
-INT2FIX(i)
-NUM2INT(value)
-INT2NUM(i)
-NUM2DBL(value)
-rb_float_new(f)
-StringValue(value)
-StringValuePtr(value)
-StringValueCStr(value)
-rb_str_new2(s)
+  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)
+  rb_integer_pack(value, words, numwords, wordsize, nails, flags), rb_integer_unpack(words, numwords, wordsize, nails, flags)
+  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)
+VALUE rb_define_class(const char *name, VALUE super) ::
 
-  super�Υ��֥��饹�Ȥ��ƿ�����Ruby���饹��������롥
+  superのサブクラスとして新しいRubyクラスを定義する．
 
-VALUE rb_define_class_under(VALUE module, const char *name, VALUE super)
+VALUE rb_define_class_under(VALUE module, const char *name, VALUE super) ::
 
-  super�Υ��֥��饹�Ȥ��ƿ�����Ruby���饹���������module��
-  ����Ȥ���������롥
+  superのサブクラスとして新しいRubyクラスを定義し，moduleの
+  定数として定義する．
 
-VALUE rb_define_module(const char *name)
+VALUE rb_define_module(const char *name) ::
 
-  ������Ruby�⥸�塼���������롥
+  新しいRubyモジュールを定義する．
 
-VALUE rb_define_module_under(VALUE module, const char *name)
+VALUE rb_define_module_under(VALUE module, const char *name) ::
 
-  ������Ruby�⥸�塼����������module������Ȥ���������롥
+  新しいRubyモジュールを定義し，moduleの定数として定義する．
 
-void rb_include_module(VALUE klass, VALUE module)
+void rb_include_module(VALUE klass, VALUE module) ::
 
-  �⥸�塼��򥤥󥯥롼�ɤ��롥class�����Ǥ�module�򥤥�
-  �롼�ɤ��Ƥ�����ˤϲ��⤷�ʤ�(¿�ť��󥯥롼�ɤζػ�)��
+  モジュールをインクルードする．classがすでにmoduleをインク
+  ルードしている時には何もしない(多重インクルードの禁止)．
 
-void rb_extend_object(VALUE object, VALUE module)
+void rb_extend_object(VALUE object, VALUE module) ::
 
-  ���֥������Ȥ�⥸�塼��(���������Ƥ���᥽�å�)�ǳ�ĥ���롥
+  オブジェクトをモジュール(で定義されているメソッド)で拡張する．
 
-** ����ѿ����
+== 大域変数定義
 
-void rb_define_variable(const char *name, VALUE *var)
+void rb_define_variable(const char *name, VALUE *var) ::
 
-  Ruby��C�ȤǶ�ͭ���륰�����Х��ѿ���������롥�ѿ�̾��`$'��
-  �Ϥޤ�ʤ����ˤϼ�ưŪ���ɲä���롥name�Ȥ���Ruby�μ��̻�
-  �Ȥ��Ƶ�����ʤ�ʸ��(�㤨��` ')��ޤ���ˤ�Ruby�ץ�����
-  �फ��ϸ����ʤ��ʤ롥
+  RubyとCとで共有するグローバル変数を定義する．変数名が`$'で
+  始まらない時には自動的に追加される．nameとしてRubyの識別子
+  として許されない文字(例えば` ')を含む場合にはRubyプログラ
+  ムからは見えなくなる．
 
-void rb_define_readonly_variable(const char *name, VALUE *var)
+void rb_define_readonly_variable(const char *name, VALUE *var) ::
 
-  Ruby��C�ȤǶ�ͭ����read only�Υ������Х��ѿ���������롥
-  read only�Ǥ��뤳�Ȱʳ���rb_define_variable()��Ʊ����
+  RubyとCとで共有するread onlyのグローバル変数を定義する．
+  read onlyであること以外はrb_define_variable()と同じ．
 
-void rb_define_virtual_variable(const char *name,
-				VALUE (*getter)(), void (*setter)())
+void rb_define_virtual_variable(const char *name, VALUE (*getter)(), void (*setter)()) ::
 
-  �ؿ��ˤ�äƼ¸������Ruby�ѿ���������롥�ѿ������Ȥ��줿
-  ���ˤ�getter�����ѿ����ͤ����åȤ��줿���ˤ�setter���ƤФ�
-  �롥
+  関数によって実現されるRuby変数を定義する．変数が参照された
+  時にはgetterが，変数に値がセットされた時にはsetterが呼ばれ
+  る．
 
-void rb_define_hooked_variable(const char *name, VALUE *var,
-			       VALUE (*getter)(), void (*setter)())
+void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), void (*setter)()) ::
 
-  �ؿ��ˤ�ä�hook�ΤĤ���줿�������Х��ѿ���������롥�ѿ�
-  �����Ȥ��줿���ˤ�getter�����ؿ����ͤ����åȤ��줿���ˤ�
-  setter���ƤФ�롥getter��setter��0����ꤷ�����ˤ�hook��
-  ���ꤷ�ʤ��Τ�Ʊ�����ˤʤ롥
+  関数によってhookのつけられたグローバル変数を定義する．変数
+  が参照された時にはgetterが，関数に値がセットされた時には
+  setterが呼ばれる．getterやsetterに0を指定した時にはhookを
+  指定しないのと同じ事になる．
 
 void rb_global_variable(VALUE *var)
 
-  GC�Τ��ᡤRuby�ץ�����फ��ϥ�����������ʤ���, Ruby����
-  �������Ȥ�ޤ�����ѿ���ޡ������롥
+  GCのため，Rubyプログラムからはアクセスされないが, Rubyオブ
+  ジェクトを含む大域変数をマークする．
 
-** ���
+== 定数
 
-void rb_define_const(VALUE klass, const char *name, VALUE val)
+void rb_define_const(VALUE klass, const char *name, VALUE val) ::
 
-  �����������롥
+  定数を定義する．
 
-void rb_define_global_const(const char *name, VALUE val)
+void rb_define_global_const(const char *name, VALUE val) ::
 
-  ��������������롥
+  大域定数を定義する．
 
-     rb_define_const(rb_cObject, name, val)
+    rb_define_const(rb_cObject, name, val)
 
-  ��Ʊ����̣��
+  と同じ意味．
 
-** �᥽�å����
+== メソッド定義
 
-rb_define_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+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)
+  メソッドを定義する．argcはselfを除く引数の数．argcが-1の時,
+  関数には引数の数(selfを含まない)を第1引数, 引数の配列を第2
+  引数とする形式で与えられる(第3引数はself)．argcが-2の時,
+  第1引数がself, 第2引数がargs(argsは引数を含むRubyの配列)と
+  いう形式で与えられる．
 
-  private�᥽�åɤ�������롥������rb_define_method()��Ʊ����
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
 
-rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc)
+  privateメソッドを定義する．引数はrb_define_method()と同じ．
 
-  �ðۥ᥽�åɤ�������롥������rb_define_method()��Ʊ����
+rb_define_singleton_method(VALUE klass, const char *name, VALUE (*func)(), int argc) ::
 
-rb_scan_args(int argc, VALUE *argv, const char *fmt, ...)
+  特異メソッドを定義する．引数はrb_define_method()と同じ．
 
-  argc, argv������Ϳ����줿������ʬ�򤹤롥fmt��ɬ�ܰ����ο�, 
-  �ղð����ο�, �Ĥ�ΰ��������뤫����ꤹ��ʸ�����, "����
-  ����*"�Ȥ��������Ǥ��롥 2 ���ܤο�����"*"�Ϥ��줾���ά��
-  ǽ�Ǥ��롥ɬ�ܰ�������Ĥ�ʤ�����0����ꤹ�롥��3������
-  �ߤ��ѿ��ؤΥݥ��󥿤�, �����������Ǥ������ѿ��˳�Ǽ����롥
-  �ղð������б����������Ϳ�����Ƥ��ʤ������ѿ���Qnil��
-  ��������롥
+rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
 
-** Ruby�᥽�åɸƤӽФ�
+  argc, argv形式で与えられた指定されたフォーマットに従って引
+  数を分解し，続くVALUEへの参照にセットします．このフォーマッ
+  トは，ABNFで記述すると以下の通りです．
 
-VALUE rb_funcall(VALUE recv, ID mid, int narg, ...)
+    scan-arg-spec  := param-arg-spec [option-hash-arg-spec] [block-arg-spec]
 
-  �᥽�åɸƤӽФ���ʸ���󤫤�mid�����뤿��ˤ�rb_intern()��
-  �Ȥ���
+    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
 
-VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv)
+    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              := "&"   ; イテレータブロックを取得するための
+                                            ; 指定
 
-  �᥽�åɸƤӽФ���������argc, argv�������Ϥ���
+  フォーマットが"12"の場合，引数は最低1つで，3つ(1+2)まで許さ
+  れるという意味になります．従って，フォーマット文字列に続い
+  て3つのVALUEへの参照を置く必要があります．それらには取得した
+  変数がセットされます．変数への参照の代わりにNULLを指定する
+  こともでき，その場合は取得した引数の値は捨てられます．なお，
+  省略可能引数が省略された時の変数の値はnil(C言語のレベルでは
+  Qnil)になります．
+
+  返り値は与えられた引数の数です．オプションハッシュおよびイ
+  テレータブロックは数えません．
+
+== Rubyメソッド呼び出し
+
+VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
+
+  メソッド呼び出し．文字列からmidを得るためにはrb_intern()を
+  使う．
+  private/protectedなメソッドでも呼び出せる．
+
+VALUE rb_funcall2(VALUE recv, ID mid, int argc, VALUE *argv) ::
+VALUE rb_funcallv(VALUE recv, ID mid, int argc, VALUE *argv) ::
+
+  メソッド呼び出し．引数をargc, argv形式で渡す．
+  private/protectedなメソッドでも呼び出せる．
+
+VALUE rb_funcallv_public(VALUE recv, ID mid, int argc, VALUE *argv) ::
+
+  メソッド呼び出し．
+  publicなメソッドしか呼べない．
 
 VALUE rb_eval_string(const char *str)
 
-  ʸ�����Ruby������ץȤȤ��ƥ���ѥ��롦�¹Ԥ��롥
+  文字列を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で示されるメソッドを持つかどうかを返す．
 
-ID rb_intern(const char *name)
+== インスタンス変数
 
-  ʸ������б�����ID���֤���
+VALUE rb_iv_get(VALUE obj, const char *name) ::
 
-char *rb_id2name(ID id)
+  objのインスタンス変数の値を得る．`@'で始まらないインスタン
+  ス変数は Rubyプログラムからアクセスできない「隠れた」イン
+  スタンス変数になる．定数は大文字の名前を持つクラス(または
+  モジュール)のインスタンス変数として実装されている．
 
-  ID���б�����ʸ������֤�(�ǥХå���)��
+VALUE rb_iv_set(VALUE obj, const char *name, VALUE val) ::
 
-char *rb_class2name(VALUE klass)
+  objのインスタンス変数をvalにセットする．
 
-  ���饹��̾�����֤�(�ǥХå���)�����饹��̾��������ʤ����ˤ�, 
-  ������̤ä�̾������ĥ��饹��̾�����֤���
+== 制御構造
 
-int rb_respond_to(VALUE obj, ID id)
+VALUE rb_block_call(VALUE obj, ID mid, int argc, VALUE * argv, VALUE (*func) (ANYARGS), VALUE data2) ::
 
-  obj��id�Ǽ������᥽�åɤ���Ĥ��ɤ������֤���
+  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) ::
 
-VALUE rb_iv_get(VALUE obj, const char *name)
+  func2をブロックとして設定し, func1をイテレータとして呼ぶ．
+  func1には arg1が引数として渡され, func2には第1引数にイテレー
+  タから与えられた値, 第2引数にarg2が渡される．
 
-  obj�Υ��󥹥����ѿ����ͤ����롥`@'�ǻϤޤ�ʤ����󥹥���
-  ���ѿ��� Ruby�ץ�����फ�饢�������Ǥ��ʤ��ֱ��줿�ץ���
-  �������ѿ��ˤʤ롥�������ʸ����̾������ĥ��饹(�ޤ���
-  �⥸�塼��)�Υ��󥹥����ѿ��Ȥ��Ƽ�������Ƥ��롥
+  1.9でrb_iterateを使う場合は, func1の中でRubyレベルのメソッド
+  を呼び出さなければならない.
+  1.9でobsoleteとなった. 代わりにrb_block_callが用意された.
 
-VALUE rb_iv_set(VALUE obj, const char *name, VALUE val)
+VALUE rb_yield(VALUE val) ::
 
-  obj�Υ��󥹥����ѿ���val�˥��åȤ��롥
+  valを値としてイテレータブロックを呼び出す．
 
-** ���湽¤
+VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
 
-VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
+  関数func1をarg1を引数に呼び出す．func1の実行中に例外が発生
+  した時には func2をarg2を引数として呼ぶ．戻り値は例外が発生
+  しなかった時はfunc1の戻り値, 例外が発生した時にはfunc2の戻
+  り値である．
 
-  func2��֥��å��Ȥ������ꤷ, func1�򥤥ƥ졼���Ȥ��ƸƤ֡� 
-  func1�ˤ� arg1�������Ȥ����Ϥ���, func2�ˤ���1�����˥��ƥ졼
-  ������Ϳ����줿��, ��2������arg2���Ϥ���롥
- 
-VALUE rb_yield(VALUE val)
+VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2) ::
 
-  val���ͤȤ��ƥ��ƥ졼���֥��å���ƤӽФ���
+  関数func1をarg1を引数として実行し, 実行終了後(たとえ例外が
+  発生しても) func2をarg2を引数として実行する．戻り値はfunc1
+  の戻り値である(例外が発生した時は戻らない)．
 
-VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
+VALUE rb_protect(VALUE (*func) (VALUE), VALUE arg, int *state) ::
 
-  �ؿ�func1��arg1������˸ƤӽФ���func1�μ¹�����㳰��ȯ��
-  �������ˤ� func2��arg2������Ȥ��ƸƤ֡�����ͤ��㳰��ȯ��
-  ���ʤ��ä�����func1�������, �㳰��ȯ���������ˤ�func2����
-  ���ͤǤ��롥
+  関数funcをargを引数として実行し, 例外が発生しなければその戻
+  り値を返す．例外が発生した場合は, *stateに非0をセットして
+  Qnilを返す．
+  rb_jump_tag()を呼ばずに捕捉した例外を無視する場合には，
+  rb_set_errinfo(Qnil)でエラー情報をクリアしなければならない．
 
-VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, void (*func2)(), VALUE arg2)
+void rb_jump_tag(int state) ::
 
-  �ؿ�func1��arg1������Ȥ��Ƽ¹Ԥ�, �¹Խ�λ��(���Ȥ��㳰��
-  ȯ�����Ƥ�) func2��arg2������Ȥ��Ƽ¹Ԥ��롥����ͤ�func1
-  ������ͤǤ���(�㳰��ȯ�������������ʤ�)��
+  rb_protect()やrb_eval_string_protect()で捕捉された例外を再
+  送する．stateはそれらの関数から返された値でなければならない．
+  この関数は直接の呼び出し元に戻らない．
 
-** �㳰�����顼
+void rb_iter_break() ::
 
-void rb_warning(const char *fmt, ...)
+  現在の最も内側のブロックを終了する．この関数は直接の呼び出
+  し元に戻らない．
 
-  rb_verbose����ɸ�२�顼���Ϥ˷ٹ�����ɽ�����롥������
-  printf()��Ʊ����
+void rb_iter_break_value(VALUE value) ::
 
-void rb_raise(rb_eRuntimeError, const char *fmt, ...)
+  現在の最も内側のブロックをvalueで終了する．ブロックは引数で
+  与えられたvalueを返す．この関数は直接の呼び出し元に戻らない．
 
-  RuntimeError�㳰��ȯ�������롥������printf()��Ʊ����
+== 例外・エラー
 
-void rb_raise(VALUE exception, const char *fmt, ...)
+void rb_warning(const char *fmt, ...) ::
 
-  exception�ǻ��ꤷ���㳰��ȯ�������롥fmt�ʲ��ΰ�����
-  printf()��Ʊ����
+  rb_verbose時に標準エラー出力に警告情報を表示する．引数は
+  printf()と同じ．
 
-void rb_fatal(const char *fmt, ...)
+void rb_raise(rb_eRuntimeError, const char *fmt, ...) ::
 
-  ��̿Ū�㳰��ȯ�������롥�̾���㳰�����ϹԤʤ�줺, ���󥿡�
-  �ץ꥿����λ����(������ensure�ǻ��ꤵ�줿�����ɤϽ�λ����
-  �¹Ԥ����)��
+  RuntimeError例外を発生させる．引数はprintf()と同じ．
 
-void rb_bug(const char *fmt, ...)
+void rb_raise(VALUE exception, const char *fmt, ...) ::
 
-  ���󥿡��ץ꥿�ʤɥץ������ΥХ��Ǥ���ȯ������Ϥ��Τʤ�
-  �����λ��Ƥ֡����󥿡��ץ꥿�ϥ�������פ�ľ���˽�λ���롥
-  �㳰�����ϰ��ڹԤʤ��ʤ���
+  exceptionで指定した例外を発生させる．fmt以下の引数は
+  printf()と同じ．
 
-** Ruby�ν�������¹�
+void rb_fatal(const char *fmt, ...) ::
 
-Ruby�򥢥ץꥱ����������������ˤϰʲ��Υ��󥿥ե�����
-��Ȥ����̾�γ�ĥ�饤�֥��ˤ�ɬ�פʤ���
+  致命的例外を発生させる．通常の例外処理は行なわれず, インター
+  プリタが終了する(ただしensureで指定されたコードは終了前に
+  実行される)．
 
-void ruby_init()
+void rb_bug(const char *fmt, ...) ::
 
-  Ruby���󥿥ץ꥿�ν������Ԥʤ���
+  インタープリタなどプログラムのバグでしか発生するはずのない
+  状況の時呼ぶ．インタープリタはコアダンプし直ちに終了する．
+  例外処理は一切行なわれない．
 
-void ruby_options(int argc, char **argv)
+注意: %iはObject#to_s('+'フラグが指定されているときはObject#inspect)を
+使ったVALUEの出力に使用されているため，整数には%dを使用すること．
 
-  Ruby���󥿥ץ꥿�Υ��ޥ�ɥ饤������ν�����Ԥʤ���
+== Rubyの初期化・実行
 
-void ruby_run()
+Rubyをアプリケーションに埋め込む場合には以下のインタフェース
+を使う．通常の拡張ライブラリには必要ない．
 
-  Ruby���󥿥ץ꥿��¹Ԥ��롥
+void ruby_init() ::
 
-void ruby_script(char *name)
+  Rubyインタプリタの初期化を行なう．
 
-  Ruby�Υ�����ץ�̾($0)�����ꤹ�롥
+void ruby_options(int argc, char **argv) ::
 
+  Rubyインタプリタのコマンドライン引数の処理を行なう．
 
-Appendix C. extconf.rb�ǻȤ���ؿ�����
+void ruby_run() ::
 
-extconf.rb����Ǥ����Ѳ�ǽ�ʥ���ѥ���������å��δؿ��ϰ�
-�����̤�Ǥ��롥
+  Rubyインタプリタを実行する．
 
-have_macro(macro, headers)
+void ruby_script(char *name) ::
 
-  �إå��ե�����header�򥤥󥯥롼�ɤ��ƥޥ���macro�������
-  ��Ƥ��뤫�ɤ��������å����롥�ޥ������������Ƥ����true
-  ���֤���
+  Rubyのスクリプト名($0)を設定する．
 
-have_library(lib, func)
+== インタプリタのイベントのフック
 
-  �ؿ�func��������Ƥ���饤�֥��lib��¸�ߤ�����å����롥
-  �饤�֥�꤬¸�ߤ������true���֤���
+  void rb_add_event_hook(rb_event_hook_func_t func, rb_event_flag_t events,
+                         VALUE data)
 
-find_library(lib, func, path...)
+指定されたインタプリタのイベントに対するフック関数を追加します．
+eventsは以下の値のorでなければなりません:
 
-  �ؿ�func��������Ƥ���饤�֥��lib��¸�ߤ� -Lpath ���ɲ�
-  ���ʤ�������å����롥�饤�֥�꤬���դ��ä�����true���֤���
+  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
 
-have_func(func, header)
+rb_event_hook_func_tの定義は以下の通りです:
 
-  �إå��ե�����header�򥤥󥯥롼�ɤ��ƴؿ�func��¸�ߤ������
-  �����롥func��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�ΤǤ�
-  ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
-  �����ؿ���¸�ߤ����true���֤���
+  typedef void (*rb_event_hook_func_t)(rb_event_t event, VALUE data,
+                                       VALUE self, ID id, VALUE klass)
 
-have_var(var, header)
+rb_add_event_hook() の第3引数 data は，フック関数の第2引数と
+して渡されます．これは1.8では現在のNODEへのポインタでした．以
+下の RB_EVENT_HOOKS_HAVE_CALLBACK_DATA も参照してください．
 
-  �إå��ե�����header�򥤥󥯥롼�ɤ����ѿ�var��¸�ߤ������
-  �����롥var��ɸ��Ǥϥ�󥯤���ʤ��饤�֥����Τ�ΤǤ�
-  ����ˤ����have_library�Ǥ��Υ饤�֥�������å����Ƥ���
-  �����ѿ���¸�ߤ����true���֤���
+  int rb_remove_event_hook(rb_event_hook_func_t func)
 
-have_header(header)
+指定されたフック関数を削除します．
 
-  �إå��ե������¸�ߤ�����å����롥�إå��ե����뤬¸�ߤ�
-  ���true���֤���
+== 互換性のためのマクロ
 
-find_header(header, path...)
+APIの互換性をチェックするために以下のマクロがデフォルトで定義されています．
 
-  �إå��ե�����header��¸�ߤ� -Ipath ���ɲä��ʤ�������å�
-  ���롥�إå��ե����뤬���դ��ä�����true���֤���
+NORETURN_STYLE_NEW ::
 
-have_struct_member(type, member, header)
+  NORETURN マクロが関数型マクロとして定義されていることを意味する．
 
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type�˥���member
-  ��¸�ߤ��뤫������å����롥type���������Ƥ��ơ�member��
-  ���Ĥ����true���֤���
+HAVE_RB_DEFINE_ALLOC_FUNC ::
 
-have_type(type, header, opt)
+  rb_define_alloc_func() 関数が提供されていること，つまり
+  allocation framework が使われることを意味する．
+  have_func("rb_define_alloc_func", "ruby.h")
+  の結果と同じ．
 
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type��¸�ߤ��뤫��
-  �����å����롥type���������Ƥ����true���֤���
+HAVE_RB_REG_NEW_STR ::
 
-check_sizeof(type, header)
+  StringオブジェクトからRegexpオブジェクトを作る
+  rb_reg_new_str() 関数が提供されていることを意味する．
+  have_func("rb_reg_new_str", "ruby.h").
+  の結果と同じ．
 
-  �إå��ե�����header�򥤥󥯥롼�ɤ��Ʒ�type��charñ�̥���
-  ����Ĵ�٤롥type���������Ƥ�������Υ��������֤��������
-  ��Ƥ��ʤ��Ȥ���nil���֤���
+HAVE_RB_IO_T ::
 
-create_makefile(target)
+  rb_io_t 型が提供されていることを意味する．
 
-  ��ĥ�饤�֥���Ѥ�Makefile���������롥���δؿ���ƤФʤ���
-  �Ф��Υ饤�֥��ϥ���ѥ��뤵��ʤ���target�ϥ⥸�塼��̾
-  ��ɽ����
+USE_SYMBOL_AS_METHOD_NAME ::
 
-find_executable(command, path)
+  メソッド名を返すメソッド，Module#methods, #singleton_methods
+  などがSymbolを返すことを意味する．
 
-  ���ޥ��command��File::PATH_SEPARATOR�Ƕ��ڤ�줿�ѥ�̾��
-  �ꥹ��path����õ����path��nil�ޤ��Ͼ�ά���줿���ϡ��Ķ�
-  �ѿ�PATH���ͤ���Ѥ��롥�¹Բ�ǽ�ʥ��ޥ�ɤ����Ĥ��ä����
-  �ϥѥ���ޤ�ե�����̾�����Ĥ���ʤ��ä�����nil���֤���
+HAVE_RUBY_*_H ::
 
-with_config(withval[, default=nil])
+  ruby.h で定義されている．対応するヘッダが提供されていること
+  を意味する．たとえば，HAVE_RUBY_ST_H が定義されている場合は
+  単なる st.h ではなく ruby/st.h を使用する．
 
-  ���ޥ�ɥ饤����--with-<withval>�ǻ��ꤵ�줿���ץ�����ͤ����롥
+RB_EVENT_HOOKS_HAVE_CALLBACK_DATA ::
 
-enable_config(config, *defaults)
-disable_config(config, *defaults)
+  rb_add_event_hook() がフック関数に渡す data を第3引数として
+  受け取ることを意味する．
 
-  ���ޥ�ɥ饤����--enable-<config>�ޤ���
-  --disable-<config>�ǻ��ꤵ�줿�����ͤ����롥
-  --enable-<config>�����ꤵ��Ƥ�������true��
-  --disable-<config>�����ꤵ��Ƥ�������false���֤���
-  �ɤ������ꤵ��Ƥ��ʤ����ϡ��֥��å��Ĥ��ǸƤӽФ���Ƥ������
-  *defaults��yield������̡��֥��å��ʤ��ʤ�*defaults���֤���
+= Appendix C. extconf.rbで使える関数たち
 
-dir_config(target[, default_dir])
-dir_config(target[, default_include, default_lib])
+extconf.rbの中では利用可能なコンパイル条件チェックの関数は以
+下の通りである．
 
-  ���ޥ�ɥ饤����--with-<target>-dir, --with-<target>-include,
-  --with-<target>-lib�Τ����줫�ǻ��ꤵ���ǥ��쥯�ȥ��
-  $CFLAGS �� $LDFLAGS ���ɲä��롥--with-<target>-dir=/path��
+have_macro(macro, headers) ::
+
+  ヘッダファイルheaderをインクルードしてマクロmacroが定義さ
+  れているかどうかチェックする．マクロが定義されている時true
+  を返す．
+
+have_library(lib, func) ::
+
+  関数funcを定義しているライブラリlibの存在をチェックする．
+  チェックに成功すると，-llibを$libsに追加し，trueを返す．
+
+find_library(lib, func, path...) ::
+
+  関数funcを定義しているライブラリlibの存在を -Lpath を追加
+  しながらチェックする．チェックに成功すると，-llibを$libsに
+  追加し，trueを返す．
+
+have_func(func, header) ::
+
+  ヘッダファイルheaderをインクルードして関数funcの存在をチェ
+  ックする．funcが標準ではリンクされないライブラリ内のもので
+  ある時には先にhave_libraryでそのライブラリをチェックしてお
+  く事．チェックに成功すると，プリプロセッサマクロ
+  `HAVE_{FUNC}` を定義し，trueを返す．
+
+have_var(var, header) ::
+
+  ヘッダファイルheaderをインクルードして変数varの存在をチェッ
+  クする．varが標準ではリンクされないライブラリ内のものであ
+  る時には先にhave_libraryでそのライブラリをチェックしておく
+  事．チェックに成功すると，プリプロセッサマクロ
+  `HAVE_{VAR}` を定義し，trueを返す．
+
+have_header(header) ::
+
+  ヘッダファイルの存在をチェックする．チェックに成功すると，
+  プリプロセッサマクロ `HAVE_{HEADER_H}` を定義し，trueを返す．
+  (スラッシュやドットはアンダースコアに置換される)
+
+find_header(header, path...) ::
+
+  ヘッダファイルheaderの存在を -Ipath を追加しながらチェック
+  する．チェックに成功すると，プリプロセッサマクロ
+  `HAVE_{HEADER_H}` を定義し，trueを返す．
+  (スラッシュやドットはアンダースコアに置換される)
+
+have_struct_member(type, member[, header[, opt]]) ::
+
+  ヘッダファイルheaderをインクルードして型typeが定義され，
+  なおかつメンバmemberが存在するかをチェックする．チェックに
+  成功すると，プリプロセッサマクロ `HAVE_{TYPE}_{MEMBER}` を
+  定義し，trueを返す．
+
+have_type(type, header, opt) ::
+
+  ヘッダファイルheaderをインクルードして型typeが存在するかを
+  チェックする．チェックに成功すると，プリプロセッサマクロ
+  `HAVE_TYPE_{TYPE}` を定義し，trueを返す．
+
+check_sizeof(type, header) ::
+
+  ヘッダファイルheaderをインクルードして型typeのchar単位サイ
+  ズを調べる．チェックに成功すると，プリプロセッサマクロ
+  `SIZEOF_{TYPE}` を定義し，そのサイズを返す．定義されていな
+  いときはnilを返す．
+
+create_makefile(target[, target_prefix]) ::
+
+  拡張ライブラリ用の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])
+  と等価である．追加された include ディレクトリと lib ディレ
+  クトリの配列を返す． ([include_dir, lib_dir])
+
+pkg_config(pkg, option=nil) ::
+
+  pkg-configコマンドからパッケージpkgの情報を [cflags, ldflags, libs]
+  の配列として得る．$CFLAGS, $LDFLAGS, $libs にはそれぞれの値が
+  追加される．
+
+  pkg-configの実際のコマンドは，以下の順で試される．
 
-pkg_config(pkg)
+  1. コマンドラインで--with-{pkg}-config={command}オプションが
+     指定された場合: {command} {option}
+  2. {pkg}-config {option}
+  3. pkg-config {option} {pkg}
 
-  pkg-config���ޥ�ɤ���ѥå�����pkg�ξ�������롥 
-  pkg-config�μºݤΥ��ޥ��̾�ϡ�--with-pkg-config���ޥ��
-  �饤�󥪥ץ����ǻ����ǽ��
+  optionが指定された場合は、上記の配列の代わりにそのオプションを
+  指定して得られた出力をstripしたものを返す．
 
 /*
  * Local variables:
diff --git a/README.ja b/README.ja
index 71ce4ee12c..9ab2f3ca0e 100644
--- a/README.ja
+++ b/README.ja
@@ -1,164 +1,192 @@
-* Ruby�Ȥ�
+= Rubyとは
 
-Ruby�ϥ���ץ뤫�Ķ��Ϥʥ��֥������Ȼظ�������ץȸ���Ǥ���
-Ruby�Ϻǽ餫����ʥ��֥������Ȼظ�����Ȥ����߷פ���Ƥ���
-�����顤���֥������Ȼظ��ץ�����ߥ󥰤��ڤ˹Ԥ����������
-������������̾�μ�³�����Υץ�����ߥ󥰤��ǽ�Ǥ���
+Rubyはシンプルかつ強力なオブジェクト指向スクリプト言語です．
+Rubyは最初から純粋なオブジェクト指向言語として設計されていま
+すから，オブジェクト指向プログラミングを手軽に行う事が出来ま
+す．もちろん通常の手続き型のプログラミングも可能です．
 
-Ruby�ϥƥ����Ƚ����ط���ǽ�Ϥʤɤ�ͥ�졤Perl��Ʊ�����餤����
-�Ǥ�������˥���ץ��ʸˡ�ȡ��㳰�����䥤�ƥ졼���ʤɤε���
-�ˤ�äơ����ʬ����䤹���ץ�����ߥ󥰤�����ޤ���
+Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい強力
+です．さらにシンプルな文法と，例外処理やイテレータなどの機構
+によって，より分かりやすいプログラミングが出来ます．
 
 
-* Ruby����Ĺ
+== Rubyの特長
 
-  + ����ץ��ʸˡ
-  + ���̤Υ��֥������Ȼظ���ǽ(���饹���᥽�åɥ�����ʤ�)
-  + �ü�ʥ��֥������Ȼظ���ǽ(Mixin, �ðۥ᥽�åɤʤ�)
-  + �黻�ҥ����С�������
-  + �㳰������ǽ
-  + ���ƥ졼���ȥ���������
-  + �����١������쥯��
-  + �����ʥߥå������ǥ��� (�������ƥ�����ˤ��)
-  + �ܿ������⤤��¿����UNIX���ư�������Ǥʤ���DOS��Windows��
-    Mac��BeOS�ʤɤξ�Ǥ�ư��
+*   シンプルな文法
+*   普通のオブジェクト指向機能(クラス，メソッドコールなど)
+*   特殊なオブジェクト指向機能(Mixin, 特異メソッドなど)
+*   演算子オーバーロード
+*   例外処理機能
+*   イテレータとクロージャ
+*   ガーベージコレクタ
+*   ダイナミックローディング (アーキテクチャによる)
+*   移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で
+    動くだけでなく，Windows， Mac OS X，BeOSなどの上でも動く
+    cf. http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatformsJa
 
+== 入手法
 
-* ����ˡ
+=== FTPで
 
-** FTP��
+以下の場所においてあります．
 
-�ʲ��ξ��ˤ����Ƥ���ޤ���
+ftp://ftp.ruby-lang.org/pub/ruby/
 
-  ftp://ftp.ruby-lang.org/pub/ruby/
+=== Subversionで
 
-** Subversion��
-
-�ܥ֥�����Ruby�κǿ��Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
-
-  $ svn co http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8/
-
-��ȯ��ü�Υ����������ɤϼ��Υ��ޥ�ɤǼ����Ǥ��ޤ���
+開発先端のソースコードは次のコマンドで取得できます．
 
   $ svn co http://svn.ruby-lang.org/repos/ruby/trunk/ ruby
 
-¾�˳�ȯ��Υ֥����ΰ����ϼ��Υ��ޥ�ɤǸ����ޤ���
+他に開発中のブランチの一覧は次のコマンドで見られます．
 
   $ svn ls http://svn.ruby-lang.org/repos/ruby/branches/
 
+=== Gitで
+
+SubversionのミラーをGitHubに公開しています．
+以下のコマンドでリポジトリを取得できます．
+
+  $ git clone git://github.com/ruby/ruby.git
 
-* �ۡ���ڡ���
+== ホームページ
 
-Ruby�Υۡ���ڡ�����URL��
+RubyのホームページのURLは
 
-   http://www.ruby-lang.org/
+http://www.ruby-lang.org/
 
-�Ǥ���
+です．
 
 
-* �᡼��󥰥ꥹ��
+== メーリングリスト
 
-Ruby�Υ᡼��󥰥ꥹ�Ȥ�����ޤ������ô�˾������
+Rubyのメーリングリストがあります。参加希望の方は
 
-   ruby-list-ctl@ruby-lang.org
+mailto:ruby-list-ctl@ruby-lang.org
 
-�ޤ���ʸ��
+まで本文に
 
    subscribe YourFirstName YourFamilyName
-   
-�Ƚ񤤤����äƲ������� 
 
-Ruby��ȯ�Ը����᡼��󥰥ꥹ�Ȥ⤢��ޤ���������Ǥ�ruby�Υ�
-��������λ��ͳ�ĥ�ʤɼ����������ˤĤ��Ƶ�������Ƥ��ޤ���
-���ô�˾������
+と書いて送って下さい。
+
+Ruby開発者向けメーリングリストもあります。こちらではrubyのバ
+グ、将来の仕様拡張など実装上の問題について議論されています。
+参加希望の方は
+
+mailto:ruby-dev-ctl@ruby-lang.org
+
+までruby-listと同様の方法でメールしてください。
+
+Ruby拡張モジュールについて話し合うruby-extメーリングリストと
+数学関係の話題について話し合うruby-mathメーリングリストと
+英語で話し合うruby-talkメーリングリストもあります。参加方法
+はどれも同じです。
 
-   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+ オプションで <tt>optflags=..</tt> <tt>warnflags=..</tt> 等
+     で上書きできます．
 
-  1. �⤷configure�ե����뤬���Ĥ���ʤ����⤷����
-     configure.in���Ť��褦�ʤ顢autoconf��¹Ԥ���
-     ������configure����������
+3.   (必要ならば)+defines.h+ を編集する
 
-  2. configure��¹Ԥ���Makefile�ʤɤ���������
+     多分，必要無いと思います．
 
-     �Ķ��ˤ�äƤϥǥե���Ȥ�C����ѥ����ѥ��ץ�����դ�
-     �ޤ���configure���ץ����� optflags=.. warnflags=.. ��
-     �Ǿ�񤭤Ǥ��ޤ���
+4.   (必要ならば)+ext/Setup+ に静的にリンクする拡張モジュールを
+     指定する
 
-  3. (ɬ�פʤ��)defines.h���Խ�����
+     +ext/Setup+ に記述したモジュールは静的にリンクされます．
 
-     ¿ʬ��ɬ��̵���Ȼפ��ޤ���
+     ダイナミックローディングをサポートしていないアーキテク
+     チャでは +Setup+ の1行目の「<tt>option nodynamic</tt>」という行のコ
+     メントを外す必要があります．また，このアーキテクチャで
+     拡張モジュールを利用するためには，あらかじめ静的にリン
+     クしておく必要があります．
 
-  4. (ɬ�פʤ��)ext/Setup����Ū�˥�󥯤����ĥ�⥸�塼���
-     ���ꤹ��
+5.   +make+ を実行してコンパイルする
 
-     ext/Setup�˵��Ҥ����⥸�塼�����Ū�˥�󥯤���ޤ���
+6.   <tt>make check</tt>でテストを行う．
 
-     �����ʥߥå������ǥ��󥰤򥵥ݡ��Ȥ��Ƥ��ʤ��������ƥ�
-     ����Ǥ�Setup��1���ܤΡ�option nodynamic�פȤ����ԤΥ�
-     ���Ȥ򳰤�ɬ�פ�����ޤ����ޤ������Υ������ƥ������
-     ��ĥ�⥸�塼������Ѥ��뤿��ˤϡ����餫������Ū�˥��
-     �����Ƥ���ɬ�פ�����ޤ���
+     「<tt>check succeeded</tt>」と表示されれば成功です．ただしテスト
+     に成功しても完璧だと保証されている訳ではありません．
 
-  5. make��¹Ԥ��ƥ���ѥ��뤹��
+7.   <tt>make install</tt>
 
-  6. make test�ǥƥ��Ȥ�Ԥ���
+     以下のディレクトリを作って，そこにファイルをインストー
+     ルします．
 
-     ��test succeeded�פ�ɽ�������������Ǥ����������ƥ���
-     ���������Ƥⴰ�������ݾڤ���Ƥ������ǤϤ���ޤ���
+     * <tt>${DESTDIR}${prefix}/bin</tt>
+     * <tt>${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/include/ruby-${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
+     * <tt>${DESTDIR}${prefix}/lib</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/site_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/vendor_ruby/${MAJOR}.${MINOR}.${TEENY}/${PLATFORM}</tt>
+     * <tt>${DESTDIR}${prefix}/lib/ruby/gems/${MAJOR}.${MINOR}.${TEENY}</tt>
+     * <tt>${DESTDIR}${prefix}/share/man/man1</tt>
+     * <tt>${DESTDIR}${prefix}/share/ri/${MAJOR}.${MINOR}.${TEENY}/system</tt>
 
-  7. make install
+     RubyのAPIバージョンが'_x.y.z_'であれば，<tt>${MAJOR}</tt>は
+     '_x_'で，<tt>${MINOR}</tt>は'_y_'，<tt>${TEENY}</tt>は'_z_'です．
 
-     root�Ǻ�Ȥ���ɬ�פ����뤫�⤷��ޤ���
+     <b>注意</b>: APIバージョンの +teeny+ は，Rubyプログラムのバージョ
+     ンとは異なることがあります．
 
-�⤷������ѥ�����˥��顼��ȯ���������ˤϥ��顼�Υ����ȥ�
-����OS�μ����ޤ�Ǥ�������ܤ�����ݡ��Ȥ��Ԥ����äƤ�
-�������¾�����Τ���ˤ�ʤ�ޤ���
+     +root+ で作業する必要があるかもしれません．
 
+もし，コンパイル時にエラーが発生した場合にはエラーのログとマ
+シン，OSの種類を含むできるだけ詳しいレポートを作者に送ってく
+ださると他の方のためにもなります．
 
-* �ܿ�
 
-UNIX�Ǥ����configure���ۤȤ�ɤκ��ۤ�ۼ����Ƥ����Ϥ���
-�������פ�̸���Ȥ������ä����(����˰㤤�ʤ�)����Ԥˤ���
-���Ȥ��ݡ��Ȥ���С����Ǥ��뤫���Τ�ޤ���
+== 移植
 
-�������ƥ�����ˤ�äȤ��¸����Τ�GC���Ǥ���Ruby��GC���о�
-�Υ������ƥ����㤬setjmp()�ˤ�ä����ƤΥ쥸������ jmp_buf��
-��Ǽ���뤳�Ȥȡ�jmp_buf�ȥ����å���32bit���饤����Ȥ����
-���뤳�Ȥ��ꤷ�Ƥ��ޤ����ä����Ԥ���Ω���ʤ������б�����
-��˺���Ǥ��礦����Ԥβ������Ū��ñ�ǡ�gc.c�ǥ����å���
-�ޡ������Ƥ�����ʬ�˥��饤����ȤΥХ��ȿ��������餷�ƥޡ�
-�����륳���ɤ��ɲä�������ǺѤߤޤ�����defined(THINK_C)�פ�
-����Ƥ�����ʬ�򻲹ͤˤ��Ƥ�������
+UNIXであれば +configure+ がほとんどの差異を吸収してくれるはずで
+すが，思わぬ見落としがあった場合(あるに違いない)，作者にその
+ことをレポートすれば，解決できるかも知れません．
 
-# �ºݤˤ�Ruby��Think C�Ǥϥ���ѥ���Ǥ��ޤ���
+アーキテクチャにもっとも依存するのはGC部です．RubyのGCは対象
+のアーキテクチャが<tt>setjmp()</tt>または<tt>getcontext()</tt>によって全てのレ
+ジスタを +jmp_buf+ や +ucontext_t+ に格納することと， +jmp_buf+ や
++ucontext_t+ とスタックが32bitアラインメントされていることを仮定
+しています．特に前者が成立しない場合の対応は非常に困難でしょう．
+後者の解決は比較的簡単で， +gc.c+ でスタックをマークしている
+部分にアラインメントのバイト数だけずらしてマークするコードを
+追加するだけで済みます．<tt>defined(\_\_mc68000\_\_)</tt>で括られてい
+る部分を参考にしてください．
 
-�쥸����������ɥ������CPU�Ǥϡ��쥸����������ɥ��򥹥���
-���˥ե�å��夹�륢����֥饳���ɤ��ɲä���ɬ�פ����뤫����
-��ޤ���
+レジスタウィンドウを持つCPUでは，レジスタウィンドウをスタッ
+クにフラッシュするアセンブラコードを追加する必要があるかも知
+れません．
 
 
-* ���۾��
+== 配布条件
 
-COPYING.ja�ե�����򻲾Ȥ��Ƥ���������
++COPYING.ja+ ファイルを参照してください。
 
 
-* ����
+== 著者
 
-�����ȡ��Х���ݡ��Ȥ���¾�� matz@netlab.jp �ޤǡ�
+コメント，バグレポートその他は mailto:matz@ruby-lang.org まで．
 -------------------------------------------------------
 created at: Thu Aug  3 11:57:36 JST 1995
+--
 Local variables:
-mode: indented-text
+mode: rdoc
 end:
diff --git a/ToDo b/ToDo
deleted file mode 100644
index b55e399edf..0000000000
--- a/ToDo
+++ /dev/null
@@ -1,126 +0,0 @@
-Language Spec.
-
-- Class#allocate - basicNew
-- class Foo::Bar<Baz .. end, module Boo::Bar .. end
-* operator !! for rescue. ???
-* objectify characters
-* ../... outside condition invokes operator method too.
-* ... 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
-* Fixnum 0 as false ????
-* discourage use of symbol variables (e.g. $/, etc.) in manual
-* discourage use of Perlish features by giving warnings.
-* non confusing in-block local variable (is it possible?)
-  + 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.
-* a +1 to be a+1, not a(+1).
-* unify == and eql? again
-* to_i returns nil if str contains no digit.
-* raise exception by `` error
-* jar like combined library package. -> RubyGems?
-* resumable Exception via Exception#resume.
-* method combination, e.g. before, after, around, etc.
-* .. or something like defadvice in Emacs.
-* property - for methods, or for objects in general.
-* "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()"
-* clarify evaluation order of operator argument (=~, .., ...)
-* :symbol => value hash in the form of {symbol: value, ...} ??
-
-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/addr2line.c b/addr2line.c
new file mode 100644
index 0000000000..f936694724
--- /dev/null
+++ b/addr2line.c
@@ -0,0 +1,1082 @@
+/**********************************************************************
+
+  addr2line.c -
+
+  $Author$
+
+  Copyright (C) 2010 Shinichiro Hamaji
+
+**********************************************************************/
+
+#include "ruby/config.h"
+#include "ruby/missing.h"
+#include "addr2line.h"
+
+#include <stdio.h>
+#include <errno.h>
+
+#ifdef USE_ELF
+
+#include <fcntl.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#ifdef __OpenBSD__
+#include <elf_abi.h>
+#else
+#include <elf.h>
+#endif
+
+/* Make alloca work the best possible way.  */
+#ifdef __GNUC__
+# ifndef atarist
+#  ifndef alloca
+#   define alloca __builtin_alloca
+#  endif
+# endif	/* atarist */
+#else
+# ifdef HAVE_ALLOCA_H
+#  include <alloca.h>
+# else
+#  ifdef _AIX
+#pragma alloca
+#  else
+#   ifndef alloca		/* predefined by HP cc +Olibcalls */
+void *alloca();
+#   endif
+#  endif /* AIX */
+# endif	/* HAVE_ALLOCA_H */
+#endif /* __GNUC__ */
+
+#ifdef HAVE_DL_ITERATE_PHDR
+# ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+# endif
+# include <link.h>
+#endif
+
+#define DW_LNS_copy                     0x01
+#define DW_LNS_advance_pc               0x02
+#define DW_LNS_advance_line             0x03
+#define DW_LNS_set_file                 0x04
+#define DW_LNS_set_column               0x05
+#define DW_LNS_negate_stmt              0x06
+#define DW_LNS_set_basic_block          0x07
+#define DW_LNS_const_add_pc             0x08
+#define DW_LNS_fixed_advance_pc         0x09
+#define DW_LNS_set_prologue_end         0x0a /* DWARF3 */
+#define DW_LNS_set_epilogue_begin       0x0b /* DWARF3 */
+#define DW_LNS_set_isa                  0x0c /* DWARF3 */
+
+/* Line number extended opcode name. */
+#define DW_LNE_end_sequence             0x01
+#define DW_LNE_set_address              0x02
+#define DW_LNE_define_file              0x03
+#define DW_LNE_set_discriminator        0x04  /* DWARF4 */
+
+#ifndef ElfW
+# if SIZEOF_VOIDP == 8
+#  define ElfW(x) Elf64##_##x
+# else
+#  define ElfW(x) Elf32##_##x
+# endif
+#endif
+#ifndef PATH_MAX
+#define PATH_MAX 4096
+#endif
+
+int kprintf(const char *fmt, ...);
+
+typedef struct {
+    const char *dirname;
+    const char *filename;
+    int line;
+
+    int fd;
+    void *mapped;
+    size_t mapped_size;
+    unsigned long base_addr;
+} line_info_t;
+
+/* Avoid consuming stack as this module may be used from signal handler */
+static char binary_filename[PATH_MAX];
+
+static unsigned long
+uleb128(char **p)
+{
+    unsigned long r = 0;
+    int s = 0;
+    for (;;) {
+	unsigned char b = *(unsigned char *)(*p)++;
+	if (b < 0x80) {
+	    r += (unsigned long)b << s;
+	    break;
+	}
+	r += (b & 0x7f) << s;
+	s += 7;
+    }
+    return r;
+}
+
+static long
+sleb128(char **p)
+{
+    long r = 0;
+    int s = 0;
+    for (;;) {
+	unsigned char b = *(unsigned char *)(*p)++;
+	if (b < 0x80) {
+	    if (b & 0x40) {
+		r -= (0x80 - b) << s;
+	    }
+	    else {
+		r += (b & 0x3f) << s;
+	    }
+	    break;
+	}
+	r += (b & 0x7f) << s;
+	s += 7;
+    }
+    return r;
+}
+
+static const char *
+get_nth_dirname(unsigned long dir, char *p)
+{
+    if (!dir--) {
+	return "";
+    }
+    while (dir--) {
+	while (*p) p++;
+	p++;
+	if (!*p) {
+	    kprintf("Unexpected directory number %lu in %s\n",
+		    dir, binary_filename);
+	    return "";
+	}
+    }
+    return p;
+}
+
+static void
+fill_filename(int file, char *include_directories, char *filenames,
+	      line_info_t *line)
+{
+    int i;
+    char *p = filenames;
+    char *filename;
+    unsigned long dir;
+    for (i = 1; i <= file; i++) {
+	filename = p;
+	if (!*p) {
+	    /* Need to output binary file name? */
+	    kprintf("Unexpected file number %d in %s\n",
+		    file, binary_filename);
+	    return;
+	}
+	while (*p) p++;
+	p++;
+	dir = uleb128(&p);
+	/* last modified. */
+	uleb128(&p);
+	/* size of the file. */
+	uleb128(&p);
+
+	if (i == file) {
+	    line->filename = filename;
+	    line->dirname = get_nth_dirname(dir, include_directories);
+	}
+    }
+}
+
+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)
+{
+    int i;
+    for (i = 0; i < num_traces; i++) {
+	unsigned long a = (unsigned long)traces[i] - lines[i].base_addr;
+	/* We assume one line code doesn't result >100 bytes of native code.
+       We may want more reliable way eventually... */
+	if (addr < a && a < addr + 100) {
+	    fill_filename(file, include_directories, filenames, &lines[i]);
+	    lines[i].line = line;
+	}
+    }
+}
+
+static void
+parse_debug_line_cu(int num_traces, void **traces,
+		    char **debug_line, line_info_t *lines)
+{
+    char *p, *cu_end, *cu_start, *include_directories, *filenames;
+    unsigned long unit_length;
+    int default_is_stmt, line_base;
+    unsigned int header_length, minimum_instruction_length, line_range,
+		 opcode_base;
+    /* unsigned char *standard_opcode_lengths; */
+
+    /* The registers. */
+    unsigned long addr = 0;
+    unsigned int file = 1;
+    unsigned int line = 1;
+    /* unsigned int column = 0; */
+    int is_stmt;
+    /* int basic_block = 0; */
+    /* int end_sequence = 0; */
+    /* int prologue_end = 0; */
+    /* int epilogue_begin = 0; */
+    /* unsigned int isa = 0; */
+
+    p = *debug_line;
+
+    unit_length = *(unsigned int *)p;
+    p += sizeof(unsigned int);
+    if (unit_length == 0xffffffff) {
+	unit_length = *(unsigned long *)p;
+	p += sizeof(unsigned long);
+    }
+
+    cu_end = p + unit_length;
+
+    /*dwarf_version = *(unsigned short *)p;*/
+    p += 2;
+
+    header_length = *(unsigned int *)p;
+    p += sizeof(unsigned int);
+
+    cu_start = p + header_length;
+
+    minimum_instruction_length = *(unsigned char *)p;
+    p++;
+
+    is_stmt = default_is_stmt = *(unsigned char *)p;
+    p++;
+
+    line_base = *(char *)p;
+    p++;
+
+    line_range = *(unsigned char *)p;
+    p++;
+
+    opcode_base = *(unsigned char *)p;
+    p++;
+
+    /* standard_opcode_lengths = (unsigned char *)p - 1; */
+    p += opcode_base - 1;
+
+    include_directories = p;
+
+    /* skip include directories */
+    while (*p) {
+	while (*p) p++;
+	p++;
+    }
+    p++;
+
+    filenames = p;
+
+    p = cu_start;
+
+#define FILL_LINE()						    \
+    do {							    \
+	fill_line(num_traces, traces, addr, file, line,		    \
+		  include_directories, filenames, lines);	    \
+	/*basic_block = prologue_end = epilogue_begin = 0;*/	    \
+    } while (0)
+
+    while (p < cu_end) {
+	unsigned long a;
+	unsigned char op = *p++;
+	switch (op) {
+	case DW_LNS_copy:
+	    FILL_LINE();
+	    break;
+	case DW_LNS_advance_pc:
+	    a = uleb128(&p);
+	    addr += a;
+	    break;
+	case DW_LNS_advance_line: {
+	    long a = sleb128(&p);
+	    line += a;
+	    break;
+	}
+	case DW_LNS_set_file:
+	    file = (unsigned int)uleb128(&p);
+	    break;
+	case DW_LNS_set_column:
+	    /*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; */
+	    break;
+	case DW_LNS_const_add_pc:
+	    a = ((255 - opcode_base) / line_range) *
+		minimum_instruction_length;
+	    addr += a;
+	    break;
+	case DW_LNS_fixed_advance_pc:
+	    a = *(unsigned char *)p++;
+	    addr += a;
+	    break;
+	case DW_LNS_set_prologue_end:
+	    /* prologue_end = 1; */
+	    break;
+	case DW_LNS_set_epilogue_begin:
+	    /* epilogue_begin = 1; */
+	    break;
+	case DW_LNS_set_isa:
+	    /* 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; */
+		FILL_LINE();
+		addr = 0;
+		file = 1;
+		line = 1;
+		/* column = 0; */
+		is_stmt = default_is_stmt;
+		/* 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:
+		kprintf("Unsupported operation in %s\n",
+			binary_filename);
+		break;
+	    case DW_LNE_set_discriminator:
+		/* TODO:currently ignore */
+		uleb128(&p);
+		break;
+	    default:
+		kprintf("Unknown extended opcode: %d in %s\n",
+			op, binary_filename);
+	    }
+	    break;
+	default: {
+	    unsigned long addr_incr;
+	    unsigned long line_incr;
+	    a = op - opcode_base;
+	    addr_incr = (a / line_range) * minimum_instruction_length;
+	    line_incr = line_base + (a % line_range);
+	    addr += (unsigned int)addr_incr;
+	    line += (unsigned int)line_incr;
+	    FILL_LINE();
+	}
+	}
+    }
+    *debug_line = p;
+}
+
+static void
+parse_debug_line(int num_traces, void **traces,
+		 char *debug_line, unsigned long size, line_info_t *lines)
+{
+    char *debug_line_end = debug_line + size;
+    while (debug_line < debug_line_end) {
+	parse_debug_line_cu(num_traces, traces, &debug_line, lines);
+    }
+    if (debug_line != debug_line_end) {
+	kprintf("Unexpected size of .debug_line in %s\n",
+		binary_filename);
+    }
+}
+
+/* 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 void
+follow_debuglink(char *debuglink, int num_traces, void **traces, char **syms,
+		 line_info_t *current_line, line_info_t *lines)
+{
+    /* 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;
+
+    p = strrchr(binary_filename, '/');
+    if (!p) {
+	return;
+    }
+    p[1] = '\0';
+
+    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);
+}
+
+/* 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)
+{
+    int i;
+    char *shstr;
+    char *section_name;
+    ElfW(Ehdr) *ehdr;
+    ElfW(Shdr) *shdr, *shstr_shdr;
+    ElfW(Shdr) *debug_line_shdr = NULL, *gnu_debuglink_shdr = NULL;
+    int fd;
+    off_t filesize;
+    char *file;
+
+    fd = open(binary_filename, O_RDONLY);
+    if (fd < 0) {
+	return;
+    }
+    filesize = lseek(fd, 0, SEEK_END);
+    if (filesize < 0) {
+	int e = errno;
+	close(fd);
+	kprintf("lseek: %s\n", strerror(e));
+	return;
+    }
+#if SIZEOF_OFF_T > SIZEOF_SIZE_T
+    if (filesize > (off_t)SIZE_MAX) {
+	close(fd);
+	kprintf("Too large file %s\n", binary_filename);
+	return;
+    }
+#endif
+    lseek(fd, 0, SEEK_SET);
+    /* async-signal unsafe */
+    file = (char *)mmap(NULL, (size_t)filesize, PROT_READ, MAP_SHARED, fd, 0);
+    if (file == MAP_FAILED) {
+	int e = errno;
+	close(fd);
+	kprintf("mmap: %s\n", strerror(e));
+	return;
+    }
+
+    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);
+	return;
+    }
+
+    current_line->fd = fd;
+    current_line->mapped = file;
+    current_line->mapped_size = (size_t)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;
+	}
+    }
+
+    shdr = (ElfW(Shdr) *)(file + ehdr->e_shoff);
+
+    shstr_shdr = shdr + ehdr->e_shstrndx;
+    shstr = file + shstr_shdr->sh_offset;
+
+    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;
+	    break;
+	} else if (!strcmp(section_name, ".gnu_debuglink")) {
+	    gnu_debuglink_shdr = shdr + i;
+	}
+    }
+
+    if (!debug_line_shdr) {
+	/* This file doesn't have .debug_line section,
+	   let's check .gnu_debuglink section instead. */
+	if (gnu_debuglink_shdr && check_debuglink) {
+	    follow_debuglink(file + gnu_debuglink_shdr->sh_offset,
+			     num_traces, traces, syms,
+			     current_line, lines);
+	}
+	return;
+    }
+
+    parse_debug_line(num_traces, traces,
+		     file + debug_line_shdr->sh_offset,
+		     debug_line_shdr->sh_size,
+		     lines);
+}
+
+#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)
+{
+    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;
+	}
+    }
+    return 0;
+}
+
+#endif /* HAVE_DL_ITERATE_PHDR */
+
+void
+rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
+{
+    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;
+	}
+
+	strncpy(binary_filename, path, len);
+	binary_filename[len] = '\0';
+
+	fill_lines(num_traces, trace, syms, 1, &lines[i], lines);
+    }
+
+    for (i = 0; i < num_traces; i++) {
+	line_info_t *line = &lines[i];
+
+	if (line->line > 0) {
+	    if (line->filename) {
+		if (line->dirname && line->dirname[0]) {
+		    kprintf("%s %s/%s:%d\n", syms[i], line->dirname, line->filename, line->line);
+		}
+		else {
+		    kprintf("%s %s:%d\n", syms[i], line->filename, line->line);
+		}
+	    } else {
+		kprintf("%s ???:%d\n", syms[i], line->line);
+	    }
+	} else {
+	    kprintf("%s\n", syms[i]);
+	}
+    }
+
+    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);
+	}
+    }
+    free(lines);
+}
+
+/* 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)
+extern int rb_toupper(int c);
+#define    toupper(c)  rb_toupper(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
new file mode 100644
index 0000000000..3782d89e07
--- /dev/null
+++ b/addr2line.h
@@ -0,0 +1,21 @@
+/**********************************************************************
+
+  addr2line.h -
+
+  $Author$
+
+  Copyright (C) 2010 Shinichiro Hamaji
+
+**********************************************************************/
+
+#ifndef RUBY_ADDR2LINE_H
+#define RUBY_ADDR2LINE_H
+
+#ifdef USE_ELF
+
+void
+rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms);
+
+#endif /* USE_ELF */
+
+#endif /* RUBY_ADDR2LINE_H */
diff --git a/array.c b/array.c
index 89f74d01ff..5d01fdb551 100644
--- a/array.c
+++ b/array.c
@@ -3,164 +3,498 @@
   array.c -
 
   $Author$
-  $Date$
   created at: Fri Aug  6 09:46:12 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "util.h"
-#include "st.h"
+#include "ruby/ruby.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>
 
 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 / sizeof(VALUE))
+#define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
 
 void
-rb_mem_clear(mem, size)
-    register VALUE *mem;
-    register long size;
+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(mem, size, val)
-    register VALUE *mem;
-    register long size;
-    register VALUE val;
+memfill(register VALUE *mem, register long size, register VALUE val)
 {
     while (size--) {
 	*mem++ = val;
     }
 }
 
-#define ARY_TMPLOCK  FL_USER1
+static void
+ary_memfill(VALUE ary, long beg, long size, VALUE val)
+{
+    RARRAY_PTR_USE(ary, ptr, {
+	memfill(ptr + beg, size, val);
+	OBJ_WRITTEN(ary, Qundef, val);
+    });
+}
+
+static void
+ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv)
+{
+#if 1
+    if (OBJ_PROMOTED(ary)) {
+	if (argc > (int)(128/sizeof(VALUE)) /* is magic number (cache line size) */) {
+	    rb_gc_writebarrier_remember_promoted(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++) {
+		    OBJ_WRITE(ary, &ptr[i+beg], argv[i]);
+		}
+	    });
+	}
+    }
+    else {
+	RARRAY_PTR_USE(ary, ptr, {
+	    MEMCPY(ptr+beg, argv, VALUE, argc);
+	});
+    }
+#else
+    /* use shady (traditional way) */
+    MEMCPY(RARRAY_PTR(ary)+beg, argv, VALUE, argc);
+#endif
+}
+
+# define ARY_SHARED_P(ary) \
+    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
+     FL_TEST((ary),ELTS_SHARED)!=0)
+# define ARY_EMBED_P(ary) \
+    (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \
+     FL_TEST((ary), RARRAY_EMBED_FLAG)!=0)
+
+#define ARY_HEAP_PTR(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.ptr)
+#define ARY_HEAP_LEN(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.len)
+#define ARY_EMBED_PTR(a) (assert(ARY_EMBED_P(a)), RARRAY(a)->as.ary)
+#define ARY_EMBED_LEN(a) \
+    (assert(ARY_EMBED_P(a)), \
+     (long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
+	 (RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
+#define ARY_HEAP_SIZE(a) (assert(!ARY_EMBED_P(a)), assert(ARY_OWNS_HEAP_P(a)), RARRAY(a)->as.heap.aux.capa * sizeof(VALUE))
+
+#define ARY_OWNS_HEAP_P(a) (!FL_TEST((a), ELTS_SHARED|RARRAY_EMBED_FLAG))
+#define FL_SET_EMBED(a) do { \
+    assert(!ARY_SHARED_P(a)); \
+    FL_SET((a), RARRAY_EMBED_FLAG); \
+} while (0)
+#define FL_UNSET_EMBED(ary) FL_UNSET((ary), RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK)
+#define FL_SET_SHARED(ary) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    FL_SET((ary), ELTS_SHARED); \
+} while (0)
+#define FL_UNSET_SHARED(ary) FL_UNSET((ary), ELTS_SHARED)
+
+#define ARY_SET_PTR(ary, p) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RARRAY(ary)->as.heap.ptr = (p); \
+} while (0)
+#define ARY_SET_EMBED_LEN(ary, n) do { \
+    long tmp_n = (n); \
+    assert(ARY_EMBED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
+    RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
+} while (0)
+#define ARY_SET_HEAP_LEN(ary, n) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    RARRAY(ary)->as.heap.len = (n); \
+} while (0)
+#define ARY_SET_LEN(ary, n) do { \
+    if (ARY_EMBED_P(ary)) { \
+        ARY_SET_EMBED_LEN((ary), (n)); \
+    } \
+    else { \
+        ARY_SET_HEAP_LEN((ary), (n)); \
+    } \
+    assert(RARRAY_LEN(ary) == (n)); \
+} while (0)
+#define ARY_INCREASE_PTR(ary, n) do  { \
+    assert(!ARY_EMBED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RARRAY(ary)->as.heap.ptr += (n); \
+} while (0)
+#define ARY_INCREASE_LEN(ary, n) do  { \
+    assert(!OBJ_FROZEN(ary)); \
+    if (ARY_EMBED_P(ary)) { \
+        ARY_SET_EMBED_LEN((ary), RARRAY_LEN(ary)+(n)); \
+    } \
+    else { \
+        RARRAY(ary)->as.heap.len += (n); \
+    } \
+} while (0)
+
+#define ARY_CAPA(ary) (ARY_EMBED_P(ary) ? RARRAY_EMBED_LEN_MAX : \
+		       ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : RARRAY(ary)->as.heap.aux.capa)
+#define ARY_SET_CAPA(ary, n) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    assert(!ARY_SHARED_P(ary)); \
+    assert(!OBJ_FROZEN(ary)); \
+    RARRAY(ary)->as.heap.aux.capa = (n); \
+} while (0)
+
+#define ARY_SHARED(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared)
+#define ARY_SET_SHARED(ary, value) do { \
+    const VALUE _ary_ = (ary); \
+    const VALUE _value_ = (value); \
+    assert(!ARY_EMBED_P(_ary_)); \
+    assert(ARY_SHARED_P(_ary_)); \
+    assert(ARY_SHARED_ROOT_P(_value_)); \
+    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); \
+} while (0)
+#define FL_SET_SHARED_ROOT(ary) do { \
+    assert(!ARY_EMBED_P(ary)); \
+    FL_SET((ary), RARRAY_SHARED_ROOT_FLAG); \
+} while (0)
+
+static void
+ary_resize_capa(VALUE ary, long capacity)
+{
+    assert(RARRAY_LEN(ary) <= capacity);
+    assert(!OBJ_FROZEN(ary));
+    assert(!ARY_SHARED_P(ary));
+    if (capacity > RARRAY_EMBED_LEN_MAX) {
+        if (ARY_EMBED_P(ary)) {
+            long len = ARY_EMBED_LEN(ary);
+            VALUE *ptr = ALLOC_N(VALUE, (capacity));
+            MEMCPY(ptr, ARY_EMBED_PTR(ary), VALUE, len);
+            FL_UNSET_EMBED(ary);
+            ARY_SET_PTR(ary, ptr);
+            ARY_SET_HEAP_LEN(ary, len);
+        }
+        else {
+	    SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, capacity, RARRAY(ary)->as.heap.aux.capa);
+        }
+        ARY_SET_CAPA(ary, (capacity));
+    }
+    else {
+        if (!ARY_EMBED_P(ary)) {
+            long len = RARRAY_LEN(ary);
+	    const VALUE *ptr = RARRAY_CONST_PTR(ary);
+	    size_t size = ARY_HEAP_SIZE(ary);
+
+	    if (len > capacity) len = capacity;
+            MEMCPY((VALUE *)RARRAY(ary)->as.ary, ptr, VALUE, len);
+            FL_SET_EMBED(ary);
+            ARY_SET_LEN(ary, len);
+	    ruby_sized_xfree((VALUE *)ptr, size);
+        }
+    }
+}
 
 static inline void
-rb_ary_modify_check(ary)
-    VALUE ary;
+ary_shrink_capa(VALUE ary)
 {
-    if (OBJ_FROZEN(ary)) rb_error_frozen("array");
-    if (FL_TEST(ary, ARY_TMPLOCK))
-	rb_raise(rb_eRuntimeError, "can't modify array during iteration");
-    if (!OBJ_TAINTED(ary) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: can't modify array");
+    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
-rb_ary_modify(ary)
-    VALUE ary;
+ary_double_capa(VALUE ary, long min)
+{
+    long new_capa = ARY_CAPA(ary) / 2;
+
+    if (new_capa < ARY_DEFAULT_SIZE) {
+	new_capa = ARY_DEFAULT_SIZE;
+    }
+    if (new_capa >= ARY_MAX_SIZE - min) {
+	new_capa = (ARY_MAX_SIZE - min) / 2;
+    }
+    new_capa += min;
+    ary_resize_capa(ary, new_capa);
+}
+
+static void
+rb_ary_decrement_share(VALUE shared)
+{
+    if (shared) {
+	long num = ARY_SHARED_NUM(shared) - 1;
+	if (num == 0) {
+	    rb_ary_free(shared);
+	    rb_gc_force_recycle(shared);
+	}
+	else if (num > 0) {
+	    ARY_SET_SHARED_NUM(shared, num);
+	}
+    }
+}
+
+static void
+rb_ary_unshare(VALUE ary)
+{
+    VALUE shared = RARRAY(ary)->as.heap.aux.shared;
+    rb_ary_decrement_share(shared);
+    FL_UNSET_SHARED(ary);
+}
+
+static inline void
+rb_ary_unshare_safe(VALUE ary)
+{
+    if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
+	rb_ary_unshare(ary);
+    }
+}
+
+static VALUE
+rb_ary_increment_share(VALUE shared)
 {
-    VALUE *ptr;
+    long num = ARY_SHARED_NUM(shared);
+    if (num >= 0) {
+	ARY_SET_SHARED_NUM(shared, num + 1);
+    }
+    return shared;
+}
 
+static void
+rb_ary_set_shared(VALUE ary, VALUE shared)
+{
+    rb_ary_increment_share(shared);
+    FL_SET_SHARED(ary);
+    ARY_SET_SHARED(ary, shared);
+}
+
+static inline void
+rb_ary_modify_check(VALUE ary)
+{
+    rb_check_frozen(ary);
+}
+
+void
+rb_ary_modify(VALUE ary)
+{
     rb_ary_modify_check(ary);
-    if (FL_TEST(ary, ELTS_SHARED)) {
-	ptr = ALLOC_N(VALUE, RARRAY(ary)->len);
-	FL_UNSET(ary, ELTS_SHARED);
-	RARRAY(ary)->aux.capa = RARRAY(ary)->len;
-	MEMCPY(ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
-	RARRAY(ary)->ptr = ptr;
+    if (ARY_SHARED_P(ary)) {
+	long shared_len, len = RARRAY_LEN(ary);
+	VALUE shared = ARY_SHARED(ary);
+        if (len <= RARRAY_EMBED_LEN_MAX) {
+	    const VALUE *ptr = ARY_HEAP_PTR(ary);
+            FL_UNSET_SHARED(ary);
+            FL_SET_EMBED(ary);
+	    MEMCPY((VALUE *)ARY_EMBED_PTR(ary), ptr, VALUE, len);
+            rb_ary_decrement_share(shared);
+            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_CONST_PTR(ary), VALUE, len);
+            rb_ary_unshare(ary);
+            ARY_SET_CAPA(ary, len);
+            ARY_SET_PTR(ary, ptr);
+        }
     }
 }
 
+static void
+ary_ensure_room_for_push(VALUE ary, long add_len)
+{
+    long new_len = RARRAY_LEN(ary) + add_len;
+    long capa;
+
+    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);
+		}
+		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;
+	    }
+	}
+    }
+    rb_ary_modify(ary);
+    capa = ARY_CAPA(ary);
+    if (new_len > capa) {
+	ary_double_capa(ary, new_len);
+    }
+}
+
+/*
+ *  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(ary)
-    VALUE ary;
+rb_ary_freeze(VALUE ary)
 {
     return rb_obj_freeze(ary);
 }
 
 /*
  *  call-seq:
- *     array.frozen?  -> true or false
+ *     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
-rb_ary_frozen_p(ary)
-    VALUE ary;
+rb_ary_frozen_p(VALUE ary)
 {
     if (OBJ_FROZEN(ary)) return Qtrue;
-    if (FL_TEST(ary, ARY_TMPLOCK)) return Qtrue;
     return Qfalse;
 }
 
-static VALUE ary_alloc _((VALUE));
+/* 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(klass)
-    VALUE klass;
+ary_alloc(VALUE klass)
 {
-    NEWOBJ(ary, struct RArray);
-    OBJSETUP(ary, klass, T_ARRAY);
+    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;
+}
 
-    ary->len = 0;
-    ary->ptr = 0;
-    ary->aux.capa = 0;
+static VALUE
+empty_ary_alloc(VALUE klass)
+{
+    if (RUBY_DTRACE_ARRAY_CREATE_ENABLED()) {
+	RUBY_DTRACE_ARRAY_CREATE(0, rb_sourcefile(), rb_sourceline());
+    }
 
-    return (VALUE)ary;
+    return ary_alloc(klass);
 }
 
 static VALUE
-ary_new(klass, len)
-    VALUE klass;
-    long len;
+ary_new(VALUE klass, long capa)
 {
-    VALUE ary = ary_alloc(klass);
+    VALUE ary,*ptr;
 
-    if (len < 0) {
+    if (capa < 0) {
 	rb_raise(rb_eArgError, "negative array size (or size too big)");
     }
-    if (len > ARY_MAX_SIZE) {
+    if (capa > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
-    if (len == 0) len++;
-    RARRAY(ary)->ptr = ALLOC_N(VALUE, len);
-    RARRAY(ary)->aux.capa = len;
+
+    if (RUBY_DTRACE_ARRAY_CREATE_ENABLED()) {
+	RUBY_DTRACE_ARRAY_CREATE(capa, rb_sourcefile(), rb_sourceline());
+    }
+
+    if (capa > RARRAY_EMBED_LEN_MAX) {
+	ptr = ALLOC_N(VALUE, capa);
+	ary = ary_alloc(klass);
+        FL_UNSET_EMBED(ary);
+        ARY_SET_PTR(ary, ptr);
+        ARY_SET_CAPA(ary, capa);
+        ARY_SET_HEAP_LEN(ary, 0);
+    }
+    else {
+	ary = ary_alloc(klass);
+    }
 
     return ary;
 }
 
 VALUE
-rb_ary_new2(len)
-    long len;
+rb_ary_new_capa(long capa)
 {
-    return ary_new(rb_cArray, len);
+    return ary_new(rb_cArray, capa);
 }
 
-
 VALUE
-rb_ary_new()
+rb_ary_new(void)
 {
-    return rb_ary_new2(ARY_DEFAULT_SIZE);
+    return rb_ary_new2(RARRAY_EMBED_LEN_MAX);
 }
 
-#ifdef HAVE_STDARG_PROTOTYPES
-#include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
-
 VALUE
-#ifdef HAVE_STDARG_PROTOTYPES
-rb_ary_new3(long n, ...)
-#else
-rb_ary_new3(n, va_alist)
-    long n;
-    va_dcl
-#endif
+rb_ary_new_from_args(long n, ...)
 {
     va_list ar;
     VALUE ary;
@@ -168,84 +502,154 @@ rb_ary_new3(n, va_alist)
 
     ary = rb_ary_new2(n);
 
-    va_init_list(ar, n);
+    va_start(ar, n);
     for (i=0; i<n; i++) {
-	RARRAY(ary)->ptr[i] = va_arg(ar, VALUE);
+	RARRAY_ASET(ary, i, va_arg(ar, VALUE));
     }
     va_end(ar);
 
-    RARRAY(ary)->len = n;
+    ARY_SET_LEN(ary, n);
     return ary;
 }
 
 VALUE
-rb_ary_new4(n, elts)
-    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(ary)->ptr, elts, VALUE, n);
+	ary_memcpy(ary, 0, n, elts);
+	ARY_SET_LEN(ary, n);
     }
 
-    /* This assignment to len will be moved to the above "if" block in Ruby 1.9 */
-    RARRAY(ary)->len = n;
-
     return ary;
 }
 
-static VALUE
-ary_make_shared(ary)
-    VALUE ary;
+VALUE
+rb_ary_tmp_new(long capa)
+{
+    return ary_new(0, capa);
+}
+
+void
+rb_ary_free(VALUE ary)
+{
+    if (ARY_OWNS_HEAP_P(ary)) {
+	ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
+    }
+}
+
+RUBY_FUNC_EXPORTED size_t
+rb_ary_memsize(VALUE ary)
+{
+    if (ARY_OWNS_HEAP_P(ary)) {
+	return RARRAY(ary)->as.heap.aux.capa * sizeof(VALUE);
+    }
+    else {
+	return 0;
+    }
+}
+
+static inline void
+ary_discard(VALUE ary)
 {
-    if (!FL_TEST(ary, ELTS_SHARED)) {
-	NEWOBJ(shared, struct RArray);
-	OBJSETUP(shared, rb_cArray, T_ARRAY);
+    rb_ary_free(ary);
+    RBASIC(ary)->flags |= RARRAY_EMBED_FLAG;
+    RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK;
+}
 
-	shared->len = RARRAY(ary)->len;
-	shared->ptr = RARRAY(ary)->ptr;
-	shared->aux.capa = RARRAY(ary)->aux.capa;
-	RARRAY(ary)->aux.shared = (VALUE)shared;
-	FL_SET(ary, ELTS_SHARED);
+static VALUE
+ary_make_shared(VALUE ary)
+{
+    assert(!ARY_EMBED_P(ary));
+    if (ARY_SHARED_P(ary)) {
+	return ARY_SHARED(ary);
+    }
+    else if (ARY_SHARED_ROOT_P(ary)) {
+	return ary;
+    }
+    else if (OBJ_FROZEN(ary)) {
+	ary_shrink_capa(ary);
+	FL_SET_SHARED_ROOT(ary);
+	ARY_SET_SHARED_NUM(ary, 1);
+	return ary;
+    }
+    else {
+	long capa = ARY_CAPA(ary), len = RARRAY_LEN(ary);
+	NEWOBJ_OF(shared, struct RArray, 0, T_ARRAY); /* keep shared ary as shady */
+        FL_UNSET_EMBED(shared);
+
+	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);
+	ARY_SET_SHARED(ary, (VALUE)shared);
 	OBJ_FREEZE(shared);
 	return (VALUE)shared;
     }
+}
+
+static VALUE
+ary_make_substitution(VALUE 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 {
-	return RARRAY(ary)->aux.shared;
+        return rb_ary_increment_share(ary_make_shared(ary));
     }
 }
 
 VALUE
-rb_assoc_new(car, cdr)
-    VALUE car, cdr;
+rb_assoc_new(VALUE car, VALUE cdr)
 {
-    VALUE ary;
-
-    ary = rb_ary_new2(2);
-    RARRAY(ary)->ptr[0] = car;
-    RARRAY(ary)->ptr[1] = cdr;
-    RARRAY(ary)->len = 2;
-
-    return ary;
+    return rb_ary_new3(2, car, cdr);
 }
 
 static VALUE
-to_ary(ary)
-    VALUE ary;
+to_ary(VALUE ary)
 {
     return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
 }
 
 VALUE
-rb_check_array_type(ary)
-    VALUE ary;
+rb_check_array_type(VALUE ary)
 {
     return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
 }
 
-static VALUE rb_ary_replace _((VALUE, VALUE));
+/*
+ *  call-seq:
+ *     Array.try_convert(obj) -> array or nil
+ *
+ *  Tries to convert +obj+ into an array, using +to_ary+ method.  Returns the
+ *  converted array or +nil+ if +obj+ cannot be converted for any reason.
+ *  This method can be used to check if an argument is an array.
+ *
+ *     Array.try_convert([1])   #=> [1]
+ *     Array.try_convert("1")   #=> nil
+ *
+ *     if tmp = Array.try_convert(arg)
+ *       # the argument is an array
+ *     elsif tmp = String.try_convert(arg)
+ *       # the argument is a string
+ *     end
+ *
+ */
+
+static VALUE
+rb_ary_s_try_convert(VALUE dummy, VALUE ary)
+{
+    return rb_check_array_type(ary);
+}
 
 /*
  *  call-seq:
@@ -253,56 +657,76 @@ static VALUE rb_ary_replace _((VALUE, VALUE));
  *     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 +obj+ are sent, an array is created with
+ *  +size+ copies of +obj+.  Take notice that all elements will reference the
+ *  same object +obj+.
+ *
+ *  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
- * 
- *     # here multiple copies are created
+ *     a # => [{"cat"=>"Felix"}, {"cat"=>"Felix"}]
+ *
+ *  Since all the Array elements store the same hash, changes to one of them
+ *  will affect them all.
+ *
+ *  If multiple copies are what you want, you should use the block
+ *  version which uses the result of that block each time an element
+ *  of the array needs to be initialized:
+ *
  *     a = Array.new(2) { Hash.new }
  *     a[0]['cat'] = 'feline'
- *     a
- * 
- *     squares = Array.new(5) {|i| i*i}
- *     squares
- * 
- *     copy = Array.new(squares)
+ *     a # => [{"cat"=>"feline"}, {}]
+ *
  */
 
 static VALUE
-rb_ary_initialize(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
 {
     long len;
     VALUE size, val;
 
     rb_ary_modify(ary);
-    if (rb_scan_args(argc, argv, "02", &size, &val) == 0) {
-	RARRAY(ary)->len = 0;
+    if (argc == 0) {
+	if (ARY_OWNS_HEAP_P(ary) && RARRAY_CONST_PTR(ary) != 0) {
+	    ruby_sized_xfree((void *)RARRAY_CONST_PTR(ary), ARY_HEAP_SIZE(ary));
+	}
+        rb_ary_unshare_safe(ary);
+        FL_SET_EMBED(ary);
+	ARY_SET_EMBED_LEN(ary, 0);
 	if (rb_block_given_p()) {
 	    rb_warning("given block not used");
 	}
 	return ary;
     }
-
+    rb_scan_args(argc, argv, "02", &size, &val);
     if (argc == 1 && !FIXNUM_P(size)) {
 	val = rb_check_array_type(size);
 	if (!NIL_P(val)) {
@@ -318,10 +742,8 @@ rb_ary_initialize(argc, argv, ary)
     if (len > ARY_MAX_SIZE) {
 	rb_raise(rb_eArgError, "array size too big");
     }
-    if (len > RARRAY(ary)->aux.capa) {
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
-	RARRAY(ary)->aux.capa = len;
-    }
+    rb_ary_modify(ary);
+    ary_resize_capa(ary, len);
     if (rb_block_given_p()) {
 	long i;
 
@@ -330,54 +752,46 @@ rb_ary_initialize(argc, argv, ary)
 	}
 	for (i=0; i<len; i++) {
 	    rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
-	    RARRAY(ary)->len = i + 1;
+	    ARY_SET_LEN(ary, i + 1);
 	}
     }
     else {
-	memfill(RARRAY(ary)->ptr, len, val);
-	RARRAY(ary)->len = len;
+	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(argc, argv, klass)
-    int argc;
-    VALUE *argv;
-    VALUE klass;
+rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
 {
-    VALUE ary = ary_alloc(klass);
-
-    if (argc > 0) {
-	RARRAY(ary)->ptr = ALLOC_N(VALUE, argc);
-	MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
+    VALUE ary = ary_new(klass, argc);
+    if (argc > 0 && argv) {
+        ary_memcpy(ary, 0, argc, argv);
+        ARY_SET_LEN(ary, argc);
     }
-    RARRAY(ary)->len = RARRAY(ary)->aux.capa = argc;
 
     return ary;
 }
 
 void
-rb_ary_store(ary, idx, val)
-    VALUE ary;
-    long idx;
-    VALUE val;
+rb_ary_store(VALUE ary, long idx, VALUE val)
 {
+    long len = RARRAY_LEN(ary);
+
     if (idx < 0) {
-	idx += RARRAY(ary)->len;
+	idx += len;
 	if (idx < 0) {
-	    rb_raise(rb_eIndexError, "index %ld out of array",
-		    idx - RARRAY(ary)->len);
+	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
+		     idx - len, -len);
 	}
     }
     else if (idx >= ARY_MAX_SIZE) {
@@ -385,78 +799,86 @@ rb_ary_store(ary, idx, val)
     }
 
     rb_ary_modify(ary);
-    if (idx >= RARRAY(ary)->aux.capa) {
-	long new_capa = RARRAY(ary)->aux.capa / 2;
-
-	if (new_capa < ARY_DEFAULT_SIZE) {
-	    new_capa = ARY_DEFAULT_SIZE;
-	}
-	if (new_capa >= ARY_MAX_SIZE - idx) {
-	    new_capa = (ARY_MAX_SIZE - idx) / 2;
-	}
-	new_capa += idx;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, new_capa);
-	RARRAY(ary)->aux.capa = new_capa;
+    if (idx >= ARY_CAPA(ary)) {
+	ary_double_capa(ary, idx);
     }
-    if (idx > RARRAY(ary)->len) {
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len,
-		     idx-RARRAY(ary)->len + 1);
+    if (idx > len) {
+	ary_mem_clear(ary, len, idx - len + 1);
     }
 
-    if (idx >= RARRAY(ary)->len) {
-	RARRAY(ary)->len = idx + 1;
+    if (idx >= len) {
+	ARY_SET_LEN(ary, idx + 1);
     }
-    RARRAY(ary)->ptr[idx] = val;
+    RARRAY_ASET(ary, idx, val);
 }
 
 static VALUE
-ary_shared_array(klass, ary)
-    VALUE klass;
-    VALUE ary;
+ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
 {
-    VALUE val = ary_alloc(klass);
+    assert(offset >= 0);
+    assert(len >= 0);
+    assert(offset+len <= RARRAY_LEN(ary));
+
+    if (len <= RARRAY_EMBED_LEN_MAX) {
+        VALUE result = ary_alloc(klass);
+	ary_memcpy(result, 0, len, RARRAY_CONST_PTR(ary) + offset);
+        ARY_SET_EMBED_LEN(result, len);
+        return result;
+    }
+    else {
+        VALUE shared, result = ary_alloc(klass);
+        FL_UNSET_EMBED(result);
+
+        shared = ary_make_shared(ary);
+        ARY_SET_PTR(result, RARRAY_CONST_PTR(ary));
+        ARY_SET_LEN(result, RARRAY_LEN(ary));
+        rb_ary_set_shared(result, shared);
 
-    ary_make_shared(ary);
-    RARRAY(val)->ptr = RARRAY(ary)->ptr;
-    RARRAY(val)->len = RARRAY(ary)->len;
-    RARRAY(val)->aux.shared = RARRAY(ary)->aux.shared;
-    FL_SET(val, ELTS_SHARED);
-    return val;
+        ARY_INCREASE_PTR(result, offset);
+        ARY_SET_LEN(result, len);
+        return result;
+    }
 }
 
 static VALUE
-ary_shared_first(argc, argv, ary, last)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-    int last;
+ary_make_shared_copy(VALUE ary)
 {
-    VALUE nv, result;
+    return ary_make_partial(ary, rb_obj_class(ary), 0, RARRAY_LEN(ary));
+}
+
+enum ary_take_pos_flags
+{
+    ARY_TAKE_FIRST = 0,
+    ARY_TAKE_LAST = 1
+};
+
+static VALUE
+ary_take_first_or_last(int argc, 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(ary)->len) {
-	n = RARRAY(ary)->len;
+    len = RARRAY_LEN(ary);
+    if (n > len) {
+	n = len;
     }
     else if (n < 0) {
 	rb_raise(rb_eArgError, "negative array size");
     }
     if (last) {
-	offset = RARRAY(ary)->len - n;
+	offset = len - n;
     }
-    result = ary_shared_array(rb_cArray, ary);
-    RARRAY(result)->ptr += offset;
-    RARRAY(result)->len = n;
-
-    return result;
+    return ary_make_partial(ary, rb_cArray, offset, n);
 }
 
 /*
  *  call-seq:
- *     array << obj            -> array
- *  
+ *     ary << obj            -> ary
+ *
  *  Append---Pushes the given object on to the end of this array. This
  *  expression returns the array itself, so several appends
  *  may be chained together.
@@ -467,65 +889,92 @@ ary_shared_first(argc, argv, ary, last)
  */
 
 VALUE
-rb_ary_push(ary, item)
-    VALUE ary;
-    VALUE item;
+rb_ary_push(VALUE ary, VALUE item)
+{
+    long idx = RARRAY_LEN(ary);
+
+    ary_ensure_room_for_push(ary, 1);
+    RARRAY_ASET(ary, idx, item);
+    ARY_SET_LEN(ary, idx + 1);
+    return ary;
+}
+
+static VALUE
+rb_ary_push_1(VALUE ary, VALUE item)
 {
-    rb_ary_store(ary, RARRAY(ary)->len, item);
+    long idx = RARRAY_LEN(ary);
+
+    if (idx >= ARY_CAPA(ary)) {
+	ary_double_capa(ary, idx);
+    }
+    RARRAY_ASET(ary, idx, item);
+    ARY_SET_LEN(ary, idx + 1);
     return ary;
 }
 
-/* 
+VALUE
+rb_ary_cat(VALUE ary, const VALUE *ptr, long len)
+{
+    long oldlen = RARRAY_LEN(ary);
+
+    ary_ensure_room_for_push(ary, len);
+    ary_memcpy(ary, oldlen, len, ptr);
+    ARY_SET_LEN(ary, oldlen + len);
+    return ary;
+}
+
+/*
  *  call-seq:
- *     array.push(obj, ... )   -> array
- *  
- *  Append---Pushes the given object(s) on to the end of this array. This
+ *     ary.push(obj, ... )   -> ary
+ *
+ *  Append --- Pushes the given object(s) on to the end of this array. This
  *  expression returns the array itself, so several appends
- *  may be chained together.
+ *  may be chained together. See also Array#pop for the opposite
+ *  effect.
  *
  *     a = [ "a", "b", "c" ]
- *     a.push("d", "e", "f")  
+ *     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(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
 {
-    while (argc--) {
-	rb_ary_push(ary, *argv++);
-    }
-    return ary;
+    return rb_ary_cat(ary, argv, argc);
 }
 
 VALUE
-rb_ary_pop(ary)
-    VALUE ary;
+rb_ary_pop(VALUE ary)
 {
+    long n;
     rb_ary_modify_check(ary);
-    if (RARRAY(ary)->len == 0) return Qnil;
-    if (!FL_TEST(ary, ELTS_SHARED) &&
-	    RARRAY(ary)->len * 3 < RARRAY(ary)->aux.capa &&
-	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
-	RARRAY(ary)->aux.capa = RARRAY(ary)->len * 2;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
+    n = RARRAY_LEN(ary);
+    if (n == 0) return Qnil;
+    if (ARY_OWNS_HEAP_P(ary) &&
+	n * 3 < ARY_CAPA(ary) &&
+	ARY_CAPA(ary) > ARY_DEFAULT_SIZE)
+    {
+	ary_resize_capa(ary, n * 2);
     }
-    return RARRAY(ary)->ptr[--RARRAY(ary)->len];
+    --n;
+    ARY_SET_LEN(ary, n);
+    return RARRAY_AREF(ary, n);
 }
 
 /*
  *  call-seq:
- *     array.pop    -> obj or nil
- *     array.pop(n) -> array
- *  
- *  Removes the last element from <i>self</i> and returns it, or
- *  <code>nil</code> if the array is empty.
+ *     ary.pop    -> obj or nil
+ *     ary.pop(n) -> new_ary
+ *
+ *  Removes the last element from +self+ and returns it, or
+ *  +nil+ if the array is empty.
+ *
+ *  If a number +n+ is given, returns an array of the last +n+ elements
+ *  (or less) just like <code>array.slice!(-n, n)</code> does. See also
+ *  Array#push for the opposite effect.
  *
- *  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.
- *     
  *     a = [ "a", "b", "c", "d" ]
  *     a.pop     #=> "d"
  *     a.pop(2)  #=> ["b", "c"]
@@ -533,10 +982,7 @@ rb_ary_pop(ary)
  */
 
 static VALUE
-rb_ary_pop_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
 {
     VALUE result;
 
@@ -545,47 +991,56 @@ rb_ary_pop_m(argc, argv, ary)
     }
 
     rb_ary_modify_check(ary);
-    result = ary_shared_first(argc, argv, ary, Qtrue);
-    RARRAY(ary)->len -= RARRAY(result)->len;
+    result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
+    ARY_INCREASE_LEN(ary, -RARRAY_LEN(result));
     return result;
 }
 
 VALUE
-rb_ary_shift(ary)
-    VALUE ary;
+rb_ary_shift(VALUE ary)
 {
     VALUE top;
+    long len = RARRAY_LEN(ary);
 
     rb_ary_modify_check(ary);
-    if (RARRAY(ary)->len == 0) return Qnil;
-    top = RARRAY(ary)->ptr[0];
-    if (!FL_TEST(ary, ELTS_SHARED)) {
-        if (RARRAY(ary)->len < ARY_DEFAULT_SIZE) {
-            MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+1, VALUE, RARRAY(ary)->len-1);
-	    RARRAY(ary)->len--;
-            return top;
-        }
-        RARRAY(ary)->ptr[0] = Qnil;
+    if (len == 0) return Qnil;
+    top = RARRAY_AREF(ary, 0);
+    if (!ARY_SHARED_P(ary)) {
+	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_ASET(ary, 0, Qnil);
 	ary_make_shared(ary);
     }
-    RARRAY(ary)->ptr++;		/* shift ptr */
-    RARRAY(ary)->len--;
+    else if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
+	RARRAY_ASET(ary, 0, Qnil);
+    }
+    ARY_INCREASE_PTR(ary, 1);		/* shift ptr */
+    ARY_INCREASE_LEN(ary, -1);
 
     return top;
 }
 
 /*
  *  call-seq:
- *     array.shift    -> obj or nil
- *     array.shift(n) -> array
- *  
- *  Returns the first element of <i>self</i> and removes it (shifting all
- *  other elements down by one). Returns <code>nil</code> if the array
+ *     ary.shift    -> obj or nil
+ *     ary.shift(n) -> new_ary
+ *
+ *  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"
  *     args           #=> ["-q", "filename"]
@@ -596,10 +1051,7 @@ rb_ary_shift(ary)
  */
 
 static VALUE
-rb_ary_shift_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
 {
     VALUE result;
     long n;
@@ -609,145 +1061,167 @@ rb_ary_shift_m(argc, argv, ary)
     }
 
     rb_ary_modify_check(ary);
-    result = ary_shared_first(argc, argv, ary, Qfalse);
-    n = RARRAY(result)->len;
-    if (FL_TEST(ary, ELTS_SHARED)) {
-	RARRAY(ary)->ptr += n;
-	RARRAY(ary)->len -= n;
+    result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
+    n = RARRAY_LEN(result);
+    if (ARY_SHARED_P(ary)) {
+	if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
+	    ary_mem_clear(ary, 0, n);
 	}
+        ARY_INCREASE_PTR(ary, n);
+    }
     else {
-	MEMMOVE(RARRAY(ary)->ptr, RARRAY(ary)->ptr+n, VALUE, RARRAY(ary)->len-n);
-	RARRAY(ary)->len -= n;
+	RARRAY_PTR_USE(ary, ptr, {
+	    MEMMOVE(ptr, ptr + n, VALUE, RARRAY_LEN(ary)-n);
+	}); /* WB: no new reference */
     }
+    ARY_INCREASE_LEN(ary, -n);
 
     return result;
 }
 
-VALUE
-rb_ary_unshift(ary, item)
-    VALUE ary, item;
-{
-    rb_ary_modify(ary);
-    if (RARRAY(ary)->len == RARRAY(ary)->aux.capa) {
-	long capa_inc = RARRAY(ary)->aux.capa / 2;
-	if (capa_inc < ARY_DEFAULT_SIZE) {
-	    capa_inc = ARY_DEFAULT_SIZE;
+static void
+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 (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;
 	}
-	RARRAY(ary)->aux.capa += capa_inc;
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->aux.capa);
     }
 
-    /* sliding items */
-    MEMMOVE(RARRAY(ary)->ptr + 1, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    rb_ary_modify(ary);
+    capa = ARY_CAPA(ary);
+    if (capa - (capa >> 6) <= new_len) {
+	ary_double_capa(ary, new_len);
+    }
 
-    RARRAY(ary)->len++;
-    RARRAY(ary)->ptr[0] = item;
+    /* 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);
 
-    return 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);
+    }
+    else {
+	/* sliding items */
+	RARRAY_PTR_USE(ary, ptr, {
+	    MEMMOVE(ptr + argc, ptr, VALUE, len);
+	});
+    }
 }
 
 /*
  *  call-seq:
- *     array.unshift(obj, ...)  -> array
- *  
- *  Prepends objects to the front of <i>array</i>.
- *  other elements up one.
- *     
+ *     ary.unshift(obj, ...)  -> ary
+ *
+ *  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"]
  *     a.unshift(1, 2)  #=> [ 1, 2, "a", "b", "c", "d"]
  */
 
 static VALUE
-rb_ary_unshift_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
 {
-    long len = RARRAY(ary)->len;
-
-    if (argc == 0) return ary;
+    long len = RARRAY_LEN(ary);
 
-    /* make rooms by setting the last item */
-    rb_ary_store(ary, len + argc - 1, Qnil);
+    if (argc == 0) {
+	rb_ary_modify_check(ary);
+	return ary;
+    }
 
-    /* sliding items */
-    MEMMOVE(RARRAY(ary)->ptr + argc, RARRAY(ary)->ptr, VALUE, len);
-    MEMCPY(RARRAY(ary)->ptr, argv, VALUE, argc);
-    
+    ary_ensure_room_for_unshift(ary, argc);
+    ary_memcpy(ary, 0, argc, argv);
+    ARY_SET_LEN(ary, len + argc);
     return ary;
 }
 
+VALUE
+rb_ary_unshift(VALUE ary, VALUE item)
+{
+    return rb_ary_unshift_m(1,&item,ary);
+}
+
 /* faster version - use this if you don't need to treat negative offset */
 static inline VALUE
-rb_ary_elt(ary, offset)
-    VALUE ary;
-    long offset;
+rb_ary_elt(VALUE ary, long offset)
 {
-    if (RARRAY(ary)->len == 0) return Qnil;
-    if (offset < 0 || RARRAY(ary)->len <= offset) {
+    long len = RARRAY_LEN(ary);
+    if (len == 0) return Qnil;
+    if (offset < 0 || len <= offset) {
 	return Qnil;
     }
-    return RARRAY(ary)->ptr[offset];
+    return RARRAY_AREF(ary, offset);
 }
 
 VALUE
-rb_ary_entry(ary, offset)
-    VALUE ary;
-    long offset;
+rb_ary_entry(VALUE ary, long offset)
 {
     if (offset < 0) {
-	offset += RARRAY(ary)->len;
+	offset += RARRAY_LEN(ary);
     }
     return rb_ary_elt(ary, offset);
 }
 
-static VALUE
-rb_ary_subseq(ary, beg, len)
-    VALUE ary;
-    long beg, len;
+VALUE
+rb_ary_subseq(VALUE ary, long beg, long len)
 {
-    VALUE klass, ary2, shared;
-    VALUE *ptr;
+    VALUE klass;
+    long alen = RARRAY_LEN(ary);
 
-    if (beg > RARRAY(ary)->len) return Qnil;
+    if (beg > alen) return Qnil;
     if (beg < 0 || len < 0) return Qnil;
 
-    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
-	len = RARRAY(ary)->len - beg;
-	if (len < 0)
-	    len = 0;
+    if (alen < len || alen < beg + len) {
+	len = alen - beg;
     }
     klass = rb_obj_class(ary);
     if (len == 0) return ary_new(klass, 0);
 
-    shared = ary_make_shared(ary);
-    ptr = RARRAY(ary)->ptr;
-    ary2 = ary_alloc(klass);
-    RARRAY(ary2)->ptr = ptr + beg;
-    RARRAY(ary2)->len = len;
-    RARRAY(ary2)->aux.shared = shared;
-    FL_SET(ary2, ELTS_SHARED);
-
-    return ary2;
+    return ary_make_partial(ary, klass, beg, len);
 }
 
-/* 
+/*
  *  call-seq:
- *     array[index]                -> obj      or nil
- *     array[start, length]        -> an_array or nil
- *     array[range]                -> an_array or nil
- *     array.slice(index)          -> obj      or nil
- *     array.slice(start, length)  -> an_array or nil
- *     array.slice(range)          -> an_array or nil
+ *     ary[index]                -> obj     or nil
+ *     ary[start, length]        -> new_ary or nil
+ *     ary[range]                -> new_ary or nil
+ *     ary.slice(index)          -> obj     or nil
+ *     ary.slice(start, length)  -> new_ary or nil
+ *     ary.slice(range)          -> new_ary or nil
+ *
+ *  Element Reference --- Returns the element at +index+, or returns a
+ *  subarray starting at the +start+ index and continuing for +length+
+ *  elements, or returns a subarray specified by +range+ of indices.
  *
- *  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.
+ *  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"
@@ -759,44 +1233,36 @@ rb_ary_subseq(ary, beg, 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(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_aref(int argc, VALUE *argv, VALUE ary)
 {
     VALUE arg;
     long beg, len;
 
     if (argc == 2) {
-	if (SYMBOL_P(argv[0])) {
-	    rb_raise(rb_eTypeError, "Symbol as array index");
-	}
 	beg = NUM2LONG(argv[0]);
 	len = NUM2LONG(argv[1]);
 	if (beg < 0) {
-	    beg += RARRAY(ary)->len;
+	    beg += RARRAY_LEN(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 */
     if (FIXNUM_P(arg)) {
 	return rb_ary_entry(ary, FIX2LONG(arg));
     }
-    if (SYMBOL_P(arg)) {
-	rb_raise(rb_eTypeError, "Symbol as array index");
-    }
     /* check if idx is Range */
-    switch (rb_range_beg_len(arg, &beg, &len, RARRAY(ary)->len, 0)) {
+    switch (rb_range_beg_len(arg, &beg, &len, RARRAY_LEN(ary), 0)) {
       case Qfalse:
 	break;
       case Qnil:
@@ -807,15 +1273,13 @@ rb_ary_aref(argc, argv, ary)
     return rb_ary_entry(ary, NUM2LONG(arg));
 }
 
-/* 
+/*
  *  call-seq:
- *     array.at(index)   ->   obj  or nil
+ *     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>.
- *  (<code>Array#at</code> is slightly faster than <code>Array#[]</code>,
- *  as it does not accept ranges and so on.)
+ *  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"
@@ -823,93 +1287,91 @@ rb_ary_aref(argc, argv, ary)
  */
 
 static VALUE
-rb_ary_at(ary, pos)
-    VALUE ary, pos;
+rb_ary_at(VALUE ary, VALUE pos)
 {
     return rb_ary_entry(ary, NUM2LONG(pos));
 }
 
 /*
  *  call-seq:
- *     array.first   ->   obj or nil
- *     array.first(n) -> an_array
+ *     ary.first     ->   obj or nil
+ *     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"
- *     a.first(1) #=> ["q"]
- *     a.first(3) #=> ["q", "r", "s"]
+ *     a.first     #=> "q"
+ *     a.first(2)  #=> ["q", "r"]
  */
 
 static VALUE
-rb_ary_first(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_first(int argc, VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
-	if (RARRAY(ary)->len == 0) return Qnil;
-	return RARRAY(ary)->ptr[0];
+	if (RARRAY_LEN(ary) == 0) return Qnil;
+	return RARRAY_AREF(ary, 0);
     }
     else {
-	return ary_shared_first(argc, argv, ary, Qfalse);
+	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
     }
 }
 
 /*
  *  call-seq:
- *     array.last     ->  obj or nil
- *     array.last(n)  ->  an_array
- *  
- *  Returns the last element(s) of <i>self</i>. If the array is empty,
- *  the first form returns <code>nil</code>.
- *     
- *     [ "w", "x", "y", "z" ].last   #=> "z"
+ *     ary.last     ->  obj or nil
+ *     ary.last(n)  ->  new_ary
+ *
+ *  Returns the last element(s) of +self+. If the array is empty,
+ *  the first form returns +nil+.
+ *
+ *  See also Array#first for the opposite effect.
+ *
+ *     a = [ "w", "x", "y", "z" ]
+ *     a.last     #=> "z"
+ *     a.last(2)  #=> ["y", "z"]
  */
 
-static VALUE
-rb_ary_last(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+VALUE
+rb_ary_last(int argc, VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
-	if (RARRAY(ary)->len == 0) return Qnil;
-	return RARRAY(ary)->ptr[RARRAY(ary)->len-1];
+	long len = RARRAY_LEN(ary);
+	if (len == 0) return Qnil;
+	return RARRAY_AREF(ary, len-1);
     }
     else {
-	return ary_shared_first(argc, argv, ary, Qtrue);
+	return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
     }
 }
 
 /*
  *  call-seq:
- *     array.fetch(index)                    -> obj
- *     array.fetch(index, default )          -> obj
- *     array.fetch(index) {|index| block }   -> obj
- *  
- *  Tries to return the element at position <i>index</i>. If the index
- *  lies outside the array, the first form throws an
- *  <code>IndexError</code> exception, the second form returns
- *  <i>default</i>, and the third form returns the value of invoking
- *  the block, passing in the index. Negative values of <i>index</i>
- *  count from the end of the array.
- *     
+ *     ary.fetch(index)                    -> obj
+ *     ary.fetch(index, default)           -> obj
+ *     ary.fetch(index) { |index| block }  -> obj
+ *
+ *  Tries to return the element at position +index+, but throws an IndexError
+ *  exception if the referenced +index+ lies outside of the array bounds.  This
+ *  error can be prevented by supplying a second argument, which will act as a
+ *  +default+ value.
+ *
+ *  Alternatively, if a block is given it will only be executed when an
+ *  invalid +index+ is referenced.  Negative values of +index+ count from the
+ *  end of the array.
+ *
  *     a = [ 11, 22, 33, 44 ]
  *     a.fetch(1)               #=> 22
  *     a.fetch(-1)              #=> 44
  *     a.fetch(4, 'cat')        #=> "cat"
- *     a.fetch(4) { |i| i*i }   #=> 16
+ *     a.fetch(100) { |i| puts "#{i} is out of bounds" }
+ *                              #=> "100 is out of bounds"
  */
 
 static VALUE
-rb_ary_fetch(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
 {
     VALUE pos, ifnone;
     long block_given;
@@ -923,233 +1385,300 @@ rb_ary_fetch(argc, argv, ary)
     idx = NUM2LONG(pos);
 
     if (idx < 0) {
-	idx +=  RARRAY(ary)->len;
+	idx +=  RARRAY_LEN(ary);
     }
-    if (idx < 0 || RARRAY(ary)->len <= idx) {
+    if (idx < 0 || RARRAY_LEN(ary) <= idx) {
 	if (block_given) return rb_yield(pos);
 	if (argc == 1) {
-	    rb_raise(rb_eIndexError, "index %ld out of array", idx);
+	    rb_raise(rb_eIndexError, "index %ld outside of array bounds: %ld...%ld",
+			idx - (idx < 0 ? RARRAY_LEN(ary) : 0), -RARRAY_LEN(ary), RARRAY_LEN(ary));
 	}
 	return ifnone;
     }
-    return RARRAY(ary)->ptr[idx];
+    return RARRAY_AREF(ary, idx);
 }
 
 /*
  *  call-seq:
- *     array.index(obj)           ->  int or nil
- *     array.index {|item| block} ->  int or nil
- *  
- *  Returns the index of the first object in <i>self</i> such that is
- *  <code>==</code> to <i>obj</i>. If a block is given instead of an
- *  argument, returns first object for which <em>block</em> is true.
- *  Returns <code>nil</code> if no match is found.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.index("b")        #=> 1
- *     a.index("z")        #=> nil
- *     a.index{|x|x=="b"}  #=> 1
+ *     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 +ary+ such that the object is
+ *  <code>==</code> to +obj+.
+ *
+ *  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.
+ *
+ *  See also Array#rindex.
  *
- *  This is an alias of <code>#find_index</code>.
+ *  An Enumerator is returned if neither a block nor argument is given.
+ *
+ *     a = [ "a", "b", "c" ]
+ *     a.index("b")              #=> 1
+ *     a.index("z")              #=> nil
+ *     a.index { |x| x == "b" }  #=> 1
  */
 
 static VALUE
-rb_ary_index(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_index(int argc, VALUE *argv, VALUE ary)
 {
+    const VALUE *ptr;
     VALUE val;
-    long i;
+    long i, len;
 
-    if (argc  == 0) {
+    if (argc == 0) {
 	RETURN_ENUMERATOR(ary, 0, 0);
-	for (i=0; i<RARRAY(ary)->len; i++) {
-	    if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
+	for (i=0; i<RARRAY_LEN(ary); i++) {
+	    if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) {
 		return LONG2NUM(i);
 	    }
 	}
 	return Qnil;
     }
-    rb_scan_args(argc, argv, "01", &val);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	if (rb_equal(RARRAY(ary)->ptr[i], val))
+    rb_check_arity(argc, 0, 1);
+    val = argv[0];
+    if (rb_block_given_p())
+	rb_warn("given block not used");
+    len = RARRAY_LEN(ary);
+    ptr = RARRAY_CONST_PTR(ary);
+    for (i=0; i<len; i++) {
+	VALUE e = ptr[i];
+	switch (rb_equal_opt(e, val)) {
+	  case Qundef:
+	    if (!rb_equal(e, val)) break;
+	  case Qtrue:
 	    return LONG2NUM(i);
+	  case Qfalse:
+	    continue;
+	}
+	len = RARRAY_LEN(ary);
+	ptr = RARRAY_CONST_PTR(ary);
     }
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     array.rindex(obj)    ->  int or nil
- *  
- *  Returns the index of the last object in <i>array</i>
- *  <code>==</code> to <i>obj</i>. If a block is given instead of an
- *  argument, returns first object for which <em>block</em> is
- *  true. Returns <code>nil</code> if no match is found.
- *     
+ *     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 +obj+.
+ *
+ *  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(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
 {
+    const VALUE *ptr;
     VALUE val;
-    long i = RARRAY(ary)->len;
+    long i = RARRAY_LEN(ary), len;
 
     if (argc == 0) {
 	RETURN_ENUMERATOR(ary, 0, 0);
 	while (i--) {
-	    if (RTEST(rb_yield(RARRAY(ary)->ptr[i])))
+	    if (RTEST(rb_yield(RARRAY_AREF(ary, i))))
 		return LONG2NUM(i);
-	    if (i > RARRAY(ary)->len) {
-		i = RARRAY(ary)->len;
+	    if (i > (len = RARRAY_LEN(ary))) {
+		i = len;
 	    }
 	}
 	return Qnil;
     }
-    rb_scan_args(argc, argv, "01", &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(ary)->ptr[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(ary)->len) {
-	    i = RARRAY(ary)->len;
+	  case Qfalse:
+	    continue;
 	}
+	if (i > (len = RARRAY_LEN(ary))) {
+	    i = len;
+	}
+	ptr = RARRAY_CONST_PTR(ary);
     }
     return Qnil;
 }
 
-/*
- *  call-seq:
- *     array.indexes( i1, i2, ... iN )   -> an_array
- *     array.indices( i1, i2, ... iN )   -> an_array
- *  
- *  Deprecated; use <code>Array#values_at</code>.
- */
-
-static VALUE
-rb_ary_indexes(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
-{
-    VALUE new_ary;
-    long i;
-
-    rb_warn("Array#%s is deprecated; use Array#values_at", rb_id2name(rb_frame_last_func()));
-    new_ary = rb_ary_new2(argc);
-    for (i=0; i<argc; i++) {
-	rb_ary_push(new_ary, rb_ary_aref(1, argv+i, ary));
-    }
-
-    return new_ary;
-}
-
 VALUE
-rb_ary_to_ary(obj)
-    VALUE obj;
+rb_ary_to_ary(VALUE obj)
 {
-    if (TYPE(obj) == T_ARRAY) {
-	return obj;
-    }
-    if (rb_respond_to(obj, rb_intern("to_ary"))) {
-	return rb_convert_type(obj, T_ARRAY, "Array", "to_ary");
-    }
+    VALUE tmp = rb_check_array_type(obj);
+
+    if (!NIL_P(tmp)) return tmp;
     return rb_ary_new3(1, obj);
 }
 
 static void
-rb_ary_splice(ary, beg, len, rpl)
-    VALUE ary;
-    long beg, len;
-    VALUE rpl;
+rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
 {
     long rlen;
+    long olen;
 
     if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
+    olen = RARRAY_LEN(ary);
     if (beg < 0) {
-	beg += RARRAY(ary)->len;
+	beg += olen;
 	if (beg < 0) {
-	    beg -= RARRAY(ary)->len;
-	    rb_raise(rb_eIndexError, "index %ld out of array", beg);
+	    rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld",
+		     beg - olen, -olen);
 	}
     }
-    if (RARRAY(ary)->len < len || RARRAY(ary)->len < beg + len) {
-	len = RARRAY(ary)->len - beg;
+    if (olen < len || olen < beg + len) {
+	len = olen - beg;
     }
 
-    if (NIL_P(rpl)) {
+    if (rpl == Qundef) {
 	rlen = 0;
     }
     else {
 	rpl = rb_ary_to_ary(rpl);
-	rlen = RARRAY(rpl)->len;
+	rlen = RARRAY_LEN(rpl);
+	olen = RARRAY_LEN(ary);	/* ary may be resized in rpl.to_ary too */
     }
-    rb_ary_modify(ary);
-
-    if (beg >= RARRAY(ary)->len) {
+    if (beg >= olen) {
 	if (beg > ARY_MAX_SIZE - rlen) {
 	    rb_raise(rb_eIndexError, "index %ld too big", beg);
 	}
+	ary_ensure_room_for_push(ary, rlen-len); /* len is 0 or negative */
 	len = beg + rlen;
-	if (len >= RARRAY(ary)->aux.capa) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, len);
-	    RARRAY(ary)->aux.capa = len;
-	}
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, beg - RARRAY(ary)->len);
+	ary_mem_clear(ary, olen, beg - olen);
 	if (rlen > 0) {
-	    MEMCPY(RARRAY(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
+	    ary_memcpy(ary, beg, rlen, RARRAY_CONST_PTR(rpl));
 	}
-	RARRAY(ary)->len = len;
+	ARY_SET_LEN(ary, len);
     }
     else {
 	long alen;
 
-	if (beg + len > RARRAY(ary)->len) {
-	    len = RARRAY(ary)->len - beg;
-	}
-
-	alen = RARRAY(ary)->len + rlen - len;
-	if (alen >= RARRAY(ary)->aux.capa) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, alen);
-	    RARRAY(ary)->aux.capa = alen;
+	rb_ary_modify(ary);
+	alen = olen + rlen - len;
+	if (alen >= ARY_CAPA(ary)) {
+	    ary_double_capa(ary, alen);
 	}
 
 	if (len != rlen) {
-	    MEMMOVE(RARRAY(ary)->ptr + beg + rlen, RARRAY(ary)->ptr + beg + len,
-		    VALUE, RARRAY(ary)->len - (beg + len));
-	    RARRAY(ary)->len = alen;
+	    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(ary)->ptr + beg, RARRAY(rpl)->ptr, VALUE, rlen);
+	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_CONST_PTR(rpl), 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.
+ * \param ary  an array
+ * \param len  new size
+ * \return     \a ary
+ * \post       the size of \a ary is \a len.
+ */
+VALUE
+rb_ary_resize(VALUE ary, long len)
+{
+    long olen;
+
+    rb_ary_modify(ary);
+    olen = RARRAY_LEN(ary);
+    if (len == olen) return ary;
+    if (len > ARY_MAX_SIZE) {
+	rb_raise(rb_eIndexError, "index %ld too big", len);
+    }
+    if (len > olen) {
+	if (len >= ARY_CAPA(ary)) {
+	    ary_double_capa(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);
+    }
+    else if (len <= RARRAY_EMBED_LEN_MAX) {
+	VALUE tmp[RARRAY_EMBED_LEN_MAX];
+	MEMCPY(tmp, ARY_HEAP_PTR(ary), VALUE, len);
+	ary_discard(ary);
+	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) {
+	    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);
     }
+    return ary;
 }
 
-/* 
+/*
  *  call-seq:
- *     array[index]         = obj                     ->  obj
- *     array[start, length] = obj or an_array or nil  ->  obj or an_array or nil
- *     array[range]         = obj or an_array or nil  ->  obj or an_array or nil
+ *     ary[index]         = obj                      ->  obj
+ *     ary[start, length] = obj or other_ary or nil  ->  obj or other_ary or nil
+ *     ary[range]         = obj or other_ary or nil  ->  obj or other_ary or nil
+ *
+ *  Element Assignment --- Sets the element at +index+, or replaces a subarray
+ *  from the +start+ index for +length+ elements, or replaces a subarray
+ *  specified by the +range+ of indices.
+ *
+ *  If indices are greater than the current capacity of the array, the array
+ *  grows automatically.  Elements are inserted into the array at +start+ if
+ *  +length+ is zero.
+ *
+ *  Negative indices will count backward from the end of the array.  For
+ *  +start+ and +range+ cases the starting index is just before an element.
+ *
+ *  An IndexError is raised if a negative index points past the beginning of
+ *  the array.
+ *
+ *  See also Array#push, and Array#unshift.
  *
- *  Element Assignment---Sets the element at _index_,
- *  or replaces a subarray starting at _start_ and
- *  continuing for _length_ elements, or replaces a subarray
- *  specified by _range_.  If indices are greater than
- *  the current capacity of the array, the array grows
- *  automatically. A negative indices will count backward
- *  from the end of the array. Inserts elements if _length_ is
- *  zero. If +nil+ is used in the second and third form,
- *  deletes elements from _self_. An +IndexError+ is raised if a
- *  negative index points past the beginning of the array. See also
- *  <code>Array#push</code>, and <code>Array#unshift</code>.
- * 
  *     a = Array.new
  *     a[4] = "4";                 #=> [nil, nil, nil, nil, "4"]
  *     a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", nil, "4"]
@@ -1157,38 +1686,31 @@ rb_ary_splice(ary, beg, len, rpl)
  *     a[0, 2] = "?"               #=> ["?", 2, nil, "4"]
  *     a[0..2] = "A"               #=> ["A", "4"]
  *     a[-1]   = "Z"               #=> ["A", "Z"]
- *     a[1..-1] = nil              #=> ["A"]
+ *     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(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_aset(int argc, VALUE *argv, VALUE ary)
 {
     long offset, beg, len;
 
     if (argc == 3) {
-	if (SYMBOL_P(argv[0])) {
-	    rb_raise(rb_eTypeError, "Symbol as array index");
-	}
-	if (SYMBOL_P(argv[1])) {
-	    rb_raise(rb_eTypeError, "Symbol as subarray length");
-	}
-	rb_ary_splice(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
+	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);
-    }
+    rb_check_arity(argc, 2, 2);
+    rb_ary_modify_check(ary);
     if (FIXNUM_P(argv[0])) {
 	offset = FIX2LONG(argv[0]);
 	goto fixnum;
     }
-    if (SYMBOL_P(argv[0])) {
-	rb_raise(rb_eTypeError, "Symbol as array index");
-    }
-    if (rb_range_beg_len(argv[0], &beg, &len, RARRAY(ary)->len, 1)) {
+    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];
@@ -1202,31 +1724,29 @@ fixnum:
 
 /*
  *  call-seq:
- *     array.insert(index, obj...)  -> array
- *  
- *  Inserts the given values before the element with the given index
- *  (which may be negative).
- *     
+ *     ary.insert(index, obj...)  -> ary
+ *
+ *  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.
+ *
  *     a = %w{ a b c d }
  *     a.insert(2, 99)         #=> ["a", "b", 99, "c", "d"]
  *     a.insert(-2, 1, 2, 3)   #=> ["a", "b", 99, "c", 1, 2, 3, "d"]
  */
 
 static VALUE
-rb_ary_insert(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_insert(int argc, VALUE *argv, VALUE ary)
 {
     long pos;
 
+    rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
+    rb_ary_modify_check(ary);
     if (argc == 1) return ary;
-    if (argc < 1) {
-	rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
-    }
     pos = NUM2LONG(argv[0]);
     if (pos == -1) {
-	pos = RARRAY(ary)->len;
+	pos = RARRAY_LEN(ary);
     }
     if (pos < 0) {
 	pos++;
@@ -1235,57 +1755,71 @@ rb_ary_insert(argc, argv, ary)
     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:
- *     array.each {|item| block }   ->   array
- *  
- *  Calls <i>block</i> once for each element in <i>self</i>, passing that
- *  element as a parameter.
- *     
+ *     ary.each { |item| block }  -> ary
+ *     ary.each                   -> Enumerator
+ *
+ *  Calls the given block once for each element in +self+, passing that element
+ *  as a parameter.
+ *
+ *  An Enumerator is returned if no block is given.
+ *
  *     a = [ "a", "b", "c" ]
  *     a.each {|x| print x, " -- " }
- *     
+ *
  *  produces:
- *     
+ *
  *     a -- b -- c --
  */
 
 VALUE
-rb_ary_each(ary)
-    VALUE ary;
+rb_ary_each(VALUE array)
 {
     long i;
+    volatile VALUE ary = array;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	rb_yield(RARRAY(ary)->ptr[i]);
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	rb_yield(RARRAY_AREF(ary, i));
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.each_index {|index| block }  ->  array
- *  
- *  Same as <code>Array#each</code>, but passes the index of the element
- *  instead of the element itself.
- *     
+ *     ary.each_index { |index| block }  -> ary
+ *     ary.each_index                    -> Enumerator
+ *
+ *  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, " -- " }
- *     
+ *
  *  produces:
- *     
+ *
  *     0 -- 1 -- 2 --
  */
 
 static VALUE
-rb_ary_each_index(ary)
-    VALUE ary;
+rb_ary_each_index(VALUE ary)
 {
     long i;
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
 
-    RETURN_ENUMERATOR(ary, 0, 0);
-    for (i=0; i<RARRAY(ary)->len; i++) {
+    for (i=0; i<RARRAY_LEN(ary); i++) {
 	rb_yield(LONG2NUM(i));
     }
     return ary;
@@ -1293,31 +1827,32 @@ rb_ary_each_index(ary)
 
 /*
  *  call-seq:
- *     array.reverse_each {|item| block } 
- *  
- *  Same as <code>Array#each</code>, but traverses <i>self</i> in reverse
- *  order.
- *     
+ *     ary.reverse_each { |item| block }  -> ary
+ *     ary.reverse_each                   -> Enumerator
+ *
+ *  Same as Array#each, but traverses +self+ in reverse order.
+ *
  *     a = [ "a", "b", "c" ]
  *     a.reverse_each {|x| print x, " " }
- *     
+ *
  *  produces:
- *     
+ *
  *     c b a
  */
 
 static VALUE
-rb_ary_reverse_each(ary)
-    VALUE ary;
+rb_ary_reverse_each(VALUE ary)
 {
     long len;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
-    len = RARRAY(ary)->len;
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
+    len = RARRAY_LEN(ary);
     while (len--) {
-	rb_yield(RARRAY(ary)->ptr[len]);
-	if (RARRAY(ary)->len < len) {
-	    len = RARRAY(ary)->len;
+	long nlen;
+	rb_yield(RARRAY_AREF(ary, len));
+	nlen = RARRAY_LEN(ary);
+	if (nlen < len) {
+	    len = nlen;
 	}
     }
     return ary;
@@ -1325,483 +1860,654 @@ rb_ary_reverse_each(ary)
 
 /*
  *  call-seq:
- *     array.length -> int
- *  
- *  Returns the number of elements in <i>self</i>. May be zero.
- *     
+ *     ary.length -> int
+ *
+ *  Returns the number of elements in +self+. May be zero.
+ *
  *     [ 1, 2, 3, 4, 5 ].length   #=> 5
+ *     [].length                  #=> 0
  */
 
 static VALUE
-rb_ary_length(ary)
-    VALUE ary;
+rb_ary_length(VALUE ary)
 {
-    return LONG2NUM(RARRAY(ary)->len);
+    long len = RARRAY_LEN(ary);
+    return LONG2NUM(len);
 }
 
 /*
  *  call-seq:
- *     array.empty?   -> true or false
- *  
- *  Returns <code>true</code> if <i>self</i> array contains no elements.
- *     
+ *     ary.empty?   -> true or false
+ *
+ *  Returns +true+ if +self+ contains no elements.
+ *
  *     [].empty?   #=> true
  */
 
 static VALUE
-rb_ary_empty_p(ary)
-    VALUE ary;
+rb_ary_empty_p(VALUE ary)
 {
-    if (RARRAY(ary)->len == 0)
+    if (RARRAY_LEN(ary) == 0)
 	return Qtrue;
     return Qfalse;
 }
 
 VALUE
-rb_ary_dup(ary)
-    VALUE ary;
+rb_ary_dup(VALUE ary)
 {
-    VALUE dup = rb_ary_new2(RARRAY(ary)->len);
-
-    DUPSETUP(dup, ary);
-    MEMCPY(RARRAY(dup)->ptr, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
-    RARRAY(dup)->len = RARRAY(ary)->len;
+    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_CONST_PTR(ary));
+}
+
 extern VALUE rb_output_fs;
 
+static void ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first);
+
 static VALUE
-inspect_join(ary, arg)
-    VALUE ary;
-    VALUE *arg;
+recursive_join(VALUE obj, VALUE argp, int recur)
+{
+    VALUE *arg = (VALUE *)argp;
+    VALUE ary = arg[0];
+    VALUE sep = arg[1];
+    VALUE result = arg[2];
+    int *first = (int *)arg[3];
+
+    if (recur) {
+	rb_raise(rb_eArgError, "recursive array join");
+    }
+    else {
+	ary_join_1(obj, ary, sep, 0, result, first);
+    }
+    return Qnil;
+}
+
+static void
+ary_join_0(VALUE ary, VALUE sep, long max, VALUE result)
 {
-    return rb_ary_join(arg[0], arg[1]);
+    long i;
+    VALUE val;
+
+    if (max > 0) rb_enc_copy(result, RARRAY_AREF(ary, 0));
+    for (i=0; i<max; 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);
+    }
 }
 
-VALUE
-rb_ary_join(ary, sep)
-    VALUE ary, sep;
+static void
+ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first)
 {
-    long len = 1, i;
-    int taint = Qfalse;
-    VALUE result, tmp;
+    VALUE val, tmp;
 
-    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
-    if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = Qtrue;
+    for (; i<RARRAY_LEN(ary); i++) {
+	if (i > 0 && !NIL_P(sep))
+	    rb_str_buf_append(result, sep);
 
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	tmp = rb_check_string_type(RARRAY(ary)->ptr[i]);
-	len += NIL_P(tmp) ? 10 : RSTRING(tmp)->len;
-    }
-    if (!NIL_P(sep)) {
-	StringValue(sep);
-	len += RSTRING(sep)->len * (RARRAY(ary)->len - 1);
-    }
-    result = rb_str_buf_new(len);
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	tmp = RARRAY(ary)->ptr[i];
-	switch (TYPE(tmp)) {
-	  case T_STRING:
-	    break;
-	  case T_ARRAY:
-	    if (tmp == ary || rb_inspecting_p(tmp)) {
-		tmp = rb_str_new2("[...]");
+	val = RARRAY_AREF(ary, i);
+	if (RB_TYPE_P(val, T_STRING)) {
+	  str_join:
+	    rb_str_buf_append(result, val);
+	    *first = FALSE;
+	}
+	else if (RB_TYPE_P(val, T_ARRAY)) {
+	    obj = val;
+	  ary_join:
+	    if (val == ary) {
+		rb_raise(rb_eArgError, "recursive array join");
 	    }
 	    else {
-		VALUE args[2];
+		VALUE args[4];
 
-		args[0] = tmp;
+		args[0] = val;
 		args[1] = sep;
-		tmp = rb_protect_inspect(inspect_join, ary, (VALUE)args);
+		args[2] = result;
+		args[3] = (VALUE)first;
+		rb_exec_recursive(recursive_join, obj, (VALUE)args);
 	    }
-	    break;
-	  default:
-	    tmp = rb_obj_as_string(tmp);
 	}
-	if (i > 0 && !NIL_P(sep))
-	    rb_str_buf_append(result, sep);
-	rb_str_buf_append(result, tmp);
-	if (OBJ_TAINTED(tmp)) taint = Qtrue;
+	else {
+	    tmp = rb_check_string_type(val);
+	    if (!NIL_P(tmp)) {
+		val = tmp;
+		goto str_join;
+	    }
+	    tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_ary");
+	    if (!NIL_P(tmp)) {
+		obj = val;
+		val = tmp;
+		goto ary_join;
+	    }
+	    val = rb_obj_as_string(val);
+	    if (*first) {
+		rb_enc_copy(result, val);
+		*first = FALSE;
+	    }
+	    goto str_join;
+	}
     }
+}
 
+VALUE
+rb_ary_join(VALUE ary, VALUE sep)
+{
+    long len = 1, i;
+    int taint = FALSE;
+    VALUE val, tmp, result;
+
+    if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0);
+    if (OBJ_TAINTED(ary)) taint = TRUE;
+
+    if (!NIL_P(sep)) {
+	StringValue(sep);
+	len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
+    }
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	val = RARRAY_AREF(ary, i);
+	tmp = rb_check_string_type(val);
+
+	if (NIL_P(tmp) || tmp != val) {
+	    int first;
+	    result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10);
+	    rb_enc_associate(result, rb_usascii_encoding());
+	    if (taint) OBJ_TAINT(result);
+	    ary_join_0(ary, sep, i, result);
+	    first = i == 0;
+	    ary_join_1(ary, ary, sep, i, result, &first);
+	    return result;
+	}
+
+	len += RSTRING_LEN(tmp);
+    }
+
+    result = rb_str_buf_new(len);
     if (taint) OBJ_TAINT(result);
+    ary_join_0(ary, sep, RARRAY_LEN(ary), result);
+
     return result;
 }
 
 /*
  *  call-seq:
- *     array.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"
  */
 
 static VALUE
-rb_ary_join_m(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
 {
     VALUE sep;
 
     rb_scan_args(argc, argv, "01", &sep);
     if (NIL_P(sep)) sep = rb_output_fs;
-    
+
     return rb_ary_join(ary, sep);
 }
 
+static VALUE
+inspect_ary(VALUE ary, VALUE dummy, int recur)
+{
+    int tainted = OBJ_TAINTED(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_AREF(ary, i));
+	if (OBJ_TAINTED(s)) tainted = TRUE;
+	if (i > 0) rb_str_buf_cat2(str, ", ");
+	else rb_enc_copy(str, s);
+	rb_str_buf_append(str, s);
+    }
+    rb_str_buf_cat2(str, "]");
+    if (tainted) OBJ_TAINT(str);
+    return str;
+}
+
 /*
  *  call-seq:
- *     array.to_s -> string
- *  
- *  Returns _self_<code>.join</code>.
- *     
- *     [ "a", "e", "i", "o" ].to_s   #=> "aeio"
+ *     ary.inspect  -> string
+ *     ary.to_s     -> string
  *
+ *  Creates a string representation of +self+.
+ *
+ *     [ "a", "b", "c" ].to_s     #=> "[\"a\", \"b\", \"c\"]"
  */
 
-VALUE
-rb_ary_to_s(ary)
-    VALUE ary;
+static VALUE
+rb_ary_inspect(VALUE ary)
 {
-    if (RARRAY(ary)->len == 0) return rb_str_new(0, 0);
-    
-    return rb_ary_join(ary, rb_output_fs);
+    if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new2("[]");
+    return rb_exec_recursive(inspect_ary, ary, 0);
 }
 
-static ID inspect_key;
+VALUE
+rb_ary_to_s(VALUE ary)
+{
+    return rb_ary_inspect(ary);
+}
 
-struct inspect_arg {
-    VALUE (*func)();
-    VALUE arg1, arg2;
-};
+/*
+ *  call-seq:
+ *     ary.to_a     -> ary
+ *
+ *  Returns +self+.
+ *
+ *  If called on a subclass of Array, converts the receiver to an Array object.
+ */
 
 static VALUE
-inspect_call(arg)
-    struct inspect_arg *arg;
+rb_ary_to_a(VALUE ary)
 {
-    return (*arg->func)(arg->arg1, arg->arg2);
+    if (rb_obj_class(ary) != rb_cArray) {
+	VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
+	rb_ary_replace(dup, ary);
+	return dup;
+    }
+    return ary;
 }
 
+/*
+ *  call-seq:
+ *     ary.to_h     -> hash
+ *
+ *  Returns the result of interpreting <i>ary</i> as an array of
+ *  <tt>[key, value]</tt> pairs. Elements other than pairs of
+ *  values are ignored.
+ *
+ *     [[:foo, :bar], [1, 2]].to_h
+ *       # => {:foo => :bar, 1 => 2}
+ */
+
 static VALUE
-get_inspect_tbl(create)
-    int create;
+rb_ary_to_h(VALUE ary)
 {
-    VALUE inspect_tbl = rb_thread_local_aref(rb_thread_current(), inspect_key);
-
-    if (NIL_P(inspect_tbl)) {
-	if (create) {
-	  tbl_init:
-	    inspect_tbl = rb_ary_new();
-	    rb_thread_local_aset(rb_thread_current(), inspect_key, inspect_tbl);
+    long i;
+    VALUE hash = rb_hash_new();
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	VALUE key_value_pair = rb_check_array_type(rb_ary_elt(ary, i));
+	if (!NIL_P(key_value_pair) && (RARRAY_LEN(key_value_pair) == 2)) {
+	    rb_hash_aset(hash, RARRAY_AREF(key_value_pair, 0), RARRAY_AREF(key_value_pair, 1));
 	}
     }
-    else if (TYPE(inspect_tbl) != T_ARRAY) {
-	rb_warn("invalid inspect_tbl value");
-	if (create) goto tbl_init;
-	rb_thread_local_aset(rb_thread_current(), inspect_key, Qnil);
-	return Qnil;
-    }
-    return inspect_tbl;
+    return hash;
 }
 
+/*
+ *  call-seq:
+ *     ary.to_ary -> ary
+ *
+ *  Returns +self+.
+ */
+
 static VALUE
-inspect_ensure(obj)
-    VALUE obj;
+rb_ary_to_ary_m(VALUE ary)
 {
-    VALUE inspect_tbl;
-
-    inspect_tbl = get_inspect_tbl(Qfalse);
-    if (!NIL_P(inspect_tbl)) {
-	rb_ary_pop(inspect_tbl);
-    }
-    return 0;
+    return ary;
 }
 
-VALUE
-rb_protect_inspect(func, obj, arg)
-    VALUE (*func)(ANYARGS);
-    VALUE obj, arg;
+static void
+ary_reverse(VALUE *p1, VALUE *p2)
 {
-    struct inspect_arg iarg;
-    VALUE inspect_tbl;
-    VALUE id;
-
-    inspect_tbl = get_inspect_tbl(Qtrue);
-    id = rb_obj_id(obj);
-    if (rb_ary_includes(inspect_tbl, id)) {
-	return (*func)(obj, arg);
+    while (p1 < p2) {
+	VALUE tmp = *p1;
+	*p1++ = *p2;
+	*p2-- = tmp;
     }
-    rb_ary_push(inspect_tbl, id);
-    iarg.func = func;
-    iarg.arg1 = obj;
-    iarg.arg2 = arg;
-
-    return rb_ensure(inspect_call, (VALUE)&iarg, inspect_ensure, obj);
 }
 
 VALUE
-rb_inspecting_p(obj)
-    VALUE obj;
+rb_ary_reverse(VALUE ary)
 {
-    VALUE inspect_tbl;
-
-    inspect_tbl = get_inspect_tbl(Qfalse);
-    if (NIL_P(inspect_tbl)) return Qfalse;
-    return rb_ary_includes(inspect_tbl, rb_obj_id(obj));
-}
-
-static VALUE
-inspect_ary(ary)
-    VALUE ary;
-{
-    int tainted = OBJ_TAINTED(ary);
-    long i;
-    VALUE s, str;
+    VALUE *p2;
+    long len = RARRAY_LEN(ary);
 
-    str = rb_str_buf_new2("[");
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	s = rb_inspect(RARRAY(ary)->ptr[i]);
-	if (OBJ_TAINTED(s)) tainted = Qtrue;
-	if (i > 0) rb_str_buf_cat2(str, ", ");
-	rb_str_buf_append(str, s);
+    rb_ary_modify(ary);
+    if (len > 1) {
+	RARRAY_PTR_USE(ary, p1, {
+	    p2 = p1 + len - 1;	/* points last item */
+	    ary_reverse(p1, p2);
+	}); /* WB: no new reference */
     }
-    rb_str_buf_cat2(str, "]");
-    if (tainted) OBJ_TAINT(str);
-    return str;
+    return ary;
 }
 
 /*
  *  call-seq:
- *     array.inspect  -> string
+ *     ary.reverse!   -> ary
  *
- *  Create a printable version of <i>array</i>.
+ *  Reverses +self+ in place.
+ *
+ *     a = [ "a", "b", "c" ]
+ *     a.reverse!       #=> ["c", "b", "a"]
+ *     a                #=> ["c", "b", "a"]
  */
 
 static VALUE
-rb_ary_inspect(ary)
-    VALUE ary;
+rb_ary_reverse_bang(VALUE ary)
 {
-    if (RARRAY(ary)->len == 0) return rb_str_new2("[]");
-    if (rb_inspecting_p(ary)) return rb_str_new2("[...]");
-    return rb_protect_inspect(inspect_ary, ary, 0);
+    return rb_ary_reverse(ary);
 }
 
 /*
  *  call-seq:
- *     array.to_a     -> array
- *  
- *  Returns _self_. If called on a subclass of Array, converts
- *  the receiver to an Array object.
+ *     ary.reverse    -> new_ary
+ *
+ *  Returns a new array containing +self+'s elements in reverse order.
+ *
+ *     [ "a", "b", "c" ].reverse   #=> ["c", "b", "a"]
+ *     [ 1 ].reverse               #=> [1]
  */
 
 static VALUE
-rb_ary_to_a(ary)
-    VALUE ary;
+rb_ary_reverse_m(VALUE ary)
 {
-    if (rb_obj_class(ary) != rb_cArray) {
-	VALUE dup = rb_ary_new2(RARRAY(ary)->len);
-	rb_ary_replace(dup, ary);
-	return dup;
+    long len = RARRAY_LEN(ary);
+    VALUE dup = rb_ary_new2(len);
+
+    if (len > 0) {
+	const VALUE *p1 = RARRAY_CONST_PTR(ary);
+	VALUE *p2 = (VALUE *)RARRAY_CONST_PTR(dup) + len - 1;
+	do *p2-- = *p1++; while (--len > 0);
     }
-    return ary;
+    ARY_SET_LEN(dup, RARRAY_LEN(ary));
+    return dup;
 }
 
-/*
- *  call-seq:
- *     array.to_ary -> array
- *  
- *  Returns _self_.
- */
-
-static VALUE
-rb_ary_to_ary_m(ary)
-    VALUE ary;
+static inline long
+rotate_count(long cnt, long len)
 {
-    return ary;
+    return (cnt < 0) ? (len - (~cnt % len) - 1) : (cnt % len);
 }
 
 VALUE
-rb_ary_reverse(ary)
-    VALUE ary;
+rb_ary_rotate(VALUE ary, long cnt)
 {
-    VALUE *p1, *p2;
-    VALUE tmp;
-
     rb_ary_modify(ary);
-    if (RARRAY(ary)->len > 1) {
-	p1 = RARRAY(ary)->ptr;
-	p2 = p1 + RARRAY(ary)->len - 1;	/* points last item */
 
-	while (p1 < p2) {
-	    tmp = *p1;
-	    *p1++ = *p2;
-	    *p2-- = tmp;
+    if (cnt != 0) {
+	VALUE *ptr = RARRAY_PTR(ary);
+	long len = RARRAY_LEN(ary);
+
+	if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) {
+	    --len;
+	    if (cnt < len) ary_reverse(ptr + cnt, ptr + len);
+	    if (--cnt > 0) ary_reverse(ptr, ptr + cnt);
+	    if (len > 0) ary_reverse(ptr, ptr + len);
+	    return ary;
 	}
     }
-    return ary;
+
+    return Qnil;
 }
 
 /*
  *  call-seq:
- *     array.reverse!   -> array 
- *  
- *  Reverses _self_ in place.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.reverse!       #=> ["c", "b", "a"]
- *     a                #=> ["c", "b", "a"]
+ *     ary.rotate!(count=1)   -> ary
+ *
+ *  Rotates +self+ in place so that the element at +count+ comes first, and
+ *  returns +self+.
+ *
+ *  If +count+ is negative then it rotates in the opposite direction, starting
+ *  from the end of the array where +-1+ is the last element.
+ *
+ *     a = [ "a", "b", "c", "d" ]
+ *     a.rotate!        #=> ["b", "c", "d", "a"]
+ *     a                #=> ["b", "c", "d", "a"]
+ *     a.rotate!(2)     #=> ["d", "a", "b", "c"]
+ *     a.rotate!(-3)    #=> ["a", "b", "c", "d"]
  */
 
 static VALUE
-rb_ary_reverse_bang(ary)
-    VALUE ary;
+rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary)
 {
-    return rb_ary_reverse(ary);
+    long n = 1;
+
+    switch (argc) {
+      case 1: n = NUM2LONG(argv[0]);
+      case 0: break;
+      default: rb_scan_args(argc, argv, "01", NULL);
+    }
+    rb_ary_rotate(ary, n);
+    return ary;
 }
 
 /*
  *  call-seq:
- *     array.reverse -> an_array
- *  
- *  Returns a new array containing <i>self</i>'s elements in reverse order.
- *     
- *     [ "a", "b", "c" ].reverse   #=> ["c", "b", "a"]
- *     [ 1 ].reverse               #=> [1]
+ *     ary.rotate(count=1)    -> new_ary
+ *
+ *  Returns a new array by rotating +self+ so that the element at +count+ is
+ *  the first element of the new array.
+ *
+ *  If +count+ is negative then it rotates in the opposite direction, starting
+ *  from the end of +self+ where +-1+ is the last element.
+ *
+ *     a = [ "a", "b", "c", "d" ]
+ *     a.rotate         #=> ["b", "c", "d", "a"]
+ *     a                #=> ["a", "b", "c", "d"]
+ *     a.rotate(2)      #=> ["c", "d", "a", "b"]
+ *     a.rotate(-3)     #=> ["b", "c", "d", "a"]
  */
 
 static VALUE
-rb_ary_reverse_m(ary)
-    VALUE ary;
+rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary)
 {
-    return rb_ary_reverse(rb_ary_dup(ary));
+    VALUE rotated;
+    const VALUE *ptr;
+    long len, cnt = 1;
+
+    switch (argc) {
+      case 1: cnt = NUM2LONG(argv[0]);
+      case 0: break;
+      default: rb_scan_args(argc, argv, "01", NULL);
+    }
+
+    len = RARRAY_LEN(ary);
+    rotated = rb_ary_new2(len);
+    if (len > 0) {
+	cnt = rotate_count(cnt, len);
+	ptr = RARRAY_CONST_PTR(ary);
+	len -= cnt;
+	ary_memcpy(rotated, 0, len, ptr + cnt);
+	ary_memcpy(rotated, len, cnt, ptr);
+    }
+    ARY_SET_LEN(rotated, RARRAY_LEN(ary));
+    return rotated;
 }
 
 struct ary_sort_data {
     VALUE ary;
-    VALUE *ptr;
-    long len;
+    int opt_methods;
+    int opt_inited;
 };
 
-static void
-ary_sort_check(data)
-    struct ary_sort_data *data;
+enum {
+    sort_opt_Fixnum,
+    sort_opt_String,
+    sort_optimizable_count
+};
+
+#define STRING_P(s) (RB_TYPE_P((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)
 {
-    if (RARRAY(data->ary)->ptr != data->ptr || RARRAY(data->ary)->len != data->len) {
-	rb_raise(rb_eArgError, "array modified during sort");
+    if (RBASIC(ary)->klass) {
+	rb_raise(rb_eRuntimeError, "sort reentered");
     }
+    return Qnil;
 }
 
 static int
-sort_1(a, b, data)
-    VALUE *a, *b;
-    struct ary_sort_data *data;
+sort_1(const void *ap, const void *bp, void *dummy)
 {
-    VALUE retval = rb_yield_values(2, *a, *b);
+    struct ary_sort_data *data = dummy;
+    VALUE retval = sort_reentered(data->ary);
+    VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
     int n;
 
-    n = rb_cmpint(retval, *a, *b);
-    ary_sort_check(data);
+    retval = rb_yield_values(2, a, b);
+    n = rb_cmpint(retval, a, b);
+    sort_reentered(data->ary);
     return n;
 }
 
 static int
-sort_2(ap, bp, data)
-    VALUE *ap, *bp;
-    struct ary_sort_data *data;
+sort_2(const void *ap, const void *bp, void *dummy)
 {
-    VALUE retval;
-    VALUE a = *ap, b = *bp;
+    struct ary_sort_data *data = dummy;
+    VALUE retval = sort_reentered(data->ary);
+    VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
     int n;
 
-    if (FIXNUM_P(a) && FIXNUM_P(b)) {
+    if (FIXNUM_P(a) && FIXNUM_P(b) && SORT_OPTIMIZABLE(data, Fixnum)) {
 	if ((long)a > (long)b) return 1;
 	if ((long)a < (long)b) return -1;
 	return 0;
     }
-    if (TYPE(a) == T_STRING) {
-	if (TYPE(b) == T_STRING) return rb_str_cmp(a, b);
+    if (STRING_P(a) && STRING_P(b) && SORT_OPTIMIZABLE(data, 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);
-    ary_sort_check(data);
+    sort_reentered(data->ary);
 
     return n;
 }
 
-static VALUE
-sort_internal(ary)
-    VALUE ary;
-{
-    struct ary_sort_data data;
-
-    data.ary = ary;
-    data.ptr = RARRAY(ary)->ptr; data.len = RARRAY(ary)->len;
-    qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE),
-	  rb_block_given_p()?sort_1:sort_2, &data);
-    return ary;
-}
-
-static VALUE
-sort_unlock(ary)
-    VALUE ary;
-{
-    FL_UNSET(ary, ARY_TMPLOCK);
-    return ary;
-}
-
 /*
  *  call-seq:
- *     array.sort!                   -> array
- *     array.sort! {| a,b | block }  -> array 
- *  
- *  Sorts _self_. Comparisons for
- *  the sort will be done using the <code><=></code> operator or using
- *  an optional code block. The block implements a comparison between
- *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- *  <code>Enumerable#sort_by</code>.
- *     
+ *     ary.sort!                   -> ary
+ *     ary.sort! { |a, b| block }  -> ary
+ *
+ *  Sorts +self+ in place.
+ *
+ *  Comparisons for the sort will be done using the <code><=></code> operator
+ *  or using an optional code block.
+ *
+ *  The block must implement a comparison between +a+ and +b+, and return
+ *  +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+
+ *  if +b+ follows +a+.
+ *
+ *  See also Enumerable#sort_by.
+ *
  *     a = [ "d", "a", "e", "c", "b" ]
- *     a.sort                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
+ *     a.sort!                    #=> ["a", "b", "c", "d", "e"]
+ *     a.sort! { |x,y| y <=> x }  #=> ["e", "d", "c", "b", "a"]
  */
 
 VALUE
-rb_ary_sort_bang(ary)
-    VALUE ary;
+rb_ary_sort_bang(VALUE ary)
 {
     rb_ary_modify(ary);
-    if (RARRAY(ary)->len > 1) {
-	FL_SET(ary, ARY_TMPLOCK);	/* prohibit modification during sort */
-	rb_ensure(sort_internal, ary, sort_unlock, ary);
+    assert(!ARY_SHARED_P(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_CLEAR_CLASS(tmp);
+	data.ary = tmp;
+	data.opt_methods = 0;
+	data.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)) {
+            if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
+                rb_ary_unshare(ary);
+            }
+            FL_SET_EMBED(ary);
+	    ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp));
+            ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
+        }
+        else {
+            if (!ARY_EMBED_P(ary) && ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
+                FL_UNSET_SHARED(ary);
+                ARY_SET_CAPA(ary, RARRAY_LEN(tmp));
+            }
+            else {
+                assert(!ARY_SHARED_P(tmp));
+                if (ARY_EMBED_P(ary)) {
+                    FL_UNSET_EMBED(ary);
+                }
+                else if (ARY_SHARED_P(ary)) {
+                    /* ary might be destructively operated in the given block */
+                    rb_ary_unshare(ary);
+                }
+                else {
+		    ruby_sized_xfree((void *)ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary));
+                }
+                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);
+            FL_SET_EMBED(tmp);
+            ARY_SET_EMBED_LEN(tmp, 0);
+            FL_SET(tmp, FL_FREEZE);
+	}
+        /* tmp will be GC'ed. */
+        RBASIC_SET_CLASS_RAW(tmp, rb_cArray); /* rb_cArray must be marked */
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.sort                   -> an_array 
- *     array.sort {| a,b | block }  -> an_array 
- *  
- *  Returns a new array created by sorting <i>self</i>. Comparisons for
- *  the sort will be done using the <code><=></code> operator or using
- *  an optional code block. The block implements a comparison between
- *  <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
- *  <code>Enumerable#sort_by</code>.
- *     
+ *     ary.sort                   -> new_ary
+ *     ary.sort { |a, b| block }  -> new_ary
+ *
+ *  Returns a new array created by sorting +self+.
+ *
+ *  Comparisons for the sort will be done using the <code><=></code> operator
+ *  or using an optional code block.
+ *
+ *  The block must implement a comparison between +a+ and +b+, and return
+ *  +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+
+ *  if +b+ follows +a+.
+ *
+ *
+ *  See also Enumerable#sort_by.
+ *
  *     a = [ "d", "a", "e", "c", "b" ]
  *     a.sort                    #=> ["a", "b", "c", "d", "e"]
- *     a.sort {|x,y| y <=> x }   #=> ["e", "d", "c", "b", "a"]
+ *     a.sort { |x,y| y <=> x }  #=> ["e", "d", "c", "b", "a"]
  */
 
 VALUE
-rb_ary_sort(ary)
-    VALUE ary;
+rb_ary_sort(VALUE ary)
 {
     ary = rb_ary_dup(ary);
     rb_ary_sort_bang(ary);
@@ -1810,71 +2516,206 @@ rb_ary_sort(ary)
 
 /*
  *  call-seq:
- *     array.collect {|item| block }  -> an_array
- *     array.map     {|item| block }  -> an_array
- *  
- *  Invokes <i>block</i> once for each element of <i>self</i>. Creates a 
- *  new array containing the values returned by the block.
- *  See also <code>Enumerable#collect</code>.
- *     
+ *     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)
+{
+    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 (FIX2INT(v) == 0) return val;
+	    smaller = FIX2INT(v) < 0;
+	}
+	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, INT2FIX(0))) {
+		case 0: return val;
+		case 1: smaller = 1; break;
+		case -1: smaller = 0;
+	    }
+	}
+	else {
+	    rb_raise(rb_eTypeError, "wrong argument type %s"
+		" (must be numeric, true, false or nil)",
+		rb_obj_classname(v));
+	}
+	if (smaller) {
+	    high = mid;
+	}
+	else {
+	    low = mid + 1;
+	}
+    }
+    if (low == RARRAY_LEN(ary)) return Qnil;
+    if (!satisfied) return Qnil;
+    return rb_ary_entry(ary, low);
+}
+
+
+static VALUE
+sort_by_i(VALUE i)
+{
+    return rb_yield(i);
+}
+
+/*
+ *  call-seq:
+ *     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.
+ *
+ */
+
+static VALUE
+rb_ary_sort_by_bang(VALUE ary)
+{
+    VALUE sorted;
+
+    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);
+    return ary;
+}
+
+
+/*
+ *  call-seq:
+ *     ary.collect { |item| block }  -> new_ary
+ *     ary.map     { |item| block }  -> new_ary
+ *     ary.collect                   -> Enumerator
+ *     ary.map                       -> Enumerator
+ *
+ *  Invokes the given block once for each element of +self+.
+ *
+ *  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.map { |x| x + "!" }   #=> ["a!", "b!", "c!", "d!"]
+ *     a                       #=> ["a", "b", "c", "d"]
  */
 
 static VALUE
-rb_ary_collect(ary)
-    VALUE ary;
+rb_ary_collect(VALUE ary)
 {
     long i;
     VALUE collect;
 
-    if (!rb_block_given_p()) {
-	return rb_ary_new4(RARRAY(ary)->len, RARRAY(ary)->ptr);
-    }
-
-    collect = rb_ary_new2(RARRAY(ary)->len);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	rb_ary_push(collect, rb_yield(RARRAY(ary)->ptr[i]));
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
+    collect = rb_ary_new2(RARRAY_LEN(ary));
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	rb_ary_push(collect, rb_yield(RARRAY_AREF(ary, i)));
     }
     return collect;
 }
 
-/* 
+
+/*
  *  call-seq:
- *     array.collect! {|item| block }   ->   array
- *     array.map!     {|item| block }   ->   array
+ *     ary.collect! {|item| block }   -> ary
+ *     ary.map!     {|item| block }   -> ary
+ *     ary.collect!                   -> Enumerator
+ *     ary.map!                       -> Enumerator
+ *
+ *  Invokes the given block once for each element of +self+, replacing the
+ *  element with the value returned by the block.
+ *
+ *  See also Enumerable#collect.
+ *
+ *  If no block is given, an Enumerator is returned instead.
  *
- *  Invokes the block once for each element of _self_, replacing the
- *  element with the value returned by _block_.
- *  See also <code>Enumerable#collect</code>.
- *   
  *     a = [ "a", "b", "c", "d" ]
- *     a.collect! {|x| x + "!" }
- *     a             #=>  [ "a!", "b!", "c!", "d!" ]
+ *     a.map! {|x| x + "!" }
+ *     a #=>  [ "a!", "b!", "c!", "d!" ]
  */
 
 static VALUE
-rb_ary_collect_bang(ary)
-    VALUE ary;
+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(ary)->len; i++) {
-	rb_ary_store(ary, i, rb_yield(RARRAY(ary)->ptr[i]));
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	rb_ary_store(ary, i, rb_yield(RARRAY_AREF(ary, i)));
     }
     return ary;
 }
 
 VALUE
-rb_values_at(obj, olen, argc, argv, func)
-    VALUE obj;
-    long olen;
-    int argc;
-    VALUE *argv;
-    VALUE (*func) _((VALUE,long));
+rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VALUE, long))
 {
     VALUE result = rb_ary_new2(argc);
     long beg, len, i, j;
@@ -1885,15 +2726,13 @@ rb_values_at(obj, olen, argc, argv, func)
 	    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])));
@@ -1901,54 +2740,59 @@ rb_values_at(obj, olen, argc, argv, func)
     return result;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.values_at(selector,... )  -> an_array
+ *     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.
+ *
+ *  See also Array#select.
  *
- *  Returns an array containing the elements in
- *  _self_ corresponding to the given selector(s). The selectors
- *  may be either integer indices or ranges. 
- *  See also <code>Array#select</code>.
- * 
  *     a = %w{ a b c d e f }
- *     a.values_at(1, 3, 5)
- *     a.values_at(1, 3, 5, 7)
- *     a.values_at(-1, -3, -5, -7)
- *     a.values_at(1..3, 2...5)
+ *     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
-rb_ary_values_at(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
 {
-    return rb_values_at(ary, RARRAY(ary)->len, argc, argv, rb_ary_entry);
+    return rb_get_values_at(ary, RARRAY_LEN(ary), argc, argv, rb_ary_entry);
 }
 
+
 /*
  *  call-seq:
- *     array.select {|item| block } -> an_array
- *  
- *  Invokes the block passing in successive elements from <i>array</i>,
- *  returning an array containing those elements for which the block
- *  returns a true value (equivalent to <code>Enumerable#select</code>).
- *     
+ *     ary.select { |item| block } -> new_ary
+ *     ary.select                  -> Enumerator
+ *
+ *  Returns a new array containing all elements of +ary+
+ *  for which the given +block+ returns a true value.
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *     [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
-rb_ary_select(ary)
-    VALUE ary;
+rb_ary_select(VALUE ary)
 {
     VALUE result;
     long i;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
-    result = rb_ary_new2(RARRAY(ary)->len);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	if (RTEST(rb_yield(RARRAY(ary)->ptr[i]))) {
+    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_AREF(ary, i)))) {
 	    rb_ary_push(result, rb_ary_elt(ary, i));
 	}
     }
@@ -1957,14 +2801,92 @@ rb_ary_select(ary)
 
 /*
  *  call-seq:
- *     array.delete(obj)            -> obj or nil 
- *     array.delete(obj) { block }  -> obj or nil
- *  
- *  Deletes items from <i>self</i> that are equal to <i>obj</i>. If
- *  the item is not found, returns <code>nil</code>. If the optional
- *  code block is given, returns the result of <i>block</i> if the item
- *  is not found.
- *     
+ *     ary.select!  {|item| block } -> ary or nil
+ *     ary.select!                  -> Enumerator
+ *
+ *  Invokes the given block passing in successive elements from +self+,
+ *  deleting elements for which the block returns a +false+ value.
+ *
+ *  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;
+
+    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_AREF(ary, i1);
+	if (!RTEST(rb_yield(v))) continue;
+	if (i1 != i2) {
+	    rb_ary_store(ary, i2, v);
+	}
+	i2++;
+    }
+
+    if (i1 == i2) return Qnil;
+    if (i2 < i1)
+	ARY_SET_LEN(ary, i2);
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     ary.keep_if { |item| block } -> ary
+ *     ary.keep_if                  -> Enumerator
+ *
+ *  Deletes every element of +self+ for which the given block evaluates to
+ *  +false+.
+ *
+ *  See also Array#select!
+ *
+ *  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"]
+ */
+
+static VALUE
+rb_ary_keep_if(VALUE ary)
+{
+    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)            -> item or nil
+ *     ary.delete(obj) { block }  -> item or result of block
+ *
+ *  Deletes all items from +self+ that are equal to +obj+.
+ *
+ *  Returns the last deleted item, or +nil+ if no matching item is found.
+ *
+ *  If the optional code block is given, the result of the block is returned if
+ *  the item is not found.  (To remove +nil+ elements and get an informative
+ *  return value, use Array#compact!)
+ *
  *     a = [ "a", "b", "b", "b", "c" ]
  *     a.delete("b")                   #=> "b"
  *     a                               #=> ["a", "c"]
@@ -1973,47 +2895,62 @@ rb_ary_select(ary)
  */
 
 VALUE
-rb_ary_delete(ary, item)
-    VALUE ary;
-    VALUE item;
+rb_ary_delete(VALUE ary, VALUE item)
 {
+    VALUE v = item;
     long i1, i2;
 
-    for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
-	VALUE e = RARRAY(ary)->ptr[i1];
+    for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
+	VALUE e = RARRAY_AREF(ary, i1);
 
-	if (rb_equal(e, item)) continue;
+	if (rb_equal(e, item)) {
+	    v = e;
+	    continue;
+	}
 	if (i1 != i2) {
 	    rb_ary_store(ary, i2, e);
 	}
 	i2++;
     }
-    if (RARRAY(ary)->len == i2) {
+    if (RARRAY_LEN(ary) == i2) {
 	if (rb_block_given_p()) {
 	    return rb_yield(item);
 	}
 	return Qnil;
     }
 
-    rb_ary_modify(ary);
-    if (RARRAY(ary)->len > i2) {
-	RARRAY(ary)->len = i2;
-	if (i2 * 2 < RARRAY(ary)->aux.capa &&
-	    RARRAY(ary)->aux.capa > ARY_DEFAULT_SIZE) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, i2 * 2);
-	    RARRAY(ary)->aux.capa = 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 item;
+    ary_resize_smaller(ary, i2);
 }
 
 VALUE
-rb_ary_delete_at(ary, pos)
-    VALUE ary;
-    long pos;
+rb_ary_delete_at(VALUE ary, long pos)
 {
-    long i, len = RARRAY(ary)->len;
+    long len = RARRAY_LEN(ary);
     VALUE del;
 
     if (pos >= len) return Qnil;
@@ -2023,52 +2960,48 @@ rb_ary_delete_at(ary, pos)
     }
 
     rb_ary_modify(ary);
-    del = RARRAY(ary)->ptr[pos];
-    for (i = pos + 1; i < len; i++, pos++) {
-	RARRAY(ary)->ptr[pos] = RARRAY(ary)->ptr[i];
-    }
-    RARRAY(ary)->len = pos;
+    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;
 }
 
 /*
  *  call-seq:
- *     array.delete_at(index)  -> obj or nil
- *  
- *  Deletes the element at the specified index, returning that element,
- *  or <code>nil</code> if the index is out of range. See also
- *  <code>Array#slice!</code>.
- *     
- *     a = %w( ant bat cat dog )
+ *     ary.delete_at(index)  -> obj or nil
+ *
+ *  Deletes the element at the specified +index+, returning that element, or
+ *  +nil+ if the +index+ is out of range.
+ *
+ *  See also Array#slice!
+ *
+ *     a = ["ant", "bat", "cat", "dog"]
  *     a.delete_at(2)    #=> "cat"
  *     a                 #=> ["ant", "bat", "dog"]
  *     a.delete_at(99)   #=> nil
  */
 
 static VALUE
-rb_ary_delete_at_m(ary, pos)
-    VALUE ary, pos;
+rb_ary_delete_at_m(VALUE ary, VALUE pos)
 {
     return rb_ary_delete_at(ary, NUM2LONG(pos));
 }
 
 /*
  *  call-seq:
- *     array.slice!(index)         -> obj or nil
- *     array.slice!(start, length) -> sub_array or nil
- *     array.slice!(range)         -> sub_array or nil 
- *  
- *  Deletes the element(s) given by an index (optionally with a length)
- *  or by a range. Returns the deleted object, subarray, or
- *  <code>nil</code> if the index is out of range. Equivalent to:
- *     
- *     def slice!(*args)
- *       result = self[*args]
- *       self[*args] = nil
- *       result
- *     end
- *     
+ *     ary.slice!(index)         -> obj or nil
+ *     ary.slice!(start, length) -> new_ary or nil
+ *     ary.slice!(range)         -> new_ary or nil
+ *
+ *  Deletes the element(s) given by an +index+ (optionally up to +length+
+ *  elements) or by a +range+.
+ *
+ *  Returns the deleted object (or objects), or +nil+ if the +index+ is out of
+ *  range.
+ *
  *     a = [ "a", "b", "c" ]
  *     a.slice!(1)     #=> "b"
  *     a               #=> ["a", "c"]
@@ -2079,18 +3012,15 @@ rb_ary_delete_at_m(ary, pos)
  */
 
 static VALUE
-rb_ary_slice_bang(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
 {
     VALUE arg1, arg2;
     long pos, len, orig_len;
 
     rb_ary_modify_check(ary);
-    if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
-	pos = NUM2LONG(arg1);
-	len = NUM2LONG(arg2);
+    if (argc == 2) {
+	pos = NUM2LONG(argv[0]);
+	len = NUM2LONG(argv[1]);
       delete_pos_len:
 	if (len < 0) return Qnil;
 	orig_len = RARRAY_LEN(ary);
@@ -2103,12 +3033,18 @@ rb_ary_slice_bang(argc, argv, 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, Qnil);	/* Qundef in 1.9 */
+	arg2 = rb_ary_new4(len, RARRAY_CONST_PTR(ary)+pos);
+	RBASIC_SET_CLASS(arg2, rb_obj_class(ary));
+	rb_ary_splice(ary, pos, len, Qundef);
 	return arg2;
     }
 
+    if (argc != 1) {
+	/* error report */
+	rb_scan_args(argc, argv, "11", NULL, NULL);
+    }
+    arg1 = argv[0];
+
     if (!FIXNUM_P(arg1)) {
 	switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) {
 	  case Qtrue:
@@ -2126,170 +3062,249 @@ rb_ary_slice_bang(argc, argv, ary)
     return rb_ary_delete_at(ary, NUM2LONG(arg1));
 }
 
-/*
- *  call-seq:
- *     array.reject! {|item| block }  -> array or nil
- *  
- *  Equivalent to <code>Array#delete_if</code>, deleting elements from
- *  _self_ for which the block evaluates to true, but returns
- *  <code>nil</code> if no changes were made. Also see
- *  <code>Enumerable#reject</code>.
- */
+static VALUE
+ary_reject(VALUE orig, VALUE result)
+{
+    long i;
+
+    for (i = 0; i < RARRAY_LEN(orig); i++) {
+	VALUE v = RARRAY_AREF(orig, i);
+	if (!RTEST(rb_yield(v))) {
+	    rb_ary_push_1(result, v);
+	}
+    }
+    return result;
+}
 
 static VALUE
-rb_ary_reject_bang(ary)
-    VALUE ary;
+ary_reject_bang(VALUE ary)
 {
-    long i1, i2;
+    long i;
+    VALUE result = Qnil;
 
-    RETURN_ENUMERATOR(ary, 0, 0);
-    rb_ary_modify(ary);
-    for (i1 = i2 = 0; i1 < RARRAY(ary)->len; i1++) {
-	VALUE v = RARRAY(ary)->ptr[i1];
-	if (RTEST(rb_yield(v))) continue;
-	if (i1 != i2) {
-	    rb_ary_store(ary, i2, v);
+    rb_ary_modify_check(ary);
+    for (i = 0; i < RARRAY_LEN(ary); ) {
+	VALUE v = RARRAY_AREF(ary, i);
+	if (RTEST(rb_yield(v))) {
+	    rb_ary_delete_at(ary, i);
+	    result = ary;
+	}
+	else {
+	    i++;
 	}
-	i2++;
     }
-    if (RARRAY(ary)->len == i2) return Qnil;
-    if (i2 < RARRAY(ary)->len)
-	RARRAY(ary)->len = i2;
+    return result;
+}
 
-    return ary;
+/*
+ *  call-seq:
+ *     ary.reject! { |item| block }  -> ary or nil
+ *     ary.reject!                   -> Enumerator
+ *
+ *  Equivalent to Array#delete_if, deleting elements from +self+ for which the
+ *  block evaluates to +true+, but returns +nil+ if no changes were made.
+ *
+ *  The array is changed instantly every time the block is called, not after
+ *  the iteration is over.
+ *
+ *  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_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
+    return ary_reject_bang(ary);
 }
 
 /*
  *  call-seq:
- *     array.reject {|item| block }  -> an_array
- *  
- *  Returns a new array containing the items in _self_
- *  for which the block is not true.
+ *     ary.reject  {|item| block }  -> new_ary
+ *     ary.reject                   -> Enumerator
+ *
+ *  Returns a new array containing the items in +self+ for which the given
+ *  block is not +true+.
+ *
+ *  See also Array#delete_if
+ *
+ *  If no block is given, an Enumerator is returned instead.
  */
 
 static VALUE
-rb_ary_reject(ary)
-    VALUE ary;
+rb_ary_reject(VALUE ary)
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
-    ary = rb_ary_dup(ary);
-    rb_ary_reject_bang(ary);
-    return ary;
+    VALUE rejected_ary;
+
+    RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length);
+    rejected_ary = rb_ary_new();
+    ary_reject(ary, rejected_ary);
+    return rejected_ary;
 }
 
 /*
  *  call-seq:
- *     array.delete_if {|item| block }  -> array
- *  
- *  Deletes every element of <i>self</i> for which <i>block</i> evaluates
- *  to <code>true</code>.
- *     
- *     a = [ "a", "b", "c" ]
- *     a.delete_if {|x| x >= "b" }   #=> ["a"]
+ *     ary.delete_if { |item| block }  -> ary
+ *     ary.delete_if                   -> Enumerator
+ *
+ *  Deletes every element of +self+ for which block evaluates to +true+.
+ *
+ *  The array is changed instantly every time the block is called, not after
+ *  the iteration is over.
+ *
+ *  See also Array#reject!
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *     scores = [ 97, 42, 75 ]
+ *     scores.delete_if {|score| score < 80 }   #=> [97]
  */
 
 static VALUE
-rb_ary_delete_if(ary)
-    VALUE ary;
+rb_ary_delete_if(VALUE ary)
 {
-    RETURN_ENUMERATOR(ary, 0, 0);
-    rb_ary_reject_bang(ary);
+    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)
+{
+    if (args[1]-- == 0) rb_iter_break();
+    if (argc > 1) val = rb_ary_new4(argc, argv);
+    rb_ary_push(args[0], val);
+    return Qnil;
+}
+
+static VALUE
+take_items(VALUE obj, long n)
+{
+    VALUE result = rb_check_array_type(obj);
+    VALUE args[2];
+
+    if (!NIL_P(result)) return rb_ary_subseq(result, 0, n);
+    result = rb_ary_new2(n);
+    args[0] = result; args[1] = (VALUE)n;
+    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:
- *     array.zip(arg, ...)                   -> an_array
- *     array.zip(arg, ...) {| arr | block }  -> nil
- *  
- *  Converts any arguments to arrays, then merges elements of
- *  <i>self</i> with corresponding elements from each argument. This
- *  generates a sequence of <code>self.size</code> <em>n</em>-element
- *  arrays, where <em>n</em> is one more that the count of arguments. If
- *  the size of any argument is less than <code>enumObj.size</code>,
- *  <code>nil</code> values are supplied. If a block given, it is
- *  invoked for each output array, otherwise an array of arrays is
- *  returned.
- *     
+ *     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(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_zip(int argc, VALUE *argv, VALUE ary)
 {
     int i, j;
-    long len;
-    VALUE result;
+    long len = RARRAY_LEN(ary);
+    VALUE result = Qnil;
 
     for (i=0; i<argc; i++) {
-	argv[i] = to_ary(argv[i]);
+	argv[i] = take_items(argv[i], len);
     }
+
     if (rb_block_given_p()) {
-	for (i=0; i<RARRAY(ary)->len; i++) {
-	    VALUE tmp = rb_ary_new2(argc+1);
+	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 (arity > 1 && argc+1 < 0x100) {
+	    VALUE *tmp = ALLOCA_N(VALUE, 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);
+	    }
+	}
+	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);
 	    }
-	    rb_yield(tmp);
 	}
-	return Qnil;
     }
-    len = RARRAY(ary)->len;
-    result = rb_ary_new2(len);
-    for (i=0; i<len; i++) {
-	VALUE tmp = rb_ary_new2(argc+1);
+    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, rb_ary_elt(ary, i));
-	for (j=0; j<argc; j++) {
-	    rb_ary_push(tmp, rb_ary_elt(argv[j], i));
+	    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);
 	}
-	rb_ary_push(result, tmp);
     }
+
     return result;
 }
 
 /*
  *  call-seq:
- *     array.transpose -> an_array
- *  
- *  Assumes that <i>self</i> is an array of arrays and transposes the
- *  rows and columns.
- *     
+ *     ary.transpose -> new_ary
+ *
+ *  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
-rb_ary_transpose(ary)
-    VALUE ary;
+rb_ary_transpose(VALUE ary)
 {
     long elen = -1, alen, i, j;
     VALUE tmp, result = 0;
 
-    alen = RARRAY(ary)->len;
+    alen = RARRAY_LEN(ary);
     if (alen == 0) return rb_ary_dup(ary);
     for (i=0; i<alen; i++) {
 	tmp = to_ary(rb_ary_elt(ary, i));
 	if (elen < 0) {		/* first element */
-	    elen = RARRAY(tmp)->len;
+	    elen = RARRAY_LEN(tmp);
 	    result = rb_ary_new2(elen);
 	    for (j=0; j<elen; j++) {
 		rb_ary_store(result, j, rb_ary_new2(alen));
 	    }
 	}
-	else if (elen != RARRAY(tmp)->len) {
-	    rb_raise(rb_eIndexError, "element size differs (%d should be %d)",
-		     RARRAY(tmp)->len, elen);
+	else if (elen != RARRAY_LEN(tmp)) {
+	    rb_raise(rb_eIndexError, "element size differs (%ld should be %ld)",
+		     RARRAY_LEN(tmp), elen);
 	}
 	for (j=0; j<elen; j++) {
 	    rb_ary_store(rb_ary_elt(result, j), i, rb_ary_elt(tmp, j));
@@ -2300,96 +3315,123 @@ rb_ary_transpose(ary)
 
 /*
  *  call-seq:
- *     array.replace(other_array)  -> array
- *  
- *  Replaces the contents of <i>self</i> with the contents of
- *  <i>other_array</i>, truncating or expanding if necessary.
- *     
+ *     ary.replace(other_ary)  -> ary
+ *     ary.initialize_copy(other_ary)	-> ary
+ *
+ *  Replaces the contents of +self+ with the contents of +other_ary+,
+ *  truncating or expanding if necessary.
+ *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.replace([ "x", "y", "z" ])   #=> ["x", "y", "z"]
  *     a                              #=> ["x", "y", "z"]
  */
 
-static VALUE
-rb_ary_replace(copy, orig)
-    VALUE copy, orig;
+VALUE
+rb_ary_replace(VALUE copy, VALUE orig)
 {
-    VALUE shared;
-
-    rb_ary_modify(copy);
+    rb_ary_modify_check(copy);
     orig = to_ary(orig);
     if (copy == orig) return copy;
-    shared = ary_make_shared(orig);
-    if (RARRAY(copy)->ptr && !FL_TEST(copy, ELTS_SHARED))
-	free(RARRAY(copy)->ptr);
-    RARRAY(copy)->ptr = RARRAY(orig)->ptr;
-    RARRAY(copy)->len = RARRAY(orig)->len;
-    RARRAY(copy)->aux.shared = shared;
-    FL_SET(copy, ELTS_SHARED);
 
+    if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) {
+        VALUE shared = 0;
+
+        if (ARY_OWNS_HEAP_P(copy)) {
+	    RARRAY_PTR_USE(copy, ptr, ruby_sized_xfree(ptr, ARY_HEAP_SIZE(copy)));
+	}
+        else if (ARY_SHARED_P(copy)) {
+            shared = ARY_SHARED(copy);
+            FL_UNSET_SHARED(copy);
+        }
+        FL_SET_EMBED(copy);
+	ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR(orig));
+        if (shared) {
+            rb_ary_decrement_share(shared);
+        }
+        ARY_SET_LEN(copy, RARRAY_LEN(orig));
+    }
+    else {
+        VALUE shared = ary_make_shared(orig);
+        if (ARY_OWNS_HEAP_P(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_CONST_PTR(orig));
+        ARY_SET_LEN(copy, RARRAY_LEN(orig));
+        rb_ary_set_shared(copy, shared);
+    }
     return copy;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.clear    ->  array
+ *     ary.clear    -> ary
  *
- *  Removes all elements from _self_.
+ *  Removes all elements from +self+.
  *
  *     a = [ "a", "b", "c", "d", "e" ]
  *     a.clear    #=> [ ]
  */
 
 VALUE
-rb_ary_clear(ary)
-    VALUE ary;
+rb_ary_clear(VALUE ary)
 {
-    rb_ary_modify(ary);
-    RARRAY(ary)->len = 0;
-    if (ARY_DEFAULT_SIZE * 2 < RARRAY(ary)->aux.capa) {
-	REALLOC_N(RARRAY(ary)->ptr, VALUE, ARY_DEFAULT_SIZE * 2);
-	RARRAY(ary)->aux.capa = ARY_DEFAULT_SIZE * 2;
+    rb_ary_modify_check(ary);
+    ARY_SET_LEN(ary, 0);
+    if (ARY_SHARED_P(ary)) {
+	if (!ARY_EMBED_P(ary)) {
+	    rb_ary_unshare(ary);
+	    FL_SET_EMBED(ary);
+	}
+    }
+    else if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
+	ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
     }
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.fill(obj)                                -> array
- *     array.fill(obj, start [, length])              -> array
- *     array.fill(obj, range )                        -> array
- *     array.fill {|index| block }                    -> array
- *     array.fill(start [, length] ) {|index| block } -> array
- *     array.fill(range) {|index| block }             -> array
- *  
- *  The first three forms set the selected elements of <i>self</i> (which
- *  may be the entire array) to <i>obj</i>. A <i>start</i> of
- *  <code>nil</code> is equivalent to zero. A <i>length</i> of
- *  <code>nil</code> is equivalent to <i>self.length</i>. The last three
- *  forms fill the array with the value of the block. The block is
- *  passed the absolute index of each element to be filled.
- *     
+ *     ary.fill(obj)                                 -> ary
+ *     ary.fill(obj, start [, length])               -> ary
+ *     ary.fill(obj, range )                         -> ary
+ *     ary.fill { |index| block }                    -> ary
+ *     ary.fill(start [, length] ) { |index| block } -> ary
+ *     ary.fill(range) { |index| block }             -> ary
+ *
+ *  The first three forms set the selected elements of +self+ (which
+ *  may be the entire array) to +obj+.
+ *
+ *  A +start+ of +nil+ is equivalent to zero.
+ *
+ *  A +length+ of +nil+ is equivalent to the length of the array.
+ *
+ *  The last three forms fill the array with the value of the given block,
+ *  which is passed the absolute index of each element to be filled.
+ *
+ *  Negative values of +start+ count from the end of the array, where +-1+ is
+ *  the last element.
+ *
  *     a = [ "a", "b", "c", "d" ]
  *     a.fill("x")              #=> ["x", "x", "x", "x"]
  *     a.fill("z", 2, 2)        #=> ["x", "x", "z", "z"]
  *     a.fill("y", 0..1)        #=> ["y", "y", "z", "z"]
- *     a.fill {|i| i*i}         #=> [0, 1, 4, 9]
- *     a.fill(-2) {|i| i*i*i}   #=> [0, 1, 8, 27]
+ *     a.fill { |i| i*i }       #=> [0, 1, 4, 9]
+ *     a.fill(-2) { |i| i*i*i } #=> [0, 1, 8, 27]
  */
 
 static VALUE
-rb_ary_fill(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 {
     VALUE item, arg1, arg2;
     long beg = 0, end = 0, len = 0;
-    VALUE *p, *pend;
-    int block_p = Qfalse;
+    int block_p = FALSE;
 
     if (rb_block_given_p()) {
-	block_p = Qtrue;
+	block_p = TRUE;
 	rb_scan_args(argc, argv, "02", &arg1, &arg2);
 	argc += 1;		/* hackish */
     }
@@ -2399,20 +3441,20 @@ rb_ary_fill(argc, argv, ary)
     switch (argc) {
       case 1:
 	beg = 0;
-	len = RARRAY(ary)->len;
+	len = RARRAY_LEN(ary);
 	break;
       case 2:
-	if (rb_range_beg_len(arg1, &beg, &len, RARRAY(ary)->len, 1)) {
+	if (rb_range_beg_len(arg1, &beg, &len, RARRAY_LEN(ary), 1)) {
 	    break;
 	}
 	/* fall through */
       case 3:
 	beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
 	if (beg < 0) {
-	    beg = RARRAY(ary)->len + beg;
+	    beg = RARRAY_LEN(ary) + beg;
 	    if (beg < 0) beg = 0;
 	}
-	len = NIL_P(arg2) ? RARRAY(ary)->len - beg : NUM2LONG(arg2);
+	len = NIL_P(arg2) ? RARRAY_LEN(ary) - beg : NUM2LONG(arg2);
 	break;
     }
     rb_ary_modify(ary);
@@ -2423,13 +3465,12 @@ rb_ary_fill(argc, argv, ary)
 	rb_raise(rb_eArgError, "argument too big");
     }
     end = beg + len;
-    if (end > RARRAY(ary)->len) {
-	if (end >= RARRAY(ary)->aux.capa) {
-	    REALLOC_N(RARRAY(ary)->ptr, VALUE, end);
-	    RARRAY(ary)->aux.capa = end;
+    if (RARRAY_LEN(ary) < end) {
+	if (end >= ARY_CAPA(ary)) {
+	    ary_resize_capa(ary, end);
 	}
-	rb_mem_clear(RARRAY(ary)->ptr + RARRAY(ary)->len, end - RARRAY(ary)->len);
-	RARRAY(ary)->len = end;
+	ary_mem_clear(ary, RARRAY_LEN(ary), end - RARRAY_LEN(ary));
+	ARY_SET_LEN(ary, end);
     }
 
     if (block_p) {
@@ -2438,76 +3479,86 @@ rb_ary_fill(argc, argv, ary)
 
 	for (i=beg; i<end; i++) {
 	    v = rb_yield(LONG2NUM(i));
-	    if (i>=RARRAY(ary)->len) break;
-	    RARRAY(ary)->ptr[i] = v;
+	    if (i>=RARRAY_LEN(ary)) break;
+	    RARRAY_ASET(ary, i, v);
 	}
     }
     else {
-	p = RARRAY(ary)->ptr + beg;
-	pend = p + len;
-	while (p < pend) {
-	    *p++ = item;
-	}
+	ary_memfill(ary, beg, len, item);
     }
     return ary;
 }
 
-/* 
+/*
  *  call-seq:
- *     array + other_array   -> an_array
+ *     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" ]
+ *
+ *  See also Array#concat.
  */
 
 VALUE
-rb_ary_plus(x, y)
-    VALUE x, y;
+rb_ary_plus(VALUE x, VALUE y)
 {
     VALUE z;
-    long len;
+    long len, xlen, ylen;
 
     y = to_ary(y);
-    len = RARRAY(x)->len + RARRAY(y)->len;
+    xlen = RARRAY_LEN(x);
+    ylen = RARRAY_LEN(y);
+    len = xlen + ylen;
     z = rb_ary_new2(len);
-    MEMCPY(RARRAY(z)->ptr, RARRAY(x)->ptr, VALUE, RARRAY(x)->len);
-    MEMCPY(RARRAY(z)->ptr + RARRAY(x)->len, RARRAY(y)->ptr, VALUE, RARRAY(y)->len);
-    RARRAY(z)->len = len;
+
+    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;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.concat(other_array)   ->  array
+ *     ary.concat(other_ary)   -> ary
+ *
+ *  Appends the elements of +other_ary+ to +self+.
  *
- *  Appends the elements in other_array to _self_.
- *  
  *     [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
+ *     a = [ 1, 2, 3 ]
+ *     a.concat( [ 4, 5 ] )
+ *     a                                 #=> [ 1, 2, 3, 4, 5 ]
+ *
+ *  See also Array#+.
  */
 
-
 VALUE
-rb_ary_concat(x, y)
-    VALUE x, y;
+rb_ary_concat(VALUE x, VALUE y)
 {
+    rb_ary_modify_check(x);
     y = to_ary(y);
-    if (RARRAY(y)->len > 0) {
-	rb_ary_splice(x, RARRAY(x)->len, 0, y);
+    if (RARRAY_LEN(y) > 0) {
+	rb_ary_splice(x, RARRAY_LEN(x), 0, y);
     }
     return x;
 }
 
 
-/* 
+/*
  *  call-seq:
- *     array * int     ->    an_array
- *     array * str     ->    a_string
+ *     ary * int     -> new_ary
+ *     ary * str     -> new_string
+ *
+ *  Repetition --- With a String argument, equivalent to
+ *  <code>ary.join(str)</code>.
  *
- *  Repetition---With a String argument, equivalent to
- *  self.join(str). Otherwise, returns a new array
- *  built by concatenating the _int_ copies of _self_.
+ *  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 ]
@@ -2516,11 +3567,11 @@ rb_ary_concat(x, y)
  */
 
 static VALUE
-rb_ary_times(ary, times)
-    VALUE ary, times;
+rb_ary_times(VALUE ary, VALUE times)
 {
     VALUE ary2, tmp;
-    long i, len;
+    const VALUE *ptr;
+    long t, len;
 
     tmp = rb_check_string_type(times);
     if (!NIL_P(tmp)) {
@@ -2528,37 +3579,50 @@ rb_ary_times(ary, times)
     }
 
     len = NUM2LONG(times);
-    if (len == 0) return ary_new(rb_obj_class(ary), 0);
+    if (len == 0) {
+	ary2 = ary_new(rb_obj_class(ary), 0);
+	goto out;
+    }
     if (len < 0) {
 	rb_raise(rb_eArgError, "negative argument");
     }
-    if (ARY_MAX_SIZE/len < RARRAY(ary)->len) {
+    if (ARY_MAX_SIZE/len < RARRAY_LEN(ary)) {
 	rb_raise(rb_eArgError, "argument too big");
     }
-    len *= RARRAY(ary)->len;
+    len *= RARRAY_LEN(ary);
 
     ary2 = ary_new(rb_obj_class(ary), len);
-    RARRAY(ary2)->len = len;
-
-    for (i=0; i<len; i+=RARRAY(ary)->len) {
-	MEMCPY(RARRAY(ary2)->ptr+i, RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    ARY_SET_LEN(ary2, len);
+
+    ptr = RARRAY_CONST_PTR(ary);
+    t = RARRAY_LEN(ary);
+    if (0 < t) {
+	ary_memcpy(ary2, 0, t, ptr);
+	while (t <= len/2) {
+	    ary_memcpy(ary2, t, t, RARRAY_CONST_PTR(ary2));
+            t *= 2;
+        }
+        if (t < len) {
+	    ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR(ary2));
+        }
     }
+  out:
     OBJ_INFECT(ary2, ary);
 
     return ary2;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.assoc(obj)   ->  an_array  or  nil
+ *     ary.assoc(obj)   -> new_ary  or  nil
+ *
+ *  Searches through an array whose elements are also arrays comparing +obj+
+ *  with the first element of each contained array using <code>obj.==</code>.
  *
- *  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>.
+ *  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" ]
@@ -2569,16 +3633,15 @@ rb_ary_times(ary, times)
  */
 
 VALUE
-rb_ary_assoc(ary, key)
-    VALUE ary, key;
+rb_ary_assoc(VALUE ary, VALUE key)
 {
     long i;
     VALUE v;
 
-    for (i = 0; i < RARRAY(ary)->len; ++i) {
-	v = rb_check_array_type(RARRAY(ary)->ptr[i]);
-	if (!NIL_P(v) && RARRAY(v)->len > 0 &&
-	    rb_equal(RARRAY(v)->ptr[0], key))
+    for (i = 0; i < RARRAY_LEN(ary); ++i) {
+	v = rb_check_array_type(RARRAY_AREF(ary, i));
+	if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
+	    rb_equal(RARRAY_AREF(v, 0), key))
 	    return v;
     }
     return Qnil;
@@ -2586,58 +3649,78 @@ rb_ary_assoc(ary, key)
 
 /*
  *  call-seq:
- *     array.rassoc(key) -> an_array or nil
- *  
- *  Searches through the array whose elements are also arrays. Compares
- *  <em>key</em> with the second element of each contained array using
- *  <code>==</code>. Returns the first contained array that matches. See
- *  also <code>Array#assoc</code>.
- *     
+ *     ary.rassoc(obj) -> new_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>.
+ *
+ *  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"]
  *     a.rassoc("four")   #=> nil
  */
 
 VALUE
-rb_ary_rassoc(ary, value)
-    VALUE ary, value;
+rb_ary_rassoc(VALUE ary, VALUE value)
 {
     long i;
     VALUE v;
 
-    for (i = 0; i < RARRAY(ary)->len; ++i) {
-	v = RARRAY(ary)->ptr[i];
-	if (TYPE(v) == T_ARRAY &&
-	    RARRAY(v)->len > 1 &&
-	    rb_equal(RARRAY(v)->ptr[1], value))
+    for (i = 0; i < RARRAY_LEN(ary); ++i) {
+	v = RARRAY_AREF(ary, i);
+	if (RB_TYPE_P(v, T_ARRAY) &&
+	    RARRAY_LEN(v) > 1 &&
+	    rb_equal(RARRAY_AREF(v, 1), value))
 	    return v;
     }
     return Qnil;
 }
 
-static VALUE recursive_equal _((VALUE, VALUE, int));
 static VALUE
-recursive_equal(ary1, ary2, recur)
-    VALUE ary1, ary2;
-    int recur;
-{
-    long i;
-
-    if (recur) return Qfalse;
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
-	    return Qfalse;
+recursive_equal(VALUE ary1, VALUE ary2, int recur)
+{
+    long i, len1;
+    const VALUE *p1, *p2;
+
+    if (recur) return Qtrue; /* Subtle! */
+
+    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;
 }
 
-/* 
+/*
  *  call-seq:
- *     array == other_array   ->   bool
+ *     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
@@ -2646,30 +3729,27 @@ recursive_equal(ary1, ary2, recur)
  */
 
 static VALUE
-rb_ary_equal(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_equal(VALUE ary1, VALUE ary2)
 {
     if (ary1 == ary2) return Qtrue;
-    if (TYPE(ary2) != T_ARRAY) {
+    if (!RB_TYPE_P(ary2, T_ARRAY)) {
 	if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
 	    return Qfalse;
 	}
 	return rb_equal(ary2, ary1);
     }
-    if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
-    return rb_exec_recursive(recursive_equal, ary1, ary2);
+    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);
 }
 
-static VALUE recursive_eql _((VALUE, VALUE, int));
 static VALUE
-recursive_eql(ary1, ary2, recur)
-    VALUE ary1, ary2;
-    int recur;
+recursive_eql(VALUE ary1, VALUE ary2, int recur)
 {
     long i;
 
-    if (recur) return Qfalse;
-    for (i=0; i<RARRAY(ary1)->len; i++) {
+    if (recur) return Qtrue; /* Subtle! */
+    for (i=0; i<RARRAY_LEN(ary1); i++) {
 	if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
 	    return Qfalse;
     }
@@ -2678,82 +3758,78 @@ recursive_eql(ary1, ary2, recur)
 
 /*
  *  call-seq:
- *     array.eql?(other)  -> true or false
+ *     ary.eql?(other)  -> true or false
  *
- *  Returns <code>true</code> if _array_ and _other_ are the same object,
- *  or are both arrays with the same content.
+ *  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(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_eql(VALUE ary1, VALUE ary2)
 {
     if (ary1 == ary2) return Qtrue;
-    if (TYPE(ary2) != T_ARRAY) return Qfalse;
-    if (RARRAY(ary1)->len != RARRAY(ary2)->len) return Qfalse;
-    return rb_exec_recursive(recursive_eql, ary1, ary2);
+    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);
 }
 
-static VALUE recursive_hash _((VALUE, VALUE, int));
 static VALUE
-recursive_hash(ary, dummy, recur)
-    VALUE ary;
-    VALUE dummy;
-    int recur;
+recursive_hash(VALUE ary, VALUE dummy, int recur)
 {
-    long i, h;
+    long i;
+    st_index_t h;
     VALUE n;
 
+    h = rb_hash_start(RARRAY_LEN(ary));
     if (recur) {
-	return LONG2FIX(0);
+	h = rb_hash_uint(h, NUM2LONG(rb_hash(rb_cArray)));
     }
-
-    h = RARRAY(ary)->len;
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	h = (h << 1) | (h<0 ? 1 : 0);
-	n = rb_hash(RARRAY(ary)->ptr[i]);
-	h ^= NUM2LONG(n);
+    else {
+	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);
 }
 
 /*
  *  call-seq:
- *     array.hash   -> fixnum
+ *     ary.hash   -> fixnum
+ *
+ *  Compute a hash-code for this array.
  *
- *  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>).
+ *  Two arrays with the same content will have the same hash code (and will
+ *  compare using #eql?).
  */
 
 static VALUE
-rb_ary_hash(ary)
-    VALUE ary;
+rb_ary_hash(VALUE ary)
 {
-    return rb_exec_recursive(recursive_hash, ary, 0);
+    return rb_exec_recursive_outer(recursive_hash, ary, 0);
 }
 
 /*
  *  call-seq:
- *     array.include?(obj)   -> true or false
- *  
- *  Returns <code>true</code> if the given object is present in
- *  <i>self</i> (that is, if any object <code>==</code> <i>anObject</i>),
- *  <code>false</code> otherwise.
- *     
+ *     ary.include?(object)   -> true or false
+ *
+ *  Returns +true+ if the given +object+ is present in +self+ (that is, if any
+ *  element <code>==</code> +object+), otherwise returns +false+.
+ *
  *     a = [ "a", "b", "c" ]
  *     a.include?("b")   #=> true
  *     a.include?("z")   #=> false
  */
 
 VALUE
-rb_ary_includes(ary, item)
-    VALUE ary;
-    VALUE item;
+rb_ary_includes(VALUE ary, VALUE item)
 {
     long i;
-    
-    for (i=0; i<RARRAY(ary)->len; i++) {
-	if (rb_equal(RARRAY(ary)->ptr[i], item)) {
+
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	if (rb_equal(RARRAY_AREF(ary, i), item)) {
 	    return Qtrue;
 	}
     }
@@ -2761,22 +3837,19 @@ rb_ary_includes(ary, item)
 }
 
 
-static VALUE recursive_cmp _((VALUE, VALUE, int));
 static VALUE
-recursive_cmp(ary1, ary2, recur)
-    VALUE ary1;
-    VALUE ary2;
-    int recur;
+recursive_cmp(VALUE ary1, VALUE ary2, int recur)
 {
     long i, len;
 
-    if (recur) return Qnil;
-    len = RARRAY(ary1)->len;
-    if (len > RARRAY(ary2)->len) {
-	len = RARRAY(ary2)->len;
+    if (recur) return Qundef;	/* Subtle! */
+    len = RARRAY_LEN(ary1);
+    if (len > RARRAY_LEN(ary2)) {
+	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;
 	}
@@ -2784,265 +3857,380 @@ recursive_cmp(ary1, ary2, recur)
     return Qundef;
 }
 
-/* 
+/*
  *  call-seq:
- *     array <=> other_array   ->  -1, 0, +1
+ *     ary <=> other_ary   ->  -1, 0, +1 or nil
+ *
+ *  Comparison --- Returns an integer (+-1+, +0+, or <code>+1</code>) if this
+ *  array is less than, equal to, or greater than +other_ary+.
+ *
+ *  +nil+ is returned if the two values are incomparable.
+ *
+ *  Each object in each array is compared (using the <=> operator).
+ *
+ *  Arrays are compared in an "element-wise" manner; the first two elements
+ *  that are not equal will determine the return value for the whole
+ *  comparison.
+ *
+ *  If all the values are equal, then the return 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.
  *
- *  Comparison---Returns an integer (-1, 0,
- *  or +1) if this array is less than, equal to, or greater than
- *  other_array.  Each object in each array is compared
- *  (using <=>). If any value isn't
- *  equal, then that inequality is the return value. If all the
- *  values found are equal, then the return is based on a
- *  comparison of the array lengths.  Thus, two arrays are
- *  ``equal'' according to <code>Array#<=></code> if and only if they have
- *  the same length and the value of each element is equal to the
- *  value of the corresponding element in the other array.
- *  
  *     [ "a", "a", "c" ]    <=> [ "a", "b", "c" ]   #=> -1
  *     [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ]            #=> +1
  *
  */
 
 VALUE
-rb_ary_cmp(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_cmp(VALUE ary1, VALUE ary2)
 {
     long len;
     VALUE v;
 
-    ary2 = to_ary(ary2);
+    ary2 = rb_check_array_type(ary2);
+    if (NIL_P(ary2)) return Qnil;
     if (ary1 == ary2) return INT2FIX(0);
-    v = rb_exec_recursive(recursive_cmp, ary1, ary2);
+    v = rb_exec_recursive_paired(recursive_cmp, ary1, ary2, ary2);
     if (v != Qundef) return v;
-    len = RARRAY(ary1)->len - RARRAY(ary2)->len;
+    len = RARRAY_LEN(ary1) - RARRAY_LEN(ary2);
     if (len == 0) return INT2FIX(0);
     if (len > 0) return INT2FIX(1);
     return INT2FIX(-1);
 }
 
 static VALUE
-ary_make_hash(ary1, ary2)
-    VALUE ary1, ary2;
+ary_add_hash(VALUE hash, VALUE ary)
 {
-    VALUE hash = rb_hash_new();
     long i;
 
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	rb_hash_aset(hash, RARRAY(ary1)->ptr[i], Qtrue);
+    for (i=0; i<RARRAY_LEN(ary); i++) {
+	rb_hash_aset(hash, RARRAY_AREF(ary, i), Qtrue);
     }
-    if (ary2) {
-	for (i=0; i<RARRAY(ary2)->len; i++) {
-	    rb_hash_aset(hash, RARRAY(ary2)->ptr[i], Qtrue);
+    return hash;
+}
+
+static inline VALUE
+ary_tmp_hash_new(void)
+{
+    VALUE hash = rb_hash_new();
+
+    RBASIC_CLEAR_CLASS(hash);
+    return hash;
+}
+
+static VALUE
+ary_make_hash(VALUE ary)
+{
+    VALUE hash = ary_tmp_hash_new();
+    return ary_add_hash(hash, ary);
+}
+
+static VALUE
+ary_add_hash_by(VALUE hash, VALUE ary)
+{
+    long i;
+
+    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);
 	}
     }
     return hash;
 }
 
-/* 
+static VALUE
+ary_make_hash_by(VALUE ary)
+{
+    VALUE hash = ary_tmp_hash_new();
+    return ary_add_hash_by(hash, ary);
+}
+
+static inline void
+ary_recycle_hash(VALUE hash)
+{
+    if (RHASH(hash)->ntbl) {
+	st_table *tbl = RHASH(hash)->ntbl;
+	RHASH(hash)->ntbl = 0;
+	st_free_table(tbl);
+    }
+}
+
+/*
  *  call-seq:
- *     array - other_array    -> an_array
+ *     ary - other_ary    -> new_ary
  *
- *  Array Difference---Returns a new array that is a copy of
- *  the original array, removing any items that also appear in
- *  other_array. (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(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_diff(VALUE ary1, VALUE ary2)
 {
     VALUE ary3;
     volatile VALUE hash;
     long i;
 
-    hash = ary_make_hash(to_ary(ary2), 0);
+    hash = ary_make_hash(to_ary(ary2));
     ary3 = rb_ary_new();
 
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	if (st_lookup(RHASH(hash)->tbl, RARRAY(ary1)->ptr[i], 0)) continue;
+    for (i=0; i<RARRAY_LEN(ary1); i++) {
+	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);
     return ary3;
 }
 
-/* 
+/*
  *  call-seq:
- *     array & other_array
+ *     ary & other_ary      -> new_ary
+ *
+ *  Set Intersection --- Returns a new array containing elements common to the
+ *  two arrays, excluding any duplicates. The order is preserved from the
+ *  original array.
+ *
+ *  It compares elements using their #hash and #eql? methods for efficiency.
  *
- *  Set Intersection---Returns a new array
- *  containing elements common to the two arrays, with no duplicates.
+ *     [ 1, 1, 3, 5 ] & [ 1, 2, 3 ]                 #=> [ 1, 3 ]
+ *     [ 'a', 'b', 'b', 'z' ] & [ 'a', 'b', 'c' ]   #=> [ 'a', 'b' ]
  *
- *     [ 1, 1, 3, 5 ] & [ 1, 2, 3 ]   #=> [ 1, 3 ]
+ *  See also Array#uniq.
  */
 
 
 static VALUE
-rb_ary_and(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_and(VALUE ary1, VALUE ary2)
 {
-    VALUE hash, ary3, v, vv;
+    VALUE hash, ary3, v;
+    st_table *table;
+    st_data_t vv;
     long i;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY(ary1)->len < RARRAY(ary2)->len ?
-	    RARRAY(ary1)->len : RARRAY(ary2)->len);
-    hash = ary_make_hash(ary2, 0);
-
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	v = vv = rb_ary_elt(ary1, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
+    ary3 = rb_ary_new();
+    if (RARRAY_LEN(ary2) == 0) return ary3;
+    hash = ary_make_hash(ary2);
+    table = rb_hash_tbl_raw(hash);
+
+    for (i=0; i<RARRAY_LEN(ary1); i++) {
+	v = RARRAY_AREF(ary1, i);
+	vv = (st_data_t)v;
+	if (st_delete(table, &vv, 0)) {
 	    rb_ary_push(ary3, v);
 	}
     }
+    ary_recycle_hash(hash);
 
     return ary3;
 }
 
-/* 
+/*
  *  call-seq:
- *     array | other_array     ->  an_array
+ *     ary | other_ary     -> new_ary
+ *
+ *  Set Union --- Returns a new array by joining +ary+ with +other_ary+,
+ *  excluding any duplicates and preserving the order from the original array.
+ *
+ *  It compares elements using their #hash and #eql? methods for efficiency.
  *
- *  Set Union---Returns a new array by joining this array with
- *  other_array, removing duplicates.
+ *     [ "a", "b", "c" ] | [ "c", "d", "a" ]    #=> [ "a", "b", "c", "d" ]
  *
- *     [ "a", "b", "c" ] | [ "c", "d", "a" ]
- *            #=> [ "a", "b", "c", "d" ]
+ *  See also Array#uniq.
  */
 
 static VALUE
-rb_ary_or(ary1, ary2)
-    VALUE ary1, ary2;
+rb_ary_or(VALUE ary1, VALUE ary2)
 {
     VALUE hash, ary3;
-    VALUE v, vv;
-    long i;
 
     ary2 = to_ary(ary2);
-    ary3 = rb_ary_new2(RARRAY(ary1)->len+RARRAY(ary2)->len);
-    hash = ary_make_hash(ary1, ary2);
-
-    for (i=0; i<RARRAY(ary1)->len; i++) {
-	v = vv = rb_ary_elt(ary1, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
-	    rb_ary_push(ary3, v);
-	}
-    }
-    for (i=0; i<RARRAY(ary2)->len; i++) {
-	v = vv = rb_ary_elt(ary2, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
-	    rb_ary_push(ary3, v);
-	}
-    }
+    hash = ary_add_hash(ary_make_hash(ary1), ary2);
+    ary3 = rb_hash_keys(hash);
+    ary_recycle_hash(hash);
     return ary3;
 }
 
+static int
+push_key(st_data_t key, st_data_t val, st_data_t ary)
+{
+    rb_ary_push((VALUE)ary, (VALUE)key);
+    return ST_CONTINUE;
+}
+
+static int
+push_value(st_data_t key, st_data_t val, st_data_t ary)
+{
+    rb_ary_push((VALUE)ary, (VALUE)val);
+    return ST_CONTINUE;
+}
+
 /*
  *  call-seq:
- *     array.uniq! -> array or nil
- *  
- *  Removes duplicate elements from _self_.
- *  Returns <code>nil</code> if no changes are made (that is, no
- *  duplicates are found).
- *     
+ *     ary.uniq!                -> ary or nil
+ *     ary.uniq! { |item| ... } -> ary or nil
+ *
+ *  Removes duplicate elements from +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.
+ *
+ *  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
+ *     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(ary)
-    VALUE ary;
+rb_ary_uniq_bang(VALUE ary)
 {
-    VALUE hash, v, vv;
-    long i, j;
+    VALUE hash;
+    long hash_size;
 
-    hash = ary_make_hash(ary, 0);
-
-    if (RARRAY(ary)->len == RHASH(hash)->tbl->num_entries) {
-	return Qnil;
+    rb_ary_modify_check(ary);
+    if (RARRAY_LEN(ary) <= 1)
+        return Qnil;
+    if (rb_block_given_p()) {
+	hash = ary_make_hash_by(ary);
+	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);
     }
-    for (i=j=0; i<RARRAY(ary)->len; i++) {
-	v = vv = rb_ary_elt(ary, i);
-	if (st_delete(RHASH(hash)->tbl, (st_data_t*)&vv, 0)) {
-	    rb_ary_store(ary, j++, v);
+    else {
+	hash = ary_make_hash(ary);
+	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_key, ary);
     }
-    RARRAY(ary)->len = j;
+    ary_recycle_hash(hash);
 
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.uniq   -> an_array
- *  
- *  Returns a new array by removing duplicate values in <i>self</i>.
- *     
+ *     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.
+ *
  *     a = [ "a", "a", "b", "b", "c" ]
- *     a.uniq   #=> ["a", "b", "c"]
+ *     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(ary)
-    VALUE ary;
+rb_ary_uniq(VALUE ary)
 {
-    ary = rb_ary_dup(ary);
-    rb_ary_uniq_bang(ary);
-    return ary;
+    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 = rb_hash_values(hash);
+    }
+    else {
+	hash = ary_make_hash(ary);
+	uniq = rb_hash_keys(hash);
+    }
+    RBASIC_SET_CLASS(uniq, rb_obj_class(ary));
+    ary_recycle_hash(hash);
+
+    return uniq;
 }
 
-/* 
+/*
  *  call-seq:
- *     array.compact!    ->   array  or  nil
+ *     ary.compact!    -> ary  or  nil
+ *
+ *  Removes +nil+ elements from the array.
  *
- *  Removes +nil+ elements from array.
- *  Returns +nil+ if no changes were made.
+ *  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
  */
 
 static VALUE
-rb_ary_compact_bang(ary)
-    VALUE ary;
+rb_ary_compact_bang(VALUE ary)
 {
     VALUE *p, *t, *end;
+    long n;
 
     rb_ary_modify(ary);
-    p = t = RARRAY(ary)->ptr;
-    end = p + RARRAY(ary)->len;
-    
+    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++;
     }
-    if (RARRAY(ary)->len == (p - RARRAY(ary)->ptr)) {
+    n = p - RARRAY_CONST_PTR(ary);
+    if (RARRAY_LEN(ary) == n) {
 	return Qnil;
     }
-    RARRAY(ary)->len = RARRAY(ary)->aux.capa = (p - RARRAY(ary)->ptr);
-    REALLOC_N(RARRAY(ary)->ptr, VALUE, RARRAY(ary)->len);
+    ary_resize_smaller(ary, n);
 
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.compact     ->  an_array
+ *     ary.compact     -> new_ary
  *
- *  Returns a copy of _self_ with all +nil+ elements removed.
+ *  Returns a copy of +self+ with all +nil+ elements removed.
  *
  *     [ "a", nil, "b", nil, "c", nil ].compact
  *                       #=> [ "a", "b", "c" ]
  */
 
 static VALUE
-rb_ary_compact(ary)
-    VALUE ary;
+rb_ary_compact(VALUE ary)
 {
     ary = rb_ary_dup(ary);
     rb_ary_compact_bang(ary);
@@ -3051,72 +4239,50 @@ rb_ary_compact(ary)
 
 /*
  *  call-seq:
- *     array.nitems -> int
- *  
- *  Returns the number of non-<code>nil</code> elements in _self_.
+ *     ary.count                   -> int
+ *     ary.count(obj)              -> int
+ *     ary.count { |item| block }  -> int
  *
- *  May be zero.
- *     
- *     [ 1, nil, 3, nil, 5 ].nitems   #=> 3
- */
-
-static VALUE
-rb_ary_nitems(ary)
-    VALUE ary;
-{
-    long n = 0;
-    VALUE *p, *pend;
-
-    for (p = RARRAY(ary)->ptr, pend = p + RARRAY(ary)->len; p < pend; p++) {
-	if (!NIL_P(*p)) n++;
-    }
-    return LONG2NUM(n);
-}
-
-/*
- *  call-seq:
- *     array.count      -> int
- *     array.count(obj) -> int
- *     array.count { |item| block }  -> int
- *  
- *  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(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+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++;
 	}
     }
 
@@ -3124,10 +4290,7 @@ rb_ary_count(argc, argv, ary)
 }
 
 static VALUE
-flatten(ary, level, modified)
-    VALUE ary;
-    int level;
-    int *modified;
+flatten(VALUE ary, int level, int *modified)
 {
     long i = 0;
     VALUE stack, result, tmp, elt;
@@ -3141,13 +4304,13 @@ flatten(ary, level, modified)
     *modified = 0;
 
     while (1) {
-	while (i < RARRAY(ary)->len) {
-	    elt = RARRAY(ary)->ptr[i++];
+	while (i < RARRAY_LEN(ary)) {
+	    elt = RARRAY_AREF(ary, i++);
 	    tmp = rb_check_array_type(elt);
 	    if (RBASIC(result)->klass) {
 		rb_raise(rb_eRuntimeError, "flatten reentered");
 	    }
-	    if (NIL_P(tmp) || (level >= 0 && RARRAY(stack)->len / 2 >= level)) {
+	    if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) {
 		rb_ary_push(result, elt);
 	    }
 	    else {
@@ -3164,7 +4327,7 @@ flatten(ary, level, modified)
 		i = 0;
 	    }
 	}
-	if (RARRAY(stack)->len == 0) {
+	if (RARRAY_LEN(stack) == 0) {
 	    break;
 	}
 	id = (st_data_t)ary;
@@ -3176,20 +4339,22 @@ flatten(ary, level, modified)
 
     st_free_table(memo);
 
-    RBASIC(result)->klass = rb_class_of(ary);
+    RBASIC_SET_CLASS(result, rb_class_of(ary));
     return result;
 }
 
 /*
  *  call-seq:
- *     array.flatten! -> array or nil
- *     array.flatten!(level) -> array or nil
- *  
- *  Flattens _self_ in place.
- *  Returns <code>nil</code> if no modifications were made (i.e.,
- *  <i>array</i> contains no subarrays.)  If the optional <i>level</i>
- *  argument determines the level of recursion to flatten.
- *     
+ *     ary.flatten!        -> ary or nil
+ *     ary.flatten!(level) -> ary or nil
+ *
+ *  Flattens +self+ in place.
+ *
+ *  Returns +nil+ if no modifications were made (i.e., the array contains no
+ *  subarrays.)
+ *
+ *  The optional +level+ argument determines the level of recursion to flatten.
+ *
  *     a = [ 1, 2, [3, [4, 5] ] ]
  *     a.flatten!   #=> [1, 2, 3, 4, 5]
  *     a.flatten!   #=> nil
@@ -3199,35 +4364,42 @@ flatten(ary, level, modified)
  */
 
 static VALUE
-rb_ary_flatten_bang(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
 {
     int mod = 0, level = -1;
     VALUE result, lv;
 
     rb_scan_args(argc, argv, "01", &lv);
+    rb_ary_modify_check(ary);
     if (!NIL_P(lv)) level = NUM2INT(lv);
-    if (level == 0) return ary;
+    if (level == 0) return Qnil;
 
     result = flatten(ary, level, &mod);
-    if (mod == 0) return Qnil;
+    if (mod == 0) {
+	ary_discard(result);
+	return Qnil;
+    }
+    if (!(mod = ARY_EMBED_P(result))) rb_obj_freeze(result);
     rb_ary_replace(ary, result);
+    if (mod) ARY_SET_EMBED_LEN(result, 0);
 
     return ary;
 }
 
 /*
  *  call-seq:
- *     array.flatten -> an_array
- *     array.flatten(level) -> an_array
- *  
- *  Returns a new array that is a one-dimensional flattening of this
- *  array (recursively). That is, for every element that is an array,
- *  extract its elements into the new array.  If the optional
- *  <i>level</i> argument determines the level of recursion to flatten.
- *     
+ *     ary.flatten -> new_ary
+ *     ary.flatten(level) -> new_ary
+ *
+ *  Returns a new array that is a one-dimensional flattening of +self+
+ *  (recursively).
+ *
+ *  That is, for every element that is an array, extract its elements into
+ *  the new array.
+ *
+ *  The optional +level+ argument determines the level of recursion to
+ *  flatten.
+ *
  *     s = [ 1, 2, 3 ]           #=> [1, 2, 3]
  *     t = [ 4, 5, 6, [7, 8] ]   #=> [4, 5, 6, [7, 8]]
  *     a = [ s, t, 9, 10 ]       #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
@@ -3237,117 +4409,255 @@ rb_ary_flatten_bang(argc, argv, ary)
  */
 
 static VALUE
-rb_ary_flatten(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
 {
     int mod = 0, level = -1;
     VALUE result, lv;
 
     rb_scan_args(argc, argv, "01", &lv);
     if (!NIL_P(lv)) level = NUM2INT(lv);
-    if (level == 0) return ary;
+    if (level == 0) return ary_make_shared_copy(ary);
 
     result = flatten(ary, level, &mod);
-    if (OBJ_TAINTED(ary)) OBJ_TAINT(result);
+    OBJ_INFECT(result, ary);
 
     return result;
 }
 
+#define OPTHASH_GIVEN_P(opts) \
+    (argc > 0 && !NIL_P((opts) = rb_check_hash_type(argv[argc-1])) && (--argc, 1))
+static VALUE sym_random;
+
+#define RAND_UPTO(max) (long)rb_random_ulong_limited((randgen), (max)-1)
+
 /*
  *  call-seq:
- *     array.shuffle!        -> array or nil
- *  
- *  Shuffles elements in _self_ in place.
+ *     ary.shuffle!              -> ary
+ *     ary.shuffle!(random: rng) -> ary
+ *
+ *  Shuffles elements in +self+ in place.
+ *
+ *  The optional +rng+ argument will be used as the random number generator.
  */
 
-
 static VALUE
-rb_ary_shuffle_bang(ary)
-    VALUE ary;
+rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
 {
-    long i = RARRAY(ary)->len;
+    VALUE opts, randgen = rb_cRandom;
+    long i, len;
 
-    rb_ary_modify(ary);
-    while (i) {
-	long j = rb_genrand_real()*i;
-	VALUE tmp = RARRAY(ary)->ptr[--i];
-	RARRAY(ary)->ptr[i] = RARRAY(ary)->ptr[j];
-	RARRAY(ary)->ptr[j] = tmp;
+    if (OPTHASH_GIVEN_P(opts)) {
+	randgen = rb_hash_lookup2(opts, sym_random, randgen);
     }
+    rb_check_arity(argc, 0, 0);
+    rb_ary_modify(ary);
+    i = len = RARRAY_LEN(ary);
+    RARRAY_PTR_USE(ary, ptr, {
+	while (i) {
+	    long j = RAND_UPTO(i);
+	    VALUE tmp;
+	    if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR(ary)) {
+		rb_raise(rb_eRuntimeError, "modified during shuffle");
+	    }
+	    tmp = ptr[--i];
+	    ptr[i] = ptr[j];
+	    ptr[j] = tmp;
+	}
+    }); /* WB: no new reference */
     return ary;
 }
 
 
 /*
  *  call-seq:
- *     array.shuffle -> an_array
- *  
- *  Returns a new array with elements of this array shuffled.
- *     
+ *     ary.shuffle              -> new_ary
+ *     ary.shuffle(random: rng) -> new_ary
+ *
+ *  Returns a new array with elements of +self+ shuffled.
+ *
  *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
  *     a.shuffle                 #=> [2, 3, 1]
+ *
+ *  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(VALUE ary)
+rb_ary_shuffle(int argc, VALUE *argv, VALUE ary)
 {
     ary = rb_ary_dup(ary);
-    rb_ary_shuffle_bang(ary);
+    rb_ary_shuffle_bang(argc, argv, ary);
     return ary;
 }
 
 
 /*
  *  call-seq:
- *     array.choice        -> obj
- *  
- *  Choose a random element from an array.
+ *     ary.sample                  -> obj
+ *     ary.sample(random: rng)     -> obj
+ *     ary.sample(n)               -> new_ary
+ *     ary.sample(n, random: rng)  -> new_ary
+ *
+ *  Choose a random element or +n+ random elements from the array.
+ *
+ *  The elements are chosen by using random and unique indices into the array
+ *  in order to ensure that an element doesn't repeat itself unless the array
+ *  already contained duplicate elements.
+ *
+ *  If the array is empty the first form returns +nil+ and the second form
+ *  returns an empty array.
+ *
+ *  The optional +rng+ argument will be used as the random number generator.
+ *
+ *     a = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+ *     a.sample         #=> 7
+ *     a.sample(4)      #=> [6, 4, 2, 5]
  */
 
 
 static VALUE
-rb_ary_choice(ary)
-    VALUE ary;
+rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 {
-    long i, j;
+    VALUE nv, result;
+    VALUE opts, randgen = rb_cRandom;
+    long n, len, i, j, k, idx[10];
+    long rnds[numberof(idx)];
+
+    if (OPTHASH_GIVEN_P(opts)) {
+	randgen = rb_hash_lookup2(opts, sym_random, randgen);
+    }
+    len = RARRAY_LEN(ary);
+    if (argc == 0) {
+	if (len < 2)
+	    i = 0;
+	else
+	    i = RAND_UPTO(len);
+
+	return rb_ary_elt(ary, i);
+    }
+    rb_scan_args(argc, argv, "1", &nv);
+    n = NUM2LONG(nv);
+    if (n < 0) rb_raise(rb_eArgError, "negative sample number");
+    if (n > len) n = len;
+    if (n <= numberof(idx)) {
+	for (i = 0; i < n; ++i) {
+	    rnds[i] = RAND_UPTO(len - i);
+	}
+    }
+    k = len;
+    len = RARRAY_LEN(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_new_capa(0);
+      case 1:
+	i = rnds[0];
+	return rb_ary_new_from_values(1, &RARRAY_AREF(ary, i));
+      case 2:
+	i = rnds[0];
+	j = rnds[1];
+	if (j >= i) j++;
+	return rb_ary_new_from_args(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j));
+      case 3:
+	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_new_from_args(3, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j), RARRAY_AREF(ary, k));
+    }
+    if (n <= numberof(idx)) {
+	long sorted[numberof(idx)];
+	sorted[0] = idx[0] = rnds[0];
+	for (i=1; i<n; i++) {
+	    k = rnds[i];
+	    for (j = 0; j < i; ++j) {
+		if (k < sorted[j]) break;
+		++k;
+	    }
+	    memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j));
+	    sorted[j] = idx[i] = k;
+	}
+	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 {
+	result = rb_ary_dup(ary);
+	RBASIC_CLEAR_CLASS(result);
+	RB_GC_GUARD(ary);
+	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);
 
-    i = RARRAY(ary)->len;
-    if (i == 0) return Qnil;
-    j = rb_genrand_real()*i;
-    return RARRAY(ary)->ptr[j];
+    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 {|obj| block }
- *     ary.cycle(n) {|obj| block }
- *  
- *  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.
- *     
+ *     ary.cycle(n=nil) { |obj| block }  -> nil
+ *     ary.cycle(n=nil)                  -> Enumerator
+ *
+ *  Calls the given block for each element +n+ times or forever if +nil+ is
+ *  given.
+ *
+ *  Does nothing if a non-positive number is given or the array is empty.
+ *
+ *  Returns +nil+ if the loop has finished without getting interrupted.
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
  *     a = ["a", "b", "c"]
- *     a.cycle {|x| puts x }  # print, a, b, c, a, b, c,.. forever.
- *     a.cycle(2) {|x| puts x }  # print, a, b, c, a, b, c.
- *     
+ *     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.
+ *
  */
 
 static VALUE
-rb_ary_cycle(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
 {
     long n, i;
     VALUE nv = Qnil;
 
     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;
     }
@@ -3356,22 +4666,27 @@ rb_ary_cycle(argc, argv, ary)
         if (n <= 0) return Qnil;
     }
 
-    while (RARRAY(ary)->len > 0 && (n < 0 || 0 < n--)) {
-        for (i=0; i<RARRAY(ary)->len; i++) {
-            rb_yield(RARRAY(ary)->ptr[i]);
+    while (RARRAY_LEN(ary) > 0 && (n < 0 || 0 < n--)) {
+        for (i=0; i<RARRAY_LEN(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_SET_CLASS_RAW(s, rb_cString))
+#define tmpary(n) rb_ary_tmp_new(n)
+#define tmpary_discard(a) (ary_discard(a), RBASIC_SET_CLASS_RAW(a, rb_cArray))
 
 /*
- * Recursively compute permutations of r elements of the set [0..n-1].
+ * Recursively compute permutations of +r+ elements of the set
+ * <code>[0..n-1]</code>.
+ *
  * When we have a complete permutation of array indexes, copy the values
- * at those indexes into a new array and yield that array. 
+ * at those indexes into a new array and yield that array.
  *
- * n: the size of the set 
+ * 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
@@ -3379,10 +4694,7 @@ rb_ary_cycle(argc, argv, ary)
  * values: the Ruby array that holds the actual values to permute
  */
 static void
-permute0(n, r, p, index, used, values)
-    long n, r, *p, index;
-    int *used;
-    VALUE values;
+permute0(long n, long r, long *p, long index, char *used, VALUE values)
 {
     long i,j;
     for (i = 0; i < n; i++) {
@@ -3391,7 +4703,7 @@ permute0(n, r, p, index, used, values)
 	    if (index < r-1) {             /* if not done yet */
 		used[i] = 1;               /* mark index used */
 		permute0(n, r, p, index+1, /* recurse */
-			 used, values);  
+			 used, values);
 		used[i] = 0;               /* index unused */
 	    }
 	    else {
@@ -3399,117 +4711,149 @@ permute0(n, r, p, index, used, values)
 		/* Build a ruby array of the corresponding values */
 		/* And yield it to the associated block */
 		VALUE result = rb_ary_new2(r);
-		VALUE *result_array = RARRAY(result)->ptr;
-		const VALUE *values_array = RARRAY(values)->ptr;
+		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]];
-		RARRAY(result)->len = r;
+		ARY_SET_LEN(result, r);
 		rb_yield(result);
+		if (RBASIC(values)->klass) {
+		    rb_raise(rb_eRuntimeError, "permute reentered");
+		}
 	    }
 	}
     }
 }
 
 /*
+ * 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 }          -> array
- *     ary.permutation                        -> enumerator
- *     ary.permutation(n) { |p| block }       -> array
- *     ary.permutation(n)                     -> enumerator
- *  
- * 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.
+ *     ary.permutation { |p| block }          -> ary
+ *     ary.permutation                        -> Enumerator
+ *     ary.permutation(n) { |p| block }       -> ary
+ *     ary.permutation(n)                     -> Enumerator
+ *
+ * When invoked with a block, yield all permutations of length +n+ of the
+ * elements of the array, then return the array itself.
+ *
+ * If +n+ is not specified, yield all permutations of all elements.
+ *
+ * The implementation makes no guarantees about the order in which the
+ * permutations are yielded.
+ *
+ * If no block is given, an Enumerator is returned instead.
  *
- * When invoked without a block, return an enumerator object 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
-rb_ary_permutation(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
 {
     VALUE num;
     long r, n, i;
 
-    n = RARRAY(ary)->len;                  /* Array length */
-    RETURN_ENUMERATOR(ary, argc, argv);   /* Return enumerator if no block */
+    n = RARRAY_LEN(ary);                  /* Array length */
+    RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_permutation_size);   /* Return enumerator if no block */
     rb_scan_args(argc, argv, "01", &num);
     r = NIL_P(num) ? n : NUM2LONG(num);   /* Permutation size from argument */
 
-    if (r < 0 || n < r) { 
+    if (r < 0 || n < r) {
 	/* no permutations: yield nothing */
     }
     else if (r == 0) { /* exactly one permutation: the zero-length array */
 	rb_yield(rb_ary_new2(0));
     }
     else if (r == 1) { /* this is a special, easy case */
-	for (i = 0; i < RARRAY(ary)->len; i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY(ary)->ptr[i]));
+	for (i = 0; i < RARRAY_LEN(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(t0)->ptr;
-	volatile VALUE t1 = tmpbuf(n,sizeof(int));
-	int *used = (int*)RSTRING(t1)->ptr;
-	VALUE ary0 = ary_make_shared(ary); /* private defensive copy of ary */
+	long *p = (long*)RSTRING_PTR(t0);
+	volatile VALUE t1 = tmpbuf(n,sizeof(char));
+	char *used = (char*)RSTRING_PTR(t1);
+	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+	RBASIC_CLEAR_CLASS(ary0);
 
-	for (i = 0; i < n; i++) used[i] = 0; /* initialize array */
+	MEMZERO(used, char, n); /* initialize array */
 
 	permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */
-	RB_GC_GUARD(t0);
-	RB_GC_GUARD(t1);
+	tmpbuf_discard(t0);
+	tmpbuf_discard(t1);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
-static long
-combi_len(n, k)
-    long n, k;
+static VALUE
+rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj)
 {
-    long i, val = 1;
+    long n = RARRAY_LEN(ary);
+    long k = NUM2LONG(RARRAY_AREF(args, 0));
 
-    if (k*2 > n) k = n-k;
-    if (k == 0) return 1;
-    if (k < 0) return 0;
-    val = 1;
-    for (i=1; i <= k; i++,n--) {
-	long m = val;
-	val *= n;
-	if (val < m) {
-	    rb_raise(rb_eRangeError, "too big for combination");
-	}
-	val /= i;
-    }
-    return val;
+    return binomial_coefficient(k, n);
 }
 
 /*
  *  call-seq:
  *     ary.combination(n) { |c| block }    -> ary
- *     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 without a block, returns an enumerator object instead.
- *     
+ *     ary.combination(n)                  -> Enumerator
+ *
+ * When invoked with a block, yields all combinations of length +n+ of elements
+ * from the array and then returns the array itself.
+ *
+ * The implementation makes no guarantees about the order in which the
+ * combinations are yielded.
+ *
+ * If no block is given, an Enumerator is returned instead.
+ *
  * Examples:
  *
  *     a = [1, 2, 3, 4]
@@ -3519,19 +4863,17 @@ combi_len(n, k)
  *     a.combination(4).to_a  #=> [[1,2,3,4]]
  *     a.combination(0).to_a  #=> [[]] # one combination of length 0
  *     a.combination(5).to_a  #=> []   # no combinations of length 5
- *     
+ *
  */
 
 static VALUE
-rb_ary_combination(ary, num)
-    VALUE ary;
-    VALUE num;
+rb_ary_combination(VALUE ary, VALUE num)
 {
     long n, i, len;
 
     n = NUM2LONG(num);
-    RETURN_ENUMERATOR(ary, 1, &num);
-    len = RARRAY(ary)->len;
+    RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_combination_size);
+    len = RARRAY_LEN(ary);
     if (n < 0 || len < n) {
 	/* yield nothing */
     }
@@ -3540,88 +4882,315 @@ rb_ary_combination(ary, num)
     }
     else if (n == 1) {
 	for (i = 0; i < len; i++) {
-	    rb_yield(rb_ary_new3(1, RARRAY(ary)->ptr[i]));
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
 	}
     }
     else {
 	volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
-	long *stack = (long*)RSTRING(t0)->ptr;
-	long nlen = combi_len(len, n);
-	volatile VALUE cc = rb_ary_new2(n);
-	VALUE *chosen = RARRAY(cc)->ptr;
+	long *stack = (long*)RSTRING_PTR(t0);
+	volatile VALUE cc = tmpary(n);
+	VALUE *chosen = RARRAY_PTR(cc);
 	long lev = 0;
 
-	RBASIC(cc)->klass = 0;
 	MEMZERO(stack, long, n);
 	stack[0] = -1;
-	for (i = 0; i < nlen; i++) {
-	    chosen[lev] = RARRAY(ary)->ptr[stack[lev+1]];
+	for (;;) {
+	    chosen[lev] = RARRAY_AREF(ary, stack[lev+1]);
 	    for (lev++; lev < n; lev++) {
-		chosen[lev] = RARRAY(ary)->ptr[stack[lev+1] = stack[lev]+1];
+		chosen[lev] = RARRAY_AREF(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 (lev && (stack[lev+1]+n == len+lev+1));
+	    } while (stack[lev+1]+n == len+lev+1);
 	}
+    done:
+	tmpbuf_discard(t0);
+	tmpary_discard(cc);
     }
     return ary;
 }
 
 /*
+ * Recursively compute repeated permutations of +r+ elements of the set
+ * <code>[0..n-1]</code>.
+ *
+ * When we have a complete repeated permutation of array indexes, copy the
+ * values at those indexes 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)
+{
+    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 */
+	}
+	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) {
+		rb_raise(rb_eRuntimeError, "repeated permute reentered");
+	    }
+	}
+    }
+}
+
+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.product(other_ary, ...)
- *  
+ *     ary.repeated_permutation(n) { |p| block } -> ary
+ *     ary.repeated_permutation(n)               -> Enumerator
+ *
+ * When invoked with a block, yield all repeated permutations of length +n+ of
+ * the elements of the array, then return the array itself.
+ *
+ * The implementation makes no guarantees about the order in which the repeated
+ * permutations are yielded.
+ *
+ * If no block is given, an Enumerator is returned instead.
+ *
+ * Examples:
+ *
+ *     a = [1, 2]
+ *     a.repeated_permutation(1).to_a  #=> [[1], [2]]
+ *     a.repeated_permutation(2).to_a  #=> [[1,1],[1,2],[2,1],[2,2]]
+ *     a.repeated_permutation(3).to_a  #=> [[1,1,1],[1,1,2],[1,2,1],[1,2,2],
+ *                                     #    [2,1,1],[2,1,2],[2,2,1],[2,2,2]]
+ *     a.repeated_permutation(0).to_a  #=> [[]] # one permutation of length 0
+ */
+
+static VALUE
+rb_ary_repeated_permutation(VALUE ary, VALUE num)
+{
+    long r, n, i;
+
+    n = RARRAY_LEN(ary);                  /* Array length */
+    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) {
+	/* no permutations: yield nothing */
+    }
+    else if (r == 0) { /* exactly one permutation: the zero-length array */
+	rb_yield(rb_ary_new2(0));
+    }
+    else if (r == 1) { /* this is a special, easy case */
+	for (i = 0; i < RARRAY_LEN(ary); i++) {
+	    rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i)));
+	}
+    }
+    else {             /* this is the general case */
+	volatile VALUE t0 = tmpbuf(r, sizeof(long));
+	long *p = (long*)RSTRING_PTR(t0);
+	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+	RBASIC_CLEAR_CLASS(ary0);
+
+	rpermute0(n, r, p, 0, ary0); /* compute and yield repeated permutations */
+	tmpbuf_discard(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)
+{
+    long j;
+    if (rest > 0) {
+	for (; index < n; ++index) {
+	    p[r-rest] = index;
+	    rcombinate0(n, r, p, index, rest-1, values);
+	}
+    }
+    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");
+	}
+    }
+}
+
+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)               -> Enumerator
+ *
+ * When invoked with a block, yields all repeated combinations of length +n+ of
+ * elements from the array and then returns the array itself.
+ *
+ * The implementation makes no guarantees about the order in which the repeated
+ * combinations are yielded.
+ *
+ * If no block is given, an Enumerator is returned instead.
+ *
+ * Examples:
+ *
+ *   a = [1, 2, 3]
+ *   a.repeated_combination(1).to_a  #=> [[1], [2], [3]]
+ *   a.repeated_combination(2).to_a  #=> [[1,1],[1,2],[1,3],[2,2],[2,3],[3,3]]
+ *   a.repeated_combination(3).to_a  #=> [[1,1,1],[1,1,2],[1,1,3],[1,2,2],[1,2,3],
+ *                                   #    [1,3,3],[2,2,2],[2,2,3],[2,3,3],[3,3,3]]
+ *   a.repeated_combination(4).to_a  #=> [[1,1,1,1],[1,1,1,2],[1,1,1,3],[1,1,2,2],[1,1,2,3],
+ *                                   #    [1,1,3,3],[1,2,2,2],[1,2,2,3],[1,2,3,3],[1,3,3,3],
+ *                                   #    [2,2,2,2],[2,2,2,3],[2,2,3,3],[2,3,3,3],[3,3,3,3]]
+ *   a.repeated_combination(0).to_a  #=> [[]] # one combination of length 0
+ *
+ */
+
+static VALUE
+rb_ary_repeated_combination(VALUE ary, VALUE num)
+{
+    long n, i, len;
+
+    n = NUM2LONG(num);                 /* Combination size from argument */
+    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 */
+    }
+    else if (n == 0) {
+	rb_yield(rb_ary_new2(0));
+    }
+    else if (n == 1) {
+	for (i = 0; i < len; 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);
+	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+	RBASIC_CLEAR_CLASS(ary0);
+
+	rcombinate0(len, n, p, 0, n, ary0); /* compute and yield repeated combinations */
+	tmpbuf_discard(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
+    }
+    return ary;
+}
+
+/*
+ *  call-seq:
+ *     ary.product(other_ary, ...)                -> new_ary
+ *     ary.product(other_ary, ...) { |p| block }  -> ary
+ *
  *  Returns an array of all combinations of elements from all arrays.
- *  The length of the returned array is the product of the length
- *  of ary and the argument arrays
- *     
- *     [1,2,3].product([4,5])     # => [[1,4],[1,5],[2,4],[2,5],[3,4],[3,5]]
- *     [1,2].product([1,2])       # => [[1,1],[1,2],[2,1],[2,2]]
- *     [1,2].product([3,4],[5,6]) # => [[1,3,5],[1,3,6],[1,4,5],[1,4,6],
+ *
+ *  The length of the returned array is the product of the length of +self+ and
+ *  the argument arrays.
+ *
+ *  If given a block, #product will yield all combinations and return +self+
+ *  instead.
+ *
+ *     [1,2,3].product([4,5])     #=> [[1,4],[1,5],[2,4],[2,5],[3,4],[3,5]]
+ *     [1,2].product([1,2])       #=> [[1,1],[1,2],[2,1],[2,2]]
+ *     [1,2].product([3,4],[5,6]) #=> [[1,3,5],[1,3,6],[1,4,5],[1,4,6],
  *                                #     [2,3,5],[2,3,6],[2,4,5],[2,4,6]]
- *     [1,2].product()            # => [[1],[2]]
- *     [1,2].product([])          # => []
+ *     [1,2].product()            #=> [[1],[2]]
+ *     [1,2].product([])          #=> []
  */
 
 static VALUE
-rb_ary_product(argc, argv, ary)
-    int argc;
-    VALUE *argv;
-    VALUE ary;
+rb_ary_product(int argc, VALUE *argv, VALUE ary)
 {
     int n = argc+1;    /* How many arrays we're operating on */
-    volatile VALUE t0 = tmpbuf(n, sizeof(VALUE));
+    volatile VALUE t0 = tmpary(n);
     volatile VALUE t1 = tmpbuf(n, sizeof(int));
-    VALUE *arrays = (VALUE*)RSTRING(t0)->ptr; /* The arrays we're computing the product of */
-    int *counters = (int*)RSTRING(t1)->ptr; /* The current position in each one */
-    VALUE result;      /* The array we'll be returning */
+    VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */
+    int *counters = (int*)RSTRING_PTR(t1); /* The current position in each one */
+    VALUE result = Qnil;      /* The array we'll be returning, when no block given */
     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);
     arrays[0] = ary;
+    for (i = 1; i < n; i++) arrays[i] = Qnil;
     for (i = 1; i < n; i++) arrays[i] = to_ary(argv[i-1]);
-    
+
     /* initialize the counters for the arrays */
     for (i = 0; i < n; i++) counters[i] = 0;
 
-    /* Compute the length of the result array; return [] if any is empty */
-    for (i = 0; i < n; i++) {
-	long k = RARRAY(arrays[i])->len, l = resultlen;
-	if (k == 0) return rb_ary_new2(0);
-	resultlen *= k;
-	if (resultlen < k || resultlen < l || resultlen / k != l) {
-	    rb_raise(rb_eRangeError, "too big to product");
+    /* Otherwise, allocate and fill in an array of results */
+    if (rb_block_given_p()) {
+	/* Make defensive copies of arrays; exit if any is empty */
+	for (i = 0; i < n; i++) {
+	    if (RARRAY_LEN(arrays[i]) == 0) goto done;
+	    arrays[i] = ary_make_shared_copy(arrays[i]);
 	}
     }
-
-    /* Otherwise, allocate and fill in an array of results */
-    result = rb_ary_new2(resultlen);
-    for (i = 0; i < resultlen; i++) {
+    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]);
+	    if (k == 0) {
+		result = rb_ary_new2(0);
+		goto done;
+	    }
+            if (MUL_OVERFLOW_LONG_P(resultlen, k))
+		rb_raise(rb_eRangeError, "too big to product");
+	    resultlen *= k;
+	}
+	result = rb_ary_new2(resultlen);
+    }
+    for (;;) {
 	int m;
 	/* fill in one subarray */
 	VALUE subarray = rb_ary_new2(n);
@@ -3630,7 +5199,19 @@ rb_ary_product(argc, argv, ary)
 	}
 
 	/* put it on the result array */
-	rb_ary_push(result, subarray);
+	if (NIL_P(result)) {
+	    FL_SET(t0, FL_USER5);
+	    rb_yield(subarray);
+	    if (! FL_TEST(t0, FL_USER5)) {
+		rb_raise(rb_eRuntimeError, "product reentered");
+	    }
+	    else {
+		FL_UNSET(t0, FL_USER5);
+	    }
+	}
+	else {
+	    rb_ary_push(result, subarray);
+	}
 
 	/*
 	 * Increment the last counter.  If it overflows, reset to 0
@@ -3638,81 +5219,92 @@ rb_ary_product(argc, argv, ary)
 	 */
 	m = n-1;
 	counters[m]++;
-	while (m > 0 && counters[m] == RARRAY(arrays[m])->len) {
+	while (counters[m] == RARRAY_LEN(arrays[m])) {
 	    counters[m] = 0;
-	    m--;
+	    /* If the first counter overflows, we are done */
+	    if (--m < 0) goto done;
 	    counters[m]++;
 	}
     }
+done:
+    tmpary_discard(t0);
+    tmpbuf_discard(t1);
 
-    return result;
+    return NIL_P(result) ? ary : result;
 }
 
 /*
  *  call-seq:
- *     ary.take(n)               => array
- *  
- *  Returns first n elements from <i>ary</i>.
- *     
+ *     ary.take(n)               -> new_ary
+ *
+ *  Returns first +n+ elements from the array.
+ *
+ *  If a negative number is given, raises an ArgumentError.
+ *
+ *  See also Array#drop
+ *
  *     a = [1, 2, 3, 4, 5, 0]
- *     a.take(3)             # => [1, 2, 3]
- *     
+ *     a.take(3)             #=> [1, 2, 3]
+ *
  */
 
 static VALUE
-rb_ary_take(obj, n)
-    VALUE obj;
-    VALUE n;
+rb_ary_take(VALUE obj, VALUE n)
 {
     long len = NUM2LONG(n);
     if (len < 0) {
 	rb_raise(rb_eArgError, "attempt to take negative size");
     }
-
     return rb_ary_subseq(obj, 0, len);
 }
 
 /*
  *  call-seq:
- *     ary.take_while {|arr| block }   => array
- *  
- *  Passes elements to the block until the block returns nil or false,
- *  then stops iterating and returns an array of all prior elements.
- *     
+ *     ary.take_while { |arr| block }  -> new_ary
+ *     ary.take_while                  -> Enumerator
+ *
+ *  Passes elements to the block until the block returns +nil+ or +false+, then
+ *  stops iterating and returns an array of all prior elements.
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *  See also Array#drop_while
+ *
  *     a = [1, 2, 3, 4, 5, 0]
- *     a.take_while {|i| i < 3 }   # => [1, 2]
- *     
+ *     a.take_while { |i| i < 3 }  #=> [1, 2]
+ *
  */
 
 static VALUE
-rb_ary_take_while(ary)
-    VALUE ary;
+rb_ary_take_while(VALUE ary)
 {
     long i;
 
     RETURN_ENUMERATOR(ary, 0, 0);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	if (!RTEST(rb_yield(RARRAY(ary)->ptr[i]))) break;
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
     }
     return rb_ary_take(ary, LONG2FIX(i));
 }
 
 /*
  *  call-seq:
- *     ary.drop(n)               => array
- *  
- *  Drops first n elements from <i>ary</i>, and returns rest elements
- *  in an array.
- *     
+ *     ary.drop(n)               -> new_ary
+ *
+ *  Drops first +n+ elements from +ary+ and returns the rest of the elements in
+ *  an array.
+ *
+ *  If a negative number is given, raises an ArgumentError.
+ *
+ *  See also Array#take
+ *
  *     a = [1, 2, 3, 4, 5, 0]
- *     a.drop(3)             # => [4, 5, 0]
- *     
+ *     a.drop(3)             #=> [4, 5, 0]
+ *
  */
 
 static VALUE
-rb_ary_drop(ary, n)
-    VALUE ary;
-    VALUE n;
+rb_ary_drop(VALUE ary, VALUE n)
 {
     VALUE result;
     long pos = NUM2LONG(n);
@@ -3720,60 +5312,297 @@ rb_ary_drop(ary, n)
 	rb_raise(rb_eArgError, "attempt to drop negative size");
     }
 
-    result = rb_ary_subseq(ary, pos, RARRAY(ary)->len);
+    result = rb_ary_subseq(ary, pos, RARRAY_LEN(ary));
     if (result == Qnil) result = rb_ary_new();
     return result;
 }
 
 /*
  *  call-seq:
- *     ary.drop_while {|arr| block }   => array
- *  
- *  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.
- *     
+ *     ary.drop_while { |arr| block }   -> new_ary
+ *     ary.drop_while                  -> Enumerator
+ *
+ *  Drops elements up to, but not including, the first element for which the
+ *  block returns +nil+ or +false+ and returns an array containing the
+ *  remaining elements.
+ *
+ *  If no block is given, an Enumerator is returned instead.
+ *
+ *  See also Array#take_while
+ *
  *     a = [1, 2, 3, 4, 5, 0]
- *     a.drop_while {|i| i < 3 }   # => [3, 4, 5, 0]
- *     
+ *     a.drop_while {|i| i < 3 }   #=> [3, 4, 5, 0]
+ *
  */
 
 static VALUE
-rb_ary_drop_while(ary)
-    VALUE ary;
+rb_ary_drop_while(VALUE ary)
 {
     long i;
 
     RETURN_ENUMERATOR(ary, 0, 0);
-    for (i = 0; i < RARRAY(ary)->len; i++) {
-	if (!RTEST(rb_yield(RARRAY(ary)->ptr[i]))) break;
+    for (i = 0; i < RARRAY_LEN(ary); i++) {
+	if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break;
     }
     return rb_ary_drop(ary, LONG2FIX(i));
 }
 
-
-
-/* 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. 
+/*
+ *  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
-Init_Array()
+Init_Array(void)
 {
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+
     rb_cArray  = rb_define_class("Array", rb_cObject);
     rb_include_module(rb_cArray, rb_mEnumerable);
 
-    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);
     rb_define_method(rb_cArray, "initialize_copy", rb_ary_replace, 1);
 
-    rb_define_method(rb_cArray, "to_s", rb_ary_to_s, 0);
     rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
+    rb_define_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);
 
@@ -3803,18 +5632,21 @@ Init_Array()
     rb_define_method(rb_cArray, "find_index", rb_ary_index, -1);
     rb_define_method(rb_cArray, "index", rb_ary_index, -1);
     rb_define_method(rb_cArray, "rindex", rb_ary_rindex, -1);
-    rb_define_method(rb_cArray, "indexes", rb_ary_indexes, -1);
-    rb_define_method(rb_cArray, "indices", rb_ary_indexes, -1);
     rb_define_method(rb_cArray, "join", rb_ary_join_m, -1);
     rb_define_method(rb_cArray, "reverse", rb_ary_reverse_m, 0);
     rb_define_method(rb_cArray, "reverse!", rb_ary_reverse_bang, 0);
+    rb_define_method(rb_cArray, "rotate", rb_ary_rotate_m, -1);
+    rb_define_method(rb_cArray, "rotate!", rb_ary_rotate_bang, -1);
     rb_define_method(rb_cArray, "sort", rb_ary_sort, 0);
     rb_define_method(rb_cArray, "sort!", rb_ary_sort_bang, 0);
+    rb_define_method(rb_cArray, "sort_by!", rb_ary_sort_by_bang, 0);
     rb_define_method(rb_cArray, "collect", rb_ary_collect, 0);
     rb_define_method(rb_cArray, "collect!", rb_ary_collect_bang, 0);
     rb_define_method(rb_cArray, "map", rb_ary_collect, 0);
     rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0);
     rb_define_method(rb_cArray, "select", rb_ary_select, 0);
+    rb_define_method(rb_cArray, "select!", rb_ary_select_bang, 0);
+    rb_define_method(rb_cArray, "keep_if", rb_ary_keep_if, 0);
     rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1);
     rb_define_method(rb_cArray, "delete", rb_ary_delete, 1);
     rb_define_method(rb_cArray, "delete_at", rb_ary_delete_at_m, 1);
@@ -3848,21 +5680,25 @@ Init_Array()
     rb_define_method(rb_cArray, "compact!", rb_ary_compact_bang, 0);
     rb_define_method(rb_cArray, "flatten", rb_ary_flatten, -1);
     rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, -1);
-    rb_define_method(rb_cArray, "nitems", rb_ary_nitems, 0);
     rb_define_method(rb_cArray, "count", rb_ary_count, -1);
-    rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, 0);
-    rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, 0);
-    rb_define_method(rb_cArray, "choice", rb_ary_choice, 0);
+    rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, -1);
+    rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, -1);
+    rb_define_method(rb_cArray, "sample", rb_ary_sample, -1);
     rb_define_method(rb_cArray, "cycle", rb_ary_cycle, -1);
     rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1);
     rb_define_method(rb_cArray, "combination", rb_ary_combination, 1);
+    rb_define_method(rb_cArray, "repeated_permutation", rb_ary_repeated_permutation, 1);
+    rb_define_method(rb_cArray, "repeated_combination", rb_ary_repeated_combination, 1);
     rb_define_method(rb_cArray, "product", rb_ary_product, -1);
 
     rb_define_method(rb_cArray, "take", rb_ary_take, 1);
     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);
 
     id_cmp = rb_intern("<=>");
-    inspect_key = rb_intern("__inspect_key__");
+    sym_random = ID2SYM(rb_intern("random"));
+    id_div = rb_intern("div");
+    id_power = rb_intern("**");
 }
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
deleted file mode 100644
index 713b5c69df..0000000000
--- a/bcc32/Makefile.sub
+++ /dev/null
@@ -1,549 +0,0 @@
-# -*- makefile -*-
-
-SHELL = $(COMSPEC)
-MKFILES = Makefile
-
-#### Start of system configuration section. ####
-!ifndef OS
-OS = bccwin32
-!endif
-!if !defined(RT)
-!error RT not defined.  Retry from configure pass.
-!endif
-
-## 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)
-!endif
-!ifndef icondirs
-!ifdef ICONDIRS
-icondirs=$(ICONDIRS)
-!endif
-!endif
-!ifdef icondirs
-icondirs=$(icondirs:\=/)
-iconinc=-I$(icondirs: = -I)
-!endif
-###############
-
-VPATH = $(srcdir):$(srcdir)/missing
-.SUFFIXES: .y
-
-!ifndef CC
-CC = bcc32
-!endif
-!ifndef CPP
-CPP = cpp32
-!endif
-!ifndef RC
-RC = brcc32
-!endif
-!ifndef YACC
-YACC = byacc
-!endif
-!ifndef AR
-AR = tlib
-!endif
-
-PURIFY =
-AUTOCONF = autoconf
-RM = $(srcdir:/=\)\win32\rm.bat
-
-!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 = /share
-!endif
-!ifndef EXTOUT
-EXTOUT = .ext
-!endif
-!ifndef RIDATADIR
-RIDATADIR = $(DESTDIR)$(datadir)/ri/$(MAJOR).$(MINOR)/system
-!endif
-!ifndef TESTUI
-TESTUI = console
-!endif
-!ifndef TESTS
-TESTS =
-!endif
-!ifndef RDOCTARGET
-RDOCTARGET = install-nodoc
-!endif
-
-OUTFLAG       = -o
-!ifndef CFLAGS
-CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
-!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 crypt.obj erf.obj win32.obj
-
-!ifndef STACK
-STACK = 0x2000000
-!endif
-
-XCFLAGS = -DRUBY_EXPORT -I. -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) "$(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)
-
-PREP          = miniruby$(EXEEXT)
-
-OBJEXT        = obj
-
-INSTALLED_LIST= .installed.list
-
-WINMAINOBJ    = winmain.$(OBJEXT)
-MINIOBJS      = dmydln.$(OBJEXT)
-
-.path.c = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
-.path.h = .;$(srcdir);$(srcdir)/win32;$(srcdir)/missing
-.path.y = $(srcdir)
-.path. = $(srcdir)
-
-.c.obj:
-	$(CC) $(CFLAGS) $(XCFLAGS) -I. $(CPPFLAGS) -c $(<:/=\)
-
-.rc.res:
-	$(RC) $(RFLAGS) -I. -I$(<D). $(iconinc) -I$(srcdir)/win32 $(RFLAGS) -fo$@ $(<:/=\)
-
-.y.c:
-	$(YACC) $(YFLAGS) $(<:\=/)
-	sed -e "s!^ *extern char \*getenv();!/* & */!;s/^\(#.*\)y\.tab/\1parse/" y.tab.c > $(@F)
-	@del y.tab.c
-
-all: $(srcdir)/bcc32/Makefile.sub $(srcdir)/common.mk
-
-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
-|
-
-CONFIG_H = ./.config.h.time
-
-config: config.status
-
-config.status: $(CONFIG_H)
-
-$(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
-	@$(srcdir:/=\)\win32\ifchange.bat config.h &&|
-\#define HAVE_SYS_TYPES_H 1
-\#define HAVE_SYS_STAT_H 1
-\#define HAVE_STDLIB_H 1
-\#define HAVE_STRING_H 1
-\#define HAVE_MEMORY_H 1
-\#define HAVE_OFF_T 1
-\#define SIZEOF_INT 4
-\#define SIZEOF_SHORT 2
-\#define SIZEOF_LONG 4
-\#define SIZEOF_LONG_LONG 0
-\#define SIZEOF___INT64 8
-\#define SIZEOF_OFF_T 4
-\#define SIZEOF_VOIDP 4
-\#define SIZEOF_FLOAT 4
-\#define SIZEOF_DOUBLE 8
-\#define SIZEOF_TIME_T 4
-\#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
-\#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_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_CHSIZE 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 DLEXT ".so"
-\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR)"
-\#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-\#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)"
-\#define RUBY_VENDOR_LIB "/lib/ruby/vendor_ruby"
-\#define RUBY_VENDOR_LIB2 "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)"
-\#define RUBY_PLATFORM "$(ARCH)-$(OS)"
-\#define RUBY_ARCHLIB "/lib/ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
-\#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
-\#define RUBY_VENDOR_ARCHLIB "/lib/ruby/vendor_ruby/$(MAJOR).$(MINOR)/$(ARCH)-$(OS)"
-|
-	@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,@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@,,;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,@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,@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,@CP@,copy > nul,;t t
-s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
-s,@ALLOCA@,$(ALLOCA),;t t
-s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t
-s,@EXEEXT@,.exe,;t t
-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,@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) -c $$(<:/=\),;t t
-s,@COMPILE_CXX@,$$(CXX) $$(INCFLAGS) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t
-s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: {$$(topdir)}.%s{}.%s: {$$(hdrdir)}.%s{}.%s: .%s.%s:,;t t
-s,@RULE_SUBST@,{.;$$(VPATH)}%s,;t t
-s,@COMMON_LIBS@,m advapi32 avicap32 avifil32 cap comctl32 comdlg32 dlcapi gdi32 glu32 imagehlp imm32 inetmib1 kernel32 loadperf lsapi32 lz32 mapi32 mgmtapi mpr msacm32 msvfw32 nddeapi netapi32 ole32 oleaut32 oledlg olepro32 opengl32 pdh pkpd32 rasapi32 rasdlg rassapi rpcrt4 setupapi shell32 shfolder snmpapi sporder tapi32 url user32 vdmdbg version win32spl winmm wintrust wsock32,;t t
-s,@COMMON_MACROS@,WIN32_LEAN_AND_MEAN WIN32,;t t
-s,@COMMON_HEADERS@,winsock2.h windows.h,;t t
-s,@TRY_LINK@,$$(CC) -oconftest $$(INCFLAGS) -I$$(hdrdir) $$(CPPFLAGS) $$(CFLAGS) $$(LIBPATH) $$(LDFLAGS) $$(src) $$(LOCAL_LIBS) $$(LIBS),;t t
-s,@EXPORT_PREFIX@,_,;t t
-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,@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),$@,nul,$(LIBRUBY_A) $(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
-		@$(MINIRUBY) $(srcdir)/win32/resource.rb \
-			-ruby_name=$(RUBY_INSTALL_NAME) \
-			-rubyw_name=$(RUBYW_INSTALL_NAME) \
-			-so_name=$(RUBY_SO_NAME) \
-			. $(icondirs) $(srcdir)/win32
-
-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)
-
-distclean-local::
-		@$(RM) ext\config.cache $(RBCONFIG:/=\)
-		@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
-
-update-rubyspec:
-	@echo SPEC_EXISTS=0 > $@.mk
-	@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
-	@type >> $@.mk &&|
-$()update-rubyspec:
-$()	@del $@.mk
-$()!if $$(SPEC_EXISTS)
-$()	cd $(srcdir:/=\)\rubyspec\mspec
-$()	git pull
-$()	cd ..\spec\rubyspec
-$()	git pull
-$()!else
-$()	git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec
-$()	git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec
-$()!endif
-|
-	@$(MAKE) -$(MAKEFLAGS)$(MFLAGS) -f $@.mk
-
-test-rubyspec:
-	@echo SPEC_EXISTS=0 > $@.mk
-	@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
-	@type >> $@.mk &&|
-$()test-rubyspec:
-$()!if $$(SPEC_EXISTS)
-$()	$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
-$()!else
-$()	@echo No rubyspec here.  put rubyspec to srcdir first.
-$()	@cd $(srcdir:/=\)\rubyspec
-$()!endif
-|
-	@$(MAKE) -$(MAKEFLAGS) -f $@.mk
-
-ext/extinit.obj: ext/extinit.c $(SETUP)
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c
-
-main.$(OBJEXT): win32.h
-array.$(OBJEXT): win32.h
-bignum.$(OBJEXT): win32.h
-class.$(OBJEXT): win32.h
-compar.$(OBJEXT): win32.h
-dir.$(OBJEXT): dir.h win32.h
-dln.$(OBJEXT): win32.h
-enum.$(OBJEXT): win32.h
-error.$(OBJEXT): win32.h
-eval.$(OBJEXT): win32.h
-file.$(OBJEXT): win32.h
-gc.$(OBJEXT): win32.h
-hash.$(OBJEXT): win32.h
-inits.$(OBJEXT): win32.h
-io.$(OBJEXT): win32.h
-marshal.$(OBJEXT): win32.h
-math.$(OBJEXT): win32.h
-numeric.$(OBJEXT): win32.h
-object.$(OBJEXT): win32.h
-pack.$(OBJEXT): win32.h
-parse.$(OBJEXT): win32.h
-process.$(OBJEXT): win32.h
-prec.$(OBJEXT): win32.h
-random.$(OBJEXT): win32.h
-range.$(OBJEXT): win32.h
-re.$(OBJEXT): win32.h
-regex.$(OBJEXT): win32.h
-ruby.$(OBJEXT): win32.h
-signal.$(OBJEXT): win32.h
-sprintf.$(OBJEXT): win32.h
-st.$(OBJEXT): win32.h
-string.$(OBJEXT): win32.h
-struct.$(OBJEXT): win32.h
-time.$(OBJEXT): win32.h
-util.$(OBJEXT): win32.h
-variable.$(OBJEXT): win32.h
-version.$(OBJEXT): win32.h
diff --git a/bcc32/README.bcc32 b/bcc32/README.bcc32
deleted file mode 100644
index c27a1261f1..0000000000
--- a/bcc32/README.bcc32
+++ /dev/null
@@ -1,137 +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.
-     * byacc ((<URL:http://gnuwin32.sourceforge.net/packages/byacc.htm>))
-     * sed   ((<URL:http://gnuwin32.sourceforge.net/packages/sed.htm>))
-
-(4) We strongly recommend to build ruby on C++Builder, to link following files.
-     * usebormm.lib
-     * memmgr.lib
-
-    RTL's internal memory manager cannot handle large memory block properly,
-    so we should use borlndmm.dll instead.
-     10000.times { "" << "." * 529671; GC.start } # crash
-
-== How to compile and install
-
-(1) Execute bcc32\configure.bat on your build directory.
-     ex. c:\ruby-1.6.7>bcc32\configure.bat
-     
-(2) Change ((|RUBY_INSTALL_NAME|)) and ((|RUBY_SO_NAME|)) in (({Makefile}))
-    if you want to change the name of the executable files. 
-    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 DESTDIR=<install_directory> install%))'
-
-    This command will create following directories and install files onto them.
-      * <install_directory>\bin
-      * <install_directory>\lib
-      * <install_directory>\lib\ruby
-      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>
-      * <install_directory>\lib\ruby\<MAJOR>.<MINOR>\<PLATFORM>
-      * <install_directory>\lib\ruby\site_ruby
-      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>
-      * <install_directory>\lib\ruby\site_ruby\<MAJOR>.<MINOR>\<PLATFORM>
-      * <install_directory>\man\man1
-    If Ruby's version is `x.y.z', the ((|<MAJOR>|)) is `x' and the ((|<MINOR>|)) is `y'.
-    The ((|<PLATFORM>|)) is usually `(({i586-bccwin32}))'.
-
-(6) Requires dynamic RTL (cc3250.dll on C++Builder5) and borlndmm.dll (If built with
-    usebormm.lib) to use installed binary. These files are ordinary in bcc32's bin
-    directory.
-
-== Icons
-
-Any icon files(*.ico) in the build directory, directories specified with
-((|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
-    make
-    make test
-    make DESTDIR=/usr/local 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 target i386-bccwin32
-    make
-    make test
-    make DESTDIR=/usr/local 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
-    make
-    make test
-    make DESTDIR=C:/usr/local 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 95575cbc60..0000000000
--- a/bcc32/configure.bat
+++ /dev/null
@@ -1,152 +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" == "--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
-: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-static-linked-ext link external modules statically
-  echo   --disable-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 dc523e2541..0000000000
--- a/bcc32/mkexports.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#!./miniruby -s
-
-$name = $library = $description = nil
-
-SYM = {}
-STDIN.reopen(open("nul"))
-ARGV.each do |obj|
-  IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
-    next unless /(?:PUBDEF|PUBD32)/ =~ l
-    SYM[$1] = true if /'(.*?)'/ =~ l
-  end
-end
-
-exports = []
-if $name
-  exports << "Name " + $name
-elsif $library
-  exports << "Library " + $library
-end
-exports << "Description " + $description.dump if $description
-exports << "EXPORTS" << SYM.keys.sort
-
-if $output
-  open($output, 'w') {|f| f.puts exports.join("\n")}
-else
-  puts exports.join("\n")
-end
diff --git a/bcc32/setup.mak b/bcc32/setup.mak
deleted file mode 100644
index 483292ed51..0000000000
--- a/bcc32/setup.mak
+++ /dev/null
@@ -1,163 +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
-|
-!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 &&|
-\#include "version.h"
-MAJOR = RUBY_VERSION_MAJOR
-MINOR = RUBY_VERSION_MINOR
-TEENY = RUBY_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-: 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_answer.rb b/benchmark/bm_app_answer.rb
new file mode 100644
index 0000000000..3cd8a8fd37
--- /dev/null
+++ b/benchmark/bm_app_answer.rb
@@ -0,0 +1,15 @@
+def ack(m, n)
+  if m == 0 then
+    n + 1
+  elsif n == 0 then
+    ack(m - 1, 1)
+  else
+    ack(m - 1, ack(m, n - 1))
+  end
+end
+
+def the_answer_to_life_the_universe_and_everything
+  (ack(3,7).to_s.split(//).inject(0){|s,x| s+x.to_i}.to_s + "2" ).to_i
+end
+
+answer = the_answer_to_life_the_universe_and_everything
diff --git a/benchmark/bm_app_aobench.rb b/benchmark/bm_app_aobench.rb
new file mode 100644
index 0000000000..807349089f
--- /dev/null
+++ b/benchmark/bm_app_aobench.rb
@@ -0,0 +1,292 @@
+# AO rebder benchmark
+# Original program (C) Syoyo Fujita in Javascript (and other languages)
+#      http://lucille.atso-net.jp/blog/?p=642
+#      http://lucille.atso-net.jp/blog/?p=711
+# 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)
+
+        # Subsmpling
+        nsubsamples.times do |v|
+          nsubsamples.times do |u|
+
+            cnt = cnt + 1
+            wf = w.to_f
+            hf = h.to_f
+            xf = x.to_f
+            yf = y.to_f
+            uf = u.to_f
+            vf = v.to_f
+
+            px = (xf + (uf / nsf) - (wf / 2.0)) / (wf / 2.0)
+            py = -(yf + (vf / nsf) - (hf / 2.0)) / (hf / 2.0)
+
+            eye = Vec.new(px, py, -1.0).vnormalize
+
+            ray = Ray.new(Vec.new(0.0, 0.0, 0.0), eye)
+
+            isect = Isect.new
+            @spheres[0].intersect(ray, isect)
+            @spheres[1].intersect(ray, isect)
+            @spheres[2].intersect(ray, isect)
+            @plane.intersect(ray, isect)
+            if isect.hit then
+              col = ambient_occlusion(isect)
+              rad.x = rad.x + col.x
+              rad.y = rad.y + col.y
+              rad.z = rad.z + col.z
+            end
+          end
+        end
+
+        r = rad.x / (nsf * nsf)
+        g = rad.y / (nsf * nsf)
+        b = rad.z / (nsf * nsf)
+        printf("%c", clamp(r))
+        printf("%c", clamp(g))
+        printf("%c", clamp(b))
+      end
+      nil
+    end
+
+    nil
+  end
+end
+
+alias printf_orig printf
+def printf *args
+end
+
+# File.open("ao.ppm", "w") do |fp|
+  printf("P6\n")
+  printf("%d %d\n", IMAGE_WIDTH, IMAGE_HEIGHT)
+  printf("255\n", IMAGE_WIDTH, IMAGE_HEIGHT)
+  Scene.new.render(IMAGE_WIDTH, IMAGE_HEIGHT, NSUBSAMPLES)
+# end
+
+undef printf
+alias printf printf_orig
diff --git a/benchmark/bm_app_erb.rb b/benchmark/bm_app_erb.rb
new file mode 100644
index 0000000000..77c66a7949
--- /dev/null
+++ b/benchmark/bm_app_erb.rb
@@ -0,0 +1,26 @@
+#
+# Create many HTML strings with ERB.
+#
+
+require 'erb'
+
+data = DATA.read
+max = 15_000
+title = "hello world!"
+content = "hello world!\n" * 10
+
+max.times{
+  ERB.new(data).result(binding)
+}
+
+__END__
+
+<html>
+  <head> <%= title %> </head>
+  <body>
+    <h1> <%= title %> </h1>
+    <p>
+      <%= content %>
+    </p>
+  </body>
+</html>
diff --git a/benchmark/bm_app_factorial.rb b/benchmark/bm_app_factorial.rb
new file mode 100644
index 0000000000..45f471dfdb
--- /dev/null
+++ b/benchmark/bm_app_factorial.rb
@@ -0,0 +1,11 @@
+def fact(n)
+  if(n > 1)
+    n * fact(n-1)
+  else
+    1
+  end
+end
+
+100.times {
+  fact(5000)
+}
diff --git a/benchmark/bm_app_fib.rb b/benchmark/bm_app_fib.rb
new file mode 100644
index 0000000000..34a7b2e725
--- /dev/null
+++ b/benchmark/bm_app_fib.rb
@@ -0,0 +1,10 @@
+def fib n
+  if n < 3
+    1
+  else
+    fib(n-1) + fib(n-2)
+  end
+end
+
+fib(34)
+
diff --git a/benchmark/bm_app_mandelbrot.rb b/benchmark/bm_app_mandelbrot.rb
new file mode 100644
index 0000000000..801b75e8e2
--- /dev/null
+++ b/benchmark/bm_app_mandelbrot.rb
@@ -0,0 +1,23 @@
+require 'complex'
+
+def mandelbrot? z
+  i = 0
+  while i<100
+    i += 1
+    z = z * z
+    return false if z.abs > 2
+  end
+  true
+end
+
+ary = []
+
+(0..1000).each{|dx|
+  (0..1000).each{|dy|
+    x = dx / 50.0
+    y = dy / 50.0
+    c = Complex(x, y)
+    ary << c if mandelbrot?(c)
+  }
+}
+
diff --git a/benchmark/bm_app_pentomino.rb b/benchmark/bm_app_pentomino.rb
new file mode 100644
index 0000000000..59c63f358e
--- /dev/null
+++ b/benchmark/bm_app_pentomino.rb
@@ -0,0 +1,259 @@
+#!/usr/local/bin/ruby
+# This program is contributed by Shin Nishiyama
+
+
+# modified by K.Sasada
+
+NP = 5
+ROW = 8 + NP
+COL = 8
+
+$p = []
+$b = []
+$no = 0
+
+def piece(n, a, nb)
+  nb.each{|x|
+    a[n] = x
+    if n == NP-1
+      $p << [a.sort]
+    else
+      nbc=nb.dup
+      [-ROW, -1, 1, ROW].each{|d|
+        if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
+          nbc << x+d
+        end
+      }
+      nbc.delete x
+      piece(n+1,a[0..n],nbc)
+    end
+  }
+end
+
+def kikaku(a)
+  a.collect {|x| x - a[0]}
+end
+def ud(a)
+  kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
+end
+def rl(a)
+  kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
+end
+def xy(a)
+  kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
+end
+
+def mkpieces
+  piece(0,[],[0])
+  $p.each do |a|
+    a0 = a[0]
+    a[1] = ud(a0)
+    a[2] = rl(a0)
+    a[3] = ud(rl(a0))
+    a[4] = xy(a0)
+    a[5] = ud(xy(a0))
+    a[6] = rl(xy(a0))
+    a[7] = ud(rl(xy(a0)))
+    a.sort!
+    a.uniq!
+  end
+  $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
+end
+
+def mkboard
+  (0...ROW*COL).each{|i|
+    if i % ROW >= ROW-NP
+      $b[i] = -2
+    else
+      $b[i] = -1
+    end
+    $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
+  }
+end
+
+def pboard
+  return # skip print
+  print "No. #$no\n"
+  (0...COL).each{|i|
+    print "|"
+    (0...ROW-NP).each{|j|
+      x = $b[i*ROW+j]
+      if x < 0
+        print "..|"
+      else
+        printf "%2d|",x+1
+      end
+    }
+    print "\n"
+  }
+  print "\n"
+end
+
+$pnum=[]
+def setpiece(a,pos)
+  if a.length == $p.length then
+    $no += 1
+    pboard
+    return
+  end
+  while $b[pos] != -1
+    pos += 1
+  end
+  ($pnum - a).each do |i|
+    $p[i].each do |x|
+      f = 0
+      x.each{|s|
+        if $b[pos+s] != -1
+          f=1
+          break
+        end
+      }
+      if f == 0 then
+        x.each{|s|
+          $b[pos+s] = i
+        }
+        a << i
+        setpiece(a.dup, pos)
+        a.pop
+        x.each{|s|
+          $b[pos+s] = -1
+        }
+      end
+    end
+  end
+end
+
+mkpieces
+mkboard
+$p[4] = [$p[4][0]]
+$pnum = (0...$p.length).to_a
+setpiece([],0)
+
+
+__END__
+
+# original
+
+NP = 5
+ROW = 8 + NP
+COL = 8
+
+$p = []
+$b = []
+$no = 0
+
+def piece(n,a,nb)
+  for x in nb
+    a[n] = x
+    if n == NP-1
+      $p << [a.sort]
+    else
+      nbc=nb.dup
+      for d in [-ROW, -1, 1, ROW]
+        if x+d > 0 and not a.include?(x+d) and not nbc.include?(x+d)
+          nbc << x+d
+        end
+      end
+      nbc.delete x
+      piece(n+1,a[0..n],nbc)
+    end
+  end
+end
+
+def kikaku(a)
+  a.collect {|x| x - a[0]}
+end
+def ud(a)
+  kikaku(a.collect {|x| ((x+NP)%ROW)-ROW*((x+NP)/ROW) }.sort)
+end
+def rl(a)
+  kikaku(a.collect {|x| ROW*((x+NP)/ROW)+ROW-((x+NP)%ROW)}.sort)
+end
+def xy(a)
+  kikaku(a.collect {|x| ROW*((x+NP)%ROW) + (x+NP)/ROW }.sort)
+end
+
+def mkpieces
+  piece(0,[],[0])
+  $p.each do |a|
+    a0 = a[0]
+    a[1] = ud(a0)
+    a[2] = rl(a0)
+    a[3] = ud(rl(a0))
+    a[4] = xy(a0)
+    a[5] = ud(xy(a0))
+    a[6] = rl(xy(a0))
+    a[7] = ud(rl(xy(a0)))
+    a.sort!
+    a.uniq!
+  end
+  $p.uniq!.sort! {|x,y| x[0] <=> y[0] }
+end
+
+def mkboard
+  for i in 0...ROW*COL
+    if i % ROW >= ROW-NP
+      $b[i] = -2
+    else
+      $b[i] = -1
+    end
+    $b[3*ROW+3]=$b[3*ROW+4]=$b[4*ROW+3]=$b[4*ROW+4]=-2
+  end
+end
+
+def pboard
+  print "No. #$no\n"
+  for i in 0...COL
+    print "|"
+    for j in 0...ROW-NP
+      x = $b[i*ROW+j]
+      if x < 0
+        print "..|"
+      else
+        printf "%2d|",x+1
+      end
+    end
+    print "\n"
+  end
+  print "\n"
+end
+
+$pnum=[]
+def setpiece(a,pos)
+  if a.length == $p.length then
+    $no += 1
+    pboard
+    return
+  end
+  while $b[pos] != -1
+    pos += 1
+  end
+  ($pnum - a).each do |i|
+    $p[i].each do |x|
+      f = 0
+      for s in x do
+        if $b[pos+s] != -1
+          f=1
+          break
+        end
+      end
+      if f == 0 then
+        for s in x do
+          $b[pos+s] = i
+        end
+        a << i
+        setpiece(a.dup, pos)
+        a.pop
+        for s in x do
+          $b[pos+s] = -1
+        end
+      end
+    end
+  end
+end
+
+mkpieces
+mkboard
+$p[4] = [$p[4][0]]
+$pnum = (0...$p.length).to_a
+setpiece([],0)
diff --git a/benchmark/bm_app_raise.rb b/benchmark/bm_app_raise.rb
new file mode 100644
index 0000000000..5db8f95d50
--- /dev/null
+++ b/benchmark/bm_app_raise.rb
@@ -0,0 +1,8 @@
+i = 0
+while i<300000
+  i += 1
+  begin
+    raise
+  rescue
+  end
+end
diff --git a/benchmark/bm_app_strconcat.rb b/benchmark/bm_app_strconcat.rb
new file mode 100644
index 0000000000..7eed7c1aed
--- /dev/null
+++ b/benchmark/bm_app_strconcat.rb
@@ -0,0 +1,5 @@
+i = 0
+while i<2_000_000
+  "#{1+1} #{1+1} #{1+1}"
+  i += 1
+end
diff --git a/benchmark/bm_app_tak.rb b/benchmark/bm_app_tak.rb
new file mode 100644
index 0000000000..efe5380f4e
--- /dev/null
+++ b/benchmark/bm_app_tak.rb
@@ -0,0 +1,13 @@
+
+def tak x, y, z
+  unless y < x
+    z
+  else
+    tak( tak(x-1, y, z),
+         tak(y-1, z, x),
+         tak(z-1, x, y))
+  end
+end
+
+tak(18, 9, 0)
+
diff --git a/benchmark/bm_app_tarai.rb b/benchmark/bm_app_tarai.rb
new file mode 100644
index 0000000000..4c146f5ccf
--- /dev/null
+++ b/benchmark/bm_app_tarai.rb
@@ -0,0 +1,10 @@
+def tarai( x, y, z )
+  if x <= y
+  then y
+  else tarai(tarai(x-1, y, z),
+             tarai(y-1, z, x),
+             tarai(z-1, x, y))
+  end
+end
+
+tarai(12, 6, 0)
diff --git a/benchmark/bm_app_uri.rb b/benchmark/bm_app_uri.rb
new file mode 100644
index 0000000000..586edfd5dc
--- /dev/null
+++ b/benchmark/bm_app_uri.rb
@@ -0,0 +1,8 @@
+require 'uri'
+
+100_000.times{
+  uri = URI.parse('http://www.ruby-lang.org')
+  uri.scheme
+  uri.host
+  uri.port
+}
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_io_file_create.rb b/benchmark/bm_io_file_create.rb
new file mode 100644
index 0000000000..2f205c1333
--- /dev/null
+++ b/benchmark/bm_io_file_create.rb
@@ -0,0 +1,13 @@
+#
+# Create files
+#
+
+max = 200_000
+file = './tmpfile_of_bm_io_file_create'
+
+max.times{
+  f = open(file, 'w')
+  f.close#(true)
+}
+File.unlink(file)
+
diff --git a/benchmark/bm_io_file_read.rb b/benchmark/bm_io_file_read.rb
new file mode 100644
index 0000000000..b9e796ed30
--- /dev/null
+++ b/benchmark/bm_io_file_read.rb
@@ -0,0 +1,15 @@
+#
+# Seek and Read file.
+#
+
+require 'tempfile'
+
+max = 200_000
+str = "Hello world!  " * 1000
+f = Tempfile.new('yarv-benchmark')
+f.write str
+
+max.times{
+  f.seek 0
+  f.read
+}
diff --git a/benchmark/bm_io_file_write.rb b/benchmark/bm_io_file_write.rb
new file mode 100644
index 0000000000..aa1be0e5fe
--- /dev/null
+++ b/benchmark/bm_io_file_write.rb
@@ -0,0 +1,14 @@
+#
+# Seek and Write file.
+#
+
+require 'tempfile'
+
+max = 200_000
+str = "Hello world!  " * 1000
+f = Tempfile.new('yarv-benchmark')
+
+max.times{
+  f.seek 0
+  f.write str
+}
diff --git a/benchmark/bm_io_select.rb b/benchmark/bm_io_select.rb
new file mode 100644
index 0000000000..19248daeb1
--- /dev/null
+++ b/benchmark/bm_io_select.rb
@@ -0,0 +1,9 @@
+# IO.select performance
+
+w = [ IO.pipe[1] ];
+
+nr = 1000000
+nr.times {
+  IO.select nil, w
+}
+
diff --git a/benchmark/bm_io_select2.rb b/benchmark/bm_io_select2.rb
new file mode 100644
index 0000000000..10e37d71b2
--- /dev/null
+++ b/benchmark/bm_io_select2.rb
@@ -0,0 +1,22 @@
+# IO.select performance. worst case of single fd.
+
+ios = []
+nr = 1000000
+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
+  ios.concat IO.pipe
+end
+
+last = [ ios[-1] ]
+puts "last IO: #{last[0].inspect}"
+
+nr.times do
+  IO.select nil, last
+end
+
diff --git a/benchmark/bm_io_select3.rb b/benchmark/bm_io_select3.rb
new file mode 100644
index 0000000000..7d0ba1f092
--- /dev/null
+++ b/benchmark/bm_io_select3.rb
@@ -0,0 +1,21 @@
+# IO.select performance. a lot of fd
+
+ios = []
+nr = 100
+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
+  r, w = IO.pipe
+  r.close
+  ios.push w
+end
+
+nr.times do
+  IO.select nil, ios
+end
+
diff --git a/benchmark/bm_loop_for.rb b/benchmark/bm_loop_for.rb
new file mode 100644
index 0000000000..0fc4cc1511
--- /dev/null
+++ b/benchmark/bm_loop_for.rb
@@ -0,0 +1,3 @@
+for i in 1..30_000_000
+  #
+end
diff --git a/benchmark/bm_loop_generator.rb b/benchmark/bm_loop_generator.rb
new file mode 100644
index 0000000000..d3375c744c
--- /dev/null
+++ b/benchmark/bm_loop_generator.rb
@@ -0,0 +1,14 @@
+max = 600000
+
+if defined? Fiber
+  gen = (1..max).each
+  loop do
+    gen.next
+  end
+else
+  require 'generator'
+  gen = Generator.new((0..max))
+  while gen.next?
+    gen.next
+  end
+end
diff --git a/benchmark/bm_loop_times.rb b/benchmark/bm_loop_times.rb
new file mode 100644
index 0000000000..521f72ad1a
--- /dev/null
+++ b/benchmark/bm_loop_times.rb
@@ -0,0 +1 @@
+30_000_000.times{|e|}
diff --git a/benchmark/bm_loop_whileloop.rb b/benchmark/bm_loop_whileloop.rb
new file mode 100644
index 0000000000..0072822c06
--- /dev/null
+++ b/benchmark/bm_loop_whileloop.rb
@@ -0,0 +1,4 @@
+i = 0
+while i<30_000_000 # benchmark loop 1
+  i += 1
+end
diff --git a/benchmark/bm_loop_whileloop2.rb b/benchmark/bm_loop_whileloop2.rb
new file mode 100644
index 0000000000..47d02dffc4
--- /dev/null
+++ b/benchmark/bm_loop_whileloop2.rb
@@ -0,0 +1,4 @@
+i = 0
+while i< 6_000_000 # benchmark loop 2
+  i += 1
+end
diff --git a/benchmark/bm_so_ackermann.rb b/benchmark/bm_so_ackermann.rb
new file mode 100644
index 0000000000..7db5be9050
--- /dev/null
+++ b/benchmark/bm_so_ackermann.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: ackermann-ruby.code,v 1.4 2004/11/13 07:40:41 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+def ack(m, n)
+    if m == 0 then
+        n + 1
+    elsif n == 0 then
+        ack(m - 1, 1)
+    else
+        ack(m - 1, ack(m, n - 1))
+    end
+end
+
+NUM = 9
+ack(3, NUM)
+
+
diff --git a/benchmark/bm_so_array.rb b/benchmark/bm_so_array.rb
new file mode 100644
index 0000000000..2b8fce8f99
--- /dev/null
+++ b/benchmark/bm_so_array.rb
@@ -0,0 +1,23 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: ary-ruby.code,v 1.4 2004/11/13 07:41:27 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Paul Brannan and Mark Hubbart
+
+n = 9000 # Integer(ARGV.shift || 1)
+
+x = Array.new(n)
+y = Array.new(n, 0)
+
+n.times{|bi|
+  x[bi] = bi + 1
+}
+
+(0 .. 999).each do |e|
+  (n-1).step(0,-1) do |bi|
+    y[bi] += x.at(bi)
+  end
+end
+# puts "#{y.first} #{y.last}"
+
+
diff --git a/benchmark/bm_so_binary_trees.rb b/benchmark/bm_so_binary_trees.rb
new file mode 100644
index 0000000000..b1693e4109
--- /dev/null
+++ b/benchmark/bm_so_binary_trees.rb
@@ -0,0 +1,62 @@
+# The Computer Language Shootout Benchmarks
+# http://shootout.alioth.debian.org
+#
+# contributed by Jesse Millikan
+
+# disable output
+alias puts_orig puts
+def puts str
+  # disable puts
+end
+
+def item_check(tree)
+ if tree[0] == nil
+  tree[1]
+ else
+  tree[1] + item_check(tree[0]) - item_check(tree[2])
+ end
+end
+
+def bottom_up_tree(item, depth)
+ if depth > 0
+  item_item = 2 * item
+  depth -= 1
+  [bottom_up_tree(item_item - 1, depth), item, bottom_up_tree(item_item, depth)]
+ else
+  [nil, item, nil]
+ end
+end
+
+max_depth = 16 # ARGV[0].to_i
+min_depth = 4
+
+max_depth = min_depth + 2 if min_depth + 2 > max_depth
+
+stretch_depth = max_depth + 1
+stretch_tree = bottom_up_tree(0, stretch_depth)
+
+puts "stretch tree of depth #{stretch_depth}\t check: #{item_check(stretch_tree)}"
+stretch_tree = nil
+
+long_lived_tree = bottom_up_tree(0, max_depth)
+
+min_depth.step(max_depth + 1, 2) do |depth|
+ iterations = 2**(max_depth - depth + min_depth)
+
+ check = 0
+
+ for i in 1..iterations
+  temp_tree = bottom_up_tree(i, depth)
+  check += item_check(temp_tree)
+
+  temp_tree = bottom_up_tree(-i, depth)
+  check += item_check(temp_tree)
+ end
+
+ puts "#{iterations * 2}\t trees of depth #{depth}\t check: #{check}"
+end
+
+puts "long lived tree of depth #{max_depth}\t check: #{item_check(long_lived_tree)}"
+
+undef puts
+alias puts puts_orig
diff --git a/benchmark/bm_so_concatenate.rb b/benchmark/bm_so_concatenate.rb
new file mode 100644
index 0000000000..873214de7c
--- /dev/null
+++ b/benchmark/bm_so_concatenate.rb
@@ -0,0 +1,18 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: strcat-ruby.code,v 1.4 2004/11/13 07:43:28 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# based on code from Aristarkh A Zagorodnikov and Dat Nguyen
+
+STUFF = "hello\n"
+i = 0
+while i<10
+  i += 1
+  hello = ''
+  4_000_000.times do |e|
+    hello << STUFF
+  end
+end
+# puts hello.length
+
+
diff --git a/benchmark/bm_so_count_words.rb b/benchmark/bm_so_count_words.rb
new file mode 100644
index 0000000000..65f6337a4a
--- /dev/null
+++ b/benchmark/bm_so_count_words.rb
@@ -0,0 +1,19 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: wc-ruby.code,v 1.4 2004/11/13 07:43:32 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Paul Brannan
+
+input = open(File.join(File.dirname($0), 'wc.input'), 'rb')
+
+nl = nw = nc = 0
+while true
+  tmp = input.read(4096) or break
+  data = tmp << (input.gets || "")
+  nc += data.length
+  nl += data.count("\n")
+  ((data.strip! || data).tr!("\n", " ") || data).squeeze!
+  nw += data.count(" ") + 1
+end
+# STDERR.puts "#{nl} #{nw} #{nc}"
+
diff --git a/benchmark/bm_so_exception.rb b/benchmark/bm_so_exception.rb
new file mode 100644
index 0000000000..deb003a594
--- /dev/null
+++ b/benchmark/bm_so_exception.rb
@@ -0,0 +1,61 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: except-ruby.code,v 1.4 2004/11/13 07:41:33 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+$HI = 0
+$LO = 0
+NUM = 250000 # Integer(ARGV[0] || 1)
+
+
+class Lo_Exception < Exception
+  def initialize(num)
+    @value = num
+  end
+end
+
+class Hi_Exception < Exception
+  def initialize(num)
+    @value = num
+  end
+end
+
+def some_function(num)
+  begin
+    hi_function(num)
+  rescue
+    print "We shouldn't get here, exception is: #{$!.type}\n"
+  end
+end
+
+def hi_function(num)
+  begin
+    lo_function(num)
+  rescue Hi_Exception
+    $HI = $HI + 1
+  end
+end
+
+def lo_function(num)
+  begin
+    blowup(num)
+  rescue Lo_Exception
+    $LO = $LO + 1
+  end
+end
+
+def blowup(num)
+  if num % 2 == 0
+    raise Lo_Exception.new(num)
+  else
+    raise Hi_Exception.new(num)
+  end
+end
+
+
+i = 1
+max = NUM+1
+while i < max
+  i += 1
+  some_function(i+1)
+end
diff --git a/benchmark/bm_so_fannkuch.rb b/benchmark/bm_so_fannkuch.rb
new file mode 100644
index 0000000000..bac5ecd44c
--- /dev/null
+++ b/benchmark/bm_so_fannkuch.rb
@@ -0,0 +1,45 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org/
+# Contributed by Sokolov Yura
+# Modified by Ryan Williams
+
+def fannkuch(n)
+   maxFlips, m, r, check = 0, n-1, n, 0
+   count = (1..n).to_a
+   perm = (1..n).to_a
+
+   while true
+      if check < 30
+         puts "#{perm}"
+         check += 1
+      end
+
+      while r != 1
+         count[r-1] = r
+         r -= 1
+      end
+
+      if perm[0] != 1 and perm[m] != n
+         perml = perm.clone #.dup
+         flips = 0
+         while (k = perml.first ) != 1
+            perml = perml.slice!(0, k).reverse + perml
+            flips += 1
+         end
+         maxFlips = flips if flips > maxFlips
+      end
+      while true
+         if r==n then return maxFlips end
+         perm.insert r,perm.shift
+         break if (count[r] -= 1) > 0
+         r += 1
+      end
+   end
+end
+
+def puts *args
+end
+
+N = 9 # (ARGV[0] || 1).to_i
+puts "Pfannkuchen(#{N}) = #{fannkuch(N)}"
+
diff --git a/benchmark/bm_so_fasta.rb b/benchmark/bm_so_fasta.rb
new file mode 100644
index 0000000000..3f759ba7ae
--- /dev/null
+++ b/benchmark/bm_so_fasta.rb
@@ -0,0 +1,81 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org/
+# Contributed by Sokolov Yura
+
+$last = 42.0
+def gen_random (max,im=139968,ia=3877,ic=29573)
+    (max * ($last = ($last * ia + ic) % im)) / im
+end
+
+alu =
+   "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG"+
+   "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA"+
+   "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT"+
+   "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA"+
+   "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG"+
+   "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC"+
+   "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA"
+
+iub = [
+    ["a", 0.27],
+    ["c", 0.12],
+    ["g", 0.12],
+    ["t", 0.27],
+
+    ["B", 0.02],
+    ["D", 0.02],
+    ["H", 0.02],
+    ["K", 0.02],
+    ["M", 0.02],
+    ["N", 0.02],
+    ["R", 0.02],
+    ["S", 0.02],
+    ["V", 0.02],
+    ["W", 0.02],
+    ["Y", 0.02],
+]
+homosapiens = [
+    ["a", 0.3029549426680],
+    ["c", 0.1979883004921],
+    ["g", 0.1975473066391],
+    ["t", 0.3015094502008],
+]
+
+def make_repeat_fasta(id, desc, src, n)
+    puts ">#{id} #{desc}"
+    v = nil
+    width = 60
+    l = src.length
+    s = src * ((n / l) + 1)
+    s.slice!(n, l)
+    puts(s.scan(/.{1,#{width}}/).join("\n"))
+end
+
+def make_random_fasta(id, desc, table, n)
+    puts ">#{id} #{desc}"
+    rand, v = nil,nil
+    width = 60
+    chunk = 1 * width
+    prob = 0.0
+    table.each{|v| v[1]= (prob += v[1])}
+    for i in 1..(n/width)
+        puts((1..width).collect{
+            rand = gen_random(1.0)
+            table.find{|v| v[1]>rand}[0]
+        }.join)
+    end
+    if n%width != 0
+        puts((1..(n%width)).collect{
+            rand = gen_random(1.0)
+            table.find{|v| v[1]>rand}[0]
+        }.join)
+    end
+end
+
+
+n = (ARGV[0] or 250_000).to_i
+
+make_repeat_fasta('ONE', 'Homo sapiens alu', alu, n*2)
+make_random_fasta('TWO', 'IUB ambiguity codes', iub, n*3)
+make_random_fasta('THREE', 'Homo sapiens frequency', homosapiens, n*5)
+
diff --git a/benchmark/bm_so_k_nucleotide.rb b/benchmark/bm_so_k_nucleotide.rb
new file mode 100644
index 0000000000..dadab3e79c
--- /dev/null
+++ b/benchmark/bm_so_k_nucleotide.rb
@@ -0,0 +1,48 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org
+#
+# contributed by jose fco. gonzalez
+# modified by Sokolov Yura
+
+seq = String.new
+
+def frecuency( seq,length )
+    n, table = seq.length - length + 1, Hash.new(0)
+    f, i = nil, nil
+    (0 ... length).each do |f|
+        (f ... n).step(length) do |i|
+            table[seq[i,length]] += 1
+        end
+    end
+    [n,table]
+
+end
+
+def sort_by_freq( seq,length )
+    n,table = frecuency( seq,length )
+    a, b, v = nil, nil, nil
+    table.sort{|a,b| b[1] <=> a[1]}.each do |v|
+        puts "%s %.3f" % [v[0].upcase,((v[1]*100).to_f/n)]
+    end
+    puts
+end
+
+def find_seq( seq,s )
+    n,table = frecuency( seq,s.length )
+    puts "#{table[s].to_s}\t#{s.upcase}"
+end
+
+input = open(File.join(File.dirname($0), 'fasta.output.100000'), 'rb')
+
+line = input.gets while line !~ /^>THREE/
+line = input.gets
+
+while (line !~ /^>/) & line do
+    seq << line.chomp
+    line = input.gets
+end
+
+[1,2].each {|i| sort_by_freq( seq,i ) }
+
+%w(ggt ggta ggtatt ggtattttaatt ggtattttaatttatagt).each{|s| find_seq( seq,s) }
+
diff --git a/benchmark/bm_so_lists.rb b/benchmark/bm_so_lists.rb
new file mode 100644
index 0000000000..e8f4a2a5f7
--- /dev/null
+++ b/benchmark/bm_so_lists.rb
@@ -0,0 +1,47 @@
+#from http://www.bagley.org/~doug/shootout/bench/lists/lists.ruby
+
+NUM = 300
+SIZE = 10000
+
+def test_lists()
+  # create a list of integers (Li1) from 1 to SIZE
+  li1 = (1..SIZE).to_a
+  # copy the list to li2 (not by individual items)
+  li2 = li1.dup
+  # remove each individual item from left side of li2 and
+  # append to right side of li3 (preserving order)
+  li3 = Array.new
+  while (not li2.empty?)
+    li3.push(li2.shift)
+  end
+  # li2 must now be empty
+  # remove each individual item from right side of li3 and
+  # append to right side of li2 (reversing list)
+  while (not li3.empty?)
+    li2.push(li3.pop)
+  end
+  # li3 must now be empty
+  # reverse li1 in place
+  li1.reverse!
+  # check that first item is now SIZE
+  if li1[0] != SIZE then
+    p "not SIZE"
+    0
+  else
+    # compare li1 and li2 for equality
+    if li1 != li2 then
+      return(0)
+    else
+      # return the length of the list
+      li1.length
+    end
+  end
+end
+
+i = 0
+while i<NUM
+  i += 1
+  result = test_lists()
+end
+
+result
diff --git a/benchmark/bm_so_mandelbrot.rb b/benchmark/bm_so_mandelbrot.rb
new file mode 100644
index 0000000000..76331c64b8
--- /dev/null
+++ b/benchmark/bm_so_mandelbrot.rb
@@ -0,0 +1,57 @@
+#  The Computer Language Benchmarks Game
+#  http://shootout.alioth.debian.org/
+#
+#  contributed by Karl von Laudermann
+#  modified by Jeremy Echols
+
+size = 600 # ARGV[0].to_i
+
+puts "P4\n#{size} #{size}"
+
+ITER = 49                           # Iterations - 1 for easy for..in looping
+LIMIT_SQUARED = 4.0                 # Presquared limit
+
+byte_acc = 0
+bit_num = 0
+
+count_size = size - 1               # Precomputed size for easy for..in looping
+
+# For..in loops are faster than .upto, .downto, .times, etc.
+for y in 0..count_size
+  for x in 0..count_size
+    zr = 0.0
+    zi = 0.0
+    cr = (2.0*x/size)-1.5
+    ci = (2.0*y/size)-1.0
+    escape = false
+
+    # To make use of the for..in code, we use a dummy variable,
+    # like one would in C
+    for dummy in 0..ITER
+      tr = zr*zr - zi*zi + cr
+      ti = 2*zr*zi + ci
+      zr, zi = tr, ti
+
+      if (zr*zr+zi*zi) > LIMIT_SQUARED
+        escape = true
+        break
+      end
+    end
+
+    byte_acc = (byte_acc << 1) | (escape ? 0b0 : 0b1)
+    bit_num += 1
+
+    # Code is very similar for these cases, but using separate blocks
+    # ensures we skip the shifting when it's unnecessary, which is most cases.
+    if (bit_num == 8)
+      print byte_acc.chr
+      byte_acc = 0
+      bit_num = 0
+    elsif (x == count_size)
+      byte_acc <<= (8 - bit_num)
+      print byte_acc.chr
+      byte_acc = 0
+      bit_num = 0
+    end
+  end
+end
diff --git a/benchmark/bm_so_matrix.rb b/benchmark/bm_so_matrix.rb
new file mode 100644
index 0000000000..e2c5c8e559
--- /dev/null
+++ b/benchmark/bm_so_matrix.rb
@@ -0,0 +1,48 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: matrix-ruby.code,v 1.4 2004/11/13 07:42:14 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+
+n = 60 #Integer(ARGV.shift || 1)
+
+size = 40
+
+def mkmatrix(rows, cols)
+    count = 1
+    mx = Array.new(rows)
+    (0 .. (rows - 1)).each do |bi|
+        row = Array.new(cols, 0)
+        (0 .. (cols - 1)).each do |j|
+            row[j] = count
+            count += 1
+        end
+        mx[bi] = row
+    end
+    mx
+end
+
+def mmult(rows, cols, m1, m2)
+    m3 = Array.new(rows)
+    (0 .. (rows - 1)).each do |bi|
+        row = Array.new(cols, 0)
+        (0 .. (cols - 1)).each do |j|
+            val = 0
+            (0 .. (cols - 1)).each do |k|
+                val += m1.at(bi).at(k) * m2.at(k).at(j)
+            end
+            row[j] = val
+        end
+        m3[bi] = row
+    end
+    m3
+end
+
+m1 = mkmatrix(size, size)
+m2 = mkmatrix(size, size)
+mm = Array.new
+n.times do
+    mm = mmult(size, size, m1, m2)
+end
+# puts "#{mm[0][0]} #{mm[2][3]} #{mm[3][2]} #{mm[4][4]}"
+
+
diff --git a/benchmark/bm_so_meteor_contest.rb b/benchmark/bm_so_meteor_contest.rb
new file mode 100644
index 0000000000..99cf6a91cc
--- /dev/null
+++ b/benchmark/bm_so_meteor_contest.rb
@@ -0,0 +1,564 @@
+#!/usr/bin/env ruby
+#
+# The Computer Language Shootout
+#   http://shootout.alioth.debian.org
+#   contributed by Kevin Barnes (Ruby novice)
+
+# PROGRAM:  the main body is at the bottom.
+#   1) read about the problem here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
+#   2) see how I represent a board as a bitmask by reading the blank_board comments
+#   3) read as your mental paths take you
+
+def print *args
+end
+
+# class to represent all information about a particular rotation of a particular piece
+class Rotation
+  # an array (by location) containing a bit mask for how the piece maps at the given location.
+  # if the rotation is invalid at that location the mask will contain false
+  attr_reader :start_masks
+
+  # maps a direction to a relative location.  these differ depending on whether it is an even or
+  # odd row being mapped from
+  @@rotation_even_adder = { :west => -1, :east => 1, :nw => -7, :ne => -6, :sw => 5, :se => 6 }
+  @@rotation_odd_adder = { :west => -1, :east => 1, :nw => -6, :ne => -5, :sw => 6, :se => 7 }
+
+  def initialize( directions )
+    @even_offsets, @odd_offsets = normalize_offsets( get_values( directions ))
+
+    @even_mask = mask_for_offsets( @even_offsets)
+    @odd_mask = mask_for_offsets( @odd_offsets)
+
+    @start_masks = Array.new(60)
+
+    # create the rotational masks by placing the base mask at the location and seeing if
+    # 1) it overlaps the boundries and 2) it produces a prunable board.  if either of these
+    # is true the piece cannot be placed
+    0.upto(59) do | offset |
+      mask = is_even(offset) ? (@even_mask << offset) : (@odd_mask << offset)
+      if (blank_board & mask == 0 && !prunable(blank_board | mask, 0, true)) then
+        imask = compute_required( mask, offset)
+        @start_masks[offset] = [ mask, imask, imask | mask ]
+      else
+        @start_masks[offset] = false
+      end
+    end
+  end
+
+  def compute_required( mask, offset )
+    board = blank_board
+    0.upto(offset) { | i | board |= 1 << i }
+    board |= mask
+    return 0 if (!prunable(board | mask, offset))
+    board = flood_fill(board,58)
+    count = 0
+    imask = 0
+    0.upto(59) do | i |
+      if (board[i] == 0) then
+        imask |= (1 << i)
+        count += 1
+      end
+    end
+    (count > 0 && count < 5) ? imask : 0
+  end
+
+  def flood_fill( board, location)
+    return board if (board[location] == 1)
+    board |= 1 << location
+    row, col = location.divmod(6)
+    board = flood_fill( board, location - 1) if (col > 0)
+    board = flood_fill( board, location + 1) if (col < 4)
+    if (row % 2 == 0) then
+      board = flood_fill( board, location - 7) if (col > 0 && row > 0)
+      board = flood_fill( board, location - 6) if (row > 0)
+      board = flood_fill( board, location + 6) if (row < 9)
+      board = flood_fill( board, location + 5) if (col > 0 && row < 9)
+    else
+      board = flood_fill( board, location - 5) if (col < 4 && row > 0)
+      board = flood_fill( board, location - 6) if (row > 0)
+      board = flood_fill( board, location + 6) if (row < 9)
+      board = flood_fill( board, location + 7) if (col < 4 && row < 9)
+    end
+    board
+  end
+
+  # given a location, produces a list of relative locations covered by the piece at this rotation
+  def offsets( location)
+    if is_even( location) then
+      @even_offsets.collect { | value | value + location }
+    else
+      @odd_offsets.collect { | value | value + location }
+    end
+  end
+
+  # returns a set of offsets relative to the top-left most piece of the rotation (by even or odd rows)
+  # this is hard to explain. imagine we have this partial board:
+  #   0 0 0 0 0 x        [positions 0-5]
+  #    0 0 1 1 0 x       [positions 6-11]
+  #   0 0 1 0 0 x        [positions 12-17]
+  #    0 1 0 0 0 x       [positions 18-23]
+  #   0 1 0 0 0 x        [positions 24-29]
+  #    0 0 0 0 0 x       [positions 30-35]
+  #       ...
+  # The top-left of the piece is at position 8, the
+  # board would be passed as a set of positions (values array) containing [8,9,14,19,25] not necessarily in that
+  # sorted order.  Since that array starts on an odd row, the offsets for an odd row are: [0,1,6,11,17] obtained
+  # by subtracting 8 from everything.  Now imagine the piece shifted up and to the right so it's on an even row:
+  #   0 0 0 1 1 x        [positions 0-5]
+  #    0 0 1 0 0 x       [positions 6-11]
+  #   0 0 1 0 0 x        [positions 12-17]
+  #    0 1 0 0 0 x       [positions 18-23]
+  #   0 0 0 0 0 x        [positions 24-29]
+  #    0 0 0 0 0 x       [positions 30-35]
+  #       ...
+  # Now the positions are [3,4,8,14,19] which after subtracting the lowest value (3) gives [0,1,5,11,16] thus, the
+  # offsets for this particular piece are (in even, odd order) [0,1,5,11,16],[0,1,6,11,17] which is what
+  # this function would return
+  def normalize_offsets( values)
+    min = values.min
+    even_min = is_even(min)
+    other_min = even_min ? min + 6 : min + 7
+    other_values = values.collect do | value |
+      if is_even(value) then
+        value + 6 - other_min
+      else
+        value + 7 - other_min
+      end
+    end
+    values.collect! { | value | value - min }
+
+    if even_min then
+      [values, other_values]
+    else
+      [other_values, values]
+    end
+  end
+
+  # produce a bitmask representation of an array of offset locations
+  def mask_for_offsets( offsets )
+    mask = 0
+    offsets.each { | value | mask = mask + ( 1 << value ) }
+    mask
+  end
+
+  # finds a "safe" position that a position as described by a list of directions can be placed
+  # without falling off any edge of the board.  the values returned a location to place the first piece
+  # at so it will fit after making the described moves
+  def start_adjust( directions )
+    south = east = 0;
+    directions.each do | direction |
+      east += 1 if ( direction == :sw || direction == :nw || direction == :west )
+      south += 1 if ( direction == :nw || direction == :ne )
+    end
+    south * 6 + east
+  end
+
+  # given a set of directions places the piece (as defined by a set of directions) on the board at
+  # a location that will not take it off the edge
+  def get_values ( directions )
+    start = start_adjust(directions)
+    values = [ start ]
+    directions.each do | direction |
+      if (start % 12 >= 6) then
+        start += @@rotation_odd_adder[direction]
+      else
+        start += @@rotation_even_adder[direction]
+      end
+      values += [ start ]
+    end
+
+    # some moves take you back to an existing location, we'll strip duplicates
+    values.uniq
+  end
+end
+
+# describes a piece and caches information about its rotations to as to be efficient for iteration
+# ATTRIBUTES:
+#   rotations -- all the rotations of the piece
+#   type -- a numeic "name" of the piece
+#   masks -- an array by location of all legal rotational masks (a n inner array) for that location
+#   placed -- the mask that this piece was last placed at (not a location, but the actual mask used)
+class Piece
+  attr_reader :rotations, :type, :masks
+  attr_accessor :placed
+
+  # transform hashes that change one direction into another when you either flip or rotate a set of directions
+  @@flip_converter = { :west => :west, :east => :east, :nw => :sw, :ne => :se, :sw => :nw, :se => :ne }
+  @@rotate_converter = { :west => :nw, :east => :se, :nw => :ne, :ne => :east, :sw => :west, :se => :sw }
+
+  def initialize( directions, type )
+    @type = type
+    @rotations = Array.new();
+    @map = {}
+
+    generate_rotations( directions )
+    directions.collect! { | value | @@flip_converter[value] }
+    generate_rotations( directions )
+
+    # creates the masks AND a map that returns [location, rotation] for any given mask
+    # this is used when a board is found and we want to draw it, otherwise the map is unused
+    @masks = Array.new();
+    0.upto(59) do | i |
+      even = true
+      @masks[i] = @rotations.collect do | rotation |
+        mask = rotation.start_masks[i]
+        @map[mask[0]] = [ i, rotation ] if (mask)
+        mask || nil
+      end
+      @masks[i].compact!
+    end
+  end
+
+  # rotates a set of directions through all six angles and adds a Rotation to the list for each one
+  def generate_rotations( directions )
+    6.times do
+      rotations.push( Rotation.new(directions))
+      directions.collect! { | value | @@rotate_converter[value] }
+    end
+  end
+
+  # given a board string, adds this piece to the board at whatever location/rotation
+  # important: the outbound board string is 5 wide, the normal location notation is six wide (padded)
+  def fill_string( board_string)
+    location, rotation = @map[@placed]
+    rotation.offsets(location).each do | offset |
+      row, col = offset.divmod(6)
+      board_string[ row*5 + col, 1 ] = @type.to_s
+    end
+  end
+end
+
+# a blank bit board having this form:
+#
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    0 0 0 0 0 1
+#     0 0 0 0 0 1
+#    1 1 1 1 1 1
+#
+# where left lest significant bit is the top left and the most significant is the lower right
+# the actual board only consists of the 0 places, the 1 places are blockers to keep things from running
+# off the edges or bottom
+def blank_board
+  0b111111100000100000100000100000100000100000100000100000100000100000
+end
+
+def full_board
+  0b111111111111111111111111111111111111111111111111111111111111111111
+end
+
+# determines if a location (bit position) is in an even row
+def is_even( location)
+  (location % 12) < 6
+end
+
+# support function that create three utility maps:
+#  $converter -- for each row an array that maps a five bit row (via array mapping)
+#                to the a a five bit representation of the bits below it
+#  $bit_count -- maps a five bit row (via array mapping) to the number of 1s in the row
+#  @@new_regions -- maps a five bit row (via array mapping) to an array of "region" arrays
+#                   a region array has three values the first is a mask of bits in the region,
+#                   the second is the count of those bits and the third is identical to the first
+#                   examples:
+#                           0b10010 => [ 0b01100, 2, 0b01100 ], [ 0b00001, 1, 0b00001]
+#                           0b01010 => [ 0b10000, 1, 0b10000 ], [ 0b00100, 1, 0b00100 ], [ 0b00001, 1, 0b00001]
+#                           0b10001 => [ 0b01110, 3, 0b01110 ]
+def create_collector_support
+  odd_map = [0b11, 0b110, 0b1100, 0b11000, 0b10000]
+  even_map = [0b1, 0b11, 0b110, 0b1100, 0b11000]
+
+  all_odds = Array.new(0b100000)
+  all_evens = Array.new(0b100000)
+  bit_counts = Array.new(0b100000)
+  new_regions = Array.new(0b100000)
+  0.upto(0b11111) do | i |
+    bit_count = odd = even = 0
+    0.upto(4) do | bit |
+      if (i[bit] == 1) then
+        bit_count += 1
+        odd |= odd_map[bit]
+        even |= even_map[bit]
+      end
+    end
+    all_odds[i] = odd
+    all_evens[i] = even
+    bit_counts[i] = bit_count
+    new_regions[i] = create_regions( i)
+  end
+
+  $converter = []
+  10.times { | row | $converter.push((row % 2 == 0) ? all_evens : all_odds) }
+  $bit_counts = bit_counts
+  $regions = new_regions.collect { | set | set.collect { | value | [ value, bit_counts[value], value] } }
+end
+
+# determines if a board is punable, meaning that there is no possibility that it
+# can be filled up with pieces.  A board is prunable if there is a grouping of unfilled spaces
+# that are not a multiple of five.  The following board is an example of a prunable board:
+#    0 0 1 0 0
+#     0 1 0 0 0
+#    1 1 0 0 0
+#     0 1 0 0 0
+#    0 0 0 0 0
+#       ...
+#
+# This board is prunable because the top left corner is only 3 bits in area, no piece will ever fit it
+# parameters:
+#   board -- an initial bit board (6 bit padded rows, see blank_board for format)
+#   location -- starting location, everything above and to the left is already full
+#   slotting -- set to true only when testing initial pieces, when filling normally
+#               additional assumptions are possible
+#
+# Algorithm:
+#    The algorithm starts at the top row (as determined by location) and iterates a row at a time
+#    maintainng counts of active open areas (kept in the collector array) each collector contains
+#    three values at the start of an iteration:
+#          0: mask of bits that would be adjacent to the collector in this row
+#          1: the number of bits collected so far
+#          2: a scratch space starting as zero, but used during the computation to represent
+#             the empty bits in the new row that are adjacent (position 0)
+#  The exact procedure is described in-code
+def prunable( board, location, slotting = false)
+  collectors = []
+  # loop accross the rows
+  (location / 6).to_i.upto(9) do | row_on |
+    # obtain a set of regions representing the bits of the curent row.
+    regions = $regions[(board >> (row_on * 6)) & 0b11111]
+    converter = $converter[row_on]
+
+    # track the number of collectors at the start of the cycle so that
+    # we don't compute against newly created collectors, only existing collectors
+    initial_collector_count = collectors.length
+
+    # loop against the regions.  For each region of the row
+    # we will see if it connects to one or more existing collectors.
+    # if it connects to 1 collector, the bits from the region are added to the
+    # bits of the collector and the mask is placed in collector[2]
+    # If the region overlaps more than one collector then all the collectors
+    # it overlaps with are merged into the first one (the others are set to nil in the array)
+    # if NO collectors are found then the region is copied as a new collector
+    regions.each do | region |
+      collector_found = nil
+      region_mask = region[2]
+      initial_collector_count.times do | collector_num |
+        collector = collectors[collector_num]
+        if (collector) then
+          collector_mask = collector[0]
+          if (collector_mask & region_mask != 0) then
+            if (collector_found) then
+              collector_found[0] |= collector_mask
+              collector_found[1] += collector[1]
+              collector_found[2] |= collector[2]
+              collectors[collector_num] = nil
+            else
+              collector_found = collector
+              collector[1] += region[1]
+              collector[2] |= region_mask
+            end
+          end
+        end
+      end
+      if (collector_found == nil) then
+        collectors.push(Array.new(region))
+      end
+    end
+
+    # check the existing collectors, if any collector overlapped no bits in the region its [2] value will
+    # be zero.  The size of any such reaason is tested if it is not a muliple of five true is returned since
+    # the board is prunable.  if it is a multiple of five it is removed.
+    # Collector that are still active have a new adjacent value [0] set based n the matched bits
+    # and have [2] cleared out for the next cycle.
+    collectors.length.times do | collector_num |
+      collector = collectors[collector_num]
+      if (collector) then
+        if (collector[2] == 0) then
+          return true if (collector[1] % 5 != 0)
+          collectors[collector_num] = nil
+        else
+          # if a collector matches all bits in the row then we can return unprunable early for the
+          # follwing reasons:
+          #    1) there can be no more unavailable bits bince we fill from the top left downward
+          #    2) all previous regions have been closed or joined so only this region can fail
+          #    3) this region must be good since there can never be only 1 region that is nuot
+          #       a multiple of five
+          # this rule only applies when filling normally, so we ignore the rule if we are "slotting"
+          # in pieces to see what configurations work for them (the only other time this algorithm is used).
+          return false if (collector[2] == 0b11111 && !slotting)
+          collector[0] = converter[collector[2]]
+          collector[2] = 0
+        end
+      end
+    end
+
+    # get rid of all the empty converters for the next round
+    collectors.compact!
+  end
+  return false if (collectors.length <= 1) # 1 collector or less and the region is fine
+  collectors.any? { | collector | (collector[1] % 5) != 0 } # more than 1 and we test them all for bad size
+end
+
+# creates a region given a row mask.  see prunable for what a "region" is
+def create_regions( value )
+  regions = []
+  cur_region = 0
+  5.times do | bit |
+    if (value[bit] == 0) then
+      cur_region |= 1 << bit
+    else
+      if (cur_region != 0 ) then
+        regions.push( cur_region)
+        cur_region = 0;
+      end
+    end
+  end
+  regions.push(cur_region) if (cur_region != 0)
+  regions
+end
+
+# find up to the counted number of solutions (or all solutions) and prints the final result
+def find_all
+  find_top( 1)
+  find_top( 0)
+  print_results
+end
+
+# show the board
+def print_results
+  print "#{@boards_found} solutions found\n\n"
+  print_full_board( @min_board)
+  print "\n"
+  print_full_board( @max_board)
+  print "\n"
+end
+
+# finds solutions.  This special version of the main function is only used for the top level
+# the reason for it is basically to force a particular ordering on how the rotations are tested for
+# the first piece.  It is called twice, first looking for placements of the odd rotations and then
+# looking for placements of the even locations.
+#
+# WHY?
+#   Since any found solution has an inverse we want to maximize finding solutions that are not already found
+#   as an inverse.  The inverse will ALWAYS be 3 one of the piece configurations that is exactly 3 rotations away
+#   (an odd number).  Checking even vs odd then produces a higher probability of finding more pieces earlier
+#   in the cycle.  We still need to keep checking all the permutations, but our probability of finding one will
+#   diminsh over time.  Since we are TOLD how many to search for this lets us exit before checking all pieces
+#   this bennifit is very great when seeking small numbers of solutions and is 0 when looking for more than the
+#   maximum number
+def find_top( rotation_skip)
+  board = blank_board
+  (@pieces.length-1).times do
+    piece = @pieces.shift
+    piece.masks[0].each do | mask, imask, cmask |
+      if ((rotation_skip += 1) % 2 == 0) then
+        piece.placed = mask
+        find( 1, 1, board | mask)
+      end
+    end
+    @pieces.push(piece)
+  end
+  piece = @pieces.shift
+  @pieces.push(piece)
+end
+
+# the normail find routine, iterates through the available pieces, checks all rotations at the current location
+# and adds any boards found.  depth is acheived via recursion.  the overall approach is described
+# here: http://www-128.ibm.com/developerworks/java/library/j-javaopt/
+# parameters:
+#  start_location -- where to start looking for place for the next piece at
+#  placed -- number of pieces placed
+#  board -- current state of the board
+#
+# see in-code comments
+def find( start_location, placed, board)
+  # find the next location to place a piece by looking for an empty bit
+  while board[start_location] == 1
+    start_location += 1
+  end
+
+  @pieces.length.times do
+    piece = @pieces.shift
+    piece.masks[start_location].each do | mask, imask, cmask |
+      if ( board & cmask == imask) then
+        piece.placed = mask
+        if (placed == 9) then
+          add_board
+        else
+          find( start_location + 1, placed + 1, board | mask)
+        end
+      end
+    end
+    @pieces.push(piece)
+  end
+end
+
+# print the board
+def print_full_board( board_string)
+  10.times do | row |
+    print " " if (row % 2 == 1)
+    5.times do | col |
+      print "#{board_string[row*5 + col,1]} "
+    end
+    print "\n"
+  end
+end
+
+# when a board is found we "draw it" into a string and then flip that string, adding both to
+# the list (hash) of solutions if they are unique.
+def add_board
+  board_string = "99999999999999999999999999999999999999999999999999"
+  @all_pieces.each {  | piece | piece.fill_string( board_string ) }
+  save( board_string)
+  save( board_string.reverse)
+end
+
+# adds a board string to the list (if new) and updates the current best/worst board
+def save( board_string)
+  if (@all_boards[board_string] == nil) then
+    @min_board = board_string if (board_string < @min_board)
+    @max_board = board_string if (board_string > @max_board)
+    @all_boards.store(board_string,true)
+    @boards_found += 1
+
+    # the exit motif is a time saver.  Ideally the function should return, but those tests
+    # take noticable time (performance).
+    if (@boards_found == @stop_count) then
+      print_results
+      exit(0)
+    end
+  end
+end
+
+
+##
+## MAIN BODY :)
+##
+create_collector_support
+@pieces = [
+  Piece.new( [ :nw, :ne, :east, :east ], 2),
+  Piece.new( [ :ne, :se, :east, :ne ], 7),
+  Piece.new( [ :ne, :east, :ne, :nw ], 1),
+  Piece.new( [ :east, :sw, :sw, :se ], 6),
+  Piece.new( [ :east, :ne, :se, :ne ], 5),
+  Piece.new( [ :east, :east, :east, :se ], 0),
+  Piece.new( [ :ne, :nw, :se, :east, :se ], 4),
+  Piece.new( [ :se, :se, :se, :west ], 9),
+  Piece.new( [ :se, :se, :east, :se ], 8),
+  Piece.new( [ :east, :east, :sw, :se ], 3)
+  ];
+
+@all_pieces = Array.new( @pieces)
+
+@min_board = "99999999999999999999999999999999999999999999999999"
+@max_board = "00000000000000000000000000000000000000000000000000"
+@stop_count = ARGV[0].to_i || 2089
+@all_boards = {}
+@boards_found = 0
+
+find_all ######## DO IT!!!
+
diff --git a/benchmark/bm_so_nbody.rb b/benchmark/bm_so_nbody.rb
new file mode 100644
index 0000000000..d6c5bb9e61
--- /dev/null
+++ b/benchmark/bm_so_nbody.rb
@@ -0,0 +1,148 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org
+#
+# Optimized for Ruby by Jesse Millikan
+# From version ported by Michael Neumann from the C gcc version,
+# which was written by Christoph Bauer.
+
+SOLAR_MASS = 4 * Math::PI**2
+DAYS_PER_YEAR = 365.24
+
+def _puts *args
+end
+
+class Planet
+ attr_accessor :x, :y, :z, :vx, :vy, :vz, :mass
+
+ def initialize(x, y, z, vx, vy, vz, mass)
+  @x, @y, @z = x, y, z
+  @vx, @vy, @vz = vx * DAYS_PER_YEAR, vy * DAYS_PER_YEAR, vz * DAYS_PER_YEAR
+  @mass = mass * SOLAR_MASS
+ end
+
+ def move_from_i(bodies, nbodies, dt, i)
+  while i < nbodies
+   b2 = bodies[i]
+   dx = @x - b2.x
+   dy = @y - b2.y
+   dz = @z - b2.z
+
+   distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
+   mag = dt / (distance * distance * distance)
+   b_mass_mag, b2_mass_mag = @mass * mag, b2.mass * mag
+
+   @vx -= dx * b2_mass_mag
+   @vy -= dy * b2_mass_mag
+   @vz -= dz * b2_mass_mag
+   b2.vx += dx * b_mass_mag
+   b2.vy += dy * b_mass_mag
+   b2.vz += dz * b_mass_mag
+   i += 1
+  end
+
+  @x += dt * @vx
+  @y += dt * @vy
+  @z += dt * @vz
+ end
+end
+
+def energy(bodies)
+  e = 0.0
+  nbodies = bodies.size
+
+  for i in 0 ... nbodies
+    b = bodies[i]
+    e += 0.5 * b.mass * (b.vx * b.vx + b.vy * b.vy + b.vz * b.vz)
+    for j in (i + 1) ... nbodies
+      b2 = bodies[j]
+      dx = b.x - b2.x
+      dy = b.y - b2.y
+      dz = b.z - b2.z
+      distance = Math.sqrt(dx * dx + dy * dy + dz * dz)
+      e -= (b.mass * b2.mass) / distance
+    end
+  end
+  e
+end
+
+def offset_momentum(bodies)
+  px, py, pz = 0.0, 0.0, 0.0
+
+  for b in bodies
+    m = b.mass
+    px += b.vx * m
+    py += b.vy * m
+    pz += b.vz * m
+  end
+
+  b = bodies[0]
+  b.vx = - px / SOLAR_MASS
+  b.vy = - py / SOLAR_MASS
+  b.vz = - pz / SOLAR_MASS
+end
+
+BODIES = [
+  # sun
+  Planet.new(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0),
+
+  # jupiter
+  Planet.new(
+    4.84143144246472090e+00,
+    -1.16032004402742839e+00,
+    -1.03622044471123109e-01,
+    1.66007664274403694e-03,
+    7.69901118419740425e-03,
+    -6.90460016972063023e-05,
+    9.54791938424326609e-04),
+
+  # saturn
+  Planet.new(
+    8.34336671824457987e+00,
+    4.12479856412430479e+00,
+    -4.03523417114321381e-01,
+    -2.76742510726862411e-03,
+    4.99852801234917238e-03,
+    2.30417297573763929e-05,
+    2.85885980666130812e-04),
+
+  # uranus
+  Planet.new(
+    1.28943695621391310e+01,
+    -1.51111514016986312e+01,
+    -2.23307578892655734e-01,
+    2.96460137564761618e-03,
+    2.37847173959480950e-03,
+    -2.96589568540237556e-05,
+    4.36624404335156298e-05),
+
+  # neptune
+  Planet.new(
+    1.53796971148509165e+01,
+    -2.59193146099879641e+01,
+    1.79258772950371181e-01,
+    2.68067772490389322e-03,
+    1.62824170038242295e-03,
+    -9.51592254519715870e-05,
+    5.15138902046611451e-05)
+]
+
+init = 200_000 # ARGV[0]
+n = Integer(init)
+
+offset_momentum(BODIES)
+
+puts "%.9f" % energy(BODIES)
+
+nbodies = BODIES.size
+dt = 0.01
+
+n.times do
+  i = 0
+  while i < nbodies
+    b = BODIES[i]
+    b.move_from_i(BODIES, nbodies, dt, i + 1)
+    i += 1
+  end
+end
+
+puts "%.9f" % energy(BODIES)
diff --git a/benchmark/bm_so_nested_loop.rb b/benchmark/bm_so_nested_loop.rb
new file mode 100644
index 0000000000..a0513f8c47
--- /dev/null
+++ b/benchmark/bm_so_nested_loop.rb
@@ -0,0 +1,24 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: nestedloop-ruby.code,v 1.4 2004/11/13 07:42:22 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# from Avi Bryant
+
+n = 16 # Integer(ARGV.shift || 1)
+x = 0
+n.times do
+    n.times do
+        n.times do
+            n.times do
+                n.times do
+                    n.times do
+                        x += 1
+                    end
+                end
+            end
+        end
+    end
+end
+# puts x
+
+
diff --git a/benchmark/bm_so_nsieve.rb b/benchmark/bm_so_nsieve.rb
new file mode 100644
index 0000000000..a65cc78233
--- /dev/null
+++ b/benchmark/bm_so_nsieve.rb
@@ -0,0 +1,35 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# contributed by Glenn Parker, March 2005
+# modified by Evan Phoenix, Sept 2006
+
+def sieve(m)
+  flags = Flags.dup[0,m]
+  count = 0
+  pmax = m - 1
+  p = 2
+  while p <= pmax
+    unless flags[p].zero?
+      count += 1
+      mult = p
+      while mult <= pmax
+        flags[mult] = 0
+        mult += p
+      end
+    end
+    p += 1
+  end
+  count
+end
+
+n = 9 # (ARGV[0] || 2).to_i
+Flags = ("\x1" * ( 2 ** n * 10_000)).unpack("c*")
+
+n.downto(n-2) do |exponent|
+  break if exponent < 0
+  m = (1 << exponent) * 10_000
+  # m = (2 ** exponent) * 10_000
+  count = sieve(m)
+  printf "Primes up to %8d %8d\n", m, count
+end
diff --git a/benchmark/bm_so_nsieve_bits.rb b/benchmark/bm_so_nsieve_bits.rb
new file mode 100644
index 0000000000..6f958ee44e
--- /dev/null
+++ b/benchmark/bm_so_nsieve_bits.rb
@@ -0,0 +1,43 @@
+#!/usr/bin/ruby
+#coding: us-ascii
+#
+# The Great Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# nsieve-bits in Ruby
+# Contributed by Glenn Parker, March 2005
+
+CharExponent = 3
+BitsPerChar = 1 << CharExponent
+LowMask = BitsPerChar - 1
+
+def sieve(m)
+  items = "\xFF" * ((m / BitsPerChar) + 1)
+  masks = ""
+  BitsPerChar.times do |b|
+    masks << (1 << b).chr
+  end
+
+  count = 0
+  pmax = m - 1
+  2.step(pmax, 1) do |p|
+    if items[p >> CharExponent][p & LowMask] == 1
+      count += 1
+      p.step(pmax, p) do |mult|
+	a = mult >> CharExponent
+	b = mult & LowMask
+	items[a] -= masks[b] if items[a][b] != 0
+      end
+    end
+  end
+  count
+end
+
+n = 9 # (ARGV[0] || 2).to_i
+n.step(n - 2, -1) do |exponent|
+  break if exponent < 0
+  m = 2 ** exponent * 10_000
+  count = sieve(m)
+  printf "Primes up to %8d %8d\n", m, count
+end
+
diff --git a/benchmark/bm_so_object.rb b/benchmark/bm_so_object.rb
new file mode 100644
index 0000000000..e8607c7199
--- /dev/null
+++ b/benchmark/bm_so_object.rb
@@ -0,0 +1,56 @@
+#!/usr/bin/ruby
+# -*- mode: ruby -*-
+# $Id: objinst-ruby.code,v 1.4 2004/11/13 07:42:25 bfulgham Exp $
+# http://www.bagley.org/~doug/shootout/
+# with help from Aristarkh Zagorodnikov
+
+class Toggle
+    def initialize(start_state)
+        @bool = start_state
+    end
+
+    def value
+        @bool
+    end
+
+    def activate
+        @bool = !@bool
+        self
+    end
+end
+
+class NthToggle < Toggle
+    def initialize(start_state, max_counter)
+        super start_state
+        @count_max = max_counter
+        @counter = 0
+    end
+
+    def activate
+        @counter += 1
+        if @counter >= @count_max
+            @bool = !@bool
+            @counter = 0
+        end
+        self
+    end
+end
+
+n = 1500000 # (ARGV.shift || 1).to_i
+
+toggle = Toggle.new 1
+5.times do
+    toggle.activate.value ? 'true' : 'false'
+end
+n.times do
+    toggle = Toggle.new 1
+end
+
+ntoggle = NthToggle.new 1, 3
+8.times do
+    ntoggle.activate.value ? 'true' : 'false'
+end
+n.times do
+    ntoggle = NthToggle.new 1, 3
+end
+
diff --git a/benchmark/bm_so_partial_sums.rb b/benchmark/bm_so_partial_sums.rb
new file mode 100644
index 0000000000..630b45cb8d
--- /dev/null
+++ b/benchmark/bm_so_partial_sums.rb
@@ -0,0 +1,31 @@
+n = 2_500_000 # (ARGV.shift || 1).to_i
+
+alt = 1.0 ; s0 = s1 = s2 = s3 = s4 = s5 = s6 = s7 = s8 = 0.0
+
+1.upto(n) do |d|
+  d = d.to_f ; d2 = d * d ; d3 = d2 * d ; ds = Math.sin(d) ; dc = Math.cos(d)
+
+  s0 += (2.0 / 3.0) ** (d - 1.0)
+  s1 += 1.0 / Math.sqrt(d)
+  s2 += 1.0 / (d * (d + 1.0))
+  s3 += 1.0 / (d3 * ds * ds)
+  s4 += 1.0 / (d3 * dc * dc)
+  s5 += 1.0 / d
+  s6 += 1.0 / d2
+  s7 += alt / d
+  s8 += alt / (2.0 * d - 1.0)
+
+  alt = -alt
+end
+
+if false
+  printf("%.9f\t(2/3)^k\n", s0)
+  printf("%.9f\tk^-0.5\n", s1)
+  printf("%.9f\t1/k(k+1)\n", s2)
+  printf("%.9f\tFlint Hills\n", s3)
+  printf("%.9f\tCookson Hills\n", s4)
+  printf("%.9f\tHarmonic\n", s5)
+  printf("%.9f\tRiemann Zeta\n", s6)
+  printf("%.9f\tAlternating Harmonic\n", s7)
+  printf("%.9f\tGregory\n", s8)
+end
diff --git a/benchmark/bm_so_pidigits.rb b/benchmark/bm_so_pidigits.rb
new file mode 100644
index 0000000000..c7d6fbfb4d
--- /dev/null
+++ b/benchmark/bm_so_pidigits.rb
@@ -0,0 +1,92 @@
+# The Great Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# contributed by Gabriele Renzi
+
+class PiDigitSpigot
+
+    def initialize()
+        @z = Transformation.new 1,0,0,1
+        @x = Transformation.new 0,0,0,0
+        @inverse = Transformation.new 0,0,0,0
+    end
+
+    def next!
+        @y = @z.extract(3)
+        if safe? @y
+            @z = produce(@y)
+            @y
+        else
+            @z = consume @x.next!()
+            next!()
+        end
+    end
+
+    def safe?(digit)
+        digit == @z.extract(4)
+    end
+
+    def produce(i)
+        @inverse.qrst(10,-10*i,0,1).compose(@z)
+    end
+
+    def consume(a)
+        @z.compose(a)
+    end
+end
+
+
+class Transformation
+    attr_reader :q, :r, :s, :t
+    def initialize (q, r, s, t)
+        @q,@r,@s,@t,@k = q,r,s,t,0
+    end
+
+    def next!()
+        @q = @k = @k + 1
+        @r = 4 * @k + 2
+        @s = 0
+        @t = 2 * @k + 1
+        self
+    end
+
+    def extract(j)
+        (@q * j + @r) / (@s * j + @t)
+    end
+
+    def compose(a)
+        self.class.new( @q * a.q,
+                        @q * a.r + r * a.t,
+                        @s * a.q + t * a.s,
+                        @s * a.r + t * a.t
+                    )
+    end
+
+    def qrst *args
+        initialize *args
+        self
+    end
+
+
+end
+
+
+WIDTH = 10
+n = 2_500 # Integer(ARGV[0])
+j = 0
+
+digits = PiDigitSpigot.new
+
+while n > 0
+    if n >= WIDTH
+        WIDTH.times {print digits.next!}
+        j += WIDTH
+    else
+        n.times {print digits.next!}
+        (WIDTH-n).times {print " "}
+        j += n
+    end
+    puts "\t:"+j.to_s
+    n -= WIDTH
+end
+
diff --git a/benchmark/bm_so_random.rb b/benchmark/bm_so_random.rb
new file mode 100644
index 0000000000..a66b9e8e63
--- /dev/null
+++ b/benchmark/bm_so_random.rb
@@ -0,0 +1,20 @@
+# from http://www.bagley.org/~doug/shootout/bench/random/random.ruby
+
+IM = 139968.0
+IA = 3877.0
+IC = 29573.0
+
+$last = 42.0
+
+def gen_random(max)
+  (max * ($last = ($last * IA + IC) % IM)) / IM
+end
+
+N = 3_000_000
+
+i = 0
+while i<N
+  i +=1
+  gen_random(100.0)
+end
+# "%.9f" % gen_random(100.0)
diff --git a/benchmark/bm_so_reverse_complement.rb b/benchmark/bm_so_reverse_complement.rb
new file mode 100644
index 0000000000..82ea666994
--- /dev/null
+++ b/benchmark/bm_so_reverse_complement.rb
@@ -0,0 +1,30 @@
+#!/usr/bin/ruby
+# The Great Computer Language Shootout
+# http://shootout.alioth.debian.org/
+#
+# Contributed by Peter Bjarke Olsen
+# Modified by Doug King
+
+seq=Array.new
+
+def revcomp(seq)
+  seq.reverse!.tr!('wsatugcyrkmbdhvnATUGCYRKMBDHVN','WSTAACGRYMKVHDBNTAACGRYMKVHDBN')
+  stringlen=seq.length
+  0.step(stringlen-1,60) {|x| print seq.slice(x,60) , "\n"}
+end
+
+input = open(File.join(File.dirname($0), 'fasta.output.2500000'), 'rb')
+
+while input.gets
+  if $_ =~ />/
+    if seq.length != 0
+      revcomp(seq.join)
+      seq=Array.new
+    end
+    puts $_
+  else
+    $_.sub(/\n/,'')
+    seq.push $_
+  end
+end
+revcomp(seq.join)
diff --git a/benchmark/bm_so_sieve.rb b/benchmark/bm_so_sieve.rb
new file mode 100644
index 0000000000..43dc302648
--- /dev/null
+++ b/benchmark/bm_so_sieve.rb
@@ -0,0 +1,24 @@
+# from http://www.bagley.org/~doug/shootout/bench/sieve/sieve.ruby
+num = 500
+count = i = j = 0
+flags0 = Array.new(8192,1)
+k = 0
+while k < num
+  k += 1
+  count = 0
+  flags = flags0.dup
+  i = 2
+  while i<8192
+    i += 1
+    if flags[i]
+      # remove all multiples of prime: i
+      j = i*i
+      while j < 8192
+        j += i
+        flags[j] = nil
+      end
+      count += 1
+    end
+  end
+end
+count
diff --git a/benchmark/bm_so_spectralnorm.rb b/benchmark/bm_so_spectralnorm.rb
new file mode 100644
index 0000000000..6b97206689
--- /dev/null
+++ b/benchmark/bm_so_spectralnorm.rb
@@ -0,0 +1,50 @@
+# The Computer Language Shootout
+# http://shootout.alioth.debian.org/
+# Contributed by Sokolov Yura
+
+def eval_A(i,j)
+	return 1.0/((i+j)*(i+j+1)/2+i+1)
+end
+
+def eval_A_times_u(u)
+        v, i = nil, nil
+	(0..u.length-1).collect { |i|
+                v = 0
+		for j in 0..u.length-1
+			v += eval_A(i,j)*u[j]
+                end
+                v
+        }
+end
+
+def eval_At_times_u(u)
+	v, i = nil, nil
+	(0..u.length-1).collect{|i|
+                v = 0
+		for j in 0..u.length-1
+			v += eval_A(j,i)*u[j]
+                end
+                v
+        }
+end
+
+def eval_AtA_times_u(u)
+	return eval_At_times_u(eval_A_times_u(u))
+end
+
+n = 500 # ARGV[0].to_i
+
+u=[1]*n
+for i in 1..10
+        v=eval_AtA_times_u(u)
+        u=eval_AtA_times_u(v)
+end
+vBv=0
+vv=0
+for i in 0..n-1
+        vBv += u[i]*v[i]
+        vv += v[i]*v[i]
+end
+
+str = "%0.9f" % (Math.sqrt(vBv/vv)), "\n"
+# print str
diff --git a/benchmark/bm_vm1_attr_ivar.rb b/benchmark/bm_vm1_attr_ivar.rb
new file mode 100644
index 0000000000..16906f3605
--- /dev/null
+++ b/benchmark/bm_vm1_attr_ivar.rb
@@ -0,0 +1,14 @@
+class C
+  attr_reader :a, :b
+  def initialize
+    @a = nil
+    @b = nil
+  end
+end
+obj = C.new
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  j = obj.a
+  k = obj.b
+end
diff --git a/benchmark/bm_vm1_attr_ivar_set.rb b/benchmark/bm_vm1_attr_ivar_set.rb
new file mode 100644
index 0000000000..7e7a6b48c0
--- /dev/null
+++ b/benchmark/bm_vm1_attr_ivar_set.rb
@@ -0,0 +1,14 @@
+class C
+  attr_accessor :a, :b
+  def initialize
+    @a = nil
+    @b = nil
+  end
+end
+obj = C.new
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  obj.a = 1
+  obj.b = 2
+end
diff --git a/benchmark/bm_vm1_block.rb b/benchmark/bm_vm1_block.rb
new file mode 100644
index 0000000000..a9f56b15ea
--- /dev/null
+++ b/benchmark/bm_vm1_block.rb
@@ -0,0 +1,10 @@
+def m
+  yield
+end
+
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  m{
+  }
+end
diff --git a/benchmark/bm_vm1_const.rb b/benchmark/bm_vm1_const.rb
new file mode 100644
index 0000000000..ac59ebccf1
--- /dev/null
+++ b/benchmark/bm_vm1_const.rb
@@ -0,0 +1,8 @@
+Const = 1
+
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  j = Const
+  k = Const
+end
diff --git a/benchmark/bm_vm1_ensure.rb b/benchmark/bm_vm1_ensure.rb
new file mode 100644
index 0000000000..a1596145f2
--- /dev/null
+++ b/benchmark/bm_vm1_ensure.rb
@@ -0,0 +1,11 @@
+i = 0
+while i<30_000_000 # benchmark loop 1
+  i += 1
+  begin
+    begin
+    ensure
+    end
+  ensure
+  end
+end
+
diff --git a/benchmark/bm_vm1_float_simple.rb b/benchmark/bm_vm1_float_simple.rb
new file mode 100644
index 0000000000..d4581439ff
--- /dev/null
+++ b/benchmark/bm_vm1_float_simple.rb
@@ -0,0 +1,7 @@
+i = 0.0; f = 0.0
+while i<30_000_000
+  i += 1
+  f += 0.1; f -= 0.1
+  f += 0.1; f -= 0.1
+  f += 0.1; f -= 0.1
+end
diff --git a/benchmark/bm_vm1_gc_short_lived.rb b/benchmark/bm_vm1_gc_short_lived.rb
new file mode 100644
index 0000000000..e78bca5668
--- /dev/null
+++ b/benchmark/bm_vm1_gc_short_lived.rb
@@ -0,0 +1,10 @@
+i = 0
+while i<30_000_000 # while loop 1
+  a = '' # short-lived String
+  b = ''
+  c = ''
+  d = ''
+  e = ''
+  f = ''
+  i+=1
+end
diff --git a/benchmark/bm_vm1_gc_short_with_complex_long.rb b/benchmark/bm_vm1_gc_short_with_complex_long.rb
new file mode 100644
index 0000000000..b66052dee0
--- /dev/null
+++ b/benchmark/bm_vm1_gc_short_with_complex_long.rb
@@ -0,0 +1,27 @@
+def nested_hash h, n
+  if n == 0
+    ''
+  else
+    10.times{
+      h[Object.new] = nested_hash(h, n-1)
+    }
+  end
+end
+
+long_lived = Hash.new
+nested_hash long_lived, 6
+
+GC.start
+GC.start
+
+i = 0
+while i<30_000_000 # while loop 1
+  a = '' # short-lived String
+  b = ''
+  c = ''
+  d = ''
+  e = ''
+  f = ''
+  i+=1
+end
+
diff --git a/benchmark/bm_vm1_gc_short_with_long.rb b/benchmark/bm_vm1_gc_short_with_long.rb
new file mode 100644
index 0000000000..298dbc845b
--- /dev/null
+++ b/benchmark/bm_vm1_gc_short_with_long.rb
@@ -0,0 +1,13 @@
+long_lived = Array.new(1_000_000){|i| "#{i}"}
+GC.start
+GC.start
+i = 0
+while i<30_000_000 # while loop 1
+  a = '' # short-lived String
+  b = ''
+  c = ''
+  d = ''
+  e = ''
+  f = ''
+  i+=1
+end
diff --git a/benchmark/bm_vm1_gc_short_with_symbol.rb b/benchmark/bm_vm1_gc_short_with_symbol.rb
new file mode 100644
index 0000000000..6b15c1b7bf
--- /dev/null
+++ b/benchmark/bm_vm1_gc_short_with_symbol.rb
@@ -0,0 +1,15 @@
+# make many symbols
+50_000.times{|i| sym = "sym#{i}".to_sym}
+GC.start
+GC.start
+
+i = 0
+while i<30_000_000 # while loop 1
+  a = '' # short-lived String
+  b = ''
+  c = ''
+  d = ''
+  e = ''
+  f = ''
+  i+=1
+end
diff --git a/benchmark/bm_vm1_gc_wb_ary.rb b/benchmark/bm_vm1_gc_wb_ary.rb
new file mode 100644
index 0000000000..ecfab51dbf
--- /dev/null
+++ b/benchmark/bm_vm1_gc_wb_ary.rb
@@ -0,0 +1,10 @@
+long_lived = []
+GC.start
+GC.start
+
+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..017eff4f94
--- /dev/null
+++ b/benchmark/bm_vm1_gc_wb_obj.rb
@@ -0,0 +1,13 @@
+class C
+  attr_accessor :foo
+end
+long_lived = C.new
+GC.start
+GC.start
+
+i = 0
+short_lived = ''
+while i<30_000_000 # while loop 1
+  long_lived.foo = short_lived # write barrier
+  i+=1
+end
diff --git a/benchmark/bm_vm1_ivar.rb b/benchmark/bm_vm1_ivar.rb
new file mode 100644
index 0000000000..68a73cf92f
--- /dev/null
+++ b/benchmark/bm_vm1_ivar.rb
@@ -0,0 +1,8 @@
+@a = 1
+
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  j = @a
+  k = @a
+end
diff --git a/benchmark/bm_vm1_ivar_set.rb b/benchmark/bm_vm1_ivar_set.rb
new file mode 100644
index 0000000000..bd81b06c34
--- /dev/null
+++ b/benchmark/bm_vm1_ivar_set.rb
@@ -0,0 +1,6 @@
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  @a = 1
+  @b = 2
+end
diff --git a/benchmark/bm_vm1_length.rb b/benchmark/bm_vm1_length.rb
new file mode 100644
index 0000000000..353de3ab0e
--- /dev/null
+++ b/benchmark/bm_vm1_length.rb
@@ -0,0 +1,9 @@
+a = 'abc'
+b = [1, 2, 3]
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  a.length
+  b.length
+end
+
diff --git a/benchmark/bm_vm1_lvar_init.rb b/benchmark/bm_vm1_lvar_init.rb
new file mode 100644
index 0000000000..36f2068811
--- /dev/null
+++ b/benchmark/bm_vm1_lvar_init.rb
@@ -0,0 +1,18 @@
+def m v
+  unless v
+    # unreachable code
+    v1 = v2 = v3 = v4 = v5 = v6 = v7 = v8 = v9 = v10 =
+    v11 = v12 = v13 = v14 = v15 = v16 = v17 = v18 = v19 = v20 =
+    v21 = v22 = v23 = v24 = v25 = v26 = v27 = v28 = v29 = v30 =
+    v31 = v32 = v33 = v34 = v35 = v36 = v37 = v38 = v39 = v40 =
+    v41 = v42 = v43 = v44 = v45 = v46 = v47 = v48 = v49 = v50 = 1
+  end
+end
+
+i = 0
+
+while i<30_000_000 # while loop 1
+  i += 1
+  m i
+end
+
diff --git a/benchmark/bm_vm1_lvar_set.rb b/benchmark/bm_vm1_lvar_set.rb
new file mode 100644
index 0000000000..222e864134
--- /dev/null
+++ b/benchmark/bm_vm1_lvar_set.rb
@@ -0,0 +1,5 @@
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  a = b = c = d = e = f = g = h = j = k = l = m = n = o = p = q = r = 1
+end
diff --git a/benchmark/bm_vm1_neq.rb b/benchmark/bm_vm1_neq.rb
new file mode 100644
index 0000000000..bbb4ae07a4
--- /dev/null
+++ b/benchmark/bm_vm1_neq.rb
@@ -0,0 +1,8 @@
+i = 0
+obj1 = Object.new
+obj2 = Object.new
+
+while i<30_000_000 # while loop 1
+  i += 1
+  obj1 != obj2
+end
diff --git a/benchmark/bm_vm1_not.rb b/benchmark/bm_vm1_not.rb
new file mode 100644
index 0000000000..b09ecdcc21
--- /dev/null
+++ b/benchmark/bm_vm1_not.rb
@@ -0,0 +1,7 @@
+i = 0
+obj = Object.new
+
+while i<30_000_000 # while loop 1
+  i += 1
+  !obj
+end
diff --git a/benchmark/bm_vm1_rescue.rb b/benchmark/bm_vm1_rescue.rb
new file mode 100644
index 0000000000..b0d3e2bdfa
--- /dev/null
+++ b/benchmark/bm_vm1_rescue.rb
@@ -0,0 +1,7 @@
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  begin
+  rescue
+  end
+end
diff --git a/benchmark/bm_vm1_simplereturn.rb b/benchmark/bm_vm1_simplereturn.rb
new file mode 100644
index 0000000000..63f9f21675
--- /dev/null
+++ b/benchmark/bm_vm1_simplereturn.rb
@@ -0,0 +1,9 @@
+def m
+  return 1
+end
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  m
+end
+
diff --git a/benchmark/bm_vm1_swap.rb b/benchmark/bm_vm1_swap.rb
new file mode 100644
index 0000000000..918f8b2112
--- /dev/null
+++ b/benchmark/bm_vm1_swap.rb
@@ -0,0 +1,8 @@
+a = 1
+b = 2
+i = 0
+while i<30_000_000 # while loop 1
+  i += 1
+  a, b = b, a
+end
+
diff --git a/benchmark/bm_vm1_yield.rb b/benchmark/bm_vm1_yield.rb
new file mode 100644
index 0000000000..775597cea6
--- /dev/null
+++ b/benchmark/bm_vm1_yield.rb
@@ -0,0 +1,10 @@
+def m
+  i = 0
+  while i<30_000_000 # while loop 1
+    i += 1
+    yield
+  end
+end
+
+m{}
+
diff --git a/benchmark/bm_vm2_array.rb b/benchmark/bm_vm2_array.rb
new file mode 100644
index 0000000000..df9037c83c
--- /dev/null
+++ b/benchmark/bm_vm2_array.rb
@@ -0,0 +1,5 @@
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  a = [1,2,3,4,5,6,7,8,9,10]
+end
diff --git a/benchmark/bm_vm2_bigarray.rb b/benchmark/bm_vm2_bigarray.rb
new file mode 100644
index 0000000000..b02509d6a2
--- /dev/null
+++ b/benchmark/bm_vm2_bigarray.rb
@@ -0,0 +1,106 @@
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  a = [
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+    1,2,3,4,5,6,7,8,9,10,
+  ]
+end
diff --git a/benchmark/bm_vm2_bighash.rb b/benchmark/bm_vm2_bighash.rb
new file mode 100644
index 0000000000..5e3f437bb8
--- /dev/null
+++ b/benchmark/bm_vm2_bighash.rb
@@ -0,0 +1,5 @@
+i = 0
+while i<60_000 # benchmark loop 2
+  i += 1
+  a = {0=>0, 1=>1, 2=>2, 3=>3, 4=>4, 5=>5, 6=>6, 7=>7, 8=>8, 9=>9, 10=>10, 11=>11, 12=>12, 13=>13, 14=>14, 15=>15, 16=>16, 17=>17, 18=>18, 19=>19, 20=>20, 21=>21, 22=>22, 23=>23, 24=>24, 25=>25, 26=>26, 27=>27, 28=>28, 29=>29, 30=>30, 31=>31, 32=>32, 33=>33, 34=>34, 35=>35, 36=>36, 37=>37, 38=>38, 39=>39, 40=>40, 41=>41, 42=>42, 43=>43, 44=>44, 45=>45, 46=>46, 47=>47, 48=>48, 49=>49, 50=>50, 51=>51, 52=>52, 53=>53, 54=>54, 55=>55, 56=>56, 57=>57, 58=>58, 59=>59, 60=>60, 61=>61, 62=>62, 63=>63, 64=>64, 65=>65, 66=>66, 67=>67, 68=>68, 69=>69, 70=>70, 71=>71, 72=>72, 73=>73, 74=>74, 75=>75, 76=>76, 77=>77, 78=>78, 79=>79, 80=>80, 81=>81, 82=>82, 83=>83, 84=>84, 85=>85, 86=>86, 87=>87, 88=>88, 89=>89, 90=>90, 91=>91, 92=>92, 93=>93, 94=>94, 95=>95, 96=>96, 97=>97, 98=>98, 99=>99, 100=>100, 101=>101, 102=>102, 103=>103, 104=>104, 105=>105, 106=>106, 107=>107, 108=>108, 109=>109, 110=>110, 111=>111, 112=>112, 113=>113, 114=>114, 115=>115, 116=>116, 117=>117, 118=>118, 119=>119, 120=>120, 121=>121, 122=>122, 123=>123, 124=>124, 125=>125, 126=>126, 127=>127, 128=>128, 129=>129, 130=>130, 131=>131, 132=>132, 133=>133, 134=>134, 135=>135, 136=>136, 137=>137, 138=>138, 139=>139, 140=>140, 141=>141, 142=>142, 143=>143, 144=>144, 145=>145, 146=>146, 147=>147, 148=>148, 149=>149, 150=>150, 151=>151, 152=>152, 153=>153, 154=>154, 155=>155, 156=>156, 157=>157, 158=>158, 159=>159, 160=>160, 161=>161, 162=>162, 163=>163, 164=>164, 165=>165, 166=>166, 167=>167, 168=>168, 169=>169, 170=>170, 171=>171, 172=>172, 173=>173, 174=>174, 175=>175, 176=>176, 177=>177, 178=>178, 179=>179, 180=>180, 181=>181, 182=>182, 183=>183, 184=>184, 185=>185, 186=>186, 187=>187, 188=>188, 189=>189, 190=>190, 191=>191, 192=>192, 193=>193, 194=>194, 195=>195, 196=>196, 197=>197, 198=>198, 199=>199, 200=>200, 201=>201, 202=>202, 203=>203, 204=>204, 205=>205, 206=>206, 207=>207, 208=>208, 209=>209, 210=>210, 211=>211, 212=>212, 213=>213, 214=>214, 215=>215, 216=>216, 217=>217, 218=>218, 219=>219, 220=>220, 221=>221, 222=>222, 223=>223, 224=>224, 225=>225, 226=>226, 227=>227, 228=>228, 229=>229, 230=>230, 231=>231, 232=>232, 233=>233, 234=>234, 235=>235, 236=>236, 237=>237, 238=>238, 239=>239, 240=>240, 241=>241, 242=>242, 243=>243, 244=>244, 245=>245, 246=>246, 247=>247, 248=>248, 249=>249, 250=>250, 251=>251, 252=>252, 253=>253, 254=>254, 255=>255, 256=>256, 257=>257, 258=>258, 259=>259, 260=>260, 261=>261, 262=>262, 263=>263, 264=>264, 265=>265, 266=>266, 267=>267, 268=>268, 269=>269, 270=>270, 271=>271, 272=>272, 273=>273, 274=>274, 275=>275, 276=>276, 277=>277, 278=>278, 279=>279, 280=>280, 281=>281, 282=>282, 283=>283, 284=>284, 285=>285, 286=>286, 287=>287, 288=>288, 289=>289, 290=>290, 291=>291, 292=>292, 293=>293, 294=>294, 295=>295, 296=>296, 297=>297, 298=>298, 299=>299, 300=>300, 301=>301, 302=>302, 303=>303, 304=>304, 305=>305, 306=>306, 307=>307, 308=>308, 309=>309, 310=>310, 311=>311, 312=>312, 313=>313, 314=>314, 315=>315, 316=>316, 317=>317, 318=>318, 319=>319, 320=>320, 321=>321, 322=>322, 323=>323, 324=>324, 325=>325, 326=>326, 327=>327, 328=>328, 329=>329, 330=>330, 331=>331, 332=>332, 333=>333, 334=>334, 335=>335, 336=>336, 337=>337, 338=>338, 339=>339, 340=>340, 341=>341, 342=>342, 343=>343, 344=>344, 345=>345, 346=>346, 347=>347, 348=>348, 349=>349, 350=>350, 351=>351, 352=>352, 353=>353, 354=>354, 355=>355, 356=>356, 357=>357, 358=>358, 359=>359, 360=>360, 361=>361, 362=>362, 363=>363, 364=>364, 365=>365, 366=>366, 367=>367, 368=>368, 369=>369, 370=>370, 371=>371, 372=>372, 373=>373, 374=>374, 375=>375, 376=>376, 377=>377, 378=>378, 379=>379, 380=>380, 381=>381, 382=>382, 383=>383, 384=>384, 385=>385, 386=>386, 387=>387, 388=>388, 389=>389, 390=>390, 391=>391, 392=>392, 393=>393, 394=>394, 395=>395, 396=>396, 397=>397, 398=>398, 399=>399, 400=>400, 401=>401, 402=>402, 403=>403, 404=>404, 405=>405, 406=>406, 407=>407, 408=>408, 409=>409, 410=>410, 411=>411, 412=>412, 413=>413, 414=>414, 415=>415, 416=>416, 417=>417, 418=>418, 419=>419, 420=>420, 421=>421, 422=>422, 423=>423, 424=>424, 425=>425, 426=>426, 427=>427, 428=>428, 429=>429, 430=>430, 431=>431, 432=>432, 433=>433, 434=>434, 435=>435, 436=>436, 437=>437, 438=>438, 439=>439, 440=>440, 441=>441, 442=>442, 443=>443, 444=>444, 445=>445, 446=>446, 447=>447, 448=>448, 449=>449, 450=>450, 451=>451, 452=>452, 453=>453, 454=>454, 455=>455, 456=>456, 457=>457, 458=>458, 459=>459, 460=>460, 461=>461, 462=>462, 463=>463, 464=>464, 465=>465, 466=>466, 467=>467, 468=>468, 469=>469, 470=>470, 471=>471, 472=>472, 473=>473, 474=>474, 475=>475, 476=>476, 477=>477, 478=>478, 479=>479, 480=>480, 481=>481, 482=>482, 483=>483, 484=>484, 485=>485, 486=>486, 487=>487, 488=>488, 489=>489, 490=>490, 491=>491, 492=>492, 493=>493, 494=>494, 495=>495, 496=>496, 497=>497, 498=>498, 499=>499, 500=>500,}
+end
diff --git a/benchmark/bm_vm2_case.rb b/benchmark/bm_vm2_case.rb
new file mode 100644
index 0000000000..adc6e4df0a
--- /dev/null
+++ b/benchmark/bm_vm2_case.rb
@@ -0,0 +1,14 @@
+i = 0
+while i<6_000_000 # while loop 2
+  case :foo
+  when :bar
+    raise
+  when :baz
+    raise
+  when :boo
+    raise
+  when :foo
+    i += 1
+  end
+end
+
diff --git a/benchmark/bm_vm2_defined_method.rb b/benchmark/bm_vm2_defined_method.rb
new file mode 100644
index 0000000000..053ed6c912
--- /dev/null
+++ b/benchmark/bm_vm2_defined_method.rb
@@ -0,0 +1,9 @@
+class Object
+  define_method(:m){}
+end
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  m; m; m; m; m; m; m; m;
+end
diff --git a/benchmark/bm_vm2_dstr.rb b/benchmark/bm_vm2_dstr.rb
new file mode 100644
index 0000000000..58c0f7bbc3
--- /dev/null
+++ b/benchmark/bm_vm2_dstr.rb
@@ -0,0 +1,6 @@
+i = 0
+x = y = 'z'
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  str = "foo#{x}bar#{y}baz"
+end
diff --git a/benchmark/bm_vm2_eval.rb b/benchmark/bm_vm2_eval.rb
new file mode 100644
index 0000000000..307cfc28ef
--- /dev/null
+++ b/benchmark/bm_vm2_eval.rb
@@ -0,0 +1,6 @@
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  eval("1")
+end
+
diff --git a/benchmark/bm_vm2_method.rb b/benchmark/bm_vm2_method.rb
new file mode 100644
index 0000000000..a8ccff7138
--- /dev/null
+++ b/benchmark/bm_vm2_method.rb
@@ -0,0 +1,9 @@
+def m
+  nil
+end
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  m; m; m; m; m; m; m; m;
+end
diff --git a/benchmark/bm_vm2_method_missing.rb b/benchmark/bm_vm2_method_missing.rb
new file mode 100644
index 0000000000..2badc73101
--- /dev/null
+++ b/benchmark/bm_vm2_method_missing.rb
@@ -0,0 +1,12 @@
+class C
+  def method_missing mid
+  end
+end
+
+obj = C.new
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m; obj.m;
+end
diff --git a/benchmark/bm_vm2_method_with_block.rb b/benchmark/bm_vm2_method_with_block.rb
new file mode 100644
index 0000000000..b4efb4f520
--- /dev/null
+++ b/benchmark/bm_vm2_method_with_block.rb
@@ -0,0 +1,9 @@
+def m
+  nil
+end
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  m{}; m{}; m{}; m{}; m{}; m{}; m{}; m{};
+end
diff --git a/benchmark/bm_vm2_mutex.rb b/benchmark/bm_vm2_mutex.rb
new file mode 100644
index 0000000000..7362f738c5
--- /dev/null
+++ b/benchmark/bm_vm2_mutex.rb
@@ -0,0 +1,9 @@
+require 'thread'
+
+m = Mutex.new
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  m.synchronize{}
+end
diff --git a/benchmark/bm_vm2_poly_method.rb b/benchmark/bm_vm2_poly_method.rb
new file mode 100644
index 0000000000..c82c0e4bce
--- /dev/null
+++ b/benchmark/bm_vm2_poly_method.rb
@@ -0,0 +1,20 @@
+class C1
+  def m
+    1
+  end
+end
+class C2
+  def m
+    2
+  end
+end
+
+o1 = C1.new
+o2 = C2.new
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  o = (i % 2 == 0) ? o1 : o2
+  o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+  i += 1
+end
diff --git a/benchmark/bm_vm2_poly_method_ov.rb b/benchmark/bm_vm2_poly_method_ov.rb
new file mode 100644
index 0000000000..aa5fd1dd38
--- /dev/null
+++ b/benchmark/bm_vm2_poly_method_ov.rb
@@ -0,0 +1,20 @@
+class C1
+  def m
+    1
+  end
+end
+class C2
+  def m
+    2
+  end
+end
+
+o1 = C1.new
+o2 = C2.new
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  o = (i % 2 == 0) ? o1 : o2
+#  o.m; o.m; o.m; o.m; o.m; o.m; o.m; o.m
+  i += 1
+end
diff --git a/benchmark/bm_vm2_proc.rb b/benchmark/bm_vm2_proc.rb
new file mode 100644
index 0000000000..65e5217371
--- /dev/null
+++ b/benchmark/bm_vm2_proc.rb
@@ -0,0 +1,14 @@
+def m &b
+  b
+end
+
+pr = m{
+  a = 1
+}
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  pr.call
+end
+
diff --git a/benchmark/bm_vm2_raise1.rb b/benchmark/bm_vm2_raise1.rb
new file mode 100644
index 0000000000..aa5387987f
--- /dev/null
+++ b/benchmark/bm_vm2_raise1.rb
@@ -0,0 +1,18 @@
+def rec n
+  if n > 0
+    rec n-1
+  else
+    raise
+  end
+end
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+
+  begin
+    rec 1
+  rescue
+    # ignore
+  end
+end
diff --git a/benchmark/bm_vm2_raise2.rb b/benchmark/bm_vm2_raise2.rb
new file mode 100644
index 0000000000..1f61c63157
--- /dev/null
+++ b/benchmark/bm_vm2_raise2.rb
@@ -0,0 +1,18 @@
+def rec n
+  if n > 0
+    rec n-1
+  else
+    raise
+  end
+end
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+
+  begin
+    rec 10
+  rescue
+    # ignore
+  end
+end
diff --git a/benchmark/bm_vm2_regexp.rb b/benchmark/bm_vm2_regexp.rb
new file mode 100644
index 0000000000..55f9e957a3
--- /dev/null
+++ b/benchmark/bm_vm2_regexp.rb
@@ -0,0 +1,6 @@
+i = 0
+str = 'xxxhogexxx'
+while i<6_000_000 # benchmark loop 2
+  /hoge/ =~ str
+  i += 1
+end
diff --git a/benchmark/bm_vm2_send.rb b/benchmark/bm_vm2_send.rb
new file mode 100644
index 0000000000..6a3ab6fdab
--- /dev/null
+++ b/benchmark/bm_vm2_send.rb
@@ -0,0 +1,12 @@
+class C
+  def m
+  end
+end
+
+o = C.new
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  o.__send__ :m
+end
diff --git a/benchmark/bm_vm2_super.rb b/benchmark/bm_vm2_super.rb
new file mode 100644
index 0000000000..afd8579e7b
--- /dev/null
+++ b/benchmark/bm_vm2_super.rb
@@ -0,0 +1,20 @@
+
+class C
+  def m
+    1
+  end
+end
+
+class CC < C
+  def m
+    super()
+  end
+end
+
+obj = CC.new
+
+i = 0
+while i<6_000_000 # benchmark loop 2
+  obj.m
+  i += 1
+end
diff --git a/benchmark/bm_vm2_unif1.rb b/benchmark/bm_vm2_unif1.rb
new file mode 100644
index 0000000000..1774625942
--- /dev/null
+++ b/benchmark/bm_vm2_unif1.rb
@@ -0,0 +1,8 @@
+i = 0
+def m a, b
+end
+
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  m 100, 200
+end
diff --git a/benchmark/bm_vm2_zsuper.rb b/benchmark/bm_vm2_zsuper.rb
new file mode 100644
index 0000000000..2a43e62217
--- /dev/null
+++ b/benchmark/bm_vm2_zsuper.rb
@@ -0,0 +1,20 @@
+i = 0
+
+class C
+  def m a
+    1
+  end
+end
+
+class CC < C
+  def m a
+    super
+  end
+end
+
+obj = CC.new
+
+while i<6_000_000 # benchmark loop 2
+  obj.m 10
+  i += 1
+end
diff --git a/benchmark/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
new file mode 100644
index 0000000000..9661323cd2
--- /dev/null
+++ b/benchmark/bm_vm3_clearmethodcache.rb
@@ -0,0 +1,8 @@
+i = 0
+while i<200_000
+  i += 1
+
+  Class.new{
+    def m; end
+  }
+end
diff --git a/benchmark/bm_vm3_gc.rb b/benchmark/bm_vm3_gc.rb
new file mode 100755
index 0000000000..7db9829d44
--- /dev/null
+++ b/benchmark/bm_vm3_gc.rb
@@ -0,0 +1,7 @@
+#! /usr/bin/ruby
+5000.times do
+  100.times do
+    {"xxxx"=>"yyyy"}
+  end
+  GC.start
+end
diff --git a/benchmark/bm_vm_thread_alive_check1.rb b/benchmark/bm_vm_thread_alive_check1.rb
new file mode 100644
index 0000000000..c993accdda
--- /dev/null
+++ b/benchmark/bm_vm_thread_alive_check1.rb
@@ -0,0 +1,6 @@
+5_000.times{
+  t = Thread.new{}
+  while t.alive?
+    Thread.pass
+  end
+}
diff --git a/benchmark/bm_vm_thread_create_join.rb b/benchmark/bm_vm_thread_create_join.rb
new file mode 100644
index 0000000000..393cd45df9
--- /dev/null
+++ b/benchmark/bm_vm_thread_create_join.rb
@@ -0,0 +1,6 @@
+i = 0
+while i<100_000 # benchmark loop 3
+  i += 1
+  Thread.new{
+  }.join
+end
diff --git a/benchmark/bm_vm_thread_mutex1.rb b/benchmark/bm_vm_thread_mutex1.rb
new file mode 100644
index 0000000000..5c9f85dfb7
--- /dev/null
+++ b/benchmark/bm_vm_thread_mutex1.rb
@@ -0,0 +1,21 @@
+# one thread, one mutex (no contention)
+
+require 'thread'
+m = Mutex.new
+r = 0
+max = 2000
+lmax = max * max
+(1..1).map{
+  Thread.new{
+    i = 0
+    while i<lmax
+      i += 1
+      m.synchronize{
+        r += 1
+      }
+    end
+  }
+}.each{|e|
+  e.join
+}
+raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_mutex2.rb b/benchmark/bm_vm_thread_mutex2.rb
new file mode 100644
index 0000000000..10de59054f
--- /dev/null
+++ b/benchmark/bm_vm_thread_mutex2.rb
@@ -0,0 +1,21 @@
+# two threads, one mutex
+
+require 'thread'
+m = Mutex.new
+r = 0
+max = 2000
+lmax = (max * max)/2
+(1..2).map{
+  Thread.new{
+    i = 0
+    while i<lmax
+      i += 1
+      m.synchronize{
+        r += 1
+      }
+    end
+  }
+}.each{|e|
+  e.join
+}
+raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_mutex3.rb b/benchmark/bm_vm_thread_mutex3.rb
new file mode 100644
index 0000000000..7f9a44b39d
--- /dev/null
+++ b/benchmark/bm_vm_thread_mutex3.rb
@@ -0,0 +1,20 @@
+# 1000 threads, one mutex
+
+require 'thread'
+m = Mutex.new
+r = 0
+max = 2000
+(1..max).map{
+  Thread.new{
+    i = 0
+    while i<max
+      i += 1
+      m.synchronize{
+        r += 1
+      }
+    end
+  }
+}.each{|e|
+  e.join
+}
+raise r.to_s if r != max * max
diff --git a/benchmark/bm_vm_thread_pass.rb b/benchmark/bm_vm_thread_pass.rb
new file mode 100644
index 0000000000..b5b3c0bc85
--- /dev/null
+++ b/benchmark/bm_vm_thread_pass.rb
@@ -0,0 +1,15 @@
+# Plenty Thtread.pass
+# A performance may depend on GVL implementation.
+
+tmax = (ARGV.shift || 2).to_i
+lmax = 200_000 / tmax
+
+(1..tmax).map{
+  Thread.new{
+    lmax.times{
+      Thread.pass
+    }
+  }
+}.each{|t| t.join}
+
+
diff --git a/benchmark/bm_vm_thread_pass_flood.rb b/benchmark/bm_vm_thread_pass_flood.rb
new file mode 100644
index 0000000000..27157d1a6f
--- /dev/null
+++ b/benchmark/bm_vm_thread_pass_flood.rb
@@ -0,0 +1,8 @@
+1000.times{
+  Thread.new{loop{Thread.pass}}
+}
+
+i = 0
+while i<10000
+  i += 1
+end
diff --git a/benchmark/bm_vm_thread_pipe.rb b/benchmark/bm_vm_thread_pipe.rb
new file mode 100644
index 0000000000..272d231eba
--- /dev/null
+++ b/benchmark/bm_vm_thread_pipe.rb
@@ -0,0 +1,17 @@
+# Mesure small and plenty pipe read/write.
+# A performance may depend on GVL implementation.
+
+lmax = 100_000
+r, w = IO.pipe
+[Thread.new{
+  lmax.times{
+    w.write('a')
+  }
+  p "w:exit"
+}, Thread.new{
+  lmax.times{
+    r.read(1)
+  }
+  p "r:exit"
+}].each{|t| t.join}
+
diff --git a/benchmark/bm_vm_thread_queue.rb b/benchmark/bm_vm_thread_queue.rb
new file mode 100644
index 0000000000..37381ae62b
--- /dev/null
+++ b/benchmark/bm_vm_thread_queue.rb
@@ -0,0 +1,18 @@
+require 'thread'
+
+n = 1_000_000
+q = Queue.new
+consumer = Thread.new{
+  while q.pop
+    # consuming
+  end
+}
+
+producer = Thread.new{
+  n.times{
+    q.push true
+  }
+  q.push nil
+}
+
+consumer.join
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
new file mode 100644
index 0000000000..695dc41aff
--- /dev/null
+++ b/benchmark/driver.rb
@@ -0,0 +1,301 @@
+#
+# Ruby Benchmark driver
+#
+
+first = true
+
+begin
+  require 'optparse'
+rescue LoadError
+  if first
+    first = false
+    $:.unshift File.join(File.dirname(__FILE__), '../lib')
+    retry
+  else
+    raise
+  end
+end
+
+require 'benchmark'
+require 'pp'
+
+class BenchmarkDriver
+  def self.benchmark(opt)
+    driver = self.new(opt[:execs], opt[:dir], opt)
+    begin
+      driver.run
+    ensure
+      driver.show_results
+    end
+  end
+
+  def output *args
+    puts(*args)
+    @output and @output.puts(*args)
+  end
+
+  def message *args
+    output(*args) if @verbose
+  end
+
+  def message_print *args
+    if @verbose
+      print(*args)
+      STDOUT.flush
+      @output and @output.print(*args)
+    end
+  end
+
+  def progress_message *args
+    unless STDOUT.tty?
+      STDERR.print(*args)
+      STDERR.flush
+    end
+  end
+
+  def initialize execs, dir, opt = {}
+    @execs = execs.map{|e|
+      e.strip!
+      next if e.empty?
+
+      if /(.+)::(.+)/ =~ e
+        # ex) ruby-a::/path/to/ruby-a
+        label = $1.strip
+        path = $2
+        version = `#{path} -v`.chomp
+      else
+        path = e
+        version = label = `#{path} -v`.chomp
+      end
+      [path, label, version]
+    }.compact
+
+    @dir = dir
+    @repeat = opt[:repeat] || 1
+    @repeat = 1 if @repeat < 1
+    @pattern = opt[:pattern] || nil
+    @exclude = opt[:exclude] || nil
+    @verbose = opt[:quiet] ? false : (opt[:verbose] || false)
+    @output = opt[:output] ? open(opt[:output], 'w') : nil
+    @loop_wl1 = @loop_wl2 = nil
+    @ruby_arg = opt[:ruby_arg] || nil
+    @opt = opt
+
+    # [[name, [[r-1-1, r-1-2, ...], [r-2-1, r-2-2, ...]]], ...]
+    @results = []
+
+    if @verbose
+      @start_time = Time.now
+      message @start_time
+      @execs.each_with_index{|(path, label, version), i|
+        message "target #{i}: " + (label == version ? "#{label}" : "#{label} (#{version})") + " at \"#{path}\""
+      }
+    end
+  end
+
+  def adjusted_results name, results
+    s = nil
+    results.each_with_index{|e, i|
+      r = e.min
+      case name
+      when /^vm1_/
+        if @loop_wl1
+          r -= @loop_wl1[i]
+          r = 0 if r < 0
+          s = '*'
+        end
+      when /^vm2_/
+        if @loop_wl2
+          r -= @loop_wl2[i]
+          r = 0 if r < 0
+          s = '*'
+        end
+      end
+      yield r
+    }
+    s
+  end
+
+  def show_results
+    output
+
+    if @verbose
+      message '-----------------------------------------------------------'
+      message 'raw data:'
+      message
+      message PP.pp(@results, "", 79)
+      message
+      message "Elapsed time: #{Time.now - @start_time} (sec)"
+    end
+
+    output '-----------------------------------------------------------'
+    output 'benchmark results:'
+
+    if @verbose and @repeat > 1
+      output "minimum results in each #{@repeat} measurements."
+    end
+
+    output "Execution time (sec)"
+    output "name\t#{@execs.map{|(_, v)| v}.join("\t")}"
+    @results.each{|v, result|
+      rets = []
+      s = adjusted_results(v, result){|r|
+        rets << sprintf("%.3f", r)
+      }
+      output "#{v}#{s}\t#{rets.join("\t")}"
+    }
+
+    if @execs.size > 1
+      output
+      output "Speedup ratio: compare with the result of `#{@execs[0][1]}' (greater is better)"
+      output "name\t#{@execs[1..-1].map{|(_, v)| v}.join("\t")}"
+      @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("%.3f", first_value/r)
+            end
+          else
+            first_value = r
+          end
+        }
+        output "#{v}#{s}\t#{rets.join("\t")}"
+      }
+    end
+
+    if @opt[:output]
+      output
+      output "Log file: #{@opt[:output]}"
+    end
+  end
+
+  def files
+    flag = {}
+    @files = Dir.glob(File.join(@dir, 'bm*.rb')).map{|file|
+      next if @pattern && /#{@pattern}/ !~ File.basename(file)
+      next if @exclude && /#{@exclude}/ =~ File.basename(file)
+      case file
+      when /bm_(vm[12])_/, /bm_loop_(whileloop2?).rb/
+        flag[$1] = true
+      end
+      file
+    }.compact
+
+    if flag['vm1'] && !flag['whileloop']
+      @files << File.join(@dir, 'bm_loop_whileloop.rb')
+    elsif flag['vm2'] && !flag['whileloop2']
+      @files << File.join(@dir, 'bm_loop_whileloop2.rb')
+    end
+
+    @files.sort!
+    progress_message "total: #{@files.size * @repeat} trial(s) (#{@repeat} trial(s) for #{@files.size} benchmark(s))\n"
+    @files
+  end
+
+  def run
+    files.each_with_index{|file, i|
+      @i = i
+      r = measure_file(file)
+
+      if /bm_loop_whileloop.rb/ =~ file
+        @loop_wl1 = r[1].map{|e| e.min}
+      elsif /bm_loop_whileloop2.rb/ =~ file
+        @loop_wl2 = r[1].map{|e| e.min}
+      end
+    }
+  end
+
+  def measure_file file
+    name = File.basename(file, '.rb').sub(/^bm_/, '')
+    prepare_file = File.join(File.dirname(file), "prepare_#{name}.rb")
+    load prepare_file if FileTest.exist?(prepare_file)
+
+    if @verbose
+      output
+      output '-----------------------------------------------------------'
+      output name
+      output
+      output File.read(file)
+      output
+    end
+
+    result = [name]
+    result << @execs.map{|(e, v)|
+      (0...@repeat).map{
+        message_print "#{v}\t"
+        progress_message '.'
+
+        m = measure(e, file)
+        message "#{m}"
+        m
+      }
+    }
+    @results << result
+    result
+  end
+
+  def measure executable, file
+    cmd = "#{executable} #{@ruby_arg} #{file}"
+
+    m = Benchmark.measure{
+      `#{cmd}`
+    }
+
+    if $? != 0
+      output "\`#{cmd}\' exited with abnormal status (#{$?})"
+      0
+    else
+      m.real
+    end
+  end
+end
+
+if __FILE__ == $0
+  opt = {
+    :execs => [],
+    :dir => File.dirname(__FILE__),
+    :repeat => 1,
+    :output => "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}",
+  }
+
+  parser = OptionParser.new{|o|
+    o.on('-e', '--executables [EXECS]',
+      "Specify benchmark one or more targets (e1::path1; e2::path2; e3::path3;...)"){|e|
+       e.split(/;/).each{|path|
+         opt[:execs] << path
+       }
+    }
+    o.on('-d', '--directory [DIRECTORY]', "Benchmark suites directory"){|d|
+      opt[:dir] = d
+    }
+    o.on('-p', '--pattern [PATTERN]', "Benchmark name pattern"){|p|
+      opt[:pattern] = p
+    }
+    o.on('-x', '--exclude [PATTERN]', "Benchmark exclude pattern"){|e|
+      opt[:exclude] = e
+    }
+    o.on('-r', '--repeat-count [NUM]', "Repeat count"){|n|
+      opt[:repeat] = n.to_i
+    }
+    o.on('-o', '--output-file [FILE]', "Output file"){|f|
+      opt[:output] = f
+    }
+    o.on('--ruby-arg [ARG]', "Optional argument for ruby"){|a|
+      opt[:ruby_arg] = a
+    }
+    o.on('-q', '--quiet', "Run without notify information except result table."){|q|
+      opt[:quiet] = q
+    }
+    o.on('-v', '--verbose'){|v|
+      opt[:verbose] = v
+    }
+  }
+
+  parser.parse!(ARGV)
+  BenchmarkDriver.benchmark(opt)
+end
+
diff --git a/benchmark/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..b038b71b54
--- /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}"
+
+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/make_fasta_output.rb b/benchmark/make_fasta_output.rb
new file mode 100644
index 0000000000..b6d787ae27
--- /dev/null
+++ b/benchmark/make_fasta_output.rb
@@ -0,0 +1,19 @@
+# prepare 'fasta.output'
+
+def prepare_fasta_output n
+  filebase = File.join(File.dirname($0), 'fasta.output')
+  script = File.join(File.dirname($0), 'bm_so_fasta.rb')
+  file = "#{filebase}.#{n}"
+
+  unless FileTest.exist?(file)
+    STDERR.puts "preparing #{file}"
+
+    open(file, 'w'){|f|
+      ARGV[0] = n
+      $stdout = f
+      load script
+      $stdout = STDOUT
+    }
+  end
+end
+
diff --git a/benchmark/other-lang/ack.pl b/benchmark/other-lang/ack.pl
new file mode 100644
index 0000000000..201e22ddfa
--- /dev/null
+++ b/benchmark/other-lang/ack.pl
@@ -0,0 +1,11 @@
+use integer;
+
+sub Ack {
+    return $_[0] ? ($_[1] ? Ack($_[0]-1, Ack($_[0], $_[1]-1))
+		    : Ack($_[0]-1, 1))
+	: $_[1]+1;
+}
+
+my $NUM = 9;
+$NUM = 1 if ($NUM < 1);
+my $ack = Ack(3, $NUM);
diff --git a/benchmark/other-lang/ack.py b/benchmark/other-lang/ack.py
new file mode 100644
index 0000000000..9968e7cfcf
--- /dev/null
+++ b/benchmark/other-lang/ack.py
@@ -0,0 +1,16 @@
+import sys
+sys.setrecursionlimit(5000000)
+
+def Ack(M, N):
+    if (not M):
+        return( N + 1 )
+    if (not N):
+        return( Ack(M-1, 1) )
+    return( Ack(M-1, Ack(M, N-1)) )
+
+def main():
+    NUM = 9
+    sys.setrecursionlimit(10000)
+    Ack(3, NUM)
+
+main()
diff --git a/benchmark/other-lang/ack.rb b/benchmark/other-lang/ack.rb
new file mode 100644
index 0000000000..7451bed6c4
--- /dev/null
+++ b/benchmark/other-lang/ack.rb
@@ -0,0 +1,12 @@
+def ack(m, n)
+    if m == 0 then
+        n + 1
+    elsif n == 0 then
+        ack(m - 1, 1)
+    else
+        ack(m - 1, ack(m, n - 1))
+    end
+end
+
+NUM = 9
+ack(3, NUM)
diff --git a/benchmark/other-lang/ack.scm b/benchmark/other-lang/ack.scm
new file mode 100644
index 0000000000..a80b73ba55
--- /dev/null
+++ b/benchmark/other-lang/ack.scm
@@ -0,0 +1,7 @@
+(define (ack m n)
+  (cond ((zero? m) (+ n 1))
+	((zero? n) (ack (- m 1) 1))
+	(else      (ack (- m 1) (ack m (- n 1))))))
+
+(ack 3 9)
+
diff --git a/benchmark/other-lang/eval.rb b/benchmark/other-lang/eval.rb
new file mode 100644
index 0000000000..48a2cea019
--- /dev/null
+++ b/benchmark/other-lang/eval.rb
@@ -0,0 +1,66 @@
+
+Bench = %w(
+  loop
+  ack
+  fib
+  tak
+  fact
+)
+
+Lang = <<EOP.map{|l| l.strip}
+  ruby-cyg
+  ../../../test6/miniruby
+  perl
+  python
+  gosh
+EOP
+
+Bench.replace ['loop2']
+Lang.replace ['ruby-cyg']
+
+Ext = %w(
+  .rb
+  .rb
+  .pl
+  .py
+  .scm
+)
+
+p Bench
+p Lang
+
+require 'benchmark'
+
+def bench cmd
+  m = Benchmark.measure{
+    #p cmd
+    system(cmd)
+  }
+  [m.utime, m.real]
+end
+
+Result = []
+Bench.each{|b|
+  r = []
+  Lang.each_with_index{|l, idx|
+    cmd = "#{l} #{b}#{Ext[idx]}"
+    r << bench(cmd)
+  }
+  Result << r
+}
+
+require 'pp'
+# utime
+puts Lang.join("\t")
+Bench.each_with_index{|b, bi|
+  print b, "\t"
+  puts Result[bi].map{|e| e[0]}.join("\t")
+}
+
+# rtime
+puts Lang.join("\t")
+Bench.each_with_index{|b, bi|
+  print b, "\t"
+  puts Result[bi].map{|e| e[1]}.join("\t")
+}
+
diff --git a/benchmark/other-lang/fact.pl b/benchmark/other-lang/fact.pl
new file mode 100644
index 0000000000..a9b0b69cdf
--- /dev/null
+++ b/benchmark/other-lang/fact.pl
@@ -0,0 +1,13 @@
+sub fact{
+  my $n = @_[0];
+  if($n < 2){
+    return 1;
+  }
+  else{
+    return $n * fact($n-1);
+  }
+}
+
+for($i=0; $i<10000; $i++){
+  &fact(100);
+}
diff --git a/benchmark/other-lang/fact.py b/benchmark/other-lang/fact.py
new file mode 100644
index 0000000000..01593965d9
--- /dev/null
+++ b/benchmark/other-lang/fact.py
@@ -0,0 +1,18 @@
+#import sys
+#sys.setrecursionlimit(1000)
+
+def factL(n):
+	r = 1
+	for x in range(2, n):
+		r *= x
+	return r
+
+def factR(n):
+	if n < 2:
+		return 1
+	else:
+		return n * factR(n-1)
+
+for i in range(10000):
+	factR(100)
+
diff --git a/benchmark/other-lang/fact.rb b/benchmark/other-lang/fact.rb
new file mode 100644
index 0000000000..6cedc752cd
--- /dev/null
+++ b/benchmark/other-lang/fact.rb
@@ -0,0 +1,13 @@
+def fact(n)
+  if n < 2
+    1
+  else
+    n * fact(n-1)
+  end
+end
+
+i = 0
+while i<10000
+  i += 1
+  fact(100)
+end
diff --git a/benchmark/other-lang/fact.scm b/benchmark/other-lang/fact.scm
new file mode 100644
index 0000000000..c98a7fedd3
--- /dev/null
+++ b/benchmark/other-lang/fact.scm
@@ -0,0 +1,8 @@
+(define (fact n)
+        (if (< n 2)
+            1
+          (* n (fact (- n 1)))))
+
+(dotimes (i 10000)
+  (fact 100))
+
diff --git a/benchmark/other-lang/fib.pl b/benchmark/other-lang/fib.pl
new file mode 100644
index 0000000000..a46f666d1e
--- /dev/null
+++ b/benchmark/other-lang/fib.pl
@@ -0,0 +1,11 @@
+sub fib{
+  my $n = $_[0];
+  if($n < 3){
+    return 1;
+  }
+  else{
+    return fib($n-1) + fib($n-2);
+  }
+};
+
+&fib(34);
diff --git a/benchmark/other-lang/fib.py b/benchmark/other-lang/fib.py
new file mode 100644
index 0000000000..45f2bceb8d
--- /dev/null
+++ b/benchmark/other-lang/fib.py
@@ -0,0 +1,7 @@
+def fib(n):
+  if n < 3:
+    return 1
+  else:
+    return fib(n-1) + fib(n-2)
+
+fib(34)
diff --git a/benchmark/other-lang/fib.rb b/benchmark/other-lang/fib.rb
new file mode 100644
index 0000000000..ec587eabe0
--- /dev/null
+++ b/benchmark/other-lang/fib.rb
@@ -0,0 +1,9 @@
+def fib n
+  if n < 3
+    1
+  else
+    fib(n-1) + fib(n-2)
+  end
+end
+
+fib(34)
diff --git a/benchmark/other-lang/fib.scm b/benchmark/other-lang/fib.scm
new file mode 100644
index 0000000000..2fc4e225bd
--- /dev/null
+++ b/benchmark/other-lang/fib.scm
@@ -0,0 +1,7 @@
+(define (fib n)
+        (if (< n 3)
+            1
+          (+ (fib (- n 1)) (fib (- n 2)))))
+
+(fib 34)
+
diff --git a/benchmark/other-lang/loop.pl b/benchmark/other-lang/loop.pl
new file mode 100644
index 0000000000..2777490aaa
--- /dev/null
+++ b/benchmark/other-lang/loop.pl
@@ -0,0 +1,3 @@
+for($i=0; $i<30000000; $i++){
+}
+
diff --git a/benchmark/other-lang/loop.py b/benchmark/other-lang/loop.py
new file mode 100644
index 0000000000..003749bf3a
--- /dev/null
+++ b/benchmark/other-lang/loop.py
@@ -0,0 +1,2 @@
+for i in xrange(30000000):
+	pass
diff --git a/benchmark/other-lang/loop.rb b/benchmark/other-lang/loop.rb
new file mode 100644
index 0000000000..b367b9dbf3
--- /dev/null
+++ b/benchmark/other-lang/loop.rb
@@ -0,0 +1,4 @@
+i = 0
+while i<30000000
+  i += 1
+end
diff --git a/benchmark/other-lang/loop.scm b/benchmark/other-lang/loop.scm
new file mode 100644
index 0000000000..3364f7e679
--- /dev/null
+++ b/benchmark/other-lang/loop.scm
@@ -0,0 +1 @@
+(dotimes (x 30000000))
diff --git a/benchmark/other-lang/loop2.rb b/benchmark/other-lang/loop2.rb
new file mode 100644
index 0000000000..df8fffc1ff
--- /dev/null
+++ b/benchmark/other-lang/loop2.rb
@@ -0,0 +1 @@
+30000000.times{}
diff --git a/benchmark/other-lang/tak.pl b/benchmark/other-lang/tak.pl
new file mode 100644
index 0000000000..7e748a67c6
--- /dev/null
+++ b/benchmark/other-lang/tak.pl
@@ -0,0 +1,11 @@
+sub tak {
+    local($x, $y, $z) = @_;
+    if (!($y < $x)) {
+	return $z;
+    } else {
+	return &tak(&tak($x - 1, $y, $z),
+		    &tak($y - 1, $z, $x),
+		    &tak($z - 1, $x, $y));
+    }
+}
+&tak(18, 9, 0);
diff --git a/benchmark/other-lang/tak.py b/benchmark/other-lang/tak.py
new file mode 100644
index 0000000000..04f3f6829c
--- /dev/null
+++ b/benchmark/other-lang/tak.py
@@ -0,0 +1,8 @@
+def tak(x, y, z):
+	if not(y<x):
+		return z
+	else:
+		return tak(tak(x-1, y, z),
+		           tak(y-1, z, x),
+		           tak(z-1, x, y))
+tak(18, 9, 0)
diff --git a/benchmark/other-lang/tak.rb b/benchmark/other-lang/tak.rb
new file mode 100644
index 0000000000..efe5380f4e
--- /dev/null
+++ b/benchmark/other-lang/tak.rb
@@ -0,0 +1,13 @@
+
+def tak x, y, z
+  unless y < x
+    z
+  else
+    tak( tak(x-1, y, z),
+         tak(y-1, z, x),
+         tak(z-1, x, y))
+  end
+end
+
+tak(18, 9, 0)
+
diff --git a/benchmark/other-lang/tak.scm b/benchmark/other-lang/tak.scm
new file mode 100644
index 0000000000..52a7629ee5
--- /dev/null
+++ b/benchmark/other-lang/tak.scm
@@ -0,0 +1,10 @@
+(define (tak x y z)
+        (if (not (< y x))
+            z
+          (tak (tak (- x 1) y z)
+               (tak (- y 1) z x)
+               (tak (- z 1) x y))))
+
+(tak 18 9 0)
+
+
diff --git a/benchmark/prepare_so_count_words.rb b/benchmark/prepare_so_count_words.rb
new file mode 100644
index 0000000000..ee2138cdb2
--- /dev/null
+++ b/benchmark/prepare_so_count_words.rb
@@ -0,0 +1,15 @@
+# prepare 'wc.input'
+
+def prepare_wc_input
+  wcinput = File.join(File.dirname($0), 'wc.input')
+  wcbase  = File.join(File.dirname($0), 'wc.input.base')
+  unless FileTest.exist?(wcinput)
+    data = File.read(wcbase)
+    13.times{
+      data << data
+    }
+    open(wcinput, 'w'){|f| f.write data}
+  end
+end
+
+prepare_wc_input
diff --git a/benchmark/prepare_so_k_nucleotide.rb b/benchmark/prepare_so_k_nucleotide.rb
new file mode 100644
index 0000000000..f28f4460a1
--- /dev/null
+++ b/benchmark/prepare_so_k_nucleotide.rb
@@ -0,0 +1,2 @@
+require File.join(File.dirname(__FILE__), 'make_fasta_output')
+prepare_fasta_output(100_000)
diff --git a/benchmark/prepare_so_reverse_complement.rb b/benchmark/prepare_so_reverse_complement.rb
new file mode 100644
index 0000000000..7f089109de
--- /dev/null
+++ b/benchmark/prepare_so_reverse_complement.rb
@@ -0,0 +1,2 @@
+require File.join(File.dirname(__FILE__), 'make_fasta_output')
+prepare_fasta_output(2_500_000)
diff --git a/benchmark/report.rb b/benchmark/report.rb
new file mode 100644
index 0000000000..d2dc56b1e1
--- /dev/null
+++ b/benchmark/report.rb
@@ -0,0 +1,79 @@
+#
+# YARV benchmark driver
+#
+
+require 'yarvutil'
+require 'benchmark'
+require 'rbconfig'
+
+def exec_command type, file, w
+  <<-EOP
+  $DRIVER_PATH = '#{File.dirname($0)}'
+  $LOAD_PATH.replace $LOAD_PATH | #{$LOAD_PATH.inspect}
+  require 'benchmark'
+  require 'yarvutil'
+#  print '#{type}'
+  begin
+    puts Benchmark.measure{
+      #{w}('#{file}')
+    }.utime
+  rescue Exception => exec_command_error_variable
+    puts "\t" + exec_command_error_variable.message
+  end
+  EOP
+end
+
+def benchmark cmd
+  rubybin = ENV['RUBY'] || RbConfig.ruby
+
+  IO.popen(rubybin, 'r+'){|io|
+    io.write cmd
+    io.close_write
+    return io.gets
+  }
+end
+
+def ruby_exec file
+  prog = exec_command 'ruby', file, 'load'
+  benchmark prog
+end
+
+def yarv_exec file
+  prog = exec_command 'yarv', file, 'YARVUtil.load_bm'
+  benchmark prog
+end
+
+$wr = $wy = nil
+
+def measure bench
+  file = File.dirname($0) + "/bm_#{bench}.rb"
+  r = ruby_exec(file).to_f
+  y = yarv_exec(file).to_f
+  puts "#{bench}\t#{r}\t#{y}"
+end
+
+def measure2
+  r = ruby_exec.to_f
+  y = yarv_exec.to_f
+  puts r/y
+end
+
+if $0 == __FILE__
+  %w{
+    whileloop
+    whileloop2
+    times
+    const
+    method
+    poly_method
+    block
+    rescue
+    rescue2
+  }.each{|bench|
+    measure bench
+  }
+end
+
+
+
+
diff --git a/benchmark/run.rb b/benchmark/run.rb
new file mode 100644
index 0000000000..0cd2363849
--- /dev/null
+++ b/benchmark/run.rb
@@ -0,0 +1,127 @@
+#
+# Ruby benchmark driver
+#
+
+require 'benchmark'
+require 'rbconfig'
+
+$matzrubyonly = false
+$rubyonly = false
+
+$results  = []
+
+# prepare 'wc.input'
+def prepare_wc_input
+  wcinput = File.join(File.dirname($0), 'wc.input')
+  wcbase  = File.join(File.dirname($0), 'wc.input.base')
+  unless FileTest.exist?(wcinput)
+    data = File.read(wcbase)
+    13.times{
+      data << data
+    }
+    open(wcinput, 'w'){|f| f.write data}
+  end
+end
+
+prepare_wc_input
+
+def bm file
+  prog = File.readlines(file).map{|e| e.rstrip}.join("\n")
+  return if prog.empty?
+
+  /[a-z]+_(.+)\.rb/ =~ file
+  bm_name = $1
+  puts '-----------------------------------------------------------' unless $rubyonly || $matzrubyonly
+  puts "#{bm_name}: "
+
+
+puts <<EOS unless $matzrubyonly || $rubyonly
+#{prog}
+--
+EOS
+  begin
+    result = [bm_name]
+    result << matzruby_exec(file) unless $rubyonly
+    result << ruby_exec(file) unless $matzrubyonly
+    $results << result
+
+  rescue Exception => e
+    puts
+    puts "** benchmark failure: #{e}"
+    puts e.backtrace
+  end
+end
+
+def benchmark file, bin
+  m = Benchmark.measure{
+    `#{bin} #{$opts} #{file}`
+  }
+  sec = '%.3f' % m.real
+  puts " #{sec}"
+  sec
+end
+
+def ruby_exec file
+  print 'ruby'
+  benchmark file, $ruby_program
+end
+
+def matzruby_exec file
+  print 'matz'
+  rubylib = ENV['RUBYLIB']
+  ENV['RUBYLIB'] = ''
+  r = benchmark file, $matzruby_program
+  ENV['RUBYLIB'] = rubylib
+  r
+end
+
+if $0 == __FILE__
+  ARGV.each{|arg|
+    case arg
+    when /\A--ruby=(.+)/
+      $ruby_program = $1
+    when /\A--matzruby=(.+)/
+      $matzruby_program = $1
+    when /\A--opts=(.+)/
+      $opts = $1
+    when /\A(-r|--only-ruby)\z/
+      $rubyonly = true
+    when /\A(-m|--only-matzruby)\z/
+      $matzrubyonly = true
+    end
+  }
+  ARGV.delete_if{|arg|
+    /\A-/ =~ arg
+  }
+
+  puts "MatzRuby:"
+  system("#{$matzruby_program} -v")
+  puts "Ruby:"
+  system("#{$ruby_program} -v")
+  puts
+
+  if ARGV.empty?
+    Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file|
+      bm file
+    }
+  else
+    ARGV.each{|file|
+      Dir.glob(File.join(File.dirname(__FILE__), file + '*')){|ef|
+        # file = "#{File.dirname(__FILE__)}/#{file}.rb"
+        bm ef
+      }
+    }
+  end
+
+  puts
+  puts "-- benchmark summary ---------------------------"
+  $results.each{|res|
+    print res.shift, "\t"
+    (res||[]).each{|result|
+      /([\d\.]+)/ =~ result
+      print $1 + "\t" if $1
+    }
+    puts
+  }
+end
+
diff --git a/benchmark/runc.rb b/benchmark/runc.rb
new file mode 100644
index 0000000000..97c5cef045
--- /dev/null
+++ b/benchmark/runc.rb
@@ -0,0 +1,27 @@
+#
+#
+#
+
+require 'benchmark'
+require 'rbconfig'
+
+$rubybin = ENV['RUBY'] || RbConfig.ruby
+
+def runfile file
+  puts file
+  file = File.join(File.dirname($0), 'contrib', file)
+  Benchmark.bm{|x|
+    x.report('ruby'){
+      system("#{$rubybin} #{file}")
+    }
+    x.report('yarv'){
+      system("#{$rubybin} -rite -I.. #{file}")
+    }
+  }
+end
+
+ARGV.each{|file|
+  runfile file
+}
+
+
diff --git a/benchmark/wc.input.base b/benchmark/wc.input.base
new file mode 100644
index 0000000000..41143fbac0
--- /dev/null
+++ b/benchmark/wc.input.base
@@ -0,0 +1,25 @@
+Subject:      Re: Who was Izchak Miller?
+From:         "Jane D. Anonymous" <nobody@yale.edu>
+Date:         1996/04/28
+Message-Id:   <4lv7bc$oh@news.ycc.yale.edu>
+References:   <317C405E.5DFA@panix.com> <4lk6vl$gde@ns.oar.net>
+To:           75176.2330@compuserve.com
+Content-Type: text/plain; charset=us-ascii
+Organization: Yale University
+X-Url:        news:4lk6vl$gde@ns.oar.net
+Mime-Version: 1.0
+Newsgroups:   rec.games.roguelike.nethack
+X-Mailer:     Mozilla 1.1N (Macintosh; I; 68K)
+
+Hello there, Izchak Miller was my father.  When I was younger I spent 
+many a night, hunched over the keyboard with a cup of tea, playing 
+nethack with him and my brother.  my dad was a philosopher with a strong 
+weakness for fantasy/sci fi.  I remember when he started to get involved 
+with the Nethack team- my brother's Dungeons and Dragons monster book 
+found a regular place beside my dad's desk. it's nice to see him living 
+on in the game he loved so much :-).  
+                                                                  Tamar Miller
+
+The following is a really long word of 5000 characters:
+
+wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww
diff --git a/bignum.c b/bignum.c
index 0c5ae3ed39..bced660134 100644
--- a/bignum.c
+++ b/bignum.c
@@ -3,492 +3,3988 @@
   bignum.c -
 
   $Author$
-  $Date$
   created at: Fri Jun 10 00:48:55 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "rubysig.h"
+#include "ruby/ruby.h"
+#include "ruby/thread.h"
+#include "ruby/util.h"
+#include "internal.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>
+
+#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)
 
 VALUE rb_cBignum;
+const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
-#if defined __MINGW32__
-#define USHORT _USHORT
+#ifndef SIZEOF_BDIGIT_DBL
+# if defined(HAVE_INT64_T) && defined(HAVE_INT128_T)
+#  define SIZEOF_BDIGIT_DBL SIZEOF_INT128_T
+# elif SIZEOF_INT*2 <= SIZEOF_LONG_LONG
+#  define SIZEOF_BDIGIT_DBL SIZEOF_LONG_LONG
+# else
+#  define SIZEOF_BDIGIT_DBL SIZEOF_LONG
+# endif
 #endif
 
-#define BDIGITS(x) ((BDIGIT*)RBIGNUM(x)->digits)
+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_BDIGITS <= sizeof(BDIGIT));
+STATIC_ASSERT(sizeof_bdigit_and_dbl, SIZEOF_BDIGITS*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, RBIGNUM_EMBED_LEN_MAX <= (RBIGNUM_EMBED_LEN_MASK >> RBIGNUM_EMBED_LEN_SHIFT));
+
+#if SIZEOF_BDIGITS < SIZEOF_LONG
+STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_LONG % SIZEOF_BDIGITS == 0);
+#else
+STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGITS % SIZEOF_LONG == 0);
+#endif
+
+#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 BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
-#define DIGSPERLONG ((unsigned int)(SIZEOF_LONG/SIZEOF_BDIGITS))
-#if HAVE_LONG_LONG
-# define DIGSPERLL ((unsigned int)(SIZEOF_LONG_LONG/SIZEOF_BDIGITS))
+#define BIGRAD_HALF ((BDIGIT)(BIGRAD >> 1))
+#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) & BDIGMAX))
+#define BDIGMAX ((BDIGIT)(BIGRAD-1))
+#define BDIGIT_DBL_MAX (~(BDIGIT_DBL)0)
+
+#if SIZEOF_BDIGITS == 2
+#   define swap_bdigit(x) swap16(x)
+#elif SIZEOF_BDIGITS == 4
+#   define swap_bdigit(x) swap32(x)
+#elif SIZEOF_BDIGITS == 8
+#   define swap_bdigit(x) swap64(x)
 #endif
-#define BIGUP(x) ((BDIGIT_DBL)(x) << BITSPERDIG)
-#define BIGDN(x) RSHIFT(x,BITSPERDIG)
-#define BIGLO(x) ((BDIGIT)((x) & (BIGRAD-1)))
-#define BDIGMAX ((BDIGIT)-1)
 
-#define BIGZEROP(x) (RBIGNUM(x)->len == 0 || \
+#define BIGZEROP(x) (RBIGNUM_LEN(x) == 0 || \
 		     (BDIGITS(x)[0] == 0 && \
-		      (RBIGNUM(x)->len == 1 || bigzero_p(x))))
+		      (RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
+#define BIGSIZE(x) (RBIGNUM_LEN(x) == 0 ? (size_t)0 : \
+    BDIGITS(x)[RBIGNUM_LEN(x)-1] ? \
+        (size_t)(RBIGNUM_LEN(x)*SIZEOF_BDIGITS - nlz(BDIGITS(x)[RBIGNUM_LEN(x)-1])/CHAR_BIT) : \
+    rb_absint_size(x, NULL))
+
+#define BIGDIVREM_EXTRA_WORDS 1
+#define roomof(n, m) ((long)(((n)+(m)-1) / (m)))
+#define bdigit_roomof(n) roomof(n, SIZEOF_BDIGITS)
+#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 RBIGNUM_SET_NEGATIVE_SIGN(b) RBIGNUM_SET_SIGN(b, 0)
+#define RBIGNUM_SET_POSITIVE_SIGN(b) RBIGNUM_SET_SIGN(b, 1)
+
+#define bignew(len,sign) bignew_1(rb_cBignum,(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, long 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_BDIGITS <= SIZEOF_INT
+static int nlz(BDIGIT x) { return nlz_int((unsigned int)x) - (SIZEOF_INT-SIZEOF_BDIGITS) * CHAR_BIT; }
+#elif SIZEOF_BDIGITS <= SIZEOF_LONG
+static int nlz(BDIGIT x) { return nlz_long((unsigned long)x) - (SIZEOF_LONG-SIZEOF_BDIGITS) * CHAR_BIT; }
+#elif SIZEOF_BDIGITS <= SIZEOF_LONG_LONG
+static int nlz(BDIGIT x) { return nlz_long_long((unsigned LONG_LONG)x) - (SIZEOF_LONG_LONG-SIZEOF_BDIGITS) * CHAR_BIT; }
+#elif SIZEOF_BDIGITS <= SIZEOF_INT128_T
+static int nlz(BDIGIT x) { return nlz_int128((uint128_t)x) - (SIZEOF_INT128_T-SIZEOF_BDIGITS) * 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 scirpt, 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"
+}
+
+ */
+
+#ifdef HAVE_UINT16_T
+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),
+};
+#endif
+#ifdef HAVE_UINT32_T
+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),
+};
+#endif
+#ifdef 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),
+};
+#endif
+#ifdef 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 bigzero_p(VALUE);
 static int
-bigzero_p(x)
-    VALUE x;
+bary_cmp(const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
 {
-    long i;
-    for (i = 0; i < RBIGNUM(x)->len; ++i) {
-	if (BDIGITS(x)[i]) return 0;
+    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 VALUE
-bignew_1(klass, len, sign)
-    VALUE klass;
-    long len;
+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_BDIGITS
+                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_BDIGITS
+                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_BDIGITS
+                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_BDIGITS
+                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_BDIGITS && 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_BDIGITS
+                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_BDIGITS && 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_BDIGITS
+                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_BDIGITS && 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_BDIGITS == 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_BDIGITS;
+            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_BDIGITS == sizeof(BDIGIT) &&
+            wordsize % SIZEOF_BDIGITS == 0 && (uintptr_t)words % ALIGNOF(BDIGIT) == 0) {
+            size_t bdigits_per_word = wordsize / SIZEOF_BDIGITS;
+            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_BDIGITS * 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_BDIGITS && 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_BDIGITS
+            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_BDIGITS
+            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_BDIGITS
+            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_BDIGITS == 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_BDIGITS;
+            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_BDIGITS == sizeof(BDIGIT) &&
+            wordsize % SIZEOF_BDIGITS == 0) {
+            size_t bdigits_per_word = wordsize / SIZEOF_BDIGITS;
+            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 = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_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 = RBIGNUM_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 = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_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_BDIGITS * zn <= 16) {
+        uint128_t z, x, y;
+        ssize_t i;
+        for (x = 0, i = xn-1; 0 <= i; i--) { x <<= SIZEOF_BDIGITS*CHAR_BIT; x |= xds[i]; }
+        for (y = 0, i = yn-1; 0 <= i; i--) { y <<= SIZEOF_BDIGITS*CHAR_BIT; y |= yds[i]; }
+        for (z = 0, i = zn-1; 0 <= i; i--) { z <<= SIZEOF_BDIGITS*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 = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_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 = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_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_BDIGITS)*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 = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_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 (xds[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)
 {
-    NEWOBJ(big, struct RBignum);
-    OBJSETUP(big, klass, T_BIGNUM);
-    big->sign = sign?1:0;
-    big->len = len;
-    big->digits = ALLOC_N(BDIGIT, len);
+    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 = RBIGNUM_LEN(x), yn = RBIGNUM_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, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    qds = BDIGITS(q);
+
+    rn = yn;
+    r = bignew(rn, RBIGNUM_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_BDIGITS)*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 = RBIGNUM_LEN(x), yn = RBIGNUM_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, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    qds = BDIGITS(q);
+
+    rn = yn;
+    r = bignew(rn, RBIGNUM_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
+#define ON_DEBUG(x) do { x; } while (0)
+static void
+dump_bignum(VALUE x)
+{
+    long i;
+    printf("%c0x0", RBIGNUM_SIGN(x) ? '+' : '-');
+    for (i = RBIGNUM_LEN(x); i--; ) {
+        printf("_%0*"PRIxBDIGIT, SIZEOF_BDIGITS*2, BDIGITS(x)[i]);
+    }
+    printf(", len=%lu", RBIGNUM_LEN(x));
+    puts("");
+}
+
+static VALUE
+rb_big_dump(VALUE x)
+{
+    dump_bignum(x);
+    return x;
+}
+#else
+#define ON_DEBUG(x)
+#endif
+
+static int
+bigzero_p(VALUE x)
+{
+    return bary_zero_p(BDIGITS(x), RBIGNUM_LEN(x));
+}
+
+int
+rb_bigzero_p(VALUE x)
+{
+    return BIGZEROP(x);
+}
+
+int
+rb_cmpint(VALUE val, VALUE a, VALUE b)
+{
+    if (NIL_P(val)) {
+	rb_cmperr(a, b);
+    }
+    if (FIXNUM_P(val)) {
+        long l = FIX2LONG(val);
+        if (l > 0) return 1;
+        if (l < 0) return -1;
+        return 0;
+    }
+    if (RB_BIGNUM_TYPE_P(val)) {
+	if (BIGZEROP(val)) return 0;
+	if (RBIGNUM_SIGN(val)) return 1;
+	return -1;
+    }
+    if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
+    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
+    return 0;
+}
+
+#define RBIGNUM_SET_LEN(b,l) \
+    ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
+     (void)(RBASIC(b)->flags = \
+	    (RBASIC(b)->flags & ~RBIGNUM_EMBED_LEN_MASK) | \
+	    ((l) << RBIGNUM_EMBED_LEN_SHIFT)) : \
+     (void)(RBIGNUM(b)->as.heap.len = (l)))
+
+static void
+rb_big_realloc(VALUE big, long len)
+{
+    BDIGIT *ds;
+    if (RBASIC(big)->flags & RBIGNUM_EMBED_FLAG) {
+	if (RBIGNUM_EMBED_LEN_MAX < len) {
+	    ds = ALLOC_N(BDIGIT, len);
+	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, RBIGNUM_EMBED_LEN_MAX);
+	    RBIGNUM(big)->as.heap.len = RBIGNUM_LEN(big);
+	    RBIGNUM(big)->as.heap.digits = ds;
+	    RBASIC(big)->flags &= ~RBIGNUM_EMBED_FLAG;
+	}
+    }
+    else {
+	if (len <= RBIGNUM_EMBED_LEN_MAX) {
+	    ds = RBIGNUM(big)->as.heap.digits;
+	    RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
+	    RBIGNUM_SET_LEN(big, len);
+            (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) {
+		RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
+	    }
+	    else {
+		REALLOC_N(RBIGNUM(big)->as.heap.digits, BDIGIT, len);
+	    }
+	}
+    }
+}
+
+void
+rb_big_resize(VALUE big, long len)
+{
+    rb_big_realloc(big, len);
+    RBIGNUM_SET_LEN(big, len);
+}
+
+static VALUE
+bignew_1(VALUE klass, long len, int sign)
+{
+    NEWOBJ_OF(big, struct RBignum, klass, T_BIGNUM | (RGENGC_WB_PROTECTED_BIGNUM ? FL_WB_PROTECTED : 0));
+    RBIGNUM_SET_SIGN(big, sign?1:0);
+    if (len <= RBIGNUM_EMBED_LEN_MAX) {
+	RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
+	RBIGNUM_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)
+{
+    return bignew(len, sign != 0);
+}
 
 VALUE
-rb_big_clone(x)
-    VALUE x;
+rb_big_clone(VALUE x)
 {
-    VALUE z = bignew_1(CLASS_OF(x), RBIGNUM(x)->len, RBIGNUM(x)->sign);
+    long len = RBIGNUM_LEN(x);
+    VALUE z = bignew_1(CLASS_OF(x), len, RBIGNUM_SIGN(x));
 
-    MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, RBIGNUM(x)->len);
+    MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, len);
     return z;
 }
 
+static void
+big_extend_carry(VALUE x)
+{
+    rb_big_resize(x, RBIGNUM_LEN(x)+1);
+    BDIGITS(x)[RBIGNUM_LEN(x)-1] = 1;
+}
+
 /* modify a bignum by 2's complement */
 static void
-get2comp(x)
-    VALUE x;
+get2comp(VALUE x)
 {
-    long i = RBIGNUM(x)->len;
+    long i = RBIGNUM_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(x)->len);
-    if (num != 0) {
-	REALLOC_N(RBIGNUM(x)->digits, BDIGIT, ++RBIGNUM(x)->len);
-	ds = BDIGITS(x);
-	ds[RBIGNUM(x)->len-1] = RBIGNUM(x)->sign ? ~0 : 1;
+    if (bary_2comp(ds, i)) {
+        big_extend_carry(x);
     }
 }
 
 void
-rb_big_2comp(x)			/* get 2's complement */
-    VALUE x;
+rb_big_2comp(VALUE x)			/* get 2's complement */
 {
     get2comp(x);
 }
 
-static VALUE
-bigtrunc(x)
-    VALUE x;
+static BDIGIT
+abs2twocomp(VALUE *xp, long *n_ret)
 {
-    long len = RBIGNUM(x)->len;
+    VALUE x = *xp;
+    long n = RBIGNUM_LEN(x);
+    BDIGIT *ds = BDIGITS(x);
+    BDIGIT hibits = 0;
+
+    BARY_TRUNC(ds, n);
+
+    if (n != 0 && RBIGNUM_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)
+{
+    RBIGNUM_SET_SIGN(x, !hibits);
+    if (hibits) {
+        get2comp(x);
+    }
+}
+
+static inline VALUE
+bigtrunc(VALUE x)
+{
+    long len = RBIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
 
     if (len == 0) return x;
     while (--len && !ds[len]);
-    RBIGNUM(x)->len = ++len;
+    if (RBIGNUM_LEN(x) > len+1) {
+	rb_big_resize(x, len+1);
+    }
     return x;
 }
 
-static VALUE
-bigfixize(x)
-    VALUE x;
+static inline VALUE
+bigfixize(VALUE x)
 {
-    long len = RBIGNUM(x)->len;
+    size_t n = RBIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
+#if SIZEOF_BDIGITS < SIZEOF_LONG
+    unsigned long u;
+#else
+    BDIGIT u;
+#endif
 
-    if (len*SIZEOF_BDIGITS <= sizeof(VALUE)) {
-	long num = 0;
-	while (len--) {
-	    num = BIGUP(num) + ds[len];
-	}
-	if (num >= 0) {
-	    if (RBIGNUM(x)->sign) {
-		if (POSFIXABLE(num)) return LONG2FIX(num);
-	    }
-	    else {
-		if (NEGFIXABLE(-(long)num)) return LONG2FIX(-(long)num);
-	    }
-	}
+    BARY_TRUNC(ds, n);
+
+    if (n == 0) return INT2FIX(0);
+
+#if SIZEOF_BDIGITS < SIZEOF_LONG
+    if (sizeof(long)/SIZEOF_BDIGITS < n)
+        goto return_big;
+    else {
+        int i = (int)n;
+        u = 0;
+        while (i--) {
+            u = (unsigned long)(BIGUP(u) + ds[i]);
+        }
     }
+#else /* SIZEOF_BDIGITS >= SIZEOF_LONG */
+    if (1 < n)
+        goto return_big;
+    else
+        u = ds[0];
+#endif
+
+    if (RBIGNUM_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(x)
-    VALUE x;
+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;
 }
 
 VALUE
-rb_big_norm(x)
-    VALUE x;
+rb_big_norm(VALUE x)
 {
     return bignorm(x);
 }
 
 VALUE
-rb_uint2big(n)
-    unsigned long n;
+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_BDIGITS >= 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(big)->len = i+1;
+    RBIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
 VALUE
-rb_int2big(n)
-    long n;
+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(big)->sign = 0;
+	RBIGNUM_SET_SIGN(big, 0);
     }
     return big;
 }
 
 VALUE
-rb_uint2inum(n)
-    unsigned long n;
+rb_uint2inum(VALUE n)
 {
     if (POSFIXABLE(n)) return LONG2FIX(n);
     return rb_uint2big(n);
 }
 
 VALUE
-rb_int2inum(n)
-    long n;
+rb_int2inum(SIGNED_VALUE n)
 {
     if (FIXABLE(n)) return LONG2FIX(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_BDIGITS >= 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 + RBIGNUM_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_BDIGITS - 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] = { nlz_bits_in_msbyte };
+    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;
+
+    /*
+     * 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 SIZEOF_LONG_LONG == QUAD_SIZE && SIZEOF_BDIGITS*2 == SIZEOF_LONG_LONG
+    if (word_numbits == 0)
+        return (size_t)-1;
 
-void
-rb_quad_pack(buf, val)
-    char *buf;
-    VALUE val;
+    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;
+
+    return numwords;
+}
+
+/* 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 : RBIGNUM_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 : RBIGNUM_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_BDIGITS >= 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(val)->len;
-	BDIGIT *ds;
+        dp = BDIGITS(val);
+        de = dp + RBIGNUM_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)
-	    rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
-	ds = BDIGITS(val);
-	q = 0;
-	while (len--) {
-	    q = BIGUP(q);
-	    q += ds[len];
-	}
-	if (!RBIGNUM(val)->sign) q = -q;
+
+/*
+ * 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_BDIGITS >= 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 = RBIGNUM_POSITIVE_P(val) ? 1 : -1;
+        ds = BDIGITS(val);
+        num_bdigits = RBIGNUM_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(buf, sign)
-    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(big)->len = i+1;
-
-    if (neg) {
-	RBIGNUM(big)->sign = 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), RBIGNUM_LEN(val)))
+        sign = 0;
+    RBIGNUM_SET_SIGN(val, 0 <= sign);
+
+    if (flags & INTEGER_PACK_FORCE_BIGNUM)
+        return bigtrunc(val);
+    return bignorm(val);
 }
 
-#else
+#define QUAD_SIZE 8
 
-static int
-quad_buf_complement(char *buf, size_t len)
+void
+rb_quad_pack(char *buf, VALUE val)
 {
-    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;
+    rb_integer_pack(val, buf, 1, QUAD_SIZE, 0,
+            INTEGER_PACK_NATIVE_BYTE_ORDER|
+            INTEGER_PACK_2COMP);
 }
 
-void
-rb_quad_pack(buf, val)
-    char *buf;
-    VALUE val;
+VALUE
+rb_quad_unpack(const char *buf, int signed_p)
 {
-    long len;
+    return rb_integer_unpack(buf, 1, QUAD_SIZE, 0,
+            INTEGER_PACK_NATIVE_BYTE_ORDER|
+            (signed_p ? INTEGER_PACK_2COMP : 0));
+}
 
-    memset(buf, 0, QUAD_SIZE);
-    val = rb_to_int(val);
-    if (FIXNUM_P(val)) {
-	val = rb_int2big(FIX2LONG(val));
+#define conv_digit(c) (ruby_digit36_to_number_table[(unsigned char)(c)])
+
+static void
+str2big_scan_digits(const char *s, const char *str, int base, int badcheck, size_t *num_digits_p, size_t *len_p)
+{
+    char nondigit = 0;
+    size_t num_digits = 0;
+    const char *digits_start = str;
+    const char *digits_end = str;
+
+    int c;
+
+    if (badcheck && *str == '_') goto bad;
+
+    while ((c = *str++) != 0) {
+	if (c == '_') {
+	    if (nondigit) {
+		if (badcheck) goto bad;
+		break;
+	    }
+	    nondigit = (char) c;
+	    continue;
+	}
+	else if ((c = conv_digit(c)) < 0) {
+	    break;
+	}
+	if (c >= base) break;
+	nondigit = 0;
+        num_digits++;
+        digits_end = str;
     }
-    len = RBIGNUM(val)->len * SIZEOF_BDIGITS;
-    if (len > QUAD_SIZE) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `quad int'");
+    if (badcheck) {
+	str--;
+	if (s+1 < str && str[-1] == '_') goto bad;
+	while (*str && ISSPACE(*str)) str++;
+	if (*str) {
+	  bad:
+	    rb_invalid_str(s, "Integer()");
+	}
+    }
+    *num_digits_p = num_digits;
+    *len_p = digits_end - digits_start;
+}
+
+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;
+
+    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;
+        }
     }
-    memcpy(buf, (char*)BDIGITS(val), len);
-    if (RBIGNUM_NEGATIVE_P(val)) {
-        quad_buf_complement(buf, QUAD_SIZE);
+    if (numbits) {
+        *dp++ = BIGLO(dd);
     }
+    assert((size_t)(dp - BDIGITS(z)) == num_bdigits);
+
+    return z;
 }
 
-#define BNEG(b) (RSHIFT(((BDIGIT*)b)[QUAD_SIZE/SIZEOF_BDIGITS-1],BITSPERDIG-1) != 0)
+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;
 
-VALUE
-rb_quad_unpack(buf, sign)
-    const char *buf;
-    int sign;
+    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;
+}
+
+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 big = bignew(QUAD_SIZE/SIZEOF_BDIGITS, 1);
+    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;
 
-    memcpy((char*)BDIGITS(big), buf, QUAD_SIZE);
-    if (sign && BNEG(buf)) {
-	char *tmp = (char*)BDIGITS(big);
+    size_t i;
+    const char *p;
+    int c;
+    VALUE z;
+
+    uds = ALLOCV_N(BDIGIT, tmpuv, 2*num_bdigits);
+    vds = uds + num_bdigits;
 
-	RBIGNUM(big)->sign = 0;
-        quad_buf_complement(tmp, QUAD_SIZE);
+    powerv = power_cache_get_power(base, power_level, NULL);
+
+    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), RBIGNUM_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), RBIGNUM_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);
+
+    if (tmpuv)
+        ALLOCV_END(tmpuv);
 
-    return bignorm(big);
+    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_BDIGITS)*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
 
 VALUE
-rb_cstr_to_inum(str, base, badcheck)
-    const char *str;
-    int base;
-    int badcheck;
+rb_cstr_to_inum(const char *str, int base, int badcheck)
 {
     const char *s = str;
-    char *end;
-    char sign = 1, nondigit = 0;
+    char sign = 1;
     int c;
-    BDIGIT_DBL num;
-    long len, blen = 1;
-    long i;
     VALUE z;
-    BDIGIT *zds;
 
-#define conv_digit(c) \
-    (!ISASCII(c) ? -1 : \
-     isdigit(c) ? ((c) - '0') : \
-     islower(c) ? ((c) - 'a' + 10) : \
-     isupper(c) ? ((c) - 'A' + 10) : \
-     -1)
+    int bits_per_digit;
+
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    size_t num_bdigits;
+    size_t len;
 
     if (!str) {
-	if (badcheck) goto bad;
+	if (badcheck) {
+          bad:
+            rb_invalid_str(s, "Integer()");
+        }
 	return INT2FIX(0);
     }
-    if (badcheck) {
-	while (ISSPACE(*str)) str++;
-    }
-    else {
-	while (ISSPACE(*str) || *str == '_') str++;
-    }
+    while (ISSPACE(*str)) str++;
 
     if (str[0] == '+') {
 	str++;
@@ -506,15 +4002,19 @@ rb_cstr_to_inum(str, base, badcheck)
 	    switch (str[1]) {
 	      case 'x': case 'X':
 		base = 16;
+                str += 2;
 		break;
 	      case 'b': case 'B':
 		base = 2;
+                str += 2;
 		break;
 	      case 'o': case 'O':
 		base = 8;
+                str += 2;
 		break;
 	      case 'd': case 'D':
 		base = 10;
+                str += 2;
 		break;
 	      default:
 		base = 8;
@@ -527,49 +4027,30 @@ rb_cstr_to_inum(str, base, badcheck)
 	    base = 10;
 	}
     }
-    switch (base) {
-      case 2:
-	len = 1;
+    else if (base == 2) {
 	if (str[0] == '0' && (str[1] == 'b'||str[1] == 'B')) {
 	    str += 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;
 	}
-      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;
 	}
-      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, "illegal radix %d", base);
-	}
-	if (base <= 32) {
-	    len = 5;
-	}
-	else {
-	    len = 6;
-	}
-	break;
     }
-    if (*str == '0') {		/* squeeze preceeding 0s */
+    if (base < 2 || 36 < base) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
+    }
+    if (*str == '0') {		/* squeeze preceding 0s */
 	int us = 0;
 	while ((c = *++str) == '0' || c == '_') {
 	    if (c == '_') {
@@ -586,12 +4067,13 @@ rb_cstr_to_inum(str, base, badcheck)
 	if (badcheck) goto bad;
 	return INT2FIX(0);
     }
-    len *= strlen(str)*sizeof(char);
 
-    if (len <= (sizeof(VALUE)*CHAR_BIT)) {
-	unsigned long val = strtoul((char*)str, &end, base);
+    bits_per_digit = bit_length(base-1);
+    if (bits_per_digit * strlen(str) <= sizeof(long) * CHAR_BIT) {
+        char *end;
+	unsigned long val = STRTOUL(str, &end, base);
 
-	if (*end == '_') goto bigparse;
+	if (str < end && *end == '_') goto bigparse;
 	if (badcheck) {
 	    if (end == str) goto bad; /* no number */
 	    while (*end && ISSPACE(*end)) end++;
@@ -607,141 +4089,282 @@ rb_cstr_to_inum(str, base, badcheck)
 	}
 	else {
 	    VALUE big = rb_uint2big(val);
-	    RBIGNUM(big)->sign = sign;
+	    RBIGNUM_SET_SIGN(big, sign);
 	    return bignorm(big);
 	}
     }
+
   bigparse:
-    len = (len/BITSPERDIG)+1;
-    if (badcheck && *str == '_') goto bad;
+    digits_start = str;
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
+    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,
+                bits_per_digit);
     }
-    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);
 }
 
 VALUE
-rb_str_to_inum(str, base, badcheck)
-    VALUE str;
-    int base;
-    int badcheck;
+rb_str_to_inum(VALUE str, int base, int badcheck)
 {
     char *s;
     long len;
+    VALUE v = 0;
+    VALUE ret;
 
     StringValue(str);
+    rb_must_asciicompat(str);
     if (badcheck) {
 	s = StringValueCStr(str);
     }
     else {
-	s = RSTRING(str)->ptr;
+	s = RSTRING_PTR(str);
     }
     if (s) {
-	len = RSTRING(str)->len;
+	len = RSTRING_LEN(str);
 	if (s[len]) {		/* no sentinel somehow */
-	    char *p = ALLOCA_N(char, len+1);
+	    char *p = ALLOCV(v, len+1);
 
 	    MEMCPY(p, s, char, len);
 	    p[len] = '\0';
 	    s = p;
 	}
     }
-    return rb_cstr_to_inum(s, base, badcheck);
+    ret = rb_cstr_to_inum(s, base, badcheck);
+    if (v)
+	ALLOCV_END(v);
+    return ret;
 }
 
-#if HAVE_LONG_LONG
+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;
+    size_t len;
+    VALUE z;
+
+    if (base < 2 || 36 < base || !POW2_P(base)) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValueCStr(arg);
+    if (*str == '-') {
+        str++;
+        positive_p = 0;
+    }
+
+    digits_start = str;
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
+    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_ull2big(n)
-    unsigned LONG_LONG n;
+rb_str2big_normal(VALUE arg, int base, int badcheck)
 {
-    BDIGIT_DBL num = n;
-    long i = 0;
-    BDIGIT *digits;
-    VALUE big;
+    int positive_p = 1;
+    const char *s, *str;
+    const char *digits_start, *digits_end;
+    size_t num_digits;
+    size_t len;
+    VALUE z;
 
-    big = bignew(DIGSPERLL, 1);
-    digits = BDIGITS(big);
-    while (i < DIGSPERLL) {
-	digits[i++] = BIGLO(num);
-	num = BIGDN(num);
+    int digits_per_bdigits_dbl;
+    size_t num_bdigits;
+
+    if (base < 2 || 36 < base) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValueCStr(arg);
+    if (*str == '-') {
+        str++;
+        positive_p = 0;
+    }
+
+    digits_start = str;
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
+    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;
+    size_t len;
+    VALUE z;
+
+    int digits_per_bdigits_dbl;
+    size_t num_bdigits;
+
+    if (base < 2 || 36 < base) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValueCStr(arg);
+    if (*str == '-') {
+        str++;
+        positive_p = 0;
     }
 
-    i = DIGSPERLL;
+    digits_start = str;
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
+    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;
+    size_t len;
+    VALUE z;
+
+    int digits_per_bdigits_dbl;
+    size_t num_bdigits;
+
+    if (base < 2 || 36 < base) {
+        rb_raise(rb_eArgError, "invalid radix %d", base);
+    }
+
+    rb_must_asciicompat(arg);
+    s = str = StringValueCStr(arg);
+    if (*str == '-') {
+        str++;
+        positive_p = 0;
+    }
+
+    digits_start = str;
+    str2big_scan_digits(s, str, base, badcheck, &num_digits, &len);
+    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)
+{
+    long i;
+    VALUE big = bignew(bdigit_roomof(SIZEOF_LONG_LONG), 1);
+    BDIGIT *digits = BDIGITS(big);
+
+#if SIZEOF_BDIGITS >= 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 = bdigit_roomof(SIZEOF_LONG_LONG);
     while (i-- && !digits[i]) ;
-    RBIGNUM(big)->len = i+1;
+    RBIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
-VALUE
-rb_ll2big(n)
-    LONG_LONG n;
+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(big)->sign = 0;
+	RBIGNUM_SET_SIGN(big, 0);
     }
     return big;
 }
 
 VALUE
-rb_ull2inum(n)
-    unsigned LONG_LONG n;
+rb_ull2inum(unsigned LONG_LONG n)
 {
     if (POSFIXABLE(n)) return LONG2FIX(n);
     return rb_ull2big(n);
 }
 
 VALUE
-rb_ll2inum(n)
-    LONG_LONG n;
+rb_ll2inum(LONG_LONG n)
 {
     if (FIXABLE(n)) return LONG2FIX(n);
     return rb_ll2big(n);
@@ -750,128 +4373,655 @@ rb_ll2inum(n)
 #endif  /* HAVE_LONG_LONG */
 
 VALUE
-rb_cstr2inum(str, base)
-    const char *str;
-    int base;
+rb_cstr2inum(const char *str, int base)
 {
     return rb_cstr_to_inum(str, base, base==0);
 }
 
 VALUE
-rb_str2inum(str, base)
-    VALUE str;
-    int base;
+rb_str2inum(VALUE str, int base)
 {
     return rb_str_to_inum(str, base, base==0);
 }
 
-const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
-VALUE
-rb_big2str0(x, base, trim)
-    VALUE x;
-    int base;
-    int trim;
+static VALUE
+big_shift3(VALUE x, int lshift_p, size_t shift_numdigits, int shift_numbits)
 {
-    volatile VALUE t;
-    BDIGIT *ds;
-    long i, j, hbase;
-    VALUE ss;
-    char *s;
+    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 = RBIGNUM_LEN(x);
+        z = bignew(xn+s1+1, RBIGNUM_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)RBIGNUM_LEN(x) <= shift_numdigits) {
+            if (RBIGNUM_POSITIVE_P(x) ||
+                bary_zero_p(BDIGITS(x), RBIGNUM_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 VALUE
+big_shift2(VALUE x, int lshift_p, VALUE y)
+{
+    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 RBIGNUM_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 VALUE
+big_lshift(VALUE x, unsigned long shift)
+{
+    long s1 = shift/BITSPERDIG;
+    int s2 = (int)(shift%BITSPERDIG);
+    return big_shift3(x, 1, s1, s2);
+}
+
+static VALUE
+big_rshift(VALUE x, unsigned long shift)
+{
+    long s1 = shift/BITSPERDIG;
+    int s2 = (int)(shift%BITSPERDIG);
+    return big_shift3(x, 0, s1, s2);
+}
+
+#define MAX_BASE36_POWER_TABLE_ENTRIES (SIZEOF_SIZE_T * CHAR_BIT + 1)
+
+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_BASE36_POWER_TABLE_ENTRIES; ++j) {
+	    base36_power_cache[i][j] = Qnil;
+	}
+    }
+}
+
+static inline VALUE
+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];
+}
+
+/*
+ * deprecated.  (used only from deprecated rb_big2str0)
+ *
+ * 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);
 
     if (FIXNUM_P(x)) {
-	return rb_fix2str(x, base);
+	bits = (SIZEOF_LONG*CHAR_BIT - 1)/2 + 1;
     }
-    i = RBIGNUM(x)->len;
-    if (BIGZEROP(x)) {
-	return rb_str_new2("0");
+    else if (BIGZEROP(x)) {
+	return 0;
     }
-    if (i >= LONG_MAX/SIZEOF_BDIGITS/CHAR_BIT) {
+    else if (RBIGNUM_LEN(x) >= LONG_MAX/BITSPERDIG) {
 	rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
     }
-    j = SIZEOF_BDIGITS*CHAR_BIT*i;
-    switch (base) {
-      case 2: break;
-      case 3:
-	j = j * 53L / 84 + 1;
-	break;
-      case 4: case 5: case 6: case 7:
-	j = (j + 1) / 2;
-	break;
-      case 8: case 9:
-	j = (j + 2) / 3;
-	break;
-      case 10: case 11: case 12: case 13: case 14: case 15:
-	j = j * 28L / 93 + 1;
-	break;
-      case 16: case 17: case 18: case 19: case 20: case 21:
-      case 22: case 23: case 24: case 25: case 26: case 27:
-      case 28: case 29: case 30: case 31:
-	j = (j + 3) / 4;
-	break;
-      case 32: case 33: case 34: case 35: case 36:
-	j = (j + 4) / 5;
-	break;
-      default:
-	rb_raise(rb_eArgError, "illegal radix %d", base);
-	break;
-    }
-    j++;			/* space for sign */
-
-    hbase = base * base;
-#if SIZEOF_BDIGITS > 2
-    hbase *= hbase;
-#endif
-
-    t = rb_big_clone(x);
-    ds = BDIGITS(t);
-    ss = rb_str_new(0, j+1);
-    s = RSTRING(ss)->ptr;
-
-    s[0] = RBIGNUM(x)->sign ? '+' : '-';
-    TRAP_BEG;
-    while (i && j > 1) {
-	long k = i;
-	BDIGIT_DBL num = 0;
-
-	while (k--) {
-	    num = BIGUP(num) + ds[k];
-	    ds[k] = (BDIGIT)(num / hbase);
-	    num %= hbase;
-	}
-	if (trim && ds[i-1] == 0) i--;
-	k = SIZEOF_BDIGITS;
-	while (k--) {
-	    s[--j] = ruby_digitmap[num % base];
-	    num /= base;
-	    if (!trim && j <= 1) break;
-	    if (trim && i == 0 && num == 0) break;
+    else {
+	bits = BITSPERDIG*RBIGNUM_LEN(x);
+    }
+
+    /* @shyouhei note: vvvvvvvvvvvvv this cast is suspicious.  But I believe it is OK, because if that cast loses data, this x value is too big, and should have raised RangeError. */
+    return (long)ceil(((double)bits)/log_2[base - 2]);
+}
+
+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)
+{
+    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 {
+            p[--j] = ruby_digitmap[num % b2s->base];
+            num /= b2s->base;
+        } while (num);
+        len = sizeof(buf) - j;
+        big2str_alloc(b2s, len + taillen);
+	MEMCPY(b2s->ptr, buf + j, char, len);
+    }
+    else {
+        p = b2s->ptr;
+        j = b2s->hbase2_numdigits;
+        do {
+            p[--j] = ruby_digitmap[num % b2s->base];
+            num /= b2s->base;
+        } while (j);
+        len = b2s->hbase2_numdigits;
+    }
+    b2s->ptr += len;
+}
+
+static void
+big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
+		  int power_level, size_t taillen)
+{
+    VALUE b;
+    size_t half_numdigits, lower_numdigits;
+    int lower_power_level;
+    size_t bn;
+    const BDIGIT *bds;
+    size_t len;
+
+    /*
+     * 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.
+     */
+
+    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;
     }
-    if (trim) {while (s[j] == '0') j++;}
-    i = RSTRING(ss)->len - j;
-    if (RBIGNUM(x)->sign) {
-	memmove(s, s+j, i);
-	RSTRING(ss)->len = i-1;
+
+    if (power_level == 0) {
+	big2str_2bdigits(b2s, xds, xn, taillen);
+        return;
+    }
+
+    lower_power_level = power_level-1;
+    b = power_cache_get_power(b2s->base, lower_power_level, &lower_numdigits);
+    bn = RBIGNUM_LEN(b);
+    bds = BDIGITS(b);
+
+    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 = RBIGNUM_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 {
-	memmove(s+1, s+j, i);
-	RSTRING(ss)->len = i;
+        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);
     }
-    s[RSTRING(ss)->len] = '\0';
-    TRAP_END;
+}
 
-    return ss;
+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 (RBIGNUM_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++ = RBIGNUM_POSITIVE_P(x) ? '+' : '-';
+    }
+    else {
+        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;
+}
+
+VALUE
+rb_big2str_poweroftwo(VALUE x, int base)
+{
+    return big2str_base_poweroftwo(x, base);
+}
+
+static VALUE
+big2str_generic(VALUE x, int base)
+{
+    BDIGIT *xds;
+    size_t xn;
+    struct big2str_struct b2s_data;
+    int power_level;
+    VALUE power;
+
+    xds = BDIGITS(x);
+    xn = RBIGNUM_LEN(x);
+    BARY_TRUNC(xds, xn);
+
+    if (xn == 0) {
+	return rb_usascii_str_new2("0");
+    }
+
+    if (base < 2 || 36 < base)
+	rb_raise(rb_eArgError, "invalid radix %d", base);
+
+    if (xn >= LONG_MAX/BITSPERDIG) {
+        rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
+    }
+
+    power_level = 0;
+    power = power_cache_get_power(base, power_level, NULL);
+    while (power_level < MAX_BASE36_POWER_TABLE_ENTRIES &&
+           (size_t)RBIGNUM_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 ((size_t)RBIGNUM_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++;
+    }
+
+    b2s_data.negative = RBIGNUM_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 + RBIGNUM_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);
+
+    *b2s_data.ptr = '\0';
+    rb_str_resize(b2s_data.result, (long)(b2s_data.ptr - RSTRING_PTR(b2s_data.result)));
+
+    RB_GC_GUARD(x);
+    return b2s_data.result;
+}
+
+VALUE
+rb_big2str_generic(VALUE x, int base)
+{
+    return big2str_generic(x, base);
+}
+
+#ifdef USE_GMP
+VALUE
+big2str_gmp(VALUE x, int base)
+{
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGITS)*CHAR_BIT;
+    mpz_t mx;
+    size_t size;
+    VALUE str;
+    BDIGIT *xds = BDIGITS(x);
+    size_t xn = RBIGNUM_LEN(x);
+
+    mpz_init(mx);
+    mpz_import(mx, xn, -1, sizeof(BDIGIT), 0, nails, xds);
+
+    size = mpz_sizeinbase(mx, base);
+
+    if (RBIGNUM_NEGATIVE_P(x)) {
+        mpz_neg(mx, mx);
+        str = rb_usascii_str_new(0, size+1);
+    }
+    else {
+        str = rb_usascii_str_new(0, size);
+    }
+    mpz_get_str(RSTRING_PTR(str), base, mx);
+    mpz_clear(mx);
+
+    if (RSTRING_PTR(str)[RSTRING_LEN(str)-1] == '\0') {
+        rb_str_set_len(str, RSTRING_LEN(str)-1);
+    }
+
+    RB_GC_GUARD(x);
+    return str;
+}
+
+VALUE
+rb_big2str_gmp(VALUE x, int base)
+{
+    return big2str_gmp(x, base);
+}
+#endif
+
+static VALUE
+rb_big2str1(VALUE x, int base)
+{
+    BDIGIT *xds;
+    size_t xn;
+
+    if (FIXNUM_P(x)) {
+	return rb_fix2str(x, base);
+    }
+
+    bigtrunc(x);
+    xds = BDIGITS(x);
+    xn = RBIGNUM_LEN(x);
+    BARY_TRUNC(xds, xn);
+
+    if (xn == 0) {
+	return rb_usascii_str_new2("0");
+    }
+
+    if (base < 2 || 36 < base)
+	rb_raise(rb_eArgError, "invalid radix %d", 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);
+    }
+
+#ifdef USE_GMP
+    if (GMP_BIG2STR_DIGITS < xn) {
+        return big2str_gmp(x, base);
+    }
+#endif
+
+    return big2str_generic(x, base);
+}
+
+/* deprecated */
+VALUE
+rb_big2str0(VALUE x, int base, int trim)
+{
+    VALUE str;
+    long oldlen;
+    long n2;
+
+    str = rb_big2str1(x, base);
+
+    if (trim || FIXNUM_P(x) || BIGZEROP(x))
+        return str;
+
+    oldlen = RSTRING_LEN(str);
+    if (oldlen && RSTRING_PTR(str)[0] != '-') {
+        rb_str_resize(str, oldlen+1);
+        MEMMOVE(RSTRING_PTR(str)+1, RSTRING_PTR(str), char, oldlen);
+        RSTRING_PTR(str)[0] = '+';
+    }
+
+    n2 = big2str_find_n1(x, base);
+
+    oldlen = RSTRING_LEN(str);
+    if (oldlen-1 < n2) {
+        long off = n2 - (oldlen-1);
+        rb_str_resize(str, n2+1);
+        MEMMOVE(RSTRING_PTR(str)+1+off, RSTRING_PTR(str)+1, char, oldlen-1);
+        memset(RSTRING_PTR(str)+1, '0', off);
+    }
+
+    RSTRING_PTR(str)[RSTRING_LEN(str)] = '\0';
+
+    return str;
 }
 
 VALUE
 rb_big2str(VALUE x, int base)
 {
-    return rb_big2str0(x, base, Qtrue);
+    return rb_big2str1(x, base);
 }
 
 /*
  *  call-seq:
- *     big.to_s(base=10)   =>  string
+ *     big.to_s(base=10)   ->  string
  *
  *  Returns a string containing the representation of <i>big</i> radix
  *  <i>base</i> (2 through 36).
@@ -884,130 +5034,154 @@ rb_big2str(VALUE x, int base)
  */
 
 static VALUE
-rb_big_to_s(argc, argv, x)
-    int argc;
-    VALUE *argv;
-    VALUE x;
+rb_big_to_s(int argc, VALUE *argv, VALUE x)
 {
-    VALUE b;
     int base;
 
-    rb_scan_args(argc, argv, "01", &b);
     if (argc == 0) base = 10;
-    else base = NUM2INT(b);
+    else {
+	VALUE b;
+
+	rb_scan_args(argc, argv, "01", &b);
+	base = NUM2INT(b);
+    }
     return rb_big2str(x, base);
 }
 
 static unsigned long
-big2ulong(x, type)
-    VALUE x;
-    char *type;
+big2ulong(VALUE x, const char *type)
 {
-    long len = RBIGNUM(x)->len;
-    BDIGIT_DBL num;
+    long len = RBIGNUM_LEN(x);
+    unsigned long num;
     BDIGIT *ds;
 
-    if (len > SIZEOF_LONG/SIZEOF_BDIGITS)
-	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
+    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_BDIGITS
+    num = (unsigned long)ds[0];
+#else
     num = 0;
     while (len--) {
-	num = BIGUP(num);
-	num += ds[len];
+	num <<= BITSPERDIG;
+	num += (unsigned long)ds[len]; /* overflow is already checked */
     }
+#endif
     return num;
 }
 
-unsigned long
-rb_big2ulong_pack(x)
-    VALUE x;
+/* deprecated */
+VALUE
+rb_big2ulong_pack(VALUE x)
 {
-    unsigned long num = big2ulong(x, "unsigned long");
-    if (!RBIGNUM(x)->sign) {
-	return -num;
-    }
+    unsigned long num;
+    rb_integer_pack(x, &num, 1, sizeof(num), 0,
+        INTEGER_PACK_NATIVE_BYTE_ORDER|INTEGER_PACK_2COMP);
     return num;
 }
 
-unsigned long
-rb_big2ulong(x)
-    VALUE x;
+VALUE
+rb_big2ulong(VALUE x)
 {
     unsigned long num = big2ulong(x, "unsigned long");
 
-    if (!RBIGNUM(x)->sign) {
-	if ((long)num < 0) {
-	    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
-	}
-	return -num;
+    if (RBIGNUM_POSITIVE_P(x)) {
+        return num;
     }
-    return num;
+    else {
+        if (num <= LONG_MAX)
+            return -(long)num;
+        if (num == 1+(unsigned long)(-(LONG_MIN+1)))
+            return LONG_MIN;
+    }
+    rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
 }
 
-long
-rb_big2long(x)
-    VALUE x;
+SIGNED_VALUE
+rb_big2long(VALUE x)
 {
     unsigned long num = big2ulong(x, "long");
 
-    if ((long)num < 0 && (RBIGNUM(x)->sign || (long)num != LONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
+    if (RBIGNUM_POSITIVE_P(x)) {
+        if (num <= LONG_MAX)
+            return num;
     }
-    if (!RBIGNUM(x)->sign) return -(long)num;
-    return num;
+    else {
+        if (num <= LONG_MAX)
+            return -(long)num;
+        if (num == 1+(unsigned long)(-(LONG_MIN+1)))
+            return LONG_MIN;
+    }
+    rb_raise(rb_eRangeError, "bignum too big to convert into `long'");
 }
 
 #if HAVE_LONG_LONG
 
 static unsigned LONG_LONG
-big2ull(x, type)
-    VALUE x;
-    char *type;
+big2ull(VALUE x, const char *type)
 {
-    long len = RBIGNUM(x)->len;
-    BDIGIT_DBL num;
-    BDIGIT *ds;
+    long len = RBIGNUM_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_BDIGITS
+    num = (unsigned LONG_LONG)ds[0];
+#else
     num = 0;
     while (len--) {
 	num = BIGUP(num);
 	num += ds[len];
     }
+#endif
     return num;
 }
 
 unsigned LONG_LONG
-rb_big2ull(x)
-    VALUE x;
+rb_big2ull(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "unsigned long long");
 
-    if (!RBIGNUM(x)->sign) return -num;
-    return num;
+    if (RBIGNUM_POSITIVE_P(x)) {
+        return num;
+    }
+    else {
+        if (num <= LLONG_MAX)
+            return -(LONG_LONG)num;
+        if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return LLONG_MIN;
+    }
+    rb_raise(rb_eRangeError, "bignum out of range of unsigned long long");
 }
 
 LONG_LONG
-rb_big2ll(x)
-    VALUE x;
+rb_big2ll(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "long long");
 
-    if ((LONG_LONG)num < 0 && (RBIGNUM(x)->sign
-			       || (LONG_LONG)num != LLONG_MIN)) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
+    if (RBIGNUM_POSITIVE_P(x)) {
+        if (num <= LLONG_MAX)
+            return num;
     }
-    if (!RBIGNUM(x)->sign) return -(LONG_LONG)num;
-    return num;
+    else {
+        if (num <= LLONG_MAX)
+            return -(LONG_LONG)num;
+        if (num == 1+(unsigned LONG_LONG)(-(LLONG_MIN+1)))
+            return LLONG_MIN;
+    }
+    rb_raise(rb_eRangeError, "bignum too big to convert into `long long'");
 }
 
 #endif  /* HAVE_LONG_LONG */
 
 static VALUE
-dbl2big(d)
-    double d;
+dbl2big(double d)
 {
     long i = 0;
     BDIGIT c;
@@ -1022,7 +5196,7 @@ dbl2big(d)
 	rb_raise(rb_eFloatDomainError, "NaN");
     }
 
-    while (!POSFIXABLE(u) || 0 != (long)u) {
+    while (1.0 <= u) {
 	u /= (double)(BIGRAD);
 	i++;
     }
@@ -1039,36 +5213,72 @@ dbl2big(d)
 }
 
 VALUE
-rb_dbl2big(d)
-    double d;
+rb_dbl2big(double d)
 {
     return bignorm(dbl2big(d));
 }
 
 static double
-big2dbl(x)
-    VALUE x;
+big2dbl(VALUE x)
 {
     double d = 0.0;
-    long i = RBIGNUM(x)->len;
-    BDIGIT *ds = BDIGITS(x);
+    long i = (bigtrunc(x), RBIGNUM_LEN(x)), lo = 0, bits;
+    BDIGIT *ds = BDIGITS(x), dl;
 
-    while (i--) {
-	d = ds[i] + BIGRAD*d;
+    if (i) {
+	bits = i * BITSPERDIG - nlz(ds[i-1]);
+	if (bits > DBL_MANT_DIG+DBL_MAX_EXP) {
+	    d = HUGE_VAL;
+	}
+	else {
+	    if (bits > DBL_MANT_DIG+1)
+		lo = (bits -= DBL_MANT_DIG+1) / BITSPERDIG;
+	    else
+		bits = 0;
+	    while (--i > lo) {
+		d = ds[i] + BIGRAD*d;
+	    }
+	    dl = ds[i];
+	    if (bits && (dl & ((BDIGIT)1 << (bits %= BITSPERDIG)))) {
+		int carry = (dl & ~(BDIGMAX << bits)) != 0;
+		if (!carry) {
+		    while (i-- > 0) {
+			carry = ds[i] != 0;
+			if (carry) break;
+		    }
+		}
+		if (carry) {
+		    dl &= BDIGMAX << bits;
+		    dl = BIGLO(dl + ((BDIGIT)1 << bits));
+		    if (!dl) d += 1;
+		}
+	    }
+	    d = dl + BIGRAD*d;
+	    if (lo) {
+		if (lo > INT_MAX / BITSPERDIG)
+		    d = HUGE_VAL;
+		else if (lo < INT_MIN / BITSPERDIG)
+		    d = 0.0;
+		else
+		    d = ldexp(d, (int)(lo * BITSPERDIG));
+	    }
+	}
     }
-    if (!RBIGNUM(x)->sign) d = -d;
+    if (!RBIGNUM_SIGN(x)) d = -d;
     return d;
 }
 
 double
-rb_big2dbl(x)
-    VALUE x;
+rb_big2dbl(VALUE x)
 {
     double d = big2dbl(x);
 
     if (isinf(d)) {
-	rb_warn("Bignum out of Float range");
-	d = HUGE_VAL;
+	rb_warning("Bignum out of Float range");
+	if (d < 0.0)
+	    d = -HUGE_VAL;
+	else
+	    d = HUGE_VAL;
     }
     return d;
 }
@@ -1083,68 +5293,233 @@ rb_big2dbl(x)
  */
 
 static VALUE
-rb_big_to_f(x)
-    VALUE x;
+rb_big_to_f(VALUE x)
 {
-    return rb_float_new(rb_big2dbl(x));
+    return DBL2NUM(rb_big2dbl(x));
+}
+
+VALUE
+rb_integer_float_cmp(VALUE x, VALUE y)
+{
+    double yd = RFLOAT_VALUE(y);
+    double yi, yf;
+    VALUE rel;
+
+    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_integer_float_eq(VALUE x, VALUE y)
+{
+    double yd = RFLOAT_VALUE(y);
+    double yi, yf;
+
+    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);
 }
 
 /*
  *  call-seq:
- *     big <=> numeric   => -1, 0, +1
+ *     big <=> numeric   -> -1, 0, +1 or nil
+ *
+ *  Comparison---Returns -1, 0, or +1 depending on whether +big+ is
+ *  less than, equal to, or greater than +numeric+. This is the
+ *  basis for the tests in Comparable.
  *
- *  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>.
+ *  +nil+ is returned if the two values are incomparable.
  *
  */
 
-static VALUE
-rb_big_cmp(x, y)
-    VALUE x, y;
+VALUE
+rb_big_cmp(VALUE x, VALUE y)
 {
-    long xlen = RBIGNUM(x)->len;
+    int cmp;
 
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
 	y = rb_int2big(FIX2LONG(y));
-	break;
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+        return rb_integer_float_cmp(x, y);
+    }
+    else {
+	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
+    }
 
-      case T_BIGNUM:
-	break;
+    if (RBIGNUM_SIGN(x) > RBIGNUM_SIGN(y)) return INT2FIX(1);
+    if (RBIGNUM_SIGN(x) < RBIGNUM_SIGN(y)) return INT2FIX(-1);
 
-      case T_FLOAT:
-	{
-	    double a = RFLOAT_VALUE(y);
+    cmp = bary_cmp(BDIGITS(x), RBIGNUM_LEN(x), BDIGITS(y), RBIGNUM_LEN(y));
+    if (RBIGNUM_SIGN(x))
+        return INT2FIX(cmp);
+    else
+        return INT2FIX(-cmp);
+}
 
-	    if (isinf(a)) {
-		if (a > 0.0) return INT2FIX(-1);
-		else return INT2FIX(1);
-	    }
-	    return rb_dbl_cmp(rb_big2dbl(x), a);
+enum big_op_t {
+    big_op_gt,
+    big_op_ge,
+    big_op_lt,
+    big_op_le
+};
+
+static VALUE
+big_op(VALUE x, VALUE y, enum big_op_t op)
+{
+    VALUE rel;
+    int n;
+
+    if (FIXNUM_P(y) || RB_BIGNUM_TYPE_P(y)) {
+	rel = rb_big_cmp(x, y);
+    }
+    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);
+    }
 
-      default:
-	return rb_num_coerce_cmp(x, y);
+    if (NIL_P(rel)) return Qfalse;
+    n = FIX2INT(rel);
+
+    switch (op) {
+	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)
+{
+    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>.
+ */
 
-    if (RBIGNUM(x)->sign > RBIGNUM(y)->sign) return INT2FIX(1);
-    if (RBIGNUM(x)->sign < RBIGNUM(y)->sign) return INT2FIX(-1);
-    if (xlen < RBIGNUM(y)->len)
-	return (RBIGNUM(x)->sign) ? INT2FIX(-1) : INT2FIX(1);
-    if (xlen > RBIGNUM(y)->len)
-	return (RBIGNUM(x)->sign) ? INT2FIX(1) : INT2FIX(-1);
+static VALUE
+big_ge(VALUE x, VALUE y)
+{
+    return big_op(x, y, big_op_ge);
+}
 
-    while(xlen-- && (BDIGITS(x)[xlen]==BDIGITS(y)[xlen]));
-    if (-1 == xlen) return INT2FIX(0);
-    return (BDIGITS(x)[xlen] > BDIGITS(y)[xlen]) ?
-	(RBIGNUM(x)->sign ? INT2FIX(1) : INT2FIX(-1)) :
-	    (RBIGNUM(x)->sign ? INT2FIX(-1) : INT2FIX(1));
+/*
+ * 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)
+{
+    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)
+{
+    return big_op(x, y, big_op_le);
 }
 
 /*
  *  call-seq:
- *     big == obj  => true or false
+ *     big == obj  -> true or false
  *
  *  Returns <code>true</code> only if <i>obj</i> has the same value
  *  as <i>big</i>. Contrast this with <code>Bignum#eql?</code>, which
@@ -1153,37 +5528,30 @@ rb_big_cmp(x, y)
  *     68719476736 == 68719476736.0   #=> true
  */
 
-static VALUE
-rb_big_eq(x, y)
-    VALUE x, y;
+VALUE
+rb_big_eq(VALUE x, VALUE y)
 {
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    if (FIXNUM_P(y)) {
+	if (bignorm(x) == y) return Qtrue;
 	y = rb_int2big(FIX2LONG(y));
-	break;
-      case T_BIGNUM:
-	break;
-      case T_FLOAT:
-        {
-	    volatile double a, b;
-
-	    a = RFLOAT(y)->value;
-	    if (isnan(a)) return Qfalse;
-	    b = rb_big2dbl(x);
-	    return (a == b)?Qtrue:Qfalse;
-	}
-      default:
+    }
+    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(x)->sign != RBIGNUM(y)->sign) return Qfalse;
-    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
+    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;
     return Qtrue;
 }
 
 /*
  *  call-seq:
- *     big.eql?(obj)   => true or false
+ *     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
@@ -1192,38 +5560,36 @@ rb_big_eq(x, y)
  *     68719476736.eql?(68719476736.0)   #=> false
  */
 
-static VALUE
-rb_big_eql(x, y)
-    VALUE x, y;
+VALUE
+rb_big_eql(VALUE x, VALUE y)
 {
-    if (TYPE(y) != T_BIGNUM) return Qfalse;
-    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign) return Qfalse;
-    if (RBIGNUM(x)->len != RBIGNUM(y)->len) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM(y)->len) != 0) return Qfalse;
+    if (!RB_BIGNUM_TYPE_P(y)) 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;
     return Qtrue;
 }
 
 /*
  * call-seq:
- *    -big   =>  other_big
+ *    -big   ->  integer
  *
- * Unary minus (returns a new Bignum whose value is 0-big)
+ * Unary minus (returns an integer whose value is 0-big)
  */
 
-static VALUE
-rb_big_uminus(x)
-    VALUE x;
+VALUE
+rb_big_uminus(VALUE x)
 {
     VALUE z = rb_big_clone(x);
 
-    RBIGNUM(z)->sign = !RBIGNUM(x)->sign;
+    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
 
     return bignorm(z);
 }
 
 /*
  * call-seq:
- *     ~big  =>  integer
+ *     ~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
@@ -1234,401 +5600,551 @@ rb_big_uminus(x)
  */
 
 static VALUE
-rb_big_neg(x)
-    VALUE x;
+rb_big_neg(VALUE x)
 {
     VALUE z = rb_big_clone(x);
-    long i;
-    BDIGIT *ds;
+    BDIGIT *ds = BDIGITS(z);
+    long n = RBIGNUM_LEN(z);
+
+    if (!n) return INT2FIX(-1);
 
-    if (!RBIGNUM(x)->sign) get2comp(z);
-    ds = BDIGITS(z);
-    i = RBIGNUM(x)->len;
-    if (!i) return INT2FIX(~0);
-    while (i--) ds[i] = ~ds[i];
-    RBIGNUM(z)->sign = !RBIGNUM(z)->sign;
-    if (RBIGNUM(x)->sign) get2comp(z);
+    if (RBIGNUM_POSITIVE_P(z)) {
+        if (bary_add_one(ds, n)) {
+            big_extend_carry(z);
+        }
+        RBIGNUM_SET_NEGATIVE_SIGN(z);
+    }
+    else {
+        bary_neg(ds, n);
+        if (bary_add_one(ds, n))
+            return INT2FIX(-1);
+        bary_neg(ds, n);
+        RBIGNUM_SET_POSITIVE_SIGN(z);
+    }
 
     return bignorm(z);
 }
 
 static VALUE
-bigsub(x, y)
-    VALUE x, y;
+bigsub(VALUE x, VALUE y)
 {
-    VALUE z = 0;
-    BDIGIT *zds;
+    VALUE z;
+    BDIGIT *xds, *yds, *zds;
+    long xn, yn, zn;
+
+    xn = RBIGNUM_LEN(x);
+    yn = RBIGNUM_LEN(y);
+    zn = xn < yn ? yn : xn;
+
+    z = bignew(zn, 1);
+
+    xds = BDIGITS(x);
+    yds = BDIGITS(y);
+    zds = BDIGITS(z);
+
+    if (bary_sub(zds, zn, xds, xn, yds, yn)) {
+        bary_2comp(zds, zn);
+        RBIGNUM_SET_NEGATIVE_SIGN(z);
+    }
+
+    return z;
+}
+
+static VALUE bigadd_int(VALUE x, long y);
+
+static VALUE
+bigsub_int(VALUE x, long y0)
+{
+    VALUE z;
+    BDIGIT *xds, *zds;
+    long xn, zn;
     BDIGIT_DBL_SIGNED num;
-    long i = RBIGNUM(x)->len;
+    long i, y;
+
+    y = y0;
+    xds = BDIGITS(x);
+    xn = RBIGNUM_LEN(x);
+
+    if (xn == 0)
+        return LONG2NUM(-y0);
+
+    zn = xn;
+#if SIZEOF_BDIGITS < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    z = bignew(zn, RBIGNUM_SIGN(x));
+    zds = BDIGITS(z);
 
-    /* if x is larger than y, swap */
-    if (RBIGNUM(x)->len < RBIGNUM(y)->len) {
-	z = x; x = y; y = z;	/* swap x y */
+#if SIZEOF_BDIGITS >= SIZEOF_LONG
+    assert(xn == zn);
+    num = (BDIGIT_DBL_SIGNED)xds[0] - y;
+    if (xn == 1 && num < 0) {
+	RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+	zds[0] = (BDIGIT)-num;
+	RB_GC_GUARD(x);
+	return bignorm(z);
+    }
+    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 < 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);
     }
-    else if (RBIGNUM(x)->len == RBIGNUM(y)->len) {
-	while (i > 0) {
-	    i--;
-	    if (BDIGITS(x)[i] > BDIGITS(y)[i]) {
-		break;
-	    }
-	    if (BDIGITS(x)[i] < BDIGITS(y)[i]) {
-		z = x; x = y; y = z;	/* swap x y */
-		break;
-	    }
-	}
+    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
+
+    for (; i < xn; i++) {
+      y_is_zero_x:
+        if (num == 0) goto num_is_zero_x;
+	num += xds[i];
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
+    }
+#if SIZEOF_BDIGITS < 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];
+    }
+#if SIZEOF_BDIGITS < 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) {
+        get2comp(z);
+	RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+    }
+    RB_GC_GUARD(x);
+    return bignorm(z);
+}
+
+static VALUE
+bigadd_int(VALUE x, long y)
+{
+    VALUE z;
+    BDIGIT *xds, *zds;
+    long xn, zn;
+    BDIGIT_DBL num;
+    long i;
+
+    xds = BDIGITS(x);
+    xn = RBIGNUM_LEN(x);
 
-    z = bignew(RBIGNUM(x)->len, z==0);
+    if (xn == 0)
+        return LONG2NUM(y);
+
+    zn = xn;
+#if SIZEOF_BDIGITS < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    zn++;
+
+    z = bignew(zn, RBIGNUM_SIGN(x));
     zds = BDIGITS(z);
 
-    for (i = 0, num = 0; i < RBIGNUM(y)->len; i++) {
-	num += (BDIGIT_DBL_SIGNED)BDIGITS(x)[i] - BDIGITS(y)[i];
+#if SIZEOF_BDIGITS >= 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 < 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);
     }
-    while (num && i < RBIGNUM(x)->len) {
-	num += BDIGITS(x)[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);
     }
-    while (i < RBIGNUM(x)->len) {
-	zds[i] = BDIGITS(x)[i];
-	i++;
+    goto finish;
+
+#endif
+
+    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);
+    }
+    for (; i < zn; i++) {
+      y_is_zero_z:
+        if (num == 0) goto num_is_zero_z;
+	zds[i] = BIGLO(num);
+	num = BIGDN(num);
     }
+    goto finish;
 
-    return z;
+    for (;i < xn; i++) {
+      num_is_zero_x:
+	zds[i] = xds[i];
+    }
+    for (; i < zn; i++) {
+      num_is_zero_z:
+	zds[i] = 0;
+    }
+    goto finish;
+
+  finish:
+    RB_GC_GUARD(x);
+    return bignorm(z);
 }
 
 static VALUE
-bigadd(x, y, sign)
-    VALUE x, y;
-    int sign;
+bigadd(VALUE x, VALUE y, int sign)
 {
     VALUE z;
-    BDIGIT_DBL num;
-    long i, len;
+    long len;
 
-    sign = (sign == RBIGNUM(y)->sign);
-    if (RBIGNUM(x)->sign != sign) {
+    sign = (sign == RBIGNUM_SIGN(y));
+    if (RBIGNUM_SIGN(x) != sign) {
 	if (sign) return bigsub(y, x);
 	return bigsub(x, y);
     }
 
-    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
-	len = RBIGNUM(x)->len + 1;
-        z = x; x = y; y = z;
+    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
+	len = RBIGNUM_LEN(x) + 1;
     }
     else {
-	len = RBIGNUM(y)->len + 1;
+	len = RBIGNUM_LEN(y) + 1;
     }
     z = bignew(len, sign);
 
-    len = RBIGNUM(x)->len;
-    for (i = 0, num = 0; i < len; i++) {
-	num += (BDIGIT_DBL)BDIGITS(x)[i] + BDIGITS(y)[i];
-	BDIGITS(z)[i] = BIGLO(num);
-	num = BIGDN(num);
-    }
-    len = RBIGNUM(y)->len;
-    while (num && i < len) {
-	num += BDIGITS(y)[i];
-	BDIGITS(z)[i++] = BIGLO(num);
-	num = BIGDN(num);
-    }
-    while (i < len) {
-	BDIGITS(z)[i] = BDIGITS(y)[i];
-	i++;
-    }
-    BDIGITS(z)[i] = (BDIGIT)num;
+    bary_add(BDIGITS(z), RBIGNUM_LEN(z),
+             BDIGITS(x), RBIGNUM_LEN(x),
+             BDIGITS(y), RBIGNUM_LEN(y));
 
     return z;
 }
 
 /*
  *  call-seq:
- *     big + other  => Numeric
+ *     big + other  -> Numeric
  *
  *  Adds big and other, returning the result.
  */
 
 VALUE
-rb_big_plus(x, y)
-    VALUE x, y;
+rb_big_plus(VALUE x, VALUE y)
 {
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	/* fall through */
-      case T_BIGNUM:
-	return bignorm(bigadd(x, y, 1));
-
-      case T_FLOAT:
-	return rb_float_new(rb_big2dbl(x) + RFLOAT(y)->value);
+    long n;
 
-      default:
-	return rb_num_coerce_bin(x, y);
+    if (FIXNUM_P(y)) {
+	n = FIX2LONG(y);
+	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	    if (n < 0) {
+		n = -n;
+	    }
+	    return bigsub_int(x, n);
+	}
+	if (n < 0) {
+	    n = -n;
+	}
+	return bigadd_int(x, n);
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+	return bignorm(bigadd(x, y, 1));
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+	return DBL2NUM(rb_big2dbl(x) + RFLOAT_VALUE(y));
+    }
+    else {
+	return rb_num_coerce_bin(x, y, '+');
     }
 }
 
 /*
  *  call-seq:
- *     big - other  => Numeric
+ *     big - other  -> Numeric
  *
  *  Subtracts other from big, returning the result.
  */
 
 VALUE
-rb_big_minus(x, y)
-    VALUE x, y;
+rb_big_minus(VALUE x, VALUE y)
 {
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	/* fall through */
-      case T_BIGNUM:
-	return bignorm(bigadd(x, y, 0));
-
-      case T_FLOAT:
-	return rb_float_new(rb_big2dbl(x) - RFLOAT(y)->value);
+    long n;
 
-      default:
-	return rb_num_coerce_bin(x, y);
+    if (FIXNUM_P(y)) {
+	n = FIX2LONG(y);
+	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	    if (n < 0) {
+		n = -n;
+	    }
+	    return bigadd_int(x, n);
+	}
+	if (n < 0) {
+	    n = -n;
+	}
+	return bigsub_int(x, n);
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+	return bignorm(bigadd(x, y, 0));
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+	return DBL2NUM(rb_big2dbl(x) - RFLOAT_VALUE(y));
+    }
+    else {
+	return rb_num_coerce_bin(x, y, '-');
     }
 }
 
-VALUE
-rb_big_mul0(x, y)
-    VALUE x, y;
+static VALUE
+bigsq(VALUE x)
 {
-    long i, j;
-    BDIGIT_DBL n = 0;
+    long xn, zn;
     VALUE z;
-    BDIGIT *zds;
+    BDIGIT *xds, *zds;
 
-    if (FIXNUM_P(x)) x = rb_int2big(FIX2LONG(x));
-    switch (TYPE(y)) {
-      case T_FIXNUM:
-	y = rb_int2big(FIX2LONG(y));
-	break;
+    xn = RBIGNUM_LEN(x);
+    zn = 2 * xn;
 
-      case T_BIGNUM:
-	break;
+    z = bignew(zn, 1);
 
-      case T_FLOAT:
-	return rb_float_new(rb_big2dbl(x) * RFLOAT(y)->value);
+    xds = BDIGITS(x);
+    zds = BDIGITS(z);
 
-      default:
-	return rb_num_coerce_bin(x, y);
-    }
+#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
 
-    j = RBIGNUM(x)->len + RBIGNUM(y)->len + 1;
-    z = bignew(j, RBIGNUM(x)->sign==RBIGNUM(y)->sign);
+    RB_GC_GUARD(x);
+    return z;
+}
+
+static VALUE
+bigmul0(VALUE x, VALUE y)
+{
+    long xn, yn, zn;
+    VALUE z;
+    BDIGIT *xds, *yds, *zds;
+
+    if (x == y)
+        return bigsq(x);
+
+    xn = RBIGNUM_LEN(x);
+    yn = RBIGNUM_LEN(y);
+    zn = xn + yn;
+
+    z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+
+    xds = BDIGITS(x);
+    yds = BDIGITS(y);
     zds = BDIGITS(z);
-    while (j--) zds[j] = 0;
-    for (i = 0; i < RBIGNUM(x)->len; i++) {
-	BDIGIT_DBL dd = BDIGITS(x)[i];
-	if (dd == 0) continue;
-	n = 0;
-	for (j = 0; j < RBIGNUM(y)->len; j++) {
-	    BDIGIT_DBL ee = n + (BDIGIT_DBL)dd * BDIGITS(y)[j];
-	    n = zds[i + j] + ee;
-	    if (ee) zds[i + j] = BIGLO(n);
-	    n = BIGDN(n);
-	}
-	if (n) {
-	    zds[i + j] = n;
-	}
-    }
 
+    bary_mul(zds, zn, xds, xn, yds, yn);
+
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
     return z;
 }
 
 /*
  *  call-seq:
- *     big * other  => Numeric
+ *     big * other  -> Numeric
  *
  *  Multiplies big and other, returning the result.
  */
 
 VALUE
-rb_big_mul(x, y)
-    VALUE x, y;
+rb_big_mul(VALUE x, VALUE y)
 {
-    return bignorm(rb_big_mul0(x, y));
+    if (FIXNUM_P(y)) {
+	y = rb_int2big(FIX2LONG(y));
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+	return DBL2NUM(rb_big2dbl(x) * RFLOAT_VALUE(y));
+    }
+    else {
+	return rb_num_coerce_bin(x, y, '*');
+    }
+
+    return bignorm(bigmul0(x, y));
 }
 
-static void
-bigdivrem(x, y, divp, modp)
-    VALUE x, y;
-    VALUE *divp, *modp;
-{
-    long nx = RBIGNUM(x)->len, ny = RBIGNUM(y)->len;
-    long i, j;
-    VALUE yy, z;
-    BDIGIT *xds, *yds, *zds, *tds;
-    BDIGIT_DBL t2;
-    BDIGIT_DBL_SIGNED num;
-    BDIGIT dd, q;
+static VALUE
+bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
+{
+    long xn = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y);
+    VALUE z;
+    BDIGIT *xds, *yds, *zds;
+    BDIGIT dd;
+
+    VALUE q = Qnil, r = Qnil;
+    BDIGIT *qds, *rds;
+    long qn, rn;
 
-    if (BIGZEROP(y)) rb_num_zerodiv();
     yds = BDIGITS(y);
-    if (nx < ny || (nx == ny && BDIGITS(x)[nx - 1] < BDIGITS(y)[ny - 1])) {
+    BARY_TRUNC(yds, yn);
+    if (yn == 0)
+        rb_num_zerodiv();
+
+    xds = BDIGITS(x);
+    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;
+	return Qnil;
     }
-    xds = BDIGITS(x);
-    if (ny == 1) {
+    if (yn == 1) {
 	dd = yds[0];
-	z = rb_big_clone(x);
+	z = bignew(xn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
 	zds = BDIGITS(z);
-	t2 = 0; i = nx;
-	while (i--) {
-	    t2 = BIGUP(t2) + zds[i];
-	    zds[i] = (BDIGIT)(t2 / dd);
-	    t2 %= dd;
-	}
-	RBIGNUM(z)->sign = RBIGNUM(x)->sign==RBIGNUM(y)->sign;
+        dd = bigdivrem_single(zds, xds, xn, dd);
 	if (modp) {
-	    *modp = rb_uint2big((unsigned long)t2);
-	    RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
+	    *modp = rb_uint2big((VALUE)dd);
+	    RBIGNUM_SET_SIGN(*modp, RBIGNUM_SIGN(x));
 	}
 	if (divp) *divp = z;
-	return;
+	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)), RBIGNUM_SIGN(x)==RBIGNUM_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)), RBIGNUM_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(x)->sign==RBIGNUM(y)->sign);
-    zds = BDIGITS(z);
-    if (nx==ny) zds[nx+1] = 0;
-    while (!yds[ny-1]) ny--;
 
-    dd = 0;
-    q = yds[ny-1];
-    while ((q & (1U<<(BITSPERDIG-1))) == 0) {
-	q <<= 1;
-	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;
-	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, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+        qds = BDIGITS(q);
     }
     else {
-	zds[nx] = 0;
-	j = nx;
-	while (j--) zds[j] = xds[j];
+        qn = 0;
+        qds = NULL;
     }
 
-    j = nx==ny?nx+1:nx;
-    do {
-	if (zds[j] ==  yds[ny-1]) q = BIGRAD-1;
-	else q = (BDIGIT)((BIGUP(zds[j]) + zds[j-1])/yds[ny-1]);
-	if (q) {
-	    i = 0; num = 0; t2 = 0;
-	    do {			/* multiply and subtract */
-		BDIGIT_DBL ee;
-		t2 += (BDIGIT_DBL)yds[i] * q;
-		ee = num - BIGLO(t2);
-		num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		if (ee) zds[j - ny + i] = BIGLO(num);
-		num = BIGDN(num);
-		t2 = BIGDN(t2);
-	    } while (++i < ny);
-	    num += zds[j - ny + i] - t2;/* borrow from high digit; don't update */
-	    while (num) {		/* "add back" required */
-		i = 0; num = 0; q--;
-		do {
-		    BDIGIT_DBL ee = num + yds[i];
-		    num = (BDIGIT_DBL)zds[j - ny + i] + ee;
-		    if (ee) zds[j - ny + i] = BIGLO(num);
-		    num = BIGDN(num);
-		} while (++i < ny);
-		num--;
-	    }
-	}
-	zds[j] = q;
-    } while (--j >= ny);
-    if (divp) {			/* move quotient down in z */
-	*divp = rb_big_clone(z);
-	zds = BDIGITS(*divp);
-	j = (nx==ny ? nx+2 : nx+1) - ny;
-	for (i = 0;i < j;i++) zds[i] = zds[i+ny];
-	RBIGNUM(*divp)->len = i;
-    }
-    if (modp) {			/* normalize remainder */
-	*modp = rb_big_clone(z);
-	zds = BDIGITS(*modp);
-	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);
-	    }
-	}
-	RBIGNUM(*modp)->len = ny;
-	RBIGNUM(*modp)->sign = RBIGNUM(x)->sign;
+    if (modp) {
+        rn = yn;
+        r = bignew(rn, RBIGNUM_SIGN(x));
+        rds = BDIGITS(r);
+    }
+    else {
+        rn = 0;
+        rds = NULL;
+    }
+
+    bary_divmod_branch(qds, qn, rds, rn, xds, xn, yds, yn);
+
+    if (divp) {
+        bigtrunc(q);
+        *divp = q;
     }
+    if (modp) {
+        bigtrunc(r);
+        *modp = r;
+    }
+
+    return Qnil;
 }
 
 static void
-bigdivmod(x, y, divp, modp)
-    VALUE x, y;
-    VALUE *divp, *modp;
+bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
 {
     VALUE mod;
 
     bigdivrem(x, y, divp, &mod);
-    if (RBIGNUM(x)->sign != RBIGNUM(y)->sign && !BIGZEROP(mod)) {
+    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y) && !BIGZEROP(mod)) {
 	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
 	if (modp) *modp = bigadd(mod, y, 1);
     }
-    else {
-	if (divp) *divp = *divp;
-	if (modp) *modp = mod;
+    else if (modp) {
+	*modp = mod;
     }
 }
 
-/*
- *  call-seq:
- *     big / other     => Numeric
- *     big.div(other)  => Numeric
- *
- *  Divides big by other, returning the result.
- */
 
 static VALUE
-rb_big_div(x, y)
-    VALUE x, y;
+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;
-
-      default:
-	return rb_num_coerce_bin(x, y);
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+    }
+    else if (RB_FLOAT_TYPE_P(y)) {
+	if (op == '/') {
+	    return DBL2NUM(rb_big2dbl(x) / RFLOAT_VALUE(y));
+	}
+	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);
 
@@ -1637,29 +6153,51 @@ rb_big_div(x, y)
 
 /*
  *  call-seq:
- *     big % other         => Numeric
- *     big.modulo(other)   => Numeric
+ *     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.
  */
 
-static VALUE
-rb_big_modulo(x, y)
-    VALUE x, y;
+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:
-	return rb_num_coerce_bin(x, y);
+    }
+    else if (!RB_BIGNUM_TYPE_P(y)) {
+	return rb_num_coerce_bin(x, y, '%');
     }
     bigdivmod(x, y, 0, &z);
 
@@ -1668,7 +6206,7 @@ rb_big_modulo(x, y)
 
 /*
  *  call-seq:
- *     big.remainder(numeric)    => number
+ *     big.remainder(numeric)    -> number
  *
  *  Returns the remainder after dividing <i>big</i> by <i>numeric</i>.
  *
@@ -1676,207 +6214,144 @@ rb_big_modulo(x, y)
  *     -1234567890987654321.remainder(13731.24)   #=> -9906.22531493148
  */
 static VALUE
-rb_big_remainder(x, y)
-    VALUE x, y;
+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:
-	return rb_num_coerce_bin(x, y);
+    }
+    else if (!RB_BIGNUM_TYPE_P(y)) {
+	return rb_num_coerce_bin(x, y, rb_intern("remainder"));
     }
     bigdivrem(x, y, 0, &z);
 
     return bignorm(z);
 }
 
-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(x, n)
-    VALUE x;
-    int n;
-{
-    if (n < 0)
-	return big_lshift(x, (unsigned int)n);
-    else if (n > 0)
-	return big_rshift(x, (unsigned int)n);
-    return x;
-}
-
 /*
  *  call-seq:
- *     big.divmod(numeric)   => array
+ *     big.divmod(numeric)   -> array
  *
  *  See <code>Numeric#divmod</code>.
  *
  */
 VALUE
-rb_big_divmod(x, y)
-    VALUE x, y;
+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:
-	return rb_num_coerce_bin(x, y);
+    }
+    else if (!RB_BIGNUM_TYPE_P(y)) {
+	return rb_num_coerce_bin(x, y, rb_intern("divmod"));
     }
     bigdivmod(x, y, &div, &mod);
 
     return rb_assoc_new(bignorm(div), bignorm(mod));
 }
 
+static VALUE
+big_shift(VALUE x, long n)
+{
+    if (n < 0)
+	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, long ey)
+{
+#define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
+    VALUE z;
+    long l, ex;
+
+    bigtrunc(x);
+    l = RBIGNUM_LEN(x);
+    ex = l * BITSPERDIG - nlz(BDIGITS(x)[l-1]);
+    ex -= 2 * DBL_BIGDIG * BITSPERDIG;
+    if (ex) x = big_shift(x, ex);
+
+    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));
+}
+
+static VALUE
+big_fdiv_int(VALUE x, VALUE y)
+{
+    long l, ey;
+    bigtrunc(y);
+    l = RBIGNUM_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);
+}
+
 /*
  *  call-seq:
- *     big.quo(numeric) -> float
- *     big.fdiv(numeric) -> float
+  *     big.fdiv(numeric) -> float
  *
  *  Returns the floating point result of dividing <i>big</i> by
  *  <i>numeric</i>.
  *
- *     -1234567890987654321.quo(13731)      #=> -89910996357705.5
- *     -1234567890987654321.quo(13731.24)   #=> -89909424858035.7
+ *     -1234567890987654321.fdiv(13731)      #=> -89910996357705.5
+ *     -1234567890987654321.fdiv(13731.24)   #=> -89909424858035.7
  *
  */
 
-static VALUE
-rb_big_quo(x, y)
-    VALUE x, y;
+
+VALUE
+rb_big_fdiv(VALUE x, VALUE y)
 {
-    double dx = big2dbl(x);
-    double dy;
+    double dx, dy;
 
-    if (isinf(dx)) {
-#define DBL_BIGDIG ((DBL_MANT_DIG + BITSPERDIG) / BITSPERDIG)
-	VALUE z;
-	int ex, ey;
-
-	ex = (RBIGNUM(bigtrunc(x))->len - 1) * BITSPERDIG;
-	ex += bdigbitsize(BDIGITS(x)[RBIGNUM(x)->len - 1]);
-	ex -= 2 * DBL_BIGDIG * BITSPERDIG;
-	if (ex) x = big_shift(x, ex);
-
-	switch (TYPE(y)) {
-	  case T_FIXNUM:
-	    y = rb_int2big(FIX2LONG(y));
-	  case T_BIGNUM: {
-	    ey = (RBIGNUM(bigtrunc(y))->len - 1) * BITSPERDIG;
-	    ey += bdigbitsize(BDIGITS(y)[RBIGNUM(y)->len - 1]);
-	    ey -= DBL_BIGDIG * BITSPERDIG;
-	    if (ey) y = big_shift(y, ey);
-	  bignum:
-	    bigdivrem(x, y, &z, 0);
-	    return rb_float_new(ldexp(big2dbl(z), ex - ey));
-	  }
-	  case T_FLOAT:
-	    y = dbl2big(ldexp(frexp(RFLOAT(y)->value, &ey), DBL_MANT_DIG));
-	    ey -= DBL_MANT_DIG;
-	    goto bignum;
-	}
-    }
-    switch (TYPE(y)) {
-      case T_FIXNUM:
+    dx = big2dbl(x);
+    if (FIXNUM_P(y)) {
 	dy = (double)FIX2LONG(y);
-	break;
-
-      case T_BIGNUM:
+	if (isinf(dx))
+	    return big_fdiv_int(x, rb_int2big(FIX2LONG(y)));
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
 	dy = rb_big2dbl(y);
-	break;
-
-      case T_FLOAT:
-	dy = RFLOAT(y)->value;
-	break;
-
-      default:
-	return rb_num_coerce_bin(x, y);
+	if (isinf(dx) || isinf(dy))
+	    return big_fdiv_int(x, y);
     }
-    return rb_float_new(dx / dy);
-}
-
-static VALUE
-bigsqr(x)
-    VALUE x;
-{
-    long len = RBIGNUM(x)->len, k = len / 2, i;
-    VALUE a, b, a2, z;
-    BDIGIT_DBL num;
-
-    if (len < 4000 / BITSPERDIG) {
-	return rb_big_mul0(x, x);
-    }
-
-    a = bignew(len - k, 1);
-    MEMCPY(BDIGITS(a), BDIGITS(x) + k, BDIGIT, len - k);
-    b = bignew(k, 1);
-    MEMCPY(BDIGITS(b), BDIGITS(x), BDIGIT, k);
-
-    a2 = bigtrunc(bigsqr(a));
-    z = bigsqr(b);
-    REALLOC_N(RBIGNUM(z)->digits, BDIGIT, (len = 2 * k + RBIGNUM(a2)->len) + 1);
-    while (RBIGNUM(z)->len < 2 * k) BDIGITS(z)[RBIGNUM(z)->len++] = 0;
-    MEMCPY(BDIGITS(z) + 2 * k, BDIGITS(a2), BDIGIT, RBIGNUM(a2)->len);
-    RBIGNUM(z)->len = len;
-    a2 = bigtrunc(rb_big_mul0(a, b));
-    len = RBIGNUM(a2)->len;
-    TRAP_BEG;
-    for (i = 0, num = 0; i < len; i++) {
-	num += (BDIGIT_DBL)BDIGITS(z)[i + k] + ((BDIGIT_DBL)BDIGITS(a2)[i] << 1);
-	BDIGITS(z)[i + k] = BIGLO(num);
-	num = BIGDN(num);
+    else if (RB_FLOAT_TYPE_P(y)) {
+	dy = RFLOAT_VALUE(y);
+	if (isnan(dy))
+	    return y;
+	if (isinf(dx))
+	    return big_fdiv_float(x, y);
     }
-    TRAP_END;
-    if (num) {
-	len = RBIGNUM(z)->len;
-	for (i += k; i < len && num; ++i) {
-	    num += (BDIGIT_DBL)BDIGITS(z)[i];
-	    BDIGITS(z)[i] = BIGLO(num);
-	    num = BIGDN(num);
-	}
-	if (num) {
-	    BDIGITS(z)[RBIGNUM(z)->len++] = BIGLO(num);
-	}
+    else {
+	return rb_num_coerce_bin(x, y, rb_intern("fdiv"));
     }
-    return bigtrunc(z);
+    return DBL2NUM(dx / dy);
 }
 
 /*
  *  call-seq:
- *     big ** exponent   #=> numeric
+ *     big ** exponent   -> numeric
  *
  *  Raises _big_ to the _exponent_ power (which may be an integer, float,
  *  or anything that will coerce to a number). The result may be
@@ -1888,387 +6363,468 @@ bigsqr(x)
  */
 
 VALUE
-rb_big_pow(x, y)
-    VALUE x, y;
+rb_big_pow(VALUE x, VALUE y)
 {
     double d;
-    long yy;
+    SIGNED_VALUE yy;
 
+  again:
     if (y == INT2FIX(0)) return INT2FIX(1);
-    switch (TYPE(y)) {
-      case T_FLOAT:
-	d = RFLOAT(y)->value;
-	break;
-
-      case T_BIGNUM:
+    if (RB_FLOAT_TYPE_P(y)) {
+	d = RFLOAT_VALUE(y);
+	if ((!RBIGNUM_SIGN(x) && !BIGZEROP(x)) && d != round(d))
+	    return rb_funcall(rb_complex_raw1(x), rb_intern("**"), 1, y);
+    }
+    else if (RB_BIGNUM_TYPE_P(y)) {
+	y = bignorm(y);
+	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) {
+
+	if (yy < 0)
+	    return rb_funcall(rb_rational_raw1(x), rb_intern("**"), 1, y);
+	else {
 	    VALUE z = 0;
-	    long mask;
-	    const long BIGLEN_LIMIT = 1024*1024 / SIZEOF_BDIGITS;
+	    SIGNED_VALUE mask;
+            const size_t xbits = rb_absint_numwords(x, 1, NULL);
+	    const size_t BIGLEN_LIMIT = 32*1024*1024;
 
-	    if ((RBIGNUM(x)->len > BIGLEN_LIMIT) ||
-		(RBIGNUM(x)->len > 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 = bigtrunc(bigsqr(z));
-		if (yy & mask) {
-		    z = z ? bigtrunc(rb_big_mul0(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);
 	}
-	d = (double)yy;
-	break;
+    }
+    else {
+	return rb_num_coerce_bin(x, y, rb_intern("**"));
+    }
+    return DBL2NUM(pow(rb_big2dbl(x), d));
+}
 
-      default:
-	return rb_num_coerce_bin(x, y);
+static VALUE
+bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y)
+{
+    VALUE z;
+    BDIGIT *xds, *zds;
+    long zn;
+    long i;
+    BDIGIT hibitsy;
+
+    if (y == 0) return INT2FIX(0);
+    if (xn == 0) return hibitsx ? LONG2NUM(y) : 0;
+    hibitsy = 0 <= y ? 0 : BDIGMAX;
+    xds = BDIGITS(x);
+#if SIZEOF_BDIGITS >= SIZEOF_LONG
+    if (!hibitsy) {
+	y &= xds[0];
+	return LONG2NUM(y);
     }
-    return rb_float_new(pow(rb_big2dbl(x), d));
+#endif
+
+    zn = xn;
+#if SIZEOF_BDIGITS < 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
+    i = 1;
+    zds[0] = xds[0] & y;
+#else
+    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
+    for (;i < xn; i++) {
+	zds[i] = xds[i] & hibitsy;
+    }
+    for (;i < zn; i++) {
+	zds[i] = hibitsx & hibitsy;
+    }
+    twocomp2abs_bang(z, hibitsx && hibitsy);
+    RB_GC_GUARD(x);
+    return bignorm(z);
 }
 
 /*
  * call-seq:
- *     big & numeric   =>  integer
+ *     big & numeric   ->  integer
  *
  * Performs bitwise +and+ between _big_ and _numeric_.
  */
 
 VALUE
-rb_big_and(xx, yy)
-    VALUE xx, 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 = rb_to_int(yy);
-    if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
+	return rb_num_coerce_bit(x, y, '&');
     }
-    if (!RBIGNUM(y)->sign) {
-	y = rb_big_clone(y);
-	get2comp(y);
+
+    hibitsx = abs2twocomp(&x, &xn);
+    if (FIXNUM_P(y)) {
+	return bigand_int(x, xn, hibitsx, FIX2LONG(y));
     }
-    if (!RBIGNUM(x)->sign) {
-	x = rb_big_clone(x);
-	get2comp(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;
     }
-    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
-	l1 = RBIGNUM(y)->len;
-	l2 = RBIGNUM(x)->len;
-	ds1 = BDIGITS(y);
-	ds2 = BDIGITS(x);
-	sign = RBIGNUM(y)->sign;
+    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<n1; i++) {
+	zds[i] = ds1[i] & ds2[i];
     }
-    else {
-	l1 = RBIGNUM(x)->len;
-	l2 = RBIGNUM(y)->len;
-	ds1 = BDIGITS(x);
-	ds2 = BDIGITS(y);
-	sign = RBIGNUM(x)->sign;
+    for (; i<n2; i++) {
+	zds[i] = hibits1 & ds2[i];
     }
-    z = bignew(l2, RBIGNUM(x)->sign || RBIGNUM(y)->sign);
+    twocomp2abs_bang(z, hibits1 && hibits2);
+    RB_GC_GUARD(x);
+    RB_GC_GUARD(y);
+    return bignorm(z);
+}
+
+static VALUE
+bigor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
+{
+    VALUE z;
+    BDIGIT *xds, *zds;
+    long zn;
+    long i;
+    BDIGIT hibitsy;
+
+    if (y == -1) return INT2FIX(-1);
+    if (xn == 0) return hibitsx ? INT2FIX(-1) : LONG2FIX(y);
+    hibitsy = 0 <= y ? 0 : BDIGMAX;
+    xds = BDIGITS(x);
+
+    zn = RBIGNUM_LEN(x);
+#if SIZEOF_BDIGITS < SIZEOF_LONG
+    if (zn < bdigit_roomof(SIZEOF_LONG))
+        zn = bdigit_roomof(SIZEOF_LONG);
+#endif
+    z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-    for (i=0; i<l1; i++) {
-	zds[i] = ds1[i] & ds2[i];
+#if SIZEOF_BDIGITS >= SIZEOF_LONG
+    i = 1;
+    zds[0] = xds[0] | y;
+    if (i < zn)
+        goto y_is_fixed_point;
+    goto finish;
+#else
+    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
+
+  y_is_fixed_point:
+    if (hibitsy)
+        goto fill_hibits;
+    for (; i < xn; i++) {
+        zds[i] = xds[i];
+    }
+    if (hibitsx)
+        goto fill_hibits;
+    for (; i < zn; i++) {
+        zds[i] = 0;
     }
-    for (; i<l2; i++) {
-	zds[i] = sign?0:ds2[i];
+  goto finish;
+
+  fill_hibits:
+    for (; i < zn; i++) {
+        zds[i] = BDIGMAX;
     }
-    if (!RBIGNUM(z)->sign) get2comp(z);
+
+  finish:
+    twocomp2abs_bang(z, hibitsx || hibitsy);
+    RB_GC_GUARD(x);
     return bignorm(z);
 }
 
 /*
  * call-seq:
- *     big | numeric   =>  integer
+ *     big | numeric   ->  integer
  *
  * Performs bitwise +or+ between _big_ and _numeric_.
  */
 
 VALUE
-rb_big_or(xx, yy)
-    VALUE xx, 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;
+    long i, xn, yn, n1, n2;
+    BDIGIT hibitsx, hibitsy;
+    BDIGIT hibits1, hibits2;
+    VALUE tmpv;
+    BDIGIT tmph;
+    long tmpn;
 
-    x = xx;
-    y = rb_to_int(yy);
-    if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
-    }
-    if (!RBIGNUM(y)->sign) {
-	y = rb_big_clone(y);
-	get2comp(y);
-    }
-    if (!RBIGNUM(x)->sign) {
-	x = rb_big_clone(x);
-	get2comp(x);
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
+	return rb_num_coerce_bit(x, y, '|');
     }
-    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
-	l1 = RBIGNUM(y)->len;
-	l2 = RBIGNUM(x)->len;
-	ds1 = BDIGITS(y);
-	ds2 = BDIGITS(x);
-	sign = RBIGNUM(y)->sign;
+
+    hibitsx = abs2twocomp(&x, &xn);
+    if (FIXNUM_P(y)) {
+	return bigor_int(x, xn, hibitsx, FIX2LONG(y));
     }
-    else {
-	l1 = RBIGNUM(x)->len;
-	l2 = RBIGNUM(y)->len;
-	ds1 = BDIGITS(x);
-	ds2 = BDIGITS(y);
-	sign = RBIGNUM(x)->sign;
+    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(x)->sign && RBIGNUM(y)->sign);
+    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]:(BIGRAD-1);
+    for (; i<n2; i++) {
+	zds[i] = hibits1 | ds2[i];
     }
-    if (!RBIGNUM(z)->sign) 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 xn, BDIGIT hibitsx, long y)
+{
+    VALUE z;
+    BDIGIT *xds, *zds;
+    long zn;
+    long i;
+    BDIGIT hibitsy;
+
+    hibitsy = 0 <= y ? 0 : BDIGMAX;
+    xds = BDIGITS(x);
+    zn = RBIGNUM_LEN(x);
+#if SIZEOF_BDIGITS < 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
+    i = 1;
+    zds[0] = xds[0] ^ y;
+#else
+    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
+    for (; i < xn; i++) {
+        zds[i] = xds[i] ^ hibitsy;
+    }
+    for (; i < zn; i++) {
+        zds[i] = hibitsx ^ hibitsy;
+    }
+    twocomp2abs_bang(z, (hibitsx ^ hibitsy) != 0);
+    RB_GC_GUARD(x);
+    return bignorm(z);
+}
 /*
  * call-seq:
- *     big ^ numeric   =>  integer
+ *     big ^ numeric   ->  integer
  *
  * Performs bitwise +exclusive or+ between _big_ and _numeric_.
  */
 
 VALUE
-rb_big_xor(xx, yy)
-    VALUE xx, 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 = rb_to_int(yy);
-    if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
-    }
-    if (!RBIGNUM(y)->sign) {
-	y = rb_big_clone(y);
-	get2comp(y);
-    }
-    if (!RBIGNUM(x)->sign) {
-	x = rb_big_clone(x);
-	get2comp(x);
+    if (!FIXNUM_P(y) && !RB_BIGNUM_TYPE_P(y)) {
+	return rb_num_coerce_bit(x, y, '^');
     }
-    if (RBIGNUM(x)->len > RBIGNUM(y)->len) {
-	l1 = RBIGNUM(y)->len;
-	l2 = RBIGNUM(x)->len;
-	ds1 = BDIGITS(y);
-	ds2 = BDIGITS(x);
-	sign = RBIGNUM(y)->sign;
-    }
-    else {
-	l1 = RBIGNUM(x)->len;
-	l2 = RBIGNUM(y)->len;
-	ds1 = BDIGITS(x);
-	ds2 = BDIGITS(y);
-	sign = RBIGNUM(x)->sign;
-    }
-    RBIGNUM(x)->sign = RBIGNUM(x)->sign?1:0;
-    RBIGNUM(y)->sign = RBIGNUM(y)->sign?1:0;
-    z = bignew(l2, !(RBIGNUM(x)->sign ^ RBIGNUM(y)->sign));
+
+    hibitsx = abs2twocomp(&x, &xn);
+    if (FIXNUM_P(y)) {
+	return bigxor_int(x, xn, hibitsx, FIX2LONG(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(z)->sign) 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(x)->len) return INT2FIX(0);
-    if (RBIGNUM(y)->len > SIZEOF_LONG / SIZEOF_BDIGITS) {
-	return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(-1);
-    }
-    return Qnil;
-}
-
 /*
  * call-seq:
- *     big << numeric   =>  integer
+ *     big << numeric   ->  integer
  *
  * Shifts big left _numeric_ positions (right if _numeric_ is negative).
  */
 
 VALUE
-rb_big_lshift(x, y)
-    VALUE x, y;
+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(y)->sign) {
-		VALUE t = check_shiftdown(y, x);
-		if (!NIL_P(t)) return t;
-		neg = 1;
-	    }
-	    shift = big2ulong(y, "long");
-	    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(x, shift)
-    VALUE x;
-    unsigned long shift;
-{
-    BDIGIT *xds, *zds;
-    long s1 = shift/BITSPERDIG;
-    int s2 = shift%BITSPERDIG;
-    VALUE z;
-    BDIGIT_DBL num = 0;
-    long len, i;
-
-    len = RBIGNUM(x)->len;
-    z = bignew(len+s1+1, RBIGNUM(x)->sign);
-    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
+ *     big >> numeric   ->  integer
  *
  * Shifts big right _numeric_ positions (left if _numeric_ is negative).
  */
 
 VALUE
-rb_big_rshift(x, y)
-    VALUE x, y;
+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(y)->sign) {
-		VALUE t = check_shiftdown(y, x);
-		if (!NIL_P(t)) return t;
-	    }
-	    else {
-		neg = 1;
-	    }
-	    shift = big2ulong(y, "long");
-	    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(x, shift)
-    VALUE x;
-    unsigned long shift;
-{
-    BDIGIT *xds, *zds;
-    long s1 = shift/BITSPERDIG;
-    int s2 = shift%BITSPERDIG;
-    VALUE z;
-    BDIGIT_DBL num = 0;
-    long i, j;
-    volatile VALUE save_x;
-
-    if (s1 > RBIGNUM(x)->len) {
-	if (RBIGNUM(x)->sign)
-	    return INT2FIX(0);
-	else
-	    return INT2FIX(-1);
-    }
-    if (!RBIGNUM(x)->sign) {
-	save_x = x = rb_big_clone(x);
-	get2comp(x);
-    }
-    xds = BDIGITS(x);
-    i = RBIGNUM(x)->len; j = i - s1;
-    if (j == 0) {
-	if (RBIGNUM(x)->sign) return INT2FIX(0);
-	else return INT2FIX(-1);
-    }
-    z = bignew(j, RBIGNUM(x)->sign);
-    if (!RBIGNUM(x)->sign) {
-	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(x)->sign) {
-	get2comp(z);
-    }
-    return z;
 }
 
 /*
@@ -2291,93 +6847,92 @@ big_rshift(x, shift)
  */
 
 static VALUE
-rb_big_aref(x, y)
-    VALUE x, y;
+rb_big_aref(VALUE x, VALUE y)
 {
     BDIGIT *xds;
-    BDIGIT_DBL num;
     unsigned long shift;
     long i, s1, s2;
+    BDIGIT bit;
 
-    if (TYPE(y) == T_BIGNUM) {
-	if (!RBIGNUM(y)->sign)
+    if (RB_BIGNUM_TYPE_P(y)) {
+	if (!RBIGNUM_SIGN(y))
 	    return INT2FIX(0);
-	if (RBIGNUM(bigtrunc(y))->len > SIZEOF_LONG/SIZEOF_BDIGITS) {
+	bigtrunc(y);
+	if (BIGSIZE(y) > sizeof(long)) {
 	  out_of_range:
-	    return RBIGNUM(x)->sign ? INT2FIX(0) : INT2FIX(1);
+	    return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
 	}
 	shift = big2ulong(y, "long");
     }
     else {
 	i = NUM2LONG(y);
 	if (i < 0) return INT2FIX(0);
-	shift = (VALUE)i;
+	shift = i;
     }
     s1 = shift/BITSPERDIG;
     s2 = shift%BITSPERDIG;
+    bit = (BDIGIT)1 << s2;
 
-    if (s1 >= RBIGNUM(x)->len) goto out_of_range;
-    if (!RBIGNUM(x)->sign) {
-	xds = BDIGITS(x);
-	i = 0; num = 1;
-	while (num += ~xds[i], ++i <= s1) {
-	    num = BIGDN(num);
-	}
-    }
-    else {
-	num = BDIGITS(x)[s1];
-    }
-    if (num & ((BDIGIT_DBL)1<<s2))
-	return INT2FIX(1);
-    return INT2FIX(0);
+    if (s1 >= RBIGNUM_LEN(x)) goto out_of_range;
+
+    xds = BDIGITS(x);
+    if (RBIGNUM_POSITIVE_P(x))
+        return (xds[s1] & bit) ? INT2FIX(1) : INT2FIX(0);
+    if (xds[s1] & (bit-1))
+        return (xds[s1] & bit) ? INT2FIX(0) : INT2FIX(1);
+    for (i = 0; i < s1; i++)
+        if (xds[i])
+            return (xds[s1] & bit) ? INT2FIX(0) : INT2FIX(1);
+    return (xds[s1] & bit) ? INT2FIX(1) : INT2FIX(0);
 }
 
 /*
  * call-seq:
- *   big.hash   => fixnum
+ *   big.hash   -> fixnum
  *
  * Compute a hash based on the value of _big_.
  */
 
 static VALUE
-rb_big_hash(x)
-    VALUE x;
+rb_big_hash(VALUE x)
 {
-    long i, len, key;
-    BDIGIT *digits;
+    st_index_t hash;
 
-    key = 0; digits = BDIGITS(x); len = RBIGNUM(x)->len;
-    for (i=0; i<len; i++) {
-	key ^= *digits++;
-    }
-    return LONG2FIX(key);
+    hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*RBIGNUM_LEN(x)) ^ RBIGNUM_SIGN(x);
+    return INT2FIX(hash);
 }
 
 /*
- * MISSING: documentation
+ * call-seq:
+ *   big.coerce(numeric)  ->  array
+ *
+ * Returns an array with both a +numeric+ and a +big+ represented as Bignum
+ * objects.
+ *
+ * This is achieved by converting +numeric+ to a Bignum.
+ *
+ * A TypeError is raised if the +numeric+ is not a Fixnum or Bignum type.
+ *
+ *     (0x3FFFFFFFFFFFFFFF+1).coerce(42)   #=> [42, 4611686018427387904]
  */
 
 static VALUE
-rb_big_coerce(x, y)
-    VALUE x, y;
+rb_big_coerce(VALUE x, VALUE y)
 {
     if (FIXNUM_P(y)) {
-	return rb_assoc_new(rb_int2big(FIX2LONG(y)), x);
-    }
-    else if (TYPE(y) == T_BIGNUM) {
-       return rb_assoc_new(y, x);
+	y = rb_int2big(FIX2LONG(y));
     }
-    else {
+    else if (!RB_BIGNUM_TYPE_P(y)) {
 	rb_raise(rb_eTypeError, "can't coerce %s to Bignum",
 		 rb_obj_classname(y));
     }
-    /* not reached */
-    return Qnil;
+    return rb_assoc_new(y, x);
 }
 
 /*
  *  call-seq:
  *     big.abs -> aBignum
+ *     big.magnitude -> aBignum
  *
  *  Returns the absolute value of <i>big</i>.
  *
@@ -2385,54 +6940,135 @@ rb_big_coerce(x, y)
  */
 
 static VALUE
-rb_big_abs(x)
-    VALUE x;
+rb_big_abs(VALUE x)
 {
-    if (!RBIGNUM(x)->sign) {
+    if (!RBIGNUM_SIGN(x)) {
 	x = rb_big_clone(x);
-	RBIGNUM(x)->sign = 1;
+	RBIGNUM_SET_SIGN(x, 1);
     }
     return x;
 }
 
-VALUE
-rb_big_rand(max, rand_buf)
-    VALUE max;
-    double *rand_buf;
+/*
+ *  call-seq:
+ *     big.size -> integer
+ *
+ *  Returns the number of bytes in the machine representation of
+ *  <i>big</i>.
+ *
+ *     (256**10 - 1).size   #=> 12
+ *     (256**20 - 1).size   #=> 20
+ *     (256**40 - 1).size   #=> 40
+ */
+
+static VALUE
+rb_big_size(VALUE big)
+{
+    return SIZET2NUM(BIGSIZE(big));
+}
+
+/*
+ *  call-seq:
+ *     int.bit_length -> integer
+ *
+ *  Returns the number of bits of the value of <i>int</i>.
+ *
+ *  "the number of bits" means that
+ *  the bit position of the highest bit which is different to the sign bit.
+ *  (The bit position of the bit 2**n is n+1.)
+ *  If there is no such bit (zero or minus one), zero is returned.
+ *
+ *  I.e. This method returns ceil(log2(int < 0 ? -int : int+1)).
+ *
+ *     (-2**10000-1).bit_length  #=> 10001
+ *     (-2**10000).bit_length    #=> 10000
+ *     (-2**10000+1).bit_length  #=> 10000
+ *
+ *     (-2**1000-1).bit_length   #=> 1001
+ *     (-2**1000).bit_length     #=> 1000
+ *     (-2**1000+1).bit_length   #=> 1000
+ *
+ *     (2**1000-1).bit_length    #=> 1000
+ *     (2**1000).bit_length      #=> 1001
+ *     (2**1000+1).bit_length    #=> 1001
+ *
+ *     (2**10000-1).bit_length   #=> 10000
+ *     (2**10000).bit_length     #=> 10001
+ *     (2**10000+1).bit_length   #=> 10001
+ *
+ */
+
+static VALUE
+rb_big_bit_length(VALUE big)
 {
-    VALUE v;
-    long len = RBIGNUM(max)->len;
+    int nlz_bits;
+    size_t numbytes;
+
+    static const BDIGIT char_bit[1] = { CHAR_BIT };
+    BDIGIT numbytes_bary[bdigit_roomof(sizeof(size_t))];
+    BDIGIT nlz_bary[1];
+    BDIGIT result_bary[bdigit_roomof(sizeof(size_t)+1)];
+
+    numbytes = rb_absint_size(big, &nlz_bits);
 
-    if (BIGZEROP(max)) {
-	return rb_float_new(rand_buf[0]);
+    if (numbytes == 0)
+        return LONG2FIX(0);
+
+    if (RBIGNUM_NEGATIVE_P(big) && rb_absint_singlebit_p(big)) {
+        if (nlz_bits != CHAR_BIT-1) {
+            nlz_bits++;
+        }
+        else {
+            nlz_bits = 0;
+            numbytes--;
+        }
     }
-    v = bignew(len,1);
-    len--;
-    BDIGITS(v)[len] = BDIGITS(max)[len] * rand_buf[len];
-    while (len--) {
-	BDIGITS(v)[len] = ((BDIGIT)~0) * rand_buf[len];
+
+    if (numbytes <= SIZE_MAX / CHAR_BIT) {
+        return SIZET2NUM(numbytes * CHAR_BIT - nlz_bits);
     }
 
-    return v;
+    nlz_bary[0] = nlz_bits;
+
+    bary_unpack(BARY_ARGS(numbytes_bary), &numbytes, 1, sizeof(numbytes), 0,
+            INTEGER_PACK_NATIVE_BYTE_ORDER);
+    BARY_SHORT_MUL(result_bary, numbytes_bary, char_bit);
+    BARY_SUB(result_bary, result_bary, nlz_bary);
+
+    return rb_integer_unpack(result_bary, numberof(result_bary), sizeof(BDIGIT), 0,
+            INTEGER_PACK_LSWORD_FIRST|INTEGER_PACK_NATIVE_BYTE_ORDER);
 }
 
 /*
  *  call-seq:
- *     big.size -> integer
+ *     big.odd? -> true or false
  *
- *  Returns the number of bytes in the machine representation of
- *  <i>big</i>.
+ *  Returns <code>true</code> if <i>big</i> is an odd number.
+ */
+
+static VALUE
+rb_big_odd_p(VALUE num)
+{
+    if (RBIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
+	return Qtrue;
+    }
+    return Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     big.even? -> true or false
  *
- *     (256**10 - 1).size   #=> 12
- *     (256**20 - 1).size   #=> 20
- *     (256**40 - 1).size   #=> 40
+ *  Returns <code>true</code> if <i>big</i> is an even number.
  */
 
 static VALUE
-rb_big_size(big)
-    VALUE big;
+rb_big_even_p(VALUE num)
 {
-    return LONG2FIX(RBIGNUM(big)->len*SIZEOF_BDIGITS);
+    if (RBIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
+	return Qfalse;
+    }
+    return Qtrue;
 }
 
 /*
@@ -2454,11 +7090,12 @@ rb_big_size(big)
  */
 
 void
-Init_Bignum()
+Init_Bignum(void)
 {
     rb_cBignum = rb_define_class("Bignum", rb_cInteger);
 
     rb_define_method(rb_cBignum, "to_s", rb_big_to_s, -1);
+    rb_define_alias(rb_cBignum, "inspect", "to_s");
     rb_define_method(rb_cBignum, "coerce", rb_big_coerce, 1);
     rb_define_method(rb_cBignum, "-@", rb_big_uminus, 0);
     rb_define_method(rb_cBignum, "+", rb_big_plus, 1);
@@ -2466,12 +7103,11 @@ Init_Bignum()
     rb_define_method(rb_cBignum, "*", rb_big_mul, 1);
     rb_define_method(rb_cBignum, "/", rb_big_div, 1);
     rb_define_method(rb_cBignum, "%", rb_big_modulo, 1);
-    rb_define_method(rb_cBignum, "div", rb_big_div, 1);
+    rb_define_method(rb_cBignum, "div", rb_big_idiv, 1);
     rb_define_method(rb_cBignum, "divmod", rb_big_divmod, 1);
     rb_define_method(rb_cBignum, "modulo", rb_big_modulo, 1);
     rb_define_method(rb_cBignum, "remainder", rb_big_remainder, 1);
-    rb_define_method(rb_cBignum, "quo", rb_big_quo, 1);
-    rb_define_method(rb_cBignum, "fdiv", rb_big_quo, 1);
+    rb_define_method(rb_cBignum, "fdiv", rb_big_fdiv, 1);
     rb_define_method(rb_cBignum, "**", rb_big_pow, 1);
     rb_define_method(rb_cBignum, "&", rb_big_and, 1);
     rb_define_method(rb_cBignum, "|", rb_big_or, 1);
@@ -2483,9 +7119,24 @@ Init_Bignum()
 
     rb_define_method(rb_cBignum, "<=>", rb_big_cmp, 1);
     rb_define_method(rb_cBignum, "==", rb_big_eq, 1);
+    rb_define_method(rb_cBignum, ">", big_gt, 1);
+    rb_define_method(rb_cBignum, ">=", big_ge, 1);
+    rb_define_method(rb_cBignum, "<", big_lt, 1);
+    rb_define_method(rb_cBignum, "<=", big_le, 1);
+    rb_define_method(rb_cBignum, "===", rb_big_eq, 1);
     rb_define_method(rb_cBignum, "eql?", rb_big_eql, 1);
     rb_define_method(rb_cBignum, "hash", rb_big_hash, 0);
     rb_define_method(rb_cBignum, "to_f", rb_big_to_f, 0);
     rb_define_method(rb_cBignum, "abs", rb_big_abs, 0);
+    rb_define_method(rb_cBignum, "magnitude", rb_big_abs, 0);
     rb_define_method(rb_cBignum, "size", rb_big_size, 0);
+    rb_define_method(rb_cBignum, "bit_length", rb_big_bit_length, 0);
+    rb_define_method(rb_cBignum, "odd?", rb_big_odd_p, 0);
+    rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0);
+
+#ifdef USE_GMP
+    rb_define_const(rb_cBignum, "GMP_VERSION", rb_sprintf("GMP %s", gmp_version));
+#endif
+
+    power_cache_init();
 }
diff --git a/bin/erb b/bin/erb
index a6fcd5370c..6a7ea7d593 100755
--- a/bin/erb
+++ b/bin/erb
@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 # Tiny eRuby --- ERB2
-# Copyright (c) 1999-2000,2002 Masatoshi SEKI 
+# Copyright (c) 1999-2000,2002 Masatoshi SEKI
 # You can redistribute it and/or modify it under the same terms as Ruby.
 
 require 'erb'
@@ -12,18 +12,28 @@ class ERB
       arg = self.shift
       return nil if arg == '--'
       if arg =~ /^-(.)(.*)/
-        return arg if $1 == '-'
-        raise 'unknown switch "-"' if $2.index('-')
-        self.unshift "-#{$2}" if $2.size > 0
+        if $1 == '-'
+          arg, @maybe_arg = arg.split(/=/, 2)
+          return arg
+        end
+        raise 'unknown switch "-"' if $2[0] == ?- and $1 != 'T'
+        if $2.size > 0
+          self.unshift "-#{$2}"
+          @maybe_arg = $2
+        else
+          @maybe_arg = nil
+        end
         "-#{$1}"
       else
         self.unshift arg
         nil
       end
     end
-    
+
     def ARGV.req_arg
-      self.shift || raise('missing argument')
+      (@maybe_arg || self.shift || raise('missing argument')).tap {
+        @maybe_arg = nil
+      }
     end
 
     def trim_mode_opt(trim_mode, disable_percent)
@@ -62,30 +72,21 @@ class ERB
             require ARGV.req_arg
           when '-S'                        # security level
             arg = ARGV.req_arg
-            raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-4]$/
+            raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-3]$/
             safe_level = arg.to_i
           when '-T'                        # trim mode
             arg = ARGV.req_arg
             if arg == '-'
-              trim_mode = arg 
+              trim_mode = arg
               next
             end
             raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
             trim_mode = arg.to_i
-          when '-K'                        # KCODE
+          when '-E', '--encoding'
             arg = ARGV.req_arg
-            case arg.downcase
-            when 'e', '-e', 'euc'
-              $KCODE = 'EUC'
-            when 's', '-s', 'sjis'
-              $KCODE = 'SJIS'
-            when 'u', '-u', 'utf8'
-              $KCODE = 'UTF8'
-            when 'n', '-n', 'none'
-              $KCODE = 'NONE'
-            else
-              raise "invalid KCODE #{arg.dump}"
-            end
+            set_encoding(*arg.split(/:/, 2))
+          when '-U'
+            set_encoding(Encoding::UTF_8, Encoding::UTF_8)
           when '-P'
             disable_percent = true
           when '--help'
@@ -96,22 +97,24 @@ class ERB
         end
       rescue                               # usage
         STDERR.puts $!.to_s
-        STDERR.puts File.basename($0) + 
+        STDERR.puts File.basename($0) +
           " [switches] [inputfile]"
         STDERR.puts <<EOU
   -x               print ruby script
   -n               print ruby script with line number
   -v               enable verbose mode
   -d               set $DEBUG to true
-  -r [library]     load a library
-  -K [kcode]       specify KANJI code-set
-  -S [safe_level]  set $SAFE (0..4)
-  -T [trim_mode]   specify trim_mode (0..2, -)
+  -r library       load a library
+  -S safe_level    set $SAFE (0..3)
+  -E ex[:in]       set default external/internal encodings
+  -U               set default encoding to UTF-8.
+  -T trim_mode     specify trim_mode (0..2, -)
   -P               ignore lines which start with "%"
 EOU
         exit 1
       end
 
+      $<.set_encoding(Encoding::ASCII_8BIT, nil)
       src = $<.read
       filename = $FILENAME
       exit 2 unless src
@@ -120,10 +123,8 @@ EOU
       erb.filename = filename
       if output
         if number
-          l = 1
-          for line in erb.src
-            puts "%3d %s"%[l, line]
-            l += 1
+          erb.src.each_line.with_index do |line, l|
+            puts "%3d %s"%[l+1, line]
           end
         else
           puts erb.src
@@ -133,6 +134,19 @@ EOU
       end
     end
     module_function :run
+
+    def set_encoding(extern, intern = nil)
+      verbose, $VERBOSE = $VERBOSE, nil
+      Encoding.default_external = extern unless extern.nil? || extern.empty?
+      Encoding.default_internal = intern unless intern.nil? || intern.empty?
+      [$stdin, $stdout, $stderr].each do |io|
+        io.set_encoding(extern, intern)
+      end
+    ensure
+      $VERBOSE = verbose
+    end
+    module_function :set_encoding
+    class << self; private :set_encoding; end
   end
 end
 
diff --git a/bin/gem b/bin/gem
new file mode 100755
index 0000000000..a4ec754abb
--- /dev/null
+++ b/bin/gem
@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+#--
+# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
+# All rights reserved.
+# See LICENSE.txt for permissions.
+#++
+
+require 'rubygems'
+require 'rubygems/gem_runner'
+require 'rubygems/exceptions'
+
+required_version = Gem::Requirement.new ">= 1.8.7"
+
+unless required_version.satisfied_by? Gem.ruby_version then
+  abort "Expected Ruby Version #{required_version}, is #{Gem.ruby_version}"
+end
+
+args = ARGV.clone
+
+begin
+  Gem::GemRunner.new.run args
+rescue Gem::SystemExitException => e
+  exit e.exit_code
+end
+
diff --git a/bin/irb b/bin/irb
index f277bc4b69..c64ee85fbd 100644..100755
--- a/bin/irb
+++ b/bin/irb
@@ -1,21 +1,11 @@
 #!/usr/bin/env ruby
 #
-#   irb.rb - intaractive ruby
-#   	$Release Version: 0.9.5 $
+#   irb.rb - interactive ruby
+#   	$Release Version: 0.9.6 $
 #   	$Revision$
-#   	$Date$
 #   	by Keiju ISHITSUKA(keiju@ruby-lang.org)
 #
 
 require "irb"
 
-if __FILE__ == $0
-  IRB.start(__FILE__)
-else
-  # check -e option
-  if /^-e$/ =~ $0
-    IRB.start(__FILE__)
-  else
-    IRB.setup(__FILE__)
-  end
-end
+IRB.start(__FILE__)
diff --git a/bin/rake b/bin/rake
new file mode 100755
index 0000000000..4e0bbb7b7a
--- /dev/null
+++ b/bin/rake
@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+
+#--
+# Copyright (c) 2003, 2004, 2005, 2006, 2007  Jim Weirich
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+#++
+
+begin
+  require 'rubygems'
+  gem 'rake'
+rescue LoadError
+end
+
+require 'rake'
+
+Rake.application.run
diff --git a/bin/rdoc b/bin/rdoc
index fe619137fd..aaa23292df 100644..100755
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -5,63 +5,40 @@
 #
 #  Copyright (c) 2003 Dave Thomas
 #  Released under the same terms as Ruby
-#
-#  $Revision$
-
-## Transitional Hack ####
-#
-#  RDoc was initially distributed independently, and installed
-#  itself into <prefix>/lib/ruby/site_ruby/<ver>/rdoc...
-#
-#  Now that RDoc is part of the distribution, it's installed into
-#  <prefix>/lib/ruby/<ver>, which unfortunately appears later in the
-#  search path. This means that if you have previously installed RDoc,
-#  and then install from ruby-lang, you'll pick up the old one by
-#  default. This hack checks for the condition, and readjusts the
-#  search path if necessary.
-
-def adjust_for_existing_rdoc(path)
-  
-  $stderr.puts %{
-  It seems as if you have a previously-installed RDoc in
-  the directory #{path}.
-
-  Because this is now out-of-date, you might want to consider
-  removing the directories:
-
-    #{File.join(path, "rdoc")}
-
-  and
-
-    #{File.join(path, "markup")}
-
-  }
 
-  # Move all the site_ruby directories to the end
-  p $:
-  $:.replace($:.partition {|path| /site_ruby/ !~ path}.flatten)
-  p $:
-end
-
-$:.each do |path|
-  if /site_ruby/ =~ path 
-    rdoc_path = File.join(path, 'rdoc', 'rdoc.rb')
-    if File.exists?(rdoc_path)
-      adjust_for_existing_rdoc(path)
-      break
-    end
-  end
+begin
+  gem 'rdoc'
+rescue NameError => e # --disable-gems
+  raise unless e.name == :gem
+rescue Gem::LoadError
 end
 
-## End of Transitional Hack ##
-
-
 require 'rdoc/rdoc'
 
 begin
   r = RDoc::RDoc.new
-  r.document(ARGV)
-rescue RDoc::RDocError => e
-  $stderr.puts e.message
-  exit(1)
+  r.document ARGV
+rescue Errno::ENOSPC
+  $stderr.puts 'Ran out of space creating documentation'
+  $stderr.puts
+  $stderr.puts 'Please free up some space and try again'
+rescue SystemExit
+  raise
+rescue Exception => e
+  if $DEBUG_RDOC then
+    $stderr.puts e.message
+    $stderr.puts "#{e.backtrace.join "\n\t"}"
+    $stderr.puts
+  elsif Interrupt === e then
+    $stderr.puts
+    $stderr.puts 'Interrupted'
+  else
+    $stderr.puts "uh-oh! RDoc had a problem:"
+    $stderr.puts e.message
+    $stderr.puts
+    $stderr.puts "run with --debug for full backtrace"
+  end
+
+  exit 1
 end
+
diff --git a/bin/ri b/bin/ri
index fb3e00eda3..7fbed0c099 100755
--- a/bin/ri
+++ b/bin/ri
@@ -1,49 +1,12 @@
 #!/usr/bin/env ruby
-# usage:
-#
-#   ri  name...
-#
-# where name can be 
-#
-#   Class | Class::method | Class#method | Class.method | method
-#
-# All names may be abbreviated to their minimum unbiguous form. If a name
-# _is_ ambiguous, all valid options will be listed.
-#
-# The form '.' method matches either class or instance methods, while 
-# #method matches only instance and ::method matches only class methods.
-#
-#
-# == Installing Documentation
-#
-# 'ri' uses a database of documentation built by the RDoc utility.
-# 
-# So, how do you install this documentation on your system?
-# It depends on how you installed Ruby.
-#
-# <em>If you installed Ruby from source files</em> (that is, if it some point
-# you typed 'make' during the process :), you can install the RDoc
-# documentation yourself. Just go back to the place where you have 
-# your Ruby source and type
-#
-#    make install-doc
-#
-# You'll probably need to do this as a superuser, as the documentation
-# is installed in the Ruby target tree (normally somewhere under 
-# <tt>/usr/local</tt>.
-#
-# <em>If you installed Ruby from a binary distribution</em> (perhaps
-# using a one-click installer, or using some other packaging system),
-# then the team that produced the package probably forgot to package
-# the documentation as well. Contact them, and see if they can add
-# it to the next release.
-#
 
+begin
+  gem 'rdoc'
+rescue NameError => e # --disable-gems
+  raise unless e.name == :gem
+rescue Gem::LoadError
+end
 
-require 'rdoc/ri/ri_driver'
-
-######################################################################
-
-ri = RiDriver.new
-ri.process_args
+require 'rdoc/ri/driver'
 
+RDoc::RI::Driver.run ARGV
diff --git a/bin/testrb b/bin/testrb
index ff49cb5466..23a00b439f 100755
--- a/bin/testrb
+++ b/bin/testrb
@@ -1,5 +1,3 @@
 #!/usr/bin/env ruby
 require 'test/unit'
-(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
-  abort r.options.banner + " tests..."
-exit r.run
+exit Test::Unit::AutoRunner.run(true)
diff --git a/bootstraptest/pending.rb b/bootstraptest/pending.rb
new file mode 100644
index 0000000000..744c0adac1
--- /dev/null
+++ b/bootstraptest/pending.rb
@@ -0,0 +1,39 @@
+assert_equal 'A', %q{
+  class A
+    @@a = 'A'
+    def a=(x)
+      @@a = x
+    end
+    def a
+      @@a
+    end
+  end
+
+  B = A.dup
+  B.new.a = 'B'
+  A.new.a
+}, '[ruby-core:17019]'
+
+assert_equal 'ok', %q{
+  def m
+    lambda{
+      proc{
+        return :ng1
+      }
+    }.call.call
+    :ng2
+  end
+
+  begin
+    m()
+  rescue LocalJumpError
+    :ok
+  end
+}
+
+assert_normal_exit %q{
+  r = Range.allocate
+  def r.<=>(o) true end
+  r.instance_eval { initialize r, r }
+  r.inspect
+}
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
new file mode 100755
index 0000000000..5fdfc42a63
--- /dev/null
+++ b/bootstraptest/runner.rb
@@ -0,0 +1,485 @@
+"exec" "${RUBY-ruby}" "-x" "$0" "$@" || true # -*- mode: ruby; coding: utf-8 -*-
+#!./ruby
+# $Id$
+
+# NOTE:
+# Never use optparse in this file.
+# Never use test/unit in this file.
+# Never use Ruby extensions in this file.
+
+begin
+  require 'fileutils'
+  require 'tmpdir'
+rescue LoadError
+  $:.unshift File.join(File.dirname(__FILE__), '../lib')
+  retry
+end
+
+if !Dir.respond_to?(:mktmpdir)
+  # copied from lib/tmpdir.rb
+  def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil)
+    case prefix_suffix
+    when nil
+      prefix = "d"
+      suffix = ""
+    when String
+      prefix = prefix_suffix
+      suffix = ""
+    when Array
+      prefix = prefix_suffix[0]
+      suffix = prefix_suffix[1]
+    else
+      raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}"
+    end
+    tmpdir ||= Dir.tmpdir
+    t = Time.now.strftime("%Y%m%d")
+    n = nil
+    begin
+      path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+      path << "-#{n}" if n
+      path << suffix
+      Dir.mkdir(path, 0700)
+    rescue Errno::EEXIST
+      n ||= 0
+      n += 1
+      retry
+    end
+
+    if block_given?
+      begin
+        yield path
+      ensure
+        FileUtils.remove_entry_secure path
+      end
+    else
+      path
+    end
+  end
+end
+
+def main
+  @ruby = File.expand_path('miniruby')
+  @verbose = false
+  $stress = false
+  @color = nil
+  @tty = nil
+  @quiet = false
+  dir = nil
+  quiet = false
+  tests = nil
+  ARGV.delete_if {|arg|
+    case arg
+    when /\A--ruby=(.*)/
+      @ruby = $1
+      @ruby.gsub!(/^([^ ]*)/){File.expand_path($1)}
+      @ruby.gsub!(/(\s+-I\s*)((?!(?:\.\/)*-(?:\s|\z))\S+)/){$1+File.expand_path($2)}
+      @ruby.gsub!(/(\s+-r\s*)(\.\.?\/\S+)/){$1+File.expand_path($2)}
+      true
+    when /\A--sets=(.*)/
+      tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb").sort
+      puts tests.map {|path| File.basename(path) }.inspect
+      true
+    when /\A--dir=(.*)/
+      dir = $1
+      true
+    when /\A(--stress|-s)/
+      $stress = true
+    when /\A--color(?:=(?:always|(auto)|(never)|(.*)))?\z/
+      warn "unknown --color argument: #$3" if $3
+      @color = $1 ? nil : !$2
+      true
+    when /\A--tty(=(?:yes|(no)|(.*)))?\z/
+      warn "unknown --tty argument: #$3" if $3
+      @tty = !$1 || !$2
+      true
+    when /\A(-q|--q(uiet))\z/
+      quiet = true
+      @quiet = true
+      true
+    when /\A(-v|--v(erbose))\z/
+      @verbose = true
+    when /\A(-h|--h(elp)?)\z/
+      puts(<<-End)
+Usage: #{File.basename($0, '.*')} --ruby=PATH [--sets=NAME,NAME,...]
+        --sets=NAME,NAME,...        Name of test sets.
+        --dir=DIRECTORY             Working directory.
+                                    default: /tmp/bootstraptestXXXXX.tmpwd
+        --color[=WHEN]              Colorize the output.  WHEN defaults to 'always'
+                                    or can be 'never' or 'auto'.
+    -s, --stress                    stress test.
+    -v, --verbose                   Output test name before exec.
+    -q, --quiet                     Don\'t print header message.
+    -h, --help                      Print this message and quit.
+End
+      exit true
+    when /\A-j/
+      true
+    else
+      false
+    end
+  }
+  if tests and not ARGV.empty?
+    $stderr.puts "--tests and arguments are exclusive"
+    exit false
+  end
+  tests ||= ARGV
+  tests = Dir.glob("#{File.dirname($0)}/test_*.rb").sort if tests.empty?
+  pathes = tests.map {|path| File.expand_path(path) }
+
+  @progress = %w[- \\ | /]
+  @progress_bs = "\b" * @progress[0].size
+  @tty = $stderr.tty? if @tty.nil?
+  case @color
+  when nil
+    @color = @tty && /dumb/ !~ ENV["TERM"]
+  end
+  @tty &&= !@verbose
+  if @color
+    # dircolors-like style
+    colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:]*)/)] : {}
+    @passed = "\e[#{colors["pass"] || "32"}m"
+    @failed = "\e[#{colors["fail"] || "31"}m"
+    @reset = "\e[m"
+    @erase = "\r\e[2K\r"
+  else
+    @passed = @failed = @reset = @erase = ""
+  end
+  unless quiet
+    puts Time.now
+    if defined?(RUBY_DESCRIPTION)
+      puts "Driver is #{RUBY_DESCRIPTION}"
+    elsif defined?(RUBY_PATCHLEVEL)
+      puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}#{RUBY_PLATFORM}) [#{RUBY_PLATFORM}]"
+    else
+      puts "Driver is ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+    end
+    puts "Target is #{`#{@ruby} -v`.chomp}"
+    puts
+    $stdout.flush
+  end
+
+  in_temporary_working_directory(dir) {
+    exec_test pathes
+  }
+end
+
+def exec_test(pathes)
+  @count = 0
+  @error = 0
+  @errbuf = []
+  @location = nil
+  pathes.each do |path|
+    @basename = File.basename(path)
+    $stderr.print @basename, " "
+    $stderr.puts if @verbose
+    count = @count
+    error = @error
+    load File.expand_path(path)
+    if @tty
+      if @error == error
+        $stderr.print "#{@progress_bs}#{@passed}PASS #{@count-count}#{@reset}"
+        $stderr.print @erase if @quiet
+      else
+        $stderr.print "#{@progress_bs}#{@failed}FAIL #{@error-error}/#{@count-count}#{@reset}"
+      end
+    end
+    $stderr.puts unless @quiet and @tty
+  end
+  if @error == 0
+    if @count == 0
+      $stderr.puts "No tests, no problem"
+    else
+      $stderr.puts "#{@passed}PASS#{@reset} all #{@count} tests"
+    end
+    exit true
+  else
+    @errbuf.each do |msg|
+      $stderr.puts msg
+    end
+    $stderr.puts "#{@failed}FAIL#{@reset} #{@error}/#{@count} tests failed"
+    exit false
+  end
+end
+
+def show_progress(message = '')
+  if @verbose
+    $stderr.print "\##{@count} #{@location} "
+  elsif @tty
+    $stderr.print "#{@progress_bs}#{@progress[@count % @progress.size]}"
+  end
+  faildesc, errout = with_stderr {yield}
+  if !faildesc
+    if @tty
+      $stderr.print "#{@progress_bs}#{@progress[@count % @progress.size]}"
+    else
+      $stderr.print '.'
+    end
+    $stderr.puts if @verbose
+  else
+    $stderr.print "#{@failed}F#{@reset}"
+    $stderr.puts if @verbose
+    error faildesc, message
+    unless errout.empty?
+      $stderr.print "#{@failed}stderr output is not empty#{@reset}\n", adjust_indent(errout)
+    end
+    if @tty and !@verbose
+      $stderr.print @basename, " ", @progress[@count % @progress.size]
+    end
+  end
+rescue Interrupt
+  raise Interrupt
+rescue Exception => err
+  $stderr.print 'E'
+  $stderr.puts if @verbose
+  error err.message, message
+end
+
+# NativeClient is special.  The binary is cross-compiled.  But runs on the build environment.
+# So RUBY_PLATFORM in this process is not useful to detect it.
+def nacl?
+  @ruby and File.basename(@ruby.split(/\s/).first)['sel_ldr']
+end
+
+def assert_check(testsrc, message = '', opt = '')
+  show_progress(message) {
+    result = get_result_string(testsrc, opt)
+    check_coredump
+    yield(result)
+  }
+end
+
+def assert_equal(expected, testsrc, message = '')
+  newtest
+  assert_check(testsrc, message) {|result|
+    if expected == result
+      nil
+    else
+      desc = "#{result.inspect} (expected #{expected.inspect})"
+      pretty(testsrc, desc, result)
+    end
+  }
+end
+
+def assert_match(expected_pattern, testsrc, message = '')
+  newtest
+  assert_check(testsrc, message) {|result|
+    if expected_pattern =~ result
+      nil
+    else
+      desc = "#{expected_pattern.inspect} expected to be =~\n#{result.inspect}"
+      pretty(testsrc, desc, result)
+    end
+  }
+end
+
+def assert_not_match(unexpected_pattern, testsrc, message = '')
+  newtest
+  assert_check(testsrc, message) {|result|
+    if unexpected_pattern !~ result
+      nil
+    else
+      desc = "#{unexpected_pattern.inspect} expected to be !~\n#{result.inspect}"
+      pretty(testsrc, desc, result)
+    end
+  }
+end
+
+def assert_valid_syntax(testsrc, message = '')
+  newtest
+  assert_check(testsrc, message, '-c') {|result|
+    result if /Syntax OK/ !~ result
+  }
+end
+
+def assert_normal_exit(testsrc, *rest)
+  newtest
+  opt = {}
+  opt = rest.pop if Hash === rest.last
+  message, ignore_signals = rest
+  message ||= ''
+  timeout = opt[:timeout]
+  show_progress(message) {
+    faildesc = nil
+    filename = make_srcfile(testsrc)
+    old_stderr = $stderr.dup
+    timeout_signaled = false
+    begin
+      $stderr.reopen("assert_normal_exit.log", "w")
+      io = IO.popen("#{@ruby} -W0 #{filename}")
+      pid = io.pid
+      th = Thread.new {
+        io.read
+        io.close
+        $?
+      }
+      if !th.join(timeout)
+        Process.kill :KILL, pid
+        timeout_signaled = true
+      end
+      status = th.value
+    ensure
+      $stderr.reopen(old_stderr)
+      old_stderr.close
+    end
+    if status && status.signaled?
+      signo = status.termsig
+      signame = Signal.list.invert[signo]
+      unless ignore_signals and ignore_signals.include?(signame)
+        sigdesc = "signal #{signo}"
+        if signame
+          sigdesc = "SIG#{signame} (#{sigdesc})"
+        end
+        if timeout_signaled
+          sigdesc << " (timeout)"
+        end
+        faildesc = pretty(testsrc, "killed by #{sigdesc}", nil)
+        stderr_log = File.read("assert_normal_exit.log")
+        if !stderr_log.empty?
+          faildesc << "\n" if /\n\z/ !~ faildesc
+          stderr_log << "\n" if /\n\z/ !~ stderr_log
+          stderr_log.gsub!(/^.*\n/) { '| ' + $& }
+          faildesc << stderr_log
+        end
+      end
+    end
+    faildesc
+  }
+end
+
+def assert_finish(timeout_seconds, testsrc, message = '')
+  newtest
+  show_progress(message) {
+    faildesc = nil
+    filename = make_srcfile(testsrc)
+    io = IO.popen("#{@ruby} -W0 #{filename}")
+    pid = io.pid
+    waited = false
+    tlimit = Time.now + timeout_seconds
+    while Time.now < tlimit
+      if Process.waitpid pid, Process::WNOHANG
+        waited = true
+        break
+      end
+      sleep 0.1
+    end
+    if !waited
+      Process.kill(:KILL, pid)
+      Process.waitpid pid
+      faildesc = pretty(testsrc, "not finished in #{timeout_seconds} seconds", nil)
+    end
+    io.close
+    faildesc
+  }
+end
+
+def flunk(message = '')
+  newtest
+  show_progress('') { message }
+end
+
+def pretty(src, desc, result)
+  src = src.sub(/\A.*\n/, '')
+  (/\n/ =~ src ? "\n#{adjust_indent(src)}" : src) + "  #=> #{desc}"
+end
+
+INDENT = 27
+
+def adjust_indent(src)
+  untabify(src).gsub(/^ {#{INDENT}}/o, '').gsub(/^/, '   ')
+end
+
+def untabify(str)
+  str.gsub(/^\t+/) {' ' * (8 * $&.size) }
+end
+
+def make_srcfile(src)
+  filename = 'bootstraptest.tmp.rb'
+  File.open(filename, 'w') {|f|
+    f.puts "GC.stress = true" if $stress
+    f.puts "print(begin; #{src}; end)"
+  }
+  filename
+end
+
+def get_result_string(src, opt = '')
+  if @ruby
+    filename = make_srcfile(src)
+    begin
+      `#{@ruby} -W0 #{opt} #{filename}`
+    ensure
+      raise Interrupt if $? and $?.signaled? && $?.termsig == Signal.list["INT"]
+      raise CoreDumpError, "core dumped" if $? and $?.coredump?
+    end
+  else
+    eval(src).to_s
+  end
+end
+
+def with_stderr
+  out = err = nil
+  begin
+    r, w = IO.pipe
+    stderr = $stderr.dup
+    $stderr.reopen(w)
+    w.close
+    reader = Thread.start {r.read}
+    begin
+      out = yield
+    ensure
+      $stderr.reopen(stderr)
+      err = reader.value
+    end
+  ensure
+    w.close rescue nil
+    r.close rescue nil
+  end
+  return out, err
+end
+
+def newtest
+  @location = File.basename(caller(2).first)
+  @count += 1
+  cleanup_coredump
+end
+
+def error(msg, additional_message)
+  msg = "#{@failed}\##{@count} #{@location}#{@reset}: #{msg}  #{additional_message}"
+  if @tty
+    $stderr.puts "#{@erase}#{msg}"
+  else
+    @errbuf.push msg
+  end
+  @error += 1
+end
+
+def in_temporary_working_directory(dir)
+  if dir
+    Dir.mkdir dir
+    Dir.chdir(dir) {
+      yield
+    }
+  else
+    Dir.mktmpdir(["bootstraptest", ".tmpwd"]) {|d|
+      Dir.chdir(d) {
+        yield
+      }
+    }
+  end
+end
+
+def cleanup_coredump
+  FileUtils.rm_f 'core'
+  FileUtils.rm_f Dir.glob('core.*')
+  FileUtils.rm_f @ruby+'.stackdump' if @ruby
+end
+
+class CoreDumpError < StandardError; end
+
+def check_coredump
+  if File.file?('core') or not Dir.glob('core.*').empty? or
+      (@ruby and File.exist?(@ruby+'.stackdump'))
+    raise CoreDumpError, "core dumped"
+  end
+end
+
+main
diff --git a/bootstraptest/test_attr.rb b/bootstraptest/test_attr.rb
new file mode 100644
index 0000000000..721a847145
--- /dev/null
+++ b/bootstraptest/test_attr.rb
@@ -0,0 +1,36 @@
+assert_equal 'ok', %q{
+  module M
+    class A
+      class << self
+        attr_accessor :at
+        def workflow_rule
+          yield self
+        end
+
+        def eval_str(str)
+          eval(str)
+        end
+      end
+    end
+  end
+  begin
+    M::A.eval_str(<<-END)
+    workflow_rule do |r|
+      r.at 1
+    end
+    END
+  rescue ArgumentError => e
+    print "ok"
+  end
+}, '[ruby-core:14641]'
+
+assert_equal %{ok}, %{
+  class A
+    attr :m
+  end
+  begin
+    A.new.m(3)
+  rescue ArgumentError => e
+    print "ok"
+  end
+}, '[ruby-core:15120]'
diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb
new file mode 100644
index 0000000000..a9f8e6dacd
--- /dev/null
+++ b/bootstraptest/test_autoload.rb
@@ -0,0 +1,70 @@
+assert_equal 'ok', %q{
+  File.unlink('zzz.rb') if File.file?('zzz.rb')
+  instance_eval do
+    autoload :ZZZ, './zzz.rb'
+    begin
+      ZZZ
+    rescue LoadError
+      :ok
+    end
+  end
+}, '[ruby-dev:43816]'
+
+assert_equal 'ok', %q{
+  open('zzz.rb', 'w') {|f| f.puts '' }
+  instance_eval do
+    autoload :ZZZ, './zzz.rb'
+    begin
+      ZZZ
+    rescue NameError
+      :ok
+    end
+  end
+}, '[ruby-dev:43816]'
+
+assert_equal 'ok', %q{
+  open('zzz.rb', 'w') {|f| f.puts 'class ZZZ; def self.ok;:ok;end;end'}
+  instance_eval do
+    autoload :ZZZ, './zzz.rb'
+    ZZZ.ok
+  end
+}, '[ruby-dev:43816]'
+
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  autoload :ZZZ, "./zzz.rb"
+  ZZZ.ok
+}
+
+assert_equal 'ok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  autoload :ZZZ, "./zzz.rb"
+  require "./zzz.rb"
+  ZZZ.ok
+}
+
+assert_equal 'okok', %q{
+  open("zzz.rb", "w") {|f| f.puts "class ZZZ; def self.ok;:ok;end;end"}
+  autoload :ZZZ, "./zzz.rb"
+  t1 = Thread.new {ZZZ.ok}
+  t2 = Thread.new {ZZZ.ok}
+  [t1.value, t2.value].join
+}
+
+assert_finish 5, %q{
+  autoload :ZZZ, File.expand_path(__FILE__)
+  begin
+    ZZZ
+  rescue NameError
+  end
+}, '[ruby-core:21696]'
+
+assert_equal 'A::C', %q{
+  open("zzz.rb", "w") {}
+  class A
+    autoload :C, "./zzz"
+    class C
+    end
+    C
+  end
+}
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
new file mode 100644
index 0000000000..6a2ccfc6da
--- /dev/null
+++ b/bootstraptest/test_block.rb
@@ -0,0 +1,599 @@
+assert_equal %q{1}, %q{
+  1.times{
+    begin
+      a = 1
+    ensure
+      foo = nil
+    end
+  }
+}
+assert_equal %q{2}, %q{
+  [1,2,3].find{|x| x == 2}
+}
+assert_equal %q{2}, %q{
+  class E
+    include Enumerable
+    def each(&block)
+      [1, 2, 3].each(&block)
+    end
+  end
+  E.new.find {|x| x == 2 }
+}
+assert_equal %q{6}, %q{
+  sum = 0
+  for x in [1, 2, 3]
+    sum += x
+  end
+  sum
+}
+assert_equal %q{15}, %q{
+  sum = 0
+  for x in (1..5)
+    sum += x
+  end
+  sum
+}
+assert_equal %q{0}, %q{
+  sum = 0
+  for x in []
+    sum += x
+  end
+  sum
+}
+assert_equal %q{1}, %q{
+  ans = []
+  1.times{
+    for n in 1..3
+      a = n
+      ans << a
+    end
+  }
+}
+assert_equal %q{1..3}, %q{
+  ans = []
+  for m in 1..3
+    for n in 1..3
+      a = [m, n]
+      ans << a
+    end
+  end
+}
+assert_equal %q{[1, 2, 3]}, %q{
+  (1..3).to_a
+}
+assert_equal %q{[4, 8, 12]}, %q{
+  (1..3).map{|e|
+    e * 4
+  }
+}
+assert_equal %q{[1, 2, 3]}, %q{
+  class C
+    include Enumerable
+    def each
+      [1,2,3].each{|e|
+        yield e
+      }
+    end
+  end
+
+  C.new.to_a
+}
+assert_equal %q{[4, 5, 6]}, %q{
+  class C
+    include Enumerable
+    def each
+      [1,2,3].each{|e|
+        yield e
+      }
+    end
+  end
+
+  C.new.map{|e|
+    e + 3
+  }
+}
+assert_equal %q{100}, %q{
+  def m
+    yield
+  end
+  def n
+    yield
+  end
+
+  m{
+    n{
+      100
+    }
+  }
+}
+assert_equal %q{20}, %q{
+  def m
+    yield 1
+  end
+
+  m{|ib|
+    m{|jb|
+      i = 20
+    }
+  }
+}
+assert_equal %q{2}, %q{
+  def m
+    yield 1
+  end
+
+  m{|ib|
+    m{|jb|
+      ib = 20
+      kb = 2
+    }
+  }
+}
+assert_equal %q{3}, %q{
+  def iter1
+    iter2{
+      yield
+    }
+  end
+
+  def iter2
+    yield
+  end
+
+  iter1{
+    jb = 2
+    iter1{
+      jb = 3
+    }
+    jb
+  }
+}
+assert_equal %q{2}, %q{
+  def iter1
+    iter2{
+      yield
+    }
+  end
+
+  def iter2
+    yield
+  end
+
+  iter1{
+    jb = 2
+    iter1{
+      jb
+    }
+    jb
+  }
+}
+assert_equal %q{2}, %q{
+  def m
+    yield 1
+  end
+  m{|ib|
+    ib*2
+  }
+}
+assert_equal %q{92580}, %q{
+  def m
+    yield 12345, 67890
+  end
+  m{|ib,jb|
+    ib*2+jb
+  }
+}
+assert_equal %q{[10, nil]}, %q{
+  def iter
+    yield 10
+  end
+
+  a = nil
+  [iter{|a|
+    a
+  }, a]
+}
+assert_equal %q{21}, %q{
+  def iter
+    yield 10
+  end
+
+  iter{|a|
+    iter{|a|
+      a + 1
+    } + a
+  }
+}
+assert_equal %q{[10, 20, 30, 40, nil, nil, nil, nil]}, %q{
+  def iter
+    yield 10, 20, 30, 40
+  end
+
+  a = b = c = d = nil
+  iter{|a, b, c, d|
+    [a, b, c, d]
+  } + [a, b, c, d]
+}
+assert_equal %q{[10, 20, 30, 40, nil, nil]}, %q{
+  def iter
+    yield 10, 20, 30, 40
+  end
+
+  a = b = nil
+  iter{|a, b, c, d|
+    [a, b, c, d]
+  } + [a, b]
+}
+assert_equal %q{[1]}, %q{
+  $a = []
+
+  def iter
+    yield 1
+  end
+
+  def m
+    x = iter{|x|
+      $a << x
+      y = 0
+    }
+  end
+  m
+  $a
+}
+assert_equal %q{[1, [2]]}, %q{
+  def iter
+    yield 1, 2
+  end
+
+  iter{|a, *b|
+    [a, b]
+  }
+}
+assert_equal %q{[[1, 2]]}, %q{
+  def iter
+    yield 1, 2
+  end
+
+  iter{|*a|
+    [a]
+  }
+}
+assert_equal %q{[1, 2, []]}, %q{
+  def iter
+    yield 1, 2
+  end
+
+  iter{|a, b, *c|
+    [a, b, c]
+  }
+}
+assert_equal %q{[1, 2, nil, []]}, %q{
+  def iter
+    yield 1, 2
+  end
+
+  iter{|a, b, c, *d|
+    [a, b, c, d]
+  }
+}
+assert_equal %q{1}, %q{
+  def m
+    yield
+  end
+  m{
+    1
+  }
+}
+assert_equal %q{15129}, %q{
+  def m
+    yield 123
+  end
+  m{|ib|
+    m{|jb|
+      ib*jb
+    }
+  }
+}
+assert_equal %q{2}, %q{
+  def m a
+    yield a
+  end
+  m(1){|ib|
+    m(2){|jb|
+      ib*jb
+    }
+  }
+}
+assert_equal %q{9}, %q{
+  sum = 0
+  3.times{|ib|
+    2.times{|jb|
+      sum += ib + jb
+    }}
+  sum
+}
+assert_equal %q{10}, %q{
+  3.times{|bl|
+    break 10
+  }
+}
+assert_equal %q{[1, 2]}, %q{
+  def iter
+    yield 1,2,3
+  end
+
+  iter{|i, j|
+    [i, j]
+  }
+}
+assert_equal %q{[1, nil]}, %q{
+  def iter
+    yield 1
+  end
+
+  iter{|i, j|
+    [i, j]
+  }
+}
+
+assert_equal '0', %q{
+def m()
+end
+m {|(v0,*,(*)),|}
+m {|(*v0,(*)),|}
+m {|(v0,*v1,(*)),|}
+m {|((v0,*v1,v2)),|}
+m {|(v0,*v1,v2),|}
+m {|(v0,*v1,(v2)),|}
+m {|((*),*v0,v1),|}
+m {|((v0),*v1,v2),|}
+m {|(v0,v1,*v2,v3),|}
+m {|v0,(v1,*v2,v3),|}
+m {|(v0,*v1,v2),v3,|}
+m {|(v0,*v1,v2)|}
+m {|(v0,*v1,v2),&v3|}
+m {|(v0,*v1,v2),*|}
+m {|(v0,*v1,v2),*,&v3|}
+m {|*,(v0,*v1,v2)|}
+m {|*,(v0,*v1,v2),&v3|}
+m {|v0,*,(v1,*v2,v3)|}
+m {|v0,*,(v1,*v2,v3),&v4|}
+m {|(v0,*v1,v2),*,v3|}
+m {|(v0,*v1,v2),*,v3,&v4|}
+m {|(v0, *v1, v2)|}
+m {|(*,v)|}
+0
+}, "block parameter (shouldn't SEGV: [ruby-dev:31143])"
+
+assert_equal 'nil', %q{
+  def m
+    yield
+  end
+  m{|&b| b}.inspect
+}, '[ruby-dev:31147]'
+
+assert_equal 'nil', %q{
+  def m()
+    yield
+  end
+  m {|(v,(*))|}.inspect
+}, '[ruby-dev:31160]'
+
+assert_equal 'nil', %q{
+  def m()
+    yield
+  end
+  m {|(*,a,b)|}.inspect
+}, '[ruby-dev:31153]'
+
+assert_equal 'nil', %q{
+  def m()
+    yield
+  end
+  m {|((*))|}.inspect
+}
+
+assert_equal %q{[1, 1, [1, nil], [1, nil], [1, nil], [1, nil], [1, 1], 1, [1, nil], [1, nil], [1, nil], [1, nil], [[1, 1], [1, 1]], [1, 1], [1, 1], [1, 1], [1, nil], [1, nil], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[1, 1], [1, 1]], [[1, 1], [1, 1]], [[1, 1], [1, 1]], [1, 1], [1, 1], [[[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[[1, 1], [1, 1]], [[1, 1], [1, 1]]], [[1, 1], [1, 1]], [[1, 1], [1, 1]]]}, %q{
+def m(ary = [])
+  yield(ary)
+end
+
+$ans = []
+o = 1
+5.times{
+  v,(*) = o; $ans << o
+  m(o){|(v,(*))| $ans << v}
+  ((x, y)) = o; $ans << [x, y]
+  m(o){|((x, y))| $ans << [x, y]}
+  (((x, y))) = o; $ans << [x, y]
+  m(o){|(((x, y)))| $ans << [x, y]}
+  o = [o, o]
+}; $ans
+}
+
+assert_equal '0', %q{
+  def m()
+    yield [0]
+  end
+  m {|*,v| v}.inspect
+}, '[ruby-dev:31437]'
+assert_equal '[0]', %q{
+  def m
+    yield [0]
+  end
+  m{|v, &b| v}.inspect
+}, '[ruby-dev:31440]'
+assert_equal 'ok', %q{
+  begin
+    lambda{|a|}.call(1, 2)
+  rescue ArgumentError
+    :ok
+  else
+    :ng
+  end
+}, '[ruby-dev:31464]'
+assert_equal 'ok', %q{
+  begin
+    lambda{|&b|}.call(3)
+  rescue ArgumentError
+    :ok
+  else
+    :ng
+  end
+}, '[ruby-dev:31472]'
+assert_equal 'ok', %q{
+  class C
+    def each
+      yield [1,2]
+      yield 1,2
+    end
+  end
+  vs1 = []
+  C.new.each {|*v| vs1 << v }
+  vs2 = []
+  C.new.to_enum.each {|*v| vs2 << v }
+  vs1 == vs2 ? :ok : :ng
+}, '[ruby-dev:32329]'
+
+assert_normal_exit %q{
+  e = [1,2,3].each
+  10000.times {
+    e = [e].each
+  }
+  Thread.new { GC.start }.join
+}, '[ruby-dev:32604]'
+
+
+assert_equal '[nil, []]', %q{
+  def m() yield nil,[] end
+  l = lambda {|*v| v}
+  GC.stress=true
+  r = m(&l)
+  GC.stress=false
+  r.inspect
+}, '[ruby-dev:32567]'
+
+assert_equal NilClass.to_s, %q{
+  r = false; 1.times{|&b| r = b}; r.class
+}
+
+assert_equal 'ok', %q{
+  class C
+    define_method(:foo) do |arg, &block|
+      if block then block.call else arg end
+    end
+  end
+  C.new.foo("ng") {"ok"}
+}, '[ruby-talk:266422]'
+
+assert_equal 'ok', %q{
+  class C
+    define_method(:xyz) do |o, k, &block|
+      block.call(o, k)
+    end
+  end
+  C.new.xyz("o","k") {|o, k| o+k}
+}, '[ruby-core:20544]'
+
+assert_equal 'ok', %q{
+  class C
+    define_method(:xyz) do |*args, &block|
+      block.call(*args)
+    end
+  end
+  C.new.xyz("o","k") {|*args| args.join("")}
+}, '[ruby-core:20544]'
+
+assert_equal 'ok', %q{
+  STDERR.reopen(STDOUT)
+  class C
+    define_method(:foo) do |&block|
+      block.call if block
+    end
+    result = "ng"
+    new.foo() {result = "ok"}
+    result
+  end
+}
+
+assert_equal "ok", %q{
+  class Bar
+    def bar; :ok; end
+  end
+  def foo
+    yield(Bar.new) if block_given?
+  end
+  foo(&:bar)
+}, '[ruby-core:14279]'
+
+assert_normal_exit %q{
+  class Controller
+    def respond_to(&block)
+      responder = Responder.new
+      block.call(responder)
+      responder.respond
+    end
+    def test_for_bug
+      respond_to{|format|
+        format.js{
+          puts "in test"
+          render{|obj|
+            puts obj
+          }
+        }
+      }
+    end
+    def render(&block)
+      puts "in render"
+    end
+  end
+
+  class Responder
+    def method_missing(symbol, &block)
+      puts "enter method_missing"
+      @response = Proc.new{
+        puts 'in method missing'
+        block.call
+      }
+      puts "leave method_missing"
+    end
+    def respond
+      @response.call
+    end
+  end
+  t = Controller.new
+  t.test_for_bug
+}, '[ruby-core:14395]'
+
+assert_equal 'true', %q{
+  class C0
+    def foo
+      block_given?
+    end
+  end
+
+  class C1 < C0
+    def foo
+      super
+    end
+  end
+
+  C1.new.foo{}
+}
+
+assert_equal 'true', %q{
+  class C0
+    def foo
+      block_given?
+    end
+  end
+
+  class C1 < C0
+    def foo
+      super()
+    end
+  end
+
+  C1.new.foo{}
+}
+
diff --git a/bootstraptest/test_class.rb b/bootstraptest/test_class.rb
new file mode 100644
index 0000000000..b7fe0a1acd
--- /dev/null
+++ b/bootstraptest/test_class.rb
@@ -0,0 +1,169 @@
+# class
+assert_equal 'true',    %q( class C; end
+                            Object.const_defined?(:C) )
+assert_equal 'Class',   %q( class C; end
+                            C.class )
+assert_equal 'C',       %q( class C; end
+                            C.name )
+assert_equal 'C',       %q( class C; end
+                            C.new.class )
+assert_equal 'C',       %q( class C; end
+                            C.new.class.name )
+assert_equal 'Class',   %q( class C; end
+                            C.new.class.class )
+assert_equal 'true',    %q( Object.__send__(:remove_const, :TrueClass)
+                            GC.start
+                            true.inspect)
+assert_equal 'false',   %q( Object.__send__(:remove_const, :FalseClass)
+                            GC.start
+                            false.inspect)
+assert_equal 'nil',     %q( Object.__send__(:remove_const, :NilClass)
+                            GC.start
+                            nil.inspect)
+
+
+# inherited class
+assert_equal 'true',    %q( class A; end
+                            class C < A; end
+                            Object.const_defined?(:C) )
+assert_equal 'Class',   %q( class A; end
+                            class C < A; end
+                            C.class )
+assert_equal 'C',       %q( class A; end
+                            class C < A; end
+                            C.name )
+assert_equal 'C',       %q( class A; end
+                            class C < A; end
+                            C.new.class )
+assert_equal 'C',       %q( class A; end
+                            class C < A; end
+                            C.new.class.name )
+assert_equal 'Class',   %q( class A; end
+                            class C < A; end
+                            C.new.class.class )
+
+# module
+assert_equal 'true',    %q( module M; end
+                            Object.const_defined?(:M) )
+assert_equal 'Module',  %q( module M; end
+                            M.class )
+assert_equal 'M',       %q( module M; end
+                            M.name )
+assert_equal 'C',       %q( module M; end
+                            class C; include M; end
+                            C.new.class )
+
+# nested class
+assert_equal 'A::B',    %q( class A; end
+                            class A::B; end
+                            A::B )
+assert_equal 'A::B',    %q( class A; end
+                            class A::B; end
+                            A::B.name )
+assert_equal 'A::B',    %q( class A; end
+                            class A::B; end
+                            A::B.new.class )
+assert_equal 'Class',   %q( class A; end
+                            class A::B; end
+                            A::B.new.class.class )
+assert_equal 'A::B::C', %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C )
+assert_equal 'A::B::C', %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C.name )
+assert_equal 'Class',   %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C.class )
+assert_equal 'A::B::C', %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C.new.class )
+assert_equal 'Class',   %q( class A; end
+                            class A::B; end
+                            class A::B::C; end
+                            A::B::C.new.class.class )
+assert_equal 'A::B2',   %q( class A; end
+                            class A::B; end
+                            class A::B2 < A::B; end
+                            A::B2 )
+assert_equal 'Class',   %q( class A; end
+                            class A::B; end
+                            class A::B2 < A::B; end
+                            A::B2.class )
+
+# reopen
+assert_equal 'true',    %q( class C; end;  c1 = ::C
+                            class C; end;  c2 = ::C
+                            c1.equal?(c2) )
+assert_equal '1',       %q( class C; end
+                            class A; end
+                            begin class C < A; end; rescue TypeError; 1 end )
+assert_equal '1',       %q( class C; end
+                            begin module C; end; rescue TypeError; 1 end )
+assert_equal '1',       %q( C = 1   # [yarv-dev:782]
+                            begin class C; end; rescue TypeError; 1 end )
+assert_equal '1',       %q( C = 1   # [yarv-dev:800]
+                            begin module C; end; rescue TypeError; 1 end )
+
+# colon2, colon3
+assert_equal '1',       %q( class A; end;  A::C = 1;  A::C )
+assert_equal '1',       %q( A = 7;  begin A::C = 7; rescue TypeError; 1 end )
+assert_equal '1',       %q( begin 7::C = 7; rescue TypeError; 1 end )
+assert_equal 'C',       %q( class A; class ::C; end end;  C )
+assert_equal 'Class',   %q( class A; class ::C; end end;  C.class )
+assert_equal 'OK',      %q( class A; ::C = "OK"; end;  C )
+assert_equal 'String',  %q( class A; ::C = "OK"; end;  C.class )
+
+# class/module dup
+assert_equal 'Class',   %q( class C; end;  C.dup.class )
+assert_equal 'Module',  %q( module M; end;  M.dup.class )
+
+
+assert_equal "ok", %q{
+  module Foo
+  end
+
+  begin
+    def foo(&b)
+      Foo.module_eval &b
+    end
+    foo{
+      def bar
+      end
+    }
+    bar()
+  rescue NameError
+    :ok
+  end
+}, '[ruby-core:14378]'
+
+assert_equal '3', %q{
+  $i = 0
+  class C
+    def self.const_missing *args
+      $i+=1
+    end
+  end
+
+  3.times{
+    C::FOO
+  }
+  $i
+}
+
+assert_match /::C\z/, %q{
+  c = nil
+  Module.new{|m| c = class m::C; name; end}
+  c
+}, '[ruby-dev:38456]'
+
+assert_normal_exit %q{
+  s = Symbol.dup
+  class << s
+  end
+  s.allocate.to_s
+}, '[ruby-core:30843]'
diff --git a/bootstraptest/test_eval.rb b/bootstraptest/test_eval.rb
new file mode 100644
index 0000000000..bf7478006d
--- /dev/null
+++ b/bootstraptest/test_eval.rb
@@ -0,0 +1,324 @@
+assert_equal %q{ok}, %q{
+  def m
+    a = :ok
+    $b = binding
+  end
+  m
+  eval('a', $b)
+}
+assert_equal %q{[:ok, :ok2]}, %q{
+  def m
+    a = :ok
+    $b = binding
+  end
+  m
+  eval('b = :ok2', $b)
+  eval('[a, b]', $b)
+}
+assert_equal %q{[nil, 1]}, %q{
+  $ans = []
+  def m
+    $b = binding
+  end
+  m
+  $ans << eval(%q{
+    $ans << eval(%q{
+      a
+    }, $b)
+    a = 1
+  }, $b)
+  $ans
+}
+assert_equal %q{C}, %q{
+  Const = :top
+  class C
+    Const = :C
+    def m
+      binding
+    end
+  end
+  eval('Const', C.new.m)
+}
+assert_equal %q{top}, %q{
+  Const = :top
+  a = 1
+  class C
+    Const = :C
+    def m
+      eval('Const', TOPLEVEL_BINDING)
+    end
+  end
+  C.new.m
+}
+assert_equal %q{:ok
+ok}, %q{
+  class C
+    $b = binding
+  end
+  eval %q{
+    def m
+      :ok
+    end
+  }, $b
+  p C.new.m
+}
+assert_equal %q{ok}, %q{
+  b = proc{
+    a = :ok
+    binding
+  }.call
+  a = :ng
+  eval("a", b)
+}
+assert_equal %q{C}, %q{
+  class C
+    def foo
+      binding
+    end
+  end
+  C.new.foo.eval("self.class.to_s")
+}
+assert_equal %q{1}, %q{
+  eval('1')
+}
+assert_equal %q{1}, %q{
+  eval('a=1; a')
+}
+assert_equal %q{1}, %q{
+  a = 1
+  eval('a')
+}
+assert_equal %q{ok}, %q{
+  __send__ :eval, %{
+    :ok
+  }
+}
+assert_equal %q{ok}, %q{
+  1.__send__ :instance_eval, %{
+    :ok
+  }
+}
+assert_equal %q{1}, %q{
+  1.instance_eval{
+    self
+  }
+}
+assert_equal %q{foo}, %q{
+  'foo'.instance_eval{
+    self
+  }
+}
+assert_equal %q{1}, %q{
+  class Fixnum
+    Const = 1
+  end
+  1.instance_eval %{
+    Const
+  }
+}
+assert_equal %q{top}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  C.module_eval{
+    Const
+  }
+}
+assert_equal %q{C}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  C.class_eval %{
+    def m
+      Const
+    end
+  }
+  C.new.m
+}
+assert_equal %q{top}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  C.class_eval{
+    def m
+      Const
+    end
+  }
+  C.new.m
+}
+assert_equal %q{[:top, :C, :top, :C]}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  $nest = false
+  $ans = []
+  def m
+    $ans << Const
+    C.module_eval %{
+      $ans << Const
+      Boo = false unless defined? Boo
+      unless $nest
+        $nest = true
+        m
+      end
+    }
+  end
+  m
+  $ans
+}
+assert_equal %q{[10, main]}, %q{
+  $nested = false
+  $ans = []
+  $pr = proc{
+    $ans << self
+    unless $nested
+      $nested = true
+      $pr.call
+    end
+  }
+  class C
+    def initialize &b
+      10.instance_eval(&b)
+    end
+  end
+  C.new(&$pr)
+  $ans
+}
+
+%w[break next redo].each do |keyword|
+  assert_match %r"Can't escape from eval with #{keyword}\z", %{
+    begin
+      eval "0 rescue #{keyword}"
+    rescue SyntaxError => e
+      e.message
+    end
+  }, '[ruby-dev:31372]'
+end
+
+assert_normal_exit %q{
+  STDERR.reopen(STDOUT)
+  class Foo
+     def self.add_method
+       class_eval("def some-bad-name; puts 'hello' unless @some_variable.some_function(''); end")
+     end
+  end
+  Foo.add_method
+}, '[ruby-core:14556] reported by Frederick Cheung'
+
+assert_equal 'ok', %q{
+  class Module
+    def my_module_eval(&block)
+      module_eval(&block)
+    end
+  end
+  class String
+    Integer.my_module_eval do
+      def hoge; end
+    end
+  end
+  if Integer.instance_methods(false).map{|m|m.to_sym}.include?(:hoge) &&
+     !String.instance_methods(false).map{|m|m.to_sym}.include?(:hoge)
+    :ok
+  else
+    :ng
+  end
+}, "[ruby-dev:34236]"
+
+assert_equal 'ok', %q{
+  begin
+    eval("class nil::Foo; end")
+    :ng
+  rescue Exception
+    :ok
+  end
+}
+
+assert_equal 'ok', %q{
+  begin
+    0.instance_eval { def m() :m end }
+    1.m
+    :ng
+  rescue Exception
+    :ok
+  end
+}, '[ruby-dev:34579]'
+
+assert_equal 'ok', %q{
+  begin
+    12.instance_eval { @@a }
+  rescue NameError
+    :ok
+  end
+}, '[ruby-core:16794]'
+
+assert_equal 'ok', %q{
+  begin
+    12.instance_exec { @@a }
+  rescue NameError
+    :ok
+  end
+}, '[ruby-core:16794]'
+
+assert_equal 'ok', %q{
+  nil.instance_eval {
+    def defd_using_instance_eval() :ok end
+  }
+  nil.defd_using_instance_eval
+}, '[ruby-core:28324]'
+
+assert_equal 'ok', %q{
+  nil.instance_exec {
+    def defd_using_instance_exec() :ok end
+  }
+  nil.defd_using_instance_exec
+}, '[ruby-core:28324]'
+
+assert_normal_exit %q{
+  eval("", method(:proc).call {}.binding)
+}
+
+assert_equal "", %q{
+  b = binding
+  10.times{
+    eval('', b)
+  }
+  begin
+    eval('1.times{raise}', b)
+  rescue => e
+    e.message
+  end
+}, '[ruby-dev:35392]'
+
+assert_equal "[:x]", %q{
+  def kaboom!
+    yield.eval("local_variables")
+  end
+
+  for x in enum_for(:kaboom!)
+    binding
+  end
+}, '[ruby-core:25125]'
+
+assert_normal_exit %q{
+  hash = {}
+  ("aaaa".."matz").each_with_index do |s, i|
+    hash[s] = i
+  end
+  begin
+    eval "class C; @@h = #{hash.inspect}; end"
+  end
+}, '[ruby-core:25714]'
+
+assert_normal_exit %q{
+  begin
+    eval("# encoding:utf-16le\nfoo")
+  rescue Exception => e
+    p e
+    RubyVM::InstructionSequence.compile("p:hello")
+  end
+}, 'check escaping the internal value th->base_block'
+
diff --git a/bootstraptest/test_exception.rb b/bootstraptest/test_exception.rb
new file mode 100644
index 0000000000..35c8d25e37
--- /dev/null
+++ b/bootstraptest/test_exception.rb
@@ -0,0 +1,432 @@
+assert_equal %q{2}, %q{
+  begin
+    1+1
+  ensure
+    2+2
+  end
+}
+assert_equal %q{4}, %q{
+  begin
+    1+1
+    begin
+      2+2
+    ensure
+      3+3
+    end
+  ensure
+    4+4
+  end
+}
+assert_equal %q{4}, %q{
+  begin
+    1+1
+    begin
+      2+2
+    ensure
+      3+3
+    end
+  ensure
+    4+4
+    begin
+      5+5
+    ensure
+      6+6
+    end
+  end
+}
+assert_equal %q{NilClass}, %q{
+  a = nil
+  1.times{|e|
+    begin
+    rescue => err
+    end
+    a = err.class
+  }
+  a
+}
+assert_equal %q{RuntimeError}, %q{
+  a = nil
+  1.times{|e|
+    begin
+      raise
+    rescue => err
+    end
+    a = err.class
+  }
+  a
+}
+assert_equal %q{}, %q{
+  $!
+}
+assert_equal %q{FOO}, %q{
+  begin
+    raise "FOO"
+  rescue
+    $!
+  end
+}
+assert_equal %q{FOO}, %q{
+  def m
+    $!
+  end
+  begin
+    raise "FOO"
+  rescue
+    m()
+  end
+}
+assert_equal %q{[#<RuntimeError: BAR>, #<RuntimeError: FOO>]}, %q{
+  $ans = []
+  def m
+    $!
+  end
+  begin
+    raise "FOO"
+  rescue
+    begin
+      raise "BAR"
+    rescue
+      $ans << m()
+    end
+    $ans << m()
+  end
+  $ans
+}
+assert_equal %q{[#<RuntimeError: FOO>, #<RuntimeError: FOO>]}, %q{
+  $ans = []
+  def m
+    $!
+  end
+
+  begin
+    begin
+      raise "FOO"
+    ensure
+      $ans << m()
+    end
+  rescue
+    $ans << m()
+  end
+}
+assert_equal %q{[nil]}, %q{
+  $ans = []
+  def m
+    $!
+  end
+  def m2
+    1.times{
+      begin
+        return
+      ensure
+        $ans << m
+      end
+    }
+  end
+  m2
+  $ans
+}
+assert_equal %q{ok}, %q{
+  begin
+    raise
+  rescue
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  begin
+    raise
+  rescue
+    :ok
+  ensure
+    :ng
+  end
+}
+assert_equal %q{RuntimeError}, %q{
+  begin
+    raise
+  rescue => e
+    e.class
+  end
+}
+assert_equal %q{ng}, %q{
+  begin
+    raise
+  rescue StandardError
+    :ng
+  rescue Exception
+    :ok
+  end
+}
+assert_equal %q{c}, %q{
+  begin
+    begin
+      raise "a"
+    rescue
+      raise "b"
+    ensure
+      raise "c"
+    end
+  rescue => e
+    e.message
+  end
+}
+assert_equal %q{33}, %q{
+  def m a, b
+    a + b
+  end
+  m(1, begin
+         raise
+       rescue
+         2
+       end) +
+  m(10, begin
+         raise
+       rescue
+         20
+       ensure
+         30
+       end)
+}
+assert_equal %q{3}, %q{
+  def m a, b
+    a + b
+  end
+  m(begin
+      raise
+    rescue
+      1
+    end,
+    begin
+      raise
+    rescue
+      2
+    end)
+}
+assert_equal %q{ok3}, %q{
+  class E1 < Exception
+  end
+
+  def m
+    yield
+  end
+
+  begin
+    begin
+      begin
+        m{
+          raise
+        }
+      rescue E1
+        :ok2
+      ensure
+      end
+    rescue
+      :ok3
+    ensure
+    end
+  rescue E1
+    :ok
+  ensure
+  end
+}
+assert_equal %q{7}, %q{
+  $i = 0
+  def m
+    iter{
+      begin
+        $i += 1
+        begin
+          $i += 2
+          break
+        ensure
+
+        end
+      ensure
+        $i += 4
+      end
+      $i = 0
+    }
+  end
+
+  def iter
+    yield
+  end
+  m
+  $i
+}
+assert_equal %q{10}, %q{
+  $i = 0
+  def m
+    begin
+      $i += 1
+      begin
+        $i += 2
+        return
+      ensure
+        $i += 3
+      end
+    ensure
+      $i += 4
+    end
+    p :end
+  end
+  m
+  $i
+}
+assert_equal %q{1}, %q{
+  begin
+    1
+  rescue
+    2
+  end
+}
+assert_equal %q{4}, %q{
+  begin
+    1
+    begin
+      2
+    rescue
+      3
+    end
+    4
+  rescue
+    5
+  end
+}
+assert_equal %q{3}, %q{
+  begin
+    1
+  rescue
+    2
+  else
+    3
+  end
+}
+assert_equal %q{2}, %q{
+  begin
+    1+1
+  rescue
+    2+2
+  ensure
+    3+3
+  end
+   }
+assert_equal %q{2}, %q{
+  begin
+    1+1
+  rescue
+    2+2
+  ensure
+    3+3
+  end
+   }
+assert_equal %q{6}, %q{
+  begin
+    1+1
+  rescue
+    2+2
+  else
+    3+3
+  ensure
+    4+4
+  end
+   }
+assert_equal %q{12}, %q{
+ begin
+   1+1
+   begin
+     2+2
+   rescue
+     3+3
+   else
+     4+4
+   end
+ rescue
+   5+5
+ else
+   6+6
+ ensure
+   7+7
+ end
+   }
+assert_equal %q{ok}, %q{ #
+  proc{
+    begin
+      raise
+      break
+    rescue
+      :ok
+    end
+  }.call
+}
+assert_equal %q{}, %q{
+  proc do
+    begin
+      raise StandardError
+      redo
+    rescue StandardError
+    end
+  end.call
+}
+
+##
+assert_match /undefined method `foo\'/, %q{#`
+  STDERR.reopen(STDOUT)
+  class C
+    def inspect
+      bar {}
+    end
+
+    def bar
+      raise
+    ensure
+    end
+  end
+  C.new.foo
+}, "[ruby-dev:31407]"
+
+assert_equal 'nil', %q{
+  doit = false
+  exc = nil
+  t = Thread.new {
+    begin
+      doit = true
+      sleep 10
+    ensure
+      exc = $!
+    end
+  }
+  Thread.pass until doit
+  t.kill
+  t.join
+  exc.inspect
+}, '[ruby-dev:32608]'
+
+assert_equal 'exception class/object expected', %q{
+  class ZeroDivisionError
+    def self.new(message)
+      42
+    end
+  end
+  begin
+    1/0
+  rescue Exception => e
+    e.message
+  end
+}, '[ruby-core:24767]'
+
+assert_equal 'ok', %q{
+  class C
+    def ===(o)
+      true
+    end
+  end
+  begin
+    begin
+      raise
+    rescue C.new
+    end
+  rescue TypeError
+    :ok
+  end
+}
diff --git a/bootstraptest/test_finalizer.rb b/bootstraptest/test_finalizer.rb
new file mode 100644
index 0000000000..22a16b1220
--- /dev/null
+++ b/bootstraptest/test_finalizer.rb
@@ -0,0 +1,8 @@
+assert_normal_exit %q{
+a1,a2,b1,b2=Array.new(4){""}
+ObjectSpace.define_finalizer(b2,proc{})
+ObjectSpace.define_finalizer(b1,proc{b1.inspect})
+
+ObjectSpace.define_finalizer(a2,proc{a1.inspect})
+ObjectSpace.define_finalizer(a1,proc{})
+}, '[ruby-dev:35778]'
diff --git a/bootstraptest/test_flip.rb b/bootstraptest/test_flip.rb
new file mode 100644
index 0000000000..ff194868b2
--- /dev/null
+++ b/bootstraptest/test_flip.rb
@@ -0,0 +1 @@
+assert_equal %q{E}, %q{$_ = "E"; eval("nil if true..~/^E/",nil,"-e"); $_}
diff --git a/bootstraptest/test_flow.rb b/bootstraptest/test_flow.rb
new file mode 100644
index 0000000000..0390062a24
--- /dev/null
+++ b/bootstraptest/test_flow.rb
@@ -0,0 +1,591 @@
+assert_equal %q{[1, 2, 4, 5, 6, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each{; $a << 2
+    break; $a << 3
+  }; $a << 4
+  begin; $a << 5
+  ensure; $a << 6
+  end; $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 6, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  begin; $a << 2
+    [1,2].each do; $a << 3
+      break; $a << 4
+    end; $a << 5
+  ensure; $a << 6
+  end; $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{ok}, %q{
+  ["a"].inject("ng"){|x,y|
+    break :ok
+  }
+}
+assert_equal %q{ok}, %q{
+  unless ''.respond_to? :lines
+    class String
+      def lines
+        self
+      end
+    end
+  end
+
+  ('a').lines.map{|e|
+    break :ok
+  }
+}
+assert_equal %q{[1, 2, 4, 5]}, %q{$a = []; begin; ; $a << 1
+  ["a"].inject("ng"){|x,y|; $a << 2
+    break :ok; $a << 3
+  }; $a << 4
+; $a << 5
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 4, 5]}, %q{$a = []; begin; ; $a << 1
+  ('a'..'b').map{|e|; $a << 2
+    break :ok; $a << 3
+  }; $a << 4
+; $a << 5
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      break; $a << 4
+    ensure; $a << 5
+    end; $a << 6
+  end; $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 9, 10]}, %q{$a = []; begin; ; $a << 1
+  i=0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    begin; $a << 5
+    ensure; $a << 6
+      break; $a << 7
+    end; $a << 8
+  end; $a << 9
+; $a << 10
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 7, 10, 11]}, %q{$a = []; begin; ; $a << 1
+  i=0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    begin; $a << 5
+      raise; $a << 6
+    ensure; $a << 7
+      break; $a << 8
+    end; $a << 9
+  end; $a << 10
+; $a << 11
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 7, 10, 11]}, %q{$a = []; begin; ; $a << 1
+  i=0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    begin; $a << 5
+      raise; $a << 6
+    rescue; $a << 7
+      break; $a << 8
+    end; $a << 9
+  end; $a << 10
+; $a << 11
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      raise StandardError; $a << 4
+    ensure; $a << 5
+      break; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      raise StandardError; $a << 4
+    rescue; $a << 5
+      break; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 6, 8, 10, 11]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      begin; $a << 4
+        break; $a << 5
+      ensure; $a << 6
+      end; $a << 7
+    ensure; $a << 8
+    end; $a << 9
+  end; $a << 10
+; $a << 11
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 14, 15]}, %q{$a = []; begin; ; $a << 1
+  i = 0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    j = 0; $a << 5
+    while j<3; $a << 6
+      j+=1; $a << 7
+      begin; $a << 8
+        raise; $a << 9
+      rescue; $a << 10
+        break; $a << 11
+      end; $a << 12
+    end; $a << 13
+  end; $a << 14
+; $a << 15
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 16, 17]}, %q{$a = []; begin; ; $a << 1
+  i = 0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    j = 0; $a << 5
+    while j<3; $a << 6
+      j+=1; $a << 7
+      1.times{; $a << 8
+        begin; $a << 9
+          raise; $a << 10
+        rescue; $a << 11
+          break; $a << 12
+        end; $a << 13
+      }; $a << 14
+    end; $a << 15
+  end; $a << 16
+; $a << 17
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 3, 4, 5, 6, 7, 8, 10, 13, 14, 15]}, %q{$a = []; begin; ; $a << 1
+  i = 0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    j = 0; $a << 5
+    while j<3; $a << 6
+      j+=1; $a << 7
+      begin; $a << 8
+        raise; $a << 9
+      ensure; $a << 10
+        break; $a << 11
+      end; $a << 12
+    end; $a << 13
+  end; $a << 14
+; $a << 15
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 3, 4, 5, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 6, 7, 8, 9, 11, 14, 15, 16, 17]}, %q{$a = []; begin; ; $a << 1
+  i = 0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    j = 0; $a << 5
+    while j<3; $a << 6
+      j+=1; $a << 7
+      1.times{; $a << 8
+        begin; $a << 9
+          raise; $a << 10
+        ensure; $a << 11
+          break; $a << 12
+        end; $a << 13
+      }; $a << 14
+    end; $a << 15
+  end; $a << 16
+; $a << 17
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  while true; $a << 2
+    begin; $a << 3
+      break; $a << 4
+    ensure; $a << 5
+      break; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 99]}, %q{
+$a = [];
+begin; ; $a << 1
+  while true; $a << 2
+    begin; $a << 3
+      break; $a << 4
+    ensure; $a << 5
+      raise; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 6, 8, 9, 10, 11]}, %q{$a = []; begin;  ; $a << 1
+  begin; $a << 2
+    [1,2].each do; $a << 3
+      begin; $a << 4
+        break; $a << 5
+      ensure; $a << 6
+      end; $a << 7
+    end; $a << 8
+  ensure; $a << 9
+  end; $a << 10
+; $a << 11
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 4, 99]}, %q{$a = []; begin; ; $a << 1
+  begin; $a << 2
+    raise StandardError; $a << 3
+  ensure; $a << 4
+  end; $a << 5
+; $a << 6
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4]}, %q{$a = []; begin;  ; $a << 1
+  begin; $a << 2
+  ensure; $a << 3
+  end ; $a << 4
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 5, 99]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      break; $a << 4
+    ensure; $a << 5
+      raise StandardError; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{3}, %q{
+  def m a, b
+    a + b
+  end
+  m(1,
+    while true
+      break 2
+    end
+    )
+}
+assert_equal %q{4}, %q{
+  def m a, b
+    a + b
+  end
+  m(1,
+    (i=0; while i<2
+       i+=1
+       class C
+         next 2
+       end
+     end; 3)
+    )
+}
+assert_equal %q{34}, %q{
+  def m a, b
+    a+b
+  end
+  m(1, 1.times{break 3}) +
+  m(10, (1.times{next 3}; 20))
+}
+assert_equal %q{[1, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
+  3.times{; $a << 2
+    class C; $a << 3
+      break; $a << 4
+    end; $a << 5
+  }; $a << 6
+; $a << 7
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  3.times{; $a << 2
+    class A; $a << 3
+      class B; $a << 4
+        break; $a << 5
+      end; $a << 6
+    end; $a << 7
+  }; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 2, 3, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
+  3.times{; $a << 2
+    class C; $a << 3
+      next; $a << 4
+    end; $a << 5
+  }; $a << 6
+; $a << 7
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 2, 3, 4, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  3.times{; $a << 2
+    class C; $a << 3
+      class D; $a << 4
+        next; $a << 5
+      end; $a << 6
+    end; $a << 7
+  }; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 6, 7]}, %q{$a = []; begin; ; $a << 1
+  while true; $a << 2
+    class C; $a << 3
+      break; $a << 4
+    end; $a << 5
+  end; $a << 6
+; $a << 7
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  while true; $a << 2
+    class C; $a << 3
+      class D; $a << 4
+        break; $a << 5
+      end; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 3, 4, 5, 3, 4, 5, 3, 4, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  i=0; $a << 2
+  while i<3; $a << 3
+    i+=1; $a << 4
+    class C; $a << 5
+      next 10; $a << 6
+    end; $a << 7
+  end; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{1}, %q{
+  1.times{
+    while true
+      class C
+        begin
+          break
+        ensure
+          break
+        end
+      end
+    end
+  }
+}
+assert_equal %q{[1, 2, 3, 5, 2, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  [1,2].each do; $a << 2
+    begin; $a << 3
+      next; $a << 4
+    ensure; $a << 5
+    end; $a << 6
+  end; $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 2, 6, 3, 5, 7, 8]}, %q{$a = []; begin;  ; $a << 1
+  o = "test"; $a << 2
+  def o.test(a); $a << 3
+    return a; $a << 4
+  ensure; $a << 5
+  end; $a << 6
+  o.test(123); $a << 7
+; $a << 8
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 4, 7, 5, 8, 9]}, %q{$a = []; begin; ; $a << 1
+  def m1 *args; $a << 2
+    ; $a << 3
+  end; $a << 4
+  def m2; $a << 5
+    m1(:a, :b, (return 1; :c)); $a << 6
+  end; $a << 7
+  m2; $a << 8
+; $a << 9
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 8, 2, 3, 4, 5, 9, 10]}, %q{$a = []; begin; ; $a << 1
+  def m(); $a << 2
+    begin; $a << 3
+      2; $a << 4
+    ensure; $a << 5
+      return 3; $a << 6
+    end; $a << 7
+  end; $a << 8
+  m; $a << 9
+; $a << 10
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 3, 11, 4, 5, 6, 7, 12, 13]}, %q{$a = []; begin; ; $a << 1
+  def m2; $a << 2
+  end; $a << 3
+  def m(); $a << 4
+    m2(begin; $a << 5
+         2; $a << 6
+       ensure; $a << 7
+         return 3; $a << 8
+       end); $a << 9
+    4; $a << 10
+  end; $a << 11
+  m(); $a << 12
+; $a << 13
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[1, 16, 2, 3, 4, 5, 6, 7, 10, 11, 17, 18]}, %q{$a = []; begin; ; $a << 1
+  def m; $a << 2
+    1; $a << 3
+    1.times{; $a << 4
+      2; $a << 5
+      begin; $a << 6
+        3; $a << 7
+        return; $a << 8
+        4; $a << 9
+      ensure; $a << 10
+        5; $a << 11
+      end; $a << 12
+      6; $a << 13
+    }; $a << 14
+    7; $a << 15
+  end; $a << 16
+  m(); $a << 17
+; $a << 18
+; rescue Exception; $a << 99; end; $a}
+assert_equal %q{[:ok, :ok2, :last]}, %q{
+  a = []
+  i = 0
+  begin
+    while i < 1
+      i+=1
+      begin
+        begin
+          next
+        ensure
+          a << :ok
+        end
+      ensure
+        a << :ok2
+      end
+    end
+  ensure
+    a << :last
+  end
+  a
+}
+assert_equal %q{[:ok, :ok2, :last]}, %q{
+  a = []
+  i = 0
+  begin
+    while i < 1
+      i+=1
+      begin
+        begin
+          break
+        ensure
+          a << :ok
+        end
+      ensure
+        a << :ok2
+      end
+    end
+  ensure
+    a << :last
+  end
+  a
+}
+assert_equal %q{[:ok, :ok2, :last]}, %q{
+  a = []
+  i = 0
+  begin
+    while i < 1
+      if i>0
+        break
+      end
+      i+=1
+      begin
+        begin
+          redo
+        ensure
+          a << :ok
+        end
+      ensure
+        a << :ok2
+      end
+    end
+  ensure
+    a << :last
+  end
+  a
+}
+assert_equal %Q{ENSURE\n}, %q{
+  def test
+    while true
+      return
+    end
+  ensure
+    puts("ENSURE")
+  end
+  test
+}, '[ruby-dev:37967]'
+
+[['[ruby-core:28129]', %q{
+  class Bug2728
+    include Enumerable
+    define_method(:dynamic_method) do
+      "dynamically defined method"
+    end
+    def each
+      begin
+        yield :foo
+      ensure
+        dynamic_method
+      end
+    end
+  end
+  e = Bug2728.new
+}],
+ ['[ruby-core:28132]', %q{
+  class Bug2729
+    include Enumerable
+    def each
+      begin
+        yield :foo
+      ensure
+        proc {}.call
+      end
+    end
+  end
+  e = Bug2729.new
+}],
+ ['[ruby-core:39125]', %q{
+  class Bug5234
+    include Enumerable
+    def each
+      begin
+        yield :foo
+      ensure
+        proc
+      end
+    end
+  end
+  e = Bug5234.new
+}],
+ ['[ruby-dev:45656]', %q{
+  class Bug6460
+    include Enumerable
+    def each
+      begin
+        yield :foo
+      ensure
+        1.times { Proc.new }
+      end
+    end
+  end
+  e = Bug6460.new
+}]].each do |bug, src|
+  assert_equal "foo", src + %q{e.detect {true}}, bug
+  assert_equal "true", src + %q{e.any? {true}}, bug
+  assert_equal "false", src + %q{e.all? {false}}, bug
+  assert_equal "true", src + %q{e.include?(:foo)}, bug
+end
+
+assert_equal "foo", %q{
+  class Bug6460
+    def m1
+      m2 {|e|
+        return e
+      }
+    end
+
+    def m2
+      begin
+        yield :foo
+      ensure
+        begin
+          begin
+            yield :foo
+          ensure
+            Proc.new
+            raise ''
+          end
+        rescue
+        end
+      end
+    end
+  end
+  Bug6460.new.m1
+}, '[ruby-dev:46372]'
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
new file mode 100644
index 0000000000..384294727f
--- /dev/null
+++ b/bootstraptest/test_fork.rb
@@ -0,0 +1,69 @@
+assert_equal '0', %q{
+  begin
+    GC.stress = true
+    pid = fork {}
+    Process.wait pid
+    $?.to_i
+  rescue NotImplementedError
+    0
+  end
+}, '[ruby-dev:32404]'
+
+assert_finish 10, %q{
+  begin
+    children = (1..10).map{
+      Thread.start{fork{}}.value
+    }
+    while !children.empty? and pid = Process.wait
+      children.delete(pid)
+    end
+  rescue NotImplementedError
+  end
+}, '[ruby-core:22158]'
+
+assert_normal_exit(<<'End', '[ruby-dev:37934]')
+  Thread.new { sleep 1; Thread.kill Thread.main }
+  Process.setrlimit(:NPROC, 1)
+  fork {}
+End
+
+assert_equal 'ok', %q{
+  begin
+    if pid1 = fork
+      sleep 1
+      Process.kill("USR1", pid1)
+      _, s = Process.wait2(pid1)
+      s.success? ? :ok : :ng
+    else
+      if pid2 = fork
+        trap("USR1") { Time.now.to_s }
+        Process.wait2(pid2)
+      else
+        sleep 2
+      end
+      exit 0
+    end
+  rescue NotImplementedError
+    :ok
+  end
+}, '[ruby-core:28924]'
+
+assert_equal '[1, 2]', %q{
+  a = []
+  trap(:INT) { a.push(1) }
+  trap(:TERM) { a.push(2) }
+  pid = $$
+  begin
+    fork do
+      sleep 0.5
+      Process.kill(:INT, pid)
+      Process.kill(:TERM, pid)
+    end
+
+    sleep 1
+    a.sort
+  rescue NotImplementedError
+    [1, 2]
+  end
+}, '[ruby-dev:44005] [Ruby 1.9 - Bug #4950]'
+
diff --git a/bootstraptest/test_gc.rb b/bootstraptest/test_gc.rb
new file mode 100644
index 0000000000..eb68c9845e
--- /dev/null
+++ b/bootstraptest/test_gc.rb
@@ -0,0 +1,34 @@
+assert_normal_exit %q{
+a = []
+ms = "a".."k"
+("A".."Z").each do |mod|
+  mod = eval("module #{mod}; self; end")
+  ms.each do |meth|
+    iseq = RubyVM::InstructionSequence.compile("module #{mod}; def #{meth}; end; end")
+    GC.stress = true
+    iseq.eval
+    GC.stress = false
+  end
+  o = Object.new.extend(mod)
+  ms.each do |meth|
+    o.send(meth)
+  end
+end
+}, '[ruby-dev:39453]'
+
+assert_normal_exit %q{
+a = []
+ms = "a".."k"
+("A".."Z").each do |mod|
+  mod = eval("module #{mod}; self; end")
+  ms.each do |meth|
+    GC.stress = true
+    mod.module_eval {define_method(meth) {}}
+    GC.stress = false
+  end
+  o = Object.new.extend(mod)
+  ms.each do |meth|
+    o.send(meth)
+  end
+end
+}, '[ruby-dev:39453]'
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
new file mode 100644
index 0000000000..f7360f34b3
--- /dev/null
+++ b/bootstraptest/test_io.rb
@@ -0,0 +1,112 @@
+assert_finish 5, %q{
+  r, w = IO.pipe
+  t1 = Thread.new { r.sysread(1) }
+  t2 = Thread.new { r.sysread(1) }
+  sleep 0.1
+  w.write "a"
+  sleep 0.1
+  w.write "a"
+}, '[ruby-dev:31866]'
+
+assert_finish 10, %q{
+  begin
+    require "io/nonblock"
+    require "timeout"
+    timeout(3) do
+      r, w = IO.pipe
+      w.nonblock?
+      w.nonblock = true
+      w.write_nonblock("a" * 100000)
+      w.nonblock = false
+      t1 = Thread.new { w.write("b" * 4096) }
+      t2 = Thread.new { w.write("c" * 4096) }
+      sleep 0.5
+      r.sysread(4096).length
+      sleep 0.5
+      r.sysread(4096).length
+      t1.join
+      t2.join
+    end
+  rescue LoadError, TimeoutError, NotImplementedError
+  end
+}, '[ruby-dev:32566]'
+
+assert_finish 1, %q{
+  r, w = IO.pipe
+  Thread.new {
+  w << "ab"
+  sleep 0.1
+  w << "ab"
+  }
+  r.gets("abab")
+}
+
+assert_equal 'ok', %q{
+  require 'tmpdir'
+  begin
+    tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
+    rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
+  rescue Errno::EEXIST
+    retry
+  end
+  save = STDIN.dup
+  STDIN.reopen(rw)
+  STDIN.reopen(save)
+  rw.close
+  File.unlink(tmpname) unless RUBY_PLATFORM['nacl']
+  :ok
+}
+
+assert_equal 'ok', %q{
+  require 'tmpdir'
+  begin
+    tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
+    rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
+  rescue Errno::EEXIST
+    retry
+  end
+  save = STDIN.dup
+  STDIN.reopen(rw)
+  STDIN.print "a"
+  STDIN.reopen(save)
+  rw.close
+  File.unlink(tmpname) unless RUBY_PLATFORM['nacl']
+  :ok
+}
+
+assert_equal 'ok', %q{
+  dup = STDIN.dup
+  dupfd = dup.fileno
+  dupfd == STDIN.dup.fileno ? :ng : :ok
+}, '[ruby-dev:46834]'
+
+assert_normal_exit %q{
+  ARGF.set_encoding "foo"
+}
+
+10.times do
+  assert_normal_exit %q{
+    at_exit { p :foo }
+
+    megacontent = "abc" * 12345678
+    #File.open("megasrc", "w") {|f| f << megacontent }
+
+    Thread.new { sleep rand*0.2; Process.kill(:INT, $$) }
+
+    r1, w1 = IO.pipe
+    r2, w2 = IO.pipe
+    t1 = Thread.new { w1 << megacontent; w1.close }
+    t2 = Thread.new { r2.read; r2.close }
+    IO.copy_stream(r1, w2) rescue nil
+    w2.close
+    r1.close
+    t1.join
+    t2.join
+  }, 'megacontent-copy_stream', ["INT"], :timeout => 10 or break
+end
+
+assert_normal_exit %q{
+  r, w = IO.pipe
+  STDOUT.reopen(w)
+  STDOUT.reopen(__FILE__, "r")
+}, '[ruby-dev:38131]'
diff --git a/bootstraptest/test_jump.rb b/bootstraptest/test_jump.rb
new file mode 100644
index 0000000000..595aaa7c4b
--- /dev/null
+++ b/bootstraptest/test_jump.rb
@@ -0,0 +1,308 @@
+assert_equal %q{ok}, %q{
+  def m
+    :ng1
+    mm{
+      yield
+    }
+    :ng2
+  end
+
+  def mm
+    :ng3
+    yield
+    :ng4
+  end
+
+  m{
+    break :ok
+  }
+}
+assert_equal %q{ok}, %q{
+  3.times{
+    break :ok
+  }
+}
+assert_equal %q{}, %q{
+  catch(:foo){
+    throw :foo
+  }
+}
+assert_equal %q{false}, %q{
+  catch(:foo){
+    throw :foo, false
+  }
+}
+assert_equal %q{}, %q{
+  catch(:foo){
+    throw :foo, nil
+  }
+}
+assert_equal %q{ok}, %q{
+  catch(:foo){
+    throw :foo, :ok
+  }
+}
+assert_equal %q{}, %q{
+  catch(:foo){
+    1.times{
+      throw :foo
+    }
+  }
+}
+assert_equal %q{ok}, %q{
+  catch(:foo){
+    1.times{
+      throw :foo, :ok
+    }
+  }
+}
+assert_equal %q{ok}, %q{
+  catch(:foo){
+    catch(:bar){
+      throw :foo, :ok
+    }
+    :ng
+  }
+}
+assert_equal %q{ok}, %q{
+  catch(:foo){
+    catch(:bar){
+      1.times{
+        throw :foo, :ok
+      }
+    }
+    :ng
+  }
+}
+assert_equal %q{2}, %q{
+  module Enumerable
+    def all_?
+      self.each{|e|
+        unless yield(e)
+          return false
+        end
+      }
+      true
+    end
+  end
+
+  xxx = 0
+  [1,2].each{|bi|
+    [3,4].each{|bj|
+      [true, nil, true].all_?{|be| be}
+      break
+    }
+    xxx += 1
+  }
+  xxx
+}
+assert_equal %q{ok}, %q{
+  def m
+    yield
+  end
+
+  m{
+    begin
+    ensure
+      break :ok
+    end
+  }
+}
+assert_equal %q{ok}, %q{
+  def m
+    yield
+    :ok
+  end
+  i=0
+  m{
+    if i>10
+      i*i
+    else
+      i+=1
+      next
+    end
+  }
+}
+assert_equal %q{ok}, %q{
+  def m
+    yield
+  end
+
+  m{
+    next :ok
+  }
+}
+assert_equal %q{131}, %q{
+  def m
+    yield + 10
+  end
+  i=0
+  m{
+    if i>10
+      i*i
+    else
+      i+=1
+      redo
+    end
+  }
+}
+assert_equal %q{ok}, %q{
+begin
+  eval %q{
+    1.times{
+      retry
+    }
+  }
+rescue SyntaxError
+  :ok
+end
+}
+assert_equal %q{3}, %q{
+  def m
+    return 3
+  end
+  m
+}
+assert_equal %q{ok}, %q{
+  def m
+    :ng1
+    mm{
+      return :ok
+    }
+    :ng2
+  end
+
+  def mm
+    :ng3
+    yield
+    :ng4
+  end
+  m
+}
+assert_equal %q{100}, %q{
+  $i = 0
+  def m
+    begin
+      iter{
+        return
+      }
+    ensure
+      $i = 100
+    end
+  end
+
+  def iter
+    yield
+  end
+  m
+  $i
+}
+assert_equal %q{ok}, %q{
+  def m
+    begin
+      raise
+    rescue
+      return :ok
+    end
+    :ng
+  end
+  m
+}
+assert_equal %q{1}, %q{
+  def m
+    begin
+      raise
+    rescue
+      return 1
+    end
+  end
+
+  m
+}
+assert_equal %q{1}, %q{
+  def m
+    begin
+      #
+    ensure
+      return 1
+    end
+  end
+
+  m
+}
+assert_equal 'ok', %q{
+  begin
+    catch {|t| throw t, :ok }
+  rescue ArgumentError
+    :ng
+  end
+}, '[ruby-dev:31609]'
+
+assert_equal "1", %q{
+  catch do |t|
+    begin
+      throw t, 1
+      2
+    ensure
+      3
+    end
+  end
+}, "[ruby-dev:31698]"
+
+assert_normal_exit %q{
+  f = 0
+  1.times do
+    begin
+      f += 1
+    ensure
+      redo unless f > 2
+    end
+  end
+}
+
+assert_normal_exit %q{
+  -> do
+    1.times do
+      begin
+        raise
+      rescue
+        return
+      end
+    end
+  end.call
+}
+
+assert_normal_exit %q{
+  while true
+    begin
+      raise
+      next
+    rescue
+    end
+    break
+  end
+}, '[ruby-core:28172]'
+
+assert_equal "true", %q{
+  class Object
+    def return_eigenclass
+      class << self
+        return self
+      end
+    end
+  end
+  s = "foo"
+  s.return_eigenclass == class << s; self; end
+}, '[ruby-core:21379]'
+
+assert_equal "true", %q{
+  class Object
+    def yield_eigenclass
+      class << self
+        yield self
+      end
+    end
+  end
+  s = "foo"
+  s.yield_eigenclass {|c| c == class << s; self; end }
+}, '[ruby-dev:40975]'
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
new file mode 100644
index 0000000000..b95a2f2d0a
--- /dev/null
+++ b/bootstraptest/test_literal.rb
@@ -0,0 +1,231 @@
+# empty program
+assert_equal '',                ''
+assert_equal '',                ' '
+assert_equal '',                "\n"
+
+# special const
+assert_equal 'true',            'true'
+assert_equal 'TrueClass',       'true.class'
+assert_equal 'false',           'false'
+assert_equal 'FalseClass',      'false.class'
+assert_equal '',                'nil'
+assert_equal 'nil',             'nil.inspect'
+assert_equal 'NilClass',        'nil.class'
+assert_equal 'sym',             ':sym'
+assert_equal ':sym',            ':sym.inspect'
+assert_equal 'Symbol',          ':sym.class'
+assert_equal '1234',            '1234'
+assert_equal 'Fixnum',          '1234.class'
+assert_equal '1234',            '1_2_3_4'
+assert_equal 'Fixnum',          '1_2_3_4.class'
+assert_equal '18',              '0x12'
+assert_equal 'Fixnum',          '0x12.class'
+assert_equal '15',              '0o17'
+assert_equal 'Fixnum',          '0o17.class'
+assert_equal '5',               '0b101'
+assert_equal 'Fixnum',          '0b101.class'
+assert_equal '123456789012345678901234567890', '123456789012345678901234567890'
+assert_equal 'Bignum',          '123456789012345678901234567890.class'
+assert_equal '2.0',             '2.0'
+assert_equal 'Float',           '1.3.class'
+
+# self
+assert_equal 'main',            'self'
+assert_equal 'Object',          'self.class'
+
+# string literal
+assert_equal 'a',               '?a'
+assert_equal 'String',          '?a.class'
+assert_equal 'A',               '?A'
+assert_equal 'String',          '?A.class'
+assert_equal "\n",              '?\n'
+assert_equal 'String',          '?\n.class'
+assert_equal ' ',               '?\ '
+assert_equal 'String',          '?\ .class'
+assert_equal 'string',          "'string'"
+assert_equal 'string',          '"string"'
+assert_equal 'string',          '%(string)'
+assert_equal 'string',          '%q(string)'
+assert_equal 'string',          '%Q(string)'
+assert_equal 'string string',   '"string string"'
+assert_equal ' ',               '" "'
+assert_equal "\0",              '"\0"'
+assert_equal "\1",              '"\1"'
+assert_equal "3",               '"\x33"'
+assert_equal "\n",              '"\n"'
+
+# dynamic string literal
+assert_equal '2',               '"#{1 + 1}"'
+assert_equal '16',              '"#{2 ** 4}"'
+assert_equal 'string',          's = "string"; "#{s}"'
+
+# dynamic symbol literal
+assert_equal 'a3c',             ':"a#{1+2}c"'
+assert_equal ':a3c',            ':"a#{1+2}c".inspect'
+assert_equal 'Symbol',          ':"a#{1+2}c".class'
+
+# xstring
+unless nacl?
+  assert_equal "foo\n",           %q(`echo foo`)
+  assert_equal "foo\n",           %q(s = "foo"; `echo #{s}`)
+end
+
+# regexp
+assert_equal '',                '//.source'
+assert_equal 'Regexp',          '//.class'
+assert_equal '0',               '// =~ "a"'
+assert_equal '0',               '// =~ ""'
+assert_equal 'a',               '/a/.source'
+assert_equal 'Regexp',          '/a/.class'
+assert_equal '0',               '/a/ =~ "a"'
+assert_equal '0',               '/test/ =~ "test"'
+assert_equal '',                '/test/ =~ "tes"'
+assert_equal '0',               're = /test/; re =~ "test"'
+assert_equal '0',               'str = "test"; /test/ =~ str'
+assert_equal '0',               're = /test/; str = "test"; re =~ str'
+
+# dynacmi regexp
+assert_equal 'regexp',          %q(/re#{'ge'}xp/.source)
+assert_equal 'Regexp',          %q(/re#{'ge'}xp/.class)
+
+# array
+assert_equal 'Array',           '[].class'
+assert_equal '0',               '[].size'
+assert_equal '0',               '[].length'
+assert_equal '[]',              '[].inspect'
+assert_equal 'Array',           '[0].class'
+assert_equal '1',               '[3].size'
+assert_equal '[3]',             '[3].inspect'
+assert_equal '3',               'a = [3]; a[0]'
+assert_equal 'Array',           '[1,2].class'
+assert_equal '2',               '[1,2].size'
+assert_equal '[1, 2]',           '[1,2].inspect'
+assert_equal 'Array',           '[1,2,3,4,5].class'
+assert_equal '5',               '[1,2,3,4,5].size'
+assert_equal '[1, 2, 3, 4, 5]', '[1,2,3,4,5].inspect'
+assert_equal '1',               'a = [1,2]; a[0]'
+assert_equal '2',               'a = [1,2]; a[1]'
+assert_equal 'Array',           'a = [1 + 2, 3 + 4, 5 + 6]; a.class'
+assert_equal '[3, 7, 11]',      'a = [1 + 2, 3 + 4, 5 + 6]; a.inspect'
+assert_equal '7',               'a = [1 + 2, 3 + 4, 5 + 6]; a[1]'
+assert_equal '1',               '([0][0] += 1)'
+assert_equal '1',               '([2][0] -= 1)'
+assert_equal 'Array',           'a = [obj = Object.new]; a.class'
+assert_equal '1',               'a = [obj = Object.new]; a.size'
+assert_equal 'true',            'a = [obj = Object.new]; a[0] == obj'
+assert_equal '5',               'a = [1,2,3]; a[1] = 5; a[1]'
+assert_equal 'bar',             '[*:foo];:bar'
+assert_equal '[1, 2]',          'def nil.to_a; [2]; end; [1, *nil]'
+assert_equal '[1, 2]',          'def nil.to_a; [1, 2]; end; [*nil]'
+assert_equal '[0, 1, {2=>3}]',  '[0, *[1], 2=>3]', "[ruby-dev:31592]"
+
+
+# hash
+assert_equal 'Hash',            '{}.class'
+assert_equal '{}',              '{}.inspect'
+assert_equal 'Hash',            '{1=>2}.class'
+assert_equal '{1=>2}',          '{1=>2}.inspect'
+assert_equal '2',               'h = {1 => 2}; h[1]'
+assert_equal '0',               'h = {1 => 2}; h.delete(1); h.size'
+assert_equal '',                'h = {1 => 2}; h.delete(1); h[1]'
+assert_equal '2',               'h = {"string" => "literal", "goto" => "hell"}; h.size'
+assert_equal 'literal', 'h = {"string"=>"literal", "goto"=>"hell"}; h["string"]'
+assert_equal 'hell', 'h = {"string"=>"literal", "goto"=>"hell"}; h["goto"]'
+
+# range
+assert_equal 'Range',           '(1..2).class'
+assert_equal '1..2',            '(1..2).inspect'
+assert_equal '1',               '(1..2).begin'
+assert_equal '2',               '(1..2).end'
+assert_equal 'false',           '(1..2).exclude_end?'
+assert_equal 'Range',           'r = 1..2; r.class'
+assert_equal '1..2',            'r = 1..2; r.inspect'
+assert_equal '1',               'r = 1..2; r.begin'
+assert_equal '2',               'r = 1..2; r.end'
+assert_equal 'false',           'r = 1..2; r.exclude_end?'
+assert_equal 'Range',           '(1...3).class'
+assert_equal '1...3',           '(1...3).inspect'
+assert_equal '1',               '(1...3).begin'
+assert_equal '3',               '(1...3).end'
+assert_equal 'true',            '(1...3).exclude_end?'
+assert_equal 'Range',           'r = (1...3); r.class'
+assert_equal '1...3',           'r = (1...3); r.inspect'
+assert_equal '1',               'r = (1...3); r.begin'
+assert_equal '3',               'r = (1...3); r.end'
+assert_equal 'true',            'r = (1...3); r.exclude_end?'
+assert_equal 'Range',           'r = (1+2 .. 3+4); r.class'
+assert_equal '3..7',            'r = (1+2 .. 3+4); r.inspect'
+assert_equal '3',               'r = (1+2 .. 3+4); r.begin'
+assert_equal '7',               'r = (1+2 .. 3+4); r.end'
+assert_equal 'false',           'r = (1+2 .. 3+4); r.exclude_end?'
+assert_equal 'Range',           'r = (1+2 ... 3+4); r.class'
+assert_equal '3...7',           'r = (1+2 ... 3+4); r.inspect'
+assert_equal '3',               'r = (1+2 ... 3+4); r.begin'
+assert_equal '7',               'r = (1+2 ... 3+4); r.end'
+assert_equal 'true',            'r = (1+2 ... 3+4); r.exclude_end?'
+assert_equal 'Range',           'r = ("a".."c"); r.class'
+assert_equal '"a".."c"',        'r = ("a".."c"); r.inspect'
+assert_equal 'a',               'r = ("a".."c"); r.begin'
+assert_equal 'c',               'r = ("a".."c"); r.end'
+
+assert_equal 'String',          '__FILE__.class'
+assert_equal 'Fixnum',          '__LINE__.class'
+
+###
+
+assert_equal 'ok', %q{
+  # this cause "called on terminated object".
+  ObjectSpace.each_object(Module) {|m| m.name.inspect }
+  :ok
+}
+
+assert_normal_exit %q{
+  begin
+    r = 0**-1
+    r + r
+  rescue
+  end
+}, '[ruby-dev:34524]'
+
+assert_normal_exit %q{
+  begin
+    r = Marshal.load("\x04\bU:\rRational[\ai\x06i\x05")
+    r + r
+  rescue
+  end
+}, '[ruby-dev:34536]'
+
+assert_equal 'ok', %q{
+  "#{}""#{}ok"
+}, '[ruby-dev:38968]'
+
+assert_equal 'ok', %q{
+  "#{}o""#{}k""#{}"
+}, '[ruby-core:25284]'
+
+assert_equal 'ok', %q{ #  long array literal
+  x = nil
+  eval "a = [#{(1..10_000).map{'x'}.join(", ")}]"
+  :ok
+}
+
+assert_equal 'ok', %q{ #  long array literal (optimized)
+  eval "a = [#{(1..10_000).to_a.join(", ")}]"
+  :ok
+}
+
+assert_equal 'ok', %q{ #  long hash literal
+  x = nil
+  eval "a = {#{(1..10_000).map{|n| "#{n} => x"}.join(', ')}}"
+  :ok
+}
+
+assert_equal 'ok', %q{ #  long hash literal (optimized)
+  eval "a = {#{(1..10_000).map{|n| "#{n} => #{n}"}.join(', ')}}"
+  :ok
+}
+
+assert_equal 'ok', %q{
+  [print(:ok), exit] # void literal with side-effect
+  :dummy
+}
diff --git a/bootstraptest/test_literal_suffix.rb b/bootstraptest/test_literal_suffix.rb
new file mode 100644
index 0000000000..4316c9e040
--- /dev/null
+++ b/bootstraptest/test_literal_suffix.rb
@@ -0,0 +1,54 @@
+# numbers with suffix
+assert_equal '0/1',             '0r'
+assert_equal 'Rational',        '0r.class'
+assert_equal '1/1',             '1r'
+assert_equal 'Rational',        '1r.class'
+assert_equal '-1/1',            '-1r'
+assert_equal 'Rational',        '(-1r).class'
+assert_equal '1/1',             '0x1r'
+assert_equal 'Rational',        '0x1r.class'
+assert_equal '1/1',             '0b1r'
+assert_equal 'Rational',        '0b1r.class'
+assert_equal '1/1',             '0d1r'
+assert_equal 'Rational',        '0d1r.class'
+assert_equal '1/1',             '0o1r'
+assert_equal 'Rational',        '0o1r.class'
+assert_equal '1/1',             '01r'
+assert_equal 'Rational',        '01r.class'
+assert_equal '6/5',             '1.2r'
+assert_equal 'Rational',        '1.2r.class'
+assert_equal '-6/5',            '-1.2r'
+assert_equal 'Rational',        '(-1.2r).class'
+assert_equal '0+0i',            '0i'
+assert_equal 'Complex',         '0i.class'
+assert_equal '0+1i',            '1i'
+assert_equal 'Complex',         '1i.class'
+assert_equal '0+1i',            '0x1i'
+assert_equal 'Complex',         '0x1i.class'
+assert_equal '0+1i',            '0b1i'
+assert_equal 'Complex',         '0b1i.class'
+assert_equal '0+1i',            '0d1i'
+assert_equal 'Complex',         '0d1i.class'
+assert_equal '0+1i',            '0o1i'
+assert_equal 'Complex',         '0o1i.class'
+assert_equal '0+1i',            '01i'
+assert_equal 'Complex',         '01i.class'
+assert_equal '0+1.2i',          '1.2i'
+assert_equal 'Complex',         '1.2i.class'
+assert_equal '0+1/1i',          '1ri'
+assert_equal 'Complex',         '1ri.class'
+assert_equal '0+6/5i',          '1.2ri'
+assert_equal 'Complex',         '1.2ri.class'
+assert_equal '0+10.0i',         '1e1i'
+assert_equal 'Complex',         '1e1i.class'
+assert_equal '1',               '1if true'
+assert_equal '1',               '1rescue nil'
+assert_equal '10000000000000000001/10000000000000000000',
+             '1.0000000000000000001r'
+
+assert_equal 'syntax error, unexpected tIDENTIFIER, expecting end-of-input',
+             %q{begin eval('1ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
+assert_equal 'syntax error, unexpected tIDENTIFIER, expecting end-of-input',
+             %q{begin eval('1.2ir', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
+assert_equal 'syntax error, unexpected tIDENTIFIER, expecting end-of-input',
+             %q{begin eval('1e1r', nil, '', 0); rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end}
diff --git a/bootstraptest/test_load.rb b/bootstraptest/test_load.rb
new file mode 100644
index 0000000000..e63c93a8f4
--- /dev/null
+++ b/bootstraptest/test_load.rb
@@ -0,0 +1,27 @@
+assert_equal 'ok', %q{
+  open("require-lock-test.rb", "w") {|f|
+    f.puts "sleep 0.1"
+    f.puts "module M"
+    f.puts "end"
+  }
+  $:.unshift Dir.pwd
+  vs = (1..2).map {|i|
+    Thread.start {
+      require "require-lock-test"
+      M
+    }
+  }.map {|t| t.value }
+  vs[0] == M && vs[1] == M ? :ok : :ng
+}, '[ruby-dev:32048]'
+
+assert_equal 'ok', %q{
+  %w[a a/foo b].each {|d| Dir.mkdir(d)}
+  open("b/foo", "w") {|f| f.puts "$ok = :ok"}
+  $:.replace(%w[a b])
+  begin
+    load "foo"
+    $ok
+  rescue => e
+    e.message
+  end
+}, '[ruby-dev:38097]'
diff --git a/bootstraptest/test_marshal.rb b/bootstraptest/test_marshal.rb
new file mode 100644
index 0000000000..7e34176169
--- /dev/null
+++ b/bootstraptest/test_marshal.rb
@@ -0,0 +1,5 @@
+
+assert_normal_exit %q{
+  Marshal.load(Marshal.dump({"k"=>"v"}), lambda {|v| v})
+}
+
diff --git a/bootstraptest/test_massign.rb b/bootstraptest/test_massign.rb
new file mode 100644
index 0000000000..0f63dd424a
--- /dev/null
+++ b/bootstraptest/test_massign.rb
@@ -0,0 +1,183 @@
+assert_equal '[[1], 2, 3]', '*v1, (a, b) = [1,[2, 3]]; [v1, a, b]'
+assert_equal '[[1], 2, 3]', '*v1,(*), (a, b) = [1,:x,[2, 3]]; [v1, a, b]'
+
+assert_equal '[]',          '*a = *nil; a'
+assert_equal '[nil]',       '*a = nil; a'
+assert_equal '2',           'a, a = 1, 2; a', "[ruby-dev:31522]"
+assert_equal '[1, 2]',      'a, b = 1, 2'
+assert_equal '[1, 2]', %q{
+  ans = []
+  trace_var(:$a){|v| ans << v}
+  trace_var(:$b){|v| ans << v}
+  $a, $b = 1, 2
+  ans
+}
+
+assert_equal 'ok', %q{
+  r = :ok
+  :ng.tap {|(r)|}
+  r
+}, '[ruby-dev:31507]'
+
+=begin
+# generated by this script:
+
+3.times{|i|
+  8.times{|e|
+    ary = (0...e).to_a
+    a,b,c,d,e,f = nil
+    vals = %w(a b c d e f)
+    vals[i] = '*' + vals[i]
+    program = "#{vals.join(", ")} = *ary"
+    eval(program)
+    ans = [a,b,c,d,e,f]
+    puts %Q{
+      assert_equal "#{ans.inspect}", %q{
+        ary = #{ary.inspect}
+        #{program}; [a, b, c, d, e, f]
+      }}
+  }
+}
+=end
+
+      assert_equal "[[], nil, nil, nil, nil, nil]", %q{
+        ary = []
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, nil, nil, nil, nil]", %q{
+        ary = [0]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, 1, nil, nil, nil]", %q{
+        ary = [0, 1]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, 1, 2, nil, nil]", %q{
+        ary = [0, 1, 2]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, 1, 2, 3, nil]", %q{
+        ary = [0, 1, 2, 3]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[], 0, 1, 2, 3, 4]", %q{
+        ary = [0, 1, 2, 3, 4]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[0], 1, 2, 3, 4, 5]", %q{
+        ary = [0, 1, 2, 3, 4, 5]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[[0, 1], 2, 3, 4, 5, 6]", %q{
+        ary = [0, 1, 2, 3, 4, 5, 6]
+        *a, b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[nil, [], nil, nil, nil, nil]", %q{
+        ary = []
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], nil, nil, nil, nil]", %q{
+        ary = [0]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], 1, nil, nil, nil]", %q{
+        ary = [0, 1]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], 1, 2, nil, nil]", %q{
+        ary = [0, 1, 2]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], 1, 2, 3, nil]", %q{
+        ary = [0, 1, 2, 3]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [], 1, 2, 3, 4]", %q{
+        ary = [0, 1, 2, 3, 4]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [1], 2, 3, 4, 5]", %q{
+        ary = [0, 1, 2, 3, 4, 5]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, [1, 2], 3, 4, 5, 6]", %q{
+        ary = [0, 1, 2, 3, 4, 5, 6]
+        a, *b, c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[nil, nil, [], nil, nil, nil]", %q{
+        ary = []
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, nil, [], nil, nil, nil]", %q{
+        ary = [0]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [], nil, nil, nil]", %q{
+        ary = [0, 1]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [], 2, nil, nil]", %q{
+        ary = [0, 1, 2]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [], 2, 3, nil]", %q{
+        ary = [0, 1, 2, 3]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [], 2, 3, 4]", %q{
+        ary = [0, 1, 2, 3, 4]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [2], 3, 4, 5]", %q{
+        ary = [0, 1, 2, 3, 4, 5]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+      assert_equal "[0, 1, [2, 3], 4, 5, 6]", %q{
+        ary = [0, 1, 2, 3, 4, 5, 6]
+        a, b, *c, d, e, f = *ary; [a, b, c, d, e, f]
+      }
+
+
+#
+assert_equal 'ok', %q{
+  a,s=[],"aaa"
+  300.times { a<<s; s=s.succ }
+  eval <<-END__
+  GC.stress=true
+  Fiber.new do
+    #{ a.join(",") },*zzz=1
+  end.resume
+  END__
+  :ok
+}, '[ruby-dev:32581]'
+
+assert_equal 'ok', %q{
+  while true
+    *, z = 1
+    break
+  end
+  :ok
+}, '[ruby-dev:32892]'
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb
new file mode 100644
index 0000000000..4282bc6273
--- /dev/null
+++ b/bootstraptest/test_method.rb
@@ -0,0 +1,1220 @@
+# regular argument
+assert_equal '1',       'def m() 1 end; m()'
+assert_equal '1',       'def m(a) a end; m(1)'
+assert_equal '[1, 2]',  'def m(a,b) [a, b] end; m(1,2)'
+assert_equal '[1, 2, 3]', 'def m(a,b,c) [a, b, c] end; m(1,2,3)'
+assert_equal 'wrong number of arguments (1 for 0)', %q{
+  def m; end
+  begin
+    m(1)
+  rescue => e
+    e.message
+  end
+}
+
+assert_equal 'wrong number of arguments (0 for 1)', %q{
+  def m a; end
+  begin
+    m
+  rescue => e
+    e.message
+  end
+}
+
+# default argument
+assert_equal '1',       'def m(x=1) x end; m()'
+assert_equal '1',       'def m(x=7) x end; m(1)'
+assert_equal '1',       'def m(a,x=1) x end; m(7)'
+assert_equal '1',       'def m(a,x=7) x end; m(7,1)'
+assert_equal '1',       'def m(a,b,x=1) x end; m(7,7)'
+assert_equal '1',       'def m(a,b,x=7) x end; m(7,7,1)'
+assert_equal '1',       'def m(a,x=1,y=1) x end; m(7)'
+assert_equal '1',       'def m(a,x=1,y=1) y end; m(7)'
+assert_equal '1',       'def m(a,x=7,y=1) x end; m(7,1)'
+assert_equal '1',       'def m(a,x=7,y=1) y end; m(7,1)'
+assert_equal '1',       'def m(a,x=7,y=7) x end; m(7,1,1)'
+assert_equal '1',       'def m(a,x=7,y=7) y end; m(7,1,1)'
+
+# rest argument
+assert_equal '[]',      'def m(*a) a end; m().inspect'
+assert_equal '[1]',     'def m(*a) a end; m(1).inspect'
+assert_equal '[1, 2]',  'def m(*a) a end; m(1,2).inspect'
+assert_equal '[]',      'def m(x,*a) a end; m(7).inspect'
+assert_equal '[1]',     'def m(x,*a) a end; m(7,1).inspect'
+assert_equal '[1, 2]',  'def m(x,*a) a end; m(7,1,2).inspect'
+assert_equal '[]',      'def m(x,y,*a) a end; m(7,7).inspect'
+assert_equal '[1]',     'def m(x,y,*a) a end; m(7,7,1).inspect'
+assert_equal '[1, 2]',  'def m(x,y,*a) a end; m(7,7,1,2).inspect'
+assert_equal '[]',      'def m(x,y=7,*a) a end; m(7).inspect'
+assert_equal '[]',      'def m(x,y,z=7,*a) a end; m(7,7).inspect'
+assert_equal '[]',      'def m(x,y,z=7,*a) a end; m(7,7,7).inspect'
+assert_equal '[]',      'def m(x,y,z=7,zz=7,*a) a end; m(7,7,7).inspect'
+assert_equal '[]',      'def m(x,y,z=7,zz=7,*a) a end; m(7,7,7,7).inspect'
+assert_equal '1',       'def m(x,y,z=7,zz=1,*a) zz end; m(7,7,7).inspect'
+assert_equal '1',       'def m(x,y,z=7,zz=1,*a) zz end; m(7,7,7).inspect'
+assert_equal '1',       'def m(x,y,z=7,zz=7,*a) zz end; m(7,7,7,1).inspect'
+
+# block argument
+assert_equal 'Proc',    'def m(&block) block end; m{}.class'
+assert_equal 'nil',     'def m(&block) block end; m().inspect'
+assert_equal 'Proc',    'def m(a,&block) block end; m(7){}.class'
+assert_equal 'nil',     'def m(a,&block) block end; m(7).inspect'
+assert_equal '1',       'def m(a,&block) a end; m(1){}'
+assert_equal 'Proc',    'def m(a,b=nil,&block) block end; m(7){}.class'
+assert_equal 'nil',     'def m(a,b=nil,&block) block end; m(7).inspect'
+assert_equal 'Proc',    'def m(a,b=nil,&block) block end; m(7,7){}.class'
+assert_equal '1',       'def m(a,b=nil,&block) b end; m(7,1){}'
+assert_equal 'Proc',    'def m(a,b=nil,*c,&block) block end; m(7){}.class'
+assert_equal 'nil',     'def m(a,b=nil,*c,&block) block end; m(7).inspect'
+assert_equal '1',       'def m(a,b=nil,*c,&block) a end; m(1).inspect'
+assert_equal '1',       'def m(a,b=1,*c,&block) b end; m(7).inspect'
+assert_equal '1',       'def m(a,b=7,*c,&block) b end; m(7,1).inspect'
+assert_equal '[1]',     'def m(a,b=7,*c,&block) c end; m(7,7,1).inspect'
+
+# splat
+assert_equal '1',       'def m(a) a end; m(*[1])'
+assert_equal '1',       'def m(x,a) a end; m(7,*[1])'
+assert_equal '1',       'def m(x,y,a) a end; m(7,7,*[1])'
+assert_equal '1',       'def m(a,b) a end; m(*[1,7])'
+assert_equal '1',       'def m(a,b) b end; m(*[7,1])'
+assert_equal '1',       'def m(x,a,b) b end; m(7,*[7,1])'
+assert_equal '1',       'def m(x,y,a,b) b end; m(7,7,*[7,1])'
+assert_equal '1',       'def m(a,b,c) a end; m(*[1,7,7])'
+assert_equal '1',       'def m(a,b,c) b end; m(*[7,1,7])'
+assert_equal '1',       'def m(a,b,c) c end; m(*[7,7,1])'
+assert_equal '1',       'def m(x,a,b,c) a end; m(7,*[1,7,7])'
+assert_equal '1',       'def m(x,y,a,b,c) a end; m(7,7,*[1,7,7])'
+
+# hash argument
+assert_equal '1',       'def m(h) h end; m(7=>1)[7]'
+assert_equal '1',       'def m(h) h end; m(7=>1).size'
+assert_equal '1',       'def m(h) h end; m(7=>1, 8=>7)[7]'
+assert_equal '2',       'def m(h) h end; m(7=>1, 8=>7).size'
+assert_equal '1',       'def m(h) h end; m(7=>1, 8=>7, 9=>7)[7]'
+assert_equal '3',       'def m(h) h end; m(7=>1, 8=>7, 9=>7).size'
+assert_equal '1',       'def m(x,h) h end; m(7, 7=>1)[7]'
+assert_equal '1',       'def m(x,h) h end; m(7, 7=>1, 8=>7)[7]'
+assert_equal '1',       'def m(x,h) h end; m(7, 7=>1, 8=>7, 9=>7)[7]'
+assert_equal '1',       'def m(x,y,h) h end; m(7,7, 7=>1)[7]'
+assert_equal '1',       'def m(x,y,h) h end; m(7,7, 7=>1, 8=>7)[7]'
+assert_equal '1',       'def m(x,y,h) h end; m(7,7, 7=>1, 8=>7, 9=>7)[7]'
+
+# block argument
+assert_equal '1',       %q(def m(&block) mm(&block) end
+                           def mm() yield 1 end
+                           m {|a| a })
+assert_equal '1',       %q(def m(x,&block) mm(x,&block) end
+                           def mm(x) yield 1 end
+                           m(7) {|a| a })
+assert_equal '1',       %q(def m(x,y,&block) mm(x,y,&block) end
+                           def mm(x,y) yield 1 end
+                           m(7,7) {|a| a })
+
+# recursive call
+assert_equal '1',       %q(def m(n) n == 0 ? 1 : m(n-1) end; m(5))
+
+# instance method
+assert_equal '1',       %q(class C; def m() 1 end end;  C.new.m)
+assert_equal '1',       %q(class C; def m(a) a end end;  C.new.m(1))
+assert_equal '1',       %q(class C; def m(a = 1) a end end;  C.new.m)
+assert_equal '[1]',     %q(class C; def m(*a) a end end;  C.new.m(1).inspect)
+assert_equal '1',       %q( class C
+                              def m() mm() end
+                              def mm() 1 end
+                            end
+                            C.new.m )
+
+# singleton method (const)
+assert_equal '1',       %q(class C; def C.m() 1 end end;  C.m)
+assert_equal '1',       %q(class C; def C.m(a) a end end;  C.m(1))
+assert_equal '1',       %q(class C; def C.m(a = 1) a end end;  C.m)
+assert_equal '[1]',     %q(class C; def C.m(*a) a end end;  C.m(1).inspect)
+assert_equal '1',       %q(class C; end; def C.m() 1 end;  C.m)
+assert_equal '1',       %q(class C; end; def C.m(a) a end;  C.m(1))
+assert_equal '1',       %q(class C; end; def C.m(a = 1) a end;  C.m)
+assert_equal '[1]',     %q(class C; end; def C.m(*a) a end;  C.m(1).inspect)
+assert_equal '1',       %q(class C; def m() 7 end end; def C.m() 1 end;  C.m)
+assert_equal '1',       %q( class C
+                              def C.m() mm() end
+                              def C.mm() 1 end
+                            end
+                            C.m )
+
+# singleton method (lvar)
+assert_equal '1',       %q(obj = Object.new; def obj.m() 1 end;  obj.m)
+assert_equal '1',       %q(obj = Object.new; def obj.m(a) a end;  obj.m(1))
+assert_equal '1',       %q(obj = Object.new; def obj.m(a=1) a end;  obj.m)
+assert_equal '[1]',     %q(obj = Object.new; def obj.m(*a) a end;  obj.m(1))
+assert_equal '1',       %q(class C; def m() 7 end; end
+                           obj = C.new
+                           def obj.m() 1 end
+                           obj.m)
+
+# inheritance
+assert_equal '1',       %q(class A; def m(a) a end end
+                           class B < A; end
+                           B.new.m(1))
+assert_equal '1',       %q(class A; end
+                           class B < A; def m(a) a end end
+                           B.new.m(1))
+assert_equal '1',       %q(class A; def m(a) a end end
+                           class B < A; end
+                           class C < B; end
+                           C.new.m(1))
+
+# include
+assert_equal '1',       %q(class A; def m(a) a end end
+                           module M; end
+                           class B < A; include M; end
+                           B.new.m(1))
+assert_equal '1',       %q(class A; end
+                           module M; def m(a) a end end
+                           class B < A; include M; end
+                           B.new.m(1))
+
+# alias
+assert_equal '1',       %q( def a() 1 end
+                            alias m a
+                            m() )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias m a
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias :m a
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias m :a
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias :m :a
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def a() 1 end
+                              alias m a
+                              undef a
+                            end
+                            C.new.m )
+
+# undef
+assert_equal '1',       %q( class C
+                              def m() end
+                              undef m
+                            end
+                            begin C.new.m; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class A
+                              def m() end
+                            end
+                            class C < A
+                              def m() end
+                              undef m
+                            end
+                            begin C.new.m; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class A; def a() end end   # [yarv-dev:999]
+                            class B < A
+                              def b() end
+                              undef a, b
+                            end
+                            begin B.new.a; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class A; def a() end end   # [yarv-dev:999]
+                            class B < A
+                              def b() end
+                              undef a, b
+                            end
+                            begin B.new.b; rescue NoMethodError; 1 end )
+
+assert_equal '3',  %q{
+  def m1
+    1
+  end
+  alias m2 m1
+  alias :"#{'m3'}" m1
+  m1 + m2 + m3
+}, '[ruby-dev:32308]'
+assert_equal '1', %q{
+  def foobar
+  end
+  undef :"foo#{:bar}"
+  1
+}, '[ruby-dev:32308]'
+assert_equal '1', %q{
+  def foobar
+    1
+  end
+  alias :"bar#{:baz}" :"foo#{:bar}"
+  barbaz
+}, '[ruby-dev:32308]'
+
+# private
+assert_equal '1',       %q( class C
+                              def m() mm() end
+                              def mm() 1 end
+                              private :mm
+                            end
+                            C.new.m )
+assert_equal '1',       %q( class C
+                              def m() 7 end
+                              private :m
+                            end
+                            begin C.m; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class C
+                              def C.m() mm() end
+                              def C.mm() 1 end
+                              private_class_method :mm
+                            end
+                            C.m )
+assert_equal '1',       %q( class C
+                              def C.m() 7 end
+                              private_class_method :m
+                            end
+                            begin C.m; rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class C; def m() 1 end end
+                            C.new.m   # cache
+                            class C
+                              alias mm m; private :mm
+                            end
+                            C.new.m
+                            begin C.new.mm; 7; rescue NoMethodError; 1 end )
+
+# nested method
+assert_equal '1',       %q( class C
+                              def m
+                                def mm() 1 end
+                              end
+                            end
+                            C.new.m
+                            C.new.mm )
+assert_equal '1',       %q( class C
+                              def m
+                                def mm() 1 end
+                              end
+                            end
+                            instance_eval "C.new.m; C.new.mm" )
+
+# method_missing
+assert_equal ':m',      %q( class C
+                              def method_missing(mid, *args) mid end
+                            end
+                            C.new.m.inspect )
+assert_equal ':mm',     %q( class C
+                              def method_missing(mid, *args) mid end
+                            end
+                            C.new.mm.inspect )
+assert_equal '[1, 2]',  %q( class C
+                              def method_missing(mid, *args) args end
+                            end
+                            C.new.m(1,2).inspect )
+assert_equal '1',       %q( class C
+                              def method_missing(mid, *args) yield 1 end
+                            end
+                            C.new.m {|a| a })
+assert_equal 'nil',     %q( class C
+                              def method_missing(mid, *args, &block) block end
+                            end
+                            C.new.m.inspect )
+
+# send
+assert_equal '1',       %q( class C; def m() 1 end end;
+                            C.new.__send__(:m) )
+assert_equal '1',       %q( class C; def m() 1 end end;
+                            C.new.send(:m) )
+assert_equal '1',       %q( class C; def m(a) a end end;
+                            C.new.send(:m,1) )
+assert_equal '1',       %q( class C; def m(a,b) a end end;
+                            C.new.send(:m,1,7) )
+assert_equal '1',       %q( class C; def m(x,a=1) a end end;
+                            C.new.send(:m,7) )
+assert_equal '1',       %q( class C; def m(x,a=7) a end end;
+                            C.new.send(:m,7,1) )
+assert_equal '[1, 2]',  %q( class C; def m(*a) a end end;
+                            C.new.send(:m,1,2).inspect )
+assert_equal '1',       %q( class C; def m() 7 end; private :m end
+                            begin C.new.public_send(:m); rescue NoMethodError; 1 end )
+assert_equal '1',       %q( class C; def m() 1 end; private :m end
+                            C.new.send(:m) )
+
+# with block
+assert_equal '[[:ok1, :foo], [:ok2, :foo, :bar]]',
+%q{
+  class C
+    def [](a)
+      $ary << [yield, a]
+    end
+    def []=(a, b)
+      $ary << [yield, a, b]
+    end
+  end
+
+  $ary = []
+  C.new[:foo, &lambda{:ok1}]
+  C.new[:foo, &lambda{:ok2}] = :bar
+  $ary
+}
+
+# with
+assert_equal '[:ok1, [:ok2, 11]]', %q{
+  class C
+    def []
+      $ary << :ok1
+      10
+    end
+    def []=(a)
+      $ary << [:ok2, a]
+    end
+  end
+  $ary = []
+  C.new[]+=1
+  $ary
+}
+
+# splat and block arguments
+assert_equal %q{[[[:x, :y, :z], NilClass], [[1, :x, :y, :z], NilClass], [[1, 2, :x, :y, :z], NilClass], [[:obj], NilClass], [[1, :obj], NilClass], [[1, 2, :obj], NilClass], [[], Proc], [[1], Proc], [[1, 2], Proc], [[], Proc], [[1], Proc], [[1, 2], Proc], [[:x, :y, :z], Proc], [[1, :x, :y, :z], Proc], [[1, 2, :x, :y, :z], Proc]]}, %q{
+def m(*args, &b)
+  $result << [args, b.class]
+end
+$result = []
+ary = [:x, :y, :z]
+obj = :obj
+b = Proc.new{}
+
+m(*ary)
+m(1,*ary)
+m(1,2,*ary)
+m(*obj)
+m(1,*obj)
+m(1,2,*obj)
+m(){}
+m(1){}
+m(1,2){}
+m(&b)
+m(1,&b)
+m(1,2,&b)
+m(*ary,&b)
+m(1,*ary,&b)
+m(1,2,*ary,&b)
+$result
+}
+
+# aset and splat
+assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;Foo.new[1,*a=[2,3]]=4}
+assert_equal '4', %q{class Foo;def []=(a,b,c,d);end;end;def m(&blk)Foo.new[1,*a=[2,3],&blk]=4;end;m{}}
+
+# post test
+assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4)}
+
+assert_equal %q{[1, 2, 3, :o2, [], 4, 5, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5)}
+
+assert_equal %q{[1, 2, 3, 4, [], 5, 6, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6)}
+
+assert_equal %q{[1, 2, 3, 4, [5], 6, 7, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7)}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6], 7, 8, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8)}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7], 8, 9, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9)}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8], 9, 10, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8, 9], 10, 11, NilClass, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11)}
+
+assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4){}}
+
+assert_equal %q{[1, 2, 3, :o2, [], 4, 5, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5){}}
+
+assert_equal %q{[1, 2, 3, 4, [], 5, 6, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6){}}
+
+assert_equal %q{[1, 2, 3, 4, [5], 6, 7, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7){}}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6], 7, 8, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8){}}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7], 8, 9, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9){}}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8], 9, 10, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10){}}
+
+assert_equal %q{[1, 2, 3, 4, [5, 6, 7, 8, 9], 10, 11, Proc, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2, &b)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, b.class, x, y]
+end
+; m(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11){}}
+
+assert_equal %q{[1, 2, :o1, :o2, [], 3, 4, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, x, y]
+end
+; m(1, 2, 3, 4)}
+
+assert_equal %q{[1, 2, 3, :o2, [], 4, 5, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, x, y]
+end
+; m(1, 2, 3, 4, 5)}
+
+assert_equal %q{[1, 2, 3, 4, [], 5, 6, nil, nil]}, %q{
+def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)
+  x, y = :x, :y if $foo
+  [m1, m2, o1, o2, r, p1, p2, x, y]
+end
+; m(1, 2, 3, 4, 5, 6)}
+
+
+#
+# super
+#
+=begin
+# below programs are generated by this program:
+
+BASE = <<EOS__
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; <TEST>; super; end; end
+EOS__
+
+tests = {
+%q{
+  def m
+} => %q{
+  C1.new.m
+},
+#
+%q{
+  def m a
+} => %q{
+  C1.new.m 1
+},
+%q{
+  def m a
+    a = :a
+} => %q{
+  C1.new.m 1
+},
+#
+%q{
+  def m a, o=:o
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+},
+%q{
+  def m a, o=:o
+    a = :a
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+},
+%q{
+  def m a, o=:o
+    o = :x
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+},
+#
+%q{
+  def m a, *r
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+  C1.new.m 1, 2, 3
+},
+%q{
+  def m a, *r
+    r = [:x, :y]
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+  C1.new.m 1, 2, 3
+},
+#
+%q{
+  def m a, o=:o, *r
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+  C1.new.m 1, 2, 3
+  C1.new.m 1, 2, 3, 4
+},
+#
+%q{
+  def m a, o=:o, *r, &b
+} => %q{
+  C1.new.m 1
+  C1.new.m 1, 2
+  C1.new.m 1, 2, 3
+  C1.new.m 1, 2, 3, 4
+  C1.new.m(1){}
+  C1.new.m(1, 2){}
+  C1.new.m(1, 2, 3){}
+  C1.new.m(1, 2, 3, 4){}
+},
+#
+"def m(m1, m2, o1=:o1, o2=:o2, p1, p2)" =>
+%q{
+C1.new.m(1,2,3,4)
+C1.new.m(1,2,3,4,5)
+C1.new.m(1,2,3,4,5,6)
+},
+#
+"def m(m1, m2, *r, p1, p2)" =>
+%q{
+C1.new.m(1,2,3,4)
+C1.new.m(1,2,3,4,5)
+C1.new.m(1,2,3,4,5,6)
+C1.new.m(1,2,3,4,5,6,7)
+C1.new.m(1,2,3,4,5,6,7,8)
+},
+#
+"def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2)" =>
+%q{
+C1.new.m(1,2,3,4)
+C1.new.m(1,2,3,4,5)
+C1.new.m(1,2,3,4,5,6)
+C1.new.m(1,2,3,4,5,6,7)
+C1.new.m(1,2,3,4,5,6,7,8)
+C1.new.m(1,2,3,4,5,6,7,8,9)
+},
+
+###
+}
+
+
+tests.each{|setup, methods| setup = setup.dup; setup.strip!
+  setup = BASE.gsub(/<TEST>/){setup}
+  methods.split(/\n/).each{|m| m = m.dup; m.strip!
+    next if m.empty?
+    expr = "#{setup}; #{m}"
+    result = eval(expr)
+    puts "assert_equal %q{#{result.inspect}}, %q{\n#{expr}}"
+    puts
+  }
+}
+
+=end
+
+assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
+; C1.new.m(1,2,3,4)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6)}
+
+assert_equal %q{[:C0_m, [1, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r; super; end; end
+; C1.new.m 1, 2, 3}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r; super; end; end
+; C1.new.m 1, 2, 3, 4}
+
+assert_equal %q{[:C0_m, [:a]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a
+    a = :a; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7,8)}
+
+assert_equal %q{[:C0_m, [1, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m 1, 2, 3}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m 1, 2, 3, 4}
+
+assert_equal %q{[:C0_m, [1, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m(1){}}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m(1, 2){}}
+
+assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m(1, 2, 3){}}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o, *r, &b; super; end; end
+; C1.new.m(1, 2, 3, 4){}}
+
+assert_equal %q{[:C0_m, [1, :x]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o
+    o = :x; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, :x]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o
+    o = :x; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [:a, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o
+    a = :a; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [:a, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o
+    a = :a; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r
+    r = [:x, :y]; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r
+    r = [:x, :y]; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1, :x, :y]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r
+    r = [:x, :y]; super; end; end
+; C1.new.m 1, 2, 3}
+
+assert_equal %q{[:C0_m, [1, 2, :o1, :o2, 3, 4]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, :o2, 4, 5]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7,8)}
+
+assert_equal %q{[:C0_m, [1, 2, 3, 4, 5, 6, 7, 8, 9]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m(m1, m2, o1=:o1, o2=:o2, *r, p1, p2); super; end; end
+; C1.new.m(1,2,3,4,5,6,7,8,9)}
+
+assert_equal %q{[:C0_m, [1]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal %q{[:C0_m, [1, 2, 3]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, *r; super; end; end
+; C1.new.m 1, 2, 3}
+
+assert_equal %q{[:C0_m, []]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m; super; end; end
+; C1.new.m}
+
+assert_equal %q{[:C0_m, [1, :o]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o; super; end; end
+; C1.new.m 1}
+
+assert_equal %q{[:C0_m, [1, 2]]}, %q{
+class C0; def m *args; [:C0_m, args]; end; end
+class C1 < C0; def m a, o=:o; super; end; end
+; C1.new.m 1, 2}
+
+assert_equal 'ok', %q{
+  class C
+    def x=(n)
+    end
+    def m
+      self.x = :ok
+    end
+  end
+  C.new.m
+}
+
+assert_equal 'ok', %q{
+  proc{
+    $SAFE = 1
+    class C
+      def m
+        :ok
+      end
+    end
+  }.call
+  C.new.m
+}, '[ruby-core:11998]'
+
+assert_equal 'ok', %q{
+  proc{
+    $SAFE = 2
+    class C
+      def m
+        :ok
+      end
+    end
+  }.call
+  C.new.m
+}, '[ruby-core:11998]'
+
+assert_equal 'ok', %q{
+  proc{
+    $SAFE = 3
+    class C
+      def m
+        :ng
+      end
+    end
+  }.call
+  begin
+    C.new.m
+  rescue SecurityError
+    :ok
+  end
+}, '[ruby-core:11998]'
+
+assert_equal 'ok', %q{
+  class B
+    def m() :fail end
+  end
+  class C < B
+    undef m
+    begin
+      remove_method :m
+    rescue NameError
+    end
+  end
+  begin
+    C.new.m
+  rescue NameError
+    :ok
+  end
+}, '[ruby-dev:31816], [ruby-dev:31817]'
+
+assert_normal_exit %q{
+  begin
+    Process.setrlimit(Process::RLIMIT_STACK, 4_202_496)
+    # FreeBSD fails this less than 4M + 8K bytes.
+  rescue Exception
+    exit
+  end
+  class C
+    attr "a" * (10*1024*1024)
+  end
+}, '[ruby-dev:31818]'
+
+assert_equal 'ok', %q{
+  class Module
+    def define_method2(name, &block)
+      define_method(name, &block)
+    end
+  end
+  class C
+    define_method2(:m) {|x, y| :fail }
+  end
+  begin
+    C.new.m([1,2])
+  rescue ArgumentError
+    :ok
+  end
+}
+
+assert_not_match /method_missing/, %q{
+  STDERR.reopen(STDOUT)
+  variable_or_mehtod_not_exist
+}
+
+assert_equal '[false, false, false, false, true, true]', %q{
+  class C
+    define_method(:foo) {
+      block_given?
+    }
+  end
+
+  C.new.foo {}
+
+  class D
+    def foo
+      D.module_eval{
+        define_method(:m1){
+          block_given?
+        }
+      }
+    end
+    def bar
+      D.module_eval{
+        define_method(:m2){
+          block_given?
+        }
+      }
+    end
+  end
+
+  D.new.foo
+  D.new.bar{}
+  [C.new.foo, C.new.foo{}, D.new.m1, D.new.m1{}, D.new.m2, D.new.m2{}]
+}, '[ruby-core:14813]'
+
+assert_equal 'ok', %q{
+  class Foo
+    define_method(:foo) do |&b|
+      b.call
+    end
+  end
+  Foo.new.foo do
+    break :ok
+  end
+}, '[ruby-dev:36028]'
+
+assert_equal '[1, 2, [3, 4]]', %q{
+  def regular(a, b, *c)
+    [a, b, c]
+  end
+  regular(*[], 1, *[], *[2, 3], *[], 4)
+}, '[ruby-core:19413]'
+
+assert_equal '[1, [:foo, 3, 4, :foo]]', %q{
+  def regular(a, *b)
+    [a, b]
+  end
+  a = b = [:foo]
+  regular(1, *a, *[3, 4], *b)
+}
+
+assert_equal '["B", "A"]', %q{
+  class A
+    def m
+      'A'
+    end
+  end
+
+  class B < A
+    define_method(:m) do
+      ['B', super()]
+    end
+  end
+
+  class C < B
+  end
+
+  C.new.m
+}
+
+assert_equal 'ok', %q{
+  module Foo
+    def foo
+      begin
+        super
+      rescue NoMethodError
+        :ok
+      end
+    end
+    module_function :foo
+  end
+  Foo.foo
+}, '[ruby-dev:37587]'
+
+assert_equal 'Object#foo', %q{
+  class Object
+    def self.foo
+      "Object.foo"
+    end
+    def foo
+      "Object#foo"
+    end
+  end
+
+  module Foo
+    def foo
+      begin
+        super
+      rescue NoMethodError
+        :ok
+      end
+    end
+    module_function :foo
+  end
+  Foo.foo
+}, '[ruby-dev:37587]'
+
+assert_normal_exit %q{
+  class BasicObject
+    remove_method :method_missing
+  end
+  begin
+    "a".lalala!
+  rescue NoMethodError => e
+    e.message == "undefined method `lalala!' for \"a\":String" ? :ok : :ng
+  end
+}, '[ruby-core:22298]'
+
+assert_equal 'ok', %q{
+  "hello"[0] ||= "H"
+  "ok"
+}
+
+assert_equal 'ok', %q{
+  "hello"[0, 1] ||= "H"
+  "ok"
+}
+
+assert_equal 'ok', %q{
+  class C
+    define_method(:foo) do
+      C.class_eval { remove_method(:foo) }
+      super()
+    end
+  end
+  begin
+    C.new.foo
+  rescue NoMethodError
+    'ok'
+  end
+}
+assert_equal 'ok', %q{
+  [0][0, &proc{}] += 21
+  'ok'
+}, '[ruby-core:30534]'
+
+# should not cache when splat
+assert_equal 'ok', %q{
+  class C
+    attr_reader :a
+    def initialize
+      @a = 1
+    end
+  end
+
+  def m *args
+    C.new.a(*args)
+  end
+
+  m()
+  begin
+    m(1)
+  rescue ArgumentError
+    'ok'
+  end
+}
+
+assert_equal 'DC', %q{
+  $result = []
+
+  class C
+    def foo *args
+      $result << 'C'
+    end
+  end
+  class D
+    def foo *args
+      $result << 'D'
+    end
+  end
+
+  o1 = $o1 = C.new
+  o2 = $o2 = D.new
+
+  args = Object.new
+  def args.to_a
+    test1 $o2, nil
+    []
+  end
+  def test1 o, args
+    o.foo(*args)
+  end
+  test1 o1, args
+  $result.join
+}
+
+assert_equal 'DC', %q{
+  $result = []
+
+  class C
+    def foo *args
+      $result << 'C'
+    end
+  end
+  class D
+    def foo *args
+      $result << 'D'
+    end
+  end
+
+  o1 = $o1 = C.new
+  o2 = $o2 = D.new
+
+  block = Object.new
+  def block.to_proc
+    test2 $o2, %w(a, b, c), nil
+    Proc.new{}
+  end
+  def test2 o, args, block
+    o.foo(*args, &block)
+  end
+  test2 o1, [], block
+  $result.join
+}
diff --git a/bootstraptest/test_objectspace.rb b/bootstraptest/test_objectspace.rb
new file mode 100644
index 0000000000..862a94e376
--- /dev/null
+++ b/bootstraptest/test_objectspace.rb
@@ -0,0 +1,46 @@
+assert_normal_exit %q{
+  eval("", TOPLEVEL_BINDING)
+  minobj = ObjectSpace.to_enum(:each_object).min_by {|a| a.object_id }
+  maxobj = ObjectSpace.to_enum(:each_object).max_by {|a| a.object_id }
+  (((minobj.object_id-100)..(minobj.object_id+100))+
+   ((maxobj.object_id-100)..(maxobj.object_id+100))).each {|id|
+    begin
+      o = ObjectSpace._id2ref(id)
+    rescue RangeError
+      next
+    end
+    o.inspect if defined?(o.inspect)
+  }
+}, '[ruby-dev:31911]'
+
+assert_normal_exit %q{
+  ary = (1..10).to_a
+  ary.permutation(2) {|x|
+    if x == [1,2]
+      ObjectSpace.each_object(String) {|s|
+        s.clear if !s.frozen? && (s.length == 40 || s.length == 80)
+      }
+    end
+  }
+}, '[ruby-dev:31982]'
+
+assert_normal_exit %q{
+  ary = (1..100).to_a
+  ary.permutation(2) {|x|
+    if x == [1,2]
+      ObjectSpace.each_object(Array) {|o| o.clear if o == ary && o.object_id != ary.object_id }
+    end
+  }
+}, '[ruby-dev:31985]'
+
+assert_normal_exit %q{
+  ObjectSpace.define_finalizer("") do
+    Mutex.new.lock
+  end
+}, '[ruby-dev:44049]'
+
+assert_normal_exit %q{
+  ObjectSpace.define_finalizer("") do
+    Thread.new {}
+  end
+}, '[ruby-core:37858]'
diff --git a/bootstraptest/test_proc.rb b/bootstraptest/test_proc.rb
new file mode 100644
index 0000000000..c23394e8d2
--- /dev/null
+++ b/bootstraptest/test_proc.rb
@@ -0,0 +1,483 @@
+assert_equal %q{[1, 2, 3]}, %q{
+  def getproc &b
+    b
+  end
+
+  def m
+    yield
+  end
+
+  m{
+    i = 1
+    m{
+      j = 2
+      m{
+        k = 3
+        getproc{
+          [i, j, k]
+        }
+      }
+    }
+  }.call
+}
+assert_equal %q{7}, %q{
+  def make_proc(&b)
+    b
+  end
+
+  def make_closure
+    a = 0
+    make_proc{
+      a+=1
+    }
+  end
+
+  cl = make_closure
+  cl.call + cl.call * cl.call
+}
+assert_equal %q{ok}, %q{
+  class C
+    def foo
+      :ok
+    end
+  end
+
+  def block
+    C.method(:new).to_proc
+  end
+  b = block()
+  b.call.foo
+}
+assert_equal %q{[0, 1, :last, 0, 2, :last]}, %q{
+  def proc &b
+    b
+  end
+
+  pr = []
+  proc{|i_b|
+    p3 = proc{|j_b|
+      pr << proc{|k_b|
+        [i_b, j_b, k_b]
+      }
+    }
+    p3.call(1)
+    p3.call(2)
+  }.call(0)
+
+  pr[0].call(:last).concat pr[1].call(:last)
+}
+assert_equal %q{12}, %q{
+  def iter
+    yield
+  end
+
+  def getproc &b
+    b
+  end
+
+  iter{
+    bvar = 3
+    getproc{
+      bvar2 = 4
+      bvar * bvar2
+    }
+  }.call
+}
+assert_equal %q{200}, %q{
+  def iter
+    yield
+  end
+
+  def getproc &b
+    b
+  end
+
+  loc1 = 0
+  pr1 = iter{
+    bl1 = 1
+    getproc{
+      loc1 += 1
+      bl1  += 1
+      loc1 + bl1
+    }
+  }
+
+  pr2 = iter{
+    bl1 = 1
+    getproc{
+      loc1 += 1
+      bl1  += 1
+      loc1 + bl1
+    }
+  }
+
+  pr1.call; pr2.call
+  pr1.call; pr2.call
+  pr1.call; pr2.call
+  (pr1.call + pr2.call) * loc1
+}
+assert_equal %q{[1, 2]}, %q{
+  def proc(&pr)
+    pr
+  end
+
+  def m
+    a = 1
+    m2{
+      a
+    }
+  end
+
+  def m2
+    b = 2
+    proc{
+      [yield, b]
+    }
+  end
+
+  pr = m
+  x = ['a', 1,2,3,4,5,6,7,8,9,0,
+            1,2,3,4,5,6,7,8,9,0,
+            1,2,3,4,5,6,7,8,9,0,
+            1,2,3,4,5,6,7,8,9,0,
+            1,2,3,4,5,6,7,8,9,0,]
+  pr.call
+}
+assert_equal %q{1}, %q{
+  def proc(&pr)
+    pr
+  end
+
+  def m
+    a = 1
+    m2{
+      a
+    }
+  end
+
+  def m2
+    b = 2
+    proc{
+      [yield, b]
+    }
+    100000.times{|x|
+      "#{x}"
+    }
+    yield
+  end
+  m
+}
+assert_equal %q{[:C, :C]}, %q{
+  Const = :top
+  class C
+    Const = :C
+    $pr = proc{
+      (1..2).map{
+        Const
+      }
+    }
+  end
+  $pr.call
+}
+assert_equal %q{top}, %q{
+  Const = :top
+  class C
+    Const = :C
+  end
+  pr = proc{
+    Const
+  }
+  C.class_eval %q{
+    pr.call
+  }
+}
+assert_equal %q{1}, %q{
+  def m(&b)
+    b
+  end
+
+  m{|e_proctest| e_proctest}.call(1)
+}
+assert_equal %q{12}, %q{
+  def m(&b)
+    b
+  end
+
+  m{|e_proctest1, e_proctest2|
+    a = e_proctest1 * e_proctest2 * 2
+    a * 3
+  }.call(1, 2)
+}
+assert_equal %q{[[], [1], [1, 2], [1, 2, 3]]}, %q{
+  [
+  Proc.new{|*args| args}.call(),
+  Proc.new{|*args| args}.call(1),
+  Proc.new{|*args| args}.call(1, 2),
+  Proc.new{|*args| args}.call(1, 2, 3),
+  ]
+}
+assert_equal %q{[[nil, []], [1, []], [1, [2]], [1, [2, 3]]]}, %q{
+  [
+  Proc.new{|a, *b| [a, b]}.call(),
+  Proc.new{|a, *b| [a, b]}.call(1),
+  Proc.new{|a, *b| [a, b]}.call(1, 2),
+  Proc.new{|a, *b| [a, b]}.call(1, 2, 3),
+  ]
+}
+assert_equal %q{0}, %q{
+  pr = proc{
+    $SAFE
+  }
+  $SAFE = 1
+  pr.call
+}
+assert_equal %q{[1, 0]}, %q{
+  pr = proc{
+    $SAFE += 1
+  }
+  [pr.call, $SAFE]
+}
+assert_equal %q{1}, %q{
+  def m(&b)
+    b
+  end
+  m{1}.call
+}
+assert_equal %q{3}, %q{
+  def m(&b)
+    b
+  end
+
+  m{
+    a = 1
+    a + 2
+  }.call
+}
+assert_equal %Q{ok\n}, %q{
+  class A; def get_block; proc {puts "ok"} end end
+  block = A.new.get_block
+  GC.start
+  block.call
+}, '[ruby-core:14885]'
+
+assert_equal 'ok', %q{
+  a = lambda {|x, y, &b| b }
+  b = a.curry[1]
+  if b.call(2){} == nil
+    :ng
+  else
+    :ok
+  end
+}, '[ruby-core:15551]'
+
+assert_equal 'ok', %q{
+  lambda {
+    break :ok
+    :ng
+  }.call
+}, '[ruby-dev:34646]'
+
+assert_equal %q{[:bar, :foo]}, %q{
+  def foo
+    klass = Class.new do
+      define_method(:bar) do
+        return :bar
+      end
+    end
+    [klass.new.bar, :foo]
+  end
+  foo
+}, "[ ruby-Bugs-19304 ]"
+
+assert_equal 'ok', %q{
+   $x = :ok
+   def def7(x, y)
+      x[y]
+      $x = :ng
+   end
+   def test_def7
+      def7(lambda {|x| x.call}, Proc.new {return})
+      $x = :ng
+   end
+   test_def7
+   $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+  lambda { a = lambda { return }; $x = :ng; a[]; $x = :ok }.call
+  $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+  lambda { a = lambda { break }; $x = :ng; a[]; $x = :ok }.call
+  $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+  def def8
+    $x = :ng
+    lambda { a = Proc.new { return }; a[]}.call
+    $x = :ok
+  end
+  def8
+  $x
+}, '[ruby-core:17164]'
+
+
+assert_equal 'ok', %q{
+   def def9
+      lambda {|a| $x = :ok; a[]; $x = :ng }.call(Proc.new { return })
+      $x = :ng
+   end
+   def9
+   $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+   def def10
+     $x = :ng
+     lambda { 1.times { return } }.call
+     $x = :ok
+   end
+   $x = :ok
+   def10
+   $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+   def def11
+      yield
+   end
+   begin
+      lambda { def11 { return } }.call
+   rescue LocalJumpError
+      :ng
+   else
+      :ok
+   end
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+   def def12
+      b = Proc.new { $x = :ng; lambda { return }.call; $x = :ok }.call
+   end
+   def12
+   $x
+}, '[ruby-core:17164]'
+
+assert_equal 'ok', %q{
+  def m
+    pr = proc{
+      proc{
+        return :ok
+      }
+    }.call
+    pr.call
+    :ng
+  end
+  m()
+}
+
+assert_equal 'ok', %q{
+  class Foo
+    def call_it
+      p = Proc.new
+      p.call
+    end
+  end
+
+  def give_it
+    proc { :ok }
+  end
+
+  f = Foo.new
+  a_proc = give_it
+  f.call_it(&give_it())
+}, '[ruby-core:15711]'
+
+assert_equal 'foo!', %q{
+  class FooProc < Proc
+    def initialize
+      @foo = "foo!"
+    end
+
+    def bar
+      @foo
+    end
+  end
+
+  def bar
+    FooProc.new &lambda{
+      p 1
+    }
+  end
+
+  fp = bar(&lambda{
+    p 2
+  })
+
+  fp.bar
+}, 'Subclass of Proc'
+
+assert_equal 'ok', %q{
+  o = Object.new
+  def o.write(s); end
+  $stderr = o
+  at_exit{
+    print $!.message
+  }
+  raise "ok"
+}
+
+assert_equal 'ok', %q{
+  lambda do
+    class A
+      class B
+        proc{return :ng}.call
+      end
+    end
+  end.call
+  :ok
+}
+
+assert_equal 'ok', %q{
+  $proc = proc{return}
+  begin
+    lambda do
+      class A
+        class B
+          $proc.call
+        end
+      end
+    end.call
+    :ng
+  rescue LocalJumpError
+    :ok
+  end
+}
+
+assert_equal 'ok', %q{
+  def x
+    binding
+  end
+  b = x{|a| a }
+  b.eval('yield("ok")')
+}, '[Bug #5634]'
+
+assert_equal 'ok', %q{
+  def x
+    binding
+  end
+  eval("x { 'ok' }").eval "yield"
+}, '[Bug #5634]'
+
+assert_equal 'ok', %q{
+  def x
+    binding
+  end
+  def m
+    x{ 'ok' }
+  end
+  eval('yield', m)
+}, '[Bug #5634]'
+
diff --git a/bootstraptest/test_struct.rb b/bootstraptest/test_struct.rb
new file mode 100644
index 0000000000..a65964d5f9
--- /dev/null
+++ b/bootstraptest/test_struct.rb
@@ -0,0 +1,5 @@
+assert_equal 'Struct::Foo', %q{
+  Struct.instance_eval { const_set(:Foo, nil) }
+  Struct.new("Foo")
+  Struct::Foo
+}
diff --git a/bootstraptest/test_syntax.rb b/bootstraptest/test_syntax.rb
new file mode 100644
index 0000000000..80eaa6416d
--- /dev/null
+++ b/bootstraptest/test_syntax.rb
@@ -0,0 +1,902 @@
+assert_equal %q{4}, %q{1 && 2 && 3 && 4}
+assert_equal %q{}, %q{1 && nil && 3 && 4}
+assert_equal %q{}, %q{1 && 2 && 3 && nil}
+assert_equal %q{false}, %q{1 && 2 && 3 && false}
+assert_equal %q{4}, %q{1 and 2 and 3 and 4}
+assert_equal %q{}, %q{1 and nil and 3 and 4}
+assert_equal %q{}, %q{1 and 2 and 3 and nil}
+assert_equal %q{false}, %q{1 and 2 and 3 and false}
+assert_equal %q{}, %q{nil && true}
+assert_equal %q{false}, %q{false && true}
+assert_equal %q{}, %q{
+  case 1
+  when 2
+    :ng
+  end}
+assert_equal %q{ok}, %q{
+  case 1
+  when 10,20,30
+    :ng1
+  when 1,2,3
+    :ok
+  when 100,200,300
+    :ng2
+  else
+    :elseng
+  end}
+assert_equal %q{elseok}, %q{
+  case 123
+  when 10,20,30
+    :ng1
+  when 1,2,3
+    :ng2
+  when 100,200,300
+    :ng3
+  else
+    :elseok
+  end
+}
+assert_equal %q{ok}, %q{
+  case 'test'
+  when /testx/
+    :ng1
+  when /test/
+    :ok
+  when /tetxx/
+    :ng2
+  else
+    :ng_else
+  end
+}
+assert_equal %q{ok}, %q{
+  case Object.new
+  when Object
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  case Object
+  when Object.new
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  case 'test'
+  when 'tes'
+    :ng
+  when 'te'
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  case 'test'
+  when 'tes'
+    :ng
+  when 'te'
+    :ng
+  when 'test'
+    :ok
+  end
+}
+assert_equal %q{ng}, %q{
+  case 'test'
+  when 'tes'
+    :ng
+  when /te/
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  case 'test'
+  when 'tes'
+    :ng
+  when /test/
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{100}, %q{
+  def test(arg)
+    case 1
+    when 2
+      3
+    end
+    return arg
+  end
+
+  test(100)
+}
+assert_equal %q{ok}, %q{
+  ary = [1, 2]
+  case 1
+  when *ary
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [1, 2]
+  case 3
+  when *ary
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [1, 2]
+  case 1
+  when :x, *ary
+    :ok
+  when :z
+    :ng1
+  else
+    :ng2
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [1, 2]
+  case 3
+  when :x, *ary
+    :ng1
+  when :z
+    :ng2
+  else
+    :ok
+  end
+}
+assert_equal %q{[:false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :false, :false, :false, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :then, :false, :then, :then, :then, :false, :false, :false, :false, :false, :false, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :false, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :false, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :false, :then, :then, :then, :then, :then, :then, :then, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep, :then, :sep]}, %q{
+
+  def make_perm ary, num
+    if num == 1
+      ary.map{|e| [e]}
+    else
+      base = make_perm(ary, num-1)
+      res  = []
+      base.each{|b|
+        ary.each{|e|
+          res << [e] + b
+        }
+      }
+      res
+    end
+  end
+
+  def each_test
+    conds = make_perm(['fv', 'tv'], 3)
+    bangs = make_perm(['', '!'], 3)
+    exprs = make_perm(['and', 'or'], 3)
+    ['if', 'unless'].each{|syn|
+      conds.each{|cs|
+        bangs.each{|bs|
+          exprs.each{|es|
+            yield(syn, cs, bs, es)
+          }
+        }
+      }
+    }
+  end
+
+  fv = false
+  tv = true
+
+  $ans = []
+  each_test{|syn, conds, bangs, exprs|
+    c1, c2, c3 = conds
+    bang1, bang2, bang3 = bangs
+    e1, e2 = exprs
+    eval %Q{
+      #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
+        $ans << :then
+      else
+        $ans << :false
+      end
+    }
+  }
+
+  each_test{|syn, conds, bangs, exprs|
+    c1, c2, c3 = conds
+    bang1, bang2, bang3 = bangs
+    e1, e2 = exprs
+    eval %Q{
+      #{syn} #{bang1}#{c1} #{e1} #{bang2}#{c2} #{e2} #{bang3}#{c3}
+        $ans << :then
+      end
+      $ans << :sep
+    }
+  }
+  $ans
+}
+assert_equal %q{}, %q{
+  defined?(m)
+}
+assert_equal %q{method}, %q{
+  def m
+  end
+  defined?(m)
+}
+assert_equal %q{}, %q{
+  defined?(a.class)
+}
+assert_equal %q{method}, %q{
+  a = 1
+  defined?(a.class)
+}
+assert_equal %q{["method", "method", "method", "method", nil, nil, "method", "method", "method", nil]}, %q{
+  class C
+    def test
+      [defined?(m1()), defined?(self.m1), defined?(C.new.m1),
+       defined?(m2()), defined?(self.m2), defined?(C.new.m2),
+       defined?(m3()), defined?(self.m3), defined?(C.new.m3)]
+    end
+    def m1
+    end
+    private
+    def m2
+    end
+    protected
+    def m3
+    end
+  end
+  C.new.test + [defined?(C.new.m3)]
+}
+assert_equal %q{[nil, nil, nil, nil, "global-variable", "global-variable", nil, nil]}, %q{
+  $ans = [defined?($1), defined?($2), defined?($3), defined?($4)]
+  /(a)(b)/ =~ 'ab'
+  $ans + [defined?($1), defined?($2), defined?($3), defined?($4)]
+}
+assert_equal %q{nilselftruefalse}, %q{
+  defined?(nil) + defined?(self) +
+    defined?(true) + defined?(false)
+}
+assert_equal %q{}, %q{
+  defined?(@a)
+}
+assert_equal %q{instance-variable}, %q{
+  @a = 1
+  defined?(@a)
+}
+assert_equal %q{}, %q{
+  defined?(@@a)
+}
+assert_equal %q{class variable}, %q{
+  @@a = 1
+  defined?(@@a)
+}
+assert_equal %q{}, %q{
+  defined?($a)
+}
+assert_equal %q{global-variable}, %q{
+  $a = 1
+  defined?($a)
+}
+assert_equal %q{}, %q{
+  defined?(C_definedtest)
+}
+assert_equal %q{constant}, %q{
+  C_definedtest = 1
+  defined?(C_definedtest)
+}
+assert_equal %q{}, %q{
+  defined?(::C_definedtest)
+}
+assert_equal %q{constant}, %q{
+  C_definedtest = 1
+  defined?(::C_definedtest)
+}
+assert_equal %q{}, %q{
+  defined?(C_definedtestA::C_definedtestB::C_definedtestC)
+}
+assert_equal %q{constant}, %q{
+  class C_definedtestA
+    class C_definedtestB
+      C_definedtestC = 1
+    end
+  end
+  defined?(C_definedtestA::C_definedtestB::C_definedtestC)
+}
+assert_equal %q{30}, %q{
+  sum = 0
+  30.times{|ib|
+    if ib % 10 == 0 .. true
+      sum += ib
+    end
+  }
+  sum
+}
+assert_equal %q{63}, %q{
+  sum = 0
+  30.times{|ib|
+    if ib % 10 == 0 ... true
+      sum += ib
+    end
+  }
+  sum
+}
+assert_equal %q{[["NUM", "Type: NUM\n"], ["NUM", "123\n"], ["NUM", "456\n"], ["NUM", "Type: ARP\n"], ["NUM", "aaa\n"], ["NUM", "bbb\n"], ["NUM", "\f\n"], ["ARP", "Type: ARP\n"], ["ARP", "aaa\n"], ["ARP", "bbb\n"]]}, %q{
+  t = nil
+  unless ''.respond_to? :lines
+    class String
+      def lines
+        self
+      end
+    end
+  end
+  ary = []
+"this must not print
+Type: NUM
+123
+456
+Type: ARP
+aaa
+bbb
+\f
+this must not print
+hoge
+Type: ARP
+aaa
+bbb
+".lines.each{|l|
+    if (t = l[/^Type: (.*)/, 1])..(/^\f/ =~ l)
+      ary << [t, l]
+    end
+  }
+  ary
+}
+assert_equal %q{1}, %q{if true  then 1 ; end}
+assert_equal %q{}, %q{if false then 1 ; end}
+assert_equal %q{1}, %q{if true  then 1 ; else; 2; end}
+assert_equal %q{2}, %q{if false then 1 ; else; 2; end}
+assert_equal %q{}, %q{if true  then   ; elsif true then ; 1 ; end}
+assert_equal %q{1}, %q{if false then   ; elsif true then ; 1 ; end}
+assert_equal %q{}, %q{unless true  then 1 ; end}
+assert_equal %q{1}, %q{unless false then 1 ; end}
+assert_equal %q{2}, %q{unless true  then 1 ; else; 2; end}
+assert_equal %q{1}, %q{unless false then 1 ; else; 2; end}
+assert_equal %q{1}, %q{1 if true}
+assert_equal %q{}, %q{1 if false}
+assert_equal %q{}, %q{1 if nil}
+assert_equal %q{}, %q{1 unless true}
+assert_equal %q{1}, %q{1 unless false}
+assert_equal %q{1}, %q{1 unless nil}
+assert_equal %q{1}, %q{1 || 2 || 3 || 4}
+assert_equal %q{1}, %q{1 || false || 3 || 4}
+assert_equal %q{2}, %q{nil || 2 || 3 || 4}
+assert_equal %q{2}, %q{false || 2 || 3 || 4}
+assert_equal %q{false}, %q{nil || false || nil || false}
+assert_equal %q{1}, %q{1 or 2 or 3 or 4}
+assert_equal %q{1}, %q{1 or false or 3 or 4}
+assert_equal %q{2}, %q{nil or 2 or 3 or 4}
+assert_equal %q{2}, %q{false or 2 or 3 or 4}
+assert_equal %q{false}, %q{nil or false or nil or false}
+assert_equal %q{elseng}, %q{
+  case
+  when 1==2, 2==3
+    :ng1
+  when false, 4==5
+    :ok
+  when false
+    :ng2
+  else
+    :elseng
+  end
+}
+assert_equal %q{ok}, %q{
+  case
+  when nil, nil
+    :ng1
+  when 1,2,3
+    :ok
+  when false, false
+    :ng2
+  else
+    :elseng
+  end
+}
+assert_equal %q{elseok}, %q{
+  case
+  when nil
+    :ng1
+  when false
+    :ng2
+  else
+    :elseok
+  end}
+assert_equal %q{}, %q{
+  case
+  when 1
+  end
+}
+assert_equal %q{ok}, %q{
+  r = nil
+  ary = []
+  case
+  when false
+    r = :ng1
+  when false, false
+    r = :ng2
+  when *ary
+    r = :ng3
+  when false, *ary
+    r = :ng4
+  when true, *ary
+    r = :ok
+  end
+  r
+}
+assert_equal %q{ok}, %q{
+  ary = []
+  case
+  when false, *ary
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [false, nil]
+  case
+  when *ary
+    :ng
+  else
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [false, nil]
+  case
+  when *ary
+    :ng
+  when true
+    :ok
+  else
+    :ng2
+  end
+}
+assert_equal %q{ng}, %q{
+  ary = [false, nil]
+  case
+  when *ary
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [false, true]
+  case
+  when *ary
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{ok}, %q{
+  ary = [false, true]
+  case
+  when false, false
+  when false, *ary
+    :ok
+  else
+    :ng
+  end
+}
+assert_equal %q{}, %q{
+  i = 0
+  while i < 10
+    i+=1
+  end}
+assert_equal %q{10}, %q{
+  i = 0
+  while i < 10
+    i+=1
+  end; i}
+assert_equal %q{}, %q{
+  i = 0
+  until i > 10
+    i+=1
+  end}
+assert_equal %q{11}, %q{
+  i = 0
+  until i > 10
+    i+=1
+  end; i}
+assert_equal %q{1}, %q{
+  i = 0
+  begin
+    i+=1
+  end while false
+  i
+}
+assert_equal %q{1}, %q{
+  i = 0
+  begin
+    i+=1
+  end until true
+  i
+}
+def assert_syntax_error expected, code, message = ''
+  assert_equal "#{expected}",
+    "begin eval(%q{#{code}}, nil, '', 0)"'; rescue SyntaxError => e; e.message[/\A:(?:\d+:)? (.*)/, 1] end', message
+end
+assert_syntax_error "unterminated string meets end of file", '().."', '[ruby-dev:29732]'
+assert_equal %q{[]}, %q{$&;[]}, '[ruby-dev:31068]'
+assert_syntax_error "syntax error, unexpected *, expecting '}'", %q{{*0}}, '[ruby-dev:31072]'
+assert_syntax_error "`@0' is not allowed as an instance variable name", %q{@0..0}, '[ruby-dev:31095]'
+assert_syntax_error "identifier $00 is not valid to get", %q{$00..0}, '[ruby-dev:31100]'
+assert_syntax_error "identifier $00 is not valid to set", %q{0..$00=1}
+assert_equal %q{0}, %q{[*0];0}, '[ruby-dev:31102]'
+assert_syntax_error "syntax error, unexpected ')'", %q{v0,(*,v1,) = 0}, '[ruby-dev:31104]'
+assert_equal %q{1}, %q{
+  class << (ary=[]); def []; 0; end; def []=(x); super(0,x);end;end; ary[]+=1
+}, '[ruby-dev:31110]'
+assert_syntax_error "Can't set variable $1", %q{0..$1=1}, '[ruby-dev:31118]'
+assert_valid_syntax %q{1.times{1+(1&&next)}}, '[ruby-dev:31119]'
+assert_valid_syntax %q{x=-1;loop{x+=1&&redo if (x+=1).zero?}}, '[ruby-dev:31119]'
+assert_syntax_error %q{syntax error, unexpected end-of-input}, %q{!}, '[ruby-dev:31243]'
+assert_equal %q{[nil]}, %q{[()]}, '[ruby-dev:31252]'
+assert_equal %q{true}, %q{!_=()}, '[ruby-dev:31263]'
+assert_equal 'ok', %q{while true; redo; end if 1 == 2; :ok}, '[ruby-dev:31360]'
+assert_equal 'ok', %q{
+  1.times {
+    begin
+    ensure
+      next
+    end
+  }; :ok
+}, '[ruby-dev:31373]'
+assert_equal 'ok', %q{
+  flag = false
+  1.times {
+    next if flag
+    flag = true
+    begin
+    ensure
+      redo
+    end
+  }; :ok
+}, '[ruby-dev:31373]'
+
+assert_equal 'ok', %q{
+  1.times{
+    p(1, (next; 2))
+  }; :ok
+}
+assert_equal '3', %q{
+  i = 0
+  1 + (while true
+         break 2 if (i+=1) > 1
+         next
+       end)
+}
+assert_equal '3', %q{
+  i = 0
+  1 + (while true
+         break 2 if (i+=1) > 1
+         p(1, (next; 2))
+       end)
+}
+# redo
+assert_equal 'ok', %q{
+  i = 0
+  1.times{
+    break if i>1
+    i+=1
+    p(1, (redo; 2))
+  }; :ok
+}
+assert_equal '3', %q{
+  i = 0
+  1 + (while true
+         break 2 if (i+=1) > 1
+         redo
+       end)
+}
+assert_equal '3', %q{
+  i = 0
+  1 + (while true
+         break 2 if (i+=1) > 1
+         p(1, (redo; 2))
+       end)
+}
+assert_equal '1', %q{
+  a = [0]
+  a[*a]+=1
+}
+assert_equal '2', %q{
+  ary = [0]
+  case 1
+  when *ary, 1
+    1
+  end +
+  case
+  when *ary
+    1
+  end
+}
+
+assert_match /invalid multibyte char/, %q{
+  STDERR.reopen(STDOUT)
+  eval("\"\xf0".force_encoding("utf-8"))
+}, '[ruby-dev:32429]'
+
+# method ! and !=
+assert_equal 'true', %q{!false}
+assert_equal 'true', %q{1 == 1}
+assert_equal 'true', %q{1 != 2}
+assert_equal 'true', %q{
+  class C; def !=(obj); true; end; end
+  C.new != 1
+}
+assert_equal 'true', %q{
+  class C; def !@; true; end; end
+  !C.new
+}
+assert_normal_exit %q{
+  eval "while true; return; end rescue p $!"
+}, '[ruby-dev:31663]'
+assert_equal '1', %q{
+  def bar
+    raise
+  end
+
+  def foo
+    1.times{
+      begin
+        return bar
+      rescue
+        :ok
+      end
+    }
+  end
+
+  foo
+}
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    next if counter != 0
+    break
+  end
+  :ok
+}, '[ruby-core:14385]'
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    next if counter != 0
+    break :ok
+  end # direct
+}, '[ruby-core:14385]'
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    break if counter == 0
+    "#{next}"
+  end
+  :ok
+}, 'reported by Yusuke ENDOH'
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    break if counter == 0
+    next
+    redo
+  end
+  :ok
+}, 'reported by Yusuke ENDOH'
+
+assert_equal 'ok', %q{
+  counter = 2
+  while true
+    counter -= 1
+    break if counter == 0
+    next
+    "#{ redo }"
+  end
+  :ok
+}, 'reported by Yusuke ENDOH'
+
+assert_normal_exit %q{
+  begin
+    raise
+  rescue
+    counter = 2
+    while true
+      counter -= 1
+      break if counter == 0
+      next
+      retry
+    end
+  end
+}, 'reported by Yusuke ENDOH'
+
+assert_normal_exit %q{
+  counter = 2
+  while true
+    counter -= 1
+    break if counter == 0
+    next
+    "#{ break }"
+  end
+}, 'reported by Yusuke ENDOH'
+
+assert_normal_exit %q{
+  counter = 2
+  while true
+    counter -= 1
+    next if counter != 0
+    "#{ break }"
+  end
+}, 'reported by Yusuke ENDOH'
+
+assert_equal 'ok', %q{
+  1.times do
+    [
+      1, 2, 3, 4, 5, 6, 7, 8,
+      begin
+        false ? next : p
+        break while true
+      end
+    ]
+  end
+  :ok
+}, '[ruby-dev:32882]'
+
+assert_equal "1\n2\n", %q{
+  i = 0
+  while i<2
+    i += 1
+    next p(i)
+  end
+}
+
+assert_valid_syntax('1.times {|i|print (42),1;}', '[ruby-list:44479]')
+
+assert_equal 'ok', %q{
+  def a() end
+  begin
+    if defined?(a(1).a)
+      :ng
+    else
+      :ok
+    end
+  rescue
+    :ng
+  end
+}, '[ruby-core:16010]'
+
+assert_equal 'ok', %q{
+  def a() end
+  begin
+    if defined?(a::B)
+      :ng
+    else
+      :ok
+    end
+  rescue
+    :ng
+  end
+}, '[ruby-core:16010]'
+
+assert_normal_exit %q{
+  defined? C && 0
+}
+
+assert_normal_exit %q{
+  class C
+    def m
+      defined?(super())
+    end
+  end
+  C.new.m
+}
+
+assert_equal 'ok', %q{
+  class X < RuntimeError;end
+  x = [X]
+  begin
+   raise X
+  rescue *x
+   :ok
+  end
+}, '[ruby-core:14537]'
+
+assert_equal 'ok', %q{
+  a = [false]
+  (a[0] &&= true) == false ? :ok : :ng
+}, '[ruby-dev:34679]'
+
+assert_normal_exit %q{
+  a = []
+  100.times {|i| a << i << nil << nil }
+  p a.compact!
+}
+
+assert_equal 'ok', %q{
+  "#{}""#{}ok"
+}, '[ruby-dev:38968]'
+
+
+assert_equal 'ok', %q{
+  "o" "#{}k"
+}, '[ruby-dev:38980]'
+
+bug2415 = '[ruby-core:26961]'
+assert_normal_exit %q{
+  0.times do
+    0.times do
+      def x(a=1, b, *rest); nil end
+    end
+  end
+}, bug2415
+
+assert_normal_exit %q{
+  0.times do
+    0.times do
+      def x@; nil end
+    end
+  end
+}, bug2415
+
+assert_normal_exit %q{
+  0.times do
+    0.times do
+      def x(a = 0.times do
+              def y(a=1, b, *rest); nil; end
+            end)
+        nil
+      end
+    end
+  end
+}, bug2415
+
+assert_normal_exit %q{
+  0.times do
+    0.times do
+      def x(a = 0.times do
+              def x@; nil; end
+            end)
+        nil
+      end
+    end
+  end
+}, bug2415
+
+assert_normal_exit %q{
+  a {
+    b {|c.d| }
+    e
+  }
+}, '[ruby-dev:39861]'
+
+bug1240 = '[ruby-core:22637]'
+assert_valid_syntax('x y { "#{}".z { } }', bug1240)
+assert_valid_syntax('x y { "#{}".z do end }', bug1240)
+
+assert_valid_syntax('y "#{a 1}" do end', '[ruby-core:29579]')
+assert_normal_exit %q{
+  def foo(&block)
+    yield
+  end
+
+  foo do
+    s = defined?(raise + 1)
+    Class
+  end
+}, '[ruby-core:30293]'
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
new file mode 100644
index 0000000000..c2b2b8ce9b
--- /dev/null
+++ b/bootstraptest/test_thread.rb
@@ -0,0 +1,464 @@
+# Thread and Fiber
+
+assert_equal %q{ok}, %q{
+  Thread.new{
+  }.join
+  :ok
+}
+assert_equal %q{ok}, %q{
+  Thread.new{
+    :ok
+  }.value
+}
+assert_equal %q{ok}, %q{
+begin
+  v = 0
+  (1..200).map{|i|
+    Thread.new{
+      i
+    }
+  }.each{|t|
+    v += t.value
+  }
+  v == 20100 ? :ok : v
+rescue ThreadError => e
+  :ok if e.message =~ "can't create Thread"
+end
+}
+assert_equal %q{5000}, %q{
+  5000.times{|e|
+    (1..2).map{
+      Thread.new{
+      }
+    }.each{|e|
+      e.join()
+    }
+  }
+}
+assert_equal %q{5000}, %q{
+  5000.times{|e|
+    (1..2).map{
+      Thread.new{
+      }
+    }.each{|e|
+      e.join(1000000000)
+    }
+  }
+}
+assert_equal %q{ok}, %q{
+begin
+  :ok if 5000 == 5000.times{
+    t = Thread.new{}
+    while t.alive?
+      Thread.pass
+    end
+  }
+rescue NoMemoryError
+  :ok
+end
+}
+assert_equal %q{100}, %q{
+  100.times{
+    Thread.new{loop{Thread.pass}}
+  }
+}
+assert_equal %q{ok}, %q{
+  Thread.new{
+    :ok
+  }.join.value
+}
+assert_equal %q{ok}, %q{
+  begin
+    Thread.new{
+      raise "ok"
+    }.join
+  rescue => e
+    e
+  end
+}
+assert_equal %q{ok}, %q{
+  ans = nil
+  t = Thread.new{
+    begin
+      sleep 0.5
+    ensure
+      ans = :ok
+    end
+  }
+  Thread.pass
+  t.kill
+  t.join
+  ans
+}
+assert_equal %q{ok}, %q{
+  t = Thread.new{
+    sleep
+  }
+  sleep 0.1
+  t.raise
+  begin
+    t.join
+    :ng
+  rescue
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  t = Thread.new{
+    loop{}
+  }
+  Thread.pass
+  t.raise
+  begin
+    t.join
+    :ng
+  rescue
+    :ok
+  end
+}
+assert_equal %q{ok}, %q{
+  t = Thread.new{
+  }
+  Thread.pass
+  t.join
+  t.raise # raise to exited thread
+  begin
+    t.join
+    :ok
+  rescue
+    :ng
+  end
+}
+assert_equal %q{run}, %q{
+  t = Thread.new{
+    loop{}
+  }
+  st = t.status
+  t.kill
+  st
+}
+assert_equal %q{sleep}, %q{
+  t = Thread.new{
+    sleep
+  }
+  sleep 0.1
+  st = t.status
+  t.kill
+  st
+}
+assert_equal %q{false}, %q{
+  t = Thread.new{
+  }
+  t.kill
+  sleep 0.1
+  t.status
+}
+assert_equal %q{[ThreadGroup, true]}, %q{
+  ptg = Thread.current.group
+  Thread.new{
+    ctg = Thread.current.group
+    [ctg.class, ctg == ptg]
+  }.value
+}
+assert_equal %q{[1, 1]}, %q{
+  thg = ThreadGroup.new
+
+  t = Thread.new{
+    thg.add Thread.current
+    sleep
+  }
+  sleep 0.1
+  [thg.list.size, ThreadGroup::Default.list.size]
+}
+assert_equal %q{true}, %q{
+  thg = ThreadGroup.new
+
+  t = Thread.new{sleep 5}
+  thg.add t
+  thg.list.include?(t)
+}
+assert_equal %q{[true, nil, true]}, %q{
+  /a/ =~ 'a'
+  $a = $~
+  Thread.new{
+    $b = $~
+    /b/ =~ 'b'
+    $c = $~
+  }.join
+  $d = $~
+  [$a == $d, $b, $c != $d]
+}
+assert_equal %q{11}, %q{
+  Thread.current[:a] = 1
+  Thread.new{
+    Thread.current[:a] = 10
+    Thread.pass
+    Thread.current[:a]
+  }.value + Thread.current[:a]
+}
+assert_normal_exit %q{
+  begin
+    100.times do |i|
+      begin
+        th = Thread.start(Thread.current) {|u| u.raise }
+        raise
+      rescue
+      ensure
+        th.join
+      end
+    end
+  rescue
+  end
+}, '[ruby-dev:31371]'
+
+assert_equal 'true', %{
+  t = Thread.new { loop {} }
+  begin
+    pid = fork {
+      exit t.status != "run"
+    }
+    Process.wait pid
+    $?.success?
+  rescue NotImplementedError
+    true
+  end
+}
+
+assert_equal 'ok', %{
+  open("zzz.rb", "w") do |f|
+    f.puts <<-END
+      begin
+        Thread.new { fork { GC.start } }.join
+        pid, status = Process.wait2
+        $result = status.success? ? :ok : :ng
+      rescue NotImplementedError
+        $result = :ok
+      end
+    END
+  end
+  require "./zzz.rb"
+  $result
+}
+
+assert_finish 3, %{
+  th = Thread.new {sleep 2}
+  th.join(1)
+  th.join
+}
+
+assert_finish 3, %{
+  require 'timeout'
+  th = Thread.new {sleep 2}
+  begin
+    Timeout.timeout(1) {th.join}
+  rescue Timeout::Error
+  end
+  th.join
+}
+
+assert_normal_exit %q{
+  STDERR.reopen(STDOUT)
+  exec "/"
+}
+
+assert_normal_exit %q{
+  (0..10).map {
+    Thread.new {
+     10000.times {
+        Object.new.to_s
+      }
+    }
+  }.each {|t|
+    t.join
+  }
+}
+
+assert_equal 'ok', %q{
+  def m
+    t = Thread.new { while true; // =~ "" end }
+    sleep 0.1
+    10.times {
+      if /((ab)*(ab)*)*(b)/ =~ "ab"*7
+        return :ng if !$4
+        return :ng if $~.size != 5
+      end
+    }
+    :ok
+  ensure
+    Thread.kill t
+  end
+  m
+}, '[ruby-dev:34492]'
+
+assert_normal_exit %q{
+  at_exit { Fiber.new{}.resume }
+}
+
+assert_normal_exit %q{
+  g = enum_for(:local_variables)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  g = enum_for(:block_given?)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  g = enum_for(:binding)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  g = "abc".enum_for(:scan, /./)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  g = Module.enum_for(:new)
+  loop { g.next }
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  Fiber.new(&Object.method(:class_eval)).resume("foo")
+}, '[ruby-dev:34128]'
+
+assert_normal_exit %q{
+  Thread.new("foo", &Object.method(:class_eval)).join
+}, '[ruby-dev:34128]'
+
+assert_equal 'ok', %q{
+  begin
+    Thread.new { Thread.stop }
+    Thread.stop
+    :ng
+  rescue Exception
+    :ok
+  end
+}
+
+assert_equal 'ok', %q{
+  begin
+    m1, m2 = Mutex.new, Mutex.new
+    Thread.new { m1.lock; sleep 1; m2.lock }
+    m2.lock; sleep 1; m1.lock
+    :ng
+  rescue Exception
+    :ok
+  end
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock }; sleep 1; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock }; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock }.join; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock; sleep 2 }
+  sleep 1; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  m = Mutex.new
+  Thread.new { m.lock; sleep 2; m.unlock }
+  sleep 1; m.lock
+  :ok
+}
+
+assert_equal 'ok', %q{
+  t = Thread.new {`echo`}
+  t.join
+  $? ? :ng : :ok
+}, '[ruby-dev:35414]'
+
+assert_equal 'ok', %q{
+  begin
+    100.times{
+      (1..100).map{ Thread.new(true) {|x| x == false } }.each{|th| th.join}
+    }
+  rescue NoMemoryError, StandardError
+  end
+  :ok
+}
+
+assert_equal 'ok', %{
+  open("zzz.rb", "w") do |f|
+    f.puts <<-END
+      begin
+        m = Mutex.new
+        Thread.new { m.lock; sleep 1 }
+        sleep 0.3
+        parent = Thread.current
+        Thread.new do
+          sleep 0.3
+          begin
+            fork { GC.start }
+          rescue Exception
+            parent.raise $!
+          end
+        end
+        m.lock
+        pid, status = Process.wait2
+        $result = status.success? ? :ok : :ng
+      rescue NotImplementedError
+        $result = :ok
+      end
+    END
+  end
+  require "./zzz.rb"
+  $result
+}
+
+assert_finish 3, %q{
+  require 'thread'
+
+  lock = Mutex.new
+  cond = ConditionVariable.new
+  t = Thread.new do
+    lock.synchronize do
+      cond.wait(lock)
+    end
+  end
+
+  begin
+    pid = fork do
+      # Child
+      STDOUT.write "This is the child process.\n"
+      STDOUT.write "Child process exiting.\n"
+    end
+    Process.waitpid(pid)
+  rescue NotImplementedError
+  end
+}, '[ruby-core:23572]'
+
+assert_equal 'ok', %q{
+  begin
+    Process.waitpid2(fork {sleep 1})[1].success? ? 'ok' : 'ng'
+  rescue NotImplementedError
+    'ok'
+  end
+}
+
+assert_equal 'foo', %q{
+  f = proc {|s| /#{ sleep 1; s }/o }
+  [ Thread.new {            f.call("foo"); nil },
+    Thread.new { sleep 0.5; f.call("bar"); nil },
+  ].each {|t| t.join }
+  GC.start
+  f.call.source
+}
diff --git a/class.c b/class.c
index 054be60d53..8d237985b8 100644
--- a/class.c
+++ b/class.c
@@ -3,123 +3,374 @@
   class.c -
 
   $Author$
-  $Date$
   created at: Tue Aug 10 15:05:44 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "rubysig.h"
-#include "node.h"
-#include "st.h"
+/*!
+ * \defgroup class Classes and their hierarchy.
+ * \par Terminology
+ * - class: same as in Ruby.
+ * - singleton class: class for a particular object
+ * - eigenclass: = singleton class
+ * - metaclass: class of a class. metaclass is a kind of singleton class.
+ * - metametaclass: class of a metaclass.
+ * - meta^(n)-class: class of a meta^(n-1)-class.
+ * - attached object: A singleton class knows its unique instance.
+ *   The instance is called the attached object for the singleton class.
+ * \{
+ */
+
+#include "ruby/ruby.h"
+#include "ruby/st.h"
+#include "method.h"
+#include "constant.h"
+#include "vm_core.h"
+#include "internal.h"
 #include <ctype.h>
 
-extern st_table *rb_class_tbl;
+int rb_vm_add_root_module(ID id, VALUE module);
+
+
+#define id_attached id__attached__
+
+void
+rb_class_subclass_add(VALUE super, VALUE klass)
+{
+    rb_subclass_entry_t *entry, *head;
+
+    if (super && super != Qundef) {
+	entry = malloc(sizeof(*entry));
+	entry->klass = klass;
+	entry->next = NULL;
+
+	head = RCLASS_EXT(super)->subclasses;
+	if (head) {
+	    entry->next = head;
+	    RCLASS_EXT(head->klass)->parent_subclasses = &entry->next;
+	}
+
+	RCLASS_EXT(super)->subclasses = entry;
+	RCLASS_EXT(klass)->parent_subclasses = &RCLASS_EXT(super)->subclasses;
+    }
+}
+
+static void
+rb_module_add_to_subclasses_list(VALUE module, VALUE iclass)
+{
+    rb_subclass_entry_t *entry, *head;
+
+    entry = malloc(sizeof(*entry));
+    entry->klass = iclass;
+    entry->next = NULL;
+
+    head = RCLASS_EXT(module)->subclasses;
+    if (head) {
+	entry->next = head;
+	RCLASS_EXT(head->klass)->module_subclasses = &entry->next;
+    }
+
+    RCLASS_EXT(module)->subclasses = entry;
+    RCLASS_EXT(iclass)->module_subclasses = &RCLASS_EXT(module)->subclasses;
+}
+
+void
+rb_class_remove_from_super_subclasses(VALUE klass)
+{
+    rb_subclass_entry_t *entry;
+
+    if (RCLASS_EXT(klass)->parent_subclasses) {
+	entry = *RCLASS_EXT(klass)->parent_subclasses;
+
+	*RCLASS_EXT(klass)->parent_subclasses = entry->next;
+	if (entry->next) {
+	    RCLASS_EXT(entry->next->klass)->parent_subclasses = RCLASS_EXT(klass)->parent_subclasses;
+	}
+	free(entry);
+    }
+
+    RCLASS_EXT(klass)->parent_subclasses = NULL;
+}
+
+void
+rb_class_remove_from_module_subclasses(VALUE klass)
+{
+    rb_subclass_entry_t *entry;
+
+    if (RCLASS_EXT(klass)->module_subclasses) {
+	entry = *RCLASS_EXT(klass)->module_subclasses;
+	*RCLASS_EXT(klass)->module_subclasses = entry->next;
+
+	if (entry->next) {
+	    RCLASS_EXT(entry->next->klass)->module_subclasses = RCLASS_EXT(klass)->module_subclasses;
+	}
+
+	free(entry);
+    }
+
+    RCLASS_EXT(klass)->module_subclasses = NULL;
+}
+
+void
+rb_class_foreach_subclass(VALUE klass, void(*f)(VALUE))
+{
+    rb_subclass_entry_t *cur = RCLASS_EXT(klass)->subclasses;
+
+    /* do not be tempted to simplify this loop into a for loop, the order of
+       operations is important here if `f` modifies the linked list */
+    while (cur) {
+	VALUE curklass = cur->klass;
+	cur = cur->next;
+	f(curklass);
+    }
+}
+
+void
+rb_class_detach_subclasses(VALUE klass)
+{
+    rb_class_foreach_subclass(klass, rb_class_remove_from_super_subclasses);
+}
+
+void
+rb_class_detach_module_subclasses(VALUE klass)
+{
+    rb_class_foreach_subclass(klass, rb_class_remove_from_module_subclasses);
+}
+
+/**
+ * Allocates a struct RClass for a new class.
+ *
+ * \param flags     initial value for basic.flags of the returned class.
+ * \param klass     the class of the returned class.
+ * \return          an uninitialized Class object.
+ * \pre  \p klass must refer \c Class class or an ancestor of Class.
+ * \pre  \code (flags | T_CLASS) != 0  \endcode
+ * \post the returned class can safely be \c #initialize 'd.
+ *
+ * \note this function is not Class#allocate.
+ */
+static VALUE
+class_alloc(VALUE flags, VALUE klass)
+{
+    NEWOBJ_OF(obj, struct RClass, klass, (flags & T_MASK) | (RGENGC_WB_PROTECTED_CLASS ? FL_WB_PROTECTED : 0));
+    obj->ptr = ALLOC(rb_classext_t);
+    RCLASS_IV_TBL(obj) = 0;
+    RCLASS_CONST_TBL(obj) = 0;
+    RCLASS_M_TBL(obj) = 0;
+    RCLASS_SET_SUPER((VALUE)obj, 0);
+    RCLASS_ORIGIN(obj) = (VALUE)obj;
+    RCLASS_IV_INDEX_TBL(obj) = 0;
+
+    RCLASS_EXT(obj)->subclasses = NULL;
+    RCLASS_EXT(obj)->parent_subclasses = NULL;
+    RCLASS_EXT(obj)->module_subclasses = NULL;
+    RCLASS_EXT(obj)->class_serial = rb_next_class_serial();
+
+    RCLASS_REFINED_CLASS(obj) = Qnil;
+    RCLASS_EXT(obj)->allocator = 0;
+    return (VALUE)obj;
+}
+
 
+/*!
+ * A utility function that wraps class_alloc.
+ *
+ * allocates a class and initializes safely.
+ * \param super     a class from which the new class derives.
+ * \return          a class object.
+ * \pre  \a super must be a class.
+ * \post the metaclass of the new class is Class.
+ */
 VALUE
-rb_class_boot(super)
-    VALUE super;
+rb_class_boot(VALUE super)
 {
-    NEWOBJ(klass, struct RClass);
-    OBJSETUP(klass, rb_cClass, T_CLASS);
+    VALUE klass = class_alloc(T_CLASS, rb_cClass);
 
-    klass->super = super;
-    klass->iv_tbl = 0;
-    klass->m_tbl = 0;		/* safe GC */
-    klass->m_tbl = st_init_numtable();
+    RCLASS_SET_SUPER(klass, super);
+    RCLASS_M_TBL(klass) = st_init_numtable();
 
     OBJ_INFECT(klass, super);
     return (VALUE)klass;
 }
 
-VALUE
-rb_class_new(super)
-    VALUE super;
+
+/*!
+ * Ensures a class can be derived from super.
+ *
+ * \param super a reference to an object.
+ * \exception TypeError if \a super is not a Class or \a super is a singleton class.
+ */
+void
+rb_check_inheritable(VALUE super)
 {
-    Check_Type(super, T_CLASS);
+    if (!RB_TYPE_P(super, T_CLASS)) {
+	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
+		 rb_obj_classname(super));
+    }
+    if (RBASIC(super)->flags & FL_SINGLETON) {
+	rb_raise(rb_eTypeError, "can't make subclass of singleton class");
+    }
     if (super == rb_cClass) {
 	rb_raise(rb_eTypeError, "can't make subclass of Class");
     }
-    if (FL_TEST(super, FL_SINGLETON)) {
-	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
-    }
+}
+
+
+/*!
+ * Creates a new class.
+ * \param super     a class from which the new class derives.
+ * \exception TypeError \a super is not inheritable.
+ * \exception TypeError \a super is the Class class.
+ */
+VALUE
+rb_class_new(VALUE super)
+{
+    Check_Type(super, T_CLASS);
+    rb_check_inheritable(super);
     return rb_class_boot(super);
 }
 
-struct clone_method_data {
-    st_table *tbl;
+static void
+rewrite_cref_stack(NODE *node, VALUE old_klass, VALUE new_klass, NODE **new_cref_ptr)
+{
+    NODE *new_node;
+    while (node) {
+	if (node->nd_clss == old_klass) {
+	    new_node = NEW_CREF(new_klass);
+	    new_node->nd_next = node->nd_next;
+	    *new_cref_ptr = new_node;
+	    return;
+	}
+	new_node = NEW_CREF(node->nd_clss);
+	node = node->nd_next;
+	*new_cref_ptr = new_node;
+	new_cref_ptr = &new_node->nd_next;
+    }
+    *new_cref_ptr = NULL;
+}
+
+static void
+clone_method(VALUE klass, ID mid, const rb_method_entry_t *me)
+{
+    VALUE newiseqval;
+    if (me->def && me->def->type == VM_METHOD_TYPE_ISEQ) {
+	rb_iseq_t *iseq;
+	NODE *new_cref;
+	newiseqval = rb_iseq_clone(me->def->body.iseq->self, klass);
+	GetISeqPtr(newiseqval, iseq);
+	rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref);
+	OBJ_WRITE(iseq->self, &iseq->cref_stack, new_cref);
+	rb_add_method(klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);
+	RB_GC_GUARD(newiseqval);
+    }
+    else {
+	rb_method_entry_set(klass, mid, me, me->flag);
+    }
+}
+
+static int
+clone_method_i(st_data_t key, st_data_t value, st_data_t data)
+{
+    clone_method((VALUE)data, (ID)key, (const rb_method_entry_t *)value);
+    return ST_CONTINUE;
+}
+
+struct clone_const_arg {
     VALUE klass;
+    st_table *tbl;
 };
 
 static int
-clone_method(mid, body, data)
-    ID mid;
-    NODE *body;
-    struct clone_method_data *data;
+clone_const(ID key, const rb_const_entry_t *ce, struct clone_const_arg *arg)
 {
-    NODE *fbody = body->nd_body;
+    rb_const_entry_t *nce = ALLOC(rb_const_entry_t);
+    MEMCPY(nce, ce, rb_const_entry_t, 1);
+    OBJ_WRITTEN(arg->klass, Qundef, ce->value);
+    OBJ_WRITTEN(arg->klass, Qundef, ce->file);
 
-    if (fbody && nd_type(fbody) == NODE_SCOPE) {
-	NODE *cref = (NODE*)fbody->nd_rval;
+    st_insert(arg->tbl, key, (st_data_t)nce);
+    return ST_CONTINUE;
+}
 
-	if (cref) cref = cref->nd_next;
-	fbody = rb_copy_node_scope(fbody, NEW_CREF(data->klass, cref));
+static int
+clone_const_i(st_data_t key, st_data_t value, st_data_t data)
+{
+    return clone_const((ID)key, (const rb_const_entry_t *)value, (struct clone_const_arg *)data);
+}
+
+static void
+class_init_copy_check(VALUE clone, VALUE orig)
+{
+    if (orig == rb_cBasicObject) {
+	rb_raise(rb_eTypeError, "can't copy the root class");
+    }
+    if (RCLASS_SUPER(clone) != 0 || clone == rb_cBasicObject) {
+	rb_raise(rb_eTypeError, "already initialized class");
+    }
+    if (FL_TEST(orig, FL_SINGLETON)) {
+	rb_raise(rb_eTypeError, "can't copy singleton class");
     }
-    st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex));
-    return ST_CONTINUE;
 }
 
 /* :nodoc: */
 VALUE
-rb_mod_init_copy(clone, orig)
-    VALUE clone, orig;
+rb_mod_init_copy(VALUE clone, VALUE orig)
 {
+    if (RB_TYPE_P(clone, T_CLASS)) {
+	class_init_copy_check(clone, orig);
+    }
     rb_obj_init_copy(clone, orig);
     if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
-	RBASIC(clone)->klass = RBASIC(orig)->klass;
-	RBASIC(clone)->klass = rb_singleton_class_clone(clone);
+	RBASIC_SET_CLASS(clone, rb_singleton_class_clone(orig));
+	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
     }
-    RCLASS(clone)->super = RCLASS(orig)->super;
-    if (RCLASS(orig)->iv_tbl) {
-	ID id;
+    RCLASS_SET_SUPER(clone, RCLASS_SUPER(orig));
+    RCLASS_EXT(clone)->allocator = RCLASS_EXT(orig)->allocator;
+    if (RCLASS_IV_TBL(orig)) {
+	st_data_t id;
 
-	RCLASS(clone)->iv_tbl = st_copy(RCLASS(orig)->iv_tbl);
-	id = rb_intern("__classpath__");
-	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
-	id = rb_intern("__classid__");
-	st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
+	if (RCLASS_IV_TBL(clone)) {
+	    st_free_table(RCLASS_IV_TBL(clone));
+	}
+	RCLASS_IV_TBL(clone) = rb_st_copy(clone, RCLASS_IV_TBL(orig));
+	CONST_ID(id, "__tmp_classpath__");
+	st_delete(RCLASS_IV_TBL(clone), &id, 0);
+	CONST_ID(id, "__classpath__");
+	st_delete(RCLASS_IV_TBL(clone), &id, 0);
+	CONST_ID(id, "__classid__");
+	st_delete(RCLASS_IV_TBL(clone), &id, 0);
     }
-    if (RCLASS(orig)->m_tbl) {
-	struct clone_method_data data;
-
-	data.tbl = RCLASS(clone)->m_tbl = st_init_numtable();
-	data.klass = (VALUE)clone;
-
-	st_foreach(RCLASS(orig)->m_tbl, clone_method, (st_data_t)&data);
+    if (RCLASS_CONST_TBL(orig)) {
+	struct clone_const_arg arg;
+	if (RCLASS_CONST_TBL(clone)) {
+	    rb_free_const_table(RCLASS_CONST_TBL(clone));
+	}
+	RCLASS_CONST_TBL(clone) = st_init_numtable();
+	arg.klass = clone;
+	arg.tbl = RCLASS_CONST_TBL(clone);
+	st_foreach(RCLASS_CONST_TBL(orig), clone_const_i, (st_data_t)&arg);
+    }
+    if (RCLASS_M_TBL(orig)) {
+	if (RCLASS_M_TBL(clone)) {
+	    rb_free_m_table(RCLASS_M_TBL(clone));
+	}
+	RCLASS_M_TBL(clone) = st_init_numtable();
+	st_foreach(RCLASS_M_TBL(orig), clone_method_i, (st_data_t)clone);
     }
 
     return clone;
 }
 
-/* :nodoc: */
 VALUE
-rb_class_init_copy(clone, orig)
-    VALUE clone, orig;
+rb_singleton_class_clone(VALUE obj)
 {
-    if (RCLASS(clone)->super != 0) {
-	rb_raise(rb_eTypeError, "already initialized class");
-    }
-    if (FL_TEST(orig, FL_SINGLETON)) {
-	rb_raise(rb_eTypeError, "can't copy singleton class");
-    }
-    return rb_mod_init_copy(clone, orig);
+    return rb_singleton_class_clone_and_attach(obj, Qundef);
 }
 
 VALUE
-rb_singleton_class_clone(obj)
-    VALUE obj;
+rb_singleton_class_clone_and_attach(VALUE obj, VALUE attach)
 {
     VALUE klass = RBASIC(obj)->klass;
 
@@ -127,84 +378,205 @@ rb_singleton_class_clone(obj)
 	return klass;
     else {
 	/* copy singleton(unnamed) class */
-	NEWOBJ(clone, struct RClass);
-	OBJSETUP(clone, 0, RBASIC(klass)->flags);
+	VALUE clone = class_alloc(RBASIC(klass)->flags, 0);
 
 	if (BUILTIN_TYPE(obj) == T_CLASS) {
-	    RBASIC(clone)->klass = (VALUE)clone;
+	    RBASIC_SET_CLASS(clone, clone);
 	}
 	else {
-	    RBASIC(clone)->klass = rb_singleton_class_clone(klass);
+	    RBASIC_SET_CLASS(clone, rb_singleton_class_clone(klass));
 	}
 
-	clone->super = RCLASS(klass)->super;
-	clone->iv_tbl = 0;
-	clone->m_tbl = 0;
-	if (RCLASS(klass)->iv_tbl) {
-	    clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
+	RCLASS_SET_SUPER(clone, RCLASS_SUPER(klass));
+	RCLASS_EXT(clone)->allocator = RCLASS_EXT(klass)->allocator;
+	if (RCLASS_IV_TBL(klass)) {
+	    RCLASS_IV_TBL(clone) = rb_st_copy(clone, RCLASS_IV_TBL(klass));
 	}
-	{
-	    struct clone_method_data data;
-
-	    data.tbl = clone->m_tbl = st_init_numtable();
-	    switch (TYPE(obj)) {
-	      case T_CLASS:
-	      case T_MODULE:
-		data.klass = obj;
-		break;
-	      default:
-		data.klass = Qnil;
-		break;
-	    }
-
-	    st_foreach(RCLASS(klass)->m_tbl, clone_method, (st_data_t)&data);
+	if (RCLASS_CONST_TBL(klass)) {
+	    struct clone_const_arg arg;
+	    RCLASS_CONST_TBL(clone) = st_init_numtable();
+	    arg.klass = clone;
+	    arg.tbl = RCLASS_CONST_TBL(clone);
+	    st_foreach(RCLASS_CONST_TBL(klass), clone_const_i, (st_data_t)&arg);
 	}
-	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
+	if (attach != Qundef) {
+	    rb_singleton_class_attached(clone, attach);
+	}
+	RCLASS_M_TBL(clone) = st_init_numtable();
+	st_foreach(RCLASS_M_TBL(klass), clone_method_i, (st_data_t)clone);
+	rb_singleton_class_attached(RBASIC(clone)->klass, clone);
 	FL_SET(clone, FL_SINGLETON);
-	return (VALUE)clone;
+
+	return clone;
     }
 }
 
+/*!
+ * Attach a object to a singleton class.
+ * @pre \a klass is the singleton class of \a obj.
+ */
 void
-rb_singleton_class_attached(klass, obj)
-    VALUE klass, obj;
+rb_singleton_class_attached(VALUE klass, VALUE obj)
 {
     if (FL_TEST(klass, FL_SINGLETON)) {
-	if (!RCLASS(klass)->iv_tbl) {
-	    RCLASS(klass)->iv_tbl = st_init_numtable();
+	if (!RCLASS_IV_TBL(klass)) {
+	    RCLASS_IV_TBL(klass) = st_init_numtable();
 	}
-	st_insert(RCLASS(klass)->iv_tbl, rb_intern("__attached__"), obj);
+	rb_st_insert_id_and_value(klass, RCLASS_IV_TBL(klass), id_attached, obj);
     }
 }
 
-VALUE
-rb_make_metaclass(obj, super)
-    VALUE obj, super;
+
+
+#define METACLASS_OF(k) RBASIC(k)->klass
+#define SET_METACLASS_OF(k, cls) RBASIC_SET_CLASS(k, cls)
+
+/*!
+ * whether k is a meta^(n)-class of Class class
+ * @retval 1 if \a k is a meta^(n)-class of Class class (n >= 0)
+ * @retval 0 otherwise
+ */
+#define META_CLASS_OF_CLASS_CLASS_P(k)  (METACLASS_OF(k) == (k))
+
+/*!
+ * whether k has a metaclass
+ * @retval 1 if \a k has a metaclass
+ * @retval 0 otherwise
+ */
+#define HAVE_METACLASS_P(k) \
+    (FL_TEST(METACLASS_OF(k), FL_SINGLETON) && \
+     rb_ivar_get(METACLASS_OF(k), id_attached) == (k))
+
+/*!
+ * ensures \a klass belongs to its own eigenclass.
+ * @return the eigenclass of \a klass
+ * @post \a klass belongs to the returned eigenclass.
+ *       i.e. the attached object of the eigenclass is \a klass.
+ * @note this macro creates a new eigenclass if necessary.
+ */
+#define ENSURE_EIGENCLASS(klass) \
+    (HAVE_METACLASS_P(klass) ? METACLASS_OF(klass) : make_metaclass(klass))
+
+
+/*!
+ * Creates a metaclass of \a klass
+ * \param klass     a class
+ * \return          created metaclass for the class
+ * \pre \a klass is a Class object
+ * \pre \a klass has no singleton class.
+ * \post the class of \a klass is the returned class.
+ * \post the returned class is meta^(n+1)-class when \a klass is a meta^(n)-klass for n >= 0
+ */
+static inline VALUE
+make_metaclass(VALUE klass)
 {
-    VALUE klass = rb_class_boot(super);
-    FL_SET(klass, FL_SINGLETON);
-    RBASIC(obj)->klass = klass;
-    rb_singleton_class_attached(klass, obj);
-    if (BUILTIN_TYPE(obj) == T_CLASS && FL_TEST(obj, FL_SINGLETON)) {
-	RBASIC(klass)->klass = klass;
-	RCLASS(klass)->super = RBASIC(rb_class_real(RCLASS(obj)->super))->klass;
+    VALUE super;
+    VALUE metaclass = rb_class_boot(Qundef);
+
+    FL_SET(metaclass, FL_SINGLETON);
+    rb_singleton_class_attached(metaclass, klass);
+
+    if (META_CLASS_OF_CLASS_CLASS_P(klass)) {
+	SET_METACLASS_OF(klass, metaclass);
+	SET_METACLASS_OF(metaclass, metaclass);
     }
     else {
-	VALUE metasuper = RBASIC(rb_class_real(super))->klass;
-
-	/* metaclass of a superclass may be NULL at boot time */
-	if (metasuper) {
-	    RBASIC(klass)->klass = metasuper;
-	}
+	VALUE tmp = METACLASS_OF(klass); /* for a meta^(n)-class klass, tmp is meta^(n)-class of Class class */
+	SET_METACLASS_OF(klass, metaclass);
+	SET_METACLASS_OF(metaclass, ENSURE_EIGENCLASS(tmp));
     }
 
+    super = RCLASS_SUPER(klass);
+    while (RB_TYPE_P(super, T_ICLASS)) super = RCLASS_SUPER(super);
+    RCLASS_SET_SUPER(metaclass, super ? ENSURE_EIGENCLASS(super) : rb_cClass);
+
+    OBJ_INFECT(metaclass, RCLASS_SUPER(metaclass));
+
+    return metaclass;
+}
+
+/*!
+ * Creates a singleton class for \a obj.
+ * \pre \a obj must not a immediate nor a special const.
+ * \pre \a obj must not a Class object.
+ * \pre \a obj has no singleton class.
+ */
+static inline VALUE
+make_singleton_class(VALUE obj)
+{
+    VALUE orig_class = RBASIC(obj)->klass;
+    VALUE klass = rb_class_boot(orig_class);
+
+    FL_SET(klass, FL_SINGLETON);
+    RBASIC_SET_CLASS(obj, klass);
+    rb_singleton_class_attached(klass, obj);
+
+    SET_METACLASS_OF(klass, METACLASS_OF(rb_class_real(orig_class)));
     return klass;
 }
 
+
+static VALUE
+boot_defclass(const char *name, VALUE super)
+{
+    VALUE obj = rb_class_boot(super);
+    ID id = rb_intern(name);
+
+    rb_name_class(obj, id);
+    rb_const_set((rb_cObject ? rb_cObject : obj), id, obj);
+    return obj;
+}
+
+void
+Init_class_hierarchy(void)
+{
+    rb_cBasicObject = boot_defclass("BasicObject", 0);
+    rb_cObject = boot_defclass("Object", rb_cBasicObject);
+    rb_cModule = boot_defclass("Module", rb_cObject);
+    rb_cClass =  boot_defclass("Class",  rb_cModule);
+
+    rb_const_set(rb_cObject, rb_intern("BasicObject"), rb_cBasicObject);
+    RBASIC_SET_CLASS(rb_cClass, rb_cClass);
+    RBASIC_SET_CLASS(rb_cModule, rb_cClass);
+    RBASIC_SET_CLASS(rb_cObject, rb_cClass);
+    RBASIC_SET_CLASS(rb_cBasicObject, rb_cClass);
+}
+
+
+/*!
+ * \internal
+ * Creates a new *singleton class* for an object.
+ *
+ * \pre \a obj has no singleton class.
+ * \note DO NOT USE the function in an extension libraries. Use \ref rb_singleton_class.
+ * \param obj     An object.
+ * \param unused  ignored.
+ * \return        The singleton class of the object.
+ */
 VALUE
-rb_define_class_id(id, super)
-    ID id;
-    VALUE super;
+rb_make_metaclass(VALUE obj, VALUE unused)
+{
+    if (BUILTIN_TYPE(obj) == T_CLASS) {
+	return make_metaclass(obj);
+    }
+    else {
+	return make_singleton_class(obj);
+    }
+}
+
+
+/*!
+ * Defines a new class.
+ * \param id     ignored
+ * \param super  A class from which the new class will derive. NULL means \c Object class.
+ * \return       the created class
+ * \throw TypeError if super is not a \c Class object.
+ *
+ * \note the returned class will not be associated with \a id.
+ *       You must explicitly set a class name if necessary.
+ */
+VALUE
+rb_define_class_id(ID id, VALUE super)
 {
     VALUE klass;
 
@@ -215,31 +587,43 @@ rb_define_class_id(id, super)
     return klass;
 }
 
-void
-rb_check_inheritable(super)
-    VALUE super;
-{
-    if (TYPE(super) != T_CLASS) {
-	rb_raise(rb_eTypeError, "superclass must be a Class (%s given)",
-		 rb_obj_classname(super));
-    }
-    if (RBASIC(super)->flags & FL_SINGLETON) {
-	rb_raise(rb_eTypeError, "can't make subclass of virtual class");
-    }
-}
 
+/*!
+ * Calls Class#inherited.
+ * \param super  A class which will be called #inherited.
+ *               NULL means Object class.
+ * \param klass  A Class object which derived from \a super
+ * \return the value \c Class#inherited's returns
+ * \pre Each of \a super and \a klass must be a \c Class object.
+ */
 VALUE
-rb_class_inherited(super, klass)
-    VALUE super, klass;
+rb_class_inherited(VALUE super, VALUE klass)
 {
+    ID inherited;
     if (!super) super = rb_cObject;
-    return rb_funcall(super, rb_intern("inherited"), 1, klass);
+    CONST_ID(inherited, "inherited");
+    return rb_funcall(super, inherited, 1, klass);
 }
 
+
+
+/*!
+ * Defines a top-level class.
+ * \param name   name of the class
+ * \param super  a class from which the new class will derive.
+ *               NULL means \c Object class.
+ * \return the created class
+ * \throw TypeError if the constant name \a name is already taken but
+ *                  the constant is not a \c Class.
+ * \throw NameError if the class is already defined but the class can not
+ *                  be reopened because its superclass is not \a super.
+ * \post top-level constant named \a name refers the returned class.
+ *
+ * \note if a class named \a name is already defined and its superclass is
+ *       \a super, the function just returns the defined class.
+ */
 VALUE
-rb_define_class(name, super)
-    const char *name;
-    VALUE super;
+rb_define_class(const char *name, VALUE super)
 {
     VALUE klass;
     ID id;
@@ -247,11 +631,11 @@ rb_define_class(name, super)
     id = rb_intern(name);
     if (rb_const_defined(rb_cObject, id)) {
 	klass = rb_const_get(rb_cObject, id);
-	if (TYPE(klass) != T_CLASS) {
+	if (!RB_TYPE_P(klass, T_CLASS)) {
 	    rb_raise(rb_eTypeError, "%s is not a class", name);
 	}
-	if (rb_class_real(RCLASS(klass)->super) != super) {
-	    rb_name_error(id, "%s is already defined", name);
+	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
+	    rb_raise(rb_eTypeError, "superclass mismatch for class %s", name);
 	}
 	return klass;
     }
@@ -259,7 +643,7 @@ rb_define_class(name, super)
 	rb_warn("no super class for `%s', Object assumed", name);
     }
     klass = rb_define_class_id(id, super);
-    st_add_direct(rb_class_tbl, id, klass);
+    rb_vm_add_root_module(id, klass);
     rb_name_class(klass, id);
     rb_const_set(rb_cObject, id, klass);
     rb_class_inherited(super, klass);
@@ -267,55 +651,86 @@ rb_define_class(name, super)
     return klass;
 }
 
+
+/*!
+ * Defines a class under the namespace of \a outer.
+ * \param outer  a class which contains the new class.
+ * \param name   name of the new class
+ * \param super  a class from which the new class will derive.
+ *               NULL means \c Object class.
+ * \return the created class
+ * \throw TypeError if the constant name \a name is already taken but
+ *                  the constant is not a \c Class.
+ * \throw NameError if the class is already defined but the class can not
+ *                  be reopened because its superclass is not \a super.
+ * \post top-level constant named \a name refers the returned class.
+ *
+ * \note if a class named \a name is already defined and its superclass is
+ *       \a super, the function just returns the defined class.
+ */
 VALUE
-rb_define_class_under(outer, name, super)
-    VALUE outer;
-    const char *name;
-    VALUE super;
+rb_define_class_under(VALUE outer, const char *name, VALUE super)
+{
+    return rb_define_class_id_under(outer, rb_intern(name), super);
+}
+
+
+/*!
+ * Defines a class under the namespace of \a outer.
+ * \param outer  a class which contains the new class.
+ * \param id     name of the new class
+ * \param super  a class from which the new class will derive.
+ *               NULL means \c Object class.
+ * \return the created class
+ * \throw TypeError if the constant name \a name is already taken but
+ *                  the constant is not a \c Class.
+ * \throw NameError if the class is already defined but the class can not
+ *                  be reopened because its superclass is not \a super.
+ * \post top-level constant named \a name refers the returned class.
+ *
+ * \note if a class named \a name is already defined and its superclass is
+ *       \a super, the function just returns the defined class.
+ */
+VALUE
+rb_define_class_id_under(VALUE outer, ID id, VALUE super)
 {
     VALUE klass;
-    ID id;
 
-    id = rb_intern(name);
     if (rb_const_defined_at(outer, id)) {
 	klass = rb_const_get_at(outer, id);
-	if (TYPE(klass) != T_CLASS) {
-	    rb_raise(rb_eTypeError, "%s is not a class", name);
+	if (!RB_TYPE_P(klass, T_CLASS)) {
+	    rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
 	}
-	if (rb_class_real(RCLASS(klass)->super) != super) {
-	    rb_name_error(id, "%s is already defined", name);
+	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
+	    rb_name_error(id, "%s is already defined", rb_id2name(id));
 	}
 	return klass;
     }
     if (!super) {
 	rb_warn("no super class for `%s::%s', Object assumed",
-		rb_class2name(outer), name);
+		rb_class2name(outer), rb_id2name(id));
     }
     klass = rb_define_class_id(id, super);
-    rb_set_class_path(klass, outer, name);
+    rb_set_class_path_string(klass, outer, rb_id2str(id));
     rb_const_set(outer, id, klass);
     rb_class_inherited(super, klass);
+    rb_gc_register_mark_object(klass);
 
     return klass;
 }
 
 VALUE
-rb_module_new()
+rb_module_new(void)
 {
-    NEWOBJ(mdl, struct RClass);
-    OBJSETUP(mdl, rb_cModule, T_MODULE);
+    VALUE mdl = class_alloc(T_MODULE, rb_cModule);
 
-    mdl->super = 0;
-    mdl->iv_tbl = 0;
-    mdl->m_tbl = 0;
-    mdl->m_tbl = st_init_numtable();
+    RCLASS_M_TBL(mdl) = st_init_numtable();
 
     return (VALUE)mdl;
 }
 
 VALUE
-rb_define_module_id(id)
-    ID id;
+rb_define_module_id(ID id)
 {
     VALUE mdl;
 
@@ -326,8 +741,7 @@ rb_define_module_id(id)
 }
 
 VALUE
-rb_define_module(name)
-    const char *name;
+rb_define_module(const char *name)
 {
     VALUE module;
     ID id;
@@ -335,61 +749,68 @@ rb_define_module(name)
     id = rb_intern(name);
     if (rb_const_defined(rb_cObject, id)) {
 	module = rb_const_get(rb_cObject, id);
-	if (TYPE(module) == T_MODULE)
+	if (RB_TYPE_P(module, T_MODULE))
 	    return module;
 	rb_raise(rb_eTypeError, "%s is not a module", rb_obj_classname(module));
     }
     module = rb_define_module_id(id);
-    st_add_direct(rb_class_tbl, id, module);
+    rb_vm_add_root_module(id, module);
     rb_const_set(rb_cObject, id, module);
 
     return module;
 }
 
 VALUE
-rb_define_module_under(outer, name)
-    VALUE outer;
-    const char *name;
+rb_define_module_under(VALUE outer, const char *name)
+{
+    return rb_define_module_id_under(outer, rb_intern(name));
+}
+
+VALUE
+rb_define_module_id_under(VALUE outer, ID id)
 {
     VALUE module;
-    ID id;
 
-    id = rb_intern(name);
     if (rb_const_defined_at(outer, id)) {
 	module = rb_const_get_at(outer, id);
-	if (TYPE(module) == T_MODULE)
+	if (RB_TYPE_P(module, T_MODULE))
 	    return module;
 	rb_raise(rb_eTypeError, "%s::%s is not a module",
 		 rb_class2name(outer), rb_obj_classname(module));
     }
     module = rb_define_module_id(id);
     rb_const_set(outer, id, module);
-    rb_set_class_path(module, outer, name);
+    rb_set_class_path_string(module, outer, rb_id2str(id));
+    rb_gc_register_mark_object(module);
 
     return module;
 }
 
-static VALUE
-include_class_new(module, super)
-    VALUE module, super;
+VALUE
+rb_include_class_new(VALUE module, VALUE super)
 {
-    NEWOBJ(klass, struct RClass);
-    OBJSETUP(klass, rb_cClass, T_ICLASS);
+    VALUE klass = class_alloc(T_ICLASS, rb_cClass);
 
     if (BUILTIN_TYPE(module) == T_ICLASS) {
 	module = RBASIC(module)->klass;
     }
-    if (!RCLASS(module)->iv_tbl) {
-	RCLASS(module)->iv_tbl = st_init_numtable();
+    if (!RCLASS_IV_TBL(module)) {
+	RCLASS_IV_TBL(module) = st_init_numtable();
     }
-    klass->iv_tbl = RCLASS(module)->iv_tbl;
-    klass->m_tbl = RCLASS(module)->m_tbl;
-    klass->super = super;
-    if (TYPE(module) == T_ICLASS) {
-	RBASIC(klass)->klass = RBASIC(module)->klass;
+    if (!RCLASS_CONST_TBL(module)) {
+	RCLASS_CONST_TBL(module) = st_init_numtable();
+    }
+    RCLASS_IV_TBL(klass) = RCLASS_IV_TBL(module);
+    RCLASS_CONST_TBL(klass) = RCLASS_CONST_TBL(module);
+
+    RCLASS_M_TBL(OBJ_WB_UNPROTECT(klass)) = RCLASS_M_TBL(OBJ_WB_UNPROTECT(RCLASS_ORIGIN(module)));
+
+    RCLASS_SET_SUPER(klass, super);
+    if (RB_TYPE_P(module, T_ICLASS)) {
+	RBASIC_SET_CLASS(klass, RBASIC(module)->klass);
     }
     else {
-	RBASIC(klass)->klass = module;
+	RBASIC_SET_CLASS(klass, module);
     }
     OBJ_INFECT(klass, module);
     OBJ_INFECT(klass, super);
@@ -397,80 +818,183 @@ include_class_new(module, super)
     return (VALUE)klass;
 }
 
+static int include_modules_at(const VALUE klass, VALUE c, VALUE module);
+
 void
-rb_include_module(klass, module)
-    VALUE klass, module;
+rb_include_module(VALUE klass, VALUE module)
 {
-    VALUE p, c;
     int changed = 0;
 
     rb_frozen_class_p(klass);
-    if (!OBJ_TAINTED(klass)) {
-	rb_secure(4);
-    }
-    
-    if (TYPE(module) != T_MODULE) {
+
+    if (!RB_TYPE_P(module, T_MODULE)) {
 	Check_Type(module, T_MODULE);
     }
 
     OBJ_INFECT(klass, module);
-    c = klass;
+
+    changed = include_modules_at(klass, RCLASS_ORIGIN(klass), module);
+    if (changed < 0)
+	rb_raise(rb_eArgError, "cyclic include detected");
+}
+
+static int
+add_refined_method_entry_i(st_data_t key, st_data_t value, st_data_t data)
+{
+    rb_add_refined_method_entry((VALUE) data, (ID) key);
+    return ST_CONTINUE;
+}
+
+static int
+include_modules_at(const VALUE klass, VALUE c, VALUE module)
+{
+    VALUE p, iclass;
+    int method_changed = 0, constant_changed = 0;
+    const st_table *const klass_m_tbl = RCLASS_M_TBL(RCLASS_ORIGIN(klass));
+
     while (module) {
-	int superclass_seen = Qfalse;
+	int superclass_seen = FALSE;
 
-	if (RCLASS(klass)->m_tbl == RCLASS(module)->m_tbl)
-	    rb_raise(rb_eArgError, "cyclic include detected");
+	if (RCLASS_ORIGIN(module) != module)
+	    goto skip;
+	if (klass_m_tbl && klass_m_tbl == RCLASS_M_TBL(module))
+	    return -1;
 	/* ignore if the module included already in superclasses */
-	for (p = RCLASS(klass)->super; p; p = RCLASS(p)->super) {
+	for (p = RCLASS_SUPER(klass); p; p = RCLASS_SUPER(p)) {
 	    switch (BUILTIN_TYPE(p)) {
 	      case T_ICLASS:
-		if (RCLASS(p)->m_tbl == RCLASS(module)->m_tbl) {
+		if (RCLASS_M_TBL(p) == RCLASS_M_TBL(module)) {
 		    if (!superclass_seen) {
-			c = p;	/* move insertion point */
+			c = p;  /* move insertion point */
 		    }
 		    goto skip;
 		}
 		break;
 	      case T_CLASS:
-		superclass_seen = Qtrue;
+		superclass_seen = TRUE;
 		break;
 	    }
 	}
-	c = RCLASS(c)->super = include_class_new(module, RCLASS(c)->super);
-	changed = 1;
+	iclass = rb_include_class_new(module, RCLASS_SUPER(c));
+	c = RCLASS_SET_SUPER(c, iclass);
+
+	if (BUILTIN_TYPE(module) == T_ICLASS) {
+	    rb_module_add_to_subclasses_list(RBASIC(module)->klass, iclass);
+	} else {
+	    rb_module_add_to_subclasses_list(module, iclass);
+	}
+
+	if (FL_TEST(klass, RMODULE_IS_REFINEMENT)) {
+	    VALUE refined_class =
+		rb_refinement_module_get_refined_class(klass);
+
+	    st_foreach(RMODULE_M_TBL(module), add_refined_method_entry_i,
+		       (st_data_t) refined_class);
+	    FL_SET(c, RMODULE_INCLUDED_INTO_REFINEMENT);
+	}
+	if (RMODULE_M_TBL(module) && RMODULE_M_TBL(module)->num_entries)
+	    method_changed = 1;
+	if (RMODULE_CONST_TBL(module) && RMODULE_CONST_TBL(module)->num_entries)
+	    constant_changed = 1;
       skip:
-	module = RCLASS(module)->super;
+	module = RCLASS_SUPER(module);
+    }
+
+    if (method_changed) rb_clear_method_cache_by_class(klass);
+    if (constant_changed) rb_clear_constant_cache();
+
+    return method_changed;
+}
+
+static int
+move_refined_method(st_data_t key, st_data_t value, st_data_t data)
+{
+    rb_method_entry_t *me = (rb_method_entry_t *) value;
+    st_table *tbl = (st_table *) data;
+
+    if (me->def->type == VM_METHOD_TYPE_REFINED) {
+	if (me->def->body.orig_me) {
+	    rb_method_entry_t *orig_me = me->def->body.orig_me, *new_me;
+	    me->def->body.orig_me = NULL;
+	    new_me = ALLOC(rb_method_entry_t);
+	    *new_me = *me;
+	    st_add_direct(tbl, key, (st_data_t) new_me);
+	    *me = *orig_me;
+	    xfree(orig_me);
+	    return ST_CONTINUE;
+	}
+	else {
+	    st_add_direct(tbl, key, (st_data_t) me);
+	    return ST_DELETE;
+	}
+    }
+    else {
+	return ST_CONTINUE;
+    }
+}
+
+void
+rb_prepend_module(VALUE klass, VALUE module)
+{
+    void rb_vm_check_redefinition_by_prepend(VALUE klass);
+    VALUE origin;
+    int changed = 0;
+
+    rb_frozen_class_p(klass);
+
+    Check_Type(module, T_MODULE);
+
+    OBJ_INFECT(klass, module);
+
+    origin = RCLASS_ORIGIN(klass);
+    if (origin == klass) {
+	origin = class_alloc(T_ICLASS, klass);
+	OBJ_WB_UNPROTECT(origin); /* TODO: conservertive shading. Need more survery. */
+	RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass));
+	RCLASS_SET_SUPER(klass, origin);
+	RCLASS_ORIGIN(klass) = origin;
+	RCLASS_M_TBL(origin) = RCLASS_M_TBL(klass);
+	RCLASS_M_TBL(klass) = st_init_numtable();
+	st_foreach(RCLASS_M_TBL(origin), move_refined_method,
+		   (st_data_t) RCLASS_M_TBL(klass));
+    }
+    changed = include_modules_at(klass, klass, module);
+    if (changed < 0)
+	rb_raise(rb_eArgError, "cyclic prepend detected");
+    if (changed) {
+	rb_vm_check_redefinition_by_prepend(klass);
     }
-    if (changed) rb_clear_cache();
 }
 
 /*
  *  call-seq:
  *     mod.included_modules -> array
- *  
+ *
  *  Returns the list of modules included in <i>mod</i>.
- *     
+ *
  *     module Mixin
  *     end
- *     
+ *
  *     module Outer
  *       include Mixin
  *     end
- *     
+ *
  *     Mixin.included_modules   #=> []
  *     Outer.included_modules   #=> [Mixin]
  */
 
 VALUE
-rb_mod_included_modules(mod)
-    VALUE mod;
+rb_mod_included_modules(VALUE mod)
 {
     VALUE ary = rb_ary_new();
     VALUE p;
+    VALUE origin = RCLASS_ORIGIN(mod);
 
-    for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
-	if (BUILTIN_TYPE(p) == T_ICLASS) {
-	    rb_ary_push(ary, RBASIC(p)->klass);
+    for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
+	if (p != origin && BUILTIN_TYPE(p) == T_ICLASS) {
+	    VALUE m = RBASIC(p)->klass;
+	    if (RB_TYPE_P(m, T_MODULE))
+		rb_ary_push(ary, m);
 	}
     }
     return ary;
@@ -478,11 +1002,11 @@ rb_mod_included_modules(mod)
 
 /*
  *  call-seq:
- *     mod.include?(module)    => true or false
- *  
+ *     mod.include?(module)    -> true or false
+ *
  *  Returns <code>true</code> if <i>module</i> is included in
  *  <i>mod</i> or one of <i>mod</i>'s ancestors.
- *     
+ *
  *     module A
  *     end
  *     class B
@@ -496,14 +1020,12 @@ rb_mod_included_modules(mod)
  */
 
 VALUE
-rb_mod_include_p(mod, mod2)
-    VALUE mod;
-    VALUE mod2;
+rb_mod_include_p(VALUE mod, VALUE mod2)
 {
     VALUE p;
 
     Check_Type(mod2, T_MODULE);
-    for (p = RCLASS(mod)->super; p; p = RCLASS(p)->super) {
+    for (p = RCLASS_SUPER(mod); p; p = RCLASS_SUPER(p)) {
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
 	    if (RBASIC(p)->klass == mod2) return Qtrue;
 	}
@@ -514,32 +1036,29 @@ rb_mod_include_p(mod, mod2)
 /*
  *  call-seq:
  *     mod.ancestors -> array
- *  
+ *
  *  Returns a list of modules included in <i>mod</i> (including
  *  <i>mod</i> itself).
- *     
+ *
  *     module Mod
  *       include Math
  *       include Comparable
  *     end
- *     
+ *
  *     Mod.ancestors    #=> [Mod, Comparable, Math]
  *     Math.ancestors   #=> [Math]
  */
 
 VALUE
-rb_mod_ancestors(mod)
-    VALUE mod;
+rb_mod_ancestors(VALUE mod)
 {
     VALUE p, ary = rb_ary_new();
 
-    for (p = mod; p; p = RCLASS(p)->super) {
-	if (FL_TEST(p, FL_SINGLETON))
-	    continue;
+    for (p = mod; p; p = RCLASS_SUPER(p)) {
 	if (BUILTIN_TYPE(p) == T_ICLASS) {
 	    rb_ary_push(ary, RBASIC(p)->klass);
 	}
-	else {
+	else if (p == RCLASS_ORIGIN(p)) {
 	    rb_ary_push(ary, p);
 	}
     }
@@ -550,13 +1069,10 @@ rb_mod_ancestors(mod)
 #define VISI_CHECK(x,f) (VISI(x) == (f))
 
 static int
-ins_methods_push(name, type, ary, visi)
-    ID name;
-    long type;
-    VALUE ary;
-    long visi;
+ins_methods_push(ID name, long type, VALUE ary, long visi)
 {
     if (type == -1) return ST_CONTINUE;
+
     switch (visi) {
       case NOEX_PRIVATE:
       case NOEX_PROTECTED:
@@ -568,77 +1084,67 @@ ins_methods_push(name, type, ary, visi)
 	break;
     }
     if (visi) {
-	rb_ary_push(ary, rb_str_new2(rb_id2name(name)));
+	rb_ary_push(ary, ID2SYM(name));
     }
     return ST_CONTINUE;
 }
 
 static int
-ins_methods_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
+ins_methods_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    return ins_methods_push(name, type, ary, -1); /* everything but private */
+    return ins_methods_push((ID)name, (long)type, (VALUE)ary, -1); /* everything but private */
 }
 
 static int
-ins_methods_prot_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
+ins_methods_prot_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    return ins_methods_push(name, type, ary, NOEX_PROTECTED);
+    return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PROTECTED);
 }
 
 static int
-ins_methods_priv_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
+ins_methods_priv_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    return ins_methods_push(name, type, ary, NOEX_PRIVATE);
+    return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PRIVATE);
 }
 
 static int
-ins_methods_pub_i(name, type, ary)
-    ID name;
-    long type;
-    VALUE ary;
+ins_methods_pub_i(st_data_t name, st_data_t type, st_data_t ary)
 {
-    return ins_methods_push(name, type, ary, NOEX_PUBLIC);
+    return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PUBLIC);
 }
 
 static int
-method_entry(key, body, list)
-    ID key;
-    NODE *body;
-    st_table *list;
+method_entry_i(st_data_t key, st_data_t value, st_data_t data)
 {
+    const rb_method_entry_t *me = (const rb_method_entry_t *)value;
+    st_table *list = (st_table *)data;
     long type;
 
-    if (key == ID_ALLOCATOR) return ST_CONTINUE;
+    if (me && me->def->type == VM_METHOD_TYPE_REFINED) {
+	me = rb_resolve_refined_method(Qnil, me, NULL);
+	if (!me) return ST_CONTINUE;
+    }
     if (!st_lookup(list, key, 0)) {
-	if (!body->nd_body) type = -1; /* none */
-	else type = VISI(body->nd_noex);
+	if (UNDEFINED_METHOD_ENTRY_P(me)) {
+	    type = -1; /* none */
+	}
+	else {
+	    type = VISI(me->flag);
+	}
 	st_add_direct(list, key, type);
     }
     return ST_CONTINUE;
 }
 
 static VALUE
-class_instance_method_list(argc, argv, mod, func)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
-    int (*func) _((ID, long, VALUE));
+class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func) (st_data_t, st_data_t, st_data_t))
 {
     VALUE ary;
-    int recur;
+    int recur, prepended = 0;
     st_table *list;
 
     if (argc == 0) {
-	recur = Qtrue;
+	recur = TRUE;
     }
     else {
 	VALUE r;
@@ -646,11 +1152,16 @@ class_instance_method_list(argc, argv, mod, func)
 	recur = RTEST(r);
     }
 
+    if (!recur && RCLASS_ORIGIN(mod) != mod) {
+	mod = RCLASS_ORIGIN(mod);
+	prepended = 1;
+    }
+
     list = st_init_numtable();
-    for (; mod; mod = RCLASS(mod)->super) {
-	st_foreach(RCLASS(mod)->m_tbl, method_entry, (st_data_t)list);
-	if (BUILTIN_TYPE(mod) == T_ICLASS) continue;
-	if (FL_TEST(mod, FL_SINGLETON)) continue;
+    for (; mod; mod = RCLASS_SUPER(mod)) {
+	if (RCLASS_M_TBL(mod)) st_foreach(RCLASS_M_TBL(mod), method_entry_i, (st_data_t)list);
+	if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue;
+	if (obj && FL_TEST(mod, FL_SINGLETON)) continue;
 	if (!recur) break;
     }
     ary = rb_ary_new();
@@ -662,15 +1173,15 @@ class_instance_method_list(argc, argv, mod, func)
 
 /*
  *  call-seq:
- *     mod.instance_methods(include_super=true)   => array
- *  
- *  Returns an array containing the names of public instance methods in
- *  the receiver. For a module, these are the public methods; for a
- *  class, they are the instance (not singleton) methods. With no
+ *     mod.instance_methods(include_super=true)   -> array
+ *
+ *  Returns an array containing the names of the public and protected instance
+ *  methods in the receiver. For a module, these are the public and protected methods;
+ *  for a class, they are the instance (not singleton) methods. With no
  *  argument, or with an argument that is <code>false</code>, the
  *  instance methods in <i>mod</i> are returned, otherwise the methods
  *  in <i>mod</i> and <i>mod</i>'s superclasses are returned.
- *     
+ *
  *     module A
  *       def method1()  end
  *     end
@@ -680,139 +1191,224 @@ class_instance_method_list(argc, argv, mod, func)
  *     class C < B
  *       def method3()  end
  *     end
- *     
- *     A.instance_methods                #=> ["method1"]
- *     B.instance_methods(false)         #=> ["method2"]
- *     C.instance_methods(false)         #=> ["method3"]
+ *
+ *     A.instance_methods                #=> [:method1]
+ *     B.instance_methods(false)         #=> [:method2]
+ *     C.instance_methods(false)         #=> [:method3]
  *     C.instance_methods(true).length   #=> 43
  */
 
 VALUE
-rb_class_instance_methods(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+rb_class_instance_methods(int argc, VALUE *argv, VALUE mod)
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_i);
+    return class_instance_method_list(argc, argv, mod, 0, ins_methods_i);
 }
 
 /*
  *  call-seq:
- *     mod.protected_instance_methods(include_super=true)   => array
- *  
+ *     mod.protected_instance_methods(include_super=true)   -> array
+ *
  *  Returns a list of the protected instance methods defined in
  *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
  *  methods of any ancestors are included.
  */
 
 VALUE
-rb_class_protected_instance_methods(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_prot_i);
+    return class_instance_method_list(argc, argv, mod, 0, ins_methods_prot_i);
 }
 
 /*
  *  call-seq:
- *     mod.private_instance_methods(include_super=true)    => array
- *  
+ *     mod.private_instance_methods(include_super=true)    -> array
+ *
  *  Returns a list of the private instance methods defined in
  *  <i>mod</i>. If the optional parameter is not <code>false</code>, the
  *  methods of any ancestors are included.
- *     
+ *
  *     module Mod
  *       def method1()  end
  *       private :method1
  *       def method2()  end
  *     end
- *     Mod.instance_methods           #=> ["method2"]
- *     Mod.private_instance_methods   #=> ["method1"]
+ *     Mod.instance_methods           #=> [:method2]
+ *     Mod.private_instance_methods   #=> [:method1]
  */
 
 VALUE
-rb_class_private_instance_methods(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_priv_i);
+    return class_instance_method_list(argc, argv, mod, 0, ins_methods_priv_i);
 }
 
 /*
  *  call-seq:
- *     mod.public_instance_methods(include_super=true)   => array
- *  
+ *     mod.public_instance_methods(include_super=true)   -> array
+ *
  *  Returns a list of the public instance methods defined in <i>mod</i>.
  *  If the optional parameter is not <code>false</code>, the methods of
  *  any ancestors are included.
  */
 
 VALUE
-rb_class_public_instance_methods(argc, argv, mod)
-    int argc;
-    VALUE *argv;
-    VALUE mod;
+rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
 {
-    return class_instance_method_list(argc, argv, mod, ins_methods_pub_i);
+    return class_instance_method_list(argc, argv, mod, 0, ins_methods_pub_i);
 }
 
 /*
  *  call-seq:
- *     obj.singleton_methods(all=true)    => array
- *  
+ *     obj.methods(regular=true)    -> array
+ *
+ *  Returns a list of the names of public and protected methods of
+ *  <i>obj</i>. This will include all the methods accessible in
+ *  <i>obj</i>'s ancestors.
+ *  If the <i>regular</i> parameter is set to <code>false</code>,
+ *  Returns an array of obj's public and protected singleton methods,
+ *  the array will not include methods in modules included in <i>obj</i>.
+ *
+ *     class Klass
+ *       def klass_method()
+ *       end
+ *     end
+ *     k = Klass.new
+ *     k.methods[0..9]    #=> [:klass_method, :nil?, :===,
+ *                        #    :==~, :!, :eql?
+ *                        #    :hash, :<=>, :class, :singleton_class]
+ *     k.methods.length   #=> 57
+ *
+ *     k.methods(false)   #=> []
+ *     def k.singleton_method; end
+ *     k.methods(false)   #=> [:singleton_method]
+ *
+ *     module M123; def m123; end end
+ *     k.extend M123
+ *     k.methods(false)   #=> [:singleton_method]
+ */
+
+VALUE
+rb_obj_methods(int argc, VALUE *argv, VALUE obj)
+{
+  retry:
+    if (argc == 0) {
+	return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_i);
+    }
+    else {
+	VALUE recur;
+
+	rb_scan_args(argc, argv, "1", &recur);
+	if (RTEST(recur)) {
+	    argc = 0;
+	    goto retry;
+	}
+	return rb_obj_singleton_methods(argc, argv, obj);
+    }
+}
+
+/*
+ *  call-seq:
+ *     obj.protected_methods(all=true)   -> array
+ *
+ *  Returns the list of protected methods accessible to <i>obj</i>. If
+ *  the <i>all</i> parameter is set to <code>false</code>, only those methods
+ *  in the receiver will be listed.
+ */
+
+VALUE
+rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj)
+{
+    return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_prot_i);
+}
+
+/*
+ *  call-seq:
+ *     obj.private_methods(all=true)   -> array
+ *
+ *  Returns the list of private methods accessible to <i>obj</i>. If
+ *  the <i>all</i> parameter is set to <code>false</code>, only those methods
+ *  in the receiver will be listed.
+ */
+
+VALUE
+rb_obj_private_methods(int argc, VALUE *argv, VALUE obj)
+{
+    return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_priv_i);
+}
+
+/*
+ *  call-seq:
+ *     obj.public_methods(all=true)   -> array
+ *
+ *  Returns the list of public methods accessible to <i>obj</i>. If
+ *  the <i>all</i> parameter is set to <code>false</code>, only those methods
+ *  in the receiver will be listed.
+ */
+
+VALUE
+rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
+{
+    return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_pub_i);
+}
+
+/*
+ *  call-seq:
+ *     obj.singleton_methods(all=true)    -> array
+ *
  *  Returns an array of the names of singleton methods for <i>obj</i>.
  *  If the optional <i>all</i> parameter is true, the list will include
  *  methods in modules included in <i>obj</i>.
- *     
+ *  Only public and protected singleton methods are returned.
+ *
  *     module Other
  *       def three() end
  *     end
- *     
+ *
  *     class Single
  *       def Single.four() end
  *     end
- *     
+ *
  *     a = Single.new
- *     
+ *
  *     def a.one()
  *     end
- *     
+ *
  *     class << a
  *       include Other
  *       def two()
  *       end
  *     end
- *     
- *     Single.singleton_methods    #=> ["four"]
- *     a.singleton_methods(false)  #=> ["two", "one"]
- *     a.singleton_methods         #=> ["two", "one", "three"]
+ *
+ *     Single.singleton_methods    #=> [:four]
+ *     a.singleton_methods(false)  #=> [:two, :one]
+ *     a.singleton_methods         #=> [:two, :one, :three]
  */
 
 VALUE
-rb_obj_singleton_methods(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
 {
-    VALUE recur, ary, klass;
-    st_table *list;
+    VALUE recur, ary, klass, origin;
+    st_table *list, *mtbl;
 
-    rb_scan_args(argc, argv, "01", &recur);
     if (argc == 0) {
 	recur = Qtrue;
     }
+    else {
+	rb_scan_args(argc, argv, "01", &recur);
+    }
     klass = CLASS_OF(obj);
+    origin = RCLASS_ORIGIN(klass);
     list = st_init_numtable();
     if (klass && FL_TEST(klass, FL_SINGLETON)) {
-	st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
-	klass = RCLASS(klass)->super;
+	if ((mtbl = RCLASS_M_TBL(origin)) != 0)
+	    st_foreach(mtbl, method_entry_i, (st_data_t)list);
+	klass = RCLASS_SUPER(klass);
     }
     if (RTEST(recur)) {
-	while (klass && (FL_TEST(klass, FL_SINGLETON) || TYPE(klass) == T_ICLASS)) {
-	    st_foreach(RCLASS(klass)->m_tbl, method_entry, (st_data_t)list);
-	    klass = RCLASS(klass)->super;
+	while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
+	    if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0)
+		st_foreach(mtbl, method_entry_i, (st_data_t)list);
+	    klass = RCLASS_SUPER(klass);
 	}
     }
     ary = rb_ary_new();
@@ -822,88 +1418,160 @@ rb_obj_singleton_methods(argc, argv, obj)
     return ary;
 }
 
+/*!
+ * \}
+ */
+/*!
+ * \defgroup defmethod Defining methods
+ * There are some APIs to define a method from C.
+ * These API takes a C function as a method body.
+ *
+ * \par Method body functions
+ * Method body functions must return a VALUE and
+ * can be one of the following form:
+ * <dl>
+ * <dt>Fixed number of parameters</dt>
+ * <dd>
+ *     This form is a normal C function, excepting it takes
+ *     a receiver object as the first argument.
+ *
+ *     \code
+ *     static VALUE my_method(VALUE self, VALUE x, VALUE y);
+ *     \endcode
+ * </dd>
+ * <dt>argc and argv style</dt>
+ * <dd>
+ *     This form takes three parameters: \a argc, \a argv and \a self.
+ *     \a self is the receiver. \a argc is the number of arguments.
+ *     \a argv is a pointer to an array of the arguments.
+ *
+ *     \code
+ *     static VALUE my_method(int argc, VALUE *argv, VALUE self);
+ *     \endcode
+ * </dd>
+ * <dt>Ruby array style</dt>
+ * <dd>
+ *     This form takes two parameters: self and args.
+ *     \a self is the receiver. \a args is an Array object which
+ *     contains the arguments.
+ *
+ *     \code
+ *     static VALUE my_method(VALUE self, VALUE args);
+ *     \endcode
+ * </dd>
+ *
+ * \par Number of parameters
+ * Method defining APIs takes the number of parameters which the
+ * method will takes. This number is called \a argc.
+ * \a argc can be:
+ * <dl>
+ * <dt>zero or positive number</dt>
+ * <dd>This means the method body function takes a fixed number of parameters</dd>
+ * <dt>-1</dt>
+ * <dd>This means the method body function is "argc and argv" style.</dd>
+ * <dt>-2</dt>
+ * <dd>This means the method body function is "self and args" style.</dd>
+ * </dl>
+ * \{
+ */
+
 void
-rb_define_method_id(klass, name, func, argc)
-    VALUE klass;
-    ID name;
-    VALUE (*func)();
-    int argc;
+rb_define_method_id(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method(klass, name, NEW_CFUNC(func,argc), NOEX_PUBLIC);
+    rb_add_method_cfunc(klass, mid, func, argc, NOEX_PUBLIC);
 }
 
 void
-rb_define_method(klass, name, func, argc)
-    VALUE klass;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    ID id = rb_intern(name);
-    int ex = NOEX_PUBLIC;
-
-
-    rb_add_method(klass, id, NEW_CFUNC(func, argc), ex);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PUBLIC);
 }
 
 void
-rb_define_protected_method(klass, name, func, argc)
-    VALUE klass;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_protected_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PROTECTED);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PROTECTED);
 }
 
 void
-rb_define_private_method(klass, name, func, argc)
-    VALUE klass;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_private_method(VALUE klass, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_add_method(klass, rb_intern(name), NEW_CFUNC(func, argc), NOEX_PRIVATE);
+    rb_add_method_cfunc(klass, rb_intern(name), func, argc, NOEX_PRIVATE);
 }
 
 void
-rb_undef_method(klass, name)
-    VALUE klass;
-    const char *name;
+rb_undef_method(VALUE klass, const char *name)
 {
-    rb_add_method(klass, rb_intern(name), 0, NOEX_UNDEF);
+    rb_add_method(klass, rb_intern(name), VM_METHOD_TYPE_UNDEF, 0, NOEX_UNDEF);
 }
 
+/*!
+ * \}
+ */
+/*!
+ * \addtogroup class
+ * \{
+ */
+
 #define SPECIAL_SINGLETON(x,c) do {\
     if (obj == (x)) {\
-	return c;\
+	return (c);\
     }\
 } while (0)
 
+static inline VALUE
+special_singleton_class_of(VALUE obj)
+{
+    SPECIAL_SINGLETON(Qnil, rb_cNilClass);
+    SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
+    SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
+    return Qnil;
+}
+
 VALUE
-rb_singleton_class(obj)
-    VALUE obj;
+rb_special_singleton_class(VALUE obj)
+{
+    return special_singleton_class_of(obj);
+}
+
+/*!
+ * \internal
+ * Returns the singleton class of \a obj. Creates it if necessary.
+ *
+ * \note DO NOT expose the returned singleton class to
+ *       outside of class.c.
+ *       Use \ref rb_singleton_class instead for
+ *       consistency of the metaclass hierarchy.
+ */
+static VALUE
+singleton_class_of(VALUE obj)
 {
     VALUE klass;
 
-    if (FIXNUM_P(obj) || SYMBOL_P(obj)) {
+    if (FIXNUM_P(obj) || FLONUM_P(obj) || SYMBOL_P(obj)) {
 	rb_raise(rb_eTypeError, "can't define singleton");
     }
-    if (rb_special_const_p(obj)) {
-	SPECIAL_SINGLETON(Qnil, rb_cNilClass);
-	SPECIAL_SINGLETON(Qfalse, rb_cFalseClass);
-	SPECIAL_SINGLETON(Qtrue, rb_cTrueClass);
-	rb_bug("unknown immediate %ld", obj);
+    if (SPECIAL_CONST_P(obj)) {
+	klass = special_singleton_class_of(obj);
+	if (NIL_P(klass))
+	    rb_bug("unknown immediate %p", (void *)obj);
+	return klass;
+    }
+    else {
+	enum ruby_value_type type = BUILTIN_TYPE(obj);
+	if (type == T_FLOAT || type == T_BIGNUM) {
+	    rb_raise(rb_eTypeError, "can't define singleton");
+	}
     }
 
-    DEFER_INTS;
     if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
-	rb_iv_get(RBASIC(obj)->klass, "__attached__") == obj) {
+	rb_ivar_get(RBASIC(obj)->klass, id_attached) == obj) {
 	klass = RBASIC(obj)->klass;
     }
     else {
 	klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
     }
+
     if (OBJ_TAINTED(obj)) {
 	OBJ_TAINT(klass);
     }
@@ -911,150 +1579,278 @@ rb_singleton_class(obj)
 	FL_UNSET(klass, FL_TAINT);
     }
     if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass);
-    ALLOW_INTS;
 
     return klass;
 }
 
+/*!
+ * Returns the singleton class of \a obj, or nil if obj is not a
+ * singleton object.
+ *
+ * \param obj an arbitrary object.
+ * \return the singleton class or nil.
+ */
+VALUE
+rb_singleton_class_get(VALUE obj)
+{
+    VALUE klass;
+
+    if (SPECIAL_CONST_P(obj)) {
+	return rb_special_singleton_class(obj);
+    }
+    klass = RBASIC(obj)->klass;
+    if (!FL_TEST(klass, FL_SINGLETON)) return Qnil;
+    if (rb_ivar_get(klass, id_attached) != obj) return Qnil;
+    return klass;
+}
+
+/*!
+ * Returns the singleton class of \a obj. Creates it if necessary.
+ *
+ * \param obj an arbitrary object.
+ * \throw TypeError if \a obj is a Fixnum or a Symbol.
+ * \return the singleton class.
+ *
+ * \post \a obj has its own singleton class.
+ * \post if \a obj is a class,
+ *       the returned singleton class also has its own
+ *       singleton class in order to keep consistency of the
+ *       inheritance structure of metaclasses.
+ * \note a new singleton class will be created
+ *       if \a obj does not have it.
+ * \note the singleton classes for nil, true and false are:
+ *       NilClass, TrueClass and FalseClass.
+ */
+VALUE
+rb_singleton_class(VALUE obj)
+{
+    VALUE klass = singleton_class_of(obj);
+
+    /* ensures an exposed class belongs to its own eigenclass */
+    if (RB_TYPE_P(obj, T_CLASS)) (void)ENSURE_EIGENCLASS(klass);
+
+    return klass;
+}
+
+/*!
+ * \}
+ */
+
+/*!
+ * \addtogroup defmethod
+ * \{
+ */
+
+/*!
+ * Defines a singleton method for \a obj.
+ * \param obj    an arbitrary object
+ * \param name   name of the singleton method
+ * \param func   the method body
+ * \param argc   the number of parameters, or -1 or -2. see \ref defmethod.
+ */
 void
-rb_define_singleton_method(obj, name, func, argc)
-    VALUE obj;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_singleton_method(VALUE obj, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
-    rb_define_method(rb_singleton_class(obj), name, func, argc);
+    rb_define_method(singleton_class_of(obj), name, func, argc);
 }
 
+
+
+/*!
+ * Defines a module function for \a module.
+ * \param module  an module or a class.
+ * \param name    name of the function
+ * \param func    the method body
+ * \param argc    the number of parameters, or -1 or -2. see \ref defmethod.
+ */
 void
-rb_define_module_function(module, name, func, argc)
-    VALUE module;
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_module_function(VALUE module, const char *name, VALUE (*func)(ANYARGS), int argc)
 {
     rb_define_private_method(module, name, func, argc);
     rb_define_singleton_method(module, name, func, argc);
 }
 
+
+/*!
+ * Defines a global function
+ * \param name    name of the function
+ * \param func    the method body
+ * \param argc    the number of parameters, or -1 or -2. see \ref defmethod.
+ */
 void
-rb_define_global_function(name, func, argc)
-    const char *name;
-    VALUE (*func)();
-    int argc;
+rb_define_global_function(const char *name, VALUE (*func)(ANYARGS), int argc)
 {
     rb_define_module_function(rb_mKernel, name, func, argc);
 }
 
+
+/*!
+ * Defines an alias of a method.
+ * \param klass  the class which the original method belongs to
+ * \param name1  a new name for the method
+ * \param name2  the original name of the method
+ */
 void
-rb_define_alias(klass, name1, name2)
-    VALUE klass;
-    const char *name1, *name2;
+rb_define_alias(VALUE klass, const char *name1, const char *name2)
 {
     rb_alias(klass, rb_intern(name1), rb_intern(name2));
 }
 
+/*!
+ * Defines (a) public accessor method(s) for an attribute.
+ * \param klass  the class which the attribute will belongs to
+ * \param name   name of the attribute
+ * \param read   a getter method for the attribute will be defined if \a read is non-zero.
+ * \param write  a setter method for the attribute will be defined if \a write is non-zero.
+ */
 void
-rb_define_attr(klass, name, read, write)
-    VALUE klass;
-    const char *name;
-    int read, write;
+rb_define_attr(VALUE klass, const char *name, int read, int write)
 {
-    rb_attr(klass, rb_intern(name), read, write, Qfalse);
+    rb_attr(klass, rb_intern(name), read, write, FALSE);
+}
+
+int
+rb_obj_basic_to_s_p(VALUE obj)
+{
+    const rb_method_entry_t *me = rb_method_entry(CLASS_OF(obj), rb_intern("to_s"), 0);
+    if (me && me->def && me->def->type == VM_METHOD_TYPE_CFUNC &&
+	me->def->body.cfunc.func == rb_any_to_s)
+	return 1;
+    return 0;
 }
 
-#ifdef HAVE_STDARG_PROTOTYPES
 #include <stdarg.h>
-#define va_init_list(a,b) va_start(a,b)
-#else
-#include <varargs.h>
-#define va_init_list(a,b) va_start(a)
-#endif
 
 int
-#ifdef HAVE_STDARG_PROTOTYPES
 rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
-#else
-rb_scan_args(argc, argv, fmt, va_alist)
-    int argc;
-    const VALUE *argv;
-    const char *fmt;
-    va_dcl
-#endif
-{
-    int n, i = 0;
+{
+    int i;
     const char *p = fmt;
     VALUE *var;
     va_list vargs;
-
-    va_init_list(vargs, fmt);
-
-    if (*p == '*') goto rest_arg;
+    int f_var = 0, f_hash = 0, f_block = 0;
+    int n_lead = 0, n_opt = 0, n_trail = 0, n_mand;
+    int argi = 0;
+    VALUE hash = Qnil;
 
     if (ISDIGIT(*p)) {
-	n = *p - '0';
-	if (n > argc)
-	    rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, n);
-	for (i=0; i<n; i++) {
-	    var = va_arg(vargs, VALUE*);
-	    if (var) *var = argv[i];
+	n_lead = *p - '0';
+	p++;
+	if (ISDIGIT(*p)) {
+	    n_opt = *p - '0';
+	    p++;
+	    if (ISDIGIT(*p)) {
+		n_trail = *p - '0';
+		p++;
+		goto block_arg;
+	    }
 	}
+    }
+    if (*p == '*') {
+	f_var = 1;
 	p++;
+	if (ISDIGIT(*p)) {
+	    n_trail = *p - '0';
+	    p++;
+	}
     }
-    else {
-	goto error;
+  block_arg:
+    if (*p == ':') {
+	f_hash = 1;
+	p++;
     }
-
-    if (ISDIGIT(*p)) {
-	n = i + *p - '0';
-	for (; i<n; i++) {
-	    var = va_arg(vargs, VALUE*);
-	    if (argc > i) {
-		if (var) *var = argv[i];
-	    }
-	    else {
-		if (var) *var = Qnil;
-	    }
-	}
+    if (*p == '&') {
+	f_block = 1;
 	p++;
     }
+    if (*p != '\0') {
+	rb_fatal("bad scan arg format: %s", fmt);
+    }
+    n_mand = n_lead + n_trail;
+
+    if (argc < n_mand)
+	goto argc_error;
+
+    va_start(vargs, fmt);
 
-    if(*p == '*') {
-      rest_arg:
-	var = va_arg(vargs, VALUE*);
-	if (argc > i) {
-	    if (var) *var = rb_ary_new4(argc-i, argv+i);
-	    i = argc;
+    /* capture an option hash - phase 1: pop */
+    if (f_hash && n_mand < argc) {
+	VALUE last = argv[argc - 1];
+
+	if (NIL_P(last)) {
+	    /* nil is taken as an empty option hash only if it is not
+	       ambiguous; i.e. '*' is not specified and arguments are
+	       given more than sufficient */
+	    if (!f_var && n_mand + n_opt < argc)
+		argc--;
+	}
+	else {
+	    hash = rb_check_hash_type(last);
+	    if (!NIL_P(hash))
+		argc--;
+	}
+    }
+    /* capture leading mandatory arguments */
+    for (i = n_lead; i-- > 0; ) {
+	var = va_arg(vargs, VALUE *);
+	if (var) *var = argv[argi];
+	argi++;
+    }
+    /* capture optional arguments */
+    for (i = n_opt; i-- > 0; ) {
+	var = va_arg(vargs, VALUE *);
+	if (argi < argc - n_trail) {
+	    if (var) *var = argv[argi];
+	    argi++;
+	}
+	else {
+	    if (var) *var = Qnil;
+	}
+    }
+    /* capture variable length arguments */
+    if (f_var) {
+	int n_var = argc - argi - n_trail;
+
+	var = va_arg(vargs, VALUE *);
+	if (0 < n_var) {
+	    if (var) *var = rb_ary_new4(n_var, &argv[argi]);
+	    argi += n_var;
 	}
 	else {
 	    if (var) *var = rb_ary_new();
 	}
-	p++;
     }
-
-    if (*p == '&') {
-	var = va_arg(vargs, VALUE*);
+    /* capture trailing mandatory arguments */
+    for (i = n_trail; i-- > 0; ) {
+	var = va_arg(vargs, VALUE *);
+	if (var) *var = argv[argi];
+	argi++;
+    }
+    /* capture an option hash - phase 2: assignment */
+    if (f_hash) {
+	var = va_arg(vargs, VALUE *);
+	if (var) *var = hash;
+    }
+    /* capture iterator block */
+    if (f_block) {
+	var = va_arg(vargs, VALUE *);
 	if (rb_block_given_p()) {
 	    *var = rb_block_proc();
 	}
 	else {
 	    *var = Qnil;
 	}
-	p++;
     }
     va_end(vargs);
 
-    if (*p != '\0') {
-	goto error;
-    }
-
-    if (argc > i) {
-	rb_raise(rb_eArgError, "wrong number of arguments (%d for %d)", argc, i);
+    if (argi < argc) {
+      argc_error:
+	rb_error_arity(argc, n_mand, f_var ? UNLIMITED_ARGUMENTS : n_mand + n_opt);
     }
 
     return argc;
-
-  error:
-    rb_fatal("bad scan arg format: %s", fmt);
-    return 0;
 }
+
+/*!
+ * \}
+ */
diff --git a/common.mk b/common.mk
index a57cc9b320..e94c4756ea 100644
--- a/common.mk
+++ b/common.mk
@@ -2,35 +2,54 @@ bin: $(PROGRAM) $(WPROGRAM)
 lib: $(LIBRUBY)
 dll: $(LIBRUBY_SO)
 
-RUBYLIB       = -
+.SUFFIXES: .inc .h .c .y .i .$(DTRACE_EXT)
+
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+ECHO = $(ECHO1:0=@echo)
+
+RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
+RUN_OPTS      = --disable-gems
 
-SPEC_GIT_BASE = git://github.com/rubyspec
+SPEC_GIT_BASE = git://github.com/nurse
 MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
 RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
 
 STATIC_RUBY   = static-ruby
 
 EXTCONF       = extconf.rb
-RBCONFIG      = ./.rbconfig.time
 LIBRUBY_EXTS  = ./.libruby-with-ext.time
+REVISION_H    = ./.revision.time
+PLATFORM_D    = ./$(PLATFORM_DIR)/.time
 RDOCOUT       = $(EXTOUT)/rdoc
+CAPIOUT       = doc/capi
 
 DMYEXT	      = dmyext.$(OBJEXT)
-MAINOBJ	      = main.$(OBJEXT)
-EXTOBJS	      = 
+NORMALMAINOBJ = main.$(OBJEXT)
+MAINOBJ       = $(NORMALMAINOBJ)
+EXTOBJS	      =
 DLDOBJS	      = $(DMYEXT)
+EXTSOLIBS     =
+MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) miniprelude.$(OBJEXT)
+ENC_MK        = enc.mk
 
-OBJS	      = array.$(OBJEXT) \
+COMMONOBJS    = array.$(OBJEXT) \
 		bignum.$(OBJEXT) \
 		class.$(OBJEXT) \
 		compar.$(OBJEXT) \
+		complex.$(OBJEXT) \
 		dir.$(OBJEXT) \
-		dln.$(OBJEXT) \
+		dln_find.$(OBJEXT) \
+		encoding.$(OBJEXT) \
 		enum.$(OBJEXT) \
 		enumerator.$(OBJEXT) \
 		error.$(OBJEXT) \
 		eval.$(OBJEXT) \
+		load.$(OBJEXT) \
+		proc.$(OBJEXT) \
 		file.$(OBJEXT) \
 		gc.$(OBJEXT) \
 		hash.$(OBJEXT) \
@@ -38,38 +57,75 @@ OBJS	      = array.$(OBJEXT) \
 		io.$(OBJEXT) \
 		marshal.$(OBJEXT) \
 		math.$(OBJEXT) \
+		node.$(OBJEXT) \
 		numeric.$(OBJEXT) \
 		object.$(OBJEXT) \
 		pack.$(OBJEXT) \
 		parse.$(OBJEXT) \
 		process.$(OBJEXT) \
-		prec.$(OBJEXT) \
 		random.$(OBJEXT) \
 		range.$(OBJEXT) \
+		rational.$(OBJEXT) \
 		re.$(OBJEXT) \
-		regex.$(OBJEXT) \
+		regcomp.$(OBJEXT) \
+		regenc.$(OBJEXT) \
+		regerror.$(OBJEXT) \
+		regexec.$(OBJEXT) \
+		regparse.$(OBJEXT) \
+		regsyntax.$(OBJEXT) \
 		ruby.$(OBJEXT) \
+		safe.$(OBJEXT) \
 		signal.$(OBJEXT) \
 		sprintf.$(OBJEXT) \
 		st.$(OBJEXT) \
+		strftime.$(OBJEXT) \
 		string.$(OBJEXT) \
 		struct.$(OBJEXT) \
 		time.$(OBJEXT) \
+		transcode.$(OBJEXT) \
 		util.$(OBJEXT) \
 		variable.$(OBJEXT) \
 		version.$(OBJEXT) \
+		compile.$(OBJEXT) \
+		debug.$(OBJEXT) \
+		iseq.$(OBJEXT) \
+		vm.$(OBJEXT) \
+		vm_dump.$(OBJEXT) \
+		vm_backtrace.$(OBJEXT) \
+		vm_trace.$(OBJEXT) \
+		thread.$(OBJEXT) \
+		cont.$(OBJEXT) \
+		$(BUILTIN_ENCOBJS) \
+		$(BUILTIN_TRANSOBJS) \
 		$(MISSING)
 
+EXPORTOBJS    = $(DLNOBJ) \
+		localeinit.$(OBJEXT) \
+		loadpath.$(OBJEXT) \
+		$(COMMONOBJS)
+
+OBJS          = $(EXPORTOBJS) prelude.$(OBJEXT)
+ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT)
+
+GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
+
+PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES)
+GEM_PRELUDE = $(srcdir)/gem_prelude.rb
+PRELUDES      = prelude.c miniprelude.c
+GOLFPRELUDES = golf_prelude.c
+
 SCRIPT_ARGS   =	--dest-dir="$(DESTDIR)" \
 		--extout="$(EXTOUT)" \
 		--mflags="$(MFLAGS)" \
 		--make-flags="$(MAKEFLAGS)"
 EXTMK_ARGS    =	$(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) \
-		--make-flags="MINIRUBY='$(MINIRUBY)'" --
+		--make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" --
+INSTRUBY      =	$(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 		--data-mode=$(INSTALL_DATA_MODE) \
 		--prog-mode=$(INSTALL_PROG_MODE) \
-		--installed-list $(INSTALLED_LIST)
+		--installed-list $(INSTALLED_LIST) \
+		--mantype="$(MANTYPE)"
 INSTALL_PROG_MODE = 0755
 INSTALL_DATA_MODE = 0644
 
@@ -79,254 +135,488 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil'
 TESTSDIR      = $(srcdir)/test
 TESTWORKDIR   = testwork
 
-all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
-	@$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS)
-prog: $(PROGRAM) $(WPROGRAM)
+TESTRUN_SCRIPT = $(srcdir)/test.rb
+
+BOOTSTRAPRUBY = $(BASERUBY)
+
+COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb
+
+all: showflags main docs
+
+main: showflags $(EXTSTATIC:static=lib)encs exts
+	@$(NULLCMD)
+
+.PHONY: showflags
+exts enc trans: showflags
+showflags:
+	$(MESSAGE_BEGIN) \
+	"	CC = $(CC)" \
+	"	LD = $(LD)" \
+	"	LDSHARED = $(LDSHARED)" \
+	"	CFLAGS = $(CFLAGS)" \
+	"	XCFLAGS = $(XCFLAGS)" \
+	"	CPPFLAGS = $(CPPFLAGS)" \
+	"	DLDFLAGS = $(DLDFLAGS)" \
+	"	SOLIBS = $(SOLIBS)" \
+	$(MESSAGE_END)
+	-@$(CC_VERSION)
+
+.PHONY: showconfig
+showconfig:
+	@$(ECHO_BEGIN) \
+	$(configure_args) \
+	$(ECHO_END)
+
+exts: build-ext
+
+EXTS_MK = exts.mk
+$(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
+	$(ECHO) generating makefile $@
+	$(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$(EXTS_MK) $(EXTMK_ARGS) configure
+
+configure-ext: $(EXTS_MK)
+
+build-ext: $(EXTS_MK)
+	$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) $(EXTSTATIC) LIBRUBY_EXTS=$(LIBRUBY_EXTS) ENCOBJS="$(ENCOBJS)"
+
+$(MKMAIN_CMD): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
+	$(Q)$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" --command-output=$@ $(EXTMK_ARGS)
 
-miniruby$(EXEEXT): config.status $(LIBRUBY_A) $(MAINOBJ) $(MINIOBJS) $(OBJS) $(DMYEXT)
+prog: program wprogram
 
-$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
+$(PREP): $(MKFILES)
 
-$(LIBRUBY_A):	$(OBJS) $(DMYEXT) $(ARCHFILE)
+miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE) $(DTRACE_OBJ)
 
-$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE)
+objs: $(ALLOBJS)
+
+GORUBY = go$(RUBY_INSTALL_NAME)
+golf: $(LIBRUBY) $(GOLFOBJS) PHONY
+	$(Q) $(MAKE) $(MFLAGS) MAINOBJ="$(GOLFOBJS)" PROGRAM=$(GORUBY)$(EXEEXT) program
+capi: $(CAPIOUT)/.timestamp PHONY
+
+$(CAPIOUT)/.timestamp: Doxyfile $(PREP)
+	$(Q) $(MAKEDIRS) "$(@D)"
+	$(ECHO) generating capi
+	$(Q) $(DOXYGEN) -b
+	$(Q) $(MINIRUBY) -e 'File.open(ARGV[0], "w"){|f| f.puts(Time.now)}' "$@"
+
+Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
+	$(ECHO) generating $@
+	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -o $@ $(srcdir)/template/Doxyfile.tmpl \
+	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
+
+program: showflags $(PROGRAM)
+wprogram: showflags $(WPROGRAM)
+mini: PHONY miniruby$(EXEEXT)
+
+$(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
+
+$(LIBRUBY_A):	$(OBJS) $(MAINOBJ) $(DTRACE_OBJ) $(DTRACE_GLOMMED_OBJ) $(DMYEXT) $(ARCHFILE)
+
+$(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
 
 $(LIBRUBY_EXTS):
 	@exit > $@
 
 $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
-	@$(RM) $@
+	$(Q)$(RM) $@
 	$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
 
-ruby.imp: $(OBJS)
-	@$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(EXPORTOBJS)
+	$(Q)$(NM) -Pgp $(EXPORTOBJS) | \
+	awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|.*_threadptr_|\.)/{print $$1}' | \
+	sort -u -o $@
 
-install: install-nodoc $(RDOCTARGET)
-install-all: install-nodoc install-doc
+install: install-$(INSTALLDOC)
+docs: $(DOCTARGETS)
+pkgconfig-data: $(ruby_pc)
+$(ruby_pc): $(srcdir)/template/ruby.pc.in config.status
+
+install-all: docs pre-install-all do-install-all post-install-all
+pre-install-all:: pre-install-local pre-install-ext pre-install-doc
+do-install-all: all
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
+post-install-all:: post-install-local post-install-ext post-install-doc
+	@$(NULLCMD)
 
 install-nodoc: pre-install-nodoc do-install-nodoc post-install-nodoc
 pre-install-nodoc:: pre-install-local pre-install-ext
-do-install-nodoc: 
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+do-install-nodoc: main
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS)
 post-install-nodoc:: post-install-local post-install-ext
 
 install-local: pre-install-local do-install-local post-install-local
 pre-install-local:: pre-install-bin pre-install-lib pre-install-man
-do-install-local:
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
-loadpath: $(PREP)
-	$(MINIRUBY) -e 'p $$:'
-
+do-install-local: $(PROGRAM)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local
 post-install-local:: post-install-bin post-install-lib post-install-man
 
 install-ext: pre-install-ext do-install-ext post-install-ext
 pre-install-ext:: pre-install-ext-arch pre-install-ext-comm
-do-install-ext:
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
+do-install-ext: exts
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
 post-install-ext:: post-install-ext-arch post-install-ext-comm
 
 install-arch: pre-install-arch do-install-arch post-install-arch
 pre-install-arch:: pre-install-bin pre-install-ext-arch
-do-install-arch:
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
+do-install-arch: main
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=arch
 post-install-arch:: post-install-bin post-install-ext-arch
 
 install-comm: pre-install-comm do-install-comm post-install-comm
 pre-install-comm:: pre-install-lib pre-install-ext-comm pre-install-man
-do-install-comm:
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
+do-install-comm: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
 post-install-comm:: post-install-lib post-install-ext-comm post-install-man
 
 install-bin: pre-install-bin do-install-bin post-install-bin
 pre-install-bin:: install-prereq
-do-install-bin:
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
+do-install-bin: $(PROGRAM)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
 post-install-bin::
 	@$(NULLCMD)
 
 install-lib: pre-install-lib do-install-lib post-install-lib
 pre-install-lib:: install-prereq
-do-install-lib:
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
+do-install-lib: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
 post-install-lib::
 	@$(NULLCMD)
 
 install-ext-comm: pre-install-ext-comm do-install-ext-comm post-install-ext-comm
 pre-install-ext-comm:: install-prereq
-do-install-ext-comm:
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
+do-install-ext-comm: exts
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
 post-install-ext-comm::
 	@$(NULLCMD)
 
 install-ext-arch: pre-install-ext-arch do-install-ext-arch post-install-ext-arch
 pre-install-ext-arch:: install-prereq
-do-install-ext-arch:
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
+do-install-ext-arch: exts
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
 post-install-ext-arch::
 	@$(NULLCMD)
 
 install-man: pre-install-man do-install-man post-install-man
 pre-install-man:: install-prereq
-do-install-man:
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+do-install-man: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man
 post-install-man::
 	@$(NULLCMD)
 
+install-capi: capi pre-install-capi do-install-capi post-install-capi
+pre-install-capi:: install-prereq
+do-install-capi: $(PREP)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=capi
+post-install-capi::
+	@$(NULLCMD)
+
 what-where: no-install
-no-install: no-install-nodoc no-install-doc
+no-install: no-install-$(INSTALLDOC)
 what-where-all: no-install-all
-no-install-all: no-install-nodoc
+no-install-all: pre-no-install-all dont-install-all post-no-install-all
+pre-no-install-all:: pre-no-install-local pre-no-install-ext pre-no-install-doc
+dont-install-all: $(PROGRAM)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --rdoc-output="$(RDOCOUT)"
+post-no-install-all:: post-no-install-local post-no-install-ext post-no-install-doc
+	@$(NULLCMD)
+
+uninstall: $(INSTALLED_LIST)
+	$(Q)$(SUDO) $(MINIRUBY) $(srcdir)/tool/rbuninstall.rb --destdir=$(DESTDIR) $(INSTALLED_LIST)
+
+reinstall: uninstall install
 
 what-where-nodoc: no-install-nodoc
 no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc
 pre-no-install-nodoc:: pre-no-install-local pre-no-install-ext
-dont-install-nodoc: 
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --mantype="$(MANTYPE)"
+dont-install-nodoc:  $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS)
 post-no-install-nodoc:: post-no-install-local post-no-install-ext
 
 what-where-local: no-install-local
 no-install-local: pre-no-install-local dont-install-local post-no-install-local
 pre-no-install-local:: pre-no-install-bin pre-no-install-lib pre-no-install-man
-dont-install-local:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local --mantype="$(MANTYPE)"
+dont-install-local: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=local
 post-no-install-local:: post-no-install-bin post-no-install-lib post-no-install-man
 
 what-where-ext: no-install-ext
 no-install-ext: pre-no-install-ext dont-install-ext post-no-install-ext
 pre-no-install-ext:: pre-no-install-ext-arch pre-no-install-ext-comm
-dont-install-ext:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
+dont-install-ext: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext
 post-no-install-ext:: post-no-install-ext-arch post-no-install-ext-comm
 
 what-where-arch: no-install-arch
 no-install-arch: pre-no-install-arch dont-install-arch post-no-install-arch
 pre-no-install-arch:: pre-no-install-bin pre-no-install-ext-arch
-dont-install-arch:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
+dont-install-arch: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin --install=ext-arch
 post-no-install-arch:: post-no-install-lib post-no-install-man post-no-install-ext-arch
 
 what-where-comm: no-install-comm
 no-install-comm: pre-no-install-comm dont-install-comm post-no-install-comm
 pre-no-install-comm:: pre-no-install-lib pre-no-install-ext-comm pre-no-install-man
-dont-install-comm:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
+dont-install-comm: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib --install=ext-comm --install=man
 post-no-install-comm:: post-no-install-lib post-no-install-ext-comm post-no-install-man
 
 what-where-bin: no-install-bin
 no-install-bin: pre-no-install-bin dont-install-bin post-no-install-bin
 pre-no-install-bin:: install-prereq
-dont-install-bin:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
+dont-install-bin: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=bin
 post-no-install-bin::
 	@$(NULLCMD)
 
 what-where-lib: no-install-lib
 no-install-lib: pre-no-install-lib dont-install-lib post-no-install-lib
 pre-no-install-lib:: install-prereq
-dont-install-lib:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
+dont-install-lib: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=lib
 post-no-install-lib::
 	@$(NULLCMD)
 
 what-where-ext-comm: no-install-ext-comm
 no-install-ext-comm: pre-no-install-ext-comm dont-install-ext-comm post-no-install-ext-comm
 pre-no-install-ext-comm:: install-prereq
-dont-install-ext-comm:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
+dont-install-ext-comm: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-comm
 post-no-install-ext-comm::
 	@$(NULLCMD)
 
 what-where-ext-arch: no-install-ext-arch
 no-install-ext-arch: pre-no-install-ext-arch dont-install-ext-arch post-no-install-ext-arch
 pre-no-install-ext-arch:: install-prereq
-dont-install-ext-arch:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
+dont-install-ext-arch: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=ext-arch
 post-no-install-ext-arch::
 	@$(NULLCMD)
 
 what-where-man: no-install-man
 no-install-man: pre-no-install-man dont-install-man post-no-install-man
 pre-no-install-man:: install-prereq
-dont-install-man:
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man --mantype="$(MANTYPE)"
+dont-install-man: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=man
 post-no-install-man::
 	@$(NULLCMD)
 
 install-doc: rdoc pre-install-doc do-install-doc post-install-doc
 pre-install-doc:: install-prereq
 do-install-doc: $(PROGRAM)
-	$(MINIRUBY) $(srcdir)/instruby.rb --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
 post-install-doc::
 	@$(NULLCMD)
 
-rdoc: $(PROGRAM) PHONY
+install-gem: pre-install-gem do-install-gem post-install-gem
+pre-install-gem:: pre-install-bin pre-install-lib pre-install-man
+do-install-gem: $(PROGRAM)
+	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=gem
+post-install-gem::
+	@$(NULLCMD)
+
+rdoc: PHONY main
 	@echo Generating RDoc documentation
-	$(RUNRUBY) "$(srcdir)/bin/rdoc" --all --ri --op "$(RDOCOUT)" "$(srcdir)"
+	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
+
+rdoc-coverage: PHONY main
+	@echo Generating RDoc coverage report
+	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all --quiet -C $(RDOCFLAGS) "$(srcdir)"
+
+RDOCBENCHOUT=/tmp/rdocbench
+
+GCBENCH_ITEM=null
+
+gcbench: PHONY
+	$(Q) $(XRUBY) "$(srcdir)/benchmark/gc/gcbench.rb" $(GCBENCH_ITEM)
+
+gcbench-rdoc: PHONY
+	$(Q) $(XRUBY) "$(srcdir)/benchmark/gc/gcbench.rb" rdoc
+
+nodoc: PHONY
 
 what-where-doc: no-install-doc
 no-install-doc: pre-no-install-doc dont-install-doc post-no-install-doc
 pre-no-install-doc:: install-prereq
-dont-install-doc::
-	$(MINIRUBY) $(srcdir)/instruby.rb -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
+dont-install-doc:: $(PREP)
+	$(INSTRUBY) -n --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
 post-no-install-doc::
 	@$(NULLCMD)
 
 CLEAR_INSTALLED_LIST = clear-installed-list
 
-install-prereq: $(CLEAR_INSTALLED_LIST)
+install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake PHONY
 
-clear-installed-list:
-	@exit > $(INSTALLED_LIST)
+clear-installed-list: PHONY
+	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
-clean: clean-ext clean-local
-clean-local::
-	@$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
-	@$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
-	@$(RM) y.tab.c y.output
-clean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) clean
+clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform
+clean-local:: PHONY
+	$(Q)$(RM) $(OBJS) $(MINIOBJS) $(MAINOBJ) $(LIBRUBY_A) $(LIBRUBY_SO) $(LIBRUBY) $(LIBRUBY_ALIASES)
+	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) $(ARCHFILE) .*.time
+	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h prelude.c config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
+clean-ext:: PHONY
+clean-golf: PHONY
+	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
+clean-rdoc: PHONY
+clean-capi: PHONY
+clean-platform: PHONY
+clean-extout: PHONY
+clean-docs: clean-rdoc clean-capi
 
-distclean: distclean-ext distclean-local
+distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform
 distclean-local:: clean-local
-	@$(RM) $(MKFILES) config.h rbconfig.rb
-	@$(RM) config.cache config.log config.status
-	@$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
-distclean-ext:
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) distclean
+	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc
+	$(Q)$(RM) config.cache config.status config.status.lineno
+	$(Q)$(RM) *~ *.bak *.stackdump core *.core gmon.out $(PREP)
+distclean-ext:: PHONY
+distclean-golf: clean-golf
+	$(Q)$(RM) $(GOLFPRELUDES)
+distclean-rdoc: PHONY
+distclean-capi: PHONY
+distclean-extout: clean-extout
+distclean-platform: clean-platform
 
-realclean:: realclean-ext realclean-local
+realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
-	@$(RM) parse.c lex.c
-realclean-ext::
-	@-$(MINIRUBY) $(srcdir)/ext/extmk.rb --make="$(MAKE)" $(EXTMK_ARGS) realclean
+	$(Q)$(RM) parse.c parse.h lex.c newline.c miniprelude.c revision.h
+realclean-ext:: PHONY
+realclean-golf: distclean-golf
+realclean-capi: PHONY
+realclean-extout: distclean-extout
+
+clean-ext distclean-ext realclean-ext::
+	$(Q)$(RM) $(EXTS_MK)
+	$(Q)$(RM) $(EXTOUT)/.timestamp/.*.time
+
+clean-enc distclean-enc realclean-enc: PHONY
+
+check: main test test-all
+	$(ECHO) check succeeded
+check-ruby: test test-ruby
 
-check: test test-all
+fake: $(CROSS_COMPILING)-fake
+yes-fake: $(arch)-fake.rb $(RBCONFIG) PHONY
+no-fake: PHONY
 
-test: miniruby$(EXEEXT) $(RBCONFIG) $(PROGRAM) PHONY
-	@$(MINIRUBY) $(srcdir)/rubytest.rb
+btest: $(TEST_RUNNABLE)-btest
+no-btest: PHONY
+yes-btest: fake miniruby$(EXEEXT) PHONY
+	$(BOOTSTRAPRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(BTESTRUBY) $(RUN_OPTS)" $(OPTS) $(TESTOPTS)
 
-test-all:
-	$(RUNRUBY) "$(srcdir)/test/runner.rb" --basedir="$(TESTSDIR)" --runner=$(TESTUI) $(TESTS)
+btest-ruby: $(TEST_RUNNABLE)-btest-ruby
+no-btest-ruby: PHONY
+yes-btest-ruby: prog PHONY
+	$(Q)$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) -I$(srcdir)/lib $(RUN_OPTS)" -q $(OPTS) $(TESTOPTS)
 
-extconf:
-	$(MINIRUBY) -run -e mkdir -- -p "$(EXTCONFDIR)"
+test-sample: $(TEST_RUNNABLE)-test-sample
+no-test-sample: PHONY
+yes-test-sample: prog PHONY
+	$(Q)$(RUNRUBY) $(srcdir)/tool/rubytest.rb --run-opt=$(RUN_OPTS) $(OPTS) $(TESTOPTS)
+
+test-knownbugs: test-knownbug
+test-knownbug: $(TEST_RUNNABLE)-test-knownbug
+no-test-knownbug: PHONY
+yes-test-knownbug: prog PHONY
+	-$(RUNRUBY) "$(srcdir)/bootstraptest/runner.rb" --ruby="$(PROGRAM) $(RUN_OPTS)" $(OPTS) $(TESTOPTS) $(srcdir)/KNOWNBUGS.rb
+
+test: test-sample btest-ruby test-knownbug
+
+test-all: $(TEST_RUNNABLE)-test-all
+yes-test-all: prog PHONY
+	$(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTOPTS) $(TESTS)
+TESTS_BUILD = mkmf
+no-test-all: PHONY
+	$(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTOPTS) $(TESTS_BUILD)
+
+test-ruby: $(TEST_RUNNABLE)-test-ruby
+no-test-ruby: PHONY
+yes-test-ruby: prog encs PHONY
+	$(RUNRUBY) "$(srcdir)/test/runner.rb" -q $(TESTOPTS) -- ruby -ext-
+
+extconf: $(PREP)
+	$(Q) $(MAKEDIRS) "$(EXTCONFDIR)"
 	$(RUNRUBY) -C "$(EXTCONFDIR)" $(EXTCONF) $(EXTCONFARGS)
 
-$(RBCONFIG): $(srcdir)/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
-	@$(MINIRUBY) $(srcdir)/mkconfig.rb -timestamp=$@ \
+$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP)
+	$(Q)$(MINIRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
 		-install_name=$(RUBY_INSTALL_NAME) \
 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
+test-rubyspec-precheck:
+
+test-rubyspec: test-rubyspec-precheck
+	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+
+RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
+runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
+	$(Q) $(MINIRUBY) $(srcdir)/tool/mkrunnable.rb -v $(EXTOUT)
+yes-runnable: PHONY
+
+encs: enc trans
+libencs: libenc libtrans
+encs enc trans libencs libenc libtrans: showflags $(ENC_MK) $(LIBRUBY) $(PREP)
+	$(ECHO) making $@
+	$(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
+		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
+		$(MFLAGS) $@
+
+
+libenc enc: {$(VPATH)}encdb.h
+libtrans trans: {$(VPATH)}transdb.h
+
+$(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \
+	$(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG)
+	$(ECHO) generating $@
+	$(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(EXTSTATIC) $@ $(ENCS)
+
 .PRECIOUS: $(MKFILES)
 
+.PHONY: PHONY all fake prereq incs srcs preludes help
 .PHONY: test install install-nodoc install-doc dist
+.PHONY: loadpath golf capi rdoc install-prereq clear-installed-list
+.PHONY: clean clean-ext clean-local clean-enc clean-golf clean-rdoc clean-extout
+.PHONY: distclean distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
+.PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
+.PHONY: check test test-all btest btest-ruby test-sample test-knownbug
+.PHONY: run runruby parse benchmark benchmark-each tbench gdb gdb-ruby
+.PHONY: update-mspec update-rubyspec test-rubyspec
 
 PHONY:
 
-{$(VPATH)}parse.c: parse.y
+{$(VPATH)}parse.c: {$(VPATH)}parse.y $(srcdir)/tool/ytab.sed {$(VPATH)}id.h
+{$(VPATH)}parse.h: {$(VPATH)}parse.c
+
+{$(srcdir)}.y.c:
+	$(ECHO) generating $@
+	$(Q)$(BASERUBY) $(srcdir)/tool/id2token.rb --path-separator=.$(PATH_SEPARATOR)./ --vpath=$(VPATH) id.h $(SRC_FILE) > parse.tmp.y
+	$(Q)$(YACC) -d $(YFLAGS) -o y.tab.c parse.tmp.y
+	$(Q)$(RM) parse.tmp.y
+	$(Q)sed -f $(srcdir)/tool/ytab.sed -e "/^#/s!parse\.tmp\.[iy]!parse.y!" -e "/^#/s!y\.tab\.c!$@!" y.tab.c > $@.new
+	$(Q)$(MV) $@.new $@
+	$(Q)sed -e "/^#line.*y\.tab\.h/d;/^#line.*parse.*\.y/d" y.tab.h > $(@:.c=.h)
+	$(Q)$(RM) y.tab.c y.tab.h
+
+$(PLATFORM_D):
+	$(Q) $(MAKEDIRS) $(PLATFORM_DIR)
+	@exit > $@
+
+###
+
+RUBY_H_INCLUDES    = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
+		     {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
+		     {$(VPATH)}subst.h
+ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
+PROBES_H_INCLUDES  = {$(VPATH)}probes.h
+VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}thread_$(THREAD_MODEL).h \
+		     {$(VPATH)}node.h {$(VPATH)}method.h {$(VPATH)}ruby_atomic.h \
+	             {$(VPATH)}vm_debug.h {$(VPATH)}id.h {$(VPATH)}thread_native.h
+
+###
 
 acosh.$(OBJEXT): {$(VPATH)}acosh.c
-alloca.$(OBJEXT): {$(VPATH)}alloca.c
+alloca.$(OBJEXT): {$(VPATH)}alloca.c {$(VPATH)}config.h
 crypt.$(OBJEXT): {$(VPATH)}crypt.c
 dup2.$(OBJEXT): {$(VPATH)}dup2.c
 erf.$(OBJEXT): {$(VPATH)}erf.c
@@ -335,135 +625,479 @@ flock.$(OBJEXT): {$(VPATH)}flock.c
 memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
 memmove.$(OBJEXT): {$(VPATH)}memmove.c
 mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
-vsnprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
-strcasecmp.$(OBJEXT): {$(VPATH)}strcasecmp.c
-strncasecmp.$(OBJEXT): {$(VPATH)}strncasecmp.c
+setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(hdrdir)/ruby.h
 strchr.$(OBJEXT): {$(VPATH)}strchr.c
 strdup.$(OBJEXT): {$(VPATH)}strdup.c
 strerror.$(OBJEXT): {$(VPATH)}strerror.c
-strftime.$(OBJEXT): {$(VPATH)}strftime.c
+strlcat.$(OBJEXT): {$(VPATH)}strlcat.c
+strlcpy.$(OBJEXT): {$(VPATH)}strlcpy.c
 strstr.$(OBJEXT): {$(VPATH)}strstr.c
 strtod.$(OBJEXT): {$(VPATH)}strtod.c
 strtol.$(OBJEXT): {$(VPATH)}strtol.c
-strtoul.$(OBJEXT): {$(VPATH)}strtoul.c
 nt.$(OBJEXT): {$(VPATH)}nt.c
-x68.$(OBJEXT): {$(VPATH)}x68.c
 os2.$(OBJEXT): {$(VPATH)}os2.c
 dl_os2.$(OBJEXT): {$(VPATH)}dl_os2.c
 ia64.$(OBJEXT): {$(VPATH)}ia64.s
 	$(CC) $(CFLAGS) -c $<
 
-# when I use -I., there is confliction at "OpenFile" 
-# so, set . into environment varible "include"
-win32.$(OBJEXT): {$(VPATH)}win32.c
-
 ###
 
-array.$(OBJEXT): {$(VPATH)}array.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h {$(VPATH)}st.h
-bignum.$(OBJEXT): {$(VPATH)}bignum.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h
-class.$(OBJEXT): {$(VPATH)}class.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}node.h {$(VPATH)}st.h
-compar.$(OBJEXT): {$(VPATH)}compar.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-dir.$(OBJEXT): {$(VPATH)}dir.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h
-dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h
-dmydln.$(OBJEXT): {$(VPATH)}dmydln.c dln.$(OBJEXT)
+addr2line.$(OBJEXT): {$(VPATH)}addr2line.c {$(VPATH)}addr2line.h {$(VPATH)}config.h
+array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}vm_opts.h
+bignum.$(OBJEXT): {$(VPATH)}bignum.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  {$(VPATH)}thread.h {$(VPATH)}internal.h
+class.$(OBJEXT): {$(VPATH)}class.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}constant.h {$(VPATH)}vm_opts.h
+compar.$(OBJEXT): {$(VPATH)}compar.c $(RUBY_H_INCLUDES)
+complex.$(OBJEXT): {$(VPATH)}complex.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}internal.h $(hdrdir)/ruby.h
+dir.$(OBJEXT): {$(VPATH)}dir.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}internal.h
+dln.$(OBJEXT): {$(VPATH)}dln.c {$(VPATH)}dln.h $(RUBY_H_INCLUDES)
+dln_find.$(OBJEXT): {$(VPATH)}dln_find.c {$(VPATH)}dln.h $(RUBY_H_INCLUDES)
+dmydln.$(OBJEXT): {$(VPATH)}dmydln.c $(RUBY_H_INCLUDES)
 dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
-enum.$(OBJEXT): {$(VPATH)}enum.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}node.h {$(VPATH)}util.h
-enumerator.$(OBJEXT): {$(VPATH)}enumerator.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}st.h
-eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}node.h {$(VPATH)}env.h {$(VPATH)}util.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}dln.h
-file.$(OBJEXT): {$(VPATH)}file.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h {$(VPATH)}util.h \
-  {$(VPATH)}dln.h
-gc.$(OBJEXT): {$(VPATH)}gc.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h {$(VPATH)}node.h \
-  {$(VPATH)}env.h {$(VPATH)}re.h {$(VPATH)}regex.h
-hash.$(OBJEXT): {$(VPATH)}hash.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}st.h {$(VPATH)}util.h {$(VPATH)}rubysig.h
-inits.$(OBJEXT): {$(VPATH)}inits.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-io.$(OBJEXT): {$(VPATH)}io.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}rubysig.h  {$(VPATH)}util.h \
-  {$(VPATH)}env.h
-main.$(OBJEXT): {$(VPATH)}main.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-marshal.$(OBJEXT): {$(VPATH)}marshal.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubyio.h {$(VPATH)}st.h {$(VPATH)}util.h
-math.$(OBJEXT): {$(VPATH)}math.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-numeric.$(OBJEXT): {$(VPATH)}numeric.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}env.h {$(VPATH)}defines.h {$(VPATH)}intern.h \
-  {$(VPATH)}missing.h
-object.$(OBJEXT): {$(VPATH)}object.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}st.h {$(VPATH)}util.h
-pack.$(OBJEXT): {$(VPATH)}pack.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-parse.$(OBJEXT): {$(VPATH)}parse.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h \
-  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c
-prec.$(OBJEXT): {$(VPATH)}prec.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-process.$(OBJEXT): {$(VPATH)}process.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h {$(VPATH)}st.h
-random.$(OBJEXT): {$(VPATH)}random.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-range.$(OBJEXT): {$(VPATH)}range.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-re.$(OBJEXT): {$(VPATH)}re.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}re.h {$(VPATH)}regex.h
-regex.$(OBJEXT): {$(VPATH)}regex.c config.h {$(VPATH)}regex.h
-ruby.$(OBJEXT): {$(VPATH)}ruby.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}dln.h {$(VPATH)}node.h {$(VPATH)}util.h
-signal.$(OBJEXT): {$(VPATH)}signal.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}rubysig.h
-sprintf.$(OBJEXT): {$(VPATH)}sprintf.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-st.$(OBJEXT): {$(VPATH)}st.c config.h {$(VPATH)}st.h
-string.$(OBJEXT): {$(VPATH)}string.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}re.h {$(VPATH)}regex.h
-struct.$(OBJEXT): {$(VPATH)}struct.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-time.$(OBJEXT): {$(VPATH)}time.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h
-util.$(OBJEXT): {$(VPATH)}util.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}util.h
-variable.$(OBJEXT): {$(VPATH)}variable.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}env.h {$(VPATH)}node.h {$(VPATH)}st.h {$(VPATH)}util.h
-version.$(OBJEXT): {$(VPATH)}version.c {$(VPATH)}ruby.h config.h \
-  {$(VPATH)}defines.h {$(VPATH)}intern.h {$(VPATH)}missing.h \
-  {$(VPATH)}version.h
-
-dist: $(PROGRAM)
-	$(RUNRUBY) $(srcdir)/distruby.rb
+encoding.$(OBJEXT): {$(VPATH)}encoding.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}regenc.h {$(VPATH)}util.h \
+  {$(VPATH)}internal.h
+enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
+  {$(VPATH)}util.h {$(VPATH)}id.h {$(VPATH)}internal.h
+enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}node.h
+error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \
+  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+eval.$(OBJEXT): {$(VPATH)}eval.c {$(VPATH)}eval_intern.h {$(VPATH)}vm.h \
+  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_error.c \
+  {$(VPATH)}eval_jump.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}probes_helper.h
+load.$(OBJEXT): {$(VPATH)}load.c {$(VPATH)}eval_intern.h \
+  {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}dln.h {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h
+file.$(OBJEXT): {$(VPATH)}file.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}util.h {$(VPATH)}dln.h \
+  {$(VPATH)}internal.h
+gc.$(OBJEXT): {$(VPATH)}gc.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
+  {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}gc.h {$(VPATH)}io.h {$(VPATH)}eval_intern.h {$(VPATH)}util.h \
+  {$(VPATH)}internal.h {$(VPATH)}constant.h \
+  {$(VPATH)}thread.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}debug.h
+hash.$(OBJEXT): {$(VPATH)}hash.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h
+inits.$(OBJEXT): {$(VPATH)}inits.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}internal.h
+io.$(OBJEXT): {$(VPATH)}io.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
+  {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \
+  {$(VPATH)}internal.h {$(VPATH)}thread.h {$(VPATH)}id.h {$(VPATH)}ruby_atomic.h
+main.$(OBJEXT): {$(VPATH)}main.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h {$(VPATH)}vm_debug.h {$(VPATH)}vm_opts.h $(hdrdir)/ruby.h
+marshal.$(OBJEXT): {$(VPATH)}marshal.c $(RUBY_H_INCLUDES) {$(VPATH)}io.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}util.h {$(VPATH)}internal.h
+math.$(OBJEXT): {$(VPATH)}math.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}internal.h
+node.$(OBJEXT): {$(VPATH)}node.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}internal.h
+numeric.$(OBJEXT): {$(VPATH)}numeric.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}util.h $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}id.h
+object.$(OBJEXT): {$(VPATH)}object.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  {$(VPATH)}internal.h {$(VPATH)}constant.h $(ENCODING_H_INCLUDES) $(PROBES_H_INCLUDES) \
+  {$(VPATH)}vm_opts.h {$(VPATH)}id.h
+pack.$(OBJEXT): {$(VPATH)}pack.c $(RUBY_H_INCLUDES) {$(VPATH)}encoding.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}internal.h
+parse.$(OBJEXT): {$(VPATH)}parse.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}regenc.h \
+  {$(VPATH)}regex.h {$(VPATH)}util.h {$(VPATH)}lex.c \
+  {$(VPATH)}defs/keywords {$(VPATH)}id.c {$(VPATH)}parse.y \
+  {$(VPATH)}parse.h {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h
+proc.$(OBJEXT): {$(VPATH)}proc.c {$(VPATH)}eval_intern.h \
+  $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}iseq.h {$(VPATH)}vm_opts.h
+process.$(OBJEXT): {$(VPATH)}process.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}util.h {$(VPATH)}io.h $(ENCODING_H_INCLUDES) {$(VPATH)}dln.h \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h \
+  {$(VPATH)}thread.h {$(VPATH)}vm_opts.h
+random.$(OBJEXT): {$(VPATH)}random.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}siphash.c {$(VPATH)}siphash.h {$(VPATH)}internal.h
+range.$(OBJEXT): {$(VPATH)}range.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}id.h
+rational.$(OBJEXT): {$(VPATH)}rational.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h $(hdrdir)/ruby.h
+re.$(OBJEXT): {$(VPATH)}re.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
+  {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) {$(VPATH)}util.h \
+  {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}internal.h
+regcomp.$(OBJEXT): {$(VPATH)}regcomp.c {$(VPATH)}regparse.h \
+  {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h \
+  $(RUBY_H_INCLUDES)
+regenc.$(OBJEXT): {$(VPATH)}regenc.c {$(VPATH)}regint.h \
+  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
+regerror.$(OBJEXT): {$(VPATH)}regerror.c {$(VPATH)}regint.h \
+  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
+regexec.$(OBJEXT): {$(VPATH)}regexec.c {$(VPATH)}regint.h \
+  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
+regparse.$(OBJEXT): {$(VPATH)}regparse.c {$(VPATH)}regparse.h \
+  {$(VPATH)}regint.h {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h \
+  $(RUBY_H_INCLUDES)
+regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c {$(VPATH)}regint.h \
+  {$(VPATH)}regenc.h {$(VPATH)}oniguruma.h $(RUBY_H_INCLUDES)
+ruby.$(OBJEXT): {$(VPATH)}ruby.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}eval_intern.h $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}dln.h {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+safe.$(OBJEXT): {$(VPATH)}safe.c $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}internal.h
+signal.$(OBJEXT): {$(VPATH)}signal.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}internal.h {$(VPATH)}ruby_atomic.h {$(VPATH)}eval_intern.h
+sprintf.$(OBJEXT): {$(VPATH)}sprintf.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
+  {$(VPATH)}regex.h {$(VPATH)}vsnprintf.c $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
+st.$(OBJEXT): {$(VPATH)}st.c $(RUBY_H_INCLUDES)
+strftime.$(OBJEXT): {$(VPATH)}strftime.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}timev.h $(ENCODING_H_INCLUDES)
+string.$(OBJEXT): {$(VPATH)}string.c $(RUBY_H_INCLUDES) {$(VPATH)}re.h \
+  {$(VPATH)}regex.h $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h $(PROBES_H_INCLUDES) {$(VPATH)}vm_opts.h {$(VPATH)}node.h {$(VPATH)}ruby_atomic.h {$(VPATH)}vm_core.h {$(VPATH)}vm_debug.h {$(VPATH)}id.h {$(VPATH)}method.h {$(VPATH)}thread_$(THREAD_MODEL).h {$(VPATH)}thread_native.h
+struct.$(OBJEXT): {$(VPATH)}struct.c $(RUBY_H_INCLUDES) {$(VPATH)}internal.h
+thread.$(OBJEXT): {$(VPATH)}thread.c {$(VPATH)}eval_intern.h \
+  $(RUBY_H_INCLUDES) {$(VPATH)}gc.h $(VM_CORE_H_INCLUDES) \
+  {$(VPATH)}thread_$(THREAD_MODEL).c $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}io.h {$(VPATH)}thread.h {$(VPATH)}timev.h {$(VPATH)}vm_opts.h
+transcode.$(OBJEXT): {$(VPATH)}transcode.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}transcode_data.h {$(VPATH)}internal.h
+cont.$(OBJEXT): {$(VPATH)}cont.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}gc.h {$(VPATH)}eval_intern.h \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+time.$(OBJEXT): {$(VPATH)}time.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}timev.h {$(VPATH)}internal.h
+util.$(OBJEXT): {$(VPATH)}util.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h \
+  {$(VPATH)}internal.h
+variable.$(OBJEXT): {$(VPATH)}variable.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}node.h {$(VPATH)}util.h {$(VPATH)}encoding.h {$(VPATH)}id.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}internal.h {$(VPATH)}constant.h
+version.$(OBJEXT): {$(VPATH)}version.c $(RUBY_H_INCLUDES) \
+  $(srcdir)/include/ruby/version.h $(srcdir)/version.h $(srcdir)/revision.h {$(VPATH)}config.h
+loadpath.$(OBJEXT): {$(VPATH)}loadpath.c $(RUBY_H_INCLUDES) \
+  $(srcdir)/include/ruby/version.h $(srcdir)/version.h {$(VPATH)}config.h \
+  verconf.h
+localeinit.$(OBJEXT): {$(VPATH)}localeinit.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) {$(VPATH)}internal.h
+miniinit.$(OBJEXT): {$(VPATH)}miniinit.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES)
+
+compile.$(OBJEXT): {$(VPATH)}compile.c {$(VPATH)}iseq.h \
+  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
+  {$(VPATH)}insns_info.inc {$(VPATH)}optinsn.inc \
+  {$(VPATH)}optunifs.inc {$(VPATH)}opt_sc.inc {$(VPATH)}insns.inc \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+iseq.$(OBJEXT): {$(VPATH)}iseq.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
+  $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}insns.inc \
+  {$(VPATH)}insns_info.inc {$(VPATH)}node_name.inc {$(VPATH)}internal.h {$(VPATH)}vm_opts.h {$(VPATH)}ruby_atomic.h {$(VPATH)}eval_intern.h
+vm.$(OBJEXT): {$(VPATH)}vm.c {$(VPATH)}gc.h {$(VPATH)}iseq.h \
+  {$(VPATH)}eval_intern.h $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}vm_method.c {$(VPATH)}vm_eval.c \
+  {$(VPATH)}vm_insnhelper.c {$(VPATH)}vm_insnhelper.h {$(VPATH)}vm_exec.c \
+  {$(VPATH)}vm_exec.h {$(VPATH)}insns.def {$(VPATH)}vmtc.inc \
+  {$(VPATH)}vm.inc {$(VPATH)}insns.inc \
+  {$(VPATH)}internal.h {$(VPATH)}vm.h {$(VPATH)}constant.h \
+  $(PROBES_H_INCLUDES) {$(VPATH)}probes_helper.h {$(VPATH)}vm_opts.h
+vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}addr2line.h \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+debug.$(OBJEXT): {$(VPATH)}debug.c $(RUBY_H_INCLUDES) \
+  $(ENCODING_H_INCLUDES) $(VM_CORE_H_INCLUDES) {$(VPATH)}eval_intern.h \
+  {$(VPATH)}util.h {$(VPATH)}vm_opts.h {$(VPATH)}internal.h
+id.$(OBJEXT): {$(VPATH)}id.c $(RUBY_H_INCLUDES) {$(VPATH)}id.h {$(VPATH)}vm_opts.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c \
+  $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) $(ENCODING_H_INCLUDES) \
+  {$(VPATH)}internal.h {$(VPATH)}iseq.h {$(VPATH)}debug.h {$(VPATH)}vm_opts.h {$(VPATH)}ruby_atomic.h {$(VPATH)}eval_intern.h
+vm_trace.$(OBJEXT): {$(VPATH)}vm_trace.c $(ENCODING_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) $(RUBY_H_INCLUDES) {$(VPATH)}debug.h \
+  {$(VPATH)}internal.h {$(VPATH)}vm_opts.h {$(VPATH)}ruby_atomic.h {$(VPATH)}eval_intern.h
+miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+prelude.$(OBJEXT): {$(VPATH)}prelude.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c $(RUBY_H_INCLUDES) \
+  $(VM_CORE_H_INCLUDES) {$(VPATH)}internal.h {$(VPATH)}vm_opts.h
+goruby.$(OBJEXT): {$(VPATH)}goruby.c {$(VPATH)}main.c $(RUBY_H_INCLUDES) \
+  {$(VPATH)}vm_debug.h {$(VPATH)}node.h $(hdrdir)/ruby.h
+
+sizes.$(OBJEXT): {$(VPATH)}sizes.c $(RUBY_H_INCLUDES)
+
+ascii.$(OBJEXT): {$(VPATH)}ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
+us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c {$(VPATH)}regenc.h \
+  {$(VPATH)}config.h {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
+unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regint.h \
+  {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}st.h {$(VPATH)}ruby.h \
+  {$(VPATH)}missing.h {$(VPATH)}intern.h \
+  {$(VPATH)}enc/unicode/name2ctype.h {$(VPATH)}enc/unicode/casefold.h  \
+  {$(VPATH)}subst.h $(RUBY_H_INCLUDES)
+
+utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
+  {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
+
+win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}dln.h {$(VPATH)}dln_find.c \
+  {$(VPATH)}internal.h $(RUBY_H_INCLUDES) $(PLATFORM_D)
+win32/file.$(OBJEXT): {$(VPATH)}win32/file.c $(RUBY_H_INCLUDES) $(PLATFORM_D)
+
+$(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb
+	$(Q) $(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo $@ $(srcdir)/enc/trans/newline.trans
+newline.$(OBJEXT): $(NEWLINE_C) {$(VPATH)}defines.h \
+  {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
+  {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}subst.h
+
+verconf.h: $(srcdir)/template/verconf.h.in $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
+	$(ECHO) creating $@
+	$(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" $(srcdir)/template/verconf.h.in > $@
+
+DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
+		eval.$(OBJEXT) \
+		gc.$(OBJEXT) \
+		hash.$(OBJEXT) \
+		load.$(OBJEXT) \
+		object.$(OBJEXT) \
+		parse.$(OBJEXT) \
+		string.$(OBJEXT) \
+		vm.$(OBJEXT)
+
+probes.$(OBJEXT): $(DTRACE_DEPENDENT_OBJS)
+ruby-glommed.$(OBJEXT): $(OBJS) $(DTRACE_OBJ)
+
+$(OBJS):  {$(VPATH)}config.h {$(VPATH)}missing.h
+
+INSNS2VMOPT = --srcdir="$(srcdir)"
+
+{$(VPATH)}minsns.inc: $(srcdir)/template/minsns.inc.tmpl
+
+{$(VPATH)}opt_sc.inc: $(srcdir)/template/opt_sc.inc.tmpl
+
+{$(VPATH)}optinsn.inc: $(srcdir)/template/optinsn.inc.tmpl
+
+{$(VPATH)}optunifs.inc: $(srcdir)/template/optunifs.inc.tmpl
+
+{$(VPATH)}insns.inc: $(srcdir)/template/insns.inc.tmpl
+
+{$(VPATH)}insns_info.inc: $(srcdir)/template/insns_info.inc.tmpl
+
+{$(VPATH)}vmtc.inc: $(srcdir)/template/vmtc.inc.tmpl
+
+{$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
+
+srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c srcs-ext srcs-enc
+
+EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/json/parser/parser.c \
+	   $(srcdir)/ext/dl/callback/callback.c  $(srcdir)/ext/rbconfig/sizeof/sizes.c
+
+srcs-ext: $(EXT_SRCS)
+
+srcs-enc: $(ENC_MK)
+	$(ECHO) making srcs under enc
+	$(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
+
+all-incs: incs
+incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}encdb.h {$(VPATH)}transdb.h {$(VPATH)}known_errors.inc \
+      $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h {$(VPATH)}id.h {$(VPATH)}probes.dmyh
+
+insns: $(INSNS)
+
+id.h: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.h.tmpl $(srcdir)/defs/id.def
+	$(ECHO) generating $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
+		$(srcdir)/template/id.h.tmpl
+
+id.c: $(srcdir)/tool/generic_erb.rb $(srcdir)/template/id.c.tmpl $(srcdir)/defs/id.def
+	$(ECHO) generating $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb --output=$@ \
+		$(srcdir)/template/id.c.tmpl
+
+node_name.inc: {$(VPATH)}node.h
+	$(ECHO) generating $@
+	$(Q) $(BASERUBY) -n $(srcdir)/tool/node_name.rb < $? > $@
+
+encdb.h: $(PREP) $(srcdir)/tool/generic_erb.rb $(srcdir)/template/encdb.h.tmpl
+	$(ECHO) generating $@
+	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/encdb.h.tmpl $(srcdir)/enc enc
+
+transdb.h: $(PREP) srcs-enc $(srcdir)/tool/generic_erb.rb $(srcdir)/template/transdb.h.tmpl
+	$(ECHO) generating $@
+	$(Q) $(MINIRUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/transdb.h.tmpl $(srcdir)/enc/trans enc/trans
+
+enc/encinit.c: $(ENC_MK) $(srcdir)/enc/encinit.c.erb
+
+known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
+	$(ECHO) generating $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def
+
+$(MINIPRELUDE_C): $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb
+	$(ECHO) generating $@
+	$(Q) $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+
+prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \
+	   $(srcdir)/lib/rubygems/defaults.rb \
+	   $(srcdir)/lib/rubygems/core_ext/kernel_gem.rb \
+	   $(PRELUDE_SCRIPTS) $(PREP)
+	$(ECHO) generating $@
+	$(Q) $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
+
+golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
+	$(ECHO) generating $@
+	$(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
+
+probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
+	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
+
+probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
+
+prereq: incs srcs preludes PHONY
+
+preludes: {$(VPATH)}miniprelude.c
+preludes: {$(srcdir)}golf_prelude.c
+
+$(srcdir)/revision.h:
+	@exit > $@
+
+$(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastrev.rb $(REVISION_FORCE)
+	-$(Q) $(BASERUBY) $(srcdir)/tool/file2lastrev.rb --revision.h "$(srcdir)" > revision.tmp
+	$(Q)$(IFCHANGE) "--timestamp=$@" "$(srcdir)/revision.h" revision.tmp
+
+$(srcdir)/ext/ripper/ripper.c: parse.y id.h
+	$(ECHO) generating $@
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
+
+$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
+	$(ECHO) generating $@
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
+
+$(srcdir)/ext/dl/callback/callback.c: $(srcdir)/ext/dl/callback/mkcallback.rb $(srcdir)/ext/dl/dl.h
+	$(ECHO) generating $@
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../.. srcdir=. VPATH=../.. RUBY="$(BASERUBY)"
+
+$(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
+		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
+	$(ECHO) generating $@
+	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f depend $(MFLAGS) \
+		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. RUBY="$(BASERUBY)"
+
+##
+
+run: fake miniruby$(EXEEXT) PHONY
+	$(BTESTRUBY) $(TESTRUN_SCRIPT) $(RUNOPT)
+
+runruby: $(PROGRAM) PHONY
+	$(RUNRUBY) $(TESTRUN_SCRIPT)
+
+parse: fake miniruby$(EXEEXT) PHONY
+	$(BTESTRUBY) $(srcdir)/tool/parse.rb $(TESTRUN_SCRIPT)
+
+bisect: PHONY
+	$(srcdir)/tool/bisect.sh miniruby $(srcdir)
+
+bisect-ruby: PHONY
+	$(srcdir)/tool/bisect.sh ruby $(srcdir)
+
+COMPARE_RUBY = $(BASERUBY)
+ITEM =
+OPTS =
+
+benchmark: $(PROGRAM) PHONY
+	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
+	            --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
+	            --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
+
+benchmark-each: $(PROGRAM) PHONY
+	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
+	            --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
+	            --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
+
+tbench: $(PROGRAM) PHONY
+	$(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
+	            --executables="$(COMPARE_RUBY); built-ruby::$(RUNRUBY)" \
+	            --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
+
+run.gdb:
+	echo b ruby_debug_breakpoint           > run.gdb
+	echo '# handle SIGINT nostop'         >> run.gdb
+	echo '# handle SIGPIPE nostop'        >> run.gdb
+	echo '# b rb_longjmp'                 >> run.gdb
+	echo source $(srcdir)/breakpoints.gdb >> run.gdb
+	echo source $(srcdir)/.gdbinit        >> run.gdb
+	echo 'set $$_exitcode = -999'         >> run.gdb
+	echo run                              >> run.gdb
+	echo 'if $$_exitcode != -999'         >> run.gdb
+	echo '  quit'                         >> run.gdb
+	echo end                              >> run.gdb
+
+
+gdb: miniruby$(EXEEXT) run.gdb PHONY
+	gdb -x run.gdb --quiet --args $(MINIRUBY) $(TESTRUN_SCRIPT)
+
+gdb-ruby: $(PROGRAM) run.gdb PHONY
+	$(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
+
+dist:
+	$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)
+
+up::
+	-$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
+
+update-config_files: $(srcdir)/tool/config.guess $(srcdir)/tool/config.sub
+$(srcdir)/tool/config.guess:
+	$(Q) $(BASERUBY) -C $(@D) get-config_files $(@F)
+$(srcdir)/tool/config.sub:
+	$(Q) $(BASERUBY) -C $(@D) get-config_files $(@F)
+
+info: info-program info-libruby_a info-libruby_so info-arch
+info-program:
+	@echo PROGRAM=$(PROGRAM)
+info-libruby_a:
+	@echo LIBRUBY_A=$(LIBRUBY_A)
+info-libruby_so:
+	@echo LIBRUBY_SO=$(LIBRUBY_SO)
+info-arch:
+	@echo arch=$(arch)
+
+change: PHONY
+	$(BASERUBY) -C "$(srcdir)" ./tool/change_maker.rb $(CHANGES) > change.log
+
+love: sudo-precheck up all test install test-all
+	@echo love is all you need
+
+yes-test-all: sudo-precheck
+
+sudo-precheck:
+	@$(SUDO) echo > $(NULL)
+
+help: PHONY
+	$(MESSAGE_BEGIN) \
+	"                Makefile of Ruby" \
+	"" \
+	"targets:" \
+	"  all (default):   builds all of below" \
+	"  miniruby:        builds only miniruby" \
+	"  encs:            builds encodings" \
+	"  exts:            builds extensions" \
+	"  main:            builds encodings, extensions and ruby" \
+	"  docs:            builds documents" \
+	"  run:             runs test.rb by miniruby" \
+	"  runruby:         runs test.rb by ruby you just built" \
+	"  gdb:             runs test.rb by miniruby under gdb" \
+	"  gdb-ruby:        runs test.rb by ruby under gdb" \
+	"  check:           equals make test test-all" \
+	"  test:            ruby core tests" \
+	"  test-all:        all ruby tests [TESTS=<test files>]" \
+	"  test-rubyspec:   run RubySpec test suite" \
+	"  update-rubyspec: update local copy of RubySpec" \
+	"  benchmark:       benchmark this ruby and COMPARE_RUBY" \
+	"  gcbench:         gc benchmark [GCBENCH_ITEM=<item_name>]" \
+	"  gcbench-rdoc:    gc benchmark with GCBENCH_ITEM=rdoc" \
+	"  install:         install all ruby distributions" \
+	"  install-nodoc:   install without rdoc" \
+	"  install-cross:   install cross compiling staff" \
+	"  clean:           clean for tarball" \
+	"  distclean:       clean for repository" \
+	"  change:          make change log template" \
+	"  golf:            for golfers" \
+	"" \
+	"see DeveloperHowto for more detail: " \
+	"  http://bugs.ruby-lang.org/wiki/ruby/DeveloperHowto" \
+	$(MESSAGE_END)
diff --git a/compar.c b/compar.c
index 1488b2c65d..2f4db291a4 100644
--- a/compar.c
+++ b/compar.c
@@ -3,39 +3,20 @@
   compar.c -
 
   $Author$
-  $Date$
   created at: Thu Aug 26 14:39:48 JST 1993
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
 
 VALUE rb_mComparable;
 
 static ID cmp;
 
-int
-rb_cmpint(val, a, b)
-    VALUE val, a, b;
-{
-    if (NIL_P(val)) {
-	rb_cmperr(a, b);
-    }
-    if (FIXNUM_P(val)) return FIX2INT(val);
-    if (TYPE(val) == T_BIGNUM) {
-	if (RBIGNUM(val)->sign) return 1;
-	return -1;
-    }
-    if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
-    if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1;
-    return 0;
-}
-
 void
-rb_cmperr(x, y)
-    VALUE x, y;
+rb_cmperr(VALUE x, VALUE y)
 {
     const char *classname;
 
@@ -50,37 +31,63 @@ rb_cmperr(x, y)
 	     rb_obj_classname(x), classname);
 }
 
-#define cmperr() (rb_cmperr(x, y), Qnil)
+static VALUE
+invcmp_recursive(VALUE x, VALUE y, int recursive)
+{
+    if (recursive) return Qnil;
+    return rb_check_funcall(y, cmp, 1, &x);
+}
+
+VALUE
+rb_invcmp(VALUE x, VALUE y)
+{
+    VALUE invcmp = rb_exec_recursive(invcmp_recursive, x, y);
+    if (invcmp == Qundef || NIL_P(invcmp)) {
+	return Qnil;
+    }
+    else {
+	int result = -rb_cmpint(invcmp, x, y);
+	return INT2FIX(result);
+    }
+}
+
+static VALUE
+cmp_eq_recursive(VALUE arg1, VALUE arg2, int recursive)
+{
+    if (recursive) return Qfalse;
+    return rb_funcallv(arg1, cmp, 1, &arg2);
+}
 
 static VALUE
-cmp_eq(a)
-    VALUE *a;
+cmp_eq(VALUE *a)
 {
-    VALUE c = rb_funcall(a[0], cmp, 1, a[1]);
+    VALUE c = rb_exec_recursive_paired_outer(cmp_eq_recursive, a[0], a[1], a[1]);
 
-    if (NIL_P(c)) return Qnil;
+    if (NIL_P(c)) return Qfalse;
     if (rb_cmpint(c, a[0], a[1]) == 0) return Qtrue;
     return Qfalse;
 }
 
 static VALUE
-cmp_failed()
+cmp_failed(void)
 {
-    return Qnil;
+    return Qfalse;
 }
 
 /*
  *  call-seq:
- *     obj == other    => true or false
- *  
+ *     obj == other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns 0. Also returns true if
  *  _obj_ and _other_ are the same object.
+ *
+ *  Even if _obj_ <=> _other_ raised an exception, the exception
+ *  is ignored and returns false.
  */
 
 static VALUE
-cmp_equal(x, y)
-    VALUE x, y;
+cmp_equal(VALUE x, VALUE y)
 {
     VALUE a[2];
 
@@ -92,99 +99,89 @@ cmp_equal(x, y)
 
 /*
  *  call-seq:
- *     obj > other    => true or false
- *  
+ *     obj > other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns 1.
  */
 
 static VALUE
-cmp_gt(x, y)
-    VALUE x, y;
+cmp_gt(VALUE x, VALUE y)
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
     if (rb_cmpint(c, x, y) > 0) return Qtrue;
     return Qfalse;
 }
 
 /*
  *  call-seq:
- *     obj >= other    => true or false
- *  
+ *     obj >= other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns 0 or 1.
  */
 
 static VALUE
-cmp_ge(x, y)
-    VALUE x, y;
+cmp_ge(VALUE x, VALUE y)
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
     if (rb_cmpint(c, x, y) >= 0) return Qtrue;
     return Qfalse;
 }
 
 /*
  *  call-seq:
- *     obj < other    => true or false
- *  
+ *     obj < other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns -1.
  */
 
 static VALUE
-cmp_lt(x, y)
-    VALUE x, y;
+cmp_lt(VALUE x, VALUE y)
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
     if (rb_cmpint(c, x, y) < 0) return Qtrue;
     return Qfalse;
 }
 
-
 /*
  *  call-seq:
- *     obj <= other    => true or false
- *  
+ *     obj <= other    -> true or false
+ *
  *  Compares two objects based on the receiver's <code><=></code>
  *  method, returning true if it returns -1 or 0.
  */
 
 static VALUE
-cmp_le(x, y)
-    VALUE x, y;
+cmp_le(VALUE x, VALUE y)
 {
     VALUE c = rb_funcall(x, cmp, 1, y);
 
-    if (NIL_P(c)) return cmperr();
     if (rb_cmpint(c, x, y) <= 0) return Qtrue;
     return Qfalse;
 }
 
 /*
  *  call-seq:
- *     obj.between?(min, max)    => true or false
- *  
+ *     obj.between?(min, max)    -> true or false
+ *
  *  Returns <code>false</code> if <i>obj</i> <code><=></code>
  *  <i>min</i> is less than zero or if <i>anObject</i> <code><=></code>
  *  <i>max</i> is greater than zero, <code>true</code> otherwise.
- *     
+ *
  *     3.between?(1, 5)               #=> true
  *     6.between?(1, 5)               #=> false
  *     'cat'.between?('ant', 'dog')   #=> true
  *     'gnu'.between?('ant', 'dog')   #=> false
- *     
+ *
  */
 
 static VALUE
-cmp_between(x, min, max)
-    VALUE x, min, max;
+cmp_between(VALUE x, VALUE min, VALUE max)
 {
     if (RTEST(cmp_lt(x, min))) return Qfalse;
     if (RTEST(cmp_gt(x, max))) return Qfalse;
@@ -196,11 +193,13 @@ cmp_between(x, min, max)
  *  may be ordered. The class must define the <code><=></code> operator,
  *  which compares the receiver against another object, returning -1, 0,
  *  or +1 depending on whether the receiver is less than, equal to, or
- *  greater than the other object. <code>Comparable</code> uses
+ *  greater than the other object. If the other object is not comparable
+ *  then the <code><=></code> operator should return nil.
+ *  <code>Comparable</code> uses
  *  <code><=></code> to implement the conventional comparison operators
  *  (<code><</code>, <code><=</code>, <code>==</code>, <code>>=</code>,
  *  and <code>></code>) and the method <code>between?</code>.
- *     
+ *
  *     class SizeMatters
  *       include Comparable
  *       attr :str
@@ -214,23 +213,26 @@ cmp_between(x, min, max)
  *         @str
  *       end
  *     end
- *     
+ *
  *     s1 = SizeMatters.new("Z")
  *     s2 = SizeMatters.new("YY")
  *     s3 = SizeMatters.new("XXX")
  *     s4 = SizeMatters.new("WWWW")
  *     s5 = SizeMatters.new("VVVVV")
- *     
+ *
  *     s1 < s2                       #=> true
  *     s4.between?(s1, s3)           #=> false
  *     s4.between?(s3, s5)           #=> true
  *     [ s3, s2, s5, s4, s1 ].sort   #=> [Z, YY, XXX, WWWW, VVVVV]
- *     
+ *
  */
 
 void
-Init_Comparable()
+Init_Comparable(void)
 {
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+
     rb_mComparable = rb_define_module("Comparable");
     rb_define_method(rb_mComparable, "==", cmp_equal, 1);
     rb_define_method(rb_mComparable, ">", cmp_gt, 1);
diff --git a/compile.c b/compile.c
new file mode 100644
index 0000000000..2b58462d16
--- /dev/null
+++ b/compile.c
@@ -0,0 +1,5933 @@
+/**********************************************************************
+
+  compile.c - ruby node tree -> VM instruction sequence
+
+  $Author$
+  created at: 04/01/01 03:42:15 JST
+
+  Copyright (C) 2004-2007 Koichi Sasada
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+#include "internal.h"
+#include <math.h>
+
+#define USE_INSN_STACK_INCREASE 1
+#include "vm_core.h"
+#include "iseq.h"
+#include "insns.inc"
+#include "insns_info.inc"
+
+#define FIXNUM_INC(n, i) ((n)+(INT2FIX(i)&~FIXNUM_FLAG))
+#define FIXNUM_OR(n, i) ((n)|INT2FIX(i))
+
+typedef struct iseq_link_element {
+    enum {
+	ISEQ_ELEMENT_NONE,
+	ISEQ_ELEMENT_LABEL,
+	ISEQ_ELEMENT_INSN,
+	ISEQ_ELEMENT_ADJUST
+    } type;
+    struct iseq_link_element *next;
+    struct iseq_link_element *prev;
+} LINK_ELEMENT;
+
+typedef struct iseq_link_anchor {
+    LINK_ELEMENT anchor;
+    LINK_ELEMENT *last;
+} LINK_ANCHOR;
+
+typedef struct iseq_label_data {
+    LINK_ELEMENT link;
+    int label_no;
+    int position;
+    int sc_state;
+    int set;
+    int sp;
+} LABEL;
+
+typedef struct iseq_insn_data {
+    LINK_ELEMENT link;
+    enum ruby_vminsn_type insn_id;
+    unsigned int line_no;
+    int operand_size;
+    int sc_state;
+    VALUE *operands;
+} INSN;
+
+typedef struct iseq_adjust_data {
+    LINK_ELEMENT link;
+    LABEL *label;
+    int line_no;
+} ADJUST;
+
+struct ensure_range {
+    LABEL *begin;
+    LABEL *end;
+    struct ensure_range *next;
+};
+
+struct iseq_compile_data_ensure_node_stack {
+    NODE *ensure_node;
+    struct iseq_compile_data_ensure_node_stack *prev;
+    struct ensure_range *erange;
+};
+
+/**
+ * debug function(macro) interface depend on CPDEBUG
+ * if it is less than 0, runtime option is in effect.
+ *
+ * debug level:
+ *  0: no debug output
+ *  1: show node type
+ *  2: show node important parameters
+ *  ...
+ *  5: show other parameters
+ * 10: show every AST array
+ */
+
+#ifndef CPDEBUG
+#define CPDEBUG 0
+#endif
+
+#if CPDEBUG >= 0
+#define compile_debug CPDEBUG
+#else
+#define compile_debug iseq->compile_data->option->debug_level
+#endif
+
+#if CPDEBUG
+
+#define compile_debug_print_indent(level) \
+    ruby_debug_print_indent((level), compile_debug, gl_node_level * 2)
+
+#define debugp(header, value) (void) \
+  (compile_debug_print_indent(1) && \
+   ruby_debug_print_value(1, compile_debug, (header), (value)))
+
+#define debugi(header, id)  (void) \
+  (compile_debug_print_indent(1) && \
+   ruby_debug_print_id(1, compile_debug, (header), (id)))
+
+#define debugp_param(header, value)  (void) \
+  (compile_debug_print_indent(1) && \
+   ruby_debug_print_value(1, compile_debug, (header), (value)))
+
+#define debugp_verbose(header, value)  (void) \
+  (compile_debug_print_indent(2) && \
+   ruby_debug_print_value(2, compile_debug, (header), (value)))
+
+#define debugp_verbose_node(header, value)  (void) \
+  (compile_debug_print_indent(10) && \
+   ruby_debug_print_value(10, compile_debug, (header), (value)))
+
+#define debug_node_start(node)  ((void) \
+  (compile_debug_print_indent(1) && \
+   (ruby_debug_print_node(1, CPDEBUG, "", (NODE *)(node)), gl_node_level)), \
+   gl_node_level++)
+
+#define debug_node_end()  gl_node_level --
+
+#else
+
+static inline ID
+r_id(ID id)
+{
+    return id;
+}
+
+static inline VALUE
+r_value(VALUE value)
+{
+    return value;
+}
+
+#define debugi(header, id)                 r_id(id)
+#define debugp(header, value)              r_value(value)
+#define debugp_verbose(header, value)      r_value(value)
+#define debugp_verbose_node(header, value) r_value(value)
+#define debugp_param(header, value)        r_value(value)
+#define debug_node_start(node)             ((void)0)
+#define debug_node_end()                   ((void)0)
+#endif
+
+#if CPDEBUG > 1 || CPDEBUG < 0
+#define debugs if (compile_debug_print_indent(1)) ruby_debug_printf
+#define debug_compile(msg, v) ((void)(compile_debug_print_indent(1) && fputs((msg), stderr)), (v))
+#else
+#define debugs                             if(0)printf
+#define debug_compile(msg, v) (v)
+#endif
+
+
+/* create new label */
+#define NEW_LABEL(l) new_label_body(iseq, (l))
+
+#define iseq_path(iseq) \
+  (((rb_iseq_t*)DATA_PTR(iseq))->location.path)
+
+#define iseq_absolute_path(iseq) \
+  (((rb_iseq_t*)DATA_PTR(iseq))->location.absolute_path)
+
+#define NEW_ISEQVAL(node, name, type, line_no)       \
+  new_child_iseq(iseq, (node), (name), 0, (type), (line_no))
+
+#define NEW_CHILD_ISEQVAL(node, name, type, line_no)       \
+  new_child_iseq(iseq, (node), (name), iseq->self, (type), (line_no))
+
+/* add instructions */
+#define ADD_SEQ(seq1, seq2) \
+  APPEND_LIST((seq1), (seq2))
+
+/* add an instruction */
+#define ADD_INSN(seq, line, insn) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
+
+/* add an instruction with some operands (1, 2, 3, 5) */
+#define ADD_INSN1(seq, line, insn, op1) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) \
+           new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(op1)))
+
+/* add an instruction with label operand (alias of ADD_INSN1) */
+#define ADD_INSNL(seq, line, insn, label) ADD_INSN1(seq, line, insn, label)
+
+#define ADD_INSN2(seq, line, insn, op1, op2) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) \
+           new_insn_body(iseq, (line), BIN(insn), 2, (VALUE)(op1), (VALUE)(op2)))
+
+#define ADD_INSN3(seq, line, insn, op1, op2, op3) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) \
+           new_insn_body(iseq, (line), BIN(insn), 3, (VALUE)(op1), (VALUE)(op2), (VALUE)(op3)))
+
+/* Specific Insn factory */
+#define ADD_SEND(seq, line, id, argc) \
+  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(0))
+
+#define ADD_CALL_RECEIVER(seq, line) \
+  ADD_INSN((seq), (line), putself)
+
+#define ADD_CALL(seq, line, id, argc) \
+  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL))
+
+#define ADD_CALL_WITH_BLOCK(seq, line, id, argc, block) \
+  ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL))
+
+#define ADD_SEND_R(seq, line, id, argc, block, flag) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) \
+           new_insn_send(iseq, (line), \
+                         (VALUE)(id), (VALUE)(argc), (VALUE)(block), (VALUE)(flag)))
+
+#define ADD_TRACE(seq, line, event) \
+  do { \
+      if ((event) == RUBY_EVENT_LINE && iseq->coverage && \
+	  (line) != iseq->compile_data->last_coverable_line) { \
+	  RARRAY_ASET(iseq->coverage, (line) - 1, INT2FIX(0)); \
+	  iseq->compile_data->last_coverable_line = (line); \
+	  ADD_INSN1((seq), (line), trace, INT2FIX(RUBY_EVENT_COVERAGE)); \
+      } \
+      if (iseq->compile_data->option->trace_instruction) { \
+	  ADD_INSN1((seq), (line), trace, INT2FIX(event)); \
+      } \
+  } while (0)
+
+/* add label */
+#define ADD_LABEL(seq, label) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) (label))
+
+#define APPEND_LABEL(seq, before, label) \
+  APPEND_ELEM((seq), (before), (LINK_ELEMENT *) (label))
+
+#define ADD_ADJUST(seq, line, label) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) new_adjust_body(iseq, (label), (line)))
+
+#define ADD_ADJUST_RESTORE(seq, label) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) new_adjust_body(iseq, (label), -1))
+
+#define ADD_CATCH_ENTRY(type, ls, le, iseqv, lc)		\
+    (rb_ary_push(iseq->compile_data->catch_table_ary,		\
+		 rb_ary_new3(5, (type),				\
+			     (VALUE)(ls) | 1, (VALUE)(le) | 1,	\
+			     (VALUE)(iseqv), (VALUE)(lc) | 1)))
+
+/* compile node */
+#define COMPILE(anchor, desc, node) \
+  (debug_compile("== " desc "\n", \
+                 iseq_compile_each(iseq, (anchor), (node), 0)))
+
+/* compile node, this node's value will be popped */
+#define COMPILE_POPED(anchor, desc, node)    \
+  (debug_compile("== " desc "\n", \
+                 iseq_compile_each(iseq, (anchor), (node), 1)))
+
+/* compile node, which is popped when 'poped' is true */
+#define COMPILE_(anchor, desc, node, poped)  \
+  (debug_compile("== " desc "\n", \
+                 iseq_compile_each(iseq, (anchor), (node), (poped))))
+
+#define OPERAND_AT(insn, idx) \
+  (((INSN*)(insn))->operands[(idx)])
+
+#define INSN_OF(insn) \
+  (((INSN*)(insn))->insn_id)
+
+/* error */
+#define COMPILE_ERROR(strs)                        \
+{                                                  \
+  VALUE tmp = GET_THREAD()->errinfo;               \
+  if (compile_debug) rb_compile_bug strs;          \
+  GET_THREAD()->errinfo = iseq->compile_data->err_info;  \
+  rb_compile_error strs;                           \
+  OBJ_WRITE(iseq->self, &iseq->compile_data->err_info, GET_THREAD()->errinfo); \
+  GET_THREAD()->errinfo = tmp;                     \
+  ret = 0;                                         \
+  break;                                           \
+}
+
+#define ERROR_ARGS ruby_sourcefile, nd_line(node),
+
+
+#define COMPILE_OK 1
+#define COMPILE_NG 0
+
+
+/* leave name uninitialized so that compiler warn if INIT_ANCHOR is
+ * missing */
+#define DECL_ANCHOR(name) \
+  LINK_ANCHOR *name, name##_body__ = {{0,},}
+#define INIT_ANCHOR(name) \
+  (name##_body__.last = &name##_body__.anchor, name = &name##_body__)
+
+#define hide_obj(obj) do {OBJ_FREEZE(obj); RBASIC_CLEAR_CLASS(obj);} while (0)
+
+#include "optinsn.inc"
+#if OPT_INSTRUCTIONS_UNIFICATION
+#include "optunifs.inc"
+#endif
+
+/* for debug */
+#if CPDEBUG < 0
+#define ISEQ_ARG iseq,
+#define ISEQ_ARG_DECLARE rb_iseq_t *iseq,
+#else
+#define ISEQ_ARG
+#define ISEQ_ARG_DECLARE
+#endif
+
+#if CPDEBUG
+#define gl_node_level iseq->compile_data->node_level
+#if 0
+static void debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor);
+#endif
+#endif
+
+static void dump_disasm_list(LINK_ELEMENT *elem);
+
+static int insn_data_length(INSN *iobj);
+static int insn_data_line_no(INSN *iobj);
+static int calc_sp_depth(int depth, INSN *iobj);
+
+static INSN *new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...);
+static LABEL *new_label_body(rb_iseq_t *iseq, long line);
+static ADJUST *new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line);
+
+static int iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * n, int);
+static int iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+
+static int iseq_set_local_table(rb_iseq_t *iseq, ID *tbl);
+static int iseq_set_exception_local_table(rb_iseq_t *iseq);
+static int iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * node);
+
+static int iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor);
+static int iseq_set_exception_table(rb_iseq_t *iseq);
+static int iseq_set_optargs_table(rb_iseq_t *iseq);
+
+/*
+ * To make Array to LinkedList, use link_anchor
+ */
+
+static void
+verify_list(ISEQ_ARG_DECLARE const char *info, LINK_ANCHOR *anchor)
+{
+#if CPDEBUG
+    int flag = 0;
+    LINK_ELEMENT *list, *plist;
+
+    if (!compile_debug) return;
+
+    list = anchor->anchor.next;
+    plist = &anchor->anchor;
+    while (list) {
+	if (plist != list->prev) {
+	    flag += 1;
+	}
+	plist = list;
+	list = list->next;
+    }
+
+    if (anchor->last != plist && anchor->last != 0) {
+	flag |= 0x70000;
+    }
+
+    if (flag != 0) {
+	rb_bug("list verify error: %08x (%s)", flag, info);
+    }
+#endif
+}
+#if CPDEBUG < 0
+#define verify_list(info, anchor) verify_list(iseq, (info), (anchor))
+#endif
+
+/*
+ * elem1, elem2 => elem1, elem2, elem
+ */
+static void
+ADD_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *elem)
+{
+    elem->prev = anchor->last;
+    anchor->last->next = elem;
+    anchor->last = elem;
+    verify_list("add", anchor);
+}
+
+/*
+ * elem1, before, elem2 => elem1, before, elem, elem2
+ */
+static void
+APPEND_ELEM(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor, LINK_ELEMENT *before, LINK_ELEMENT *elem)
+{
+    elem->prev = before;
+    elem->next = before->next;
+    elem->next->prev = elem;
+    before->next = elem;
+    if (before == anchor->last) anchor->last = elem;
+    verify_list("add", anchor);
+}
+#if CPDEBUG < 0
+#define ADD_ELEM(anchor, elem) ADD_ELEM(iseq, (anchor), (elem))
+#define APPEND_ELEM(anchor, before, elem) ADD_ELEM(iseq, (anchor), (before), (elem))
+#endif
+
+static int
+iseq_add_mark_object(rb_iseq_t *iseq, VALUE v)
+{
+    if (!SPECIAL_CONST_P(v)) {
+	rb_iseq_add_mark_object(iseq, v);
+    }
+    return COMPILE_OK;
+}
+
+#define ruby_sourcefile		RSTRING_PTR(iseq->location.path)
+
+static int
+iseq_add_mark_object_compile_time(rb_iseq_t *iseq, VALUE v)
+{
+    if (!SPECIAL_CONST_P(v)) {
+	rb_ary_push(iseq->compile_data->mark_ary, v);
+    }
+    return COMPILE_OK;
+}
+
+static int
+validate_label(st_data_t name, st_data_t label, st_data_t arg)
+{
+    rb_iseq_t *iseq = (rb_iseq_t *)arg;
+    LABEL *lobj = (LABEL *)label;
+    if (!lobj->link.next) {
+	do {
+	    int ret;
+	    COMPILE_ERROR((ruby_sourcefile, lobj->position,
+			   "%s: undefined label", rb_id2name((ID)name)));
+	    if (ret) break;
+	} while (0);
+    }
+    return ST_CONTINUE;
+}
+
+static void
+validate_labels(rb_iseq_t *iseq, st_table *labels_table)
+{
+    st_foreach(labels_table, validate_label, (st_data_t)iseq);
+    if (!NIL_P(iseq->compile_data->err_info)) {
+	rb_exc_raise(iseq->compile_data->err_info);
+    }
+}
+
+VALUE
+rb_iseq_compile_node(VALUE self, NODE *node)
+{
+    DECL_ANCHOR(ret);
+    rb_iseq_t *iseq;
+    INIT_ANCHOR(ret);
+    GetISeqPtr(self, iseq);
+
+    if (node == 0) {
+	COMPILE(ret, "nil", node);
+	iseq_set_local_table(iseq, 0);
+    }
+    else if (nd_type(node) == NODE_SCOPE) {
+	/* iseq type of top, method, class, block */
+	iseq_set_local_table(iseq, node->nd_tbl);
+	iseq_set_arguments(iseq, ret, node->nd_args);
+
+	switch (iseq->type) {
+	  case ISEQ_TYPE_BLOCK:
+	    {
+		LABEL *start = iseq->compile_data->start_label = NEW_LABEL(0);
+		LABEL *end = iseq->compile_data->end_label = NEW_LABEL(0);
+
+		ADD_LABEL(ret, start);
+		ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_B_CALL);
+		COMPILE(ret, "block body", node->nd_body);
+		ADD_LABEL(ret, end);
+		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_B_RETURN);
+
+		/* wide range catch handler must put at last */
+		ADD_CATCH_ENTRY(CATCH_TYPE_REDO, start, end, 0, start);
+		ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, start, end, 0, end);
+		break;
+	    }
+	  case ISEQ_TYPE_CLASS:
+	    {
+		ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_CLASS);
+		COMPILE(ret, "scoped node", node->nd_body);
+		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_END);
+		break;
+	    }
+	  case ISEQ_TYPE_METHOD:
+	    {
+		ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_CALL);
+		COMPILE(ret, "scoped node", node->nd_body);
+		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_RETURN);
+		break;
+	    }
+	  default: {
+	    COMPILE(ret, "scoped node", node->nd_body);
+	    break;
+	  }
+	}
+    }
+    else if (nd_type(node) == NODE_IFUNC) {
+	/* user callback */
+	(*node->nd_cfnc)(iseq, ret, node->nd_tval);
+    }
+    else {
+	switch (iseq->type) {
+	  case ISEQ_TYPE_METHOD:
+	  case ISEQ_TYPE_CLASS:
+	  case ISEQ_TYPE_BLOCK:
+	  case ISEQ_TYPE_EVAL:
+	  case ISEQ_TYPE_MAIN:
+	  case ISEQ_TYPE_TOP:
+	    rb_compile_error(ERROR_ARGS "compile/should not be reached: %s:%d",
+			     __FILE__, __LINE__);
+	    break;
+	  case ISEQ_TYPE_RESCUE:
+	    iseq_set_exception_local_table(iseq);
+	    COMPILE(ret, "rescue", node);
+	    break;
+	  case ISEQ_TYPE_ENSURE:
+	    iseq_set_exception_local_table(iseq);
+	    COMPILE_POPED(ret, "ensure", node);
+	    break;
+	  case ISEQ_TYPE_DEFINED_GUARD:
+	    iseq_set_local_table(iseq, 0);
+	    COMPILE(ret, "defined guard", node);
+	    break;
+	  default:
+	    rb_bug("unknown scope");
+	}
+    }
+
+    if (iseq->type == ISEQ_TYPE_RESCUE || iseq->type == ISEQ_TYPE_ENSURE) {
+	ADD_INSN2(ret, 0, getlocal, INT2FIX(2), INT2FIX(0));
+	ADD_INSN1(ret, 0, throw, INT2FIX(0) /* continue throw */ );
+    }
+    else {
+	ADD_INSN(ret, iseq->compile_data->last_line, leave);
+    }
+
+#if SUPPORT_JOKE
+    if (iseq->compile_data->labels_table) {
+	validate_labels(iseq, iseq->compile_data->labels_table);
+    }
+#endif
+    return iseq_setup(iseq, ret);
+}
+
+int
+rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
+{
+#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
+    const void * const *table = rb_vm_get_insns_address_table();
+    unsigned long i;
+
+    iseq->iseq_encoded = ALLOC_N(VALUE, iseq->iseq_size);
+    MEMCPY(iseq->iseq_encoded, iseq->iseq, VALUE, iseq->iseq_size);
+
+    for (i = 0; i < iseq->iseq_size; /* */ ) {
+	int insn = (int)iseq->iseq_encoded[i];
+	int len = insn_len(insn);
+	iseq->iseq_encoded[i] = (VALUE)table[insn];
+	i += len;
+    }
+#else
+    iseq->iseq_encoded = iseq->iseq;
+#endif
+    return COMPILE_OK;
+}
+
+/*********************************************/
+/* definition of data structure for compiler */
+/*********************************************/
+
+static void *
+compile_data_alloc(rb_iseq_t *iseq, size_t size)
+{
+    void *ptr = 0;
+    struct iseq_compile_data_storage *storage =
+	iseq->compile_data->storage_current;
+
+    if (storage->pos + size > storage->size) {
+	unsigned long alloc_size = storage->size * 2;
+
+      retry:
+	if (alloc_size < size) {
+	    alloc_size *= 2;
+	    goto retry;
+	}
+	storage->next = (void *)ALLOC_N(char, alloc_size +
+					sizeof(struct
+					       iseq_compile_data_storage));
+	storage = iseq->compile_data->storage_current = storage->next;
+	storage->next = 0;
+	storage->pos = 0;
+	storage->size = alloc_size;
+	storage->buff = (char *)(&storage->buff + 1);
+    }
+
+    ptr = (void *)&storage->buff[storage->pos];
+    storage->pos += size;
+    return ptr;
+}
+
+static INSN *
+compile_data_alloc_insn(rb_iseq_t *iseq)
+{
+    return (INSN *)compile_data_alloc(iseq, sizeof(INSN));
+}
+
+static LABEL *
+compile_data_alloc_label(rb_iseq_t *iseq)
+{
+    return (LABEL *)compile_data_alloc(iseq, sizeof(LABEL));
+}
+
+static ADJUST *
+compile_data_alloc_adjust(rb_iseq_t *iseq)
+{
+    return (ADJUST *)compile_data_alloc(iseq, sizeof(ADJUST));
+}
+
+/*
+ * elem1, elemX => elem1, elem2, elemX
+ */
+static void
+INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+{
+    elem2->next = elem1->next;
+    elem2->prev = elem1;
+    elem1->next = elem2;
+    if (elem2->next) {
+	elem2->next->prev = elem2;
+    }
+}
+
+#if 0 /* unused */
+/*
+ * elemX, elem1 => elemX, elem2, elem1
+ */
+static void
+INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+{
+    elem2->prev = elem1->prev;
+    elem2->next = elem1;
+    elem1->prev = elem2;
+    if (elem2->prev) {
+	elem2->prev->next = elem2;
+    }
+}
+#endif
+
+/*
+ * elemX, elem1, elemY => elemX, elem2, elemY
+ */
+static void
+REPLACE_ELEM(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+{
+    elem2->prev = elem1->prev;
+    elem2->next = elem1->next;
+    if (elem1->prev) {
+	elem1->prev->next = elem2;
+    }
+    if (elem1->next) {
+	elem1->next->prev = elem2;
+    }
+}
+
+static void
+REMOVE_ELEM(LINK_ELEMENT *elem)
+{
+    elem->prev->next = elem->next;
+    if (elem->next) {
+	elem->next->prev = elem->prev;
+    }
+}
+
+static LINK_ELEMENT *
+FIRST_ELEMENT(LINK_ANCHOR *anchor)
+{
+    return anchor->anchor.next;
+}
+
+#if 0 /* unused */
+static LINK_ELEMENT *
+LAST_ELEMENT(LINK_ANCHOR *anchor)
+{
+  return anchor->last;
+}
+#endif
+
+static LINK_ELEMENT *
+POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *elem = anchor->last;
+    anchor->last = anchor->last->prev;
+    anchor->last->next = 0;
+    verify_list("pop", anchor);
+    return elem;
+}
+#if CPDEBUG < 0
+#define POP_ELEMENT(anchor) POP_ELEMENT(iseq, (anchor))
+#endif
+
+#if 0 /* unused */
+static LINK_ELEMENT *
+SHIFT_ELEMENT(LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *elem = anchor->anchor.next;
+    if (elem) {
+	anchor->anchor.next = elem->next;
+    }
+    return elem;
+}
+#endif
+
+#if 0 /* unused */
+static int
+LIST_SIZE(LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *elem = anchor->anchor.next;
+    int size = 0;
+    while (elem) {
+	size += 1;
+	elem = elem->next;
+    }
+    return size;
+}
+#endif
+
+static int
+LIST_SIZE_ZERO(LINK_ANCHOR *anchor)
+{
+    if (anchor->anchor.next == 0) {
+	return 1;
+    }
+    else {
+	return 0;
+    }
+}
+
+/*
+ * anc1: e1, e2, e3
+ * anc2: e4, e5
+ *#=>
+ * anc1: e1, e2, e3, e4, e5
+ * anc2: e4, e5 (broken)
+ */
+static void
+APPEND_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
+{
+    if (anc2->anchor.next) {
+	anc1->last->next = anc2->anchor.next;
+	anc2->anchor.next->prev = anc1->last;
+	anc1->last = anc2->last;
+    }
+    verify_list("append", anc1);
+}
+#if CPDEBUG < 0
+#define APPEND_LIST(anc1, anc2) APPEND_LIST(iseq, (anc1), (anc2))
+#endif
+
+/*
+ * anc1: e1, e2, e3
+ * anc2: e4, e5
+ *#=>
+ * anc1: e4, e5, e1, e2, e3
+ * anc2: e4, e5 (broken)
+ */
+static void
+INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
+{
+    if (anc2->anchor.next) {
+	LINK_ELEMENT *first = anc1->anchor.next;
+	anc1->anchor.next = anc2->anchor.next;
+	anc1->anchor.next->prev = &anc1->anchor;
+	anc2->last->next = first;
+	if (first) {
+	    first->prev = anc2->last;
+	}
+	else {
+	    anc1->last = anc2->last;
+	}
+    }
+
+    verify_list("append", anc1);
+}
+#if CPDEBUG < 0
+#define INSERT_LIST(anc1, anc2) INSERT_LIST(iseq, (anc1), (anc2))
+#endif
+
+#if 0 /* unused */
+/*
+ * anc1: e1, e2, e3
+ * anc2: e4, e5
+ *#=>
+ * anc1: e4, e5
+ * anc2: e1, e2, e3
+ */
+static void
+SWAP_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
+{
+    LINK_ANCHOR tmp = *anc2;
+
+    /* it has bug */
+    *anc2 = *anc1;
+    *anc1 = tmp;
+
+    verify_list("swap1", anc1);
+    verify_list("swap2", anc2);
+}
+#if CPDEBUG < 0
+#define SWAP_LIST(anc1, anc2) SWAP_LIST(iseq, (anc1), (anc2))
+#endif
+
+static LINK_ANCHOR *
+REVERSE_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc)
+{
+    LINK_ELEMENT *first, *last, *elem, *e;
+    first = &anc->anchor;
+    elem = first->next;
+    last = anc->last;
+
+    if (elem != 0) {
+	anc->anchor.next = last;
+	anc->last = elem;
+    }
+    else {
+	/* null list */
+	return anc;
+    }
+    while (elem) {
+	e = elem->next;
+	elem->next = elem->prev;
+	elem->prev = e;
+	elem = e;
+    }
+
+    first->next = last;
+    last->prev = first;
+    anc->last->next = 0;
+
+    verify_list("reverse", anc);
+    return anc;
+}
+#if CPDEBUG < 0
+#define REVERSE_LIST(anc) REVERSE_LIST(iseq, (anc))
+#endif
+#endif
+
+#if CPDEBUG && 0
+static void
+debug_list(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *list = FIRST_ELEMENT(anchor);
+    printf("----\n");
+    printf("anch: %p, frst: %p, last: %p\n", &anchor->anchor,
+	   anchor->anchor.next, anchor->last);
+    while (list) {
+	printf("curr: %p, next: %p, prev: %p, type: %d\n", list, list->next,
+	       list->prev, FIX2INT(list->type));
+	list = list->next;
+    }
+    printf("----\n");
+
+    dump_disasm_list(anchor->anchor.next);
+    verify_list("debug list", anchor);
+}
+#if CPDEBUG < 0
+#define debug_list(anc) debug_list(iseq, (anc))
+#endif
+#endif
+
+static LABEL *
+new_label_body(rb_iseq_t *iseq, long line)
+{
+    LABEL *labelobj = compile_data_alloc_label(iseq);
+
+    labelobj->link.type = ISEQ_ELEMENT_LABEL;
+    labelobj->link.next = 0;
+
+    labelobj->label_no = iseq->compile_data->label_no++;
+    labelobj->sc_state = 0;
+    labelobj->sp = -1;
+    return labelobj;
+}
+
+static ADJUST *
+new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line)
+{
+    ADJUST *adjust = compile_data_alloc_adjust(iseq);
+    adjust->link.type = ISEQ_ELEMENT_ADJUST;
+    adjust->link.next = 0;
+    adjust->label = label;
+    adjust->line_no = line;
+    return adjust;
+}
+
+static INSN *
+new_insn_core(rb_iseq_t *iseq, int line_no,
+	      int insn_id, int argc, VALUE *argv)
+{
+    INSN *iobj = compile_data_alloc_insn(iseq);
+    /* printf("insn_id: %d, line: %d\n", insn_id, line_no); */
+
+    iobj->link.type = ISEQ_ELEMENT_INSN;
+    iobj->link.next = 0;
+    iobj->insn_id = insn_id;
+    iobj->line_no = line_no;
+    iobj->operands = argv;
+    iobj->operand_size = argc;
+    iobj->sc_state = 0;
+    return iobj;
+}
+
+static INSN *
+new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...)
+{
+    VALUE *operands = 0;
+    va_list argv;
+    if (argc > 0) {
+	int i;
+	va_init_list(argv, argc);
+	operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
+	for (i = 0; i < argc; i++) {
+	    VALUE v = va_arg(argv, VALUE);
+	    operands[i] = v;
+	}
+	va_end(argv);
+    }
+    return new_insn_core(iseq, line_no, insn_id, argc, operands);
+}
+
+static rb_call_info_t *
+new_callinfo(rb_iseq_t *iseq, ID mid, int argc, VALUE block, unsigned long flag)
+{
+    rb_call_info_t *ci = (rb_call_info_t *)compile_data_alloc(iseq, sizeof(rb_call_info_t));
+    ci->mid = mid;
+    ci->flag = flag;
+    ci->orig_argc = argc;
+    ci->argc = argc;
+
+    if (block) {
+	GetISeqPtr(block, ci->blockiseq);
+    }
+    else {
+	ci->blockiseq = 0;
+	if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG))) {
+	    ci->flag |= VM_CALL_ARGS_SKIP_SETUP;
+	}
+    }
+    ci->method_serial = 0;
+    ci->class_serial = 0;
+    ci->blockptr = 0;
+    ci->recv = Qundef;
+    ci->call = 0; /* TODO: should set default function? */
+
+    ci->aux.index = iseq->callinfo_size++;
+
+    return ci;
+}
+
+static INSN *
+new_insn_send(rb_iseq_t *iseq, int line_no, VALUE id, VALUE argc, VALUE block, VALUE flag)
+{
+    VALUE *operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 1);
+    operands[0] = (VALUE)new_callinfo(iseq, SYM2ID(id), FIX2INT(argc), block, FIX2INT(flag));
+    return new_insn_core(iseq, line_no, BIN(send), 1, operands);
+}
+
+static VALUE
+new_child_iseq(rb_iseq_t *iseq, NODE *node,
+	       VALUE name, VALUE parent, enum iseq_type type, int line_no)
+{
+    VALUE ret;
+
+    debugs("[new_child_iseq]> ---------------------------------------\n");
+    ret = rb_iseq_new_with_opt(node, name,
+			       iseq_path(iseq->self), iseq_absolute_path(iseq->self),
+			       INT2FIX(line_no), parent, type, iseq->compile_data->option);
+    debugs("[new_child_iseq]< ---------------------------------------\n");
+    iseq_add_mark_object(iseq, ret);
+    return ret;
+}
+
+static int
+iseq_setup(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+    /* debugs("[compile step 2] (iseq_array_to_linkedlist)\n"); */
+
+    if (compile_debug > 5)
+	dump_disasm_list(FIRST_ELEMENT(anchor));
+
+    debugs("[compile step 3.1 (iseq_optimize)]\n");
+    iseq_optimize(iseq, anchor);
+
+    if (compile_debug > 5)
+	dump_disasm_list(FIRST_ELEMENT(anchor));
+
+    if (iseq->compile_data->option->instructions_unification) {
+	debugs("[compile step 3.2 (iseq_insns_unification)]\n");
+	iseq_insns_unification(iseq, anchor);
+	if (compile_debug > 5)
+	    dump_disasm_list(FIRST_ELEMENT(anchor));
+    }
+
+    if (iseq->compile_data->option->stack_caching) {
+	debugs("[compile step 3.3 (iseq_set_sequence_stackcaching)]\n");
+	iseq_set_sequence_stackcaching(iseq, anchor);
+	if (compile_debug > 5)
+	    dump_disasm_list(FIRST_ELEMENT(anchor));
+    }
+
+    debugs("[compile step 4.1 (iseq_set_sequence)]\n");
+    iseq_set_sequence(iseq, anchor);
+    if (compile_debug > 5)
+	dump_disasm_list(FIRST_ELEMENT(anchor));
+
+    debugs("[compile step 4.2 (iseq_set_exception_table)]\n");
+    iseq_set_exception_table(iseq);
+
+    debugs("[compile step 4.3 (set_optargs_table)] \n");
+    iseq_set_optargs_table(iseq);
+
+    debugs("[compile step 5 (iseq_translate_threaded_code)] \n");
+    rb_iseq_translate_threaded_code(iseq);
+
+    if (compile_debug > 1) {
+	VALUE str = rb_iseq_disasm(iseq->self);
+	printf("%s\n", StringValueCStr(str));
+	fflush(stdout);
+    }
+    debugs("[compile step: finish]\n");
+
+    return 0;
+}
+
+static int
+iseq_set_exception_local_table(rb_iseq_t *iseq)
+{
+    ID id_dollar_bang;
+
+    CONST_ID(id_dollar_bang, "#$!");
+    iseq->local_table = (ID *)ALLOC_N(ID, 1);
+    iseq->local_table_size = 1;
+    iseq->local_size = iseq->local_table_size + 1;
+    iseq->local_table[0] = id_dollar_bang;
+    return COMPILE_OK;
+}
+
+static int
+get_lvar_level(rb_iseq_t *iseq)
+{
+    int lev = 0;
+    while (iseq != iseq->local_iseq) {
+	lev++;
+	iseq = iseq->parent_iseq;
+    }
+    return lev;
+}
+
+static int
+get_dyna_var_idx_at_raw(rb_iseq_t *iseq, ID id)
+{
+    int i;
+
+    for (i = 0; i < iseq->local_table_size; i++) {
+	if (iseq->local_table[i] == id) {
+	    return i;
+	}
+    }
+    return -1;
+}
+
+static int
+get_local_var_idx(rb_iseq_t *iseq, ID id)
+{
+    int idx = get_dyna_var_idx_at_raw(iseq->local_iseq, id);
+
+    if (idx < 0) {
+	rb_bug("get_local_var_idx: %d", idx);
+    }
+
+    return idx;
+}
+
+static int
+get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls)
+{
+    int lv = 0, idx = -1;
+
+    while (iseq) {
+	idx = get_dyna_var_idx_at_raw(iseq, id);
+	if (idx >= 0) {
+	    break;
+	}
+	iseq = iseq->parent_iseq;
+	lv++;
+    }
+
+    if (idx < 0) {
+	rb_bug("get_dyna_var_idx: -1");
+    }
+
+    *level = lv;
+    *ls = iseq->local_size;
+    return idx;
+}
+
+static int
+iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
+{
+    debugs("iseq_set_arguments: %s\n", node_args ? "" : "0");
+
+    if (node_args) {
+	struct rb_args_info *args = node_args->nd_ainfo;
+	ID rest_id = 0;
+	int last_comma = 0;
+	ID block_id = 0;
+
+	if (nd_type(node_args) != NODE_ARGS) {
+	    rb_bug("iseq_set_arguments: NODE_ARGS is expected, but %s",
+		   ruby_node_name(nd_type(node_args)));
+	}
+
+
+	iseq->argc = (int)args->pre_args_num;
+	debugs("  - argc: %d\n", iseq->argc);
+
+	rest_id = args->rest_arg;
+	if (rest_id == 1) {
+	    last_comma = 1;
+	    rest_id = 0;
+	}
+	block_id = args->block_arg;
+
+	if (args->first_post_arg) {
+	    iseq->arg_post_start = get_dyna_var_idx_at_raw(iseq, args->first_post_arg);
+	    iseq->arg_post_len = args->post_args_num;
+	}
+
+	if (args->opt_args) {
+	    NODE *node = args->opt_args;
+	    LABEL *label;
+	    VALUE labels = rb_ary_tmp_new(1);
+	    int i = 0, j;
+
+	    while (node) {
+		label = NEW_LABEL(nd_line(node));
+		rb_ary_push(labels, (VALUE)label | 1);
+		ADD_LABEL(optargs, label);
+		COMPILE_POPED(optargs, "optarg", node->nd_body);
+		node = node->nd_next;
+		i += 1;
+	    }
+
+	    /* last label */
+	    label = NEW_LABEL(nd_line(node_args));
+	    rb_ary_push(labels, (VALUE)label | 1);
+	    ADD_LABEL(optargs, label);
+	    i += 1;
+
+	    iseq->arg_opts = i;
+	    iseq->arg_opt_table = ALLOC_N(VALUE, i);
+	    MEMCPY(iseq->arg_opt_table, RARRAY_CONST_PTR(labels), VALUE, i);
+	    for (j = 0; j < i; j++) {
+		iseq->arg_opt_table[j] &= ~1;
+	    }
+	    rb_ary_clear(labels);
+	}
+	else {
+	    iseq->arg_opts = 0;
+	}
+
+	if (args->kw_args) {
+	    NODE *node = args->kw_args;
+	    VALUE keywords = rb_ary_tmp_new(1);
+	    VALUE required = 0;
+	    int i = 0, j, r = 0;
+
+	    iseq->arg_keyword = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
+	    COMPILE(optargs, "kwarg", args->kw_rest_arg);
+	    while (node) {
+		VALUE list = keywords;
+		if (node->nd_body->nd_value == (NODE *)-1) {
+		    ++r;
+		    if (!required) required = rb_ary_tmp_new(1);
+		    list = required;
+		}
+		rb_ary_push(list, INT2FIX(node->nd_body->nd_vid));
+		COMPILE_POPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */
+		node = node->nd_next;
+		i += 1;
+	    }
+	    iseq->arg_keyword_check = (args->kw_rest_arg->nd_vid & ID_SCOPE_MASK) == ID_JUNK;
+	    iseq->arg_keywords = i;
+	    iseq->arg_keyword_required = r;
+	    iseq->arg_keyword_table = ALLOC_N(ID, i);
+	    if (r) {
+		rb_ary_concat(required, keywords);
+		keywords = required;
+	    }
+	    for (j = 0; j < i; j++) {
+		iseq->arg_keyword_table[j] = FIX2INT(RARRAY_AREF(keywords, j));
+	    }
+	    ADD_INSN(optargs, nd_line(args->kw_args), pop);
+	}
+	else if (args->kw_rest_arg) {
+	    iseq->arg_keyword = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
+	    COMPILE(optargs, "kwarg", args->kw_rest_arg);
+	    ADD_INSN(optargs, nd_line(args->kw_rest_arg), pop);
+	}
+	else {
+	    iseq->arg_keyword = -1;
+	}
+
+	if (args->pre_init) { /* m_init */
+	    COMPILE_POPED(optargs, "init arguments (m)", args->pre_init);
+	}
+	if (args->post_init) { /* p_init */
+	    COMPILE_POPED(optargs, "init arguments (p)", args->post_init);
+	}
+
+	if (rest_id) {
+	    iseq->arg_rest = get_dyna_var_idx_at_raw(iseq, rest_id);
+
+	    if (iseq->arg_rest == -1) {
+		rb_bug("arg_rest: -1");
+	    }
+
+	    if (iseq->arg_post_start == 0) {
+		iseq->arg_post_start = iseq->arg_rest + 1;
+	    }
+	}
+
+	if (block_id) {
+	    iseq->arg_block = get_dyna_var_idx_at_raw(iseq, block_id);
+	}
+
+	if (iseq->arg_opts != 0 || iseq->arg_post_len != 0 ||
+	    iseq->arg_rest != -1 || iseq->arg_block != -1 ||
+	    iseq->arg_keyword != -1) {
+	    iseq->arg_simple = 0;
+
+	    /* set arg_size: size of arguments */
+	    if (iseq->arg_keyword != -1) {
+		iseq->arg_size = iseq->arg_keyword + 1;
+	    }
+	    else if (iseq->arg_block != -1) {
+		iseq->arg_size = iseq->arg_block + 1;
+	    }
+	    else if (iseq->arg_post_len) {
+		iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
+	    }
+	    else if (iseq->arg_rest != -1) {
+		iseq->arg_size = iseq->arg_rest + 1;
+	    }
+	    else if (iseq->arg_opts) {
+		iseq->arg_size = iseq->argc + iseq->arg_opts - 1;
+	    }
+	    else {
+		iseq->arg_size = iseq->argc;
+	    }
+	}
+	else {
+	    iseq->arg_simple = 1;
+	    iseq->arg_size = iseq->argc;
+	}
+
+	if (iseq->type == ISEQ_TYPE_BLOCK) {
+	    if (iseq->arg_opts == 0 && iseq->arg_post_len == 0 &&
+		iseq->arg_rest == -1 && iseq->arg_keyword == -1) {
+		if (iseq->argc == 1 && last_comma == 0) {
+		    /* {|a|} */
+		    iseq->arg_simple |= 0x02;
+		}
+	    }
+	}
+    }
+    else {
+	iseq->arg_simple = 1;
+    }
+
+    return COMPILE_OK;
+}
+
+static int
+iseq_set_local_table(rb_iseq_t *iseq, ID *tbl)
+{
+    int size;
+
+    if (tbl) {
+	size = (int)*tbl;
+	tbl++;
+    }
+    else {
+	size = 0;
+    }
+
+    if (size > 0) {
+	iseq->local_table = (ID *)ALLOC_N(ID, size);
+	MEMCPY(iseq->local_table, tbl, ID, size);
+    }
+
+    iseq->local_size = iseq->local_table_size = size;
+    iseq->local_size += 1;
+    /*
+      if (lfp == dfp ) { // top, class, method
+	  dfp[-1]: svar
+      else {             // block
+          dfp[-1]: cref
+      }
+     */
+
+    debugs("iseq_set_local_table: %d, %d\n", iseq->local_size, iseq->local_table_size);
+    return COMPILE_OK;
+}
+
+static int
+cdhash_cmp(VALUE val, VALUE lit)
+{
+    if (val == lit) return 0;
+    if (SPECIAL_CONST_P(lit)) {
+	return val != lit;
+    }
+    if (SPECIAL_CONST_P(val) || BUILTIN_TYPE(val) != BUILTIN_TYPE(lit)) {
+	return -1;
+    }
+    if (BUILTIN_TYPE(lit) == T_STRING) {
+	return rb_str_hash_cmp(lit, val);
+    }
+    return !rb_eql(lit, val);
+}
+
+static st_index_t
+cdhash_hash(VALUE a)
+{
+    if (SPECIAL_CONST_P(a)) return (st_index_t)a;
+    if (RB_TYPE_P(a, T_STRING)) return rb_str_hash(a);
+    {
+	VALUE hval = rb_hash(a);
+	return (st_index_t)FIX2LONG(hval);
+    }
+}
+
+static const struct st_hash_type cdhash_type = {
+    cdhash_cmp,
+    cdhash_hash,
+};
+
+struct cdhash_set_label_struct {
+    VALUE hash;
+    int pos;
+    int len;
+};
+
+static int
+cdhash_set_label_i(VALUE key, VALUE val, void *ptr)
+{
+    struct cdhash_set_label_struct *data = (struct cdhash_set_label_struct *)ptr;
+    LABEL *lobj = (LABEL *)(val & ~1);
+    rb_hash_aset(data->hash, key, INT2FIX(lobj->position - (data->pos+data->len)));
+    return ST_CONTINUE;
+}
+
+/**
+  ruby insn object list -> raw instruction sequence
+ */
+static int
+iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+    LABEL *lobj;
+    INSN *iobj;
+    struct iseq_line_info_entry *line_info_table;
+    unsigned int last_line = 0;
+    LINK_ELEMENT *list;
+    VALUE *generated_iseq;
+
+    int k, pos, sp, stack_max = 0, line = 0;
+
+    /* set label position */
+    list = FIRST_ELEMENT(anchor);
+    k = pos = 0;
+    while (list) {
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		iobj = (INSN *)list;
+		line = iobj->line_no;
+		pos += insn_data_length(iobj);
+		k++;
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		lobj = (LABEL *)list;
+		lobj->position = pos;
+		lobj->set = TRUE;
+		break;
+	    }
+	  case ISEQ_ELEMENT_NONE:
+	    {
+		/* ignore */
+		break;
+	    }
+	  case ISEQ_ELEMENT_ADJUST:
+	    {
+		ADJUST *adjust = (ADJUST *)list;
+		if (adjust->line_no != -1) {
+		    pos += 2 /* insn + 1 operand */;
+		    k++;
+		}
+		break;
+	    }
+	  default:
+	    dump_disasm_list(FIRST_ELEMENT(anchor));
+	    dump_disasm_list(list);
+	    rb_compile_error(RSTRING_PTR(iseq->location.path), line,
+			     "error: set_sequence");
+	    break;
+	}
+	list = list->next;
+    }
+
+    /* make instruction sequence */
+    generated_iseq = ALLOC_N(VALUE, pos);
+    line_info_table = ALLOC_N(struct iseq_line_info_entry, k);
+    iseq->is_entries = ALLOC_N(union iseq_inline_storage_entry, iseq->is_size);
+    MEMZERO(iseq->is_entries, union iseq_inline_storage_entry, iseq->is_size);
+    iseq->callinfo_entries = ALLOC_N(rb_call_info_t, iseq->callinfo_size);
+    /* MEMZERO(iseq->callinfo_entries, rb_call_info_t, iseq->callinfo_size); */
+
+    list = FIRST_ELEMENT(anchor);
+    k = pos = sp = 0;
+
+    while (list) {
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		int j, len, insn;
+		const char *types;
+		VALUE *operands;
+
+		iobj = (INSN *)list;
+
+		/* update sp */
+		sp = calc_sp_depth(sp, iobj);
+		if (sp > stack_max) {
+		    stack_max = sp;
+		}
+
+		/* fprintf(stderr, "insn: %-16s, sp: %d\n", insn_name(iobj->insn_id), sp); */
+		operands = iobj->operands;
+		insn = iobj->insn_id;
+		generated_iseq[pos] = insn;
+		types = insn_op_types(insn);
+		len = insn_len(insn);
+
+		/* operand check */
+		if (iobj->operand_size != len - 1) {
+		    /* printf("operand size miss! (%d, %d)\n", iobj->operand_size, len); */
+		    dump_disasm_list(list);
+		    rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+				     "operand size miss! (%d for %d)",
+				     iobj->operand_size, len - 1);
+		    xfree(generated_iseq);
+		    xfree(line_info_table);
+		    return 0;
+		}
+
+		for (j = 0; types[j]; j++) {
+		    char type = types[j];
+		    /* printf("--> [%c - (%d-%d)]\n", type, k, j); */
+		    switch (type) {
+		      case TS_OFFSET:
+			{
+			    /* label(destination position) */
+			    lobj = (LABEL *)operands[j];
+			    if (!lobj->set) {
+				rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+						 "unknown label");
+			    }
+			    if (lobj->sp == -1) {
+				lobj->sp = sp;
+			    }
+			    generated_iseq[pos + 1 + j] = lobj->position - (pos + len);
+			    break;
+			}
+		      case TS_CDHASH:
+			{
+			    VALUE map = operands[j];
+			    struct cdhash_set_label_struct data;
+                            data.hash = map;
+                            data.pos = pos;
+                            data.len = len;
+			    rb_hash_foreach(map, cdhash_set_label_i, (VALUE)&data);
+
+			    hide_obj(map);
+			    generated_iseq[pos + 1 + j] = map;
+			    break;
+			}
+		      case TS_LINDEX:
+		      case TS_NUM:	/* ulong */
+			generated_iseq[pos + 1 + j] = FIX2INT(operands[j]);
+			break;
+		      case TS_ISEQ:	/* iseq */
+			{
+			    VALUE v = operands[j];
+			    rb_iseq_t *block = 0;
+			    if (v) {
+				GetISeqPtr(v, block);
+			    }
+			    generated_iseq[pos + 1 + j] = (VALUE)block;
+			    break;
+			}
+		      case TS_VALUE:	/* VALUE */
+			{
+			    VALUE v = operands[j];
+			    generated_iseq[pos + 1 + j] = v;
+			    /* to mark ruby object */
+			    iseq_add_mark_object(iseq, v);
+			    break;
+			}
+		      case TS_IC: /* inline cache */
+			{
+			    int ic_index = FIX2INT(operands[j]);
+			    IC ic = (IC)&iseq->is_entries[ic_index];
+			    if (UNLIKELY(ic_index >= iseq->is_size)) {
+				rb_bug("iseq_set_sequence: ic_index overflow: index: %d, size: %d", ic_index, iseq->is_size);
+			    }
+			    generated_iseq[pos + 1 + j] = (VALUE)ic;
+			    break;
+			}
+		      case TS_CALLINFO: /* call info */
+			{
+			    rb_call_info_t *base_ci = (rb_call_info_t *)operands[j];
+			    rb_call_info_t *ci = &iseq->callinfo_entries[base_ci->aux.index];
+			    *ci = *base_ci;
+
+			    if (UNLIKELY(base_ci->aux.index >= iseq->callinfo_size)) {
+				rb_bug("iseq_set_sequence: ci_index overflow: index: %d, size: %d", base_ci->argc, iseq->callinfo_size);
+			    }
+			    generated_iseq[pos + 1 + j] = (VALUE)ci;
+			    break;
+			}
+		      case TS_ID: /* ID */
+			generated_iseq[pos + 1 + j] = SYM2ID(operands[j]);
+			break;
+		      case TS_GENTRY:
+			{
+			    struct rb_global_entry *entry =
+				(struct rb_global_entry *)(operands[j] & (~1));
+			    generated_iseq[pos + 1 + j] = (VALUE)entry;
+			}
+			break;
+		      default:
+			rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+					 "unknown operand type: %c", type);
+			xfree(generated_iseq);
+			xfree(line_info_table);
+			return 0;
+		    }
+		}
+		if (last_line != iobj->line_no) {
+		    line_info_table[k].line_no = last_line = iobj->line_no;
+		    line_info_table[k].position = pos;
+		    k++;
+		}
+		pos += len;
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		lobj = (LABEL *)list;
+		if (lobj->sp == -1) {
+		    lobj->sp = sp;
+		}
+		else {
+		    sp = lobj->sp;
+		}
+		break;
+	    }
+	  case ISEQ_ELEMENT_ADJUST:
+	    {
+		ADJUST *adjust = (ADJUST *)list;
+		int orig_sp = sp;
+
+		if (adjust->label) {
+		    sp = adjust->label->sp;
+		}
+		else {
+		    sp = 0;
+		}
+
+		if (adjust->line_no != -1) {
+		    if (orig_sp - sp > 0) {
+			if (last_line != (unsigned int)adjust->line_no) {
+			    line_info_table[k].line_no = last_line = adjust->line_no;
+			    line_info_table[k].position = pos;
+			    k++;
+			}
+			generated_iseq[pos++] = BIN(adjuststack);
+			generated_iseq[pos++] = orig_sp - sp;
+		    }
+		    else if (orig_sp - sp == 0) {
+			/* jump to next insn */
+			if (last_line != (unsigned int)adjust->line_no) {
+			    line_info_table[k].line_no = last_line = adjust->line_no;
+			    line_info_table[k].position = pos;
+			    k++;
+			}
+			generated_iseq[pos++] = BIN(jump);
+			generated_iseq[pos++] = 0;
+		    }
+		    else {
+			rb_bug("iseq_set_sequence: adjust bug");
+		    }
+		}
+		break;
+	    }
+	  default:
+	    /* ignore */
+	    break;
+	}
+	list = list->next;
+    }
+
+#if 0 /* XXX */
+    /* this check need dead code elimination */
+    if (sp != 1) {
+	rb_bug("SP is not 0 on %s (%d)\n", RSTRING_PTR(iseq->name), sp);
+    }
+#endif
+
+    iseq->iseq = (void *)generated_iseq;
+    iseq->iseq_size = pos;
+    iseq->stack_max = stack_max;
+
+    line_info_table = ruby_xrealloc(line_info_table, k * sizeof(struct iseq_line_info_entry));
+    iseq->line_info_table = line_info_table;
+    iseq->line_info_size = k;
+
+    return COMPILE_OK;
+}
+
+static int
+label_get_position(LABEL *lobj)
+{
+    return lobj->position;
+}
+
+static int
+label_get_sp(LABEL *lobj)
+{
+    return lobj->sp;
+}
+
+static int
+iseq_set_exception_table(rb_iseq_t *iseq)
+{
+    const VALUE *tptr, *ptr;
+    int tlen, i;
+    struct iseq_catch_table_entry *entry;
+
+    tlen = (int)RARRAY_LEN(iseq->compile_data->catch_table_ary);
+    tptr = RARRAY_CONST_PTR(iseq->compile_data->catch_table_ary);
+
+    iseq->catch_table = tlen ? ALLOC_N(struct iseq_catch_table_entry, tlen) : 0;
+    iseq->catch_table_size = tlen;
+
+    for (i = 0; i < tlen; i++) {
+	ptr = RARRAY_CONST_PTR(tptr[i]);
+	entry = &iseq->catch_table[i];
+	entry->type = (enum catch_type)(ptr[0] & 0xffff);
+	entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
+	entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
+	entry->iseq = ptr[3];
+
+	/* register iseq as mark object */
+	if (entry->iseq != 0) {
+	    iseq_add_mark_object(iseq, entry->iseq);
+	}
+
+	/* stack depth */
+	if (ptr[4]) {
+	    LABEL *lobj = (LABEL *)(ptr[4] & ~1);
+	    entry->cont = label_get_position(lobj);
+	    entry->sp = label_get_sp(lobj);
+
+	    /* TODO: Dirty Hack!  Fix me */
+	    if (entry->type == CATCH_TYPE_RESCUE ||
+		entry->type == CATCH_TYPE_BREAK ||
+		entry->type == CATCH_TYPE_NEXT) {
+		entry->sp--;
+	    }
+	}
+	else {
+	    entry->cont = 0;
+	}
+    }
+
+    OBJ_WRITE(iseq->self, &iseq->compile_data->catch_table_ary, 0); /* free */
+    return COMPILE_OK;
+}
+
+/*
+ * set optional argument table
+ *   def foo(a, b=expr1, c=expr2)
+ *   =>
+ *    b:
+ *      expr1
+ *    c:
+ *      expr2
+ */
+static int
+iseq_set_optargs_table(rb_iseq_t *iseq)
+{
+    int i;
+
+    if (iseq->arg_opts != 0) {
+	for (i = 0; i < iseq->arg_opts; i++) {
+	    iseq->arg_opt_table[i] =
+		label_get_position((LABEL *)iseq->arg_opt_table[i]);
+	}
+    }
+    return COMPILE_OK;
+}
+
+static LINK_ELEMENT *
+get_destination_insn(INSN *iobj)
+{
+    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
+    LINK_ELEMENT *list;
+
+    list = lobj->link.next;
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
+	    break;
+	}
+	list = list->next;
+    }
+    return list;
+}
+
+static LINK_ELEMENT *
+get_next_insn(INSN *iobj)
+{
+    LINK_ELEMENT *list = iobj->link.next;
+
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
+	    return list;
+	}
+	list = list->next;
+    }
+    return 0;
+}
+
+static LINK_ELEMENT *
+get_prev_insn(INSN *iobj)
+{
+    LINK_ELEMENT *list = iobj->link.prev;
+
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN || list->type == ISEQ_ELEMENT_ADJUST) {
+	    return list;
+	}
+	list = list->prev;
+    }
+    return 0;
+}
+
+static int
+iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcallopt)
+{
+    INSN *iobj = (INSN *)list;
+  again:
+    if (iobj->insn_id == BIN(jump)) {
+	INSN *niobj, *diobj, *piobj;
+	/*
+	 *  useless jump elimination:
+	 *     jump LABEL1
+	 *     ...
+	 *   LABEL1:
+	 *     jump LABEL2
+	 *
+	 *   => in this case, first jump instruction should jump to
+	 *      LABEL2 directly
+	 */
+	diobj = (INSN *)get_destination_insn(iobj);
+	niobj = (INSN *)get_next_insn(iobj);
+
+	if (diobj == niobj) {
+	    /*
+	     *   jump LABEL
+	     *  LABEL:
+	     * =>
+	     *   LABEL:
+	     */
+	    REMOVE_ELEM(&iobj->link);
+	}
+	else if (iobj != diobj && diobj->insn_id == BIN(jump)) {
+	    if (OPERAND_AT(iobj, 0) != OPERAND_AT(diobj, 0)) {
+		OPERAND_AT(iobj, 0) = OPERAND_AT(diobj, 0);
+		goto again;
+	    }
+	}
+	else if (diobj->insn_id == BIN(leave)) {
+	    /*
+	     *  jump LABEL
+	     *  ...
+	     * LABEL:
+	     *  leave
+	     * =>
+	     *  leave
+	     *  ...
+	     * LABEL:
+	     *  leave
+	     */
+	    INSN *eiobj = new_insn_core(iseq, iobj->line_no, BIN(leave),
+					diobj->operand_size, diobj->operands);
+	    INSN *popiobj = new_insn_core(iseq, iobj->line_no,
+					  BIN(pop), 0, 0);
+	    /* replace */
+	    REPLACE_ELEM((LINK_ELEMENT *)iobj, (LINK_ELEMENT *)eiobj);
+	    INSERT_ELEM_NEXT((LINK_ELEMENT *)eiobj, (LINK_ELEMENT *)popiobj);
+	    iobj = popiobj;
+	}
+	/*
+	 * useless jump elimination (if/unless destination):
+	 *   if   L1
+	 *   jump L2
+	 * L1:
+	 *   ...
+	 * L2:
+	 *
+	 * ==>
+	 *   unless L2
+	 * L1:
+	 *   ...
+	 * L2:
+	 */
+	else if ((piobj = (INSN *)get_prev_insn(iobj)) != 0 &&
+		 (piobj->insn_id == BIN(branchif) ||
+		  piobj->insn_id == BIN(branchunless))) {
+	    if (niobj == (INSN *)get_destination_insn(piobj)) {
+		piobj->insn_id = (piobj->insn_id == BIN(branchif))
+		  ? BIN(branchunless) : BIN(branchif);
+		OPERAND_AT(piobj, 0) = OPERAND_AT(iobj, 0);
+		REMOVE_ELEM(&iobj->link);
+	    }
+	}
+    }
+
+    if (iobj->insn_id == BIN(branchif) ||
+	iobj->insn_id == BIN(branchunless)) {
+	/*
+	 *   if L1
+	 *   ...
+	 * L1:
+	 *   jump L2
+	 * =>
+	 *   if L2
+	 */
+	INSN *nobj = (INSN *)get_destination_insn(iobj);
+	if (nobj->insn_id == BIN(jump)) {
+	    OPERAND_AT(iobj, 0) = OPERAND_AT(nobj, 0);
+	}
+    }
+
+    if (do_tailcallopt && iobj->insn_id == BIN(leave)) {
+	/*
+	 *  send ...
+	 *  leave
+	 * =>
+	 *  send ..., ... | VM_CALL_TAILCALL, ...
+	 *  leave # unreachable
+	 */
+	INSN *piobj = (INSN *)get_prev_insn((INSN *)list);
+	enum ruby_vminsn_type previ = piobj->insn_id;
+
+	if (previ == BIN(send) || previ == BIN(opt_send_simple) || previ == BIN(invokesuper)) {
+	    rb_call_info_t *ci = (rb_call_info_t *)piobj->operands[0];
+	    if (ci->blockiseq == 0) {
+		ci->flag |= VM_CALL_TAILCALL;
+	    }
+	}
+    }
+    return COMPILE_OK;
+}
+
+static int
+insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int insn_id)
+{
+    int old_opsize = iobj->operand_size;
+    iobj->insn_id = insn_id;
+    iobj->operand_size = insn_len(insn_id) - 1;
+
+    if (iobj->operand_size > old_opsize) {
+	VALUE *old_operands = iobj->operands;
+	if (insn_id != BIN(opt_neq)) {
+	    rb_bug("insn_set_specialized_instruction: unknown insn: %d", insn_id);
+	}
+	iobj->operands = (VALUE *)compile_data_alloc(iseq, iobj->operand_size * sizeof(VALUE));
+	iobj->operands[0] = old_operands[0];
+	iobj->operands[1] = (VALUE)new_callinfo(iseq, idEq, 1, 0, 0);
+    }
+
+    return COMPILE_OK;
+}
+
+static int
+iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
+{
+    if (iobj->insn_id == BIN(send)) {
+	rb_call_info_t *ci = (rb_call_info_t *)OPERAND_AT(iobj, 0);
+
+#define SP_INSN(opt) insn_set_specialized_instruction(iseq, iobj, BIN(opt_##opt))
+	if (ci->blockiseq == 0 && (ci->flag & ~VM_CALL_ARGS_SKIP_SETUP) == 0) {
+	    switch (ci->orig_argc) {
+	      case 0:
+		switch (ci->mid) {
+		  case idLength: SP_INSN(length); return COMPILE_OK;
+		  case idSize:	 SP_INSN(size);	  return COMPILE_OK;
+		  case idEmptyP: SP_INSN(empty_p);return COMPILE_OK;
+		  case idSucc:	 SP_INSN(succ);	  return COMPILE_OK;
+		  case idNot:	 SP_INSN(not);	  return COMPILE_OK;
+		}
+		break;
+	      case 1:
+		switch (ci->mid) {
+		  case idPLUS:	 SP_INSN(plus);	  return COMPILE_OK;
+		  case idMINUS:	 SP_INSN(minus);  return COMPILE_OK;
+		  case idMULT:	 SP_INSN(mult);	  return COMPILE_OK;
+		  case idDIV:	 SP_INSN(div);	  return COMPILE_OK;
+		  case idMOD:	 SP_INSN(mod);	  return COMPILE_OK;
+		  case idEq:	 SP_INSN(eq);	  return COMPILE_OK;
+		  case idNeq:	 SP_INSN(neq);	  return COMPILE_OK;
+		  case idLT:	 SP_INSN(lt);	  return COMPILE_OK;
+		  case idLE:	 SP_INSN(le);	  return COMPILE_OK;
+		  case idGT:	 SP_INSN(gt);	  return COMPILE_OK;
+		  case idGE:	 SP_INSN(ge);	  return COMPILE_OK;
+		  case idLTLT:	 SP_INSN(ltlt);	  return COMPILE_OK;
+		  case idAREF:	 SP_INSN(aref);	  return COMPILE_OK;
+		}
+		break;
+	    }
+	}
+	if (ci->flag & VM_CALL_ARGS_SKIP_SETUP) {
+	    iobj->insn_id = BIN(opt_send_simple);
+	}
+    }
+#undef SP_INSN
+
+    return COMPILE_OK;
+}
+
+static int
+iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+    LINK_ELEMENT *list;
+    const int do_peepholeopt = iseq->compile_data->option->peephole_optimization;
+    const int do_tailcallopt = iseq->compile_data->option->tailcall_optimization;
+    const int do_si = iseq->compile_data->option->specialized_instruction;
+    const int do_ou = iseq->compile_data->option->operands_unification;
+    list = FIRST_ELEMENT(anchor);
+
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN) {
+	    if (do_peepholeopt) {
+		iseq_peephole_optimize(iseq, list, do_tailcallopt);
+	    }
+	    if (do_si) {
+		iseq_specialized_instruction(iseq, (INSN *)list);
+	    }
+	    if (do_ou) {
+		insn_operands_unification((INSN *)list);
+	    }
+	}
+	list = list->next;
+    }
+    return COMPILE_OK;
+}
+
+#if OPT_INSTRUCTIONS_UNIFICATION
+static INSN *
+new_unified_insn(rb_iseq_t *iseq,
+		 int insn_id, int size, LINK_ELEMENT *seq_list)
+{
+    INSN *iobj = 0;
+    LINK_ELEMENT *list = seq_list;
+    int i, argc = 0;
+    VALUE *operands = 0, *ptr = 0;
+
+
+    /* count argc */
+    for (i = 0; i < size; i++) {
+	iobj = (INSN *)list;
+	argc += iobj->operand_size;
+	list = list->next;
+    }
+
+    if (argc > 0) {
+	ptr = operands =
+	    (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * argc);
+    }
+
+    /* copy operands */
+    list = seq_list;
+    for (i = 0; i < size; i++) {
+	iobj = (INSN *)list;
+	MEMCPY(ptr, iobj->operands, VALUE, iobj->operand_size);
+	ptr += iobj->operand_size;
+	list = list->next;
+    }
+
+    return new_insn_core(iseq, iobj->line_no, insn_id, argc, operands);
+}
+#endif
+
+/*
+ * This scheme can get more performance if do this optimize with
+ * label address resolving.
+ * It's future work (if compile time was bottle neck).
+ */
+static int
+iseq_insns_unification(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+#if OPT_INSTRUCTIONS_UNIFICATION
+    LINK_ELEMENT *list;
+    INSN *iobj, *niobj;
+    int id, k;
+    intptr_t j;
+
+    list = FIRST_ELEMENT(anchor);
+    while (list) {
+	if (list->type == ISEQ_ELEMENT_INSN) {
+	    iobj = (INSN *)list;
+	    id = iobj->insn_id;
+	    if (unified_insns_data[id] != 0) {
+		const int *const *entry = unified_insns_data[id];
+		for (j = 1; j < (intptr_t)entry[0]; j++) {
+		    const int *unified = entry[j];
+		    LINK_ELEMENT *li = list->next;
+		    for (k = 2; k < unified[1]; k++) {
+			if (li->type != ISEQ_ELEMENT_INSN ||
+			    ((INSN *)li)->insn_id != unified[k]) {
+			    goto miss;
+			}
+			li = li->next;
+		    }
+		    /* matched */
+		    niobj =
+			new_unified_insn(iseq, unified[0], unified[1] - 1,
+					 list);
+
+		    /* insert to list */
+		    niobj->link.prev = (LINK_ELEMENT *)iobj->link.prev;
+		    niobj->link.next = li;
+		    if (li) {
+			li->prev = (LINK_ELEMENT *)niobj;
+		    }
+
+		    list->prev->next = (LINK_ELEMENT *)niobj;
+		    list = (LINK_ELEMENT *)niobj;
+		    break;
+		  miss:;
+		}
+	    }
+	}
+	list = list->next;
+    }
+#endif
+    return COMPILE_OK;
+}
+
+#if OPT_STACK_CACHING
+
+#define SC_INSN(insn, stat) sc_insn_info[(insn)][(stat)]
+#define SC_NEXT(insn)       sc_insn_next[(insn)]
+
+#include "opt_sc.inc"
+
+static int
+insn_set_sc_state(rb_iseq_t *iseq, INSN *iobj, int state)
+{
+    int nstate;
+    int insn_id;
+
+    insn_id = iobj->insn_id;
+    iobj->insn_id = SC_INSN(insn_id, state);
+    nstate = SC_NEXT(iobj->insn_id);
+
+    if (insn_id == BIN(jump) ||
+	insn_id == BIN(branchif) || insn_id == BIN(branchunless)) {
+	LABEL *lobj = (LABEL *)OPERAND_AT(iobj, 0);
+
+	if (lobj->sc_state != 0) {
+	    if (lobj->sc_state != nstate) {
+		dump_disasm_list((LINK_ELEMENT *)iobj);
+		dump_disasm_list((LINK_ELEMENT *)lobj);
+		printf("\n-- %d, %d\n", lobj->sc_state, nstate);
+		rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+				 "insn_set_sc_state error\n");
+		return 0;
+	    }
+	}
+	else {
+	    lobj->sc_state = nstate;
+	}
+	if (insn_id == BIN(jump)) {
+	    nstate = SCS_XX;
+	}
+    }
+    else if (insn_id == BIN(leave)) {
+	nstate = SCS_XX;
+    }
+
+    return nstate;
+}
+
+static int
+label_set_sc_state(LABEL *lobj, int state)
+{
+    if (lobj->sc_state != 0) {
+	if (lobj->sc_state != state) {
+	    state = lobj->sc_state;
+	}
+    }
+    else {
+	lobj->sc_state = state;
+    }
+
+    return state;
+}
+
+
+#endif
+
+static int
+iseq_set_sequence_stackcaching(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
+{
+#if OPT_STACK_CACHING
+    LINK_ELEMENT *list;
+    int state, insn_id;
+
+    /* initialize */
+    state = SCS_XX;
+    list = FIRST_ELEMENT(anchor);
+    /* dump_disasm_list(list); */
+
+    /* for each list element */
+    while (list) {
+      redo_point:
+	switch (list->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		INSN *iobj = (INSN *)list;
+		insn_id = iobj->insn_id;
+
+		/* dump_disasm_list(list); */
+
+		switch (insn_id) {
+		  case BIN(nop):
+		    {
+			/* exception merge point */
+			if (state != SCS_AX) {
+			    INSN *rpobj =
+				new_insn_body(iseq, 0, BIN(reput), 0);
+
+			    /* replace this insn */
+			    REPLACE_ELEM(list, (LINK_ELEMENT *)rpobj);
+			    list = (LINK_ELEMENT *)rpobj;
+			    goto redo_point;
+			}
+			break;
+		    }
+		  case BIN(swap):
+		    {
+			if (state == SCS_AB || state == SCS_BA) {
+			    state = (state == SCS_AB ? SCS_BA : SCS_AB);
+
+			    REMOVE_ELEM(list);
+			    list = list->next;
+			    goto redo_point;
+			}
+			break;
+		    }
+		  case BIN(pop):
+		    {
+			switch (state) {
+			  case SCS_AX:
+			  case SCS_BX:
+			    state = SCS_XX;
+			    break;
+			  case SCS_AB:
+			    state = SCS_AX;
+			    break;
+			  case SCS_BA:
+			    state = SCS_BX;
+			    break;
+			  case SCS_XX:
+			    goto normal_insn;
+			  default:
+			    rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
+					     "unreachable");
+			}
+			/* remove useless pop */
+			REMOVE_ELEM(list);
+			list = list->next;
+			goto redo_point;
+		    }
+		  default:;
+		    /* none */
+		}		/* end of switch */
+	      normal_insn:
+		state = insn_set_sc_state(iseq, iobj, state);
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		LABEL *lobj;
+		lobj = (LABEL *)list;
+
+		state = label_set_sc_state(lobj, state);
+	    }
+	  default:
+	    break;
+	}
+	list = list->next;
+    }
+#endif
+    return COMPILE_OK;
+}
+
+static int
+compile_dstr_fragments(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int *cntp)
+{
+    NODE *list = node->nd_next;
+    VALUE lit = node->nd_lit;
+    int cnt = 0;
+
+    debugp_param("nd_lit", lit);
+    if (!NIL_P(lit)) {
+	hide_obj(lit);
+	cnt++;
+	ADD_INSN1(ret, nd_line(node), putobject, lit);
+    }
+
+    while (list) {
+	node = list->nd_head;
+	if (nd_type(node) == NODE_STR) {
+	    hide_obj(node->nd_lit);
+	    ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
+	}
+	else {
+	    COMPILE(ret, "each string", node);
+	}
+	cnt++;
+	list = list->nd_next;
+    }
+    *cntp = cnt;
+
+    return COMPILE_OK;
+}
+
+static int
+compile_dstr(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
+{
+    int cnt;
+    compile_dstr_fragments(iseq, ret, node, &cnt);
+    ADD_INSN1(ret, nd_line(node), concatstrings, INT2FIX(cnt));
+    return COMPILE_OK;
+}
+
+static int
+compile_dregx(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node)
+{
+    int cnt;
+    compile_dstr_fragments(iseq, ret, node, &cnt);
+    ADD_INSN2(ret, nd_line(node), toregexp, INT2FIX(node->nd_cflag), INT2FIX(cnt));
+    return COMPILE_OK;
+}
+
+static int
+compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
+			 LABEL *then_label, LABEL *else_label)
+{
+    switch (nd_type(cond)) {
+      case NODE_AND:
+	{
+	    LABEL *label = NEW_LABEL(nd_line(cond));
+	    compile_branch_condition(iseq, ret, cond->nd_1st, label,
+				     else_label);
+	    ADD_LABEL(ret, label);
+	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
+				     else_label);
+	    break;
+	}
+      case NODE_OR:
+	{
+	    LABEL *label = NEW_LABEL(nd_line(cond));
+	    compile_branch_condition(iseq, ret, cond->nd_1st, then_label,
+				     label);
+	    ADD_LABEL(ret, label);
+	    compile_branch_condition(iseq, ret, cond->nd_2nd, then_label,
+				     else_label);
+	    break;
+	}
+      case NODE_LIT:		/* NODE_LIT is always not true */
+      case NODE_TRUE:
+      case NODE_STR:
+	/* printf("useless condition eliminate (%s)\n",  ruby_node_name(nd_type(cond))); */
+	ADD_INSNL(ret, nd_line(cond), jump, then_label);
+	break;
+      case NODE_FALSE:
+      case NODE_NIL:
+	/* printf("useless condition eliminate (%s)\n", ruby_node_name(nd_type(cond))); */
+	ADD_INSNL(ret, nd_line(cond), jump, else_label);
+	break;
+      default:
+	COMPILE(ret, "branch condition", cond);
+	ADD_INSNL(ret, nd_line(cond), branchunless, else_label);
+	ADD_INSNL(ret, nd_line(cond), jump, then_label);
+	break;
+    }
+    return COMPILE_OK;
+}
+
+enum compile_array_type_t {
+    COMPILE_ARRAY_TYPE_ARRAY,
+    COMPILE_ARRAY_TYPE_HASH,
+    COMPILE_ARRAY_TYPE_ARGS
+};
+
+static int
+compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
+	       enum compile_array_type_t type, int poped)
+{
+    NODE *node = node_root;
+    int line = (int)nd_line(node);
+    int len = 0;
+
+    if (nd_type(node) == NODE_ZARRAY) {
+	if (!poped) {
+	    switch (type) {
+	      case COMPILE_ARRAY_TYPE_ARRAY: ADD_INSN1(ret, line, newarray, INT2FIX(0)); break;
+	      case COMPILE_ARRAY_TYPE_HASH: ADD_INSN1(ret, line, newhash, INT2FIX(0)); break;
+	      case COMPILE_ARRAY_TYPE_ARGS: /* do nothing */ break;
+	    }
+	}
+    }
+    else {
+	int opt_p = 1;
+	int first = 1, i;
+
+	while (node) {
+	    NODE *start_node = node, *end_node;
+	    NODE *kw = 0;
+	    const int max = 0x100;
+	    DECL_ANCHOR(anchor);
+	    INIT_ANCHOR(anchor);
+
+	    for (i=0; i<max && node; i++, len++, node = node->nd_next) {
+		if (CPDEBUG > 0 && nd_type(node) != NODE_ARRAY) {
+		    rb_bug("compile_array: This node is not NODE_ARRAY, but %s", ruby_node_name(nd_type(node)));
+		}
+
+		if (type == COMPILE_ARRAY_TYPE_HASH && !node->nd_head) {
+		    opt_p = 0;
+		    kw = node->nd_next;
+		    node = kw->nd_next;
+		    kw = kw->nd_head;
+		    break;
+		}
+		if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
+		    opt_p = 0;
+		}
+
+		COMPILE_(anchor, "array element", node->nd_head, poped);
+	    }
+
+	    if (opt_p && type != COMPILE_ARRAY_TYPE_ARGS) {
+		if (!poped) {
+		    VALUE ary = rb_ary_tmp_new(i);
+
+		    end_node = node;
+		    node = start_node;
+
+		    while (node != end_node) {
+			rb_ary_push(ary, node->nd_head->nd_lit);
+			node = node->nd_next;
+		    }
+		    while (node && nd_type(node->nd_head) == NODE_LIT &&
+			   node->nd_next && nd_type(node->nd_next->nd_head) == NODE_LIT) {
+			rb_ary_push(ary, node->nd_head->nd_lit);
+			node = node->nd_next;
+			rb_ary_push(ary, node->nd_head->nd_lit);
+			node = node->nd_next;
+			len++;
+		    }
+
+		    OBJ_FREEZE(ary);
+
+		    iseq_add_mark_object_compile_time(iseq, ary);
+
+		    if (first) {
+			first = 0;
+			if (type == COMPILE_ARRAY_TYPE_ARRAY) {
+			    ADD_INSN1(ret, line, duparray, ary);
+			}
+			else { /* COMPILE_ARRAY_TYPE_HASH */
+			    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+			    ADD_INSN1(ret, line, putobject, ary);
+			    ADD_SEND(ret, line, ID2SYM(id_core_hash_from_ary), INT2FIX(1));
+			}
+		    }
+		    else {
+			if (type == COMPILE_ARRAY_TYPE_ARRAY) {
+			    ADD_INSN1(ret, line, putobject, ary);
+			    ADD_INSN(ret, line, concatarray);
+			}
+			else {
+			    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+			    ADD_INSN1(ret, line, putobject, ary);
+			    ADD_SEND(ret, line, ID2SYM(id_core_hash_merge_ary), INT2FIX(1));
+			}
+		    }
+		}
+	    }
+	    else {
+		if (!poped) {
+		    switch (type) {
+		      case COMPILE_ARRAY_TYPE_ARRAY:
+			ADD_INSN1(anchor, line, newarray, INT2FIX(i));
+
+			if (first) {
+			    first = 0;
+			}
+			else {
+			    ADD_INSN(anchor, line, concatarray);
+			}
+
+			APPEND_LIST(ret, anchor);
+			break;
+		      case COMPILE_ARRAY_TYPE_HASH:
+			if (i > 0) {
+			    if (first) {
+				ADD_INSN1(anchor, line, newhash, INT2FIX(i));
+				APPEND_LIST(ret, anchor);
+			    }
+			    else {
+				ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+				ADD_INSN(ret, line, swap);
+				APPEND_LIST(ret, anchor);
+				ADD_SEND(ret, line, ID2SYM(id_core_hash_merge_ptr), INT2FIX(i + 1));
+			    }
+			}
+			if (kw) {
+			    VALUE nhash = (i > 0 || !first) ? INT2FIX(2) : INT2FIX(1);
+			    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+			    if (i > 0 || !first) ADD_INSN(ret, line, swap);
+			    COMPILE(ret, "keyword splat", kw);
+			    ADD_SEND(ret, line, ID2SYM(id_core_hash_merge_kwd), nhash);
+			}
+			first = 0;
+			break;
+		      case COMPILE_ARRAY_TYPE_ARGS:
+			APPEND_LIST(ret, anchor);
+			break;
+		    }
+		}
+		else {
+		    /* poped */
+		    APPEND_LIST(ret, anchor);
+		}
+	    }
+	}
+    }
+    return len;
+}
+
+static VALUE
+compile_array(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root, enum compile_array_type_t type)
+{
+    return compile_array_(iseq, ret, node_root, type, 0);
+}
+
+static VALUE
+case_when_optimizable_literal(NODE * node)
+{
+    switch (nd_type(node)) {
+      case NODE_LIT: {
+	VALUE v = node->nd_lit;
+	double ival;
+	if (RB_TYPE_P(v, T_FLOAT) &&
+	    modf(RFLOAT_VALUE(v), &ival) == 0.0) {
+	    return FIXABLE(ival) ? LONG2FIX((long)ival) : rb_dbl2big(ival);
+	}
+	if (SYMBOL_P(v) || rb_obj_is_kind_of(v, rb_cNumeric)) {
+	    return v;
+	}
+	break;
+      }
+      case NODE_STR:
+	return node->nd_lit;
+    }
+    return Qundef;
+}
+
+static int
+when_vals(rb_iseq_t *iseq, LINK_ANCHOR *cond_seq, NODE *vals, LABEL *l1, int only_special_literals, VALUE literals)
+{
+    while (vals) {
+	NODE* val = vals->nd_head;
+	VALUE lit = case_when_optimizable_literal(val);
+
+	if (lit == Qundef) {
+	    only_special_literals = 0;
+	}
+	else {
+	    if (rb_hash_lookup(literals, lit) != Qnil) {
+		rb_compile_warning(RSTRING_PTR(iseq->location.path), nd_line(val), "duplicated when clause is ignored");
+	    }
+	    else {
+		rb_hash_aset(literals, lit, (VALUE)(l1) | 1);
+	    }
+	}
+
+	ADD_INSN(cond_seq, nd_line(val), dup); /* dup target */
+
+	if (nd_type(val) == NODE_STR) {
+	    debugp_param("nd_lit", val->nd_lit);
+	    OBJ_FREEZE(val->nd_lit);
+	    ADD_INSN1(cond_seq, nd_line(val), putobject, val->nd_lit);
+	}
+	else {
+	    COMPILE(cond_seq, "when cond", val);
+	}
+
+	ADD_INSN1(cond_seq, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE));
+	ADD_INSNL(cond_seq, nd_line(val), branchif, l1);
+	vals = vals->nd_next;
+    }
+    return only_special_literals;
+}
+
+static int
+compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
+{
+    switch (nd_type(node)) {
+      case NODE_ATTRASGN: {
+	INSN *iobj;
+	rb_call_info_t *ci;
+	VALUE dupidx;
+
+	COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
+
+	POP_ELEMENT(ret);        /* pop pop insn */
+	iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */
+	ci = (rb_call_info_t *)iobj->operands[0];
+	ci->orig_argc += 1; ci->argc = ci->orig_argc;
+	dupidx = INT2FIX(ci->orig_argc);
+
+	ADD_INSN1(ret, nd_line(node), topn, dupidx);
+	ADD_ELEM(ret, (LINK_ELEMENT *)iobj);
+	ADD_INSN(ret, nd_line(node), pop);	/* result */
+	ADD_INSN(ret, nd_line(node), pop);	/* rhs    */
+	break;
+      }
+      case NODE_MASGN: {
+	DECL_ANCHOR(anchor);
+	INIT_ANCHOR(anchor);
+	COMPILE_POPED(anchor, "nest masgn lhs", node);
+	REMOVE_ELEM(FIRST_ELEMENT(anchor));
+	ADD_SEQ(ret, anchor);
+	break;
+      }
+      default: {
+	DECL_ANCHOR(anchor);
+	INIT_ANCHOR(anchor);
+	COMPILE_POPED(anchor, "masgn lhs", node);
+	REMOVE_ELEM(FIRST_ELEMENT(anchor));
+	ADD_SEQ(ret, anchor);
+      }
+    }
+
+    return COMPILE_OK;
+}
+
+static void
+compile_massign_opt_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *lhsn)
+{
+    if (lhsn) {
+	compile_massign_opt_lhs(iseq, ret, lhsn->nd_next);
+	compile_massign_lhs(iseq, ret, lhsn->nd_head);
+    }
+}
+
+static int
+compile_massign_opt(rb_iseq_t *iseq, LINK_ANCHOR *ret,
+		    NODE *rhsn, NODE *orig_lhsn)
+{
+    VALUE mem[64];
+    const int memsize = numberof(mem);
+    int memindex = 0;
+    int llen = 0, rlen = 0;
+    int i;
+    NODE *lhsn = orig_lhsn;
+
+#define MEMORY(v) { \
+    int i; \
+    if (memindex == memsize) return 0; \
+    for (i=0; i<memindex; i++) { \
+	if (mem[i] == (v)) return 0; \
+    } \
+    mem[memindex++] = (v); \
+}
+
+    if (rhsn == 0 || nd_type(rhsn) != NODE_ARRAY) {
+	return 0;
+    }
+
+    while (lhsn) {
+	NODE *ln = lhsn->nd_head;
+	switch (nd_type(ln)) {
+	  case NODE_LASGN:
+	    MEMORY(ln->nd_vid);
+	    break;
+	  case NODE_DASGN:
+	  case NODE_DASGN_CURR:
+	  case NODE_IASGN:
+	  case NODE_IASGN2:
+	  case NODE_CVASGN:
+	    MEMORY(ln->nd_vid);
+	    break;
+	  default:
+	    return 0;
+	}
+	lhsn = lhsn->nd_next;
+	llen++;
+    }
+
+    while (rhsn) {
+	if (llen <= rlen) {
+	    COMPILE_POPED(ret, "masgn val (popped)", rhsn->nd_head);
+	}
+	else {
+	    COMPILE(ret, "masgn val", rhsn->nd_head);
+	}
+	rhsn = rhsn->nd_next;
+	rlen++;
+    }
+
+    if (llen > rlen) {
+	for (i=0; i<llen-rlen; i++) {
+	    ADD_INSN(ret, nd_line(orig_lhsn), putnil);
+	}
+    }
+
+    compile_massign_opt_lhs(iseq, ret, orig_lhsn);
+    return 1;
+}
+
+static int
+compile_massign(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node, int poped)
+{
+    NODE *rhsn = node->nd_value;
+    NODE *splatn = node->nd_args;
+    NODE *lhsn = node->nd_head;
+    int lhs_splat = (splatn && (VALUE)splatn != (VALUE)-1) ? 1 : 0;
+
+    if (!poped || splatn || !compile_massign_opt(iseq, ret, rhsn, lhsn)) {
+	int llen = 0;
+	DECL_ANCHOR(lhsseq);
+
+	INIT_ANCHOR(lhsseq);
+
+	while (lhsn) {
+	    compile_massign_lhs(iseq, lhsseq, lhsn->nd_head);
+	    llen += 1;
+	    lhsn = lhsn->nd_next;
+	}
+
+	COMPILE(ret, "normal masgn rhs", rhsn);
+
+	if (!poped) {
+	    ADD_INSN(ret, nd_line(node), dup);
+	}
+
+	ADD_INSN2(ret, nd_line(node), expandarray,
+		  INT2FIX(llen), INT2FIX(lhs_splat));
+	ADD_SEQ(ret, lhsseq);
+
+	if (lhs_splat) {
+	    if (nd_type(splatn) == NODE_POSTARG) {
+		/*a, b, *r, p1, p2 */
+		NODE *postn = splatn->nd_2nd;
+		NODE *restn = splatn->nd_1st;
+		int num = (int)postn->nd_alen;
+		int flag = 0x02 | (((VALUE)restn == (VALUE)-1) ? 0x00 : 0x01);
+
+		ADD_INSN2(ret, nd_line(splatn), expandarray,
+			  INT2FIX(num), INT2FIX(flag));
+
+		if ((VALUE)restn != (VALUE)-1) {
+		    compile_massign_lhs(iseq, ret, restn);
+		}
+		while (postn) {
+		    compile_massign_lhs(iseq, ret, postn->nd_head);
+		    postn = postn->nd_next;
+		}
+	    }
+	    else {
+		/* a, b, *r */
+		compile_massign_lhs(iseq, ret, splatn);
+	    }
+	}
+    }
+    return COMPILE_OK;
+}
+
+static int
+compile_colon2(rb_iseq_t *iseq, NODE * node,
+	       LINK_ANCHOR *pref, LINK_ANCHOR *body)
+{
+    switch (nd_type(node)) {
+      case NODE_CONST:
+	debugi("compile_colon2 - colon", node->nd_vid);
+	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_vid));
+	break;
+      case NODE_COLON3:
+	debugi("compile_colon2 - colon3", node->nd_mid);
+	ADD_INSN(body, nd_line(node), pop);
+	ADD_INSN1(body, nd_line(node), putobject, rb_cObject);
+	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
+	break;
+      case NODE_COLON2:
+	compile_colon2(iseq, node->nd_head, pref, body);
+	debugi("compile_colon2 - colon2", node->nd_mid);
+	ADD_INSN1(body, nd_line(node), getconstant, ID2SYM(node->nd_mid));
+	break;
+      default:
+	COMPILE(pref, "const colon2 prefix", node);
+	break;
+    }
+    return COMPILE_OK;
+}
+
+static VALUE
+compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
+{
+    if (nd_type(cpath) == NODE_COLON3) {
+	/* toplevel class ::Foo */
+	ADD_INSN1(ret, nd_line(cpath), putobject, rb_cObject);
+	return Qfalse;
+    }
+    else if (cpath->nd_head) {
+	/* Bar::Foo */
+	COMPILE(ret, "nd_else->nd_head", cpath->nd_head);
+	return Qfalse;
+    }
+    else {
+	/* class at cbase Foo */
+	ADD_INSN1(ret, nd_line(cpath), putspecialobject,
+		  INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+	return Qtrue;
+    }
+}
+
+#define defined_expr defined_expr0
+static int
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
+	     NODE *node, LABEL **lfinish, VALUE needstr)
+{
+    enum defined_type expr_type = 0;
+    enum node_type type;
+
+    switch (type = nd_type(node)) {
+
+	/* easy literals */
+      case NODE_NIL:
+	expr_type = DEFINED_NIL;
+	break;
+      case NODE_SELF:
+	expr_type = DEFINED_SELF;
+	break;
+      case NODE_TRUE:
+	expr_type = DEFINED_TRUE;
+	break;
+      case NODE_FALSE:
+	expr_type = DEFINED_FALSE;
+	break;
+
+      case NODE_ARRAY:{
+	NODE *vals = node;
+
+	do {
+	    defined_expr(iseq, ret, vals->nd_head, lfinish, Qfalse);
+
+	    if (!lfinish[1]) {
+		lfinish[1] = NEW_LABEL(nd_line(node));
+	    }
+	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+	} while ((vals = vals->nd_next) != NULL);
+      }
+      case NODE_STR:
+      case NODE_LIT:
+      case NODE_ZARRAY:
+      case NODE_AND:
+      case NODE_OR:
+      default:
+	expr_type = DEFINED_EXPR;
+	break;
+
+	/* variables */
+      case NODE_LVAR:
+      case NODE_DVAR:
+	expr_type = DEFINED_LVAR;
+	break;
+
+      case NODE_IVAR:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_IVAR),
+		  ID2SYM(node->nd_vid), needstr);
+	return 1;
+
+      case NODE_GVAR:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_GVAR),
+		  ID2SYM(node->nd_entry->id), needstr);
+	return 1;
+
+      case NODE_CVAR:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CVAR),
+		  ID2SYM(node->nd_vid), needstr);
+	return 1;
+
+      case NODE_CONST:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
+		  ID2SYM(node->nd_vid), needstr);
+	return 1;
+      case NODE_COLON2:
+	if (!lfinish[1]) {
+	    lfinish[1] = NEW_LABEL(nd_line(node));
+	}
+	defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
+	ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+
+	if (rb_is_const_id(node->nd_mid)) {
+	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_CONST),
+		      ID2SYM(node->nd_mid), needstr);
+	}
+	else {
+	    COMPILE(ret, "defined/colon2#nd_head", node->nd_head);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
+		      ID2SYM(node->nd_mid), needstr);
+	}
+	return 1;
+      case NODE_COLON3:
+	ADD_INSN1(ret, nd_line(node), putobject, rb_cObject);
+	ADD_INSN3(ret, nd_line(node), defined,
+		  INT2FIX(DEFINED_CONST), ID2SYM(node->nd_mid), needstr);
+	return 1;
+
+	/* method dispatch */
+      case NODE_CALL:
+      case NODE_VCALL:
+      case NODE_FCALL:
+      case NODE_ATTRASGN:{
+	int self = TRUE;
+
+	switch (type) {
+	  case NODE_ATTRASGN:
+	    if (node->nd_recv == (NODE *)1) break;
+	  case NODE_CALL:
+	    self = FALSE;
+	    break;
+	  default:
+	    /* through */;
+	}
+	if (!lfinish[1]) {
+	    lfinish[1] = NEW_LABEL(nd_line(node));
+	}
+	if (node->nd_args) {
+	    defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse);
+	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+	}
+	if (!self) {
+	    defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse);
+	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
+	    COMPILE(ret, "defined/recv", node->nd_recv);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_METHOD),
+		      ID2SYM(node->nd_mid), needstr);
+	}
+	else {
+	    ADD_INSN(ret, nd_line(node), putself);
+	    ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_FUNC),
+		      ID2SYM(node->nd_mid), needstr);
+	}
+	return 1;
+      }
+
+      case NODE_YIELD:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_YIELD), 0,
+		  needstr);
+	return 1;
+
+      case NODE_BACK_REF:
+      case NODE_NTH_REF:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_REF),
+		  INT2FIX((node->nd_nth << 1) | (type == NODE_BACK_REF)),
+		  needstr);
+	return 1;
+
+      case NODE_SUPER:
+      case NODE_ZSUPER:
+	ADD_INSN(ret, nd_line(node), putnil);
+	ADD_INSN3(ret, nd_line(node), defined, INT2FIX(DEFINED_ZSUPER), 0,
+		  needstr);
+	return 1;
+
+      case NODE_OP_ASGN1:
+      case NODE_OP_ASGN2:
+      case NODE_OP_ASGN_OR:
+      case NODE_OP_ASGN_AND:
+      case NODE_MASGN:
+      case NODE_LASGN:
+      case NODE_DASGN:
+      case NODE_DASGN_CURR:
+      case NODE_GASGN:
+      case NODE_IASGN:
+      case NODE_CDECL:
+      case NODE_CVDECL:
+      case NODE_CVASGN:
+	expr_type = DEFINED_ASGN;
+	break;
+    }
+
+    if (expr_type) {
+	if (needstr != Qfalse) {
+	    VALUE str = rb_iseq_defined_string(expr_type);
+	    ADD_INSN1(ret, nd_line(node), putobject, str);
+	}
+	else {
+	    ADD_INSN1(ret, nd_line(node), putobject, Qtrue);
+	}
+	return 1;
+    }
+    return 0;
+}
+#undef defined_expr
+
+static int
+defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
+	     NODE *node, LABEL **lfinish, VALUE needstr)
+{
+    LINK_ELEMENT *lcur = ret->last;
+    int done = defined_expr0(iseq, ret, node, lfinish, needstr);
+    if (lfinish[1]) {
+	int line = nd_line(node);
+	LABEL *lstart = NEW_LABEL(line);
+	LABEL *lend = NEW_LABEL(line);
+	VALUE rescue = NEW_CHILD_ISEQVAL(NEW_NIL(),
+					 rb_str_concat(rb_str_new2
+						       ("defined guard in "),
+						       iseq->location.label),
+					 ISEQ_TYPE_DEFINED_GUARD, 0);
+	APPEND_LABEL(ret, lcur, lstart);
+	ADD_LABEL(ret, lend);
+	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
+    }
+    return done;
+}
+
+#define BUFSIZE 0x100
+
+static VALUE
+make_name_for_block(rb_iseq_t *iseq)
+{
+    int level = 1;
+    rb_iseq_t *ip = iseq;
+
+    if (iseq->parent_iseq != 0) {
+	while (ip->local_iseq != ip) {
+	    if (ip->type == ISEQ_TYPE_BLOCK) {
+		level++;
+	    }
+	    ip = ip->parent_iseq;
+	}
+    }
+
+    if (level == 1) {
+	return rb_sprintf("block in %"PRIsVALUE, ip->location.label);
+    }
+    else {
+	return rb_sprintf("block (%d levels) in %"PRIsVALUE, level, ip->location.label);
+    }
+}
+
+static void
+push_ensure_entry(rb_iseq_t *iseq,
+		  struct iseq_compile_data_ensure_node_stack *enl,
+		  struct ensure_range *er, NODE *node)
+{
+    enl->ensure_node = node;
+    enl->prev = iseq->compile_data->ensure_node_stack;	/* prev */
+    enl->erange = er;
+    iseq->compile_data->ensure_node_stack = enl;
+}
+
+static void
+add_ensure_range(rb_iseq_t *iseq, struct ensure_range *erange,
+		 LABEL *lstart, LABEL *lend)
+{
+    struct ensure_range *ne =
+	compile_data_alloc(iseq, sizeof(struct ensure_range));
+
+    while (erange->next != 0) {
+	erange = erange->next;
+    }
+    ne->next = 0;
+    ne->begin = lend;
+    ne->end = erange->end;
+    erange->end = lstart;
+
+    erange->next = ne;
+}
+
+static void
+add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
+{
+    struct iseq_compile_data_ensure_node_stack *enlp =
+	iseq->compile_data->ensure_node_stack;
+    struct iseq_compile_data_ensure_node_stack *prev_enlp = enlp;
+    DECL_ANCHOR(ensure);
+
+    INIT_ANCHOR(ensure);
+    while (enlp) {
+	if (enlp->erange != 0) {
+	    DECL_ANCHOR(ensure_part);
+	    LABEL *lstart = NEW_LABEL(0);
+	    LABEL *lend = NEW_LABEL(0);
+	    INIT_ANCHOR(ensure_part);
+
+	    add_ensure_range(iseq, enlp->erange, lstart, lend);
+
+	    iseq->compile_data->ensure_node_stack = enlp->prev;
+	    ADD_LABEL(ensure_part, lstart);
+	    COMPILE_POPED(ensure_part, "ensure part", enlp->ensure_node);
+	    ADD_LABEL(ensure_part, lend);
+	    ADD_SEQ(ensure, ensure_part);
+	}
+	else {
+	    if (!is_return) {
+		break;
+	    }
+	}
+	enlp = enlp->prev;
+    }
+    iseq->compile_data->ensure_node_stack = prev_enlp;
+    ADD_SEQ(ret, ensure);
+}
+
+static VALUE
+setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
+{
+    VALUE argc = INT2FIX(0);
+    int nsplat = 0;
+    DECL_ANCHOR(arg_block);
+    DECL_ANCHOR(args_splat);
+
+    INIT_ANCHOR(arg_block);
+    INIT_ANCHOR(args_splat);
+    if (argn && nd_type(argn) == NODE_BLOCK_PASS) {
+	COMPILE(arg_block, "block", argn->nd_body);
+	*flag |= VM_CALL_ARGS_BLOCKARG;
+	argn = argn->nd_head;
+    }
+
+  setup_argn:
+    if (argn) {
+	switch (nd_type(argn)) {
+	  case NODE_SPLAT: {
+	    COMPILE(args, "args (splat)", argn->nd_head);
+	    argc = INT2FIX(1);
+	    nsplat++;
+	    *flag |= VM_CALL_ARGS_SPLAT;
+	    break;
+	  }
+	  case NODE_ARGSCAT:
+	  case NODE_ARGSPUSH: {
+	    int next_is_array = (nd_type(argn->nd_head) == NODE_ARRAY);
+	    DECL_ANCHOR(tmp);
+
+	    INIT_ANCHOR(tmp);
+	    COMPILE(tmp, "args (cat: splat)", argn->nd_body);
+	    if (next_is_array && nsplat == 0) {
+		/* none */
+	    }
+	    else {
+		if (nd_type(argn) == NODE_ARGSCAT) {
+		    ADD_INSN1(tmp, nd_line(argn), splatarray, Qfalse);
+		}
+		else {
+		    ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1));
+		}
+	    }
+	    INSERT_LIST(args_splat, tmp);
+	    nsplat++;
+	    *flag |= VM_CALL_ARGS_SPLAT;
+
+	    if (next_is_array) {
+		argc = INT2FIX(compile_array(iseq, args, argn->nd_head, COMPILE_ARRAY_TYPE_ARGS) + 1);
+	    }
+	    else {
+		argn = argn->nd_head;
+		goto setup_argn;
+	    }
+	    break;
+	  }
+	  case NODE_ARRAY: {
+	    argc = INT2FIX(compile_array(iseq, args, argn, COMPILE_ARRAY_TYPE_ARGS));
+	    break;
+	  }
+	  default: {
+	    rb_bug("setup_arg: unknown node: %s\n", ruby_node_name(nd_type(argn)));
+	  }
+	}
+    }
+
+    if (nsplat > 1) {
+	int i;
+	for (i=1; i<nsplat; i++) {
+	    ADD_INSN(args_splat, nd_line(args), concatarray);
+	}
+    }
+
+    if (!LIST_SIZE_ZERO(args_splat)) {
+	ADD_SEQ(args, args_splat);
+    }
+
+    if (*flag & VM_CALL_ARGS_BLOCKARG) {
+	ADD_SEQ(args, arg_block);
+    }
+    return argc;
+}
+
+static VALUE
+build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *body)
+{
+    int line = nd_line(body);
+    VALUE argc = INT2FIX(0);
+    VALUE block = NEW_CHILD_ISEQVAL(body, make_name_for_block(iseq->parent_iseq), ISEQ_TYPE_BLOCK, line);
+    ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+    ADD_CALL_WITH_BLOCK(ret, line, ID2SYM(id_core_set_postexe), argc, block);
+    iseq_set_local_table(iseq, 0);
+    return Qnil;
+}
+
+/**
+  compile each node
+
+  self:  InstructionSequence
+  node:  Ruby compiled node
+  poped: This node will be poped
+ */
+static int
+iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
+{
+    enum node_type type;
+    LINK_ELEMENT *saved_last_element = 0;
+    int line;
+
+    if (node == 0) {
+	if (!poped) {
+	    debugs("node: NODE_NIL(implicit)\n");
+	    ADD_INSN(ret, iseq->compile_data->last_line, putnil);
+	}
+	return COMPILE_OK;
+    }
+
+    iseq->compile_data->last_line = line = (int)nd_line(node);
+    debug_node_start(node);
+
+    type = nd_type(node);
+
+    if (node->flags & NODE_FL_NEWLINE) {
+	ADD_TRACE(ret, line, RUBY_EVENT_LINE);
+	saved_last_element = ret->last;
+    }
+
+    switch (type) {
+      case NODE_BLOCK:{
+	while (node && nd_type(node) == NODE_BLOCK) {
+	    COMPILE_(ret, "BLOCK body", node->nd_head,
+		     (node->nd_next == 0 && poped == 0) ? 0 : 1);
+	    node = node->nd_next;
+	}
+	if (node) {
+	    COMPILE_(ret, "BLOCK next", node->nd_next, poped);
+	}
+	break;
+      }
+      case NODE_IF:{
+	DECL_ANCHOR(cond_seq);
+	DECL_ANCHOR(then_seq);
+	DECL_ANCHOR(else_seq);
+	LABEL *then_label, *else_label, *end_label;
+
+	INIT_ANCHOR(cond_seq);
+	INIT_ANCHOR(then_seq);
+	INIT_ANCHOR(else_seq);
+	then_label = NEW_LABEL(line);
+	else_label = NEW_LABEL(line);
+	end_label = NEW_LABEL(line);
+
+	compile_branch_condition(iseq, cond_seq, node->nd_cond,
+				 then_label, else_label);
+	COMPILE_(then_seq, "then", node->nd_body, poped);
+	COMPILE_(else_seq, "else", node->nd_else, poped);
+
+	ADD_SEQ(ret, cond_seq);
+
+	ADD_LABEL(ret, then_label);
+	ADD_SEQ(ret, then_seq);
+	ADD_INSNL(ret, line, jump, end_label);
+
+	ADD_LABEL(ret, else_label);
+	ADD_SEQ(ret, else_seq);
+
+	ADD_LABEL(ret, end_label);
+
+	break;
+      }
+      case NODE_CASE:{
+	NODE *vals;
+	NODE *tempnode = node;
+	LABEL *endlabel, *elselabel;
+	DECL_ANCHOR(head);
+	DECL_ANCHOR(body_seq);
+	DECL_ANCHOR(cond_seq);
+	int only_special_literals = 1;
+	VALUE literals = rb_hash_new();
+
+	INIT_ANCHOR(head);
+	INIT_ANCHOR(body_seq);
+	INIT_ANCHOR(cond_seq);
+
+	rb_hash_tbl_raw(literals)->type = &cdhash_type;
+
+	if (node->nd_head == 0) {
+	    COMPILE_(ret, "when", node->nd_body, poped);
+	    break;
+	}
+	COMPILE(head, "case base", node->nd_head);
+
+	node = node->nd_body;
+	type = nd_type(node);
+	line = nd_line(node);
+
+	if (type != NODE_WHEN) {
+	    COMPILE_ERROR((ERROR_ARGS "NODE_CASE: unexpected node. must be NODE_WHEN, but %s", ruby_node_name(type)));
+	}
+
+	endlabel = NEW_LABEL(line);
+	elselabel = NEW_LABEL(line);
+
+	ADD_SEQ(ret, head);	/* case VAL */
+
+	while (type == NODE_WHEN) {
+	    LABEL *l1;
+
+	    l1 = NEW_LABEL(line);
+	    ADD_LABEL(body_seq, l1);
+	    ADD_INSN(body_seq, line, pop);
+	    COMPILE_(body_seq, "when body", node->nd_body, poped);
+	    ADD_INSNL(body_seq, line, jump, endlabel);
+
+	    vals = node->nd_head;
+	    if (vals) {
+		switch (nd_type(vals)) {
+		  case NODE_ARRAY:
+		    only_special_literals = when_vals(iseq, cond_seq, vals, l1, only_special_literals, literals);
+		    break;
+		  case NODE_SPLAT:
+		  case NODE_ARGSCAT:
+		  case NODE_ARGSPUSH:
+		    only_special_literals = 0;
+		    ADD_INSN (cond_seq, nd_line(vals), dup);
+		    COMPILE(cond_seq, "when/cond splat", vals);
+		    ADD_INSN1(cond_seq, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_CASE | VM_CHECKMATCH_ARRAY));
+		    ADD_INSNL(cond_seq, nd_line(vals), branchif, l1);
+		    break;
+		  default:
+		    rb_bug("NODE_CASE: unknown node (%s)",
+			   ruby_node_name(nd_type(vals)));
+		}
+	    }
+	    else {
+		rb_bug("NODE_CASE: must be NODE_ARRAY, but 0");
+	    }
+
+	    node = node->nd_next;
+	    if (!node) {
+		break;
+	    }
+	    type = nd_type(node);
+	    line = nd_line(node);
+	}
+	/* else */
+	if (node) {
+	    ADD_LABEL(cond_seq, elselabel);
+	    ADD_INSN(cond_seq, line, pop);
+	    COMPILE_(cond_seq, "else", node, poped);
+	    ADD_INSNL(cond_seq, line, jump, endlabel);
+	}
+	else {
+	    debugs("== else (implicit)\n");
+	    ADD_LABEL(cond_seq, elselabel);
+	    ADD_INSN(cond_seq, nd_line(tempnode), pop);
+	    if (!poped) {
+		ADD_INSN(cond_seq, nd_line(tempnode), putnil);
+	    }
+	    ADD_INSNL(cond_seq, nd_line(tempnode), jump, endlabel);
+	}
+
+	if (only_special_literals) {
+	    iseq_add_mark_object(iseq, literals);
+
+	    ADD_INSN(ret, nd_line(tempnode), dup);
+	    ADD_INSN2(ret, nd_line(tempnode), opt_case_dispatch, literals, elselabel);
+	}
+
+	ADD_SEQ(ret, cond_seq);
+	ADD_SEQ(ret, body_seq);
+	ADD_LABEL(ret, endlabel);
+	break;
+      }
+      case NODE_WHEN:{
+	NODE *vals;
+	NODE *val;
+	NODE *orig_node = node;
+	LABEL *endlabel;
+	DECL_ANCHOR(body_seq);
+
+	INIT_ANCHOR(body_seq);
+	endlabel = NEW_LABEL(line);
+
+	while (node && nd_type(node) == NODE_WHEN) {
+	    LABEL *l1 = NEW_LABEL(line = nd_line(node));
+	    ADD_LABEL(body_seq, l1);
+	    COMPILE_(body_seq, "when", node->nd_body, poped);
+	    ADD_INSNL(body_seq, line, jump, endlabel);
+
+	    vals = node->nd_head;
+	    if (!vals) {
+		rb_bug("NODE_WHEN: must be NODE_ARRAY, but 0");
+	    }
+	    switch (nd_type(vals)) {
+	      case NODE_ARRAY:
+		while (vals) {
+		    val = vals->nd_head;
+		    COMPILE(ret, "when2", val);
+		    ADD_INSNL(ret, nd_line(val), branchif, l1);
+		    vals = vals->nd_next;
+		}
+		break;
+	      case NODE_SPLAT:
+	      case NODE_ARGSCAT:
+	      case NODE_ARGSPUSH:
+		ADD_INSN(ret, nd_line(vals), putnil);
+		COMPILE(ret, "when2/cond splat", vals);
+		ADD_INSN1(ret, nd_line(vals), checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_WHEN | VM_CHECKMATCH_ARRAY));
+		ADD_INSNL(ret, nd_line(vals), branchif, l1);
+		break;
+	      default:
+		rb_bug("NODE_WHEN: unknown node (%s)",
+		       ruby_node_name(nd_type(vals)));
+	    }
+	    node = node->nd_next;
+	}
+	/* else */
+	COMPILE_(ret, "else", node, poped);
+	ADD_INSNL(ret, nd_line(orig_node), jump, endlabel);
+
+	ADD_SEQ(ret, body_seq);
+	ADD_LABEL(ret, endlabel);
+
+	break;
+      }
+      case NODE_OPT_N:
+      case NODE_WHILE:
+      case NODE_UNTIL:{
+	LABEL *prev_start_label = iseq->compile_data->start_label;
+	LABEL *prev_end_label = iseq->compile_data->end_label;
+	LABEL *prev_redo_label = iseq->compile_data->redo_label;
+	int prev_loopval_popped = iseq->compile_data->loopval_popped;
+
+	struct iseq_compile_data_ensure_node_stack enl;
+
+	LABEL *next_label = iseq->compile_data->start_label = NEW_LABEL(line);	/* next  */
+	LABEL *redo_label = iseq->compile_data->redo_label = NEW_LABEL(line);	/* redo  */
+	LABEL *break_label = iseq->compile_data->end_label = NEW_LABEL(line);	/* break */
+	LABEL *end_label = NEW_LABEL(line);
+
+	LABEL *next_catch_label = NEW_LABEL(line);
+	LABEL *tmp_label = NULL;
+
+	iseq->compile_data->loopval_popped = 0;
+	push_ensure_entry(iseq, &enl, 0, 0);
+
+	if (type == NODE_OPT_N || node->nd_state == 1) {
+	    ADD_INSNL(ret, line, jump, next_label);
+	}
+	else {
+	    tmp_label = NEW_LABEL(line);
+	    ADD_INSNL(ret, line, jump, tmp_label);
+	}
+	ADD_INSN(ret, line, putnil);
+	ADD_LABEL(ret, next_catch_label);
+	ADD_INSN(ret, line, pop);
+	ADD_INSNL(ret, line, jump, next_label);
+	if (tmp_label) ADD_LABEL(ret, tmp_label);
+
+	ADD_LABEL(ret, redo_label);
+	COMPILE_POPED(ret, "while body", node->nd_body);
+	ADD_LABEL(ret, next_label);	/* next */
+
+	if (type == NODE_WHILE) {
+	    compile_branch_condition(iseq, ret, node->nd_cond,
+				     redo_label, end_label);
+	}
+	else if (type == NODE_UNTIL) {
+	    /* until */
+	    compile_branch_condition(iseq, ret, node->nd_cond,
+				     end_label, redo_label);
+	}
+	else {
+	    ADD_CALL_RECEIVER(ret, line);
+	    ADD_CALL(ret, line, ID2SYM(idGets), INT2FIX(0));
+	    ADD_INSNL(ret, line, branchif, redo_label);
+	    /* opt_n */
+	}
+
+	ADD_LABEL(ret, end_label);
+
+	if (node->nd_state == Qundef) {
+	    /* ADD_INSN(ret, line, putundef); */
+	    rb_bug("unsupported: putundef");
+	}
+	else {
+	    ADD_INSN(ret, line, putnil);
+	}
+
+	ADD_LABEL(ret, break_label);	/* break */
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+
+	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, redo_label, break_label,
+			0, break_label);
+	ADD_CATCH_ENTRY(CATCH_TYPE_NEXT, redo_label, break_label, 0,
+			next_catch_label);
+	ADD_CATCH_ENTRY(CATCH_TYPE_REDO, redo_label, break_label, 0,
+			iseq->compile_data->redo_label);
+
+	iseq->compile_data->start_label = prev_start_label;
+	iseq->compile_data->end_label = prev_end_label;
+	iseq->compile_data->redo_label = prev_redo_label;
+	iseq->compile_data->loopval_popped = prev_loopval_popped;
+	iseq->compile_data->ensure_node_stack = iseq->compile_data->ensure_node_stack->prev;
+	break;
+      }
+      case NODE_ITER:
+      case NODE_FOR:{
+	VALUE prevblock = iseq->compile_data->current_block;
+	LABEL *retry_label = NEW_LABEL(line);
+	LABEL *retry_end_l = NEW_LABEL(line);
+
+	ADD_LABEL(ret, retry_label);
+	if (nd_type(node) == NODE_FOR) {
+	    COMPILE(ret, "iter caller (for)", node->nd_iter);
+
+	    iseq->compile_data->current_block =
+		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
+				  ISEQ_TYPE_BLOCK, line);
+
+	    ADD_SEND_R(ret, line, ID2SYM(idEach), INT2FIX(0),
+		       iseq->compile_data->current_block, INT2FIX(0));
+	}
+	else {
+	    iseq->compile_data->current_block =
+		NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq),
+				  ISEQ_TYPE_BLOCK, line);
+	    COMPILE(ret, "iter caller", node->nd_iter);
+	}
+	ADD_LABEL(ret, retry_end_l);
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+
+	iseq->compile_data->current_block = prevblock;
+
+	ADD_CATCH_ENTRY(CATCH_TYPE_BREAK, retry_label, retry_end_l, 0, retry_end_l);
+
+	break;
+      }
+      case NODE_BREAK:{
+	unsigned long level = 0;
+
+	if (iseq->compile_data->redo_label != 0) {
+	    /* while/until */
+	    LABEL *splabel = NEW_LABEL(0);
+	    ADD_LABEL(ret, splabel);
+	    ADD_ADJUST(ret, line, iseq->compile_data->redo_label);
+	    COMPILE_(ret, "break val (while/until)", node->nd_stts, iseq->compile_data->loopval_popped);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->end_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+
+	    if (!poped) {
+		ADD_INSN(ret, line, putnil);
+	    }
+	}
+	else if (iseq->type == ISEQ_TYPE_BLOCK) {
+	  break_by_insn:
+	    /* escape from block */
+	    COMPILE(ret, "break val (block)", node->nd_stts);
+	    ADD_INSN1(ret, line, throw, INT2FIX(level | 0x02) /* TAG_BREAK */ );
+	    if (poped) {
+		ADD_INSN(ret, line, pop);
+	    }
+	}
+	else if (iseq->type == ISEQ_TYPE_EVAL) {
+	  break_in_eval:
+	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with break"));
+	}
+	else {
+	    rb_iseq_t *ip = iseq->parent_iseq;
+	    while (ip) {
+		if (!ip->compile_data) {
+		    ip = 0;
+		    break;
+		}
+
+		level++;
+		if (ip->compile_data->redo_label != 0) {
+		    level = 0x8000;
+		    if (ip->compile_data->loopval_popped == 0) {
+			/* need value */
+			level |= 0x4000;
+		    }
+		    goto break_by_insn;
+		}
+		else if (ip->type == ISEQ_TYPE_BLOCK) {
+		    level <<= 16;
+		    goto break_by_insn;
+		}
+		else if (ip->type == ISEQ_TYPE_EVAL) {
+		    goto break_in_eval;
+		}
+
+		ip = ip->parent_iseq;
+	    }
+	    COMPILE_ERROR((ERROR_ARGS "Invalid break"));
+	}
+	break;
+      }
+      case NODE_NEXT:{
+	unsigned long level = 0;
+
+	if (iseq->compile_data->redo_label != 0) {
+	    LABEL *splabel = NEW_LABEL(0);
+	    debugs("next in while loop\n");
+	    ADD_LABEL(ret, splabel);
+	    COMPILE(ret, "next val/valid syntax?", node->nd_stts);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_ADJUST(ret, line, iseq->compile_data->redo_label);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->start_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+	    if (!poped) {
+		ADD_INSN(ret, line, putnil);
+	    }
+	}
+	else if (iseq->compile_data->end_label) {
+	    LABEL *splabel = NEW_LABEL(0);
+	    debugs("next in block\n");
+	    ADD_LABEL(ret, splabel);
+	    ADD_ADJUST(ret, line, iseq->compile_data->start_label);
+	    COMPILE(ret, "next val", node->nd_stts);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->end_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+
+	    if (!poped) {
+		ADD_INSN(ret, line, putnil);
+	    }
+	}
+	else if (iseq->type == ISEQ_TYPE_EVAL) {
+	  next_in_eval:
+	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with next"));
+	}
+	else {
+	    rb_iseq_t *ip;
+	    ip = iseq;
+	    while (ip) {
+		if (!ip->compile_data) {
+		    ip = 0;
+		    break;
+		}
+
+		level = 0x8000 | 0x4000;
+		if (ip->compile_data->redo_label != 0) {
+		    /* while loop */
+		    break;
+		}
+		else if (ip->type == ISEQ_TYPE_BLOCK) {
+		    break;
+		}
+		else if (ip->type == ISEQ_TYPE_EVAL) {
+		    goto next_in_eval;
+		}
+
+		ip = ip->parent_iseq;
+	    }
+	    if (ip != 0) {
+		COMPILE(ret, "next val", node->nd_stts);
+		ADD_INSN1(ret, line, throw, INT2FIX(level | 0x03) /* TAG_NEXT */ );
+
+		if (poped) {
+		    ADD_INSN(ret, line, pop);
+		}
+	    }
+	    else {
+		COMPILE_ERROR((ERROR_ARGS "Invalid next"));
+	    }
+	}
+	break;
+      }
+      case NODE_REDO:{
+	if (iseq->compile_data->redo_label) {
+	    LABEL *splabel = NEW_LABEL(0);
+	    debugs("redo in while");
+	    ADD_LABEL(ret, splabel);
+	    ADD_ADJUST(ret, line, iseq->compile_data->redo_label);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->redo_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+	    if (!poped) {
+		ADD_INSN(ret, line, putnil);
+	    }
+	}
+	else if (iseq->type == ISEQ_TYPE_EVAL) {
+	  redo_in_eval:
+	    COMPILE_ERROR((ERROR_ARGS "Can't escape from eval with redo"));
+	}
+	else if (iseq->compile_data->start_label) {
+	    LABEL *splabel = NEW_LABEL(0);
+
+	    debugs("redo in block");
+	    ADD_LABEL(ret, splabel);
+	    add_ensure_iseq(ret, iseq, 0);
+	    ADD_ADJUST(ret, line, iseq->compile_data->start_label);
+	    ADD_INSNL(ret, line, jump, iseq->compile_data->start_label);
+	    ADD_ADJUST_RESTORE(ret, splabel);
+
+	    if (!poped) {
+		ADD_INSN(ret, line, putnil);
+	    }
+	}
+	else {
+	    rb_iseq_t *ip;
+	    unsigned long level;
+	    level = 0x8000 | 0x4000;
+	    ip = iseq;
+	    while (ip) {
+		if (!ip->compile_data) {
+		    ip = 0;
+		    break;
+		}
+
+		if (ip->compile_data->redo_label != 0) {
+		    break;
+		}
+		else if (ip->type == ISEQ_TYPE_BLOCK) {
+		    break;
+		}
+		else if (ip->type == ISEQ_TYPE_EVAL) {
+		    goto redo_in_eval;
+		}
+
+		ip = ip->parent_iseq;
+	    }
+	    if (ip != 0) {
+		ADD_INSN(ret, line, putnil);
+		ADD_INSN1(ret, line, throw, INT2FIX(level | 0x05) /* TAG_REDO */ );
+
+		if (poped) {
+		    ADD_INSN(ret, line, pop);
+		}
+	    }
+	    else {
+		COMPILE_ERROR((ERROR_ARGS "Invalid redo"));
+	    }
+	}
+	break;
+      }
+      case NODE_RETRY:{
+	if (iseq->type == ISEQ_TYPE_RESCUE) {
+	    ADD_INSN(ret, line, putnil);
+	    ADD_INSN1(ret, line, throw, INT2FIX(0x04) /* TAG_RETRY */ );
+
+	    if (poped) {
+		ADD_INSN(ret, line, pop);
+	    }
+	}
+	else {
+	    COMPILE_ERROR((ERROR_ARGS "Invalid retry"));
+	}
+	break;
+      }
+      case NODE_BEGIN:{
+	COMPILE_(ret, "NODE_BEGIN", node->nd_body, poped);
+	break;
+      }
+      case NODE_RESCUE:{
+	LABEL *lstart = NEW_LABEL(line);
+	LABEL *lend = NEW_LABEL(line);
+	LABEL *lcont = NEW_LABEL(line);
+	VALUE rescue = NEW_CHILD_ISEQVAL(
+	    node->nd_resq,
+	    rb_str_concat(rb_str_new2("rescue in "), iseq->location.label),
+	    ISEQ_TYPE_RESCUE, line);
+
+	ADD_LABEL(ret, lstart);
+	COMPILE(ret, "rescue head", node->nd_head);
+	ADD_LABEL(ret, lend);
+	if (node->nd_else) {
+	    ADD_INSN(ret, line, pop);
+	    COMPILE(ret, "rescue else", node->nd_else);
+	}
+	ADD_INSN(ret, line, nop);
+	ADD_LABEL(ret, lcont);
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+
+	/* register catch entry */
+	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lcont);
+	ADD_CATCH_ENTRY(CATCH_TYPE_RETRY, lend, lcont, 0, lstart);
+	break;
+      }
+      case NODE_RESBODY:{
+	NODE *resq = node;
+	NODE *narg;
+	LABEL *label_miss, *label_hit;
+
+	while (resq) {
+	    label_miss = NEW_LABEL(line);
+	    label_hit = NEW_LABEL(line);
+
+	    narg = resq->nd_args;
+	    if (narg) {
+		switch (nd_type(narg)) {
+		  case NODE_ARRAY:
+		    while (narg) {
+			ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
+			COMPILE(ret, "rescue arg", narg->nd_head);
+			ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+			ADD_INSNL(ret, line, branchif, label_hit);
+			narg = narg->nd_next;
+		    }
+		    break;
+		  case NODE_SPLAT:
+		  case NODE_ARGSCAT:
+		  case NODE_ARGSPUSH:
+		    ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
+		    COMPILE(ret, "rescue/cond splat", narg);
+		    ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE | VM_CHECKMATCH_ARRAY));
+		    ADD_INSNL(ret, line, branchif, label_hit);
+		    break;
+		  default:
+		    rb_bug("NODE_RESBODY: unknown node (%s)",
+			   ruby_node_name(nd_type(narg)));
+		}
+	    }
+	    else {
+		ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
+		ADD_INSN1(ret, line, putobject, rb_eStandardError);
+		ADD_INSN1(ret, line, checkmatch, INT2FIX(VM_CHECKMATCH_TYPE_RESCUE));
+		ADD_INSNL(ret, line, branchif, label_hit);
+	    }
+	    ADD_INSNL(ret, line, jump, label_miss);
+	    ADD_LABEL(ret, label_hit);
+	    COMPILE(ret, "resbody body", resq->nd_body);
+	    if (iseq->compile_data->option->tailcall_optimization) {
+		ADD_INSN(ret, line, nop);
+	    }
+	    ADD_INSN(ret, line, leave);
+	    ADD_LABEL(ret, label_miss);
+	    resq = resq->nd_head;
+	}
+	break;
+      }
+      case NODE_ENSURE:{
+	DECL_ANCHOR(ensr);
+	VALUE ensure = NEW_CHILD_ISEQVAL(node->nd_ensr,
+					 rb_str_concat(rb_str_new2
+						       ("ensure in "),
+						       iseq->location.label),
+					 ISEQ_TYPE_ENSURE, line);
+	LABEL *lstart = NEW_LABEL(line);
+	LABEL *lend = NEW_LABEL(line);
+	LABEL *lcont = NEW_LABEL(line);
+	struct ensure_range er;
+	struct iseq_compile_data_ensure_node_stack enl;
+	struct ensure_range *erange;
+
+	INIT_ANCHOR(ensr);
+	COMPILE_POPED(ensr, "ensure ensr", node->nd_ensr);
+
+	er.begin = lstart;
+	er.end = lend;
+	er.next = 0;
+	push_ensure_entry(iseq, &enl, &er, node->nd_ensr);
+
+	ADD_LABEL(ret, lstart);
+	COMPILE_(ret, "ensure head", node->nd_head, poped);
+	ADD_LABEL(ret, lend);
+	if (ensr->anchor.next == 0) {
+	    ADD_INSN(ret, line, nop);
+	}
+	else {
+	    ADD_SEQ(ret, ensr);
+	}
+	ADD_LABEL(ret, lcont);
+
+	erange = iseq->compile_data->ensure_node_stack->erange;
+	while (erange) {
+	    ADD_CATCH_ENTRY(CATCH_TYPE_ENSURE, erange->begin, erange->end,
+			    ensure, lcont);
+	    erange = erange->next;
+	}
+
+	iseq->compile_data->ensure_node_stack = enl.prev;
+	break;
+      }
+
+      case NODE_AND:
+      case NODE_OR:{
+	LABEL *end_label = NEW_LABEL(line);
+	COMPILE(ret, "nd_1st", node->nd_1st);
+	if (!poped) {
+	    ADD_INSN(ret, line, dup);
+	}
+	if (type == NODE_AND) {
+	    ADD_INSNL(ret, line, branchunless, end_label);
+	}
+	else {
+	    ADD_INSNL(ret, line, branchif, end_label);
+	}
+	if (!poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	COMPILE_(ret, "nd_2nd", node->nd_2nd, poped);
+	ADD_LABEL(ret, end_label);
+	break;
+      }
+
+      case NODE_MASGN:{
+	compile_massign(iseq, ret, node, poped);
+	break;
+      }
+
+      case NODE_LASGN:{
+	ID id = node->nd_vid;
+	int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
+
+	debugs("lvar: %s idx: %d\n", rb_id2name(id), idx);
+	COMPILE(ret, "rvalue", node->nd_value);
+
+	if (!poped) {
+	    ADD_INSN(ret, line, dup);
+	}
+	ADD_INSN2(ret, line, setlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
+
+	break;
+      }
+      case NODE_DASGN:
+      case NODE_DASGN_CURR:{
+	int idx, lv, ls;
+	COMPILE(ret, "dvalue", node->nd_value);
+	debugp_param("dassn id", rb_str_new2(rb_id2name(node->nd_vid) ? rb_id2name(node->nd_vid) : "*"));
+
+	if (!poped) {
+	    ADD_INSN(ret, line, dup);
+	}
+
+	idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
+
+	if (idx < 0) {
+	    rb_bug("NODE_DASGN(_CURR): unknown id (%s)", rb_id2name(node->nd_vid));
+	}
+
+	ADD_INSN2(ret, line, setlocal, INT2FIX(ls - idx), INT2FIX(lv));
+	break;
+      }
+      case NODE_GASGN:{
+	COMPILE(ret, "lvalue", node->nd_value);
+
+	if (!poped) {
+	    ADD_INSN(ret, line, dup);
+	}
+	ADD_INSN1(ret, line, setglobal,
+		  ((VALUE)node->nd_entry | 1));
+	break;
+      }
+      case NODE_IASGN:
+      case NODE_IASGN2:{
+	COMPILE(ret, "lvalue", node->nd_value);
+	if (!poped) {
+	    ADD_INSN(ret, line, dup);
+	}
+	ADD_INSN2(ret, line, setinstancevariable,
+		  ID2SYM(node->nd_vid), INT2FIX(iseq->is_size++));
+	break;
+      }
+      case NODE_CDECL:{
+	COMPILE(ret, "lvalue", node->nd_value);
+
+	if (!poped) {
+	    ADD_INSN(ret, line, dup);
+	}
+
+	if (node->nd_vid) {
+	    ADD_INSN1(ret, line, putspecialobject,
+		      INT2FIX(VM_SPECIAL_OBJECT_CONST_BASE));
+	    ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_vid));
+	}
+	else {
+	    compile_cpath(ret, iseq, node->nd_else);
+	    ADD_INSN1(ret, line, setconstant, ID2SYM(node->nd_else->nd_mid));
+	}
+	break;
+      }
+      case NODE_CVASGN:{
+	COMPILE(ret, "cvasgn val", node->nd_value);
+	if (!poped) {
+	    ADD_INSN(ret, line, dup);
+	}
+	ADD_INSN1(ret, line, setclassvariable,
+		  ID2SYM(node->nd_vid));
+	break;
+      }
+      case NODE_OP_ASGN1: {
+	DECL_ANCHOR(args);
+	VALUE argc;
+	VALUE flag = 0;
+	ID id = node->nd_mid;
+	int boff = 0;
+
+	/*
+	 * a[x] (op)= y
+	 *
+	 * nil       # nil
+	 * eval a    # nil a
+	 * eval x    # nil a x
+	 * dupn 2    # nil a x a x
+	 * send :[]  # nil a x a[x]
+	 * eval y    # nil a x a[x] y
+	 * send op   # nil a x ret
+	 * setn 3    # ret a x ret
+	 * send []=  # ret ?
+	 * pop       # ret
+	 */
+
+	/*
+	 * nd_recv[nd_args->nd_body] (nd_mid)= nd_args->nd_head;
+	 * NODE_OP_ASGN nd_recv
+	 *              nd_args->nd_head
+	 *              nd_args->nd_body
+	 *              nd_mid
+	 */
+
+	if (!poped) {
+	    ADD_INSN(ret, line, putnil);
+	}
+	COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv);
+	switch (nd_type(node->nd_args->nd_head)) {
+	  case NODE_ZARRAY:
+	    argc = INT2FIX(0);
+	    break;
+	  case NODE_BLOCK_PASS:
+	    boff = 1;
+	  default:
+	    INIT_ANCHOR(args);
+	    argc = setup_args(iseq, args, node->nd_args->nd_head, &flag);
+	    ADD_SEQ(ret, args);
+	}
+	ADD_INSN1(ret, line, dupn, FIXNUM_INC(argc, 1 + boff));
+	ADD_SEND_R(ret, line, ID2SYM(idAREF), argc, Qfalse, LONG2FIX(flag));
+
+	if (id == 0 || id == 1) {
+	    /* 0: or, 1: and
+	       a[x] ||= y
+
+	       unless/if a[x]
+	       a[x]= y
+	       else
+	       nil
+	       end
+	    */
+	    LABEL *label = NEW_LABEL(line);
+	    LABEL *lfin = NEW_LABEL(line);
+
+	    ADD_INSN(ret, line, dup);
+	    if (id == 0) {
+		/* or */
+		ADD_INSNL(ret, line, branchif, label);
+	    }
+	    else {
+		/* and */
+		ADD_INSNL(ret, line, branchunless, label);
+	    }
+	    ADD_INSN(ret, line, pop);
+
+	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
+	    if (!poped) {
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
+	    }
+	    if (flag & VM_CALL_ARGS_SPLAT) {
+		ADD_INSN1(ret, line, newarray, INT2FIX(1));
+		if (boff > 0) {
+		    ADD_INSN1(ret, line, dupn, INT2FIX(3));
+		    ADD_INSN(ret, line, swap);
+		    ADD_INSN(ret, line, pop);
+		}
+		ADD_INSN(ret, line, concatarray);
+		if (boff > 0) {
+		    ADD_INSN1(ret, line, setn, INT2FIX(3));
+		    ADD_INSN(ret, line, pop);
+		    ADD_INSN(ret, line, pop);
+		}
+		ADD_SEND_R(ret, line, ID2SYM(idASET),
+			   argc, Qfalse, LONG2FIX(flag));
+	    }
+	    else {
+		if (boff > 0)
+		    ADD_INSN(ret, line, swap);
+		ADD_SEND_R(ret, line, ID2SYM(idASET),
+			   FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
+	    }
+	    ADD_INSN(ret, line, pop);
+	    ADD_INSNL(ret, line, jump, lfin);
+	    ADD_LABEL(ret, label);
+	    if (!poped) {
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
+	    }
+	    ADD_INSN1(ret, line, adjuststack, FIXNUM_INC(argc, 2+boff));
+	    ADD_LABEL(ret, lfin);
+	}
+	else {
+	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
+	    ADD_SEND(ret, line, ID2SYM(id), INT2FIX(1));
+	    if (!poped) {
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
+	    }
+	    if (flag & VM_CALL_ARGS_SPLAT) {
+		ADD_INSN1(ret, line, newarray, INT2FIX(1));
+		if (boff > 0) {
+		    ADD_INSN1(ret, line, dupn, INT2FIX(3));
+		    ADD_INSN(ret, line, swap);
+		    ADD_INSN(ret, line, pop);
+		}
+		ADD_INSN(ret, line, concatarray);
+		if (boff > 0) {
+		    ADD_INSN1(ret, line, setn, INT2FIX(3));
+		    ADD_INSN(ret, line, pop);
+		    ADD_INSN(ret, line, pop);
+		}
+		ADD_SEND_R(ret, line, ID2SYM(idASET),
+			   argc, Qfalse, LONG2FIX(flag));
+	    }
+	    else {
+		if (boff > 0)
+		    ADD_INSN(ret, line, swap);
+		ADD_SEND_R(ret, line, ID2SYM(idASET),
+			   FIXNUM_INC(argc, 1), Qfalse, LONG2FIX(flag));
+	    }
+	    ADD_INSN(ret, line, pop);
+	}
+
+	break;
+      }
+      case NODE_OP_ASGN2:{
+	ID atype = node->nd_next->nd_mid;
+	LABEL *lfin = NEW_LABEL(line);
+	LABEL *lcfin = NEW_LABEL(line);
+	/*
+	  class C; attr_accessor :c; end
+	  r = C.new
+	  r.a &&= v # asgn2
+
+	  eval r    # r
+	  dup       # r r
+	  eval r.a  # r o
+
+	  # or
+	  dup       # r o o
+	  if lcfin  # r o
+	  pop       # r
+	  eval v    # r v
+	  swap      # v r
+	  topn 1    # v r v
+	  send a=   # v ?
+	  jump lfin # v ?
+
+	  lcfin:      # r o
+	  swap      # o r
+
+	  lfin:       # o ?
+	  pop       # o
+
+	  # and
+	  dup       # r o o
+	  unless lcfin
+	  pop       # r
+	  eval v    # r v
+	  swap      # v r
+	  topn 1    # v r v
+	  send a=   # v ?
+	  jump lfin # v ?
+
+	  # others
+	  eval v    # r o v
+	  send ??   # r w
+	  send a=   # w
+
+	*/
+
+	COMPILE(ret, "NODE_OP_ASGN2#recv", node->nd_recv);
+	ADD_INSN(ret, line, dup);
+	ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_vid),
+		 INT2FIX(0));
+
+	if (atype == 0 || atype == 1) {	/* 0: OR or 1: AND */
+	    ADD_INSN(ret, line, dup);
+	    if (atype == 0) {
+		ADD_INSNL(ret, line, branchif, lcfin);
+	    }
+	    else {
+		ADD_INSNL(ret, line, branchunless, lcfin);
+	    }
+	    ADD_INSN(ret, line, pop);
+	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
+	    ADD_INSN(ret, line, swap);
+	    ADD_INSN1(ret, line, topn, INT2FIX(1));
+	    ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_aid),
+		     INT2FIX(1));
+	    ADD_INSNL(ret, line, jump, lfin);
+
+	    ADD_LABEL(ret, lcfin);
+	    ADD_INSN(ret, line, swap);
+
+	    ADD_LABEL(ret, lfin);
+	    ADD_INSN(ret, line, pop);
+	    if (poped) {
+		/* we can apply more optimize */
+		ADD_INSN(ret, line, pop);
+	    }
+	}
+	else {
+	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
+	    ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_mid),
+		     INT2FIX(1));
+	    if (!poped) {
+		ADD_INSN(ret, line, swap);
+		ADD_INSN1(ret, line, topn, INT2FIX(1));
+	    }
+	    ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_aid),
+		     INT2FIX(1));
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_OP_CDECL: {
+	LABEL *lfin = 0;
+	LABEL *lassign = 0;
+	ID mid;
+
+	switch (nd_type(node->nd_head)) {
+	  case NODE_COLON3:
+	    ADD_INSN1(ret, line, putobject, rb_cObject);
+	    break;
+	  case NODE_COLON2:
+	    COMPILE(ret, "NODE_OP_CDECL/colon2#nd_head", node->nd_head->nd_head);
+	    break;
+	  default:
+	    do {
+		COMPILE_ERROR((ERROR_ARGS "%s: invalid node in NODE_OP_CDECL",
+			       ruby_node_name(nd_type(node->nd_head))));
+	    } while (0);
+	    return COMPILE_NG;
+	}
+	mid = node->nd_head->nd_mid;
+	/* cref */
+	if (node->nd_aid == 0) {
+	    lassign = NEW_LABEL(line);
+	    ADD_INSN(ret, line, dup); /* cref cref */
+	    ADD_INSN3(ret, line, defined, INT2FIX(DEFINED_CONST),
+		      ID2SYM(mid), Qfalse); /* cref bool */
+	    ADD_INSNL(ret, line, branchunless, lassign); /* cref */
+	}
+	ADD_INSN(ret, line, dup); /* cref cref */
+	ADD_INSN1(ret, line, getconstant, ID2SYM(mid)); /* cref obj */
+
+	if (node->nd_aid == 0 || node->nd_aid == 1) {
+	    lfin = NEW_LABEL(line);
+	    if (!poped) ADD_INSN(ret, line, dup); /* cref [obj] obj */
+	    if (node->nd_aid == 0)
+		ADD_INSNL(ret, line, branchif, lfin);
+	    else
+		ADD_INSNL(ret, line, branchunless, lfin);
+	    /* cref [obj] */
+	    if (!poped) ADD_INSN(ret, line, pop); /* cref */
+	    if (lassign) ADD_LABEL(ret, lassign);
+	    COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value);
+	    /* cref value */
+	    if (poped)
+		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* cref value cref */
+	    else {
+		ADD_INSN1(ret, line, dupn, INT2FIX(2)); /* cref value cref value */
+		ADD_INSN(ret, line, swap); /* cref value value cref */
+	    }
+	    ADD_INSN1(ret, line, setconstant, ID2SYM(mid)); /* cref [value] */
+	    ADD_LABEL(ret, lfin);			    /* cref [value] */
+	    if (!poped) ADD_INSN(ret, line, swap); /* [value] cref */
+	    ADD_INSN(ret, line, pop); /* [value] */
+	}
+	else {
+	    COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value);
+	    /* cref obj value */
+	    ADD_CALL(ret, line, ID2SYM(node->nd_aid), INT2FIX(1));
+	    /* cref value */
+	    ADD_INSN(ret, line, swap); /* value cref */
+	    if (!poped) {
+		ADD_INSN1(ret, line, topn, INT2FIX(1)); /* value cref value */
+		ADD_INSN(ret, line, swap); /* value value cref */
+	    }
+	    ADD_INSN1(ret, line, setconstant, ID2SYM(mid));
+	}
+	break;
+      }
+      case NODE_OP_ASGN_AND:
+      case NODE_OP_ASGN_OR:{
+	LABEL *lfin = NEW_LABEL(line);
+	LABEL *lassign;
+
+	if (nd_type(node) == NODE_OP_ASGN_OR) {
+	    LABEL *lfinish[2];
+	    lfinish[0] = lfin;
+	    lfinish[1] = 0;
+	    defined_expr(iseq, ret, node->nd_head, lfinish, Qfalse);
+	    lassign = lfinish[1];
+	    if (!lassign) {
+		lassign = NEW_LABEL(line);
+	    }
+	    ADD_INSNL(ret, line, branchunless, lassign);
+	}
+	else {
+	    lassign = NEW_LABEL(line);
+	}
+
+	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_head", node->nd_head);
+	ADD_INSN(ret, line, dup);
+
+	if (nd_type(node) == NODE_OP_ASGN_AND) {
+	    ADD_INSNL(ret, line, branchunless, lfin);
+	}
+	else {
+	    ADD_INSNL(ret, line, branchif, lfin);
+	}
+
+	ADD_INSN(ret, line, pop);
+	ADD_LABEL(ret, lassign);
+	COMPILE(ret, "NODE_OP_ASGN_AND/OR#nd_value", node->nd_value);
+	ADD_LABEL(ret, lfin);
+
+	if (poped) {
+	    /* we can apply more optimize */
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_CALL:
+	if (node->nd_recv && nd_type(node->nd_recv) == NODE_STR &&
+	    node->nd_mid == idFreeze && node->nd_args == NULL)
+	{
+	    VALUE str = rb_fstring(node->nd_recv->nd_lit);
+	    iseq_add_mark_object(iseq, str);
+	    ADD_INSN1(ret, line, opt_str_freeze, str);
+	    if (poped) {
+		ADD_INSN(ret, line, pop);
+	    }
+	    break;
+	}
+      case NODE_FCALL:
+      case NODE_VCALL:{		/* VCALL: variable or call */
+	/*
+	  call:  obj.method(...)
+	  fcall: func(...)
+	  vcall: func
+	*/
+	DECL_ANCHOR(recv);
+	DECL_ANCHOR(args);
+	ID mid = node->nd_mid;
+	VALUE argc;
+	VALUE flag = 0;
+	VALUE parent_block = iseq->compile_data->current_block;
+	iseq->compile_data->current_block = Qfalse;
+
+	INIT_ANCHOR(recv);
+	INIT_ANCHOR(args);
+#if SUPPORT_JOKE
+	if (nd_type(node) == NODE_VCALL) {
+	    ID id_bitblt;
+	    ID id_answer;
+
+	    CONST_ID(id_bitblt, "bitblt");
+	    CONST_ID(id_answer, "the_answer_to_life_the_universe_and_everything");
+
+	    if (mid == id_bitblt) {
+		ADD_INSN(ret, line, bitblt);
+		break;
+	    }
+	    else if (mid == id_answer) {
+		ADD_INSN(ret, line, answer);
+		break;
+	    }
+	}
+	/* only joke */
+	{
+	    ID goto_id;
+	    ID label_id;
+
+	    CONST_ID(goto_id, "__goto__");
+	    CONST_ID(label_id, "__label__");
+
+	    if (nd_type(node) == NODE_FCALL &&
+		(mid == goto_id || mid == label_id)) {
+		LABEL *label;
+		st_data_t data;
+		st_table *labels_table = iseq->compile_data->labels_table;
+		ID label_name;
+
+		if (!labels_table) {
+		    labels_table = st_init_numtable();
+		    iseq->compile_data->labels_table = labels_table;
+		}
+		if (nd_type(node->nd_args->nd_head) == NODE_LIT &&
+		    SYMBOL_P(node->nd_args->nd_head->nd_lit)) {
+
+		    label_name = SYM2ID(node->nd_args->nd_head->nd_lit);
+		    if (!st_lookup(labels_table, (st_data_t)label_name, &data)) {
+			label = NEW_LABEL(line);
+			label->position = line;
+			st_insert(labels_table, (st_data_t)label_name, (st_data_t)label);
+		    }
+		    else {
+			label = (LABEL *)data;
+		    }
+		}
+		else {
+		    COMPILE_ERROR((ERROR_ARGS "invalid goto/label format"));
+		}
+
+
+		if (mid == goto_id) {
+		    ADD_INSNL(ret, line, jump, label);
+		}
+		else {
+		    ADD_LABEL(ret, label);
+		}
+		break;
+	    }
+	}
+#endif
+	/* receiver */
+	if (type == NODE_CALL) {
+	    COMPILE(recv, "recv", node->nd_recv);
+	}
+	else if (type == NODE_FCALL || type == NODE_VCALL) {
+	    ADD_CALL_RECEIVER(recv, line);
+	}
+
+	/* args */
+	if (nd_type(node) != NODE_VCALL) {
+	    argc = setup_args(iseq, args, node->nd_args, &flag);
+	}
+	else {
+	    argc = INT2FIX(0);
+	}
+
+	ADD_SEQ(ret, recv);
+	ADD_SEQ(ret, args);
+
+	debugp_param("call args argc", argc);
+	debugp_param("call method", ID2SYM(mid));
+
+	switch (nd_type(node)) {
+	  case NODE_VCALL:
+	    flag |= VM_CALL_VCALL;
+	    /* VCALL is funcall, so fall through */
+	  case NODE_FCALL:
+	    flag |= VM_CALL_FCALL;
+	}
+
+	ADD_SEND_R(ret, line, ID2SYM(mid),
+		   argc, parent_block, LONG2FIX(flag));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_SUPER:
+      case NODE_ZSUPER:{
+	DECL_ANCHOR(args);
+	int argc;
+	VALUE flag = 0;
+	VALUE parent_block = iseq->compile_data->current_block;
+
+	INIT_ANCHOR(args);
+	iseq->compile_data->current_block = Qfalse;
+	if (nd_type(node) == NODE_SUPER) {
+	    VALUE vargc = setup_args(iseq, args, node->nd_args, &flag);
+	    argc = FIX2INT(vargc);
+	}
+	else {
+	    /* NODE_ZSUPER */
+	    int i;
+	    rb_iseq_t *liseq = iseq->local_iseq;
+	    int lvar_level = get_lvar_level(iseq);
+
+	    argc = liseq->argc;
+
+	    /* normal arguments */
+	    for (i = 0; i < liseq->argc; i++) {
+		int idx = liseq->local_size - i;
+		ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+	    }
+
+	    if (!liseq->arg_simple) {
+		if (liseq->arg_opts) {
+		    /* optional arguments */
+		    int j;
+		    for (j = 0; j < liseq->arg_opts - 1; j++) {
+			int idx = liseq->local_size - (i + j);
+			ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		    }
+		    i += j;
+		    argc = i;
+		}
+
+		if (liseq->arg_rest != -1) {
+		    /* rest argument */
+		    int idx = liseq->local_size - liseq->arg_rest;
+		    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		    argc = liseq->arg_rest + 1;
+		    flag |= VM_CALL_ARGS_SPLAT;
+		}
+
+		if (liseq->arg_post_len) {
+		    /* post arguments */
+		    int post_len = liseq->arg_post_len;
+		    int post_start = liseq->arg_post_start;
+
+		    if (liseq->arg_rest != -1) {
+			int j;
+			for (j=0; j<post_len; j++) {
+			    int idx = liseq->local_size - (post_start + j);
+			    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+			}
+			ADD_INSN1(args, line, newarray, INT2FIX(j));
+			ADD_INSN (args, line, concatarray);
+			/* argc is settled at above */
+		    }
+		    else {
+			int j;
+			for (j=0; j<post_len; j++) {
+			    int idx = liseq->local_size - (post_start + j);
+			    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+			}
+			argc = post_len + post_start;
+		    }
+		}
+
+		if (liseq->arg_keyword >= 0) {
+		    int local_size = liseq->local_size;
+		    int idx = local_size - liseq->arg_keyword;
+		    argc++;
+		    ADD_INSN1(args, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+		    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		    ADD_SEND (args, line, ID2SYM(rb_intern("dup")), INT2FIX(0));
+		    for (i = 0; i < liseq->arg_keywords; ++i) {
+			ID id = liseq->arg_keyword_table[i];
+			idx = local_size - get_local_var_idx(liseq, id);
+			ADD_INSN1(args, line, putobject, ID2SYM(id));
+			ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		    }
+		    ADD_SEND(args, line, ID2SYM(id_core_hash_merge_ptr), INT2FIX(i * 2 + 1));
+		    if (liseq->arg_rest != -1) {
+			ADD_INSN1(args, line, newarray, INT2FIX(1));
+			ADD_INSN (args, line, concatarray);
+			--argc;
+		    }
+		}
+	    }
+	}
+
+	/* dummy receiver */
+	ADD_INSN1(ret, line, putobject, nd_type(node) == NODE_ZSUPER ? Qfalse : Qtrue);
+	ADD_SEQ(ret, args);
+	ADD_INSN1(ret, line, invokesuper, new_callinfo(iseq, 0, argc, parent_block,
+								flag | VM_CALL_SUPER | VM_CALL_FCALL));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_ARRAY:{
+	compile_array_(iseq, ret, node, COMPILE_ARRAY_TYPE_ARRAY, poped);
+	break;
+      }
+      case NODE_ZARRAY:{
+	if (!poped) {
+	    ADD_INSN1(ret, line, newarray, INT2FIX(0));
+	}
+	break;
+      }
+      case NODE_VALUES:{
+	NODE *n = node;
+	while (n) {
+	    COMPILE(ret, "values item", n->nd_head);
+	    n = n->nd_next;
+	}
+	ADD_INSN1(ret, line, newarray, INT2FIX(node->nd_alen));
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_HASH:{
+	DECL_ANCHOR(list);
+	int type = node->nd_head ? nd_type(node->nd_head) : NODE_ZARRAY;
+
+	INIT_ANCHOR(list);
+	switch (type) {
+	  case NODE_ARRAY:
+	    compile_array(iseq, list, node->nd_head, COMPILE_ARRAY_TYPE_HASH);
+	    ADD_SEQ(ret, list);
+	    break;
+
+	  case NODE_ZARRAY:
+	    ADD_INSN1(ret, line, newhash, INT2FIX(0));
+	    break;
+
+	  default:
+	    rb_bug("can't make hash with this node: %s", ruby_node_name(type));
+	}
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_RETURN:{
+	rb_iseq_t *is = iseq;
+
+	if (is) {
+	    if (is->type == ISEQ_TYPE_TOP) {
+		COMPILE_ERROR((ERROR_ARGS "Invalid return"));
+	    }
+	    else {
+		LABEL *splabel = 0;
+
+		if (is->type == ISEQ_TYPE_METHOD) {
+		    splabel = NEW_LABEL(0);
+		    ADD_LABEL(ret, splabel);
+		    ADD_ADJUST(ret, line, 0);
+		}
+
+		COMPILE(ret, "return nd_stts (return val)", node->nd_stts);
+
+		if (is->type == ISEQ_TYPE_METHOD) {
+		    add_ensure_iseq(ret, iseq, 1);
+		    ADD_TRACE(ret, line, RUBY_EVENT_RETURN);
+		    ADD_INSN(ret, line, leave);
+		    ADD_ADJUST_RESTORE(ret, splabel);
+
+		    if (!poped) {
+			ADD_INSN(ret, line, putnil);
+		    }
+		}
+		else {
+		    ADD_INSN1(ret, line, throw, INT2FIX(0x01) /* TAG_RETURN */ );
+		    if (poped) {
+			ADD_INSN(ret, line, pop);
+		    }
+		}
+	    }
+	}
+	break;
+      }
+      case NODE_YIELD:{
+	DECL_ANCHOR(args);
+	VALUE argc;
+	VALUE flag = 0;
+
+	INIT_ANCHOR(args);
+	if (iseq->type == ISEQ_TYPE_TOP) {
+	    COMPILE_ERROR((ERROR_ARGS "Invalid yield"));
+	}
+
+	if (node->nd_head) {
+	    argc = setup_args(iseq, args, node->nd_head, &flag);
+	}
+	else {
+	    argc = INT2FIX(0);
+	}
+
+	ADD_SEQ(ret, args);
+	ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), 0, flag));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_LVAR:{
+	if (!poped) {
+	    ID id = node->nd_vid;
+	    int idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
+
+	    debugs("id: %s idx: %d\n", rb_id2name(id), idx);
+	    ADD_INSN2(ret, line, getlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
+	}
+	break;
+      }
+      case NODE_DVAR:{
+	int lv, idx, ls;
+	debugi("nd_vid", node->nd_vid);
+	if (!poped) {
+	    idx = get_dyna_var_idx(iseq, node->nd_vid, &lv, &ls);
+	    if (idx < 0) {
+		rb_bug("unknown dvar (%s)", rb_id2name(node->nd_vid));
+	    }
+	    ADD_INSN2(ret, line, getlocal, INT2FIX(ls - idx), INT2FIX(lv));
+	}
+	break;
+      }
+      case NODE_GVAR:{
+	ADD_INSN1(ret, line, getglobal,
+		  ((VALUE)node->nd_entry | 1));
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_IVAR:{
+	debugi("nd_vid", node->nd_vid);
+	if (!poped) {
+	    ADD_INSN2(ret, line, getinstancevariable,
+		      ID2SYM(node->nd_vid), INT2FIX(iseq->is_size++));
+	}
+	break;
+      }
+      case NODE_CONST:{
+	debugi("nd_vid", node->nd_vid);
+
+	if (iseq->compile_data->option->inline_const_cache) {
+	    LABEL *lend = NEW_LABEL(line);
+	    int ic_index = iseq->is_size++;
+
+	    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
+	    ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
+	    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
+	    ADD_LABEL(ret, lend);
+	}
+	else {
+	    ADD_INSN(ret, line, putnil);
+	    ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_vid));
+	}
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_CVAR:{
+	if (!poped) {
+	    ADD_INSN1(ret, line, getclassvariable,
+		      ID2SYM(node->nd_vid));
+	}
+	break;
+      }
+      case NODE_NTH_REF:{
+        if (!poped) {
+	    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~'  */,
+		      INT2FIX(node->nd_nth << 1));
+	}
+	break;
+      }
+      case NODE_BACK_REF:{
+	if (!poped) {
+	    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~' */,
+		      INT2FIX(0x01 | (node->nd_nth << 1)));
+	}
+	break;
+      }
+      case NODE_MATCH:
+      case NODE_MATCH2:
+      case NODE_MATCH3:{
+	DECL_ANCHOR(recv);
+	DECL_ANCHOR(val);
+
+	INIT_ANCHOR(recv);
+	INIT_ANCHOR(val);
+	switch (nd_type(node)) {
+	  case NODE_MATCH:
+	    ADD_INSN1(recv, line, putobject, node->nd_lit);
+	    ADD_INSN2(val, line, getspecial, INT2FIX(0),
+		      INT2FIX(0));
+	    break;
+	  case NODE_MATCH2:
+	    COMPILE(recv, "receiver", node->nd_recv);
+	    COMPILE(val, "value", node->nd_value);
+	    break;
+	  case NODE_MATCH3:
+	    COMPILE(recv, "receiver", node->nd_value);
+	    COMPILE(val, "value", node->nd_recv);
+	    break;
+	}
+
+	if (iseq->compile_data->option->specialized_instruction) {
+	    /* TODO: detect by node */
+	    if (recv->last == recv->anchor.next &&
+		INSN_OF(recv->last) == BIN(putobject) &&
+		nd_type(node) == NODE_MATCH2) {
+		ADD_SEQ(ret, val);
+		ADD_INSN1(ret, line, opt_regexpmatch1,
+			  OPERAND_AT(recv->last, 0));
+	    }
+	    else {
+		ADD_SEQ(ret, recv);
+		ADD_SEQ(ret, val);
+		ADD_INSN1(ret, line, opt_regexpmatch2, new_callinfo(iseq, idEqTilde, 1, 0, 0));
+	    }
+	}
+	else {
+	    ADD_SEQ(ret, recv);
+	    ADD_SEQ(ret, val);
+	    ADD_SEND(ret, line, ID2SYM(idEqTilde), INT2FIX(1));
+	}
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_LIT:{
+	debugp_param("lit", node->nd_lit);
+	if (!poped) {
+	    ADD_INSN1(ret, line, putobject, node->nd_lit);
+	}
+	break;
+      }
+      case NODE_STR:{
+	debugp_param("nd_lit", node->nd_lit);
+	if (!poped) {
+	    OBJ_FREEZE(node->nd_lit);
+	    ADD_INSN1(ret, line, putstring, node->nd_lit);
+	}
+	break;
+      }
+      case NODE_DSTR:{
+	compile_dstr(iseq, ret, node);
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_XSTR:{
+	OBJ_FREEZE(node->nd_lit);
+	ADD_CALL_RECEIVER(ret, line);
+	ADD_INSN1(ret, line, putobject, node->nd_lit);
+	ADD_CALL(ret, line, ID2SYM(idBackquote), INT2FIX(1));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_DXSTR:{
+	ADD_CALL_RECEIVER(ret, line);
+	compile_dstr(iseq, ret, node);
+	ADD_CALL(ret, line, ID2SYM(idBackquote), INT2FIX(1));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_EVSTR:{
+	COMPILE(ret, "nd_body", node->nd_body);
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	else {
+	    ADD_INSN(ret, line, tostring);
+	}
+	break;
+      }
+      case NODE_DREGX:{
+	compile_dregx(iseq, ret, node);
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_DREGX_ONCE:{
+	int ic_index = iseq->is_size++;
+	NODE *dregx_node = NEW_NODE(NODE_DREGX, node->u1.value, node->u2.value, node->u3.value);
+	NODE *block_node = NEW_NODE(NODE_SCOPE, 0, dregx_node, 0);
+	VALUE block_iseq = NEW_CHILD_ISEQVAL(block_node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+
+	ADD_INSN2(ret, line, once, block_iseq, INT2FIX(ic_index));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_ARGSCAT:{
+	if (poped) {
+	    COMPILE(ret, "argscat head", node->nd_head);
+	    ADD_INSN1(ret, line, splatarray, Qfalse);
+	    ADD_INSN(ret, line, pop);
+	    COMPILE(ret, "argscat body", node->nd_body);
+	    ADD_INSN1(ret, line, splatarray, Qfalse);
+	    ADD_INSN(ret, line, pop);
+	}
+	else {
+	    COMPILE(ret, "argscat head", node->nd_head);
+	    COMPILE(ret, "argscat body", node->nd_body);
+	    ADD_INSN(ret, line, concatarray);
+	}
+	break;
+      }
+      case NODE_ARGSPUSH:{
+	if (poped) {
+	    COMPILE(ret, "arsgpush head", node->nd_head);
+	    ADD_INSN1(ret, line, splatarray, Qfalse);
+	    ADD_INSN(ret, line, pop);
+	    COMPILE_(ret, "argspush body", node->nd_body, poped);
+	}
+	else {
+	    COMPILE(ret, "arsgpush head", node->nd_head);
+	    COMPILE_(ret, "argspush body", node->nd_body, poped);
+	    ADD_INSN1(ret, line, newarray, INT2FIX(1));
+	    ADD_INSN(ret, line, concatarray);
+	}
+	break;
+      }
+      case NODE_SPLAT:{
+	COMPILE(ret, "splat", node->nd_head);
+	ADD_INSN1(ret, line, splatarray, Qtrue);
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_DEFN:{
+	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
+				    rb_str_dup(rb_id2str(node->nd_mid)),
+				    ISEQ_TYPE_METHOD, line);
+
+	debugp_param("defn/iseq", iseqval);
+
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid));
+	ADD_INSN1(ret, line, putiseq, iseqval);
+	ADD_SEND (ret, line, ID2SYM(id_core_define_method), INT2FIX(3));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+
+	debugp_param("defn", iseqval);
+	break;
+      }
+      case NODE_DEFS:{
+	VALUE iseqval = NEW_ISEQVAL(node->nd_defn,
+				    rb_str_dup(rb_id2str(node->nd_mid)),
+				    ISEQ_TYPE_METHOD, line);
+
+	debugp_param("defs/iseq", iseqval);
+
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	COMPILE(ret, "defs: recv", node->nd_recv);
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->nd_mid));
+	ADD_INSN1(ret, line, putiseq, iseqval);
+	ADD_SEND (ret, line, ID2SYM(id_core_define_singleton_method), INT2FIX(3));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_ALIAS:{
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	COMPILE(ret, "alias arg1", node->u1.node);
+	COMPILE(ret, "alias arg2", node->u2.node);
+	ADD_SEND(ret, line, ID2SYM(id_core_set_method_alias), INT2FIX(3));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_VALIAS:{
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->u1.id));
+	ADD_INSN1(ret, line, putobject, ID2SYM(node->u2.id));
+	ADD_SEND(ret, line, ID2SYM(id_core_set_variable_alias), INT2FIX(2));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_UNDEF:{
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_CBASE));
+	COMPILE(ret, "undef arg", node->u2.node);
+	ADD_SEND(ret, line, ID2SYM(id_core_undef_method), INT2FIX(2));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_CLASS:{
+	VALUE iseqval =
+	    NEW_CHILD_ISEQVAL(
+		node->nd_body,
+		rb_sprintf("<class:%s>", rb_id2name(node->nd_cpath->nd_mid)),
+		ISEQ_TYPE_CLASS, line);
+	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
+	int flags = VM_DEFINECLASS_TYPE_CLASS;
+	if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED;
+	if (node->nd_super) flags |= VM_DEFINECLASS_FLAG_HAS_SUPERCLASS;
+	COMPILE(ret, "super", node->nd_super);
+	ADD_INSN3(ret, line, defineclass,
+		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(flags));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_MODULE:{
+	VALUE iseqval = NEW_CHILD_ISEQVAL(
+	    node->nd_body,
+	    rb_sprintf("<module:%s>", rb_id2name(node->nd_cpath->nd_mid)),
+	    ISEQ_TYPE_CLASS, line);
+
+	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
+	int flags = VM_DEFINECLASS_TYPE_MODULE;
+	if (!noscope) flags |= VM_DEFINECLASS_FLAG_SCOPED;
+	ADD_INSN (ret, line, putnil); /* dummy */
+	ADD_INSN3(ret, line, defineclass,
+		  ID2SYM(node->nd_cpath->nd_mid), iseqval, INT2FIX(flags));
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_SCLASS:{
+	ID singletonclass;
+	VALUE iseqval =
+	    NEW_ISEQVAL(node->nd_body, rb_str_new2("singleton class"),
+			ISEQ_TYPE_CLASS, line);
+
+	COMPILE(ret, "sclass#recv", node->nd_recv);
+	ADD_INSN (ret, line, putnil);
+	CONST_ID(singletonclass, "singletonclass");
+	ADD_INSN3(ret, line, defineclass,
+		  ID2SYM(singletonclass), iseqval,
+		  INT2FIX(VM_DEFINECLASS_TYPE_SINGLETON_CLASS));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_COLON2:{
+	if (rb_is_const_id(node->nd_mid)) {
+	    /* constant */
+	    LABEL *lend = NEW_LABEL(line);
+	    int ic_index = iseq->is_size++;
+
+	    DECL_ANCHOR(pref);
+	    DECL_ANCHOR(body);
+
+	    INIT_ANCHOR(pref);
+	    INIT_ANCHOR(body);
+	    compile_colon2(iseq, node, pref, body);
+	    if (LIST_SIZE_ZERO(pref)) {
+		if (iseq->compile_data->option->inline_const_cache) {
+		    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
+		}
+		else {
+		    ADD_INSN(ret, line, putnil);
+		}
+
+		ADD_SEQ(ret, body);
+
+		if (iseq->compile_data->option->inline_const_cache) {
+		    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
+		    ADD_LABEL(ret, lend);
+		}
+	    }
+	    else {
+		ADD_SEQ(ret, pref);
+		ADD_SEQ(ret, body);
+	    }
+	}
+	else {
+	    /* function call */
+	    ADD_CALL_RECEIVER(ret, line);
+	    COMPILE(ret, "colon2#nd_head", node->nd_head);
+	    ADD_CALL(ret, line, ID2SYM(node->nd_mid),
+		     INT2FIX(1));
+	}
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_COLON3:{
+	LABEL *lend = NEW_LABEL(line);
+	int ic_index = iseq->is_size++;
+
+	debugi("colon3#nd_mid", node->nd_mid);
+
+	/* add cache insn */
+	if (iseq->compile_data->option->inline_const_cache) {
+	    ADD_INSN2(ret, line, getinlinecache, lend, INT2FIX(ic_index));
+	    ADD_INSN(ret, line, pop);
+	}
+
+	ADD_INSN1(ret, line, putobject, rb_cObject);
+	ADD_INSN1(ret, line, getconstant, ID2SYM(node->nd_mid));
+
+	if (iseq->compile_data->option->inline_const_cache) {
+	    ADD_INSN1(ret, line, setinlinecache, INT2FIX(ic_index));
+	    ADD_LABEL(ret, lend);
+	}
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_DOT2:
+      case NODE_DOT3:{
+	VALUE flag = type == NODE_DOT2 ? INT2FIX(0) : INT2FIX(1);
+	COMPILE(ret, "min", (NODE *) node->nd_beg);
+	COMPILE(ret, "max", (NODE *) node->nd_end);
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	    ADD_INSN(ret, line, pop);
+	}
+	else {
+	    ADD_INSN1(ret, line, newrange, flag);
+	}
+	break;
+      }
+      case NODE_FLIP2:
+      case NODE_FLIP3:{
+	LABEL *lend = NEW_LABEL(line);
+	LABEL *lfin = NEW_LABEL(line);
+	LABEL *ltrue = NEW_LABEL(line);
+	rb_iseq_t *local_iseq = iseq->local_iseq;
+	rb_num_t cnt;
+	VALUE key;
+
+	cnt = local_iseq->flip_cnt++ + DEFAULT_SPECIAL_VAR_COUNT;
+	key = INT2FIX(cnt);
+
+	ADD_INSN2(ret, line, getspecial, key, INT2FIX(0));
+	ADD_INSNL(ret, line, branchif, lend);
+
+	/* *flip == 0 */
+	COMPILE(ret, "flip2 beg", node->nd_beg);
+	ADD_INSN(ret, line, dup);
+	ADD_INSNL(ret, line, branchunless, lfin);
+	if (nd_type(node) == NODE_FLIP3) {
+	    ADD_INSN(ret, line, dup);
+	    ADD_INSN1(ret, line, setspecial, key);
+	    ADD_INSNL(ret, line, jump, lfin);
+	}
+	else {
+	    ADD_INSN1(ret, line, setspecial, key);
+	}
+
+	/* *flip == 1 */
+	ADD_LABEL(ret, lend);
+	COMPILE(ret, "flip2 end", node->nd_end);
+	ADD_INSNL(ret, line, branchunless, ltrue);
+	ADD_INSN1(ret, line, putobject, Qfalse);
+	ADD_INSN1(ret, line, setspecial, key);
+
+	ADD_LABEL(ret, ltrue);
+	ADD_INSN1(ret, line, putobject, Qtrue);
+
+	ADD_LABEL(ret, lfin);
+	break;
+      }
+      case NODE_SELF:{
+	if (!poped) {
+	    ADD_INSN(ret, line, putself);
+	}
+	break;
+      }
+      case NODE_NIL:{
+	if (!poped) {
+	    ADD_INSN(ret, line, putnil);
+	}
+	break;
+      }
+      case NODE_TRUE:{
+	if (!poped) {
+	    ADD_INSN1(ret, line, putobject, Qtrue);
+	}
+	break;
+      }
+      case NODE_FALSE:{
+	if (!poped) {
+	    ADD_INSN1(ret, line, putobject, Qfalse);
+	}
+	break;
+      }
+      case NODE_ERRINFO:{
+	if (!poped) {
+	    if (iseq->type == ISEQ_TYPE_RESCUE) {
+		ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(0));
+	    }
+	    else {
+		rb_iseq_t *ip = iseq;
+		int level = 0;
+		while (ip) {
+		    if (ip->type == ISEQ_TYPE_RESCUE) {
+			break;
+		    }
+		    ip = ip->parent_iseq;
+		    level++;
+		}
+		if (ip) {
+		    ADD_INSN2(ret, line, getlocal, INT2FIX(2), INT2FIX(level));
+		}
+		else {
+		    ADD_INSN(ret, line, putnil);
+		}
+	    }
+	}
+	break;
+      }
+      case NODE_DEFINED:{
+	if (poped) break;
+	if (!node->nd_head) {
+	    VALUE str = rb_iseq_defined_string(DEFINED_NIL);
+	    ADD_INSN1(ret, nd_line(node), putobject, str);
+	}
+	else {
+	    LABEL *lfinish[2];
+	    lfinish[0] = NEW_LABEL(line);
+	    lfinish[1] = 0;
+	    ADD_INSN(ret, line, putnil);
+	    defined_expr(iseq, ret, node->nd_head, lfinish, Qtrue);
+	    ADD_INSN(ret, line, swap);
+	    ADD_INSN(ret, line, pop);
+	    if (lfinish[1]) {
+		ADD_LABEL(ret, lfinish[1]);
+	    }
+	    ADD_LABEL(ret, lfinish[0]);
+	}
+	break;
+      }
+      case NODE_POSTEXE:{
+	/* compiled to:
+	 *   ONCE{ rb_mRubyVMFrozenCore::core#set_postexe{ ... } }
+	 */
+	int is_index = iseq->is_size++;
+	VALUE once_iseq = NEW_CHILD_ISEQVAL(
+	    NEW_IFUNC(build_postexe_iseq, node->nd_body),
+	    make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+
+	ADD_INSN2(ret, line, once, once_iseq, INT2FIX(is_index));
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_KW_ARG:{
+	LABEL *default_label = NEW_LABEL(line);
+	LABEL *end_label = 0;
+	int idx, lv, ls;
+	ID id = node->nd_body->nd_vid;
+
+	ADD_INSN(ret, line, dup);
+	ADD_INSN1(ret, line, putobject, ID2SYM(id));
+	ADD_SEND(ret, line, ID2SYM(rb_intern("key?")), INT2FIX(1));
+	ADD_INSNL(ret, line, branchunless, default_label);
+	ADD_INSN(ret, line, dup);
+	ADD_INSN1(ret, line, putobject, ID2SYM(id));
+	ADD_SEND(ret, line, ID2SYM(rb_intern("delete")), INT2FIX(1));
+	switch (nd_type(node->nd_body)) {
+	  case NODE_LASGN:
+	    idx = iseq->local_iseq->local_size - get_local_var_idx(iseq, id);
+	    ADD_INSN2(ret, line, setlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
+	    break;
+	  case NODE_DASGN:
+	  case NODE_DASGN_CURR:
+	    idx = get_dyna_var_idx(iseq, id, &lv, &ls);
+	    ADD_INSN2(ret, line, setlocal, INT2FIX(ls - idx), INT2FIX(lv));
+	    break;
+	  default:
+	    rb_bug("iseq_compile_each (NODE_KW_ARG): unknown node: %s", ruby_node_name(nd_type(node->nd_body)));
+	}
+	if (node->nd_body->nd_value != (NODE *)-1) {
+	    end_label = NEW_LABEL(nd_line(node));
+	    ADD_INSNL(ret, nd_line(node), jump, end_label);
+	}
+	ADD_LABEL(ret, default_label);
+	if (node->nd_body->nd_value != (NODE *)-1) {
+	    COMPILE_POPED(ret, "keyword default argument", node->nd_body);
+	    ADD_LABEL(ret, end_label);
+	}
+	break;
+      }
+      case NODE_DSYM:{
+	compile_dstr(iseq, ret, node);
+	if (!poped) {
+	    ADD_SEND(ret, line, ID2SYM(idIntern), INT2FIX(0));
+	}
+	else {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      case NODE_ATTRASGN:{
+	DECL_ANCHOR(recv);
+	DECL_ANCHOR(args);
+	VALUE flag = 0;
+	VALUE argc;
+
+	INIT_ANCHOR(recv);
+	INIT_ANCHOR(args);
+	argc = setup_args(iseq, args, node->nd_args, &flag);
+
+	if (node->nd_recv == (NODE *) 1) {
+	    flag |= VM_CALL_FCALL;
+	    ADD_INSN(recv, line, putself);
+	}
+	else {
+	    COMPILE(recv, "recv", node->nd_recv);
+	}
+
+	debugp_param("argc", argc);
+	debugp_param("nd_mid", ID2SYM(node->nd_mid));
+
+	if (!poped) {
+	    ADD_INSN(ret, line, putnil);
+	    ADD_SEQ(ret, recv);
+	    ADD_SEQ(ret, args);
+
+	    if (flag & VM_CALL_ARGS_BLOCKARG) {
+		ADD_INSN1(ret, line, topn, INT2FIX(1));
+		if (flag & VM_CALL_ARGS_SPLAT) {
+		    ADD_INSN1(ret, line, putobject, INT2FIX(-1));
+		    ADD_SEND(ret, line, ID2SYM(idAREF), INT2FIX(1));
+		}
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 3));
+		ADD_INSN (ret, line, pop);
+	    }
+	    else if (flag & VM_CALL_ARGS_SPLAT) {
+		ADD_INSN(ret, line, dup);
+		ADD_INSN1(ret, line, putobject, INT2FIX(-1));
+		ADD_SEND(ret, line, ID2SYM(idAREF), INT2FIX(1));
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2));
+		ADD_INSN (ret, line, pop);
+	    }
+	    else {
+		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 1));
+	    }
+	}
+	else {
+	    ADD_SEQ(ret, recv);
+	    ADD_SEQ(ret, args);
+	}
+	ADD_SEND_R(ret, line, ID2SYM(node->nd_mid), argc, 0, LONG2FIX(flag));
+	ADD_INSN(ret, line, pop);
+
+	break;
+      }
+      case NODE_PRELUDE:{
+	COMPILE_POPED(ret, "prelude", node->nd_head);
+	COMPILE_(ret, "body", node->nd_body, poped);
+	break;
+      }
+      case NODE_LAMBDA:{
+	/* compile same as lambda{...} */
+	VALUE block = NEW_CHILD_ISEQVAL(node->nd_body, make_name_for_block(iseq), ISEQ_TYPE_BLOCK, line);
+	VALUE argc = INT2FIX(0);
+	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
+	ADD_CALL_WITH_BLOCK(ret, line, ID2SYM(idLambda), argc, block);
+
+	if (poped) {
+	    ADD_INSN(ret, line, pop);
+	}
+	break;
+      }
+      default:
+	rb_bug("iseq_compile_each: unknown node: %s", ruby_node_name(type));
+	return COMPILE_NG;
+    }
+
+    /* check & remove redundant trace(line) */
+    if (saved_last_element && ret /* ret can be 0 when error */ &&
+	ret->last == saved_last_element &&
+	((INSN *)saved_last_element)->insn_id == BIN(trace)) {
+	POP_ELEMENT(ret);
+    }
+
+    debug_node_end();
+    return COMPILE_OK;
+}
+
+/***************************/
+/* instruction information */
+/***************************/
+
+static int
+insn_data_length(INSN *iobj)
+{
+    return insn_len(iobj->insn_id);
+}
+
+static int
+calc_sp_depth(int depth, INSN *insn)
+{
+    return insn_stack_increase(depth, insn->insn_id, insn->operands);
+}
+
+static int
+insn_data_line_no(INSN *iobj)
+{
+    return insn_len(iobj->line_no);
+}
+
+static VALUE
+insn_data_to_s_detail(INSN *iobj)
+{
+    VALUE str = rb_sprintf("%-16s", insn_name(iobj->insn_id));
+
+    if (iobj->operands) {
+	const char *types = insn_op_types(iobj->insn_id);
+	int j;
+
+	for (j = 0; types[j]; j++) {
+	    char type = types[j];
+	    printf("str: %"PRIxVALUE", type: %c\n", str, type);
+
+	    switch (type) {
+	      case TS_OFFSET:	/* label(destination position) */
+		{
+		    LABEL *lobj = (LABEL *)OPERAND_AT(iobj, j);
+		    rb_str_catf(str, "<L%03d>", lobj->label_no);
+		    break;
+		}
+		break;
+	      case TS_ISEQ:	/* iseq */
+		{
+		    rb_iseq_t *iseq = (rb_iseq_t *)OPERAND_AT(iobj, j);
+		    VALUE val = Qnil;
+		    if (0 && iseq) { /* TODO: invalidate now */
+			val = iseq->self;
+		    }
+		    rb_str_concat(str, rb_inspect(val));
+		}
+		break;
+	      case TS_LINDEX:
+	      case TS_NUM:	/* ulong */
+	      case TS_VALUE:	/* VALUE */
+		{
+		    VALUE v = OPERAND_AT(iobj, j);
+		    rb_str_concat(str, rb_inspect(v));
+		    break;
+		}
+	      case TS_ID:	/* ID */
+		rb_str_concat(str, rb_inspect(OPERAND_AT(iobj, j)));
+		break;
+	      case TS_GENTRY:
+		{
+		    struct rb_global_entry *entry = (struct rb_global_entry *)
+		      (OPERAND_AT(iobj, j) & (~1));
+		    rb_str_cat2(str, rb_id2name(entry->id));
+		    break;
+		}
+	      case TS_IC:	/* inline cache */
+		rb_str_catf(str, "<ic:%d>", FIX2INT(OPERAND_AT(iobj, j)));
+		break;
+	      case TS_CALLINFO: /* call info */
+		{
+		    rb_call_info_t *ci = (rb_call_info_t *)OPERAND_AT(iobj, j);
+		    rb_str_catf(str, "<callinfo:%s, %d>", ci->mid ? rb_id2name(ci->mid) : "", ci->orig_argc);
+		    break;
+		}
+	      case TS_CDHASH:	/* case/when condition cache */
+		rb_str_cat2(str, "<ch>");
+		break;
+	      default:{
+		rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
+	      }
+	    }
+	    if (types[j + 1]) {
+		rb_str_cat2(str, ", ");
+	    }
+	}
+    }
+    return str;
+}
+
+static void
+dump_disasm_list(struct iseq_link_element *link)
+{
+    int pos = 0;
+    INSN *iobj;
+    LABEL *lobj;
+    VALUE str;
+
+    printf("-- raw disasm--------\n");
+
+    while (link) {
+	switch (link->type) {
+	  case ISEQ_ELEMENT_INSN:
+	    {
+		iobj = (INSN *)link;
+		str = insn_data_to_s_detail(iobj);
+		printf("%04d %-65s(%4d)\n", pos, StringValueCStr(str), insn_data_line_no(iobj));
+		pos += insn_data_length(iobj);
+		break;
+	    }
+	  case ISEQ_ELEMENT_LABEL:
+	    {
+		lobj = (LABEL *)link;
+		printf("<L%03d>\n", lobj->label_no);
+		break;
+	    }
+	  case ISEQ_ELEMENT_NONE:
+	    {
+		printf("[none]\n");
+		break;
+	    }
+	  case ISEQ_ELEMENT_ADJUST:
+	    {
+		ADJUST *adjust = (ADJUST *)link;
+		printf("adjust: [label: %d]\n", adjust->label->label_no);
+		break;
+	    }
+	  default:
+	    /* ignore */
+	    rb_raise(rb_eSyntaxError, "dump_disasm_list error: %ld\n", FIX2LONG(link->type));
+	}
+	link = link->next;
+    }
+    printf("---------------------\n");
+}
+
+const char *
+rb_insns_name(int i)
+{
+    return insn_name_info[i];
+}
+
+VALUE
+rb_insns_name_array(void)
+{
+    VALUE ary = rb_ary_new();
+    int i;
+    for (i = 0; i < numberof(insn_name_info); i++) {
+	rb_ary_push(ary, rb_obj_freeze(rb_str_new2(insn_name_info[i])));
+    }
+    return rb_obj_freeze(ary);
+}
+
+static LABEL *
+register_label(rb_iseq_t *iseq, struct st_table *labels_table, VALUE obj)
+{
+    LABEL *label = 0;
+    st_data_t tmp;
+    obj = rb_convert_type(obj, T_SYMBOL, "Symbol", "to_sym");
+
+    if (st_lookup(labels_table, obj, &tmp) == 0) {
+	label = NEW_LABEL(0);
+	st_insert(labels_table, obj, (st_data_t)label);
+    }
+    else {
+	label = (LABEL *)tmp;
+    }
+    return label;
+}
+
+static VALUE
+get_exception_sym2type(VALUE sym)
+{
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+    VALUE sym_inspect;
+    static VALUE symRescue, symEnsure, symRetry;
+    static VALUE symBreak, symRedo, symNext;
+
+    if (symRescue == 0) {
+	symRescue = ID2SYM(rb_intern("rescue"));
+	symEnsure = ID2SYM(rb_intern("ensure"));
+	symRetry  = ID2SYM(rb_intern("retry"));
+	symBreak  = ID2SYM(rb_intern("break"));
+	symRedo   = ID2SYM(rb_intern("redo"));
+	symNext   = ID2SYM(rb_intern("next"));
+    }
+
+    if (sym == symRescue) return CATCH_TYPE_RESCUE;
+    if (sym == symEnsure) return CATCH_TYPE_ENSURE;
+    if (sym == symRetry)  return CATCH_TYPE_RETRY;
+    if (sym == symBreak)  return CATCH_TYPE_BREAK;
+    if (sym == symRedo)   return CATCH_TYPE_REDO;
+    if (sym == symNext)   return CATCH_TYPE_NEXT;
+    sym_inspect = rb_inspect(sym);
+    rb_raise(rb_eSyntaxError, "invalid exception symbol: %s",
+	     StringValuePtr(sym_inspect));
+    return 0;
+}
+
+static int
+iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
+		     VALUE exception)
+{
+    int i;
+
+    for (i=0; i<RARRAY_LEN(exception); i++) {
+	VALUE v, type, eiseqval;
+	const VALUE *ptr;
+	LABEL *lstart, *lend, *lcont;
+	int sp;
+
+	RB_GC_GUARD(v) = rb_convert_type(RARRAY_AREF(exception, i), T_ARRAY,
+					 "Array", "to_ary");
+	if (RARRAY_LEN(v) != 6) {
+	    rb_raise(rb_eSyntaxError, "wrong exception entry");
+	}
+	ptr  = RARRAY_CONST_PTR(v);
+	type = get_exception_sym2type(ptr[0]);
+	if (ptr[1] == Qnil) {
+	    eiseqval = 0;
+	}
+	else {
+	    eiseqval = rb_iseq_load(ptr[1], iseq->self, Qnil);
+	}
+
+	lstart = register_label(iseq, labels_table, ptr[2]);
+	lend   = register_label(iseq, labels_table, ptr[3]);
+	lcont  = register_label(iseq, labels_table, ptr[4]);
+	sp     = NUM2INT(ptr[5]);
+
+	(void)sp;
+
+	ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont);
+    }
+    return COMPILE_OK;
+}
+
+static struct st_table *
+insn_make_insn_table(void)
+{
+    struct st_table *table;
+    int i;
+    table = st_init_numtable();
+
+    for (i=0; i<VM_INSTRUCTION_SIZE; i++) {
+	st_insert(table, ID2SYM(rb_intern(insn_name(i))), i);
+    }
+
+    return table;
+}
+
+static VALUE
+iseq_build_load_iseq(rb_iseq_t *iseq, VALUE op)
+{
+    VALUE iseqval;
+    if (RB_TYPE_P(op, T_ARRAY)) {
+	iseqval = rb_iseq_load(op, iseq->self, Qnil);
+    }
+    else if (CLASS_OF(op) == rb_cISeq) {
+	iseqval = op;
+    }
+    else {
+	rb_raise(rb_eSyntaxError, "ISEQ is required");
+    }
+    iseq_add_mark_object(iseq, iseqval);
+    return iseqval;
+}
+
+static int
+iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
+		VALUE body, struct st_table *labels_table)
+{
+    /* TODO: body should be frozen */
+    const VALUE *ptr = RARRAY_CONST_PTR(body);
+    long i, len = RARRAY_LEN(body);
+    int j;
+    int line_no = 0;
+
+    /*
+     * index -> LABEL *label
+     */
+    static struct st_table *insn_table;
+
+    if (insn_table == 0) {
+	insn_table = insn_make_insn_table();
+    }
+
+    for (i=0; i<len; i++) {
+	VALUE obj = ptr[i];
+
+	if (SYMBOL_P(obj)) {
+	    LABEL *label = register_label(iseq, labels_table, obj);
+	    ADD_LABEL(anchor, label);
+	}
+	else if (FIXNUM_P(obj)) {
+	    line_no = NUM2INT(obj);
+	}
+	else if (RB_TYPE_P(obj, T_ARRAY)) {
+	    VALUE *argv = 0;
+	    int argc = RARRAY_LENINT(obj) - 1;
+	    st_data_t insn_id;
+	    VALUE insn;
+
+	    insn = (argc < 0) ? Qnil : RARRAY_AREF(obj, 0);
+	    if (st_lookup(insn_table, (st_data_t)insn, &insn_id) == 0) {
+		/* TODO: exception */
+		RB_GC_GUARD(insn) = rb_inspect(insn);
+		rb_compile_error(RSTRING_PTR(iseq->location.path), line_no,
+				 "unknown instruction: %s", RSTRING_PTR(insn));
+	    }
+
+	    if (argc != insn_len((VALUE)insn_id)-1) {
+		rb_compile_error(RSTRING_PTR(iseq->location.path), line_no,
+				 "operand size mismatch");
+	    }
+
+	    if (argc > 0) {
+		argv = compile_data_alloc(iseq, sizeof(VALUE) * argc);
+		for (j=0; j<argc; j++) {
+		    VALUE op = rb_ary_entry(obj, j+1);
+		    switch (insn_op_type((VALUE)insn_id, j)) {
+		      case TS_OFFSET: {
+			LABEL *label = register_label(iseq, labels_table, op);
+			argv[j] = (VALUE)label;
+			break;
+		      }
+		      case TS_LINDEX:
+		      case TS_NUM:
+			(void)NUM2INT(op);
+			argv[j] = op;
+			break;
+		      case TS_VALUE:
+			argv[j] = op;
+			iseq_add_mark_object(iseq, op);
+			break;
+		      case TS_ISEQ:
+			{
+			    if (op != Qnil) {
+				argv[j] = iseq_build_load_iseq(iseq, op);
+			    }
+			    else {
+				argv[j] = 0;
+			    }
+			}
+			break;
+		      case TS_GENTRY:
+			op = rb_convert_type(op, T_SYMBOL, "Symbol", "to_sym");
+			argv[j] = (VALUE)rb_global_entry(SYM2ID(op));
+			break;
+		      case TS_IC:
+			argv[j] = op;
+			if (NUM2INT(op) >= iseq->is_size) {
+			    iseq->is_size = NUM2INT(op) + 1;
+			}
+			break;
+		      case TS_CALLINFO:
+			{
+			    ID mid = 0;
+			    int orig_argc = 0;
+			    VALUE block = 0;
+			    unsigned long flag = 0;
+
+			    if (!NIL_P(op)) {
+				VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid")));
+				VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern("flag")));
+				VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern("orig_argc")));
+				VALUE vblock = rb_hash_aref(op, ID2SYM(rb_intern("block")));
+
+				if (!NIL_P(vmid)) mid = SYM2ID(vmid);
+				if (!NIL_P(vflag)) flag = NUM2ULONG(vflag);
+				if (!NIL_P(vorig_argc)) orig_argc = FIX2INT(vorig_argc);
+				if (!NIL_P(vblock)) block = iseq_build_load_iseq(iseq, vblock);
+			    }
+			    argv[j] = (VALUE)new_callinfo(iseq, mid, orig_argc, block, flag);
+			}
+			break;
+		      case TS_ID:
+			argv[j] = rb_convert_type(op, T_SYMBOL,
+						  "Symbol", "to_sym");
+			break;
+		      case TS_CDHASH:
+			{
+			    int i;
+			    op = rb_convert_type(op, T_ARRAY, "Array", "to_ary");
+			    op = rb_ary_dup(op);
+			    for (i=0; i<RARRAY_LEN(op); i+=2) {
+				VALUE sym = rb_ary_entry(op, i+1);
+				LABEL *label =
+				  register_label(iseq, labels_table, sym);
+				rb_ary_store(op, i+1, (VALUE)label | 1);
+			    }
+			    argv[j] = op;
+			    iseq_add_mark_object_compile_time(iseq, op);
+			}
+			break;
+		      default:
+			rb_raise(rb_eSyntaxError, "unknown operand: %c", insn_op_type((VALUE)insn_id, j));
+		    }
+		}
+	    }
+	    ADD_ELEM(anchor,
+		     (LINK_ELEMENT*)new_insn_core(iseq, line_no,
+						  (enum ruby_vminsn_type)insn_id, argc, argv));
+	}
+	else {
+	    rb_raise(rb_eTypeError, "unexpected object for instruction");
+	}
+    }
+    validate_labels(iseq, labels_table);
+    st_free_table(labels_table);
+    iseq_setup(iseq, anchor);
+    return COMPILE_OK;
+}
+
+#define CHECK_ARRAY(v)   rb_convert_type((v), T_ARRAY, "Array", "to_ary")
+#define CHECK_STRING(v)  rb_convert_type((v), T_STRING, "String", "to_str")
+#define CHECK_SYMBOL(v)  rb_convert_type((v), T_SYMBOL, "Symbol", "to_sym")
+static inline VALUE CHECK_INTEGER(VALUE v) {(void)NUM2LONG(v); return v;}
+
+VALUE
+rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
+			 VALUE exception, VALUE body)
+{
+    int i;
+    ID *tbl;
+    struct st_table *labels_table = st_init_numtable();
+    DECL_ANCHOR(anchor);
+    INIT_ANCHOR(anchor);
+
+    iseq->local_table_size = RARRAY_LENINT(locals);
+    iseq->local_table = tbl = (ID *)ALLOC_N(ID, iseq->local_table_size);
+    iseq->local_size = iseq->local_table_size + 1;
+
+    for (i=0; i<RARRAY_LEN(locals); i++) {
+	VALUE lv = RARRAY_AREF(locals, i);
+	tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
+    }
+
+    /* args */
+    if (FIXNUM_P(args)) {
+	iseq->arg_size = iseq->argc = FIX2INT(args);
+	iseq->arg_simple = 1;
+    }
+    else {
+	int i = 0;
+	VALUE argc = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_opt_labels = CHECK_ARRAY(rb_ary_entry(args, i++));
+	VALUE arg_post_len = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_post_start = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_rest = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_block = CHECK_INTEGER(rb_ary_entry(args, i++));
+	VALUE arg_simple = CHECK_INTEGER(rb_ary_entry(args, i++));
+
+	iseq->argc = FIX2INT(argc);
+	iseq->arg_rest = FIX2INT(arg_rest);
+	iseq->arg_post_len = FIX2INT(arg_post_len);
+	iseq->arg_post_start = FIX2INT(arg_post_start);
+	iseq->arg_block = FIX2INT(arg_block);
+	iseq->arg_opts = RARRAY_LENINT(arg_opt_labels);
+	iseq->arg_opt_table = (VALUE *)ALLOC_N(VALUE, iseq->arg_opts);
+
+	if (iseq->arg_block != -1) {
+	    iseq->arg_size = iseq->arg_block + 1;
+	}
+	else if (iseq->arg_post_len) {
+	    iseq->arg_size = iseq->arg_post_start + iseq->arg_post_len;
+	}
+	else if (iseq->arg_rest != -1) {
+	    iseq->arg_size = iseq->arg_rest + 1;
+	}
+	else {
+	    iseq->arg_size = iseq->argc + (iseq->arg_opts ? iseq->arg_opts - 1 : 0);
+	}
+
+	for (i=0; i<RARRAY_LEN(arg_opt_labels); i++) {
+	    iseq->arg_opt_table[i] =
+	      (VALUE)register_label(iseq, labels_table,
+				    rb_ary_entry(arg_opt_labels, i));
+	}
+
+	iseq->arg_simple = NUM2INT(arg_simple);
+    }
+
+    /* exception */
+    iseq_build_from_ary_exception(iseq, labels_table, exception);
+
+    /* body */
+    iseq_build_from_ary_body(iseq, anchor, body, labels_table);
+    return iseq->self;
+}
+
+/* for parser */
+
+int
+rb_dvar_defined(ID id)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_iseq_t *iseq;
+    if (th->base_block && (iseq = th->base_block->iseq)) {
+	while (iseq->type == ISEQ_TYPE_BLOCK ||
+	       iseq->type == ISEQ_TYPE_RESCUE ||
+	       iseq->type == ISEQ_TYPE_ENSURE ||
+	       iseq->type == ISEQ_TYPE_EVAL ||
+	       iseq->type == ISEQ_TYPE_MAIN
+	       ) {
+	    int i;
+
+	    for (i = 0; i < iseq->local_table_size; i++) {
+		if (iseq->local_table[i] == id) {
+		    return 1;
+		}
+	    }
+	    iseq = iseq->parent_iseq;
+	}
+    }
+    return 0;
+}
+
+int
+rb_local_defined(ID id)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_iseq_t *iseq;
+
+    if (th->base_block && th->base_block->iseq) {
+	int i;
+	iseq = th->base_block->iseq->local_iseq;
+
+	for (i=0; i<iseq->local_table_size; i++) {
+	    if (iseq->local_table[i] == id) {
+		return 1;
+	    }
+	}
+    }
+    return 0;
+}
+
+int
+rb_parse_in_eval(void)
+{
+    return GET_THREAD()->parse_in_eval > 0;
+}
+
+int
+rb_parse_in_main(void)
+{
+    return GET_THREAD()->parse_in_eval < 0;
+}
diff --git a/complex.c b/complex.c
new file mode 100644
index 0000000000..3e9d63117a
--- /dev/null
+++ b/complex.c
@@ -0,0 +1,2256 @@
+/*
+  complex.c: Coded by Tadayoshi Funaba 2008-2012
+
+  This implementation is based on Keiju Ishitsuka's Complex library
+  which is written in ruby.
+*/
+
+#include "ruby.h"
+#include "internal.h"
+#include <math.h>
+
+#define NDEBUG
+#include <assert.h>
+
+#define ZERO INT2FIX(0)
+#define ONE INT2FIX(1)
+#define TWO INT2FIX(2)
+
+VALUE rb_cComplex;
+
+static ID id_abs, id_abs2, id_arg, id_cmp, id_conj, id_convert,
+    id_denominator, id_divmod, id_eqeq_p, id_expt, id_fdiv,  id_floor,
+    id_idiv, id_imag, id_inspect, id_negate, id_numerator, id_quo,
+    id_real, id_real_p, id_to_f, id_to_i, id_to_r, id_to_s,
+    id_i_real, id_i_imag;
+
+#define f_boolcast(x) ((x) ? Qtrue : Qfalse)
+
+#define binop(n,op) \
+inline static VALUE \
+f_##n(VALUE x, VALUE y)\
+{\
+    return rb_funcall(x, (op), 1, y);\
+}
+
+#define fun1(n) \
+inline static VALUE \
+f_##n(VALUE x)\
+{\
+    return rb_funcall(x, id_##n, 0);\
+}
+
+#define fun2(n) \
+inline static VALUE \
+f_##n(VALUE x, VALUE y)\
+{\
+    return rb_funcall(x, id_##n, 1, y);\
+}
+
+#define math1(n) \
+inline static VALUE \
+m_##n(VALUE x)\
+{\
+    return rb_funcall(rb_mMath, id_##n, 1, x);\
+}
+
+#define math2(n) \
+inline static VALUE \
+m_##n(VALUE x, VALUE y)\
+{\
+    return rb_funcall(rb_mMath, id_##n, 2, x, y);\
+}
+
+#define PRESERVE_SIGNEDZERO
+
+inline static VALUE
+f_add(VALUE x, VALUE y)
+{
+#ifndef PRESERVE_SIGNEDZERO
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
+	return x;
+    else if (FIXNUM_P(x) && FIX2LONG(x) == 0)
+	return y;
+#endif
+    return rb_funcall(x, '+', 1, y);
+}
+
+inline static VALUE
+f_cmp(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x) && FIXNUM_P(y)) {
+	long c = FIX2LONG(x) - FIX2LONG(y);
+	if (c > 0)
+	    c = 1;
+	else if (c < 0)
+	    c = -1;
+	return INT2FIX(c);
+    }
+    return rb_funcall(x, id_cmp, 1, y);
+}
+
+inline static VALUE
+f_div(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(y) && FIX2LONG(y) == 1)
+	return x;
+    return rb_funcall(x, '/', 1, y);
+}
+
+inline static VALUE
+f_gt_p(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x) && FIXNUM_P(y))
+	return f_boolcast(FIX2LONG(x) > FIX2LONG(y));
+    return rb_funcall(x, '>', 1, y);
+}
+
+inline static VALUE
+f_lt_p(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x) && FIXNUM_P(y))
+	return f_boolcast(FIX2LONG(x) < FIX2LONG(y));
+    return rb_funcall(x, '<', 1, y);
+}
+
+binop(mod, '%')
+
+inline static VALUE
+f_mul(VALUE x, VALUE y)
+{
+#ifndef PRESERVE_SIGNEDZERO
+    if (FIXNUM_P(y)) {
+	long iy = FIX2LONG(y);
+	if (iy == 0) {
+	    if (FIXNUM_P(x) || RB_TYPE_P(x, T_BIGNUM))
+		return ZERO;
+	}
+	else if (iy == 1)
+	    return x;
+    }
+    else if (FIXNUM_P(x)) {
+	long ix = FIX2LONG(x);
+	if (ix == 0) {
+	    if (FIXNUM_P(y) || RB_TYPE_P(y, T_BIGNUM))
+		return ZERO;
+	}
+	else if (ix == 1)
+	    return y;
+    }
+#endif
+    return rb_funcall(x, '*', 1, y);
+}
+
+inline static VALUE
+f_sub(VALUE x, VALUE y)
+{
+#ifndef PRESERVE_SIGNEDZERO
+    if (FIXNUM_P(y) && FIX2LONG(y) == 0)
+	return x;
+#endif
+    return rb_funcall(x, '-', 1, y);
+}
+
+fun1(abs)
+fun1(abs2)
+fun1(arg)
+fun1(conj)
+fun1(denominator)
+fun1(floor)
+fun1(imag)
+fun1(inspect)
+fun1(negate)
+fun1(numerator)
+fun1(real)
+fun1(real_p)
+
+inline static VALUE
+f_to_i(VALUE x)
+{
+    if (RB_TYPE_P(x, T_STRING))
+	return rb_str_to_inum(x, 10, 0);
+    return rb_funcall(x, id_to_i, 0);
+}
+inline static VALUE
+f_to_f(VALUE x)
+{
+    if (RB_TYPE_P(x, T_STRING))
+	return DBL2NUM(rb_str_to_dbl(x, 0));
+    return rb_funcall(x, id_to_f, 0);
+}
+
+fun1(to_r)
+fun1(to_s)
+
+fun2(divmod)
+
+inline static VALUE
+f_eqeq_p(VALUE x, VALUE y)
+{
+    if (FIXNUM_P(x) && FIXNUM_P(y))
+	return f_boolcast(FIX2LONG(x) == FIX2LONG(y));
+    return rb_funcall(x, id_eqeq_p, 1, y);
+}
+
+fun2(expt)
+fun2(fdiv)
+fun2(idiv)
+fun2(quo)
+
+inline static VALUE
+f_negative_p(VALUE x)
+{
+    if (FIXNUM_P(x))
+	return f_boolcast(FIX2LONG(x) < 0);
+    return rb_funcall(x, '<', 1, ZERO);
+}
+
+#define f_positive_p(x) (!f_negative_p(x))
+
+inline static VALUE
+f_zero_p(VALUE x)
+{
+    if (RB_TYPE_P(x, T_FIXNUM)) {
+	return f_boolcast(FIX2LONG(x) == 0);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return Qfalse;
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+	VALUE num = RRATIONAL(x)->num;
+
+	return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 0);
+    }
+    return rb_funcall(x, id_eqeq_p, 1, ZERO);
+}
+
+#define f_nonzero_p(x) (!f_zero_p(x))
+
+inline static VALUE
+f_one_p(VALUE x)
+{
+    if (RB_TYPE_P(x, T_FIXNUM)) {
+	return f_boolcast(FIX2LONG(x) == 1);
+    }
+    else if (RB_TYPE_P(x, T_BIGNUM)) {
+	return Qfalse;
+    }
+    else if (RB_TYPE_P(x, T_RATIONAL)) {
+	VALUE num = RRATIONAL(x)->num;
+	VALUE den = RRATIONAL(x)->den;
+
+	return f_boolcast(FIXNUM_P(num) && FIX2LONG(num) == 1 &&
+			  FIXNUM_P(den) && FIX2LONG(den) == 1);
+    }
+    return rb_funcall(x, id_eqeq_p, 1, ONE);
+}
+
+inline static VALUE
+f_kind_of_p(VALUE x, VALUE c)
+{
+    return rb_obj_is_kind_of(x, c);
+}
+
+inline static VALUE
+k_numeric_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cNumeric);
+}
+
+inline static VALUE
+k_integer_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cInteger);
+}
+
+inline static VALUE
+k_fixnum_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cFixnum);
+}
+
+inline static VALUE
+k_bignum_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cBignum);
+}
+
+inline static VALUE
+k_float_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cFloat);
+}
+
+inline static VALUE
+k_rational_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cRational);
+}
+
+inline static VALUE
+k_complex_p(VALUE x)
+{
+    return f_kind_of_p(x, rb_cComplex);
+}
+
+#define k_exact_p(x) (!k_float_p(x))
+#define k_inexact_p(x) k_float_p(x)
+
+#define k_exact_zero_p(x) (k_exact_p(x) && f_zero_p(x))
+#define k_exact_one_p(x) (k_exact_p(x) && f_one_p(x))
+
+#define get_dat1(x) \
+    struct RComplex *dat;\
+    dat = ((struct RComplex *)(x))
+
+#define get_dat2(x,y) \
+    struct RComplex *adat, *bdat;\
+    adat = ((struct RComplex *)(x));\
+    bdat = ((struct RComplex *)(y))
+
+inline static VALUE
+nucomp_s_new_internal(VALUE klass, VALUE real, VALUE imag)
+{
+    NEWOBJ_OF(obj, struct RComplex, klass, T_COMPLEX | (RGENGC_WB_PROTECTED_COMPLEX ? FL_WB_PROTECTED : 0));
+
+    RCOMPLEX_SET_REAL(obj, real);
+    RCOMPLEX_SET_IMAG(obj, imag);
+
+    return (VALUE)obj;
+}
+
+static VALUE
+nucomp_s_alloc(VALUE klass)
+{
+    return nucomp_s_new_internal(klass, ZERO, ZERO);
+}
+
+#if 0
+static VALUE
+nucomp_s_new_bang(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE real, imag;
+
+    switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
+      case 1:
+	if (!k_numeric_p(real))
+	    real = f_to_i(real);
+	imag = ZERO;
+	break;
+      default:
+	if (!k_numeric_p(real))
+	    real = f_to_i(real);
+	if (!k_numeric_p(imag))
+	    imag = f_to_i(imag);
+	break;
+    }
+
+    return nucomp_s_new_internal(klass, real, imag);
+}
+#endif
+
+inline static VALUE
+f_complex_new_bang1(VALUE klass, VALUE x)
+{
+    assert(!k_complex_p(x));
+    return nucomp_s_new_internal(klass, x, ZERO);
+}
+
+inline static VALUE
+f_complex_new_bang2(VALUE klass, VALUE x, VALUE y)
+{
+    assert(!k_complex_p(x));
+    assert(!k_complex_p(y));
+    return nucomp_s_new_internal(klass, x, y);
+}
+
+#ifdef CANONICALIZATION_FOR_MATHN
+#define CANON
+#endif
+
+#ifdef CANON
+static int canonicalization = 0;
+
+RUBY_FUNC_EXPORTED void
+nucomp_canonicalization(int f)
+{
+    canonicalization = f;
+}
+#endif
+
+inline static void
+nucomp_real_check(VALUE num)
+{
+    if (!RB_TYPE_P(num, T_FIXNUM) &&
+	!RB_TYPE_P(num, T_BIGNUM) &&
+	!RB_TYPE_P(num, T_FLOAT) &&
+	!RB_TYPE_P(num, T_RATIONAL)) {
+	if (!k_numeric_p(num) || !f_real_p(num))
+	    rb_raise(rb_eTypeError, "not a real");
+    }
+}
+
+inline static VALUE
+nucomp_s_canonicalize_internal(VALUE klass, VALUE real, VALUE imag)
+{
+#ifdef CANON
+#define CL_CANON
+#ifdef CL_CANON
+    if (k_exact_zero_p(imag) && canonicalization)
+	return real;
+#else
+    if (f_zero_p(imag) && canonicalization)
+	return real;
+#endif
+#endif
+    if (f_real_p(real) && f_real_p(imag))
+	return nucomp_s_new_internal(klass, real, imag);
+    else if (f_real_p(real)) {
+	get_dat1(imag);
+
+	return nucomp_s_new_internal(klass,
+				     f_sub(real, dat->imag),
+				     f_add(ZERO, dat->real));
+    }
+    else if (f_real_p(imag)) {
+	get_dat1(real);
+
+	return nucomp_s_new_internal(klass,
+				     dat->real,
+				     f_add(dat->imag, imag));
+    }
+    else {
+	get_dat2(real, imag);
+
+	return nucomp_s_new_internal(klass,
+				     f_sub(adat->real, bdat->imag),
+				     f_add(adat->imag, bdat->real));
+    }
+}
+
+/*
+ * call-seq:
+ *    Complex.rect(real[, imag])         ->  complex
+ *    Complex.rectangular(real[, imag])  ->  complex
+ *
+ * Returns a complex object which denotes the given rectangular form.
+ *
+ *    Complex.rectangular(1, 2)  #=> (1+2i)
+ */
+static VALUE
+nucomp_s_new(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE real, imag;
+
+    switch (rb_scan_args(argc, argv, "11", &real, &imag)) {
+      case 1:
+	nucomp_real_check(real);
+	imag = ZERO;
+	break;
+      default:
+	nucomp_real_check(real);
+	nucomp_real_check(imag);
+	break;
+    }
+
+    return nucomp_s_canonicalize_internal(klass, real, imag);
+}
+
+inline static VALUE
+f_complex_new1(VALUE klass, VALUE x)
+{
+    assert(!k_complex_p(x));
+    return nucomp_s_canonicalize_internal(klass, x, ZERO);
+}
+
+inline static VALUE
+f_complex_new2(VALUE klass, VALUE x, VALUE y)
+{
+    assert(!k_complex_p(x));
+    return nucomp_s_canonicalize_internal(klass, x, y);
+}
+
+/*
+ * call-seq:
+ *    Complex(x[, y])  ->  numeric
+ *
+ * Returns x+i*y;
+ *
+ *    Complex(1, 2)    #=> (1+2i)
+ *    Complex('1+2i')  #=> (1+2i)
+ *
+ * Syntax of string form:
+ *
+ *   string form = extra spaces , complex , extra spaces ;
+ *   complex = real part | [ sign ] , imaginary part
+ *           | real part , sign , imaginary part
+ *           | rational , "@" , rational ;
+ *   real part = rational ;
+ *   imaginary part = imaginary unit | unsigned rational , imaginary unit ;
+ *   rational = [ sign ] , unsigned rational ;
+ *   unsigned rational = numerator | numerator , "/" , denominator ;
+ *   numerator = integer part | fractional part | integer part , fractional part ;
+ *   denominator = digits ;
+ *   integer part = digits ;
+ *   fractional part = "." , digits , [ ( "e" | "E" ) , [ sign ] , digits ] ;
+ *   imaginary unit = "i" | "I" | "j" | "J" ;
+ *   sign = "-" | "+" ;
+ *   digits = digit , { digit | "_" , digit };
+ *   digit = "0" | "1" | "2" | "3" | "4" | "5" | "6" | "7" | "8" | "9" ;
+ *   extra spaces = ? \s* ? ;
+ *
+ * See String#to_c.
+ */
+static VALUE
+nucomp_f_complex(int argc, VALUE *argv, VALUE klass)
+{
+    return rb_funcall2(rb_cComplex, id_convert, argc, argv);
+}
+
+#define imp1(n) \
+inline static VALUE \
+m_##n##_bang(VALUE x)\
+{\
+    return rb_math_##n(x);\
+}
+
+#define imp2(n) \
+inline static VALUE \
+m_##n##_bang(VALUE x, VALUE y)\
+{\
+    return rb_math_##n(x, y);\
+}
+
+imp2(atan2)
+imp1(cos)
+imp1(cosh)
+imp1(exp)
+imp2(hypot)
+
+#define m_hypot(x,y) m_hypot_bang((x),(y))
+
+static VALUE
+m_log_bang(VALUE x)
+{
+    return rb_math_log(1, &x);
+}
+
+imp1(sin)
+imp1(sinh)
+imp1(sqrt)
+
+static VALUE
+m_cos(VALUE x)
+{
+    if (f_real_p(x))
+	return m_cos_bang(x);
+    {
+	get_dat1(x);
+	return f_complex_new2(rb_cComplex,
+			      f_mul(m_cos_bang(dat->real),
+				    m_cosh_bang(dat->imag)),
+			      f_mul(f_negate(m_sin_bang(dat->real)),
+				    m_sinh_bang(dat->imag)));
+    }
+}
+
+static VALUE
+m_sin(VALUE x)
+{
+    if (f_real_p(x))
+	return m_sin_bang(x);
+    {
+	get_dat1(x);
+	return f_complex_new2(rb_cComplex,
+			      f_mul(m_sin_bang(dat->real),
+				    m_cosh_bang(dat->imag)),
+			      f_mul(m_cos_bang(dat->real),
+				    m_sinh_bang(dat->imag)));
+    }
+}
+
+#if 0
+static VALUE
+m_sqrt(VALUE x)
+{
+    if (f_real_p(x)) {
+	if (f_positive_p(x))
+	    return m_sqrt_bang(x);
+	return f_complex_new2(rb_cComplex, ZERO, m_sqrt_bang(f_negate(x)));
+    }
+    else {
+	get_dat1(x);
+
+	if (f_negative_p(dat->imag))
+	    return f_conj(m_sqrt(f_conj(x)));
+	else {
+	    VALUE a = f_abs(x);
+	    return f_complex_new2(rb_cComplex,
+				  m_sqrt_bang(f_div(f_add(a, dat->real), TWO)),
+				  m_sqrt_bang(f_div(f_sub(a, dat->real), TWO)));
+	}
+    }
+}
+#endif
+
+inline static VALUE
+f_complex_polar(VALUE klass, VALUE x, VALUE y)
+{
+    assert(!k_complex_p(x));
+    assert(!k_complex_p(y));
+    return nucomp_s_canonicalize_internal(klass,
+					  f_mul(x, m_cos(y)),
+					  f_mul(x, m_sin(y)));
+}
+
+/*
+ * call-seq:
+ *    Complex.polar(abs[, arg])  ->  complex
+ *
+ * Returns a complex object which denotes the given polar form.
+ *
+ *    Complex.polar(3, 0)            #=> (3.0+0.0i)
+ *    Complex.polar(3, Math::PI/2)   #=> (1.836909530733566e-16+3.0i)
+ *    Complex.polar(3, Math::PI)     #=> (-3.0+3.673819061467132e-16i)
+ *    Complex.polar(3, -Math::PI/2)  #=> (1.836909530733566e-16-3.0i)
+ */
+static VALUE
+nucomp_s_polar(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE abs, arg;
+
+    switch (rb_scan_args(argc, argv, "11", &abs, &arg)) {
+      case 1:
+	nucomp_real_check(abs);
+	arg = ZERO;
+	break;
+      default:
+	nucomp_real_check(abs);
+	nucomp_real_check(arg);
+	break;
+    }
+    return f_complex_polar(klass, abs, arg);
+}
+
+/*
+ * call-seq:
+ *    cmp.real  ->  real
+ *
+ * Returns the real part.
+ *
+ *    Complex(7).real      #=> 7
+ *    Complex(9, -4).real  #=> 9
+ */
+static VALUE
+nucomp_real(VALUE self)
+{
+    get_dat1(self);
+    return dat->real;
+}
+
+/*
+ * call-seq:
+ *    cmp.imag       ->  real
+ *    cmp.imaginary  ->  real
+ *
+ * Returns the imaginary part.
+ *
+ *    Complex(7).imaginary      #=> 0
+ *    Complex(9, -4).imaginary  #=> -4
+ */
+static VALUE
+nucomp_imag(VALUE self)
+{
+    get_dat1(self);
+    return dat->imag;
+}
+
+/*
+ * call-seq:
+ *    -cmp  ->  complex
+ *
+ * Returns negation of the value.
+ *
+ *    -Complex(1, 2)  #=> (-1-2i)
+ */
+static VALUE
+nucomp_negate(VALUE self)
+{
+  get_dat1(self);
+  return f_complex_new2(CLASS_OF(self),
+			f_negate(dat->real), f_negate(dat->imag));
+}
+
+inline static VALUE
+f_addsub(VALUE self, VALUE other,
+	 VALUE (*func)(VALUE, VALUE), ID id)
+{
+    if (k_complex_p(other)) {
+	VALUE real, imag;
+
+	get_dat2(self, other);
+
+	real = (*func)(adat->real, bdat->real);
+	imag = (*func)(adat->imag, bdat->imag);
+
+	return f_complex_new2(CLASS_OF(self), real, imag);
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_complex_new2(CLASS_OF(self),
+			      (*func)(dat->real, other), dat->imag);
+    }
+    return rb_num_coerce_bin(self, other, id);
+}
+
+/*
+ * call-seq:
+ *    cmp + numeric  ->  complex
+ *
+ * Performs addition.
+ *
+ *    Complex(2, 3)  + Complex(2, 3)   #=> (4+6i)
+ *    Complex(900)   + Complex(1)      #=> (901+0i)
+ *    Complex(-2, 9) + Complex(-9, 2)  #=> (-11+11i)
+ *    Complex(9, 8)  + 4               #=> (13+8i)
+ *    Complex(20, 9) + 9.8             #=> (29.8+9i)
+ */
+static VALUE
+nucomp_add(VALUE self, VALUE other)
+{
+    return f_addsub(self, other, f_add, '+');
+}
+
+/*
+ * call-seq:
+ *    cmp - numeric  ->  complex
+ *
+ * Performs subtraction.
+ *
+ *    Complex(2, 3)  - Complex(2, 3)   #=> (0+0i)
+ *    Complex(900)   - Complex(1)      #=> (899+0i)
+ *    Complex(-2, 9) - Complex(-9, 2)  #=> (7+7i)
+ *    Complex(9, 8)  - 4               #=> (5+8i)
+ *    Complex(20, 9) - 9.8             #=> (10.2+9i)
+ */
+static VALUE
+nucomp_sub(VALUE self, VALUE other)
+{
+    return f_addsub(self, other, f_sub, '-');
+}
+
+/*
+ * call-seq:
+ *    cmp * numeric  ->  complex
+ *
+ * Performs multiplication.
+ *
+ *    Complex(2, 3)  * Complex(2, 3)   #=> (-5+12i)
+ *    Complex(900)   * Complex(1)      #=> (900+0i)
+ *    Complex(-2, 9) * Complex(-9, 2)  #=> (0-85i)
+ *    Complex(9, 8)  * 4               #=> (36+32i)
+ *    Complex(20, 9) * 9.8             #=> (196.0+88.2i)
+ */
+static VALUE
+nucomp_mul(VALUE self, VALUE other)
+{
+    if (k_complex_p(other)) {
+	VALUE real, imag;
+
+	get_dat2(self, other);
+
+	real = f_sub(f_mul(adat->real, bdat->real),
+		     f_mul(adat->imag, bdat->imag));
+	imag = f_add(f_mul(adat->real, bdat->imag),
+		     f_mul(adat->imag, bdat->real));
+
+	return f_complex_new2(CLASS_OF(self), real, imag);
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_complex_new2(CLASS_OF(self),
+			      f_mul(dat->real, other),
+			      f_mul(dat->imag, other));
+    }
+    return rb_num_coerce_bin(self, other, '*');
+}
+
+inline static VALUE
+f_divide(VALUE self, VALUE other,
+	 VALUE (*func)(VALUE, VALUE), ID id)
+{
+    if (k_complex_p(other)) {
+	int flo;
+	get_dat2(self, other);
+
+	flo = (k_float_p(adat->real) || k_float_p(adat->imag) ||
+	       k_float_p(bdat->real) || k_float_p(bdat->imag));
+
+	if (f_gt_p(f_abs(bdat->real), f_abs(bdat->imag))) {
+	    VALUE r, n;
+
+	    r = (*func)(bdat->imag, bdat->real);
+	    n = f_mul(bdat->real, f_add(ONE, f_mul(r, r)));
+	    if (flo)
+		return f_complex_new2(CLASS_OF(self),
+				      (*func)(self, n),
+				      (*func)(f_negate(f_mul(self, r)), n));
+	    return f_complex_new2(CLASS_OF(self),
+				  (*func)(f_add(adat->real,
+						f_mul(adat->imag, r)), n),
+				  (*func)(f_sub(adat->imag,
+						f_mul(adat->real, r)), n));
+	}
+	else {
+	    VALUE r, n;
+
+	    r = (*func)(bdat->real, bdat->imag);
+	    n = f_mul(bdat->imag, f_add(ONE, f_mul(r, r)));
+	    if (flo)
+		return f_complex_new2(CLASS_OF(self),
+				      (*func)(f_mul(self, r), n),
+				      (*func)(f_negate(self), n));
+	    return f_complex_new2(CLASS_OF(self),
+				  (*func)(f_add(f_mul(adat->real, r),
+						adat->imag), n),
+				  (*func)(f_sub(f_mul(adat->imag, r),
+						adat->real), n));
+	}
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_complex_new2(CLASS_OF(self),
+			      (*func)(dat->real, other),
+			      (*func)(dat->imag, other));
+    }
+    return rb_num_coerce_bin(self, other, id);
+}
+
+#define rb_raise_zerodiv() rb_raise(rb_eZeroDivError, "divided by 0")
+
+/*
+ * call-seq:
+ *    cmp / numeric     ->  complex
+ *    cmp.quo(numeric)  ->  complex
+ *
+ * Performs division.
+ *
+ *    Complex(2, 3)  / Complex(2, 3)   #=> ((1/1)+(0/1)*i)
+ *    Complex(900)   / Complex(1)      #=> ((900/1)+(0/1)*i)
+ *    Complex(-2, 9) / Complex(-9, 2)  #=> ((36/85)-(77/85)*i)
+ *    Complex(9, 8)  / 4               #=> ((9/4)+(2/1)*i)
+ *    Complex(20, 9) / 9.8             #=> (2.0408163265306123+0.9183673469387754i)
+ */
+static VALUE
+nucomp_div(VALUE self, VALUE other)
+{
+    return f_divide(self, other, f_quo, id_quo);
+}
+
+#define nucomp_quo nucomp_div
+
+/*
+ * call-seq:
+ *    cmp.fdiv(numeric)  ->  complex
+ *
+ * Performs division as each part is a float, never returns a float.
+ *
+ *    Complex(11, 22).fdiv(3)  #=> (3.6666666666666665+7.333333333333333i)
+ */
+static VALUE
+nucomp_fdiv(VALUE self, VALUE other)
+{
+    return f_divide(self, other, f_fdiv, id_fdiv);
+}
+
+inline static VALUE
+f_reciprocal(VALUE x)
+{
+    return f_quo(ONE, x);
+}
+
+/*
+ * call-seq:
+ *    cmp ** numeric  ->  complex
+ *
+ * Performs exponentiation.
+ *
+ *    Complex('i') ** 2              #=> (-1+0i)
+ *    Complex(-8) ** Rational(1, 3)  #=> (1.0000000000000002+1.7320508075688772i)
+ */
+static VALUE
+nucomp_expt(VALUE self, VALUE other)
+{
+    if (k_numeric_p(other) && k_exact_zero_p(other))
+	return f_complex_new_bang1(CLASS_OF(self), ONE);
+
+    if (k_rational_p(other) && f_one_p(f_denominator(other)))
+	other = f_numerator(other); /* c14n */
+
+    if (k_complex_p(other)) {
+	get_dat1(other);
+
+	if (k_exact_zero_p(dat->imag))
+	    other = dat->real; /* c14n */
+    }
+
+    if (k_complex_p(other)) {
+	VALUE r, theta, nr, ntheta;
+
+	get_dat1(other);
+
+	r = f_abs(self);
+	theta = f_arg(self);
+
+	nr = m_exp_bang(f_sub(f_mul(dat->real, m_log_bang(r)),
+			      f_mul(dat->imag, theta)));
+	ntheta = f_add(f_mul(theta, dat->real),
+		       f_mul(dat->imag, m_log_bang(r)));
+	return f_complex_polar(CLASS_OF(self), nr, ntheta);
+    }
+    if (k_fixnum_p(other)) {
+	if (f_gt_p(other, ZERO)) {
+	    VALUE x, z;
+	    long n;
+
+	    x = self;
+	    z = x;
+	    n = FIX2LONG(other) - 1;
+
+	    while (n) {
+		long q, r;
+
+		while (1) {
+		    get_dat1(x);
+
+		    q = n / 2;
+		    r = n % 2;
+
+		    if (r)
+			break;
+
+		    x = nucomp_s_new_internal(CLASS_OF(self),
+				       f_sub(f_mul(dat->real, dat->real),
+					     f_mul(dat->imag, dat->imag)),
+				       f_mul(f_mul(TWO, dat->real), dat->imag));
+		    n = q;
+		}
+		z = f_mul(z, x);
+		n--;
+	    }
+	    return z;
+	}
+	return f_expt(f_reciprocal(self), f_negate(other));
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	VALUE r, theta;
+
+	if (k_bignum_p(other))
+	    rb_warn("in a**b, b may be too big");
+
+	r = f_abs(self);
+	theta = f_arg(self);
+
+	return f_complex_polar(CLASS_OF(self), f_expt(r, other),
+			       f_mul(theta, other));
+    }
+    return rb_num_coerce_bin(self, other, id_expt);
+}
+
+/*
+ * call-seq:
+ *    cmp == object  ->  true or false
+ *
+ * Returns true if cmp equals object numerically.
+ *
+ *    Complex(2, 3)  == Complex(2, 3)   #=> true
+ *    Complex(5)     == 5               #=> true
+ *    Complex(0)     == 0.0             #=> true
+ *    Complex('1/3') == 0.33            #=> false
+ *    Complex('1/2') == '1/2'           #=> false
+ */
+static VALUE
+nucomp_eqeq_p(VALUE self, VALUE other)
+{
+    if (k_complex_p(other)) {
+	get_dat2(self, other);
+
+	return f_boolcast(f_eqeq_p(adat->real, bdat->real) &&
+			  f_eqeq_p(adat->imag, bdat->imag));
+    }
+    if (k_numeric_p(other) && f_real_p(other)) {
+	get_dat1(self);
+
+	return f_boolcast(f_eqeq_p(dat->real, other) && f_zero_p(dat->imag));
+    }
+    return f_eqeq_p(other, self);
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_coerce(VALUE self, VALUE other)
+{
+    if (k_numeric_p(other) && f_real_p(other))
+	return rb_assoc_new(f_complex_new_bang1(CLASS_OF(self), other), self);
+    if (RB_TYPE_P(other, T_COMPLEX))
+	return rb_assoc_new(other, self);
+
+    rb_raise(rb_eTypeError, "%s can't be coerced into %s",
+	     rb_obj_classname(other), rb_obj_classname(self));
+    return Qnil;
+}
+
+/*
+ * call-seq:
+ *    cmp.abs        ->  real
+ *    cmp.magnitude  ->  real
+ *
+ * Returns the absolute part of its polar form.
+ *
+ *    Complex(-1).abs         #=> 1
+ *    Complex(3.0, -4.0).abs  #=> 5.0
+ */
+static VALUE
+nucomp_abs(VALUE self)
+{
+    get_dat1(self);
+
+    if (f_zero_p(dat->real)) {
+	VALUE a = f_abs(dat->imag);
+	if (k_float_p(dat->real) && !k_float_p(dat->imag))
+	    a = f_to_f(a);
+	return a;
+    }
+    if (f_zero_p(dat->imag)) {
+	VALUE a = f_abs(dat->real);
+	if (!k_float_p(dat->real) && k_float_p(dat->imag))
+	    a = f_to_f(a);
+	return a;
+    }
+    return m_hypot(dat->real, dat->imag);
+}
+
+/*
+ * call-seq:
+ *    cmp.abs2  ->  real
+ *
+ * Returns square of the absolute value.
+ *
+ *    Complex(-1).abs2         #=> 1
+ *    Complex(3.0, -4.0).abs2  #=> 25.0
+ */
+static VALUE
+nucomp_abs2(VALUE self)
+{
+    get_dat1(self);
+    return f_add(f_mul(dat->real, dat->real),
+		 f_mul(dat->imag, dat->imag));
+}
+
+/*
+ * call-seq:
+ *    cmp.arg    ->  float
+ *    cmp.angle  ->  float
+ *    cmp.phase  ->  float
+ *
+ * Returns the angle part of its polar form.
+ *
+ *    Complex.polar(3, Math::PI/2).arg  #=> 1.5707963267948966
+ */
+static VALUE
+nucomp_arg(VALUE self)
+{
+    get_dat1(self);
+    return m_atan2_bang(dat->imag, dat->real);
+}
+
+/*
+ * call-seq:
+ *    cmp.rect         ->  array
+ *    cmp.rectangular  ->  array
+ *
+ * Returns an array; [cmp.real, cmp.imag].
+ *
+ *    Complex(1, 2).rectangular  #=> [1, 2]
+ */
+static VALUE
+nucomp_rect(VALUE self)
+{
+    get_dat1(self);
+    return rb_assoc_new(dat->real, dat->imag);
+}
+
+/*
+ * call-seq:
+ *    cmp.polar  ->  array
+ *
+ * Returns an array; [cmp.abs, cmp.arg].
+ *
+ *    Complex(1, 2).polar  #=> [2.23606797749979, 1.1071487177940904]
+ */
+static VALUE
+nucomp_polar(VALUE self)
+{
+    return rb_assoc_new(f_abs(self), f_arg(self));
+}
+
+/*
+ * call-seq:
+ *    cmp.conj       ->  complex
+ *    cmp.conjugate  ->  complex
+ *
+ * Returns the complex conjugate.
+ *
+ *    Complex(1, 2).conjugate  #=> (1-2i)
+ */
+static VALUE
+nucomp_conj(VALUE self)
+{
+    get_dat1(self);
+    return f_complex_new2(CLASS_OF(self), dat->real, f_negate(dat->imag));
+}
+
+#if 0
+/* :nodoc: */
+static VALUE
+nucomp_true(VALUE self)
+{
+    return Qtrue;
+}
+#endif
+
+/*
+ * call-seq:
+ *    cmp.real?  ->  false
+ *
+ * Returns false.
+ */
+static VALUE
+nucomp_false(VALUE self)
+{
+    return Qfalse;
+}
+
+#if 0
+/* :nodoc: */
+static VALUE
+nucomp_exact_p(VALUE self)
+{
+    get_dat1(self);
+    return f_boolcast(k_exact_p(dat->real) && k_exact_p(dat->imag));
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_inexact_p(VALUE self)
+{
+    return f_boolcast(!nucomp_exact_p(self));
+}
+#endif
+
+/*
+ * call-seq:
+ *    cmp.denominator  ->  integer
+ *
+ * Returns the denominator (lcm of both denominator - real and imag).
+ *
+ * See numerator.
+ */
+static VALUE
+nucomp_denominator(VALUE self)
+{
+    get_dat1(self);
+    return rb_lcm(f_denominator(dat->real), f_denominator(dat->imag));
+}
+
+/*
+ * call-seq:
+ *    cmp.numerator  ->  numeric
+ *
+ * Returns the numerator.
+ *
+ *        1   2       3+4i  <-  numerator
+ *        - + -i  ->  ----
+ *        2   3        6    <-  denominator
+ *
+ *    c = Complex('1/2+2/3i')  #=> ((1/2)+(2/3)*i)
+ *    n = c.numerator          #=> (3+4i)
+ *    d = c.denominator        #=> 6
+ *    n / d                    #=> ((1/2)+(2/3)*i)
+ *    Complex(Rational(n.real, d), Rational(n.imag, d))
+ *                             #=> ((1/2)+(2/3)*i)
+ * See denominator.
+ */
+static VALUE
+nucomp_numerator(VALUE self)
+{
+    VALUE cd;
+
+    get_dat1(self);
+
+    cd = f_denominator(self);
+    return f_complex_new2(CLASS_OF(self),
+			  f_mul(f_numerator(dat->real),
+				f_div(cd, f_denominator(dat->real))),
+			  f_mul(f_numerator(dat->imag),
+				f_div(cd, f_denominator(dat->imag))));
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_hash(VALUE self)
+{
+    st_index_t v, h[2];
+    VALUE n;
+
+    get_dat1(self);
+    n = rb_hash(dat->real);
+    h[0] = NUM2LONG(n);
+    n = rb_hash(dat->imag);
+    h[1] = NUM2LONG(n);
+    v = rb_memhash(h, sizeof(h));
+    return LONG2FIX(v);
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_eql_p(VALUE self, VALUE other)
+{
+    if (k_complex_p(other)) {
+	get_dat2(self, other);
+
+	return f_boolcast((CLASS_OF(adat->real) == CLASS_OF(bdat->real)) &&
+			  (CLASS_OF(adat->imag) == CLASS_OF(bdat->imag)) &&
+			  f_eqeq_p(self, other));
+
+    }
+    return Qfalse;
+}
+
+inline static VALUE
+f_signbit(VALUE x)
+{
+#if defined(HAVE_SIGNBIT) && defined(__GNUC__) && defined(__sun) && \
+    !defined(signbit)
+    extern int signbit(double);
+#endif
+    if (RB_TYPE_P(x, T_FLOAT)) {
+	double f = RFLOAT_VALUE(x);
+	return f_boolcast(!isnan(f) && signbit(f));
+    }
+    return f_negative_p(x);
+}
+
+inline static VALUE
+f_tpositive_p(VALUE x)
+{
+    return f_boolcast(!f_signbit(x));
+}
+
+static VALUE
+f_format(VALUE self, VALUE (*func)(VALUE))
+{
+    VALUE s, impos;
+
+    get_dat1(self);
+
+    impos = f_tpositive_p(dat->imag);
+
+    s = (*func)(dat->real);
+    rb_str_cat2(s, !impos ? "-" : "+");
+
+    rb_str_concat(s, (*func)(f_abs(dat->imag)));
+    if (!rb_isdigit(RSTRING_PTR(s)[RSTRING_LEN(s) - 1]))
+	rb_str_cat2(s, "*");
+    rb_str_cat2(s, "i");
+
+    return s;
+}
+
+/*
+ * call-seq:
+ *    cmp.to_s  ->  string
+ *
+ * Returns the value as a string.
+ *
+ *    Complex(2).to_s                       #=> "2+0i"
+ *    Complex('-8/6').to_s                  #=> "-4/3+0i"
+ *    Complex('1/2i').to_s                  #=> "0+1/2i"
+ *    Complex(0, Float::INFINITY).to_s      #=> "0+Infinity*i"
+ *    Complex(Float::NAN, Float::NAN).to_s  #=> "NaN+NaN*i"
+ */
+static VALUE
+nucomp_to_s(VALUE self)
+{
+    return f_format(self, f_to_s);
+}
+
+/*
+ * call-seq:
+ *    cmp.inspect  ->  string
+ *
+ * Returns the value as a string for inspection.
+ *
+ *    Complex(2).inspect                       #=> "(2+0i)"
+ *    Complex('-8/6').inspect                  #=> "((-4/3)+0i)"
+ *    Complex('1/2i').inspect                  #=> "(0+(1/2)*i)"
+ *    Complex(0, Float::INFINITY).inspect      #=> "(0+Infinity*i)"
+ *    Complex(Float::NAN, Float::NAN).inspect  #=> "(NaN+NaN*i)"
+ */
+static VALUE
+nucomp_inspect(VALUE self)
+{
+    VALUE s;
+
+    s = rb_usascii_str_new2("(");
+    rb_str_concat(s, f_format(self, f_inspect));
+    rb_str_cat2(s, ")");
+
+    return s;
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_dumper(VALUE self)
+{
+    return self;
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_loader(VALUE self, VALUE a)
+{
+    get_dat1(self);
+
+    RCOMPLEX_SET_REAL(dat, rb_ivar_get(a, id_i_real));
+    RCOMPLEX_SET_IMAG(dat, rb_ivar_get(a, id_i_imag));
+
+    return self;
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_marshal_dump(VALUE self)
+{
+    VALUE a;
+    get_dat1(self);
+
+    a = rb_assoc_new(dat->real, dat->imag);
+    rb_copy_generic_ivar(a, self);
+    return a;
+}
+
+/* :nodoc: */
+static VALUE
+nucomp_marshal_load(VALUE self, VALUE a)
+{
+    Check_Type(a, T_ARRAY);
+    if (RARRAY_LEN(a) != 2)
+	rb_raise(rb_eArgError, "marshaled complex must have an array whose length is 2 but %ld", RARRAY_LEN(a));
+    rb_ivar_set(self, id_i_real, RARRAY_AREF(a, 0));
+    rb_ivar_set(self, id_i_imag, RARRAY_AREF(a, 1));
+    return self;
+}
+
+/* --- */
+
+VALUE
+rb_complex_raw(VALUE x, VALUE y)
+{
+    return nucomp_s_new_internal(rb_cComplex, x, y);
+}
+
+VALUE
+rb_complex_new(VALUE x, VALUE y)
+{
+    return nucomp_s_canonicalize_internal(rb_cComplex, x, y);
+}
+
+VALUE
+rb_complex_polar(VALUE x, VALUE y)
+{
+    return f_complex_polar(rb_cComplex, x, y);
+}
+
+static VALUE nucomp_s_convert(int argc, VALUE *argv, VALUE klass);
+
+VALUE
+rb_Complex(VALUE x, VALUE y)
+{
+    VALUE a[2];
+    a[0] = x;
+    a[1] = y;
+    return nucomp_s_convert(2, a, rb_cComplex);
+}
+
+/*
+ * call-seq:
+ *    cmp.to_i  ->  integer
+ *
+ * Returns the value as an integer if possible (the imaginary part
+ * should be exactly zero).
+ *
+ *    Complex(1, 0).to_i    #=> 1
+ *    Complex(1, 0.0).to_i  # RangeError
+ *    Complex(1, 2).to_i    # RangeError
+ */
+static VALUE
+nucomp_to_i(VALUE self)
+{
+    get_dat1(self);
+
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
+	VALUE s = f_to_s(self);
+	rb_raise(rb_eRangeError, "can't convert %s into Integer",
+		 StringValuePtr(s));
+    }
+    return f_to_i(dat->real);
+}
+
+/*
+ * call-seq:
+ *    cmp.to_f  ->  float
+ *
+ * Returns the value as a float if possible (the imaginary part should
+ * be exactly zero).
+ *
+ *    Complex(1, 0).to_f    #=> 1.0
+ *    Complex(1, 0.0).to_f  # RangeError
+ *    Complex(1, 2).to_f    # RangeError
+ */
+static VALUE
+nucomp_to_f(VALUE self)
+{
+    get_dat1(self);
+
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
+	VALUE s = f_to_s(self);
+	rb_raise(rb_eRangeError, "can't convert %s into Float",
+		 StringValuePtr(s));
+    }
+    return f_to_f(dat->real);
+}
+
+/*
+ * call-seq:
+ *    cmp.to_r  ->  rational
+ *
+ * Returns the value as a rational if possible (the imaginary part
+ * should be exactly zero).
+ *
+ *    Complex(1, 0).to_r    #=> (1/1)
+ *    Complex(1, 0.0).to_r  # RangeError
+ *    Complex(1, 2).to_r    # RangeError
+ *
+ * See rationalize.
+ */
+static VALUE
+nucomp_to_r(VALUE self)
+{
+    get_dat1(self);
+
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
+	VALUE s = f_to_s(self);
+	rb_raise(rb_eRangeError, "can't convert %s into Rational",
+		 StringValuePtr(s));
+    }
+    return f_to_r(dat->real);
+}
+
+/*
+ * call-seq:
+ *    cmp.rationalize([eps])  ->  rational
+ *
+ * Returns the value as a rational if possible (the imaginary part
+ * should be exactly zero).
+ *
+ *    Complex(1.0/3, 0).rationalize  #=> (1/3)
+ *    Complex(1, 0.0).rationalize    # RangeError
+ *    Complex(1, 2).rationalize      # RangeError
+ *
+ * See to_r.
+ */
+static VALUE
+nucomp_rationalize(int argc, VALUE *argv, VALUE self)
+{
+    get_dat1(self);
+
+    rb_scan_args(argc, argv, "01", NULL);
+
+    if (k_inexact_p(dat->imag) || f_nonzero_p(dat->imag)) {
+       VALUE s = f_to_s(self);
+       rb_raise(rb_eRangeError, "can't convert %s into Rational",
+                StringValuePtr(s));
+    }
+    return rb_funcall2(dat->real, rb_intern("rationalize"), argc, argv);
+}
+
+/*
+ * call-seq:
+ *    complex.to_c  ->  self
+ *
+ * Returns self.
+ *
+ *    Complex(2).to_c      #=> (2+0i)
+ *    Complex(-8, 6).to_c  #=> (-8+6i)
+ */
+static VALUE
+nucomp_to_c(VALUE self)
+{
+    return self;
+}
+
+/*
+ * call-seq:
+ *    nil.to_c  ->  (0+0i)
+ *
+ * Returns zero as a complex.
+ */
+static VALUE
+nilclass_to_c(VALUE self)
+{
+    return rb_complex_new1(INT2FIX(0));
+}
+
+/*
+ * call-seq:
+ *    num.to_c  ->  complex
+ *
+ * Returns the value as a complex.
+ */
+static VALUE
+numeric_to_c(VALUE self)
+{
+    return rb_complex_new1(self);
+}
+
+#include <ctype.h>
+
+inline static int
+issign(int c)
+{
+    return (c == '-' || c == '+');
+}
+
+static int
+read_sign(const char **s,
+	  char **b)
+{
+    int sign = '?';
+
+    if (issign(**s)) {
+	sign = **b = **s;
+	(*s)++;
+	(*b)++;
+    }
+    return sign;
+}
+
+inline static int
+isdecimal(int c)
+{
+    return isdigit((unsigned char)c);
+}
+
+static int
+read_digits(const char **s, int strict,
+	    char **b)
+{
+    int us = 1;
+
+    if (!isdecimal(**s))
+	return 0;
+
+    while (isdecimal(**s) || **s == '_') {
+	if (**s == '_') {
+	    if (strict) {
+		if (us)
+		    return 0;
+	    }
+	    us = 1;
+	}
+	else {
+	    **b = **s;
+	    (*b)++;
+	    us = 0;
+	}
+	(*s)++;
+    }
+    if (us)
+	do {
+	    (*s)--;
+	} while (**s == '_');
+    return 1;
+}
+
+inline static int
+islettere(int c)
+{
+    return (c == 'e' || c == 'E');
+}
+
+static int
+read_num(const char **s, int strict,
+	 char **b)
+{
+    if (**s != '.') {
+	if (!read_digits(s, strict, b))
+	    return 0;
+    }
+
+    if (**s == '.') {
+	**b = **s;
+	(*s)++;
+	(*b)++;
+	if (!read_digits(s, strict, b)) {
+	    (*b)--;
+	    return 0;
+	}
+    }
+
+    if (islettere(**s)) {
+	**b = **s;
+	(*s)++;
+	(*b)++;
+	read_sign(s, b);
+	if (!read_digits(s, strict, b)) {
+	    (*b)--;
+	    return 0;
+	}
+    }
+    return 1;
+}
+
+inline static int
+read_den(const char **s, int strict,
+	 char **b)
+{
+    if (!read_digits(s, strict, b))
+	return 0;
+    return 1;
+}
+
+static int
+read_rat_nos(const char **s, int strict,
+	     char **b)
+{
+    if (!read_num(s, strict, b))
+	return 0;
+    if (**s == '/') {
+	**b = **s;
+	(*s)++;
+	(*b)++;
+	if (!read_den(s, strict, b)) {
+	    (*b)--;
+	    return 0;
+	}
+    }
+    return 1;
+}
+
+static int
+read_rat(const char **s, int strict,
+	 char **b)
+{
+    read_sign(s, b);
+    if (!read_rat_nos(s, strict, b))
+	return 0;
+    return 1;
+}
+
+inline static int
+isimagunit(int c)
+{
+    return (c == 'i' || c == 'I' ||
+	    c == 'j' || c == 'J');
+}
+
+VALUE rb_cstr_to_rat(const char *, int);
+
+static VALUE
+str2num(char *s)
+{
+    if (strchr(s, '/'))
+	return rb_cstr_to_rat(s, 0);
+    if (strpbrk(s, ".eE"))
+	return DBL2NUM(rb_cstr_to_dbl(s, 0));
+    return rb_cstr_to_inum(s, 10, 0);
+}
+
+static int
+read_comp(const char **s, int strict,
+	  VALUE *ret, char **b)
+{
+    char *bb;
+    int sign;
+    VALUE num, num2;
+
+    bb = *b;
+
+    sign = read_sign(s, b);
+
+    if (isimagunit(**s)) {
+	(*s)++;
+	num = INT2FIX((sign == '-') ? -1 : + 1);
+	*ret = rb_complex_new2(ZERO, num);
+	return 1; /* e.g. "i" */
+    }
+
+    if (!read_rat_nos(s, strict, b)) {
+	**b = '\0';
+	num = str2num(bb);
+	*ret = rb_complex_new2(num, ZERO);
+	return 0; /* e.g. "-" */
+    }
+    **b = '\0';
+    num = str2num(bb);
+
+    if (isimagunit(**s)) {
+	(*s)++;
+	*ret = rb_complex_new2(ZERO, num);
+	return 1; /* e.g. "3i" */
+    }
+
+    if (**s == '@') {
+	int st;
+
+	(*s)++;
+	bb = *b;
+	st = read_rat(s, strict, b);
+	**b = '\0';
+	if (strlen(bb) < 1 ||
+	    !isdecimal(*(bb + strlen(bb) - 1))) {
+	    *ret = rb_complex_new2(num, ZERO);
+	    return 0; /* e.g. "1@-" */
+	}
+	num2 = str2num(bb);
+	*ret = rb_complex_polar(num, num2);
+	if (!st)
+	    return 0; /* e.g. "1@2." */
+	else
+	    return 1; /* e.g. "1@2" */
+    }
+
+    if (issign(**s)) {
+	bb = *b;
+	sign = read_sign(s, b);
+	if (isimagunit(**s))
+	    num2 = INT2FIX((sign == '-') ? -1 : + 1);
+	else {
+	    if (!read_rat_nos(s, strict, b)) {
+		*ret = rb_complex_new2(num, ZERO);
+		return 0; /* e.g. "1+xi" */
+	    }
+	    **b = '\0';
+	    num2 = str2num(bb);
+	}
+	if (!isimagunit(**s)) {
+	    *ret = rb_complex_new2(num, ZERO);
+	    return 0; /* e.g. "1+3x" */
+	}
+	(*s)++;
+	*ret = rb_complex_new2(num, num2);
+	return 1; /* e.g. "1+2i" */
+    }
+    /* !(@, - or +) */
+    {
+	*ret = rb_complex_new2(num, ZERO);
+	return 1; /* e.g. "3" */
+    }
+}
+
+inline static void
+skip_ws(const char **s)
+{
+    while (isspace((unsigned char)**s))
+	(*s)++;
+}
+
+static int
+parse_comp(const char *s, int strict,
+	   VALUE *num)
+{
+    char *buf, *b;
+
+    buf = ALLOCA_N(char, strlen(s) + 1);
+    b = buf;
+
+    skip_ws(&s);
+    if (!read_comp(&s, strict, num, &b))
+	return 0;
+    skip_ws(&s);
+
+    if (strict)
+	if (*s != '\0')
+	    return 0;
+    return 1;
+}
+
+static VALUE
+string_to_c_strict(VALUE self)
+{
+    char *s;
+    VALUE num;
+
+    rb_must_asciicompat(self);
+
+    s = RSTRING_PTR(self);
+
+    if (!s || memchr(s, '\0', RSTRING_LEN(self)))
+	rb_raise(rb_eArgError, "string contains null byte");
+
+    if (s && s[RSTRING_LEN(self)]) {
+	rb_str_modify(self);
+	s = RSTRING_PTR(self);
+	s[RSTRING_LEN(self)] = '\0';
+    }
+
+    if (!s)
+	s = (char *)"";
+
+    if (!parse_comp(s, 1, &num)) {
+	VALUE ins = f_inspect(self);
+	rb_raise(rb_eArgError, "invalid value for convert(): %s",
+		 StringValuePtr(ins));
+    }
+
+    return num;
+}
+
+/*
+ * call-seq:
+ *    str.to_c  ->  complex
+ *
+ * Returns a complex which denotes the string form.  The parser
+ * ignores leading whitespaces and trailing garbage.  Any digit
+ * sequences can be separated by an underscore.  Returns zero for null
+ * or garbage string.
+ *
+ *    '9'.to_c           #=> (9+0i)
+ *    '2.5'.to_c         #=> (2.5+0i)
+ *    '2.5/1'.to_c       #=> ((5/2)+0i)
+ *    '-3/2'.to_c        #=> ((-3/2)+0i)
+ *    '-i'.to_c          #=> (0-1i)
+ *    '45i'.to_c         #=> (0+45i)
+ *    '3-4i'.to_c        #=> (3-4i)
+ *    '-4e2-4e-2i'.to_c  #=> (-400.0-0.04i)
+ *    '-0.0-0.0i'.to_c   #=> (-0.0-0.0i)
+ *    '1/2+3/4i'.to_c    #=> ((1/2)+(3/4)*i)
+ *    'ruby'.to_c        #=> (0+0i)
+ *
+ * See Kernel.Complex.
+ */
+static VALUE
+string_to_c(VALUE self)
+{
+    char *s;
+    VALUE num;
+
+    rb_must_asciicompat(self);
+
+    s = RSTRING_PTR(self);
+
+    if (s && s[RSTRING_LEN(self)]) {
+	rb_str_modify(self);
+	s = RSTRING_PTR(self);
+	s[RSTRING_LEN(self)] = '\0';
+    }
+
+    if (!s)
+	s = (char *)"";
+
+    (void)parse_comp(s, 0, &num);
+
+    return num;
+}
+
+static VALUE
+nucomp_s_convert(int argc, VALUE *argv, VALUE klass)
+{
+    VALUE a1, a2, backref;
+
+    rb_scan_args(argc, argv, "11", &a1, &a2);
+
+    if (NIL_P(a1) || (argc == 2 && NIL_P(a2)))
+	rb_raise(rb_eTypeError, "can't convert nil into Complex");
+
+    backref = rb_backref_get();
+    rb_match_busy(backref);
+
+    if (RB_TYPE_P(a1, T_STRING)) {
+	a1 = string_to_c_strict(a1);
+    }
+
+    if (RB_TYPE_P(a2, T_STRING)) {
+	a2 = string_to_c_strict(a2);
+    }
+
+    rb_backref_set(backref);
+
+    if (RB_TYPE_P(a1, T_COMPLEX)) {
+	{
+	    get_dat1(a1);
+
+	    if (k_exact_zero_p(dat->imag))
+		a1 = dat->real;
+	}
+    }
+
+    if (RB_TYPE_P(a2, T_COMPLEX)) {
+	{
+	    get_dat1(a2);
+
+	    if (k_exact_zero_p(dat->imag))
+		a2 = dat->real;
+	}
+    }
+
+    if (RB_TYPE_P(a1, T_COMPLEX)) {
+	if (argc == 1 || (k_exact_zero_p(a2)))
+	    return a1;
+    }
+
+    if (argc == 1) {
+	if (k_numeric_p(a1) && !f_real_p(a1))
+	    return a1;
+	/* should raise exception for consistency */
+	if (!k_numeric_p(a1))
+	    return rb_convert_type(a1, T_COMPLEX, "Complex", "to_c");
+    }
+    else {
+	if ((k_numeric_p(a1) && k_numeric_p(a2)) &&
+	    (!f_real_p(a1) || !f_real_p(a2)))
+	    return f_add(a1,
+			 f_mul(a2,
+			       f_complex_new_bang2(rb_cComplex, ZERO, ONE)));
+    }
+
+    {
+	VALUE argv2[2];
+	argv2[0] = a1;
+	argv2[1] = a2;
+	return nucomp_s_new(argc, argv2, klass);
+    }
+}
+
+/* --- */
+
+/*
+ * call-seq:
+ *    num.real  ->  self
+ *
+ * Returns self.
+ */
+static VALUE
+numeric_real(VALUE self)
+{
+    return self;
+}
+
+/*
+ * call-seq:
+ *    num.imag       ->  0
+ *    num.imaginary  ->  0
+ *
+ * Returns zero.
+ */
+static VALUE
+numeric_imag(VALUE self)
+{
+    return INT2FIX(0);
+}
+
+/*
+ * call-seq:
+ *    num.abs2  ->  real
+ *
+ * Returns square of self.
+ */
+static VALUE
+numeric_abs2(VALUE self)
+{
+    return f_mul(self, self);
+}
+
+#define id_PI rb_intern("PI")
+
+/*
+ * call-seq:
+ *    num.arg    ->  0 or float
+ *    num.angle  ->  0 or float
+ *    num.phase  ->  0 or float
+ *
+ * Returns 0 if the value is positive, pi otherwise.
+ */
+static VALUE
+numeric_arg(VALUE self)
+{
+    if (f_positive_p(self))
+	return INT2FIX(0);
+    return rb_const_get(rb_mMath, id_PI);
+}
+
+/*
+ * call-seq:
+ *    num.rect  ->  array
+ *    num.rectangular  ->  array
+ *
+ * Returns an array; [num, 0].
+ */
+static VALUE
+numeric_rect(VALUE self)
+{
+    return rb_assoc_new(self, INT2FIX(0));
+}
+
+/*
+ * call-seq:
+ *    num.polar  ->  array
+ *
+ * Returns an array; [num.abs, num.arg].
+ */
+static VALUE
+numeric_polar(VALUE self)
+{
+    return rb_assoc_new(f_abs(self), f_arg(self));
+}
+
+/*
+ * call-seq:
+ *    num.conj       ->  self
+ *    num.conjugate  ->  self
+ *
+ * Returns self.
+ */
+static VALUE
+numeric_conj(VALUE self)
+{
+    return self;
+}
+
+/*
+ * call-seq:
+ *    flo.arg    ->  0 or float
+ *    flo.angle  ->  0 or float
+ *    flo.phase  ->  0 or float
+ *
+ * Returns 0 if the value is positive, pi otherwise.
+ */
+static VALUE
+float_arg(VALUE self)
+{
+    if (isnan(RFLOAT_VALUE(self)))
+	return self;
+    if (f_tpositive_p(self))
+	return INT2FIX(0);
+    return rb_const_get(rb_mMath, id_PI);
+}
+
+/*
+ * A complex number can be represented as a paired real number with
+ * imaginary unit; a+bi.  Where a is real part, b is imaginary part
+ * and i is imaginary unit.  Real a equals complex a+0i
+ * mathematically.
+ *
+ * In ruby, you can create complex object with Complex, Complex::rect,
+ * Complex::polar or to_c method.
+ *
+ *    Complex(1)           #=> (1+0i)
+ *    Complex(2, 3)        #=> (2+3i)
+ *    Complex.polar(2, 3)  #=> (-1.9799849932008908+0.2822400161197344i)
+ *    3.to_c               #=> (3+0i)
+ *
+ * You can also create complex object from floating-point numbers or
+ * strings.
+ *
+ *    Complex(0.3)         #=> (0.3+0i)
+ *    Complex('0.3-0.5i')  #=> (0.3-0.5i)
+ *    Complex('2/3+3/4i')  #=> ((2/3)+(3/4)*i)
+ *    Complex('1@2')       #=> (-0.4161468365471424+0.9092974268256817i)
+ *
+ *    0.3.to_c             #=> (0.3+0i)
+ *    '0.3-0.5i'.to_c      #=> (0.3-0.5i)
+ *    '2/3+3/4i'.to_c      #=> ((2/3)+(3/4)*i)
+ *    '1@2'.to_c           #=> (-0.4161468365471424+0.9092974268256817i)
+ *
+ * A complex object is either an exact or an inexact number.
+ *
+ *    Complex(1, 1) / 2    #=> ((1/2)+(1/2)*i)
+ *    Complex(1, 1) / 2.0  #=> (0.5+0.5i)
+ */
+void
+Init_Complex(void)
+{
+    VALUE compat;
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
+
+    assert(fprintf(stderr, "assert() is now active\n"));
+
+    id_abs = rb_intern("abs");
+    id_abs2 = rb_intern("abs2");
+    id_arg = rb_intern("arg");
+    id_cmp = rb_intern("<=>");
+    id_conj = rb_intern("conj");
+    id_convert = rb_intern("convert");
+    id_denominator = rb_intern("denominator");
+    id_divmod = rb_intern("divmod");
+    id_eqeq_p = rb_intern("==");
+    id_expt = rb_intern("**");
+    id_fdiv = rb_intern("fdiv");
+    id_floor = rb_intern("floor");
+    id_idiv = rb_intern("div");
+    id_imag = rb_intern("imag");
+    id_inspect = rb_intern("inspect");
+    id_negate = rb_intern("-@");
+    id_numerator = rb_intern("numerator");
+    id_quo = rb_intern("quo");
+    id_real = rb_intern("real");
+    id_real_p = rb_intern("real?");
+    id_to_f = rb_intern("to_f");
+    id_to_i = rb_intern("to_i");
+    id_to_r = rb_intern("to_r");
+    id_to_s = rb_intern("to_s");
+    id_i_real = rb_intern("@real");
+    id_i_imag = rb_intern("@image"); /* @image, not @imag */
+
+    rb_cComplex = rb_define_class("Complex", rb_cNumeric);
+
+    rb_define_alloc_func(rb_cComplex, nucomp_s_alloc);
+    rb_undef_method(CLASS_OF(rb_cComplex), "allocate");
+
+#if 0
+    rb_define_private_method(CLASS_OF(rb_cComplex), "new!", nucomp_s_new_bang, -1);
+    rb_define_private_method(CLASS_OF(rb_cComplex), "new", nucomp_s_new, -1);
+#else
+    rb_undef_method(CLASS_OF(rb_cComplex), "new");
+#endif
+
+    rb_define_singleton_method(rb_cComplex, "rectangular", nucomp_s_new, -1);
+    rb_define_singleton_method(rb_cComplex, "rect", nucomp_s_new, -1);
+    rb_define_singleton_method(rb_cComplex, "polar", nucomp_s_polar, -1);
+
+    rb_define_global_function("Complex", nucomp_f_complex, -1);
+
+    rb_undef_method(rb_cComplex, "%");
+    rb_undef_method(rb_cComplex, "<");
+    rb_undef_method(rb_cComplex, "<=");
+    rb_undef_method(rb_cComplex, "<=>");
+    rb_undef_method(rb_cComplex, ">");
+    rb_undef_method(rb_cComplex, ">=");
+    rb_undef_method(rb_cComplex, "between?");
+    rb_undef_method(rb_cComplex, "div");
+    rb_undef_method(rb_cComplex, "divmod");
+    rb_undef_method(rb_cComplex, "floor");
+    rb_undef_method(rb_cComplex, "ceil");
+    rb_undef_method(rb_cComplex, "modulo");
+    rb_undef_method(rb_cComplex, "remainder");
+    rb_undef_method(rb_cComplex, "round");
+    rb_undef_method(rb_cComplex, "step");
+    rb_undef_method(rb_cComplex, "truncate");
+    rb_undef_method(rb_cComplex, "i");
+
+#if 0 /* NUBY */
+    rb_undef_method(rb_cComplex, "//");
+#endif
+
+    rb_define_method(rb_cComplex, "real", nucomp_real, 0);
+    rb_define_method(rb_cComplex, "imaginary", nucomp_imag, 0);
+    rb_define_method(rb_cComplex, "imag", nucomp_imag, 0);
+
+    rb_define_method(rb_cComplex, "-@", nucomp_negate, 0);
+    rb_define_method(rb_cComplex, "+", nucomp_add, 1);
+    rb_define_method(rb_cComplex, "-", nucomp_sub, 1);
+    rb_define_method(rb_cComplex, "*", nucomp_mul, 1);
+    rb_define_method(rb_cComplex, "/", nucomp_div, 1);
+    rb_define_method(rb_cComplex, "quo", nucomp_quo, 1);
+    rb_define_method(rb_cComplex, "fdiv", nucomp_fdiv, 1);
+    rb_define_method(rb_cComplex, "**", nucomp_expt, 1);
+
+    rb_define_method(rb_cComplex, "==", nucomp_eqeq_p, 1);
+    rb_define_method(rb_cComplex, "coerce", nucomp_coerce, 1);
+
+    rb_define_method(rb_cComplex, "abs", nucomp_abs, 0);
+    rb_define_method(rb_cComplex, "magnitude", nucomp_abs, 0);
+    rb_define_method(rb_cComplex, "abs2", nucomp_abs2, 0);
+    rb_define_method(rb_cComplex, "arg", nucomp_arg, 0);
+    rb_define_method(rb_cComplex, "angle", nucomp_arg, 0);
+    rb_define_method(rb_cComplex, "phase", nucomp_arg, 0);
+    rb_define_method(rb_cComplex, "rectangular", nucomp_rect, 0);
+    rb_define_method(rb_cComplex, "rect", nucomp_rect, 0);
+    rb_define_method(rb_cComplex, "polar", nucomp_polar, 0);
+    rb_define_method(rb_cComplex, "conjugate", nucomp_conj, 0);
+    rb_define_method(rb_cComplex, "conj", nucomp_conj, 0);
+#if 0
+    rb_define_method(rb_cComplex, "~", nucomp_conj, 0); /* gcc */
+#endif
+
+    rb_define_method(rb_cComplex, "real?", nucomp_false, 0);
+#if 0
+    rb_define_method(rb_cComplex, "complex?", nucomp_true, 0);
+    rb_define_method(rb_cComplex, "exact?", nucomp_exact_p, 0);
+    rb_define_method(rb_cComplex, "inexact?", nucomp_inexact_p, 0);
+#endif
+
+    rb_define_method(rb_cComplex, "numerator", nucomp_numerator, 0);
+    rb_define_method(rb_cComplex, "denominator", nucomp_denominator, 0);
+
+    rb_define_method(rb_cComplex, "hash", nucomp_hash, 0);
+    rb_define_method(rb_cComplex, "eql?", nucomp_eql_p, 1);
+
+    rb_define_method(rb_cComplex, "to_s", nucomp_to_s, 0);
+    rb_define_method(rb_cComplex, "inspect", nucomp_inspect, 0);
+
+    rb_define_private_method(rb_cComplex, "marshal_dump", nucomp_marshal_dump, 0);
+    compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject);
+    rb_define_private_method(compat, "marshal_load", nucomp_marshal_load, 1);
+    rb_marshal_define_compat(rb_cComplex, compat, nucomp_dumper, nucomp_loader);
+
+    /* --- */
+
+    rb_define_method(rb_cComplex, "to_i", nucomp_to_i, 0);
+    rb_define_method(rb_cComplex, "to_f", nucomp_to_f, 0);
+    rb_define_method(rb_cComplex, "to_r", nucomp_to_r, 0);
+    rb_define_method(rb_cComplex, "rationalize", nucomp_rationalize, -1);
+    rb_define_method(rb_cComplex, "to_c", nucomp_to_c, 0);
+    rb_define_method(rb_cNilClass, "to_c", nilclass_to_c, 0);
+    rb_define_method(rb_cNumeric, "to_c", numeric_to_c, 0);
+
+    rb_define_method(rb_cString, "to_c", string_to_c, 0);
+
+    rb_define_private_method(CLASS_OF(rb_cComplex), "convert", nucomp_s_convert, -1);
+
+    /* --- */
+
+    rb_define_method(rb_cNumeric, "real", numeric_real, 0);
+    rb_define_method(rb_cNumeric, "imaginary", numeric_imag, 0);
+    rb_define_method(rb_cNumeric, "imag", numeric_imag, 0);
+    rb_define_method(rb_cNumeric, "abs2", numeric_abs2, 0);
+    rb_define_method(rb_cNumeric, "arg", numeric_arg, 0);
+    rb_define_method(rb_cNumeric, "angle", numeric_arg, 0);
+    rb_define_method(rb_cNumeric, "phase", numeric_arg, 0);
+    rb_define_method(rb_cNumeric, "rectangular", numeric_rect, 0);
+    rb_define_method(rb_cNumeric, "rect", numeric_rect, 0);
+    rb_define_method(rb_cNumeric, "polar", numeric_polar, 0);
+    rb_define_method(rb_cNumeric, "conjugate", numeric_conj, 0);
+    rb_define_method(rb_cNumeric, "conj", numeric_conj, 0);
+
+    rb_define_method(rb_cFloat, "arg", float_arg, 0);
+    rb_define_method(rb_cFloat, "angle", float_arg, 0);
+    rb_define_method(rb_cFloat, "phase", float_arg, 0);
+
+    /*
+     * The imaginary unit.
+     */
+    rb_define_const(rb_cComplex, "I",
+		    f_complex_new_bang2(rb_cComplex, ZERO, ONE));
+}
+
+/*
+Local variables:
+c-file-style: "ruby"
+End:
+*/
diff --git a/config.guess b/config.guess
deleted file mode 100644
index dd1688b7b5..0000000000
--- a/config.guess
+++ /dev/null
@@ -1,1459 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-06-11'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    arc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    pmax:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    wgrisc:OpenBSD:*:*)
-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha*:OpenVMS:*:*)
-	echo alpha-hp-vms
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	# Determine whether the default compiler uses glibc.
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#if __GLIBC__ >= 2
-	LIBC=gnu
-	#else
-	LIBC=
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
-	# FreeBSD's kernel, but not the complete OS.
-	case ${LIBC} in gnu) kernel_only='k' ;; esac
-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	case `uname -p` in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    powerpc) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-    ftp://ftp.gnu.org/pub/gnu/config/
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/config.sub b/config.sub
deleted file mode 100644
index 506d3ab77f..0000000000
--- a/config.sub
+++ /dev/null
@@ -1,1537 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-06-11'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m68000 | m68k | m88k | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| msp430-* \
-	| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
-	| xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	mmix*)
-		basic_machine=mmix-knuth
-		os=-mmixware
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nv1)
-		basic_machine=nv1-cray
-		os=-unicosmp
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=-linux
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/configure.in b/configure.in
index 62b34a8c62..5d86e14bd0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,63 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT()
+{
+AC_CONFIG_AUX_DIR(tool)
+
+AC_PREREQ(2.67)
+
+AC_DEFUN([RUBY_PREREQ_AC],
+	[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [$1]), [-1],
+		AC_MSG_ERROR([Autoconf version ]$1[ or higher is required]$2))])
+
+AC_DISABLE_OPTION_CHECKING
+
+AC_DEFUN([RUBY_RM_RECURSIVE], [
+m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2.70]), [-1], [
+# suppress error messages, rm: cannot remove 'conftest.dSYM', from
+# AC_EGREP_CPP with CFLAGS=-g on Darwin.
+#
+# TODO: remove this hack when AC_PREREQ() becomes 2.70 or later.
+AS_CASE([$build_os], [darwin*], [
+rm() {
+    rm_recursive=''
+    for arg do
+	AS_CASE("$arg",
+		[--*], [],
+		[-*r*], [break],
+		[conftest.*], [if test -d "$arg"; then rm_recursive=-r; break; fi],
+		[])
+    done
+    command rm $rm_recursive "[$]@"
+}
+])])])
+
+{ # environment section
+
+AC_ARG_WITH(baseruby,
+	AS_HELP_STRING([--with-baseruby=RUBY], [use RUBY as baseruby; RUBY is the pathname of ruby]),
+	[
+		AS_CASE(["$withval"],[*ruby*],[BASERUBY=$withval],[AC_MSG_ERROR(need ruby)])
+	],
+	[
+		BASERUBY="ruby"
+	])
+if test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42; then
+    if test "`RUBYOPT=- $BASERUBY --disable=gems -e 'p 42' 2>/dev/null`" = 42; then
+	BASERUBY="$BASERUBY --disable=gems"
+    fi
+else
+    BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+fi
+AC_SUBST(BASERUBY)
 
-AC_PREREQ(2.60)
+for conf in config.guess config.sub; do
+    test -f "$srcdir/tool/$conf" && continue
+    $BASERUBY -C "$srcdir/tool" get-config_files $conf
+done
 
 AC_DEFUN([RUBY_MINGW32],
-[case "$host_os" in
-cygwin*)
+[AS_CASE(["$host_os"],
+[cygwin*], [
 AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
 [AC_TRY_CPP([
 #ifndef __MINGW32__
@@ -13,16 +65,106 @@ AC_CACHE_CHECK(for mingw32 environment, rb_cv_mingw32,
 #endif
 ], rb_cv_mingw32=yes,rb_cv_mingw32=no)
 rm -f conftest*])
-test "$rb_cv_mingw32" = yes && target_os="mingw32"
-  ;;
-esac])
+if test "$rb_cv_mingw32" = yes; then
+    target_os="mingw32"
+    : ${ac_tool_prefix:="`expr "$CC" : ['\(.*-\)g\?cc[^/]*$']`"}
+fi
+])
+AS_CASE(["$target_os"], [mingw*msvc], [
+target_os="`echo ${target_os} | sed 's/msvc$//'`"
+])
+AS_CASE(["$target_cpu-$target_os"], [x86_64-mingw*], [
+target_cpu=x64
+])
+])
+
+AC_DEFUN([RUBY_NACL],
+[
+ AS_CASE(["${host_os}"],
+[nacl], [
+  ac_cv_exeext=.nexe
+  host_vendor=chromium
+  ac_cv_host=chromium
+  AC_MSG_CHECKING([wheather \$NACL_SDK_ROOT is set])
+  if test x"${NACL_SDK_ROOT}" = x; then
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([You need to set \$NACL_SDK_ROOT environment variable to build for NativeClient])
+  fi
+  AC_MSG_RESULT([yes])
+
+  nacl_cv_build_variant=glibc
+  AC_ARG_WITH(newlib,
+              AS_HELP_STRING([--with-newlib], [uses newlib version of NativeClient SDK]),
+              [AS_CASE([$withval],
+                       [no], [nacl_cv_build_variant=glibc],
+                       [yes], [nacl_cv_build_variant=newlib])])
+
+  AS_CASE(["$build_cpu"],
+          [x86_64|i?86], [nacl_cv_cpu_nick=x86], [nacl_cv_cpu_nick=$build_cpu])
+  AS_CASE(["$build_os"],
+          [linux*], [nacl_cv_os_nick=linux],
+          [darwin*], [nacl_cv_os_nick=mac],
+          [cygwin*|mingw*], [nacl_cv_os_nick=win],
+          [nacl_cv_os_nick=$build_os])
+
+  host="$host_cpu-chromium-$host_os-"
+  ac_tool_prefix="$host_cpu-nacl-"
+
+  AC_MSG_CHECKING([NativeClient toolchain])
+  if test -d \
+    "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"; then
+    NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"
+  else
+    AS_CASE(
+      ["${nacl_cv_build_variant}"],
+      [glibc], [if test \
+        -d "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_newlib" \
+        -a -d "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}"; then
+        NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}"
+      fi],
+      [newlib], [ NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}" ])
+  fi
+  if test ! -e "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/${ac_tool_prefix}gcc"; then
+    if test "${build_cpu}" = i686 -a -e "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/nacl-gcc"; then
+      ac_tool_prefix=nacl-
+    fi
+    if test "${build_cpu}" = x86_64 -a -e "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/nacl-gcc"; then
+      ac_tool_prefix=nacl64-
+    fi
+  fi
+  if test -z "${NACL_TOOLCHAIN}"; then
+    AC_MSG_ERROR([Unrecognized --host and --build combination or NaCl SDK is not installed])
+  fi
+  AC_MSG_RESULT(${NACL_TOOLCHAIN})
+
+  AC_MSG_CHECKING([path to SDK])
+  if ! echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then
+    PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin"
+  fi
+
+  AC_SUBST(NACL_TOOLCHAIN)
+  AC_SUBST(NACL_SDK_ROOT)
+  AC_SUBST(NACL_SDK_VARIANT, nacl_cv_build_variant)
+])])
+
+AC_DEFUN([RUBY_NACL_CHECK_PEPPER_TYPES],
+[AS_CASE(["${host_os}"],
+[nacl], [
+ AC_CHECK_TYPES([struct PPB_Core, struct PPB_Messaging, struct PPB_Var,
+              struct PPB_URLLoader, struct PPB_URLRequestInfo,
+              struct PPB_URLResponseInfo, struct PPB_FileRef,
+              struct PPP_Instance])
+])
+])
 
 AC_DEFUN([RUBY_CPPOUTFILE],
 [AC_CACHE_CHECK(whether ${CPP} accepts -o, rb_cv_cppoutfile,
-[cppflags=$CPPFLAGS
-CPPFLAGS='-o conftest.i'
-AC_TRY_CPP([], rb_cv_cppoutfile=yes, rb_cv_cppoutfile=no)
-CPPFLAGS=$cppflags
+[save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS='-o conftest-1.i'
+rb_cv_cppoutfile=no
+AC_TRY_CPP([test-for-cppout],
+	   [grep test-for-cppout conftest-1.i > /dev/null && rb_cv_cppoutfile=yes])
+CPPFLAGS="$save_CPPFLAGS"
 rm -f conftest*])
 if test "$rb_cv_cppoutfile" = yes; then
   CPPOUTFILE='-o conftest.i'
@@ -44,126 +186,273 @@ fi
 GNU_LD=$rb_cv_prog_gnu_ld
 AC_SUBST(GNU_LD)])
 
-unset GREP_OPTIONS
-rb_version=`grep RUBY_VERSION $srcdir/version.h`
-MAJOR=`expr "$rb_version" : '#define RUBY_VERSION "\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*"'`
-MINOR=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*"'`
-TEENY=`expr "$rb_version" : '#define RUBY_VERSION "[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)"'`
-if test "$MAJOR" = ""; then
-  AC_MSG_ERROR(could not determine MAJOR number from version.h)
-fi
-if test "$MINOR" = ""; then
-  AC_MSG_ERROR(could not determine MINOR number from version.h)
-fi
-if test "$TEENY" = ""; then
-  AC_MSG_ERROR(could not determine TEENY number from version.h)
-fi
+eval `sed -n 's/^#define RUBY_API_VERSION_\([A-Z][A-Z_0-9]*\) \([0-9][0-9]*\)/\1=\2/p' $srcdir/include/ruby/version.h`
+for v in MAJOR MINOR TEENY; do
+    if eval "test \"\$$v\" = ''"; then
+	AC_MSG_ERROR(could not determine $v number from version.h)
+    fi
+done
 AC_SUBST(MAJOR)
 AC_SUBST(MINOR)
 AC_SUBST(TEENY)
+RUBY_PROGRAM_VERSION=`sed -n 's/^#define RUBY_VERSION "\(.*\)"/\1/p' $srcdir/version.h`
+AC_SUBST(RUBY_PROGRAM_VERSION)
+RUBY_RELEASE_DATE=`sed -n 's/^#define RUBY_RELEASE_DATE "\(.*\)"/\1/p' $srcdir/version.h`
+AC_SUBST(RUBY_RELEASE_DATE)
+RUBY_PATCHLEVEL=`sed -n 's/^#define RUBY_PATCHLEVEL //p' $srcdir/version.h`
+AC_DEFINE(CANONICALIZATION_FOR_MATHN)
 dnl checks for alternative programs
-AC_ARG_WITH(gcc, [  --without-gcc           never use gcc], [
-	case $withval in
-	no)	: ${CC=cc}
-		;;
-	yes)	: ${CC=gcc}
-		;;
-	*)	CC=$withval
-		;;
-	esac])
+AC_CANONICAL_BUILD
+RUBY_RM_RECURSIVE
+AC_ARG_WITH(gcc,
+	AS_HELP_STRING([--without-gcc], [never use gcc]),
+	[
+	AS_CASE([$withval],
+	    [no],  [: ${CC=cc}],
+	    [yes], [: ${CC=gcc}],
+	           [CC=$withval])])
 dnl If the user switches compilers, we can't believe the cache
 if test ! -z "$ac_cv_prog_CC" -a ! -z "$CC" -a "$CC" != "$ac_cv_prog_CC"
 then
   AC_MSG_ERROR(cached CC is different -- throw away $cache_file
 (it is also a good idea to do 'make clean' before compiling))
 fi
+AS_CASE(["$build_os"],
+  [darwin1*.*], [
+    AS_CASE(["x$CC"],
+      [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
+      [xgcc|x/usr/bin/gcc],         [: ${CXX=g++}],
+      [xcc|x/usr/bin/cc],           [: ${CXX=c++}],
+      [xclang|x/usr/bin/clang],     [: ${CXX=clang++}])
+  ])
 test -z "$CC" || ac_cv_prog_CC="$CC"
+test -z "$CXX" || ac_cv_prog_CXX="$CXX"
 
 if test "$program_prefix" = NONE; then
   program_prefix=
 fi
+RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
+RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
+AC_SUBST(RUBY_BASE_NAME)
+AC_SUBST(RUBYW_BASE_NAME)
+AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}')
+
 AC_CANONICAL_TARGET
+test x"$target_alias" = x &&
 target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'`
 ac_install_sh='' # unusable for extension libraries.
 
-ifelse(currently,disabled, [
-dnl checks for fat-binary
-AC_ARG_ENABLE(fat-binary,
-       [  --enable-fat-binary=ARCHS
-                          build an Apple/NeXT Multi Architecture Binary (MAB);
+AS_CASE($target_os,
+	[darwin*], [os_version_style=major+0],
+	[os_version_style=full])
+AC_ARG_WITH(os-version-style,
+	AS_HELP_STRING([--with-os-version-style=TYPE],
+		       [OS version number for target and target_os [[full]]]
+		       [(full|teeny|minor+0|minor|major+0|major|none)]),
+	[os_version_style=$withval])
+os_version_style_transform=
+AS_CASE("${os_version_style}",
+	[full|teeny], [],
+	[minor+0], [os_version_style_transform=['s/\([0-9]\.[0-9][0-9]*\)\.[0-9][.0-9]*$/\1.0/']],
+	[minor],   [os_version_style_transform=['s/\([0-9]\.[0-9][0-9]*\)\.[0-9][.0-9]*$/\1/']],
+	[major+0], [os_version_style_transform=['s/\([0-9]\)\.[0-9][.0-9]*$/\1.0/']],
+	[major],   [os_version_style_transform=['s/\([0-9]\)\.[0-9][.0-9]*$/\1/']],
+	[none],    [os_version_style_transform=['s/[0-9]\.[0-9][.0-9]*$//']],
+	[AC_MSG_ERROR(unknown --with-os-version-style: $withval)])
+AS_IF([test -z "$target_alias" -a -n "$os_version_style_transform"],
+	[
+	target=`echo ${target} | sed "$os_version_style_transform"`
+	target_os=`echo ${target_os} | sed "$os_version_style_transform"`
+	])
+
+AC_DEFUN([RUBY_APPEND_OPTION],
+	[# RUBY_APPEND_OPTION($1, $2)
+	AS_CASE([" [$]{$1-} "],
+	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="[$]$1 $2"])])
+AC_DEFUN([RUBY_APPEND_OPTIONS],
+	[{ for rb_opt in $2; do # RUBY_APPEND_OPTIONS($1, $2)
+	AS_CASE([" [$]{$1-} "],
+	[*" [$]{rb_opt} "*], [], ['  '], [ $1="[$]{rb_opt}"], [ $1="[$]$1 [$]{rb_opt}"])
+	done; }])
+AC_DEFUN([RUBY_PREPEND_OPTION],
+	[# RUBY_PREPEND_OPTION($1, $2)
+	AS_CASE([" [$]{$1-} "],
+	[*' $2 '*], [], ['  '], [ $1="$2"], [ $1="$2 [$]$1"])])
+AC_DEFUN([RUBY_PREPEND_OPTIONS],
+	[{ unset rb_opts; for rb_opt in $2; do # RUBY_PREPEND_OPTIONS($1, $2)
+	AS_CASE([" [$]{rb_opts} [$]{$1-} "],
+	[*" [$]{rb_opt} "*], [], ['  '], [ $1="[$]{rb_opt}"], [ rb_opts="[$]{rb_opts}[$]{rb_opt} "])
+	done
+	$1="[$]{rb_opts}[$]$1"; }])
+
+AC_ARG_WITH(arch,
+	AS_HELP_STRING([--with-arch=ARCHS],
+		       [build an Apple/NeXT Multi Architecture Binary (MAB);
                           ARCHS is a comma-delimited list of architectures for
-                          which to build; if ARCHS is omitted, then the package
-                          will be built for all architectures supported by the
-                          platform ("ppc" for MacOS/X and Darwin; "ppc,i386"
-                          for Rhapsody; "m68k,i386,sparc" for OpenStep;
-                          "m68k,i386,sparc,hppa" for NextStep); if this option
-                          is disabled or omitted entirely, then the package
-                          will be built only for the target platform],
-       [fat_binary=$enableval], [fat_binary=no])
-if test "$fat_binary" != no; then
+                          which to build; if this option is disabled or omitted
+			  entirely, then the package will be built only for the
+			  target platform]),
+       [target_archs="$withval"], [unset target_archs])
+
+AC_DEFUN([RUBY_DEFAULT_ARCH], [
+AC_MSG_CHECKING([arch option])
+AS_CASE([$1],
+	[*64],        [ARCH_FLAG=-m64],
+	[[i[3-6]86]], [ARCH_FLAG=-m32],
+	[AC_MSG_ERROR(unknown target architecture: $target_archs)]
+	)
+AC_MSG_RESULT([$ARCH_FLAG])
+])
 
+AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
+# RUBY_UNIVERSAL_ARCH begin
+ARCH_FLAG=`expr " $CFLAGS " : ['.* \(-m[0-9][0-9]*\) ']`
+test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
+test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
+unset universal_binary universal_archnames
+if test ${target_archs+set}; then
     AC_MSG_CHECKING([target architectures])
-
-    # Respect TARGET_ARCHS setting from environment if available.
-    if test -z "$TARGET_ARCHS"; then
-	# Respect ARCH given to --enable-fat-binary if present.
-	if test "$fat_binary" != yes; then
-	    TARGET_ARCHS=`echo "$fat_binary" | tr ',' ' '`
-	else
-	    # Choose a default set of architectures based upon platform.
-	    case "$target_os" in
-	    darwin*)
-		TARGET_ARCHS="ppc"
-		;;
-	    rhapsody*)
-		TARGET_ARCHS="ppc i386"
-		;;
-	    openstep*)
-		TARGET_ARCHS="m68k i386 sparc"
-		;;
-	    nextstep*)
-		TARGET_ARCHS="m68k i386 sparc hppa"
-		;;
-	    *)
-		TARGET_ARCHS=`arch`
-	    esac
-	fi
-    fi
-
-    AC_MSG_RESULT([$TARGET_ARCHS])
-
+    target_archs=`echo $target_archs | tr , ' '`
     # /usr/lib/arch_tool -archify_list $TARGET_ARCHS
-    ARCH_FLAG=
-    for archs in $TARGET_ARCHS 
+    for archs in $target_archs
     do
-        ARCH_FLAG="$ARCH_FLAG -arch $archs"
+	AS_CASE([",$universal_binary,"],[*",$archs,"*], [],[
+	    cpu=`$SHELL "$ac_aux_dir/config.sub" "${archs}-${target_os}" 2>&1` || {
+	        AC_MSG_RESULT([failed])
+		AC_MSG_ERROR([$cpu])
+	    }
+	    cpu=`echo $cpu | sed 's/-.*-.*//'`
+	    universal_binary="${universal_binary+$universal_binary,}$cpu"
+	    universal_archnames="${universal_archnames} ${archs}=${cpu}"
+	    ARCH_FLAG="${ARCH_FLAG+$ARCH_FLAG }-arch $archs"
+	    ])
     done
-    AC_DEFINE(NEXT_FAT_BINARY)
+    target_archs="$universal_binary"
+    unset universal_binary
+    AS_CASE(["$target_archs"],
+      [*,*], [universal_binary=yes],
+             [unset universal_archnames])
+    AC_MSG_RESULT([$target_archs])
+
+    target=`echo $target | sed "s/^$target_cpu-/-/"`
+    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
+    if test "${universal_binary-no}" = yes; then
+	AC_SUBST(try_header,try_compile)
+	target_cpu=universal
+	real_cross_compiling=$cross_compiling
+    else
+	if test x"$target_cpu" != x"${target_archs}"; then
+	    echo 'int main(){return 0;}' > conftest.c
+	    if $CC $CFLAGS $ARCH_FLAG -o conftest conftest.c > /dev/null 2>&1; then
+		rm -fr conftest.*
+	    else
+		RUBY_DEFAULT_ARCH("$target_archs")
+	    fi
+	fi
+	target_cpu=${target_archs}
+    fi
+    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
+    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
+else
+    if test x"$target_alias" = x; then
+	AS_CASE(["$target_os"],
+	  [darwin*], [
+	    AC_MSG_CHECKING([for real target cpu])
+	    target=`echo $target | sed "s/^$target_cpu-/-/"`
+	    target_cpu=`$CC -E - 2>/dev/null <<EOF |
+#ifdef __x86_64__
+"processor-name=x86_64"
+#endif
+#ifdef __i386__
+"processor-name=i386"
+#endif
+#ifdef __ppc__
+"processor-name=powerpc"
+#endif
+#ifdef __ppc64__
+"processor-name=powerpc64"
+#endif
+EOF
+	    sed -n 's/^"processor-name=\(.*\)"/\1/p'`
+	    target="$target_cpu${target}"
+	    AC_MSG_RESULT([$target_cpu])
+	    ])
+    fi
+    target_archs="$target_cpu"
 fi
-], [fat_binary=no])
-
-case $target_cpu in
-  i?86) frame_address=yes;;
-  *)    frame_address=no;;
-esac
-AC_ARG_ENABLE(frame-address,
-       [  --enable-frame-address  use GCC __builtin_frame_address(). ],
-       [frame_address=$enableval])
-if test $frame_address = yes; then
-    AC_DEFINE(USE_BUILTIN_FRAME_ADDRESS)
+if test "${target_archs}" != "${rb_cv_target_archs-${target_archs}}"; then
+    AC_MSG_ERROR([target arch(s) has changed from ${rb_cv_target_archs-nothing} to ${target_archs}])
+else
+    rb_cv_target_archs=${target_archs}
 fi
+if test "x${ARCH_FLAG}" != x; then
+    CFLAGS="$CFLAGS ${ARCH_FLAG}"
+    LDFLAGS="${LDFLAGS+$LDFLAGS }${ARCH_FLAG}"
+fi
+# RUBY_UNIVERSAL_ARCH end
+])
+
+AC_ARG_ENABLE(load-relative,
+       AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]),
+       [load_relative=$enableval])
 
 AC_ARG_PROGRAM
 
 dnl Checks for programs.
 
+cflagspat=
+test -z "$optflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${optflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "$debugflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${debugflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+test -z "warnflags" ||
+    cflagspat="$cflagspat;s|"`eval echo '"'"${warnflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^ */ /;s/ *$/ /'`'| |g'
+if test -z "${CFLAGS+set}"; then
+    cflags=`echo " $cflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
+    orig_cflags="$cflags"
+    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'
+fi
+if test -z "${CXXFLAGS+set}"; then
+    cxxflags=`echo " $cxxflags " | sed "$cflagspat;s/^ *//;s/ *$//"`
+    orig_cxxflags="$cxxflags"
+    cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'
+fi
+
+RUBY_NACL
+AS_CASE(["$host_os:$build_os"],
+[darwin*:darwin*], [
+    AC_CHECK_TOOLS(CC, [gcc-4.2 clang gcc cc])
+    # Following Apple deployed clang are broken
+    # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
+    # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
+    # Apple clang version 2.1 (tags/Apple/clang-163.7.1) (based on LLVM 3.0svn)
+    if ! $CC -E -xc - <<SRC >/dev/null; then
+	@%:@if defined __APPLE_CC__ && defined __clang_major__ && __clang_major__ < 3
+	@%:@error premature clang
+	@%:@endif
+SRC
+	AC_MSG_ERROR([clang version 3.0 or later is required])
+    fi
+])
 if test x"${build}" != x"${host}"; then
   AC_CHECK_TOOL(CC, gcc)
 fi
+
 AC_PROG_CC
+AC_PROG_CXX
+RUBY_MINGW32
 AC_PROG_GCC_TRADITIONAL
+AC_SUBST(GCC)
+AS_CASE(["$target_os"],
+[solaris*], [AC_PATH_TOOL([LD], [ld], [/usr/ccs/bin/ld], [/usr/ccs/bin:$PATH])],
+[AC_CHECK_TOOL([LD], [ld], [ld])])
+AC_SUBST(LD)
 if test "$GCC" = yes; then
     linker_flag=-Wl,
+    : ${optflags=-O3}
+    gcc_major=`echo =__GNUC__ | $CC -E -xc - | sed '/^=/!d;s///'`
+    test -n "$gcc_major" || gcc_major=0
+    # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
 else
     linker_flag=
 fi
@@ -172,15 +461,48 @@ RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
 
 : ${OUTFLAG='-o '}
+: ${COUTFLAG=${OUTFLAG}}
 AC_SUBST(OUTFLAG)
+AC_SUBST(COUTFLAG)
+
+cc_version=
+for option in --version -v -V -qversion; do
+    cc_version_message=`$CC $option 2>&1`
+    cc_version_status=$?
+    AS_CASE($cc_version_status, [0], [:], [continue])
+    AS_CASE($cc_version_message, [*Warning*], [continue])
+    cc_version='$(CC) '$option
+done
+AC_SUBST(CC_VERSION, $cc_version)
 
-RUBY_MINGW32
-
-AC_PROG_YACC
-if test "$YACC" = "yacc"; then
-  AC_DEFINE([OLD_YACC])
+RUBY_UNIVERSAL_ARCH
+if test "$target_cpu" != "$host_cpu" -a "$GCC" = yes -a "$cross_compiling" = no -a "$universal_binary" = no; then
+    RUBY_DEFAULT_ARCH("$target_cpu")
 fi
 
+AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86*]], [
+	 AC_CACHE_CHECK([for __sync_val_compare_and_swap], [rb_cv_gcc_compiler_cas], [
+			 AC_TRY_LINK([unsigned long atomic_var;],
+				     [
+				      __sync_val_compare_and_swap(&atomic_var, 0, 1);
+				      ],
+				      [rb_cv_gcc_compiler_cas=yes],
+				      [rb_cv_gcc_compiler_cas=no])])
+	 if test "$rb_cv_gcc_compiler_cas" = no; then
+		 unset rb_cv_gcc_compiler_cas
+		 save_CFLAGS="$CFLAGS"
+		 CFLAGS="$CFLAGS -march=i486"
+		 AC_CACHE_CHECK([for __sync_val_compare_and_swap with -march=i486], [rb_cv_gcc_compiler_cas], [
+				 AC_TRY_LINK([unsigned long atomic_var;],
+					     [
+					      __sync_val_compare_and_swap(&atomic_var, 0, 1);
+					      ],
+					      [rb_cv_gcc_compiler_cas=yes
+					       ARCH_FLAG="-march=i486"],
+					      [rb_cv_gcc_compiler_cas=no])])
+		 CFLAGS="$save_CFLAGS"
+	 fi])
+
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(AR, ar)
 if test -z "$AR"; then
@@ -191,63 +513,600 @@ AC_CHECK_TOOL(AS, as)
 ASFLAGS=$ASFLAGS
 AC_SUBST(ASFLAGS)
 
-case "$target_os" in
-cygwin*|mingw*)
-    AC_CHECK_TOOL(NM, nm)
+AS_CASE(["$target_os"],[cygwin*|mingw*], [ac_cv_prog_ac_ct_OBJCOPY=":"])
+
+# BSD's ports and MacPorts prefix GNU binutils with 'g'
+AC_CHECK_TOOLS(OBJDUMP, [objdump gobjdump])
+AC_CHECK_TOOLS(OBJCOPY, [objcopy gobjcopy])
+
+AS_CASE(["$target_os"],
+[cygwin*|mingw*], [
     AC_CHECK_TOOL(WINDRES, windres)
     AC_CHECK_TOOL(DLLWRAP, dllwrap)
+    target=`echo $target | sed "s/^$target_cpu-/-/"`
+    target_alias=`echo $target_alias | sed "s/^$target_cpu-/-/"`
     target_cpu=`echo $target_cpu | sed s/i.86/i386/`
-    case "$target_os" in
-    mingw*)
+    AS_CASE(["$target"], [-*], [ target="$target_cpu${target}"])
+    AS_CASE(["$target_alias"], [-*], [ target_alias="$target_cpu${target_alias}"])
+    AS_CASE(["$target_os"],
+    [mingw*], [
 	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
-	AC_CHECK_TOOL(OBJDUMP, objdump)
 	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
-	AC_TRY_LINK([#include <stdio.h>],
+	AC_TRY_LINK([@%:@include <stdio.h>],
 		    [FILE* volatile f = stdin; return 0;],
 		    [rb_cv_msvcrt=`$OBJDUMP -p conftest$ac_exeext |
 				   tr A-Z a-z |
 				   sed -n '/^[[ 	]]*dll name: \(msvc.*\)\.dll$/{s//\1/p;q;}'`],
 		    [rb_cv_msvcrt=msvcrt])
 	test "$rb_cv_msvcrt" = "" && rb_cv_msvcrt=msvcrt])
-	AC_ARG_WITH(winsock2,
-		[  --with-winsock2         link winsock2 (MinGW only)], [
-		case $withval in
-		yes) with_winsock2=yes;;
-		*)   with_winsock2=no;;
-		esac], [with_winsock2=no])
-	if test "$with_winsock2" = yes; then
-	  AC_DEFINE(USE_WINSOCK2)
-	  COMMON_HEADERS="ws2tcpip.h winsock2.h windows.h"
-	else
-	  COMMON_HEADERS="windows.h winsock.h"
-	fi
-    esac
+	RT_VER=`echo "$rb_cv_msvcrt" | tr -cd [0-9]`
+	test "$RT_VER" = "" && RT_VER=60
+	AC_DEFINE_UNQUOTED(RUBY_MSVCRT_VERSION, $RT_VER)
+    ])
     : ${enable_shared=yes}
-    ;;
-aix*)
-    AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)
-    ;;
-hiuxmpp*)
-    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
-    AC_DEFINE(__HIUX_MPP__)
-    ;;
-esac
+    ],
+[aix*],     [AC_CHECK_TOOL(NM, nm, /usr/ccs/bin/nm, /usr/ccs/bin:$PATH)],
+[hiuxmpp*], [AC_DEFINE(__HIUX_MPP__)])    # by TOYODA Eizi <toyoda@npd.kishou.go.jp>
+AC_CHECK_TOOL(NM, nm)
 
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_PROG_MKDIR_P
+if test "x$MKDIR_P" = "x -d"; then
+  if test x"$as_mkdir_p" != xfalse; then
+    MKDIR_P='mkdir -p'
+    echo "use 'mkdir -p' as MKDIR_P"
+  else
+    AC_MSG_ERROR([mkdir -p is required])
+  fi
+fi
+MAKEDIRS="$MKDIR_P"
+AC_SUBST(MAKEDIRS)
+
+AC_DEFUN([RUBY_DTRACE_AVAILABLE],
+[AC_CACHE_CHECK(whether dtrace USDT is available, rb_cv_dtrace_available,
+[
+    echo "provider conftest{ probe fire(); };" > conftest_provider.d
+    if $DTRACE -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null; then
+      # DTrace is available on the system
+      rb_cv_dtrace_available=yes
+    else
+      # DTrace is not available while dtrace command exists
+      # for example FreeBSD 8 or FreeBSD 9 without DTrace build option
+      rb_cv_dtrace_available=no
+    fi
+    rm -f conftest.[co] conftest_provider.[dho]
+])
+])
+
+AC_DEFUN([RUBY_DTRACE_POSTPROCESS],
+[AC_CACHE_CHECK(whether $DTRACE needs post processing, rb_cv_prog_dtrace_g,
+[
+  if {
+    echo "provider conftest{ probe fire(); };" > conftest_provider.d &&
+    dtrace -h -o conftest_provider.h -s conftest_provider.d >/dev/null 2>/dev/null &&
+    cat >conftest.c <<_CONF &&
+    @%:@include "conftest_provider.h"
+    int main(void){ CONFTEST_FIRE(); return 0; }
+_CONF
+    $CC $CFLAGS -c -o conftest.o conftest.c &&
+    $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null
+  }; then
+    rb_cv_prog_dtrace_g=yes
+  else
+    rb_cv_prog_dtrace_g=no
+  fi
+  rm -f conftest.[co] conftest_provider.[dho]
+])
+])
+
+AC_CHECK_PROG([DTRACE], [${ac_tool_prefix}dtrace], [${ac_tool_prefix}dtrace])
+if test "$cross_compiling:$ac_cv_prog_DTRACE" = no: -a -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG([DTRACE], [dtrace], [dtrace])
+fi
+
+AC_CHECK_PROGS(DOT, dot)
+AC_CHECK_PROGS(DOXYGEN, doxygen)
+AS_CASE(["${host_os}"], [nacl], [AC_PATH_PROG(PYTHON, python)])
+
+AC_CHECK_PROG(PKG_CONFIG, pkg-config, [pkg-config], [], [],
+    [`"$as_dir/$ac_word$ac_exec_ext" --print-errors --version > /dev/null 2>&1 || echo "$as_dir/$ac_word$ac_exec_ext"`])
 
 # checks for UNIX variants that set C preprocessor variables
-AC_AIX
-AC_MINIX
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_SUBST(RM, ['rm -f'])
 AC_SUBST(CP, ['cp'])
-if $as_mkdir_p; then
-  AC_SUBST(MAKEDIRS, ['mkdir -p'])
+RMDIRS='$(top_srcdir)/tool/rmdirs'
+RMDIR=rmdir
+mkdir "rmdirs_$$_test" "rmdirs_$$_test/a"
+rmdir --ignore-fail-on-non-empty "rmdirs_$$_test" 2>/dev/null &&
+RMDIR='rmdir --ignore-fail-on-non-empty'
+$RMDIR -p "rmdirs_$$_test/a" 2>/dev/null &&
+{ test -d "rmdirs_$$_test" || RMDIRS="$RMDIR -p"; }
+rmdir "rmdirs_$$_test/a" "rmdirs_$$_test" 2>/dev/null
+AC_SUBST(RMDIR)
+AC_SUBST(RMDIRS)
+AC_SUBST(RMALL, ['rm -fr'])
+
+AC_MSG_CHECKING([for cd using physical directory])
+rm -fr conf$$.dir
+mkdir conf$$.dir &&
+(cd conf$$.dir && mkdir src build && cd src &&
+$as_ln_s ../build . > /dev/null 2>&1 && cd build &&
+for chdir in 'cd -P' 'PWD= cd'; do
+    /bin/sh -c "$chdir ../src && echo '$chdir' > cdcmd" 2> /dev/null && break
+done)
+if test -f conf$$.dir/src/cdcmd; then
+    read CHDIR < conf$$.dir/src/cdcmd 2> /dev/null
 else
-  AC_SUBST(MAKEDIRS, ['install -d'])
+    CHDIR=cd
+fi
+rm -fr conf$$.dir
+AC_MSG_RESULT([$CHDIR])
+AC_SUBST(CHDIR)
+
+}
+{ # compiler section
+
+AC_DEFUN([RUBY_WERROR_FLAG], [dnl
+save_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $rb_cv_warnflags"
+if test "${ac_c_werror_flag+set}"; then
+  rb_c_werror_flag="$ac_c_werror_flag"
+else
+  unset rb_c_werror_flag
+fi
+ac_c_werror_flag=yes
+$1
+CFLAGS="$save_CFLAGS"
+save_CFLAGS=
+if test "${rb_c_werror_flag+set}"; then
+  ac_c_werror_flag="$rb_c_werror_flag"
+else
+  unset ac_c_werror_flag
+fi])
+
+RUBY_WERROR_FLAG([
+    AC_MSG_CHECKING([whether CFLAGS is valid])
+    AC_TRY_COMPILE([], [],
+	[AC_MSG_RESULT(yes)],
+	[
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR([something wrong with CFLAGS="$CFLAGS"])
+	]
+    )
+    AC_MSG_CHECKING([whether LDFLAGS is valid])
+    AC_TRY_LINK([], [],
+	[AC_MSG_RESULT(yes)],
+	[
+	AC_MSG_RESULT(no)
+	AC_MSG_ERROR([something wrong with LDFLAGS="$LDFLAGS"])
+	]
+    )
+])
+
+AC_DEFUN(RUBY_TRY_CFLAGS, [
+    AC_MSG_CHECKING([whether ]$1[ is accepted as CFLAGS])
+    RUBY_WERROR_FLAG([
+    CFLAGS="[$]CFLAGS $1"
+    AC_TRY_COMPILE([$4], [$5],
+	[$2
+	AC_MSG_RESULT(yes)],
+	[$3
+	AC_MSG_RESULT(no)])
+    ])
+])
+
+AC_DEFUN(RUBY_TRY_LDFLAGS, [
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="[$]LDFLAGS $1"
+    AC_MSG_CHECKING([whether $1 is accepted as LDFLAGS])
+    RUBY_WERROR_FLAG([
+    AC_TRY_LINK([$4], [$5],
+	[$2
+	AC_MSG_RESULT(yes)],
+	[$3
+	AC_MSG_RESULT(no)])
+    ])
+    LDFLAGS="$save_LDFLAGS"
+    save_LDFLAGS=
+])
+
+AS_CASE([$RUBY_PATCHLEVEL], [-*],
+	[particular_werror_flags=yes], [particular_werror_flags=no])
+AC_ARG_ENABLE(werror,
+	AS_HELP_STRING([--disable-werror],
+		       [don't make warnings into errors
+		       even if a compiler support -Werror feature
+		       [[disabled by default unless development version]]]),
+	[particular_werror_flags=$enableval])
+
+rb_cv_warnflags="$warnflags"
+if test "$GCC:${warnflags+set}:no" = yes::no; then
+    if test $gcc_major -ge 4; then
+	extra_warning=-Werror=extra-tokens
+    else
+	extra_warning=
+    fi
+    for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
+		 -Wno-missing-field-initializers \
+		 -Wunused-variable \
+		 -Werror=pointer-arith \
+		 -Werror=write-strings \
+		 -Werror=declaration-after-statement \
+		 -Werror=shorten-64-to-32 \
+		 -Werror=implicit-function-declaration \
+		 -Werror=division-by-zero \
+		 $extra_warning \
+		 ; do
+	if test "$particular_werror_flags" != yes; then
+	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/;s/^x//'`
+	fi
+	ok=no
+	RUBY_TRY_CFLAGS($wflag, [
+	    RUBY_APPEND_OPTIONS(warnflags, $wflag)
+	    ok=yes
+	])
+	AS_CASE([$ok:$wflag], [no:-Werror=*], [
+	    wflag=`echo x$wflag | sed 's/^x-Werror=/-W/'`
+	    RUBY_TRY_CFLAGS($wflag, [
+		RUBY_APPEND_OPTIONS(warnflags, $wflag)
+		particular_werror_flags=no
+	    ])
+	])
+    done
+    AS_CASE([" $warnflags "],[*" -Wno-missing-field-initializers "*], [wflag="-Wall -Wextra"],
+                             [wflag=-Wall])
+    RUBY_TRY_CFLAGS($wflag, [warnflags="$wflag${warnflags+ $warnflags}"])
+    # Disable warnflags while conftest. -Werror=* flags might make bad OS capability guess.
+    rb_cv_warnflags="$warnflags"
+    warnflags=
 fi
+if test "$GCC" = yes; then
+    # -D_FORTIFY_SOURCE
+    # When defined _FORTIFY_SOURCE, glibc enables some additional sanity
+    # argument check. The performance drop is very little and Ubuntu enables
+    # _FORTIFY_SOURCE=2 by default. So, let's support it for protecting us from
+    # a mistake of silly C extensions.
+    RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
+
+    # -fstack-protector
+    AS_CASE(["$target_os"],
+    [mingw*|nacl|haiku], [
+	stack_protector=no
+    ])
+    if test -z "${stack_protector+set}"; then
+	RUBY_TRY_CFLAGS(-fstack-protector, [stack_protector=yes], [stack_protector=no])
+	if test "x$stack_protector" = xyes; then
+	    RUBY_TRY_LDFLAGS(-fstack-protector, [], [stack_protector=broken])
+	fi
+    fi
+    if test "x$stack_protector" = xyes; then
+	RUBY_APPEND_OPTION(XCFLAGS, -fstack-protector)
+	RUBY_APPEND_OPTION(XLDFLAGS, -fstack-protector)
+	RUBY_APPEND_OPTION(LDFLAGS, -fstack-protector)
+    fi
+
+    AS_CASE(["$target_os"],[mingw*], [
+      # On  Windows  platforms,   system  provided  headers  are  VC++
+      # optimized.  That  is, C++  habits are often  contaminated into
+      # various  headers.  Most frequent  situation is  the use  of //
+      # comments.   We  bypass  ANSI   C  mode  for  them.   Otherwise
+      # extension libs cannot include those headers.
+    ],
+    [cygwin*|darwin*|netbsd*], [
+      # need lgamma_r(), finite()
+    ],
+    [haiku], [
+      # Haiku R1/alpha3 uses gcc-4.4.4 which can not handle anonymous union
+      # with ANSI standard flags. Anonumous union is required to compile
+      # socket extension where <net/if.h> uses anonymous union.
+    ],
+    [
+      # ANSI (no XCFLAGS because this is C only)
+      RUBY_TRY_CFLAGS(-ansi -std=iso9899:199409, [
+        RUBY_APPEND_OPTION(warnflags, -ansi -std=iso9899:199409)
+        RUBY_APPEND_OPTION(strict_warnflags, -ansi -std=iso9899:199409)
+      ])
+    ])
+
+    # suppress annoying -Wstrict-overflow warnings
+    RUBY_TRY_CFLAGS(-fno-strict-overflow, [RUBY_APPEND_OPTION(XCFLAGS, -fno-strict-overflow)])
+
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb3, [debugflags=-ggdb3])}
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-ggdb, [debugflags=-ggdb])}
+    test "${debugflags+set}" || {RUBY_TRY_CFLAGS(-g3, [debugflags=-g3])}
+fi
+test $ac_cv_prog_cc_g = yes && : ${debugflags=-g}
+
+if test "$GCC" = ""; then
+    AS_CASE(["$target_os"],[aix*],[warnflags="$warnflags -qinfo=por" rb_cv_warnflags="$rb_cv_warnflags -qinfo=por"])
+fi
+if test "$GCC" = yes; then
+    if test "$gcc_major" -ge 4; then
+	RUBY_TRY_CFLAGS(-fvisibility=hidden, [visibility_option=yes], [visibility_option=no])
+    fi
+    AC_SUBST(WERRORFLAG, "-Werror")
+    if test "$visibility_option" = yes; then
+	RUBY_APPEND_OPTION(XCFLAGS, -fvisibility=hidden)
+	AC_DEFINE(RUBY_SYMBOL_EXPORT_BEGIN, [_Pragma("GCC visibility push(default)")])
+	AC_DEFINE(RUBY_SYMBOL_EXPORT_END,   [_Pragma("GCC visibility pop")])
+    else
+	RUBY_TRY_LDFLAGS([-Wl,-unexported_symbol,_Init_*], [visibility_option=ld], [visibility_option=no])
+    fi
+    test "$visibility_option" = no -o "$host_os" = nacl || OBJCOPY=:
+fi
+
+if test "$GCC" = yes; then
+    # optflags
+
+    AS_CASE(["$target_os"], [mingw*], [
+	RUBY_TRY_CFLAGS(-fno-omit-frame-pointer, [optflags="${optflags+$optflags }-fno-omit-frame-pointer"])
+    ])
+
+    # disable fast-math
+    for oflag in -fno-fast-math; do
+	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
+    done
+fi
+
+test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
+test -z "${ac_env_CXXFLAGS_set}" -a -n "${cxxflags+set}" && eval CXXFLAGS="\"$cxxflags $ARCH_FLAG\""
+
+}
+{ # header and library section
+
+AC_ARG_WITH(winnt-ver,
+  AS_HELP_STRING([--with-winnt-ver=0xXXXX], [target Windows NT version (default to 0x0501)]),
+  [with_winnt_ver="$withval"], [with_winnt_ver="0x0501"])
+AS_CASE(["$target_os"],
+[mingw*], [
+  RUBY_APPEND_OPTION(CPPFLAGS, -D_WIN32_WINNT=$with_winnt_ver)
+])
+
+AS_CASE(["$target_os"],
+[freebsd*], [
+  AC_CACHE_CHECK([whether pthread should be enabled by default],
+    rb_cv_enable_pthread_default,
+    [AC_TRY_CPP([
+#include <osreldate.h>
+#if __FreeBSD_version < 502102
+#error pthread should be disabled on this platform
+#endif
+      ],
+      rb_cv_enable_pthread_default=yes,
+      rb_cv_enable_pthread_default=no)])
+  enable_pthread=$rb_cv_enable_pthread_default
+  ],
+[mingw*], [
+  enable_pthread=no
+  ],
+[
+  enable_pthread=yes
+  ])
+
+AC_ARG_ENABLE(pthread,
+       AS_HELP_STRING([--enable-pthread], [obsolete, and ignored]))
+
+dnl Checks for libraries.
+AS_CASE(["$target_os"],[*bsd*|dragonfly*],[],[ac_cv_func_daemon=no])
+
+POSTLINK=:
+AC_SUBST(POSTLINK)
+AS_CASE(["$target_os"],
+[nextstep*], [	],
+[openstep*], [	],
+[rhapsody*], [	],
+[darwin*], [	RUBY_PREPEND_OPTION(LIBS, -lobjc)
+		RUBY_APPEND_OPTIONS(CPPFLAGS, -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE -D_DARWIN_UNLIMITED_SELECT -D_REENTRANT)
+		AC_MSG_CHECKING(whether Mac OS X 10.5 or later)
+		AC_TRY_CPP([#include <AvailabilityMacros.h>
+		    #if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
+		    #error pre OS X 10.4
+		    [!<===== pre OS X 10.4 =====>]
+		    #endif
+		    ],
+		    [macosx_10_5=yes], [macosx_10_5=no])
+		AC_MSG_RESULT($macosx_10_5)
+		if test $macosx_10_5 = yes; then
+		    ac_cv_header_ucontext_h=no
+		else
+		    AC_DEFINE(BROKEN_SETREUID, 1)
+		    AC_DEFINE(BROKEN_SETREGID, 1)
+		fi
+		ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
+		ac_cv_lib_crypt_crypt=no
+		ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
+                AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
+                    [AC_TRY_RUN([
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+int
+main()
+{
+    int i;
+    for (i = 0; i < 128*128; i++) {
+	char salt[2], buf[256], *s;
+	salt[0] = 0x80 | (i & 0x7f);
+	salt[1] = 0x80 | (i >> 7);
+	strcpy(buf, crypt("", salt));
+	if (strcmp(buf, s = crypt("", salt))) {
+#if 0
+	    printf("%.2x%.2x: %s -> %s\n", (unsigned char)salt[0], (unsigned char)salt[1],
+		   buf+2, s+2);
+#endif
+	    return 1;
+	}
+    }
+    return 0;
+}
+],
+	            rb_cv_broken_crypt=no,
+	            rb_cv_broken_crypt=yes,
+	            rb_cv_broken_crypt=yes)])
+                if test "$rb_cv_broken_crypt" = yes; then
+                  AC_DEFINE(BROKEN_CRYPT, 1)
+                fi
+		AC_CHECK_PROGS(codesign, codesign)
+		if test -n "$codesign"; then
+		    POSTLINK="test -z '\$(RUBY_CODESIGN)' || $codesign -s '\$(RUBY_CODESIGN)' -f \$@"
+		    LINK_SO="$LINK_SO
+\$(POSTLINK)"
+		fi
+		AC_CHECK_HEADERS(crt_externs.h, [], [], [
+		    #include <crt_externs.h>
+		])
+		],
+[hpux*], [	LIBS="-lm $LIBS"
+		ac_cv_c_inline=no],
+[beos*|haiku*], [
+		ac_cv_func_link=no
+		ac_cv_func_sched_yield=no
+		ac_cv_func_pthread_attr_setinheritsched=no
+		AS_CASE(["$target_os"],
+		[beos*], [ ac_cv_header_net_socket_h=yes],
+		[haiku*], [ ac_cv_func_shutdown=no])
+		LIBS="$LIBS" # m lib is include in root under BeOS/Haiku
+		],
+[cygwin*], [	ac_cv_header_langinfo_h=yes
+		AC_CHECK_FUNCS(cygwin_conv_path)
+		AC_LIBOBJ([langinfo])
+		],
+[mingw*], [	LIBS="-lshell32 -lws2_32 -liphlpapi -limagehlp -lshlwapi $LIBS"
+		ac_cv_header_a_out_h=no
+		ac_cv_header_pwd_h=no
+		ac_cv_header_utime_h=no
+		ac_cv_header_sys_ioctl_h=no
+		ac_cv_header_sys_param_h=no
+		ac_cv_header_sys_resource_h=no
+		ac_cv_header_sys_select_h=no
+		ac_cv_header_sys_time_h=no
+		ac_cv_header_sys_times_h=no
+		ac_cv_header_sys_socket_h=no
+		ac_cv_func_times=yes
+		ac_cv_func_waitpid=yes
+		ac_cv_func_fsync=yes
+		ac_cv_func_seekdir=yes
+		ac_cv_func_telldir=yes
+		ac_cv_func_isinf=yes
+		ac_cv_func_isnan=yes
+		ac_cv_func_finite=yes
+		ac_cv_func_link=yes
+		ac_cv_lib_crypt_crypt=no
+		ac_cv_func_getpgrp_void=no
+		ac_cv_func_memcmp_working=yes
+		ac_cv_lib_dl_dlopen=no
+		rb_cv_binary_elf=no
+		rb_cv_negative_time_t=no
+		ac_cv_func_fcntl=yes
+		ac_cv_func_flock=yes
+		ac_cv_func_gmtime_r=yes
+		rb_cv_large_fd_select=yes
+		ac_cv_type_struct_timeval=yes
+                ac_cv_func_clock_gettime=yes
+                ac_cv_func_clock_getres=yes
+		ac_cv_func_malloc_usable_size=no
+		AC_CHECK_TYPE([NET_LUID], [], [],
+			      [@%:@include <windows.h>
+		  	      @%:@include <iphlpapi.h>])
+		if test x"$ac_cv_type_NET_LUID" = xyes; then
+		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
+		fi
+		AC_LIBOBJ([langinfo])
+		],
+[os2-emx*], [	LIBS="-lm $LIBS"
+		ac_cv_lib_dir_opendir=no],
+[bsdi*], [	LIBS="-lm $LIBS"
+		AC_DEFINE(BROKEN_SETREUID, 1)
+		AC_DEFINE(BROKEN_SETREGID, 1)
+                ac_cv_sizeof_rlim_t=8],
+[freebsd*], [	LIBS="-lm $LIBS"
+		ac_cv_func_getpeername=no
+		ac_cv_func_getsockname=no
+		ac_cv_func_shutdown=no
+		ac_cv_func_close=no
+		],
+[dragonfly*], [	LIBS="-lm $LIBS"
+		# isinf() and isnan() are macros on DragonFly.
+		ac_cv_func_isinf=yes
+		ac_cv_func_isnan=yes
+		],
+[nacl], [
+  LIBS="-lm $LIBS"
+  if test "${nacl_cv_build_variant}" = "newlib"; then
+    RUBY_APPEND_OPTION(CPPFLAGS, -DNACL_NEWLIB)
+    RUBY_APPEND_OPTION(LIBS, '-lnosys')
+  else
+    RUBY_APPEND_OPTION(XCFLAGS, -fPIC)
+  fi
+  ac_cv_func_shutdown=no
+  ac_cv_func_fcntl=no
+  ],
+[	LIBS="-lm $LIBS"])
+
+AC_CHECK_LIB(crypt, crypt)      # glibc (GNU/Linux, GNU/Hurd, GNU/kFreeBSD)
+AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
+AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
+AC_CHECK_LIB(socket, shutdown)  # SunOS/Solaris
+
+dnl Checks for header files.
+AC_HEADER_DIRENT
+dnl AC_HEADER_STDC has been checked in AC_USE_SYSTEM_EXTENSIONS
+AC_HEADER_STDBOOL
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS( \
+  limits.h \
+  sys/file.h \
+  sys/ioctl.h \
+  sys/syscall.h \
+  fcntl.h \
+  sys/fcntl.h \
+  sys/select.h \
+  sys/time.h \
+  sys/times.h \
+  sys/param.h \
+  syscall.h \
+  pwd.h \
+  grp.h \
+  a.out.h \
+  utime.h \
+  direct.h \
+  sys/resource.h \
+  sys/mkdev.h \
+  sys/utime.h \
+  float.h \
+  ieeefp.h \
+  ucontext.h \
+  intrinsics.h \
+  langinfo.h \
+  locale.h \
+  sys/sendfile.h \
+  time.h \
+  net/socket.h \
+  sys/socket.h \
+  process.h \
+  sys/prctl.h \
+  atomic.h \
+  malloc.h \
+  malloc_np.h \
+  setjmpex.h
+)
+
+AC_ARG_WITH([gmp],
+  [AS_HELP_STRING([--without-gmp],
+    [disable GNU GMP to accelerate Bignum operations])],
+  [],
+  [with_gmp=yes])
+AS_IF([test "x$with_gmp" != xno],
+  [AC_CHECK_HEADERS(gmp.h)
+   AS_IF([test "x$ac_cv_header_gmp_h" != xno],
+     AC_CHECK_LIB([gmp], [__gmpz_init]))
+   with_gmp="$ac_cv_lib_gmp___gmpz_init"
+   AS_IF([test -z "$with_gmp"], [with_gmp=no])])
 
 dnl check for large file stuff
 mv confdefs.h confdefs1.h
@@ -257,23 +1116,216 @@ mv confdefs.h largefile.h
 mv confdefs1.h confdefs.h
 cat largefile.h >> confdefs.h
 
+AS_CASE(["$target_os"],[mingw*], [ac_cv_type_off_t=yes;ac_cv_sizeof_off_t=8])
+
+AC_C_BIGENDIAN
+AC_C_CONST
+AC_C_CHAR_UNSIGNED
+AC_C_INLINE
+AC_C_VOLATILE
+
+AS_CASE(":$ac_cv_c_const:$ac_cv_c_volatile:",
+    [*:no:*], [AC_MSG_ERROR(ANSI C-conforming const and volatile are mandatory)])
+
 AC_CHECK_TYPES([long long, off_t])
 
-AC_CHECK_SIZEOF(int, 4)
-AC_CHECK_SIZEOF(short, 2)
-AC_CHECK_SIZEOF(long, 4)
-AC_CHECK_SIZEOF(long long, 0)
-AC_CHECK_SIZEOF(__int64, 0)
-AC_CHECK_SIZEOF(off_t, 0)
-AC_CHECK_SIZEOF(void*, 4)
-AC_CHECK_SIZEOF(float, 4)
-AC_CHECK_SIZEOF(double, 8)
-AC_CHECK_SIZEOF(time_t, 0)
-
-for id in pid_t gid_t uid_t; do
-    AC_CHECK_TYPE($id, [typ=$id], [typ=int])
-    AC_DEFINE_UNQUOTED(rb_$id, $typ)
-done
+AC_CACHE_CHECK([char bit], [rb_cv_char_bit],
+    [test "$universal_binary" = yes && cross_compiling=yes
+    AC_COMPUTE_INT([rb_cv_char_bit], [CHAR_BIT],
+	[AC_INCLUDES_DEFAULT([@%:@include <limits.h>])], [rb_cv_char_bit=8])
+    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling])
+
+dnl RUBY_CHECK_SIZEOF [typename], [maybe same size types], [macros], [include]
+AC_DEFUN([RUBY_CHECK_SIZEOF],
+[m4_bmatch([$1], [\.], [], [if test "$universal_binary" = yes; then])
+AC_CACHE_CHECK([size of $1], [AS_TR_SH([ac_cv_sizeof_$1])], [
+    unset AS_TR_SH(ac_cv_sizeof_$1)
+    rbcv_var="
+typedef m4_bpatsubst([$1], [\..*]) ac__type_sizeof_;
+static ac__type_sizeof_ *rbcv_ptr;
+@%:@define AS_TR_CPP(SIZEOF_$1) sizeof((*rbcv_ptr)[]m4_bmatch([$1], [\.], .m4_bpatsubst([$1], [^[^.]*\.])))
+"
+    m4_ifval([$2], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
+    for t in $2; do
+	AC_COMPILE_IFELSE(
+	    [AC_LANG_BOOL_COMPILE_TRY(AC_INCLUDES_DEFAULT([$4]
+		[$rbcv_var]),
+		[AS_TR_CPP(SIZEOF_$1) == sizeof($t)])], [
+		AS_TR_SH(ac_cv_sizeof_$1)=AS_TR_CPP([SIZEOF_]$t)
+		break])
+    done
+    }])
+    unset cond
+    m4_ifval([$3], [test -z "${AS_TR_SH(ac_cv_sizeof_$1)+set}" && {
+    for s in 32 64 128; do
+	for t in $3; do
+	    cond="${cond}
+@%:@${cond+el}if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})"
+	    hdr="AC_INCLUDES_DEFAULT([$4
+@%:@if defined(__${t}${s}__) || defined(__${t}${s}) || defined(_${t}${s}) || defined(${t}${s})
+@%:@ define AS_TR_CPP(HAVE_$1) 1
+@%:@else
+@%:@ define AS_TR_CPP(HAVE_$1) 0
+@%:@endif])"
+	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr], [!AS_TR_CPP(HAVE_$1)])], [continue])
+	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([$hdr]
+				[$rbcv_var],
+				[AS_TR_CPP(HAVE_$1) == (AS_TR_CPP(SIZEOF_$1) == ([$[s / rb_cv_char_bit]]))])],
+		[AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}${s}"])
+	done
+    done
+    }])
+    m4_ifval([$2][$3],
+	[test "${AS_TR_SH(ac_cv_sizeof_$1)@%:@SIZEOF_}" = "${AS_TR_SH(ac_cv_sizeof_$1)}" && ]){
+    test "$universal_binary" = yes && cross_compiling=yes
+    AC_COMPUTE_INT([t], AS_TR_CPP(SIZEOF_$1), [AC_INCLUDES_DEFAULT([$4])]
+[${cond+$cond
+@%:@else}
+$rbcv_var
+${cond+@%:@endif}
+@%:@ifndef AS_TR_CPP(SIZEOF_$1)
+@%:@define AS_TR_CPP(SIZEOF_$1) 0
+@%:@endif], [t=0])
+    test "$universal_binary" = yes && cross_compiling=$real_cross_compiling
+    if test ${t-0} != 0; then
+	AS_TR_SH(ac_cv_sizeof_$1)="${AS_TR_SH(ac_cv_sizeof_$1)+${AS_TR_SH(ac_cv_sizeof_$1)-} }${t}"
+    fi
+    }
+    : ${AS_TR_SH(ac_cv_sizeof_$1)=0}
+])
+{
+    unset cond
+    for t in ${AS_TR_SH(ac_cv_sizeof_$1)-}; do
+	AS_CASE(["$t"],
+	[[[0-9]*|SIZEOF_*]], [
+	    ${cond+echo "@%:@else"}
+	    echo "[@%:@define ]AS_TR_CPP(SIZEOF_$1) [$t]"
+	    break
+	    ],
+	[
+	    s=`expr $t : ['.*[^0-9]\([0-9][0-9]*\)$']`
+	    echo "@%:@${cond+el}if defined(__${t}__) || defined(__${t}) || defined(_${t}) || defined($t)"
+	    echo "@%:@define AS_TR_CPP(SIZEOF_$1) [$[s / rb_cv_char_bit]]"
+	    cond=1
+	    ])
+    done
+    ${cond+echo "@%:@endif"}
+} >> confdefs.h
+m4_bmatch([$1], [\.], [], [else
+AC_CHECK_SIZEOF([$1], 0, [$4])
+fi])
+])
+
+RUBY_CHECK_SIZEOF(int, [], [ILP])
+RUBY_CHECK_SIZEOF(short)
+RUBY_CHECK_SIZEOF(long, [int], [ILP LP])
+RUBY_CHECK_SIZEOF(long long)
+RUBY_CHECK_SIZEOF(__int64)
+RUBY_CHECK_SIZEOF(__int128)
+RUBY_CHECK_SIZEOF(off_t)
+RUBY_CHECK_SIZEOF(void*, [int long "long long"], [ILP LP LLP])
+RUBY_CHECK_SIZEOF(float)
+RUBY_CHECK_SIZEOF(double)
+RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
+RUBY_CHECK_SIZEOF(clock_t, [], [], [@%:@include <time.h>])
+
+AC_DEFUN([RUBY_CHECK_PRINTF_PREFIX], [
+AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[
+    [rb_cv_pri_prefix_]AS_TR_SH($1)=[NONE]
+    RUBY_WERROR_FLAG(for pri in $2; do
+        AC_TRY_COMPILE(
+            [@%:@include <stdio.h>
+	    @%:@include <stddef.h>
+            @%:@ifdef __GNUC__
+            @%:@define PRINTF_ARGS(decl, string_index, first_to_check) \
+              decl __attribute__((format(printf, string_index, first_to_check)))
+            @%:@else
+            @%:@define PRINTF_ARGS(decl, string_index, first_to_check) decl
+            @%:@endif
+	    PRINTF_ARGS(void test_sprintf(const char*, ...), 1, 2);],
+            [printf("%]${pri}[d", (]$1[)42);
+            test_sprintf("%]${pri}[d", (]$1[)42);],
+            [rb_cv_pri_prefix_]AS_TR_SH($1)[=[$pri]; break])
+    done)])
+if test "[$rb_cv_pri_prefix_]AS_TR_SH($1)" != NONE; then
+    AC_DEFINE_UNQUOTED([PRI_]m4_ifval($3,$3,AS_TR_CPP(m4_bpatsubst([$1],[_t$])))[_PREFIX],
+        "[$rb_cv_pri_prefix_]AS_TR_SH($1)")
+fi
+])
+
+if test "x$ac_cv_type_long_long" = xyes; then
+    RUBY_CHECK_PRINTF_PREFIX(long long, ll I64, LL)
+elif test "x$ac_cv_type___int64" = xyes; then
+    RUBY_CHECK_PRINTF_PREFIX(__int64, ll I64, LL)
+fi
+
+dnl RUBY_CHECK_SIZEOF [typename] [if-signed] [if-unsigned] [included]
+AC_DEFUN([RUBY_CHECK_SIGNEDNESS], [dnl
+    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])], [($1)-1 > 0])],
+		      [$3], [$2])])
+
+dnl RUBY_REPLACE_TYPE [typename] [default type] [macro type] [included]
+AC_DEFUN([RUBY_REPLACE_TYPE], [dnl
+    AC_CHECK_TYPE([$1],
+		  [n="patsubst([$1],["],[\\"])"],
+		  [n="patsubst([$2],["],[\\"])"],
+		  [$4])
+    AC_CACHE_CHECK([for convertible type of [$1]], rb_cv_[$1]_convertible, [
+	u= t=
+	AS_CASE(["$n "],
+	  [*" signed "*], [ ],
+	  [*" unsigned "*], [
+	    u=U],
+	  [RUBY_CHECK_SIGNEDNESS($n, [], [u=U], [$4])])
+	if test x"$t" = x; then
+	    for t in "long long" long int short; do
+		test -n "$u" && t="unsigned $t"
+		AC_COMPILE_IFELSE(
+		    [AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT([$4])]
+			[typedef $n rbcv_conftest_target_type;
+			typedef $t rbcv_conftest_replace_type;
+			extern rbcv_conftest_target_type rbcv_conftest_var;
+			extern rbcv_conftest_replace_type rbcv_conftest_var;
+			extern rbcv_conftest_target_type rbcv_conftest_func(void);
+			extern rbcv_conftest_replace_type rbcv_conftest_func(void);
+			], [sizeof(rbcv_conftest_target_type) == sizeof(rbcv_conftest_replace_type)])],
+		    [n="$t"; break])
+	    done
+	fi
+	AS_CASE([" $n "],
+	  [*" long long "*], [
+	    t=LL],
+	  [*" long "*], [
+	    t=LONG],
+	  [
+	    t=INT])
+	rb_cv_[$1]_convertible=${u}${t}])
+    test "${AS_TR_SH(ac_cv_type_[$1])}" = "yes" && n="$1"
+    AS_CASE("${rb_cv_[$1]_convertible}", [U*], [u=+1], [u=-1])
+    AC_DEFINE_UNQUOTED(rb_[$1], $n)
+    AC_DEFINE_UNQUOTED([SIGNEDNESS_OF_]AS_TR_CPP($1), $u)
+    AC_DEFINE_UNQUOTED([$3]2NUM[(v)], [${rb_cv_[$1]_convertible}2NUM(v)])
+    AC_DEFINE_UNQUOTED(NUM2[$3][(v)], [NUM2${rb_cv_[$1]_convertible}(v)])
+    AC_DEFINE_UNQUOTED(PRI_[$3]_PREFIX,
+	[PRI_`echo ${rb_cv_[$1]_convertible} | sed ['s/^U//']`_PREFIX])
+])
+RUBY_REPLACE_TYPE(pid_t, int, PIDT)
+RUBY_REPLACE_TYPE(uid_t, int, UIDT)
+RUBY_REPLACE_TYPE(gid_t, int, GIDT)
+RUBY_REPLACE_TYPE(time_t, [], TIMET, [@%:@include <time.h>])
+RUBY_REPLACE_TYPE(dev_t, [int long "long long"], DEVT)
+RUBY_REPLACE_TYPE(mode_t, ["unsigned int" long], MODET, [@%:@include <sys/stat.h>])
+RUBY_REPLACE_TYPE(rlim_t, [int long "long long"], RLIM, [
+@%:@ifdef HAVE_SYS_TYPES_H
+@%:@include <sys/types.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TYPES_H
+@%:@include <sys/time.h>
+@%:@endif
+@%:@include <sys/resource.h>
+])
+RUBY_REPLACE_TYPE(off_t, [], OFFT)
+RUBY_REPLACE_TYPE(clockid_t, [], CLOCKID)
 
 AC_CACHE_CHECK(for prototypes, rb_cv_have_prototypes,
   [AC_TRY_COMPILE([int foo(int x) { return 0; }], [return foo(10);],
@@ -284,16 +1336,51 @@ if test "$rb_cv_have_prototypes" = yes; then
 fi
 
 AC_CACHE_CHECK(token paste string, rb_cv_tokenpaste,
-  [AC_TRY_COMPILE([#define paste(a,b) a##b],
+  [AC_TRY_COMPILE([@%:@define paste(a,b) a@%:@@%:@b],
 		  [int xy = 1; return paste(x,y);],
 		  rb_cv_tokenpaste=ansi,
 		  rb_cv_tokenpaste=knr)])
 if test "$rb_cv_tokenpaste" = ansi; then
-  AC_DEFINE(TOKEN_PASTE(x,y),[x##y])
+  AC_DEFINE(TOKEN_PASTE(x,y),[x@%:@@%:@y])
 else
   AC_DEFINE(TOKEN_PASTE(x,y),[x/**/y])
 fi
 
+AC_CACHE_CHECK(stringization, rb_cv_stringization, [
+  rb_cv_stringization=no
+  for string in "#expr" '"expr"'; do
+    AC_COMPILE_IFELSE([
+      AC_LANG_BOOL_COMPILE_TRY([
+#define STRINGIZE0(expr) $string
+#define STRINGIZE(expr) STRINGIZE0(expr)
+#undef real_test_for_stringization
+#define test_for_stringization -.real_test_for_stringization.-
+const char stringized[[]] = STRINGIZE(test_for_stringization);
+], [sizeof(stringized) == 32])],
+      [rb_cv_stringization="$string"; break],
+      [rb_cv_stringization=no])
+  done]
+)
+AC_DEFINE(STRINGIZE(expr),STRINGIZE0(expr))
+if test x"$rb_cv_stringization" != xno -a "$rb_cv_stringization" != "#expr"; then
+  AC_DEFINE_UNQUOTED(STRINGIZE0(expr),$rb_cv_stringization)
+  AC_DEFINE(OLD_FASHIONED_STRINGIZATION,1)
+fi
+
+AC_CACHE_CHECK([string literal concatenation],
+  rb_cv_string_literal_concatenation, [
+  AC_COMPILE_IFELSE([
+    AC_LANG_BOOL_COMPILE_TRY([
+const char concatenated_literal[[]] = "literals" "to"
+  "be" "concatenated.";
+], [sizeof(concatenated_literal) == 26])],
+    [rb_cv_string_literal_concatenation=yes],
+    [rb_cv_string_literal_concatenation=no])]
+)
+if test "$rb_cv_string_literal_concatenation" = no; then
+  AC_DEFINE(NO_STRING_LITERAL_CONCATENATION,1)
+fi
+
 AC_CACHE_CHECK(for variable length prototypes and stdarg.h, rb_cv_stdarg,
   [AC_TRY_COMPILE([
 #include <stdarg.h>
@@ -312,6 +1399,30 @@ if test "$rb_cv_stdarg" = yes; then
   AC_DEFINE(HAVE_STDARG_PROTOTYPES)
 fi
 
+AC_CACHE_CHECK(for variable length macro, rb_cv_va_args_macro,
+  [AC_TRY_COMPILE([
+int foo(int x, ...);
+@%:@define FOO(a, ...) foo(a, @%:@@%:@__VA_ARGS__)
+], [FOO(1);FOO(1,2);FOO(1,2,3);],
+  rb_cv_va_args_macro=yes,
+  rb_cv_va_args_macro=no)])
+if test "$rb_cv_va_args_macro" = yes; then
+  AC_DEFINE(HAVE_VA_ARGS_MACRO)
+fi
+
+AC_DEFUN([RUBY_DEFINE_IF], [dnl
+    m4_ifval([$1], [AS_LITERAL_IF([$1], [], [test "X$1" = X || ])cat <<EOH >> confdefs.h
+@%:@if $1
+EOH
+])dnl
+AC_DEFINE_UNQUOTED($2, $3)dnl
+    m4_ifval([$1], [AS_LITERAL_IF([$1], [], [test "X$1" = X || ])cat <<EOH >> confdefs.h
+@%:@endif /* $1 */
+EOH
+])dnl
+])dnl
+
+dnl RUBY_FUNC_ATTRIBUTE(attrib, macroname, cachevar, condition)
 AC_DEFUN([RUBY_FUNC_ATTRIBUTE], [dnl
 m4_ifval([$2], dnl
   [AS_VAR_PUSHDEF([attrib],[$2])], dnl
@@ -321,231 +1432,210 @@ m4_ifval([$3], dnl
   [AS_VAR_PUSHDEF([rbcv],[$3])], dnl
   [AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl
 )dnl
+m4_ifval([$4], [rbcv_cond=["$4"]; test "$rbcv_cond" || unset rbcv_cond])
 AC_CACHE_CHECK(for [$1] function attribute, rbcv,
 [rbcv=x
-if test "${ac_c_werror_flag+set}"; then
-  rb_c_werror_flag="$ac_c_werror_flag"
-else
-  unset rb_c_werror_flag
-fi
-ac_c_werror_flag=yes
+RUBY_WERROR_FLAG([
 for mac in "__attribute__ (($1)) x" "x __attribute__ (($1))" "__declspec($1) x" x; do
+  m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"})
   AC_TRY_COMPILE(
-    [#define ]attrib[(x) $mac
-    ]attrib[(void conftest_attribute_check(void));], [],
+    m4_ifval([$4],${rbcv_cond+[@%:@if ]$rbcv_cond})
+[@%:@define ]attrib[(x) $mac]
+m4_ifval([$4],${rbcv_cond+[@%:@else]}
+${rbcv_cond+[@%:@define ]attrib[(x) x]}
+${rbcv_cond+[@%:@endif]})
+    attrib[(void conftest_attribute_check(void));], [],
     [rbcv="$mac"; break])
 done
-if test "${rb_c_werror_flag+set}"; then
-  ac_c_werror_flag="$rb_c_werror_flag"
-else
-  unset ac_c_werror_flag
+])])
+if test "$rbcv" != x; then
+    RUBY_DEFINE_IF(m4_ifval([$4],[${rbcv_cond}]), attrib[(x)], $rbcv)
 fi
-])
-AC_DEFINE_UNQUOTED(attrib[(x)], $rbcv)
-AS_VAR_POPDEF([attrib])
-AS_VAR_POPDEF([rbcv])
+m4_ifval([$4], [unset rbcv_cond])dnl
+AS_VAR_POPDEF([attrib])dnl
+AS_VAR_POPDEF([rbcv])dnl
 ])
 
 RUBY_FUNC_ATTRIBUTE(noreturn, NORETURN)
+RUBY_FUNC_ATTRIBUTE(deprecated, DEPRECATED)
 RUBY_FUNC_ATTRIBUTE(noinline, NOINLINE)
 
-AC_CACHE_CHECK([for RUBY_EXTERN], rb_cv_ruby_extern,
-[rb_cv_ruby_extern=no
-for mac in "__attribute__((dllimport))" "__declspec(dllimport)"; do
-  AC_TRY_COMPILE(
-    [extern $mac void conftest(void);],
-    [rb_cv_ruby_extern="extern $mac"; break])
-done])
-test "x$rb_cv_ruby_extern" = xno || AC_DEFINE_UNQUOTED(RUBY_EXTERN, $rb_cv_ruby_extern)
-
-XCFLAGS="$XCFLAGS -DRUBY_EXPORT"
-
-dnl Check whether we need to define sys_nerr locally
-AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
-#include <errno.h>])
+if_i386=${universal_binary+[defined __i386__]}
+RUBY_FUNC_ATTRIBUTE(stdcall,  [], [], ${if_i386})
+RUBY_FUNC_ATTRIBUTE(cdecl,    [], [], ${if_i386})
+RUBY_FUNC_ATTRIBUTE(fastcall, [], [], ${if_i386})
 
-dnl whether link libc_r or not
-AC_ARG_WITH(libc_r, 
-	[  --with-libc_r           link libc_r if possible (FreeBSD only)], [
-	case $withval in
-	yes) with_libc_r=yes;;
-	*)   with_libc_r=no;;
-	esac], [with_libc_r=no])
+if test "$GCC" = yes; then
+    AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias],
+	[rb_cv_gcc_function_alias=no
+	for a in alias weak,alias; do
+	    AC_TRY_LINK([void foo(void) {}
+		void bar(void) __attribute__(($a("foo")));], [bar()],
+		[rb_cv_gcc_function_alias=$a; break])
+	done])
+    if test "$rb_cv_gcc_function_alias" != no; then
+	AC_DEFINE(HAVE_ATTRIBUTE_FUNCTION_ALIAS)
+	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_TYPE(type, prot, name, args)],
+			   [type prot __attribute__(($rb_cv_gcc_function_alias(@%:@name)));])
+	AC_DEFINE_UNQUOTED([RUBY_ALIAS_FUNCTION_VOID(prot, name, args)],
+			   [RUBY_ALIAS_FUNCTION_TYPE(void, prot, name, args)])
+    fi
+    AC_CACHE_CHECK([for atomic builtins], [rb_cv_gcc_atomic_builtins], [
+	AC_TRY_LINK([unsigned char atomic_var;],
+		    [
+			__sync_lock_test_and_set(&atomic_var, 0);
+			__sync_lock_test_and_set(&atomic_var, 1);
+			__sync_fetch_and_add(&atomic_var, 1);
+			__sync_fetch_and_sub(&atomic_var, 1);
+		    ],
+		    [rb_cv_gcc_atomic_builtins=yes],
+		    [rb_cv_gcc_atomic_builtins=no])])
+    if test "$rb_cv_gcc_atomic_builtins" = yes; then
+	AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS)
+    fi
 
-AC_ARG_ENABLE(pthread,
-       [  --enable-pthread        use pthread library.],
-       [enable_pthread=$enableval], [enable_pthread=no])
+    AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
+    [RUBY_WERROR_FLAG(
+    [AC_TRY_LINK([@%:@include <stdlib.h>],
+	[exit(0); __builtin_unreachable();],
+	[rb_cv_func___builtin_unreachable=yes],
+	[rb_cv_func___builtin_unreachable=no])
+    ])
+    ])
+    if test "$rb_cv_func___builtin_unreachable" = yes; then
+	AC_DEFINE_UNQUOTED(UNREACHABLE, [__builtin_unreachable()])
+    fi
+fi
 
-AC_ARG_ENABLE(fastthread,
-       [  --disable-fastthread    do not use the fastthread mutex], [
-	: handled by ext/thread/extconf.rb
-        ])
+AC_CACHE_CHECK(for exported function attribute, rb_cv_func_exported, [
+rb_cv_func_exported=no
+RUBY_WERROR_FLAG([
+for mac in '__attribute__ ((visibility("default")))' '__declspec(dllexport)'; do
+  AC_TRY_COMPILE([@%:@define RUBY_FUNC_EXPORTED $mac extern
+    RUBY_FUNC_EXPORTED void conftest_attribute_check(void);], [],
+    [rb_cv_func_exported="$mac"; break])
+done
+])])
+if test "$rb_cv_func_exported" != no; then
+    AC_DEFINE_UNQUOTED(RUBY_FUNC_EXPORTED, [$rb_cv_func_exported extern])
+fi
 
-dnl Checks for libraries.
-case "$target_os" in
-nextstep*)	;;
-openstep*)	;;
-rhapsody*)	;;
-darwin*)	LIBS="-lobjc $LIBS"
-		CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE"
-		AC_TRY_CPP([#include <AvailabilityMacros.h>
-		    #if MAC_OS_X_VERSION_MAX_ALLOWED <= 1040
-		    #error pre OS X 10.4
-		    [!<===== pre OS X 10.4 =====>]
-		    #endif
-		    ],
-		    [
-		    test "x$target_cpu" = xpowerpc && ac_cv_header_ucontext_h=no
-		    ],
-		    [
-		    AC_DEFINE(BROKEN_SETREUID, 1)
-		    AC_DEFINE(BROKEN_SETREGID, 1)
-		    ])
-		;;
-hpux*)		LIBS="-lm $LIBS"
-		ac_cv_c_inline=no;;
-human*)		ac_cv_func_getpgrp_void=yes
-		ac_cv_func_setitimer=no
-		;;
-beos*)		ac_cv_func_link=no;;
-cygwin*)	;;
-mingw*)		if test "$with_winsock2" = yes; then
-		  LIBS="-lws2_32 $LIBS"
-		else
-		  LIBS="-lwsock32 $LIBS"
-		fi
-		LIBS="-lshell32 $LIBS"
-		ac_cv_header_a_out_h=no
-		ac_cv_header_pwd_h=no
-		ac_cv_header_utime_h=no
-		ac_cv_header_sys_ioctl_h=no
-		ac_cv_header_sys_param_h=no
-		ac_cv_header_sys_resource_h=no
-		ac_cv_header_sys_select_h=no
-		ac_cv_header_sys_time_h=no
-		ac_cv_header_sys_times_h=no
-		ac_cv_func_times=yes
-		ac_cv_func_waitpid=yes
-		ac_cv_func_fsync=yes
-		ac_cv_func_vsnprintf=yes
-		ac_cv_func_seekdir=yes
-		ac_cv_func_telldir=yes
-		ac_cv_func_isinf=yes
-		ac_cv_func_isnan=yes
-		ac_cv_func_finite=yes
-		ac_cv_func_link=yes
-		ac_cv_lib_crypt_crypt=no
-		ac_cv_func_getpgrp_void=no
-		ac_cv_func_setpgrp_void=yes
-		ac_cv_func_memcmp_working=yes
-		ac_cv_lib_dl_dlopen=no
-		rb_cv_binary_elf=no
-		rb_cv_negative_time_t=no
-		enable_pthread=no
-		ac_cv_func_fcntl=yes
-		;;
-os2-emx*)	LIBS="-lm $LIBS"
-		ac_cv_lib_dir_opendir=no;;
-msdosdjgpp*)	LIBS="-lm $LIBS"
-		ac_cv_func_getpgrp_void=yes
-		ac_cv_func_setitimer=no
-                ac_cv_sizeof_rlim_t=4
-		ac_cv_func_setrlimit=no
-		;;
-bsdi*)          LIBS="-lm $LIBS"
-		AC_DEFINE(BROKEN_SETREUID, 1)
-		AC_DEFINE(BROKEN_SETREGID, 1)
-                ac_cv_sizeof_rlim_t=8;;
-freebsd*)	LIBS="-lm $LIBS"
-		AC_CACHE_CHECK([whether -lxpg4 has to be linked],
-		  rb_cv_lib_xpg4_needed,
-		  [AC_TRY_CPP([
-#include <osreldate.h>
-#if __FreeBSD_version < 400020 || \
-   (__FreeBSD_version >= 500000 && __FreeBSD_version < 500005)
-#error needs libxpg4
-#endif
-		   ],
-		   rb_cv_lib_xpg4_needed=no,
-		   rb_cv_lib_xpg4_needed=yes,
-		   rb_cv_lib_xpg4_needed=yes)])
-		if test "$rb_cv_lib_xpg4_needed" = yes; then
-			AC_CHECK_LIB(xpg4, setlocale)
-		fi
-		if test "$with_libc_r" = yes; then
-			AC_CACHE_CHECK([whether libc_r is supplementary to libc],
-			  rb_cv_supplementary_lib_c_r,
-			  [AC_TRY_CPP([
-#include <osreldate.h>
-#if 500016 <= __FreeBSD_version
-#error libc_r is supplementary to libc
-#endif
-			   ],
-			   rb_cv_supplementary_lib_c_r=no,
-			   rb_cv_supplementary_lib_c_r=yes,
-			   rb_cv_supplementary_lib_c_r=yes)])
-			if test "$rb_cv_supplementary_lib_c_r" = yes; then
-			   MAINLIBS="-lc_r $MAINLIBS"
-			fi
-		fi
-		;;
-dragonfly*)	LIBS="-lm $LIBS"
-		;;
-bow)		ac_cv_func_setitimer=no
-		;;
-superux*)     ac_cv_func_setitimer=no
-              ;;
-solaris*2.1*) if test -z "$GCC"; then
-	           ac_cv_func_isinf=yes
-              fi
-              LIBS="-lm $LIBS"
-              ;;
-*) LIBS="-lm $LIBS";;
-esac
-AC_CHECK_LIB(crypt, crypt)
-AC_CHECK_LIB(dl, dlopen)	# Dynamic linking for SunOS/Solaris and SYSV
-AC_CHECK_LIB(dld, shl_load)	# Dynamic linking for HP-UX
-AC_CHECK_LIB(rt, clock_gettime)	# GNU/Linux
+RUBY_APPEND_OPTION(XCFLAGS, -DRUBY_EXPORT)
+
+AC_CACHE_CHECK(for function name string predefined identifier,
+    rb_cv_function_name_string,
+    [rb_cv_function_name_string=no
+    RUBY_WERROR_FLAG([
+	for func in __func__ __FUNCTION__; do
+	    AC_TRY_LINK([@%:@include <stdio.h>],
+			[puts($func);],
+			[rb_cv_function_name_string=$func
+			break])
+	done
+    ])]
+)
+if test "$rb_cv_function_name_string" != no; then
+    AC_DEFINE_UNQUOTED(RUBY_FUNCTION_NAME_STRING, [$rb_cv_function_name_string])
+fi
 
-case "$target_cpu" in
-alpha*)		case "$target_os"::"$GCC" in
-		*::yes)	CFLAGS="-mieee $CFLAGS" ;;   # gcc
-		osf*)   CFLAGS="-ieee $CFLAGS" ;;    # ccc
-		esac ;;
-esac
+dnl Check whether we need to define sys_nerr locally
+AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default
+@%:@include <errno.h>])
+
+AC_CHECK_DECLS([getenv])
+
+AS_CASE(["$target_cpu"],
+[alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"],
+		[*::yes],  # gcc
+			[CFLAGS="-mieee $CFLAGS"],
+		[osf*],    # ccc
+			[CFLAGS="-ieee $CFLAGS"],
+		)],
+[sparc*], [AC_LIBOBJ([sparc])])
+
+ac_cv_header_net_socket_h=${ac_cv_header_net_socket_h=no}
+if test "$ac_cv_header_net_socket_h" = yes; then
+    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=no}
+else
+    ac_cv_header_sys_socket_h=${ac_cv_header_sys_socket_h=yes}
+fi
 
-dnl Checks for header files.
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(stdlib.h string.h unistd.h limits.h sys/file.h sys/ioctl.h sys/syscall.h\
-		 fcntl.h sys/fcntl.h sys/select.h sys/time.h sys/times.h sys/param.h\
-		 syscall.h pwd.h grp.h a.out.h utime.h memory.h direct.h sys/resource.h \
-		 sys/mkdev.h sys/utime.h netinet/in_systm.h float.h ieeefp.h pthread.h \
-		 ucontext.h intrinsics.h time.h)
-
-dnl Check additional types.
-AC_CHECK_SIZEOF(rlim_t, 0, [
-  #ifdef HAVE_SYS_TYPES_H
-  # include <sys/types.h>
-  #endif
-  #ifdef HAVE_SYS_TIME_H
-  # include <sys/time.h>
-  #endif
-  #ifdef HAVE_SYS_RESOURCE_H
-  # include <sys/resource.h>
-  #endif
-  #ifdef HAVE_UNISTD_H
-  # include <unistd.h>
-  #endif
-  #include <stdio.h>
-])
 
-dnl Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_SIZE_T
+RUBY_CHECK_SIGNEDNESS(size_t, [AC_MSG_ERROR(size_t is signed)], [],
+		      [@%:@include <sys/types.h>])
+RUBY_CHECK_SIZEOF(size_t, [int long void*], [], [@%:@include <sys/types.h>])
+RUBY_CHECK_SIZEOF(ptrdiff_t, size_t, [], [@%:@include <stddef.h>])
+RUBY_CHECK_PRINTF_PREFIX(size_t, z)
+RUBY_CHECK_PRINTF_PREFIX(ptrdiff_t, t)
 AC_STRUCT_ST_BLKSIZE
 AC_STRUCT_ST_BLOCKS
 AC_STRUCT_ST_RDEV
+RUBY_CHECK_SIZEOF([struct stat.st_size], [int long "long long"], [], [@%:@include <sys/stat.h>])
+if test "$ac_cv_member_struct_stat_st_blocks" = yes; then
+    RUBY_CHECK_SIZEOF([struct stat.st_blocks], [int long "long long"], [], [@%:@include <sys/stat.h>])
+fi
+AC_CHECK_MEMBERS([struct stat.st_atim])
+AC_CHECK_MEMBERS([struct stat.st_atimespec])
+AC_CHECK_MEMBERS([struct stat.st_atimensec])
+AC_CHECK_MEMBERS([struct stat.st_mtim])
+AC_CHECK_MEMBERS([struct stat.st_mtimespec])
+AC_CHECK_MEMBERS([struct stat.st_mtimensec])
+AC_CHECK_MEMBERS([struct stat.st_ctim])
+AC_CHECK_MEMBERS([struct stat.st_ctimespec])
+AC_CHECK_MEMBERS([struct stat.st_ctimensec])
+
+AC_CHECK_TYPES([struct timeval], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@include <sys/time.h>
+@%:@endif])
+
+if test "${ac_cv_type_struct_timeval}" = yes; then
+    RUBY_CHECK_SIZEOF([struct timeval.tv_sec], [time_t long "long long"], [],
+		      [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@include <sys/time.h>
+@%:@endif])
+    AS_CASE(${ac_cv_sizeof_struct_timeval_tv_sec},
+	    [SIZEOF_INT], [t=int],
+	    [SIZEOF_LONG], [t=long],
+	    [SIZEOF_LONG_LONG], [t=LONG_LONG],
+	    [t=])
+    if test "${t}" != ""; then
+	AC_DEFINE_UNQUOTED(TYPEOF_TIMEVAL_TV_SEC, [$t])
+    fi
+fi
+
+AC_CHECK_TYPES([struct timespec], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@include <sys/time.h>
+@%:@endif])
+
+AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@ include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@ include <sys/time.h>
+@%:@endif])
+
+AC_CHECK_TYPES([clockid_t], [], [], [@%:@ifdef HAVE_TIME_H
+@%:@ include <time.h>
+@%:@endif
+@%:@ifdef HAVE_SYS_TIME_H
+@%:@ include <sys/time.h>
+@%:@endif])
+
+AC_CACHE_VAL([rb_cv_large_fd_select],
+    [AC_CHECK_TYPE(fd_mask, [rb_cv_large_fd_select=yes], [rb_cv_large_fd_select=no])])
+if test "$rb_cv_large_fd_select" = yes; then
+    AC_DEFINE(HAVE_RB_FD_INIT, 1)
+fi
 
 dnl RUBY_DEFINT TYPENAME, SIZE, [SIGNED-OR-UNSIGNED], [INCLUDES = DEFAULT-INCLUDES]
 AC_DEFUN([RUBY_DEFINT], [dnl
@@ -560,15 +1650,16 @@ typedef $1 t; int s = sizeof(t) == 42;])],
     ["$ac_cv_sizeof_long"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long"],
     ["$ac_cv_sizeof_long_long"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])long long"],
     ["$ac_cv_sizeof___int64"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int64"],
+    ["$ac_cv_sizeof___int128"], [ rb_cv_type_$1="m4_if([$3], [], [], [$3 ])__int128"],
     [ rb_cv_type_$1=no])])])
 if test "${rb_cv_type_$1}" != no; then
     AC_DEFINE([HAVE_]AS_TR_CPP($1), 1)
     if test "${rb_cv_type_$1}" = yes; then
-        m4_bmatch([$2], [^[1-9][0-9]*$], [AC_CHECK_SIZEOF([$1], 0, [AC_INCLUDES_DEFAULT([$4])])],
-                        [RUBY_CHECK_SIZEOF([$1], [$2], [], [AC_INCLUDES_DEFAULT([$4])])])
+	m4_bmatch([$2], [^[1-9][0-9]*$], [AC_CHECK_SIZEOF([$1], 0, [AC_INCLUDES_DEFAULT([$4])])],
+			[RUBY_CHECK_SIZEOF([$1], [$2], [], [AC_INCLUDES_DEFAULT([$4])])])
     else
-        AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1])
-        AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$rb_cv_type_$1]))
+	AC_DEFINE_UNQUOTED($1, [$rb_cv_type_$1])
+	AC_DEFINE_UNQUOTED([SIZEOF_]AS_TR_CPP($1), [SIZEOF_]AS_TR_CPP([$rb_cv_type_$1]))
     fi
 fi
 ])
@@ -583,30 +1674,92 @@ RUBY_DEFINT(int64_t, 8)
 RUBY_DEFINT(uint64_t, 8, unsigned)
 RUBY_DEFINT(int128_t, 16)
 RUBY_DEFINT(uint128_t, 16, unsigned)
-AC_CHECK_TYPES([struct timezone], [], [], [@%:@ifdef HAVE_TIME_H
-@%:@ include <time.h>
-@%:@endif
-@%:@ifdef HAVE_SYS_TIME_H
-@%:@ include <sys/time.h>
-@%:@endif])
+RUBY_DEFINT(intptr_t, void*)
+RUBY_DEFINT(uintptr_t, void*, unsigned)
+RUBY_DEFINT(ssize_t, size_t, [], [@%:@include <sys/types.h>])	dnl may differ from int, so not use AC_TYPE_SSIZE_T.
+
+RUBY_NACL_CHECK_PEPPER_TYPES
+
+AC_CACHE_CHECK(for stack end address, rb_cv_stack_end_address,
+[rb_cv_stack_end_address=no
+  AC_TRY_LINK(
+    [extern void *__libc_stack_end;],
+    [if (!__libc_stack_end) return 1;],
+    [rb_cv_stack_end_address="__libc_stack_end"])
+])
+if test $rb_cv_stack_end_address != no; then
+  AC_DEFINE_UNQUOTED(STACK_END_ADDRESS, $rb_cv_stack_end_address)
+fi
+
+# posix_memalign(memptr, alignment, size) implemented for OpenBSD 4.8 doesn't work if alignment > MALLOC_PAGESIZE.
+# [ruby-core:42158] https://bugs.ruby-lang.org/issues/5901
+# OpenBSD 5.2 fixed the problem. (src/lib/libc/stdlib/malloc.c:1.142)
+# MirOS #10semel has the problem but fixed in the repository.  (src/lib/libc/stdlib/malloc.c:1.9)
+AS_CASE(["$target_os"],
+[openbsd*|mirbsd*], [
+  AC_CACHE_CHECK(for heap align log on openbsd, rb_cv_page_size_log,
+    [rb_cv_page_size_log=no
+     for page_log in 12 13; do
+       AC_TRY_RUN([
+#include <math.h>
+#include <unistd.h>
+
+int
+main() {
+  if ((int)log2((double)sysconf(_SC_PAGESIZE)) != $page_log) return 1;
+  return 0;
+}
+       ],
+       rb_cv_page_size_log="$page_log"; break)
+     done])
+  if test $rb_cv_page_size_log != no; then
+    AC_DEFINE_UNQUOTED(HEAP_ALIGN_LOG, $rb_cv_page_size_log)
+  else
+    AC_DEFINE_UNQUOTED(HEAP_ALIGN_LOG, 12)
+  fi
+])
 
 dnl Checks for library functions.
 AC_TYPE_GETGROUPS
 AC_TYPE_SIGNAL
-case "${target_cpu}-${target_os}" in
-powerpc-darwin*)
+AS_CASE(["${target_cpu}-${target_os}:${target_archs}"],
+[powerpc-darwin*], [
   AC_LIBSOURCES(alloca.c)
   AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
   AC_DEFINE(C_ALLOCA)
   AC_DEFINE_UNQUOTED(alloca, alloca)
-  ;;
-*)
+  ],
+[universal-darwin*:*ppc*], [
+  AC_LIBSOURCES(alloca.c)
+  AC_SUBST([ALLOCA], [\${LIBOBJDIR}alloca.${ac_objext}])
+  RUBY_DEFINE_IF([defined __powerpc__], C_ALLOCA, 1)
+  RUBY_DEFINE_IF([defined __powerpc__], alloca, alloca)
+  ],
+[
   AC_FUNC_ALLOCA
-  ;;
-esac
+  ])
+if test "x$ALLOCA" = "x"; then
+    AC_CACHE_CHECK([for dynamic size alloca], rb_cv_dynamic_alloca, [
+    for chk in ok __chkstk; do
+	AC_TRY_LINK([
+	    @%:@ifdef HAVE_ALLOCA_H
+	    @%:@include <alloca.h>
+	    @%:@endif
+	    void $chk() {}
+	    int dynamic_alloca_test;
+	    int dynamic_alloca_result;],
+	    [dynamic_alloca_result = alloca(dynamic_alloca_test) != 0;],
+	    [rb_cv_dynamic_alloca=$chk; break])
+    done])
+    if test "x$rb_cv_dynamic_alloca" = "x__chkstk"; then
+	AC_DEFINE_UNQUOTED(RUBY_ALLOCA_CHKSTK, _$rb_cv_dynamic_alloca)
+	AS_CASE("$target_cpu",
+	[x64|x86_64], [
+	    AC_SUBST([ALLOCA], [\${LIBOBJDIR}x86_64-chkstk.${ac_objext}])
+	],)
+    fi
+fi
 AC_FUNC_MEMCMP
-AC_FUNC_FSEEKO
-AC_CHECK_FUNCS(ftello)
 
 # http://sources.redhat.com/ml/libc-hacker/2005-08/msg00008.html
 # Debian GNU/Linux Etch's libc6.1 2.3.6.ds1-13etch5 has this problem.
@@ -624,23 +1777,179 @@ main()
 	rb_cv_broken_glibc_ia64_erfc=no,
 	rb_cv_broken_glibc_ia64_erfc=yes,
 	rb_cv_broken_glibc_ia64_erfc=no)])
-case $rb_cv_broken_glibc_ia64_erfc in
-  yes) ac_cv_func_erf=no;;
-esac
-
-AC_REPLACE_FUNCS(dup2 memmove strcasecmp strncasecmp strerror strftime\
-		 strchr strstr strtoul crypt flock vsnprintf\
-		 isnan finite isinf hypot acosh erf)
-AC_CHECK_FUNCS(fmod killpg wait4 waitpid syscall chroot fsync getcwd eaccess\
-	      truncate ftruncate chsize times utimes fcntl lockf lstat symlink link\
-	      readlink setitimer setruid seteuid setreuid setresuid\
-	      setproctitle setrgid setegid setregid setresgid issetugid pause\
-	      lchown lchmod getpgrp setpgrp getpgid setpgid initgroups\
-	      getgroups setgroups getpriority getrlimit setrlimit sysconf\
-	      group_member dlopen sigprocmask\
-	      sigaction sigsetjmp _setjmp _longjmp setsid telldir seekdir fchmod\
-	      mktime timegm gettimeofday\
-	      cosh sinh tanh round setuid setgid setenv unsetenv)
+AS_CASE([$rb_cv_broken_glibc_ia64_erfc],[yes],[ac_cv_func_erf=no])
+
+AS_CASE(["$target_os"],[freebsd*],[
+	 AC_DEFINE(BROKEN_CLOSE)
+	 AC_REPLACE_FUNCS(close)
+	 ])
+AC_REPLACE_FUNCS(dup2 memmove strerror\
+		 strchr strstr crypt flock\
+		 isnan finite isinf hypot acosh erf tgamma lgamma_r cbrt \
+                 strlcpy strlcat ffs setproctitle)
+
+# for missing/setproctitle.c
+AS_CASE(["$target_os"],
+[aix* | k*bsd*-gnu | kopensolaris*-gnu | linux* | darwin*], [AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)],
+[hpux*], [AC_DEFINE(SPT_TYPE,SPT_PSTAT) ],
+[])
+AC_CHECK_HEADERS(sys/pstat.h)
+
+
+AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
+  [AC_TRY_LINK([
+#include <math.h>
+], [int v = signbit(-0.0);],
+	rb_cv_have_signbit=yes,
+	rb_cv_have_signbit=no)])
+if test "$rb_cv_have_signbit" = yes; then
+  AC_DEFINE(HAVE_SIGNBIT)
+else
+  AC_LIBOBJ([signbit])
+fi
+
+AC_CHECK_FUNCS(__syscall)
+AC_CHECK_FUNCS(_longjmp)		# used for AC_ARG_WITH(setjmp-type)
+AC_CHECK_FUNCS(_setjmp)			# used for AC_ARG_WITH(setjmp-type)
+AC_CHECK_FUNCS(_setjmpex)		# used for AC_ARG_WITH(setjmp-type)
+AC_CHECK_FUNCS(chroot)
+AC_CHECK_FUNCS(chsize)
+AC_CHECK_FUNCS(clock_gettime)
+AC_CHECK_FUNCS(cosh)
+AC_CHECK_FUNCS(daemon)
+AC_CHECK_FUNCS(dl_iterate_phdr)
+AC_CHECK_FUNCS(dlopen)
+AC_CHECK_FUNCS(dup)
+AC_CHECK_FUNCS(dup3)
+AC_CHECK_FUNCS(eaccess)
+AC_CHECK_FUNCS(endgrent)
+AC_CHECK_FUNCS(fchmod)
+AC_CHECK_FUNCS(fchown)
+AC_CHECK_FUNCS(fcntl)
+AC_CHECK_FUNCS(fdatasync)
+AC_CHECK_FUNCS(fmod)
+AC_CHECK_FUNCS(fork)
+AC_CHECK_FUNCS(fsync)
+AC_CHECK_FUNCS(ftruncate)
+AC_CHECK_FUNCS(ftruncate64)		# used for Win32 platform
+AC_CHECK_FUNCS(getcwd)
+AC_CHECK_FUNCS(getgrnam_r)
+AC_CHECK_FUNCS(getgroups)
+AC_CHECK_FUNCS(getpgid)
+AC_CHECK_FUNCS(getpgrp)
+AC_CHECK_FUNCS(getpriority)
+AC_CHECK_FUNCS(getpwnam_r)
+AC_CHECK_FUNCS(getrlimit)
+AC_CHECK_FUNCS(getsid)
+AC_CHECK_FUNCS(gettimeofday)		# for making ac_cv_func_gettimeofday
+AC_CHECK_FUNCS(gmtime_r)
+AC_CHECK_FUNCS(initgroups)
+AC_CHECK_FUNCS(ioctl)
+AC_CHECK_FUNCS(issetugid)
+AC_CHECK_FUNCS(killpg)
+AC_CHECK_FUNCS(lchmod)
+AC_CHECK_FUNCS(lchown)
+AC_CHECK_FUNCS(link)
+AC_CHECK_FUNCS(llabs)
+AC_CHECK_FUNCS(lockf)
+AC_CHECK_FUNCS(log2)
+AC_CHECK_FUNCS(lstat)
+AC_CHECK_FUNCS(malloc_usable_size)
+AC_CHECK_FUNCS(mblen)
+AC_CHECK_FUNCS(memalign)
+AC_CHECK_FUNCS(memrchr)
+AC_CHECK_FUNCS(mktime)
+AC_CHECK_FUNCS(pipe2)
+AC_CHECK_FUNCS(poll)
+AC_CHECK_FUNCS(posix_fadvise)
+AC_CHECK_FUNCS(posix_memalign)
+AC_CHECK_FUNCS(ppoll)
+AC_CHECK_FUNCS(pread)
+AC_CHECK_FUNCS(readlink)
+AC_CHECK_FUNCS(round)
+AC_CHECK_FUNCS(seekdir)
+AC_CHECK_FUNCS(select_large_fdset)
+AC_CHECK_FUNCS(sendfile)
+AC_CHECK_FUNCS(setegid)
+AC_CHECK_FUNCS(setenv)
+AC_CHECK_FUNCS(seteuid)
+AC_CHECK_FUNCS(setgid)
+AC_CHECK_FUNCS(setgroups)
+AC_CHECK_FUNCS(setpgid)
+AC_CHECK_FUNCS(setpgrp)
+AC_CHECK_FUNCS(setregid)
+AC_CHECK_FUNCS(setresgid)
+AC_CHECK_FUNCS(setresuid)
+AC_CHECK_FUNCS(setreuid)
+AC_CHECK_FUNCS(setrgid)
+AC_CHECK_FUNCS(setrlimit)
+AC_CHECK_FUNCS(setruid)
+AC_CHECK_FUNCS(setsid)
+AC_CHECK_FUNCS(setuid)
+AC_CHECK_FUNCS(shutdown)
+AC_CHECK_FUNCS(sigaction)
+AC_CHECK_FUNCS(sigaltstack)
+AC_CHECK_FUNCS(sigprocmask)
+AC_CHECK_FUNCS(sinh)
+AC_CHECK_FUNCS(spawnv)
+AC_CHECK_FUNCS(symlink)
+AC_CHECK_FUNCS(syscall)
+AC_CHECK_FUNCS(sysconf)
+AC_CHECK_FUNCS(tanh)
+AC_CHECK_FUNCS(telldir)
+AC_CHECK_FUNCS(timegm)
+AC_CHECK_FUNCS(times)
+AC_CHECK_FUNCS(truncate)
+AC_CHECK_FUNCS(truncate64)		# used for Win32
+AC_CHECK_FUNCS(unsetenv)
+AC_CHECK_FUNCS(utimensat)
+AC_CHECK_FUNCS(utimes)
+AC_CHECK_FUNCS(wait4)
+AC_CHECK_FUNCS(waitpid)
+
+AC_DEFUN([RUBY_CHECK_BUILTIN_FUNC], [dnl
+AC_CACHE_CHECK([for $1], AS_TR_SH(rb_cv_builtin_$1),
+  [AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM([], [$2;])],
+    [AS_TR_SH(rb_cv_builtin_$1)=yes],
+    [AS_TR_SH(rb_cv_builtin_$1)=no])])
+if test "${AS_TR_SH(rb_cv_builtin_$1)}" != no; then
+  AC_DEFINE(AS_TR_CPP(HAVE_BUILTIN_$1))
+fi])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap32, [__builtin_bswap32(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_bswap64, [__builtin_bswap64(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_clz, [__builtin_clz(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
+
+# Some platform need -lrt for clock_gettime, but the other don't.
+if test x"$ac_cv_func_clock_gettime" != xyes; then
+    # glibc 2.17 moves clock_* functions from librt to the main C library.
+    # http://sourceware.org/ml/libc-announce/2012/msg00001.html
+    AC_CHECK_LIB(rt, clock_gettime)
+    if test x"$ac_cv_lib_rt_clock_gettime" = xyes; then
+	AC_DEFINE(HAVE_CLOCK_GETTIME, 1)
+    fi
+fi
+AC_CHECK_FUNCS(clock_getres) # clock_getres should be tested after clock_gettime test including librt test.
+
+AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value,
+  [AC_TRY_COMPILE([
+#include <stdlib.h>
+], [int v = unsetenv("foo");],
+	rb_cv_unsetenv_return_value=yes,
+	rb_cv_unsetenv_return_value=no)])
+if test "$rb_cv_unsetenv_return_value" = no; then
+  AC_DEFINE(VOID_UNSETENV)
+fi
+
+# used for AC_ARG_WITH(setjmp-type)
+AC_CACHE_CHECK(for sigsetjmp as a macro or function, ac_cv_func_sigsetjmp,
+  [AC_TRY_COMPILE([
+#include <setjmp.h>
+], [sigjmp_buf env; sigsetjmp(env,1);],
+	ac_cv_func_sigsetjmp=yes,
+	ac_cv_func_sigsetjmp=no)])
 
 AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
 [AC_TRY_LINK([@%:@include <setjmp.h>
@@ -650,49 +1959,55 @@ AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
     [ac_cv_func___builtin_setjmp=no])
 ])
 
+# we don't use _setjmp if _longjmp doesn't exist.
 test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
 
 AC_MSG_CHECKING(for setjmp type)
-AC_ARG_WITH(setjmp-type, 
-	[  --with-setjmp-type      select setjmp type], [
-	case $withval in
-	__builtin_setjmp) setjmp_prefix=__builtin_;;
-	_setjmp) setjmp_prefix=_;;
-	sigsetjmp) setjmp_prefix=sig;;
-	setjmp) setjmp_prefix=;;
-	'') unset setjmp_prefix;;
-	*)   AC_MSG_ERROR(invalid setjmp type: $withval);;
-	esac], [unset setjmp_prefix])
+setjmp_suffix=
+AC_ARG_WITH(setjmp-type,
+	AS_HELP_STRING([--with-setjmp-type], [select setjmp type]),
+	[
+	AS_CASE([$withval],
+	[__builtin_setjmp], [setjmp=__builtin_setjmp],
+	[_setjmp], [ setjmp_prefix=_],
+	[sigsetjmp], [ setjmp_prefix=sig],
+	[setjmp], [ setjmp_prefix=],
+	[setjmpex], [ setjmp_prefix= setjmp_suffix=ex],
+	[''], [ unset setjmp_prefix],
+	[   AC_MSG_ERROR(invalid setjmp type: $withval)])], [unset setjmp_prefix])
 if test ${setjmp_prefix+set}; then
-    if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp = no; then
-	AC_MSG_ERROR(${setjmp_prefix}setjmp is not available)
+    if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp${setjmp_suffix} = no; then
+	AC_MSG_ERROR(${setjmp_prefix}setjmp${setjmp_suffix} is not available)
     fi
 elif test "$ac_cv_func___builtin_setjmp" = yes; then
     setjmp_prefix=__builtin_
+    setjmp_suffix=
+elif test "$ac_cv_header_setjmpex_h:$ac_cv_func__setjmpex" = yes:yes; then
+    setjmp_prefix=
+    setjmp_suffix=ex
 elif test "$ac_cv_func__setjmp" = yes; then
     setjmp_prefix=_
+    setjmp_suffix=
 elif test "$ac_cv_func_sigsetjmp" = yes; then
-    case $target_os in
-    solaris*|cygwin*)
-	setjmp_prefix=;;
-    *)
-	setjmp_prefix=sig;;
-    esac
+    AS_CASE([$target_os],[solaris*|cygwin*],[setjmp_prefix=],[setjmp_prefix=sig])
+    setjmp_suffix=
 else
     setjmp_prefix=
+    setjmp_suffix=
 fi
 if test x$setjmp_prefix = xsig; then
     setjmp_sigmask=yes
 else
     unset setjmp_sigmask
 fi
-AC_MSG_RESULT(${setjmp_prefix}setjmp)
-AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp(env${setjmp_sigmask+,0})])
+AC_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix})
+AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}(env${setjmp_sigmask+,0})])
 AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp(env,val)])
 AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
+# End of setjmp check.
 
 AC_ARG_ENABLE(setreuid,
-       [  --enable-setreuid       use setreuid()/setregid() according to need even if obsolete.],
+       AS_HELP_STRING([--enable-setreuid], [use setreuid()/setregid() according to need even if obsolete]),
        [use_setreuid=$enableval])
 if test "$use_setreuid" = yes; then
     AC_DEFINE(USE_SETREUID)
@@ -700,7 +2015,7 @@ if test "$use_setreuid" = yes; then
 fi
 AC_STRUCT_TIMEZONE
 AC_CACHE_CHECK(for struct tm.tm_gmtoff, rb_cv_member_struct_tm_tm_gmtoff,
-  [AC_TRY_COMPILE([#include <time.h>],
+  [AC_TRY_COMPILE([@%:@include <time.h>],
     [struct tm t; t.tm_gmtoff = 3600;],
   [rb_cv_member_struct_tm_tm_gmtoff=yes],
   [rb_cv_member_struct_tm_tm_gmtoff=no])])
@@ -710,15 +2025,15 @@ fi
 AC_CACHE_CHECK(for external int daylight, rb_cv_have_daylight,
   [AC_TRY_LINK([#include <time.h>
   int i;],
-  	[i = daylight;],
+	[i = daylight;],
 	rb_cv_have_daylight=yes,
 	rb_cv_have_daylight=no)])
 if test "$rb_cv_have_daylight" = yes; then
   AC_DEFINE(HAVE_DAYLIGHT)
 fi
 AC_DEFUN([RUBY_CHECK_VARTYPE], [dnl
-AC_CACHE_CHECK([for external $1], rb_cv_var_$1,
-  [rb_cv_var_$1=no
+AC_CACHE_CHECK([for external $1], AS_TR_SH(rb_cv_var_$1),
+  [AS_TR_SH(rb_cv_var_$1)=no
   AC_TRY_COMPILE([
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 1
@@ -737,31 +2052,30 @@ $2
 extern $t $1;
 const volatile void *volatile t;],
         [t = &(&$1)[0];],
-        [rb_cv_var_$1=$t; break])
+        [AS_TR_SH(rb_cv_var_$1)=$t; break])
     done])])
-if test "[$rb_cv_var_]$1" != no; then
-  AC_DEFINE([HAVE_VAR_]m4_toupper($1))
-  AC_DEFINE_UNQUOTED([TYPEOF_VAR_]m4_toupper($1), $rb_cv_var_$1)
+if test "${AS_TR_SH(rb_cv_var_$1)}" != no; then
+  AC_DEFINE(AS_TR_CPP(HAVE_VAR_$1))
+  AC_DEFINE_UNQUOTED(AS_TR_CPP(TYPEOF_VAR_$1), ${AS_TR_SH(rb_cv_var_$1)})
 fi])
 RUBY_CHECK_VARTYPE(timezone, [@%:@include <time.h>], [long int])
 RUBY_CHECK_VARTYPE(altzone, [@%:@include <time.h>], [long int])
-if test "$rb_cv_var_timezone" = no; then
-  AC_CHECK_FUNCS(timezone)
-  if test "$ac_cv_func_timezone" = yes; then
-    AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
-      [AC_TRY_COMPILE([@%:@include <time.h>],
-	[(void)timezone(0, 0);],
-	[rb_cv_func_timezone_void=no],
-	[rb_cv_func_timezone_void=yes])]
-    )
-    if test $rb_cv_func_timezone_void = yes; then
-      AC_DEFINE(TIMEZONE_VOID)
-    fi
+AC_CHECK_FUNCS(timezone)
+if test "$ac_cv_func_timezone" = yes; then
+  AC_CACHE_CHECK([whether timezone requires zero arguments], rb_cv_func_timezone_void,
+    [AC_TRY_COMPILE([@%:@include <time.h>],
+      [(void)timezone(0, 0);],
+      [rb_cv_func_timezone_void=no],
+      [rb_cv_func_timezone_void=yes])]
+  )
+  if test $rb_cv_func_timezone_void = yes; then
+    AC_DEFINE(TIMEZONE_VOID)
   fi
 fi
 
 AC_CACHE_CHECK(for negative time_t for gmtime(3), rb_cv_negative_time_t,
   [AC_TRY_RUN([
+#include <stdlib.h>
 #include <time.h>
 
 void
@@ -798,6 +2112,49 @@ if test "$rb_cv_negative_time_t" = yes; then
   AC_DEFINE(NEGATIVE_TIME_T)
 fi
 
+# [ruby-dev:40910] overflow of time on FreeBSD
+# http://www.freebsd.org/cgi/query-pr.cgi?pr=145341
+AC_CACHE_CHECK(for localtime(3) overflow correctly, rb_cv_localtime_overflow,
+  [AC_TRY_RUN([
+#include <stdlib.h>
+#include <time.h>
+
+void
+check(time_t t1)
+{
+    struct tm *tm;
+    time_t t2;
+    tm = localtime(&t1);
+    if (!tm)
+	return; /* overflow detected.  ok. */
+    t2 = mktime(tm);
+    if (t1 == t2)
+        return; /* round-trip.  ok. */
+    exit(1);
+}
+
+int
+main()
+{
+    time_t t;
+    if (~(time_t)0 <= 0) {
+        t = (((time_t)1) << (sizeof(time_t) * 8 - 2));
+        t |= t - 1;
+    }
+    else {
+        t = ~(time_t)0;
+    }
+    check(t);
+    return 0;
+}
+],
+	rb_cv_localtime_overflow=yes,
+	rb_cv_localtime_overflow=no,
+	rb_cv_localtime_overflow=no)])
+if test "$rb_cv_localtime_overflow" = no; then
+  AC_DEFINE(LOCALTIME_OVERFLOW_PROBLEM)
+fi
+
 if test "$ac_cv_func_sigprocmask" = yes && test "$ac_cv_func_sigaction" = yes; then
    AC_DEFINE(POSIX_SIGNAL)
 else
@@ -830,14 +2187,19 @@ main()
   fi
 fi
 
+if test "$ac_cv_func_getpgid" = no; then
+  # AC_FUNC_GETPGRP fails when cross-compiling with old autoconf.
+  # autoconf is changed between 2.52d and 2.52f?
+  # http://lists.gnu.org/archive/html/bug-gnu-utils/2001-09/msg00181.html
+  # "autoconf cleanup for AC_FUNC_GETPGRP and GETPGRP_VOID"
 AC_FUNC_GETPGRP
-AC_FUNC_SETPGRP  
-
-AC_C_BIGENDIAN
-AC_C_CONST
-AC_C_CHAR_UNSIGNED
-AC_C_INLINE
-AC_C_VOLATILE
+fi
+if test "$ac_cv_func_setpgid:$ac_cv_func_setpgrp" = no:yes; then
+  # AC_FUNC_SETPGRP fails when cross-compiling.  (until autoconf 2.69?)
+  # https://lists.gnu.org/archive/html/bug-autoconf/2013-02/msg00002.html
+  # "AC_FUNC_SETPGRP fails to work properly when cross-compiling"
+AC_FUNC_SETPGRP
+fi
 
 if test x"$target_cpu" = xia64; then
     AC_LIBOBJ([ia64])
@@ -855,27 +2217,20 @@ if test x"$target_cpu" = xia64; then
 fi
 
 AC_CACHE_CHECK(whether right shift preserve sign bit, rb_cv_rshift_sign,
-    [AC_TRY_RUN([
-int
-main()
-{
-  if (-1==(-1>>1))
-    return 0;
-  return 1;
-}
-],
+    [AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([], [(-1==(-1>>1))])],
 	rb_cv_rshift_sign=yes,
-	rb_cv_rshift_sign=no,
-	rb_cv_rshift_sign=yes)])
+	rb_cv_rshift_sign=no)])
 if test "$rb_cv_rshift_sign" = yes; then
-  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)y))
+  AC_DEFINE(RSHIFT(x,y), ((x)>>(int)(y)))
 else
-  AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>y) : (x)>>y))
+  AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>(int)(y)) : (x)>>(int)(y)))
 fi
 
-AC_MSG_CHECKING(read count field in FILE structures)
-AC_CACHE_VAL(rb_cv_fcnt,
-[for fcnt in	dnl
+# win32.c still use this. Don't remove it.
+test "$rb_cv_fcnt" = "not found" && rb_cv_fcnt="not found (OK if using GNU libc)"
+AC_CACHE_CHECK([read count field in FILE structures], rb_cv_fcnt,
+[rb_cv_fcnt="not found (OK if using GNU libc)"
+for fcnt in	dnl
      _cnt	dnl
      __cnt	dnl
      _r		dnl
@@ -885,24 +2240,21 @@ AC_CACHE_VAL(rb_cv_fcnt,
     AC_TRY_COMPILE([#include <stdio.h>
 ],
 	[FILE *f = stdin; f->$fcnt = 0;],
-	rb_cv_fcnt="$fcnt"; break,
-	rb_cv_fcnt="not found")
+	[rb_cv_fcnt="$fcnt"; break])
 done])
-if test "$rb_cv_fcnt" = "not found"; then
-  AC_MSG_RESULT([not found(OK if using GNU libc)])
-else
-  AC_MSG_RESULT($rb_cv_fcnt)
-  AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)
-fi
+AS_CASE("$rb_cv_fcnt",
+	["not found"*], [rb_cv_fcnt="not found"],
+	[AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)])
 
-AC_MSG_CHECKING(read buffer ptr field in FILE structures)
-AC_CACHE_VAL(rb_cv_frptr,
+# win32.c still use this. Don't remove it.
+AC_CACHE_CHECK([read buffer ptr field in FILE structures], rb_cv_frptr,
 [for frptr in	dnl
      _IO_read_ptr dnl
      _ptr	dnl
      __ptr	dnl
      bufpos	dnl
      _p	dnl
+     __bufpos	dnl
 ; do
     AC_TRY_COMPILE([#include <stdio.h>
 ],
@@ -910,109 +2262,34 @@ AC_CACHE_VAL(rb_cv_frptr,
 	rb_cv_frptr="$frptr"; break,
 	rb_cv_frptr="not found")
 done])
-if test "$rb_cv_frptr" = "not found"; then
-  AC_MSG_RESULT([not found])
-else
-  AC_MSG_RESULT($rb_cv_frptr)
+if test "$rb_cv_frptr" != "not found"; then
   AC_DEFINE_UNQUOTED(FILE_READPTR, $rb_cv_frptr)
 
   if test "$rb_cv_fcnt" = "not found"; then
-    AC_MSG_CHECKING(read buffer end field in FILE structures)
-    AC_CACHE_VAL(rb_cv_frend,
+    AC_CACHE_CHECK([read buffer end field in FILE structures], rb_cv_frend,
     [for frend in	dnl
          _IO_read_end	dnl
          bufread 	dnl
+         __bufread 	dnl
     ; do
         AC_TRY_COMPILE([#include <stdio.h>
     ],
-  	[FILE *f = stdin; char buf[256]; f->$frend = buf;],
-  	rb_cv_frend="$frend"; break,
-  	rb_cv_frend="not found")
+	[FILE *f = stdin; char buf[256]; f->$frend = buf;],
+	rb_cv_frend="$frend"; break,
+	rb_cv_frend="not found")
     done])
-    if test "$rb_cv_frend" = "not found"; then
-      AC_MSG_RESULT([not found])
-    else
-      AC_MSG_RESULT($rb_cv_frend)
+    if test "$rb_cv_frend" != "not found"; then
       AC_DEFINE_UNQUOTED(FILE_READEND, $rb_cv_frend)
     fi
   fi
 fi
 
-AC_DEFUN([RUBY_CHECK_IO_NEED],
-[AC_CACHE_CHECK(whether need to [$1], [$2],
-    [AC_TRY_RUN([
-#include <stdio.h>
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-#define before_seek(f) ]ifelse(index($2,flush_before_seek),-1,[fflush(f)],[(f,0)])[
-#define reset_rw(f) ]ifelse(index($2,seek_between_rw),-1,[do_seek(f,SEEK_CUR)],[(f,0)])[
-#define do_seek(f, w) (before_seek(f), fseek(f,0,w))
-
-char *fn = "conftest.dat";
-char *wombat = "wombat\n";
-char *koara = "koara\n";
-char *kangaroo = "kangaroo\n";
-
-int main()
-{
-    char buf[BUFSIZ];
-    FILE *f;
-    int r = 1;
-
-    if (!(f = fopen(fn, "w+"))) return 1;
-    fputs(wombat, f);
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    reset_rw(f);
-    fputs(koara, f);
-    fputs(kangaroo, f);
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    reset_rw(f);
-    fputc('X', f);
-    reset_rw(f);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, koara+1)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
-    do_seek(f, SEEK_SET);
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, wombat)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || buf[0] != 'X' || strcmp(buf+1, koara+1)) goto fail;
-    if (!fgets(buf, BUFSIZ, f) || strcmp(buf, kangaroo)) goto fail;
-    r = 0;
-  fail:
-    fclose(f);
-    unlink(fn);
-    return r;
-}
-], [$2]=no, [$2]=yes, [$2]=[$3])])])
-RUBY_CHECK_IO_NEED(seek between R/W, rb_cv_need_io_seek_between_rw, yes)
-if test "$rb_cv_need_io_seek_between_rw" = yes; then
-  AC_DEFINE(NEED_IO_SEEK_BETWEEN_RW, 1)
-fi
-dnl RUBY_CHECK_IO_NEED(flush before seek, rb_cv_need_io_flush_before_seek, no)
-dnl if test "$rb_cv_need_io_flush_before_seek" = yes; then
-dnl   AC_DEFINE(NEED_IO_FLUSH_BEFORE_SEEK, 1)
-dnl fi
-
-AC_CACHE_CHECK([whether st_ino is huge], rb_cv_huge_st_ino,
-[AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([
-#include <sys/stat.h>
-struct stat test_stat;
-], [sizeof(test_stat.st_ino)>sizeof(long)])],
-rb_cv_huge_st_ino=yes,
-rb_cv_huge_st_ino=no)
-])
-if test $rb_cv_huge_st_ino = yes; then
-  AC_DEFINE(HUGE_ST_INO)
+if test x"$ac_cv_func_gettimeofday" != xyes; then
+    AC_MSG_ERROR(gettimeofday() must exist)
 fi
 
+RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>])
+
 if test "$ac_cv_func_sysconf" = yes; then
   AC_DEFUN([RUBY_CHECK_SYSCONF], [dnl
   AC_CACHE_CHECK([whether _SC_$1 is supported], rb_cv_have_sc_[]m4_tolower($1),
@@ -1029,12 +2306,14 @@ if test "$ac_cv_func_sysconf" = yes; then
   RUBY_CHECK_SYSCONF(CLK_TCK)
 fi
 
-case "$target_cpu" in
-m68*|i?86|ia64|sparc*|alpha*) rb_cv_stack_grow_dir=-1;;
-hppa*) rb_cv_stack_grow_dir=+1;;
-esac
-AC_CACHE_CHECK(stack growing direction, rb_cv_stack_grow_dir,
-  [AC_TRY_RUN([
+AC_DEFUN(RUBY_STACK_GROW_DIRECTION, [
+    AS_VAR_PUSHDEF([stack_grow_dir], [rb_cv_stack_grow_dir_$1])
+    AC_CACHE_CHECK(stack growing direction on $1, stack_grow_dir, [
+AS_CASE(["$1"],
+[m68*|x86*|x64|i?86|ia64|ppc*|sparc*|alpha*], [ $2=-1],
+[hppa*], [ $2=+1],
+[
+  AC_TRY_RUN([
 /* recurse to get rid of inlining */
 static int
 stack_growup_p(addr, n)
@@ -1051,12 +2330,45 @@ int main()
     int x;
     return stack_growup_p(&x, 10);
 }
-], rb_cv_stack_grow_dir=-1, rb_cv_stack_grow_dir=+1, rb_cv_stack_grow_dir=0)])
-AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $rb_cv_stack_grow_dir)
+], $2=-1, $2=+1, $2=0)
+  ])
+eval stack_grow_dir=\$$2])
+eval $2=\$stack_grow_dir
+AS_VAR_POPDEF([stack_grow_dir])])
+if test "${universal_binary-no}" = yes ; then
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    save_CFLAGS="$CFLAGS" new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
+    save_LDFLAGS="$LDFLAGS" new_ldflags=`echo "$LDFLAGS" | sed "s|$archflagpat"'||'`
+    stack_dir=
+    for archs in ${universal_archnames}; do
+	archs=`echo $archs | sed 's/=.*//'`
+	CFLAGS="$new_cflags -arch $archs"
+	LDFLAGS="$new_ldflags -arch $archs"
+	RUBY_STACK_GROW_DIRECTION($archs, dir)
+	if test x$stack_dir = x; then
+	    stack_dir=$dir
+	elif test x$stack_dir != x$dir; then
+	    stack_dir=no
+	fi
+    done
+    CFLAGS="$save_CFLAGS" LDFLAGS="$save_LDFLAGS"
+    if test x$stack_dir = xno; then
+	for archs in ${universal_archnames}; do
+	    archs=`echo $archs | sed 's/=.*//'`
+	    eval dir=\$[rb_cv_stack_grow_dir_]AS_TR_SH([$archs])
+	    RUBY_DEFINE_IF([defined __${archs}__], STACK_GROW_DIRECTION, $dir)
+	done
+    else
+	AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $stack_dir)
+    fi
+else
+    RUBY_STACK_GROW_DIRECTION($target_cpu, dir)
+    AC_DEFINE_UNQUOTED(STACK_GROW_DIRECTION, $dir)
+fi
 
 if test x"$enable_pthread" = xyes; then
-    for pthread_lib in pthread pthreads c c_r; do
- 	AC_CHECK_LIB($pthread_lib, pthread_kill,
+    for pthread_lib in thr pthread pthreads c c_r root; do
+	AC_CHECK_LIB($pthread_lib, pthread_kill,
 		     rb_with_pthread=yes, rb_with_pthread=no)
 	if test "$rb_with_pthread" = "yes"; then break; fi
     done
@@ -1064,25 +2376,27 @@ if test x"$enable_pthread" = xyes; then
 	AC_DEFINE(_REENTRANT)
 	AC_DEFINE(_THREAD_SAFE)
 	AC_DEFINE(HAVE_LIBPTHREAD)
-	case $pthread_lib in
-	c)
-	    ;;
-	c_r)
-	    MAINLIBS="-pthread $MAINLIBS"
-	    ;;
-	*)
-      	    LIBS="-l$pthread_lib $LIBS"
-	    ;;
-	esac
+	AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>])
+	AS_CASE([$pthread_lib],
+	[c],    [],
+	[root], [],
+	[c_r],  [MAINLIBS="-pthread $MAINLIBS"],
+	        [AS_CASE(["$target_os"],
+		    [openbsd*|mirbsd*], [LIBS="-pthread $LIBS"],
+		    [LIBS="-l$pthread_lib $LIBS"])])
     else
 	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
     fi
-    AC_CHECK_FUNCS(nanosleep)
-    if test x"$ac_cv_func_nanosleep" = xno; then
-       AC_CHECK_LIB(rt, nanosleep)
-       if test x"$ac_cv_lib_rt_nanosleep" = xyes; then
-           AC_DEFINE(HAVE_NANOSLEEP)
-       fi
+    AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
+	pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\
+	pthread_get_stackaddr_np pthread_get_stacksize_np \
+	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
+	pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
+        pthread_sigmask)
+    if test "${host_os}" = "nacl"; then
+      ac_cv_func_pthread_attr_init=no
+    else
+      AC_CHECK_FUNCS(pthread_attr_init)
     fi
 fi
 if test x"$ac_cv_header_ucontext_h" = xyes; then
@@ -1091,62 +2405,112 @@ if test x"$ac_cv_header_ucontext_h" = xyes; then
     fi
 fi
 
-dnl default value for $KANJI
-DEFAULT_KCODE="KCODE_NONE"
+if test "$ac_cv_func_fork" = "yes" -a "$rb_with_pthread" = "yes"; then
+    AC_CACHE_CHECK([if fork works with pthread], rb_cv_fork_with_pthread,
+	[AC_TRY_RUN([
+#include <stdlib.h>
+#include <unistd.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <signal.h>
+#ifndef EXIT_SUCCESS
+#define EXIT_SUCCESS 0
+#endif
+#ifndef EXIT_FAILURE
+#define EXIT_FAILURE 1
+#endif
 
-AC_ARG_WITH(default-kcode, 
-	[  --with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)], 
-	[case $withval in
-	utf8) DEFAULT_KCODE="KCODE_UTF8";;
-	euc)  DEFAULT_KCODE="KCODE_EUC";;
-	sjis) DEFAULT_KCODE="KCODE_SJIS";;
-	none) DEFAULT_KCODE="KCODE_NONE";;
-        *)    AC_MSG_WARN($withval is not valid kcode; ignored);;
-	esac])
-AC_DEFINE_UNQUOTED(DEFAULT_KCODE, $DEFAULT_KCODE)
+void *
+thread_func(void *dmy)
+{
+    return dmy;
+}
+
+int
+use_threads(void)
+{
+    pthread_t tid;
+    if (pthread_create(&tid, 0, thread_func, 0) != 0) {
+	return -1;
+    }
+    if (pthread_join(tid, 0) != 0) {
+	return -1;
+    }
+    return 0;
+}
+
+int
+main(int argc, char *argv[])
+{
+    pid_t pid;
+    if (use_threads()) return EXIT_FAILURE;
+    pid = fork();
+
+    if (pid) {
+	int loc;
+	sleep(1);
+	if (waitpid(pid, &loc, WNOHANG) == 0) {
+	    kill(pid, SIGKILL);
+	    return EXIT_FAILURE;
+	}
+        if (!WIFEXITED(loc) || WEXITSTATUS(loc) != EXIT_SUCCESS)
+           return EXIT_FAILURE;
+    }
+    else {
+	if (use_threads()) return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
+}],
+	rb_cv_fork_with_pthread=yes,
+	rb_cv_fork_with_pthread=no,
+	rb_cv_fork_with_pthread=yes)])
+    test x$rb_cv_fork_with_pthread = xyes || AC_DEFINE(CANNOT_FORK_WITH_PTHREAD)
+fi
+
+
+}
+{ # runtime section
 
 dnl wheather use dln_a_out or not
-AC_ARG_WITH(dln-a-out, 
-	[  --with-dln-a-out        use dln_a_out if possible], [
-	case $withval in
-	yes) with_dln_a_out=yes;;
-	*)   with_dln_a_out=no;;
-	esac], [with_dln_a_out=no])
+AC_ARG_WITH(dln-a-out,
+	AS_HELP_STRING([--with-dln-a-out], [use dln_a_out if possible]),
+	[
+	AS_CASE([$withval],
+	[yes], [
+	    if test "$enable_shared" = yes; then
+		AC_MSG_ERROR(dln_a_out can not make shared library)
+	    fi
+	    with_dln_a_out=yes],
+	[
+	    with_dln_a_out=no])], [with_dln_a_out=no])
 
 AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
-[AC_TRY_RUN([
-/* Test for whether ELF binaries are produced */
-#include <fcntl.h>
-#include <stdlib.h>
-main() {
-	char buffer[4];
-	int i=open("conftest",O_RDONLY);
-	if(i==-1)
-		exit(1); /* fail */
-	if(read(i,&buffer[0],4)<4)
-		exit(1); /* fail */
-	if(buffer[0] != 127 || buffer[1] != 'E' ||
-           buffer[2] != 'L' || buffer[3] != 'F')
-		exit(1); /* fail */
-	exit(0); /* succeed (yes, it's ELF) */
-}
-],
-rb_cv_binary_elf=yes,
-rb_cv_binary_elf=no,
-rb_cv_binary_elf=yes)])
+[AC_TRY_LINK([],[], [
+AS_CASE(["`head -1 conftest$EXEEXT | cat -e`"],
+['^?ELF'*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
+rb_cv_binary_elf=no)])
 
 if test "$rb_cv_binary_elf" = yes; then
   AC_DEFINE(USE_ELF)
+  if test "$with_dln_a_out" = yes; then
+    AC_MSG_ERROR(dln_a_out does not work with ELF)
+  fi
+  AC_CHECK_HEADERS([elf.h elf_abi.h])
+  if test $ac_cv_header_elf_h = yes -o $ac_cv_header_elf_abi_h = yes; then
+    AC_LIBOBJ([addr2line])
+  fi
 fi
 
-case "$target_os" in
-linux* | gnu* | k*bsd*-gnu | bsdi*)
+AS_CASE(["$target_os"],
+[linux* | gnu* | k*bsd*-gnu | bsdi* | kopensolaris*-gnu | nacl], [
     if test "$rb_cv_binary_elf" = no; then
 	with_dln_a_out=yes
     else
 	LDFLAGS="$LDFLAGS -rdynamic"
-    fi;;
-esac
+    fi])
 LIBEXT=a
 
 AC_SUBST(DLDFLAGS)dnl
@@ -1155,6 +2519,7 @@ AC_SUBST(ARCH_FLAG)dnl
 AC_SUBST(STATIC)dnl
 AC_SUBST(CCDLFLAGS)dnl
 AC_SUBST(LDSHARED)dnl
+AC_SUBST(LDSHAREDXX)dnl
 AC_SUBST(DLEXT)dnl
 AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
@@ -1166,162 +2531,283 @@ if test "$with_dln_a_out" != yes; then
   rb_cv_dlopen=unknown
   AC_MSG_CHECKING(whether OS depend dynamic link works)
   if test "$GCC" = yes; then
-    case "$target_os" in
-    nextstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    openstep*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    rhapsody*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    darwin*)	CCDLFLAGS="$CCDLFLAGS -fno-common";;
-    human*|bsdi*|beos*|cygwin*|mingw*|aix*|interix*) ;;
-    *) CCDLFLAGS="$CCDLFLAGS -fPIC";;
-    esac
+    AS_CASE(["$target_os"],
+    [darwin*], [
+      # The -fno-common is needed if we wish to embed the Ruby interpreter
+      # into a plugin module of some project (as opposed to embedding it
+      # within the project's application).  The -I/usr/local/include is
+      # needed because CPP as discovered by configure (cc -E -traditional)
+      # fails to consult /usr/local/include by default.  This causes
+      # mkmf.rb's have_header() to fail if the desired resource happens to be
+      # installed in the /usr/local tree.
+      RUBY_APPEND_OPTION(CCDLFLAGS, -fno-common)],
+    [bsdi*|beos*|haiku*|cygwin*|mingw*|aix*|interix*], [ ],
+    [
+      RUBY_APPEND_OPTION(CCDLFLAGS, -fPIC)])
   else
-    case "$target_os" in
-	hpux*)		CCDLFLAGS="$CCDLFLAGS +Z";;
-	solaris*|irix*)	CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
-	sunos*)		CCDLFLAGS="$CCDLFLAGS -PIC" ;;
-	esix*|uxpds*)   CCDLFLAGS="$CCDLFLAGS -KPIC" ;;
-	*)		: ${CCDLFLAGS=""} ;;
-    esac
+    AS_CASE(["$target_os"],
+	[hpux*],          [CCDLFLAGS="$CCDLFLAGS +Z"],
+	[solaris*|irix*], [CCDLFLAGS="$CCDLFLAGS -KPIC"],
+	[sunos*],         [CCDLFLAGS="$CCDLFLAGS -PIC"],
+	[esix*|uxpds*],   [CCDLFLAGS="$CCDLFLAGS -KPIC"],
+	                  [: ${CCDLFLAGS=""}])
   fi
 
 
   AC_ARG_ENABLE(rpath,
-       [  --disable-rpath         embed run path into extension libraries.],
+       AS_HELP_STRING([--enable-rpath], [embed run path into extension libraries.
+       enabled by default on ELF platforms]),
        [enable_rpath=$enableval], [enable_rpath="$rb_cv_binary_elf"])
   if test "$enable_rpath" = yes; then
     RPATHFLAG=" ${linker_flag}-R%1\$-s"
   fi
 
-  case "$target_os" in
-	hpux*)		DLDFLAGS="$DLDFLAGS -E"
-			: ${LDSHARED='ld -b'}
+  AS_CASE(["$target_os"],
+	[hpux*], [	DLDFLAGS="$DLDFLAGS -E"
+			: ${LDSHARED='$(LD) -b'}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
 			: ${LIBPATHENV=SHLIB_PATH}
 			if test "$rb_cv_prog_gnu_ld" = no; then
 			    RPATHFLAG=' +b %1$-s'
 			fi
-			rb_cv_dlopen=yes;;
-	solaris*) 	if test "$GCC" = yes; then
-                          : ${LDSHARED='$(CC) -shared'}
-			   if test "$rb_cv_prog_gnu_ld" = yes; then
-	 		       LDFLAGS="$LDFLAGS -Wl,-E"
-			   fi
+			rb_cv_dlopen=yes],
+	[solaris*], [ 	if test "$GCC" = yes; then
+			    : ${LDSHARED='$(CC) -shared'}
+			    if test "$rb_cv_prog_gnu_ld" = yes; then
+				LDFLAGS="$LDFLAGS -Wl,-E"
+			    fi
 			else
-			   : ${LDSHARED='ld -G'}
+			    : ${LDSHARED='$(CC) -G'}
 			fi
-			rb_cv_dlopen=yes;;
-	sunos*) 	: ${LDSHARED='ld -assert nodefinitions'}
-			rb_cv_dlopen=yes;;
-	irix*)		: ${LDSHARED='ld -shared'}
-			rb_cv_dlopen=yes;;
-	sysv4*) 	: ${LDSHARED='ld -G'}
-			rb_cv_dlopen=yes;;
-        nto-qnx*)       : ${LDSHARED="qcc -shared"}
-                        rb_cv_dlopen=yes ;;
-	esix*|uxpds*) 	: ${LDSHARED="ld -G"}
-			rb_cv_dlopen=yes ;;
-	osf*) 		: ${LDSHARED="ld -shared -expect_unresolved \"*\""}
-			rb_cv_dlopen=yes ;;
-	bsdi3*) 	case "$CC" in
-			*shlicc*)	: ${LDSHARED="$CC -r"}
-					rb_cv_dlopen=yes ;;
-			esac ;;
-	linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi*)
-			: ${LDSHARED='${CC} -shared'}
+			if test "$ac_cv_sizeof_voidp" = 8; then
+			    : ${LIBPATHENV=LD_LIBRARY_PATH_64}
+			fi
+			rb_cv_dlopen=yes],
+	[sunos*], [	: ${LDSHARED='$(LD) -assert nodefinitions'}
+			rb_cv_dlopen=yes],
+	[irix*], [	: ${LDSHARED='$(LD) -shared'}
+			rb_cv_dlopen=yes],
+	[sysv4*], [	: ${LDSHARED='$(LD) -G'}
+			rb_cv_dlopen=yes],
+	[nto-qnx*], [	: ${LDSHARED='$(CC) -shared'}
+			rb_cv_dlopen=yes],
+	[esix*|uxpds*], [ : ${LDSHARED='$(LD) -G'}
+			rb_cv_dlopen=yes],
+	[osf*], [	: ${LDSHARED='$(LD) -shared -expect_unresolved "*"'}
+			rb_cv_dlopen=yes],
+	[bsdi3*], [	AS_CASE(["$CC"],
+			[*shlicc*], [	: ${LDSHARED='$(CC) -r'}
+					rb_cv_dlopen=yes])],
+	[linux* | gnu* | k*bsd*-gnu | netbsd* | bsdi* | kopensolaris*-gnu], [
+			: ${LDSHARED='$(CC) -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-export-dynamic"
 			fi
-			rb_cv_dlopen=yes ;;
-	interix*) 	: ${LDSHARED="$CC -shared"}
+			rb_cv_dlopen=yes],
+	[interix*], [	: ${LDSHARED='$(CC) -shared'}
 			XLDFLAGS="$XLDFLAGS -Wl,-E"
 			LIBPATHFLAG=" -L%1\$-s"
-			rb_cv_dlopen=yes ;;
-	freebsd*|dragonfly*)       : ${LDSHARED="$CC -shared"}
+			rb_cv_dlopen=yes],
+	[freebsd*|dragonfly*], [
+			: ${LDSHARED='$(CC) -shared'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -rdynamic"
 			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)'
 			else
-			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable"
+			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
 			fi
-			rb_cv_dlopen=yes ;;
-	openbsd*) 	: ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"}
+			rb_cv_dlopen=yes],
+	[openbsd*|mirbsd*], [	: ${LDSHARED='$(CC) -shared ${CCDLFLAGS}'}
 			if test "$rb_cv_binary_elf" = yes; then
 			    LDFLAGS="$LDFLAGS -Wl,-E"
 			fi
-			rb_cv_dlopen=yes ;;
-	nextstep*)	: ${LDSHARED='cc -r -nostdlib'}
-			LDFLAGS="$LDFLAGS -u libsys_s"
-			rb_cv_dlopen=yes ;;
-	openstep*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
-			: ${LDFLAGS=""}
-			rb_cv_dlopen=yes ;;
-	rhapsody*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
-			: ${LDFLAGS=""}
-			rb_cv_dlopen=yes ;;
-	darwin*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress -flat_namespace'}
+			rb_cv_dlopen=yes],
+	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
+			: ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress"}
 			: ${LDFLAGS=""}
 			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
-			rb_cv_dlopen=yes ;;
-        aix*)           if test "$GCC" = yes; then
-			    : ${LDSHARED='$(CC) -shared'}
-			else
-			    : ${LDSHARED='$(CC)'}
+			# /usr/local/include is always searched for
+			# some reason, but /usr/local/lib is not.
+			hdr=`find /usr/local/include -name \*.h -type f | sed 's:^/usr/local/include/::;q'`
+			if test -n "$hdr" && $CC -E -include "$hdr" -xc - </dev/null 2>/dev/null | fgrep -q "$hdr"; then
+			    $CC -print-search-dirs | grep -q '^libraries:.*:/usr/local/lib/*' ||
+			    echo " $LDFLAGS " | grep -q ' -L */usr/local/lib/* ' ||
+			    LDFLAGS="${LDFLAGS:+$LDFLAGS }-L/usr/local/lib"
 			fi
+			rb_cv_dlopen=yes],
+        [aix*], [	: ${LDSHARED='$(CC)'}
 			LDSHARED="$LDSHARED ${linker_flag}-G"
-			DLDFLAGS='-eInit_$(TARGET)'
-			XLDFLAGS="${linker_flag}-bE:ruby.imp ${linker_flag}-brtl"
-                        : ${ARCHFILE="ruby.imp"}
+			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
+			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
+			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
+			: ${ARCHFILE="ruby.imp"}
                         TRY_LINK='$(CC) $(LDFLAGS) -oconftest $(INCFLAGS) -I$(hdrdir) $(CPPFLAGS)'
                         TRY_LINK="$TRY_LINK"' $(CFLAGS) $(src) $(LIBPATH) $(LOCAL_LIBS) $(LIBS)'
-                        : ${LIBPATHENV=SHLIB_PATH}
-                        rb_cv_dlopen=yes ;;
-	human*)		: ${DLDFLAGS=''}
-			: ${LDSHARED=''}
-			: ${LDFLAGS=''}
-			: ${LINK_SO='ar cru $@ $(OBJS)'}
-			rb_cv_dlopen=yes ;;
-	beos*) 		case "$target_cpu" in
-			  powerpc*)
-			    : ${LDSHARED="ld -xms"}
-			    DLDFLAGS="$DLDFLAGS "'-export Init_$(TARGET) -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
-                            ;;
-			  i586*)
-			    : ${LDSHARED="ld -shared"}
-			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -lbe -lroot"
-			    ;;
-			esac
+			: ${LIBPATHENV=LIBPATH}
+			RPATHFLAG=" ${linker_flag}-blibpath:%1\$-s:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
+			rb_cv_dlopen=yes],
+	[beos*], [	AS_CASE(["$target_cpu"],
+			  [powerpc*], [
+			    : ${LDSHARED='$(LD) -xms'}
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
+			    DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
+			    LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
+			    ],
+			  [i586*], [
+			    : ${LDSHARED='$(LD) -shared'}
+			    DLDFLAGS="$DLDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib \$(topdir)/_APP_ -lroot"
+			    LDFLAGS="$LDFLAGS -L/boot/develop/lib/x86 -L/boot/home/config/lib -lroot"
+			    ])
 			: ${LIBPATHENV=LIBRARY_PATH}
-			rb_cv_dlopen=yes ;;
-	nto-qnx*)	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
-			: ${LDSHARED='ld -Bshareable -x'}
+			rb_cv_dlopen=yes],
+	[haiku*], [	AS_CASE(["$target_cpu"],
+			  [powerpc*], [
+			    : ${LDSHARED='$(LD) -xms'}
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
+			    DLDFLAGS="$DLDFLAGS -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
+                            ],
+			  [i586*], [
+			    : ${LDSHARED='$(CC) -shared'}
+			    ])
+			: ${LIBPATHENV=LIBRARY_PATH}
+			rb_cv_dlopen=yes ],
+	[nto-qnx*], [	DLDFLAGS="$DLDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
+			: ${LDSHARED='$(LD) -Bshareable -x'}
 			LDFLAGS="$LDFLAGS -L/lib -L/usr/lib -L/usr/local/lib"
-			rb_cv_dlopen=yes;;
-	cygwin*|mingw*)	: ${LDSHARED="${CC} -shared -s"}
-			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x02000000"
-			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import,--export-all"
+			rb_cv_dlopen=yes],
+	[cygwin*|mingw*], [
+			: ${LDSHARED='$(CC) -shared $(if $(filter-out -g -g0,$(debugflags)),,-s)'}
+			XLDFLAGS="$XLDFLAGS -Wl,--stack,0x00200000,--enable-auto-import"
+			DLDFLAGS="${DLDFLAGS} -Wl,--enable-auto-image-base,--enable-auto-import"
 			: ${LIBPATHENV=""}
-			rb_cv_dlopen=yes ;;
-	hiuxmpp)	: ${LDSHARED='ld -r'} ;;
-	atheos*) 	: ${LDSHARED="$CC -shared"}
-			rb_cv_dlopen=yes ;;
-	os2-emx*)	LDFLAGS="$LDFLAGS -Zbsd-signals"
-			;;
-	*) 		: ${LDSHARED='ld'} ;;
-  esac
+			rb_cv_dlopen=yes],
+	[hiuxmpp], [	: ${LDSHARED='$(LD) -r'}],
+	[atheos*], [	: ${LDSHARED='$(CC) -shared'}
+			rb_cv_dlopen=yes],
+	[os2-emx*], [	LDFLAGS="$LDFLAGS -Zomf"
+			],
+        [nacl], [ LDSHARED='$(CC) -shared' ],
+	[ 	: ${LDSHARED='$(LD)'}])
   AC_MSG_RESULT($rb_cv_dlopen)
 fi
-case ${RPATHFLAG} in
-*'%1$'*)
-    : ${LIBPATHFLAG=' -L%1$-s'};;
-*)
-    : ${LIBPATHFLAG=' -L%s'};;
-esac
+if test "${LDSHAREDXX}" = ""; then
+    AS_CASE(["${LDSHARED}"],
+	[*'$(CC)'*], [
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\$(CC)/$(CXX)/'`
+	    ],
+	[*'${CC}'*], [
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed 's/\${CC}/${CXX}/'`
+	    ],
+	[*$CC*], [
+	    LDSHAREDXX=`echo "${LDSHARED}" | sed "s|$CC|$CXX|"`
+	    ],
+	[ld" "*], [
+	    ])
+fi
+AS_CASE([${RPATHFLAG}],[*'%1$'*],[: ${LIBPATHFLAG=' -L%1$-s'}],[: ${LIBPATHFLAG=' -L%s'}])
+
 AC_SUBST(LINK_SO)
 AC_SUBST(LIBPATHFLAG)
 AC_SUBST(RPATHFLAG)
 AC_SUBST(LIBPATHENV, "${LIBPATHENV-LD_LIBRARY_PATH}")
 AC_SUBST(TRY_LINK)
 
+AC_ARG_WITH(opt-dir,
+	AS_HELP_STRING([--with-opt-dir=DIR-LIST],
+		       [add optional headers and libraries directories separated by $PATH_SEPARATOR]),
+	[
+		val=`echo "$PATH_SEPARATOR$withval" | sed "s|$PATH_SEPARATOR\([[^$PATH_SEPARATOR]*]\)| -I\1/include|g;s/^ //"`
+		CPPFLAGS="$CPPFLAGS $val"
+		val=`IFS="$PATH_SEPARATOR"
+		    for dir in $withval; do
+			echo x ${LIBPATHFLAG} ${RPATHFLAG} |
+			sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${dir}/lib${IFS}g;s${IFS}%s${IFS}${dir}/lib${IFS}g"
+		    done | tr '\012' ' '`
+		LDFLAGS_OPTDIR="$val"
+		test x"${LDFLAGS}" = x || LDFLAGS="$LDFLAGS "
+		LDFLAGS="$LDFLAGS$val"
+		test x"${DLDFLAGS}" = x || DLDFLAGS="$DLDFLAGS "
+		DLDFLAGS="$DLDFLAGS$val"
+	])
+
+AS_CASE(["$target_cpu-$target_os"],
+[*-darwin*], [
+    AC_CHECK_HEADERS([execinfo.h])
+    if test "x$ac_cv_header_execinfo_h" = xyes; then
+	AC_CHECK_LIB([execinfo], [backtrace])
+    fi],
+[*-freebsd*|x86_64-netbsd*], [
+    AC_CHECK_HEADERS([execinfo.h])
+    if test "x$ac_cv_header_execinfo_h" = xyes; then
+	AC_CHECK_LIB([execinfo], [backtrace])
+	AC_CHECK_LIB([unwind], [unw_backtrace])
+    fi])
+AC_CHECK_FUNCS(backtrace)
+
+if test "x$ac_cv_func_backtrace" = xyes; then
+  AC_CACHE_CHECK(for broken backtrace, rb_cv_broken_backtrace,
+    [AC_TRY_RUN([
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <signal.h>
+#include <execinfo.h>
+
+#define TRACE_SIZE 256
+
+void sigsegv(int signum, siginfo_t *info, void *ctx){
+    void *trace[TRACE_SIZE];
+    int n = backtrace(trace, TRACE_SIZE);
+    if (n > 0) {
+	/*fprintf(stdout, "backtrace:%d\n",n);*/
+    } else {
+	abort();
+    }
+    _exit(0);
+}
+int
+main()
+{
+    stack_t ss;
+    ss.ss_sp = malloc(SIGSTKSZ);
+    if (ss.ss_sp == NULL) {
+	fprintf(stderr, "cannot allocate memory for sigaltstack\n");
+	abort();
+    }
+    ss.ss_size = SIGSTKSZ;
+    ss.ss_flags = 0;
+    if (sigaltstack(&ss, NULL) == -1) {
+	fprintf(stderr, "sigaltstack failed\n");
+	abort();
+    }
+    struct sigaction sa;
+    memset(&sa, 0, sizeof(struct sigaction));
+    sigemptyset(&sa.sa_mask);
+    sa.sa_sigaction = sigsegv;
+    sa.sa_flags |= SA_SIGINFO;
+    sa.sa_flags |= SA_ONSTACK;
+    sigaction(SIGSEGV, &sa, NULL);
+    int *a = NULL;
+    a[0] = 1;
+    return 0;
+}
+],
+	rb_cv_broken_backtrace=no,
+	rb_cv_broken_backtrace=yes,
+	rb_cv_broken_backtrace=no)])
+  if test "$rb_cv_broken_backtrace" = yes; then
+    AC_DEFINE(BROKEN_BACKTRACE, 1)
+  fi
+fi
+
+AC_ARG_WITH(valgrind,
+        AS_HELP_STRING([--without-valgrind],[disable valgrind memcheck support]),
+        [], with_valgrind=yes)
+AS_IF([test x$with_valgrind != xno],
+        [AC_CHECK_HEADERS(valgrind/memcheck.h)])
+
 dln_a_out_works=no
 if test "$ac_cv_header_a_out_h" = yes; then
   if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then
@@ -1331,7 +2817,7 @@ if test "$ac_cv_header_a_out_h" = yes; then
 #define USE_DLN_A_OUT
 #include "dln.c"
 ],
-	[], 
+	[],
 	rb_cv_dln_a_out=yes,
 	rb_cv_dln_a_out=no)])
     if test "$rb_cv_dln_a_out" = yes; then
@@ -1350,139 +2836,152 @@ if test "$dln_a_out_works" = yes; then
   DLEXT=so
   CCDLFLAGS=
 else
-  case "$target_os" in
-    hpux*)	DLEXT=sl;;
-    nextstep*|openstep*|rhapsody*|darwin*)
-		DLEXT=bundle;;
-    os2-emx*)	DLEXT=dll;;
-    cygwin*|mingw*)
-		DLEXT=so DLEXT2=dll;;
-    *)		DLEXT=so;;
-  esac
+  AS_CASE(["$target_os"],
+    [hpux*], [
+	DLEXT=sl],
+    [darwin*], [
+	RUBY_APPEND_OPTION(XLDFLAGS, [-Wl,-u,_objc_msgSend])
+	DLEXT=bundle],
+    [os2-emx*], [
+	LOAD_RELATIVE=1
+	DLEXT=dll],
+    [cygwin*|mingw*|*djgpp*], [
+	LOAD_RELATIVE=1
+	DLEXT=so],
+    [
+	DLEXT=so])
+fi
+if test "$rb_cv_dlopen:$load_relative" = yes:yes; then
+    AC_CHECK_FUNCS(dladdr)
+    if test "$ac_cv_func_dladdr" = yes; then
+	LOAD_RELATIVE=1
+    fi
+fi
+if test x"$LOAD_RELATIVE" = x1; then
+    load_relative=yes
+else
+    unset load_relative
 fi
+
 len=2 # .rb
 n=`expr "$DLEXT"  : '.*'`; test "$n" -gt "$len" && len=$n
 n=`expr "$DLEXT2" : '.*'`; test "$n" -gt "$len" && len=$n
 AC_DEFINE_UNQUOTED(DLEXT_MAXLEN, `expr $len + 1`)
 test ".$DLEXT"  = "." || AC_DEFINE_UNQUOTED(DLEXT,  ".$DLEXT")
 test ".$DLEXT2" = "." || AC_DEFINE_UNQUOTED(DLEXT2, ".$DLEXT2")
+AC_SUBST(DLEXT)
 
-AC_SUBST(STRIP)dnl
 if test "$with_dln_a_out" = yes; then
   STRIP=true
 else
-  STRIP=strip
-fi
-
-case "$target_os" in
-  linux* | gnu* | k*bsd*-gnu)
-	STRIP='strip -S -x';;
-  nextstep*)
-	STRIP='strip -A -n';;
-  openstep*)
-	STRIP='strip -A -n';;
-  rhapsody*)
-	STRIP='strip -A -n';;
-  darwin*)
-	STRIP='strip -A -n';;
-esac
+  AC_CHECK_TOOL(STRIP, strip, :)dnl
+fi
 
+AS_CASE(["$target_os"],
+  [linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu], [
+	STRIP="$STRIP -S -x"],
+  [darwin*], [
+	STRIP="$STRIP -A -n"])
+
+AC_ARG_WITH(ext,
+            AC_HELP_STRING([--with-ext=EXTS],
+                           [pass to --with-ext option of extmk.rb]))
+AC_ARG_WITH(out-ext,
+            AC_HELP_STRING([--with-out-ext=EXTS],
+                           [pass to --without-ext option of extmk.rb]))
 EXTSTATIC=
 AC_SUBST(EXTSTATIC)dnl
 AC_ARG_WITH(static-linked-ext,
-	    [  --with-static-linked-ext link external modules statically],
-            [case $withval in
-	     yes) STATIC=
-		  EXTSTATIC=static;;
-	     *)	;;
-	     esac])
-
-case "$target_os" in
-  human*)
-    AC_CHECK_LIB(signal, _harderr)
-    AC_CHECK_LIB(hmem, hmemset)
-    AC_CHECK_FUNCS(select)
-    AC_CACHE_CHECK(whether PD libc _dtos18 fail to convert big number,
-		   rb_cv_missing__dtos18,
-    [AC_TRY_RUN(
-changequote(<<, >>)dnl
-<<
-#include <stdio.h>
-main ()
-{
-   char buf[256];
-   sprintf (buf, "%g", 1e+300);
-   exit (strcmp (buf, "1e+300") ? 0 : 1);
-}
->>,
-changequote([, ])dnl
-rb_cv_missing__dtos18=yes, rb_cv_missing__dtos18=no, rb_cv_missing__dtos18=no)])
-    if test "$rb_cv_missing__dtos18" = yes; then
-      AC_DEFINE(MISSING__DTOS18)
-    fi
-    AC_CACHE_CHECK(whether PD libc fconvert fail to round,
-		   rb_cv_missing_fconvert,
-    [AC_TRY_RUN(
-changequote(<<, >>)dnl
-<<
-#include <stdio.h>
-#include <math.h>
-main ()
-{
-  char buf[256];
-  sprintf (buf, "%f", log(exp(1.0)));
-  exit (strcmp (buf, "1.000000") ? 0 : 1);
-}
->>,
-changequote([, ])dnl
-rb_cv_missing_fconvert=yes, rb_cv_missing_fconvert=no, rb_cv_missing_fconvert=no)])
-    if test "$rb_cv_missing_fconvert" = yes; then
-      AC_DEFINE(MISSING_FCONVERT)
-    fi
-    AC_LIBOBJ([x68.o])
-    CFLAGS="$CFLAGS -fansi-only"
-    XCFLAGS="$XCFLAGS -cc1-stack=262144 -cpp-stack=2694144"
-    EXEEXT=.x
-    OBJEXT=o
-    setup=Setup.x68
-    ;;
-  dnl OS/2 environment w/ Autoconf 2.1x for EMX
-  os2-emx)
-    AC_LIBOBJ([os2])
-    setup=Setup.emx
-    ;;
-  *djgpp*)
-    setup=Setup.dj
-    ;;
-  *)
-    setup=Setup
-    ;;
-esac
+	    AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
+            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static])])
+if test x"$EXTSTATIC" = xstatic; then
+  ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
+  EXTOBJS='ext/extinit.$(OBJEXT)'
+  AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
+fi
+AC_SUBST(ENCOBJS)
+AC_SUBST(EXTOBJS)
 
+if test -f "$srcdir/ext/Setup.$target_os"; then
+    setup="Setup.$target_os"
+else
+    setup=
+    for file in "$srcdir"/ext/Setup.*; do
+	AS_CASE(["$file"], [*~|*.bak|*.orig|*.rej|*.tmp], [continue])
+	setup=`basename "$file"`
+	AS_CASE(["$target_os"], [`expr "$setup" : 'Setup.\(.*\)'`*], [break])
+	platform=`sed '/^option  *platform  */!d;s///;s/|/*|/g;q' "$file"`
+	if test "x$platform" != x; then
+	    eval "AS_CASE([\"\$target_os\"], [$platform*], [break])"
+	fi
+	setup=
+    done
+    : ${setup:=Setup}
+fi
 AC_SUBST(setup)
 
-if test "$prefix" = NONE; then
-  prefix=$ac_default_prefix
+if test x"${exec_prefix}" != xNONE; then
+    RUBY_EXEC_PREFIX="$exec_prefix"
+elif test x"$prefix" != xNONE; then
+    RUBY_EXEC_PREFIX="$prefix"
+else
+    RUBY_EXEC_PREFIX=$ac_default_prefix
 fi
+pat=`echo "${RUBY_EXEC_PREFIX}" | tr -c '\012' .`'\(.*\)'
+for var in bindir libdir; do
+    eval val='"$'$var'"'
+    AS_CASE(["$val"], ["${RUBY_EXEC_PREFIX}"*], [val='${exec_prefix}'"`expr \"$val\" : \"$pat\"`"])
+    eval $var='"$val"'
+done
 
-#if test "$fat_binary" != no ; then
-#  CFLAGS="$CFLAGS $ARCH_FLAG"
-#fi
-
+BTESTRUBY='$(MINIRUBY)'
 if test x"$cross_compiling" = xyes; then
-  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-ruby} -I`pwd` -rfake"
-  PREP=fake.rb
-  RUNRUBY='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  test x"$MINIRUBY" = x && MINIRUBY="${RUBY-$BASERUBY} -I`$CHDIR .; pwd` "-r'$(arch)-fake'
+  XRUBY_LIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["libdir"]']`
+  XRUBY_RUBYLIBDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubylibdir"]']`
+  XRUBY_RUBYHDRDIR=`${RUBY-$BASERUBY} -rrbconfig -e ['puts RbConfig::CONFIG["rubyhdrdir"]']`
+  AC_SUBST(XRUBY_LIBDIR)
+  AC_SUBST(XRUBY_RUBYLIBDIR)
+  AC_SUBST(XRUBY_RUBYHDRDIR)
+  PREP='$(arch)-fake.rb'
+  RUNRUBY_COMMAND='$(MINIRUBY) -I`cd $(srcdir)/lib; pwd`'
+  RUNRUBY='$(RUNRUBY_COMMAND)'
+  XRUBY='$(MINIRUBY)'
+  TEST_RUNNABLE=no
+  CROSS_COMPILING=yes
+
+  if test "$host_os" = "nacl"; then
+      if test "$build_cpu" = "$host_cpu" || test "${nacl_cv_cpu_nick}" = "x86" -a "$host_cpu" = "i686"; then
+          nacl_cv_sel_ldr='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb sel_ldr`'
+          nacl_cv_irt_core='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb irt_core`'
+          nacl_cv_runnable_ld='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb runnable_ld`'
+          nacl_cv_host_lib='`$(MINIRUBY) $(srcdir)/nacl/nacl-config.rb host_lib`'
+          TEST_RUNNABLE=yes
+          BTESTRUBY="${nacl_cv_sel_ldr} -a -B ${nacl_cv_irt_core} -w 1:3 -w 2:4"
+          BTESTRUBY="$BTESTRUBY -- ${nacl_cv_runnable_ld} --library-path ${nacl_cv_host_lib}"
+          BTESTRUBY="$BTESTRUBY `pwd`/"'miniruby$(EXEEXT) -I`cd $(srcdir)/lib; pwd` -I.'
+          BTESTRUBY="$BTESTRUBY"' -I$(EXTOUT)/common 3>&1 4>&2 1>/dev/null 2>/dev/null '
+      fi
+  fi
 else
-  MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib'
-  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common -I./- -r$(srcdir)/ext/purelib.rb'
+  MINIRUBY='./miniruby$(EXEEXT) -I$(srcdir)/lib -I.'
+  MINIRUBY="$MINIRUBY"' -I$(EXTOUT)/common'
   PREP='miniruby$(EXEEXT)'
-  RUNRUBY='$(MINIRUBY) $(srcdir)/runruby.rb --extout=$(EXTOUT)'
+  RUNRUBY_COMMAND='$(MINIRUBY) $(srcdir)/tool/runruby.rb --extout=$(EXTOUT) $(RUNRUBYOPT)'
+  RUNRUBY='$(RUNRUBY_COMMAND) --'
+  XRUBY='$(RUNRUBY)'
+  TEST_RUNNABLE=yes
+  CROSS_COMPILING=no
 fi
+AC_SUBST(TEST_RUNNABLE)
+AC_SUBST(CROSS_COMPILING)
 AC_SUBST(MINIRUBY)
+AC_SUBST(BTESTRUBY)
 AC_SUBST(PREP)
+AC_SUBST(RUNRUBY_COMMAND)
 AC_SUBST(RUNRUBY)
-AC_SUBST(EXTOUT, [${EXTOUT-.ext}])
+AC_SUBST(XRUBY)
+AC_SUBST(EXTOUT, [${EXTOUT=.ext}])
 
 FIRSTMAKEFILE=""
 LIBRUBY_A='lib$(RUBY_SO_NAME)-static.a'
@@ -1491,16 +2990,30 @@ LIBRUBYARG_STATIC='-l$(RUBY_SO_NAME)-static'
 LIBRUBYARG='$(LIBRUBYARG_STATIC)'
 SOLIBS=
 
-case "$target_os" in
-  cygwin*|mingw*|beos*|openstep*|nextstep*|rhapsody*|darwin*|os2-emx*)
+AS_CASE(["$target_os"],
+  [cygwin*|mingw*|beos*|haiku*|darwin*|os2-emx*], [
     : ${DLDLIBS=""}
-    ;;
-  *)
+    ],
+  [
     DLDLIBS="$DLDLIBS -lc"
-    ;;
-esac
+    ])
+
+AC_ARG_ENABLE(multiarch,
+	      AS_HELP_STRING([--enable-multiarch], [enable multiarch compatible directories]),
+	      [multiarch=], [unset multiarch])
+if test ${multiarch+set}; then
+   AC_DEFINE(ENABLE_MULTIARCH)
+fi
+
+archlibdir='${libdir}/${arch}'
+sitearchlibdir='${libdir}/${sitearch}'
+archincludedir='${includedir}/${arch}'
+sitearchincludedir='${includedir}/${sitearch}'
+
+AC_ARG_WITH(soname,
+	AS_HELP_STRING([--with-soname=SONAME], [base name of shared library]),
+	[RUBY_SO_NAME=$withval], [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
 
-RUBY_SO_NAME='$(RUBY_INSTALL_NAME)'
 LIBRUBY_LDSHARED=$LDSHARED
 LIBRUBY_DLDFLAGS=$DLDFLAGS
 LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY)'
@@ -1508,213 +3021,518 @@ LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so'
 ENABLE_SHARED=no
 
 AC_ARG_ENABLE(shared,
-       [  --enable-shared         build a shared library for Ruby. ],
+       AS_HELP_STRING([--enable-shared], [build a shared library for Ruby]),
        [enable_shared=$enableval])
-if test "$enable_shared" = 'yes'; then
+libprefix=${multiarch+'$(archlibdir)'}${multiarch-'$(libdir)'}
+LIBRUBY_RELATIVE=${load_relative-no}
+AS_CASE("$enable_shared", [yes], [
   LIBRUBY='$(LIBRUBY_SO)'
   LIBRUBYARG_SHARED='-l$(RUBY_SO_NAME)'
   LIBRUBYARG='$(LIBRUBYARG_SHARED)'
-  CFLAGS="$CFLAGS $CCDLFLAGS"
+  LIBRUBY_RELATIVE=no
+  test -z "$CCDLFLAGS" || CFLAGS="$CFLAGS $CCDLFLAGS"
   ENABLE_SHARED=yes
   if test "$rb_cv_binary_elf" = yes; then
     SOLIBS='$(LIBS)'
   fi
-  case "$target_os" in
-    sunos4*)
+
+  # libdir can be overridden in config.site file (on OpenSUSE at least).
+  libdir_basename=lib
+  if test "$bindir" = '${exec_prefix}/bin'; then
+    AS_CASE(["$libdir"], ['${exec_prefix}/'*], [libdir_basename=`basename "$libdir"`])
+  fi
+  AC_DEFINE_UNQUOTED(LIBDIR_BASENAME, ["${libdir_basename}"])
+  libdir_basename="${libdir_basename}"${multiarch+'/${arch}'}
+
+  AS_CASE(["$target_os"],
+    [freebsd*|dragonfly*], [],
+    [
+     if test "$GCC" = yes; then
+       RUBY_TRY_LDFLAGS([${linker_flag}--no-undefined], [no_undefined=yes], [no_undefined=no])
+       if test "no_undefined" = yes; then
+	  RUBY_APPEND_OPTION(EXTLDFLAGS, [${linker_flag}--no-undefined])
+       fi
+     fi
+    ])
+
+  AS_CASE(["$target_os"],
+    [sunos4*], [
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	;;
-    linux* | gnu* | k*bsd*-gnu | atheos*)
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'
+	],
+    [linux* | gnu* | k*bsd*-gnu | atheos* | kopensolaris*-gnu], [
+	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR)'" $LDFLAGS_OPTDIR"
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).so'
-	;;
-    freebsd*|dragonfly*)
+	if test "$load_relative" = yes; then
+	    libprefix="'\$\${ORIGIN}/../${libdir_basename}'"
+	    LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
+	    LIBRUBY_RELATIVE=yes
+	fi
+	],
+    [freebsd*|dragonfly*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
 	if test "$rb_cv_binary_elf" != "yes" ; then
 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
 	    LIBRUBY_ALIASES=''
 	fi
-	;;
-    netbsd*)
+	],
+    [netbsd*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'
+	LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'" $LDFLAGS_OPTDIR"
 	if test "$rb_cv_binary_elf" = yes; then # ELF platforms
 	   LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so'
 	else	# a.out platforms
 	   LIBRUBY_ALIASES=""
 	fi
- 	;;
-    openbsd*)
+	],
+    [openbsd*|mirbsd*], [
 	SOLIBS='$(LIBS)'
-	LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
-	;;
-    solaris*)
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR).'`expr ${MINOR} \* 10 + ${TEENY}`
+	],
+    [solaris*], [
 	SOLIBS='$(LIBS)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY) lib$(RUBY_SO_NAME).so'
 	if test "$GCC" = yes; then
 	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(@F)'
+	else
+	    LIBRUBY_DLDFLAGS="$DLDFLAGS "'-h $(@F)'
 	fi
 	XLDFLAGS="$XLDFLAGS "'-R${libdir}'
- 	;;
-    hpux*)
+	],
+    [hpux*], [
 	XLDFLAGS="$XLDFLAGS "'-Wl,+s,+b,$(libdir)'
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR).$(TEENY)'
 	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).sl.$(MAJOR).$(MINOR) lib$(RUBY_SO_NAME).sl'
-	;;
-    aix*)
-	LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS"
+	],
+    [aix*], [
+	LIBRUBY_DLDFLAGS="${linker_flag}-bnoentry $XLDFLAGS $LDFLAGS_OPTDIR"
 	LIBRUBYARG_SHARED='-L${libdir} -l${RUBY_SO_NAME}'
 	SOLIBS='-lm -lc'
-	;;
-    beos*)
-	case "$target_cpu" in
-	powerpc*)
-	    LIBRUBY_DLDFLAGS='-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o'
-	    ;;
-	esac
-	;;
-    darwin*)
-	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'
-	LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
-	LIBRUBY_DLDFLAGS='-install_name $(libdir)/lib$(RUBY_SO_NAME).dylib -current_version $(MAJOR).$(MINOR).$(TEENY) -compatibility_version $(MAJOR).$(MINOR)'
-	LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_SO_NAME).dylib'
-	;;
-    interix*)
+	],
+    [beos*], [
+	AS_CASE(["$target_cpu"],
+	[powerpc*], [
+	    LIBRUBY_DLDFLAGS="-f ruby.exp -lnet -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o $LDFLAGS_OPTDIR"
+	    ])
+	],
+    [darwin*], [
+	RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
+	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
+	if test "$load_relative" = yes; then
+	    libprefix="@executable_path/../${libdir_basename}"
+	    LIBRUBY_RELATIVE=yes
+	fi
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
+	if test "$visibility_option" = ld; then
+	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*'
+	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,*_threadptr_*'
+	fi
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "' $(XLDFLAGS)'
+	LIBRUBY_SO='lib$(RUBY_SO_NAME).dylib'
+	LIBRUBY_ALIASES='lib$(RUBY_BASE_NAME).$(MAJOR).$(MINOR).dylib lib$(RUBY_INSTALL_NAME).dylib'
+	SOLIBS='$(LIBS)'
+	],
+    [interix*], [
 	LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)'
-	;;
-    *)
-	;;
-  esac
-fi
+	],
+    [mingw*|cygwin*|mswin*], [
+	LIBRUBY_RELATIVE=yes
+	])
+], [
+  LIBRUBYARG_SHARED=
+
+  # enable PIE if possible
+  pie=
+  AS_CASE(["$target_os"],
+  [haiku], [
+    # gcc supports PIE, but doesn't work correctly in Haiku
+    pie=no
+  ],
+  [nacl], [
+    # -pie implies -shared for NaCl.
+    pie=no
+  ])
+  if test "$GCC" = yes -a -z "$EXTSTATIC" -a "x$pie" != xno; then
+    RUBY_TRY_CFLAGS(-fPIE, [pie=yes], [pie=no])
+    if test "$pie" = yes; then
+      # Use -fPIE when testing -pie.  RUBY_TRY_LDFLAGS sets
+      # $save_CFLAGS internally, so set other name here.
+      save_CFLAGS_before_pie="$CFLAGS"
+      CFLAGS="$CFLAGS -fPIE"
+
+      # gcc need -pie but clang need -Wl,-pie.
+      for pie in -pie -Wl,-pie; do
+	RUBY_TRY_LDFLAGS([$pie], [], [pie=])
+	if test "x$pie" != x; then
+	  RUBY_APPEND_OPTION(XCFLAGS, -fPIE)
+	  RUBY_APPEND_OPTION(XLDFLAGS, $pie)
+	  break
+	fi
+      done
+      CFLAGS="$save_CFLAGS_before_pie"
+    fi
+  fi
+])
 if test "$enable_rpath" = yes; then
-    LIBRUBYARG_SHARED="${linker_flag}-R ${linker_flag}\$(libdir) -L\$(libdir) $LIBRUBYARG_SHARED"
+    test -z "$LIBRUBY_RPATHFLAGS" || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS "
+    LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${linker_flag}-R ${linker_flag}${libprefix}"
+    test "x$cross_compiling" = xyes || LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS -L${libprefix}"
+    LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED"
+    LIBRUBYARG_STATIC="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_STATIC"
 fi
+AC_SUBST(LIBRUBY_RELATIVE)
 
 LDFLAGS="-L. $LDFLAGS"
 AC_SUBST(ARCHFILE)
 
+if test "$EXEEXT" = .exe; then
+    EXECUTABLE_EXTS='".exe",".com",".cmd",".bat"'
+    AC_DEFINE_UNQUOTED(EXECUTABLE_EXTS, $EXECUTABLE_EXTS)
+    EXECUTABLE_EXTS=`echo $EXECUTABLE_EXTS | tr -d '"' | tr , ' '`
+    AC_SUBST(EXECUTABLE_EXTS)
+fi
+
+AC_ARG_ENABLE(dtrace,
+        AS_HELP_STRING([--enable-dtrace],
+        [enable DTrace for tracing inside ruby. enabled by default on systems having dtrace]),
+        [enable_dtrace=$enableval], [enable_dtrace=auto])
+
+if test "${enable_dtrace}" = "auto"; then
+    if test x"$DTRACE" != x -a x"$cross_compiling" != xyes; then
+        RUBY_DTRACE_AVAILABLE()
+        enable_dtrace=$rb_cv_dtrace_available
+    else
+        enable_dtrace=no
+    fi
+fi
+
+LIBRUBY_A_OBJS='$(OBJS)'
+if test "${enable_dtrace}" = "yes"; then
+    if test -z "$DTRACE"; then
+        AC_MSG_ERROR([dtrace(1) is missing])
+    elif test "$cross_compiling" = yes; then
+        AC_MSG_ERROR([--enable-dtrace, however, cross compiling])
+    else
+        RUBY_DTRACE_AVAILABLE()
+        enable_dtrace=$rb_cv_dtrace_available
+        if test "${enable_dtrace}" = "no"; then
+            AC_MSG_ERROR([--enable-dtrace, however, USDT is not available])
+        fi
+        RUBY_DTRACE_POSTPROCESS()
+        if test "$rb_cv_prog_dtrace_g" = 'yes'; then
+            DTRACE_OBJ='probes.$(OBJEXT)'
+            DTRACE_GLOMMED_OBJ='ruby-glommed.$(OBJEXT)'
+            LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)'
+        fi
+        AS_CASE("${target_os}", [freebsd*], [
+            # FreeBSD's dtrace requires libelf
+            LIBS="-lelf $LIBS"
+        ])
+    fi
+    DTRACE_EXT=d
+else
+    DTRACE_EXT=dmyh
+fi
+AC_SUBST(DTRACE_EXT)
+AC_SUBST(DTRACE_OBJ)
+AC_SUBST(DTRACE_GLOMMED_OBJ)
+AC_SUBST(LIBRUBY_A_OBJS)
+
+}
+{ # build section
+
 dnl build rdoc index if requested
 RDOCTARGET=""
+CAPITARGET=""
 AC_ARG_ENABLE(install-doc,
-       [  --enable-install-doc    build and install rdoc indexes during install ],
-       [install_doc=$enableval], [install_doc=no])
+       AS_HELP_STRING([--disable-install-doc], [do not install neither rdoc indexes nor C API documents during install]),
+       [install_doc=$enableval], [install_doc=yes])
+AC_ARG_ENABLE(install-rdoc,
+      AS_HELP_STRING([--disable-install-rdoc], [do not install rdoc indexes during install]),
+      [install_rdoc=$enableval], [install_rdoc=yes])
+AC_ARG_ENABLE(install-capi,
+      AS_HELP_STRING([--disable-install-capi], [do not install C API documents during install]),
+      [install_capi=$enableval], [install_capi=yes])
+
 if test "$install_doc" != no; then
-   RDOCTARGET="install-doc"
+    if test "$install_rdoc" != no; then
+	RDOCTARGET="rdoc"
+    else
+	RDOCTARGET="nodoc"
+    fi
+    if test "$install_capi" != no -a -n "$DOXYGEN"; then
+	CAPITARGET="capi"
+    else
+	CAPITARGET="nodoc"
+    fi
+else
+    RDOCTARGET="nodoc"
+    CAPITARGET="nodoc"
 fi
+
 AC_SUBST(RDOCTARGET)
+AC_SUBST(CAPITARGET)
+
+AS_CASE(["$RDOCTARGET:$CAPITARGET"],[nodoc:nodoc],[INSTALLDOC=nodoc],[INSTALLDOC=all])
+AC_SUBST(INSTALLDOC)
 
-case "$target_os" in
-    linux*)
-	XCFLAGS="$XCFLAGS -D_GNU_SOURCE=1"
-	;;
-    netbsd*)
-    	CFLAGS="$CFLAGS -pipe"
-	;;
-    nextstep*|openstep*)
-	# The -fno-common is needed if we wish to embed the Ruby interpreter
-	# into a plugin module of some project (as opposed to embedding it
-	# within the project's application).  The -I/usr/local/include is
-	# needed because CPP as discovered by configure (cc -E -traditional)
-	# fails to consult /usr/local/include by default.  This causes
-	# mkmf.rb's have_header() to fail if the desired resource happens to be
-	# installed in the /usr/local tree.
-    	CFLAGS="$CFLAGS -pipe -fno-common"
-	CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-	;;
-    rhapsody*)
-    	CFLAGS="$CFLAGS -pipe -no-precomp -fno-common"
-	;;
-    darwin*)
-    	CFLAGS="$CFLAGS -pipe -fno-common"
-	MINIOBJS=dmydln.o
-	;;
-    os2-emx)
-    	CFLAGS="$CFLAGS -DOS2 -Zmts"
+if test "$rb_with_pthread" = "yes"; then
+    THREAD_MODEL=pthread
+fi
+AC_CACHE_CHECK([for prefix of external symbols], rb_cv_symbol_prefix, [
+    AC_TRY_COMPILE([extern void conftest_external(void) {}], [], [
+	rb_cv_symbol_prefix=`$NM conftest.$ac_objext |
+			     sed -n ['/.*T[ 	]\([^ 	]*\)conftest_external.*/!d;s//\1/p;q']`
+	],
+	[rb_cv_symbol_prefix=''])
+    test -n "$rb_cv_symbol_prefix" || rb_cv_symbol_prefix=NONE
+])
+SYMBOL_PREFIX="$rb_cv_symbol_prefix"
+test "x$SYMBOL_PREFIX" = xNONE && SYMBOL_PREFIX=''
+DLNOBJ=dln.o
+AC_ARG_ENABLE(dln,
+	      AC_HELP_STRING([--disable-dln], [disable dynamic link feature]),
+	      [test "$enableval" = yes || DLNOBJ=dmydln.o])
+AC_SUBST(DLNOBJ)
+MINIDLNOBJ=dmydln.o
+
+AS_CASE(["$target_os"],
+    [linux*], [
+	],
+    [netbsd*], [
+	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+	],
+    [darwin*], [
+	RUBY_APPEND_OPTION(CFLAGS, -pipe)
+	RUBY_APPEND_OPTION(XLDFLAGS, [-framework CoreFoundation])
+	RUBY_APPEND_OPTION(LIBRUBYARG_STATIC, [-framework CoreFoundation])
+	],
+    [os2-emx], [
+	AC_LIBOBJ([os2])
+	CFLAGS="$CFLAGS -DOS2"
 	LIBRUBY_A=`echo $LIBRUBY_A | sed 's/^lib//'`
 	LIBRUBY_SO=`echo $LIBRUBY_SO | sed 's/^lib//'`
 	LIBRUBY_ALIASES=`for i in $LIBRUBY_ALIASES; do echo "$i"; done | sed 's/^lib//'`
-	;;
-    osf*)
+	],
+    [osf*], [
 	if test "$GCC" != "yes" ; then
 	  # compile something small: taint.c is fine for this.
 	  # the main point is the '-v' flag of 'cc'.
-	  case "`cc -v -I. -c main.c -o /tmp/main.o 2>&1`" in
-	  */gemc_cc*)   # we have the new DEC GEM CC
+	  AS_CASE(["`cc -v -I. -c main.c -o /tmp/main.o 2>&1`"],
+	  [*/gemc_cc*], [   # we have the new DEC GEM CC
                         CFLAGS="$CFLAGS -oldc"
-                        ;;
-          *)            # we have the old MIPS CC
-                        ;;
-          esac
+                        ],
+          [            # we have the old MIPS CC
+                        ])
 	  # cleanup
 	  rm -f /tmp/main.o
 	  CFLAGS="$CFLAGS -std"
 	fi
-	;;
-    beos*)
-	case "$target_cpu" in
-	powerpc*)
-	    CFLAGS="$CFLAGS -relax_pointers"
-	    ;;
-	esac
-	;;
-    cygwin*|mingw*)
-	case "$target_os" in
-	cygwin*)
+	],
+    [beos*], [
+	AS_CASE(["$target_cpu"],[powerpc*], [CFLAGS="$CFLAGS -relax_pointers"])
+	CPPFLAGS="$CPPFLAGS -I/boot/home/config/include"
+	],
+    [cygwin*|mingw*], [
+	RUBY_SO_NAME="${RUBY_SO_NAME}"'$(MAJOR)$(MINOR)$(TEENY)'
+	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
+	AS_CASE(["$target_os"],
+	[cygwin*], [
 	    if test x"$enable_shared" = xyes; then
-		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
-		LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
+		LIBRUBY_SO='cyg$(RUBY_SO_NAME)'.dll
+		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
+	    fi
+	    ],
+	[mingw*], [
+	    RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
+	    if test x"${target_cpu}" != xi386; then
+		RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
 	    fi
-	    ;;
-	mingw*)
-	    RUBY_SO_NAME=${rb_cv_msvcrt}-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
 	    if test x"$enable_shared" = xyes; then
 		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
-		LIBRUBY='lib$(LIBRUBY_SO).a'
+		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
 	    fi
-	    AC_LIBOBJ([win32])
+	    EXPORT_PREFIX=' '
+	    DLDFLAGS="${DLDFLAGS}"' $(DEFFILE)'
+	    AC_LIBOBJ([win32/win32])
+	    AC_LIBOBJ([win32/file])
 	    COMMON_LIBS=m
 #	    COMMON_MACROS="WIN32_LEAN_AND_MEAN="
-	    ;;
-	esac
-	LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
+	    COMMON_HEADERS="winsock2.h windows.h"
+	    THREAD_MODEL=win32
+	    PLATFORM_DIR=win32
+	    ])
 	LIBRUBY_ALIASES=''
 	FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
 	SOLIBS='$(LIBS)'
-	if test x"$enable_shared" = xno; then
+	if test x"$enable_shared" = xyes; then
+	    LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
+	else
 	    LIBRUBY_SO=dummy
 	    LIBRUBY='lib$(RUBY_SO_NAME).a'
 	    LIBRUBYARG='-l$(RUBY_SO_NAME)'
 	fi
-	MINIOBJS=dmydln.o
-	;;
-    hpux*)
-	case "$YACC" in
-	  *yacc*)
+	],
+    [hpux*], [
+	AS_CASE(["$YACC"],[*yacc*], [
 	    XCFLAGS="$XCFLAGS -DYYMAXDEPTH=300"
 	    YACC="$YACC -Nl40000 -Nm40000"
-	    ;;
-	esac
-	MINIOBJS=dmydln.o
-	;;
-    *)
-	;;
-esac
-
-case "$build_os" in
-  *msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
-esac
+	])],
+    [nacl], [
+	FIRSTMAKEFILE=GNUmakefile:nacl/GNUmakefile.in
+	])
+
+AS_CASE(["$with_gmp: $SOLIBS "], [no:* | *' -lgmp '*|*' $(LIBS) '*], [],
+	[SOLIBS="-lgmp $SOLIBS"])
+
+MINIOBJS="$MINIDLNOBJ"
+
+AS_CASE(["$THREAD_MODEL"],
+[pthread], [AC_CHECK_HEADERS(pthread.h)],
+[win32],   [],
+[""],      [AC_MSG_ERROR(thread model is missing)],
+           [AC_MSG_ERROR(unknown thread model $THREAD_MODEL)])
+
+AC_ARG_ENABLE(debug-env,
+       AS_HELP_STRING([--enable-debug-env], [enable RUBY_DEBUG environment variable]),
+       [AC_DEFINE(RUBY_DEBUG_ENV)])
+
+AS_CASE(["$FIRSTMAKEFILE"], [*GNUmakefile:*], [gnumake=yes], [
+    AC_MSG_CHECKING([if ${MAKE-make} is GNU make])
+    mkdir conftest.dir
+    echo "all:; @echo yes" > conftest.dir/GNUmakefile
+    echo "all:; @echo no" > conftest.dir/Makefile
+    gnumake=`(cd conftest.dir; ${MAKE-make})`
+    rm -fr conftest.dir
+    AS_CASE(["$gnumake"],
+    [*yes*], [
+	FIRSTMAKEFILE=GNUmakefile:template/GNUmakefile.in
+	gnumake=yes],
+    [
+	gnumake=no])
+    AC_MSG_RESULT($gnumake)
+])
+AS_IF([test "$gnumake" = yes], [ NULLCMD=: ], [
+    AC_MSG_CHECKING([for safe null command for ${MAKE-make}])
+    mkdir conftest.dir
+    NULLCMD=
+    for cmd in : true; do
+	echo 'A=1' > conftest.dir/Makefile
+	echo 'B=$(A:1=@'$cmd')' >> conftest.dir/Makefile
+	echo 'all:; $B 1 2 3 4 5 6 7 8 9' >> conftest.dir/Makefile
+	if (cd conftest.dir; ${MAKE-make} >/dev/null 2>/dev/null); then
+	    NULLCMD=$cmd
+	    break
+	fi
+    done
+    rm -fr conftest.dir
+    if test -z "$NULLCMD"; then
+	AC_MSG_ERROR(no candidate for safe null command)
+    fi
+    AC_MSG_RESULT($NULLCMD)
+])
+AC_SUBST(NULLCMD)
+
+if test "${universal_binary-no}" = yes ; then
+    AC_CACHE_CHECK([for architecture macros], rb_cv_architecture_macros, [
+    mv confdefs.h confdefs1.h
+    : > confdefs.h
+    AC_TRY_COMPILE([@%:@if defined __`echo ${universal_archnames} |
+    sed 's/=[^ ]*//g;s/ /__ || defined __/g'`__
+@%:@else
+@%:@error
+>>>>>><<<<<<
+@%:@endif], [],
+[
+    rb_cv_architecture_macros=yes
+    mv -f confdefs1.h confdefs.h
+], [
+    rb_cv_architecture_macros=no
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    new_cflags=`echo "$CFLAGS" | sed "s|$archflagpat"'||'`
+    for archs in ${universal_archnames}; do
+	cpu=${archs@%:@*=}
+	archs=${archs%=*}
+	CFLAGS="$new_cflags -arch $archs"
+	archs="__${archs}__"
+	AC_MSG_CHECKING([for macro ${archs} on ${cpu}])
+	AC_TRY_COMPILE([@%:@ifndef ${archs}
+@%:@error
+@%:@endif], [], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+    done
+    mv -f confdefs1.h confdefs.h
+    AC_MSG_ERROR([failed])
+    ])])
+fi
+
+AC_CHECK_FUNC(memmem, [
+  AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, [
+    AC_TRY_RUN([
+#include <string.h>
+
+int
+main()
+{
+  char *str = "hogefugafoobar";
+  char *rs = "foo";
+  char *empty = "";
+  char *p;
+
+  p = memmem(str, strlen(str), rs, strlen(rs));
+  if (p == str+8) {
+    p = memmem(str, strlen(str), empty, strlen(empty));
+    if (p == str)
+      return 0;
+    else
+      return 1;
+  }
+  else {
+    return 1;
+  }
+}
+    ],
+    rb_cv_broken_memmem=no,
+    rb_cv_broken_memmem=yes,
+    rb_cv_broken_memmem=yes)
+  ])
+  if test "$rb_cv_broken_memmem" = no; then
+    AC_DEFINE(HAVE_MEMMEM, 1)
+  fi
+])
+
 
 CPPFLAGS="$CPPFLAGS "'$(DEFS)'
-test -z "$CFLAGS" || CFLAGS="$CFLAGS "; CFLAGS="$CFLAGS"'${cflags}'
 test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
+if test -n "${cflags+set}"; then
+    cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    CFLAGS=`echo " $CFLAGS " | sed "s|$cflagspat"'|${cflags}|;s/^ *//;s/ *$//'`
+fi
+if test -n "${cxxflags+set}"; then
+    cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g;s/^  */ /;s/^  *$/ /'`
+    CXXFLAGS=`echo " $CXXFLAGS " | sed "s|$cxxflagspat"'|${cxxflags}|;s/^ *//;s/ *$//'`
+fi
+if test "${ARCH_FLAG}"; then
+    archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    CFLAGS=`echo "$CFLAGS" | sed "s| *$archflagpat"'||'`
+    CXXFLAGS=`echo "$CXXFLAGS" | sed "s| *$archflagpat"'||'`
+    LDFLAGS=`echo "$LDFLAGS" | sed "s| *$archflagpat"'||'`
+fi
+warnflags="$rb_cv_warnflags"
 AC_SUBST(cppflags, [])dnl
-AC_SUBST(cflags, ['${optflags} ${debugflags}'])dnl
+AC_SUBST(cflags, ["$orig_cflags "'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
 AC_SUBST(optflags)dnl
 AC_SUBST(debugflags)dnl
+AC_SUBST(warnflags)dnl
+AC_SUBST(strict_warnflags)dnl
 AC_SUBST(XCFLAGS)dnl
 AC_SUBST(XLDFLAGS)dnl
+AC_SUBST(EXTLDFLAGS)dnl
+AC_SUBST(EXTDLDFLAGS)dnl
 AC_SUBST(LIBRUBY_LDSHARED)
 AC_SUBST(LIBRUBY_DLDFLAGS)
 AC_SUBST(RUBY_INSTALL_NAME)
@@ -1736,9 +3554,14 @@ AC_SUBST(COMMON_LIBS)
 AC_SUBST(COMMON_MACROS)
 AC_SUBST(COMMON_HEADERS)
 AC_SUBST(EXPORT_PREFIX)
+AC_SUBST(SYMBOL_PREFIX)
 AC_SUBST(MINIOBJS)
+AC_SUBST(THREAD_MODEL)
+AC_SUBST(PLATFORM_DIR)
 
-MAKEFILES="Makefile `echo $FIRSTMAKEFILE | sed 's/:.*//'`"
+firstmf=`echo $FIRSTMAKEFILE | sed 's/:.*//'`
+firsttmpl=`echo $FIRSTMAKEFILE | sed 's/.*://'`
+MAKEFILES="Makefile $firstmf"
 MAKEFILES="`echo $MAKEFILES`"
 AC_SUBST(MAKEFILES)
 
@@ -1750,111 +3573,212 @@ ri_suffix=
 test "$program_suffix" != NONE &&
   ri_suffix=$program_suffix
 
-RUBY_INSTALL_NAME="${ri_prefix}ruby${ri_suffix}"
-case "$target_os" in
-  cygwin*|mingw*)
-    RUBYW_INSTALL_NAME="${ri_prefix}rubyw${ri_suffix}"
-    rubyw_install_name="$RUBYW_INSTALL_NAME"
-    ;;
-esac
-RUBY_LIB_PREFIX=`eval echo \\"${libdir}/ruby\\"`
+RUBY_INSTALL_NAME="${ri_prefix}"'$(RUBY_BASE_NAME)'"${ri_suffix}"
+AS_CASE(["$target_os"],
+  [cygwin*|mingw*], [
+    RUBYW_INSTALL_NAME="${ri_prefix}"'$(RUBYW_BASE_NAME)'"${ri_suffix}"
+    rubyw_install_name='$(RUBYW_INSTALL_NAME)'
+    ])
+
+rubylibprefix='${libdir}/${RUBY_BASE_NAME}'
+AC_ARG_WITH(rubylibprefix,
+	    AS_HELP_STRING([--with-rubylibprefix=DIR], [prefix for ruby libraries [[LIBDIR/RUBY_BASE_NAME]]]),
+	    [if test "x$withval" = xno; then
+		AC_MSG_ERROR([No ruby, No libprefix])
+	    fi
+	    rubylibprefix="$withval"])
+AC_SUBST(rubylibprefix)
+rubylibdir='${rubylibprefix}/${ruby_version}'
+rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
+
+rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
+AC_ARG_WITH(rubyarchprefix,
+	    AS_HELP_STRING([--with-rubyarchprefix=DIR],
+			   [prefix for architecture dependent ruby libraries [[RUBYLIBPREFIX/ARCH]]]),
+	    [rubyarchprefix="$withval"])
+AC_SUBST(rubyarchprefix)
+
+rubysitearchprefix=${multiarch+'${sitearchlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${sitearch}'}
+AC_ARG_WITH(rubysitearchprefix,
+	    AS_HELP_STRING([--with-rubysitearchprefix=DIR],
+			   [prefix for architecture dependent site libraries [[RUBYLIBPREFIX/SITEARCH]]]),
+	    [rubysitearchprefix="$withval"])
+AC_SUBST(rubysitearchprefix)
+
+RI_BASE_NAME=`echo ${RUBY_BASE_NAME} | sed 's/ruby/ri/'`
+ridir='${datarootdir}/${RI_BASE_NAME}'
+AC_ARG_WITH(ridir,
+	    AS_HELP_STRING([--with-ridir=DIR], [ri documentation [[DATAROOTDIR/ri]]]),
+	    [ridir=$withval])
+AC_SUBST(ridir)
+AC_SUBST(RI_BASE_NAME)
+
+AC_ARG_WITH(ruby-version,
+	    AS_HELP_STRING([--with-ruby-version=STR], [ruby version string for version specific directories [[full]] (full|minor|STR)]),
+            [ruby_version=$withval],
+            [ruby_version=full])
+unset RUBY_LIB_VERSION
+unset RUBY_LIB_VERSION_STYLE
+AS_CASE(["$ruby_version"],
+  [full],  [RUBY_LIB_VERSION_STYLE='3	/* full */'],
+  [minor], [RUBY_LIB_VERSION_STYLE='2	/* minor */'])
+if test ${RUBY_LIB_VERSION_STYLE+set}; then
+    {
+    echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE"
+    echo '#define STRINGIZE(x) x'
+    test -f revision.h -o -f "${srcdir}/revision.h" || echo '#define RUBY_REVISION 0'
+    echo '#include "verconf.h"'
+    echo '#include "version.h"'
+    echo 'ruby_version=RUBY_LIB_VERSION'
+    } > conftest.c
+    test -f verconf.h || > verconf.h
+    ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`"
+    eval $ruby_version
+elif test -z "${ruby_version}"; then
+    AC_MSG_ERROR([No ruby version, No place for bundled libraries])
+else
+    RUBY_LIB_VERSION="\"${ruby_version}\""
+fi
+AC_SUBST(RUBY_LIB_VERSION_STYLE)
+AC_SUBST(RUBY_LIB_VERSION)
 
 AC_ARG_WITH(sitedir,
-	    [  --with-sitedir=DIR      site libraries in DIR [[LIBDIR/ruby/site_ruby]]],
+	    AS_HELP_STRING([--with-sitedir=DIR], [site libraries in DIR [[RUBY_LIB_PREFIX/site_ruby]], "no" to disable site directory]),
             [sitedir=$withval],
-            [sitedir='${libdir}/ruby/site_ruby'])
-SITE_DIR=`eval echo \\"${sitedir}\\"`
-
-case "$target_os" in
-  cygwin*|mingw*|*djgpp*|os2-emx*)
-    RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-    RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-    ;;
-  *)
-    RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-    RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-    ;;
-esac
-RUBY_LIB_PATH="${RUBY_LIB_PREFIX}/${MAJOR}.${MINOR}"
-RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
-
-AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
+            [sitedir='${rubylibprefix}/site_ruby'])
+sitelibdir='${sitedir}/${ruby_version}'
+
+AC_ARG_WITH(sitearchdir,
+	    AS_HELP_STRING([--with-sitearchdir=DIR],
+			   [architecture dependent site libraries in DIR [[SITEDIR/SITEARCH]], "no" to disable site directory]),
+            [sitearchdir=$withval],
+            [sitearchdir=${multiarch+'${rubysitearchprefix}/site_ruby/${ruby_version}'}${multiarch-'${sitelibdir}/${sitearch}'}])
 
 AC_ARG_WITH(vendordir,
-	    [  --with-vendordir=DIR    vendor libraries in DIR [[LIBDIR/ruby/vendor_ruby]]],
+	    AS_HELP_STRING([--with-vendordir=DIR], [vendor libraries in DIR [[RUBY_LIB_PREFIX/vendor_ruby]], "no" to disable vendor directory]),
             [vendordir=$withval],
-            [vendordir='${libdir}/ruby/vendor_ruby'])
-VENDOR_DIR=`eval echo \\"${vendordir}\\"`
-case "$target_os" in
-  cygwin*|mingw*|*djgpp*|os2-emx*)
-    RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
-    ;;
-  *)
-    RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
-    ;;
-esac
-RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
-
-AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
-AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
+            [vendordir='${rubylibprefix}/vendor_ruby'])
+vendorlibdir='${vendordir}/${ruby_version}'
+
+AC_ARG_WITH(vendorarchdir,
+	    AS_HELP_STRING([--with-vendorarchdir=DIR],
+			   [architecture dependent vendor libraries in DIR [[VENDORDIR/SITEARCH]], "no" to disable vendor directory]),
+            [vendorarchdir=$withval],
+            [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}])
+
+if test "${LOAD_RELATIVE+set}"; then
+    AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
+    RUBY_EXEC_PREFIX=''
+fi
 
+AC_SUBST(RUBY_EXEC_PREFIX)
+
+AC_SUBST(libdirname, ${multiarch+arch}libdir)
+AC_SUBST(archlibdir)dnl
+AC_SUBST(sitearchlibdir)dnl
+AC_SUBST(archincludedir)dnl
+AC_SUBST(sitearchincludedir)dnl
 AC_SUBST(arch)dnl
 AC_SUBST(sitearch)dnl
+AC_SUBST(ruby_version)dnl
+AC_SUBST(rubylibdir)dnl
+AC_SUBST(rubyarchdir)dnl
 AC_SUBST(sitedir)dnl
+AC_SUBST(sitelibdir)dnl
+AC_SUBST(sitearchdir)dnl
 AC_SUBST(vendordir)dnl
-
-configure_args=$ac_configure_args
-AC_SUBST(configure_args)dnl
-
-if test "$fat_binary" != no ; then
-    arch="fat-${target_os}"
-
-    AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
-                 "${RUBY_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-
-    AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
-                 "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-    AC_DEFINE_UNQUOTED(RUBY_VENDOR_THIN_ARCHLIB,
-                 "${RUBY_VENDOR_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
+AC_SUBST(vendorlibdir)dnl
+AC_SUBST(vendorarchdir)dnl
+
+AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl
+
+if test "${universal_binary-no}" = yes ; then
+    arch="universal-${target_os}"
+    AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
+	AC_TRY_COMPILE([const char arch[] = __ARCHITECTURE__;], [puts(arch);],
+	     [rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
+    if test "${rb_cv_architecture_available}" = yes; then
+	AC_DEFINE_UNQUOTED(RUBY_PLATFORM_CPU, __ARCHITECTURE__)
+    else
+	for archs in ${universal_archnames}; do
+	    cpu=`echo $archs | sed 's/.*=//'`
+	    archs=`echo $archs | sed 's/=.*//'`
+	    RUBY_DEFINE_IF([defined __${archs}__], RUBY_PLATFORM_CPU, ["${cpu}"])
+	done
+    fi
+    ints='long int short'
+    test "$ac_cv_type_long_long" = yes && ints="'long long' $ints"
+    AC_SUBST(UNIVERSAL_ARCHNAMES, "${universal_archnames}")
+    AC_SUBST(UNIVERSAL_INTS, "${ints}")
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM_OS, "${target_os}")
+    AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS)
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
 else
     arch="${target_cpu}-${target_os}"
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
 fi
 
-case "$target_os" in
-  mingw*) sitearch="$target_cpu-$rb_cv_msvcrt" ;;
-  *) sitearch="${arch}" ;;
-esac
-
-AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
-AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, "${RUBY_VENDOR_LIB_PATH2}/${sitearch}")
+unset sitearch
+AS_CASE(["$target_os"],[mingw*],[sitearch="$target_cpu-$rb_cv_msvcrt"])
+: ${sitearch='${arch}'}
 
 AC_ARG_WITH(search-path,
-		[  --with-search-path=DIR specify the additional search path],
+		AS_HELP_STRING([--with-search-path=DIR], [specify the additional search path]),
 		[search_path=$withval])
 if test "$search_path" != ""; then
-    AC_DEFINE_UNQUOTED(RUBY_SEARCH_PATH,"$search_path")
+    AC_SUBST(RUBY_SEARCH_PATH, $search_path)
 fi
 
+AC_ARG_WITH(rubyhdrdir,
+	    AS_HELP_STRING([--with-rubyhdrdir=DIR], [core headers in DIR [[INCLUDEDIR/RUBY_BASE_NAME-RUBY_VERSION]]]),
+	    [rubyhdrdir=$withval],
+	    [rubyhdrdir='${includedir}/${RUBY_VERSION_NAME}'])
+
+AC_ARG_WITH(rubyarchhdrdir,
+	    AS_HELP_STRING([--with-rubyarchhdrdir=DIR],
+			   [architecture dependent core headers in DIR [[$(rubyhdrdir)/$(arch)]]]),
+	    [rubyarchhdrdir=$withval],
+	    [rubyarchhdrdir=${multiarch+'${archincludedir}/${RUBY_VERSION_NAME}'}${multiarch-'${rubyhdrdir}/${arch}'}])
+
+AC_ARG_WITH(sitehdrdir,
+	    AS_HELP_STRING([--with-sitehdrdir=DIR], [core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
+	    [sitehdrdir=$withval],
+	    [sitehdrdir='${rubyhdrdir}/site_ruby'])
+
+AC_ARG_WITH(sitearchhdrdir,
+	    AS_HELP_STRING([--with-sitearchhdrdir=DIR],
+			   [architecture dependent core site headers in DIR [[RUBYHDRDIR/site_ruby]]]),
+	    [sitearchhdrdir=$withval],
+	    [sitearchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/site_ruby'}${multiarch-'${sitehdrdir}/${sitearch}'}])
+
+AC_ARG_WITH(vendorhdrdir,
+	    AS_HELP_STRING([--with-vendorhdrdir=DIR], [core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
+	    [vendorhdrdir=$withval],
+	    [vendorhdrdir='${rubyhdrdir}/vendor_ruby'])
+
+AC_ARG_WITH(vendorarchhdrdir,
+	    AS_HELP_STRING([--with-vendorarchhdrdir=DIR],
+			   [architecture dependent core vendor headers in DIR [[RUBYHDRDIR/vendor_ruby]]]),
+	    [vendorarchhdrdir=$withval],
+	    [vendorarchhdrdir=${multiarch+'${sitearchincludedir}/${RUBY_VERSION_NAME}/vendor_ruby'}${multiarch-'${vendorhdrdir}/${sitearch}'}])
+
+AC_SUBST(rubyhdrdir)dnl
+AC_SUBST(sitehdrdir)dnl
+AC_SUBST(vendorhdrdir)dnl
+AC_SUBST(rubyarchhdrdir)dnl
+AC_SUBST(sitearchhdrdir)dnl
+AC_SUBST(vendorarchhdrdir)dnl
+
 AC_ARG_WITH(mantype,
-		[  --with-mantype=TYPE specify man page type; TYPE is one of man and doc],
+	AS_HELP_STRING([--with-mantype=TYPE], [specify man page type; TYPE is one of man and doc]),
 		[
-			case "$withval" in
-			man|doc)
-				MANTYPE=$withval
-				;;
-			*)
-				AC_MSG_ERROR(invalid man type: $withval)
-				;;
-			esac
+			AS_CASE(["$withval"],
+			[man|doc], [MANTYPE=$withval],
+			[AC_MSG_ERROR(invalid man type: $withval)])
 		])
 if test -z "$MANTYPE"; then
 	AC_PATH_PROGS(NROFF, nroff awf, /bin/false, "/usr/bin:/usr/ucb")
-	if ${NROFF} -mdoc ${srcdir}/ruby.1 >/dev/null 2>&1; then
+	if ${NROFF} -mdoc ${srcdir}/man/ruby.1 >/dev/null 2>&1; then
 		MANTYPE=doc
 	else
 		MANTYPE=man
@@ -1862,21 +3786,124 @@ if test -z "$MANTYPE"; then
 fi
 AC_SUBST(MANTYPE)
 
-if test -f config.h && tr -d '\015' < confdefs.h | cmp -s config.h -; then
-  echo "config.h unchanged"
+AC_ARG_ENABLE(rubygems,
+	AS_HELP_STRING([--disable-rubygems], [disable rubygems by default]),
+	[enable_rubygems="$enableval"], [enable_rubygems=yes])
+if test x"$enable_rubygems" = xno; then
+    AC_DEFINE(DISABLE_RUBYGEMS, 1)
+    USE_RUBYGEMS=NO
 else
-  echo "creating config.h"
-  tr -d '\015' < confdefs.h > config.h
+    USE_RUBYGEMS=YES
 fi
+AC_SUBST(USE_RUBYGEMS)
+
+arch_hdrdir="${EXTOUT}/include/${arch}/ruby"
+AS_MKDIR_P("${arch_hdrdir}")
+config_h="${arch_hdrdir}/config.h"
+guard=INCLUDE_RUBY_CONFIG_H
+{
+  echo "#ifndef $guard"
+  echo "#define $guard 1"
+  grep -v "^#define PACKAGE_" confdefs.h
+  echo "#endif /* $guard */"
+} | tr -d '\015' |
+${srcdir}/tool/ifchange "${config_h}" -
 tr -d '\015' < largefile.h > confdefs.h
 rm largefile.h
 
-AC_CONFIG_FILES($FIRSTMAKEFILE)
-AC_CONFIG_FILES(Makefile, [{
-	sed '/^MISSING/s/\$U\././g' Makefile
+BUILTIN_ENCS=["`sed -n -e '/^BUILTIN_ENCS[ 	]*=/{' \
+	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
+	-e '}' "${srcdir}/enc/Makefile.in"`"]
+BUILTIN_ENCOBJS=
+for e in $BUILTIN_ENCS; do BUILTIN_ENCOBJS="$BUILTIN_ENCOBJS `basename $e .c`"'.$(OBJEXT)'; done
+AC_SUBST(BUILTIN_ENCOBJS)
+
+BUILTIN_TRANSES=["`sed -n -e '/^BUILTIN_TRANSES[ 	]*=/{' \
+	-e s/// -e :l -e '/\\\\$/N' -e 's/\\\\\\n/ /' -e 't l' -e p \
+	-e '}' "${srcdir}/enc/Makefile.in"`"]
+BUILTIN_TRANSSRCS=
+BUILTIN_TRANSOBJS=
+for e in $BUILTIN_TRANSES; do
+  BUILTIN_TRANSSRCS="$BUILTIN_TRANSSRCS `basename $e .trans`"'.c';
+  BUILTIN_TRANSOBJS="$BUILTIN_TRANSOBJS `basename $e .trans`"'.$(OBJEXT)';
+done
+AC_SUBST(BUILTIN_TRANSSRCS)
+AC_SUBST(BUILTIN_TRANSOBJS)
+
+PACKAGE=$RUBY_BASE_NAME
+AC_SUBST(PACKAGE)
+AC_MSG_RESULT($PACKAGE library version = $ruby_version)
+
+AS_CASE([" $CPP "], [*" $CC "*], [CPP=`echo " $CPP " | sed "s| $CC |"' $(CC) |;s/^ *//;s/  *$//'`])
+
+if test x"$firstmf" != x; then
+    AC_CONFIG_FILES($firstmf:$firsttmpl, [], [firstmf="$firstmf" firsttmpl="$firsttmpl"])
+fi
+AC_CONFIG_FILES(Makefile, [
+    tmpmk=confmk$$.tmp
+    {
+	if test ${VCS+set}; then
+	    :
+	elif svn info "$srcdir" > /dev/null 2>&1; then
+	    VCS='svn'
+	elif test -d "$srcdir/.git/svn"; then
+	    VCS='git svn'
+	elif test -d "$srcdir/.git"; then
+	    VCS='git'
+	else
+	    VCS='echo cannot'
+	fi
+	AS_CASE("$VCS",
+		[svn],       [VCSUP='$(VCS) up $(SVNUPOPTIONS)'],
+		["git svn"], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'],
+		[git],       [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'],
+		[VCSUP='$(VCS)'])
+	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
-	test "$RUBY_INSTALL_NAME$EXEEXT" = ruby || echo 'ruby: $(PROGRAM);'
-	sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
-      } >> confmk$$.tmp && mv -f confmk$$.tmp Makefile],
-[RUBY_INSTALL_NAME=$RUBY_INSTALL_NAME EXEEXT=$EXEEXT])
+	if test "$gnumake" != yes; then
+	    echo ['$(MKFILES): $(srcdir)/common.mk']
+	    sed ['s/{\$([^(){}]*)[^{}]*}//g'] ${srcdir}/common.mk
+	else
+	    echo 'distclean-local::; @$(RM) GNUmakefile uncommon.mk'
+	fi
+    } > $tmpmk && if ! grep '^ruby:' $tmpmk > /dev/null; then
+	if test "${gnumake}" = yes; then
+	    tmpgmk=confgmk$$.tmp
+	    {
+		echo "include $tmpmk"
+		echo "-include uncommon.mk"
+	    } > $tmpgmk
+	else
+	    tmpgmk=$tmpmk
+	fi &&
+	test -z "`${MAKE-make} -f $tmpgmk info-program | grep '^PROGRAM=ruby$'`" &&
+	echo 'ruby: $(PROGRAM);' >> $tmpmk
+	test "$tmpmk" = "$tmpgmk" || rm -f "$tmpgmk"
+    fi && mv -f $tmpmk Makefile],
+[EXEEXT='$EXEEXT' gnumake='$gnumake'])
+
+AC_ARG_WITH([ruby-pc],
+	    AC_HELP_STRING([pc file basename]),
+	    [ruby_pc="$withval"],
+	    [ruby_pc="${RUBY_BASE_NAME}-${MAJOR}.${MINOR}.pc"])
+AC_SUBST(ruby_pc)
+AC_SUBST(exec, [exec])
+
+AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
+    [
+    if sed ['s/\$(\([A-Za-z_][A-Za-z0-9_]*\))/${\1}/g;s/@[A-Za-z_][A-Za-z0-9_]*@//'] $ruby_pc > ruby.tmp.pc &&
+	{
+	    test -z "$PKG_CONFIG" ||
+	    PKG_CONFIG_PATH=. $PKG_CONFIG --print-errors ruby.tmp
+	}
+    then
+	mv -f ruby.tmp.pc $ruby_pc
+    else
+	exit 1
+    fi
+    ],
+    [ruby_pc='$ruby_pc' PKG_CONFIG='$PKG_CONFIG'])
+
 AC_OUTPUT
+}
+}
diff --git a/constant.h b/constant.h
new file mode 100644
index 0000000000..3dc9b8d4ef
--- /dev/null
+++ b/constant.h
@@ -0,0 +1,36 @@
+/**********************************************************************
+
+  constant.h -
+
+  $Author$
+  created at: Sun Nov 15 00:09:33 2009
+
+  Copyright (C) 2009 Yusuke Endoh
+
+**********************************************************************/
+#ifndef CONSTANT_H
+#define CONSTANT_H
+
+typedef enum {
+    CONST_PUBLIC    = 0x00,
+    CONST_PRIVATE   = 0x01
+} rb_const_flag_t;
+
+typedef struct rb_const_entry_struct {
+    rb_const_flag_t flag;
+    const VALUE value;            /* should be mark */
+    const VALUE file;             /* should be mark */
+    int line;
+} rb_const_entry_t;
+
+VALUE rb_mod_private_constant(int argc, VALUE *argv, VALUE obj);
+VALUE rb_mod_public_constant(int argc, VALUE *argv, VALUE obj);
+void rb_free_const_table(st_table *tbl);
+VALUE rb_public_const_get(VALUE klass, ID id);
+VALUE rb_public_const_get_at(VALUE klass, ID id);
+VALUE rb_public_const_get_from(VALUE klass, ID id);
+int rb_public_const_defined(VALUE klass, ID id);
+int rb_public_const_defined_at(VALUE klass, ID id);
+int rb_public_const_defined_from(VALUE klass, ID id);
+
+#endif /* CONSTANT_H */
diff --git a/cont.c b/cont.c
new file mode 100644
index 0000000000..fa9e91ee64
--- /dev/null
+++ b/cont.c
@@ -0,0 +1,1694 @@
+/**********************************************************************
+
+  cont.c -
+
+  $Author$
+  created at: Thu May 23 09:03:43 2007
+
+  Copyright (C) 2007 Koichi Sasada
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+#include "internal.h"
+#include "vm_core.h"
+#include "gc.h"
+#include "eval_intern.h"
+
+/* FIBER_USE_NATIVE enables Fiber performance improvement using system
+ * dependent method such as make/setcontext on POSIX system or
+ * CreateFiber() API on Windows.
+ * This hack make Fiber context switch faster (x2 or more).
+ * However, it decrease maximum number of Fiber.  For example, on the
+ * 32bit POSIX OS, ten or twenty thousands Fiber can be created.
+ *
+ * Details is reported in the paper "A Fast Fiber Implementation for Ruby 1.9"
+ * in Proc. of 51th Programming Symposium, pp.21--28 (2010) (in Japanese).
+ */
+
+#if !defined(FIBER_USE_NATIVE)
+# if defined(HAVE_GETCONTEXT) && defined(HAVE_SETCONTEXT)
+#   if 0
+#   elif defined(__NetBSD__)
+/* On our experience, NetBSD doesn't support using setcontext() and pthread
+ * simultaneously.  This is because pthread_self(), TLS and other information
+ * are represented by stack pointer (higher bits of stack pointer).
+ * TODO: check such constraint on configure.
+ */
+#     define FIBER_USE_NATIVE 0
+#   elif defined(__sun)
+/* On Solaris because resuming any Fiber caused SEGV, for some reason.
+ */
+#     define FIBER_USE_NATIVE 0
+#   elif defined(__ia64)
+/* At least, Linux/ia64's getcontext(3) doesn't save register window.
+ */
+#     define FIBER_USE_NATIVE 0
+#   elif defined(__GNU__)
+/* GNU/Hurd doesn't fully support getcontext, setcontext, makecontext
+ * and swapcontext functions. Disabling their usage till support is
+ * implemented. More info at
+ * http://darnassus.sceen.net/~hurd-web/open_issues/glibc/#getcontext
+ */
+#     define FIBER_USE_NATIVE 0
+#   else
+#     define FIBER_USE_NATIVE 1
+#   endif
+# elif defined(_WIN32)
+#   if _WIN32_WINNT >= 0x0400
+/* only when _WIN32_WINNT >= 0x0400 on Windows because Fiber APIs are
+ * supported only such building (and running) environments.
+ * [ruby-dev:41192]
+ */
+#     define FIBER_USE_NATIVE 1
+#   endif
+# endif
+#endif
+#if !defined(FIBER_USE_NATIVE)
+#define FIBER_USE_NATIVE 0
+#endif
+
+#if FIBER_USE_NATIVE
+#ifndef _WIN32
+#include <unistd.h>
+#include <sys/mman.h>
+#include <ucontext.h>
+#endif
+#define RB_PAGE_SIZE (pagesize)
+#define RB_PAGE_MASK (~(RB_PAGE_SIZE - 1))
+static long pagesize;
+#endif /*FIBER_USE_NATIVE*/
+
+#define CAPTURE_JUST_VALID_VM_STACK 1
+
+enum context_type {
+    CONTINUATION_CONTEXT = 0,
+    FIBER_CONTEXT = 1,
+    ROOT_FIBER_CONTEXT = 2
+};
+
+typedef struct rb_context_struct {
+    enum context_type type;
+    VALUE self;
+    int argc;
+    VALUE value;
+    VALUE *vm_stack;
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+    size_t vm_stack_slen;  /* length of stack (head of th->stack) */
+    size_t vm_stack_clen;  /* length of control frames (tail of th->stack) */
+#endif
+    VALUE *machine_stack;
+    VALUE *machine_stack_src;
+#ifdef __ia64
+    VALUE *machine_register_stack;
+    VALUE *machine_register_stack_src;
+    int machine_register_stack_size;
+#endif
+    rb_thread_t saved_thread;
+    rb_jmpbuf_t jmpbuf;
+    size_t machine_stack_size;
+    rb_ensure_entry_t *ensure_array;
+    rb_ensure_list_t *ensure_list;
+} rb_context_t;
+
+enum fiber_status {
+    CREATED,
+    RUNNING,
+    TERMINATED
+};
+
+#if FIBER_USE_NATIVE && !defined(_WIN32)
+#define MAX_MACHINE_STACK_CACHE  10
+static int machine_stack_cache_index = 0;
+typedef struct machine_stack_cache_struct {
+    void *ptr;
+    size_t size;
+} machine_stack_cache_t;
+static machine_stack_cache_t machine_stack_cache[MAX_MACHINE_STACK_CACHE];
+static machine_stack_cache_t terminated_machine_stack;
+#endif
+
+typedef struct rb_fiber_struct {
+    rb_context_t cont;
+    VALUE prev;
+    enum fiber_status status;
+    struct rb_fiber_struct *prev_fiber;
+    struct rb_fiber_struct *next_fiber;
+    /* If a fiber invokes "transfer",
+     * then this fiber can't "resume" any more after that.
+     * You shouldn't mix "transfer" and "resume".
+     */
+    int transfered;
+
+#if FIBER_USE_NATIVE
+#ifdef _WIN32
+    void *fib_handle;
+#else
+    ucontext_t context;
+#endif
+#endif
+} rb_fiber_t;
+
+static const rb_data_type_t cont_data_type, fiber_data_type;
+static VALUE rb_cContinuation;
+static VALUE rb_cFiber;
+static VALUE rb_eFiberError;
+
+#define GetContPtr(obj, ptr)  \
+    TypedData_Get_Struct((obj), rb_context_t, &cont_data_type, (ptr))
+
+#define GetFiberPtr(obj, ptr)  do {\
+    TypedData_Get_Struct((obj), rb_fiber_t, &fiber_data_type, (ptr)); \
+    if (!(ptr)) rb_raise(rb_eFiberError, "uninitialized fiber"); \
+} while (0)
+
+NOINLINE(static VALUE cont_capture(volatile int *stat));
+
+#define THREAD_MUST_BE_RUNNING(th) do { \
+	if (!(th)->tag) rb_raise(rb_eThreadError, "not running thread");	\
+    } while (0)
+
+static void
+cont_mark(void *ptr)
+{
+    RUBY_MARK_ENTER("cont");
+    if (ptr) {
+	rb_context_t *cont = ptr;
+	rb_gc_mark(cont->value);
+	rb_thread_mark(&cont->saved_thread);
+	rb_gc_mark(cont->saved_thread.self);
+
+	if (cont->vm_stack) {
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+	    rb_gc_mark_locations(cont->vm_stack,
+				 cont->vm_stack + cont->vm_stack_slen + cont->vm_stack_clen);
+#else
+	    rb_gc_mark_localtion(cont->vm_stack,
+				 cont->vm_stack, cont->saved_thread.stack_size);
+#endif
+	}
+
+	if (cont->machine_stack) {
+	    if (cont->type == CONTINUATION_CONTEXT) {
+		/* cont */
+		rb_gc_mark_locations(cont->machine_stack,
+				     cont->machine_stack + cont->machine_stack_size);
+            }
+            else {
+		/* fiber */
+		rb_thread_t *th;
+                rb_fiber_t *fib = (rb_fiber_t*)cont;
+		GetThreadPtr(cont->saved_thread.self, th);
+		if ((th->fiber != cont->self) && fib->status == RUNNING) {
+		    rb_gc_mark_locations(cont->machine_stack,
+					 cont->machine_stack + cont->machine_stack_size);
+		}
+	    }
+	}
+#ifdef __ia64
+	if (cont->machine_register_stack) {
+	    rb_gc_mark_locations(cont->machine_register_stack,
+				 cont->machine_register_stack + cont->machine_register_stack_size);
+	}
+#endif
+    }
+    RUBY_MARK_LEAVE("cont");
+}
+
+static void
+cont_free(void *ptr)
+{
+    RUBY_FREE_ENTER("cont");
+    if (ptr) {
+	rb_context_t *cont = ptr;
+	RUBY_FREE_UNLESS_NULL(cont->saved_thread.stack); fflush(stdout);
+#if FIBER_USE_NATIVE
+	if (cont->type == CONTINUATION_CONTEXT) {
+	    /* cont */
+	    ruby_xfree(cont->ensure_array);
+	    RUBY_FREE_UNLESS_NULL(cont->machine_stack);
+	}
+	else {
+	    /* fiber */
+#ifdef _WIN32
+	    if (GET_THREAD()->fiber != cont->self && cont->type != ROOT_FIBER_CONTEXT) {
+		/* don't delete root fiber handle */
+		rb_fiber_t *fib = (rb_fiber_t*)cont;
+		if (fib->fib_handle) {
+		    DeleteFiber(fib->fib_handle);
+		}
+	    }
+#else /* not WIN32 */
+	    if (GET_THREAD()->fiber != cont->self) {
+                rb_fiber_t *fib = (rb_fiber_t*)cont;
+                if (fib->context.uc_stack.ss_sp) {
+                    if (cont->type == ROOT_FIBER_CONTEXT) {
+			rb_bug("Illegal root fiber parameter");
+                    }
+		    munmap((void*)fib->context.uc_stack.ss_sp, fib->context.uc_stack.ss_size);
+		}
+	    }
+            else {
+		/* It may reached here when finalize */
+		/* TODO examine whether it is a bug */
+                /* rb_bug("cont_free: release self"); */
+            }
+#endif
+	}
+#else /* not FIBER_USE_NATIVE */
+	ruby_xfree(cont->ensure_array);
+	RUBY_FREE_UNLESS_NULL(cont->machine_stack);
+#endif
+#ifdef __ia64
+	RUBY_FREE_UNLESS_NULL(cont->machine_register_stack);
+#endif
+	RUBY_FREE_UNLESS_NULL(cont->vm_stack);
+
+	/* free rb_cont_t or rb_fiber_t */
+	ruby_xfree(ptr);
+    }
+    RUBY_FREE_LEAVE("cont");
+}
+
+static size_t
+cont_memsize(const void *ptr)
+{
+    const rb_context_t *cont = ptr;
+    size_t size = 0;
+    if (cont) {
+	size = sizeof(*cont);
+	if (cont->vm_stack) {
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+	    size_t n = (cont->vm_stack_slen + cont->vm_stack_clen);
+#else
+	    size_t n = cont->saved_thread.stack_size;
+#endif
+	    size += n * sizeof(*cont->vm_stack);
+	}
+
+	if (cont->machine_stack) {
+	    size += cont->machine_stack_size * sizeof(*cont->machine_stack);
+	}
+#ifdef __ia64
+	if (cont->machine_register_stack) {
+	    size += cont->machine_register_stack_size * sizeof(*cont->machine_register_stack);
+	}
+#endif
+    }
+    return size;
+}
+
+static void
+fiber_mark(void *ptr)
+{
+    RUBY_MARK_ENTER("cont");
+    if (ptr) {
+	rb_fiber_t *fib = ptr;
+	rb_gc_mark(fib->prev);
+	cont_mark(&fib->cont);
+    }
+    RUBY_MARK_LEAVE("cont");
+}
+
+static void
+fiber_link_join(rb_fiber_t *fib)
+{
+    VALUE current_fibval = rb_fiber_current();
+    rb_fiber_t *current_fib;
+    GetFiberPtr(current_fibval, current_fib);
+
+    /* join fiber link */
+    fib->next_fiber = current_fib->next_fiber;
+    fib->prev_fiber = current_fib;
+    current_fib->next_fiber->prev_fiber = fib;
+    current_fib->next_fiber = fib;
+}
+
+static void
+fiber_link_remove(rb_fiber_t *fib)
+{
+    fib->prev_fiber->next_fiber = fib->next_fiber;
+    fib->next_fiber->prev_fiber = fib->prev_fiber;
+}
+
+static void
+fiber_free(void *ptr)
+{
+    RUBY_FREE_ENTER("fiber");
+    if (ptr) {
+	rb_fiber_t *fib = ptr;
+	if (fib->cont.type != ROOT_FIBER_CONTEXT &&
+	    fib->cont.saved_thread.local_storage) {
+	    st_free_table(fib->cont.saved_thread.local_storage);
+	}
+	fiber_link_remove(fib);
+
+	cont_free(&fib->cont);
+    }
+    RUBY_FREE_LEAVE("fiber");
+}
+
+static size_t
+fiber_memsize(const void *ptr)
+{
+    const rb_fiber_t *fib = ptr;
+    size_t size = 0;
+    if (ptr) {
+	size = sizeof(*fib);
+	if (fib->cont.type != ROOT_FIBER_CONTEXT &&
+	    fib->cont.saved_thread.local_storage != NULL) {
+	    size += st_memsize(fib->cont.saved_thread.local_storage);
+	}
+	size += cont_memsize(&fib->cont);
+    }
+    return size;
+}
+
+VALUE
+rb_obj_is_fiber(VALUE obj)
+{
+    if (rb_typeddata_is_kind_of(obj, &fiber_data_type)) {
+	return Qtrue;
+    }
+    else {
+	return Qfalse;
+    }
+}
+
+static void
+cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
+{
+    size_t size;
+
+    SET_MACHINE_STACK_END(&th->machine_stack_end);
+#ifdef __ia64
+    th->machine_register_stack_end = rb_ia64_bsp();
+#endif
+
+    if (th->machine_stack_start > th->machine_stack_end) {
+	size = cont->machine_stack_size = th->machine_stack_start - th->machine_stack_end;
+	cont->machine_stack_src = th->machine_stack_end;
+    }
+    else {
+	size = cont->machine_stack_size = th->machine_stack_end - th->machine_stack_start;
+	cont->machine_stack_src = th->machine_stack_start;
+    }
+
+    if (cont->machine_stack) {
+	REALLOC_N(cont->machine_stack, VALUE, size);
+    }
+    else {
+	cont->machine_stack = ALLOC_N(VALUE, size);
+    }
+
+    FLUSH_REGISTER_WINDOWS;
+    MEMCPY(cont->machine_stack, cont->machine_stack_src, VALUE, size);
+
+#ifdef __ia64
+    rb_ia64_flushrs();
+    size = cont->machine_register_stack_size = th->machine_register_stack_end - th->machine_register_stack_start;
+    cont->machine_register_stack_src = th->machine_register_stack_start;
+    if (cont->machine_register_stack) {
+	REALLOC_N(cont->machine_register_stack, VALUE, size);
+    }
+    else {
+	cont->machine_register_stack = ALLOC_N(VALUE, size);
+    }
+
+    MEMCPY(cont->machine_register_stack, cont->machine_register_stack_src, VALUE, size);
+#endif
+}
+
+static const rb_data_type_t cont_data_type = {
+    "continuation",
+    {cont_mark, cont_free, cont_memsize,},
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static void
+cont_save_thread(rb_context_t *cont, rb_thread_t *th)
+{
+    /* save thread context */
+    cont->saved_thread = *th;
+    /* saved_thread->machine_stack_(start|end) should be NULL */
+    /* because it may happen GC afterward */
+    cont->saved_thread.machine_stack_start = 0;
+    cont->saved_thread.machine_stack_end = 0;
+#ifdef __ia64
+    cont->saved_thread.machine_register_stack_start = 0;
+    cont->saved_thread.machine_register_stack_end = 0;
+#endif
+}
+
+static void
+cont_init(rb_context_t *cont, rb_thread_t *th)
+{
+    /* save thread context */
+    cont_save_thread(cont, th);
+    cont->saved_thread.local_storage = 0;
+}
+
+static rb_context_t *
+cont_new(VALUE klass)
+{
+    rb_context_t *cont;
+    volatile VALUE contval;
+    rb_thread_t *th = GET_THREAD();
+
+    THREAD_MUST_BE_RUNNING(th);
+    contval = TypedData_Make_Struct(klass, rb_context_t, &cont_data_type, cont);
+    cont->self = contval;
+    cont_init(cont, th);
+    return cont;
+}
+
+static VALUE
+cont_capture(volatile int *stat)
+{
+    rb_context_t *cont;
+    rb_thread_t *th = GET_THREAD(), *sth;
+    volatile VALUE contval;
+
+    THREAD_MUST_BE_RUNNING(th);
+    rb_vm_stack_to_heap(th);
+    cont = cont_new(rb_cContinuation);
+    contval = cont->self;
+    sth = &cont->saved_thread;
+
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+    cont->vm_stack_slen = th->cfp->sp + th->mark_stack_len - th->stack;
+    cont->vm_stack_clen = th->stack + th->stack_size - (VALUE*)th->cfp;
+    cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);
+    MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);
+    MEMCPY(cont->vm_stack + cont->vm_stack_slen, (VALUE*)th->cfp, VALUE, cont->vm_stack_clen);
+#else
+    cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
+    MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
+#endif
+    sth->stack = 0;
+
+    cont_save_machine_stack(th, cont);
+
+    /* backup ensure_list to array for search in another context */
+    {
+	rb_ensure_list_t *p;
+	int size = 0;
+	rb_ensure_entry_t *entry;
+	for (p=th->ensure_list; p; p=p->next)
+	    size++;
+	entry = cont->ensure_array = ALLOC_N(rb_ensure_entry_t,size+1);
+	for (p=th->ensure_list; p; p=p->next) {
+	    if (!p->entry.marker)
+		p->entry.marker = rb_ary_tmp_new(0); /* dummy object */
+	    *entry++ = p->entry;
+	}
+	entry->marker = 0;
+    }
+
+    if (ruby_setjmp(cont->jmpbuf)) {
+	volatile VALUE value;
+
+	value = cont->value;
+	if (cont->argc == -1) rb_exc_raise(value);
+	cont->value = Qnil;
+	*stat = 1;
+	return value;
+    }
+    else {
+	*stat = 0;
+	return contval;
+    }
+}
+
+static void
+cont_restore_thread(rb_context_t *cont)
+{
+    rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
+
+    /* restore thread context */
+    if (cont->type == CONTINUATION_CONTEXT) {
+	/* continuation */
+	VALUE fib;
+
+	th->fiber = sth->fiber;
+	fib = th->fiber ? th->fiber : th->root_fiber;
+
+	if (fib) {
+	    rb_fiber_t *fcont;
+	    GetFiberPtr(fib, fcont);
+	    th->stack_size = fcont->cont.saved_thread.stack_size;
+	    th->stack = fcont->cont.saved_thread.stack;
+	}
+#ifdef CAPTURE_JUST_VALID_VM_STACK
+	MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);
+	MEMCPY(th->stack + sth->stack_size - cont->vm_stack_clen,
+	       cont->vm_stack + cont->vm_stack_slen, VALUE, cont->vm_stack_clen);
+#else
+	MEMCPY(th->stack, cont->vm_stack, VALUE, sth->stack_size);
+#endif
+    }
+    else {
+	/* fiber */
+	th->stack = sth->stack;
+	th->stack_size = sth->stack_size;
+	th->local_storage = sth->local_storage;
+	th->fiber = cont->self;
+    }
+
+    th->cfp = sth->cfp;
+    th->safe_level = sth->safe_level;
+    th->raised_flag = sth->raised_flag;
+    th->state = sth->state;
+    th->status = sth->status;
+    th->tag = sth->tag;
+    th->protect_tag = sth->protect_tag;
+    th->errinfo = sth->errinfo;
+    th->first_proc = sth->first_proc;
+    th->root_lep = sth->root_lep;
+    th->root_svar = sth->root_svar;
+    th->ensure_list = sth->ensure_list;
+
+}
+
+#if FIBER_USE_NATIVE
+#ifdef _WIN32
+static void
+fiber_set_stack_location(void)
+{
+    rb_thread_t *th = GET_THREAD();
+    VALUE *ptr;
+
+    SET_MACHINE_STACK_END(&ptr);
+    th->machine_stack_start = (void*)(((VALUE)ptr & RB_PAGE_MASK) + STACK_UPPER((void *)&ptr, 0, RB_PAGE_SIZE));
+}
+
+static VOID CALLBACK
+fiber_entry(void *arg)
+{
+    fiber_set_stack_location();
+    rb_fiber_start();
+}
+#else /* _WIN32 */
+
+/*
+ * FreeBSD require a first (i.e. addr) argument of mmap(2) is not NULL
+ * if MAP_STACK is passed.
+ * http://www.FreeBSD.org/cgi/query-pr.cgi?pr=158755
+ */
+#if defined(MAP_STACK) && !defined(__FreeBSD__) && !defined(__FreeBSD_kernel__)
+#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON | MAP_STACK)
+#else
+#define FIBER_STACK_FLAGS (MAP_PRIVATE | MAP_ANON)
+#endif
+
+static char*
+fiber_machine_stack_alloc(size_t size)
+{
+    char *ptr;
+
+    if (machine_stack_cache_index > 0) {
+	if (machine_stack_cache[machine_stack_cache_index - 1].size == (size / sizeof(VALUE))) {
+	    ptr = machine_stack_cache[machine_stack_cache_index - 1].ptr;
+	    machine_stack_cache_index--;
+	    machine_stack_cache[machine_stack_cache_index].ptr = NULL;
+	    machine_stack_cache[machine_stack_cache_index].size = 0;
+	}
+	else{
+            /* TODO handle multiple machine stack size */
+	    rb_bug("machine_stack_cache size is not canonicalized");
+	}
+    }
+    else {
+	void *page;
+	STACK_GROW_DIR_DETECTION;
+
+	errno = 0;
+	ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, FIBER_STACK_FLAGS, -1, 0);
+	if (ptr == MAP_FAILED) {
+	    rb_raise(rb_eFiberError, "can't alloc machine stack to fiber: %s", strerror(errno));
+	}
+
+	/* guard page setup */
+	page = ptr + STACK_DIR_UPPER(size - RB_PAGE_SIZE, 0);
+	if (mprotect(page, RB_PAGE_SIZE, PROT_NONE) < 0) {
+	    rb_raise(rb_eFiberError, "mprotect failed");
+	}
+    }
+
+    return ptr;
+}
+#endif
+
+static void
+fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size)
+{
+    rb_thread_t *sth = &fib->cont.saved_thread;
+
+#ifdef _WIN32
+    fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL);
+    if (!fib->fib_handle) {
+	/* try to release unnecessary fibers & retry to create */
+	rb_gc();
+	fib->fib_handle = CreateFiberEx(size - 1, size, 0, fiber_entry, NULL);
+	if (!fib->fib_handle) {
+	    rb_raise(rb_eFiberError, "can't create fiber");
+	}
+    }
+    sth->machine_stack_maxsize = size;
+#else /* not WIN32 */
+    ucontext_t *context = &fib->context;
+    char *ptr;
+    STACK_GROW_DIR_DETECTION;
+
+    getcontext(context);
+    ptr = fiber_machine_stack_alloc(size);
+    context->uc_link = NULL;
+    context->uc_stack.ss_sp = ptr;
+    context->uc_stack.ss_size = size;
+    makecontext(context, rb_fiber_start, 0);
+    sth->machine_stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size));
+    sth->machine_stack_maxsize = size - RB_PAGE_SIZE;
+#endif
+#ifdef __ia64
+    sth->machine_register_stack_maxsize = sth->machine_stack_maxsize;
+#endif
+}
+
+NOINLINE(static void fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib));
+
+static void
+fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib)
+{
+    rb_thread_t *th = GET_THREAD(), *sth = &newfib->cont.saved_thread;
+
+    if (newfib->status != RUNNING) {
+	fiber_initialize_machine_stack_context(newfib, th->vm->default_params.fiber_machine_stack_size);
+    }
+
+    /* restore thread context */
+    cont_restore_thread(&newfib->cont);
+    th->machine_stack_maxsize = sth->machine_stack_maxsize;
+    if (sth->machine_stack_end && (newfib != oldfib)) {
+	rb_bug("fiber_setcontext: sth->machine_stack_end has non zero value");
+    }
+
+    /* save  oldfib's machine stack */
+    if (oldfib->status != TERMINATED) {
+	STACK_GROW_DIR_DETECTION;
+	SET_MACHINE_STACK_END(&th->machine_stack_end);
+	if (STACK_DIR_UPPER(0, 1)) {
+	    oldfib->cont.machine_stack_size = th->machine_stack_start - th->machine_stack_end;
+	    oldfib->cont.machine_stack = th->machine_stack_end;
+	}
+	else {
+	    oldfib->cont.machine_stack_size = th->machine_stack_end - th->machine_stack_start;
+	    oldfib->cont.machine_stack = th->machine_stack_start;
+	}
+    }
+    /* exchange machine_stack_start between oldfib and newfib */
+    oldfib->cont.saved_thread.machine_stack_start = th->machine_stack_start;
+    th->machine_stack_start = sth->machine_stack_start;
+    /* oldfib->machine_stack_end should be NULL */
+    oldfib->cont.saved_thread.machine_stack_end = 0;
+#ifndef _WIN32
+    if (!newfib->context.uc_stack.ss_sp && th->root_fiber != newfib->cont.self) {
+	rb_bug("non_root_fiber->context.uc_stac.ss_sp should not be NULL");
+    }
+#endif
+
+    /* swap machine context */
+#ifdef _WIN32
+    SwitchToFiber(newfib->fib_handle);
+#else
+    swapcontext(&oldfib->context, &newfib->context);
+#endif
+}
+#endif
+
+NOINLINE(NORETURN(static void cont_restore_1(rb_context_t *)));
+
+static void
+cont_restore_1(rb_context_t *cont)
+{
+    cont_restore_thread(cont);
+
+    /* restore machine stack */
+#ifdef _M_AMD64
+    {
+	/* workaround for x64 SEH */
+	jmp_buf buf;
+	setjmp(buf);
+	((_JUMP_BUFFER*)(&cont->jmpbuf))->Frame =
+	    ((_JUMP_BUFFER*)(&buf))->Frame;
+    }
+#endif
+    if (cont->machine_stack_src) {
+	FLUSH_REGISTER_WINDOWS;
+	MEMCPY(cont->machine_stack_src, cont->machine_stack,
+		VALUE, cont->machine_stack_size);
+    }
+
+#ifdef __ia64
+    if (cont->machine_register_stack_src) {
+	MEMCPY(cont->machine_register_stack_src, cont->machine_register_stack,
+	       VALUE, cont->machine_register_stack_size);
+    }
+#endif
+
+    ruby_longjmp(cont->jmpbuf, 1);
+}
+
+NORETURN(NOINLINE(static void cont_restore_0(rb_context_t *, VALUE *)));
+
+#ifdef __ia64
+#define C(a) rse_##a##0, rse_##a##1, rse_##a##2, rse_##a##3, rse_##a##4
+#define E(a) rse_##a##0= rse_##a##1= rse_##a##2= rse_##a##3= rse_##a##4
+static volatile int C(a), C(b), C(c), C(d), C(e);
+static volatile int C(f), C(g), C(h), C(i), C(j);
+static volatile int C(k), C(l), C(m), C(n), C(o);
+static volatile int C(p), C(q), C(r), C(s), C(t);
+#if 0
+{/* the above lines make cc-mode.el confused so much */}
+#endif
+int rb_dummy_false = 0;
+NORETURN(NOINLINE(static void register_stack_extend(rb_context_t *, VALUE *, VALUE *)));
+static void
+register_stack_extend(rb_context_t *cont, VALUE *vp, VALUE *curr_bsp)
+{
+    if (rb_dummy_false) {
+        /* use registers as much as possible */
+        E(a) = E(b) = E(c) = E(d) = E(e) =
+        E(f) = E(g) = E(h) = E(i) = E(j) =
+        E(k) = E(l) = E(m) = E(n) = E(o) =
+        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+        E(a) = E(b) = E(c) = E(d) = E(e) =
+        E(f) = E(g) = E(h) = E(i) = E(j) =
+        E(k) = E(l) = E(m) = E(n) = E(o) =
+        E(p) = E(q) = E(r) = E(s) = E(t) = 0;
+    }
+    if (curr_bsp < cont->machine_register_stack_src+cont->machine_register_stack_size) {
+        register_stack_extend(cont, vp, (VALUE*)rb_ia64_bsp());
+    }
+    cont_restore_0(cont, vp);
+}
+#undef C
+#undef E
+#endif
+
+static void
+cont_restore_0(rb_context_t *cont, VALUE *addr_in_prev_frame)
+{
+    if (cont->machine_stack_src) {
+#ifdef HAVE_ALLOCA
+#define STACK_PAD_SIZE 1
+#else
+#define STACK_PAD_SIZE 1024
+#endif
+	VALUE space[STACK_PAD_SIZE];
+
+#if !STACK_GROW_DIRECTION
+	if (addr_in_prev_frame > &space[0]) {
+	    /* Stack grows downward */
+#endif
+#if STACK_GROW_DIRECTION <= 0
+	    volatile VALUE *const end = cont->machine_stack_src;
+	    if (&space[0] > end) {
+# ifdef HAVE_ALLOCA
+		volatile VALUE *sp = ALLOCA_N(VALUE, &space[0] - end);
+		space[0] = *sp;
+# else
+		cont_restore_0(cont, &space[0]);
+# endif
+	    }
+#endif
+#if !STACK_GROW_DIRECTION
+	}
+	else {
+	    /* Stack grows upward */
+#endif
+#if STACK_GROW_DIRECTION >= 0
+	    volatile VALUE *const end = cont->machine_stack_src + cont->machine_stack_size;
+	    if (&space[STACK_PAD_SIZE] < end) {
+# ifdef HAVE_ALLOCA
+		volatile VALUE *sp = ALLOCA_N(VALUE, end - &space[STACK_PAD_SIZE]);
+		space[0] = *sp;
+# else
+		cont_restore_0(cont, &space[STACK_PAD_SIZE-1]);
+# endif
+	    }
+#endif
+#if !STACK_GROW_DIRECTION
+	}
+#endif
+    }
+    cont_restore_1(cont);
+}
+#ifdef __ia64
+#define cont_restore_0(cont, vp) register_stack_extend((cont), (vp), (VALUE*)rb_ia64_bsp())
+#endif
+
+/*
+ *  Document-class: Continuation
+ *
+ *  Continuation objects are generated by Kernel#callcc,
+ *  after having +require+d <i>continuation</i>. They hold
+ *  a return address and execution context, allowing a nonlocal return
+ *  to the end of the <code>callcc</code> block from anywhere within a
+ *  program. Continuations are somewhat analogous to a structured
+ *  version of C's <code>setjmp/longjmp</code> (although they contain
+ *  more state, so you might consider them closer to threads).
+ *
+ *  For instance:
+ *
+ *     require "continuation"
+ *     arr = [ "Freddie", "Herbie", "Ron", "Max", "Ringo" ]
+ *     callcc{|cc| $cc = cc}
+ *     puts(message = arr.shift)
+ *     $cc.call unless message =~ /Max/
+ *
+ *  <em>produces:</em>
+ *
+ *     Freddie
+ *     Herbie
+ *     Ron
+ *     Max
+ *
+ *  This (somewhat contrived) example allows the inner loop to abandon
+ *  processing early:
+ *
+ *     require "continuation"
+ *     callcc {|cont|
+ *       for i in 0..4
+ *         print "\n#{i}: "
+ *         for j in i*5...(i+1)*5
+ *           cont.call() if j == 17
+ *           printf "%3d", j
+ *         end
+ *       end
+ *     }
+ *     puts
+ *
+ *  <em>produces:</em>
+ *
+ *     0:   0  1  2  3  4
+ *     1:   5  6  7  8  9
+ *     2:  10 11 12 13 14
+ *     3:  15 16
+ */
+
+/*
+ *  call-seq:
+ *     callcc {|cont| block }   ->  obj
+ *
+ *  Generates a Continuation object, which it passes to
+ *  the associated block. You need to <code>require
+ *  'continuation'</code> before using this method. Performing a
+ *  <em>cont</em><code>.call</code> will cause the #callcc
+ *  to return (as will falling through the end of the block). The
+ *  value returned by the #callcc is the value of the
+ *  block, or the value passed to <em>cont</em><code>.call</code>. See
+ *  class Continuation for more details. Also see
+ *  Kernel#throw for an alternative mechanism for
+ *  unwinding a call stack.
+ */
+
+static VALUE
+rb_callcc(VALUE self)
+{
+    volatile int called;
+    volatile VALUE val = cont_capture(&called);
+
+    if (called) {
+	return val;
+    }
+    else {
+	return rb_yield(val);
+    }
+}
+
+static VALUE
+make_passing_arg(int argc, VALUE *argv)
+{
+    switch (argc) {
+      case 0:
+	return Qnil;
+      case 1:
+	return argv[0];
+      default:
+	return rb_ary_new4(argc, argv);
+    }
+}
+
+/* CAUTION!! : Currently, error in rollback_func is not supported  */
+/* same as rb_protect if set rollback_func to NULL */
+void
+ruby_register_rollback_func_for_ensure(VALUE (*ensure_func)(ANYARGS), VALUE (*rollback_func)(ANYARGS))
+{
+    st_table **table_p = &GET_VM()->ensure_rollback_table;
+    if (UNLIKELY(*table_p == NULL)) {
+	*table_p = st_init_numtable();
+    }
+    st_insert(*table_p, (st_data_t)ensure_func, (st_data_t)rollback_func);
+}
+
+static inline VALUE
+lookup_rollback_func(VALUE (*ensure_func)(ANYARGS))
+{
+    st_table *table = GET_VM()->ensure_rollback_table;
+    st_data_t val;
+    if (table && st_lookup(table, (st_data_t)ensure_func, &val))
+	return (VALUE) val;
+    return Qundef;
+}
+
+
+static inline void
+rollback_ensure_stack(VALUE self,rb_ensure_list_t *current,rb_ensure_entry_t *target)
+{
+    rb_ensure_list_t *p;
+    rb_ensure_entry_t *entry;
+    size_t i;
+    size_t cur_size;
+    size_t target_size;
+    size_t base_point;
+    VALUE (*func)(ANYARGS);
+
+    cur_size = 0;
+    for (p=current; p; p=p->next)
+	cur_size++;
+    target_size = 0;
+    for (entry=target; entry->marker; entry++)
+	target_size++;
+
+    /* search common stack point */
+    p = current;
+    base_point = cur_size;
+    while (base_point) {
+	if (target_size >= base_point &&
+	    p->entry.marker == target[target_size - base_point].marker)
+	    break;
+	base_point --;
+	p = p->next;
+    }
+
+    /* rollback function check */
+    for (i=0; i < target_size - base_point; i++) {
+	if (!lookup_rollback_func(target[i].e_proc)) {
+	    rb_raise(rb_eRuntimeError, "continuation called from out of critical rb_ensure scope");
+	}
+    }
+    /* pop ensure stack */
+    while (cur_size > base_point) {
+	/* escape from ensure block */
+	(*current->entry.e_proc)(current->entry.data2);
+	current = current->next;
+	cur_size--;
+    }
+    /* push ensure stack */
+    while (i--) {
+	func = (VALUE (*)(ANYARGS)) lookup_rollback_func(target[i].e_proc);
+	if ((VALUE)func != Qundef) {
+	    (*func)(target[i].data2);
+	}
+    }
+}
+
+/*
+ *  call-seq:
+ *     cont.call(args, ...)
+ *     cont[args, ...]
+ *
+ *  Invokes the continuation. The program continues from the end of the
+ *  <code>callcc</code> block. If no arguments are given, the original
+ *  <code>callcc</code> returns <code>nil</code>. If one argument is
+ *  given, <code>callcc</code> returns it. Otherwise, an array
+ *  containing <i>args</i> is returned.
+ *
+ *     callcc {|cont|  cont.call }           #=> nil
+ *     callcc {|cont|  cont.call 1 }         #=> 1
+ *     callcc {|cont|  cont.call 1, 2, 3 }   #=> [1, 2, 3]
+ */
+
+static VALUE
+rb_cont_call(int argc, VALUE *argv, VALUE contval)
+{
+    rb_context_t *cont;
+    rb_thread_t *th = GET_THREAD();
+    GetContPtr(contval, cont);
+
+    if (cont->saved_thread.self != th->self) {
+	rb_raise(rb_eRuntimeError, "continuation called across threads");
+    }
+    if (cont->saved_thread.protect_tag != th->protect_tag) {
+	rb_raise(rb_eRuntimeError, "continuation called across stack rewinding barrier");
+    }
+    if (cont->saved_thread.fiber) {
+	rb_fiber_t *fcont;
+	GetFiberPtr(cont->saved_thread.fiber, fcont);
+
+	if (th->fiber != cont->saved_thread.fiber) {
+	    rb_raise(rb_eRuntimeError, "continuation called across fiber");
+	}
+    }
+    rollback_ensure_stack(contval, th->ensure_list, cont->ensure_array);
+
+    cont->argc = argc;
+    cont->value = make_passing_arg(argc, argv);
+
+    /* restore `tracing' context. see [Feature #4347] */
+    th->trace_arg = cont->saved_thread.trace_arg;
+
+    cont_restore_0(cont, &contval);
+    return Qnil; /* unreachable */
+}
+
+/*********/
+/* fiber */
+/*********/
+
+/*
+ *  Document-class: Fiber
+ *
+ *  Fibers are primitives for implementing light weight cooperative
+ *  concurrency in Ruby. Basically they are a means of creating code blocks
+ *  that can be paused and resumed, much like threads. The main difference
+ *  is that they are never preempted and that the scheduling must be done by
+ *  the programmer and not the VM.
+ *
+ *  As opposed to other stackless light weight concurrency models, each fiber
+ *  comes with a small 4KB stack. This enables the fiber to be paused from deeply
+ *  nested function calls within the fiber block.
+ *
+ *  When a fiber is created it will not run automatically. Rather it must be
+ *  be explicitly asked to run using the <code>Fiber#resume</code> method.
+ *  The code running inside the fiber can give up control by calling
+ *  <code>Fiber.yield</code> in which case it yields control back to caller
+ *  (the caller of the <code>Fiber#resume</code>).
+ *
+ *  Upon yielding or termination the Fiber returns the value of the last
+ *  executed expression
+ *
+ *  For instance:
+ *
+ *    fiber = Fiber.new do
+ *      Fiber.yield 1
+ *      2
+ *    end
+ *
+ *    puts fiber.resume
+ *    puts fiber.resume
+ *    puts fiber.resume
+ *
+ *  <em>produces</em>
+ *
+ *    1
+ *    2
+ *    FiberError: dead fiber called
+ *
+ *  The <code>Fiber#resume</code> method accepts an arbitrary number of
+ *  parameters, if it is the first call to <code>resume</code> then they
+ *  will be passed as block arguments. Otherwise they will be the return
+ *  value of the call to <code>Fiber.yield</code>
+ *
+ *  Example:
+ *
+ *    fiber = Fiber.new do |first|
+ *      second = Fiber.yield first + 2
+ *    end
+ *
+ *    puts fiber.resume 10
+ *    puts fiber.resume 14
+ *    puts fiber.resume 18
+ *
+ *  <em>produces</em>
+ *
+ *    12
+ *    14
+ *    FiberError: dead fiber called
+ *
+ */
+
+static const rb_data_type_t fiber_data_type = {
+    "fiber",
+    {fiber_mark, fiber_free, fiber_memsize,},
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE
+fiber_alloc(VALUE klass)
+{
+    return TypedData_Wrap_Struct(klass, &fiber_data_type, 0);
+}
+
+static rb_fiber_t*
+fiber_t_alloc(VALUE fibval)
+{
+    rb_fiber_t *fib;
+    rb_thread_t *th = GET_THREAD();
+
+    if (DATA_PTR(fibval) != 0) {
+	rb_raise(rb_eRuntimeError, "cannot initialize twice");
+    }
+
+    THREAD_MUST_BE_RUNNING(th);
+    fib = ALLOC(rb_fiber_t);
+    memset(fib, 0, sizeof(rb_fiber_t));
+    fib->cont.self = fibval;
+    fib->cont.type = FIBER_CONTEXT;
+    cont_init(&fib->cont, th);
+    fib->prev = Qnil;
+    fib->status = CREATED;
+
+    DATA_PTR(fibval) = fib;
+
+    return fib;
+}
+
+static VALUE
+fiber_init(VALUE fibval, VALUE proc)
+{
+    rb_fiber_t *fib = fiber_t_alloc(fibval);
+    rb_context_t *cont = &fib->cont;
+    rb_thread_t *th = &cont->saved_thread;
+
+    /* initialize cont */
+    cont->vm_stack = 0;
+
+    th->stack = 0;
+    th->stack_size = 0;
+
+    fiber_link_join(fib);
+
+    th->stack_size = th->vm->default_params.fiber_vm_stack_size / sizeof(VALUE);
+    th->stack = ALLOC_N(VALUE, th->stack_size);
+
+    th->cfp = (void *)(th->stack + th->stack_size);
+    th->cfp--;
+    th->cfp->pc = 0;
+    th->cfp->sp = th->stack + 1;
+#if VM_DEBUG_BP_CHECK
+    th->cfp->bp_check = 0;
+#endif
+    th->cfp->ep = th->stack;
+    *th->cfp->ep = VM_ENVVAL_BLOCK_PTR(0);
+    th->cfp->self = Qnil;
+    th->cfp->klass = Qnil;
+    th->cfp->flag = 0;
+    th->cfp->iseq = 0;
+    th->cfp->proc = 0;
+    th->cfp->block_iseq = 0;
+    th->cfp->me = 0;
+    th->tag = 0;
+    th->local_storage = st_init_numtable();
+
+    th->first_proc = proc;
+
+#if !FIBER_USE_NATIVE
+    MEMCPY(&cont->jmpbuf, &th->root_jmpbuf, rb_jmpbuf_t, 1);
+#endif
+
+    return fibval;
+}
+
+/* :nodoc: */
+static VALUE
+rb_fiber_init(VALUE fibval)
+{
+    return fiber_init(fibval, rb_block_proc());
+}
+
+VALUE
+rb_fiber_new(VALUE (*func)(ANYARGS), VALUE obj)
+{
+    return fiber_init(fiber_alloc(rb_cFiber), rb_proc_new(func, obj));
+}
+
+static VALUE
+return_fiber(void)
+{
+    rb_fiber_t *fib;
+    VALUE curr = rb_fiber_current();
+    VALUE prev;
+    GetFiberPtr(curr, fib);
+
+    prev = fib->prev;
+    if (NIL_P(prev)) {
+	const VALUE root_fiber = GET_THREAD()->root_fiber;
+
+	if (root_fiber == curr) {
+	    rb_raise(rb_eFiberError, "can't yield from root fiber");
+	}
+	return root_fiber;
+    }
+    else {
+	fib->prev = Qnil;
+	return prev;
+    }
+}
+
+VALUE rb_fiber_transfer(VALUE fib, int argc, VALUE *argv);
+
+static void
+rb_fiber_terminate(rb_fiber_t *fib)
+{
+    VALUE value = fib->cont.value;
+    fib->status = TERMINATED;
+#if FIBER_USE_NATIVE && !defined(_WIN32)
+    /* Ruby must not switch to other thread until storing terminated_machine_stack */
+    terminated_machine_stack.ptr = fib->context.uc_stack.ss_sp;
+    terminated_machine_stack.size = fib->context.uc_stack.ss_size / sizeof(VALUE);
+    fib->context.uc_stack.ss_sp = NULL;
+    fib->cont.machine_stack = NULL;
+    fib->cont.machine_stack_size = 0;
+#endif
+    rb_fiber_transfer(return_fiber(), 1, &value);
+}
+
+void
+rb_fiber_start(void)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_fiber_t *fib;
+    rb_context_t *cont;
+    rb_proc_t *proc;
+    int state;
+
+    GetFiberPtr(th->fiber, fib);
+    cont = &fib->cont;
+
+    TH_PUSH_TAG(th);
+    if ((state = EXEC_TAG()) == 0) {
+	int argc;
+	const VALUE *argv, args = cont->value;
+	GetProcPtr(cont->saved_thread.first_proc, proc);
+	argv = (argc = cont->argc) > 1 ? RARRAY_CONST_PTR(args) : &args;
+	cont->value = Qnil;
+	th->errinfo = Qnil;
+	th->root_lep = rb_vm_ep_local_ep(proc->block.ep);
+	th->root_svar = Qnil;
+
+	fib->status = RUNNING;
+	cont->value = rb_vm_invoke_proc(th, proc, argc, argv, 0);
+    }
+    TH_POP_TAG();
+
+    if (state) {
+	if (state == TAG_RAISE || state == TAG_FATAL) {
+	    rb_threadptr_pending_interrupt_enque(th, th->errinfo);
+	}
+	else {
+	    VALUE err = rb_vm_make_jump_tag_but_local_jump(state, th->errinfo);
+	    if (!NIL_P(err))
+		rb_threadptr_pending_interrupt_enque(th, err);
+	}
+	RUBY_VM_SET_INTERRUPT(th);
+    }
+
+    rb_fiber_terminate(fib);
+    rb_bug("rb_fiber_start: unreachable");
+}
+
+static rb_fiber_t *
+root_fiber_alloc(rb_thread_t *th)
+{
+    rb_fiber_t *fib;
+    /* no need to allocate vm stack */
+    fib = fiber_t_alloc(fiber_alloc(rb_cFiber));
+    fib->cont.type = ROOT_FIBER_CONTEXT;
+#if FIBER_USE_NATIVE
+#ifdef _WIN32
+    fib->fib_handle = ConvertThreadToFiber(0);
+#endif
+#endif
+    fib->status = RUNNING;
+    fib->prev_fiber = fib->next_fiber = fib;
+
+    return fib;
+}
+
+VALUE
+rb_fiber_current(void)
+{
+    rb_thread_t *th = GET_THREAD();
+    if (th->fiber == 0) {
+	/* save root */
+	rb_fiber_t *fib = root_fiber_alloc(th);
+	th->root_fiber = th->fiber = fib->cont.self;
+    }
+    return th->fiber;
+}
+
+static VALUE
+fiber_store(rb_fiber_t *next_fib)
+{
+    rb_thread_t *th = GET_THREAD();
+    rb_fiber_t *fib;
+
+    if (th->fiber) {
+	GetFiberPtr(th->fiber, fib);
+	cont_save_thread(&fib->cont, th);
+    }
+    else {
+	/* create current fiber */
+	fib = root_fiber_alloc(th);
+	th->root_fiber = th->fiber = fib->cont.self;
+    }
+
+#if !FIBER_USE_NATIVE
+    cont_save_machine_stack(th, &fib->cont);
+#endif
+
+    if (FIBER_USE_NATIVE || ruby_setjmp(fib->cont.jmpbuf)) {
+#if FIBER_USE_NATIVE
+	fiber_setcontext(next_fib, fib);
+#ifndef _WIN32
+	if (terminated_machine_stack.ptr) {
+	    if (machine_stack_cache_index < MAX_MACHINE_STACK_CACHE) {
+		machine_stack_cache[machine_stack_cache_index].ptr = terminated_machine_stack.ptr;
+		machine_stack_cache[machine_stack_cache_index].size = terminated_machine_stack.size;
+		machine_stack_cache_index++;
+	    }
+	    else {
+		if (terminated_machine_stack.ptr != fib->cont.machine_stack) {
+		    munmap((void*)terminated_machine_stack.ptr, terminated_machine_stack.size * sizeof(VALUE));
+		}
+		else {
+		    rb_bug("terminated fiber resumed");
+		}
+	    }
+	    terminated_machine_stack.ptr = NULL;
+	    terminated_machine_stack.size = 0;
+	}
+#endif
+#endif
+	/* restored */
+	GetFiberPtr(th->fiber, fib);
+	if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
+	return fib->cont.value;
+    }
+#if !FIBER_USE_NATIVE
+    else {
+	return Qundef;
+    }
+#endif
+}
+
+static inline VALUE
+fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
+{
+    VALUE value;
+    rb_fiber_t *fib;
+    rb_context_t *cont;
+    rb_thread_t *th = GET_THREAD();
+
+    GetFiberPtr(fibval, fib);
+    cont = &fib->cont;
+
+    if (th->fiber == fibval) {
+	/* ignore fiber context switch
+         * because destination fiber is same as current fiber
+	 */
+	return make_passing_arg(argc, argv);
+    }
+
+    if (cont->saved_thread.self != th->self) {
+	rb_raise(rb_eFiberError, "fiber called across threads");
+    }
+    else if (cont->saved_thread.protect_tag != th->protect_tag) {
+	rb_raise(rb_eFiberError, "fiber called across stack rewinding barrier");
+    }
+    else if (fib->status == TERMINATED) {
+	value = rb_exc_new2(rb_eFiberError, "dead fiber called");
+	if (th->fiber != fibval) {
+	    GetFiberPtr(th->fiber, fib);
+	    if (fib->status != TERMINATED) rb_exc_raise(value);
+	    fibval = th->root_fiber;
+	}
+	else {
+	    fibval = fib->prev;
+	    if (NIL_P(fibval)) fibval = th->root_fiber;
+	}
+	GetFiberPtr(fibval, fib);
+	cont = &fib->cont;
+	cont->argc = -1;
+	cont->value = value;
+#if FIBER_USE_NATIVE
+	{
+	    VALUE oldfibval;
+	    rb_fiber_t *oldfib;
+	    oldfibval = rb_fiber_current();
+	    GetFiberPtr(oldfibval, oldfib);
+	    fiber_setcontext(fib, oldfib);
+	}
+#else
+	cont_restore_0(cont, &value);
+#endif
+    }
+
+    if (is_resume) {
+	fib->prev = rb_fiber_current();
+    }
+    else {
+	/* restore `tracing' context. see [Feature #4347] */
+	th->trace_arg = cont->saved_thread.trace_arg;
+    }
+
+    cont->argc = argc;
+    cont->value = make_passing_arg(argc, argv);
+
+    value = fiber_store(fib);
+#if !FIBER_USE_NATIVE
+    if (value == Qundef) {
+	cont_restore_0(cont, &value);
+	rb_bug("rb_fiber_resume: unreachable");
+    }
+#endif
+    RUBY_VM_CHECK_INTS(th);
+
+    return value;
+}
+
+VALUE
+rb_fiber_transfer(VALUE fib, int argc, VALUE *argv)
+{
+    return fiber_switch(fib, argc, argv, 0);
+}
+
+VALUE
+rb_fiber_resume(VALUE fibval, int argc, VALUE *argv)
+{
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
+
+    if (fib->prev != Qnil || fib->cont.type == ROOT_FIBER_CONTEXT) {
+	rb_raise(rb_eFiberError, "double resume");
+    }
+    if (fib->transfered != 0) {
+	rb_raise(rb_eFiberError, "cannot resume transferred Fiber");
+    }
+
+    return fiber_switch(fibval, argc, argv, 1);
+}
+
+VALUE
+rb_fiber_yield(int argc, VALUE *argv)
+{
+    return rb_fiber_transfer(return_fiber(), argc, argv);
+}
+
+void
+rb_fiber_reset_root_local_storage(VALUE thval)
+{
+    rb_thread_t *th;
+    rb_fiber_t	*fib;
+
+    GetThreadPtr(thval, th);
+    if (th->root_fiber && th->root_fiber != th->fiber) {
+	GetFiberPtr(th->root_fiber, fib);
+	th->local_storage = fib->cont.saved_thread.local_storage;
+    }
+}
+
+/*
+ *  call-seq:
+ *     fiber.alive? -> true or false
+ *
+ *  Returns true if the fiber can still be resumed (or transferred
+ *  to). After finishing execution of the fiber block this method will
+ *  always return false. You need to <code>require 'fiber'</code>
+ *  before using this method.
+ */
+VALUE
+rb_fiber_alive_p(VALUE fibval)
+{
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
+    return fib->status != TERMINATED ? Qtrue : Qfalse;
+}
+
+/*
+ *  call-seq:
+ *     fiber.resume(args, ...) -> obj
+ *
+ *  Resumes the fiber from the point at which the last <code>Fiber.yield</code>
+ *  was called, or starts running it if it is the first call to
+ *  <code>resume</code>. Arguments passed to resume will be the value of
+ *  the <code>Fiber.yield</code> expression or will be passed as block
+ *  parameters to the fiber's block if this is the first <code>resume</code>.
+ *
+ *  Alternatively, when resume is called it evaluates to the arguments passed
+ *  to the next <code>Fiber.yield</code> statement inside the fiber's block
+ *  or to the block value if it runs to completion without any
+ *  <code>Fiber.yield</code>
+ */
+static VALUE
+rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
+{
+    return rb_fiber_resume(fib, argc, argv);
+}
+
+/*
+ *  call-seq:
+ *     fiber.transfer(args, ...) -> obj
+ *
+ *  Transfer control to another fiber, resuming it from where it last
+ *  stopped or starting it if it was not resumed before. The calling
+ *  fiber will be suspended much like in a call to
+ *  <code>Fiber.yield</code>. You need to <code>require 'fiber'</code>
+ *  before using this method.
+ *
+ *  The fiber which receives the transfer call is treats it much like
+ *  a resume call. Arguments passed to transfer are treated like those
+ *  passed to resume.
+ *
+ *  You cannot resume a fiber that transferred control to another one.
+ *  This will cause a double resume error. You need to transfer control
+ *  back to this fiber before it can yield and resume.
+ *
+ *  Example:
+ *
+ *    fiber1 = Fiber.new do
+ *      puts "In Fiber 1"
+ *      Fiber.yield
+ *    end
+ *
+ *    fiber2 = Fiber.new do
+ *      puts "In Fiber 2"
+ *      fiber1.transfer
+ *      puts "Never see this message"
+ *    end
+ *
+ *    fiber3 = Fiber.new do
+ *      puts "In Fiber 3"
+ *    end
+ *
+ *    fiber2.resume
+ *    fiber3.resume
+ *
+ *    <em>produces</em>
+ *
+ *    In fiber 2
+ *    In fiber 1
+ *    In fiber 3
+ *
+ */
+static VALUE
+rb_fiber_m_transfer(int argc, VALUE *argv, VALUE fibval)
+{
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
+    fib->transfered = 1;
+    return rb_fiber_transfer(fibval, argc, argv);
+}
+
+/*
+ *  call-seq:
+ *     Fiber.yield(args, ...) -> obj
+ *
+ *  Yields control back to the context that resumed the fiber, passing
+ *  along any arguments that were passed to it. The fiber will resume
+ *  processing at this point when <code>resume</code> is called next.
+ *  Any arguments passed to the next <code>resume</code> will be the
+ *  value that this <code>Fiber.yield</code> expression evaluates to.
+ */
+static VALUE
+rb_fiber_s_yield(int argc, VALUE *argv, VALUE klass)
+{
+    return rb_fiber_yield(argc, argv);
+}
+
+/*
+ *  call-seq:
+ *     Fiber.current() -> fiber
+ *
+ *  Returns the current fiber. You need to <code>require 'fiber'</code>
+ *  before using this method. If you are not running in the context of
+ *  a fiber this method will return the root fiber.
+ */
+static VALUE
+rb_fiber_s_current(VALUE klass)
+{
+    return rb_fiber_current();
+}
+
+
+
+/*
+ *  Document-class: FiberError
+ *
+ *  Raised when an invalid operation is attempted on a Fiber, in
+ *  particular when attempting to call/resume a dead fiber,
+ *  attempting to yield from the root fiber, or calling a fiber across
+ *  threads.
+ *
+ *     fiber = Fiber.new{}
+ *     fiber.resume #=> nil
+ *     fiber.resume #=> FiberError: dead fiber called
+ */
+
+void
+Init_Cont(void)
+{
+#if FIBER_USE_NATIVE
+    rb_thread_t *th = GET_THREAD();
+
+#ifdef _WIN32
+    SYSTEM_INFO info;
+    GetSystemInfo(&info);
+    pagesize = info.dwPageSize;
+#else /* not WIN32 */
+    pagesize = sysconf(_SC_PAGESIZE);
+#endif
+    SET_MACHINE_STACK_END(&th->machine_stack_end);
+#endif
+
+    rb_cFiber = rb_define_class("Fiber", rb_cObject);
+    rb_define_alloc_func(rb_cFiber, fiber_alloc);
+    rb_eFiberError = rb_define_class("FiberError", rb_eStandardError);
+    rb_define_singleton_method(rb_cFiber, "yield", rb_fiber_s_yield, -1);
+    rb_define_method(rb_cFiber, "initialize", rb_fiber_init, 0);
+    rb_define_method(rb_cFiber, "resume", rb_fiber_m_resume, -1);
+}
+
+RUBY_SYMBOL_EXPORT_BEGIN
+
+void
+ruby_Init_Continuation_body(void)
+{
+    rb_cContinuation = rb_define_class("Continuation", rb_cObject);
+    rb_undef_alloc_func(rb_cContinuation);
+    rb_undef_method(CLASS_OF(rb_cContinuation), "new");
+    rb_define_method(rb_cContinuation, "call", rb_cont_call, -1);
+    rb_define_method(rb_cContinuation, "[]", rb_cont_call, -1);
+    rb_define_global_function("callcc", rb_callcc, 0);
+}
+
+void
+ruby_Init_Fiber_as_Coroutine(void)
+{
+    rb_define_method(rb_cFiber, "transfer", rb_fiber_m_transfer, -1);
+    rb_define_method(rb_cFiber, "alive?", rb_fiber_alive_p, 0);
+    rb_define_singleton_method(rb_cFiber, "current", rb_fiber_s_current, 0);
+}
+
+RUBY_SYMBOL_EXPORT_END
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 734d8702a6..5bd414d786 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -1,14 +1,18 @@
 include Makefile
 
 ENABLE_SHARED=@ENABLE_SHARED@
-DLLWRAP = @DLLWRAP@ --target=@target_os@
+DLLWRAP = @DLLWRAP@ --target=@target_os@ --driver-name="$(CC)"
+WINDRES = @WINDRES@ --preprocessor="$(CPP) -xc" -DRC_INVOKED
 
 ifeq (@target_os@,cygwin)
-  DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
+  DLL_BASE_NAME := $(LIBRUBY_SO:.dll=)
 else
   DLL_BASE_NAME := $(RUBY_SO_NAME)
   DLLWRAP += -mno-cygwin
-  VPATH += $(srcdir)/win32
+  VPATH := $(VPATH):$(srcdir)/win32
+  STUBPROGRAM = rubystub$(EXEEXT)
+  IGNOREDPATTERNS = %~ .% %.orig %.rej \#%\#
+  SCRIPTPROGRAMS = $(addsuffix $(EXEEXT),$(filter-out $(IGNOREDPATTERNS),$(notdir $(wildcard $(srcdir)/bin/*))))
 endif
 
 ifneq ($(ENABLE_SHARED),yes)
@@ -25,21 +29,34 @@ else
 endif
 
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
+
+-include uncommon.mk
+
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
+EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
+RUBYDEF = $(DLL_BASE_NAME).def
 
 ruby: $(PROGRAM)
 rubyw: $(WPROGRAM)
+stub: $(STUBPROGRAM)
+scriptbin: $(SCRIPTPROGRAMS)
+
+%$(EXEEXT): bin/% $(STUBPROGRAM)
+	$(ECHO) generating $@
+	$(Q) { cat $(STUBPROGRAM); echo; sed -e '1{' -e '/^#!.*ruby/!i\' -e '#!/bin/ruby' -e '}' $<; } > $@
+	$(Q) chmod +x $@
 
 $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
 $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
 
 %.res.@OBJEXT@: %.rc
-	@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
+	$(ECHO) compiling $@
+	$(Q) $(WINDRES) --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
 
-$(RCFILES): $(RBCONFIG) $(srcdir)/version.h $(srcdir)/win32/resource.rb
-	@$(MINIRUBY) $(srcdir)/win32/resource.rb \
+$(RCFILES): $(RBCONFIG) $(srcdir)/revision.h $(srcdir)/win32/resource.rb
+	$(ECHO) generating $@
+	$(Q) $(MINIRUBY) $(srcdir)/win32/resource.rb \
 	  -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
 	  -so_name=$(DLL_BASE_NAME) \
 	  . $(icondirs) $(srcdir)/win32
@@ -47,32 +64,46 @@ $(RCFILES): $(RBCONFIG) $(srcdir)/version.h $(srcdir)/win32/resource.rb
 $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@
 $(WPROGRAM): $(RUBYW_INSTALL_NAME).res.@OBJEXT@
 	@rm -f $@
-	$(PURIFY) $(CC) -mwindows -e _mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
+	$(ECHO) linking $@
+	$(Q) $(PURIFY) $(CC) -mwindows -e $(SYMBOL_PREFIX)mainCRTStartup $(LDFLAGS) $(XLDFLAGS) \
 	  $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
+$(STUBPROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ stub.@OBJEXT@
+	@rm -f $@
+	$(ECHO) linking $@
+	$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) \
+	  stub.@OBJEXT@ $(EXTOBJS) $(LIBRUBYARG) $(LIBS) -o $@
 
 $(RUBY_EXP): $(LIBRUBY_A)
-	$(DLLWRAP) \
+	$(ECHO) creating $@
+	$(Q) $(DLLWRAP) \
 	  --output-exp=$(RUBY_EXP) \
 	  --export-all $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
-	$(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
+	$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) dmyext.o $(SOLIBS) -o $(PROGRAM)
 	@rm -f $(PROGRAM)
 
 GNUmakefile:	$(srcdir)/cygwin/GNUmakefile.in
 
 ifeq (@target_os@,mingw32)
-$(OBJS) $(MAINOBJ): win32/win32.h
+$(OBJS) $(MAINOBJ): win32.h
+
+dir.$(OBJEXT) win32.$(OBJEXT): win32/dir.h
 endif
 
+$(LIBRUBY_SO): $(RUBYDEF)
+
+$(RUBYDEF): $(LIBRUBY_A) $(PREP) $(RBCONFIG)
+	$(ECHO) generating $@
+	$(Q) $(MINIRUBY) $(srcdir)/win32/mkexports.rb -output=$@ $(LIBRUBY_A)
+
+clean-local::
+	@$(RM) $(RUBYDEF)
+
 ifeq (@target_os@,cygwin)
-cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR).dll: $(LIBRUBY_A)
-	@NM@ --extern --defined $(LIBRUBY_A) | \
-	  $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=cyg$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def
-	@DLLWRAP@ -s --def=rubydll.def -o $@
-	@rm -f rubydll.def
+cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) $(RUBYDEF)
+	$(ECHO) generating $@
+	$(Q) @DLLWRAP@ -s --def=$(RUBYDEF) -o $@
 endif
 
 clean-local::
 	@$(RM) $(RUBY_EXP) $(RCFILES:.rc=.res.@OBJEXT@)
-
-distclean-local::
 	@$(RM) $(RCFILES)
diff --git a/debug.c b/debug.c
new file mode 100644
index 0000000000..2f1e03cc3a
--- /dev/null
+++ b/debug.c
@@ -0,0 +1,162 @@
+/**********************************************************************
+
+  debug.c -
+
+  $Author$
+  created at: 04/08/25 02:31:54 JST
+
+  Copyright (C) 2004-2007 Koichi Sasada
+
+**********************************************************************/
+
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+#include "ruby/util.h"
+#include "vm_debug.h"
+#include "eval_intern.h"
+#include "vm_core.h"
+#include "id.h"
+
+/* for gdb */
+const union {
+    enum ruby_special_consts    special_consts;
+    enum ruby_value_type        value_type;
+    enum ruby_tag_type          tag_type;
+    enum node_type              node_type;
+    enum ruby_method_ids        method_ids;
+    enum ruby_id_types          id_types;
+    enum {
+        RUBY_ENCODING_INLINE_MAX = ENCODING_INLINE_MAX,
+        RUBY_ENCODING_SHIFT = ENCODING_SHIFT,
+        RUBY_ENC_CODERANGE_MASK    = ENC_CODERANGE_MASK,
+        RUBY_ENC_CODERANGE_UNKNOWN = ENC_CODERANGE_UNKNOWN,
+        RUBY_ENC_CODERANGE_7BIT    = ENC_CODERANGE_7BIT,
+        RUBY_ENC_CODERANGE_VALID   = ENC_CODERANGE_VALID,
+        RUBY_ENC_CODERANGE_BROKEN  = ENC_CODERANGE_BROKEN,
+        RUBY_FL_WB_PROTECTED     = FL_WB_PROTECTED,
+        RUBY_FL_PROMOTED    = FL_PROMOTED,
+        RUBY_FL_FINALIZE    = FL_FINALIZE,
+        RUBY_FL_TAINT       = FL_TAINT,
+        RUBY_FL_EXIVAR      = FL_EXIVAR,
+        RUBY_FL_FREEZE      = FL_FREEZE,
+        RUBY_FL_SINGLETON   = FL_SINGLETON,
+        RUBY_FL_USER0       = FL_USER0,
+        RUBY_FL_USER1       = FL_USER1,
+        RUBY_FL_USER2       = FL_USER2,
+        RUBY_FL_USER3       = FL_USER3,
+        RUBY_FL_USER4       = FL_USER4,
+        RUBY_FL_USER5       = FL_USER5,
+        RUBY_FL_USER6       = FL_USER6,
+        RUBY_FL_USER7       = FL_USER7,
+        RUBY_FL_USER8       = FL_USER8,
+        RUBY_FL_USER9       = FL_USER9,
+        RUBY_FL_USER10      = FL_USER10,
+        RUBY_FL_USER11      = FL_USER11,
+        RUBY_FL_USER12      = FL_USER12,
+        RUBY_FL_USER13      = FL_USER13,
+        RUBY_FL_USER14      = FL_USER14,
+        RUBY_FL_USER15      = FL_USER15,
+        RUBY_FL_USER16      = FL_USER16,
+        RUBY_FL_USER17      = FL_USER17,
+        RUBY_FL_USER18      = FL_USER18,
+        RUBY_FL_USHIFT      = FL_USHIFT,
+        RUBY_NODE_TYPESHIFT = NODE_TYPESHIFT,
+        RUBY_NODE_TYPEMASK  = NODE_TYPEMASK,
+        RUBY_NODE_LSHIFT    = NODE_LSHIFT,
+        RUBY_NODE_FL_NEWLINE   = NODE_FL_NEWLINE
+    } various;
+} ruby_dummy_gdb_enums;
+
+const VALUE RUBY_FL_USER19    = FL_USER19;
+const SIGNED_VALUE RUBY_NODE_LMASK = NODE_LMASK;
+const VALUE RUBY_ENCODING_MASK  = ENCODING_MASK;
+
+int
+ruby_debug_print_indent(int level, int debug_level, int indent_level)
+{
+    if (level < debug_level) {
+	fprintf(stderr, "%*s", indent_level, "");
+	fflush(stderr);
+	return TRUE;
+    }
+    return FALSE;
+}
+
+void
+ruby_debug_printf(const char *format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+    vfprintf(stderr, format, ap);
+    va_end(ap);
+}
+
+VALUE
+ruby_debug_print_value(int level, int debug_level, const char *header, VALUE obj)
+{
+    if (level < debug_level) {
+	VALUE str;
+	str = rb_inspect(obj);
+	fprintf(stderr, "DBG> %s: %s\n", header,
+		obj == (VALUE)(SIGNED_VALUE)-1 ? "" : StringValueCStr(str));
+	fflush(stderr);
+    }
+    return obj;
+}
+
+void
+ruby_debug_print_v(VALUE v)
+{
+    ruby_debug_print_value(0, 1, "", v);
+}
+
+ID
+ruby_debug_print_id(int level, int debug_level, const char *header, ID id)
+{
+    if (level < debug_level) {
+	fprintf(stderr, "DBG> %s: %s\n", header, rb_id2name(id));
+	fflush(stderr);
+    }
+    return id;
+}
+
+NODE *
+ruby_debug_print_node(int level, int debug_level, const char *header, const NODE *node)
+{
+    if (level < debug_level) {
+	fprintf(stderr, "DBG> %s: %s (%u)\n", header,
+		ruby_node_name(nd_type(node)), nd_line(node));
+    }
+    return (NODE *)node;
+}
+
+void
+ruby_debug_breakpoint(void)
+{
+    /* */
+}
+
+static void
+set_debug_option(const char *str, int len, void *arg)
+{
+#define SET_WHEN(name, var) do {	    \
+	if (len == sizeof(name) - 1 &&	    \
+	    strncmp(str, (name), len) == 0) { \
+	    extern int var;	    \
+	    var = 1;		    \
+	    return;			    \
+	}				    \
+    } while (0)
+    SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr);
+    SET_WHEN("core", ruby_enable_coredump);
+#if defined _WIN32 && defined _MSC_VER && _MSC_VER >= 1400
+    SET_WHEN("rtc_error", ruby_w32_rtc_error);
+#endif
+    fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
+}
+
+void
+ruby_set_debug_option(const char *str)
+{
+    ruby_each_words(str, set_debug_option, 0);
+}
diff --git a/defines.h b/defines.h
deleted file mode 100644
index f39097fea4..0000000000
--- a/defines.h
+++ /dev/null
@@ -1,273 +0,0 @@
-/************************************************
-
-  defines.h -
-
-  $Author$
-  $Date$
-  created at: Wed May 18 00:21:44 JST 1994
-
-************************************************/
-#ifndef DEFINES_H
-#define DEFINES_H
-
-#define RUBY
-
-#ifdef __cplusplus
-# ifndef  HAVE_PROTOTYPES
-#  define HAVE_PROTOTYPES 1
-# endif
-# ifndef  HAVE_STDARG_PROTOTYPES
-#  define HAVE_STDARG_PROTOTYPES 1
-# endif
-#endif
-
-#undef _
-#ifdef HAVE_PROTOTYPES
-# define _(args) args
-#else
-# define _(args) ()
-#endif
-
-#undef __
-#ifdef HAVE_STDARG_PROTOTYPES
-# define __(args) args
-#else
-# define __(args) ()
-#endif
-
-#ifdef __cplusplus
-#define ANYARGS ...
-#else
-#define ANYARGS
-#endif
-
-#define xmalloc ruby_xmalloc
-#define xcalloc ruby_xcalloc
-#define xrealloc ruby_xrealloc
-#define xfree ruby_xfree
-
-void *xmalloc _((long));
-void *xcalloc _((long,long));
-void *xrealloc _((void*,long));
-void xfree _((void*));
-
-#if SIZEOF_LONG_LONG > 0
-# define LONG_LONG long long
-#elif SIZEOF___INT64 > 0
-# define HAVE_LONG_LONG 1
-# define LONG_LONG __int64
-# undef SIZEOF_LONG_LONG
-# define SIZEOF_LONG_LONG SIZEOF___INT64
-#endif
-
-#if SIZEOF_INT*2 <= SIZEOF_LONG_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned LONG_LONG
-# define BDIGIT_DBL_SIGNED LONG_LONG
-#elif SIZEOF_INT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned int
-# define SIZEOF_BDIGITS SIZEOF_INT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#elif SIZEOF_SHORT*2 <= SIZEOF_LONG
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS SIZEOF_SHORT
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#else
-# define BDIGIT unsigned short
-# define SIZEOF_BDIGITS (SIZEOF_LONG/2)
-# define BDIGIT_DBL unsigned long
-# define BDIGIT_DBL_SIGNED long
-#endif
-
-#ifdef __CYGWIN__
-#undef _WIN32
-#endif
-
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__EMX__)
-#define DOSISH 1
-#ifndef _WIN32_WCE
-# define DOSISH_DRIVE_LETTER
-#endif
-#endif
-
-/* define RUBY_USE_EUC/SJIS for default kanji-code */
-#ifndef DEFAULT_KCODE
-#if defined(DOSISH) || defined(__CYGWIN__) || defined(__MACOS__) || defined(OS2)
-#define DEFAULT_KCODE KCODE_SJIS
-#else
-#define DEFAULT_KCODE KCODE_EUC
-#endif
-#endif
-
-#if defined(__NeXT__) || defined(__APPLE__)
-/* Do not trust WORDS_BIGENDIAN from configure since -arch compiler flag may
-   result in a different endian.  Instead trust __BIG_ENDIAN__ and
-   __LITTLE_ENDIAN__ which are set correctly by -arch. */
-#undef WORDS_BIGENDIAN
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN
-#endif
-#endif
-
-#ifdef __NeXT__
-/* NextStep, OpenStep, Rhapsody */
-#ifndef S_IRUSR
-#define S_IRUSR 0000400        /* read permission, owner */
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP 0000040        /* read permission, group */
-#endif
-#ifndef S_IROTH
-#define S_IROTH 0000004        /* read permission, other */
-#endif
-#ifndef S_IWUSR
-#define S_IWUSR 0000200        /* write permission, owner */
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 0000020        /* write permission, group */
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 0000002        /* write permission, other */
-#endif
-#ifndef S_IXUSR
-#define S_IXUSR 0000100        /* execute/search permission, owner */
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0000010        /* execute/search permission, group */
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0000001        /* execute/search permission, other */
-#endif
-#ifndef S_IRWXU
-#define S_IRWXU 0000700        /* read, write, execute permissions, owner */
-#endif
-#ifndef S_IRWXG
-#define S_IRWXG 0000070        /* read, write, execute permissions, group */
-#endif
-#ifndef S_IRWXO
-#define S_IRWXO 0000007        /* read, write, execute permissions, other */
-#endif
-#ifndef S_ISBLK
-#define S_ISBLK(mode)  (((mode) & (0170000)) == (0060000))
-#endif
-#ifndef S_ISCHR
-#define S_ISCHR(mode)  (((mode) & (0170000)) == (0020000))
-#endif
-#ifndef S_ISDIR
-#define S_ISDIR(mode)  (((mode) & (0170000)) == (0040000))
-#endif
-#ifndef S_ISFIFO
-#define S_ISFIFO(mode) (((mode) & (0170000)) == (0010000))
-#endif
-#ifndef S_ISREG
-#define S_ISREG(mode)  (((mode) & (0170000)) == (0100000))
-#endif
-#ifndef __APPLE__
-/* NextStep, OpenStep (but not Rhapsody) */
-#ifndef GETPGRP_VOID
-#define GETPGRP_VOID 1
-#endif
-#ifndef WNOHANG
-#define WNOHANG 01
-#endif
-#ifndef WUNTRACED
-#define WUNTRACED 02
-#endif
-#ifndef X_OK
-#define X_OK 1
-#endif
-#endif /* __APPLE__ */
-#endif /* NeXT */
-
-#ifdef _WIN32
-#include "win32/win32.h"
-#endif
-
-#if defined(__VMS)
-#include "vms.h"
-#endif
-
-#if defined(__BEOS__)
-#include <net/socket.h> /* intern.h needs fd_set definition */
-#endif
-
-#ifdef RUBY_EXPORT
-#undef RUBY_EXTERN
-#endif
-
-#ifndef RUBY_EXTERN
-#define RUBY_EXTERN extern
-#endif
-
-#ifndef EXTERN
-#define EXTERN RUBY_EXTERN	/* deprecated */
-#endif
-
-#ifndef RUBY_MBCHAR_MAXSIZE
-#define RUBY_MBCHAR_MAXSIZE INT_MAX
-        /* MB_CUR_MAX will not work well in C locale */
-#endif
-
-#if defined(sparc) || defined(__sparc__)
-static inline void
-flush_register_windows(void)
-{
-    asm
-#ifdef __GNUC__
-	volatile
-#endif
-# if defined(__sparc_v9__) || defined(__sparcv9) || defined(__arch64__)
-	("flushw")
-# else
-	("ta  0x03")
-# endif /* trap always to flush register windows if we are on a Sparc system */
-	;
-}
-#  define FLUSH_REGISTER_WINDOWS flush_register_windows()
-#elif defined(__ia64)
-void *rb_ia64_bsp(void);
-void rb_ia64_flushrs(void);
-#  define FLUSH_REGISTER_WINDOWS rb_ia64_flushrs()
-#else
-#  define FLUSH_REGISTER_WINDOWS ((void)0)
-#endif
-
-#if defined(DOSISH)
-#define PATH_SEP ";"
-#elif defined(riscos)
-#define PATH_SEP ","
-#else
-#define PATH_SEP ":"
-#endif
-#define PATH_SEP_CHAR PATH_SEP[0]
-
-#if defined(__human68k__)
-#define PATH_ENV "path"
-#else
-#define PATH_ENV "PATH"
-#endif
-
-#if defined(DOSISH) && !defined(__human68k__) && !defined(__EMX__)
-#define ENV_IGNORECASE
-#endif
-
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH || defined __VMS
-#   define CASEFOLD_FILESYSTEM 1
-# else
-#   define CASEFOLD_FILESYSTEM 0
-# endif
-#endif
-
-#ifndef DLEXT_MAXLEN
-#define DLEXT_MAXLEN 4
-#endif
-
-#ifndef RUBY_PLATFORM
-#define RUBY_PLATFORM "unknown-unknown"
-#endif
-
-#endif
diff --git a/defs/default_gems b/defs/default_gems
new file mode 100644
index 0000000000..e73e383b26
--- /dev/null
+++ b/defs/default_gems
@@ -0,0 +1,5 @@
+# gem		base directory		versioning file			[executable files under bin]
+rake		lib/rake		lib/rake/version.rb		[rake]
+rdoc		lib/rdoc		lib/rdoc.rb			[rdoc ri]
+minitest	lib/minitest		lib/minitest/unit.rb
+json		ext/json		ext/json/lib/json/version.rb
diff --git a/defs/gmake.mk b/defs/gmake.mk
new file mode 100644
index 0000000000..0acb88ef57
--- /dev/null
+++ b/defs/gmake.mk
@@ -0,0 +1,29 @@
+# -*- makefile-gmake -*-
+TEST_TARGETS := $(filter check test check% test% btest%,$(MAKECMDGOALS))
+TEST_TARGETS += $(subst check,test-all,$(patsubst check-%,test-%,$(TEST_TARGETS)))
+TEST_TARGETS := $(patsubst test-%,yes-test-%,$(patsubst btest-%,yes-btest-%,$(TEST_TARGETS)))
+TEST_DEPENDS := $(if $(TEST_TARGETS),$(filter all main exts,$(MAKECMDGOALS)))
+TEST_DEPENDS += $(TEST_DEPENDS) $(if $(filter check%,$(MAKECMDGOALS)),main)
+
+ifneq ($(filter check% test,$(MAKECMDGOALS)),)
+yes-test-knownbug: $(TEST_DEPENDS) yes-btest-ruby
+yes-btest-ruby: $(TEST_DEPENDS) yes-test-sample
+yes-test-sample: $(TEST_DEPENDS)
+endif
+ifneq ($(filter check%,$(MAKECMDGOALS)) $(filter test-all,$(TEST_TARGETS)),)
+yes-test-all yes-test-ruby: $(filter-out %test-all %test-ruby check%,$(TEST_TARGETS))
+endif
+ifneq ($(filter check%,$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
+yes-test-all yes-test-ruby: yes-test-knownbug
+endif
+
+$(TEST_TARGETS): $(TEST_DEPENDS)
+
+ifneq ($(if $(filter install,$(MAKECMDGOALS)),$(filter uninstall,$(MAKECMDGOALS))),)
+install-targets := $(filter install uninstall,$(MAKECMDGOALS))
+$(word 1,$(install-targets)): $(word 0,$(install-targets))
+endif
+
+ifneq ($(filter reinstall,$(MAKECMDGOALS)),)
+install: uninstall
+endif
diff --git a/defs/id.def b/defs/id.def
new file mode 100644
index 0000000000..53ed3775ad
--- /dev/null
+++ b/defs/id.def
@@ -0,0 +1,105 @@
+# -*- mode: ruby; coding: us-ascii -*-
+firstline, predefined = __LINE__+1, %[\
+  freeze
+  inspect
+  intern
+  object_id
+  const_missing
+  method_missing                                        MethodMissing
+  method_added
+  singleton_method_added
+  method_removed
+  singleton_method_removed
+  method_undefined
+  singleton_method_undefined
+  length
+  size
+  gets
+  succ
+  each
+  proc
+  lambda
+  send
+  __send__
+  __attached__
+  initialize
+  initialize_copy
+  initialize_clone
+  initialize_dup
+  _                                                     UScore
+  "/*NULL*/"                                            NULL
+  empty?
+  eql?
+  respond_to?                                           Respond_to
+  respond_to_missing?                                   Respond_to_missing
+  <IFUNC>
+  <CFUNC>
+  core#set_method_alias
+  core#set_variable_alias
+  core#undef_method
+  core#define_method
+  core#define_singleton_method
+  core#set_postexe
+  core#hash_from_ary
+  core#hash_merge_ary
+  core#hash_merge_ptr
+  core#hash_merge_kwd
+]
+
+class KeywordError < RuntimeError
+  def self.raise(mesg, line)
+    super(self, mesg, ["#{__FILE__}:#{line}", *caller])
+  end
+end
+
+predefined_ids = {}
+preserved_ids = []
+local_ids = []
+instance_ids = []
+global_ids = []
+const_ids = []
+class_ids = []
+names = {}
+predefined.split(/^/).each_with_index do |line, num|
+  next if /^#/ =~ line
+  line.sub!(/\s+#.*/, '')
+  name, token = line.split
+  next unless name
+  token ||= name
+  if /#/ =~ token
+    token = "_#{token.gsub(/\W+/, '_')}"
+  else
+    token = token.sub(/\?/, 'P').sub(/\A[a-z]/) {$&.upcase}
+    token.sub!(/\A\$/, "_G_")
+    token.sub!(/\A@@/, "_C_")
+    token.sub!(/\A@/, "_I_")
+    token.gsub!(/\W+/, "")
+  end
+  if prev = names[name]
+    KeywordError.raise("#{name} is already registered at line #{prev+firstline}", firstline+num)
+  end
+  if prev = predefined_ids[token]
+    KeywordError.raise("#{token} is already used for #{prev} at line #{names[prev]+firstline}", firstline+num)
+  end
+  names[name] = num
+  case name
+  when /\A[A-Z]\w*\z/; const_ids
+  when /\A(?!\d)\w+\z/; local_ids
+  when /\A\$(?:\d+|(?!\d)\w+)\z/; global_ids
+  when /\A@@(?!\d)\w+\z/; class_ids
+  when /\A@(?!\d)\w+\z/; instance_ids
+  when /\A((?!\d)\w+)=\z/
+    KeywordError.raise("use ID2ATTRSET(#{$1}) instead of ATTRSET #{name}", firstline+num)
+  else preserved_ids
+  end << token
+  predefined_ids[token] = name
+end
+{
+  "LOCAL" => local_ids,
+  "INSTANCE" => instance_ids,
+  "GLOBAL" => global_ids,
+  "CONST" => const_ids,
+  "CLASS" => class_ids,
+  :preserved => preserved_ids,
+  :predefined => predefined_ids,
+}
diff --git a/defs/keywords b/defs/keywords
new file mode 100644
index 0000000000..1b5719aa85
--- /dev/null
+++ b/defs/keywords
@@ -0,0 +1,53 @@
+%{
+struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
+const struct kwtable *rb_reserved_word(const char *, unsigned int);
+#ifndef RIPPER
+static const struct kwtable *reserved_word(const char *, unsigned int);
+#define rb_reserved_word(str, len) reserved_word(str, len)
+%}
+
+struct kwtable;
+%%
+__ENCODING__, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END
+__LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END
+__FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END
+BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END
+END, {keyword_END, keyword_END}, EXPR_END
+alias, {keyword_alias, keyword_alias}, EXPR_FNAME
+and, {keyword_and, keyword_and}, EXPR_VALUE
+begin, {keyword_begin, keyword_begin}, EXPR_BEG
+break, {keyword_break, keyword_break}, EXPR_MID
+case, {keyword_case, keyword_case}, EXPR_VALUE
+class, {keyword_class, keyword_class}, EXPR_CLASS
+def, {keyword_def, keyword_def}, EXPR_FNAME
+defined?, {keyword_defined, keyword_defined}, EXPR_ARG
+do, {keyword_do, keyword_do}, EXPR_BEG
+else, {keyword_else, keyword_else}, EXPR_BEG
+elsif, {keyword_elsif, keyword_elsif}, EXPR_VALUE
+end, {keyword_end, keyword_end}, EXPR_END
+ensure, {keyword_ensure, keyword_ensure}, EXPR_BEG
+false, {keyword_false, keyword_false}, EXPR_END
+for, {keyword_for, keyword_for}, EXPR_VALUE
+if, {keyword_if, modifier_if}, EXPR_VALUE
+in, {keyword_in, keyword_in}, EXPR_VALUE
+module, {keyword_module, keyword_module}, EXPR_VALUE
+next, {keyword_next, keyword_next}, EXPR_MID
+nil, {keyword_nil, keyword_nil}, EXPR_END
+not, {keyword_not, keyword_not}, EXPR_ARG
+or, {keyword_or, keyword_or}, EXPR_VALUE
+redo, {keyword_redo, keyword_redo}, EXPR_END
+rescue, {keyword_rescue, modifier_rescue}, EXPR_MID
+retry, {keyword_retry, keyword_retry}, EXPR_END
+return, {keyword_return, keyword_return}, EXPR_MID
+self, {keyword_self, keyword_self}, EXPR_END
+super, {keyword_super, keyword_super}, EXPR_ARG
+then, {keyword_then, keyword_then}, EXPR_BEG
+true, {keyword_true, keyword_true}, EXPR_END
+undef, {keyword_undef, keyword_undef}, EXPR_FNAME
+unless, {keyword_unless, modifier_unless}, EXPR_VALUE
+until, {keyword_until, modifier_until}, EXPR_VALUE
+when, {keyword_when, keyword_when}, EXPR_VALUE
+while, {keyword_while, modifier_while}, EXPR_VALUE
+yield, {keyword_yield, keyword_yield}, EXPR_ARG
+%%
+#endif
diff --git a/defs/known_errors.def b/defs/known_errors.def
new file mode 100644
index 0000000000..3cebe90a8e
--- /dev/null
+++ b/defs/known_errors.def
@@ -0,0 +1,145 @@
+EPERM
+ENOENT
+ESRCH
+EINTR
+EIO
+ENXIO
+E2BIG
+ENOEXEC
+EBADF
+ECHILD
+EAGAIN
+ENOMEM
+EACCES
+EFAULT
+ENOTBLK
+EBUSY
+EEXIST
+EXDEV
+ENODEV
+ENOTDIR
+EISDIR
+EINVAL
+ENFILE
+EMFILE
+ENOTTY
+ETXTBSY
+EFBIG
+ENOSPC
+ESPIPE
+EROFS
+EMLINK
+EPIPE
+EDOM
+ERANGE
+EDEADLK
+ENAMETOOLONG
+ENOLCK
+ENOSYS
+ENOTEMPTY
+ELOOP
+EWOULDBLOCK
+ENOMSG
+EIDRM
+ECHRNG
+EL2NSYNC
+EL3HLT
+EL3RST
+ELNRNG
+EUNATCH
+ENOCSI
+EL2HLT
+EBADE
+EBADR
+EXFULL
+ENOANO
+EBADRQC
+EBADSLT
+EDEADLOCK
+EBFONT
+ENOSTR
+ENODATA
+ETIME
+ENOSR
+ENONET
+ENOPKG
+EREMOTE
+ENOLINK
+EADV
+ESRMNT
+ECOMM
+EPROTO
+EMULTIHOP
+EDOTDOT
+EBADMSG
+EOVERFLOW
+ENOTUNIQ
+EBADFD
+EREMCHG
+ELIBACC
+ELIBBAD
+ELIBSCN
+ELIBMAX
+ELIBEXEC
+EILSEQ
+ERESTART
+ESTRPIPE
+EUSERS
+ENOTSOCK
+EDESTADDRREQ
+EMSGSIZE
+EPROTOTYPE
+ENOPROTOOPT
+EPROTONOSUPPORT
+ESOCKTNOSUPPORT
+EOPNOTSUPP
+EPFNOSUPPORT
+EAFNOSUPPORT
+EADDRINUSE
+EADDRNOTAVAIL
+ENETDOWN
+ENETUNREACH
+ENETRESET
+ECONNABORTED
+ECONNRESET
+ENOBUFS
+EISCONN
+ENOTCONN
+ESHUTDOWN
+ETOOMANYREFS
+ETIMEDOUT
+ECONNREFUSED
+EHOSTDOWN
+EHOSTUNREACH
+EALREADY
+EINPROGRESS
+ESTALE
+EUCLEAN
+ENOTNAM
+ENAVAIL
+EISNAM
+EREMOTEIO
+EDQUOT
+ECANCELED
+EKEYEXPIRED
+EKEYREJECTED
+EKEYREVOKED
+EMEDIUMTYPE
+ENOKEY
+ENOMEDIUM
+ENOTRECOVERABLE
+EOWNERDEAD
+ERFKILL
+EAUTH
+EBADRPC
+EDOOFUS
+EFTYPE
+ENEEDAUTH
+ENOATTR
+ENOTSUP
+EPROCLIM
+EPROCUNAVAIL
+EPROGMISMATCH
+EPROGUNAVAIL
+ERPCMISMATCH
+EIPSEC
diff --git a/defs/lex.c.src b/defs/lex.c.src
new file mode 100644
index 0000000000..1b5719aa85
--- /dev/null
+++ b/defs/lex.c.src
@@ -0,0 +1,53 @@
+%{
+struct kwtable {const char *name; int id[2]; enum lex_state_e state;};
+const struct kwtable *rb_reserved_word(const char *, unsigned int);
+#ifndef RIPPER
+static const struct kwtable *reserved_word(const char *, unsigned int);
+#define rb_reserved_word(str, len) reserved_word(str, len)
+%}
+
+struct kwtable;
+%%
+__ENCODING__, {keyword__ENCODING__, keyword__ENCODING__}, EXPR_END
+__LINE__, {keyword__LINE__, keyword__LINE__}, EXPR_END
+__FILE__, {keyword__FILE__, keyword__FILE__}, EXPR_END
+BEGIN, {keyword_BEGIN, keyword_BEGIN}, EXPR_END
+END, {keyword_END, keyword_END}, EXPR_END
+alias, {keyword_alias, keyword_alias}, EXPR_FNAME
+and, {keyword_and, keyword_and}, EXPR_VALUE
+begin, {keyword_begin, keyword_begin}, EXPR_BEG
+break, {keyword_break, keyword_break}, EXPR_MID
+case, {keyword_case, keyword_case}, EXPR_VALUE
+class, {keyword_class, keyword_class}, EXPR_CLASS
+def, {keyword_def, keyword_def}, EXPR_FNAME
+defined?, {keyword_defined, keyword_defined}, EXPR_ARG
+do, {keyword_do, keyword_do}, EXPR_BEG
+else, {keyword_else, keyword_else}, EXPR_BEG
+elsif, {keyword_elsif, keyword_elsif}, EXPR_VALUE
+end, {keyword_end, keyword_end}, EXPR_END
+ensure, {keyword_ensure, keyword_ensure}, EXPR_BEG
+false, {keyword_false, keyword_false}, EXPR_END
+for, {keyword_for, keyword_for}, EXPR_VALUE
+if, {keyword_if, modifier_if}, EXPR_VALUE
+in, {keyword_in, keyword_in}, EXPR_VALUE
+module, {keyword_module, keyword_module}, EXPR_VALUE
+next, {keyword_next, keyword_next}, EXPR_MID
+nil, {keyword_nil, keyword_nil}, EXPR_END
+not, {keyword_not, keyword_not}, EXPR_ARG
+or, {keyword_or, keyword_or}, EXPR_VALUE
+redo, {keyword_redo, keyword_redo}, EXPR_END
+rescue, {keyword_rescue, modifier_rescue}, EXPR_MID
+retry, {keyword_retry, keyword_retry}, EXPR_END
+return, {keyword_return, keyword_return}, EXPR_MID
+self, {keyword_self, keyword_self}, EXPR_END
+super, {keyword_super, keyword_super}, EXPR_ARG
+then, {keyword_then, keyword_then}, EXPR_BEG
+true, {keyword_true, keyword_true}, EXPR_END
+undef, {keyword_undef, keyword_undef}, EXPR_FNAME
+unless, {keyword_unless, modifier_unless}, EXPR_VALUE
+until, {keyword_until, modifier_until}, EXPR_VALUE
+when, {keyword_when, keyword_when}, EXPR_VALUE
+while, {keyword_while, modifier_while}, EXPR_VALUE
+yield, {keyword_yield, keyword_yield}, EXPR_ARG
+%%
+#endif
diff --git a/defs/opt_insn_unif.def b/defs/opt_insn_unif.def
new file mode 100644
index 0000000000..1ac613dbea
--- /dev/null
+++ b/defs/opt_insn_unif.def
@@ -0,0 +1,29 @@
+#
+# a definition of instruction unification
+#
+#
+
+__END__
+
+putobject putobject
+putobject putstring
+putobject setlocal
+putobject setdynamic
+
+putstring putstring
+putstring putobject
+putstring setlocal
+putstring setdynamic
+
+# putnil end
+
+dup setlocal
+
+# from tarai
+getlocal getlocal
+# getlocal send
+
+# from tak, ackermann
+getlocal putobject
+
+
diff --git a/defs/opt_operand.def b/defs/opt_operand.def
new file mode 100644
index 0000000000..ab7103a421
--- /dev/null
+++ b/defs/opt_operand.def
@@ -0,0 +1,22 @@
+#
+# configration file for operand union optimization
+#
+# format:
+#   [insn name] op1, op2 ...
+#
+#  wildcard: *
+#
+
+getlocal *, 0
+getlocal *, 1
+setlocal *, 0
+setlocal *, 1
+
+putobject INT2FIX(0)
+putobject INT2FIX(1)
+
+__END__
+
+putobject Qtrue
+putobject Qfalse
+
diff --git a/dir.c b/dir.c
index 710299e7b6..e3a74c18b0 100644
--- a/dir.c
+++ b/dir.c
@@ -3,16 +3,17 @@
   dir.c -
 
   $Author$
-  $Date$
   created at: Wed Jan  5 09:51:01 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
   Copyright (C) 2000  Network Applied Communication Laboratory, Inc.
   Copyright (C) 2000  Information-technology Promotion Agency, Japan
 
 **********************************************************************/
 
-#include "ruby.h"
+#include "ruby/ruby.h"
+#include "ruby/encoding.h"
+#include "internal.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -29,12 +30,7 @@
 # define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
 # define dirent direct
-# if !defined __NeXT__
-#  define NAMLEN(dirent) (dirent)->d_namlen
-# else
-#  /* On some versions of NextStep, d_namlen is always zero, so avoid it. */
-#  define NAMLEN(dirent) strlen((dirent)->d_name)
-# endif
+# define NAMLEN(dirent) (dirent)->d_namlen
 # if HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
 # endif
@@ -48,6 +44,10 @@
 #  include "win32/dir.h"
 # endif
 #endif
+#if defined(__native_client__) && defined(NACL_NEWLIB)
+# include "nacl/dirent.h"
+# include "nacl/stat.h"
+#endif
 
 #include <errno.h>
 
@@ -56,29 +56,65 @@ char *getenv();
 #endif
 
 #ifndef HAVE_STRING_H
-char *strchr _((char*,char));
+char *strchr(char*,char);
 #endif
 
 #include <ctype.h>
 
-#include "util.h"
+#include "ruby/util.h"
 
-#if !defined HAVE_LSTAT && !defined lstat
-#define lstat stat
+/* define system APIs */
+#ifdef _WIN32
+#undef chdir
+#define chdir(p) rb_w32_uchdir(p)
+#undef mkdir
+#define mkdir(p, m) rb_w32_umkdir((p), (m))
+#undef rmdir
+#define rmdir(p) rb_w32_urmdir(p)
+#undef opendir
+#define opendir(p) rb_w32_uopendir(p)
 #endif
 
-#ifndef CASEFOLD_FILESYSTEM
-# if defined DOSISH || defined __VMS
-#   define CASEFOLD_FILESYSTEM 1
-# else
-#   define CASEFOLD_FILESYSTEM 0
-# endif
+#ifdef __APPLE__
+# define HAVE_HFS 1
+#else
+# define HAVE_HFS 0
+#endif
+#if HAVE_HFS
+#include <sys/param.h>
+#include <sys/mount.h>
+
+static inline int
+is_hfs(DIR *dirp)
+{
+    struct statfs buf;
+    if (fstatfs(dirfd(dirp), &buf) == 0) {
+	return buf.f_type == 17; /* HFS on darwin */
+    }
+    return FALSE;
+}
+
+static inline int
+has_nonascii(const char *ptr, size_t len)
+{
+    while (len > 0) {
+	if (!ISASCII(*ptr)) return 1;
+	ptr++;
+	--len;
+    }
+    return 0;
+}
+
+# define IF_HAVE_HFS(something) something
+#else
+# define IF_HAVE_HFS(something) /* nothing */
 #endif
 
 #define FNM_NOESCAPE	0x01
 #define FNM_PATHNAME	0x02
 #define FNM_DOTMATCH	0x04
 #define FNM_CASEFOLD	0x08
+#define FNM_EXTGLOB	0x10
 #if CASEFOLD_FILESYSTEM
 #define FNM_SYSCASE	FNM_CASEFOLD
 #else
@@ -88,102 +124,25 @@ char *strchr _((char*,char));
 #define FNM_NOMATCH	1
 #define FNM_ERROR	2
 
-#define downcase(c) (nocase && ISUPPER(c) ? tolower(c) : (c))
-#define compare(c1, c2) (((unsigned char)(c1)) - ((unsigned char)(c2)))
-
-/* caution: in case *p == '\0'
-   Next(p) == p + 1 in single byte environment
-   Next(p) == p     in multi byte environment
-*/
-#if defined(CharNext)
-# define Next(p) CharNext(p)
-#elif defined(DJGPP)
-# define Next(p) ((p) + mblen(p, RUBY_MBCHAR_MAXSIZE))
-#elif defined(__EMX__)
-# define Next(p) ((p) + emx_mblen(p))
-static inline int
-emx_mblen(const char *p)
-{
-    int n = mblen(p, RUBY_MBCHAR_MAXSIZE);
-    return (n < 0) ? 1 : n;
-}
-#endif
-
-#ifndef Next /* single byte environment */
-# define Next(p) ((p) + 1)
-# define Inc(p) (++(p))
-# define Compare(p1, p2) (compare(downcase(*(p1)), downcase(*(p2))))
-#else /* multi byte environment */
-# define Inc(p) ((p) = Next(p))
-# define Compare(p1, p2) (CompareImpl(p1, p2, nocase))
-static int
-CompareImpl(const char *p1, const char *p2, int nocase)
-{
-    const int len1 = Next(p1) - p1;
-    const int len2 = Next(p2) - p2;
-#ifdef _WIN32
-    char buf1[10], buf2[10]; /* large enough? */
-#endif
-
-    if (len1 < 0 || len2 < 0) {
-	rb_fatal("CompareImpl: negative len");
-    }
-
-    if (len1 == 0) return  len2;
-    if (len2 == 0) return -len1;
-
-#ifdef _WIN32
-    if (nocase && rb_w32_iswinnt()) {
-	if (len1 > 1) {
-	    if (len1 >= sizeof(buf1)) {
-		rb_fatal("CompareImpl: too large len");
-	    }
-	    memcpy(buf1, p1, len1);
-	    buf1[len1] = '\0';
-	    CharLower(buf1);
-	    p1 = buf1; /* trick */
-	}
-	if (len2 > 1) {
-	    if (len2 >= sizeof(buf2)) {
-		rb_fatal("CompareImpl: too large len");
-	    }
-	    memcpy(buf2, p2, len2);
-	    buf2[len2] = '\0';
-	    CharLower(buf2);
-	    p2 = buf2; /* trick */
-	}
-    }
-#endif
-    if (len1 == 1)
-	if (len2 == 1)
-	    return compare(downcase(*p1), downcase(*p2));
-	else {
-	    const int ret = compare(downcase(*p1), *p2);
-	    return ret ? ret : -1;
-	}
-    else
-	if (len2 == 1) {
-	    const int ret = compare(*p1, downcase(*p2));
-	    return ret ? ret : 1;
-	}
-	else {
-	    const int ret = memcmp(p1, p2, len1 < len2 ? len1 : len2);
-	    return ret ? ret : len1 - len2;
-	}
-}
-#endif /* environment */
+# define Next(p, e, enc) ((p)+ rb_enc_mbclen((p), (e), (enc)))
+# define Inc(p, e, enc) ((p) = Next((p), (e), (enc)))
 
 static char *
-bracket(p, s, flags)
-    const char *p; /* pattern (next to '[') */
-    const char *s; /* string */
-    int flags;
+bracket(
+    const char *p, /* pattern (next to '[') */
+    const char *pend,
+    const char *s, /* string */
+    const char *send,
+    int flags,
+    rb_encoding *enc)
 {
     const int nocase = flags & FNM_CASEFOLD;
     const int escape = !(flags & FNM_NOESCAPE);
-
+    unsigned int c1, c2;
+    int r;
     int ok = 0, not = 0;
 
+    if (p >= pend) return NULL;
     if (*p == '!' || *p == '^') {
 	not = 1;
 	p++;
@@ -195,20 +154,43 @@ bracket(p, s, flags)
 	    t1++;
 	if (!*t1)
 	    return NULL;
-	p = Next(t1);
+	p = t1 + (r = rb_enc_mbclen(t1, pend, enc));
+	if (p >= pend) return NULL;
 	if (p[0] == '-' && p[1] != ']') {
 	    const char *t2 = p + 1;
+	    int r2;
 	    if (escape && *t2 == '\\')
 		t2++;
 	    if (!*t2)
 		return NULL;
-	    p = Next(t2);
-	    if (!ok && Compare(t1, s) <= 0 && Compare(s, t2) <= 0)
+	    p = t2 + (r2 = rb_enc_mbclen(t2, pend, enc));
+	    if (ok) continue;
+	    if ((r <= (send-s) && memcmp(t1, s, r) == 0) ||
+		(r2 <= (send-s) && memcmp(t2, s, r2) == 0)) {
 		ok = 1;
+		continue;
+	    }
+	    c1 = rb_enc_codepoint(s, send, enc);
+	    if (nocase) c1 = rb_enc_toupper(c1, enc);
+	    c2 = rb_enc_codepoint(t1, pend, enc);
+	    if (nocase) c2 = rb_enc_toupper(c2, enc);
+	    if (c1 < c2) continue;
+	    c2 = rb_enc_codepoint(t2, pend, enc);
+	    if (nocase) c2 = rb_enc_toupper(c2, enc);
+	    if (c1 > c2) continue;
 	}
-	else
-	    if (!ok && Compare(t1, s) == 0)
+	else {
+	    if (ok) continue;
+	    if (r <= (send-s) && memcmp(t1, s, r) == 0) {
 		ok = 1;
+		continue;
+	    }
+	    if (!nocase) continue;
+	    c1 = rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc);
+	    c2 = rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc);
+	    if (c1 != c2) continue;
+	}
+	ok = 1;
     }
 
     return ok == not ? NULL : (char *)p + 1;
@@ -224,10 +206,11 @@ bracket(p, s, flags)
 #define RETURN(val) return *pcur = p, *scur = s, (val);
 
 static int
-fnmatch_helper(pcur, scur, flags)
-    const char **pcur; /* pattern */
-    const char **scur; /* string */
-    int flags;
+fnmatch_helper(
+    const char **pcur, /* pattern */
+    const char **scur, /* string */
+    int flags,
+    rb_encoding *enc)
 {
     const int period = !(flags & FNM_DOTMATCH);
     const int pathname = flags & FNM_PATHNAME;
@@ -238,7 +221,11 @@ fnmatch_helper(pcur, scur, flags)
     const char *stmp = 0;
 
     const char *p = *pcur;
+    const char *pend = p + strlen(p);
     const char *s = *scur;
+    const char *send = s + strlen(s);
+
+    int r;
 
     if (period && *s == '.' && *UNESCAPE(p) != '.') /* leading period */
 	RETURN(FNM_NOMATCH);
@@ -261,16 +248,16 @@ fnmatch_helper(pcur, scur, flags)
 	    if (ISEND(s))
 		RETURN(FNM_NOMATCH);
 	    p++;
-	    Inc(s);
+	    Inc(s, send, enc);
 	    continue;
 
 	  case '[': {
 	    const char *t;
 	    if (ISEND(s))
 		RETURN(FNM_NOMATCH);
-	    if ((t = bracket(p + 1, s, flags)) != 0) {
+	    if ((t = bracket(p + 1, pend, s, send, flags, enc)) != 0) {
 		p = t;
-		Inc(s);
+		Inc(s, send, enc);
 		continue;
 	    }
 	    goto failed;
@@ -283,16 +270,26 @@ fnmatch_helper(pcur, scur, flags)
 	    RETURN(ISEND(p) ? 0 : FNM_NOMATCH);
 	if (ISEND(p))
 	    goto failed;
-	if (Compare(p, s) != 0)
+	r = rb_enc_precise_mbclen(p, pend, enc);
+	if (!MBCLEN_CHARFOUND_P(r))
 	    goto failed;
-	Inc(p);
-	Inc(s);
+	if (r <= (send-s) && memcmp(p, s, r) == 0) {
+	    p += r;
+	    s += r;
+	    continue;
+	}
+	if (!nocase) goto failed;
+	if (rb_enc_toupper(rb_enc_codepoint(p, pend, enc), enc) !=
+	    rb_enc_toupper(rb_enc_codepoint(s, send, enc), enc))
+	    goto failed;
+	p += r;
+	Inc(s, send, enc);
 	continue;
 
       failed: /* try next '*' position */
 	if (ptmp && stmp) {
 	    p = ptmp;
-	    Inc(stmp); /* !ISEND(*stmp) */
+	    Inc(stmp, send, enc); /* !ISEND(*stmp) */
 	    s = stmp;
 	    continue;
 	}
@@ -301,11 +298,15 @@ fnmatch_helper(pcur, scur, flags)
 }
 
 static int
-fnmatch(p, s, flags)
-    const char *p; /* pattern */
-    const char *s; /* string */
-    int flags;
+fnmatch(
+    const char *pattern,
+    rb_encoding *enc,
+    const char *string,
+    int flags)
 {
+    const char *p = pattern;
+    const char *s = string;
+    const char *send = s + strlen(string);
     const int period = !(flags & FNM_DOTMATCH);
     const int pathname = flags & FNM_PATHNAME;
 
@@ -319,8 +320,8 @@ fnmatch(p, s, flags)
 		ptmp = p;
 		stmp = s;
 	    }
-	    if (fnmatch_helper(&p, &s, flags) == 0) {
-		while (*s && *s != '/') Inc(s);
+	    if (fnmatch_helper(&p, &s, flags, enc) == 0) {
+		while (*s && *s != '/') Inc(s, send, enc);
 		if (*p && *s) {
 		    p++;
 		    s++;
@@ -331,7 +332,7 @@ fnmatch(p, s, flags)
 	    }
 	    /* failed : try next recursion */
 	    if (ptmp && stmp && !(period && *stmp == '.')) {
-		while (*stmp && *stmp != '/') Inc(stmp);
+		while (*stmp && *stmp != '/') Inc(stmp, send, enc);
 		if (*stmp) {
 		    p = ptmp;
 		    stmp++;
@@ -343,39 +344,66 @@ fnmatch(p, s, flags)
 	}
     }
     else
-	return fnmatch_helper(&p, &s, flags);
+	return fnmatch_helper(&p, &s, flags, enc);
 }
 
 VALUE rb_cDir;
 
 struct dir_data {
     DIR *dir;
-    char *path;
+    VALUE path;
+    rb_encoding *enc;
 };
 
 static void
-free_dir(dir)
-    struct dir_data *dir;
+dir_mark(void *ptr)
+{
+    struct dir_data *dir = ptr;
+    rb_gc_mark(dir->path);
+}
+
+static void
+dir_free(void *ptr)
 {
+    struct dir_data *dir = ptr;
     if (dir) {
 	if (dir->dir) closedir(dir->dir);
-	if (dir->path) free(dir->path);
     }
-    free(dir);
+    xfree(dir);
 }
 
-static VALUE dir_close _((VALUE));
+static size_t
+dir_memsize(const void *ptr)
+{
+    return ptr ? sizeof(struct dir_data) : 0;
+}
+
+static const rb_data_type_t dir_data_type = {
+    "dir",
+    {dir_mark, dir_free, dir_memsize,},
+    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+};
+
+static VALUE dir_close(VALUE);
+
+#define GlobPathValue(str, safe) \
+    /* can contain null bytes as separators */	\
+    (!RB_TYPE_P((str), T_STRING) ?		\
+     (void)FilePathValue(str) :			\
+     (void)(check_safe_glob((str), (safe)),		\
+      check_glob_encoding(str), (str)))
+#define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0)
+#define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding()))
 
-static VALUE dir_s_alloc _((VALUE));
 static VALUE
-dir_s_alloc(klass)
-    VALUE klass;
+dir_s_alloc(VALUE klass)
 {
     struct dir_data *dirp;
-    VALUE obj = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dirp);
+    VALUE obj = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dirp);
 
     dirp->dir = NULL;
-    dirp->path = NULL;
+    dirp->path = Qnil;
+    dirp->enc = NULL;
 
     return obj;
 }
@@ -383,40 +411,69 @@ dir_s_alloc(klass)
 /*
  *  call-seq:
  *     Dir.new( string ) -> aDir
+ *     Dir.new( string, encoding: enc ) -> aDir
  *
  *  Returns a new directory object for the named directory.
+ *
+ *  The optional <i>enc</i> argument specifies the encoding of the directory.
+ *  If not specified, the filesystem encoding is used.
  */
 static VALUE
-dir_initialize(dir, dirname)
-    VALUE dir, dirname;
+dir_initialize(int argc, VALUE *argv, VALUE dir)
 {
     struct dir_data *dp;
+    rb_encoding  *fsenc;
+    VALUE dirname, opt, orig;
+    static VALUE sym_enc;
+
+    if (!sym_enc) {
+	sym_enc = ID2SYM(rb_intern("encoding"));
+    }
+    fsenc = rb_filesystem_encoding();
+
+    rb_scan_args(argc, argv, "1:", &dirname, &opt);
+
+    if (!NIL_P(opt)) {
+	VALUE enc = rb_hash_aref(opt, sym_enc);
+	if (!NIL_P(enc)) {
+	    fsenc = rb_to_encoding(enc);
+	}
+    }
+
+    GlobPathValue(dirname, FALSE);
+    orig = rb_str_dup_frozen(dirname);
+    dirname = rb_str_encode_ospath(dirname);
+    dirname = rb_str_dup_frozen(dirname);
 
-    SafeStringValue(dirname);
-    Data_Get_Struct(dir, struct dir_data, dp);
+    TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dp);
     if (dp->dir) closedir(dp->dir);
-    if (dp->path) free(dp->path);
     dp->dir = NULL;
-    dp->path = NULL;
-    dp->dir = opendir(RSTRING(dirname)->ptr);
+    dp->path = Qnil;
+    dp->enc = fsenc;
+    dp->dir = opendir(RSTRING_PTR(dirname));
     if (dp->dir == NULL) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
-	    dp->dir = opendir(RSTRING(dirname)->ptr);
+	    dp->dir = opendir(RSTRING_PTR(dirname));
 	}
 	if (dp->dir == NULL) {
-	    rb_sys_fail(RSTRING(dirname)->ptr);
+	    rb_sys_fail_path(orig);
 	}
     }
-    dp->path = strdup(RSTRING(dirname)->ptr);
+    dp->path = orig;
 
     return dir;
 }
 
 /*
  *  call-seq:
- *     Dir.open( string ) => aDir
- *     Dir.open( string ) {| aDir | block } => anObject
+ *     Dir.open( string ) -> aDir
+ *     Dir.open( string, encoding: enc ) -> aDir
+ *     Dir.open( string ) {| aDir | block } -> anObject
+ *     Dir.open( string, encoding: enc ) {| aDir | block } -> anObject
+ *
+ *  The optional <i>enc</i> argument specifies the encoding of the directory.
+ *  If not specified, the filesystem encoding is used.
  *
  *  With no block, <code>open</code> is a synonym for
  *  <code>Dir::new</code>. If a block is present, it is passed
@@ -424,15 +481,13 @@ dir_initialize(dir, dirname)
  *  the block, and <code>Dir::open</code> returns the value of the
  *  block.
  */
-
 static VALUE
-dir_s_open(klass, dirname)
-    VALUE klass, dirname;
+dir_s_open(int argc, VALUE *argv, VALUE klass)
 {
     struct dir_data *dp;
-    VALUE dir = Data_Make_Struct(klass, struct dir_data, 0, free_dir, dp);
+    VALUE dir = TypedData_Make_Struct(klass, struct dir_data, &dir_data_type, dp);
 
-    dir_initialize(dir, dirname);
+    dir_initialize(argc, argv, dir);
     if (rb_block_given_p()) {
 	return rb_ensure(rb_yield, dir, dir_close, dir);
     }
@@ -441,52 +496,51 @@ dir_s_open(klass, dirname)
 }
 
 static void
-dir_closed()
+dir_closed(void)
 {
     rb_raise(rb_eIOError, "closed directory");
 }
 
-static void
-dir_check(dir)
-    VALUE dir;
+static struct dir_data *
+dir_check(VALUE dir)
 {
-    if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
-	rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
+    struct dir_data *dirp;
     rb_check_frozen(dir);
+    dirp = rb_check_typeddata(dir, &dir_data_type);
+    if (!dirp->dir) dir_closed();
+    return dirp;
 }
 
-#define GetDIR(obj, dirp) do {\
-    dir_check(dir);\
-    Data_Get_Struct(obj, struct dir_data, dirp);\
-    if (dirp->dir == NULL) dir_closed();\
-} while (0)
+#define GetDIR(obj, dirp) ((dirp) = dir_check(obj))
+
 
 /*
  *  call-seq:
- *     dir.inspect => string
+ *     dir.inspect -> string
  *
  *  Return a string describing this Dir object.
  */
 static VALUE
-dir_inspect(dir)
-    VALUE dir;
+dir_inspect(VALUE dir)
 {
     struct dir_data *dirp;
 
-    Data_Get_Struct(dir, struct dir_data, dirp);
-    if (dirp->path) {
-	const char *c = rb_obj_classname(dir);
-	int len = strlen(c) + strlen(dirp->path) + 4;
-	VALUE s = rb_str_new(0, len);
-	snprintf(RSTRING_PTR(s), len+1, "#<%s:%s>", c, dirp->path);
-	return s;
+    TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
+    if (!NIL_P(dirp->path)) {
+	VALUE str = rb_str_new_cstr("#<");
+	rb_str_append(str, rb_class_name(CLASS_OF(dir)));
+	rb_str_cat2(str, ":");
+	rb_str_append(str, dirp->path);
+	rb_str_cat2(str, ">");
+	return str;
     }
     return rb_funcall(dir, rb_intern("to_s"), 0, 0);
 }
 
 /*
  *  call-seq:
- *     dir.path => string or nil
+ *     dir.path -> string or nil
+ *     dir.to_path -> string or nil
  *
  *  Returns the path parameter passed to <em>dir</em>'s constructor.
  *
@@ -494,19 +548,24 @@ dir_inspect(dir)
  *     d.path   #=> ".."
  */
 static VALUE
-dir_path(dir)
-    VALUE dir;
+dir_path(VALUE dir)
 {
     struct dir_data *dirp;
 
-    Data_Get_Struct(dir, struct dir_data, dirp);
-    if (!dirp->path) return Qnil;
-    return rb_str_new2(dirp->path);
+    TypedData_Get_Struct(dir, struct dir_data, &dir_data_type, dirp);
+    if (NIL_P(dirp->path)) return Qnil;
+    return rb_str_dup(dirp->path);
 }
 
+#if defined _WIN32
+# define READDIR(dir, enc) rb_w32_readdir((dir), (enc))
+#else
+# define READDIR(dir, enc) readdir((dir))
+#endif
+
 /*
  *  call-seq:
- *     dir.read => string or nil
+ *     dir.read -> string or nil
  *
  *  Reads the next entry from <em>dir</em> and returns it as a string.
  *  Returns <code>nil</code> at the end of the stream.
@@ -517,34 +576,32 @@ dir_path(dir)
  *     d.read   #=> "config.h"
  */
 static VALUE
-dir_read(dir)
-    VALUE dir;
+dir_read(VALUE dir)
 {
     struct dir_data *dirp;
     struct dirent *dp;
 
     GetDIR(dir, dirp);
     errno = 0;
-    dp = readdir(dirp->dir);
-    if (dp) {
-	return rb_tainted_str_new(dp->d_name, NAMLEN(dp));
-    }
-    else if (errno == 0) {	/* end of stream */
-	return Qnil;
+    if ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) {
+	return rb_external_str_new_with_enc(dp->d_name, NAMLEN(dp), dirp->enc);
     }
     else {
-	rb_sys_fail(0);
+	if (errno != 0) rb_sys_fail(0);
+	return Qnil;		/* end of stream */
     }
-    return Qnil;		/* not reached */
 }
 
 /*
  *  call-seq:
- *     dir.each { |filename| block }  => dir
+ *     dir.each { |filename| block }  -> dir
+ *     dir.each                       -> an_enumerator
  *
  *  Calls the block once for each entry in this directory, passing the
  *  filename of each entry as a parameter to the block.
  *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     d = Dir.new("testdir")
  *     d.each  {|x| puts "Got #{x}" }
  *
@@ -556,26 +613,39 @@ dir_read(dir)
  *     Got main.rb
  */
 static VALUE
-dir_each(dir)
-    VALUE dir;
+dir_each(VALUE dir)
 {
     struct dir_data *dirp;
     struct dirent *dp;
+    IF_HAVE_HFS(int hfs_p);
 
     RETURN_ENUMERATOR(dir, 0, 0);
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
-    for (dp = readdir(dirp->dir); dp != NULL; dp = readdir(dirp->dir)) {
-	rb_yield(rb_tainted_str_new(dp->d_name, NAMLEN(dp)));
+    IF_HAVE_HFS(hfs_p = is_hfs(dirp->dir));
+    while ((dp = READDIR(dirp->dir, dirp->enc)) != NULL) {
+	const char *name = dp->d_name;
+	size_t namlen = NAMLEN(dp);
+	VALUE path;
+#if HAVE_HFS
+	if (hfs_p && has_nonascii(name, namlen) &&
+	    !NIL_P(path = rb_str_normalize_ospath(name, namlen))) {
+	    path = rb_external_str_with_enc(path, dirp->enc);
+	}
+	else
+#endif
+	path = rb_external_str_new_with_enc(name, namlen, dirp->enc);
+	rb_yield(path);
 	if (dirp->dir == NULL) dir_closed();
     }
     return dir;
 }
 
+#ifdef HAVE_TELLDIR
 /*
  *  call-seq:
- *     dir.pos => integer
- *     dir.tell => integer
+ *     dir.pos -> integer
+ *     dir.tell -> integer
  *
  *  Returns the current position in <em>dir</em>. See also
  *  <code>Dir#seek</code>.
@@ -586,24 +656,23 @@ dir_each(dir)
  *     d.tell   #=> 12
  */
 static VALUE
-dir_tell(dir)
-    VALUE dir;
+dir_tell(VALUE dir)
 {
-#ifdef HAVE_TELLDIR
     struct dir_data *dirp;
     long pos;
 
     GetDIR(dir, dirp);
     pos = telldir(dirp->dir);
     return rb_int2inum(pos);
+}
 #else
-    rb_notimplement();
+#define dir_tell rb_f_notimplement
 #endif
-}
 
+#ifdef HAVE_SEEKDIR
 /*
  *  call-seq:
- *     dir.seek( integer ) => dir
+ *     dir.seek( integer ) -> dir
  *
  *  Seeks to a particular location in <em>dir</em>. <i>integer</i>
  *  must be a value returned by <code>Dir#tell</code>.
@@ -616,24 +685,23 @@ dir_tell(dir)
  *     d.read                   #=> ".."
  */
 static VALUE
-dir_seek(dir, pos)
-    VALUE dir, pos;
+dir_seek(VALUE dir, VALUE pos)
 {
     struct dir_data *dirp;
-    off_t p = NUM2OFFT(pos);
+    long p = NUM2LONG(pos);
 
     GetDIR(dir, dirp);
-#ifdef HAVE_SEEKDIR
     seekdir(dirp->dir, p);
     return dir;
+}
 #else
-    rb_notimplement();
+#define dir_seek rb_f_notimplement
 #endif
-}
 
+#ifdef HAVE_SEEKDIR
 /*
  *  call-seq:
- *     dir.pos( integer ) => integer
+ *     dir.pos = integer  -> integer
  *
  *  Synonym for <code>Dir#seek</code>, but returns the position
  *  parameter.
@@ -646,16 +714,18 @@ dir_seek(dir, pos)
  *     d.read                   #=> ".."
  */
 static VALUE
-dir_set_pos(dir, pos)
-    VALUE dir, pos;
+dir_set_pos(VALUE dir, VALUE pos)
 {
     dir_seek(dir, pos);
     return pos;
 }
+#else
+#define dir_set_pos rb_f_notimplement
+#endif
 
 /*
  *  call-seq:
- *     dir.rewind => dir
+ *     dir.rewind -> dir
  *
  *  Repositions <em>dir</em> to the first entry.
  *
@@ -665,14 +735,10 @@ dir_set_pos(dir, pos)
  *     d.read     #=> "."
  */
 static VALUE
-dir_rewind(dir)
-    VALUE dir;
+dir_rewind(VALUE dir)
 {
     struct dir_data *dirp;
 
-    if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
-	rb_raise(rb_eSecurityError, "Insecure: can't close");
-    }
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
     return dir;
@@ -680,7 +746,7 @@ dir_rewind(dir)
 
 /*
  *  call-seq:
- *     dir.close => nil
+ *     dir.close -> nil
  *
  *  Closes the directory stream. Any further attempts to access
  *  <em>dir</em> will raise an <code>IOError</code>.
@@ -689,8 +755,7 @@ dir_rewind(dir)
  *     d.close   #=> nil
  */
 static VALUE
-dir_close(dir)
-    VALUE dir;
+dir_close(VALUE dir)
 {
     struct dir_data *dirp;
 
@@ -702,11 +767,10 @@ dir_close(dir)
 }
 
 static void
-dir_chdir(path)
-    VALUE path;
+dir_chdir(VALUE path)
 {
-    if (chdir(RSTRING(path)->ptr) < 0)
-	rb_sys_fail(RSTRING(path)->ptr);
+    if (chdir(RSTRING_PTR(path)) < 0)
+	rb_sys_fail_path(path);
 }
 
 static int chdir_blocking = 0;
@@ -718,11 +782,10 @@ struct chdir_data {
 };
 
 static VALUE
-chdir_yield(args)
-    struct chdir_data *args;
+chdir_yield(struct chdir_data *args)
 {
     dir_chdir(args->new_path);
-    args->done = Qtrue;
+    args->done = TRUE;
     chdir_blocking++;
     if (chdir_thread == Qnil)
 	chdir_thread = rb_thread_current();
@@ -730,8 +793,7 @@ chdir_yield(args)
 }
 
 static VALUE
-chdir_restore(args)
-    struct chdir_data *args;
+chdir_restore(struct chdir_data *args)
 {
     if (args->done) {
 	chdir_blocking--;
@@ -744,8 +806,8 @@ chdir_restore(args)
 
 /*
  *  call-seq:
- *     Dir.chdir( [ string] ) => 0
- *     Dir.chdir( [ string] ) {| path | block }  => anObject
+ *     Dir.chdir( [ string] ) -> 0
+ *     Dir.chdir( [ string] ) {| path | block }  -> anObject
  *
  *  Changes the current working directory of the process to the given
  *  string. When called without an argument, changes the directory to
@@ -782,16 +844,14 @@ chdir_restore(args)
  *     /var/spool/mail
  */
 static VALUE
-dir_s_chdir(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+dir_s_chdir(int argc, VALUE *argv, VALUE obj)
 {
     VALUE path = Qnil;
 
     rb_secure(2);
     if (rb_scan_args(argc, argv, "01", &path) == 1) {
-	SafeStringValue(path);
+	FilePathValue(path);
+	path = rb_str_encode_ospath(path);
     }
     else {
 	const char *dist = getenv("HOME");
@@ -809,11 +869,10 @@ dir_s_chdir(argc, argv, obj)
 
     if (rb_block_given_p()) {
 	struct chdir_data args;
-	char *cwd = my_getcwd();
 
-	args.old_path = rb_tainted_str_new2(cwd); free(cwd);
+	args.old_path = rb_str_encode_ospath(rb_dir_getwd());
 	args.new_path = path;
-	args.done = Qfalse;
+	args.done = FALSE;
 	return rb_ensure(chdir_yield, (VALUE)&args, chdir_restore, (VALUE)&args);
     }
     dir_chdir(path);
@@ -821,10 +880,24 @@ dir_s_chdir(argc, argv, obj)
     return INT2FIX(0);
 }
 
+VALUE
+rb_dir_getwd(void)
+{
+    char *path;
+    VALUE cwd;
+
+    path = my_getcwd();
+    cwd = rb_tainted_str_new2(path);
+    rb_enc_associate(cwd, rb_filesystem_encoding());
+
+    xfree(path);
+    return cwd;
+}
+
 /*
  *  call-seq:
- *     Dir.getwd => string
- *     Dir.pwd => string
+ *     Dir.getwd -> string
+ *     Dir.pwd -> string
  *
  *  Returns the path to the current working directory of this process as
  *  a string.
@@ -833,38 +906,35 @@ dir_s_chdir(argc, argv, obj)
  *     Dir.getwd           #=> "/tmp"
  */
 static VALUE
-dir_s_getwd(dir)
-    VALUE dir;
+dir_s_getwd(VALUE dir)
 {
-    char *path;
-    VALUE cwd;
-
-    rb_secure(4);
-    path = my_getcwd();
-    cwd = rb_tainted_str_new2(path);
-
-    free(path);
-    return cwd;
+    return rb_dir_getwd();
 }
 
-static void check_dirname _((volatile VALUE *));
 static void
-check_dirname(dir)
-    volatile VALUE *dir;
+check_dirname(volatile VALUE *dir)
 {
+    VALUE d = *dir;
     char *path, *pend;
+    long len;
+    rb_encoding *enc;
 
-    SafeStringValue(*dir);
     rb_secure(2);
-    path = RSTRING(*dir)->ptr;
-    if (path && *(pend = rb_path_end(rb_path_skip_prefix(path)))) {
-	*dir = rb_str_new(path, pend - path);
+    FilePathValue(d);
+    enc = rb_enc_get(d);
+    RSTRING_GETMEM(d, path, len);
+    pend = path + len;
+    pend = rb_enc_path_end(rb_enc_path_skip_prefix(path, pend, enc), pend, enc);
+    if (pend - path < len) {
+	d = rb_str_subseq(d, 0, pend - path);
     }
+    *dir = rb_str_encode_ospath(d);
 }
 
+#if defined(HAVE_CHROOT)
 /*
  *  call-seq:
- *     Dir.chroot( string ) => 0
+ *     Dir.chroot( string ) -> 0
  *
  *  Changes this process's idea of the file system root. Only a
  *  privileged process may make this call. Not available on all
@@ -872,25 +942,21 @@ check_dirname(dir)
  *  information.
  */
 static VALUE
-dir_s_chroot(dir, path)
-    VALUE dir, path;
+dir_s_chroot(VALUE dir, VALUE path)
 {
-#if defined(HAVE_CHROOT) && !defined(__CHECKER__)
     check_dirname(&path);
-
-    if (chroot(RSTRING(path)->ptr) == -1)
-	rb_sys_fail(RSTRING(path)->ptr);
+    if (chroot(RSTRING_PTR(path)) == -1)
+	rb_sys_fail_path(path);
 
     return INT2FIX(0);
+}
 #else
-    rb_notimplement();
-    return Qnil;		/* not reached */
+#define dir_s_chroot rb_f_notimplement
 #endif
-}
 
 /*
  *  call-seq:
- *     Dir.mkdir( string [, integer] ) => 0
+ *     Dir.mkdir( string [, integer] ) -> 0
  *
  *  Makes a new directory named by <i>string</i>, with permissions
  *  specified by the optional parameter <i>anInteger</i>. The
@@ -900,12 +966,11 @@ dir_s_chroot(dir, path)
  *  also the discussion of permissions in the class documentation for
  *  <code>File</code>.
  *
+ *    Dir.mkdir(File.join(Dir.home, ".foo"), 0700) #=> 0
+ *
  */
 static VALUE
-dir_s_mkdir(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+dir_s_mkdir(int argc, VALUE *argv, VALUE obj)
 {
     VALUE path, vmode;
     int mode;
@@ -918,46 +983,46 @@ dir_s_mkdir(argc, argv, obj)
     }
 
     check_dirname(&path);
-    if (mkdir(RSTRING(path)->ptr, mode) == -1)
-	rb_sys_fail(RSTRING(path)->ptr);
+    if (mkdir(RSTRING_PTR(path), mode) == -1)
+	rb_sys_fail_path(path);
 
     return INT2FIX(0);
 }
 
 /*
  *  call-seq:
- *     Dir.delete( string ) => 0
- *     Dir.rmdir( string ) => 0
- *     Dir.unlink( string ) => 0
+ *     Dir.delete( string ) -> 0
+ *     Dir.rmdir( string ) -> 0
+ *     Dir.unlink( string ) -> 0
  *
  *  Deletes the named directory. Raises a subclass of
  *  <code>SystemCallError</code> if the directory isn't empty.
  */
 static VALUE
-dir_s_rmdir(obj, dir)
-    VALUE obj, dir;
+dir_s_rmdir(VALUE obj, VALUE dir)
 {
     check_dirname(&dir);
-    if (rmdir(RSTRING(dir)->ptr) < 0)
-	rb_sys_fail(RSTRING(dir)->ptr);
+    if (rmdir(RSTRING_PTR(dir)) < 0)
+	rb_sys_fail_path(dir);
 
     return INT2FIX(0);
 }
 
-static void
-sys_warning_1(mesg)
-    const char* mesg;
+static VALUE
+sys_warning_1(VALUE mesg)
 {
-    rb_sys_warning("%s", mesg);
+    rb_sys_warning("%s:%s", strerror(errno), (const char *)mesg);
+    return Qnil;
 }
 
-#define GLOB_VERBOSE	(1UL << (sizeof(int) * CHAR_BIT - 1))
+#define GLOB_VERBOSE	(1U << (sizeof(int) * CHAR_BIT - 1))
 #define sys_warning(val) \
-    (void)((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)_((VALUE)))sys_warning_1, (VALUE)(val), 0))
+    (void)((flags & GLOB_VERBOSE) && rb_protect(sys_warning_1, (VALUE)(val), 0))
 
-#define GLOB_ALLOC(type) (type *)malloc(sizeof(type))
-#define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n))
-#define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status))
+#define GLOB_ALLOC(type) ((type *)malloc(sizeof(type)))
+#define GLOB_ALLOC_N(type, n) ((type *)malloc(sizeof(type) * (n)))
+#define GLOB_FREE(ptr) free(ptr)
+#define GLOB_JUMP_TAG(status) (((status) == -1) ? rb_memerror() : rb_jump_tag(status))
 
 /*
  * ENOTDIR can be returned by stat(2) if a non-leaf element of the path
@@ -965,18 +1030,25 @@ sys_warning_1(mesg)
  */
 #define to_be_ignored(e) ((e) == ENOENT || (e) == ENOTDIR)
 
+#ifdef _WIN32
+#define STAT(p, s)	rb_w32_ustati64((p), (s))
+#else
+#define STAT(p, s)	stat((p), (s))
+#endif
+
 /* System call with warning */
 static int
 do_stat(const char *path, struct stat *pst, int flags)
 
 {
-    int ret = stat(path, pst);
+    int ret = STAT(path, pst);
     if (ret < 0 && !to_be_ignored(errno))
 	sys_warning(path);
 
     return ret;
 }
 
+#if defined HAVE_LSTAT || defined lstat
 static int
 do_lstat(const char *path, struct stat *pst, int flags)
 {
@@ -986,11 +1058,25 @@ do_lstat(const char *path, struct stat *pst, int flags)
 
     return ret;
 }
+#else
+#define do_lstat do_stat
+#endif
 
 static DIR *
-do_opendir(const char *path, int flags)
+do_opendir(const char *path, int flags, rb_encoding *enc)
 {
-    DIR *dirp = opendir(path);
+    DIR *dirp;
+#ifdef _WIN32
+    volatile VALUE tmp;
+    if (enc != rb_usascii_encoding() &&
+	enc != rb_ascii8bit_encoding() &&
+	enc != rb_utf8_encoding()) {
+	tmp = rb_enc_str_new(path, strlen(path), enc);
+	tmp = rb_str_encode_ospath(tmp);
+	path = RSTRING_PTR(tmp);
+    }
+#endif
+    dirp = opendir(path);
     if (dirp == NULL && !to_be_ignored(errno))
 	sys_warning(path);
 
@@ -999,17 +1085,14 @@ do_opendir(const char *path, int flags)
 
 /* Return nonzero if S has any special globbing chars in it.  */
 static int
-has_magic(s, flags)
-    const char *s;
-    int flags;
+has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const int nocase = flags & FNM_CASEFOLD;
 
-    register const char *p = s;
     register char c;
 
-    while ((c = *p++) != 0) {
+    while (p < pend && (c = *p++) != 0) {
 	switch (c) {
 	  case '*':
 	  case '?':
@@ -1026,7 +1109,7 @@ has_magic(s, flags)
 		return 1;
 	}
 
-	p = Next(p-1);
+	p = Next(p-1, pend, enc);
     }
 
     return 0;
@@ -1034,11 +1117,10 @@ has_magic(s, flags)
 
 /* Find separator in globbing pattern. */
 static char *
-find_dirsep(const char *s, int flags)
+find_dirsep(const char *p, const char *pend, int flags, rb_encoding *enc)
 {
     const int escape = !(flags & FNM_NOESCAPE);
 
-    register const char *p = s;
     register char c;
     int open = 0;
 
@@ -1062,16 +1144,15 @@ find_dirsep(const char *s, int flags)
 	    continue;
 	}
 
-	p = Next(p-1);
+	p = Next(p-1, pend, enc);
     }
 
     return (char *)p-1;
 }
 
 /* Remove escaping backslashes */
-static void
-remove_backslashes(p)
-    char *p;
+static char *
+remove_backslashes(char *p, register const char *pend, rb_encoding *enc)
 {
     char *t = p;
     char *s = p;
@@ -1084,13 +1165,15 @@ remove_backslashes(p)
 	    s = ++p;
 	    if (!*p) break;
 	}
-	Inc(p);
+	Inc(p, pend, enc);
     }
 
     while (*p++);
 
     if (t != s)
 	memmove(t, s, p - s); /* move '\0' too */
+
+    return p;
 }
 
 /* Globing pattern */
@@ -1105,31 +1188,43 @@ struct glob_pattern {
 static void glob_free_pattern(struct glob_pattern *list);
 
 static struct glob_pattern *
-glob_make_pattern(const char *p, int flags)
+glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
 {
     struct glob_pattern *list, *tmp, **tail = &list;
     int dirsep = 0; /* pattern is terminated with '/' */
+    int recursive = 0;
 
-    while (*p) {
+    while (p < e && *p) {
 	tmp = GLOB_ALLOC(struct glob_pattern);
 	if (!tmp) goto error;
 	if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
 	    /* fold continuous RECURSIVEs (needed in glob_helper) */
-	    do { p += 3; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
+	    do { p += 3; while (*p == '/') p++; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
 	    tmp->type = RECURSIVE;
 	    tmp->str = 0;
 	    dirsep = 1;
+	    recursive = 1;
 	}
 	else {
-	    const char *m = find_dirsep(p, flags);
-	    char *buf = GLOB_ALLOC_N(char, m-p+1);
+	    const char *m = find_dirsep(p, e, flags, enc);
+	    int magic = has_magic(p, m, flags, enc);
+	    char *buf;
+
+	    if (!magic && !recursive && *m) {
+		const char *m2;
+		while (!has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) &&
+		       *m2) {
+		    m = m2;
+		}
+	    }
+	    buf = GLOB_ALLOC_N(char, m-p+1);
 	    if (!buf) {
-		free(tmp);
+		GLOB_FREE(tmp);
 		goto error;
 	    }
 	    memcpy(buf, p, m-p);
 	    buf[m-p] = '\0';
-	    tmp->type = has_magic(buf, flags) ? MAGICAL : PLAIN;
+	    tmp->type = magic ? MAGICAL : PLAIN;
 	    tmp->str = buf;
 	    if (*m) {
 		dirsep = 1;
@@ -1166,80 +1261,77 @@ glob_free_pattern(struct glob_pattern *list)
 	struct glob_pattern *tmp = list;
 	list = list->next;
 	if (tmp->str)
-	    free(tmp->str);
-	free(tmp);
+	    GLOB_FREE(tmp->str);
+	GLOB_FREE(tmp);
     }
 }
 
 static char *
-join_path(const char *path, int dirsep, const char *name)
+join_path(const char *path, long len, int dirsep, const char *name, size_t namlen)
 {
-    long len = strlen(path);
-    char *buf = GLOB_ALLOC_N(char, len+strlen(name)+(dirsep?1:0)+1);
+    char *buf = GLOB_ALLOC_N(char, len+namlen+(dirsep?1:0)+1);
 
     if (!buf) return 0;
     memcpy(buf, path, len);
     if (dirsep) {
-	strcpy(buf+len, "/");
-	len++;
+	buf[len++] = '/';
     }
-    strcpy(buf+len, name);
+    memcpy(buf+len, name, namlen);
+    buf[len+namlen] = '\0';
     return buf;
 }
 
-enum answer { YES, NO, UNKNOWN };
+enum answer {UNKNOWN = -1, NO, YES};
+
+#ifndef S_ISDIR
+#   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#endif
 
 #ifndef S_ISLNK
 #  ifndef S_IFLNK
 #    define S_ISLNK(m) (0)
 #  else
-#    define S_ISLNK(m) ((m & S_IFMT) == S_IFLNK)
+#    define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
 #  endif
 #endif
 
-#ifndef S_ISDIR
-#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
-#endif
-
 struct glob_args {
-    void (*func) _((const char*, VALUE));
-    const char *c;
-    VALUE v;
+    void (*func)(const char *, VALUE, void *);
+    const char *path;
+    VALUE value;
+    rb_encoding *enc;
 };
 
-static VALUE glob_func_caller _((VALUE));
-
 static VALUE
-glob_func_caller(val)
-    VALUE val;
+glob_func_caller(VALUE val)
 {
     struct glob_args *args = (struct glob_args *)val;
 
-    (*args->func)(args->c, args->v);
+    (*args->func)(args->path, args->value, args->enc);
     return Qnil;
 }
 
-#define glob_call_func(func, path, arg) (*func)(path, arg)
-
-static int glob_helper _((const char *, int, enum answer, enum answer, struct glob_pattern **, struct glob_pattern **, int, ruby_glob_func *, VALUE));
+#define glob_call_func(func, path, arg, enc) (*(func))((path), (arg), (enc))
 
 static int
-glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
-    const char *path;
-    int dirsep; /* '/' should be placed before appending child entry's name to 'path'. */
-    enum answer exist; /* Does 'path' indicate an existing entry? */
-    enum answer isdir; /* Does 'path' indicate a directory or a symlink to a directory? */
-    struct glob_pattern **beg;
-    struct glob_pattern **end;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+glob_helper(
+    const char *path,
+    int dirsep, /* '/' should be placed before appending child entry's name to 'path'. */
+    enum answer exist, /* Does 'path' indicate an existing entry? */
+    enum answer isdir, /* Does 'path' indicate a directory or a symlink to a directory? */
+    struct glob_pattern **beg,
+    struct glob_pattern **end,
+    int flags,
+    ruby_glob_func *func,
+    VALUE arg,
+    rb_encoding *enc)
 {
     struct stat st;
     int status = 0;
     struct glob_pattern **cur, **new_beg, **new_end;
     int plain = 0, magical = 0, recursive = 0, match_all = 0, match_dir = 0;
     int escape = !(flags & FNM_NOESCAPE);
+    long pathlen;
 
     for (cur = beg; cur < end; ++cur) {
 	struct glob_pattern *p = *cur;
@@ -1248,23 +1340,24 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 	    p = p->next;
 	}
 	switch (p->type) {
-	case PLAIN:
+	  case PLAIN:
 	    plain = 1;
 	    break;
-	case MAGICAL:
+	  case MAGICAL:
 	    magical = 1;
 	    break;
-	case MATCH_ALL:
+	  case MATCH_ALL:
 	    match_all = 1;
 	    break;
-	case MATCH_DIR:
+	  case MATCH_DIR:
 	    match_dir = 1;
 	    break;
-	case RECURSIVE:
+	  case RECURSIVE:
 	    rb_bug("continuous RECURSIVEs");
 	}
     }
 
+    pathlen = strlen(path);
     if (*path) {
 	if (match_all && exist == UNKNOWN) {
 	    if (do_lstat(path, &st, flags) == 0) {
@@ -1287,14 +1380,14 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 	    }
 	}
 	if (match_all && exist == YES) {
-	    status = glob_call_func(func, path, arg);
+	    status = glob_call_func(func, path, arg, enc);
 	    if (status) return status;
 	}
 	if (match_dir && isdir == YES) {
-	    char *tmp = join_path(path, dirsep, "");
+	    char *tmp = join_path(path, pathlen, dirsep, "", 0);
 	    if (!tmp) return -1;
-	    status = glob_call_func(func, tmp, arg);
-	    free(tmp);
+	    status = glob_call_func(func, tmp, arg, enc);
+	    GLOB_FREE(tmp);
 	    if (status) return status;
 	}
     }
@@ -1303,19 +1396,51 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 
     if (magical || recursive) {
 	struct dirent *dp;
-	DIR *dirp = do_opendir(*path ? path : ".", flags);
+	DIR *dirp;
+	IF_HAVE_HFS(int hfs_p);
+	dirp = do_opendir(*path ? path : ".", flags, enc);
 	if (dirp == NULL) return 0;
+	IF_HAVE_HFS(hfs_p = is_hfs(dirp));
 
-	for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
-	    char *buf = join_path(path, dirsep, dp->d_name);
+	while ((dp = READDIR(dirp, enc)) != NULL) {
+	    char *buf;
 	    enum answer new_isdir = UNKNOWN;
+	    const char *name;
+	    size_t namlen;
+	    int dotfile = 0;
+	    IF_HAVE_HFS(VALUE utf8str = Qnil);
+
+	    if (recursive && dp->d_name[0] == '.') {
+		++dotfile;
+		if (!dp->d_name[1]) {
+		    /* unless DOTMATCH, skip current directories not to recurse infinitely */
+		    if (!(flags & FNM_DOTMATCH)) continue;
+		    ++dotfile;
+		}
+		else if (dp->d_name[1] == '.' && !dp->d_name[2]) {
+		    /* always skip parent directories not to recurse infinitely */
+		    continue;
+		}
+	    }
 
+	    name = dp->d_name;
+	    namlen = NAMLEN(dp);
+# if HAVE_HFS
+	    if (hfs_p && has_nonascii(name, namlen)) {
+		if (!NIL_P(utf8str = rb_str_normalize_ospath(name, namlen))) {
+		    RSTRING_GETMEM(utf8str, name, namlen);
+		}
+	    }
+# endif
+	    buf = join_path(path, pathlen, dirsep, name, namlen);
+	    IF_HAVE_HFS(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
 	    if (!buf) {
 		status = -1;
 		break;
 	    }
-	    if (recursive && strcmp(dp->d_name, ".") != 0 && strcmp(dp->d_name, "..") != 0
-		&& fnmatch("*", dp->d_name, flags) == 0) {
+	    name = buf + pathlen + (dirsep != 0);
+	    if (recursive && dotfile < ((flags & FNM_DOTMATCH) ? 2 : 1)) {
+		/* RECURSIVE never match dot files unless FNM_DOTMATCH is set */
 #ifndef _WIN32
 		if (do_lstat(buf, &st, flags) == 0)
 		    new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
@@ -1328,6 +1453,7 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 
 	    new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, (end - beg) * 2);
 	    if (!new_beg) {
+		GLOB_FREE(buf);
 		status = -1;
 		break;
 	    }
@@ -1340,14 +1466,15 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 		    p = p->next; /* 0 times recursion */
 		}
 		if (p->type == PLAIN || p->type == MAGICAL) {
-		    if (fnmatch(p->str, dp->d_name, flags) == 0)
+		    if (fnmatch(p->str, enc, name, flags) == 0)
 			*new_end++ = p->next;
 		}
 	    }
 
-	    status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end, flags, func, arg);
-	    free(buf);
-	    free(new_beg);
+	    status = glob_helper(buf, 1, YES, new_isdir, new_beg, new_end,
+				 flags, func, arg, enc);
+	    GLOB_FREE(buf);
+	    GLOB_FREE(new_beg);
 	    if (status) break;
 	}
 
@@ -1365,65 +1492,64 @@ glob_helper(path, dirsep, exist, isdir, beg, end, flags, func, arg)
 	    if (*cur) {
 		char *buf;
 		char *name;
-		name = GLOB_ALLOC_N(char, strlen((*cur)->str) + 1);
+		size_t len = strlen((*cur)->str) + 1;
+		name = GLOB_ALLOC_N(char, len);
 		if (!name) {
 		    status = -1;
 		    break;
 		}
-		strcpy(name, (*cur)->str);
-		if (escape) remove_backslashes(name);
+		memcpy(name, (*cur)->str, len);
+		if (escape)
+		    len = remove_backslashes(name, name+len-1, enc) - name;
 
 		new_beg = new_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
 		if (!new_beg) {
-		    free(name);
+		    GLOB_FREE(name);
 		    status = -1;
 		    break;
 		}
 		*new_end++ = (*cur)->next;
 		for (cur2 = cur + 1; cur2 < copy_end; ++cur2) {
-		    if (*cur2 && fnmatch((*cur2)->str, name, flags) == 0) {
+		    if (*cur2 && fnmatch((*cur2)->str, enc, name, flags) == 0) {
 			*new_end++ = (*cur2)->next;
 			*cur2 = 0;
 		    }
 		}
 
-		buf = join_path(path, dirsep, name);
-		free(name);
+		buf = join_path(path, pathlen, dirsep, name, len);
+		GLOB_FREE(name);
 		if (!buf) {
-		    free(new_beg);
+		    GLOB_FREE(new_beg);
 		    status = -1;
 		    break;
 		}
-		status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg, new_end, flags, func, arg);
-		free(buf);
-		free(new_beg);
+		status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg,
+				     new_end, flags, func, arg, enc);
+		GLOB_FREE(buf);
+		GLOB_FREE(new_beg);
 		if (status) break;
 	    }
 	}
 
-	free(copy_beg);
+	GLOB_FREE(copy_beg);
     }
 
     return status;
 }
 
 static int
-ruby_glob0(path, flags, func, arg)
-    const char *path;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
 {
     struct glob_pattern *list;
     const char *root, *start;
     char *buf;
-    int n;
+    size_t n;
     int status;
 
     start = root = path;
     flags |= FNM_SYSCASE;
 #if defined DOSISH
-    root = rb_path_skip_prefix(root);
+    root = rb_enc_path_skip_prefix(root, root + strlen(root), enc);
 #endif
 
     if (root && *root == '/') root++;
@@ -1434,90 +1560,75 @@ ruby_glob0(path, flags, func, arg)
     MEMCPY(buf, start, char, n);
     buf[n] = '\0';
 
-    list = glob_make_pattern(root, flags);
+    list = glob_make_pattern(root, root + strlen(root), flags, enc);
     if (!list) {
-	free(buf);
+	GLOB_FREE(buf);
 	return -1;
     }
-    status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg);
+    status = glob_helper(buf, 0, UNKNOWN, UNKNOWN, &list, &list + 1, flags, func, arg, enc);
     glob_free_pattern(list);
-    free(buf);
+    GLOB_FREE(buf);
 
     return status;
 }
 
 int
-ruby_glob(path, flags, func, arg)
-    const char *path;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
 {
-    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg);
+    return ruby_glob0(path, flags & ~GLOB_VERBOSE, func, arg,
+		      rb_ascii8bit_encoding());
 }
 
-static int rb_glob_caller _((const char *, VALUE));
-
 static int
-rb_glob_caller(path, a)
-    const char *path;
-    VALUE a;
+rb_glob_caller(const char *path, VALUE a, void *enc)
 {
     int status;
     struct glob_args *args = (struct glob_args *)a;
 
-    args->c = path;
+    args->path = path;
     rb_protect(glob_func_caller, a, &status);
     return status;
 }
 
 static int
-rb_glob2(path, flags, func, arg)
-    const char *path;
-    int flags;
-    void (*func) _((const char *, VALUE));
-    VALUE arg;
+rb_glob2(const char *path, int flags,
+	 void (*func)(const char *, VALUE, void *), VALUE arg,
+	 rb_encoding* enc)
 {
     struct glob_args args;
 
     args.func = func;
-    args.v = arg;
+    args.value = arg;
+    args.enc = enc;
 
     if (flags & FNM_SYSCASE) {
 	rb_warning("Dir.glob() ignores File::FNM_CASEFOLD");
     }
 
-    return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
+    return ruby_glob0(path, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args,
+		      enc);
 }
 
 void
-rb_glob(path, func, arg)
-    const char *path;
-    void (*func) _((const char*, VALUE));
-    VALUE arg;
+rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
 {
-    int status = rb_glob2(path, 0, func, arg);
+    int status = rb_glob2(path, 0, func, arg, rb_ascii8bit_encoding());
     if (status) GLOB_JUMP_TAG(status);
 }
 
-static void push_pattern _((const char* path, VALUE ary));
 static void
-push_pattern(path, ary)
-    const char *path;
-    VALUE ary;
+push_pattern(const char *path, VALUE ary, void *enc)
 {
-    rb_ary_push(ary, rb_tainted_str_new2(path));
+    rb_ary_push(ary, rb_external_str_new_with_enc(path, strlen(path), enc));
 }
 
-int
-ruby_brace_expand(str, flags, func, arg)
-    const char *str;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+static int
+ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
+		  rb_encoding *enc)
 {
     const int escape = !(flags & FNM_NOESCAPE);
     const char *p = str;
+    const char *pend = p + strlen(p);
     const char *s = p;
     const char *lbrace = 0, *rbrace = 0;
     int nest = 0, status = 0;
@@ -1533,11 +1644,12 @@ ruby_brace_expand(str, flags, func, arg)
 	if (*p == '\\' && escape) {
 	    if (!*++p) break;
 	}
-	Inc(p);
+	Inc(p, pend, enc);
     }
 
     if (lbrace && rbrace) {
-	char *buf = GLOB_ALLOC_N(char, strlen(s) + 1);
+	size_t len = strlen(s) + 1;
+	char *buf = GLOB_ALLOC_N(char, len);
 	long shift;
 
 	if (!buf) return -1;
@@ -1553,17 +1665,17 @@ ruby_brace_expand(str, flags, func, arg)
 		if (*p == '\\' && escape) {
 		    if (++p == rbrace) break;
 		}
-		Inc(p);
+		Inc(p, pend, enc);
 	    }
 	    memcpy(buf+shift, t, p-t);
-	    strcpy(buf+shift+(p-t), rbrace+1);
-	    status = ruby_brace_expand(buf, flags, func, arg);
+	    strlcpy(buf+shift+(p-t), rbrace+1, len-(shift+(p-t)));
+	    status = ruby_brace_expand(buf, flags, func, arg, enc);
 	    if (status) break;
 	}
-	free(buf);
+	GLOB_FREE(buf);
     }
     else if (!lbrace && !rbrace) {
-	status = (*func)(s, arg);
+	status = (*func)(s, arg, enc);
     }
 
     return status;
@@ -1575,84 +1687,84 @@ struct brace_args {
     int flags;
 };
 
-static int glob_brace _((const char *, VALUE));
 static int
-glob_brace(path, val)
-    const char *path;
-    VALUE val;
+glob_brace(const char *path, VALUE val, void *enc)
 {
     struct brace_args *arg = (struct brace_args *)val;
 
-    return ruby_glob0(path, arg->flags, arg->func, arg->value);
+    return ruby_glob0(path, arg->flags, arg->func, arg->value, enc);
 }
 
 static int
-ruby_brace_glob0(str, flags, func, arg)
-    const char *str;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+ruby_brace_glob0(const char *str, int flags, ruby_glob_func *func, VALUE arg,
+		 rb_encoding* enc)
 {
     struct brace_args args;
 
     args.func = func;
     args.value = arg;
     args.flags = flags;
-    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args);
+    return ruby_brace_expand(str, flags, glob_brace, (VALUE)&args, enc);
 }
 
 int
-ruby_brace_glob(str, flags, func, arg)
-    const char *str;
-    int flags;
-    ruby_glob_func *func;
-    VALUE arg;
+ruby_brace_glob(const char *str, int flags, ruby_glob_func *func, VALUE arg)
 {
-    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg);
+    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg,
+			    rb_ascii8bit_encoding());
+}
+
+int
+ruby_brace_glob_with_enc(const char *str, int flags, ruby_glob_func *func, VALUE arg, rb_encoding *enc)
+{
+    return ruby_brace_glob0(str, flags & ~GLOB_VERBOSE, func, arg, enc);
 }
 
 static int
-push_glob(VALUE ary, const char *str, int flags)
+push_glob(VALUE ary, VALUE str, int flags)
 {
     struct glob_args args;
+    rb_encoding *enc = rb_enc_get(str);
 
+    if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding();
     args.func = push_pattern;
-    args.v = ary;
-    return ruby_brace_glob0(str, flags | GLOB_VERBOSE, rb_glob_caller, (VALUE)&args);
+    args.value = ary;
+    args.enc = enc;
+
+    RB_GC_GUARD(str);
+    return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
+			    rb_glob_caller, (VALUE)&args, enc);
 }
 
 static VALUE
-rb_push_glob(str, flags) /* '\0' is delimiter */
-    VALUE str;
-    int flags;
+rb_push_glob(VALUE str, int flags) /* '\0' is delimiter */
 {
     long offset = 0;
     VALUE ary;
 
+    GlobPathValue(str, TRUE);
     ary = rb_ary_new();
-    SafeStringValue(str);
 
     while (offset < RSTRING_LEN(str)) {
-	int status = push_glob(ary, RSTRING(str)->ptr + offset, flags);
 	char *p, *pend;
+	int status;
+	p = RSTRING_PTR(str) + offset;
+	status = push_glob(ary, rb_enc_str_new(p, strlen(p), rb_enc_get(str)),
+			   flags);
 	if (status) GLOB_JUMP_TAG(status);
 	if (offset >= RSTRING_LEN(str)) break;
-	p = RSTRING(str)->ptr + offset;
 	p += strlen(p) + 1;
-	pend = RSTRING(str)->ptr + RSTRING_LEN(str);
+	pend = RSTRING_PTR(str) + RSTRING_LEN(str);
 	while (p < pend && !*p)
 	    p++;
-	offset = p - RSTRING(str)->ptr;
+	offset = p - RSTRING_PTR(str);
     }
 
     return ary;
 }
 
 static VALUE
-dir_globs(argc, argv, flags)
-    long argc;
-    VALUE *argv;
-    int flags;
+dir_globs(long argc, const VALUE *argv, int flags)
 {
     VALUE ary = rb_ary_new();
     long i;
@@ -1660,8 +1772,8 @@ dir_globs(argc, argv, flags)
     for (i = 0; i < argc; ++i) {
 	int status;
 	VALUE str = argv[i];
-	SafeStringValue(str);
-	status = push_glob(ary, RSTRING(str)->ptr, flags);
+	GlobPathValue(str, TRUE);
+	status = push_glob(ary, str, flags);
 	if (status) GLOB_JUMP_TAG(status);
     }
 
@@ -1670,60 +1782,75 @@ dir_globs(argc, argv, flags)
 
 /*
  *  call-seq:
- *     Dir[ array ]                 => array
- *     Dir[ string [, string ...] ] => array
+ *     Dir[ array ]                 -> array
+ *     Dir[ string [, string ...] ] -> array
  *
  *  Equivalent to calling
- *  <code>Dir.glob(</code><i>array,</i><code>0)</code> and 
+ *  <code>Dir.glob(</code><i>array,</i><code>0)</code> and
  *  <code>Dir.glob([</code><i>string,...</i><code>],0)</code>.
  *
  */
 static VALUE
 dir_s_aref(int argc, VALUE *argv, VALUE obj)
- {
+{
     if (argc == 1) {
 	return rb_push_glob(argv[0], 0);
     }
     return dir_globs(argc, argv, 0);
- }
+}
 
 /*
  *  call-seq:
- *     Dir.glob( pattern, [flags] ) => array
- *     Dir.glob( pattern, [flags] ) {| filename | block }  => nil
- *
- *  Returns the filenames found by expanding <i>pattern</i> which is
- *  an +Array+ of the patterns or the pattern +String+, either as an
- *  <i>array</i> or as parameters to the block. Note that this pattern
- *  is not a regexp (it's closer to a shell glob). See
- *  <code>File::fnmatch</code> for the meaning of the <i>flags</i>
- *  parameter. Note that case sensitivity depends on your system (so
- *  <code>File::FNM_CASEFOLD</code> is ignored)
- *
- *  <code>*</code>::        Matches any file. Can be restricted by
- *                          other values in the glob. <code>*</code>
- *                          will match all files; <code>c*</code> will
- *                          match all files beginning with
- *                          <code>c</code>; <code>*c</code> will match
- *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
- *                          have <code>c</code> in them (including at
- *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp.
- *  <code>**</code>::       Matches directories recursively.
- *  <code>?</code>::        Matches any one character. Equivalent to
- *                          <code>/.{1}/</code> in regexp.
- *  <code>[set]</code>::    Matches any one character in +set+.
- *                          Behaves exactly like character sets in
- *                          Regexp, including set negation
- *                          (<code>[^a-z]</code>).
- *  <code>{p,q}</code>::    Matches either literal <code>p</code> or
- *                          literal <code>q</code>. Matching literals
- *                          may be more than one character in length.
- *                          More than two literals may be specified.
- *                          Equivalent to pattern alternation in
- *                          regexp.
- *  <code>\</code>::        Escapes the next metacharacter.
+ *     Dir.glob( pattern, [flags] ) -> matches
+ *     Dir.glob( pattern, [flags] ) { |filename| block }  -> nil
+ *
+ *  Expands +pattern+, which is an Array of patterns or a pattern String, and
+ *  returns the results as +matches+ or as arguments given to the block.
+ *
+ *  Note that this pattern is not a regexp, it's closer to a shell glob.  See
+ *  File::fnmatch for the meaning of the +flags+ parameter.  Note that case
+ *  sensitivity depends on your system (so File::FNM_CASEFOLD is ignored), as
+ *  does the order in which the results are returned.
+ *
+ *  <code>*</code>::
+ *    Matches any file. Can be restricted by other values in the glob.
+ *    Equivalent to <code>/ .* /x</code> in regexp.
+ *
+ *    <code>*</code>::     Matches all files
+ *    <code>c*</code>::    Matches all files beginning with <code>c</code>
+ *    <code>*c</code>::    Matches all files ending with <code>c</code>
+ *    <code>\*c\*</code>:: Match all files that have <code>c</code> in them
+ *                         (including at the beginning or end).
+ *
+ *    Note, this will not match Unix-like hidden files (dotfiles).  In order
+ *    to include those in the match results, you must use the
+ *    File::FNM_DOTMATCH flag or something like <code>"{*,.*}"</code>.
+ *
+ *  <code>**</code>::
+ *    Matches directories recursively.
+ *
+ *  <code>?</code>::
+ *    Matches any one character. Equivalent to <code>/.{1}/</code> in regexp.
+ *
+ *  <code>[set]</code>::
+ *    Matches any one character in +set+.  Behaves exactly like character sets
+ *    in Regexp, including set negation (<code>[^a-z]</code>).
+ *
+ *  <code>{p,q}</code>::
+ *    Matches either literal <code>p</code> or literal <code>q</code>.
+ *    Equivalent to pattern alternation in regexp.
+ *
+ *    Matching literals may be more than one character in length.  More than
+ *    two literals may be specified.
+ *
+ *  <code> \\ </code>::
+ *    Escapes the next metacharacter.
+ *
+ *    Note that this means you cannot use backslash on windows as part of a
+ *    glob, i.e.  <code>Dir["c:\\foo*"]</code> will not work, use
+ *    <code>Dir["c:/foo*"]</code> instead.
+ *
+ *  Examples:
  *
  *     Dir["config.?"]                     #=> ["config.h"]
  *     Dir.glob("config.?")                #=> ["config.h"]
@@ -1735,23 +1862,20 @@ dir_s_aref(int argc, VALUE *argv, VALUE obj)
  *
  *     rbfiles = File.join("**", "*.rb")
  *     Dir.glob(rbfiles)                   #=> ["main.rb",
- *                                              "lib/song.rb",
- *                                              "lib/song/karaoke.rb"]
+ *                                         #    "lib/song.rb",
+ *                                         #    "lib/song/karaoke.rb"]
  *     libdirs = File.join("**", "lib")
  *     Dir.glob(libdirs)                   #=> ["lib"]
  *
  *     librbfiles = File.join("**", "lib", "**", "*.rb")
  *     Dir.glob(librbfiles)                #=> ["lib/song.rb",
- *                                              "lib/song/karaoke.rb"]
+ *                                         #    "lib/song/karaoke.rb"]
  *
  *     librbfiles = File.join("**", "lib", "*.rb")
  *     Dir.glob(librbfiles)                #=> ["lib/song.rb"]
  */
 static VALUE
-dir_s_glob(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+dir_s_glob(int argc, VALUE *argv, VALUE obj)
 {
     VALUE str, rflags, ary;
     int flags;
@@ -1767,7 +1891,7 @@ dir_s_glob(argc, argv, obj)
     }
     else {
 	volatile VALUE v = ary;
-	ary = dir_globs(RARRAY_LEN(v), RARRAY_PTR(v), flags);
+	ary = dir_globs(RARRAY_LEN(v), RARRAY_CONST_PTR(v), flags);
     }
 
     if (rb_block_given_p()) {
@@ -1778,27 +1902,27 @@ dir_s_glob(argc, argv, obj)
 }
 
 static VALUE
-dir_open_dir(path)
-    VALUE path;
+dir_open_dir(int argc, VALUE *argv)
 {
-    VALUE dir = rb_funcall(rb_cDir, rb_intern("open"), 1, path);
+    VALUE dir = rb_funcall2(rb_cDir, rb_intern("open"), argc, argv);
 
-    if (TYPE(dir) != T_DATA ||
-	RDATA(dir)->dfree != (RUBY_DATA_FUNC)free_dir) {
-	rb_raise(rb_eTypeError, "wrong argument type %s (expected Dir)",
-		 rb_obj_classname(dir));
-    }
+    rb_check_typeddata(dir, &dir_data_type);
     return dir;
 }
 
 
 /*
  *  call-seq:
- *     Dir.foreach( dirname ) {| filename | block }  => nil
+ *     Dir.foreach( dirname ) {| filename | block }                 -> nil
+ *     Dir.foreach( dirname, encoding: enc ) {| filename | block }  -> nil
+ *     Dir.foreach( dirname )                                       -> an_enumerator
+ *     Dir.foreach( dirname, encoding: enc )                        -> an_enumerator
  *
  *  Calls the block once for each entry in the named directory, passing
  *  the filename of each entry as a parameter to the block.
  *
+ *  If no block is given, an enumerator is returned instead.
+ *
  *     Dir.foreach("testdir") {|x| puts "Got #{x}" }
  *
  *  <em>produces:</em>
@@ -1810,97 +1934,137 @@ dir_open_dir(path)
  *
  */
 static VALUE
-dir_foreach(io, dirname)
-    VALUE io, dirname;
+dir_foreach(int argc, VALUE *argv, VALUE io)
 {
     VALUE dir;
 
-    RETURN_ENUMERATOR(io, 1, &dirname);
-    dir = dir_open_dir(dirname);
+    RETURN_ENUMERATOR(io, argc, argv);
+    dir = dir_open_dir(argc, argv);
     rb_ensure(dir_each, dir, dir_close, dir);
     return Qnil;
 }
 
 /*
  *  call-seq:
- *     Dir.entries( dirname ) => array
+ *     Dir.entries( dirname )                -> array
+ *     Dir.entries( dirname, encoding: enc ) -> array
  *
  *  Returns an array containing all of the filenames in the given
  *  directory. Will raise a <code>SystemCallError</code> if the named
  *  directory doesn't exist.
  *
+ *  The optional <i>enc</i> argument specifies the encoding of the directory.
+ *  If not specified, the filesystem encoding is used.
+ *
  *     Dir.entries("testdir")   #=> [".", "..", "config.h", "main.rb"]
  *
  */
 static VALUE
-dir_entries(io, dirname)
-    VALUE io, dirname;
+dir_entries(int argc, VALUE *argv, VALUE io)
 {
     VALUE dir;
 
-    dir = dir_open_dir(dirname);
+    dir = dir_open_dir(argc, argv);
     return rb_ensure(rb_Array, dir, dir_close, dir);
 }
 
+static int
+fnmatch_brace(const char *pattern, VALUE val, void *enc)
+{
+    struct brace_args *arg = (struct brace_args *)val;
+    VALUE path = arg->value;
+    rb_encoding *enc_pattern = enc;
+    rb_encoding *enc_path = rb_enc_get(path);
+
+    if (enc_pattern != enc_path) {
+	if (!rb_enc_asciicompat(enc_pattern))
+	    return FNM_NOMATCH;
+	if (!rb_enc_asciicompat(enc_path))
+	    return FNM_NOMATCH;
+	if (!rb_enc_str_asciionly_p(path)) {
+	    int cr = ENC_CODERANGE_7BIT;
+	    long len = strlen(pattern);
+	    if (rb_str_coderange_scan_restartable(pattern, pattern + len,
+						  enc_pattern, &cr) != len)
+		return FNM_NOMATCH;
+	    if (cr != ENC_CODERANGE_7BIT)
+		return FNM_NOMATCH;
+	}
+    }
+    return (fnmatch(pattern, enc, RSTRING_PTR(path), arg->flags) == 0);
+}
+
 /*
  *  call-seq:
- *     File.fnmatch( pattern, path, [flags] ) => (true or false)
- *     File.fnmatch?( pattern, path, [flags] ) => (true or false)
- *
- *  Returns true if <i>path</i> matches against <i>pattern</i> The
- *  pattern is not a regular expression; instead it follows rules
- *  similar to shell filename globbing. It may contain the following
- *  metacharacters:
- *
- *  <code>*</code>::        Matches any file. Can be restricted by
- *                          other values in the glob. <code>*</code>
- *                          will match all files; <code>c*</code> will
- *                          match all files beginning with
- *                          <code>c</code>; <code>*c</code> will match
- *                          all files ending with <code>c</code>; and
- *                          <code>*c*</code> will match all files that
- *                          have <code>c</code> in them (including at
- *                          the beginning or end). Equivalent to
- *                          <code>/ .* /x</code> in regexp.
- *  <code>**</code>::       Matches directories recursively or files
- *                          expansively.
- *  <code>?</code>::        Matches any one character. Equivalent to
- *                          <code>/.{1}/</code> in regexp.
- *  <code>[set]</code>::    Matches any one character in +set+.
- *                          Behaves exactly like character sets in
- *                          Regexp, including set negation
- *                          (<code>[^a-z]</code>).
- *  <code>\</code>::        Escapes the next metacharacter.
- *
- *  <i>flags</i> is a bitwise OR of the <code>FNM_xxx</code>
- *  parameters. The same glob pattern and flags are used by
- *  <code>Dir::glob</code>.
- *
- *     File.fnmatch('cat',       'cat')        #=> true  : match entire string
- *     File.fnmatch('cat',       'category')   #=> false : only match partial string
- *     File.fnmatch('c{at,ub}s', 'cats')       #=> false : { } isn't supported
- *
- *     File.fnmatch('c?t',     'cat')          #=> true  : '?' match only 1 character
- *     File.fnmatch('c??t',    'cat')          #=> false : ditto
- *     File.fnmatch('c*',      'cats')         #=> true  : '*' match 0 or more characters
- *     File.fnmatch('c*t',     'c/a/b/t')      #=> true  : ditto
- *     File.fnmatch('ca[a-z]', 'cat')          #=> true  : inclusive bracket expression
- *     File.fnmatch('ca[^t]',  'cat')          #=> false : exclusive bracket expression ('^' or '!')
- *
- *     File.fnmatch('cat', 'CAT')                     #=> false : case sensitive
- *     File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true  : case insensitive
- *
- *     File.fnmatch('?',   '/', File::FNM_PATHNAME)  #=> false : wildcard doesn't match '/' on FNM_PATHNAME
- *     File.fnmatch('*',   '/', File::FNM_PATHNAME)  #=> false : ditto
- *     File.fnmatch('[/]', '/', File::FNM_PATHNAME)  #=> false : ditto
- *
- *     File.fnmatch('\?',   '?')                       #=> true  : escaped wildcard becomes ordinary
- *     File.fnmatch('\a',   'a')                       #=> true  : escaped ordinary remains ordinary
- *     File.fnmatch('\a',   '\a', File::FNM_NOESCAPE)  #=> true  : FNM_NOESACPE makes '\' ordinary
- *     File.fnmatch('[\?]', '?')                       #=> true  : can escape inside bracket expression
- *
- *     File.fnmatch('*',   '.profile')                      #=> false : wildcard doesn't match leading
- *     File.fnmatch('*',   '.profile', File::FNM_DOTMATCH)  #=> true    period by default.
+ *     File.fnmatch( pattern, path, [flags] ) -> (true or false)
+ *     File.fnmatch?( pattern, path, [flags] ) -> (true or false)
+ *
+ *  Returns true if +path+ matches against +pattern+.  The pattern is not a
+ *  regular expression; instead it follows rules similar to shell filename
+ *  globbing.  It may contain the following metacharacters:
+ *
+ *  <code>*</code>::
+ *    Matches any file. Can be restricted by other values in the glob.
+ *    Equivalent to <code>/ .* /x</code> in regexp.
+ *
+ *    <code>*</code>::    Matches all files regular files
+ *    <code>c*</code>::   Matches all files beginning with <code>c</code>
+ *    <code>*c</code>::   Matches all files ending with <code>c</code>
+ *    <code>\*c*</code>:: Matches all files that have <code>c</code> in them
+ *                        (including at the beginning or end).
+ *
+ *    To match hidden files (that start with a <code>.</code> set the
+ *    File::FNM_DOTMATCH flag.
+ *
+ *  <code>**</code>::
+ *    Matches directories recursively or files expansively.
+ *
+ *  <code>?</code>::
+ *    Matches any one character. Equivalent to <code>/.{1}/</code> in regexp.
+ *
+ *  <code>[set]</code>::
+ *    Matches any one character in +set+.  Behaves exactly like character sets
+ *    in Regexp, including set negation (<code>[^a-z]</code>).
+ *
+ *  <code> \ </code>::
+ *    Escapes the next metacharacter.
+ *
+ *  <code>{a,b}</code>::
+ *    Matches pattern a and pattern b if File::FNM_EXTGLOB flag is enabled.
+ *    Behaves like a Regexp union (<code>(?:a|b)</code>).
+ *
+ *  +flags+ is a bitwise OR of the <code>FNM_XXX</code> constants. The same
+ *  glob pattern and flags are used by Dir::glob.
+ *
+ *  Examples:
+ *
+ *     File.fnmatch('cat',       'cat')        #=> true  # match entire string
+ *     File.fnmatch('cat',       'category')   #=> false # only match partial string
+ *
+ *     File.fnmatch('c{at,ub}s', 'cats')                    #=> false # { } isn't supported by default
+ *     File.fnmatch('c{at,ub}s', 'cats', File::FNM_EXTGLOB) #=> true  # { } is supported on FNM_EXTGLOB
+ *
+ *     File.fnmatch('c?t',     'cat')          #=> true  # '?' match only 1 character
+ *     File.fnmatch('c??t',    'cat')          #=> false # ditto
+ *     File.fnmatch('c*',      'cats')         #=> true  # '*' match 0 or more characters
+ *     File.fnmatch('c*t',     'c/a/b/t')      #=> true  # ditto
+ *     File.fnmatch('ca[a-z]', 'cat')          #=> true  # inclusive bracket expression
+ *     File.fnmatch('ca[^t]',  'cat')          #=> false # exclusive bracket expression ('^' or '!')
+ *
+ *     File.fnmatch('cat', 'CAT')                     #=> false # case sensitive
+ *     File.fnmatch('cat', 'CAT', File::FNM_CASEFOLD) #=> true  # case insensitive
+ *
+ *     File.fnmatch('?',   '/', File::FNM_PATHNAME)  #=> false # wildcard doesn't match '/' on FNM_PATHNAME
+ *     File.fnmatch('*',   '/', File::FNM_PATHNAME)  #=> false # ditto
+ *     File.fnmatch('[/]', '/', File::FNM_PATHNAME)  #=> false # ditto
+ *
+ *     File.fnmatch('\?',   '?')                       #=> true  # escaped wildcard becomes ordinary
+ *     File.fnmatch('\a',   'a')                       #=> true  # escaped ordinary remains ordinary
+ *     File.fnmatch('\a',   '\a', File::FNM_NOESCAPE)  #=> true  # FNM_NOESCAPE makes '\' ordinary
+ *     File.fnmatch('[\?]', '?')                       #=> true  # can escape inside bracket expression
+ *
+ *     File.fnmatch('*',   '.profile')                      #=> false # wildcard doesn't match leading
+ *     File.fnmatch('*',   '.profile', File::FNM_DOTMATCH)  #=> true  # period by default.
  *     File.fnmatch('.*',  '.profile')                      #=> true
  *
  *     rbfiles = '**' '/' '*.rb' # you don't have to do like this. just write in single string.
@@ -1924,10 +2088,7 @@ dir_entries(io, dirname)
  *     File.fnmatch(pattern, 'a/.b/c/foo', File::FNM_PATHNAME | File::FNM_DOTMATCH) #=> true
  */
 static VALUE
-file_s_fnmatch(argc, argv, obj)
-    int argc;
-    VALUE *argv;
-    VALUE obj;
+file_s_fnmatch(int argc, VALUE *argv, VALUE obj)
 {
     VALUE pattern, path;
     VALUE rflags;
@@ -1939,15 +2100,80 @@ file_s_fnmatch(argc, argv, obj)
 	flags = 0;
 
     StringValue(pattern);
-    StringValue(path);
+    FilePathStringValue(path);
 
-    if (fnmatch(RSTRING(pattern)->ptr, RSTRING(path)->ptr, flags) == 0)
-	return Qtrue;
+    if (flags & FNM_EXTGLOB) {
+	struct brace_args args;
+
+	args.value = path;
+	args.flags = flags;
+	if (ruby_brace_expand(RSTRING_PTR(pattern), flags, fnmatch_brace,
+			      (VALUE)&args, rb_enc_get(pattern)) > 0)
+	    return Qtrue;
+    }
+    else {
+	rb_encoding *enc = rb_enc_compatible(pattern, path);
+	if (!enc) return Qfalse;
+	if (fnmatch(RSTRING_PTR(pattern), enc, RSTRING_PTR(path), flags) == 0)
+	    return Qtrue;
+    }
+    RB_GC_GUARD(pattern);
 
     return Qfalse;
 }
 
 /*
+ *  call-seq:
+ *    Dir.home()       -> "/home/me"
+ *    Dir.home("root") -> "/root"
+ *
+ *  Returns the home directory of the current user or the named user
+ *  if given.
+ */
+static VALUE
+dir_s_home(int argc, VALUE *argv, VALUE obj)
+{
+    VALUE user;
+    const char *u = 0;
+
+    rb_check_arity(argc, 0, 1);
+    user = (argc > 0) ? argv[0] : Qnil;
+    if (!NIL_P(user)) {
+	SafeStringValue(user);
+	rb_must_asciicompat(user);
+	u = StringValueCStr(user);
+	if (*u) {
+	    return rb_home_dir_of(user, rb_str_new(0, 0));
+	}
+    }
+    return rb_default_home_dir(rb_str_new(0, 0));
+
+}
+
+#if 0
+/*
+ * call-seq:
+ *   Dir.exist?(file_name)   ->  true or false
+ *   Dir.exists?(file_name)   ->  true or false
+ *
+ * Returns <code>true</code> if the named file is a directory,
+ * <code>false</code> otherwise.
+ *
+ */
+VALUE
+rb_file_directory_p()
+{
+}
+#endif
+
+static VALUE
+rb_dir_exists_p(VALUE obj, VALUE fname)
+{
+    rb_warning("Dir.exists? is a deprecated name, use Dir.exist? instead");
+    return rb_file_directory_p(obj, fname);
+}
+
+/*
  *  Objects of class <code>Dir</code> are directory streams representing
  *  directories in the underlying file system. They provide a variety of
  *  ways to list directories and their contents. See also
@@ -1959,19 +2185,20 @@ file_s_fnmatch(argc, argv, obj)
  *  (<code>.</code>).
  */
 void
-Init_Dir()
+Init_Dir(void)
 {
     rb_cDir = rb_define_class("Dir", rb_cObject);
 
     rb_include_module(rb_cDir, rb_mEnumerable);
 
     rb_define_alloc_func(rb_cDir, dir_s_alloc);
-    rb_define_singleton_method(rb_cDir, "open", dir_s_open, 1);
-    rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, 1);
-    rb_define_singleton_method(rb_cDir, "entries", dir_entries, 1);
+    rb_define_singleton_method(rb_cDir, "open", dir_s_open, -1);
+    rb_define_singleton_method(rb_cDir, "foreach", dir_foreach, -1);
+    rb_define_singleton_method(rb_cDir, "entries", dir_entries, -1);
 
-    rb_define_method(rb_cDir,"initialize", dir_initialize, 1);
+    rb_define_method(rb_cDir,"initialize", dir_initialize, -1);
     rb_define_method(rb_cDir,"path", dir_path, 0);
+    rb_define_method(rb_cDir,"to_path", dir_path, 0);
     rb_define_method(rb_cDir,"inspect", dir_inspect, 0);
     rb_define_method(rb_cDir,"read", dir_read, 0);
     rb_define_method(rb_cDir,"each", dir_each, 0);
@@ -1990,16 +2217,47 @@ Init_Dir()
     rb_define_singleton_method(rb_cDir,"rmdir", dir_s_rmdir, 1);
     rb_define_singleton_method(rb_cDir,"delete", dir_s_rmdir, 1);
     rb_define_singleton_method(rb_cDir,"unlink", dir_s_rmdir, 1);
+    rb_define_singleton_method(rb_cDir,"home", dir_s_home, -1);
 
     rb_define_singleton_method(rb_cDir,"glob", dir_s_glob, -1);
     rb_define_singleton_method(rb_cDir,"[]", dir_s_aref, -1);
+    rb_define_singleton_method(rb_cDir,"exist?", rb_file_directory_p, 1);
+    rb_define_singleton_method(rb_cDir,"exists?", rb_dir_exists_p, 1);
 
     rb_define_singleton_method(rb_cFile,"fnmatch", file_s_fnmatch, -1);
     rb_define_singleton_method(rb_cFile,"fnmatch?", file_s_fnmatch, -1);
 
+    /*  Document-const: File::Constants::FNM_NOESCAPE
+     *
+     *  Disables escapes in File.fnmatch and Dir.glob patterns
+     */
     rb_file_const("FNM_NOESCAPE", INT2FIX(FNM_NOESCAPE));
+
+    /*  Document-const: File::Constants::FNM_PATHNAME
+     *
+     *  Wildcards in File.fnmatch and Dir.glob patterns do not match directory
+     *  separators
+     */
     rb_file_const("FNM_PATHNAME", INT2FIX(FNM_PATHNAME));
+
+    /*  Document-const: File::Constants::FNM_DOTMATCH
+     *
+     *  The '*' wildcard matches filenames starting with "." in File.fnmatch
+     *  and Dir.glob patterns
+     */
     rb_file_const("FNM_DOTMATCH", INT2FIX(FNM_DOTMATCH));
+
+    /*  Document-const: File::Constants::FNM_CASEFOLD
+     *
+     *  Makes File.fnmatch patterns case insensitive (but not Dir.glob
+     *  patterns).
+     */
     rb_file_const("FNM_CASEFOLD", INT2FIX(FNM_CASEFOLD));
+
+    /*  Document-const: File::Constants::FNM_EXTGLOB
+     *
+     *  Allows file globbing through "{a,b}" in File.fnmatch patterns.
+     */
+    rb_file_const("FNM_EXTGLOB", INT2FIX(FNM_EXTGLOB));
     rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
 }
diff --git a/distruby.rb b/distruby.rb
deleted file mode 100644
index 613da0eb9c..0000000000
--- a/distruby.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!./miniruby
-
-if RUBY_PATCHLEVEL.zero?
-	dirname = sprintf 'ruby-%s', RUBY_VERSION
-	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)/, 'v\1_\2_\3'
-else
-	dirname = sprintf 'ruby-%s-p%u', RUBY_VERSION, RUBY_PATCHLEVEL
-	tagname = dirname.gsub /ruby-(\d)\.(\d)\.(\d)-p/, 'v\1_\2_\3_'
-end
-tgzname = dirname + '.tar.gz'
-tbzname = dirname + '.tar.bz2'
-zipname = dirname + '.zip'
-repos   = 'http://svn.ruby-lang.org/repos/ruby/tags/' + tagname
-
-STDERR.puts 'exporting sources...'
-system 'svn',  'export',  '-q', repos, dirname
-Dir.chdir dirname do
-	STDERR.puts 'generating configure...'
-	system 'autoconf'
-	system 'rm', '-rf', 'autom4te.cache'
-
-	STDERR.puts 'generating parse.c...'
-	system 'bison', '-y', '-o', 'parse.c', 'parse.y'
-end
-
-STDERR.puts 'generating tarballs...'
-ENV['GZIP'] = '-9'
-system 'tar', 'chofzp', tgzname, dirname
-system 'tar', 'chojfp', tbzname, dirname
-system 'zip', '-q9r', zipname, dirname
-
-require 'digest/md5'
-require 'digest/sha2'
-for name in [tgzname, tbzname, zipname] do
-	open name, 'rb' do |fp|
-		str = fp.read
-		md5 = Digest::MD5.hexdigest str
-		sha = Digest::SHA256.hexdigest str
-		printf "MD5(%s)= %s\nSHA256(%s)= %s\nSIZE(%s)= %s\n\n",
-				 name, md5,
-				 name, sha,
-				 name, str.size
-	end
-end
-
-
-
-# 
-# Local Variables:
-# mode: ruby
-# code: utf-8
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# fill-column: 79
-# default-justification: full
-# End:
-# vi: ts=3 sw=3
-
diff --git a/djgpp/GNUmakefile.in b/djgpp/GNUmakefile.in
deleted file mode 100644
index 0a7e1fb131..0000000000
--- a/djgpp/GNUmakefile.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include Makefile
-VPATH = $(srcdir) $(srcdir)/missing
diff --git a/djgpp/README.djgpp b/djgpp/README.djgpp
deleted file mode 100644
index f1f413a478..0000000000
--- a/djgpp/README.djgpp
+++ /dev/null
@@ -1,21 +0,0 @@
-* How to compile and install on djgpp
-
-This is what you need to do to compile and install Ruby:
-
-  1. Run configure.bat, which will generate config.h and Makefile
-     (GNU sed required).
-     Message like this is normal:
-       sed.exe: can't read 123456789: No such file or directory (ENOENT)
-
-  2. Edit defines.h if you need.  Probably this step will not need.
-
-  3. Remove comment mark(#) before the module names from ext/Setup.dj (or
-     add module names if not present).
-
-  4. Run make.
-
-  5. 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).
-
-  6. Run 'make install'
diff --git a/djgpp/config.hin b/djgpp/config.hin
deleted file mode 100644
index 8ee427c92f..0000000000
--- a/djgpp/config.hin
+++ /dev/null
@@ -1,114 +0,0 @@
-
-#define PACKAGE_NAME ""
-#define PACKAGE_TARNAME ""
-#define PACKAGE_VERSION ""
-#define PACKAGE_STRING ""
-#define PACKAGE_BUGREPORT ""
-#define USE_BUILTIN_FRAME_ADDRESS 1
-#define STDC_HEADERS 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_STRINGS_H 1
-#define HAVE_UNISTD_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 8
-#define SIZEOF___INT64 0
-#define SIZEOF_OFF_T 4
-#define SIZEOF_VOIDP 4
-#define SIZEOF_FLOAT 4
-#define SIZEOF_DOUBLE 8
-#define HAVE_PROTOTYPES 1
-#define TOKEN_PASTE(x,y) x##y
-#define HAVE_STDARG_PROTOTYPES 1
-#define NORETURN(x) x __attribute__ ((noreturn))
-#define HAVE_DECL_SYS_NERR 1
-#define HAVE_DIRENT_H 1
-#define STDC_HEADERS 1
-#define HAVE_SYS_WAIT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_SYS_FILE_H 1
-#define HAVE_SYS_IOCTL_H 1
-#define HAVE_FCNTL_H 1
-#define HAVE_SYS_FCNTL_H 1
-#define HAVE_SYS_TIME_H 1
-#define HAVE_SYS_TIMES_H 1
-#define HAVE_SYS_PARAM_H 1
-#define HAVE_PWD_H 1
-#define HAVE_UTIME_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_DIRECT_H 1
-#define HAVE_SYS_RESOURCE_H 1
-#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-#define HAVE_ST_BLKSIZE 1
-#define HAVE_STRUCT_STAT_ST_RDEV 1
-#define HAVE_ST_RDEV 1
-#define GETGROUPS_T gid_t
-#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_STRTOUL 1
-#define HAVE_ISINF 1
-#define HAVE_ISNAN 1
-#define HAVE_FINITE 1
-#define HAVE_HYPOT 1
-#define HAVE_ACOSH 1
-#define HAVE_FMOD 1
-#define HAVE_WAITPID 1
-#define HAVE_FSYNC 1
-#define HAVE_TRUNCATE 1
-#define HAVE_CHSIZE 1
-#define HAVE_TIMES 1
-#define HAVE_UTIMES 1
-#define HAVE_FCNTL 1
-#define HAVE_SYMLINK 1
-#define HAVE_SETITIMER 1
-#define HAVE_PAUSE 1
-#define HAVE_GETPGRP 1
-#define HAVE_SETPGID 1
-#define HAVE_GETGROUPS 1
-#define HAVE_GETRLIMIT 1
-#define HAVE_SIGPROCMASK 1
-#define HAVE_SIGACTION 1
-#define HAVE_SETSID 1
-#define HAVE_TELLDIR 1
-#define HAVE_SEEKDIR 1
-#define HAVE_MKTIME 1
-#define HAVE_COSH 1
-#define HAVE_SINH 1
-#define HAVE_TANH 1
-#define HAVE_STRUCT_TM_TM_ZONE 1
-#define HAVE_TM_ZONE 1
-#define HAVE_STRUCT_TM_TM_GMTOFF 1
-#define POSIX_SIGNAL 1
-#define GETPGRP_VOID 1
-#define SETPGRP_VOID 1
-#define RSHIFT(x,y) ((x)>>(int)y)
-#define FILE_COUNT _cnt
-#define FILE_READPTR _ptr
-#define NEED_IO_FLUSH_BETWEEN_RW 1
-#define DEFAULT_KCODE KCODE_NONE
-#define DLEXT ".so"
-#define RUBY_LIB "/lib/ruby/@MAJOR@.@MINOR@"
-#define RUBY_SITE_LIB "/lib/ruby/site_ruby"
-#define RUBY_SITE_LIB2 "/lib/ruby/site_ruby/@MAJOR@.@MINOR@"
-#define RUBY_PLATFORM "i386-msdosdjgpp"
-#define RUBY_ARCHLIB "/lib/ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
-#define RUBY_SITE_ARCHLIB "/lib/ruby/site_ruby/@MAJOR@.@MINOR@/i386-msdosdjgpp"
diff --git a/djgpp/config.sed b/djgpp/config.sed
deleted file mode 100644
index 1805789520..0000000000
--- a/djgpp/config.sed
+++ /dev/null
@@ -1,128 +0,0 @@
-/^SHELL/s,/bin/sh,$(COMSPEC),
-;s%/bin/rm%rm%
-;s%|| true%%
-;/\/dev\/null/ {
-;s,/dev/null 2>&1, nul,
-;s,2> /dev/null,,
-;}
-;/^config.status/ {
-;    N;N;N;N;N;d
-;}
-:t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@srcdir@,.,g;t t
-s,@top_srcdir@,..,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,,;t t
-s,@PACKAGE_TARNAME@,,;t t
-s,@PACKAGE_VERSION@,,;t t
-s,@PACKAGE_STRING@,,;t t
-s,@PACKAGE_BUGREPORT@,,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/dev/env/DJDIR,;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@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/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,@build_alias@,i586-pc-msdosdjgpp,;t t
-s,@host_alias@,i586-pc-msdosdjgpp,;t t
-s,@target_alias@,i386-msdosdjgpp,;t t
-s,@DEFS@,,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@,-lm ,;t t
-s,@MAJOR@,1,;t t
-s,@MINOR@,7,;t t
-s,@TEENY@,3,;t t
-s,@build@,i586-pc-msdosdjgpp,;t t
-s,@build_cpu@,i586,;t t
-s,@build_vendor@,pc,;t t
-s,@build_os@,msdosdjgpp,;t t
-s,@host@,i586-pc-msdosdjgpp,;t t
-s,@host_cpu@,i586,;t t
-s,@host_vendor@,pc,;t t
-s,@host_os@,msdosdjgpp,;t t
-s,@target@,i386-pc-msdosdjgpp,;t t
-s,@target_cpu@,i386,;t t
-s,@target_vendor@,pc,;t t
-s,@target_os@,msdosdjgpp,;t t
-s,@CC@,gcc,;t t
-s,@ac_ct_CC@,,;t t
-s,@CFLAGS@,-Os,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@EXEEXT@,.exe,;t t
-s,@OBJEXT@,o,;t t
-s,@CPP@,gcc -E,;t t
-s,@EGREP@,grep -E,;t t
-s,@GNU_LD@,yes,;t t
-s,@CPPOUTFILE@,-o conftest.i,;t t
-s,@OUTFLAG@,-o ,;t t
-s,@YACC@,bison -y,;t t
-s,@RANLIB@,ranlib,;t t
-s,@ac_ct_RANLIB@,,;t t
-s,@AR@,ar,;t t
-s,@ac_ct_AR@,,;t t
-s,@NM@,,;t t
-s,@ac_ct_NM@,,;t t
-s,@WINDRES@,,;t t
-s,@ac_ct_WINDRES@,,;t t
-s,@DLLWRAP@,,;t t
-s,@ac_ct_DLLWRAP@,,;t t
-s,@LN_S@,ln -s,;t t
-s,@SET_MAKE@,,;t t
-s,@LIBOBJS@,crypt.o flock.o vsnprintf.o,;t t
-s,@ALLOCA@,,;t t
-s,@XCFLAGS@,,;t t
-s,@XLDFLAGS@, -L.,;t t
-s,@DLDFLAGS@,,;t t
-s,@STATIC@,,;t t
-s,@CCDLFLAGS@,,;t t
-s,@LDSHARED@,ld,;t t
-s,@DLEXT@,so,;t t
-s,@DLEXT2@,,;t t
-s,@LIBEXT@,a,;t t
-s,@LINK_SO@,,;t t
-s,@LIBPATHFLAG@, -L%s,;t t
-s,@STRIP@,strip,;t t
-s,@EXTSTATIC@,,;t t
-s,@setup@,Setup.dj,;t t
-s,@MINIRUBY@,./miniruby,;t t
-s,@PREP@,,;t t
-s,@ARCHFILE@,,;t t
-s,@LIBRUBY_LDSHARED@,ld,;t t
-s,@LIBRUBY_DLDFLAGS@,,;t t
-s,@RUBY_INSTALL_NAME@,ruby,;t t
-s,@rubyw_install_name@,,;t t
-s,@RUBYW_INSTALL_NAME@,,;t t
-s,@RUBY_SO_NAME@,$(RUBY_INSTALL_NAME),;t t
-s,@LIBRUBY_A@,lib$(RUBY_INSTALL_NAME).a,;t t
-s,@LIBRUBY_SO@,lib$(RUBY_SO_NAME).so.$(MAJOR).$(MINOR).$(TEENY),;t t
-s,@LIBRUBY_ALIASES@,lib$(RUBY_SO_NAME).so,;t t
-s,@LIBRUBY@,$(LIBRUBY_A),;t t
-s,@LIBRUBYARG@,-l$(RUBY_INSTALL_NAME),;t t
-s,@SOLIBS@,,;t t
-s,@DLDLIBS@,-lc,;t t
-s,@ENABLE_SHARED@,no,;t t
-s,@MAINLIBS@,,;t t
-s,@COMMON_LIBS@,,;t t
-s,@COMMON_MACROS@,,;t t
-s,@COMMON_HEADERS@,,;t t
-s,@EXPORT_PREFIX@,,;t t
-s,@MAKEFILES@,Makefile,;t t
-s,@arch@,i386-msdosdjgpp,;t t
-s,@sitearch@,i386-msdosdjgpp,;t t
-s,@sitedir@,${prefix}/lib/ruby/site_ruby,;t t
-s,@configure_args@,,;t t
-/^,THIS_IS_DUMMY_PATTERN_/i\
-ac_given_srcdir=.
diff --git a/djgpp/configure.bat b/djgpp/configure.bat
deleted file mode 100755
index e6a5d79d4a..0000000000
--- a/djgpp/configure.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-if exist configure.bat cd ..
-if exist djgpp\version.sed goto exist
-  sed -n -f djgpp\mkver.sed < version.h > djgpp\version.sed
-:exist
-set _conv_=-f djgpp\config.sed -f djgpp\version.sed
-sed %_conv_% < Makefile.in > Makefile
-sed %_conv_% < djgpp\config.hin > config.h
-echo LFN check > 12345678
-sed -n /LFN/d 123456789 > nul
-if errorlevel 2 goto LFN
-    copy missing\vsnprintf.c missing\vsnprint.c > nul
-    copy djgpp\config.sed config.sta > nul
-goto end
-:LFN
-    copy djgpp\config.sed config.status > nul
-:end
-set _conv_=
-del 12345678
-echo Now you must run a make.
diff --git a/djgpp/mkver.sed b/djgpp/mkver.sed
deleted file mode 100644
index f29b9ddd3e..0000000000
--- a/djgpp/mkver.sed
+++ /dev/null
@@ -1 +0,0 @@
-/RUBY_VERSION /s/^.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*$/s,@MAJOR@,\1,;s,@MINOR@,\2,;s,@TEENY@,\3,/p
diff --git a/dln.c b/dln.c
index 5ba25b6415..e6b20d54e3 100644
--- a/dln.c
+++ b/dln.c
@@ -3,26 +3,30 @@
   dln.c -
 
   $Author$
-  $Date$
   created at: Tue Jan 18 17:05:06 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
-#include "ruby.h"
+#ifdef RUBY_EXPORT
+#include "ruby/ruby.h"
+#define dln_notimplement rb_notimplement
+#define dln_memerror rb_memerror
+#define dln_exit rb_exit
+#define dln_loaderror rb_loaderror
+#else
+#define dln_notimplement --->>> dln not implemented <<<---
+#define dln_memerror abort
+#define dln_exit exit
+static void dln_loaderror(const char *format, ...);
+#endif
 #include "dln.h"
 
 #ifdef HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
 
-#ifdef __CHECKER__
-#undef HAVE_DLOPEN
-#undef USE_DLN_A_OUT
-#undef USE_DLN_DLOPEN
-#endif
-
 #ifdef USE_DLN_A_OUT
 char *dln_argv0;
 #endif
@@ -43,15 +47,17 @@ void *xcalloc();
 void *xrealloc();
 #endif
 
+#define free(x) xfree(x)
+
 #include <stdio.h>
-#if defined(_WIN32) || defined(__VMS)
+#if defined(_WIN32)
 #include "missing/file.h"
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
 
 #ifndef S_ISDIR
-#   define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR)
+#   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
 #endif
 
 #ifdef HAVE_SYS_PARAM_H
@@ -69,19 +75,7 @@ void *xrealloc();
 char *getenv();
 #endif
 
-#if defined(__VMS)
-#pragma builtins
-#include <dlfcn.h>
-#endif
-
-#ifdef __MACOS__
-# include <TextUtils.h>
-# include <CodeFragments.h>
-# include <Aliases.h>
-# include "macruby_private.h"
-#endif
-
-#if defined(__APPLE__) && defined(__MACH__)   /* Mac OS X */
+#ifdef __APPLE__
 # if defined(HAVE_DLOPEN)
    /* Mac OS X with dlopen (10.3 or later) */
 #  define MACOSX_DLOPEN
@@ -90,11 +84,21 @@ char *getenv();
 # endif
 #endif
 
-#ifdef __BEOS__
+#if defined(__BEOS__) || defined(__HAIKU__)
 # include <image.h>
 #endif
 
-#ifndef NO_DLN_LOAD
+#ifndef dln_loaderror
+static void
+dln_loaderror(const char *format, ...)
+{
+    va_list ap;
+    va_start(ap, format);
+    vfprintf(stderr, format, ap);
+    va_end(ap);
+    abort();
+}
+#endif
 
 #if defined(HAVE_DLOPEN) && !defined(USE_DLN_A_OUT) && !defined(_AIX) && !defined(MACOSX_DYLD) && !defined(_UNICOSMP)
 /* dynamic load with dlopen() */
@@ -102,51 +106,48 @@ char *getenv();
 #endif
 
 #ifndef FUNCNAME_PATTERN
-# if defined(__hp9000s300) ||  (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && !defined(__ELF__)) || (defined(__OpenBSD__) && !defined(__ELF__)) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
-#  define FUNCNAME_PATTERN "_Init_%s"
+# if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
+#  define FUNCNAME_PREFIX "_Init_"
 # else
-#  define FUNCNAME_PATTERN "Init_%s"
+#  define FUNCNAME_PREFIX "Init_"
 # endif
 #endif
 
-static int
-init_funcname_len(buf, file)
-    char **buf;
-    const char *file;
-{
-    char *p;
-    const char *slash;
-    int len;
-
-    /* Load the file as an object one */
-    for (slash = file-1; *file; file++) /* Find position of last '/' */
-#ifdef __MACOS__
-	if (*file == ':') slash = file;
+#if defined __CYGWIN__ || defined DOSISH
+#define isdirsep(x) ((x) == '/' || (x) == '\\')
 #else
-	if (*file == '/') slash = file;
+#define isdirsep(x) ((x) == '/')
 #endif
 
-    len = strlen(FUNCNAME_PATTERN) + strlen(slash + 1);
-    *buf = xmalloc(len);
-    snprintf(*buf, len, FUNCNAME_PATTERN, slash + 1);
-    for (p = *buf; *p; p++) {         /* Delete suffix if it exists */
-	if (*p == '.') {
-	    *p = '\0'; break;
-	}
+static size_t
+init_funcname_len(const char **file)
+{
+    const char *p = *file, *base, *dot = NULL;
+
+    /* Load the file as an object one */
+    for (base = p; *p; p++) { /* Find position of last '/' */
+	if (*p == '.' && !dot) dot = p;
+	if (isdirsep(*p)) base = p+1, dot = NULL;
     }
-    return p - *buf;
+    *file = base;
+    /* Delete suffix if it exists */
+    return (dot ? dot : p) - base;
 }
 
+static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX;
+
 #define init_funcname(buf, file) do {\
-    int len = init_funcname_len(buf, file);\
-    char *tmp = ALLOCA_N(char, len+1);\
+    const char *base = (file);\
+    const size_t flen = init_funcname_len(&base);\
+    const size_t plen = sizeof(funcname_prefix);\
+    char *const tmp = ALLOCA_N(char, plen+flen+1);\
     if (!tmp) {\
-	free(*buf);\
-	rb_memerror();\
+	dln_memerror();\
     }\
-    strcpy(tmp, *buf);\
-    free(*buf);\
-    *buf = tmp;\
+    memcpy(tmp, funcname_prefix, plen);\
+    memcpy(tmp+plen, base, flen);\
+    tmp[plen+flen] = '\0';\
+    *(buf) = tmp;\
 } while (0)
 
 #ifdef USE_DLN_A_OUT
@@ -184,8 +185,8 @@ static int dln_init_p = 0;
 
 #define INVALID_OBJECT(h) (N_MAGIC(h) != OMAGIC)
 
-#include "util.h"
-#include "st.h"
+#include "ruby/util.h"
+#include "ruby/st.h"
 
 static st_table *sym_tbl;
 static st_table *undef_tbl;
@@ -193,10 +194,7 @@ static st_table *undef_tbl;
 static int load_lib();
 
 static int
-load_header(fd, hdrp, disp)
-    int fd;
-    struct exec *hdrp;
-    long disp;
+load_header(int fd, struct exec *hdrp, long disp)
 {
     int size;
 
@@ -230,7 +228,7 @@ load_header(fd, hdrp, disp)
 #define RELOC_TARGET_SIZE(r)		((r)->r_length)
 #endif
 
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
 /* Sparc (Sun 4) macros */
 #  undef relocation_info
 #  define relocation_info reloc_info_sparc
@@ -266,10 +264,7 @@ static int reloc_r_length[] = {
 #endif
 
 static struct relocation_info *
-load_reloc(fd, hdrp, disp)
-     int fd;
-     struct exec *hdrp;
-     long disp;
+load_reloc(int fd, struct exec *hdrp, long disp)
 {
     struct relocation_info *reloc;
     int size;
@@ -292,10 +287,7 @@ load_reloc(fd, hdrp, disp)
 }
 
 static struct nlist *
-load_sym(fd, hdrp, disp)
-    int fd;
-    struct exec *hdrp;
-    long disp;
+load_sym(int fd, struct exec *hdrp, long disp)
 {
     struct nlist * buffer;
     struct nlist * sym;
@@ -336,9 +328,7 @@ load_sym(fd, hdrp, disp)
 }
 
 static st_table *
-sym_hash(hdrp, syms)
-    struct exec *hdrp;
-    struct nlist *syms;
+sym_hash(struct exec *hdrp, struct nlist *syms)
 {
     st_table *tbl;
     struct nlist *sym = syms;
@@ -358,17 +348,16 @@ sym_hash(hdrp, syms)
 }
 
 static int
-dln_init(prog)
-    const char *prog;
+dln_init(const char *prog)
 {
-    char *file;
+    char *file, fbuf[MAXPATHLEN];
     int fd;
     struct exec hdr;
     struct nlist *syms;
 
     if (dln_init_p == 1) return 0;
 
-    file = dln_find_exe(prog, NULL);
+    file = dln_find_exe_r(prog, NULL, fbuf, sizeof(fbuf));
     if (file == NULL || (fd = open(file, O_RDONLY)) < 0) {
 	dln_errno = errno;
 	return -1;
@@ -433,11 +422,7 @@ dln_init(prog)
 }
 
 static long
-load_text_data(fd, hdrp, bss, disp)
-    int fd;
-    struct exec *hdrp;
-    int bss;
-    long disp;
+load_text_data(int fd, struct exec *hdrp, int bss, long disp)
 {
     int size;
     unsigned char* addr;
@@ -471,27 +456,26 @@ load_text_data(fd, hdrp, bss, disp)
 }
 
 static int
-undef_print(key, value)
-    char *key, *value;
+undef_print(char *key, char *value)
 {
     fprintf(stderr, "  %s\n", key);
     return ST_CONTINUE;
 }
 
 static void
-dln_print_undef()
+dln_print_undef(void)
 {
     fprintf(stderr, " Undefined symbols:\n");
     st_foreach(undef_tbl, undef_print, NULL);
 }
 
 static void
-dln_undefined()
+dln_undefined(void)
 {
     if (undef_tbl->num_entries > 0) {
 	fprintf(stderr, "dln: Calling undefined function\n");
 	dln_print_undef();
-	rb_exit(1);
+	dln_exit(1);
     }
 }
 
@@ -509,10 +493,7 @@ struct undef {
 
 static st_table *reloc_tbl = NULL;
 static void
-link_undef(name, base, reloc)
-    const char *name;
-    long base;
-    struct relocation_info *reloc;
+link_undef(const char *name, long base, struct relocation_info *reloc)
 {
     static int u_no = 0;
     struct undef *obj;
@@ -545,14 +526,11 @@ struct reloc_arg {
 };
 
 static int
-reloc_undef(no, undef, arg)
-    int no;
-    struct undef *undef;
-    struct reloc_arg *arg;
+reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
 {
     int datum;
     char *address;
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
     unsigned int mask = 0;
 #endif
 
@@ -561,7 +539,7 @@ reloc_undef(no, undef, arg)
     datum = arg->value;
 
     if (R_PCREL(&(undef->reloc))) datum -= undef->base;
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
     datum += undef->reloc.r_addend;
     datum >>= R_RIGHTSHIFT(&(undef->reloc));
     mask = (1 << R_BITSIZE(&(undef->reloc))) - 1;
@@ -609,9 +587,7 @@ reloc_undef(no, undef, arg)
 }
 
 static void
-unlink_undef(name, value)
-    const char *name;
-    long value;
+unlink_undef(const char *name, long value)
 {
     struct reloc_arg arg;
 
@@ -626,10 +602,7 @@ struct indr_data {
 };
 
 static int
-reloc_repl(no, undef, data)
-    int no;
-    struct undef *undef;
-    struct indr_data *data;
+reloc_repl(int no, struct undef *undef, struct indr_data *data)
 {
     if (strcmp(data->name0, undef->name) == 0) {
 	free(undef->name);
@@ -640,10 +613,7 @@ reloc_repl(no, undef, data)
 #endif
 
 static int
-load_1(fd, disp, need_init)
-    int fd;
-    long disp;
-    const char *need_init;
+load_1(int fd, long disp, const char *need_init)
 {
     static const char *libc = LIBC_NAME;
     struct exec hdr;
@@ -793,11 +763,11 @@ load_1(fd, disp, need_init)
 	while (rel < rel_end) {
 	    char *address = (char*)(rel->r_address + block);
 	    long datum = 0;
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
 	    unsigned int mask = 0;
 #endif
 
-	    if(rel >= rel_beg)
+	    if (rel >= rel_beg)
 		address += hdr.a_text;
 
 	    if (rel->r_extern) { /* Look it up in symbol-table */
@@ -814,7 +784,7 @@ load_1(fd, disp, need_init)
 		}
 	    } /* end.. look it up */
 	    else { /* is static */
-		switch (R_SYMBOL(rel)) { 
+		switch (R_SYMBOL(rel)) {
 		  case N_TEXT:
 		  case N_DATA:
 		    datum = block;
@@ -828,7 +798,7 @@ load_1(fd, disp, need_init)
 	    } /* end .. is static */
 	    if (R_PCREL(rel)) datum -= block;
 
-#if defined(sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
 	    datum += rel->r_addend;
 	    datum >>= R_RIGHTSHIFT(rel);
 	    mask = (1 << R_BITSIZE(rel)) - 1;
@@ -924,10 +894,7 @@ load_1(fd, disp, need_init)
 
 static int target_offset;
 static int
-search_undef(key, value, lib_tbl)
-    const char *key;
-    int value;
-    st_table *lib_tbl;
+search_undef(const char *key, int value, st_table *lib_tbl)
 {
     long offset;
 
@@ -941,13 +908,13 @@ struct symdef {
     int lib_offset;
 };
 
-char *dln_librrb_ary_path = DLN_DEFAULT_LIB_PATH;
+const char *dln_librrb_ary_path = DLN_DEFAULT_LIB_PATH;
 
 static int
-load_lib(lib)
-    const char *lib;
+load_lib(const char *lib)
 {
-    char *path, *file;
+    char *path, *file, fbuf[MAXPATHLEN];
+    char *envpath = 0;
     char armagic[SARMAG];
     int fd, size;
     struct ar_hdr ahdr;
@@ -977,8 +944,10 @@ load_lib(lib)
     /* if path is still NULL, use "." for path. */
     path = getenv("DLN_LIBRARY_PATH");
     if (path == NULL) path = dln_librrb_ary_path;
+    else path = envpath = strdup(path);
 
-    file = dln_find_file(lib, path);
+    file = dln_find_file_r(lib, path, fbuf, sizeof(fbuf));
+    if (envpath) free(envpath);
     fd = open(file, O_RDONLY);
     if (fd == -1) goto syserr;
     size = read(fd, armagic, SARMAG);
@@ -1082,8 +1051,7 @@ load_lib(lib)
 }
 
 static int
-load(file)
-    const char *file;
+load(const char *file)
 {
     int fd;
     int result;
@@ -1108,8 +1076,7 @@ load(file)
 }
 
 void*
-dln_sym(name)
-    const char *name;
+dln_sym(const char *name)
 {
     struct nlist *sym;
 
@@ -1121,12 +1088,7 @@ dln_sym(name)
 #endif /* USE_DLN_A_OUT */
 
 #ifdef USE_DLN_DLOPEN
-# if defined(__NetBSD__) && defined(__NetBSD_Version__) && __NetBSD_Version__ < 105000000
-#  include <nlist.h>
-#  include <link.h>
-# else
-#  include <dlfcn.h>
-# endif
+# include <dlfcn.h>
 #endif
 
 #ifdef __hpux
@@ -1157,19 +1119,33 @@ dln_sym(name)
 
 #if defined _WIN32 && !defined __CYGWIN__
 #include <windows.h>
+#include <imagehlp.h>
 #endif
 
-#ifdef _WIN32_WCE
-#undef FormatMessage
-#define FormatMessage FormatMessageA
-#undef LoadLibrary
-#define LoadLibrary LoadLibraryA
-#undef GetProcAddress
-#define GetProcAddress GetProcAddressA
-#endif
-
+#if defined _WIN32 && !defined __CYGWIN__
+static const char *
+dln_strerror(char *message, size_t size)
+{
+    int error = GetLastError();
+    char *p = message;
+    size_t len = snprintf(message, size, "%d: ", error);
+
+#define format_message(sublang) FormatMessage(\
+	FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,	\
+	NULL, error, MAKELANGID(LANG_NEUTRAL, (sublang)),		\
+	message + len, size - len, NULL)
+    if (format_message(SUBLANG_ENGLISH_US) == 0)
+	format_message(SUBLANG_DEFAULT);
+    for (p = message + len; *p; p++) {
+	if (*p == '\n' || *p == '\r')
+	    *p = ' ';
+    }
+    return message;
+}
+#define dln_strerror() dln_strerror(message, sizeof message)
+#elif ! defined _AIX
 static const char *
-dln_strerror()
+dln_strerror(void)
 {
 #ifdef USE_DLN_A_OUT
     char *strerror();
@@ -1195,101 +1171,83 @@ dln_strerror()
 #ifdef USE_DLN_DLOPEN
     return (char*)dlerror();
 #endif
-
-#if defined _WIN32 && !defined __CYGWIN__
-    static char message[1024];
-    int error = GetLastError();
-    char *p = message;
-    p += sprintf(message, "%d: ", error);
-    FormatMessage(
-	FORMAT_MESSAGE_FROM_SYSTEM	 | FORMAT_MESSAGE_IGNORE_INSERTS,
-	NULL,
-	error,
-	MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-	p,
-	sizeof message - strlen(message),
-	NULL);
-
-    for (p = message; *p; p++) {
-	if (*p == '\n' || *p == '\r')
-	    *p = ' ';
-    }
-    return message;
-#endif
 }
-
+#endif
 
 #if defined(_AIX) && ! defined(_IA64)
 static void
 aix_loaderror(const char *pathname)
 {
-    char *message[8], errbuf[1024];
-    int i,j;
-
-    struct errtab { 
-	int errnum;
-	char *errstr;
-    } load_errtab[] = {
-	{L_ERROR_TOOMANY,	"too many errors, rest skipped."},
-	{L_ERROR_NOLIB,		"can't load library:"},
-	{L_ERROR_UNDEF,		"can't find symbol in library:"},
-	{L_ERROR_RLDBAD,
-	     "RLD index out of range or bad relocation type:"},
-	{L_ERROR_FORMAT,	"not a valid, executable xcoff file:"},
-	{L_ERROR_MEMBER,
-	     "file not an archive or does not contain requested member:"},
-	{L_ERROR_TYPE,		"symbol table mismatch:"},
-	{L_ERROR_ALIGN,		"text alignment in file is wrong."},
-	{L_ERROR_SYSTEM,	"System error:"},
-	{L_ERROR_ERRNO,		NULL}
-    };
-
-#define LOAD_ERRTAB_LEN	(sizeof(load_errtab)/sizeof(load_errtab[0]))
-#define ERRBUF_APPEND(s) strncat(errbuf, s, sizeof(errbuf)-strlen(errbuf)-1)
-
-    snprintf(errbuf, 1024, "load failed - %s ", pathname);
-
-    if (!loadquery(1, &message[0], sizeof(message))) 
-	ERRBUF_APPEND(strerror(errno));
-    for(i = 0; message[i] && *message[i]; i++) {
-	int nerr = atoi(message[i]);
-	for (j=0; j<LOAD_ERRTAB_LEN; j++) {
-           if (nerr == load_errtab[i].errnum && load_errtab[i].errstr)
-		ERRBUF_APPEND(load_errtab[i].errstr);
-	}
-	while (isdigit(*message[i])) message[i]++; 
-	ERRBUF_APPEND(message[i]);
-	ERRBUF_APPEND("\n");
+  char *message[1024], errbuf[1024];
+  int i;
+#define ERRBUF_APPEND(s) strncat(errbuf, (s), sizeof(errbuf)-strlen(errbuf)-1)
+  snprintf(errbuf, sizeof(errbuf), "load failed - %s. ", pathname);
+
+  if (loadquery(L_GETMESSAGES, &message[0], sizeof(message)) != -1) {
+    ERRBUF_APPEND("Please issue below command for detailed reasons:\n\t");
+    ERRBUF_APPEND("/usr/sbin/execerror ruby ");
+    for (i=0; message[i]; i++) {
+      ERRBUF_APPEND("\"");
+      ERRBUF_APPEND(message[i]);
+      ERRBUF_APPEND("\" ");
     }
-    errbuf[strlen(errbuf)-1] = '\0';	/* trim off last newline */
-    rb_loaderror(errbuf);
-    return;
+    ERRBUF_APPEND("\n");
+  } else {
+    ERRBUF_APPEND(strerror(errno));
+    ERRBUF_APPEND("[loadquery failed]");
+  }
+  dln_loaderror("%s", errbuf);
 }
 #endif
 
-#if defined(__VMS)
-#include <starlet.h>
-#include <rms.h>
-#include <stsdef.h>
-#include <unixlib.h>
-#include <descrip.h>
-#include <lib$routines.h>
-
-static char *vms_filespec;
-static int vms_fileact(char *filespec, int type);
-static long vms_fisexh(long *sigarr, long *mecarr);
+#if defined _WIN32 && defined RUBY_EXPORT
+HANDLE rb_libruby_handle(void);
+
+static int
+rb_w32_check_imported(HMODULE ext, HMODULE mine)
+{
+    ULONG size;
+    const IMAGE_IMPORT_DESCRIPTOR *desc;
+
+    desc = ImageDirectoryEntryToData(ext, TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size);
+    if (!desc) return 0;
+    while (desc->Name) {
+	PIMAGE_THUNK_DATA pint = (PIMAGE_THUNK_DATA)((char *)ext + desc->Characteristics);
+	PIMAGE_THUNK_DATA piat = (PIMAGE_THUNK_DATA)((char *)ext + desc->FirstThunk);
+	for (; piat->u1.Function; piat++, pint++) {
+	    static const char prefix[] = "rb_";
+	    PIMAGE_IMPORT_BY_NAME pii;
+	    const char *name;
+
+	    if (IMAGE_SNAP_BY_ORDINAL(pint->u1.Ordinal)) continue;
+	    pii = (PIMAGE_IMPORT_BY_NAME)((char *)ext + (size_t)pint->u1.AddressOfData);
+	    name = (const char *)pii->Name;
+	    if (strncmp(name, prefix, sizeof(prefix) - 1) == 0) {
+		FARPROC addr = GetProcAddress(mine, name);
+		if (addr) return (FARPROC)piat->u1.Function == addr;
+	    }
+	}
+	desc++;
+    }
+    return 1;
+}
 #endif
 
-#endif /* NO_DLN_LOAD */
+#if defined(DLN_NEEDS_ALT_SEPARATOR) && DLN_NEEDS_ALT_SEPARATOR
+#define translit_separator(src) do { \
+	char *tmp = ALLOCA_N(char, strlen(src) + 1), *p = tmp, c; \
+	do { \
+	    *p++ = ((c = *file++) == '/') ? DLN_NEEDS_ALT_SEPARATOR : c; \
+	} while (c); \
+	(src) = tmp; \
+    } while (0)
+#else
+#define translit_separator(str) (void)(str)
+#endif
 
 void*
-dln_load(file)
-    const char *file;
+dln_load(const char *file)
 {
-#ifdef NO_DLN_LOAD
-    rb_raise(rb_eLoadError, "this executable file can't load extension libraries");
-#else
-
 #if !defined(_AIX) && !defined(NeXT)
     const char *error = 0;
 #define DLN_ERROR() (error = dln_strerror(), strcpy(ALLOCA_N(char, strlen(error) + 1), error))
@@ -1298,15 +1256,16 @@ dln_load(file)
 #if defined _WIN32 && !defined __CYGWIN__
     HINSTANCE handle;
     char winfile[MAXPATHLEN];
+    char message[1024];
     void (*init_fct)();
     char *buf;
 
-    if (strlen(file) >= MAXPATHLEN) rb_loaderror("filename too long");
+    if (strlen(file) >= MAXPATHLEN) dln_loaderror("filename too long");
 
     /* Load the file as an object one */
     init_funcname(&buf, file);
 
-    strcpy(winfile, file);
+    strlcpy(winfile, file, sizeof(winfile));
 
     /* Load file */
     if ((handle = LoadLibrary(winfile)) == NULL) {
@@ -1314,8 +1273,16 @@ dln_load(file)
 	goto failed;
     }
 
+#if defined _WIN32 && defined RUBY_EXPORT
+    if (!rb_w32_check_imported(handle, rb_libruby_handle())) {
+	FreeLibrary(handle);
+	error = "incompatible library version";
+	goto failed;
+    }
+#endif
+
     if ((init_fct = (void(*)())GetProcAddress(handle, buf)) == NULL) {
-	rb_loaderror("%s - %s\n%s", dln_strerror(), buf, file);
+	dln_loaderror("%s - %s\n%s", dln_strerror(), buf, file);
     }
 
     /* Call the init code */
@@ -1333,6 +1300,7 @@ dln_load(file)
     char *buf;
     /* Load the file as an object one */
     init_funcname(&buf, file);
+    translit_separator(file);
 
 #ifdef USE_DLN_DLOPEN
 #define DLN_DEFINED
@@ -1350,13 +1318,33 @@ dln_load(file)
 # define RTLD_GLOBAL 0
 #endif
 
+#ifdef __native_client__
+	char* p, *orig;
+        if (file[0] == '.' && file[1] == '/') file+=2;
+	orig = strdup(file);
+	for (p = file; *p; ++p) {
+	    if (*p == '/') *p = '_';
+	}
+#endif
 	/* Load file */
 	if ((handle = (void*)dlopen(file, RTLD_LAZY|RTLD_GLOBAL)) == NULL) {
+#ifdef __native_client__
+            free(orig);
+#endif
 	    error = dln_strerror();
 	    goto failed;
 	}
 
-	init_fct = (void(*)())dlsym(handle, buf);
+	init_fct = (void(*)())(VALUE)dlsym(handle, buf);
+#ifdef __native_client__
+	strcpy(file, orig);
+	free(orig);
+#endif
+#if defined __SYMBIAN32__
+	if (init_fct == NULL) {
+	    init_fct = (void(*)())dlsym(handle, "1"); /* Some Symbian versions do not support symbol table in DLL, ordinal numbers only */
+	}
+#endif
 	if (init_fct == NULL) {
 	    error = DLN_ERROR();
 	    dlclose(handle);
@@ -1380,14 +1368,14 @@ dln_load(file)
 	lib = shl_load(file, flags, 0);
 	if (lib == NULL) {
 	    extern int errno;
-	    rb_loaderror("%s - %s", strerror(errno), file);
+	    dln_loaderror("%s - %s", strerror(errno), file);
 	}
 	shl_findsym(&lib, buf, TYPE_PROCEDURE, (void*)&init_fct);
 	if (init_fct == NULL) {
 	    shl_findsym(&lib, buf, TYPE_UNDEFINED, (void*)&init_fct);
 	    if (init_fct == NULL) {
 		errno = ENOSYM;
-		rb_loaderror("%s - %s", strerror(ENOSYM), file);
+		dln_loaderror("%s - %s", strerror(ENOSYM), file);
 	    }
 	}
 	(*init_fct)();
@@ -1412,54 +1400,17 @@ dln_load(file)
     }
 #endif /* _AIX */
 
-#if defined(NeXT) || defined(MACOSX_DYLD)
+#if defined(MACOSX_DYLD)
 #define DLN_DEFINED
 /*----------------------------------------------------
    By SHIROYAMA Takayuki Psi@fortune.nest.or.jp
- 
+
    Special Thanks...
     Yu tomoak-i@is.aist-nara.ac.jp,
     Mi hisho@tasihara.nest.or.jp,
     sunshine@sunshineco.com,
     and... Miss ARAI Akino(^^;)
  ----------------------------------------------------*/
-#if defined(NeXT) && (NS_TARGET_MAJOR < 4)/* NeXTSTEP rld functions */
-
-    {
-        NXStream* s;
-	unsigned long init_address;
-	char *object_files[2] = {NULL, NULL};
-
-	void (*init_fct)();
-	
-	object_files[0] = (char*)file;
-	
-	s = NXOpenFile(2,NX_WRITEONLY);
-
-	/* Load object file, if return value ==0 ,  load failed*/
-	if(rld_load(s, NULL, object_files, NULL) == 0) {
-	    NXFlush(s);
-	    NXClose(s);
-	    rb_loaderror("Failed to load %.200s", file);
-	}
-
-	/* lookup the initial function */
-	if(rld_lookup(s, buf, &init_address) == 0) {
-	    NXFlush(s);
-	    NXClose(s);
-	    rb_loaderror("Failed to lookup Init function %.200s", file);
-	}
-
-	NXFlush(s);
-	NXClose(s);
-
-	/* Cannot call *init_address directory, so copy this value to
-	   funtion pointer */
-	init_fct = (void(*)())init_address;
-	(*init_fct)();
-	return (void*)init_address;
-    }
-#else/* OPENSTEP dyld functions */
     {
 	int dyld_result;
 	NSObjectFileImage obj_file; /* handle, but not use it */
@@ -1472,36 +1423,36 @@ dln_load(file)
 	dyld_result = NSCreateObjectFileImageFromFile(file, &obj_file);
 
 	if (dyld_result != NSObjectFileImageSuccess) {
-	    rb_loaderror("Failed to load %.200s", file);
+	    dln_loaderror("Failed to load %.200s", file);
 	}
 
 	NSLinkModule(obj_file, file, NSLINKMODULE_OPTION_BINDNOW);
 
 	/* lookup the initial function */
-	if(!NSIsSymbolNameDefined(buf)) {
-	    rb_loaderror("Failed to lookup Init function %.200s",file);
-	}	
+	if (!NSIsSymbolNameDefined(buf)) {
+	    dln_loaderror("Failed to lookup Init function %.200s",file);
+	}
 	init_fct = NSAddressOfSymbol(NSLookupAndBindSymbol(buf));
 	(*init_fct)();
 
 	return (void*)init_fct;
     }
-#endif /* rld or dyld */
 #endif
 
-#ifdef __BEOS__
+#if defined(__BEOS__) || defined(__HAIKU__)
 # define DLN_DEFINED
     {
       status_t err_stat;  /* BeOS error status code */
-      image_id img_id;    /* extention module unique id */
-      void (*init_fct)(); /* initialize function for extention module */
+      image_id img_id;    /* extension module unique id */
+      void (*init_fct)(); /* initialize function for extension module */
 
-      /* load extention module */
+      /* load extension module */
       img_id = load_add_on(file);
       if (img_id <= 0) {
-	rb_loaderror("Failed to load %.200s", file);
+	dln_loaderror("Failed to load add_on %.200s error_code=%x",
+	  file, img_id);
       }
-      
+
       /* find symbol for module initialize function. */
       /* The Be Book KernelKit Images section described to use
 	 B_SYMBOL_TYPE_TEXT for symbol of function, not
@@ -1514,357 +1465,38 @@ dln_load(file)
       if (err_stat != B_NO_ERROR) {
 	char real_name[MAXPATHLEN];
 
-	strcpy(real_name, buf);
-	strcat(real_name, "__Fv");
+	strlcpy(real_name, buf, MAXPATHLEN);
+	strlcat(real_name, "__Fv", MAXPATHLEN);
         err_stat = get_image_symbol(img_id, real_name,
 				    B_SYMBOL_TYPE_TEXT, (void **)&init_fct);
       }
 
       if ((B_BAD_IMAGE_ID == err_stat) || (B_BAD_INDEX == err_stat)) {
 	unload_add_on(img_id);
-	rb_loaderror("Failed to lookup Init function %.200s", file);
+	dln_loaderror("Failed to lookup Init function %.200s", file);
       }
       else if (B_NO_ERROR != err_stat) {
 	char errmsg[] = "Internal of BeOS version. %.200s (symbol_name = %s)";
 	unload_add_on(img_id);
-	rb_loaderror(errmsg, strerror(err_stat), buf);
+	dln_loaderror(errmsg, strerror(err_stat), buf);
       }
 
       /* call module initialize function. */
       (*init_fct)();
       return (void*)img_id;
     }
-#endif /* __BEOS__*/
-
-#ifdef __MACOS__   /* Mac OS 9 or before */
-# define DLN_DEFINED
-    {
-      OSErr err;
-      FSSpec libspec;
-      CFragConnectionID connID;
-      Ptr mainAddr;
-      char errMessage[1024];
-      Boolean isfolder, didsomething;
-      Str63 fragname;
-      Ptr symAddr;
-      CFragSymbolClass class;
-      void (*init_fct)();
-      char fullpath[MAXPATHLEN];
-
-      strcpy(fullpath, file);
-
-      /* resolve any aliases to find the real file */
-      c2pstr(fullpath);
-      (void)FSMakeFSSpec(0, 0, fullpath, &libspec);
-      err = ResolveAliasFile(&libspec, 1, &isfolder, &didsomething);
-      if (err) {
-	  rb_loaderror("Unresolved Alias - %s", file);
-      }
-
-      /* Load the fragment (or return the connID if it is already loaded */
-      fragname[0] = 0;
-      err = GetDiskFragment(&libspec, 0, 0, fragname, 
-			    kLoadCFrag, &connID, &mainAddr,
-			    errMessage);
-      if (err) {
-	  p2cstr(errMessage);
-	  rb_loaderror("%s - %s",errMessage , file);
-      }
-
-      /* Locate the address of the correct init function */
-      c2pstr(buf);
-      err = FindSymbol(connID, buf, &symAddr, &class);
-      if (err) {
-	  rb_loaderror("Unresolved symbols - %s" , file);
-      }
-      init_fct = (void (*)())symAddr;
-      (*init_fct)();
-      return (void*)init_fct;
-    }
-#endif /* __MACOS__ */
-
-#if defined(__VMS)
-#define DLN_DEFINED
-    {
-	long status;
-	void (*init_fct)();
-	char *fname, *p1, *p2;
-
-	$DESCRIPTOR(fname_d, "");
-	$DESCRIPTOR(image_d, "");
-	$DESCRIPTOR(buf_d, "");
-
-	decc$to_vms(file, vms_fileact, 0, 0);
-
-	fname = (char *)__alloca(strlen(file)+1);
-	strcpy(fname,file);
-	if (p1 = strrchr(fname,'/'))
-	    fname = p1 + 1;
-	if (p2 = strrchr(fname,'.'))
-	    *p2 = '\0';
-
-	fname_d.dsc$w_length  = strlen(fname);
-	fname_d.dsc$a_pointer = fname;
-	image_d.dsc$w_length  = strlen(vms_filespec);
-	image_d.dsc$a_pointer = vms_filespec;
-	buf_d.dsc$w_length    = strlen(buf);
-	buf_d.dsc$a_pointer   = buf;
-
-	lib$establish(vms_fisexh);
-
-	status = lib$find_image_symbol (
-		     &fname_d,
-		     &buf_d, 
-		     &init_fct, 
-		     &image_d);
-
-	lib$establish(0);
-
-	if (status == RMS$_FNF) {
-	    error = dln_strerror();
-	    goto failed;
-	} else if (!$VMS_STATUS_SUCCESS(status)) {
-	    error = DLN_ERROR();
-	    goto failed;
-	}
-
-	/* Call the init code */
-	(*init_fct)();
-
-	return 1;
-    }
-#endif /* __VMS */
+#endif /* __BEOS__ || __HAIKU__ */
 
 #ifndef DLN_DEFINED
-    rb_notimplement();
+    dln_notimplement();
 #endif
 
 #endif /* USE_DLN_A_OUT */
 #endif
 #if !defined(_AIX) && !defined(NeXT)
   failed:
-    rb_loaderror("%s - %s", error, file);
+    dln_loaderror("%s - %s", error, file);
 #endif
 
-#endif /* NO_DLN_LOAD */
     return 0;			/* dummy return */
 }
-
-static char *dln_find_1();
-
-char *
-dln_find_exe(fname, path)
-    const char *fname;
-    const char *path;
-{
-    if (!path) {
-	path = getenv(PATH_ENV);
-    }
-
-    if (!path) {
-#if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__MACOS__)
-	path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
-#else
-	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
-#endif
-    }
-    return dln_find_1(fname, path, 1);
-}
-
-char *
-dln_find_file(fname, path)
-    const char *fname;
-    const char *path;
-{
-#ifndef __MACOS__
-    if (!path) path = ".";
-    return dln_find_1(fname, path, 0);
-#else
-    if (!path) path = ".";
-    return _macruby_path_conv_posix_to_macos(dln_find_1(fname, path, 0));
-#endif
-}
-
-static char fbuf[MAXPATHLEN];
-
-static char *
-dln_find_1(fname, path, exe_flag)
-    const char *fname;
-    const char *path;
-    int exe_flag;		/* non 0 if looking for executable. */
-{
-    register const char *dp;
-    register const char *ep;
-    register char *bp;
-    struct stat st;
-#ifdef __MACOS__
-    const char* mac_fullpath;
-#endif
-
-    if (!fname) return (char *)fname;
-    if (fname[0] == '/') return (char *)fname;
-    if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0)
-      return (char *)fname;
-    if (exe_flag && strchr(fname, '/')) return (char *)fname;
-#ifdef DOSISH
-    if (fname[0] == '\\') return (char *)fname;
-# ifdef DOSISH_DRIVE_LETTER
-    if (strlen(fname) > 2 && fname[1] == ':') return (char *)fname;
-# endif
-    if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0)
-      return (char *)fname;
-    if (exe_flag && strchr(fname, '\\')) return (char *)fname;
-#endif
-
-    for (dp = path;; dp = ++ep) {
-	register int l;
-	int i;
-	int fspace;
-
-	/* extract a component */
-	ep = strchr(dp, PATH_SEP[0]);
-	if (ep == NULL)
-	    ep = dp+strlen(dp);
-
-	/* find the length of that component */
-	l = ep - dp;
-	bp = fbuf;
-	fspace = sizeof fbuf - 2;
-	if (l > 0) {
-	    /*
-	    **	If the length of the component is zero length,
-	    **	start from the current directory.  If the
-	    **	component begins with "~", start from the
-	    **	user's $HOME environment variable.  Otherwise
-	    **	take the path literally.
-	    */
-
-	    if (*dp == '~' && (l == 1 ||
-#if defined(DOSISH)
-			       dp[1] == '\\' || 
-#endif
-			       dp[1] == '/')) {
-		char *home;
-
-		home = getenv("HOME");
-		if (home != NULL) {
-		    i = strlen(home);
-		    if ((fspace -= i) < 0)
-			goto toolong;
-		    memcpy(bp, home, i);
-		    bp += i;
-		}
-		dp++;
-		l--;
-	    }
-	    if (l > 0) {
-		if ((fspace -= l) < 0)
-		    goto toolong;
-		memcpy(bp, dp, l);
-		bp += l;
-	    }
-
-	    /* add a "/" between directory and filename */
-	    if (ep[-1] != '/')
-		*bp++ = '/';
-	}
-
-	/* now append the file name */
-	i = strlen(fname);
-	if ((fspace -= i) < 0) {
-	  toolong:
-	    fprintf(stderr, "openpath: pathname too long (ignored)\n");
-	    *bp = '\0';
-	    fprintf(stderr, "\tDirectory \"%s\"\n", fbuf);
-	    fprintf(stderr, "\tFile \"%s\"\n", fname);
-	    goto next;
-	}
-	memcpy(bp, fname, i + 1);
-
-#if defined(DOSISH)
-	if (exe_flag) {
-	    static const char extension[][5] = {
-#if defined(MSDOS)
-		".com", ".exe", ".bat",
-#if defined(DJGPP)
-		".btm", ".sh", ".ksh", ".pl", ".sed",
-#endif
-#elif defined(__EMX__) || defined(_WIN32)
-		".exe", ".com", ".cmd", ".bat",
-/* end of __EMX__ or _WIN32 */
-#else
-		".r", ".R", ".x", ".X", ".bat", ".BAT",
-/* __human68k__ */
-#endif
-	    };
-	    int j;
-
-	    for (j = 0; j < sizeof(extension) / sizeof(extension[0]); j++) {
-		if (fspace < strlen(extension[j])) {
-		    fprintf(stderr, "openpath: pathname too long (ignored)\n");
-		    fprintf(stderr, "\tDirectory \"%.*s\"\n", (int) (bp - fbuf), fbuf);
-		    fprintf(stderr, "\tFile \"%s%s\"\n", fname, extension[j]);
-		    continue;
-		}
-		strcpy(bp + i, extension[j]);
-#ifndef __MACOS__
-		if (stat(fbuf, &st) == 0)
-		    return fbuf;
-#else
-		if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf))
-		    return mac_fullpath;
-
-#endif
-	    }
-	    goto next;
-	}
-#endif /* MSDOS or _WIN32 or __human68k__ or __EMX__ */
-
-#ifndef __MACOS__
-	if (stat(fbuf, &st) == 0) {
-	    if (exe_flag == 0) return fbuf;
-	    /* looking for executable */
-	    if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
-		return fbuf;
-	}
-#else
-	if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf)) {
-	    if (exe_flag == 0) return mac_fullpath;
-	    /* looking for executable */
-	    if (stat(mac_fullpath, &st) == 0) {
-		if (!S_ISDIR(st.st_mode) && eaccess(mac_fullpath, X_OK) == 0)
-		    return mac_fullpath;
-	    }
-	}
-#endif
-
-      next:
-	/* if not, and no other alternatives, life is bleak */
-	if (*ep == '\0') {
-	    return NULL;
-	}
-
-	/* otherwise try the next component in the search path */
-    }
-}
-
-#if defined(__VMS)
-
-/* action routine for decc$to_vms */
-static int vms_fileact(char *filespec, int type)
-{
-    if (vms_filespec)
-	free(vms_filespec);
-    vms_filespec = malloc(strlen(filespec)+1);
-    strcpy(vms_filespec, filespec);
-    return 1;
-}
-
-/* exception handler for LIB$FIND_IMAGE_SYMBOL */
-static long vms_fisexh(long *sigarr, long *mecarr)
-{
-    sys$unwind(1, 0);
-    return 1;
-}
-
-#endif /* __VMS */
diff --git a/dln.h b/dln.h
index 182cf9f9f4..d98b2607e2 100644
--- a/dln.h
+++ b/dln.h
@@ -3,10 +3,9 @@
   dln.h -
 
   $Author$
-  $Date$
   created at: Wed Jan 19 16:53:09 JST 1994
 
-  Copyright (C) 1993-2003 Yukihiro Matsumoto
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
 
 **********************************************************************/
 
@@ -29,12 +28,24 @@
 # define _(args) ()
 #endif
 
-char *dln_find_exe _((const char*,const char*));
-char *dln_find_file _((const char*,const char*));
+RUBY_SYMBOL_EXPORT_BEGIN
+
+#ifndef DLN_FIND_EXTRA_ARG
+#define DLN_FIND_EXTRA_ARG
+#endif
+#ifndef DLN_FIND_EXTRA_ARG_DECL
+#define DLN_FIND_EXTRA_ARG_DECL
+#endif
+
+char *dln_find_exe_r(const char*,const char*,char*,size_t DLN_FIND_EXTRA_ARG_DECL);
+char *dln_find_file_r(const char*,const char*,char*,size_t DLN_FIND_EXTRA_ARG_DECL);
 
 #ifdef USE_DLN_A_OUT
 extern char *dln_argv0;
 #endif
 
-void *dln_load _((const char*));
+void *dln_load(const char*);
+
+RUBY_SYMBOL_EXPORT_END
+
 #endif
diff --git a/dln_find.c b/dln_find.c
new file mode 100644
index 0000000000..f41ceb051d
--- /dev/null
+++ b/dln_find.c
@@ -0,0 +1,294 @@
+/**********************************************************************
+
+  dln_find.c -
+
+  $Author$
+  created at: Tue Jan 18 17:05:06 JST 1994
+
+  Copyright (C) 1993-2007 Yukihiro Matsumoto
+
+**********************************************************************/
+
+#ifdef RUBY_EXPORT
+#include "ruby/ruby.h"
+#define dln_warning rb_warning
+#define dln_warning_arg
+#else
+#define dln_warning fprintf
+#define dln_warning_arg stderr,
+#endif
+#include "dln.h"
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+
+#ifdef USE_DLN_A_OUT
+char *dln_argv0;
+#endif
+
+#if defined(HAVE_ALLOCA_H)
+#include <alloca.h>
+#endif
+
+#ifdef HAVE_STRING_H
+# include <string.h>
+#else
+# include <strings.h>
+#endif
+
+#include <stdio.h>
+#if defined(_WIN32)
+#include "missing/file.h"
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifndef S_ISDIR
+#   define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#ifndef MAXPATHLEN
+# define MAXPATHLEN 1024
+#endif
+
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#if !defined(_WIN32) && !HAVE_DECL_GETENV
+char *getenv();
+#endif
+
+static char *dln_find_1(const char *fname, const char *path, char *buf, size_t size, int exe_flag
+			DLN_FIND_EXTRA_ARG_DECL);
+
+char *
+dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size
+	       DLN_FIND_EXTRA_ARG_DECL)
+{
+    char *envpath = 0;
+
+    if (!path) {
+	path = getenv(PATH_ENV);
+	if (path) path = envpath = strdup(path);
+    }
+
+    if (!path) {
+#if defined(_WIN32)
+	path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
+#else
+	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
+#endif
+    }
+    buf = dln_find_1(fname, path, buf, size, 1 DLN_FIND_EXTRA_ARG);
+    if (envpath) free(envpath);
+    return buf;
+}
+
+char *
+dln_find_file_r(const char *fname, const char *path, char *buf, size_t size
+		DLN_FIND_EXTRA_ARG_DECL)
+{
+    if (!path) path = ".";
+    return dln_find_1(fname, path, buf, size, 0 DLN_FIND_EXTRA_ARG);
+}
+
+static char *
+dln_find_1(const char *fname, const char *path, char *fbuf, size_t size,
+	   int exe_flag /* non 0 if looking for executable. */
+	   DLN_FIND_EXTRA_ARG_DECL)
+{
+    register const char *dp;
+    register const char *ep;
+    register char *bp;
+    struct stat st;
+    size_t i, fnlen, fspace;
+#ifdef DOSISH
+    static const char extension[][5] = {
+	EXECUTABLE_EXTS,
+    };
+    size_t j;
+    int is_abs = 0, has_path = 0;
+    const char *ext = 0;
+#endif
+    const char *p = fname;
+
+    static const char pathname_too_long[] = "openpath: pathname too long (ignored)\n\
+\tDirectory \"%.*s\"%s\n\tFile \"%.*s\"%s\n";
+#define PATHNAME_TOO_LONG() dln_warning(dln_warning_arg pathname_too_long, \
+					((bp - fbuf) > 100 ? 100 : (int)(bp - fbuf)), fbuf, \
+					((bp - fbuf) > 100 ? "..." : ""), \
+					(fnlen > 100 ? 100 : (int)fnlen), fname, \
+					(fnlen > 100 ? "..." : ""))
+
+#define RETURN_IF(expr) if (expr) return (char *)fname;
+
+    RETURN_IF(!fname);
+    fnlen = strlen(fname);
+    if (fnlen >= size) {
+	dln_warning(dln_warning_arg
+		    "openpath: pathname too long (ignored)\n\tFile \"%.*s\"%s\n",
+		    (fnlen > 100 ? 100 : (int)fnlen), fname,
+		    (fnlen > 100 ? "..." : ""));
+	return NULL;
+    }
+#ifdef DOSISH
+# ifndef CharNext
+# define CharNext(p) ((p)+1)
+# endif
+# ifdef DOSISH_DRIVE_LETTER
+    if (((p[0] | 0x20) - 'a') < 26  && p[1] == ':') {
+	p += 2;
+	is_abs = 1;
+    }
+# endif
+    switch (*p) {
+      case '/': case '\\':
+	is_abs = 1;
+	p++;
+    }
+    has_path = is_abs;
+    while (*p) {
+	switch (*p) {
+	  case '/': case '\\':
+	    has_path = 1;
+	    ext = 0;
+	    p++;
+	    break;
+	  case '.':
+	    ext = p;
+	    p++;
+	    break;
+	  default:
+	    p = CharNext(p);
+	}
+    }
+    if (ext) {
+	for (j = 0; STRCASECMP(ext, extension[j]); ) {
+	    if (++j == sizeof(extension) / sizeof(extension[0])) {
+		ext = 0;
+		break;
+	    }
+	}
+    }
+    ep = bp = 0;
+    if (!exe_flag) {
+	RETURN_IF(is_abs);
+    }
+    else if (has_path) {
+	RETURN_IF(ext);
+	i = p - fname;
+	if (i + 1 > size) goto toolong;
+	fspace = size - i - 1;
+	bp = fbuf;
+	ep = p;
+	memcpy(fbuf, fname, i + 1);
+	goto needs_extension;
+    }
+    p = fname;
+#endif
+
+    if (*p == '.' && *++p == '.') ++p;
+    RETURN_IF(*p == '/');
+    RETURN_IF(exe_flag && strchr(fname, '/'));
+
+#undef RETURN_IF
+
+    for (dp = path;; dp = ++ep) {
+	register size_t l;
+
+	/* extract a component */
+	ep = strchr(dp, PATH_SEP[0]);
+	if (ep == NULL)
+	    ep = dp+strlen(dp);
+
+	/* find the length of that component */
+	l = ep - dp;
+	bp = fbuf;
+	fspace = size - 2;
+	if (l > 0) {
+	    /*
+	    **	If the length of the component is zero length,
+	    **	start from the current directory.  If the
+	    **	component begins with "~", start from the
+	    **	user's $HOME environment variable.  Otherwise
+	    **	take the path literally.
+	    */
+
+	    if (*dp == '~' && (l == 1 ||
+#if defined(DOSISH)
+			       dp[1] == '\\' ||
+#endif
+			       dp[1] == '/')) {
+		char *home;
+
+		home = getenv("HOME");
+		if (home != NULL) {
+		    i = strlen(home);
+		    if (fspace < i)
+			goto toolong;
+		    fspace -= i;
+		    memcpy(bp, home, i);
+		    bp += i;
+		}
+		dp++;
+		l--;
+	    }
+	    if (l > 0) {
+		if (fspace < l)
+		    goto toolong;
+		fspace -= l;
+		memcpy(bp, dp, l);
+		bp += l;
+	    }
+
+	    /* add a "/" between directory and filename */
+	    if (ep[-1] != '/')
+		*bp++ = '/';
+	}
+
+	/* now append the file name */
+	i = fnlen;
+	if (fspace < i) {
+	  toolong:
+	    PATHNAME_TOO_LONG();
+	    goto next;
+	}
+	fspace -= i;
+	memcpy(bp, fname, i + 1);
+
+#if defined(DOSISH)
+	if (exe_flag && !ext) {
+	  needs_extension:
+	    for (j = 0; j < sizeof(extension) / sizeof(extension[0]); j++) {
+		if (fspace < strlen(extension[j])) {
+		    PATHNAME_TOO_LONG();
+		    continue;
+		}
+		strlcpy(bp + i, extension[j], fspace);
+		if (stat(fbuf, &st) == 0)
+		    return fbuf;
+	    }
+	    goto next;
+	}
+#endif /* _WIN32 or __EMX__ */
+
+	if (stat(fbuf, &st) == 0) {
+	    if (exe_flag == 0) return fbuf;
+	    /* looking for executable */
+	    if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0)
+		return fbuf;
+	}
+      next:
+	/* if not, and no other alternatives, life is bleak */
+	if (*ep == '\0') {
+	    return NULL;
+	}
+
+	/* otherwise try the next component in the search path */
+    }
+}
diff --git a/dmydln.c b/dmydln.c
index 09ea06806c..25872efc98 100644
--- a/dmydln.c
+++ b/dmydln.c
@@ -1,2 +1,9 @@
-#define NO_DLN_LOAD 1
-#include "dln.c"
+#include "ruby/ruby.h"
+
+void*
+dln_load(const char *file)
+{
+    rb_loaderror("this executable file can't load extension libraries");
+
+    UNREACHABLE;
+}
diff --git a/dmyext.c b/dmyext.c
index 4120d493c3..34ea7a02f4 100644
--- a/dmyext.c
+++ b/dmyext.c
@@ -1,4 +1,9 @@
 void
-Init_ext()
+Init_ext(void)
+{
+}
+
+void
+Init_enc(void)
 {
 }
diff --git a/doc/.document b/doc/.document
new file mode 100644
index 0000000000..b48c0387a7
--- /dev/null
+++ b/doc/.document
@@ -0,0 +1,4 @@
+*.rdoc
+ChangeLog*
+NEWS-*
+syntax
diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0
index d168a50f80..07d7c6b165 100644
--- a/doc/ChangeLog-1.8.0
+++ b/doc/ChangeLog-1.8.0
@@ -42,7 +42,7 @@ Sun Aug  3 23:56:50 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Sun Aug  3 22:07:47 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tkentry.rb: support 'validatecommand' option of 
+	* ext/tk/lib/tkentry.rb: support 'validatecommand' option of
 	  TkEntry/TkSpinbox widget
 
 	* ext/tk/sample/{demos-en,demos-jp}/spin.rb: add
@@ -60,7 +60,7 @@ Sun Aug  3 18:03:44 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Sun Aug  3 08:53:06 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/sample/{demos-en,demos-jp}/image3.rb: add 
+	* ext/tk/sample/{demos-en,demos-jp}/image3.rb: add
 
 	* ext/tk/lib/tkcanvas.rb: bug fix on Tk object ID management
 
@@ -84,7 +84,7 @@ Sat Aug  2 23:51:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Sat Aug  2 09:58:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: bug fix --- TkGrid failed to treat 
+	* ext/tk/lib/tk.rb: bug fix --- TkGrid failed to treat
 	  RELATIVE PLACEMENT
 
 	* ext/tk/sample/demos-en/, demos-jp/: add or modify some
@@ -122,7 +122,7 @@ Sat Aug  2 14:02:39 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Sat Aug  2 09:58:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: bug fix --- forgot to entry a widget class 
+	* ext/tk/lib/tk.rb: bug fix --- forgot to entry a widget class
 	  name of 'labelframe' widget
 
 	* ext/tk/sample/{demos-en,demos-jp}/{labelframe.rb,paned1.rb,
@@ -238,7 +238,7 @@ Fri Aug  1 09:54:38 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Aug  1 04:58:55 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: bug fix --- forget to eval given block to 
+	* ext/tk/lib/tk.rb: bug fix --- forget to eval given block to
 	  TkRoot.new method
 
 	* ext/tk/sample/tkoptdb-safeTk.rb: new sample script
@@ -255,13 +255,13 @@ Thu Jul 31 23:44:00 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 Thu Jul 31 23:04:45 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/sample/resource.en, ext/tk/sample/resource.jp: 
+	* ext/tk/sample/resource.en, ext/tk/sample/resource.jp:
 	  wrong resource file format
 
-	* ext/tk/lib/tk.rb: add Tk::Encoding.{encoding_convertfrom, 
+	* ext/tk/lib/tk.rb: add Tk::Encoding.{encoding_convertfrom,
 	  encoding_convertto}
 
-	* ext/tk/lib/tk.rb: add TkOptionDB.read_with_encoding to read 
+	* ext/tk/lib/tk.rb: add TkOptionDB.read_with_encoding to read
 	  non-utf8 resource file
 
 Thu Jul 31 23:02:47 2003  NAKAMURA Usaku <usa@ruby-lang.org>
@@ -274,15 +274,15 @@ Thu Jul 31 20:52:40 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk.rb: (IMPORTANT BUG FIX) scan of event keywords
 	  doesn't work on recent versions of Tck/Tk
 
-	* ext/tk/lib/tk.rb: initialize error of instance variable on 
+	* ext/tk/lib/tk.rb: initialize error of instance variable on
 	  TkComposite
 
-	* ext/tk/lib/multi-tk.rb: initialize error on encoding-system on 
+	* ext/tk/lib/multi-tk.rb: initialize error on encoding-system on
 	  MultiTkIp
 
 	* ext/tk/lib/tk.rb: trouble on destroying widgets
 
-	* ext/tk/sample/demos-en/, demos-jp/: add JP and EN version of 
+	* ext/tk/sample/demos-en/, demos-jp/: add JP and EN version of
 	  Ruby/Tk widget demos
 
 Thu Jul 31 15:25:12 2003  NAKAMURA Usaku <usa@ruby-lang.org>
@@ -311,13 +311,13 @@ Thu Jul 31 08:18:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
 
 Thu Jul 31 07:59:18 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: wrap the command-proc of TkScale --- pass 
+	* ext/tk/lib/tk.rb: wrap the command-proc of TkScale --- pass
 	  the numeric object to the proc
 
-	* ext/tk/lib/tk.rb: better support for widgets created on 
+	* ext/tk/lib/tk.rb: better support for widgets created on
 	  Tk interpreter (without Ruby)
 
-	* ext/tk/lib/multi-tk.rb: a little more stable on Multiple Tk 
+	* ext/tk/lib/multi-tk.rb: a little more stable on Multiple Tk
 	  interpreters running
 
 Thu Jul 31 00:17:19 2003  Shugo Maeda  <shugo@ruby-lang.org>
@@ -411,17 +411,17 @@ Wed Jul 30 07:23:14 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkentry.rb: fix lack of methods for TkEntry
 
-	* ext/tk/lib/multi-tk.rb, ext/tk/lib/tk.rb, 
-	  ext/tk/lib/tkdialog.rb, ext/tk/lib/tkentry.rb, 
+	* ext/tk/lib/multi-tk.rb, ext/tk/lib/tk.rb,
+	  ext/tk/lib/tkdialog.rb, ext/tk/lib/tkentry.rb,
 	  ext/tk/sample/safe-tk.rb, ext/tk/sample/tktimer2.rb: bug fix
 
-	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_* accept a block to 
+	* ext/tk/lib/multi-tk.rb: MultiTkIp.new_* accept a block to
 	  eval under the new interpreter
 
 Wed Jul 30 04:36:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c, 
-	  ext/tk/lib/tk.rb, ext/tk/lib/tkafter.rb: additional check of 
+	* ext/tcltklib/tcltklib.c,
+	  ext/tk/lib/tk.rb, ext/tk/lib/tkafter.rb: additional check of
 	  Tk interpreters' status for a little more safety
 
 Wed Jul 30 02:37:12 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -514,14 +514,14 @@ Mon Jul 28 22:57:52 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Tue Jul 29 16:20:36 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: bug fix and 
+	* ext/tcltklib/tcltklib.c: bug fix and
 	  change mainloop_abort_on_no_widget_cmd => mainloop_abort_on_exception
 	  ( to avoid thread timing trouble on accessing destroyed widgets )
 
-	* ext/tk/lib/multi-tk.rb: change default mode of 
+	* ext/tk/lib/multi-tk.rb: change default mode of
 	  mainloop_abort_on_exception on multi-tk.rb
 
-	* ext/tk/lib/multi-tk.rb: fix a bug of the procedure for 
+	* ext/tk/lib/multi-tk.rb: fix a bug of the procedure for
 	  'Delete' button on the safe-Tk frmae
 
 Tue Jul 29 12:22:28 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
@@ -541,8 +541,8 @@ Tue Jul 29 12:15:37 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
 Tue Jul 29 08:05:30 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb, ext/tk/lib/tkdialog.rb, ext/tk/lib/tktext.rb, 
-	  ext/tk/sample/tkbiff.rb, ext/tk/sample/tkdialog.rb, 
+	* ext/tk/lib/tk.rb, ext/tk/lib/tkdialog.rb, ext/tk/lib/tktext.rb,
+	  ext/tk/sample/tkbiff.rb, ext/tk/sample/tkdialog.rb,
 	  ext/tk/sample/tkform.rb: bug fix ( tested with Ruby/Tk widget demo )
 
 Tue Jul 29 04:22:08 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
@@ -571,7 +571,7 @@ Tue Jul 29 01:24:32 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/multi-tk.rb: bug fix and pack options are pssed
 	  to the safeTk container
 
-	* ext/tk/sample/safe-tk.rb: add example for pack options of 
+	* ext/tk/sample/safe-tk.rb: add example for pack options of
 	  safeTk container
 
 Mon Jul 28 23:23:08 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
@@ -643,7 +643,7 @@ Sun Jul 27 19:35:06 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tcltklib/tcltklib.c: add some methods to support
 	  multiple interpreters (low level)
 
-	* ext/tk/lib/multi-tk.rb: new library to support multiple Tk 
+	* ext/tk/lib/multi-tk.rb: new library to support multiple Tk
 	  interpreters (high level)
 
 	* ext/tcltklib/demo/safeTk.rb: new sample of safeTk interpreter
@@ -732,12 +732,12 @@ Fri Jul 26 00:04:25 2003  NAKAMURA, Hiroshi  <nakahiro@sarion.co.jp>
 
 Fri Jul 25 16:43:03 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tcltklib/tcltklib.c: add TclTkIp#create_slave, 
+	* ext/tcltklib/tcltklib.c: add TclTkIp#create_slave,
 	  TclTkIp#_make_safe and TclTkIp#safe?
 
 	* ext/tcltklib/MANUAL.euc: modify descriptions
 
-	* ext/tk/lib/tk.rb: bug fix [ruby-talk:76980] and modify to 
+	* ext/tk/lib/tk.rb: bug fix [ruby-talk:76980] and modify to
 	  support multi Tk IPs
 
 	* ext/tk/lib/tkafter.rb: modify to support multi Tk IPs
@@ -747,10 +747,10 @@ Fri Jul 25 15:47:39 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 	* ext/openssl/extconf.rb: add check for BN_rand_range() and
 	  BN_pseudo_rand_range().
 
-	* ext/openssl/ossl_bn.c (ossl_bn_s_rand_range): should raise 
+	* ext/openssl/ossl_bn.c (ossl_bn_s_rand_range): should raise
 	  NotImplementedError if BN_rand_range() wan not defined.
 
-	* ext/openssl/ossl_bn.c (ossl_bn_s_pseudo_rand_range): should raise 
+	* ext/openssl/ossl_bn.c (ossl_bn_s_pseudo_rand_range): should raise
 	  NotImplementedError if BN_pseudo_rand_range() wan not defined.
 
 	* ext/openssl/ossl_pkcs7.c (ossl_pkcs7_s_encrypt): avoid compiler
@@ -1110,7 +1110,7 @@ Thu Jul 17 13:42:53 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
 Thu Jul 17 06:40:28 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: recover and fix typo : Tk.chooseDirectory 
+	* ext/tk/lib/tk.rb: recover and fix typo : Tk.chooseDirectory
 	  (Tk8.4 feature)
 
 Wed Jul 16 16:23:58 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -1139,7 +1139,7 @@ Tue Jul 15 14:38:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Tue Jul 15 03:30:41 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
 
-	* ext/syck/rubyext.c (syck_mark_emitter): forgot to rb_gc_mark the 
+	* ext/syck/rubyext.c (syck_mark_emitter): forgot to rb_gc_mark the
 	  outgoing IO object.
 
 Sun Jul 13 14:55:36 2003  Koji Arai  <jca02266@nifty.ne.jp>
@@ -1196,7 +1196,7 @@ Fri Jul 11 16:09:09 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Jul 11 07:17:47 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: not create a Tcl/Tk interpreter if already 
+	* ext/tk/lib/tk.rb: not create a Tcl/Tk interpreter if already
 	  defined TkCore::INTERP
 
 	* ext/tk/lib/tk.rb: bugfix on TkWindow#configure
@@ -1306,7 +1306,7 @@ Thu Jul  3 14:22:46 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Thu Jul  3 12:13:05 2003  WATANABE Hirofumi  <eban@ruby-lang.org>
 
-	* lib/mkmf.rb (VPATH): convert from Windows form to Unix form on 
+	* lib/mkmf.rb (VPATH): convert from Windows form to Unix form on
 	  MinGW.  This fixes the build with GNU make 3.80-1 for Cygwin.
 
 Wed Jul  2 23:27:34 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -1459,11 +1459,11 @@ Thu Jun 26 21:34:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 Wed Jun 25 14:40:33 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: add and modify methods --- 
-	  TkWidget.database_class, TkWidget.database_classname, 
-          TkWidget#database_class, TkWidget#database_classname 
+	* ext/tk/lib/tk.rb: add and modify methods ---
+	  TkWidget.database_class, TkWidget.database_classname,
+          TkWidget#database_class, TkWidget#database_classname
 
-	* ext/tk/lib/tk.rb: instances of a subclass of TkToplevel or 
+	* ext/tk/lib/tk.rb: instances of a subclass of TkToplevel or
 	  TkFrame are created with ":class=>subclass" option as default.
 
 	* ext/tk/sample/tkoptdb.rb: add a new part
@@ -1478,7 +1478,7 @@ Wed Jun 25 05:49:10 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: add widget destroy hook binding to TkBindTag::ALL
 
-	* ext/tk/lib/tkcanvas.rb: Although requiring manual control of GC, 
+	* ext/tk/lib/tkcanvas.rb: Although requiring manual control of GC,
 	  memory eating problem of TkCanvas Items is fixed.
 
 	* ext/tk/lib/tktext.rb: add some methods and bug fix
@@ -1493,10 +1493,10 @@ Tue Jun 24 16:46:07 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk.rb: bug fix on TkToplevel, TkFrame,
 	  TkPanedwindow, TkOptionDB
 
-	* ext/tk/lib/tk.rb: TkOptionDB --- make it more secure to use procs 
+	* ext/tk/lib/tk.rb: TkOptionDB --- make it more secure to use procs
 	  defined on resourceDB
 
-	* ext/tk/sample/tkoptdb.rb, resource.ja, resource.en: 
+	* ext/tk/sample/tkoptdb.rb, resource.ja, resource.en:
 	  sample script how to use TkOptionDB.
 
 Tue Jun 24 14:22:41 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
@@ -1610,14 +1610,14 @@ Sun Jun 22 23:42:20 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 Sun Jun 22 16:17:02 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm 
+	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm
 	  commands as elements
 
 	* ext/tk/lib/tk.rb: TkMenu --- add some methods
 
 	* ext/tk/lib/tk.rb: TkOptionMenubutton --- bug fix
 
-	* ext/tk/sample/tkmenubutton.rb: sample of TkMenubutton and 
+	* ext/tk/sample/tkmenubutton.rb: sample of TkMenubutton and
 	  TkOptionMenubutton
 
 Sat Jun 21 23:15:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -1625,7 +1625,7 @@ Sat Jun 21 23:15:08 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (proc_invoke): should not propagate distination tag if
 	  tag is already handled in this level. (ruby-bugs-ja PR#501)
 
-	* object.c (str_to_id): check for empty string before intern. 
+	* object.c (str_to_id): check for empty string before intern.
 	  [ruby-talk:74006]
 
 Sat Jun 21 13:56:09 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
@@ -1636,10 +1636,10 @@ Sat Jun 21 13:56:09 2003  Takaaki Uematsu  <uema2x@jcom.home.ne.jp>
 
 Sat Jun 21 12:55:17 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm commands 
-	  as elements of a hash argument. 
+	* ext/tk/lib/tk.rb: TkRoot.new and TkToplevel.new accept Wm commands
+	  as elements of a hash argument.
 
-	* ext/tk/sample/tktimer2.rb: add comments about the usage of a 
+	* ext/tk/sample/tktimer2.rb: add comments about the usage of a
 	  TkTimer object.
 
 Sat Jun 21 08:47:22 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -1647,10 +1647,10 @@ Sat Jun 21 08:47:22 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tk*.rb: remove direct-accesses to TkComm::INTERP and
 	  TkComm::INITIALIZE_TARGETS
 
-	* ext/tk/lib/tk*.rb: use TkINTERP_SETUP_SCRIPTS constant for setting 
+	* ext/tk/lib/tk*.rb: use TkINTERP_SETUP_SCRIPTS constant for setting
 	  up the interpreter
 
-	* ext/tcltklib/tcltklib.c: support to create a safe interpreter 
+	* ext/tcltklib/tcltklib.c: support to create a safe interpreter
 	  with safe-Tk
 
 Fri Jun 20 23:28:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
@@ -1660,7 +1660,7 @@ Fri Jun 20 23:28:27 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Fri Jun 20 15:04:28 2003  NAKAMURA Usaku <usa@ruby-lang.org>
 
-	* defines.h (PATH_ENV): name of PATH environment. [new]. 
+	* defines.h (PATH_ENV): name of PATH environment. [new].
 
 	* defines.h (ENV_IGNORECASE): define for case insensitive platforms
 	  to access environment variables.
@@ -1678,7 +1678,7 @@ Fri Jun 20 14:52:46 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 Fri Jun 20 03:09:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
-	* parse.y (new_yield): distinguish "yield 1,2" and "yield [1,2]". 
+	* parse.y (new_yield): distinguish "yield 1,2" and "yield [1,2]".
 	  [ruby-dev:20360]
 
 	* eval.c (rb_eval): support new_yield() change.
@@ -1688,7 +1688,7 @@ Fri Jun 20 03:09:21 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	  [ruby-list:36935]
 
 	* parse.y (no_blockarg): separate no block argument check and
-	  ret_args argument processing. 
+	  ret_args argument processing.
 
 Fri Jun 20 00:45:19 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
 
@@ -1696,9 +1696,9 @@ Fri Jun 20 00:45:19 2003  NAKAMURA, Hiroshi <nahi@ruby-lang.org>
 
 Thu Jun 19 22:51:41 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
-	* lib/drb.rb, lib/drb/drb.rb, lib/drb/eq.rb, 
-	  lib/drb/extserv.rb, lib/drb/extservm.rb, lib/drb/gw.rb, 
-	  lib/drb/invokemethod.rb, lib/drb/observer.rb, 
+	* lib/drb.rb, lib/drb/drb.rb, lib/drb/eq.rb,
+	  lib/drb/extserv.rb, lib/drb/extservm.rb, lib/drb/gw.rb,
+	  lib/drb/invokemethod.rb, lib/drb/observer.rb,
 	  lib/drb/timeridconv.rb, lib/drb/unix.rb: import drb-2.0.4b3
 
 Thu Jun 19 16:14:43 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -1710,17 +1710,17 @@ Thu Jun 19 16:14:43 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tcltklib/tcltklib.c: add TclTkLib::EventFlag::NONE ( == 0 )
 
-	* ext/tcltklib/tcltklib.c: add set_no_event_wait() and 
+	* ext/tcltklib/tcltklib.c: add set_no_event_wait() and
 	  get_no_event_wait()
 
 	* ext/tcltklib/MANUAL.euc: modify
 
 	* ext/tcltklib/README.euc: ditto
 
-	* ext/tk/lib/tk.rb: change default value of TkCore.do_one_event 
+	* ext/tk/lib/tk.rb: change default value of TkCore.do_one_event
 	  argument
 
-	* ext/tk/lib/tk.rb: add TkCore.set_no_event_wait(wait) and 
+	* ext/tk/lib/tk.rb: add TkCore.set_no_event_wait(wait) and
 	  TkCore.get_no_event_wait
 
 	* ext/tk/lib/tk.rb: add Tk.exit ( == destroy root widget )
@@ -1730,7 +1730,7 @@ Thu Jun 19 16:14:43 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkafter.rb: set_callback returns self
 
-	* ext/tk/lib/tkafter.rb: continue() raises an exception, if already 
+	* ext/tk/lib/tkafter.rb: continue() raises an exception, if already
 	  running or no procedure.
 
 	* ext/tk/lib/tkafter.rb: skip() raises an exception, if not running.
@@ -1768,15 +1768,15 @@ Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: rename 'no_create' option to 'without_creating'
 
-	* ext/tk/lib/tk.rb: add TkWindow#pack_in, TkWindow#grid_in, 
+	* ext/tk/lib/tk.rb: add TkWindow#pack_in, TkWindow#grid_in,
 	  TkWindow#place_in
 
 	* ext/tk/lib/tk.rb: add TkWindow#bind_class and TkWindow#database_class
 
-	* ext/tk/lib/tk.rb: add TkBindTag.new_by_name and TkDatabaseClass 
+	* ext/tk/lib/tk.rb: add TkBindTag.new_by_name and TkDatabaseClass
 	  for binding to database class
 
-	* ext/tk/lib/tk.rb: check varname whether already exsist or not. 
+	* ext/tk/lib/tk.rb: check varname whether already exsist or not.
 	  (TkVarAccess.new)
 
 	* ext/tk/lib/tk.rb: TkTextWin#bbox returns an array of four numbers
@@ -1788,21 +1788,21 @@ Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: TkBindTag.new accepts a block
 
-	* ext/tk/lib/tk.rb: If given taglist, TkWindow#bindtags(taglist) 
+	* ext/tk/lib/tk.rb: If given taglist, TkWindow#bindtags(taglist)
 	  returns taglist
 
 	* ext/tk/lib/tk.rb: add TkWindow#bindtags=(taglist)
 
-	* ext/tk/lib/tk.rb: Tk.focue and Tk.focus_lastfor return nil 
+	* ext/tk/lib/tk.rb: Tk.focue and Tk.focus_lastfor return nil
 	  if there is no target widget.
 
-	* ext/tk/lib/tk.rb: Tk::Wm.client returns the argument string 
+	* ext/tk/lib/tk.rb: Tk::Wm.client returns the argument string
 	  when setting name
 
-	* ext/tk/lib/tk.rb: TkGrid.columnconfiginfo and rowconfiginfo 
+	* ext/tk/lib/tk.rb: TkGrid.columnconfiginfo and rowconfiginfo
 	  given a slot return a number.
 
-	* ext/tk/lib/tk.rb: TkWindow.grid_columnconfiginfo and 
+	* ext/tk/lib/tk.rb: TkWindow.grid_columnconfiginfo and
 	  grid_rowconfiginfo --- ditto
 
 	* ext/tk/lib/tk.rb: rename and define alias :: TkOption ==> TkOptionDB
@@ -1813,10 +1813,10 @@ Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: some TkComm methods change to module functions
 
-	* ext/tk/lib/tk.rb: add support for -displayof option to some 
+	* ext/tk/lib/tk.rb: add support for -displayof option to some
 	  TkWinfo methods
 
-	* ext/tk/lib/tk.rb: bind, bind_append and bind_remove --- 
+	* ext/tk/lib/tk.rb: bind, bind_append and bind_remove ---
 	  returns the target of event-binding
 
 	* ext/tk/lib/tk.rb: add Tk8.4 features
@@ -1837,7 +1837,7 @@ Wed Jun 18 19:46:21 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkentry.rb: TkEntry#bbox returns an array of four numbers
 
-	* ext/tk/lib/tkentry.rb: scan validatecommand arguments and 
+	* ext/tk/lib/tkentry.rb: scan validatecommand arguments and
 	  convert to proper type
 
 	* ext/tk/lib/tkbgerror.rb: support to define a error handler by user
@@ -1932,7 +1932,7 @@ Fri Jun 13 09:24:39 2003  Shugo Maeda  <shugo@ruby-lang.org>
 Thu Jun 12 22:13:13 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb : add 'no_create' option to widget
-	  initialize method. 
+	  initialize method.
 
 	* ext/tk/MANIFEST : forgot to commit when added tkmacpkg.rb
 	  and tkwinpkg.rb
@@ -1947,7 +1947,7 @@ Thu Jun 12 21:14:11 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	* ext/tk/lib/tkmacpkg.rb : Mac resource (not new but not
 	  included until now)
 
-	* ext/tk/lib/tkwinpkg.rb : Win DDE and registry (not new but not 
+	* ext/tk/lib/tkwinpkg.rb : Win DDE and registry (not new but not
 	  included until now)
 
 Tue Jun 10 14:26:30 2003  why the lucky stiff  <ruby-cvs@whytheluckystiff.net>
@@ -8346,7 +8346,7 @@ Tue Jun  4 07:03:33 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tkfont.rb:  Fix bugs on TkFont.init_widget_font for Tk8.x.
 
-	* ext/tk/lib/tkafter.rb: Add self to 1st argument of interval- 
+	* ext/tk/lib/tkafter.rb: Add self to 1st argument of interval-
 	  and loop-proc
 	  TkAfter#current_interval returns an interval (sleep) time value
 	  TkAfter#current_args returns an array of arguments
@@ -8354,7 +8354,7 @@ Tue Jun  4 07:03:33 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk*.rb: Allow to use Symbols for parameters.
 
-	* ext/tk/lib/tkcanvas.rb: (TkcItem) Add 'coords' parameter to the 
+	* ext/tk/lib/tkcanvas.rb: (TkcItem) Add 'coords' parameter to the
 	  canvas item constructor (for new notation of constructor).
 
 	* ext/tcltklib/tcltklib.c: New 'mainloop' and 'mainloop_watchdog'.
@@ -8363,7 +8363,7 @@ Tue Jun  4 07:03:33 2002  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
 	  'use' parameter.
 
 	* ext/tk/lib/tk.rb: Add new parameter 'widgetname' to the widget
-	  constructor to support effective use of Resource Database. 
+	  constructor to support effective use of Resource Database.
 
 	* ext/tk/lib/tk.rb: TkOption::get always returns a tainted string.
 
@@ -10516,6 +10516,11 @@ Thu Jan 17 16:21:42 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 	* eval.c (block_pass): should allow block argument relay even in
 	  the tainted mode.
 
+Thu Jan 17 09:43:05 2002  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* misc/ruby-mode.el (ruby-add-log-current-method): New function
+	for `add-log-current-defun-function'.
+
 Thu Jan 17 04:51:48 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* ext/socket/socket.c: support subclassing by proper "initialize"
@@ -13758,7 +13763,7 @@ Tue Apr 17 17:33:55 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* eval.c (handle_rescue): use === to compare exception match.
 
-	* error.c (syserr_eqq): comparison between SytemCallErrors should
+	* error.c (syserr_eqq): comparison between SystemCallErrors should
 	  based on their error numbers.
 
 Tue Apr 17 16:54:39 2001  K.Kosako  <kosako@sofnec.co.jp>
diff --git a/doc/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3
new file mode 100644
index 0000000000..b8e3162511
--- /dev/null
+++ b/doc/ChangeLog-1.9.3