1 files changed, 0 insertions, 32 deletions
diff --git a/lib/rdoc/require.rb b/lib/rdoc/require.rb
deleted file mode 100644
index 407b55af35..0000000000
--- a/lib/rdoc/require.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'rdoc/code_object'
-
-##
-# A file loaded by \#require
-
-class RDoc::Require < RDoc::CodeObject
-
-  ##
-  # Name of the required file
-
-  attr_accessor :name
-
-  ##
-  # Creates a new Require that loads +name+ with +comment+
-
-  def initialize(name, comment)
-    super()
-    @name = name.gsub(/'|"/, "") #'
-    self.comment = comment
-  end
-
-  def inspect # :nodoc:
-    "#<%s:0x%x require '%s' in %s>" % [
-      self.class,
-      object_id,
-      @name,
-      parent_file_name,
-    ]
-  end
-
-end
-
diff --git a/.gdbinit b/.gdbinit
index 17be7d8779..d1279ea046 100644
--- a/.gdbinit
+++ b/.gdbinit
@@ -50,7 +50,7 @@ define rp
     end
   else
   set $flags = ((struct RBasic*)($arg0))->flags
-  if ($flags & RUBY_FL_PROMOTED)
+  if ($flags & RUBY_FL_PROMOTED) == RUBY_FL_PROMOTED
     printf "[PROMOTED] "
   end
   if ($flags & RUBY_T_MASK) == RUBY_T_NONE
@@ -211,7 +211,35 @@ define rp
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_SYMBOL
     printf "%sT_SYMBOL%s: ", $color_type, $color_end
-    print (struct RBasic *)($arg0)
+    print (struct RSymbol *)($arg0)
+    set $id_type = ((struct RSymbol *)($arg0))->id & RUBY_ID_SCOPE_MASK
+    if $id_type == RUBY_ID_LOCAL
+      printf "l"
+    else
+    if $id_type == RUBY_ID_INSTANCE
+      printf "i"
+    else
+    if $id_type == RUBY_ID_GLOBAL
+      printf "G"
+    else
+    if $id_type == RUBY_ID_ATTRSET
+      printf "a"
+    else
+    if $id_type == RUBY_ID_CONST
+      printf "C"
+    else
+    if $id_type == RUBY_ID_CLASS
+      printf "c"
+    else
+      printf "j"
+    end
+    end
+    end
+    end
+    end
+    end
+    set $id_fstr = ((struct RSymbol *)($arg0))->fstr
+    rp_string $id_fstr
   else
   if ($flags & RUBY_T_MASK) == RUBY_T_UNDEF
     printf "%sT_UNDEF%s: ", $color_type, $color_end
@@ -350,9 +378,9 @@ define rp_id
       end
     end
     printf "(%ld): ", $id
-    rb_numtable_entry global_symbols.id_str $id
-    if $rb_numtable_rec
-      rp_string $rb_numtable_rec
+    set $str = lookup_id_str($id)
+    if $str
+      rp_string $str
     else
       echo undef\n
     end
@@ -710,6 +738,12 @@ define nd_tval
   rp ($arg0).u2.value
 end
 
+define nd_tree
+  set $buf = (struct RString *)rb_str_buf_new(0)
+  call dump_node((VALUE)($buf), rb_str_new(0, 0), 0, ($arg0))
+  printf "%s\n", $buf->as.heap.ptr
+end
+
 define rb_p
   call rb_p($arg0)
 end
@@ -731,7 +765,7 @@ define rb_numtable_entry
       end
     end
   else
-    set $rb_numtable_p = $rb_numtable_tbl->as.big.bins[$rb_numtable_id % $rb_numtable_tbl->num_bins]
+    set $rb_numtable_p = $rb_numtable_tbl->as.big.bins[st_numhash($rb_numtable_id) % $rb_numtable_tbl->num_bins]
     while $rb_numtable_p
       if $rb_numtable_p->key == $rb_numtable_id
 	set $rb_numtable_key = $rb_numtable_p->key
@@ -761,7 +795,7 @@ define rb_method_entry
     rb_numtable_entry $rb_method_entry_klass->m_tbl_wrapper->tbl $rb_method_entry_id
     set $rb_method_entry_me = (rb_method_entry_t *)$rb_numtable_rec
     if !$rb_method_entry_me
-      set $rb_method_entry_klass = (struct RClass *)$rb_method_entry_klass->ptr->super
+      set $rb_method_entry_klass = (struct RClass *)RCLASS_SUPER($rb_method_entry_klass)
     end
   end
   if $rb_method_entry_me
@@ -790,7 +824,7 @@ 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
+    set $rb_ancestors_module = RCLASS_SUPER($rb_ancestors_module)
   end
 end
 document rb_ancestors
diff --git a/.gitignore b/.gitignore
index aa6994a8dc..a9104e9ed5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,7 @@ y.tab.c
 /*.pc
 /*_prelude.c
 /COPYING.LIB
-/ChangeLog-1.8.0
+/ChangeLog-*
 /ChangeLog.pre-alpha
 /ChangeLog.pre1_1
 /Doxyfile
@@ -47,6 +47,7 @@ y.tab.c
 /autom4te*.cache
 /automake
 /beos
+/bmlog-*
 /breakpoints.gdb
 /config.cache
 /config.h
@@ -54,6 +55,11 @@ y.tab.c
 /config.status
 /config.status.lineno
 /configure
+/coverage/simplecov
+/coverage/.last_run.json
+/coverage/.resultset.json*
+/coverage/assets
+/coverage/index.html
 /doc/capi
 /enc.mk
 /encdb.h
@@ -96,6 +102,10 @@ y.tab.c
 
 # /benchmark/
 /benchmark/bmx_*.rb
+/benchmark/fasta.output.*
+/benchmark/wc.input
+
+/enc/unicode/data
 
 # /enc/trans/
 /enc/trans/*.c
@@ -107,6 +117,12 @@ y.tab.c
 /ext/dl/callback/callback-*.c
 /ext/dl/callback/callback.c
 
+# /ext/etc/
+/ext/etc/constdefs.h
+
+# /ext/fiddle/
+/ext/fiddle/libffi-*
+
 # /ext/rbconfig/
 /ext/rbconfig/sizeof/sizes.c
 
@@ -125,6 +141,9 @@ y.tab.c
 # /ext/tk/
 /ext/tk/config_list
 
+# /gems
+/gems/*.gem
+
 # /spec/
 /spec/mspec
 /spec/rubyspec
diff --git a/.travis.yml b/.travis.yml
index 8db00587d6..0052fdfc41 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,45 +18,57 @@
 
 # Language specification.
 language: c
+sudo: false
 
 # Compilers.  Several  compilers are  provided in Travis,  so we try  them all.
 # The value set here is visible via $CC environment variable.
 compiler:
   - gcc
-  - clang
+
+os:
+  - linux
 
 # Dependencies.  Some  header files are missing  in a Travis' worker  VM, so we
 # have  to install  them.  The  "1.9.1" here  is OK.   It is  the  most adopted
 # version string  for Debian/Ubuntu, and  no dependencies have been  changed so
 # far since the 1.9.1 release.
 before_install:
-  - "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"
+  - "CONFIG_FLAG="
+  - "JOBS='-j 4'"
 
 # Script is where the test runs.  Note  we just do "make test", not other tests
 # like  test-all, test-rubyspec.   This is  because  they take  too much  time,
 # enough for Travis to shut down the VM as being stalled.
 before_script:
-  - "make -f common.mk BASERUBY=ruby srcdir=. update-config_files"
+  - "uname -a"
+  - "uname -r"
+  - "rm -fr .ext autom4te.cache"
+  - "echo $TERM"
+  - "make -f common.mk BASERUBY=ruby MAKEDIRS='mkdir -p' srcdir=. update-config_files"
   - "autoconf"
   - "mkdir config_1st config_2nd"
-  - "./configure -C --with-gcc=$CC"
+  - "./configure -C --disable-install-doc --with-gcc=$CC $CONFIG_FLAG"
   - "cp -pr config.status .ext/include config_1st"
   - "make reconfig"
   - "cp -pr config.status .ext/include config_2nd"
   - "diff -ru config_1st config_2nd"
-  - "make -sj encs"
-  - "make -sj exts"
+  - "make after-update BASERUBY=ruby"
+  - "make -s $JOBS"
+  - "make update-rubyspec"
 script:
-  - "make test OPTS=-v"
-#  - "make test-all TESTS='-v'"
+  - "make test TESTOPTS=--color=never"
+  - "make test-all TESTOPTS='-q -j3 --color=never --job-status=normal'"
+  - "make test-rubyspec MSPECOPT=-fm"
 
 # Branch matrix.  Not all branches are Travis-ready so we limit branches here.
 branches:
   only:
     - trunk
-    - ruby_1_9_3
+    - ruby_2_1
+    - ruby_2_2
+    - ruby_2_3
+    - /^feature\//
+    - /^bug\//
 
 # We want to be notified when something happens.
 notifications:
@@ -65,7 +77,7 @@ notifications:
       - "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
+    on_failure: always # [always|never|change] # default: always
     template:
       - "%{message} by @%{author}: See %{build_url}"
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..ffdf2dd4b8
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,4 @@
+Please see the [official issue tracker] and wiki [HowToContribute].
+
+[official issue tracker]: https://bugs.ruby-lang.org
+[HowToContribute]: https://bugs.ruby-lang.org/projects/ruby/wiki/HowToContribute
diff --git a/ChangeLog b/ChangeLog
index 7cb30dbe62..f8f303e59c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13496 @@
+Tue Nov 15 15:29:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ssl_npn_select_cb_common): fix parsing
+	  protocol list.
+	  The protocol list from OpenSSL is not null-terminated.
+	  patched by Kazuki Yamaguchi [Bug #11810] [ruby-core:72082]
+
+Tue Nov 15 03:55:45 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/-test/file/fs.c (get_atime_p): Updating of file access times
+	  is enabled or not.
+
+Tue Nov 15 03:55:45 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_file.rb (TestFile#test_stat): fix noatime case.
+	  [ruby-core:77943] [Bug #12903]
+
+Tue Nov 15 03:54:14 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* test/rinda/test_rinda.rb (test_make_socket_ipv6_multicast,
+	  test_make_socket_ipv6_multicast_hops): skip if IPv6 multicast 
+	  address is not available.
+
+Tue Nov 15 03:39:07 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (transport_request): other than HTTPContinue
+	  in 1xx (HTTPInformation) also needs to continue. [Bug #12890]
+
+Sat Nov 12 07:48:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (mnew_internal): follow the original class, not to loop
+	  the prepended module.  [ruby-core:77591] [Bug #12832]
+
+Sat Nov 12 07:47:19 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* cont.c (cont_new): disable optimization if clang's version is
+	  3.8.0.  [ruby-core:77894] [Bug #12893]
+
+Sat Nov 12 07:37:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): format exact number more exactly.
+
+Sat Nov 12 07:34:03 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl.c (Init_openssl): register an ex_data index for
+	  X509_STORE and X509_STORE_CTX respectively. Since they don't share
+	  the ex_data index registry, we can't use the same index.
+	  (ossl_verify_cb): use the the correct index.
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_verify_callback): ditto.
+
+	* ext/openssl/ossl_x509store.c (ossl_x509store_set_vfy_cb): ditto.
+	  (ossl_x509stctx_verify): ditto.
+
+	* ext/openssl/ossl.h (void ossl_clear_error): add extern declarations
+	  of ossl_store_{ctx_,}ex_verify_cb_idx.
+
+	* ext/openssl/openssl_missing.c: remove X509_STORE_set_ex_data and
+	  X509_STORE_get_ex_data.
+
+	* ext/openssl/openssl_missing.h: implement X509_STORE_get_ex_data,
+	  X509_STORE_set_ex_data and X509_STORE_get_ex_new_index as macros.
+
+Sat Nov 12 07:32:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_pending_interrupt_p): no pending interrupt
+	  before initialization.
+
+	* thread.c (thread_raise_m, rb_thread_kill): uninitialized thread
+	  cannot interrupt.  [ruby-core:72732] [Bug #11959]
+
+Thu Oct 27 16:47:57 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* eval_intern.h (TH_PUSH_TAG): Initialize struct rb_vm_tag::tag with
+	  Qundef rather than 0 which is equal to Qfalse. Since Kernel#throw(obj)
+	  searches a tag with rb_vm_tag::tag == obj, throw(false) can
+	  accidentally find an unrelated tag which is not created by
+	  Kernel#catch.  [ruby-core:77229] [Bug #12743]
+
+	* test/ruby/test_exception.rb (test_throw_false): Add a test case for
+	  this.
+
+Thu Oct 27 16:39:56 2016  Aurelien Jacobs  <aurel@gnuage.org>
+
+	* lib/logger.rb (Logger::Period#next_rotate_time): fix monthly log
+	  rotate when DST is applied during a month of 31 days.
+	  [Fix GH-1458]
+
+Thu Oct 27 16:27:06 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* object.c: Improve documentation for Float conversion.
+	  [ruby-core:71661][Bug #11736][ci skip]
+
+Fri Oct  7 02:44:57 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rubygems/ssl_certs/GlobalSignRootCA.pem: add for RubyGems.org.
+
+Sat Oct  1 01:02:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_const_search): raise with the actual class/module
+	  name which defines the private constant.
+
+Sat Oct  1 00:57:54 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump.c (backtrace): use rip in the saved context for the case
+	  the SIGSEGV is received when the process is in userland.
+	  Note that ip in the stack should be used if the signal is received
+	  when it is in kernel (when it is calling syscall) [Bug #12711]
+
+Sat Oct  1 00:56:19 2016  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* lib/uri/generic.rb (def check_password): don't include bad password
+	  in URI exception output
+
+	* test/uri/test_generic.rb (def test_set_component): test for behavior
+
+Sat Oct  1 00:55:19 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (nogvl_fsync, nogvl_fdatasync): on Windows, just ignore if the
+	  fd is associated to non-disk device.  if call fsync and/or fdatasync
+	  with such fds, it causes Errno::EBADF exception and the behavior is
+	  incompatible with ruby 2.1 and earlier unintentionally introduced.
+
+Sat Oct  1 00:53:28 2016  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* array.c (flatten): use rb_obj_class instead of rb_class_of
+	  because rb_class_of may return a singleton class.
+	  [ruby-dev:49781] [Bug #12738]
+
+Sat Oct  1 00:52:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* man/irb.1: remove useless -width option.
+	  [ruby-dev:49767] [Bug #12692]
+
+Sat Oct  1 00:49:40 2016  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (Init_win32ole): should not use atexit to
+	  free allocated hash table to avoid error on Cygwin.
+
+Sat Oct  1 00:43:11 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/fiddle/test_pointer.rb (test_to_str, test_to_s, test_aref_aset):
+	  Attempt to use independent strings for destructive tests that
+	  directly modify values on memory by using Fiddle::Pointer.
+	  [Bug #12537] [ruby-dev:49700]
+
+Sat Oct  1 00:06:03 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c (str_buf_cat): Fix capa size for embed string.
+	  Fix bug in r55547. [Bug #12536]
+
+Sat Oct  1 00:06:03 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c (rb_str_change_terminator_length): New function to change
+	  termlen and resize heap for the terminator. This is split from
+	  rb_str_fill_terminator (str_fill_term) because filling terminator
+	  and changing terminator length are different things. [Bug #12536]
+
+	* internal.h: declaration for rb_str_change_terminator_length.
+
+	* string.c (str_fill_term): Simplify only to zero-fill the terminator.
+	  For non-shared strings, it assumes that (capa + termlen) bytes of
+	  heap is allocated. This partially reverts r55557.
+
+	* encoding.c (rb_enc_associate_index): rb_str_change_terminator_length
+	  is used, and it should be called whenever the termlen is changed.
+
+	* string.c (str_capacity): New static function to return capacity
+	  of a string with the given termlen, because the termlen may
+	  sometimes be different from TERM_LEN(str) especially during
+	  changing termlen or filling terminator with specific termlen.
+
+	* string.c (rb_str_capacity): Use str_capacity.
+
+Sat Oct  1 00:06:03 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c: Partially reverts r55547 and r55555.
+	  ChangeLog about the reverted changes are also deleted in this file.
+	  [Bug #12536] [ruby-dev:49699] [ruby-dev:49702]
+
+Sat Oct  1 00:06:03 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c (str_fill_term): When termlen increases, re-allocation
+	  of memory for termlen should always be needed.
+	  In this fix, if possible, decrease capa instead of realloc.
+	  [Bug #12536] [ruby-dev:49699]
+
+Sat Oct  1 00:06:03 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c: Specify termlen as far as possible.
+	  Additional fix for [Bug #12536] [ruby-dev:49699].
+
+	* string.c (str_new_static): Specify termlen from the given encoding
+	  when creating a new String object is needed.
+
+	* string.c (rb_tainted_str_new_with_enc): New function to create a
+	  tainted String object with the given encoding. This means that
+	  the termlen is correctly specified. Currently static function.
+	  The function name might be renamed to rb_tainted_enc_str_new
+	  or rb_enc_tainted_str_new.
+
+	* string.c (rb_external_str_new_with_enc): Use encoding by using the
+	  above rb_tainted_str_new_with_enc().
+
+Sat Oct  1 00:06:03 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c (rb_str_subseq, str_substr): When RSTRING_EMBED_LEN_MAX
+	  is used, TERM_LEN(str) should be considered with it because
+	  embedded strings are also processed by TERM_FILL.
+	  Additional fix for [Bug #12536] [ruby-dev:49699].
+
+Sat Oct  1 00:06:03 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* string.c: Fix memory corruptions when using UTF-16/32 strings.
+	  [Bug #12536] [ruby-dev:49699]
+
+	* string.c (rb_str_new_with_class): Use TERM_LEN of the "obj".
+
+	* string.c (rb_str_plus, rb_str_justify): Use str_new0 which is aware
+	  of termlen.
+
+	* string.c (str_shared_replace): Copy +termlen bytes instead of +1.
+
+	* string.c (rb_str_times): termlen should not be included in capa.
+
+	* string.c (RESIZE_CAPA_TERM): When using RSTRING_EMBED_LEN_MAX,
+	  termlen should be counted with it because embedded strings are
+	  also processed by TERM_FILL.
+
+	* string.c (rb_str_capacity, str_shared_replace, str_buf_cat): ditto.
+
+	* string.c (rb_str_drop_bytes, rb_str_setbyte, str_byte_substr): ditto.
+
+Sat Oct  1 00:00:13 2016  Eric Wong  <e@80x24.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_write_internal):
+	  avoid undefined behavior
+	* test/openssl/test_pair.rb (test_write_zero): new test
+	  [ruby-core:76751] [Bug #12660]
+
+Tue Aug 16 21:12:07 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (ADD_TRACE): ignore trace instruction on non-positive
+	  line.
+
+	* parse.y (coverage): get rid of ArgumentError when the starting
+	  line number is not positive.  [ruby-core:76141] [Bug #12517]
+
+Tue Aug 16 21:12:07 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* test/coverage/test_coverage.rb: ignored test when enabled to coverage.
+	  It lead to crash with `make test-all`.
+
+Tue Aug 16 21:01:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/mailto.rb (initialize): RFC3986_Parser#split sets opaque
+	  only if the URI has path-rootless, not path-empty.
+	  [ruby-core:76055] [Bug #12498]
+	  patched by Chris Heisterkamp <cheister@squareup.com>
+
+Tue Aug 16 20:59:35 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_strftime.c (date_strftime_with_tmx): reject too
+	  large precision to get rid of buffer overflow.
+	  reported by Guido Vranken <guido AT guidovranken.nl>.
+
+Tue Aug 16 20:58:11 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (noname_disable_map): don't optimize out group 0
+	  Ruby's Regexp doesn't allow normal numbered groups if the regexp
+	  has named groups. On such case it optimizes out related NT_ENCLOSE.
+	  But even on the case it can use \g<0>.
+	  This fix not to remove NT_ENCLOSE whose regnum is 0.
+	  [ruby-core:75828] [Bug #12454]
+
+Tue Aug 16 20:56:30 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* missing/crypt.c: fix size macros to use configured values
+	  for platforms long is larger than 32bit.
+	  [ruby-core:75792] [Bug #12446]
+
+Tue Aug 16 20:40:36 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_bn.c (try_convert_to_bnptr): Extracted from
+	  GetBNPtr(). This doesn't raise exception but returns NULL on error.
+	  (GetBNPtr): Raise TypeError if conversion fails.
+	  (ossl_bn_eq): Implement BN#==.
+	  (ossl_bn_eql): #eql? should not raise TypeError even if the argument
+	  is not compatible with BN.
+	  (ossl_bn_hash): Implement BN#hash.
+
+	* ext/openssl/ossl_bn.c (Init_ossl_bn): Define #== and #hash.
+
+	* test/openssl/test_bn.rb: Test BN#eql?, #== and #hash
+
+Tue Aug 16 20:34:22 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (str_transcode0): scrub in the given encoding when
+	  the source encoding is given, not in the encoding of the
+	  receiver.  [ruby-core:75732] [Bug #12431]
+
+Tue Aug 16 20:30:53 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/ossl_pkey_dh.c (ossl_dh_compute_key): Check that the DH
+	  has 'p' (the prime) before calling DH_size(). We can create a DH with
+	  no parameter but DH_size() does not check and dereferences NULL.
+	  [ruby-core:75720] [Bug #12428]
+
+	* ext/openssl/ossl_pkey_dsa.c (ossl_dsa_sign): Ditto. DSA_size() does
+	  not check dsa->q.
+
+	* ext/openssl/ossl_pkey_rsa.c (ossl_rsa_public_encrypt,
+	  ossl_rsa_public_decrypt, ossl_rsa_private_encrypt,
+	  ossl_rsa_private_decrypt): Ditto. RSA_size() does not check rsa->n.
+
+Tue Aug 16 20:28:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (enc_arg, str_transcode_enc_args, econv_args):
+	  remove volatile, and add GC guards in callers.
+	  [ruby-core:75664] [Bug #12411]
+
+Tue Aug 16 14:58:50 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (build-ext), ext/extmk.rb: use variable EXTENCS
+	  different than ENCOBJS, to get rid of circular dependency.
+	  build libencs when linking encodings statically.
+	  [ruby-core:75618] [Bug #12401]
+
+Tue Aug 16 14:54:14 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_local_constants_i): exclude private constants
+	  when excluding inherited constants too.  [Bug #12345]
+
+Tue Aug 16 14:43:00 2016  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/timeridconv.rb: don't use keeper thread. [Bug #12342]
+
+	* test/drb/ut_timerholder.rb: ditto.
+
+Tue Aug 16 14:07:18 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* ext/json/lib/*.rb: Removed some comments. Because these are unnecessary
+	  class description. [ci skip][Bug #12255][ruby-core:74835]
+
+Tue Aug 16 14:06:04 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* pack.c (pack_pack): use union instead of bare variable to ease
+	  optimizations and avoid assigning x87 floating point number.
+	  [ruby-core:74496] [Bug #12209]
+
+	* pack.c (pack_unpack): ditto.
+
+Tue Aug 16 13:59:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c, ext/socket/rubysocket.h (inet_ntop): share
+	  the fallback definition.  [ruby-core:76646] [Bug #12645]
+
+Tue Aug 16 13:52:42 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (vm_set_main_stack): remove unnecessary check.  toplevel
+	  binding must be initialized.  [Bug #12611] (N1)
+
+	* string.c (rb_str_split_m): simplify the condition.
+	  [Bug #12611](N4)
+
+Tue Aug 16 13:42:42 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* thread.c (rb_wait_for_single_fd): Clean up fds.revents every time
+	  before calling ppoll(2). [Bug #12575] [ruby-dev:49725]
+
+Tue Aug 16 13:40:26 2016  Eric Wong  <e@80x24.org>
+
+	* lib/webrick/httpservlet/cgihandler.rb (do_GET): delete HTTP_PROXY
+	* test/webrick/test_cgi.rb (test_cgi_env): new test
+	* test/webrick/webrick.cgi (do_GET): new endpoint to dump env
+	  [ruby-core:76511] [Bug #12610]
+
+Tue Aug 16 13:38:36 2016  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/attribute.rb (REXML::Attribute#to_string): Fix wrong
+	  entry reference name of double quote.
+	  [Bug #12609][ruby-core:76509]
+	  Patch by Joseph Marrero. Thanks!!!
+
+Tue Aug 16 13:36:00 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_roots): should mark the VM object itself to mark
+	  singleton class of the VM object.
+	  Before this patch, we only set mark bit for the VM object and
+	  invoke mark function separately.
+	  [Bug #12583]
+
+	* test/ruby/test_gc.rb: add a test.
+
+Tue Aug 16 13:29:25 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rubygems/package.rb: Fixed potential perms issue unpacking of
+	  gems on NFS.  [Backport #12579]
+
+	* lib/rubygems.rb: bump version.
+
+Fri Aug 12 11:48:27 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_args.c (setup_parameters_complex): don't raise ArgumentError
+	  if an array is given for instance_exec with optional argument.
+	  [ruby-core:76300] [Bug #12568]
+	  https://github.com/rails/rails/pull/25699
+
+Fri Aug 12 11:45:02 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/http/generic_rquest.rb (write_header): A Request-Line must
+	  not contain CR or LF.
+
+Fri Aug 12 11:41:41 2016  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (putline): raise an ArgumentError when
+	  CR or LF is included in a line.
+
+Fri Aug 12 11:21:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (tr_trans): consider terminator length and fix heap
+	  overflow.  reported by Guido Vranken <guido AT guidovranken.nl>.
+
+Tue Jul 12 00:17:36 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/fake.rb: don't fake libdir.  use libdirname instead.
+
+Thu Jul  7 00:05:00 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bignum.c (Init_Bignum): revert a part of previous commit (r55598),
+	  because the implementation of Object#hash is a little difference from
+	  trunk.  cf. [Backport #12391]
+
+Wed Jul  6 23:02:03 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* bignum.c (rb_big_hash): make it public function to be available in
+	  other source files, and remove documentation comment for Bignum#hash.
+
+	* bignum.c (Bignum#hash): remove its definition because it is unified
+	  with Object#hash.
+
+	* include/ruby/intern.h (rb_big_hash): add a prototype declaration.
+
+	* hash.c (any_hash): treat Bignum values directly.
+
+Fri Jun 10 17:48:51 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser::Completion.candidate): get rid of
+	  nil as key names.  [ruby-core:75773] [Bug #12438]
+
+	* lib/optparse.rb (OptionParser#make_switch): char class option
+	  cannot be NoArgument, default to RequiredArgument.
+
+Fri Jun 10 17:44:59 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (unescape_nonascii): scan hex up to only 3 characters.
+	  [Bug #12420] [Bug #12423]
+
+Fri Jun 10 17:44:59 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regparse.c (fetch_token_in_cc): raise error if given octal escaped
+	  character is too big. [Bug #12420] [Bug #12423]
+
+Fri Jun 10 17:34:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (rb_exec_getargs): honor the expected argument types
+	  over the conversion method.  the basic language functionality
+	  should be robust.  [ruby-core:75388] [Bug #12355]
+
+Fri Jun 10 16:30:16 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (new_if_gen): set newline flag to NODE_IF to trace all
+	  if/elsif statements.  [ruby-core:67720] [Bug #10763]
+
+Fri Jun 10 16:24:29 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* ext/date/date_core.c (Init_date_core): [DOC] Convert DateTime
+	  documentation to RDoc from Markdown.
+	  [ruby-core:75136] [Bug #12311]
+
+Fri Jun 10 16:12:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_local_constants_i): exclude hidden constants.
+	  [ruby-core:75575] [Bug #12389]
+
+Fri Jun 10 16:10:23 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c (compile_length_tree): return error code immediately
+	  if compile_length_tree raised error [Bug #12418]
+
+Fri Jun 10 16:06:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/missing.h (isfinite): move from numeric.c.
+
+Fri Jun 10 16:06:25 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (isfinite): get rid of a warning on
+	  cygwin. [Bug #12417][ruby-core:75691]
+
+Fri Jun 10 16:06:25 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (isfinite): isfinite does not always
+	  exist.  fixed build error on Windows introduced at r55123.
+
+Fri Jun 10 16:06:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): consider
+	  non-finite float values not to raise FloatDomainError.
+	  [ruby-core:75682] [Bug #12414]
+
+Fri Jun 10 16:00:27 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* thread.c (recursive_list_access): a object id may be a Bignum.  so,
+	  the list must be a objhash, instead of a identhash.
+	  this fixes many test errors on mswin64 CI.
+
+Fri Jun 10 15:56:24 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_modify_expand): check integer overflow.
+	  [ruby-core:75592] [Bug #12390]
+
+Fri Jun 10 15:54:05 2016  Benoit Daloze  <eregontp@gmail.com>
+
+	* insns.def (defineclass): Also raise an error when redeclaring the
+	  superclass of a class as Object and it has another superclass.
+	  [Bug #12367] [ruby-core:75446]
+
+	* test/ruby/test_class.rb: test for above.
+
+Fri Jun 10 15:46:24 2016  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* bignum.c: [DOC] Update result of 123456789 ** -2.
+	  [ruby-dev:49606] [Bug #12339]
+
+Fri Jun 10 15:37:25 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* internal.h (RCOMPLEX_SET_IMAG): undef RCOMPLEX_SET_IMAG
+	  instead of duplicated undef RCOMPLEX_SET_REAL.
+
+Fri Jun 10 15:37:25 2016  Yuichiro Kaneko  <yui-knk@ruby-lang.org>
+
+	* complex.c (rb_complex_set_imag): Fix to properly set imag
+	  of complex.
+
+Fri Jun 10 15:05:41 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (rb_w32_utruncate): implements new
+	  truncate alternative which accepts UTF-8 path.
+
+	* file.c (truncate): use above function.
+	  [Bug #12340]
+
+Fri Apr 29 20:11:38 2016  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_time_tz.rb: Tests depends on Europe/Moscow removed
+	  to avoid test failures due to the tzdata change.
+	  https://github.com/eggert/tz/commit/8ee11a301cf173afb0c76e0315b9f9ec8ebb9d95
+	  Found by naruse.
+
+Wed Apr 27 22:16:04 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* compile.c (new_label_body): missed backporting r54548 in r54698.
+	  this fixes randomly test failure introduced by r54698.
+	  cf. [Bug #12082]
+
+Tue Apr 26 13:38:31 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* README.EXT{,.ja}: `nul` should be uppercase.
+	  change 'nul' => 'NUL'.  [Fix GH-1172]
+	  derived from a patch by craft4coder <yooobuntu@163.com>
+
+	* doc/extension.rdoc: Improvements to english grammers.
+	  [Bug #12246][ruby-core:74792][ci skip]
+	  derived from a patch by Marcus Stollsteimer <sto.mar@web.de>
+
+Tue Apr 26 13:25:25 2016  Marcus Stollsteimer  <sto.mar@web.de>
+
+	* encoding.c: Fix return value of `Encoding::ISO8859_1.name`
+	  [Bug #12313][ruby-core:75147][ci skip]
+	* ext/bigdecimal/bigdecimal.c: Fix code sample of `BigDecimal.new`
+
+Tue Apr 26 13:22:45 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: add missing -lm for AIX.
+
+Tue Apr 26 13:22:45 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: don't use the system-provided round(3) on AIX.
+	  In AIX, round(0.49999999999999994) returns 1.0.
+	  Use round() in numeric.c instead.
+
+Tue Apr 26 13:18:59 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c: cygwin does not use w32_cmdvector, command line can be
+	  other than UTF-8.  [ruby-dev:49519] [Bug #12184]
+
+Tue Apr 26 13:16:41 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_jump.c (exec_end_procs_chain): restore previous error info
+	  for each end procs.  [ruby-core:75038] [Bug #12302]
+
+Fri Apr 22 18:36:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (new_label_body): initialize bit fields, since
+	  compile_data_alloc does not clear the memory.  [Bug #12082]
+
+Fri Apr 22 18:36:15 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_optimize): disable tail call optimization in
+	  rescued, rescue, and ensure blocks.
+	  [ruby-core:73871] [Bug #12082]
+
+Fri Apr 22 18:34:31 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/regexp.rdoc (comments): [DOC] terminators cannot appear in
+	  comments.  [ruby-core:74838] [Bug #12256]
+
+Fri Apr 22 18:30:50 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* extension.rdoc, extension.ja.rdoc: [DOC] Fix some errors.
+	  Renamed files, wrong method names or argument types; the example
+	  GetDBM macro is now updated to the current version of the actual
+	  code.
+	  patches are derived from Marcus Stollsteimer in [ruby-core:74690].
+	  [Bug #12228]
+
+Fri Apr 22 18:22:15 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c (mime_putc): fix typo.
+	  [Bug #12202] [ruby-core:74802]
+
+Fri Apr 22 18:22:15 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
+	  patched by Anton Sivakov [Bug #12201] [Bug #12202]
+
+Fri Apr 22 18:16:51 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/securerandom.rb (gen_random): to avoid blocking on Windows.
+	  On Windows OpenSSL RAND_bytes (underlying implementation is
+	  RAND_poll in crypto/rand/rand_win.c) may be blocked at
+	  NetStatisticsGet.
+	  https://wiki.openssl.org/index.php/Random_Numbers#Windows_Issues
+	  Instead of this, use Random.raw_seed directory (whose implementation
+	  CryptGenRandom is one of the source of
+	  entropy of RAND_poll on Windows).
+	  https://wiki.openssl.org/index.php/Random_Numbers
+	  Note: CryptGenRandom function is PRNG and doesn't check its entropy,
+	  so it won't block. [Bug #12139]
+	  https://msdn.microsoft.com/ja-jp/library/windows/desktop/aa379942.aspx
+	  https://tools.ietf.org/html/rfc4086#section-7.1.3
+	  https://eprint.iacr.org/2007/419.pdf
+	  http://www.cs.huji.ac.il/~dolev/pubs/thesis/msc-thesis-leo.pdf
+
+Fri Apr 22 18:13:22 2016  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/rubygems/test_case.rb: Fix test on Windows for inconsistent temp path.
+	  https://github.com/rubygems/rubygems/pull/1554
+	  [Bug #12193][ruby-core:74431]
+
+Fri Apr 22 16:37:14 2016  multisnow  <infinity.blick.winkel@gmail.com>
+
+	* ext/openssl/extconf.rb: check RAND_edg to support libressl.
+
+	* ext/openssl/ossl_rand.c (ossl_rand_egd): define only if RAND_edg
+	  is available.  [Fix GH-829]
+
+Fri Apr 22 16:24:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_lgamma_r_m0): fix the condition for
+	  lgamma_r(-0.0).  [Bug #12249]
+
+Fri Apr 22 16:24:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_lgamma_r_m0): check if lgamma_r(-0.0)
+	  returns negative infinity.  [Bug #12249]
+
+	* math.c (ruby_lgamma_r): define by the configured result.
+
+Fri Apr 22 16:24:00 2016  cremno phobia  <cremno@mail.ru>
+
+	* math.c (ruby_lgamma_r): missing/lgamma_r.c is used on Windows,
+	  since msvcrt does not provide it.
+
+	* missing/lgamma_r.c (lgamma_r): fix lgamma(-0.0).
+	  [ruby-core:74823] [Bug #12249]
+
+Fri Apr 22 16:24:00 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* math.c (ruby_lgamma_r): mswin's lgamma_r also seems to be wrong.
+	  cf. [Bug #12249]
+
+Fri Apr 22 16:24:00 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* math.c (ruby_tgamma): fix tgamma(-0.0) on mingw.
+	  [ruby-core:74817] [Bug #12249]
+
+Fri Apr 22 16:00:50 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* defs/keywords (alias, undef): symbol literals are allowed.
+
+	* parse.y (parse_percent): should parse symbol literals for alias
+	  and undef.  [ruby-dev:47681] [Bug #8851]
+
+Fri Apr 22 15:47:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (struct_make_members_list): extract making member name
+	  list from char* va_list, with creating symbols without
+	  intermediate IDs.
+
+Fri Apr 22 15:19:01 2016  Joe Swatosh  <joe.swatosh@gmail.com>
+
+	* ext/win32/lib/win32/registry.rb (DeleteValue, DeleteKey): fix
+	  API names.  [ruby-core:74863] [Bug #12264]
+
+Fri Apr 22 15:13:39 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_vm_struct): make at_exit a single linked list but
+	  not RArray, not to mark the registered functions by the write
+	  barrier.  based on the patches by Evan Phoenix.
+	  [ruby-core:73908] [Bug #12095]
+
+Fri Apr 22 15:08:27 2016  Benoit Daloze  <eregontp@gmail.com>
+
+	* thread.c (update_coverage): Do not track coverage in loaded files
+	  after Coverage.result. Avoids out-of-bounds access. [Bug #12237]
+
+	* ext/coverage/coverage.c (coverage_clear_result_i): document.
+
+Fri Apr 22 14:56:46 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/date/date_core.c (Init_date_core): [DOC] fix misplaced doc
+	  of DateTime.  [ruby-core:74729] [Bug #12233]
+
+Fri Apr 22 14:48:09 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parse_ident): allow keyword arguments just after a
+	  method where the same name local variable is defined.
+	  [ruby-core:73816] [Bug#12073]
+
+Fri Apr 22 14:34:27 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): set the cause only if it is explicitly
+	  given or not set yet.  [Bug #12068]
+
+Fri Apr 22 14:13:28 2016  sorah (Shota Fukumori)  <her@sorah.jp>
+
+	* lib/forwardable.rb: Convert given accessors to String.
+
+	  r53381 changed to accept only Symbol or String for accessors, but
+	  there are several rubygems that pass classes (e.g. Array,
+	  Hash, ...) as accessors. Prior r53381, it was accepted because Class#to_s
+	  returns its class name. After r53381 given accessors are checked
+	  with define_method, but it accepts only Symbol or String, otherwise
+	  raises TypeError.
+
+	      def_delegator Foo, :some_method
+
+	  This change is to revert unexpected incompatibility. But this behavior
+	  may change in the future.
+
+Fri Apr 22 14:13:28 2016  Elliot Winkler  <elliot.winkler@gmail.com>
+
+	* lib/forwardable.rb (def_instance_delegator) fix delegating to
+	  'args' and 'block', clashing with local variables in generated
+	  methods.  [ruby-core:72579] [Bug #11916]
+
+	* lib/forwardable.rb (def_single_delegator): ditto.
+
+Fri Apr 22 13:41:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_massign_lhs): when index ends with splat,
+	  append rhs value to it like POSTARG, since VM_CALL_ARGS_SPLAT
+	  splats the last argument only.  [ruby-core:72777] [Bug #11970]
+
+Thu Mar 31 05:06:02 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): fix buffer overflow, length must be
+	  greater than precision.  reported by William Bowling <will AT
+	  wbowling.info>.
+
+Thu Mar 31 04:49:05 2016  Kimura Wataru  <kimuraw@i.nifty.jp>
+
+	* test/ruby/test_io.rb: handled rlimit value same as r52277
+	  [Bug #11852][ruby-dev:49446]
+
+Wed Mar 30 06:37:56 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/extlibs.rb (do_patch): let "patch" command change the
+	  working directory and open the patch file there, instead of
+	  spawn options, so that proper error message will be shown by the
+	  command not just "chdir" or "open".
+
+Wed Mar 30 06:11:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (reserve_stack): fix reserving position where
+	  the stack growing bottom to top. [Bug #12118]
+
+Wed Mar 30 06:04:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* .travis.yml: removed commented-out code.
+
+Wed Mar 30 06:04:18 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* .travis.yml: removed osx code. follow up with r53517
+
+Wed Mar 30 06:04:18 2016  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* .travis.yml: update libssl before running tests. 
+	  Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for figuring out the
+	  travis settings!
+
+Wed Mar 30 06:04:18 2016  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: removed Ruby 1.9.3 build on Travis CI
+
+Wed Mar 30 06:04:18 2016  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: Remove redundant configuration option.
+	  [fix GH-809] Patch by @gxworld
+
+Wed Mar 30 05:15:04 2016  Kazuki Yamaguchi  <k@rhe.jp>
+
+	* ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
+	  function rather than OPENSSL_NPN_NEGOTIATED macro. it exists
+	  even if it is disabled by OpenSSL configuration.
+	  [ruby-core:74384] [Bug #12182]
+
+	* ext/openssl/ossl_ssl.c: update #ifdef(s) as above.
+
+	* test/openssl/test_ssl.rb: skip NPN tests if NPN is disabled.
+
+Wed Mar 30 05:13:25 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/uri/http.rb (URI::HTTP#initialize): [DOC] fix example,
+	  missing mandatory arguments.  [ruby-core:74540] [Bug #12215]
+
+Tue Mar 29 02:22:35 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* lib/uri/mailto.rb: raising URI::InvalidComponentError instead
+	  of failing with undefined method `split' for nil:NilClass for
+	  mailto: URIs without opaque part. [Bug #10738]
+	* test/uri/testuri.rb: Test for above
+
+Tue Mar 29 02:08:40 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* signal.c: should also clear ruby_disable_gc.
+	  [Bug #11692]
+
+Tue Mar 29 02:04:18 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_f_catch): [DOC] fix malformed RDoc syntax, "+...+"
+	  cannot enclose non-identifier characters.
+	  a patch by Sebastian S in [ruby-core:74278].  [Bug#12170]
+
+Tue Mar 29 02:02:53 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/-ext-/float/test_nextafter.rb: In AIX,
+	  nextafter(+0.0,-0.0)=+0.0, and nextafter(-0.0,+0.0)=-0.0,
+	  but they should return -0.0 and +0.0, respectively. This is
+	  a known bug in nextafter(3) on AIX, so skip related tests.
+
+Tue Mar 29 01:56:24 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* lib/rubygems/installer.rb: merge partially r49511.
+	  cherry picking https://github.com/rubygems/rubygems/commit/f9232680
+	  [Bug #12066]
+
+Tue Mar 29 01:41:10 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (enc_succ_alnum_char): try to skip an invalid character
+	  gap between GREEK CAPITAL RHO and SIGMA.
+	  [ruby-core:74478] [Bug #12204]
+
+Tue Mar 29 01:27:52 2016  Victor Nawothnig  <Victor.Nawothnig@gmail.com>
+
+	* parse.y (parse_numvar): NTH_REF must be less than a half of
+	  INT_MAX, as it is left-shifted to be ORed with back-ref flag.
+	  [ruby-core:74444] [Bug#12192] [Fix GH-1296]
+
+Tue Mar 29 01:24:55 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/trans/JIS: update Unicode's notice. [Bug #11844]
+
+Tue Mar 29 01:22:39 2016  Eric Hodel  <drbrain@segment7.net>
+
+	* marshal.c (r_object0):  raise ArgumentError when linking to undefined
+	  object.
+
+Tue Mar 29 01:22:39 2016  Eric Hodel  <drbrain@segment7.net>
+
+	* marshal.c (r_object0): Fix Marshal crash for corrupt extended object.
+
+Tue Mar 29 01:20:37 2016  Eric Wong  <e@80x24.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_sslctx_setup): document as MT-unsafe
+	  [ruby-core:73803] [Bug #12069]
+
+Tue Mar 29 01:07:36 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* insns.def (opt_mod): show its method name on ZeroDivisionError.
+	  [Bug #12158]
+
+Tue Mar 29 01:05:28 2016  Anthony Dmitriyev  <antstorm@gmail.com>
+
+	* net/ftp.rb: add NullSocket#closed? to fix closing not opened
+	  connection.  [Fix GH-1232]
+
+Tue Mar 29 01:02:49 2016  Koichi ITO  <koic.ito@gmail.com>
+
+	* variable.c: Added documentation about order of `Module#constants`
+	  [ci skip][Bug #12121][ruby-dev:49505][fix GH-1301]
+
+Tue Mar 29 00:56:10 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/ruby/test_process.rb (test_execopts_gid): Skip a test
+	  that is known to fail on AIX. AIX allows setgid to
+	  a supplementary group, but Ruby does not allow the "-e"
+	  option when setgid'ed, so the test does not work as intended.
+
+Tue Mar 29 00:53:26 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/socket/test_addrinfo.rb (test_ipv6_address_predicates):
+	  IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken
+	  on AIX, so skip related tests.
+
+Tue Mar 29 00:44:55 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast):
+	  The fifth argument to getsockopt(2) should be modified to
+	  indicate the actual size of the value on return,
+	  but not in AIX. This is a know bug. Skip related tests.
+	* test/rinda/test_rinda.rb (test_ring_server_ipv4_multicast):
+	  ditto.
+	* test/rinda/test_rinda.rb (test_make_socket_unicast): ditto.
+	* test/socket/test_basicsocket.rb (test_getsockopt): ditto.
+	* test/socket/test_sockopt.rb (test_bool): ditto.
+
+Tue Mar 29 00:43:40 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/zlib/test_zlib.rb (test_adler32_combine, test_crc32_combine):
+	  Skip two tests on AIX because zconf.h in zlib does not correctly
+	  recognize _LARGE_FILES in AIX. The problem was already reported
+	  to zlib, and skip these tests until it is fixed.
+
+Tue Mar 29 00:42:10 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_lock): skip
+	  this test on AIX. The issue is the same as on Solaris.
+	  [ruby-dev:47631]
+
+Tue Mar 29 00:33:06 2016  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* thread_pthread.c (getstack): __pi_stacksize returned by
+	  pthread_getthrds_np() is wrong on AIX. Use
+	  __pi_stackend - __pi_stackaddr instead.
+
+Tue Mar 29 00:06:58 2016  Alex Boyd  <alex@opengroove.org>
+
+	* lib/irb.rb: avoid to needless truncation when using back_trace_limit option.
+	  [fix GH-1205][ruby-core:72773][Bug #11969]
+
+Tue Mar 29 00:00:27 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/tcllib/tablelist_tile.rb: fix method name typo.
+	  [ruby-core:72513] [Bug #11893] The patch provided by Akira Matsuda.
+
+
+Mon Mar 28 23:58:27 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/tcllib/toolbar.rb: fix method name typo.
+	  [ruby-core:72511] [Bug #11891] The patch provided by Akira Matsuda.
+
+
+Mon Mar 28 23:57:33 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tkextlib/blt/tree.rb: fix method name typo.
+	  [ruby-core:72510] [Bug #11890] The patch provided by Akira Matsuda.
+
+
+Mon Mar 28 23:56:17 2016  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/tk/lib/tk/menubar.rb: fix a typo in font name. [ruby-core:72505]
+	  [Bug #11886] The patch provided by Akira Matsuda.
+
+	* ext/tk/sample/*.rb: ditto.
+
+Mon Mar 28 23:20:12 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/fiddle/test_handle.rb (test_NEXT): use -test-/dln/empty
+	  which is always a shared object and is not used by others.
+	  [ruby-dev:48629] [Bug #10384]
+
+Mon Mar 28 23:15:54 2016  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
+	  and HAVE_BUILTIN___BUILTIN_TYPES_COMPATIBLE_P on C++.
+	  [ruby-core:72736] [Bug #11962]
+
+Thu Mar 24 20:39:58 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c (inspect_tcpi_msec): more accurate condition
+	  for TCPI msec member inspection function.
+	  [ruby-core:74388] [Bug #12185]
+
+Thu Mar 10 00:22:25 2016  Naotoshi Seo  <sonots@gmail.com>
+
+	* lib/logger.rb: Remove block from Logger.add as it's not needed
+	  patch provided by Daniel Lobato Garcia [fix GH-1240] [Bug #12054]
+
+Thu Mar 10 00:17:57 2016  Zachary Scott  <zzak@ruby-lang.org>
+
+	* re.c: Remove deprecated kcode argument from Regexp.new and compile
+	  patch provided by Dylan Pulliam [Bug #11495]
+
+Thu Mar 10 00:17:57 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* re.c: Update documentation for Regexp class.
+	  [fix GH-937][ci skip] Patch by @davydovanton
+
+Thu Mar 10 00:04:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_gethostname): support unlimited size
+	  hostname.
+
+Wed Mar  9 22:59:43 2016  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/xmlrpc/client.rb: Support SSL options in async methods of
+	  XMLRPC::Client.
+	  [Bug #11489]
+	  Reported by Aleksandar Kostadinov. Thanks!!!
+
+Wed Mar  9 22:46:56 2016  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* marshal.c (r_object0): honor Marshal.load post proc
+	  value for TYPE_LINK.  by Hiroshi Nakamura <nahi@ruby-lang.org>
+	  https://github.com/ruby/ruby/pull/1204 fix GH-1204
+
+Wed Mar  9 22:26:38 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c (sockopt_bool): relax boolean size to be one
+	  too not only sizeof(int).  Winsock getsockopt() returns a single
+	  byte as a boolean socket option.  [ruby-core:72730] [Bug #11958]
+
+Wed Mar  9 05:14:20 2016  Eric Wong  <e@80x24.org>
+
+	* io.c (io_getpartial): remove unused kwarg from template
+	* test/ruby/test_io.rb (test_readpartial_bad_args): new
+	  [Bug #11885]
+
+Wed Mar  9 05:14:20 2016  Eric Wong  <e@80x24.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_read_internal):
+	  do not process kwargs in blocking mode
+	* test/openssl/test_ssl.rb: test sysread
+
+Wed Mar  9 04:21:02 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c (rb_execarg_parent_start1): need to convert the encoding to
+	  ospath's one.
+
+Wed Mar  9 04:21:02 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* process.c: use rb_w32_uchdir() instead of plain chdir() on Windows.
+	  reported by naruse via twitter.
+
+	* process.c (rb_execarg_addopt): need to convert the encoding to
+	  ospath's one.
+
+Wed Mar  9 04:15:20 2016  Eric Wong  <e@80x24.org>
+
+	* ext/stringio/stringio.c (strio_binmode): implement to set encoding
+	* test/stringio/test_stringio.rb (test_binmode): new test
+	  [ruby-core:72699] [Bug #11945]
+
+Wed Mar  9 03:53:37 2016  Tadashi Saito  <tad.a.digger@gmail.com>
+
+	* compile.c, cont.c, doc, man: fix common misspelling.
+	  [ruby-core:72466] [Bug #11870]
+
+Wed Mar  9 03:51:48 2016  Eric Wong  <e@80x24.org>
+
+	* ext/socket/init.c (rsock_init_sock): reject reserved FDs
+	  [ruby-core:72445] [Bug #11862]
+
+Wed Mar  9 03:41:27 2016  Eric Wong  <e@80x24.org>
+
+	* ext/socket/init.c (rsock_init_sock): check FD after validating
+	* test/socket/test_basicsocket.rb (test_for_fd): new
+	  [ruby-core:72418] [Bug #11854]
+
+Wed Mar  9 03:34:54 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (reg_names_iter): should consider encoding of regexp.
+	  [ruby-core:72185] [Bug #11825]
+
+Wed Feb 24 08:18:18 2016  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* enc/windows_1250.c: Should not use C++ style comments (C99 feature).
+	  [Bug #11843]
+
+Tue Feb 23 03:43:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_2.c, enc/windows_1250.c: separate Windows-1250
+	  from ISO-8859-2 to fix 0x80..0x9e range (from Kimihito Matsui)
+
+Tue Feb 23 03:43:23 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/windows_1252.c: separate from ISO-8859-1 to fix 0x80..0x9e
+	  range.  [ruby-core:64049] [Bug #10097]
+
+Tue Feb 23 03:43:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_13.c: Added three missing lower/upper-case
+	  character pairs (from Kimihito Matsui)
+
+Tue Feb 23 03:43:23 2016  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* enc/iso_8859_4.c: Added missing lower/upper-case character
+	  pair (U+014A and U+014B, LATIN CAPITAL/SMALL LETTER ENG)
+	  (from Kimihito Matsui)
+
+Mon Feb 15 02:05:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_scrub): the result should be infected by the
+	  original string.
+
+Mon Feb 15 02:05:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_econv_substr_append, econv_primitive_convert):
+	  the result should be infected by the original string.
+
+Mon Feb 15 02:05:13 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h: add raw FL macros, which assume always the
+	  argument object is not a special constant.
+
+	* internal.h (STR_EMBED_P, STR_SHARED_P): valid only for T_STRING.
+
+	* string.c: deal with taint flags directly across String instances.
+
+Mon Feb 15 01:20:08 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (regexp): set_yylval_num sets u1, should use nd_tag
+	  instead of nd_state.  [ruby-core:72638] [Bug #11932]
+
+Tue Jan 26 21:52:16 2016  Joseph Tibbertsma  <josephtibbertsma@gmail.com>
+
+	* gc.c (RVALUE_PAGE_WB_UNPROTECTED): fix a typo of argument name.
+	  [Fix GH-1221]
+
+Mon Jan 18 00:34:41 2016  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_call_method): should not set fastpath
+	  with keyword arguments for VM_METHOD_TYPE_ATTRSET type methods.
+
+	  Normally, we can not use keyword arguments for this kind of methods,
+	  (obj.foo = 1), but we can set alias names for them.
+	  [Bug #11657]
+
+	* test/ruby/test_keyword.rb: add a test for this fix.
+
+Wed Dec 23 06:05:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): allow here documents in labeled
+	  argument.  [ruby-core:72396] [Bug #11849]
+
+Wed Dec 23 05:52:06 2015  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* test/ruby/test_syntax.rb: fix typo in test
+
+Wed Dec 23 05:52:06 2015  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* parse.y (parse_percent): Allow %-literals in labeled arg as
+	  r51624 did for parentheses.
+	  Fixes [ruby-core:72084] [Bug #11812].
+
+Mon Dec 21 05:05:54 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* cont.c: fix a double word typo.
+	  [Bug #11313][ruby-core:69749]
+
+Mon Dec 21 05:04:18 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/tk/lib/multi-tk.rb: fix typos.
+	  [Bug #11764][ruby-core:71800]
+
+Wed Dec 16 21:10:19 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/fiddle/handle.c: check tainted string arguments.
+	  Patch provided by tenderlove and nobu.
+
+	* test/fiddle/test_handle.rb (class TestHandle): add test for above.
+
+Wed Dec 16 02:38:19 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (parse_mode_enc): fix buffer overflow.
+
+Sat Dec 12 17:19:27 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* doc/NEWS-0.2.2: add description about incompatible change in Hash
+	  duplicated key overriding policy. [Bug #10315] [Bug #11501]
+
+Fri Dec 11 22:41:15 2015  Eric Wong  <e@80x24.org>
+
+	* insns.def (opt_case_dispatch): avoid converting Infinity
+	* test/ruby/test_optimization.rb (test_opt_case_dispatch_inf): new
+	  [ruby-dev:49423] [Bug #11804]'
+
+Thu Dec 10 00:23:07 2015  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: pthread_getattr_np is broken on AIX.
+	  More specifically, the stack address and size returned are
+	  not correct.
+
+Thu Dec 10 00:19:18 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (update-gems): use BASERUBY instead of RUNRUBY.
+
+Wed Dec  9 01:49:13 2015  Eric Wong  <e@80x24.org>
+
+	* insns.def (opt_case_dispatch): check Float#=== redefinition
+	* test/ruby/test_optimization.rb (test_opt_case_dispatch): new
+	  [ruby-core:71920] [Bug #11784]
+
+Wed Dec  9 01:46:23 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby_atomic.h (ATOMIC_SIZE_CAS): fix the argument order of
+	  InterlockedCompareExchange64.  new value and then old value is
+	  the last.
+
+Wed Dec  9 01:28:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_m_loader): defer finding encoding object not to
+	  be infected by marshal source.  [ruby-core:71793] [Bug #11760]
+
+	* marshal.c (r_object0): enable compatible loader on USERDEF
+	  class.  the loader function is called with the class itself,
+	  instead of an allocated object, and the loaded data.
+
+	* marshal.c (compat_allocator_table): initialize
+	  compat_allocator_tbl on demand.
+
+	* object.c (rb_undefined_alloc): extract from rb_obj_alloc.
+
+Wed Dec  9 01:24:57 2015  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* ext/-test-/file/fs.c: need to include sys/statvfs.h
+	  to use statvfs().
+
+	* ext/-test-/file/extconf.rb: check the existence of
+	  sys/statvfs.h
+
+Fri Dec  4 04:46:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): fix wrong shifting position in
+	  Rational conversion when not at the beginning of the result.
+	  [ruby-core:71806] [Bug #11766]
+
+Fri Dec  4 02:42:37 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (range_to_s): should be infected by the receiver.
+	  str2 infects by appending.  [ruby-core:71811] [Bug #11767]
+
+Wed Dec  2 03:17:01 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/readline/extconf.rb: call dir_config("libedit")
+	  if --enable-libedit is spcified. [Bug #11751]
+	  patched by John Hein
+
+Wed Dec  2 02:59:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_here_document): store dispatched result of
+	  on_tstring_content at the last fragment of a here document.
+
+Tue Dec  1 02:52:17 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* test/ruby/test_gc.rb: merge partially r52391 to get rid of CI error.
+
+Tue Dec  1 02:27:41 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_each_codepoint): raise an exception at incomplete
+	  character before EOF when conversion takes place.  [Bug #11444]
+
+Sun Nov 29 18:02:44 2015  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* io.c (argf_getpartial): should not resize str if the second
+	  argument is not given.
+	  [ruby-core:71668] [Bug #11738]
+
+Sun Nov 29 17:48:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (local_var_list_add): skip internal local variable
+	  name by its type but not if it has a name.  internal local
+	  variable names are just unique per frame, not globally.
+	  [ruby-core:71437] [Bug #11674]
+
+Sun Nov 29 17:13:16 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_each_codepoint): read more data when read partially.
+	  [ruby-core:70379] [Bug #11444]
+
+Sun Nov 29 16:46:25 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/net/http.rb: set hostname before call ossl_ssl_set_session.
+	  [Bug #11401][ruby-core:70152][fix GH-964] Patch by @mkarnebeek
+
+Sun Nov 29 16:33:30 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_econv_open0): rb_econv_t::source_encoding_name
+	  and rb_econv_t::destination_encoding_name should refer static
+	  strings always or NULL.  [ruby-core:70247] [Bug #11416]
+
+Sun Nov 29 16:11:32 2015  Eric Wong  <e@80x24.org>
+
+	* iseq.c (iseq_data_to_ary): dump kw_arg as symbol
+	* test/-ext-/iseq_load/test_iseq_load.rb: test kw_arg roundtrip
+	  [ruby-core:69891] [Bug #11338]
+
+Sun Nov 29 02:55:56 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* gc.c (__has_feature): move into internal.h.
+
+	* internal.h (__has_feature): ditto.
+
+	* internal.h (__has_extension): new macro.
+
+	* internal.h (STATIC_ASSERT): use _Static_assert with
+	  clang. [ruby-core:69931] [Bug #11343]
+
+Sat Nov 28 06:28:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (literal_concat_gen, evstr2dstr_gen): keep literal
+	  encoding beginning with an interpolation same as the source file
+	  encoding.  [ruby-core:70703] [Bug #11519]
+
+Sat Nov 28 06:12:32 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ssl_npn_select_cb): explicitly raise error
+	  in ext/openssl instead of OpenSSL itself because LibreSSL
+	  silently truncate the selected protocol name by casting the length
+	  from int to unsigned char. [Bug #11369]
+	  Patch by Jeremy Evans <merch-redmine@jeremyevans.net>
+
+Sat Nov 28 05:50:58 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (send_internal): set method_missing_reason before
+	  invoking overriding method_missing method so that the default
+	  method_missing can achieve it properly.
+	  [ruby-core:68515] [Bug #10969]
+
+Sat Nov 28 05:47:27 2015  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/ruby/test_symbol.rb (test_symbol_fstr_leak): add a warm-up
+	  code and check RSS to avoid false positive on AIX and false
+	  negative on Mac OS X. [Bug #10686]
+
+Sat Nov 28 05:47:27 2015  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/ruby/test_symbol.rb: avoid a false positive in AIX.
+
+Sat Nov 28 05:35:28 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* test/objspace/test_objspace.rb
+	  (test_trace_object_allocations_start_stop_clear): clear object
+	  allocation table first to get rid of erroneous detection for obj3.
+	  [ruby-dev:49095] [Bug #11271]
+
+Sat Nov 28 05:21:06 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* insns.def (defined): skip respond_to_missing? when
+	  a method is available.
+	  [Bug #11211]
+
+	* test/ruby/test_defined.rb: add a test for this fix.
+
+Wed Nov 25 01:05:29 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/digest/sha1/sha1ossl.c: fix defs.h path to catch up changes in
+	  r52739.[Bug #3231]
+
+	* ext/digest/rmd160/rmd160ossl.c: ditto.
+
+Wed Nov 25 00:54:15 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (kwd_append): fix segv after invalid keyword argument,
+	  preceding keyword list is NULL when syntax error is there.
+	  [ruby-core:71356] [Bug #11663]
+
+Wed Nov 25 00:47:07 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/ipaddr.rb, test/test_ipaddr.rb: Reject invalid address contained
+	  EOL string. Patch by @kachick [fix GH-942][Bug #11513]
+
+Wed Nov 25 00:32:44 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_build_from_ary_body): register cdhash to the
+	  iseq constant body instead of compile time mark array, not to
+	  get GCed.  [ruby-core:70708] [Feature #8543]
+
+Wed Nov 25 00:14:28 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/digest/*/*.[ch]: include ruby.h before digest.h to avoid
+	  includeing ext/digest/extconf.h. [Bug #3231]
+	  https://msdn.microsoft.com/library/36k2cdd4.aspx
+
+	* ext/digest/*/extconf.rb: remove ext/digest from include search path
+	  to avoid confusion of cl.exe.
+
+	* ext/digest/*/*.[ch]: explicitly specify def.h's path.
+
+Wed Nov 25 00:03:42 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* Added missing reference of GitHub
+
+Wed Nov 25 00:03:42 2015  Trevor Rowe  <trevorrowe@gmail.com>
+
+	* lib/net/http.rb: Fixed regression for Net::HTTP::PUT with "Expect-100"
+	  header. [fix GH-949]
+	* test/net/http/test_http.rb: added test.
+
+Mon Nov 23 00:19:51 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (vm_invoke_block): we should not expect ci->argc is
+	  stable after invoking a block. [Bug #11451]
+
+	* test/ruby/test_yield.rb: add a test. This test script is given by
+	  Alex Dowad.
+
+Thu Nov 19 01:06:07 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_load_internal0): stop separating exits at loading
+	  from exits from execution.  TAG_FATAL is the only case that
+	  `errinfo` is a Fixnum, and should continue to exit by JUMP_TAG
+	  but not raising as an ordinary exception.
+	  [ruby-core:70169] [Bug #11404]
+
+Thu Nov 19 01:06:07 2015  Alex Dowad  <alexinbeijing@gmail.com>
+
+	* load.c (rb_load_internal0): extra check before returning
+	  TAG_RAISE when a non-local transfer of control happens while
+	  loading and parsing a Ruby source file.
+	  [ruby-core:70169] [Bug #11404]
+
+Thu Nov 19 01:06:07 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_load_internal0): do not raise any exceptions but
+	  return the result tag state.
+
+	* load.c (rb_load_protect): reduce nested EXEC_TAGs.
+
+Thu Nov 19 00:41:09 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* enc/euc_jp.c (mbc_case_fold): check given string is valid or not,
+	  and if invalid, return 1. [Bug #11486]
+
+Thu Nov 19 00:15:23 2015  Zachary Scott  <zzak@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey.c: Merge ruby/openssl@b9ea8ef [Bug #10735]
+
+Thu Nov 19 00:01:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (argf_next_argv): check ARGV element type, and try
+	  conversion if necessary.  [ruby-core:71140] [Bug #11610]
+
+Wed Nov 18 23:29:32 2015  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_method_tab): Only add SSLv3 support
+	  if the SSL library supports it.  Thanks Kurt Roeckx <kurt@roeckx.be>
+	  [Bug #11376]
+
+	* ext/openssl/extconf.rb: check for SSLv3 support in the SSL
+	  implementation.
+
+	* test/openssl/test_ssl.rb (class OpenSSL): Skip tests that need SSLv3
+	  if there is no support.
+
+Mon Nov 16 03:39:59 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* tool/runruby.rb: rubyspec now requires other FDs not to be closed
+	  since 7b6ce1fee.
+
+Sun Nov  8 23:30:56 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks_orig):
+	  maintain trace_running counter on internal events.
+
+	  This patch is made by Takashi Kokubun <takashikkbn@gmail.com>.
+	  [Bug #11603] https://github.com/ruby/ruby/pull/1059
+
+Sun Nov  1 03:52:41 2015  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* test/openssl/test_ssl_session.rb: Fix tests so that they take in to
+	  account OpenSSL installations that have SSLv3 disabled by default.
+	  Thanks Jeremy Evans <code@jeremyevans.net> for the patches.
+	  [Bug #11366] [Bug #11367]
+
+Sun Nov  1 03:40:43 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_ssl_session.rb (OpenSSL#test_ctx_client_session_cb):
+	  fix test failure with OpenSSL disabled SSLv3 protocol.
+	  [ruby-core:63772] [Bug #10046]
+
+Tue Oct 27 23:58:32 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (hook_before_rewind): prevent kicking :return event while
+	  finishing vm_exec func because invoke_block_from_c() kick a :return
+	  event for bmethods.
+	  [Bug #11492]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Tue Oct 27 23:38:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check for libunwind.h, which is not available in
+	  very old OS X SDK.  [ruby-core:71080] [Bug #11591]
+
+Tue Oct 27 23:32:51 2015  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* test/drb/test_drb.rb: Run Rinda/DRb tests on localhost. [Fix GH-1027]
+	  patch by voxik.
+
+	* test/rinda/test_rinda.rb: ditto
+
+Tue Oct  6 01:29:02 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (IS_BEG): include labeled argument state, which was
+	  EXPR_LABELARG.  [ruby-dev:49221] [Bug #11456]
+
+Tue Oct  6 01:29:02 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y: fix syntax error at do-block after a conditional
+	  operator.  separate label-allowed and after-a-label states from
+	  others as bit flags.  [ruby-dev:48790] [Bug #10653]
+
+Mon Oct  5 03:29:23 2015  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (nmin_filter): Fix limit value.
+	  patch by Helder Pereira.
+	  [Bug #11471] [ruby-core:70477]
+
+Wed Sep 30 03:44:36 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rss/rss.rb (Time#w3cdtf): fix zero-trimmed width of fraction
+	  digits.  [ruby-core:70667] [Bug #11509]
+
+Wed Sep 30 03:34:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_memsearch_wchar, rb_memsearch_qchar): test matching
+	  till the end of string.  [ruby-core:70592] [Bug #11488]
+
+	* test/ruby/test_m17n.rb (test_include?, test_index): add tests by
+	  Tom Stuart.
+
+Wed Sep 30 03:24:29 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* thread_pthread.c (reserve_stack): ensure the memory is really
+	  allocated. [Bug #11457]
+
+Tue Aug 25 01:01:01 2015  Koichi Sasada <ko1@atdot.net>
+
+	* insns.def (defineclass): introduce an ad-hoc patch to avoid
+	  an issue reported on [Bug #10871].
+
+	  This patch does not fix completely. For example, method definition
+	  in a block (like 1.times{def ...; end}) still causes same issue.
+	  To solve all, we need a huge patch and it seems difficult for
+	  stable branch.
+
+	  Use Ruby 2.3 and later to solve this issue completely.
+	  (See [Bug #10943])
+
+Tue Aug 18 22:52:50 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/downloader.rb: support old versions of ruby.
+
+	* tool/downloader.rb: now can download gems by http if openssl is not
+	  available (this may be danger!)
+
+Tue Aug 18 20:10:13 2015  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (Init_Numeric): Fix document for Float::MIN and
+	  Float::EPSILON.
+
+Mon Aug 17 23:07:47 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rubygems.rb: bump version to 2.4.5.1. this version fixed
+	  CVE-2015-3900.
+	* lib/rubygems/remote_fetcher.rb: ditto.
+	* test/rubygems/test_gem_remote_fetcher.rb: added testcase for CVE-2015-3900
+
+Mon Aug 17 23:00:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (API#SetValue): data size should
+	  be in bytes, not in chars.  [ruby-core:70365] [Bug #11439]
+
+Mon Aug 17 23:00:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (API#SetValue): add terminator
+	  size, not 1 byte.  [ruby-core:70365] [Bug #11439]
+
+Sun Aug 16 03:14:04 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_memsearch): should match only char boundaries in wide
+	  character encodings.  [ruby-core:70220] [Bug #11413]
+
+Sun Aug 16 03:00:44 2015  Eric Wong  <e@80x24.org>
+
+	* symbol.h (struct RSymbol): add hashval field
+	* symbol.c (dsymbol_alloc): setup hashval field once
+	* hash.c (rb_any_hash): return RSymbol->hashval directly
+	* common.mk: hash.o depends on symbol.h
+	  Thanks to Bruno Escherl <bruno@escherl.net> for the bug report
+	  [ruby-core:70129] [Bug #11396]
+
+Fri Aug 14 16:30:43 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (rb_econv_set_replacement): target encoding name can
+	  be empty now.  [ruby-core:69841] [Bug #11324]
+
+Fri Aug 14 15:24:12 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_any_hash): fix Float hash.  rb_dbl_hash() returns a
+	  Fixnum, but not a long.  [Bug #9381]
+
+Fri Aug 14 15:09:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/json/parser/parser.rl: raise with messages in UTF-8
+	  encoding.  [ruby-core:67386] [Bug #10705]
+
+Fri Aug 14 00:44:34 2015  Eric Wong  <e@80x24.org>
+
+	* io.c (rb_io_oflags_modestr): handle O_TRUNC correctly
+	* test/ruby/test_io.rb (test_reopen_stdio): new test
+	  Patch-by: cremno phobia <cremno@mail.ru>
+	  [ruby-core:69779] [Bug #11319]
+
+Thu Aug 13 01:25:26 2015  Benoit Daloze  <eregontp@gmail.com>
+
+	* lib/net/ftp.rb (makeport): close the TCPServer
+	  when sending the port fails.
+
+	* test/net/ftp/test_ftp.rb: test for above.
+
+Thu Aug 13 01:03:13 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/net/http/response.rb (Net::HTTPResponse::Inflater#finish):
+	  fix a bug that empty gzipped response body causes Zlib::BufError.
+	  [ruby-core:68846] [Bug #11058]
+
+	* test/net/http/test_httpresponse.rb: tests for the above.
+
+Thu Aug 13 01:03:13 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/net/http/response.rb (Net::HTTPResponse#inflater):
+	  fix TypeError. An exception object might be nil.
+	  [ruby-core:68846] [Bug #11058]
+
+Thu Aug 13 00:03:24 2015  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* .travis.yml: update libssl before running tests. 
+	  Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for figuring out the
+	  travis settings!
+
+Thu Aug 13 00:03:24 2015  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (module OpenSSL): raise a more
+	  helpful exception when verifying the peer connection and an
+	  anonymous cipher has been selected. [ruby-core:68330] [Bug #10910]
+	  Thanks to Chris Sinjakli <chris@sinjakli.co.uk> for the patch.
+
+	* test/openssl/test_ssl.rb (class OpenSSL): test for change
+
+Wed Aug 12 23:57:01 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/date/extconf.rb: try_cflags("-std=iso9899:1999") [Bug #10906]
+	  ruby itself (including numeric.c) is built with strict compile
+	  options including -std=iso9899:1999, but ext/date is not.
+	  By the way -std=iso9899:1999 is not only a warning option but also
+	  changes behavior like MACRO definitions for example INFINITY.
+	  gcc on Solaris affect this.
+
+Wed Aug 12 23:53:39 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (waitpid): return immediately if interrupted.
+	  reported by <takkanm AT gmail.com> [ruby-dev:49176] [Bug #11340]
+
+Wed Aug 12 01:05:58 2015  Jeremy Evans  <merch-redmine@jeremyevans.net>
+
+	* test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised
+	  in OpenSSL tests. [ruby-core:70020][Bug #11368]
+
+Wed Aug 12 00:54:29 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_repeated_permutation): fix buffer size, ALLOCV_N
+	  already multiplies element size.
+
+Tue Aug 11 01:51:53 2015 CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* lib/timeout.rb (ExitException): leave Timeout::ExitException as an
+	  alias of Timeout::Error for backward compatibility in stable branch.
+	  [ruby-dev:49179] [Bug #11344]
+
+Tue Aug 11 01:51:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (ExitException): removed internal exception class
+	  and use Timeout::Error instead, as using throw/catch to isolate
+	  each timeouts now.  [ruby-dev:49179] [Bug #11344]
+
+Tue Aug 11 01:37:28 2015  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* test/net/http/test_httpresponse.rb
+	(HTTPResponseTest#test_read_body_content_encoding_deflate_uppercase):
+	fix a failure without zlib.
+
+Tue Aug 11 01:37:28 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/response.rb (inflater): CONTENT_ENCODING can be upper
+	  case. [ruby-core:69670] [Bug #11285] patched by Andy Chu
+
+Tue Aug 11 01:21:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (m_core_hash_merge_ptr): copy the arguments to the machine
+	  stack before rewinding the control frame pointer and leaving the
+	  arguments outside valid region of the value stack.
+	  [ruby-core:69969] [Bug #11352]
+
+	* vm.c (REWIND_CFP): keep the arguments region inside the valid
+	  value stack.  [ruby-core:69969] [Bug #11352]
+
+Tue Aug 11 01:11:02 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_reverse): reversed string is not a substring,
+	  and should not set coderange of the original string.
+	  [ruby-dev:49189] [Bug #11387]
+
+Tue Aug 11 00:42:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lambda_body): pop cmdarg stack for lookahead
+	  token.  [ruby-core:70067] [Bug #11380]
+
+Tue Aug 11 00:21:56 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/extconf.rb: Solaris 11 has struct tcp_info.tcpi_ca_state,
+	  but it is a dummy.
+
+	* ext/socket/option.c: Solaris 11 doesn't have u_intN_t.
+
+	* ext/socket/option.c: Solaris 11 needs inspect_tcpi_msec.
+
+	* ext/socket/raddrinfo.c: Solaris 11 has AF_PACKET but doesn't have
+	  related macros.
+
+Tue Aug  4 04:11:34 2015  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (strptime): Support %s.%N.
+	  [ruby-core:68301] [Bug #10904] Patch by Sadayuki Furuhashi.
+
+Tue Aug  4 03:43:15 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* transcode.c (load_transcoder_entry): fix transcoder loading race
+	  condition, by waiting in require.  [ruby-dev:49106] [Bug #11277]
+
+Tue Aug  4 03:13:59 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_ensure_room_for_push): check if array size will
+	  exceed maximum size to get rid of buffer overflow.
+	  [ruby-dev:49043] [Bug #11235]
+
+	* array.c (ary_ensure_room_for_unshift, rb_ary_splice): ditto.
+
+Sat Jul  4 23:08:32 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_load_ok): try opening file without gvl not to
+	  lock entire process.  [Bug #11060]
+
+Sat Jul  4 05:00:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (pkg_config): split --libs if --libs-only-l option
+	  is not available.  patch in [ruby-core:69428] by Hans Mackowiak.
+	  [ruby-core:69421] [Bug #11201]
+
+Sat Jul  4 04:46:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): out of range NTH_REF is always
+	  nil.
+
+	* parse.y (parse_numvar): check overflow of NTH_REF and range.
+	  [ruby-core:69393] [Bug #11192]
+
+	* util.c (ruby_scan_digits): make public and add length parameter.
+
+Sat Jul  4 04:35:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_method_call_status): resolve refined method entry
+	  to check if undefined.  [ruby-core:69064] [Bug #11117]
+
+Sat Jul  4 04:35:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_method_call_status): undefined refined method is
+	  not callable unless using.  [ruby-core:69064] [Bug #11117]
+
+Wed Jul  1 04:16:56 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/bigdecimal/bigdecimal.gemspec: Fix require paths for released gem.
+	  [fix GH-929] Patch by @voxik
+	* ext/io/console/io-console.gemspec: ditto.
+
+Wed Jul  1 04:15:38 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/zlib/zlib.c: Fix indentation for rdoc.
+	  [Bug #11221][ruby-core:69465]
+
+Sat Jun 27 22:51:59 2015  Shota Fukumori  <her@sorah.jp>
+
+	* ext/objspace/objspace_dump.c(dump_object): Return empty JSON object when
+	  passed object is a special const, instead of SEGV.
+	  Based patch by Kohei Suzuki (eagletmt). [ruby-core:69692] [Bug #11291]
+
+	* test/objspace/test_objspace.rb(test_dump_special_consts): Test for above fix.
+
+
+Wed Jun 17 02:53:59 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* test/objspace/test_objspace.rb (test_dump_flags): relax pattern
+	  because long_lived flag and marked flag can be false at major GC.
+	  [Bug #10852]
+
+Mon Jun 15 03:24:23 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_insnhelper.c (lep_svar_set): add WBs.
+
+Fri Jun 12 01:39:49 2015  Eric Wong  <e@80x24.org>
+
+	* ext/socket/ancdata.c: use RB_GC_GUARD instead of volatile
+	  [ruby-core:69419] [Feature #11198]
+
+Fri Jun 12 01:16:13 2015  Eric Wong  <e@80x24.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_traverse, ossl_asn1_decode,
+	  ossl_asn1_decode_all): use RB_GC_GUARD instead of volatile
+	  [ruby-core:69371] [Bug #11185]
+
+Fri Jun 12 01:14:00 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* win32/win32.c (setup_overlapped): seek to the file end only when
+	  writing (mode:a), not reading (mode:a+, read).
+
+Fri Jun 12 01:11:52 2015  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* load.c (loaded_feature_path): stop returning false negatives for
+	  filenames which are trailing substrings of file extensions.  For
+	  example, 'b', which a trailing substring of ".rb" should not return
+	  false. [Bug #11155][ruby-core:69206]
+
+	* test/ruby/test_autoload.rb: test for fix
+
+Sun May 24 03:56:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (r_symreal): register symbol names as strings first so
+	  that r_symlink always returns valid names.
+	  [ruby-core:68587] [Bug #10991]
+
+	* marshal.c (r_ivar, r_object0): now need to intern symbol names.
+
+	* marshal.c (r_object0): compare with symbol names.
+
+Sun May 24 03:53:07 2015  Eric Wong  <e@80x24.org>
+
+	* ext/socket/ancdata.c (bsock_recvmsg_internal): GC guard
+	  [Bug #11123]
+
+Sun May 24 03:44:42 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* range.c (linear_object_p, range_include): test if covered for
+	  linear objects.  [ruby-core:69052] [Bug #11113]
+
+Sun May 24 03:41:45 2015  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (body_ext_mpart): should work even if body-fld-dsp
+	  is omitted.  [ruby-core:69093] [Bug #11128]
+
+Sun May 24 03:37:14 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* string.c: added documentation for character sequence \' with String#sub
+	  [Bug #11132][ruby-core:69121][fix GH-900][ci skip] Patch by @shishir127
+
+Sun May 24 03:32:53 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* rational.c: Added documentation for rational literal.
+	  [Bug #11075][fix GH-885][ci skip] Patch by @shishir127
+
+Sun May 24 03:06:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/ipsocket.c (init_inetsock_internal): preserve errno
+	  before other library calls and use rb_syserr_fail.
+	  [ruby-core:68531] [Bug #10975]
+
+Sun May 24 03:01:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/-test-/printf/printf.c (uint_to_str): renamed to get rid of
+	  conflict on cygwin.  [ruby-core:68877] [Bug #11065]
+
+Sun May 24 02:44:53 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (vm_exec): check other events when RETURN is thrown.
+	  [Bug #10724]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Sun May 24 02:21:47 2015  Masahiro Tomita  <tommy@tmtm.org>
+
+	* ext/socket/raddrinfo.c (addrinfo_mload): fix memory leak of
+	  addrinfo.  [ruby-dev:48923] [Bug #11051]
+
+Sun May 24 02:17:05 2015  Kenta Murata  <mrkn@cookpad.com>
+
+	* bigdecimal: conform to ruby's license.  [ruby-core:68466] [Bug #10952]
+
+Sun May 24 02:06:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/-test-/file/fs.c (get_fsname): try magic number only if
+	  f_type is included.  [ruby-dev:48913] [Bug #11000]
+
+Sun May 24 02:06:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/-test-/file/fs.c (get_fsname): return filesystem name by
+	  statfs/statvfs.  [ruby-core:68624] [Bug #10998]
+
+Sun May 24 02:02:00 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_symbol.rb: fix syntax error.
+
+Sun May 24 02:02:00 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_any_hash): Symbols are compared by the identities
+	  always.  [ruby-core:68767] [Bug #11035]
+
+Sun May 24 02:01:07 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_any_hash): use same hash values with Float#hash so
+	  that -0.0 and +0.0 will be identical.
+	  [ruby-core:68541] [Bug #10979]
+
+Thu May 21 01:34:48 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (id2ref): prohibit from accessing internal objects.
+	  [ruby-core:68348] [Bug #10918]
+
+Thu May 21 01:32:02 2015  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* ext/pty/pty.c: AIX supports autopush.
+	  Patch by Perry Smith [ruby-core:58539] [Bug #9144]
+
+Thu May 21 01:07:41 2015  Misumi Rize  <r@ayase-e.li>
+
+	* vm_insnhelper.c (vm_throw_start): search the target to break
+	  from a block with nested rescue, from the nested blocks.
+	  [ruby-core:67765] [Bug #10775] [Fix GH-820]
+
+Thu May 21 00:55:45 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_args.c: protect value stack from calling other methods
+	  during complex parameter setting process (splat, kw, and so on).
+	  [Bug #11027]
+
+	* vm_core.h: remove rb_thead_t::mark_stack_len.
+	  With this modification, we don't need to use th->mark_stack_len.
+
+	* test/ruby/test_keyword.rb: add a test.
+
+	* cont.c (cont_capture): catch up this fix.
+
+	* vm.c (rb_thread_mark): ditto.
+
+Thu May 21 00:07:54 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_obj_instance_eval, rb_obj_instance_exec): allow
+	  symbols to just instance_eval/exec, except for definition of
+	  singletons.  [ruby-core:68961] [Bug #11086]
+
+Wed May 20 04:33:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (STR_SET_EMBED): clear NOFREE flag at embedding as
+	  embedded strings no longer refer static strings.
+	  [ruby-core:68436] [Bug #10942]
+
+Wed May 20 03:46:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (need_normalization): use getattrlist() if fgetattrlist()
+	  is unavailable, on OSX 10.5.  [ruby-core:68829] [Bug #11054]
+
+Wed May 20 03:25:34 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (proc_binding): replicate env from method object, and
+	  allocate the local variable area for the iseq local table.
+	  [ruby-core:68673] [Bug #11012]
+
+Wed May 20 03:25:34 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* proc.c: use RUBY_VM_IFUNC_P() to recognize IFUNC or not.
+
+	* vm.c: ditto.
+
+	* vm_dump.c: ditto.
+
+	* vm_insnhelper.c: ditto.
+
+	* vm_core.h: use RB_TYPE_P() instead of BUILTIN_TYPE().
+
+Wed May 20 03:10:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* benchmark/bm_hash_aref_flo.rb: make more realistic data.
+	  [ruby-core:68632] [[Bug #10999]
+
+Wed May 20 02:49:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (respond_to_missing_p): check if the receiver responds to
+	  the given method by respond_to_missing?.
+
+	* proc.c (mnew_missing): create Method object for method_missing.
+	  [ruby-core:68564] [Bug #10985]
+
+Wed May 20 02:16:05 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c (replace_real_basename): need to check the return value of
+	  GLOB_REALLOC().
+
+Wed May 20 02:16:05 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* dir.c (replace_real_basename): shouldn't create Ruby object before
+	  the object system is loaded.
+	  [ruby-core:68430] [Bug #10941]
+
+Wed May 20 01:58:12 2015  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS::Label::Str#==): Check class equality.
+	  (Resolv::DNS::Name#initialize): Normalize labels as
+	  Resolv::DNS::Label::Str objects.
+
+Wed May 20 01:47:23 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_iseq_compile_with_option): check source type, must be
+	  an IO or a String.  [ruby-core:69219] [Bug #11159]
+
+Fri May 15 05:01:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbol.c (Init_sym): make dsym_fstrs a hash compared by identity
+	  as the keys are unique fstrings, to get rid of running hash and
+	  compare methods and causing new object allocation during garbage
+	  collection phase.  [ruby-dev:48891] [Bug #10933]
+
+Thu May 14 00:50:40 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lambda): push and reset cmdarg_stack in lambda body.
+	  [ruby-core:69017] [Bug #11107]
+
+Thu May 14 00:39:29 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dln.c (dln_load): check if a different libruby is loaded by the
+	  extension library, and then bail out to get rid of very frequent
+	  reported stale bug reports.
+
+Thu May 14 00:29:44 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils#mv): show the exact target path in
+	  the error message instead of the destination parent directory
+	  name.  patched by Joao Britto <jabcalves AT gmail.com> at
+	  [ruby-core:68706].  [Bug #11021]
+
+Thu May 14 00:19:04 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread_pthread.c (reserve_stack): keep sp safe zone to get rid
+	  of crash by -fstack-check.  [ruby-core:68740] [Bug #11030]
+
+Tue Apr 14 23:33:39 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: check also procstat_getvmmap, which is not
+	  available on FreeBSD 9.  [ruby-core:68468] [Bug #10954]
+
+	* vm_dump.c (procstat_vm): use kinfo_getvmmap instead if
+	  procstat_getvmmap is not available.
+
+Mon Apr 13 22:11:21 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/ssl.rb: stricter hostname verification
+	  following RFC 6125. with the patch provided by Tony Arcieri and
+	  Hiroshi Nakamura [ruby-core:61545] [Bug #9644]
+	* test/openssl/test_ssl.rb: add tests for above.
+
+Mon Apr 13 13:03:33 2015  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* lib/securerandom.rb: skip Win32 libraries in SecureRandom if
+	  OpenSSL::Random is available.
+	  https://github.com/ruby/ruby/pull/848 [Bug #10948] [Bug #10995]
+
+Mon Apr 13 00:49:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (arg): fix segfault by null caused by syntax error.
+	  [ruby-core:68851] [Bug #10957]
+
+Mon Apr 13 00:49:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): empty parentheses at cmdarg can be null.
+	  [ruby-core:68477] [Bug #10957]
+
+Mon Apr 13 00:44:12 2015  Eric Wong  <e@80x24.org>
+
+	* ext/io/wait/wait.c (io_nread): wrap return value with INT2FIX
+	  Thanks to Yura Sokolov <funny.falcon@gmail.com>
+	  [ruby-core:68369] [Bug#10923]
+	* test/io/wait/test_io_wait.rb (test_nread_buffered):
+	  fix broken test
+
+Mon Apr 13 00:16:32 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (vm_call_super): search next super class from the
+	  original class, to get rid of infinite recursion with
+	  prepending.  a patch by Seiei Higa <hanachin AT gmail.com> at
+	  [ruby-core:68434].  [ruby-core:68093] [Bug #10847]
+
+Mon Apr 13 00:09:48 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c (rb_prepend_module): need a WB for klass -> origin.
+
+Sun Apr 12 23:53:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/extconf.rb: needs --enable-shared when linked to
+	  libruby or fiddle.so.  since --with-static-linked-ext does no
+	  longer link extensions to ruby program with --enable-shared, the
+	  only combination needs --enable-static is --disable-shared and
+	  --with-static-linked-ext.  [ruby-dev:48901] [Bug #10960]
+
+Sun Apr 12 23:53:33 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/extconf.rb: make PIC objects if it will be linked as
+	  a shared object eventually.  [ruby-core:67128]
+
+Sun Mar 22 12:39:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* spec/default.mspec: use default configuration file name.
+	  https://github.com/ruby/rubyspec/commit/cc69f337b06362e5607ffa3e3ad40ef7494960cf
+
+Sun Mar 22 12:39:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* spec/default.mspec: remove specific version number.
+	  https://github.com/ruby/rubyspec/commit/7a909e925c1baa9c700bd44af9241aef6e596714
+
+Sun Mar 22 12:39:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* common.mk: use ruby organization for rubyspec.
+
+Thu Feb 26 15:48:41 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/win32/Win32API.rb (initialize): accept both a string and an array
+	  for the arguments of the imported function.
+	  reported by Aaron Stone [ruby-core:68208] [Bug #10876] [Fixes GH-835]
+
+Wed Feb 25 15:36:26 2015  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: support 2.1+ versioning scheme.
+
+Tue Feb 24 17:41:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_zone_name): should be US-ASCII only if all 7-bits,
+	  otherwise locale encoding.  [ruby-core:68230] [Bug #10887]
+
+Tue Feb 24 17:41:27 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_zone_name): should be US-ASCII only if all 7-bits,
+	  otherwise locale encoding.  [ruby-core:68230] [Bug #10887]
+
+Tue Feb 24 17:41:27 2015  Benoit Daloze  <eregontp@gmail.com>
+
+	* time.c: Zone encoding should be US-ASCII if all 7-bits. Fix r46907.
+
+	* test/ruby/test_time.rb, test/ruby/test_time_tz.rb: Update tests.
+
+Tue Feb 24 16:37:26 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (chompped_length): enable smart chomp for all non-dummy
+	  encoding strings, not only default_rs.
+	  [ruby-core:68258] [Bug #10893]
+
+Tue Feb 24 16:31:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_split_m): raise ArgumentError at broken string
+	  not RegexpError, as Regexp is not involved in.
+	  [ruby-core:68229] [Bug #10886]
+
+Tue Feb 24 14:00:46 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_call_finalizer): control GC execution during
+	  force firnalizations at the end of interpreter process.
+	  [Bug #10768]
+
+	  1) Prohibit incremental GC while running Ruby-level finalizers
+	     to avoid any danger.
+	  2) Prohibit GC while invoking T_DATA/T_FILE data structure
+	     because these operations break object relations consistency.
+
+	  This patch can introduce another memory consuming issue because
+	  Ruby-level finalizers can run after (2), GC is disabled.
+	  However, basically object consistency was broken at (2) as I
+	  described above. So that running Ruby-level finalizers contains
+	  danger originally. Because of this point, I need to suggest to
+	  remove these 3 lines (invoking remaining finalizers). And add a
+	  rule to add that finalizers should not add new finalizers, or
+	  say there is no guarantee to invoke finalizers that added by
+	  another finalizer.
+
+Tue Feb 24 14:00:46 2015  Aman Gupta <ruby@tmm1.net>
+
+	* gc.c (rb_objspace_free): cause rb_bug if lazy sweep is in progress
+	  during rb_objspace_free. Adds extra protection for r46340.
+	  Patch by Vicent Marti. [Bug #10768] [ruby-core:67734]
+	* gc.c (rb_objspace_call_finalizer): Ensure GC is completed after
+	  finalizers have run. We already call gc_rest() before invoking
+	  finalizers, but finalizer can allocate new objects and start new GC
+	  cycle, so we call gc_rest() again after finalizers are complete.
+
+Tue Feb 24 10:30:59 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_insnhelper.c (rb_vm_rewrite_cref_stack): copy nd_refinements
+	  of original crefs. It fixes segmentation fault when calling
+	  refined method in duplicate module. [ruby-dev:48878] [Bug #10885]
+
+	* vm_core.h, class.c: change accordingly.
+
+	* test/ruby/test_refinement.rb: add a test for above.
+
+Sun Feb 22 21:20:37 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (match_aref): RMatch::regexp is Qnil after matching by a
+	  string since r45451.  [ruby-core:68209] [Bug #10877]
+
+Sun Feb 22 17:11:25 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* Makefile.in (probes.stamp): rebuild dtrace dependent objects
+	  only when `dtrace -G` modifies its input files.
+
+Sun Feb 22 17:11:25 2015  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* common.mk (ruby-glommed.o): dependency on $(OBJ) should be written
+	  in common.mk (in which OBJ is defined) because of Makefile include
+	  and parse order. This partly reverts r49419.
+	  [ruby-dev:48849] [Bug #10808]
+
+	* Makefile.in (ruby-glommed.o): ditto.
+
+	* Makefile.in (ruby-glommed.o): remove excess $(DTRACE_OBJ) because
+	  it is included in $(OBJS) since r49451.
+
+	* Makefile.in (probes.o): should depend on $(DTRACE_DEPENDENT_OBJS)
+
+Sun Feb 22 02:16:40 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_identical_p): fix handle leak, ensure to close
+	  the handle of the first argument.
+
+Sat Feb 21 13:48:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (different_device_p): compare by volume serial
+	  numbers, not by path names.  [ruby-core:68162] [Bug #10865]
+
+Sat Feb 21 13:48:11 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (wrename): return EXDEV if moving a directory to
+	  another drive, since MoveFileExW does not set proper error code.
+	  [ruby-core:68162] [Bug #10865]
+
+Sat Feb 21 12:46:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/file.c (rb_file_expand_path_internal): neither the drive
+	  of base directory nor the current drive are involved in the
+	  result if different than the drive of path.
+	  [ruby-core:68130] [Bug #10858]
+
+Sat Feb 21 12:46:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/file.c (rb_file_expand_path_internal): do not make invalid
+	  (or ADS) path if the path has a drive letter, the result also
+	  should have be under it.  [ruby-core:68130] [Bug #10858]
+
+Sat Feb 21 12:45:54 2015  Matt Hoyle  <matt@deployable.co>
+
+	* ext/bigdecimal/bigdecimal.c (VpSetPTR): fix a typo, 'expoennt'
+	  to 'exponent'.  [ruby-core:67980] [Bug #10823] [Fix GH-825]
+
+Fri Feb 20 17:47:20 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_core.h (rb_call_info_kw_arg_struct): make keywords a symbols
+	  list to get rid of inadvertent creation by variable keyword
+	  arguments.  [ruby-core:68031] [Bug #10831]
+
+Fri Feb 20 15:08:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (has_magic): always get long path name on Windows even if
+	  no tilde is there.  [ruby-core:68011] [Bug #10819]
+
+	* dir.c (replace_real_basename): FindFirstFile ignore redirection
+	  character, check if exists before call it.  cf. [Bug #8597]
+
+Fri Feb 20 15:08:17 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): obtain real name with FindFirstFile API
+	  instead of matchin all entries, on Windows.
+	  [ruby-core:67954] [Bug #10819]
+
+Fri Feb 20 14:32:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_initialize): workaround of opendir failure at symlink
+	  directories on Windows via CIFS.
+
+Thu Feb 19 17:05:47 2015  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* class.c (rb_obj_singleton_methods): should use RTEST() to convert
+	  VALUE to int.
+
+Thu Feb 19 16:14:04 2015  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* class.c (method_entry_i, class_instance_method_list,
+	  rb_obj_singleton_methods): should not include methods of
+	  superclasses if recur is false. [ruby-dev:48854] [Bug #10826]
+
+Thu Feb 19 16:14:04 2015  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_method.c (remove_method): When remove refined
+	  method, raise a NameError if the method is not
+	  defined in refined class.
+
+	  But if the method is defined in refined class,
+	  it should keep refined method and remove original
+	  method.
+
+	  Patch by Seiei Higa. [ruby-core:67722] [Bug #10765]
+
+Thu Feb 19 16:07:03 2015  Seiei Higa  <hanachin@gmail.com>
+
+	* proc.c (rb_obj_singleton_method): Kernel#singleton_method should
+	  not use refinements, as well as Kernel#method.
+	  [ruby-core:67603] [Bug #10744]
+
+Thu Feb 19 15:32:26 2015  Dave Stevens  <dave@crowdlab.com>
+
+	* string.c (str_make_independent_expand): terminate String when
+	  moved from heap to embedded.  [Fix GH-821].
+
+Thu Feb 19 13:35:21 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/sdbm/_sdbm.c: include ruby/ruby.h for PRIdPTRDIFF when a
+	  macro `DEBUG` is defined.  based on the patch by Owen Rodley in
+	  [ruby-core:67987]. [Bug #10825]
+
+Tue Feb 17 18:57:13 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements
+	  returned by Kernel#instance_variables are Symbols now.
+	  [ruby-core:68128] [Bug #10857]
+
+Tue Feb 17 15:39:01 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API): use wide
+	  versions of RegDeleteValue and RegDeleteKey.
+	  [ruby-core:67958] [Bug #10820]
+
+Tue Feb 17 11:50:06 2015  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* string.c (str_discard): does not free for STR_NOFREE string.
+	  [Bug #10853][ruby-core:68110]
+
+	* bootstraptest/test_string.rb: test for above.
+
+Sun Feb 15 13:15:46 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/getaddrinfo.c (get_addr): reject too long hostname to
+	  get rid of GHOST vulnerability on very old platforms.
+
+	* ext/socket/raddrinfo.c (make_hostent_internal): ditto, paranoic
+	  check for the canonnical name.
+
+Sat Feb 14 13:27:41 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (send_internal), vm_insnhelper.c (vm_call_opt_send):
+	  convert String method name into a Symbol, as method_missing
+	  method expects its first argument to be a Symbol.  [Bug #10828]
+
+	* vm_insnhelper.c (ci_missing_reason): return the reason of method
+	  missing in call info.
+
+	* vm_insnhelper.c (vm_call_opt_send): re-apply r49500 with the
+	  proper missing reason.  [Bug #10828]
+
+Sat Feb 14 13:27:41 2015  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* vm_insnhelper.c: Fix symbol leak with +send+ [Bug #10828]
+
+Sat Feb 14 08:53:50 2015  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* class.c (method_entry_i, class_instance_method_list,
+	  rb_obj_singleton_methods): should not include methods of
+	  superclasses if recur is false. [ruby-dev:48854] [Bug #10826]
+
+Fri Feb 13 13:59:56 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of
+	  interference by modifying global variables in have_devel? method.
+	  [ruby-core:67962] [Bug #10821]
+
+Fri Feb 13 03:13:05 2015  Scott Francis  <scott.francis@shopify.com>
+
+	* thread_pthread.c (reserve_stack): fix intermittent SIGBUS on
+	  Linux, by reserving the stack virtual address space at process
+	  start up so that it will not clash with the heap space.
+	  [Fix GH-822]
+
+Fri Feb  6 12:05:13 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* thread.c: Improve documentation for Thread#value
+	  [Bug #10694][ruby-core:67324][ci skip]
+
+Fri Feb  6 12:02:05 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/win32/libffi.mk.tmpl: assemble without directory prefix.
+	  workaround of a bug of VC12 ml, by unak at [ruby-core:67792].
+	  [ruby-core:67789] [Bug #10780]
+
+Fri Feb  6 01:03:38 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object, marshal_dump): use indetity tables for
+	  arbitrary VALUE keys, because of performance of FLONUM.
+	  [Bug #10761]
+
+	* marshal.c (obj_alloc_by_klass, marshal_load): ditto.
+
+Fri Feb  6 01:03:38 2015  Eric Wong  <e@80x24.org>
+
+	* benchmark/bm_marshal_dump_flo.rb: new benchmark for [Bug #10761]
+
+Fri Feb  6 01:03:38 2015  Eric Wong  <e@80x24.org>
+
+	* st.c (st_numhash): mix float value for flonum
+	* hash.c (rb_any_hash): ditto
+	* benchmark/bm_hash_aref_flo.rb: new benchmark
+	* benchmark/bm_hash_ident_flo.rb: ditto
+	  [Bug #10761]
+
+Thu Feb  5 16:30:09 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (gettable_gen): disable warnings of possible reference
+	  to a local variable defined in a past scope.
+	  [ruby-core:67162] [Bug #10661]
+
+Mon Jan 26 15:35:16 2015  Seiei Higa  <hanachin@gmail.com>
+
+	* vm_method.c (check_definition): Module#public_method_defined?,
+	  Module#private_method_defined?, Module#protected_method_defined?
+	  should not use refinements. [ruby-core:67656] [Bug #10753]
+
+Thu Jan 22 11:47:31 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* doc/syntax/literals.rdoc (Symbols): now Symbols created by
+	  interpolation can be garbage collected.  patch by Yihang Ho in
+	  [ruby-core:67194].  [Bug #10671]
+
+Thu Jan 22 11:45:32 2015  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* eval_intern.h, vm.c, vm_eval.c, vm_insnhelper.c:
+	  change throw mechanism (not save target ep, but save target cfp).
+	  It fixes `unexpected break' bug that occurs when
+	  TracePoint#binding is called.
+	  [ruby-dev:48797] [Bug #10689]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Tue Jan 20 14:05:08 2015  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): avoid SEGV when VT_RECORD
+	  variable is passed by reference. [ruby-dev:48803] [Bug #10697] 
+
+Mon Jan 19 15:45:33 2015  Seiei Higa  <hanachin@gmail.com>
+
+	* vm_method.c (rb_method_entry): if no super class, no original
+	  method entry.  [ruby-core:67389] [Bug #10707]
+
+Mon Jan 19 12:03:59 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): check by configured result instead
+	  of system name for old FreeBSD.  based on a patch by Steve Wills
+	  at [ruby-core:67655].  [Bug #10752]
+
+Mon Jan 19 12:00:51 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: get rid of pattern substitution, which is not
+	  supported by ash, and ash on NetBSD parses whole source first
+	  and fails to start.  [ruby-dev:48823] [Bug #10750]
+
+Mon Jan 19 11:57:14 2015  Vit Ondruch  <vondruch@redhat.com>
+
+	* configure.in (RUBY_SETJMP_TYPE): Remove superfluous semicolon
+	  which causes a syntax error with autoconf 2.63.
+	  [ruby-core:67429] [Bug #10716]
+
+Mon Jan 19 11:44:52 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rdoc/text.rb (expand_tabs): get rid of infinite loop with
+	  CR.  should check if substitution occurred too.
+	  [ruby-dev:48813] [Bug #10732]
+
+Sun Jan 18 00:59:41 2015  Eric Wong  <e@80x24.org>
+
+	* numeric.c (bit_coerce): use original value for error message
+	  [ruby-core:67405] [Bug #10711]
+	* test/ruby/test_numeric.rb (test_coerce): check error message
+
+Sun Jan 18 00:53:38 2015  Seiei Higa  <hanachin@gmail.com>
+
+	* vm_method.c (rb_alias): raise a NameError when creating alias to
+	  a refined method if the original method of the refined method is
+	  not defined.  [ruby-core:67523] [Bug #10731]
+
+Sat Jan 17 22:25:50 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (need_normalization): not only HFS+, CIFS (SMB) is also
+	  decomposed.  [Bug #10704]
+
+	* dir.c (NORMALIZE_UTF8PATH): Unicode decomposition seems to
+	  perform in an upper layer than file systems on OSX, as all path
+	  names are always decomposed regardless of file system types.
+
+Sat Jan 17 17:56:45 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assocs, assoc): eliminate splatting empty literal
+	  hashes.  [ruby-core:67446] [Bug #10719]
+
+	* compile.c (compile_array_): supprt splatted hash in hash type.
+
+Sat Jan 17 16:49:49 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/readline.c (readline_s_refresh_line): initialize
+	  before rl_refresh_line(), as some function make the internal
+	  state non-clean but rl_refresh_line() does not re-initialize it.
+	  [ruby-core:43957] [Bug #6232]
+
+Sat Jan 17 16:47:20 2015  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval_error.c (error_print): pos and len parameters of rb_str_substr()
+	  are counted by characters, not bytes.  use rb_str_subseq() instead.
+	  [Bug #10727] [ruby-core:67473]
+
+Sat Jan 17 16:35:59 2015  Seiei Higa  <hanachin@gmail.com>
+
+	* vm_method.c (rb_export_method): bail out if the original method
+	  is undefined when the method is refined.
+	  [ruby-core:67387] [Bug #10706]
+
+Sat Jan 17 16:16:14 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): match in case-folding only if the directory
+	  resides on a case-insensitve file system, on OSX.
+	  [ruby-core:67364] [Bug #10700]
+
+Sat Jan 17 02:04:01 2015  Eric Wong  <e@80x24.org>
+
+	* lib/resolv.rb: consider ENETUNREACH as ResolvTimeout
+	  [ruby-core:67411] [Bug #10712]
+
+Sat Jan 17 01:57:57 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/zlib/zlib.c: fix document of method signatures.
+	  [Bug #10668][ruby-core:67186][ci skip]
+
+Sat Jan 17 01:52:42 2015  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (timelocalw): Set tm_isdst field -1 if vtm->isdst is
+	  VTM_ISDST_INITVAL.  This bug is introduced at packing struct
+	  vtm (r45155).
+	  [ruby-core:67345] [Bug #10698] Reported by Boris Ruf.
+
+Fri Jan 16 21:17:34 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_io.rb: added timeout for AIX environment.
+	  [ruby-core:62983][Bug #9917]
+
+Fri Jan 16 18:25:57 2015  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (Resolv::DNS::Name#==): Compare an array of Label:Str
+	  objects.  Label#Str#== is case-insensitive.
+
+Fri Jan 16 18:25:57 2015  Ben Miller  <bmiller@rackspace.com>
+
+	* lib/resolv.rb (Resolv::DNS::Name#==): DNS is case-insensitive, so the
+	  comparison should be case-insensitive as well.
+	  [ruby-core:66498] [Bug #10550]
+
+Fri Jan 16 18:25:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::DNS::Name): names with different dots
+	  should be different.
+
+Fri Jan 16 17:34:57 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_label): return tLABEL value as it is.
+	  [ruby-core:67315] [Bug #10693]
+
+Fri Jan 16 16:49:04 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/net/http.rb (Net::HTTP#send_request): there is no response body
+	  with HEAD request. Patch by @rodrigosaito [fix GH-520]
+
+Fri Jan 16 16:49:04 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/net/http/test_http.rb (_test_send_request__HEAD): Added
+	  failing test for send_request with HEAD method.
+
+Fri Jan 16 14:56:08 2015  Eric Wong  <e@80x24.org>
+
+	* symbol.c (rb_gc_free_dsymbol): delete from global fstr hash
+	* test/ruby/test_symbol.rb (test_symbol_fstr_leak): test for bug
+	  [ruby-core:67268] [Bug #10686]
+
+Fri Jan 16 14:20:52 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_args.c (keyword_hash_p): fix non-symbol keys hash.
+	  rb_extract_keywords() returns 0 not Qnil when no symbol keys is
+	  included.
+
+Fri Jan 16 11:06:17 2015  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/unicode_normalize.rb: typo fix. [ci skip]
+	  [ruby-dev:48794][misc #10675]
+	  included.  [ruby-core:67264] [Bug #10685]
+Fri Jan 16 11:04:35 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (unescape_nonascii): append excape sequence as-is not
+	  unescaped character, to get rid of unexpected meta-character.
+	  [ruby-core:67193] [Bug #10670]
+
+Sat Jan  3 21:17:58 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (rb_thread_variable_get): fix dynamic symbol keys.
+	  rb_check_id() returns non-zero only for static symbols, whereas
+	  thread local variable keys can be dynamic symbols.
+	  [ruby-core:67185] [Bug #10667]
+
+Thu Jan  1 08:29:55 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cygwin/GNUmakefile.in (EXTOBJS): override to add resource files
+	  always.  [ruby-core:67153] [Bug #10657]
+
+Wed Dec 31 15:26:46 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_kwrest, new_args_tail_gen): unnamed rest keyword and
+	  keywords bits arguments should be unique.  since internal IDs
+	  depend on the local variable index in the current scope, new ID
+	  should be made before popping those vtables.
+	  [ruby-core:67157] [Bug #10659]
+
+Wed Dec 31 14:11:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/tk/lib/tkextlib/tcllib/plotchart.rb: fix to invoke correct function
+	  of tcllib. Patch by @zalt50 [fix GH-787]
+
+Wed Dec 31 13:26:22 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_vm_living_threads_insert): preserve order
+	  [Bug #10660] [ruby-core:67154] [ruby-core:67159]
+
+Fri Dec 26 15:42:27 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/rbinstall.rb: skip installing bundle gems if zlib is unavailable.
+	  [Bug #10647] [ruby-dev:48787]
+
+Thu Dec 25 17:42:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (console_dev): send the given arguments
+	  to the opened console.  as a special case, do nothing if :close
+	  is given.
+
+	* test/lib/leakchecker.rb (LeakChecker#check_fd_leak): close if
+	  console.
+
+Thu Dec 25 17:37:47 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* gc.c (wmap_final_func): fix memory size shortage when realloc wmap.
+	  Fix SEGV during finilize of WeakRef on Solaris (though the SEGV
+	  could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646]
+
+Thu Dec 25 17:31:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (NET_LUID): include winsock2.h instead of windows.h.
+	  patch by Jon Forums in [ruby-core:67125].  [Bug #10640]
+
+Thu Dec 25 16:01:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (rb_file_expand_path_internal): drop characters ignored
+	  by filesystem on Mac OS X.
+
+Thu Dec 25 15:36:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (replace_real_basename): get the real name and replace the
+	  base name with it by getattrlist(2) if available.
+	  suggested by Matthew Draper at [ruby-core:67116].  [Bug #10015]
+
+	* dir.c (glob_helper): get the real name of the whole path, not
+	  only the last name.
+
+Thu Dec 25 13:59:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (NET_LUID): include also ifdef.h as a workaround of
+	  a bug in mingw-w64 header.  [ruby-core:67103] [Bug #10640]
+
+Thu Dec 25 12:47:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (gettable_gen): warn possible reference to a local
+	  variable defined in a past scope.
+
+Thu Dec 25 10:09:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (console_dev): id_console is not a
+	  constant name, use rb_const_remove() to get rid of NameError.
+
+Thu Dec 25 09:18:55 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/resolv/test_dns.rb (TestResolvDNS#test_query_ipv4_address):
+	  set timeout for recvfrom because if client thread is crashed, it
+	  waits infinity.
+
+Thu Dec 25 08:42:11 2014  Eric Wong  <e@80x24.org>
+
+	* lib/uri/generic.rb (split_userinfo): fstring for 1-byte split
+	  (set_port): reduce bytecode size
+	  (check_path): reduce garbage via opt_str_freeze
+	  (query=): ditto
+	  (fragment=): ditto
+	  [misc #10628]
+	* lib/uri/rfc3986_parser.rb (regexp): cache as attr
+	  (initialize): setup and freeze regexp attr once
+	  (split): reduce bytecode size, use opt_str_freeze
+	  (parse): minor bytecode and garbage reduction
+	  (default_regexp): rename for initialize
+
+Wed Dec 24 20:38:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_make_pattern): restrict searching case-insensitive
+	  name from the filesystem to only last part, for the performance.
+	  [ruby-core:63591] [Bug #10015]
+
+Wed Dec 24 18:21:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove unused rb_objspace_t::rgengc::old_objects_at_gc_start.
+
+Wed Dec 24 13:25:22 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/redmine-backporter.rb: require view_changesets permission.
+
+Wed Dec 24 13:00:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/downloader.rb (Downloader.download): fix the exception to
+	  re-raise.  initialize methods of subclasses of Exception may
+	  have different parameters.  [ruby-core:67086] [Bug #10639]
+
+Wed Dec 24 12:16:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.h (rb_data_type_t): revert r48647 and revise parent member.
+	  [ruby-core:66969] [Bug #10621]
+
+Wed Dec 24 05:40:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/downloader.rb: use config.guess in gcc repo.
+
+Wed Dec 24 11:50:19 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* hash.c (rb_hash_delete): return Qnil if there are no corresponding
+	  entry. [Bug #10623]
+
+	* hash.c (rb_hash_delete_entry): try delete and return Qundef if there
+	  are no corresponding entry.
+
+	* internal.h: add rb_hash_delete_entry()'s declaration.
+
+	* symbol.c: use rb_hash_delete_entry().
+
+	* thread.c: use rb_hash_delete_entry().
+
+	* ext/-test-/hash/delete.c: use rb_hash_delete_entry().
+
+Wed Dec 24 09:35:11 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/fiddle/extconf.rb: remove ffitarget.h generated by configure on
+	  mswin, because it's not normal file (cygwin's symlink) and have
+	  system attribute.
+
+Wed Dec 24 05:40:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/downloader.rb: support ruby 1.8.
+
+Wed Dec 24 02:44:06 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/response.rb (Net::HTTPResponse): require one or more
+	  spaces [Bug #10591].
+	  by leriksen <leif.eriksen.au@gmail.com>
+	  https://github.com/ruby/ruby/pull/782 fix GH-782
+	  NOTE: graph.facebook.com returns without SP Reason-Phrase.
+
+Wed Dec 24 02:12:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/make-snapshot (package): VCS#branch_list expects glob a
+	  pattern string but not a regexp.  based on the patch by Vit
+	  Ondruch.  in [ruby-core:67064].  [Bug #10636]
+
+	* tool/vcs.rb (VCS::SVN#branch_list): strip newlines.
+
+	* tool/vcs.rb (VCS::GIT.get_revisions): retrieve modified time
+	  from toplevel log too.
+
+	* tool/vcs.rb (VCS::GIT#branch_list): yield for each lines.
+
+Wed Dec 24 00:23:13 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/extlibs.rb (do_extract): the pipe should be binmode.
+
+Wed Dec 24 00:21:44 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* Makefile.in, common.mk: move common-srcs to Makefile.in because
+	  it breaks build on mswin.
+
+Wed Dec 24 00:04:45 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/open-uri.rb (OpenURI.open_http): accept multiple certs path in
+	  ssl_ca_certs.
+
+	* tool/downloader.rb: use certs of rubygems for downloading gems.
+
+Tue Dec 23 22:39:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/extlibs: libffi-3.2.1 and patch for mswin.
+
+Tue Dec 23 22:04:38 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#query=): don't escape [\]^
+	  on both rfc2396 and rfc3986. [Bug #10619]
+
+Tue Dec 23 16:03:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::Error#initialize):
+	  try en_US message if the default message cannot be encoded to
+	  locale.  [ruby-core:65295] [Bug #10300]
+
+Tue Dec 23 11:42:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_cipher.c (ossl_cipher_update_long): update huge
+	  data gradually not to exceed INT_MAX.  workaround of OpenSSL API
+	  limitation.  [ruby-core:67043] [Bug #10633]
+
+Mon Dec 22 21:30:16 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_event.rb: some tests are
+	  executed on standard Windows OS without ADO.
+
+Mon Dec 22 14:08:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (received_signal): fix condition to define.
+	  [ruby-core:67032] [Bug #10629]
+
+Sun Dec 21 10:51:51 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_event.rb: test_s_new_exception is
+	  executed on standard Windows OS without ADO.
+
+Sun Dec 21 08:35:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (jemalloc): fix option argument, should use
+	  `$withval` but not `yes` always.  [ruby-core:66994] [Bug #10625]
+
+	* configure.in (jemalloc): defer adding the liner option to get
+	  rid of linking contest against jemalloc, so that it works
+	  without runtime dynamic load path.
+
+Sat Dec 20 17:49:03 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb (Dir.mktmpdir): Accept nil again, as Ruby 2.1.
+	  [ruby-core:66943] [Bug #10616] Fixed by Alex Slynko.
+
+Sat Dec 20 11:22:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/depend, ext/fiddle/extconf.rb: try to build bundled
+	  libffi if existing.
+
+Sat Dec 20 05:21:00 2014  Eric Wong  <e@80x24.org>
+
+	* test/test_weakref.rb (test_repeated_object_leak): increase timeout
+	  [Bug #10618]
+
+Fri Dec 19 22:33:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/update-deps: Use $(hdrdir) if possible.
+
+Fri Dec 19 22:10:00 2014  Kenta Murata  <mrkn@cookpad.com>
+
+	* ext/bigdecimal/depend: Fix dependencies to make bigdecimal
+	  installable by rubygems.
+
+	* ext/bigdecimal/bigdecimal.gemspec: version 1.2.6.
+
+Fri Dec 19 20:00:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (PRIsVALUE): put a space after string
+	  literals not to be confused with C++11 string literal suffix.
+	  https://github.com/ruby/ruby/commit/a9f3eb7#commitcomment-9040169
+
+Fri Dec 19 15:36:02 2014  Simon Genier  <simon.genier@shopify.com>
+
+	* hash.c (hash_equal): prefer true than the result of implicit
+	  conversion from int returned by rb_eql() to VALUE.  [Fix GH-789]
+
+Thu Dec 18 17:45:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_binary_elf): get rid of -e option of cat
+	  which is not available on BusyBox, use tr instead.
+	  [ruby-core:64824] [Bug #10210]
+
+Thu Dec 18 14:25:17 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT,
+	  should be treated before calling signal(3).
+	  [Bug #10615]
+
+Wed Dec 17 12:20:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (rb_method_for_self_aref, rb_method_for_self_aset):
+	  move from iseq.c to build from node instead of arrays.
+
+Wed Dec 17 10:50:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/gdbm/test_gdbm.rb: Added test for each_key called without a block.
+	  Patch by @joeyates [fix GH-783]
+
+Wed Dec 17 10:18:42 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): check
+	  iseq->compile_data->option->specialized_instruction for opt_* insn.
+
+	* test/ruby/test_iseq.rb: check no specialized_instructions option.
+
+Wed Dec 17 09:48:57 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (iseq_compile_each): only emit opt_str_freeze,
+	  opt_aref_with, and opt_aset_with insn when no block is given
+	  [Bug #10557] [ruby-core:66595]
+	* test/ruby/test_optimization.rb (test_block_given_aset_aref):
+	  new test for bug thanks to Bartosz Kopinski.
+	  (test_string_freeze): additional assertion for object_id
+
+Wed Dec 17 01:06:47 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/win32/lib/Win32API.rb (Win32API#call): need to splat.  hmm, when
+	  was this broken?
+
+Tue Dec 16 15:18:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_method_for_self_aref, rb_method_for_self_aset): call
+	  accessor functions directly, not to be affected by [] and []=
+	  methods.  [ruby-core:66846] [Bug #10601]
+
+	* struct.c (define_aref_method, define_aset_method): ditto.
+
+	* vm_insnhelper.c (rb_vm_opt_struct_aref, rb_vm_opt_struct_aset):
+	  direct accessors of Struct.
+
+Tue Dec 16 12:01:29 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+	  extend timeout seconds to 60 for RGENGC_CHECK_MODE > 0 environment.
+
+Tue Dec 16 08:53:12 2014  Eric Wong  <e@80x24.org>
+
+	* tool/vcs.rb: fix Ruby 1.8 compatibility harder
+
+Tue Dec 16 07:37:18 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (GC_HEAP_FREE_SLOTS): move definition to match use order
+	  (RUBY_GC_HEAP_GROWTH_SLOTS): s/factor/number of slots/
+
+	* man/ruby.1: add section for GC environment variables
+	  [Feature #10197]
+
+Tue Dec 16 05:41:46 2014  Eric Wong  <e@80x24.org>
+
+	* tool/vcs.rb: fix Ruby 1.8 compatibility
+
+Mon Dec 15 17:51:28 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c: ObjectSpace.memsize_of(obj) returns
+	  with sizeof(RVALUE). [Bug #8984]
+
+	* gc.c (obj_memsize_of): ditto.
+
+	* NEWS: add a NEWS entry.
+
+	* test/objspace/test_objspace.rb: catch up this fix.
+
+	* test/ruby/test_file_exhaustive.rb: ditto.
+
+Mon Dec 15 16:19:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_enc_str_coderange): dummy wchar, non-endianness
+	  encoding string cannot be ascii only.
+	  [ruby-core:66835] [Bug #10598]
+
+Sun Dec 14 20:11:42 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): restore current_arg so that circular
+	  reference after a method definition is also warned.
+	  [ruby-core:61299] [Bug #9593]
+
+Sat Dec 13 20:41:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_trace.c (rb_postponed_job_flush): mask signal trap interrupt
+	  too to defer handling after finalizers finished.
+	  [ruby-core:66825] [Bug #10595]
+
+Sat Dec 13 18:33:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_pkey_ec.rb: ignored tests with old OpenSSL.
+
+Sat Dec 13 18:01:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (check_stack_overflow): check sp also on i386/x86_64
+	  FreeBSD.
+
+Sat Dec 13 09:58:41 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (define_final0): avoid duplicate blocks
+	  [Bug #10537]
+	* test/test_weakref.rb (test_repeated_object_leak): new test
+
+Sat Dec 13 04:59:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bin/erb (ERB::Main#run): get rid of shadowing outer local
+	  variables.  [ruby-core:65772] [Feature #10395]
+
+Fri Dec 12 21:56:44 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* gems/bundled_gems: Upgrade to test-unit 3.0.8. assert_throw and
+	  assert_nothing_thrown in test-unit 3.0.7 were broken by
+	  UncaughtThrowError change introduced in Ruby 2.2.0
+	  preview2. These assertions in test-unit 3.0.8 work well with
+	  UncaughtThrowError in Ruby 2.2.0 preview2.
+
+Fri Dec 12 19:48:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* bin/erb (ARGV.switch, ERB::Main#run): allow variables to be set
+	  from the command line.  [ruby-core:65772] [Feature #10395]
+
+Fri Dec 12 19:31:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/erb.rb (ERB#lineno): accessor for line number to eval.
+
+	* lib/erb.rb (ERB#location=): setter of file name and line number.
+
+Fri Dec 12 13:09:13 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_latest_gc_info): return :state field to show current
+	  GC state (none/marking/sweeping).
+	  [Feature #10590]
+
+Fri Dec 12 10:49:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_crypt): check arguments more strictly.
+	  * crypt() is not for wide char strings
+	  * salt bytes should not be NUL
+
+Fri Dec 12 08:16:01 2014  Matt Hoyle  <matt@deployable.co>
+
+	* io.c (io_read) Fix spelling in docco for read.  [Fix GH-781]
+	  try > tries
+
+Thu Dec 11 19:06:01 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* class.c (class_alloc): Start from age == 2.
+	  Class and Module objects can be living long life.
+
+	* iseq.c: Same for ISeq objects.
+
+	* gc.c (RVALUE_AGE_RESET): added.
+
+	* gc.c (newobj_of): allow to generate (age != 0) objects.
+
+	* gc.c (rb_copy_wb_protected_attribute): reset age for wb unprotected
+	  objects.
+
+	* include/ruby/ruby.h: add RUBY_TYPED_PROMOTED1 as an unrecommended
+	  flag.
+
+Thu Dec 11 05:37:52 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/prime.rb: Remove useless loop and block capture.
+	  See [#10354]
+
+Thu Dec 11 04:27:24 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: introduce new field
+	  rb_thread_t::local_storage_recursive_hash_for_trace to store
+	  recursive hash to avoid creating new recursive (nested) hashes
+	  for each trace events.
+	  [Bug #10511]
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks_orig): use it.
+
+	* cont.c: catch up this fix.
+
+	* vm.c (rb_thread_mark): ditto.
+
+Wed Dec 10 13:39:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (define_aref_method, define_aset_method): use iseq
+	  VALUE instead of rb_iseq_t to prevent from GC, as RB_GC_GUARD
+	  makes sense only for local variables.  [Feature #10575]
+
+Wed Dec 10 09:38:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (exec_recursive): use the same last method name as
+	  recursive_push in the error message when recursive_pop failed.
+	  [ruby-core:66742] [Bug #10579]
+
+Wed Dec 10 02:48:46 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/net/http/test_https.rb
+	  (TestNetHTTPS#test_certificate_verify_failure): on Windows,
+	  Errno::ECONNRESET will be raised when the verify is failure at the
+	  client side, and it'll be eaten by WEBrick.
+
+	* test/open-uri/test_ssl.rb (TestOpenURISSL#test_validation_failure):
+	  ditto.
+
+Wed Dec 10 00:42:13 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.c (rb_method_for_self_aref, rb_method_for_self_aset):
+	  new methods to generate bytecode for struct.c
+	  [Feature #10575]
+	* struct.c (rb_struct_ref, rb_struct_set): remove
+	  (define_aref_method, define_aset_method): new functions
+	  (setup_struct): use new functions
+	* test/ruby/test_struct.rb: add test for struct >10 members
+	* benchmark/bm_vm2_struct_big_aref_hi.rb: new benchmark
+	* benchmark/bm_vm2_struct_big_aref_lo.rb: ditto
+	* benchmark/bm_vm2_struct_big_aset.rb: ditto
+	* benchmark/bm_vm2_struct_small_aref.rb: ditto
+	* benchmark/bm_vm2_struct_small_aset.rb: ditto
+
+Tue Dec  9 20:24:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* string.c: [DOC] Add missing documentation around String#chomp.
+	  Patch by @stderr [ci skip][fix GH-780]
+
+Tue Dec  9 18:20:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c: [DOC] Revise documentation by Marcus Stollsteimer at
+	  [ruby-core:66368].  [Bug #10526]
+
+	  * #inspect: be more specific about generated string, remove
+	    obsolete example.
+	  * #nil?: use code examples instead of different call-seq's.
+	  * #tap: clarify what is yielded.
+	  * Integer(): be more specific about to_int and to_i, remove
+	    reference to Ruby 1.8.
+	  * Array(): fix error.
+	  * Class: fix variable name style and indentation in example.
+	  * improve consistency, fix typos and formatting.
+
+Tue Dec  9 12:48:32 2014  Josef Simanek  <josef.simanek@gmail.com>
+
+	* vm_eval.c (rb_eval_string_wrap): [DOC] Fix `rb_eval_string_wrap`
+	  documentation.  It is referencing `require` instead of `load`.
+	  The former does not have the optional argument.  [Fix GH-779]
+
+Tue Dec  9 10:16:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_frame_last_func): return the most recent frame method
+	  name.
+
+	* thread.c (recursive_list_access): use the last method name,
+	  instead of the current method name which can be unset in some
+	  cases, not to use a symbol by the invalid ID.
+	  [ruby-core:66742] [Bug #10579]
+
+Sun Dec  7 19:36:12 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/socket/basicsocket.c, ext/socket/sockssocket.c:
+	  remove code for $SAFE=4.
+
+Sun Dec  7 10:20:55 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rdoc:  Update to RDoc 4.2.0.
+	* test/rdoc:  ditto.
+
+Sun Dec  7 09:52:30 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 2.4.5.
+	* test/rubygems:  ditto.
+
+Sat Dec  6 10:05:08 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb: Fix undefined variable usage & refactor/DRY
+	  code.  Patch by @aledovsky. [Fixes GH-770]
+
+	* test/net/test_imap.rb: related test.
+
+Sat Dec  6 10:09:44 2014  Eric Wong  <e@80x24.org>
+
+	* thread.c (do_select): rename parameters to avoid shadowing
+
+Sat Dec  6 09:22:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rake:  Update to rake 10.4.2
+	* test/rake: ditto.
+
+Sat Dec  6 06:48:03 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (rb_iseq_build_from_ary): remove misc handling
+
+Sat Dec  6 06:14:23 2014  Vit Ondruch  <vondruch@redhat.com>
+
+	* configure.in (RUBY_LIB_VERSION): Fix --with-ruby-version
+	  configuration option.  get rid of quoting in config.status.
+
+	* template/verconf.h.tmpl: quote RUBY_LIB_VERSION here.
+	  [ruby-core:66724] [Bug #10572]
+
+Sat Dec  6 04:33:52 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/pp.rb (File::Stat#pretty_print): some platforms (such as Windows)
+	  does not have major/minor parts of device.
+
+Fri Dec  5 22:43:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/psych/lib/psych.rb: bump version to 2.0.8
+	* ext/psych/psych.gemspec: ditto.
+	* ext/psych/psych_emitter.c: ditto.
+	* ext/psych/psych_parser.c: ditto.
+
+Fri Dec  5 17:09:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/option.c (inet_ntop): link aliased inet_ntop in
+	  libruby on mswin not rb_w32_inet_ntop which fails to link for
+	  unknown reason.
+
+Fri Dec  5 11:09:54 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.c (prepare_iseq_build): remove unused block_opt param
+	  (rb_iseq_new_with_bopt_and_opt): remove
+	  (rb_iseq_new_with_opt): inline removed function
+	  (rb_iseq_new_with_bopt): remove
+	  (iseq_load): adjust prepare_iseq_build call
+	  [Feature #10565]
+
+Fri Dec  5 09:46:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): fix lex_state after tLABEL_END, should
+	  be EXPR_LABELARG to be followed by "paren with arg".
+	  [ruby-core:66705] [Feature #4935]
+
+Fri Dec  5 02:27:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/extmk.rb: as all extension objects including initializations
+	  of ext and enc should be linked to libruby if enable-shared,
+	  EXTOBJS should not be linked to main programs.
+	  [ruby-core:66675] [Bug #10566]
+
+Thu Dec  4 07:06:02 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (rb_iseq_build_from_exception): entry->sp is unsigned
+	  (iseq_build_callinfo_from_hash): account for kw_arg
+	  (iseq_build_from_ary_body): update for r35459
+	  (CHECK_STRING, CHECK_INTEGER): remove unused checks
+	  (int_param): new function for checking new `params' hash
+	  (iseq_build_kw): new function for loading rb_iseq_param_keyword
+	  (rb_iseq_build_from_ary): account for `misc' entry and general
+	   structure changes
+	  [Feature #8543]
+	* iseq.c (CHECK_HASH): new macro (for `misc' and `param' entries)
+	  (iseq_load): account for `misc' and `params' hashes
+	  (iseq_data_to_ary): add final opt to arg_opt_labels,
+	   fix kw support, account for unsigned entry->sp
+	* ext/-test-/iseq_load/iseq_load.c: new ext for test
+	* ext/-test-/iseq_load/extconf.rb: ditto
+	* test/-ext-/iseq_load/test_iseq_load.rb: new test
+
+Thu Dec  4 06:56:57 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.c (iseq_free): avoid segfault on incomplete iseq
+	* test/ruby/test_syntax.rb (test_invalid_next): new test
+	  for syntax error, not segfault
+
+Thu Dec  4 04:20:34 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (ruby_require_internal): ignore error detail, just return
+	  an error.
+
+Wed Dec  3 17:13:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (load_encoding): use rb_require_internal instead of
+	  calling rb_require_safe with protection.
+
+Wed Dec  3 16:47:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (register_init_ext, ruby_init_ext): defer running the
+	  registered initialization function until required, not to enable
+	  extensions which have global effects just by loading, e.g.,
+	  mathn/complex and mathn/rational.  fix `make test` with
+	  --with-static-linked-ext.
+
+	* enc/encinit.c.erb (Init_enc): initialize encdb and transdb
+	  directly.
+
+Wed Dec  3 14:51:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (ruby_require_internal): separate from rb_require_safe,
+	  not to raise exceptions.
+
+	* ruby.c (process_options): remove unnatural encoding search.
+
+Wed Dec  3 14:34:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (setup_fake_str): fake string does not share another
+	  string, but just should not free.
+
+Wed Dec  3 11:14:14 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (w32_spawn): `v2` is used not only for `shell` but also
+	  `cmd`, so must not free before using `cmd`.
+	  [ruby-core:66648] [Bug #10563]
+
+Wed Dec  3 09:48:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/racc/cparse/cparse.c (cparse_params_type): use typed data.
+
+Tue Dec  2 21:33:56 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: use typed data for com_hash.
+
+Tue Dec  2 15:30:30 2014  Martin Duerst  <duerst@it.aoyama.ac.jp>
+
+	* array.c (rb_ary_plus): in documentation, added note about
+	  inefficiency of repeated += operations.
+
+Tue Dec  2 07:20:21 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.c (iseq_data_to_ary): keep hidden variables
+	  Thanks to wanabe [ruby-core:66566]
+
+Tue Dec  2 06:46:57 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: bumping version
+
+	* ext/psych/psych.gemspec: ditto
+
+Tue Dec  2 06:34:08 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: support objects that are
+	  marshalable, but inherit from basic object.
+	  Thanks Sean Griffin <sean@thoughtbot.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: ditto
+
+	* test/psych/test_marshalable.rb: test for fix
+
+Tue Dec  2 06:32:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ripper_flush_string_content): preserve the dispatched
+	  results at tSTRING_CONTENT.  [ruby-dev:48714] [Bug #10437]
+
+	* parse.y (regexp_contents): check in ripper only if the whole
+	  content is a single regexp without interpolation.
+	  [ruby-dev:48714] [Bug #10437]
+
+Tue Dec  2 06:30:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (rb_reg_region_copy): new function to try with GC if copy
+	  failed and return the error.
+
+Tue Dec  2 04:43:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (CHECK_REGION_COPIED): onig_region_copy() can fail when
+	  memory exhausted but returns nothing, so check by if allocated.
+
+Tue Dec  2 02:53:00 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (magic_comment_encoding): enable in ripper, since the
+	  encoding is necessary to parse non-default encoding scripts.
+
+Tue Dec  2 02:30:25 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic.build):
+	  use hostname= to detect and wrap IPv6 hosts.
+	  Build is accepting URI components and users may not expect
+	  that a host component needs to be wrapped with square brackets
+	  since it's not providing a URI.
+	  Note: initialize with arg_check => true does not wrap IPv6 hosts.
+	  by Joe Rafaniello <jrafanie@redhat.com>
+	  https://github.com/ruby/ruby/pull/765 fix GH-765
+
+	* test/uri/test_generic.rb: Add more tests
+
+Mon Dec  1 20:01:12 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: use typed data for WIN32OLE.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_event.c: ditto.
+
+Mon Dec  1 17:20:42 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/Makefile.sub (verconf.h): so depends on verconf.mk, which
+	  is rebuilt by setup.mak.
+
+Mon Dec  1 11:05:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* proc.c: fix grammar by @BenMorganIO [fix GH-764][ci skip]
+
+Mon Dec  1 10:49:53 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* man/rake.1: Update latest man content by @aledovsky
+	  [fix GH-771][ci skip]
+
+Mon Dec  1 10:42:31 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* doc/syntax/refinements.rdoc: refinements are no longer experimental.
+	  patch by @gaurish [fix GH-775][ci skip]
+
+Sun Nov 30 20:05:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (regexp_contents): fix a typo.  pointed out by wanabe.
+	  [ruby-dev:48741] [Bug #10543]
+
+Sun Nov 30 18:55:32 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+	  Don't raise Interrupt.
+
+Sun Nov 30 17:11:05 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking): Use
+	  assert_separately.
+
+Sun Nov 30 00:02:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options, ruby_script): transcode script name and
+	  program name to locale encoding as well as argv.
+	  [ruby-dev:48752] [Bug #10555]
+
+	* ruby.c (translit_char_bin): should not use code page dependent
+	  CharNext on UTF-8 string.  [ruby-dev:48752] [Bug #10555]
+
+Sat Nov 29 16:53:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (ruby_set_argv): convert argv from UTF-8.
+
+	* win32/win32.c (rb_w32_sysinit, cmdglob, w32_cmdvector): convert
+	  wide char command line to UTF-8 argv, and glob in UTF-8 so that
+	  metacharacters would match multibyte characters.
+	  [ruby-dev:48752] [Bug #10555]
+
+Sat Nov 29 10:49:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (win32_direct_conv, rb_w32_readdir): convert UTF-8
+	  and filesystem code page by using Win32 API directly.
+
+Sat Nov 29 09:37:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (syserr_initialize): simplify message building and get
+	  rid of potential invalid byte sequence.
+
+Sat Nov 29 06:09:44 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* eval_error.c (error_print): respect the encoding of the message.
+
+	* io.c (rb_write_error_str): use rb_w32_write_console() on Windows
+	  if stderr is a tty.
+
+Fri Nov 28 05:10:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (--with-setup): add option to select ext/Setup file.
+
+Fri Nov 28 05:02:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dmyenc.c (Init_enc): separate from dmyext.c for statically
+	  linked extension excluding encoding libraries.
+
+Thu Nov 27 21:58:30 2014  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk (miniprelude.c): It does not depend on prelude.rb now.
+
+Thu Nov 27 21:49:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/update-deps: List up files built always in the source directory
+	  and source files built always in the build directory.
+
+Thu Nov 27 21:24:55 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* NEWS: add obsolete callcc.
+
+Thu Nov 27 19:59:49 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_compile_each): remove duplicated line event.
+	  [Bug #10449]
+
+	* test/ruby/test_settracefunc.rb: add and fix tests.
+
+Thu Nov 27 19:04:50 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_args.c: fix backtrace location for keyword related exceptions.
+
+	  For example, the following program
+	    def foo(k1: 1); end # line 1
+	    foo(k2: 2)          # line 2
+	  causes "unknown keyword: k2 (ArgumentError)".
+
+	  Before this patch, the backtrace location is only line 2.
+	  However, error should be located at line 1 (over line 2 in
+	  stack trace). This patch fix this problem.
+
+	* class.c (rb_keyword_error_new): separate exception creation logic
+	  from rb_keyword_error(), to use in vm_args.c.
+
+	* vm_insnhelper.c (rb_arg_error_new): rename to rb_arity_error_new().
+
+	* vm_args.c (argument_arity_error): rename to argument_arity_error().
+
+	* vm_args.c (argument_kw_error): added to fix backtrace.
+
+	* test/ruby/test_keyword.rb: add tests.
+
+Thu Nov 27 17:31:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (prelude.c): no longer depends on miniruby, since not
+	  depending on rbconfig.rb.
+
+Thu Nov 27 17:12:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (miniprelude.c): miniruby needs no preludes.
+
+Thu Nov 27 17:10:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/prelude.c.tmpl: no code if no prelude code is given.
+
+Thu Nov 27 13:11:00 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_malloc_increase): enable lazy sweep on GC by malloc()
+	  (malloc_increase) to make GC incrementally.
+
+	  This change can increase memory consumption. Report us if you find
+	  any problem.
+
+Thu Nov 27 12:46:38 2014  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (time_s_mkutc): [DOC] Time.utc's 10 arguments form
+	  doesn't examine wday, yday, isdst and tz.
+	  (time_s_mktime): [DOC] Time.mktime's 10 arguments form
+	  doesn't examine wday, yday and tz.
+	  Suggested by naruse.
+
+Thu Nov 27 11:45:33 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.c (iseq_data_to_ary): add missing GC guard
+
+Thu Nov 27 10:51:59 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: add rb_thread_t::local_storage_recursive_hash
+	  to speed up Thread#[:__recursive_key__] access.
+	  [Bug #10511]
+
+	* thread.c (threadptr_local_aref): add fast path for
+	  :__recursive_data__.
+
+	* thread.c (threadptr_recursive_hash, threadptr_recursive_hash_set):
+	  add special accessor for recursive hash.
+
+	* cont.c: store/restore local_storage_recursive_hash.
+
+	* vm.c: init and mark local_storage_recursive_hash.
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks_orig): clear and restore
+	  local_storage_recursive_hash directly.
+
+Thu Nov 27 07:11:00 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (iseq_calc_param_size): hoist out of iseq_set_arguments
+
+Wed Nov 26 22:28:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (rb_get_kwargs, rb_extract_keywords): export
+	  keyword argument functions.
+
+Wed Nov 26 21:18:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/inlinetest.rb: removed unused test helper.
+
+Wed Nov 26 20:47:28 2014  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* ext/continuation/continuation.c (Init_continuation): obsolete callcc.
+	  first step of [Feature #10548].
+
+Wed Nov 26 19:57:54 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb (test_latest_gc_info): do test separately
+	  to avoid mysterious behavior.
+
+Wed Nov 26 19:54:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (constat_reset): do nothing on non-standard
+	  console emulators.  [ruby-core:66471] [Bug #10546]
+
+Wed Nov 26 19:44:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tsort.rb: Returns an enumerator if no block is given.
+	  [ruby-core:66270] [Feature #10508] Proposed by Andrey Savchenko.
+
+Wed Nov 26 17:25:45 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_label, f_kw, formal_argument_gen): ignore invalid
+	  formal argument in keyword argument definition.
+	  [ruby-dev:48742] [Bug #10545]
+
+Wed Nov 26 15:32:06 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (iseq_set_sequence): use "nop" insn instead of
+	  "jump to next insn".
+	  https://bugs.ruby-lang.org/issues/8543#change-50085
+
+Wed Nov 26 11:01:35 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.c (iseq_s_compile_file): close IO when done
+
+Wed Nov 26 06:06:23 2014  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: encdb.h and transdb.h depends on $(PREP).
+	  So prebuild files for them in tarball are useless.
+
+Wed Nov 26 02:08:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/make-snapshot: Don't generate enc/trans/newline.c in tarball.
+
+Wed Nov 26 00:41:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk (prereq): Don't depends on prelude.c and golf_prelude.c.
+	  Since they depend on $(PREP) which is miniruby, they are rebuilt
+	  after miniruby is built, even if tarball contains them.
+
+Wed Nov 26 00:20:48 2014  Tanaka Akira  <akr@fsij.org>
+
+	* template/prelude.c.tmpl: Don't expand RbConfig::Config[...].
+	  It is not used now.
+
+	* common.mk: prelude.c and golf_prelude.c doesn't depend on rbconfig.
+
+Tue Nov 25 17:07:06 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* NEWS: add an "Implementation changes" section.
+
+Tue Nov 25 16:09:28 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/net/http.rb:  Do not attempt SSL session resumption when the
+	  session is expired.  [Bug #10533]
+
+Tue Nov 25 15:59:46 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rake:  Update to rake 10.4.0
+	* test/rake:  ditto.
+	* NEWS:  ditto.
+
+	* test/lib/minitest/unit.rb:  Add compatibility shim for minitest 5.
+	  This only provides minitest 5 unit test naming compatibility.
+
+Tue Nov 25 15:26:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/vcs.rb (get_revisions): use Time.new instead of Time.mktime
+	  which does not accept UTC offset, and offset manually for older
+	  versions than 1.9.
+
+Tue Nov 25 12:14:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (Init_process): initialize static IDs before constant
+	  definitions.  [ruby-core:66445]
+
+Tue Nov 25 10:32:23 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (iseq_build_callinfo_from_hash): hoist out
+	  (iseq_build_from_ary_body): shorten callinfo case
+
+Mon Nov 24 23:03:21 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* gems/bundled_gems: Update to test-unit 3.0.7.
+
+Mon Nov 24 12:44:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (check_exec_redirect_fd, check_exec_redirect),
+	  (rb_execarg_addopt): get rid of inadvertent ID pindown.
+
+Mon Nov 24 02:03:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_setter): preserve encoding of global variable
+	  name in error message.
+
+Mon Nov 24 02:03:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* iseq.c (rb_insn_operand_intern): preserve encoding of method
+	  name in CALL_INFO at disassembling.
+
+Mon Nov 24 02:02:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (must_respond_to): preserve encodings of variable name and
+	  class name in warning message.
+
+Sun Nov 23 10:46:23 2014  Eric Wong  <e@80x24.org>
+
+	* internal.h (struct rb_execarg): 160 => 144 bytes on x86-64
+	* ruby.c (struct load_file_arg): 48 => 40 bytes on x86-64
+	* vm_args.c (struct args_info): ditto
+
+Sun Nov 23 07:46:54 2014  Andy Maloney  <asmaloney@gmail.com>
+
+	* io.c (rb_io_sysread): Remove redundant assignment of 'n'.
+	  [Fix GH-767]
+
+Sat Nov 22 09:48:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/make-snapshot: Specify PWD macro for make.
+	  PWD environment variable may not exist.
+
+Fri Nov 21 11:58:58 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/resolv.rb: fall back if canonicalization fails.
+	  Thanks Vit Ondruch for the patch!  [ruby-core:65836]
+
+	* test/resolv/test_dns.rb: test for patch
+
+Sat Nov 22 01:11:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_mod_const_get, rb_mod_const_defined): ditto.
+
+	* variable.c (rb_const_missing, rb_mod_const_missing): call
+	  const_missing without new ID to get rid of inadvertent ID
+	  creation.
+
+Fri Nov 21 19:32:57 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (ext/ripper/ripper.c): revert about srcdir and top_srcdir.
+
+	* common.mk (ext/ripper/ripper.c): use $(PWD) for Unix,
+	  $(MAKEDIR) for Windows.
+
+Fri Nov 21 18:12:37 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/update-deps: Refactored.
+
+Fri Nov 21 14:25:40 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (top_srcdir): added because lacking this macro
+	  causes build error at r48526.
+
+Fri Nov 21 12:00:58 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/update-deps (in_makefile): Use FILES_NEED_VPATH and
+	  FILES_CONFUSING.
+
+	* ext/objspace/extconf.rb: Add VPATH for id.h
+
+Fri Nov 21 09:10:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (ext/ripper/ripper.c): fix dependencies for the case
+	  to make ripper.y and id.h under the build directory.
+
+Fri Nov 21 08:42:21 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (ext/ripper/ripper.c): id.h in VPATH may exist in the build
+	  directory.
+
+	* common.mk (ext/ripper/ripper.c): $(RM) was not defined.
+
+Fri Nov 21 00:36:09 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/x509.rb
+	  (OpenSSL::X509::Name::RFC2253DN::StringChar): get rid of a false
+	  positive assertion in ripper's test.
+
+Fri Nov 21 00:29:51 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/net/imap.rb (Net::IMAP::ResponseParser::BEG_REGEXP): no need to
+	  use embed string.
+
+Fri Nov 21 00:19:17 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/uri/mailto.rb (URI::MailTo::EMAIL_REGEXP): should escape `#`.
+
+Thu Nov 20 23:17:11 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/update-deps: Insert all dependencies found by compiler.
+
+Thu Nov 20 15:51:01 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/nkf/depend (nkf.o): add nkf.c as dependency.
+	  bsdmake tries to make nkf.o with nkf-utf8/nkf.c without this.
+
+Thu Nov 20 08:54:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (struct parser_params): reduce size by reordering
+	  members and an unused member.
+
+Thu Nov 20 02:44:27 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Vector#independent? and associated class method
+	  patch by gogo tanaka [#10451]
+
+Thu Nov 20 02:32:34 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add Vector#angle_with
+	  Patch by Egunov Dmitriy [#10442]
+
+Thu Nov 20 02:10:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ripper_flush_string_content, parser_parse_string):
+	  preserve parsed string content.  [ruby-dev:48714] [Bug #10437]
+
+	* parse.y (ripper_new_yylval): abstract function to create ripper
+	  wrapper, and make it able to hold another object.
+
+Thu Nov 20 01:00:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (reg_named_capture_assign_gen): use predefined ID
+	  instead of rb_intern.
+
+Thu Nov 20 00:54:57 2014  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (ruby_init_setproctitle): Declare here.
+
+Thu Nov 20 00:26:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_here_document): append byte sequence directly to
+	  the delayed content instead of creating an intermediate string
+	  object.
+
+Wed Nov 19 21:11:01 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (ext/json/parser/parser.c): don't touch parse.c,
+	  ruby repo is a downstream.
+
+Wed Nov 19 20:38:11 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (ext/ripper/ripper.c): use $(PWD) to get
+	  <build-directory>/ext/ripper.
+
+Wed Nov 19 18:12:17 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/downloader.rb (RubyGems.download): Don't download gem if the
+	  version is already downloaded. A gem file is versioned and
+	  it must be identical if the version is the same.
+
+Wed Nov 19 17:59:25 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk (ext/ripper/ripper.c): pass build directory as VPATH.
+
+	* ext/ripper/depend (.y.c): use VPATH for y.tab.c.
+
+Wed Nov 19 10:07:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/prelude.c.tmpl (Prelude#translate): strip VPATH prefix
+	  from prelude names, so that srcdir differences do not make the
+	  generated code different.
+
+Wed Nov 19 07:45:11 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_write): should set the error of
+	  GetOverlappedResult()'s, not WriteFile()'s (it's always
+	  ERROR_IO_PENDING, of course).
+
+Tue Nov 18 14:16:47 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_record): add information for debug print.
+
+Wed Nov 19 04:49:07 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* debug.c (set_debug_option): need the declaration.
+
+	* debug.c (set_debug_option): use the same macro with the implementation
+	  at win32/win32.c.
+
+Wed Nov 19 04:16:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (symbol_list): fix the node type of literal symbol list
+	  with no interpolation.  [ruby-core:66343]
+
+Wed Nov 19 00:26:15 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/update-deps: Sort dependencies.
+
+Wed Nov 19 00:24:18 2014  Tanaka Akira  <akr@fsij.org>
+
+	* enc/encdb.c: Include internal.h.
+
+Tue Nov 18 23:23:45 2014  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: Gather declarations in non-header files.
+
+Tue Nov 18 23:45:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* debug.c (SET_WHEN): Don't declare debug variables here.
+	  ruby_initial_gc_stress_ptr is changed int* to VALUE* at r41406.
+
+	* internal.h (ruby_initial_gc_stress_ptr): Declared.
+	  (ruby_enable_coredump): Ditto.
+
+Tue Nov 18 18:06:43 2014  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/io.h (FMODE_WSPLIT): Removed.  The write() system call
+	  is not required to split.  It was useful to avoid whole process
+	  blocking in Ruby 1.8 but not useful since write() is invoked without
+	  GVL.
+	  (FMODE_WSPLIT_INITIALIZED): Ditto.
+
+	* io.c (wsplit_p): Removed.
+	  (io_writable_length): Removed.
+	  (rb_fcntl): Don't update the removed flags.
+
+Tue Nov 18 03:23:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (check_setter_id): show the original argument instead
+	  of nil on TypeError.
+
+Tue Nov 18 03:20:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbol.h (is_{local,global,instance,attrset,const,class,junk}_sym):
+	  fix ID type names.
+
+Mon Nov 17 20:17:59 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_event.c: use typed data.
+
+Mon Nov 17 12:54:56 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems/*, test/rubygems/*: Update to RubyGems 2.4.4
+	  master (2f6e42e).
+
+Mon Nov 17 06:13:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (proc_binding): use the original iseq on a binding from
+	  proc from method object to get the location.
+
+Sun Nov 16 19:38:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_current_receiver): new function to return the
+	  receiver in the current control frame.  [Feature #10195]
+
+Sun Nov 16 19:11:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/timeout.rb (Timeout::ExitException#exception): rescue
+	  UncaughtThrowError which is specific for throw, instead of
+	  ArgumentError.
+
+Sun Nov 16 18:22:18 2014  Eric Wong  <e@80x24.org>
+
+	* tool/update-deps: warning to disable ccache
+
+Sun Nov 16 13:11:35 2014  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk (CCAN_LIST_INCLUDES): Unused variable removed.
+	  (ENCODING_H_INCLUDES): Ditto.
+	  (PROBES_H_INCLUDES): Ditto.
+	  (VM_CORE_H_INCLUDES): Ditto.
+
+Sun Nov 16 11:07:25 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_io.rb (test_readpartial_locktmp):
+	  remove unnecessary begin/end
+
+Sun Nov 16 00:45:23 2014  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: Specify dependencies for generated C sources.
+
+Sat Nov 15 23:10:45 2014  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: No need to declare dependencies which
+	  will be detected by inference rules.
+
+Sat Nov 15 20:34:23 2014  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: Include ruby.h and ruby/encoding.h to be
+	  includable without prior inclusion.
+
+Sat Nov 15 20:46:44 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb
+	  (REXMLTests::TestDocument::EntityExpansionLimitTest):
+	  Group tests by general entity and parameter entity.
+
+Sat Nov 15 20:43:31 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb
+	  (REXMLTests::TestDocument::EntityExpansionLimitTest): Define
+	  test XML in each test method because (1) each XML in used only
+	  one test and (2) related data and code should be close.
+
+Sat Nov 15 20:39:06 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb
+	  (REXMLTests::TestDocument::EntityExpansionLimitTest): Use
+	  one test method for one test.
+
+Sat Nov 15 20:16:59 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb
+	  (REXMLTests::TestDocument::EntityExpansionLimitTest): Use
+	  setup and teardown instead of ensure in test.
+
+Sat Nov 15 20:11:34 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb (REXMLTests::TestDocument): Group
+	  entity expansion limit related tests.
+
+Sat Nov 15 20:09:00 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb (REXMLTests::TestDocument::BomTest):
+	  Fix wrong parent class. It doesn't need inherit tests in
+	  TestDocument class.
+
+Sat Nov 15 19:48:59 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb (depend_rules): support comments during a line.
+
+	* lib/mkmf.rb (depend_rules): apply RULE_SUBST even if the dependency
+	  file contains path.
+
+Sat Nov 15 19:25:46 2014  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: Remove comments in Dependency lines.
+	  Notified by usa.
+
+	* enc/depend: Ditto.
+
+	* ext/**/depend: Ditto.
+
+Sat Nov 15 16:28:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_throw_obj): throw UncaughtThrowError instead of
+	  ArgumentError.  [Feature #10480]
+
+Sat Nov 15 14:13:38 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/update-deps: Extend to fix dependencies.
+
+	* common.mk: Dependencies updated by tool/update-deps.
+
+	* enc/depend: Ditto.
+
+	* ext/**/depend: Ditto.
+
+Fri Nov 14 17:36:48 2014  Tanaka Akira  <akr@fsij.org>
+
+	* tool/update-deps: Support GNU Make 4.0.
+
+Fri Nov 14 16:59:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (default_proc_for_compat_func): check arguments number and
+	  type, and get rid of reentering this default proc.
+
+Fri Nov 14 16:33:06 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): support compatible layer for
+	  GC.stat(symbol) type access.
+
+Fri Nov 14 16:19:08 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): add compatible layer.
+	  From Ruby 2.2, keys of GC.stat are changed [Feature #9924].
+	  To provide compatible layer, GC.stat add a default_proc
+	  (if default_proc of given Hash object is not set).
+
+	  At first use of this compatible layer of interpreter process,
+	  show a warning message like that:
+	  program: GC.stat[:total_allocated_object]
+	  warning message: "warning: GC.stat keys were changed from Ruby
+	  2.1. In this case, you refer to obsolete `total_allocated_object'
+	  (new key is `total_allocated_objects').
+	  Please check <https://bugs.ruby-lang.org/issues/9924>
+	  for more information."
+
+	  Please correct my English message :)
+
+	* hash.c (rb_hash_set_default_proc): export (in internal).
+
+	* internal.h: ditto.
+
+Fri Nov 14 10:41:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: guard by #if/#endif with GC_ENABLE_INCREMENTAL_MARK
+	  to hide unused codes.
+
+	* gc.c: similar to GC_ENABLE_LAZY_SWEEP.
+
+Fri Nov 14 10:23:35 2014  Eric Wong  <e@80x24.org>
+
+	* vm_eval.c (rb_eval_cmd): use pre-defined idCall
+
+Fri Nov 14 09:25:44 2014  Eric Wong  <e@80x24.org>
+
+	* vm_eval.c (rb_yield_splat): add missing GC guard
+	  [Bug #10509]
+
+Fri Nov 14 08:12:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gc.c: fix build error caused by implicit conversion with clang.
+
+Fri Nov 14 06:54:06 2014  Eric Wong  <e@80x24.org>
+
+	* insns.def (opt_succ): remove Time#succ optimization
+	  [Feature #10501]
+
+Fri Nov 14 05:29:46 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: refactoring.
+
+	* gc.c: use GC_ENABLE_INCREMENTAL_MARK instead of USE_RINCGC.
+
+	* gc.c (gc_start): check FORCE_MAJOR_GC.
+
+Fri Nov 14 04:51:18 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: Tuning RincGC parameters.
+
+	  Before this patch, gc_marks_step() marks (white -> grey) fixed
+	  number objects. However, this strategy does not fit practical
+	  cases, for example too slow to make progress.
+
+	  This patch changes this strategy how many objects the
+	  gc_marks_step() should handle.
+
+	  We can estimate how many times gc_marks_step() is called during
+	  this major marking (== C) with the free slot number in pooled
+	  pages. We also can estimate the living object number (== L)
+	  using last marked_slots value. We can solve this problem (how
+	  many objects should be process in gc_marks_step()) by L/C.
+
+	* gc.c (rb_objspace_t): add rb_objspace_t::rincgc::pooled_slots and
+	  step_slots.
+
+Fri Nov 14 01:26:47 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (search_response): parse MODSEQ in SEARCH
+	  responses properly.  [ruby-core:64203] [Bug #10112]
+
+Fri Nov 14 01:03:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/envutil.rb: Moved from test/ruby/.
+
+	* test/lib/find_executable.rb: Ditto.
+
+	* test/lib/memory_status.rb: Ditto.
+
+	* test/lib/test/unit.rb: require envutil.
+
+	* test/: Don't require envutil in test files.
+
+Thu Nov 13 21:59:58 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* lib/rexml/document.rb: add REXML::Document#document.
+	  reported by Tomas Hoger <thoger@redhat.com> and patched by nahi.
+
+Thu Nov 13 21:51:56 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/monitor/test_monitor.rb: Use assert_join_threads.
+
+Thu Nov 13 21:45:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl: Don't specify port number.
+
+Thu Nov 13 21:22:35 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/ssl_server.rb: Unused file removed.
+	  It is not used since r16111, Ruby 1.9.1.
+
+Thu Nov 13 18:50:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_ensure): remove obsolete prot_tag comment.  patch by
+	  Jack Danger at [ruby-core:66238].  [misc #10502]
+
+Thu Nov 13 18:10:38 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_vm_make_proc_lambda): similar to rb_vm_make_proc() with
+	  is_lambda argument.
+
+Thu Nov 13 12:11:18 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_fstat{,i64}): speed up.  adjusting
+	  timestamps in this function is to get rid of the side effect of
+	  ENV["TZ"].  then, if ENV["TZ"] is not set, no need to adjust.
+	  this change makes File#stat about 60% faster.
+
+Thu Nov 13 11:56:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* st.c: include "internal.h" for STATIC_ASSERT.
+
+Thu Nov 13 03:56:38 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (struct heap_page): trivial packing
+	  304 => 296 bytes on x86-64
+
+Wed Nov 12 22:50:12 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gems/bundled_gems: Update to test-unit 3.0.6 and minitest 5.4.3.
+
+Wed Nov 12 22:30:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems/*: Update to RubyGems 2.4.3 master (7b1f684).
+
+Wed Nov 12 00:26:37 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_object.rb: Specify an exception class for rescue clause.
+
+	* test/dbm/test_dbm.rb: Ditto.
+
+	* test/gdbm/test_gdbm.rb: Ditto.
+
+	* test/sdbm/test_sdbm.rb: Ditto.
+
+Tue Nov 11 23:43:51 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/fileutils/test_fileutils.rb: Use assert_join_threads.
+
+Tue Nov 11 22:51:14 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/resolv/test_dns.rb: Use assert_join_threads.
+
+Tue Nov 11 22:33:08 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/pop/test_pop.rb: Use assert_join_threads.
+
+Tue Nov 11 22:07:20 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/http/test_https_proxy.rb: Use assert_join_threads.
+
+Tue Nov 11 18:09:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/prelude.c.tmpl: move from tool/compile_prelude.rb and
+	  expand by generic_erb.rb.
+
+Tue Nov 11 13:01:31 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/rubygems/commands/contents_command.rb (files_in_default_gem):
+	  remove useless sort. show_files will sort the result and
+	  another branch, files_in_gem, doesn't sort.
+	  it should be removed for consistency.
+
+	* test/rubygems/test_gem_commands_contents_command.rb
+	  (test_execute_default_gem): adjust the sort algorithm with
+	  Gem::Commands::ContentsCommand#show_files, which sort items
+	  as array of [prefix, basename] not strings.
+
+Tue Nov 11 10:37:09 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (sym_equal): use rb_obj_equal().
+	  rb_obj_equal() is specially optimized in
+	  opt_eq_func()@vm_insnhelper.c.
+
+	  This fix is made from this discussion:
+	  https://www.omniref.com/ruby/2.1.4/symbols/Symbol/%3D%3D#line=8361.
+
+Tue Nov 11 09:38:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rdoc/known_classes.rb: reverted regression changes of
+	  rdoc known class.
+
+Tue Nov 11 00:21:50 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/imap/test_imap.rb: Don't ignore exceptions on server
+	  threads.
+
+Mon Nov 10 23:34:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/ftp/test_ftp.rb (create_ftp_server): Don't ignore
+	  exceptions on server thread.
+	  Delete read_timeout method call to fix NoMethodError.
+
+Mon Nov 10 20:20:53 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_read): retry with reduced length if cannot to
+	  write any data but no error occurs.
+
+Mon Nov 10 20:04:16 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/server.rb: Setup shutdown pipe in listen method.
+
+Mon Nov 10 19:37:09 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/win32/win32.h (rb_w32_set_nonblock): new
+	  function to support nonblock-mode of pipes.
+
+	* win32/win32.c (rb_w32_read): nonblock-mode pipe returns ERROR_NO_DATA
+	  if there is no data, but also returns it if remote-end is closed.
+
+	* win32/win32.c (rb_w32_write): if cannot to write any data, it may be
+	  blocking.
+
+	* io.c (rb_io_set_nonblock): use rb_w32_set_nonblock for Windows.
+
+	* ext/io/nonblock/nonblock.c (rb_io_nonblock_set): use ruby's API when
+	  setting nonblock-mode.
+
+	* test/ruby/test_io.rb: test nonblock pipes on Windows.
+
+Mon Nov 10 17:24:34 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_getlogin): set login name encoding properly.
+	  [ruby-core:66163] [Bug #10493]
+
+Mon Nov 10 16:20:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems/*.rb: Update to RubyGems master(3e36528).
+
+Mon Nov 10 16:09:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (rb_f_kill): [DOC] mention known signal list.
+	  [ruby-core:66162] [Bug #10492]
+
+Mon Nov 10 14:17:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rdoc/*.rb: Update to RDoc 4.2.0.alpha(579a11c)
+
+Mon Nov 10 12:44:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/server.rb: Less instance variables.
+
+Mon Nov 10 12:19:43 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/server.rb (shutdown): Use close() on @shutdown_pipe_w to
+	  notify readability on the read side of the pipe.
+	  write_nonblock() is not usable for pipe on Windows.
+	  (cleanup_shutdown_pipe): Rescue IOError for @shutdown_pipe_w.close.
+
+Mon Nov 10 07:31:59 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/server.rb (initialize): Initialize shutdown pipe here
+	  to avoid race condition.
+	  (cleanup_shutdown_pipe): New private method.
+	  (cleanup_listener): Extracted from shutdown method.
+	  Call this method from start method to avoid race condition.
+
+Mon Nov 10 05:57:53 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/webrick/webrick.cgi: Don't use debug mode.
+
+	* test/webrick/webrick_long_filename.cgi: Ditto.
+
+Sun Nov  9 23:25:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (vm_call_super): allow bound proc method to call super
+	  method.
+
+	* vm_insnhelper.c (vm_yield_with_cfunc): push defined class and
+	  bound proc method entry to the control frame.
+
+Sun Nov  9 22:46:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/open-uri: Test server log in server thread.
+
+	* test/webrick: Ditto.
+
+Sun Nov  9 22:28:34 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/httpstatus.rb: require webrick/accesslog for AccessLog.
+
+Sun Nov  9 21:03:59 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/webrick: Fix the argument order of assert_equal.
+
+Sun Nov  9 20:29:01 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/webrick: Store log in an array.
+
+	* test/net/http: Ditto.
+
+	* test/open-uri: Ditto.
+
+Sun Nov  9 18:35:36 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc: Refine log test.
+
+Sun Nov  9 18:33:33 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize/normalize.rb: Replaced if-else by
+	  case in self.normalized? in parallel to r48309.
+
+Sun Nov  9 18:07:00 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc: Use assert_join_threads.
+
+Sun Nov  9 14:06:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/xmlrpc: Test webrick error log is empty.
+
+Sun Nov  9 13:47:02 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (is_incremental_marking): use #if/#else because
+	  rb_objspace_t::flags::during_incremental_marking is not defined
+	  when GC_ENABLE_INCREMENTAL_MARK is 0.
+
+	* gc.c (will_be_incremental_marking, is_full_marking): similar fix.
+
+Sun Nov  9 12:16:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/securerandom.rb (SecureRandom.gen_random): separate
+	  implementation details and select at the load time.
+
+Sun Nov  9 12:09:38 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/win32/lib/win32/registry.rb (Win32::Registry::API#Enum{Value,Key):
+	  ditto.
+
+Sun Nov  9 11:48:40 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/http: Examine webrick log.
+
+Sun Nov  9 11:45:19 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gems/bundled_gems: upgraded to test-unit 3.0.5.
+
+Sun Nov  9 11:40:50 2014  Tanaka Akira  <akr@fsij.org>
+
+	* defs/known_errors.def: More errors for FreeBSD.
+
+Sun Nov  9 11:25:11 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* gems/bundled_gems: upgraded to power_assert 0.2.0.
+
+Sun Nov  9 10:31:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/securerandom.rb: set the script encoding to make a string
+	  literal in SecureRandom::Kernel32.last_error_message single byte
+	  encoding so msg[] works in bytes, since FormatMessage() returns
+	  the size in TCHARs, not in characters.
+
+Sun Nov  9 09:50:22 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/webrick: Refine log tests.
+
+Sun Nov  9 08:58:05 2014  Tanaka Akira  <akr@fsij.org>
+
+	* defs/known_errors.def (EHWPOISON): New errno symbol.
+	  It is defined by glibc-2.16.
+
+Sun Nov  9 05:00:23 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/securerandom.rb (initialize): call the special method for Win32
+	  before checking `/dev/urandom` because we know windows doesn't have it.
+
+Sun Nov  9 04:01:46 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/securerandom.rb (SecureRandom::AdvApi32): split from `initialize`.
+	  thanks @zzak to remember it.
+
+Sun Nov  9 02:05:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/net/http/utils.rb: Don't connect to spawned server
+	  before actual test.
+
+Sun Nov  9 01:51:50 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* object.c (Module#const_defined?): [DOC] Revise the documentation.
+	  Patch by Xavier Noria.
+	  [Fixes GH-754] https://github.com/ruby/ruby/pull/754
+
+Sun Nov  9 00:37:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/webrick: Examine log and use assert_join_threads.
+
+Fri Nov  7 00:00:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* template/unicode_norm_gen.tmpl: expand kompatible_table so that
+	  recursive expansion is not needed at runtime.
+
+Thu Nov  6 23:58:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (pack_pack): escape unprintable characters and preserve
+	  the encoding of warning message.
+
+Thu Nov  6 23:55:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_printable): QUOTE() should not raise an exception
+	  even on invalid byte sequence.
+
+Thu Nov  6 21:44:36 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/test_unicode_normalize.rb: Rename TestNormalize to
+	  TestUnicodeNormalize.
+	  Define constants under TestUnicodeNormalize.
+
+Thu Nov  6 21:22:59 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/open-uri/test_open-uri.rb: Check empty webrick log.
+
+Thu Nov  6 19:27:34 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* re.c (unescape_nonascii): cast -1 for the case char is unsigned char.
+	  If char is signed char, for example gcc for ARM or ppc64, it caused
+	  infinite loop.
+	  http://kmuto.jp/build-ruby/arm/ruby-trunk/log/20141106T013005Z.fail.html.gz
+	  http://rubyci.blob.core.windows.net/f19p8/ruby-trunk/log/20141106T090217Z.fail.html.gz
+
+Thu Nov  6 09:53:18 2014  Eric Wong  <e@80x24.org>
+
+	* lib/uri/rfc2396_parser.rb (initialize): reduce bytecode size
+	  2088 => 1332 bytes on 32-bit x86
+
+Thu Nov  6 08:49:49 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize/normalize.rb: Comment clarification.
+
+Wed Nov  5 23:43:24 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* compile.c (compile_data_alloc): add padding when strict alignment
+	  is required for memory access. Currently, the padding is enabled
+	  only when the CPU is 32-bit SPARC and the compiler is GCC.
+	  [Bug #9681] [ruby-core:61715]
+
+	* compile.c (STRICT_ALIGNMENT): defined if strict alignment is required
+
+	* compile.c (ALIGNMENT_SIZE, ALIGNMENT_SIZE_MASK, PADDING_SIZE_MAX):
+	  new macros for alignment word size, bit mask, max size of padding.
+
+	* compile.c (calc_padding): new function to calculate padding size.
+
+Wed Nov  5 23:24:45 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/open-uri/test_open-uri.rb: Don't ignore webrick's log.
+
+Wed Nov  5 19:20:08 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/server.rb: Stop listener loop properly.
+	  [ruby-core:66085] [Bug #10478] Fixed by Charles Nutter.
+
+Wed Nov  5 17:20:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_disable_super, rb_enable_super): warn
+	  as deprecated at build time, instead of ignoring silently or
+	  warning at runtime only.
+
+Wed Nov  5 16:55:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_f_lambda): remove deprecated function, which has been
+	  unavailable from extension libraries.
+
+Wed Nov  5 16:26:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/intern.h (rb_clear_cache): mark as deprecated, not
+	  only warnings at runtime.
+
+Wed Nov  5 15:05:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_{,l,r}strip_bang): rb_str_subseq() will not
+	  NUL-terminate the result string, in the future, so it will not
+	  be needed in other cases.
+
+Wed Nov  5 14:11:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (lib/unicode_normalize/tables.rb): do nothing unless
+	  BASERUBY is available.  MINIRUBY cannot load extension libraries,
+	  so cannot update Unicode data.
+
+Wed Nov  5 12:13:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by
+	  copying necessary part only.
+
+	* string.c (rb_str_strip_bang, rb_str_strip): ditto.
+
+Wed Nov  5 12:13:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by
+	  copying necessary part only.
+
+	* string.c (rb_str_strip_bang, rb_str_strip): ditto.
+
+Wed Nov  5 10:54:19 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_lstrip_bang, rb_str_rstrip_bang): terminate
+	  wchar strings with wchar 0.
+
+Tue Nov  4 21:23:22 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/win32/lib/Win32API.rb: Fiddle::Importer is defined in
+	  fiddle/import.rb and it's not loaded implicitly.
+
+	* ext/win32/lib/Win32API.rb (Win32API#initialize): `import` is a string.
+
+	* ext/win32/lib/Win32API.rb (Win32API#initialize):
+	  Fiddle::Importer::CALL_TYPE_TO_ABI is private constant.
+
+Tue Nov  4 21:20:07 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/securerandom.rb (SecureRandom.random_bytes): use fiddle directly
+	  instead of using Win32API.
+
+Tue Nov  4 21:04:30 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem_request_set_lockfile.rb
+	  (test_relative_path_from): driveletter support.
+
+Tue Nov  4 16:23:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/rubygems/test_gem_remote_fetcher.rb (RemoteFetcherCleanup):
+	  close all pooled connections for each tests to fix leaked file
+	  descriptors.
+
+Tue Nov  4 12:51:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/ruby.h (PRIsVALUE), vsnprintf.c (BSD_vfprintf): add
+	  RUBY_PRI_VALUE_MARK to reduce danger of accidental conflict with
+	  plain "%i".  binary incompatible with extension libraries using
+	  PRIsVALUE and built for 2.1 and earlier.  [EXPERIMENTAL]
+
+Tue Nov  4 12:33:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* object.c: fix document of Kernel#String by @suzukaze
+	  [fix GH-743][ci skip]
+
+Tue Nov  4 12:21:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/csv.rb: added documentation for skip_blanks option by @decasia
+	  [fix GH-744][ci skip]
+
+Tue Nov  4 12:09:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/open3.rb: fix code formatting in documentation by @JoshCheek
+	  [fix GH-747][ci skip]
+
+Tue Nov  4 08:57:37 2014  Eric Wong  <e@80x24.org>
+
+	* encoding.c (enc_memsize): remove unnecessary function
+	  [ruby-core:65304]
+
+Mon Nov  3 18:09:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/utils.rb: The default of :ignore_listener_error is
+	  changed to false.
+
+Mon Nov  3 14:42:37 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_free): resolve memory leak.
+
+Mon Nov  3 13:49:18 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (iseq_memsize): catch up recent changes.
+
+Mon Nov  3 13:38:28 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: change semantics of opt_num and opt_table.
+	  `opt_num' was the number of optional parameters + 1.
+	  `opt_table' has "opt_num" entries.
+
+	  Change them to:
+	  `opt_num' is the number of optional parameters.
+	  `opt_table' has "opt_num + 1" entries.
+
+	  This change simplify parameter fitting logics.
+
+	* compile.c: catch up this change.
+
+	* iseq.c: ditto.
+
+	* proc.c: ditto.
+
+	* vm_args.c: ditto.
+
+Mon Nov  3 11:47:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* NEWS: added period into Matrix section. [ci skip]
+	  [misc #10446][ruby-core:65987]
+
+Mon Nov  3 09:43:30 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* vm_args.c: fixed build error with clang
+
+Mon Nov  3 09:32:46 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/rfc3986_parser.rb (URI::RFC3986_Parser::RFC3986_URI):
+	  allow '[' and ']' for URI input (and escape). [Bug #10402]
+
+	* lib/uri/generic.rb (URI#query=): escape '[', '\', and ']'.
+
+Mon Nov  3 07:49:34 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: change iseq parameter data structure.
+	  https://bugs.ruby-lang.org/issues/10440#change-49694
+
+	  * change terminology `arg' to `param'.
+	  * move rb_iseq_t::arg_* to rb_iseq_t::param.
+	  * move rb_iseq_t::arg_size to rb_iseq_t::param::size.
+	  * move rb_iseq_t::argc to rb_iseq_t::param::lead_num.
+	  * move rb_iseq_t::arg_opts to rb_iseq_t::param::opt_num.
+	  * move rb_iseq_t::arg_rest to rb_iseq_t::param::rest_start.
+	  * move rb_iseq_t::arg_post_num to rb_iseq_t::param::post_num.
+	  * move rb_iseq_t::arg_post_start to rb_iseq_t::param::post_start.
+	  * move rb_iseq_t::arg_block to rb_iseq_t::param::block_start.
+	  * move rb_iseq_t::arg_keyword* to rb_iseq_t::param::keyword.
+	    rb_iseq_t::param::keyword is allocated only when keyword
+	    parameters are available.
+	  * introduce rb_iseq_t::param::flags to represent parameter
+	    availability. For example, rb_iseq_t::param::flags::has_kw
+	    represents that this iseq has keyword parameters and
+	    rb_iseq_t::param::keyword is allocated.
+	    We don't need to compare with -1 to check availability.
+	  * remove rb_iseq_t::arg_simple.
+
+	* compile.c: catch up this change.
+
+	* iseq.c: ditto.
+
+	* proc.c: ditto.
+
+	* vm.c, vm_args.c, vm_dump.c, vm_insnhelper.c: ditto.
+
+	* iseq.c (iseq_data_to_ary): support keyword argument.
+
+Mon Nov  3 03:39:04 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_method.rb: r48239 makes this test green.
+
+Mon Nov 03 03:02:38 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* rewrite method/block parameter fitting logic to optimize
+	  keyword arguments/parameters and a splat argument.
+	  [Feature #10440] (Details are described in this ticket)
+
+	  Most of complex part is moved to vm_args.c.
+
+	  Now, ISeq#to_a does not catch up new instruction format.
+
+	* vm_core.h: change iseq data structures.
+
+	  * introduce rb_call_info_kw_arg_t to represent keyword arguments.
+	  * add rb_call_info_t::kw_arg.
+	  * rename rb_iseq_t::arg_post_len to rb_iseq_t::arg_post_num.
+	  * rename rb_iseq_t::arg_keywords to arg_keyword_num.
+	  * rename rb_iseq_t::arg_keyword to rb_iseq_t::arg_keyword_bits.
+	    to represent keyword bitmap parameter index.
+	    This bitmap parameter shows that which keyword parameters are given
+	    or not given (0 for given).
+	    It is referred by `checkkeyword' instruction described bellow.
+	  * rename rb_iseq_t::arg_keyword_check to rb_iseq_t::arg_keyword_rest
+	    to represent keyword rest parameter index.
+	  * add rb_iseq_t::arg_keyword_default_values to represent default
+	    keyword values.
+	  * rename VM_CALL_ARGS_SKIP_SETUP to VM_CALL_ARGS_SIMPLE
+	    to represent
+	      (ci->flag & (SPLAT|BLOCKARG)) &&
+	      ci->blockiseq == NULL &&
+	      ci->kw_arg == NULL.
+
+	* vm_insnhelper.c, vm_args.c: rewrite with refactoring.
+
+	  * rewrite splat argument code.
+	  * rewrite keyword arguments/parameters code.
+	  * merge method and block parameter fitting code into one code base.
+
+	* vm.c, vm_eval.c: catch up these changes.
+
+	* compile.c (new_callinfo): callinfo requires kw_arg parameter.
+
+	* compile.c (compile_array_): check the last argument Hash object or
+	  not. If Hash object and all keys are Symbol literals, they are
+	  compiled to keyword arguments.
+
+	* insns.def (checkkeyword): add new instruction.
+	  This instruction check the availability of corresponding keyword.
+
+	  For example, a method "def foo k1: 'v1'; end" is compiled to the
+	  following instructions.
+
+	    0000 checkkeyword     2, 0  # check k1 is given.
+	    0003 branchif         9     # if given, jump to address #9
+	    0005 putstring        "v1"
+	    0007 setlocal_OP__WC__0 3   # k1 = 'v1'
+	    0009 trace            8
+	    0011 putnil
+	    0012 trace            16
+	    0014 leave
+
+	* insns.def (opt_send_simple): removed and add new instruction
+	  "opt_send_without_block".
+
+	* parse.y (new_args_tail_gen): reorder variables.
+	  Before this patch, a method "def foo(k1: 1, kr1:, k2: 2, **krest, &b)"
+	  has parameter variables "k1, kr1, k2, &b, internal_id, krest",
+	  but this patch reorders to "kr1, k1, k2, internal_id, krest, &b".
+	  (locate a block variable at last)
+
+	* parse.y (vtable_pop): added.
+	  This function remove latest `n' variables from vtable.
+
+	* iseq.c: catch up iseq data changes.
+
+	* proc.c: ditto.
+
+	* class.c (keyword_error): export as rb_keyword_error().
+
+	* common.mk: depend vm_args.c for vm.o.
+
+	* hash.c (rb_hash_has_key): export.
+
+	* internal.h: ditto.
+
+Mon Nov  3 02:35:32 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* sample/simple-bench.rb: added to measure performance of simple
+	  lines.
+
+Mon Nov  3 02:33:43 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (obj_info): show T_STRING more details.
+
+Sun Nov  2 01:30:32 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/test_ssl.rb: Don't ignore errors on listener threads,
+	  as much as possible.
+
+	* test/openssl/test_ssl_session.rb: Ditto.
+
+	* test/openssl/test_partial_record_read.rb: Ditto.
+
+Sat Nov  1 23:11:05 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/utils.rb (start_server): Don't close sockets before
+	  threads finished.
+
+Sat Nov  1 22:06:24 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/test_ssl_session.rb (test_ctx_client_session_cb): Don't
+	  ignore errors of SSL accept.
+	  (test_ctx_server_session_cb): Ditto.
+
+	* test/openssl/utils.rb (server_loop): Add ignore_ssl_accept_error
+	  argument.
+	  (start_server): Refine threads waits.
+
+	* test/ruby/envutil.rb (assert_join_threads): Show a thread before
+	  backtrace.
+
+Sat Nov  1 20:40:18 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl/utils.rb (start_server, server_loop): Use a
+	  pipe to stop server instead of shutdown/close a listening socket.
+
+Sat Nov  1 19:24:59 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_join_threads): New assertion to
+	  join multiple threads without exceptions.
+
+Sat Nov  1 17:09:32 2014  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (bary_mul_balance_with_mulfunc): Fix free work area
+	  location.
+	  [ruby-dev:48723] [Bug #10464]
+	  [ruby-core:66044] [Bug #10465]
+	  Reported by Kohji Nishihama.
+
+Sat Nov  1 15:45:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parse_atmark): mere atmark and two atmarks without
+	  succeeding identifiers are invalid as instance/class variable
+	  names.
+
+Sat Nov  1 06:31:41 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_variant.c: use typed data.
+
+Fri Oct 31 13:55:28 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/dl/*: remove DL as it is replaced by Fiddle.
+	  [Feature #5458] Thanks to Jonan Scheffler <jonanscheffler@gmail.com>
+	  for this patch
+
+	* test/dl/*: ditto.
+
+Fri Oct 31 15:26:02 2014  Charles Oliver Nutter  <headius@headius.com>
+
+	* test/openssl/test_ssl.rb: Add certificate verification chain
+	  test from JRuby community.
+
+Fri Oct 31 18:58:02 2014  Charles Oliver Nutter  <headius@headius.com>
+
+	* test/psych/test_emitter.rb: Fix line_width test...initial value
+	  is impl-specific and attr assignment always returns LHS.
+
+Fri Oct 31 22:19:30 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest.rb (Digest()): This function should now be
+	  thread-safe.  If you have a problem with regard to on-demand
+	  loading under a multi-threaded environment, preload "digest/*"
+	  modules on boot or use this method instead of directly
+	  referencing Digest::*. [Bug #9494]
+	  cf. https://github.com/aws/aws-sdk-ruby/issues/525
+
+Fri Oct 31 21:33:17 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* test/digest/test_digest.rb: Drop #!.  This no longer runs
+	  stand-alone because it depends on ruby/envutil.
+
+Fri Oct 31 17:22:19 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/setup.mak: $(APPEND) with some arguments insert a space before
+	  the arguments, so it causes error if the arguments are expected to be
+	  a macro definition.  this fix resolve the build error introduced at
+	  r48210.
+
+Fri Oct 31 16:47:35 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/syslog/lib/syslog/logger.rb (Syslog::Logger::VERSION): Bump
+	  the VERSION to 2.1.0. [ruby-core:64483] [Bug #10159]
+
+Fri Oct 31 16:33:46 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/net/imap.rb (Net::IMAP#fetch): [DOC] Document that
+	  Net::IMAP#fetch will return nil instead of an empty array.
+
+Fri Oct 31 12:54:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (.unicode-tables.time): needs Unicode files always,
+	  and should update after downloading these files.
+	  [ruby-core:66026] [Bug #10461]
+
+Fri Oct 31 10:16:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: reverted r48199, it's unrelated configuration.
+
+Fri Oct 31 09:58:14 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_unicode_normalize.rb: added unicode version number to
+	  test data location.
+
+Fri Oct 31 09:56:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .gitignore: ignored unicode data with version directories.
+
+Fri Oct 31 09:35:30 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: tweak build scripts for unicode_normalize.rb.
+
+Thu Oct 30 18:47:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* common.mk: fix for the case ALWAYS_UPDATE_UNICODE=no
+
+Thu Oct 30 13:23:23 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/downloader.rb: changed Unicode data download location
+	  from latest Unicode version to Unicode 7.0.0.
+
+Thu Oct 30 11:16:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_arg{_complex,}): try conversion
+	  by to_ary for a lambda, as well as a proc.
+	  [ruby-core:65887] [Bug #9605]
+
+Wed Oct 29 21:13:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (gettable_gen): warn circular argument reference, for
+	  transition from 2.1 and earlier.  [ruby-core:65990] [Bug #10314]
+
+Wed Oct 29 20:41:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_params): remove unused member `cur_mid`.
+	  this has been taken over by `in_def` since 1.6.
+
+Wed Oct 29 14:44:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (rb_f_load): path name needs to be transcoded to OS path
+	  encoding.  [ruby-list:49994]
+
+Wed Oct 29 11:48:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (__builtin_setjmp): disable with gcc/clang earlier
+	  than 4.3 on Mac OS X.  [ruby-core:65174] [Bug #10272]
+
+Wed Oct 29 11:43:43 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Generalize Vector#cross_product to arbitrary
+	  dimensions
+	  based on a patch by gogo tanaka [#10074]
+
+Wed Oct 29 11:43:11 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add Matrix#adjucate
+	  patch by gogo tanaka [#10056]
+
+Wed Oct 29 11:42:33 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add aliases for Vector#cross & dot
+	  patch by gogo tanaka [#10352]
+
+Wed Oct 29 10:00:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gems/bundled_gems: Update latest version of bundled gems.
+
+Tue Oct 28 16:52:07 2014  Eric Wong  <e@80x24.org>
+
+	* signal.c (install_sighandler): remove rb_disable_interrupt and
+	  rb_enable_interrupt calls
+	  (init_sigchld): ditto
+	  (Init_signal): disable and enable interrupt once around all
+	  install_sighandler and init_sigchld to reduce syscalls at start
+	  [Feature #9345] [ruby-core:59480]
+
+Tue Oct 28 16:22:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ruby.c (process_options, load_file_internal2): should not
+	  require other files when dump option is given.
+	  [ruby-dev:48712] [Bug #10435]
+
+Tue Oct 28 14:51:38 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: remove apple-gcc4.2 from CC candidates.
+
+Mon Oct 27 20:13:37 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/rexml/entity.rb: keep the entity size within the limitation.
+	  reported by Willis Vandevanter <will@silentrobots.com> and
+	  patched by nahi.
+
+Mon Oct 27 17:17:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (method_proc): the receiver of binding from method should
+	  be same as the receiver of the method.
+	  [ruby-core:65917] [Bug #10432]
+
+Mon Oct 27 16:26:37 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_super.rb: add a test to check block passing.
+
+Mon Oct 27 15:59:26 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: is_incremental_marking(), will_be_incremental_marking():
+	  use `&&' with GC_ENABLE_INCREMENTAL_MARK instead of using
+	  #if/#else/#endif.
+
+Mon Oct 27 13:40:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (gc_sweep_rest): sweep rest pages regardless of whether
+	  lazy sweep is enabled or not.  based on the patch by Masahiro
+	  Ide at [ruby-dev:48706].  [Bug #10431]
+
+Mon Oct 27 11:18:32 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+	  reduce garbage during forks
+
+Sun Oct 25 12:26:26 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* template/insns.inc.tmpl, insns_info.inc.tmpl, known_errors.inc.tmpl,
+	  minsns.inc.tmpl: fixed path of generating script.
+
+Sun Oct 26 12:24:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/ripper/lib/ripper/sexp.rb (Ripper.sexp, Ripper.sexp_raw):
+	  return nil on error.  [ruby-dev:48678] [Bug #10405]
+
+Sun Oct 25 11:24:24 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* string.c: improved comment.
+
+Sun Oct 26 07:40:11 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_val2variant, ole_invoke): refactoring.
+	  use ole_variant2variant to convert WIN32OLE_VARIANT object to
+	  VARIANT object.
+
+	* ext/win32ole/win32ole_variant.c: refactoring. add
+	  ole_variant2variant.
+	* ext/win32ole/win32ole_variant.h: ditto.
+
+Sat Oct 25 22:28:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (io_binwrite_string): Test writev() failure.
+
+Sat Oct 25 20:19:19 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* test/test-unicode_normalize.rb: added test_us_ascii.
+
+Sat Oct 25 20:09:09 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize/normalize.rb: added US_ASCII
+	  as trivially supported encoding (is always normalized,
+	  and may appear mixed in with UTF-8 or other Unicode
+	  encodings).
+
+Sat Oct 25 20:01:01 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* test/test-unicode_normalize.rb: added
+	  test_raise_exception_for_non_unicode_encoding.
+
+Sat Oct 25 19:30:30 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* test/test-unicode_normalize.rb: removed unused function.
+
+Sat Oct 25 18:41:41 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* template/unicode_norm_gen.tmpl: Adjusted name of generating file.
+
+Fri Oct 24 22:49:42 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): dispatch newline and space at fluent
+	  interface, so that the following identifier does not include the
+	  space.  [ruby-dev:48684] [Bug #10411]
+
+Fri Oct 24 20:41:36 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* signal.c (check_reserved_signal_): fix write count since r47991.
+
+Thu Oct 23 21:42:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_hash_delete): now does not call the block given to
+	  the current method.  [ruby-core:65861] [Bug #10413]
+
+Thu Oct 23 19:13:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_make): warn redefinition only for
+	  already defined methods, but not for undefined methods.
+	  [ruby-dev:48691] [Bug #10421]
+
+Thu Oct 23 17:19:04 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/source.rb (REXML::IOSource#encoding_updated): Fix a
+	  bug that can't parse XML correctly when
+	  Encoding.default_internal is different with XML
+	  encoding. REXML::Source converts XML encoding on read. So IO
+	  should not convert XML encoding.
+	  Based on patch by NAKAMURA Usaku.
+	  [ruby-dev:48686] [Bug #10418]
+
+	* test/rexml/test_encoding.rb
+	  (REXMLTests::EncodingTester#test_parse_utf16_with_utf8_default_internal):
+	  Add the for the above case.
+
+Thu Oct 23 16:29:02 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_encoding.rb
+	  (REXMLTests::EncodingTester#test_parse_utf16): Use meaningful
+	  test name. "ticket" in the old test name means the ticket in
+	  REXML's issue tracker. The REXML's issue tracker was gone. So
+	  "ticket" is meaningless.
+
+	* test/rexml/data/ticket_110_utf16.xml: Rename to ...
+	* test/rexml/data/utf16.xml: ... this.
+
+Thu Oct 23 16:18:11 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_encoding.rb
+	  (REXMLTests::EncodingTester#test_ticket_110): Fix expected and
+	  actual order.
+	  Patch by NAKAMURA Usaku. Thanks!!!
+
+Thu Oct 23 10:47:16 2014  Eric Wong  <e@80x24.org>
+
+	* insns.def (getlocal,setlocal): add comment to def/opt_operand.def
+
+Thu Oct 23 10:22:41 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+	  use IO#wait_readable instead of timeout
+
+Thu Oct 23 10:22:24 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+	  ensure exit! during fork failure
+
+Thu Oct 23 10:21:21 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* NEWS: Added String#unicode_normalize(|!|d?) [ci skip]
+
+Thu Oct 23 03:41:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (unknown_keyword_error): delete expected keywords
+	  directly from raw table, so that the given block is not called.
+	  [ruby-core:65837] [Bug #10413]
+
+Thu Oct 23 02:33:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (update-unicode): invert dependency to run every times.
+	  [ruby-core:65842] [Bug #10415]
+
+	* common.mk (after-update): update files under source tree.
+	  [ruby-core:65840] [Bug #10414]
+
+Wed Oct 22 22:38:59 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (DEFAULT_PARAMS): override
+	  options even if OpenSSL::SSL::OP_NO_SSLv3 is not defined.
+	  this is pointed out by Stephen Touset. [ruby-core:65711] [Bug #9424]
+
+Wed Oct 22 21:31:56 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (prelude.c): add dependency to LIB_SRCS because
+	  enc/prelude.rb requires lib/unicode_normalize.rb, and it's also
+	  requires lib/unicode_normalize/tables.rb (=LIB_SRCS).
+
+Wed Oct 22 21:09:51 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* configure.in (nacl_cv_cpu_nick): fix typo in PNaCl.
+	  (XCFLAGS) Add -isystem flag to pnacl and nacl-newlib
+	  (CXX): added
+
+	* nacl/GNUmakefile.in (CXX): Added
+	  (PPROGRAM): Use clang++ instead of clang because libnacl_io
+	  depends on c++ std lib.
+
+Wed Oct 22 21:07:32 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* common.mk (build-ext): avoid trying to build dynamic libraries
+	  if configured --with-static-linked-ext.
+
+Wed Oct 22 20:33:33 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Fixed grammar in comment [ci skip]
+
+Wed Oct 22 19:18:18 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/unicode_norm_gen.rb: Fixed escaping of backslash and
+	  double quote ('\\\&' -> "\\\\\\\&"; double quoted string
+	  is needed to make \& mean last match; double double
+	  backslashes are needed because of two layers of escaping).
+
+Wed Oct 22 18:13:29 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/test-unicode_normalize.rb: as often said, ruby is sometimes built
+	  at non-srcdir.
+
+Wed Oct 22 18:12:12 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* test/test-unicode_normalize.rb: Adjusted path for test
+	  data file (now ../enc/unicode/data/NormalizationTest.txt).
+
+Wed Oct 22 18:07:07 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* test/test-unicode_normalize.rb: Removed explicit require,
+	  changed method names, adjusted copyright.
+
+Wed Oct 22 18:00:00 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* test/test-unicode_normalize.rb: Importing from
+	  https://github.com/duerst/eprun/blob/master/test/test_normalize.rb.
+	  (removing trailing whitespace, fixing EOLs and adding EOL property)
+
+Wed Oct 22 08:21:09 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* nacl/pepper_main.c (Instance_DidCreate): mount devfs and rebind fd 0
+	  .. 2 so that stderr goes to the console of the browser.
+
+Wed Oct 22 03:47:43 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/etc/etc.c (etc_nprocessors_affin): maximum "n" should be 16384.
+
+Wed Oct 22 03:37:00 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/etc/etc.c (etc_nprocessors_affin): minor spell fix.
+
+Wed Oct 22 03:33:58 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/etc/etc.c (etc_nprocessors_affin): optimize memory usage a
+	  bit. Typical rubyist never use 8k cpus machine.
+
+Wed Oct 22 00:01:09 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* configure.in (XCFLAGS): Add include path for NaCl libraries.
+	  (XLDFLAGS): ditto.
+	  (NACL_LIB_PATH): new substitution
+
+	* nacl/nacl-config.rb: support NACL_LIB_PATH
+
+	* nacl/package.rb: ditto.
+
+	* nacl/pepper_main.c: replace old implementations with nacl_io.
+
+	* nacl/GNUmakefile.in: link nacl_io to pepper_ruby
+
+	* ruby.c (rb_load_file): remove __attribute__((weak)) because the old
+	  override hack was replaced with nacl_io.
+
+	* file.c (rb_file_load_ok): ditto.
+
+Tue Oct 21 17:32:32 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Adding explicit creation of directory
+	  enc/unicode/data because git doesn't handle empty
+	  directories. [patch by Masahiro Ide, filed with r48073]
+
+Tue Oct 21 17:12:12 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize/tables.rb: Committing to make version
+	  update easier and more predictable, and reducing compilation
+	  time.
+
+Tue Oct 21 15:56:56 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize/normalize.rb: Added comment to point to
+	  relevant portion of Unicode standard for Hangul (de)composition
+	  identifiers and algorithm.
+
+Tue Oct 21 11:49:16 2014  Andreas Schwab  <schwab@suse.de>
+
+	* gc.c (mark_current_machine_context) [__mc68000__]: Update stack
+	  marking.
+	  (rb_gc_mark_machine_stack) [__mc68000__]: Also handle it here.
+
+Mon Oct 20 23:59:38 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* enc/prelude.rb: we sometimes run ruby without library path (especially
+	  for test), so should permit to run ruby if unicode_normalize.rb is
+	  missing.
+
+Mon Oct 20 23:57:58 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (lib/unicode_normalize/tables.rb): enable running (n)make
+	  in non-srcdir.
+
+Mon Oct 20 23:58:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/downloader.rb: add -a option to always download regardless
+	  existing files.
+
+Mon Oct 20 23:18:18 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/mkmf.rb: no need to convert path separator for COPY because it's
+	  ruby -run cp and it can treat '/' on any platform.
+
+Mon Oct 20 19:54:54 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* config.mk: Added missing data files as targets for
+	  prerequisite update_unicode.
+
+Mon Oct 20 19:06:06 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: revert r48046. The s in sIndex
+	  is not hungarian notation. The variable name sIndex is
+	  directly taken from the relevant part of the Unicode
+	  Standard, where it is written SIndex and stands for
+	  'syllable index'. See pp. 144/145 of
+	  http://www.unicode.org/versions/Unicode7.0.0/ch03.pdf.
+
+Mon Oct 20 12:46:46 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: removing unnecessary 'self'.
+
+Mon Oct 20 12:37:37 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: change method names
+	  in commented-out code. Followup to r48027.
+
+Mon Oct 20 02:23:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* variable.c (rb_ivar_get), vm_insnhelper.c (vm_getivar): improve
+	  instance variable retrieval performance by checking ruby_verbose
+	  before call of rb_warning and evaluation of its argument.
+	  [ruby-core:65786] [Feature #10396]
+
+Sun Oct 19 23:31:29 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* lib/unicode_normalize.rb: (unicode_normalize!): change method name.
+	  catch up the method name change at r48014. [Feature #10084]
+
+Sun Oct 19 20:05:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/tk/lib/tkextlib/tile/treeview.rb: fix syntax error.
+
+Sun Oct 19 18:39:39 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* enc/prelude.rb: Added automatic loading of
+	  lib/unicode_normalize.rb. This makes sure that all
+	  the methods that are available on String are
+	  available without explicit require.
+
+Sun Oct 19 18:35:35 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize/normalize.rb: Added a missing
+	  file extension in require statement.
+
+Sun Oct 19 18:13:13 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Added a rule to generate
+	  lib/unicode_normalize/tables.rb. This rule still
+	  needs to be integrated into the overall make process.
+
+Sun Oct 19 17:53:53 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: Changed to dynamic
+	  loading of actual normalization code and tables.
+
+Sun Oct 19 17:37:37 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: Small documentation fix.
+
+Sun Oct 19 17:26:26 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: Added documentation.
+
+Sun Oct 19 11:09:09 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/unicode_norm_gen.rb, lib/unicode_normalize.rb:
+	  File name change from lib/unicode_normalize/normalize_tables.rb
+	  to lib/unicode_normalize/tables.rb.
+
+Sun Oct 19 10:12:12 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: Changing method names, see
+	  https://bugs.ruby-lang.org/issues/10084#note-7
+
+Sun Oct 19 10:10:10 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: Changing module name.
+
+Sun Oct 19 10:08:08 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: Changing require statement,
+	  adjusting copyright.
+
+Sun Oct 19 10:04:04 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize.rb: Importing from
+	  https://github.com/duerst/eprun/blob/master/lib/string_normalize.rb.
+	  (removing trailing whitespace, fixing EOLs and adding EOL property)
+
+Sun Oct 19 09:56:56 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/unicode_norm_gen.rb: Changed module name.
+
+Sun Oct 19 09:48:48 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize/normalize.rb: Changed module name,
+	  adjusted copyright.
+
+Sun Oct 19 09:38:38 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize/normalize.rb: Importing from
+	  https://github.com/duerst/eprun/blob/master/lib/normalize.rb.
+
+Sat Oct 18 20:40:52 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_core.h, proc.c, vm_backtrace.c, vm_trace.c:
+	  remove rb_binding_new_with_cfp, and use rb_vm_make_binding instead.
+
+Sat Oct 18 20:38:48 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* vm_core.h, vm.c, proc.c: fix GC mark miss on bindings.
+	  [ruby-dev:48616] [Bug #10368]
+
+	* test/ruby/test_eval.rb: add a test code.
+
+Fri Oct 17 22:47:11 2014  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_unpack): Add casts for char references for 'u'.
+	  Fix line ending recognition algorithm.
+
+Fri Oct 17 21:49:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (pack_unpack): Add casts for char references for 'b' and 'h'.
+
+Fri Oct 17 17:50:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* Avoid undefined behaviors found by gcc -fsanitize=undefined.
+	  gcc (Debian 4.9.1-16) 4.9.1
+
+	* string.c (rb_str_sum): Avoid undefined behavior.
+
+Fri Oct 17 17:43:50 2014  Tanaka Akira  <akr@fsij.org>
+
+	* Avoid undefined behaviors found by gcc -fsanitize=undefined.
+	  gcc (Debian 4.9.1-16) 4.9.1
+
+	* include/ruby/ruby.h (INT2FIX): Avoid undefined behavior.
+
+	* node.h (nd_set_line): Ditto.
+
+	* pack.c (encodes): Ditto.
+	  (pack_unpack): Ditto.
+
+	* regint.h (BIT_STATUS_AT): Ditto.
+	  (BS_BIT): Ditto.
+
+	* time.c (time_mdump): Ditto.
+	  (time_mload): Ditto.
+
+	* vm_core.h (VM_FRAME_MAGIC_MASK): Ditto.
+
+	* vm_trace.c (recalc_add_ruby_vm_event_flags): Ditto.
+
+Fri Oct 17 15:06:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (unescape_nonascii): make dynamically compiled US-ASCII
+	  regexps ASCII-8BIT encoding if binary (hexadecimal, control,
+	  meta) escapes are contained, as well as literal regexps.
+	  [ruby-dev:48626] [Bug #10382]
+
+Fri Oct 17 03:05:08 2014  Eric Wong  <e@80x24.org>
+
+	* test/-ext-/bug_reporter/test_bug_reporter.rb
+	  (test_bug_reporter_add): revert r47972
+	* test/ruby/test_rubyoptions.rb (test_segv_test): revert r47971
+	  [ruby-core:65764]
+
+Thu Oct 16 23:17:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (rb_sigaltstack_size): double default size to get rid
+	  of heap corruption by alternate stack overflow in SEGV handler.
+	  typically happened at fprintf() in control_frame_dump().
+
+Thu Oct 16 22:43:12 2014  Tanaka Akira  <akr@fsij.org>
+
+	* vm_backtrace.c (id2str): Fix a variable name.
+	  [ruby-dev:48642] [Bug #10389]
+
+Thu Oct 16 20:01:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_pattern_list): Show number of matched
+	  patterns and characters.
+
+Thu Oct 16 16:26:09 2014  Eric Wong  <e@80x24.org>
+
+	* cont.c (fiber_store): fix WIN32 fibers
+	  [ruby-core:65745] [ruby-core:65758]
+
+Thu Oct 16 15:05:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_here_document): do not append already appended
+	  and disposed code fragment.  [ruby-dev:48647] [Bug #10392]
+
+Thu Oct 16 10:35:33 2014  Eric Wong  <e@80x24.org>
+
+	* test/-ext-/bug_reporter/test_bug_reporter.rb
+	  (test_bug_reporter_add): fix race
+
+Thu Oct 16 10:09:02 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_rubyoptions.rb (test_segv_test): fix race
+
+Thu Oct 16 09:17:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* cont.c (rb_fiber_t): fix compile error caused by move to
+	  vm_core.h at r47964.  [Feature #10341]
+
+Thu Oct 16 08:58:11 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_process.rb (test_deadlock_by_signal_at_forking):
+	  avoid killing wrong parent
+
+Thu Oct 16 08:40:04 2014  Eric Wong  <e@80x24.org>
+
+	* cont.c (fiber_store): restore references to next_fib (fix typo)
+
+Thu Oct 16 08:26:08 2014  Eric Wong  <e@80x24.org>
+
+	* cont.c (fiber_store): remove references to nextfib
+	  fix build when FIBER_USE_NATIVE is 0
+
+Thu Oct 16 06:51:35 2014  Knut Franke  <Knut.Franke@gmx.de>
+
+	* vm_core.h: declare rb_fiber_t typedef
+	  (rb_thread_t): fiber and root_fiber become rb_fiber_t * (from VALUE)
+	* vm.c (rb_thread_mark): use rb_fiber_mark_self
+	* cont.c (rb_fiber_t): prev becomes rb_fiber_t * (from VALUE)
+	  (cont_mark, cont_free): simplify conditions
+	  (rb_fiber_mark_self): new function
+	  (fiber_mark): use rb_fiber_mark_self
+	  (cont_save_thread, cont_restore_thread): inline
+	  (cont_restore_thread): simplify
+	  (fiber_setcontext): simplify conditions
+	  (rb_cont_call): remove dereference
+	  (fiber_t_alloc): update for rb_fiber_t->prev type change
+	  (rb_fiber_start): ditto
+	  (fiber_current): extract from rb_fiber_current
+	  (return_fiber): move, simplify type checks
+	  (rb_fiber_current): use fiber_current
+	  (fiber_store): simplify type checks
+	  (fiber_switch): ditto, simplify call to fiber_setcontext,
+	   use fiber_current
+	  (rb_fiber_transfer): update for type changes
+	  (rb_fiber_terminate): move, use fiber_switch
+	  (rb_fiber_resume): update for type changes
+	  (rb_fiber_reset_root_local_storage): ditto
+	  (rb_fiber_yield): use rb_fiber_switch instead of rb_fiber_transfer
+	  (rb_fiber_m_transfer): ditto
+	  [ruby-core:65518] [Feature #10341]
+
+Thu Oct 16 06:25:29 2014  Knut Franke  <Knut.Franke@gmx.de>
+
+	* cont.c (rb_context_t): comment on saved_thread
+	  (cont_save_thread): sparse copy
+	  (cont_init): copy extra fields
+	  (fiber_init): use current thread VM stack size
+	  [ruby-core:65518] [Feature #10341]
+
+Thu Oct 16 06:13:09 2014  Knut Franke  <Knut.Franke@gmx.de>
+
+	* cont.c (cont_capture): remove unnecessary variable
+	  [ruby-core:65518] [Feature #10341]
+
+Thu Oct 16 05:02:31 2014  Knut Franke  <Knut.Franke@gmx.de>
+
+	* cont.c (fiber_store, fiber_switch): simplify
+	  [ruby-core:65518] [Feature #10341]
+
+Thu Oct 16 04:28:41 2014  Knut Franke  <Knut.Franke@gmx.de>
+
+	* cont.c (rb_fiber_t): remove prev_fiber/next_fiber
+	  (fiber_link_join, fiber_link_remove): remove functions
+	  (fiber_free, fiber_init, root_fiber_alloc):
+	   remove references to removed fields and functions
+	  [ruby-core:65518] [Feature #10341]
+
+Wed Oct 15 22:08:37 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/etc.c (etc_nprocessors_affin): Test CPU_ALLOC availability.
+	  CentOS 5 don't have CPU_ALLOC().
+
+Wed Oct 15 18:26:19 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* ext/etc/etc.c (etc_nprocessors_affinity): use sched_getaffinity
+	  for getting precious number of available cpus.
+
+	* ext/etc/etc.c (etc_nprocessors): use etc_nprocessors_affinity if
+	  possible.
+
+	  [Feature #10267] etc-nprocessors-kosaki2.patch
+
+Wed Oct 15 17:53:28 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_pattern_list) Renamed from
+	  assert_regexp_list.
+	  Show multiline string in multi lines.
+
+	* test/-ext-/bug_reporter/test_bug_reporter.rb: Use
+	  assert_pattern_list.
+
+Wed Oct 15 12:26:58 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (assert_regexp_list): New assertion method.
+
+	* test/ruby/test_rubyoptions.rb: Use assert_regexp_list.
+
+Wed Oct 15 07:21:09 2014  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c: min(n) drops elements bigger than the n-th maximum element.
+	  (struct nmin_data): New field to record the n-th maximum element, limit
+	  (nmin_filter): Update limit field.
+	  (nmin_i): Drop too big elements.
+	  (nmin_run): Initialize limit field.
+
+Wed Oct 15 07:00:14 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_optimization.rb (test_string_size): new test
+
+Wed Oct 15 06:51:13 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_optimization.rb (test_string_eq_neq): new test
+	  (test_string_ltlt): ditto
+
+Wed Oct 15 06:50:29 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_optimization.rb (test_hash_aset_with):
+	  assert assignment
+
+Wed Oct 15 04:56:27 2014  Zachary Scott  <e@zzak.io>
+
+	* gc.c (rb_obj_id): [DOC] Fix typo, clean up sentence, and wrap cols
+
+Wed Oct 15 04:53:30 2014  Zachary Scott  <e@zzak.io>
+
+	* error.c: [DOC] Fix case of type in exception message by @tricknotes
+	  [Fixes GH-740] https://github.com/ruby/ruby/pull/740
+
+	* object.c: ditto
+
+Tue Oct 14 21:39:16 2014  Vit Ondruch  <vondruch@redhat.com>
+
+	* tool/rbinstall.rb (gem): Fix permissions of bundled gems
+	  specification files.  [ruby-core:65700] [Bug #10383]
+
+Tue Oct 14 19:15:31 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_record.c: use typed data.
+
+Tue Oct 14 16:23:12 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbol.c (global_symbols): make ids two-dimensional array of
+	  strings and symbols, for write-barrier.
+
+	* symbol.c (global_symbols): make IDs immortal always, instead
+	  of treating dynamic symbols as IDs.
+
+	* iseq.c, marshal.c, string.c: use rb_str_intern instead of
+	  rb_str_dynamic_intern.
+
+	* symbol.c (rb_str_intern): rename rb_str_dynamic_intern.
+
+Tue Oct 14 10:19:10 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_optimization.rb (test_string_freeze): new test
+	  (test_hash_aref_with): ditto
+	  (test_hash_aset_with): ditto
+
+Tue Oct 14 01:27:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (nmin_run): max(n) and max_by(n) returns an array in
+	  descending order.
+	  [ruby-core:65452] Suggested by David Grayson.
+
+Mon Oct 13 20:44:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (update-gems): chdir to the target directory and then
+	  add the tool directory to load paths, for older BASERUBY.
+	  [Bug #10372][ruby-core:65630]
+
+Mon Oct 13 17:53:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/xmlrpc/parser.rb: added new parser class using libxml-ruby gem.
+	  [Feature #9379][ruby-core:59633]
+	* lib/xmlrpc/config.rb: ditto.
+
+Mon Oct 13 16:32:56 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/find.rb (Find.find): Call to_path for arguments to obtain
+	  strings.
+	  [ruby-core:63713] [Bug #10035] Reported by Herwin.
+
+Mon Oct 13 15:42:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* common.mk: use relative load path for bundled_gems directory.
+	  [Bug #10372][ruby-core:65630]
+
+Mon Oct 13 08:44:06 2014  Zachary Scott  <e@zzak.io>
+
+	* README.EXT: [DOC] fix example missing typedef with patch by
+	  @steveklabnik [Fixes GH-739] https://github.com/ruby/ruby/pull/739
+
+	* README.EXT.ja: ditto.
+
+Mon Oct 13 06:52:09 2014  Eric Wong  <e@80x24.org>
+
+	* array.c (ary_recycle_hash): add RB_GC_GUARD
+	  (rb_ary_diff): remove volatile
+	  [Bug #10369]
+
+Mon Oct 13 03:20:23 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/date/date_core.c: [DOC] Clean up whitespace, examples, and typos
+	  in date_core based on a patch by @vipulnsward [Fixes GH-724]
+	  https://github.com/ruby/ruby/pull/724
+
+Mon Oct 13 02:39:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (remove_duplicate_keys): should not simply eliminate all
+	  value nodes, which may have side effects.
+	  [ruby-core:65625] [Bug #10315]
+
+Sun Oct 12 10:39:16 2014  Zachary Scott  <e@zzak.io>
+
+	* vm.c: [DOC] fix typo by @yui-knk [Fixes GH-738]
+	  https://github.com/ruby/ruby/pull/738
+
+Sun Oct 12 09:24:15 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/test/unit.rb: Hide skips by default.
+
+Sun Oct 12 01:37:11 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* file.c: include sys/time.h only if HAVE_SYS_TIME_H
+
+Sat Oct 11 22:29:40 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* file.c (HAVE_UTIMENSAT): disabled for NativeClient.
+	  Fixes build error.
+
+Sat Oct 11 22:11:58 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* ext/extmk.rb: generates the rule for extinit.$(OBJEXT).
+	  extinit.$(OBJEXT) used to be generated by the builtin rule, thus
+	  didn't accept custom $(CC) and caused linkage error for cross
+	  compiling.
+
+Sat Oct 11 18:46:50 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* include/ruby/intern.h (rb_fd_select): declare struct timeval, or the
+	  struct gets local to the function in C99.
+
+	* file.c (#include): add nacl/stat.h for PNaCl.
+	  (utimes): added a declaration for PNaCl.
+	  (stat_atimespec): stat::st_atimensec is long long but
+	  timespec::tv_nsec is long in PNaCl.
+	  (stat_mtimespec, stat_ctimespec): ditto.
+	  (rb_group_member): disable getgroups unless HAVE_GETGROUPS.
+	  (eaccess): unify the fallback to generic defined(USE_GETEUID).
+
+	* io.c: include sys/time.h for struct timeval.
+	  (rb_close_before_exec): nothing we can do if F_GETFD is not
+	  available.
+	  (ioctl): pnacl newlib actually doesn't have ioctl.
+
+	* process.c (maxgroups): it is used iff
+	   defined(_SC_NGROUPS_MAX) || defined(NGROUPS_MAX) but not
+	   defined(HAVE_GETGROUPS) || defined(HAVE_SETGROUPS).
+	  (obj2gid): fail unless the object is a Fixnum if getgrnam is not
+	  available.
+	  (disable_child_handler_fork_child): sigaction is not available in
+	  PNaCl newlib.
+
+	* configure.in (warnflags, strict_warnflags): avoid -ansi for strlcpy.
+	  (rb_cv_gcc_atomic_builtins): also check
+	  __atomic_or_etch because it is used in ruby_atomic.h.
+	  (rb_cv_gcc_sync_builtins): ditto.
+	  (HAVE_GETGRNAM): added.
+
+Sat Oct 11 15:32:08 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (iseq_build_from_ary_exception): move RB_GC_GUARD
+	  (iseq_build_from_ary_body): use PRIsVALUE instead of RB_GC_GUARD
+
+Sat Oct 11 14:57:08 2014  Eric Wong  <e@80x24.org>
+
+	* string.c (rb_str_intern): remove unnecessary RB_GC_GUARD
+
+Sat Oct 11 13:47:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (remove_duplicate_keys): remove duplicate literal keys,
+	  i.e., symbols and strings.  [ruby-core:65368] [Bug #10315]
+
+	* vm.c (kwmerge_i): override existing keys by new keys.
+	  [ruby-core:65368] [Bug #10315]
+
+	* parse.y (assocs): concatenate splatted literal hashes.  the
+	  former key has precedence even if duplicated literal keys
+	  follow.  [ruby-core:65368] [Bug #10315]
+
+Sat Oct 11 12:27:03 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* configure.in (RUBY_NACL): automatically locate pnacl-clang.
+	  (RUBY_PLATFORM): pnacl instead of le32-nacl.
+
+Sat Oct 11 11:27:14 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* io.c: fix issues in the last two commits. don't disable cloexec for
+	  platforms other than NativeClient.
+
+	* ChangeLog: ditto. add entries for the last two commits.
+
+Sat Oct 11 11:12:00 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* signal.c (install_signalhandler, init_sigchld): allow failure because it
+	  always fails with ENOSYS on NaCl.
+
+Sat Oct 11 11:11:53 2014  Yuki Yugui Sonoda  <yugui@yugui.jp>
+
+	* configure.in (RUBY_NACL and others): merge patch from naclports. Supports PNaCl.
+
+	* dln.c: ditto. replace the old hacky dynamic loading over HTTP with nacl_io.
+
+	* file.c: ditto. tentatively use access(2) instead of eaccess.
+	  (rb_file_load_ok): weaken with attribute but not by postprocess.
+
+	* io.c: ditto.
+	  (socket.h): now NaCl has socket.h
+	  (flock): disable here instead of nacl/ioctl.h
+
+	* nacl/GNUmakefile.in: ditto.
+	  (CC, LD, NM, AR, AS, RANLIB, OBJDUMP, OBJCOPY):
+	  respect path to them if they are absolute.
+	  This helps naclports to build ruby in their source tree.
+	  (PROGRAM_NMF, .SUFFIXES): support .pnexe for PNaCl.
+	  (ruby.o, file.o): move the hack to attributes in ruby.c and file.c
+
+	* nacl/ioctl.h: ditto. removed. move the hack to io.c.
+
+	* nacl/nacl-config.rb: ditto. support arm, pnacl and others.
+
+	* nacl/pepper_main.c: ditto. support build in a naclports tree.
+
+	* ruby.c (rb_load_file): ditto. weaken with attribute but not by postprocess.
+
+Sat Oct 11 09:32:00 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/socket/unixsocket.c: [DOC] Fix example to render in HTML
+	  properly, with a patch by @eval [Fixes GH-733]
+	  https://github.com/ruby/ruby/pull/733
+
+Sat Oct 11 04:14:41 2014  Kir Shatrov  <shatrov@me.com>
+
+	* lib/open-uri.rb (OpenURI::Options): add :open_timeout default
+	* (def OpenURI.open_http): check :open_timeout option
+	* (module OpenURI): rdoc for :open_timeout
+	* test/open-uri/test_open-uri.rb (test_open_timeout): new test
+	  [Feature #10361]
+
+Fri Oct 10 11:27:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/io.h (rb_io_mode_flags, rb_io_modenum_flags):
+	  deprecate old macros for compatibility for ruby 1.8 and older.
+
+Thu Oct  9 23:31:47 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* bignum.c (absint_numwords_generic): set an array element after
+	  definition of a variable to fix compile error with older version
+	  of fcc (Fujitsu C Compiler) 5.6 on Solaris 10 on Sparc.
+	  [Bug #10350] [ruby-dev:48608]
+
+Thu Oct  9 16:15:26 2014  Eric Wong  <e@80x24.org>
+
+	* ext/-test-/st/foreach/extconf.rb: new file
+	* ext/-test-/st/foreach/foreach.c: ditto
+	* test/-ext-/st/test_foreach.rb: ditto
+	  [Feature #10321]
+
+Thu Oct  9 12:40:28 2014  Eric Wong  <e@80x24.org>
+
+	* benchmark/bm_hash_aref_sym*.rb: force static symbols
+
+Thu Oct  9 12:38:28 2014  Eric Wong  <e@80x24.org>
+
+	* hash.c (rb_any_hash): remove unnecessary dsym check
+
+Thu Oct  9 07:20:30 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* missing/setproctitle.c: Avoid invalidating argv[1], argv[2],
+	  etc. until the first call to Process.setproctitle, because
+	  the ps command of AIX refers to the argv array.
+	  [Bug #10090]
+
+Thu Oct  9 00:53:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (dir_s_aref): fix rdoc.  `Dir.glob` allows an array but
+	  `Dir[]` not.  the former accepts an optional parameter `flags`,
+	  while the latter accepts arbitrary number of arguments but no
+	  `flags`.  [ruby-core:65265] [Bug #10294]
+
+Wed Oct  8 21:44:10 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_variable.c: use typed data.
+
+Wed Oct  8 16:36:47 2014  gogo tanaka  <mail@tanakakazuki.com>
+
+	* test/ruby/test_syntax.rb: added syntax tests of underscore
+	  arguments.  [Feature #10340][ruby-core:65496]
+
+Wed Oct  8 07:42:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI#inspect): remove Object id.
+	  URI is considered that it doesn't require id.
+
+Wed Oct  8 05:22:42 2014  Eric Wong  <e@80x24.org>
+
+	* ext/etc/etc.c (etc_systmpdir): set default tmplen correctly
+	  Fixup r47826
+
+Wed Oct  8 05:16:32 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add @- and @+ for Matrix and Vector.
+	  patch by gogo tanaka [#10068] [#10069]
+
+Wed Oct  8 04:58:48 2014  John Bachir  <j@jjb.cc>
+
+	* bootstraptest/test_io.rb (assert_finish):
+	  normalize rescue for Timeout::Error
+	* lib/net/ftp.rb (Net#read_timeout): ditto for doc
+	* lib/resolv.rb (Resolv::ResolvTimeout): ditto for subclass
+	* lib/webrick/httprequest.rb (_read_data): ditto for rescue
+	* sample/timeout.rb (p timeout): ditto for call
+	* test/drb/drbtest.rb (test_06_timeout): ditto
+	* test/ruby/test_readpartial.rb (test_open_pipe): ditto
+	* test/thread/test_queue.rb (test_queue_thread_raise): ditto
+	* thread.c (rb_thread_s_handle_interrupt): ditto for doc
+	  [ruby-core:65481] [misc #10339]
+
+Wed Oct  8 04:38:29 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/ruby/test_process.rb (TestProcess#test_setsid): AIX
+	  does not allow Process::getsid(pid) when pid is in a
+	  different session.
+
+Wed Oct  8 04:33:04 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/ruby/test_rubyoptions.rb (TestRubyOptions#test_encoding):
+	  On AIX, locale_charmap is ISO-8859-1 with LANG=C.  This means
+	  the source encoding of stdin is ISO-8859-1, so "invalid
+	  multibyte char" error does not occur.
+
+Wed Oct  8 04:30:29 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add Matrix#laplace_expansion.
+	  patch by gogo tanaka [#10073]
+
+Wed Oct  8 04:29:21 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add Vector.basis.
+	  Based on patch by gogo tanaka [#10072]
+
+Tue Oct  7 23:40:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (rb_f_kill): get rid of deadlock as unhandled and
+	  discarded signals do not make interrupt_cond signaled.
+	  based on the patch by Kazuki Tsujimoto at [ruby-dev:48606].
+	  [Bug #9820]
+
+Tue Oct  7 22:43:44 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_method.c: use typed data.
+
+Tue Oct  7 21:47:05 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_param.c: refactoring.
+
+Tue Oct  7 21:40:17 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_method.c: refactoring. add
+	  olemethod_data_get_struct to wrap Data_Get_Struct.
+	* ext/win32ole/win32ole_method.h: ditto.
+
+	* ext/win32ole/win32ole_param.c (oleparam_ole_param):
+	  call olemethod_data_get_struct instead of Data_Get_Struct.
+
+Tue Oct  7 11:17:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_systmpdir): try user temporary directory by
+	  confstr() on Mac OS X.
+	  c.f. http://www.opensource.apple.com/source/ruby/ruby-104/patches/ext_etc_etc.c.diff
+
+Tue Oct  7 10:48:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (struct stat.st_size): prefer off_t over int, long,
+	  and so on.  inspired by
+	  http://www.opensource.apple.com/source/ruby/ruby-104/patches/config.h.ed
+
+Tue Oct  7 10:37:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_UNIVERSAL_ARCH): fix missing quoting
+	  brackets.  incorporated from
+	  http://www.opensource.apple.com/source/ruby/ruby-104/patches/configure.diff
+
+Mon Oct  6 23:34:42 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_param.c: use typed data.
+
+Mon Oct  6 22:37:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbol.h (struct RSymbol): move from internal.h.
+
+Mon Oct  6 21:43:03 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* error.c: update exception tree. [DOC]
+	  reported by @hemge via twitter.
+
+Mon Oct  6 18:43:03 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* configure.in: Fix typo. [Bug #9914]
+
+Mon Oct  6 16:23:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (rb_f_kill): should not ignore signal unless the
+	  default handler is registered.  [ruby-dev:48592] [Bug #9820]
+
+Mon Oct  6 16:07:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_string.rb (test_LSHIFT_neary_long_max): enable
+	  only on platforms where string size range is smaller than memory
+	  space.  this test does not make sense but just wastes memory and
+	  time on other platforms, as it is hardly possible that a string
+	  size becomes neary LONG_MAX if long size equals pointer size.
+	  [ruby-core:65410] [Bug #10325]
+
+Mon Oct  6 11:21:21 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/unicode_norm_gen.rb: Adding/tweaking comments.
+
+Mon Oct  6 10:57:57 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/unicode_norm_gen.rb: Adjusted directory paths.
+
+Mon Oct  6 10:27:27 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/unicode_norm_gen.rb: Data generation script imported from
+	  https://github.com/duerst/eprun/blob/master/lib/generate.rb
+
+Mon Oct  6 10:15:15 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/downloader.rb: Adjust example in documentation for
+	  Downloader.download.
+
+Mon Oct  6 10:07:07 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* lib/unicode_normalize: New folder for Unicode normalization
+	  functionality
+
+Sun Oct  5 11:04:13 2014  Luiz Angelo Daros de Luca  <luizluca@gmail.com>
+
+	* ext/digest/{md5,rmd160,sha1,sha2}/extconf.rb: configure OpenSSL
+	  only if bundled libraries is not used, so that OpenSSL is not
+	  linked unnecessarily.  [ruby-core:65404] [Bug #10324]
+
+Sun Oct  5 10:39:11 2014  Luiz Angelo Daros de Luca  <luizluca@gmail.com>
+
+	* ext/digest/rmd160/extconf.rb: fix transform function name to
+	  check.  [ruby-core:65091] [Bug #10252]
+
+Sun Oct  5 05:46:00 2014  Eric Wong  <e@80x24.org>
+
+	* ext/zlib/zlib.c (zstream_mark, zstream_free): update signature
+	  (gzfile_mark, gzfile_free): ditto
+	  (zstream_memsize): new function for rb_data_type->dsize
+	  (gzfile_memsize): ditto
+	  (zstream_data_type, gzfile_data_type): new data types
+	  (zstream_new): Data_Make_Struct => TypedData_Make_Struct
+	  (gzfile_new): ditto
+	  (get_zstream, get_gzfile): Data_Get_Struct => TypedData_Get_Struct
+	  (rb_zstream_flush_next_in): ditto
+	  (rb_zstream_flush_next_out): ditto
+	  (rb_zstream_avail_out): ditto
+	  (rb_zstream_avail_in): ditto
+	  (rb_zstream_closed_p): ditto
+	  (rb_deflate_initialize): ditto
+	  (rb_deflate_init_copy): ditto
+	  (rb_inflate_initialize): ditto
+	  (gzfile_ensure_close): ditto
+	  (rb_gzfile_closed_p): ditto
+	  (rb_gzfile_path): ditto
+	  (rb_gzwriter_initialize): ditto
+	  (rb_gzreader_initialize): ditto
+	  (rb_gzreader_unused): ditto
+	  [ruby-core:65377] [Feature #10319]
+
+Sat Oct  4 16:24:41 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/test_syslog.rb (TestSyslog#test_log): In AIX, each output
+	  line of LOG_PERROR to stderr has an additional empty line appended,
+	  so skip that line.
+
+Sat Oct  4 16:05:49 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/socket/test_unix.rb (TestSocket_UNIXSocket#test_too_long_path):
+	  sockaddr_un.sun_path in AIX is defined as char[1024],
+	  so "a" * 300 is not too long. "a" * 3000 would be enough.
+
+Sat Oct  4 09:12:03 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/win32ole/sample/example*.rb: Add wait input to quit for examples
+	  with patch provided by @windwiny [Fixes GH-705]
+	  https://github.com/ruby/ruby/pull/705
+
+Sat Oct  4 09:08:18 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/win32ole/win32ole.c: [DOC] Fix typo in :nodoc: reported by
+	  @windwiny to [Fix GH-705] https://github.com/ruby/ruby/pull/705
+
+	* ext/pty/pty.c: ditto
+
+Sat Oct  4 08:59:45 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_rand.c: [DOC] Add call signature for pseudo_bytes
+	  and random_bytes, wrap lines at 80 chars, and remove useless
+	  comments.
+
+Sat Oct  4 08:49:34 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_rand.c: [DOC] Add rdoc for method descriptions
+	  By @vipulnsward [Fixes GH-657] https://github.com/ruby/ruby/pull/657
+
+Sat Oct  4 08:23:48 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_rand.c: Use rb_define_module_function instead of
+	  macro. [Fixes GH-686] https://github.com/ruby/ruby/pull/686
+
+Sat Oct  4 06:04:56 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_method.c(olemethod_set_member): remove
+	  redundant NULL check.
+	* ext/win32ole/win32ole_type.c(oletype_set_member): ditto.
+
+Sat Oct  4 00:25:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: removed needless preparation for gcc.
+
+Fri Oct  3 23:41:20 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: enabled gcc build with osx on travis.
+
+Fri Oct  3 23:22:23 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* template/fake.rb.in: fix make install failure due to MSYS path
+	  with mingw on MSYS environment.
+	  [ruby-core:64965] [Bug #10230]
+
+Fri Oct  3 21:02:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_io.rb (TestIO#test_advise): avoid to infinite loop.
+
+Fri Oct  3 19:26:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: enabled test results of linux.
+
+Fri Oct  3 18:52:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_io.rb (TestIO#test_advise): added workaround of fadvise(2)
+	  with tmpfs and old linux kernel. [ruby-core:65355][Bug #10313]
+
+Fri Oct  3 18:22:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: Disabled to generate document on travis.
+	  Reduce test running time.
+
+Fri Oct  3 12:42:15 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add hstack & vstack methods.
+	  Based on a patch by creasywuqiong. [Fix GH-344]
+
+Fri Oct  3 12:37:48 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Fix Matrix.rows copy bug.
+	  Patch by Arron Mabrey. [Fix GH-707]
+
+Fri Oct  3 06:06:28 2014  Eric Wong  <e@80x24.org>
+
+	* st.c (next_pow2): new function (from old bignum.c)
+	  (new_size): use next_pow2 function
+
+Fri Oct  3 05:58:58 2014  Eric Wong  <e@80x24.org>
+
+	* vm_trace.c (rb_tp_t): pack 56 => 48 bytes on 64-bit
+
+Thu Oct  2 18:41:45 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_nprocessors): Windows support.
+	  see [Feature #10267]
+
+Thu Oct  2 12:21:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/etc.c (etc_nprocessors): New method.
+	  Accepted by matz at RubyKaigi 2014.
+	  [ruby-core:65142] [Feature #10267]
+
+Thu Oct  2 07:56:49 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.c (rb_iseq_line_trace_each): explicit cast
+	  Fix https://travis-ci.org/ruby/ruby/jobs/36814282
+
+Thu Oct  2 05:40:05 2014  Eric Wong  <e@80x24.org>
+
+	* ruby.h: set rb_event_flag_t to uint32_t
+	  [ruby-core:65315] [misc #10249]
+
+Thu Oct  2 05:32:17 2014  Eric Wong  <e@80x24.org>
+
+	* io.c (fptr_finalize): free memory before GC sweep
+	  [ruby-core:65269] [Feature #10295]
+
+Thu Oct  2 05:27:24 2014  Eric Wong  <e@80x24.org>
+
+	* marshal.c (w_class): check dump_arg->compat_tbl before lookup
+	  (w_object): lazy init ->compat_tbl before insert
+	  (obj_alloc_by_class): ditto
+	  (clear_dump_arg): free only non-NULL ->compat_tbl
+	  (clear_load_arg): ditto for ->compat_tbl
+	  (marshal_dump): ->compat_tbl defaults to zero
+	  (marshal_load): ditto for ->compat_tbl
+	  (r_entry0): check l->compat_tbl before lookup
+	  (r_fixup_compat): ditto
+	  [ruby-core:65305] [Feature #10302]
+
+Wed Oct  1 21:14:34 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_type.c: use typed data.
+
+Wed Oct  1 18:15:42 2014  Nolan Evans  <nolane@gmail.com>
+
+	* compile.c: remove commented out code.
+
+Wed Oct  1 17:38:53 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* test/fileutils/test_fileutils.rb: AIX does not allow
+	  a sticky bit on a regular file.
+
+Wed Oct  1 17:31:41 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* NEWS:  Add RubyGems update.
+
+Wed Oct  1 17:28:58 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems:  Update to RubyGems 2.4.2.
+	* test/rubygems:  ditto.
+
+Tue Sep 30 22:25:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_data_type): separate ripper data type for from
+	  parser.
+
+Tue Sep 30 18:46:31 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_typelib.c: use typed data.
+
+Tue Sep 30 09:51:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* common.mk: fixed broken reference of update-config_files task
+
+Mon Sep 29 22:54:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/file.c (append_wstr): set expanded length, not length of
+	  appended string.  fix "probable buffer overflow" bug.
+	  [ruby-core:65317] [Bug #10304]
+
+	* string.c (str_make_independent_expand): drop NOFREE flag after
+	  reallocation, static buffer is not pointed anymore.
+	  [ruby-core:65317] [Bug #10304]
+
+Sun Sep 28 23:59:17 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* gc.c (rb_gcdebug_print_obj_condition): use RVALUE_REMEMBERED
+	  because GET_HEAP_REMEMBERSET_BITS is obsoleted.
+
+Sun Sep 28 11:14:14 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* common.mk: Created new target update-unicode to download
+	  some Unicode data files.
+
+Fri Sep 26 15:03:19 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/uri/rfc3986_parser.rb: raise URI::InvalidURIError when
+	  uri doesn't respond to #to_str. [ruby-core:64453] [Bug #10150]
+
+	* test/uri/test_parser.rb: test for above.
+
+Sat Sep 27 10:31:48 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* gems/bundled_gems: upgraded to power_assert 0.1.4.
+
+Fri Sep 26 12:52:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_write): ASCII-8BIT StringIO
+	  should be writable any encoding strings, without conversion.
+	  [ruby-core:65240] [Bug #10285]
+
+Fri Sep 26 05:21:01 2014  Eric Wong  <e@80x24.org>
+
+	* object.c (rb_class_real): do not dereference 0 VALUE
+
+	* test/ruby/test_module.rb (test_inspect_segfault):
+	  Test case and bug report by Thomas Stratmann.
+	  [ruby-core:65214] [Bug #10282]
+
+Fri Sep 26 05:12:10 2014  Eric Wong  <e@80x24.org>
+
+	* man/ruby.1: document stack size env variables
+	  [Feature #10197]
+
+Thu Sep 25 19:37:34 2014  Eric Wong  <e@80x24.org>
+
+	* io.c (free_io_buffer): new function for a common pattern
+	  (clear_readconv): use free_io_buffer
+	  (rb_io_fptr_finalize): ditto
+
+Thu Sep 25 07:51:07 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/matrix.rb: Fix docs. Patched by Ben Woodall. [GH-726]
+
+Wed Sep 24 19:04:04 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* enc/unicode/data: New directory for downloaded Unicode
+	  data files.
+
+Wed Sep 24 18:59:59 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/downloader.rb: Adjusting example for
+	  Downloader.download to implementation changes in r47693.
+
+Wed Sep 24 18:06:06 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/downloader.rb: Removing unused method
+	  Downloader.download_if_modified_since.
+	  (if ever used, just replace with Downloader.download)
+
+Wed Sep 24 17:59:59 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/downloader.rb: Fixing raise after return.
+
+Wed Sep 24 17:55:55 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/downloader.rb: Made Unicode data file location available
+	  via :unicode Symbol.
+
+Wed Sep 24 10:45:45 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/downloader.rb: Small fix to documentation comment.
+
+Tue Sep 23 22:00:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parse_ident): just after a label, new expression should
+	  start, cannot be a modifier.  [ruby-core:65211] [Bug #10279]
+
+Tue Sep 23 16:07:07 2014  Martin Duerst <duerst@it.aoyama.ac.jp>
+
+	* tool/downloader.rb: added Downloader.download_if_modified_since
+	  to reduce downloads of large files that change only rarely.
+	  [ruby-core:65164] [CommonRuby - Feature #10084]
+
+Tue Sep 23 11:55:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: added rubyspec into travis tasks and eliminate to stdout.
+
+Mon Sep 22 20:00:29 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_variant.rb
+	  (test_conversion_time2date_with_msec): test by using only
+	  assert_in_delta  to avoid to fail when converting Time object with
+	  999999999 nanoseconds into VT_DATE Variant.
+
+Mon Sep 22 19:49:12 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/syntax/methods.rdoc: [DOC] [] and []= methods by @process
+	  [Fixes GH-662] https://github.com/ruby/ruby/pull/662
+
+Mon Sep 22 18:21:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: Only osx build is enabled. linux builds is random failure
+	  and test results of major linux is covered by rubyci.
+
+Mon Sep 22 12:10:29 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_time_tz.rb: Fix test error with tzdata-2014g.
+	  [ruby-core:65058] [Bug #10245] Reported by Vit Ondruch.
+
+Mon Sep 22 09:28:43 2014  Eric Wong  <e@80x24.org>
+
+	* ext/socket/ancdata.c ({send,recv}msg_args_struct): 24 => 16 bytes
+	* ext/socket/init.c (connect_arg): ditto
+	* ext/socket/raddrinfo.c (getnameinfo_arg): 56 => 48 bytes
+	  (reductions only for 64-bit systems)
+
+Mon Sep 22 02:04:25 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/drb/drb.rb: Support graceful shutdown.
+	  (DRbTCPSocket#initialize): Create a pipe for shutdown notification.
+	  (DRbTCPSocket#close): Invoke close_shutdown_pipe.
+	  (DRbTCPSocket#close_shutdown_pipe): New private method.
+	  (DRbTCPSocket#accept): Use accept_or_shutdown.
+	  (DRbTCPSocket#accept_or_shutdown): New private method which returns
+	  nil on shutdown.
+	  (DRbServer#stop_service): Use shutdown instead of Thread#kill.
+	  (DRbServer#run): Break infinite loop when main_loop returns nil.
+	  (DRbServer#main_loop): @protocol.accept may return nil.
+
+	* lib/drb/ssl.rb: Follow above change.
+
+	* lib/drb/unix.rb: Ditto.
+
+Sun Sep 21 13:54:36 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* time.c: raise exception when minutes of utc_offset is out of 00-59.
+	  patch is from Kenichi Kamiya.
+	  [ruby-dev:47539] [Bug #8679]
+
+	* test/ruby/test_time.rb: test for above.
+	  patch is from Kenichi Kamiya.
+
+Sun Sep 21 19:04:08 2014  Narihiro Nakamura <authornari@gmail.com>
+
+	* st.c (do_hash_bin): unused macro.
+
+Sun Sep 21 18:45:01 2014  Narihiro Nakamura <authornari@gmail.com>
+
+	* parse.y (parser_class_nest): unused variable after YARV
+	  merged (r11439).
+
+Sun Sep 21 18:14:03 2014  Narihiro Nakamura <authornari@gmail.com>
+
+	* st.c (numberof): unused. internal.h has same macro.
+
+	* node.c (F_CUSTOM2): unused.
+
+Sun Sep 21 14:11:23 2014  Tanaka Akira  <akr@fsij.org>
+
+	* thread_pthread.c (native_set_thread_name): New function to
+	  set thread name visible with ps command on GNU/Linux.
+	  Ex. ps -o %c -L
+
+	* thread.c (thread_start_func_2): Call native_set_thread_name at
+	  beginning.
+	  (rb_thread_inspect_msg): Extract from rb_thread_inspect.
+
+Sun Sep 21 12:49:11 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.c (rb_iseq_defined_string): trim redundant semi-colon
+
+Sun Sep 21 12:19:29 2014  Eric Wong  <e@80x24.org>
+
+	* file.c (rb_find_file_ext_safe): clear tmp buffer on failure
+	  (rb_find_file_safe): ditto
+
+Sat Sep 20 04:42:18 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/csv.rb: avoid unnecessary object allocations.
+	  patch is from Andrew Vit. [ruby-core:63215] [Feature #9952]
+
+Sun Sep 21 12:10:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rexml/**/*.rb: removed commented-out code.
+
+Sat Sep 20 03:46:58 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* array.c: use rb_equal_opt() for performance improvement.
+	  [ruby-core:64954] [Feature #10227]
+
+Sun Sep 21 11:16:56 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (rbtime2vtdate, vtdate2rbtime): fix
+	  the bug in conversion of milliseconds. [Bug #10258]
+
+	* test/win32ole/test_win32ole_variant.rb
+	  (test_conversion_dbl2date_with_msec,
+	  test_conversion_time2date_with_msec): use assert_in_delta instead
+	  of assert_equal to treat an acceptable error range.
+
+Sun Sep 21 11:03:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (ruby_signal): although "EINVAL from sigaction(2) is
+	  not a bug", but even it is a failure.  pointed at toRuby/guRuby
+	  in RubyHiroba.
+
+Sat Sep 20 03:00:26 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/tempfile.rb: define parameters appropriately and some
+	  refactoring.
+
+	* lib/tmpdir.rb: ditto.
+
+Sat Sep 20 23:58:21 2014  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_chunk): Deprecate the state management.
+	  (enum_slice_before): Ditto.
+
+Sat Sep 20 15:39:11 2014  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c (enum_slice_when): New method: Enumerable#slice_when.
+	  (slicewhen_i): New function.
+	  (slicewhen_ii): New function.
+
+	* enumerator.c (InitVM_Enumerator): New method:
+	  Enumerator::Lazy#slice_when.
+
+	  [ruby-core:62499] [Feature #9826]
+
+Sat Sep 20 11:55:19 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .travis.yml: added new configurations for osx on travis ci.
+	  [fix GH-723]
+	* test/ruby/test_object.rb: tweaked to memory leak limit for osx build.
+
+Sat Sep 20 10:48:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assoc): allow quoted ID as a key of a hash literal.
+	  [ruby-core:34453] [Feature #4276]
+
+Sat Sep 20 10:23:00 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_set_arguments): store local variable IDs in
+	  temporary list as Symbols.  previously these are stored as
+	  Fixnums to prevent from GC, but IDs of dynamic symbols can
+	  exceed Fixnum range and cause RangeError at inverting from
+	  Fixnum.  [ruby-dev:48564] [Bug #10266]
+
+Sat Sep 20 10:02:51 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/lib/openssl/x509.rb (OpenSSL::X509::Name#pretty_print):
+	  New method.
+	  (OpenSSL::X509::Certificate#pretty_print): Ditto.
+
+	* ext/openssl/lib/openssl/bn.rb (OpenSSL::BN#pretty_print): Ditto.
+
+Sat Sep 20 07:55:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (eval_string_with_cref): fix super from eval with
+	  scope.  set klass in the current control frame to the class of
+	  the receiver in the context to be evaluated, this class/module
+	  must match the actual receiver to call super.
+	  [ruby-core:65122] [Bug #10263]
+
+Fri Sep 19 20:06:00 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbol.c (rb_str_dynamic_intern): check if the stem ID of
+	  attrset ID is already registered as a static ID.
+	  [ruby-dev:48559] [Bug #10259]
+
+Fri Sep 19 15:48:09 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/Makefile.sub (VCSUP): nothing to do if this worktree is not
+	  under any VCS (it means that the worktree may be from the release
+	  package).
+
+Fri Sep 19 10:47:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_math.rb (TestMath#assert_infinity): Float#finite?
+	  returns true also for NaN, so use Float#infinite? instead.
+	  [ruby-core:65117] [Feature #10261]
+
+Fri Sep 19 05:36:16 2014  Eric Wong  <e@80x24.org>
+
+	* NEWS: note --with-jemalloc option [ci skip]
+
+Thu Sep 18 16:26:27 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem_commands_setup_command.rb: @ui uses StringIO
+	  as its streams, and Encoding.default_external does not effect to
+	  StringIOs already exist.  so, we need to set external_encoding of
+	  @ui.outs directly.  this problem (test failure) does not appear in
+	  the environments default_external is us-ascii or utf-8.
+
+Thu Sep 18 15:02:15 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/rubygems/test_gem_specification.rb: '/' is not always the root.
+
+Thu Sep 18 09:36:37 2014  Scott Francis  <scott.francis@shopify.com>
+
+	* vm_method.c (Init_Method): make global method cache size
+	  configurable by environment variable
+	  "RUBY_GLOBAL_METHOD_CACHE_SIZE"  [Fix GH-719]
+
+Thu Sep 18 07:03:36 2014  Eric Wong  <e@80x24.org>
+
+	* test/-ext-/string/test_modify_expand.rb: increase limit
+	  for {je,tc}malloc [Bug #10236]
+
+Thu Sep 18 06:41:18 2014  Eric Wong  <e@80x24.org>
+
+	* ext/zlib/zlib.c (struct gzfile): pack (288 => 272 bytes) on 64-bit
+
+Thu Sep 18 05:44:05 2014  Eric Wong  <e@80x24.org>
+
+	* ext/socket/init.c (rsock_connect): refactor for blocking
+	  (wait_connectable): clear error before wait
+	  [Bug #9356]
+
+Wed Sep 17 23:12:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/rfc3986_parser.rb: specify a regexp for :OPAQUE; generic.rb
+	  assumes it is present, and will refuse all values otherwise.
+	  by Matthew Draper <matthew@trebex.net>
+	  https://github.com/ruby/ruby/pull/718 fix GH-718
+
+Wed Sep 17 16:22:58 2014  Eric Wong  <e@80x24.org>
+
+	* ext/zlib/zlib.c (zlib_mem_alloc): check overflow
+
+Wed Sep 17 11:33:35 2014  Laurent Arnoud  <laurent@spkdev.net>
+
+	* test/fiddle/test_import.rb (Fiddle::TestImport#test_sizeof):
+	  added test for long long [fix GH-716]
+
+Wed Sep 17 11:09:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/rbinstall.rb: fixed invalid options with latest rubygems.
+	  https://github.com/rubygems/rubygems/issues/1013
+
+Tue Sep 16 19:19:00 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* benchmark/bm_app_aobench.rb: update outdated links to the
+	  original program.  [ruby-dev:48550] [Feature #10247]
+
+Tue Sep 16 01:06:40 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* reg*.c: Merge Onigmo 5.15.0 38a870960aa7370051a3544
+
+Mon Sep 15 16:21:10 2014  Eric Wong  <e@80x24.org>
+
+	* io.c (struct io_advise_struct): 32 => 24 bytes on 64-bit
+	* io.c (struct io_internal_writev_struct): 24 => 16 bytes on 64-bit
+	* process.c (struct waitpid_arg): ditto
+
+Mon Sep 15 10:29:25 2014  Natalie Weizenbaum  <nweiz@google.com>
+
+	* ext/pathname/lib/pathname.rb (SAME_PATHS):
+	  Pathname#relative_path_from uses String#casecmp to compare strings
+	  on case-insensitive filesystem platforms (e.g., Windows). This can
+	  return nil for strings with different encodings, and the code
+	  previously assumed that it always returned a Fixnum.  [Fix GH-713]
+
+Mon Sep 15 09:43:18 2014  Sho Hashimoto  <sho.hsmt@gmail.com>
+
+	* ext/fiddle/lib/fiddle/import.rb (Fiddle::Importer#sizeof): fix typo,
+	  SIZEOF_LONG_LON.  [Fix GH-714]
+
+Mon Sep 15 08:13:40 2014  Matthew Draper  <matthew@trebex.net>
+
+	* sprintf.c (rb_str_format): rational 'f' format works for more
+	  values.  [fix GH-717]
+
+Sun Sep 14 16:57:27 2014  Eric Wong  <e@80x24.org>
+
+	* template/vm.inc.tmpl: "insns.c" => "insns.def"
+	* tool/instruction.rb: typo fix
+
+Sun Sep 14 12:29:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_tracer.rb: fixed testcase for rubygems update.
+
+Sun Sep 14 12:29:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems:  Update to RubyGems 2.4.1 master(713ab65)
+	  Complete history at:
+	  https://github.com/rubygems/rubygems/blob/master/History.txt#L3-L216
+
+	* test/rubygems:  ditto.
+
+Sun Sep 14 11:03:24 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych.rb: update version
+	* ext/psych/psych.gemspec: ditto
+
+Sun Sep 14 08:43:37 2014  Eric Wong  <e@80x24.org>
+
+	* ccan/container_of/container_of.h (container_of_or_null): added
+	  [ccan 7ec5b8e06b2fd5fa98b1fcde1158c286d2d429d8] (David Gibson)
+
+Sun Sep 14 08:41:44 2014  Eric Wong  <e@80x24.org>
+
+	* ccan/list/list.h (list_del_init, list_node_init): new functions
+	  for multiple list_del() calls
+	  [ccan ec8654d94d3c5c47aa5f82698f7e8048c79765b1] (Rusty Russell)
+
+Sat Sep 13 22:19:26 2014  Bernard Potocki  <bernard.potocki@imanel.org>
+
+	* hash.c (rb_hash_aset): fix misleading example which may suggest
+	  that Hash.store will return self instead of value - Hash#store
+	  is returning value and update itself, as well as Hash#[]=.
+	  [Fix GH-715]
+
+Sat Sep 13 15:16:31 2014  Eric Wong  <e@80x24.org>
+
+	* class.c: use ALLOC(rb_subclass_entry_t)
+
+Sat Sep 13 14:14:00 2014  Eric Wong  <e@80x24.org>
+
+	* process.c (free_exec_arg): remove
+	  (memsize_exec_arg): ptr is never NULL
+	  (exec_arg_data_type): use RUBY_TYPED_DEFAULT_FREE
+
+	* variable.c (autoload_i_free): remove
+	  (autoload_data_i_type): use RUBY_TYPED_DEFAULT_FREE
+	  (autoload_memsize): ptr is never NULL
+
+	* vm_backtrace.c (location_free): remove
+	  (location_mark): ptr is never NULL
+	  (location_data_type): use RUBY_TYPED_DEFAULT_FREE
+	  (backtrace_mark): ditto
+	  (backtrace_free): ditto
+
+Sat Sep 13 13:43:07 2014  Eric Wong  <e@80x24.org>
+
+	* doc/NEWS-2.0.0: fix typo for default RUBY_FIBER_MACHINE_STACK_SIZE
+	  [ci skip]
+
+Sat Sep 13 11:16:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_event.c(ev_advise, ole_event_free,
+	  fev_s_allocate, fev_unadvise): avoid segmentation fault when COM
+	  server freed before calling Unadvise from WIN32OLE_EVENT object.
+	* ext/win32ole/win32ole.c: ditto.
+
+Sat Sep 13 09:47:44 2014  Eric Wong  <e@80x24.org>
+
+	* man/ruby.1: use https for *.ruby-lang.org links
+
+Sat Sep 13 06:31:23 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (thread_alloc): remove needless volatile
+
+Sat Sep 13 06:13:55 2014  Eric Wong  <e@80x24.org>
+
+	* proc.c (proc_free): remove, use RUBY_TYPED_DEFAULT_FREE
+	  (proc_mark, proc_memsize): remove needless branching
+
+	* vm.c (env_free): remove, use RUBY_TYPED_DEFAULT_FREE
+	  (env_mark, env_memsize): remove needless branching
+
+Sat Sep 13 05:52:15 2014  Eric Wong  <e@80x24.org>
+
+	* proc.c (rb_proc_alloc): inline and move to vm.c
+	  (rb_proc_wrap): new wrapper function used by rb_proc_alloc
+	  (proc_dup): simplify alloc + copy + wrap operation
+	  [ruby-core:64994]
+
+	* vm.c (rb_proc_alloc): new inline function
+	  (rb_vm_make_proc): call rb_proc_alloc
+
+	* vm_core.h: remove rb_proc_alloc, add rb_proc_wrap
+
+	* benchmark/bm_vm2_newlambda.rb: short test to show difference
+
+Sat Sep 13 04:40:04 2014  Eric Wong  <e@80x24.org>
+
+	* process.c (Init_process): subclass Thread as Process::Waiter
+	  (rb_detach_process): use Process::Waiter instead of singleton class
+	  Thanks to headius and nobu. [Bug #10231]
+
+	* test/ruby/test_process.rb (test_process_detach): new test
+
+	* inits.c (rb_call_inits): call Init_Thread before Init_process to
+	  ensure Process::Waiter may be a subclass of Thread
+
+Fri Sep 12 18:14:28 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (env_alloc): inline to avoid extra zeroing
+	  tiny speedup [ruby-core:64980]
+
+Fri Sep 12 17:13:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_make, remove_method): ditto.
+
+Fri Sep 12 14:39:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gems/bundled_gems: Upgraded to test-unit-3.0.1 and minitest-5.4.1
+
+Fri Sep 12 06:55:40 2014  Eric Wong  <e@80x24.org>
+
+	* string.c (Init_frozen_strings): use st_init_table_with_size
+
+Fri Sep 12 06:15:37 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (sym_find): remove Symbol.find because we have Symbol GC now.
+	  https://bugs.ruby-lang.org/projects/ruby/wiki/DevelopersMeeting20140904Japan
+	  If you still want this, request again on Redmine. [Feature #7854]
+	  https://bugs.ruby-lang.org/issues/7854
+
+	* ext/-test-/symbol/init.c (sym_find): moved from string.c for tests.
+
+Fri Sep 12 04:24:03 2014  Eric Wong  <e@80x24.org>
+
+	* insns.def (once): define and use fake RUNNING_THREAD_ONCE_DONE
+	  pointer to indicate is->once.running_thread is done.
+
+	* vm_core.h (iseq_inline_storage_entry): remove done field,
+	  allowing the union to be reduced from 24=>16 bytes on 64-bit
+	  [Feature #10187]
+
+Thu Sep 11 20:10:00 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_thread_mark): use rb_gc_mark_values() to mark VM stack.
+
+Thu Sep 11 19:50:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_vm_register_special_exception): make new function to
+	  make and register special exceptions.
+
+	* vm.c (rb_vm_mark): do not need to mark special exceptions
+	  because they are registered by rb_gc_register_mark_object().
+
+	* eval.c (Init_eval): use rb_vm_register_special_exception().
+
+	* gc.c (Init_GC): ditto.
+
+	* proc.c (Init_Proc): ditto.
+
+	* thread.c (Init_Thread): ditto.
+
+Thu Sep 11 19:32:30 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_mark_values): added.
+	  This function is similar to rb_gc_mark_locations(), but not
+	  conservative.
+
+	* internal.h: ditto.
+
+	* vm.c (env_mark): use rb_gc_mark_values() because env values should
+	  be Ruby VALUEs.
+
+Thu Sep 11 19:16:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_ptr): rename to gc_mark_set.
+
+	* gc.c (gc_mark): add gc_mark_ptr() to skip is_markable_object()
+	  check. gc_mark_maybe() can use gc_mark_ptr() directly because
+	  passed pointer is checked by is_pointer_to_heap().
+
+Thu Sep 11 18:40:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .gitignore: ignored temporary files and coverage results.
+
+Thu Sep 11 18:15:30 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .gitignore: ignored only simplecov.
+	* coverage/README: Added coverage docs.
+
+Thu Sep 11 17:25:31 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h, gc.c: add new internal events
+	  RUBY_INTERNAL_EVENT_GC_ENTER and
+	  RUBY_INTERNAL_EVENT_GC_EXIT.
+
+	  When invoking GC process, GC_ENTER event is called.
+	  When exiting from GC process, GC_EXIT event is called.
+
+	  Incremental GC (incremental marking and lazy sweep) can call
+	  these events many times.
+
+	  For example (minor marking):
+	  (1) GC_ENTER
+	  - (2) GC_START (minor GC)
+	    (minor marking)
+	  - (3) GC_END_MARK
+	    (start lazy sweep)
+	  (4) GC_EXIT
+	    (ruby process)
+	  (5) GC_ENTER
+	    (lazy sweep)
+	  (6) GC_EXIT
+	    (ruby process)
+	    (... repeat (5), (6))
+	  (7) GC_ENTER
+	      (finish lazy sweep)
+	    - (8) GC_END_SWEEP
+	  (9) GC_EXIT
+
+	  2nd example (incremental major marking):
+	  (1) GC_ENTER
+	  - (2) GC_START (minor GC)
+	    (start incremental marking)
+	  (3) GC_EXIT
+	    (ruby process)
+	  (4) GC_ENTER
+	    (incremental marking)
+	  (5) GC_EXIT
+	     (ruby process)
+	     (... repeat (4), (5))
+	  (6) GC_ENTER
+	    (finish incremental marking)
+	  - (7) GC_END_MARK
+	    (start lazy sweep)
+	  (8) GC_EXIT
+	    (ruby process)
+	  (9) GC_ENTER
+	    (lazy sweep)
+	  (10) GC_EXIT
+	    (ruby process)
+	    (... repeat (9), (10))
+	  (11) GC_ENTER
+	    (finish lazy marking)
+	  - (12) GC_STOP_SWEEP
+	  (13) GC_EXIT
+
+	  These internal events enable to measure GC pause time completely.
+
+Thu Sep 11 17:04:54 2014  Eric Wong  <e@80x24.org>
+
+	* lib/benchmark.rb: remove CLOCK_MONOTONIC_RAW support
+	  Thanks to Vit Ondruch for reporting the issue on ARM.
+	  [Bug #10202]
+
+Thu Sep 11 14:31:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/ruby.h: freeze nil/true/false.
+	  [Feature #8923]
+
+	* gc.c (should_be_finalizable): check frozen after checkin FL_ABLE.
+
+	* object.c (rb_obj_taint): check
+	  OBJ_TAINTABLE(obj).
+
+	* object.c (rb_obj_freeze): remove immediate_frozen_tbl
+	  because all of immediate values are frozen. YAY!
+
+	* object.c (rb_obj_frozen_p): ditto.
+
+	* test/ruby/test_eval.rb: skip instance_variable_set for
+	  frozen objects.
+
+	* test/ruby/test_weakmap.rb: check ArgumentError instead of
+	  RuntimeError.
+
+Thu Sep 11 10:03:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(21b241a)
+
+Wed Sep 10 17:52:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (rb_vm_addr2insn): rename to rb_vm_insn_addr2insn
+	  to clear what address.
+
+Wed Sep 10 16:22:26 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: fix condition.
+
+Wed Sep 10 15:29:46 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_call_info_t): ci->flag becomes 32-bit unsigned int
+	  ci->index becomes a 32-bit signed int (from signed long).
+	  Reorder for better packing on 64-bit, giving an 8 byte reduction
+	  from 104 to 96 bytes for each ci.
+	  [Feature #10187]
+
+	* compile.c (new_callinfo, setup_args, iseq_compile_each,
+	  iseq_build_from_ary_body): adjust for type changes
+
+	* vm_insnhelper.c (vm_getivar): ditto
+
+Wed Sep 10 15:07:35 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (rb_iseq_translate_threaded_code):
+	  modify in-place w/o copy
+	  (rb_vm_addr2insn): new function for debug
+	  (rb_iseq_original_iseq): ditto
+	  (iseq_set_sequence): assign iseq_encoded directly
+	  [Feature #10185]
+
+	* vm_core (rb_iseq_t): move original ->iseq to bottom
+
+	* iseq.c (iseq_free, iseq_free): adjust for new layout
+	  (rb_iseq_disasm): use original iseq for dump
+	  (iseq_data_to_ary): ditto
+	  (rb_iseq_line_trace_each): ditto
+	  (rb_iseq_build_for_ruby2cext): use iseq_encoded directly
+
+	* vm_dump.c (rb_vmdebug_debug_print_pre): use original iseq
+
+Wed Sep 10 15:00:11 2014  Eric Wong  <e@80x24.org>
+
+	* time.c (time_mark): remove NULL check
+	  (time_memsize): ditto
+	  (time_free): remove, use RUBY_TYPED_DEFAULT_FREE instead
+	  [Feature #10219]
+
+Wed Sep 10 14:14:57 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* common.mk (encs enc trans libencs libenc libtrans): force to run
+	  enk.mk because common.mk does not know the dependency, but enk.mk
+	  knows. [ruby-dev:48530] [Bug #10220]
+
+Wed Sep 10 11:59:10 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat): update rdoc.
+
+Wed Sep 10 11:52:08 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): rename:
+	  * malloc_increase -> malloc_increase_bytes
+	  * malloc_limit -> malloc_increase_bytes_limit
+	  * oldmalloc_increase -> oldmalloc_increase_bytes
+	  * oldmalloc_limit -> oldmalloc_increase_bytes_limit
+	  ref: [Feature #9924]
+
+Wed Sep 10 11:45:40 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): rename `heap_used' to `heap_allocated_pages'.
+	  ref: [Feature #9924]
+
+	* test/ruby/test_gc.rb: add constraints test for gc stat information.
+
+Wed Sep 10 11:31:16 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): rename:
+	  * remembered_shady_object -> remembered_wb_unprotected_objects
+	  * remembered_shady_object_limit -> remembered_wb_unprotected_objects_limit
+	  * old_object -> old_objects
+	  * old_object_limit -> old_objects_limit
+	  ref: [Feature #9924]
+
+Wed Sep 10 11:12:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): support:
+	  * total_allocated_pages
+	  * total_freed_pages
+	  ref: [Feature #9924]
+
+Wed Sep 10 10:48:04 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: catch up last fix.
+
+Wed Sep 10 10:36:08 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_total_slot): rename objspace_available_slots.
+
+	* gc.c (objspace_live_slot, objspace_free_slot): rename
+	  ..._slot() to ..._slots().
+
+	* gc.c (objspace_free_slot): should subtract heap_pages_final_slots.
+
+	* gc.c (gc_stat_internal):
+	  * add `heap_available_slots' field
+	  * rename heap_live_slot to heap_live_slots
+	  * rename heap_free_slot to heap_free_slots
+	  ref: [Feature #9924]
+
+Wed Sep 10 07:22:53 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: refactoring for RGENGC_PROFILE > 0.
+
+	  * rename rb_objspace_t::profile::..._count
+	    to rb_objspace_t::profile::total_..._count
+	  * rename promote_infant_types to promote_types
+
+	* gc.c (gc_remember_unprotected): count remembered shady objects here.
+
+Wed Sep 10 03:12:12 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* gc.c (init_mark_stack): MEMZERO() receive type as 2nd argument instead
+	  of size.
+	  Coverity Scan found this bug.
+
+Tue Sep  9 21:55:39 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/sample/excel2.rb: remove some commented-out code.
+	  rotate graph more slowly to see graph clearly.
+
+Tue Sep  9 19:52:33 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename rb_objspace_t::marked_objects to marked_slots.
+
+	* gc.c (gc_marks_start): should be clear first.
+
+	* gc.c (gc_marks_start): remembered shady objects are also marked.
+
+	* gc.c (gc_stat_internal): add heap_marked_slots.
+
+Tue Sep  9 18:58:48 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename
+	  * total_allocated_object_num -> total_allocated_objects
+	  * total_allocated_object_num_at_gc_start -> total_allocated_objects_at_gc_start
+	  * total_freed_object_num -> total_freed_objects
+
+	* gc.c (gc_stat_internal):
+	  * rename total_allocated_object -> total_allocated_objects
+	  * rename total_freed_object -> total_freed_objects
+
+Tue Sep  9 18:51:36 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): fix symbol names
+	  * heap_final_slot -> heap_final_slots
+	  * heap_swept_slot -> heap_swept_slots
+
+Tue Sep  9 18:18:07 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_t::heap_pages): rename field names:
+	  * used -> allocated_pages
+	  * increment -> allocatable_pages
+	  * length -> sorted_length
+	  And remove unused `limit' field.
+
+	* gc.c: rename macros:
+	  * heap_pages_used -> heap_allocated_pages
+	  * heap_pages_length -> heap_pages_sorted_length
+	  * heap_pages_increment -> heap_allocatable_pages
+
+	* gc.c (gc_stat_internal): fix symbol names
+	  * heap_used -> heap_allocated_pages
+	  * heap_eden_page_length -> heap_eden_pages
+	  * heap_tomb_page_length -> heap_tomb_pages
+	  * heap_increment -> heap_allocatable_pages
+	  * heap_length -> heap_sorted_length
+
+	  ref: [Feature #9924]
+	  https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing
+	  Yellow color fields in this table are changed.
+
+	* test/ruby/test_gc.rb: catch up this change.
+
+Tue Sep  9 14:56:03 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: continue layout changing.
+
+	  newobj_of() also touch:
+	  (4) increment total_allocated_object_num
+	  (5) check hook_events
+
+	  And gather fields related to marking phase.
+
+Tue Sep  9 14:21:50 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix layout of rb_objspace_t to improve cache locality.
+
+	  newobj_of() accesses:
+	  (1) rb_objspace_t::flags
+	  (2) rb_objspace_t::eden_heap::freelist
+	  (3) and rb_objspace_t::eden_heap::free_pages if freelist is NULL.
+
+Tue Sep  9 14:09:36 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: move rb_objspace_t::flags::gc_stressful after during_gc
+	  to make accessing both parameters easy.
+
+	* gc.c (heap_get_freeobj): add LIKELY() hint.
+
+	* gc.c (heap_get_freeobj_from_next_freepage): ditto.
+
+	* gc.c (newobj_of): check both parameters at once for exceptional
+	  case.
+
+Tue Sep  9 13:51:32 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add rb_objspace_t::flags::gc_stressful and
+	  ruby_gc_stressful macro.
+	  Rename objspace->gc_stress to objspace->gc_stress_mode.
+
+	  If objspace->gc_stress_mode is true (!nil and !false) then
+	  ruby_gc_stressful becomes TRUE.
+
+	  ruby_gc_stressful will speedup newobj_of() slightly.
+
+	* gc.c: initialize ruby_gc_stress(full|_mode) by gc_params.gc_stress
+	  even if ENABLE_VM_OBJSPACE is false.
+
+Tue Sep  9 13:05:50 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove ruby_disable_gc_stress and add ruby_disable_gc
+	  to speed-up newobj_of().
+
+	* gc.c (ready_to_gc): check ruby_disable_gc.
+
+	* signal.c: use ruby_disable_gc.
+
+Tue Sep  9 12:11:41 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename gc_stat entries and check stat transition.
+
+Tue Sep  9 12:06:03 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_sweep_rest): remove wrong modification of during_gc flag.
+
+Tue Sep  9 11:39:41 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: pack boolean values into rb_objspace_t::flags with bit fields
+	  to improve cache locality.
+
+Tue Sep  9 11:11:05 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_object.rb: extend timeout.
+
+Tue Sep  9 09:02:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb (MakeMakefile#pkg_config): append --cflags to also
+	  $CXXFLAGS, as they are often used by C++ compiler.
+	  [ruby-core:54532] [Bug #8315]
+
+Tue Sep  9 07:03:22 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c: remove needless SYM2ID <-> ID2SYM conversions
+	  [misc #10207]
+
+Tue Sep  9 05:48:42 2014  Eric Wong  <e@80x24.org>
+
+	* symbol.c (rb_intern_cstr_without_pindown): check dsymbol on return
+	  This is not a complete fix for bug 10206, but seems to reduce
+	  that crash and also looks correct.
+
+Tue Sep  9 04:36:24 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_env_t): use flexible array
+	  This reduces allocations and speeds up the lambda calculus
+	  fizzbuzz (bm_app_lc_fizzbuzz.rb) benchmark [ruby-core:64858]
+	* proc.c (get_local_variable_ptr): deconst to adjust for flex array
+	* vm.c (env_mark, env_free, env_memsize): remove check for env->env
+	* vm.c (env_alloc): single allocation for flex array
+	* vm.c (vm_make_env_each): adjust env_alloc call
+
+Mon Sep  8 16:08:22 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_lc_fizzbuzz.rb: should skip output on benchmark.
+
+Mon Sep  8 16:04:02 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_lc_fizzbuzz.rb: `answer.to_a' does not return
+	  a string, but an array.
+
+Mon Sep  8 13:18:37 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/bm_app_lc_fizzbuzz.rb: added.
+
+	  This program is described closely in "Understanding Computation"
+	  chapter 6 by Tom Stuart. <http://computationbook.com/>
+
+	  Japanese translation will be published soon.
+	  <http://www.oreilly.co.jp/books/9784873116976/>
+
+Mon Sep  8 12:01:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add incremental GC algorithm. [Feature #10137]
+
+	  Please refer this ticket for details.
+
+	  This change also introduces the following changes.
+
+	  * Remove RGENGC_AGE2_PROMOTION and introduce object age (0 to 3).
+	    Age can be count with FL_PROMOTE0 and FL_PROMOTE1 flags in
+	    RBasic::flags (2 bit). Age == 3 objects become old objects.
+	  * WB_PROTECTED flag in RBasic to WB_UNPROTECTED bitmap.
+	  * LONG_LIVED bitmap to represent living objects while minor GCs
+	    It specifies (1) Old objects and (2) remembered shady objects.
+	  * Introduce rb_objspace_t::marked_objects which counts marked
+	    objects in current marking phase. marking count is needed to
+	    introduce incremental marking.
+	  * rename mark related function and sweep related function to
+	    gc_(marks|sweep)_(start|finish|step|rest|continue).
+	  * rename rgengc_report() to gc_report().
+	  * Add obj_info() function to get cstr of object details.
+	  * Add MEASURE_LINE() macro to measure execution time of specific line.
+	  * and many small fixes.
+
+	* include/ruby/ruby.h: add flag USE_RINCGC.
+	  Now USE_RINCGC can be set only with USE_RGENGC.
+
+	* include/ruby/ruby.h: introduce FL_PROMOTED0 and add FL_PROMOTED1
+	  to count object age.
+
+	* include/ruby/ruby.h: rewrite write barriers for incremental marking.
+
+	* debug.c: catch up flag name changes.
+
+	* internal.h: add rb_gc_writebarrier_remember() instead of
+	  rb_gc_writebarrier_remember_promoted().
+
+	* array.c (ary_memcpy0): use rb_gc_writebarrier_remember().
+
+	* array.c (rb_ary_modify): ditto.
+
+	* hash.c (rb_hash_keys): ditto.
+
+	* hash.c (rb_hash_values): ditto.
+
+	* object.c (init_copy): use rb_copy_wb_protected_attribute() because
+	  FL_WB_PROTECTED is moved from RBasic::flags.
+
+	* test/objspace/test_objspace.rb: catch up ObjectSpace.dump() changes.
+
+Sun Sep  7 12:47:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c: PTHREAD_CANCEL_DISABLE is not defined on Android.
+
+Sat Sep  6 20:59:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): The gid zero is not a privilege.
+
+Sat Sep  6 20:19:16 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (struct child_handler_disabler_state): cancelstate field
+	  added.
+	  (disable_child_handler_before_fork): Record cancelstate.
+	  (disable_child_handler_fork_parent): Restore cancelstate.
+
+Sat Sep  6 19:27:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (struct child_handler_disabler_state): Defined.
+
+Sat Sep  6 18:31:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rake.rb, lib/rake/*, test/rake/*: Update latest rake master(e47d023)
+
+Sat Sep  6 16:38:08 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_variant.c (ole_val2variant_err,
+	  ole_val2variantdata, Init_win32ole_variant): support VT_ERROR
+	  variant with error code. add WIN32OLE_VARIANT::NoParam.
+	* test/win32ole/test_win32ole_variant.rb(test_c_noparam,
+	  test_vt_error_noparam): ditto.
+	* ext/win32ole/win32ole.c: ditto.
+
+Sat Sep  6 11:08:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (arg_ambiguous_gen): fix warning message, "even" does
+	  not mean the number of spaces here.  state the place to put a
+	  space and the operator.  [ruby-core:64790] [Bug #10204]
+
+Sat Sep  6 08:44:40 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/rdoc/generator/template/darkfish/js/jquery.js: Backport
+	  rdoc/rdoc@74f60fcb04fee1778fe2694d1a0ea6513f8e67b7
+
+Sat Sep  6 08:10:44 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_io.rb (test_readpartial_locktmp): use IO#nonblock=
+	  Old fcntl invocation may drop necessary flags on some platforms.
+
+Sat Sep  6 07:46:51 2014  Eric Wong  <e@80x24.org>
+
+	* test/ruby/test_io.rb (test_readpartial_locktmp): avoid EBADF
+	  [ruby-core:64773] [ruby-core:64775]
+
+Sat Sep  6 01:34:31 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_f_exec): Call before_exec_async_signal_safe and
+	  after_exec_async_signal_safe around rb_exec_async_signal_safe.
+	  (rb_exec_async_signal_safe): Don't call
+	  before_exec_async_signal_safe and after_exec_async_signal_safe.
+	  (rb_exec_without_timer_thread): Call before_exec and
+	  after_exec.
+	  (disable_child_handler_fork_child): Make SIGPIPE handler SIG_DFL.
+
+Sat Sep  6 00:49:41 2014  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (ruby_signal): Don't set SA_SIGINFO for SIG_IGN and
+	  SIG_DFL.
+
+Fri Sep  5 21:45:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (disable_child_handler_before_fork): New function.
+	  (disable_child_handler_fork_parent): Ditto.
+	  (disable_child_handler_fork_child): Ditto.
+	  (retry_fork_async_signal_safe): Call above functions to disable
+	  signal handlers in child process.
+
+Fri Sep  5 21:02:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (handle_fork_error): Make try_gc_p argument volatile to
+	  suppress "clobbered" warning.
+
+Fri Sep  5 20:48:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (handle_fork_error): Don't need state_p argument.
+
+Fri Sep  5 20:35:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): Fix a return value.
+
+Fri Sep  5 19:00:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/shellwords.rb: proofreading documentation.
+	  [Bug #10155][ruby-core:64471]
+
+Fri Sep  5 18:34:33 2014  Laurent Arnoud  <laurent@spkdev.net>
+
+	* test/csv/test_row.rb: Added some missing tests in CSV.
+	  [fix GH-710]
+	* test/csv/test_table.rb: ditto.
+
+Fri Sep  5 12:57:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): Refine uid/gid check.
+
+Fri Sep  5 12:40:55 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Check sys/id.h, getuidx and getgidx for AIX.
+
+	* process.c (getresuid): Defined for AIX.
+	  (getresgid): Ditto
+	  AIX don't have getresuid/getresgid but getuidx/getgidx.
+
+Fri Sep  5 12:28:21 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): Fix assignments.
+
+Fri Sep  5 11:10:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rdoc/generator/pot/po.rb: fixed broken tests for trailing whitespace.
+	* test/rdoc/test_rdoc_generator_pot.rb: ditto.
+	* test/rdoc/test_rdoc_generator_pot_po.rb: ditto.
+
+Fri Sep  5 10:41:07 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/rdoc/test_rdoc_rdoc.rb (TestRDocRDoc#test_parse_file_encoding):
+	  typofix.
+
+Fri Sep  5 10:39:14 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(313287)
+
+Fri Sep  5 06:04:22 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c: remove unused USE_THREAD_RECYCLE [misc #10198]
+
+Fri Sep  5 00:29:08 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (dirfd): Check function.
+
+	* dir.c (dir_fileno): New method.
+	  [ruby-dev:48265] [Feature #9880]
+
+Thu Sep  4 23:39:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (has_privilege): New function.
+	  (retry_fork_async_signal_safe): Don't use vfork() for privileged
+	  process.
+
+	* configure.in (getresuid): Check function.
+	  (getresgid): Ditto.
+
+Thu Sep  4 20:22:14 2014  Laurent Arnoud  <laurent@spkdev.net>
+
+	* test/pathname/test_pathname.rb: added testcase for Pathname#mountpoint?.
+	  [fix GH-709]
+
+Thu Sep  4 20:09:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* symbian/*: removed Symbian support.
+	  [Feature #10199][ruby-core:64725]
+	* dln.c: ditto.
+	* include/ruby/defines.h: ditto.
+	* thread_pthread.c: ditto.
+	* vm.c: ditto.
+
+Thu Sep  4 17:44:40 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* dir.c (glob_helper): use #ifdef instead of #if.
+	  gcc's -Wundef option shows warning for undefined macro.
+
+	* numeric.c (flo_is_finite_p): ditto.
+
+	* vm_dump.c (rb_vmdebug_thread_dump_state): ditto.
+
+	* vm_core.h: define VM_DEBUG_VERIFY_METHOD_CACHE to 0.
+
+Thu Sep  4 03:57:46 2014  Eric Wong  <e@80x24.org>
+
+	* man/ruby.1: spelling fix ("bellow" => "below") [ci-skip]
+
+Thu Sep  4 03:52:16 2014  Eric Wong  <e@80x24.org>
+
+	* man/ruby.1: add trailing slash to URLs [ci-skip]
+
+Wed Sep  3 19:10:28 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (before_fork_ruby): Renamed from before_fork.
+	  (after_fork_ruby): Renamed from after_fork.
+
+Wed Sep  3 18:56:05 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (forked_child): Removed.
+
+Wed Sep  3 16:56:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_copy_ivar): allocate no memory for empty
+	  instance variables.  [ruby-core:64700] [Bug #10191]
+
+Wed Sep  3 12:05:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork_async_signal_safe): Use vfork() if available.
+	  vfork() is still faster than fork() especially when the parent
+	  process uses big memory.
+
+	  ruby -rbenchmark -e 'a = "a" * 1_000_000_000; puts Benchmark.measure { system("true") }'
+	  fork:   0.000000   0.010000   0.010000 (  0.014968)
+	  vfork:  0.000000   0.000000   0.000000 (  0.000912)
+	  on Debian sid.
+
+Wed Sep  3 11:33:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_pkey_rsa.rb (OpenSSL#test_sign_verify_memory_leak):
+	  added timeout into testcase for low performance environment.
+	  [Bug #9984][ruby-core:63367]
+
+Wed Sep  3 07:50:15 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Use AC_FUNC_FORK.
+
+	* io.c: Use HAVE_WORKING_FORK instead of HAVE_FORK.
+
+	* process.c: Ditto.
+
+Wed Sep  3 00:12:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork_async_signal_safe): Don't return on in child
+	  process.
+
+Tue Sep  2 23:47:35 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (retry_fork_async_signal_safe): Specialized version of
+	  retry_fork respect to rb_fork_async_signal_safe.
+	  (retry_fork_ruby): Specialized version of retry_fork respect to
+	  rb_fork_ruby.
+	  (rb_fork_ruby): Removed.
+
+Tue Sep  2 23:26:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (send_child_error): Simplified.
+	  (recv_child_error): Ditto.
+
+Tue Sep  2 22:56:25 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (rb_fork_async_signal_safe): Inline rb_fork_internal.
+	  (rb_fork_ruby): Ditto.
+	  (rb_fork_internal): Removed.
+	  (chfunc_protect): Removed.
+
+Tue Sep  2 22:43:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb (test_new_with_block): Set autoclose to avoid
+	  EBADF.
+
+Tue Sep  2 22:01:51 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* Makefile.in (update-coverage): Remove a never executed line.
+
+Tue Sep  2 19:48:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (handle_fork_error): Extracted from retry_fork.
+
+Tue Sep  2 17:02:53 2014  Vit Ondruch  <v.ondruch@tiscali.cz>
+
+	* tool/rbinstall.rb: fixed error of local installation.
+	  [Bug #10192][ruby-core:64702]
+
+Tue Sep  2 16:58:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/runner.rb: reporting test coverage for test-all with COVERAGE env.
+	  [Feature #10189][ruby-core:64681][fix GH-708]
+	* Makefile.in: added task for coverage report.
+	* common.mk: added definition of forked simplecov url.
+	* .gitignore: ignored coverage directory.
+
+Mon Sep  1 20:11:02 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (rbtime2vtdate): try to convert millisecond
+	  of Time object to millisecond of VT_DATE VARIANT.
+	* test/win32ole/test_win32ole_variant.rb
+	  (test_conversion_time2date_with_msec): ditto.
+
+Sun Aug 31 16:58:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/benchmark.rb: Fix a syntax error.
+
+Sun Aug 31 08:46:44 2014  Eric Wong  <e@80x24.org>
+
+	* ext/zlib/zlib.c (gzfile_reset): preserve ZSTREAM_FLAG_GZFILE
+	  [Bug #10101]
+
+	* test/zlib/test_zlib.rb (test_rewind): test each_byte
+
+Sat Aug 30 19:22:47 2014  Eric Wong  <e@80x24.org>
+
+	* symbol.c (rb_sym2id): do not return garbage object
+
+Sat Aug 30 06:39:48 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and
+	  loading. Fixes GH #85. Thanks @brentdax for the patch!
+	* test/psych/test_exception.rb: test for fix
+
+Sat Aug 30 06:23:40 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: fix loading strings that
+	  look like integers but have a newline. Fixes GH #189
+	* test/psych/test_string.rb: test for fix
+
+Sat Aug 30 06:10:39 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash
+	  should merge the hash in to the parent.
+	* test/psych/test_merge_keys.rb: test for change. Fixes GH #202
+
+Sat Aug 30 06:00:26 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings
+	  should not be treated as merge keys.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys
+	  containing "<<" should roundtrip.
+	* test/psych/test_merge_keys.rb: test for change. Fixes GH #203
+
+Fri Aug 29 17:56:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/net/imap/test_imap_response_parser.rb: removed needless code.
+
+Fri Aug 29 17:36:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/rinda/test_rinda.rb: removed useless assignment variables.
+	* test/rss/rss-assertions.rb: ditto.
+	* test/rss/test_maker_itunes.rb: ditto.
+
+Fri Aug 29 16:18:26 2014  Eric Wong  <e@80x24.org>
+
+	* string.c: revert part of r47311, add rb_vm_fstring_table(),
+	  remove vm_core.h dependency. [ruby-core:64627]
+
+Fri Aug 29 15:17:13 2014  Eric Wong  <e@80x24.org>
+
+	* string.c: remove static frozen_strings
+	* string.c (Init_frozen_strings): new function
+	* string.c (rb_fstring): remove check for frozen strings,
+	  use per-VM table
+	* string.c (rb_str_free): use per-VM table
+	* string.c (Init_String): use per-VM table
+	* vm_core.h (rb_vm_t): add frozen_strings table
+	* internal.h (Init_frozen_strings): new function prototype
+	* eval.c (ruby_setup): call Init_frozen_strings
+	  [Feature #10182]
+
+Wed Aug 27 23:10:24 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/tempfile.rb: remove "require 'thread'". its features are no
+	  longer used.
+
+Wed Aug 27 21:19:40 2014  gogo tanaka  <mail@tanakakazuki.com>
+
+	* lib/drb/acl.rb: Removed meaningless #to_s methods in interpolation.
+	  [Feature #10174][ruby-core:64584]
+	* lib/erb.rb: ditto.
+	* lib/observer.rb: ditto.
+	* lib/rake/invocation_chain.rb: ditto.
+	* lib/rubygems/command_manager.rb: ditto.
+	* lib/rubygems/config_file.rb: ditto.
+	* lib/uri/common.rb: ditto.
+
+Wed Aug 27 21:08:20 2014  gogo tanaka  <mail@tanakakazuki.com>
+
+	* lib/drb/drb.rb: use attr_reader instead of Module#attr.
+	  [Feature #10172][ruby-core:64582]
+	* lib/irb/ruby-token.rb: ditto.
+	* lib/net/telnet.rb: ditto.
+	* lib/rdoc/ruby_token.rb: ditto.
+	* lib/thwait.rb: ditto.
+
+Wed Aug 27 19:52:33 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (vtdate2rbtime): try to convert millisecond
+	  of VT_DATE VARIANT to nsec of Time object.
+	* test/win32ole/test_win32ole_variant.rb
+	  (test_conversion_dbl2date_with_msec): ditto.
+
+Wed Aug 27 09:57:29 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: removed unreachable code.
+	* test/ruby/test_rational.rb: ditto.
+
+Wed Aug 27 07:59:17 2014  Eric Wong  <e@80x24.org>
+
+	* compile.c (iseq_set_sequence): check for multiplication overflow
+
+Tue Aug 26 22:07:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: cherry-picked working assertions from r47251.
+	* test/ruby/test_rational.rb: cherry-picked working assertions from r47263.
+
+Tue Aug 26 21:07:56 2014  gogo tanaka  <mail@tanakakazuki.com>
+
+	* lib/mathn.rb (Fixnum#**, Bignum#**, Float#**, Rational#**):
+	  remove as these are now built-in.  [ruby-core:63973] [Bug #10086]
+
+Tue Aug 26 20:46:55 2014  Tanaka Akira  <akr@fsij.org>
+
+	* time.c (rb_time_unmagnify_to_float): Avoid double rounding.
+	  Reported by Tsuyoshi Sawada.
+	  https://bugs.ruby-lang.org/issues/10135#note-1
+
+Tue Aug 26 17:12:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_close): ignore only "closed stream" IOError and
+	  NoMethodError, do not swallow other exceptions at the end of
+	  block.  [ruby-core:64463] [Bug #10153]
+
+Tue Aug 26 13:46:33 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* template/fake.rb.in: fix failed to make install when @srcdir@ is
+	  absolute path.
+
+Tue Aug 26 13:43:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_range.rb: added workaround for VERBOSE message.
+
+Tue Aug 26 12:38:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_mathn.rb: added workaround for VERBOSE messages.
+
+Tue Aug 26 11:44:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/shell/process-controller.rb: removed commented-out code.
+
+Tue Aug 26 11:39:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/thwait.rb (ThreadsWait): removed needless constant.
+
+Tue Aug 26 09:27:10 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/mathn.rb: mathn library is deprecated on ruby 2.2.
+	  [Feature #10169][ruby-core:64553]
+
+Tue Aug 26 09:25:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/mathn.rb: removed commented-out code.
+
+Mon Aug 25 20:15:50 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c(fole_s_connect, fole_initialize): raise a
+	  security error with the tainted string object.
+	* ext/win32ole/win32ole_event.c(ev_advise): ditto.
+	* test/win32ole/test_win32ole.rb(test_s_new_exc_svr_tainted,
+	  test_s_new_exc_host_tainted): ditto.
+	* test/win32ole/test_win32ole_event.rb(test_s_new_exc_tainted): ditto.
+
+Mon Aug 25 12:56:54 2014  Ivan Korunkov  <ivankorunkov@ya.ru>
+
+	* lib/logger.rb (format_datetime): use "%6N" to show microsecond.
+	  [Fix GH-704]
+
+Mon Aug 25 11:02:07 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_iseq_location_t): change first_lineno type to VALUE
+	* iseq.c (rb_iseq_build_for_ruby2cext): update based on argument
+
+Sun Aug 24 16:14:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/e2mmap.rb: remove needless instance variables.
+	* lib/irb.rb: ditto.
+	* lib/irb/**/*.rb: ditto.
+	* lib/shell.rb: ditto.
+
+Sun Aug 24 12:44:26 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: removed needless conditions.
+	* test/ruby/test_rational.rb: ditto.
+
+Sun Aug 24 11:47:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_rational.rb: fixed indent.
+
+Sun Aug 24 11:44:11 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_rational.rb: remove commented-out code.
+
+Sun Aug 24 11:09:29 2014  Eric Wong  <e@80x24.org>
+
+	* lib/benchmark.rb (measure): reduce allocations as in r47260
+
+Sun Aug 24 10:35:54 2014  Pete Higgins  <pete@peterhiggins.org>
+
+	* lib/benchmark.rb (module Benchmark): define BENCHMARK_CLOCK
+	  (realtime): use Process.clock_gettime(BENCHMARK_CLOCK)
+	  Reduces allocations to improve performance [Feature #10165]
+
+	* test/benchmark/test_benchmark.rb (test_realtime_output): new test
+
+Fri Aug 22 20:23:54 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (rb_fstring): fix condition (easy to cause infinite loop!).
+
+Fri Aug 22 20:07:43 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (rb_fstring, fstr_update_callback): simply delete garbage
+	  key first.
+
+	  Garbage keys can be swept by lazy sweeping invoked by creating new
+	  fstring.  So that simply do:
+	  (1) delete garbage key and return `fstr_update_callback' immediately
+	  (2) try again `fstr_update_callback()' to create a new fstr.
+
+	  This bug can be cause memory corruption, reported by
+	  http://u64.rubyci.org/~chkbuild/ruby-trunk/log/20140821T220302Z.fail.html.gz
+
+Fri Aug 22 19:30:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: removed commented-out code.
+
+Fri Aug 22 19:25:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_complex.rb: fixed broken tests. Math is not
+	  compatible CMath now.
+
+Fri Aug 22 15:36:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* common.mk (Doxyfile): revert r43888, not to require preinstalled
+	  ruby.  [ruby-core:64488] [Bug #10161]
+
+Fri Aug 22 12:32:15 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/shell.rb: removed commented-out code.
+	* lib/shell/builtin-command.rb: ditto.
+	* lib/shell/command-processor.rb: ditto.
+
+Fri Aug 22 12:21:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/complex.rb: removed deprecated library.
+	* lib/rational.rb: ditto.
+
+Fri Aug 22 11:38:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/prettyprint.rb: removed PrettyPrint#first?
+	  because it is obsoleted method since Ruby 1.8.2
+
+Thu Aug 21 17:10:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (constat_attr): manage reverse video internally
+	  since Windows console window does not manage it.  based on the
+	  patch by white leaf in [ruby-dev:48483].  [Bug #10158]
+
+Thu Aug 21 14:45:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/e2mmap.rb: removed commented-out code.
+
+Thu Aug 21 13:23:34 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rinda/ring.rb: split executable code into sample directory.
+	* sample/rinda-ring.rb: ditto.
+
+Thu Aug 21 13:21:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/drb/acl.rb: split executable code into sample directory.
+	* sample/drb/acl.rb: ditto.
+
+Thu Aug 21 12:55:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* .gitignore: ignored temporary file for Changelog.
+	  http://mkosaki.blog46.fc2.com/blog-entry-1284.html
+
+Thu Aug 21 12:40:22 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/net/imap.rb: split executable code into sample directory.
+	* sample/net-imap.rb: ditto.
+
+Thu Aug 21 12:23:56 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/net/imap.rb: removed commented-out code.
+
+Wed Aug 20 17:27:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_TRY_CFLAGS, RUBY_TRY_LDFLAGS),
+	  (RUBY_CHECK_BUILTIN_SETJMP, RUBY_SETJMP_TYPE),
+	  (RUBY_STACK_GROW_DIRECTION): quote defun names, for some
+	  versions of autoconf possibly.  [ruby-core:64473] [Bug #10156]
+
+Tue Aug 19 22:28:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): fix condition to round.
+	  [ruby-core:64454] [Bug #10151]
+
+Tue Aug 19 22:22:45 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/trans/euckr-tbl.rb (EUCKR_TO_UCS_TBL): add missing euro and
+	  registered signs.  [ruby-core:64452] [Bug #10149]
+
+Tue Aug 19 13:59:43 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compar.c (rb_cmperr): preserve encodings of arguments in the
+	  message.
+
+Tue Aug 19 10:13:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/thread/thread.c (get_array): check instance variables are
+	  initialized properly.  [ruby-core:63826][Bug #10062]
+
+Mon Aug 18 17:06:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (rb_str_format): support rational 'f' format.
+	  [ruby-core:64382] [Bug #10136]
+
+Mon Aug 18 08:03:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* spec/default.mspec: use 2.2 definition.
+
+Sun Aug 17 19:41:40 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* gc.c (obj_memsize_of): don't calculate memsize of T_NODE
+	  when called from check_gen_consistency. It fixes segmentation
+	  fault on RGENGC_CHECK_MODE >= 1 introduced by r47188.
+
+Sun Aug 17 17:08:12 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): use RHASH_SIZE instead of
+	  calling Hash#length method.
+
+Sat Aug 16 19:32:06 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_event.c (evs_length): use RARRAY_LEN instead
+	  of calling Array#length method.
+
+Sat Aug 16 10:20:17 2014  Eric Wong  <e@80x24.org>
+
+	* time.c (time_timespec): fix tv_nsec overflow
+	  [Bug #10144]
+
+Fri Aug 15 20:34:17 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_EVENT src from
+	  win32ole.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_event.c: ditto.
+	* ext/win32ole/win32ole_event.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Fri Aug 15 19:38:00 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (rb_iseq_clone): Should not insert write barrier from
+	  non-RVALUE data (to non-RVALUE data, of course).
+
+	  Ruby 2.1 also has a same problem.
+
+Fri Aug 15 19:34:33 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (setup_fake_str): fake strings should not set class by
+	  RBASIC_SET_CLASS() because it insert write barriers to fake
+	  (non-RVALUE) structure.
+
+	  It can cause unexpected behaviour.
+
+	  Ruby 2.1 also have a same problem (setup_fake_str() in parse.y).
+
+	* symbol.c (setup_fake_str): ditto.
+
+Fri Aug 15 19:27:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_tmp_new_fill): added.
+	  This function creates internal use only array (which is completely
+	  hided by ObjectSpace.each_object) with filling nil.
+
+	  Otherwise, it can be includes strange VALUEs.
+
+	* internal.h: added.
+
+	* node.h: use rb_ary_tmp_new_fill() for MEMO.
+
+Fri Aug 15 10:13:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/gserver.rb: removed unmaintained code.
+	  [ruby-core:40313][Feature #5480]
+	* lib/xmlrpc/httpserver.rb: ditto.
+
+Fri Aug 15 09:22:12 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_thread_struct): reorder to pack
+	* cont.c (rb_context_struct, rb_fiber_struct): ditto
+	  On x86-64, these changes reduces:
+	  rb_thread_struct to 1000 bytes (from 1016)
+	  rb_context_struct to 1288 bytes (from 1312)
+	  rb_fiber_struct to 2272 bytes (from 2304)
+
+Fri Aug 15 09:06:31 2014  Eric Wong  <e@80x24.org>
+
+	* thread_pthread.h: define RB_NATIVETHREAD_LOCK_INIT and
+	  RB_NATIVETHREAD_COND_INIT macros
+
+	* thread_pthread.c (native_mutex_lock, native_mutex_unlock,
+	  native_mutex_trylock, native_mutex_initialize,
+	  native_mutex_destroy, native_cond_wait):
+	  use rb_nativethread_lock_t instead of pthread_mutex_t
+	  [Feature #10134]
+
+	* thread_pthread.c (native_mutex_debug): make argument type-agnostic
+	  to avoid later cast.
+
+	* thread_pthread.c (register_cached_thread_and_wait):
+	  replace PTHREAD_COND_INITIALIZER with RB_NATIVETHREAD_COND_INIT,
+	  use native_mutex_{lock,unlock}
+
+	* thread_pthread.c (use_cached_thread):
+	  use native_mutex_{lock,unlock}
+
+	* thread_pthread.c (native_sleep):
+	  use rb_nativethread_lock_t to match th->interrupt_lock,
+	  use native_mutex_{lock,unlock}
+
+	* thread_pthread.c (timer_thread_lock): use rb_nativethread_lock_t type
+
+Fri Aug 15 08:10:29 2014  Eric Wong  <e@80x24.org>
+
+	* cont.c (cont_mark): fix typo in unused path [ci skip]
+
+Fri Aug 15 06:00:56 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (rb_thread_mark): update comment about marking `me'
+	  [ruby-core:64340] [ruby-core:64341]
+
+Fri Aug 15 05:53:59 2014  Eric Wong  <e@80x24.org>
+
+	* README.EXT: preliminary documentation for RB_GC_GUARD
+	  [Bug #10100] [ruby-core:60741]
+
+Thu Aug 14 00:26:19 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_RECORD src from
+	  win32ole.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_record.c: ditto.
+	* ext/win32ole/win32ole_record.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Wed Aug 13 21:41:04 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_VARIANT src from
+	  win32ole.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_variant.c: ditto.
+	* ext/win32ole/win32ole_variant.c: ditto.
+	* ext/win32ole/depend: ditto.
+
+Wed Aug 13 20:09:37 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: remove unused variable.
+
+Wed Aug 13 19:31:27 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_search_handler_method, rescue_callback,
+	  folerecord_inspect): use PRIsVALUE in rb_sprintf.
+
+	* ext/win32ole/win32ole_param.c (foleparam_inspect): ditto.
+
+	* ext/win32ole/win32ole_variable.c (folevariable_inspect): use
+	  PRIsVALUE in rb_sprintf, use rb_inspect.
+
+Wed Aug 13 11:54:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb/completion.rb: reverted r47163.
+	  because another case can't be show completion target.
+
+Wed Aug 13 11:17:00 2014  Shimpei Makimoto  <github@makimoto.org>
+
+	* lib/irb.rb: Prevent irb from crashing when exception with
+	  nil backtrace is raised.
+	  [fix GH-434][ruby-core:58078][Bug #9063]
+	* test/irb/test_raise_no_backtrace_exception.rb: ditto.
+
+Wed Aug 13 11:08:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb/completion.rb: fixed broken completion list with
+	  String including spaces. Contributed from @dunric. [fix GH-465]
+
+Wed Aug 13 00:07:01 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_PARAM src from win32ole.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_param.c: ditto.
+	* ext/win32ole/win32ole_param.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Tue Aug 12 23:17:47 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: refactoring. move some methods
+	  into win32ole_type.c / win32ole_method.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_method.c: ditto.
+	* ext/win32ole/win32ole_method.h: ditto.
+	* ext/win32ole/win32ole_type.h: ditto.
+	* ext/win32ole/win32ole_type.h: ditto.
+
+Tue Aug 12 22:59:48 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: refactoring. move
+	  ole_typelib_from_itypeinfo into win32ole_typelib.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_typelib.h: ditto.
+	* ext/win32ole/win32ole_typelib.h: ditto.
+
+Tue Aug 12 21:49:40 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_create_dcom): use the converted
+	  result if the argument can be converted to a string, to get rid
+	  of invalid access. Thanks to nobu. [ruby-dev:48467] [Bug #10127]
+
+Tue Aug 12 14:22:58 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* configure.in: ignored working directory same as prefix value.
+	  [ruby-core:54999] [Bug #8409]
+
+Tue Aug 12 13:34:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/fileutils.rb: enable to remove with non-owner directory.
+	  [ruby-dev:45976] [Bug #6756]
+	* test/fileutils/test_fileutils.rb: add testcase for #6756.
+
+Tue Aug 12 12:57:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* vm_exec.c: improve performance in ppc64 arch.
+	  [ruby-core:63437] [Feature #9997]
+
+Tue Aug 12 12:14:52 2014  Akira Matsuda <ronnie@dio.jp>
+
+	* lib/fileutils.rb: fix typo.
+	  [ruby-dev:47831] [Bug #9180]
+
+Tue Aug 12 10:10:42 2014  Eric Wong  <e@80x24.org>
+
+	* vm_method.c (release_method_definition): use rb_free_method_entry
+
+Tue Aug 12 06:16:09 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_METHOD src from
+	  win32ole.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_method.c: ditto.
+	* ext/win32ole/win32ole_method.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Mon Aug 11 22:19:15 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_variable.c (folevariable_inspect): refactoring.
+
+Mon Aug 11 20:47:27 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_VARIABLE src from
+	  win32ole.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_variable.c: ditto.
+	* ext/win32ole/win32ole_variable.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Mon Aug 11 16:17:21 2014  Tony Miller  <mcfiredrill@gmail.com>
+
+	* dir.c (rb_dir_exists_p): [DOC] Document that Dir.exists? is
+	  deprecated.  [ruby-core:64135] [Bug #10102]
+
+Mon Aug 11 11:26:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/tempfile.rb: start rdoc parsing inside singleton class
+	  definition to include the document there.
+	  [ruby-core:64157] [Bug #10105]
+
+Sun Aug 10 12:22:43 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_type.c: refactoring.
+
+Sun Aug 10 10:34:00 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/cgi/session/pstore.rb: separated sample code.
+	* lib/open3.rb: ditto.
+
+Sun Aug 10 10:03:24 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb/ext/multi-irb.rb: removed commented-out code.
+
+Sat Aug  9 11:02:07 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb.rb: removed commented-out code.
+	* lib/irb/**/*.rb: ditto.
+
+Sat Aug  9 10:35:30 2014  Laurent Arnoud  <laurent@spkdev.net>
+
+	* lib/cmath.rb: fixed indent. [fix GH-696]
+	* lib/drb/ssl.rb: ditto.
+	* lib/irb/**/*.rb: ditto.
+
+Sat Aug  9 10:28:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/minitest/test_minitest_unit.rb: removed obsoleted condition
+	  for Ruby 1.8.
+	* test/ruby/test_time_tz.rb: ditto.
+
+Sat Aug  9 10:18:00 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/cgi/test_cgi_core.rb: removed obsoleted condition for Ruby 1.8.
+	* test/cgi/test_cgi_header.rb: ditto.
+	* test/cgi/test_cgi_multipart.rb: ditto.
+	* test/cgi/test_cgi_tag_helper.rb: ditto.
+
+Sat Aug  9 00:34:37 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE_TYPE src from win32ole.c.
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_type.c: ditto.
+	* ext/win32ole/win32ole_type.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Fri Aug  8 01:53:37 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/securerandom.rb: use OpenSSL::BN for performance improvement.
+
+	* benchmark/bm_securerandom.rb: benchmark script.
+
+Fri Aug  8 17:19:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/open-uri.rb: remove needless condition for old ruby version.
+	* test/open-uri/test_open-uri.rb: ditto.
+
+Fri Aug  8 16:40:59 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/irb/init.rb: removed unreachable code.
+
+Fri Aug  8 16:34:22 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/drb/drb.rb: removed unreachable code.
+
+Fri Aug  8 14:33:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/webrick/httpproxy.rb: remove needless condition
+	  for old ruby version.
+
+Fri Aug  8 01:07:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): fix invalid char in eval, should raise
+	  an syntax error too, as well as directly coded.
+	  [ruby-core:64243] [Bug #10117]
+
+Thu Aug  7 23:25:29 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/open3.rb: avoid unnecessary write if stdin_data is empty.
+
+Thu Aug  7 21:42:49 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole_typelib.c (foletypelib_version): return
+	  version string.
+
+	* test/win32ole/test_win32ole_typelib.rb (test_version): ditto.
+
+Thu Aug  7 15:13:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/cgi.rb: remove needless condition for old ruby version.
+
+Thu Aug  7 06:04:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yyerror): preserve source code encoding in
+	  syntax error messages.  [ruby-core:64228] [Bug #10114]
+
+Wed Aug  6 20:56:02 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate src of WIN32OLE_TYPELIB from
+	  win32ole.c
+
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_typelib.c: ditto.
+	* ext/win32ole/win32ole_typelib.h: ditto.
+	* ext/win32ole/depend: ditto.
+
+Wed Aug  6 20:44:07 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* enum.c (enum_one): [DOC] Move enum.one? documentation before the
+	  relevant method.  Submitted by @vipulnsward. [Fixes GH-687]
+	  https://github.com/ruby/ruby/pull/687
+
+Wed Aug  6 20:25:47 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set#replace): Check if an object given is enumerable
+	  before clearing self.  Reported by yui-knk. [GH-675]
+	  https://github.com/ruby/ruby/pull/675
+
+Wed Aug  6 20:07:26 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (olerecord_ivar_set): remove rb_str_subseq.
+
+Wed Aug  6 19:09:27 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/set.rb (Set): Implement Set#clone by splitting
+	  initialize_copy into initialize_dup and initialize_clone.
+	  Submitted by yui-knk. [Fixes GH-661]
+	  https://github.com/ruby/ruby/pull/661
+
+Wed Aug  6 18:42:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate src of WIN32OLERuntimeError
+	  from win32ole.c.
+
+	* ext/win32ole/win32ole.h: ditto
+	* ext/win32ole/depend: ditto.
+	* ext/win32ole/win32ole_error.c: ditto.
+	* ext/win32ole/win32ole_error.h: ditto.
+
+Wed Aug  6 04:33:58 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead
+	  of parser to handle IPv6 address. [Bug #9129]
+
+Wed Aug  6 04:16:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/requests.rb (Net::HTTP::Options::RESPONSE_HAS_BODY):
+	  OPTIONS requests may have response bodies. [Feature #8429]
+	  http://tools.ietf.org/html/rfc7231#section-4.3.7
+
+Wed Aug  6 03:18:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/generic_request.rb (Net::HTTP::GenericRequest#exec):
+	  handle req['host'] in update_uri.
+
+	* lib/net/http/generic_request.rb
+	  (Net::HTTP::GenericRequest#update_uri):
+	  use req['host'] if it is explicitly set. Even if URI is given,
+	  it is already used for the initial value of req['host'].
+	  Therefore overwritten value should be respected. [Bug #10054]
+
+Wed Aug  6 03:17:34 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/generic_request.rb
+	  (Net::HTTP::GenericRequest#update_uri):
+	  handle scheme, host, and port to reflect connection to @uri.
+
+	* lib/net/http.rb (Net::HTTP#begin_transport): move trivial handling
+	  to Net::HTTP::GenericRequest#update_uri.
+
+
+Wed Aug  6 02:16:43 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/generic_request.rb
+	  (Net::HTTP::GenericRequest#initialize):
+	  optimize object allocation.
+
+Wed Aug  6 01:16:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#path_query): remove a private method.
+
+Wed Aug  6 01:15:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#normalize!): use String#empty?
+
+	* lib/uri/generic.rb (URI::Generic#path_query): optimized.
+
+	* lib/uri/generic.rb (URI::Generic#to_s): optimized.
+
+Wed Aug  6 00:15:10 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/http.rb (URI::HTTP#request_uri): optimized.
+	  decrease object allocation, and ensure always create at least one new
+	  object for return value.
+
+Wed Aug  6 03:41:21 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: backwards compatibility for
+	  hashes emitted by Syck. Github #198
+	* test/psych/test_hash.rb: test for change.
+
+Tue Aug  5 19:27:59 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): skip VariantClear when
+	  argument is VT_RECORD variant.
+
+Tue Aug  5 15:52:51 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gems/bundled_gems: Upgrade to test-unit-3.0.0 and minitest-5.4.0.
+
+Mon Aug  4 21:50:09 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* test/win32ole/test_win32ole_record.rb: add for WIN32OLE_RECORD
+	  test(need .NET Framework 3.5 to run test).
+
+Mon Aug  4 19:49:34 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): call rb_hash_foreach instead
+	  of rb_block_call.
+
+	* ext/win32ole/win32ole.c: add comment for rdoc of WIN32OLE_VARIANT
+	  class.
+
+Mon Aug  4 09:12:47 2014  Eric Wong  <e@80x24.org>
+
+	* variable.c: cleanup to use rb_const_lookup
+	  [Feature #10107]
+
+	* vm_insnhelper.c: ditto
+
+Sun Aug  3 10:55:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h (rb_check_symbol_cstr): ditto.
+
+Sun Aug  3 10:43:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): unusable super class should cause
+	  method missing when BasicObject is refined but not been using.
+	  [ruby-core:64166] [Bug #10106]
+
+Sat Aug  2 23:47:45 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: separate WIN32OLE::VARIANT src file
+	  from win32ole.c
+	* ext/win32ole/win32ole.h: ditto.
+	* ext/win32ole/win32ole_variant_m.c: ditto.
+	* ext/win32ole/win32ole_variant_m.h: ditto.
+	* ext/win32ole/depend: ditto.
+	* ext/.document: ditto.
+
+Sat Aug  2 14:34:58 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add comments for rdoc.
+
+Sat Aug  2 10:26:57 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* object.c (rb_obj_itself): new method Object#itself.  based on the
+	  patch by Rafael Franca in [ruby-core:64156].
+	  [EXPERIMENTAL] this method may be renamed due to compatibilities.
+	  [ruby-core:44704] [Feature #6373]
+
+Fri Aug  1 22:30:40 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (folerecord_initialize): accept
+	  only 2 arguments. The 2nd argument should be WIN32OLE object or
+	  WIN32OLE_RECORD object.
+
+Fri Aug  1 20:17:33 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_variant2val): call
+	  folerecord_s_allocate instead of WIN32OLE_RECORD.new.
+
+Fri Aug  1 18:39:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/date/test_date.rb: remove commented-out code.
+	* test/date/test_date_arith.rb: ditto.
+	* test/date/test_date_attr.rb: ditto.
+	* test/date/test_date_parse.rb: ditto.
+
+Fri Aug  1 16:35:32 2014  Evan Miller  <evan@squareup.com>
+
+	* numeric.c (flodivmod): all results are NaN if divisor is NaN.
+	  [fix GH-692]
+
+Thu Aug 01 07:28:12 2014  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c: [DOC] Add description of
+	  `BigDecimal.new` exceptions.  Patched by @joker1007 and
+	  @prathamesh-sonpatki [Fixes GH-690]
+	  https://github.com/ruby/ruby/pull/690
+
+Thu Jul 31 22:20:12 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE_RECORD#inspect.
+
+Thu Jul 31 20:35:32 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add
+	  WIN32OLE_RECORD#ole_instance_variable_set and
+	  WIN32OLE_RECORD#ole_instance_variable_get
+
+Wed Jul 30 23:28:10 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* sprintf.c (rb_str_format): like r47006, get rid of
+	  function calls in RSTRING_PTR().
+
+Wed Jul 30 22:10:29 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* process.c (rlimit_resource_type, rlimit_resource_value):
+	  get rid of inadvertent dynamic symbol pin-down.
+
+	* re.c (match_backref_number): ditto.
+
+	* signal.c (esignal_init, rb_f_kill, trap_signm): ditto.
+
+	* transcode.c (econv_opts): ditto.
+
+	* vm_trace.c (symbol2event_flag): ditto.
+
+Wed Jul 30 21:29:39 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_invoke): pass WIN32OLE_RECORD variant
+	  by reference when invoke OLE methods at first.
+
+	* ext/win32ole/win32ole.c (olerecord_set_ivar): release
+	  IRecordInfo interface before setting another IRecordInfo interface.
+
+Wed Jul 30 13:17:35 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: remove unused macros.
+
+Tue Jul 29 22:21:37 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (hash2olerec): ignore WIN32OLE_RECORD
+	  instance variable if the variable is nil.
+
+Tue Jul 29 19:43:27 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (folerecord_method_missing): refactoring.
+	  divide functionality of folerecord_method_missing into
+	  olerecord_ivar_set and olerecord_ivar_get.
+
+Mon Jul 28 20:20:08 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win23ole.c (folerecord_method_missing): support
+	  setter of member of WIN32OLE_RECORD object.
+
+Mon Jul 28 06:37:19 2014  Zachary Scott  <e@zzak.io>
+
+	* vm_eval.c: [DOC] Fix rdoc formatting of patch from [Bug #9551]
+
+Mon Jul 28 06:34:43 2014  Zachary Scott  <e@zzak.io>
+
+	* vm_eval.c: [DOC] [Bug #9551] Improve clarity of Kernel::catch
+	  documentation, patch by Jesse Sielaff.
+
+Mon Jul 28 06:24:54 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/uri/common.rb: [DOC] [Bug #9563] Recommend using URI.escape
+	  before parsing a uri to avoid invalid characters. Reported by
+	  Evgeniy Serykh.
+
+Mon Jul 28 05:55:56 2014  Zachary Scott  <e@zzak.io>
+
+	* time.c: [DOC] Clarify %Y in strftime, which can accept any digits
+	  and will output at least 4 digits as the year. Reported by Yury
+	  Trofimenko [Bug #10049]
+
+	* lib/time.rb: ditto
+
+Mon Jul 28 05:32:06 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/uri/common.rb: [DOC] [Bug #10075] Clarify how URI.join arguments
+	  are handled by RFC3986, originally reported by John Feminella.
+
+Mon Jul 28 05:21:41 2014  Zachary Scott  <e@zzak.io>
+
+	* file.c: [DOC] Clarify how File.file? handles symbolic links. Also
+	  cleaned up the rdoc style for this method, more to follow.
+	  Originally reported by Michael Renner [Bug #10067]
+
+Mon Jul 28 05:12:22 2014  Zachary Scott  <e@zzak.io>
+
+	* time.c: [DOC] Remove dead link and old bug report, which hasn't been
+	  reproduced in a few years. Reported by Federico Builes [Bug #10071]
+
+Mon Jul 28 04:39:58 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/zlib/zlib.c: [DOC] Remove default value of Zlib constants, as
+	  they may change in the implementation without notice. Patched by
+	  @robin850 [Fixes GH-682] https://github.com/ruby/ruby/pull/682
+
+Mon Jul 28 04:35:35 2014  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/ossl_hmac.c: Fix NO_HMAC warning [Fixes GH-665]
+	  Patched by @vipulnsward https://github.com/ruby/ruby/pull/665
+
+Sun Jul 27 19:49:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/cgi/core.rb: remove unused variables.
+	* lib/erb.rb: ditto.
+	* lib/mkmf.rb: ditto.
+	* lib/net/http/response.rb: ditto.
+	* lib/optparse/version.rb: ditto.
+	* lib/prime.rb: ditto.
+	* lib/racc/parser.rb: ditto.
+	* lib/rexml/document.rb: ditto.
+	* lib/rexml/dtd/dtd.rb: ditto.
+	* lib/rexml/element.rb: ditto.
+	* lib/rexml/functions.rb: ditto.
+	* lib/rexml/parsers/xpathparser.rb: ditto.
+
+Sun Jul 27 05:11:21 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/irb.rb: [DOC] PROMPT_I cannot be nil, patch by @hgillane
+	  Fixes documenting-ruby/ruby#37
+	  https://github.com/documenting-ruby/ruby/pull/37
+
+Sun Jul 27 02:41:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/shell/command-processor.rb: remove unused variable.
+	* lib/shell/system-command.rb: ditto.
+	* lib/tmpdir.rb: ditto.
+	* lib/uri/generic.rb: ditto.
+
+Sun Jul 27 02:08:31 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/weakref.rb: split executable code into sample directory.
+	* sample/weakref.rb: ditto.
+
+Sun Jul 27 02:06:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/delegate.rb: split executable code into sample directory.
+	* sample/delegate.rb: ditto.
+
+Sun Jul 27 01:46:34 2014  Zachary Scott  <e@zzak.io>
+
+	* proc.c (method_super_method): [DOC] Method#super_method
+
+Sun Jul 27 01:22:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (method_super_method): new method Method#super_method,
+	  which returns a method object of the method to be called by
+	  `super` in the receiver method object.
+	  [ruby-core:62202] [Feature #9781]
+
+Sat Jul 26 17:22:14 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* ext/objspace/objspace_dump.c (dump_append): avoid fflush.
+
+	  because dump_append_string_value() iterates over each chars,
+	  fflush()-ing here effectively issues system calls on every single
+	  bytes exist in a ruby process.
+
+Sat Jul 26 16:55:18 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.h (struct iseq_compile_data_storage): reduce overhead
+	  to 16 bytes (from 32) on 64-bit
+
+Sat Jul 26 16:28:06 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (struct rb_iseq_struct): reduce to 280 bytes
+	  (from 288 bytes) on 64-bit
+
+Sat Jul 26 06:44:43 2014  Eric Wong  <e@80x24.org>
+
+	* parse.y (struct parse_params): shrink to 320 to 304 bytes on 64-bit
+
+Sat Jul 26 05:58:35 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/ruby.h (ZALLOC, ZALLOC_N): implement
+	  (Data_Make_Struct, TypedData_Make_Struct):
+	  ZALLOC replaces ALLOC+memset
+	  [ruby-core:63951][Feature #10082]
+	* compile.c (iseq_seq_sequence): ZALLOC_N replaces ALLOC_N+MEMZERO
+	* cont.c (fiber_t_alloc): ZALLOC replaces ALLOC+MEMZERO
+	* io.c (rb_io_reopen): ditto
+	* iseq.c (prepare_iseq_build): ditto
+	* parse.y (new_args_tail_gen, parser_new, ripper_s_allocate): ditto
+	* re.c (match_alloc): ditto
+	* variable.c (rb_const_set): ditto
+	* ext/socket/raddrinfo.c (get_addrinfo): ditto
+	* ext/strscan/strscan.c (strscan_s_allocate): ditto
+	* gc.c (rb_objspace_alloc): calloc replaces malloc+MEMZERO
+
+Sat Jul 26 05:54:54 2014  Eric Wong  <e@80x24.org>
+
+	* symbol.c (dsymbol_check): remove unneeded semi-colon
+
+Fri Jul 25 14:07:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change objspace::rgengc::parent_object_is_old (boolean)
+	  to objspace::rgengc::parent_object (VALUE).
+	  Use Qfalse or RVALUE pointer instead of FALSE and TRUE.
+
+	* gc.c (gc_marks_body): should clear parent_object just before
+	  gc_mark_roots() because there are no parents objects
+	  for root objects.
+
+Fri Jul 25 13:45:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_writebarrier_remember_promoted): should remember only
+	  OLD objects on RGENGC_AGE2_PROMOTION.
+
+Fri Jul 25 13:42:02 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_stacked_objects): fix error message.
+
+Fri Jul 25 13:18:00 2014  Will Farrington  <wfarrington@digitalocean.com>
+
+	* ext/socket/socket.c (sock_gethostname): Use NI_MAXHOST to support
+	  hostnames longer than 64 characters if the system supports it.
+	  [fixes GH-683]
+
+Fri Jul 25 12:21:11 2014  Santiago Pastorino  <santiago@wyeworks.com>
+
+	* compile.c (defined_expr): make the condition if the receiver
+	  is explicit or implicit cleaner.  [fix GH-681]
+
+Fri Jul 25 03:53:52 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* doc/keywords.rdoc:  [DOC] Describe each keyword.
+
+Thu Jul 24 22:40:24 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (Init_win32ole): add WIN32OLE_RECORD#initialize
+	  method.
+
+	* ext/win32ole/win32ole.c (ole_val2variant): convert WIN32OLE_RECORD
+	  object to VT_RECORD variant.
+
+Thu Jul 24 20:10:59 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: fix major GC flags.
+	  * add GPR_FLAG_MAJOR_BY_FORCE, which indicates
+	    major GC by METHOD, CAPI and so on (see GC_BY).
+	  * remove GPR_FLAG_MAJOR_BY_RESCAN because not used.
+	  * remove GPR_FLAG_MAJOR_BY_STRESS, use FORCE instead.
+
+	* test/ruby/test_gc.rb: catch up.
+
+Thu Jul 24 15:55:02 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* include/ruby/io.h (struct rb_io_buffer_t): PACKED_STRUCT should not
+	  be used for platform-specific optimization. PACKED_STRUCT_UNALIGNED
+	  should be used. [ruby-core:63988] [Bug #10088]
+
+Thu Jul 24 04:42:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/benchmark.rb: split executable code into sample directory.
+	* sample/benchmark.rb: ditto.
+
+Thu Jul 24 04:36:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/tempfile.rb: split executable code into sample directory.
+	* sample/tempfile.rb: ditto.
+
+Thu Jul 24 04:29:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/pstore.rb: split executable code into sample directory.
+	* sample/pstore.rb: ditto.
+
+Wed Jul 23 23:50:11 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/defines.h, siphash.c, st.c (UNALIGNED_WORD_ACCESS):
+	  add PowerPC64 too, which is capable to access unaligned words.
+	  patched by Gustavo Frederico Temple Pedrosa in [ruby-core:63937].
+	  [Feature #10081]
+
+	* regint.h (PLATFORM_UNALIGNED_WORD_ACCESS): ditto.
+
+Wed Jul 23 04:04:38 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/drb/extserv.rb: remove duplicate code with sample directory.
+	  contributed from @vipulnsward. [fix GH-679]
+
+Tue Jul 22 12:56:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_count): fix wrong single-byte optimization.
+	  7bit ascii can be a trailing byte in Shift_JIS.
+	  [ruby-dev:48442] [Bug #10078]
+
+Tue Jul 22 01:48:38 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/io.h (rb_io_buffer_t): fix packing on gcc
+	  r46892 caused packing to be a no-op on gcc (4.7.2-5, Debian)
+	  [Bug #10079][ruby-core:63912]
+
+Mon Jul 21 15:55:42 2014  fuji70  <fujifuji70@gmail.com>
+
+	* lib/optparse.rb (getopts): print default values and descriptions
+	  in the help message.  [fix GH-676]
+
+Sun Jul 20 14:26:27 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_proc_t): reduce to 64 bytes from 72 on 64-bit
+
+Sun Jul 20 13:50:34 2014  Eric Wong  <e@80x24.org>
+
+	* transcode.c (rb_econv_t): reduce to 184 bytes from 200 on 64-bit
+
+Sun Jul 20 12:44:23 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/io.h (rb_io_buffer_t): pack structure
+	  Reduces rb_io_t from 200 to 192 bytes, allowing rb_io_t to
+	  occupy one less cache line.
+	  [Feature #10050]
+
+Sun Jul 20 12:41:53 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/io.h (rb_io_t): shrink to 200 bytes from 216 on 64-bit
+	  This puts us within 8 bytes of being three cache lines instead of
+	  four lines on x86-64.  This breaks the ABI.
+	  [Feature #10050]
+
+Sun Jul 20 12:36:46 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/oniguruma.h (struct re_pattern_buffer): shrink to 448
+	  bytes from 464 bytes on 64-bit.  This breaks the ABI.
+	  [Feature #10034]
+
+Sun Jul 20 01:06:06 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/openssl/ossl.c: use encryptor instead of encrypter in doc.
+	  contributed from @vipulnsward. [fix GH-663]
+
+Sun Jul 20 00:32:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_initialize): [DOC] fix rdoc of append mode.  it does
+	  not move the pointer at open.  [ruby-core:63747] [Bug #10039]
+
+Sat Jul 19 12:40:50 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each): allow to access private attribute
+	  reader in op_assign.  [ruby-core:63817] [Bug #10060]
+
+Sat Jul 19 11:56:36 2014  Grey Baker  <greysteil@gmail.com>
+
+	* lib/time.rb (Time#apply_offset): Guards against a `nil` return
+	  value from `Time.month_days` when offsetting date.  Out of range
+	  values are then caught when `Time.utc` is called (as usual).
+
+	  Previously a `nil` return value from `Time.month_days` would
+	  have the `<` operator called on it, and raise `NoMethodError`.
+	  [fix GH-667]
+
+	* lib/rdoc/parser/changelog.rb (RDoc#parse_entries): fix dirty hack.
+
+Sat Jul 19 06:19:01 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: refactoring.
+
+Fri Jul 18 22:34:41 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (folevariant_initialize): WIN32OLE_VARIANT
+	  does not support VT_RECORD. VT_RECORD should be supported in
+	  WIN32OLE_RECORD.
+
+	* test/win32ole/test_win32ole_variant.rb (test_s_new_vt_record_exc):
+	  ditto.
+
+Fri Jul 18 19:54:03 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (folevariant_initialize): remove unnecessary
+	  code.
+
+Fri Jul 18 19:11:03 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix/eigenvalue_decomposition: Style fix
+	  Patch by Gogo Tanaka [#10058]
+
+Fri Jul 18 19:03:53 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Avoid using `and`.
+	  Patch by gogo tanaka [#10058]
+
+Fri Jul 18 17:41:54 2014  GoGo tanaka  <qlli.illb@gmail.com>
+
+	* test/matrix/test_matrix.rb: Add tests for Matrix class.
+	  [Feature #10057][ruby-core:63809]
+
+Fri Jul 18 10:14:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/fileutils.rb: added missing options of FileUtils.touch by @Domon.
+	  [fix GH-669]
+
+Thu Jul 17 19:57:27 2014  Herwin  <herwin@quarantainenet.nl>
+
+	* ext/thread/thread.c (rb_szqueue_push): add optional parameter,
+	  non_block defaulted to false.  [ruby-core:63794] [Feature #10052]
+
+Wed Jul 16 23:01:43 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (ole_variant2val): support array of
+	  VT_RECORD variant.
+
+Wed Jul 16 20:21:49 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* vm_core.h (struct rb_iseq_struct): stack_max is changed to int
+	  because all calculations related to stack_max in compile.c
+	  (iseq_set_sequence) and vm_insnhelper.c (vm_push_frame) are
+	  conducted by using int. This partly reverts r23945.
+	* vm_insnhelper.c (vm_push_frame): ditto. This reverts r42401.
+
+Wed Jul 16 19:55:32 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* vm_core.h (struct rb_iseq_struct): temporal workaround of [Bug 10037].
+	  Add padding on big-endian 64-bit architecture (e.g. sparc64).
+
+Wed Jul 16 19:32:23 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fole_record_method_missing): call
+	  rb_hash_fetch instead of rb_hash_aref.
+
+Wed Jul 16 18:08:47 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* iseq.c (rb_iseq_defined_string): use rb_gc_mark_object() instead of
+	  marking from vm_mark().
+
+	* vm.c (rb_vm_mark): ditto.
+
+Wed Jul 16 18:03:50 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_mark_roots): call rb_vm_mark directly.
+
+	* vm.c: remove mark function for RubyVM object because
+	  RubyVM object marked manually.
+
+Wed Jul 16 12:25:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* regcomp.c: Merge Onigmo 5.14.1 25a8a69fc05ae3b56a09.
+	  this includes Support for Unicode 7.0 [Bug #9092].
+
+Tue Jul 15 23:59:27 2014  Jared Jennings  <jared.jennings.ctr@us.af.mil>
+
+	* ext/digest: make built-in digest function implementations
+	  indicate success or failure of init and final functions.
+	  [ruby-core:61614] [Bug #9659]
+
+	* ext/digest/digest.c: expect digest init and finish functions to
+	  indicate success or failure; raise exception on failure.
+	  [ruby-core:61614] [Bug #9659]
+
+Tue Jul 15 20:31:40 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: modify document for WIN32OLE_RECORD.
+
+Tue Jul 15 12:42:23 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* defs/default_gems: change version definition file of rake.
+
+Tue Jul 15 12:00:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rake.rb, lib/rake/*.rb: Upgrade to rake-10.3.2
+	  [fix GH-668]
+	* test/rake/*.rb: ditto.
+
+Mon Jul 14 19:14:51 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: modify WIN32OLE class document and
+	  add comment for constants of WIN32OLE.
+
+Mon Jul 14 16:38:45 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (struct rb_iseq_struct): reduce to 288 bytes
+	  on x86-64 (from 296 bytes)
+
+Mon Jul 14 16:07:25 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.h (struct iseq_catch_table_entry): shrink to 32 bytes
+	  on x86-64 (from 48 bytes)
+
+Mon Jul 14 16:04:41 2014  Eric Wong  <e@80x24.org>
+
+	* iseq.h (struct iseq_catch_table): new flexible array struct
+		 (iseq_catch_table_bytes): allocated size function
+	* vm_core.h (struct rb_iseq_struct): update catch_table member
+	  This reduces the struct from 304 to 296 bytes on x86-64.
+	* compile.c (iseq_set_exception_table): update for struct changes
+	* iseq.c (iseq_free): ditto
+	* iseq.c (iseq_memsize): ditto
+	* iseq.c (rb_iseq_disasm): ditto
+	* iseq.c (iseq_data_to_ary): ditto
+	* iseq.c (rb_iseq_build_for_ruby2cext): ditto (untested)
+	* vm.c (vm_exec): ditto
+	* vm_core.h (struct rb_iseq_struct): ditto
+	* vm_insnhelper.c (vm_throw): ditto
+
+Sun Jul 13 17:49:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/openssl/ossl_cipher.c: Fix call to ciphers class method and
+	  spell out `encryption` by @vipulnsward [fix GH-664]
+
+Sun Jul 13 17:31:51 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/gdbm/gdbm.c: fix wrong arguments in GetDBM2 macro.
+	* ext/sdbm/init.c: ditto.
+
+Sun Jul 13 17:25:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/dbm/dbm.c: fix wrong arguments in GetDBM2 macro by @v2e4lisp.
+	  [fix GH-655]
+
+Sun Jul 13 16:44:56 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (struct rb_call_info_struct): improve packing
+	  This reduces the struct from 112 to 104 bytes on x86-64.
+
+Sun Jul 13 15:53:25 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (struct rb_iseq_struct): stack_max is uint32_t
+	  This reduces the struct from 312 to 304 bytes on x86-64.
+
+Sun Jul 13 10:56:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_broken_backtrace): exit with failure
+	  normally, no needs to abort.  [ruby-core:63678] [Bug #10008]
+
+Sat Jul 12 15:10:22 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c (fole_record_method_missing): correct
+	  fields Hash key.
+
+Sat Jul 12 04:17:40 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/net/smtp.rb (Net::SMTP#data): enable buffering while
+	  'data' send for optimizing Net::SMTP#send_message.
+	  [ruby-dev:48329] [misc #9981]
+	  patch by Masahiro Tomita.
+
+Sat Jul 12 01:13:45 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* test/ruby/envutil.rb (assert_no_memory_leak): On Solaris 9 or later,
+	  if possible, execute child ruby with environment variables
+	  LD_PRELOAD=libumem.so UMEM_OPTIONS="backend=mmap". With these
+	  variables, freed memory is immediately returned to the OS.
+	  [Bug #10020] [ruby-dev:48391]
+
+Fri Jul 11 20:49:10 2014  Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+	* ext/win32ole/win32ole.c: add WIN32OLE_RECORD class to support
+	  VT_RECORD OLE variables.
+
+Fri Jul 11 17:15:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/abbrev.rb: remove executable.
+
+Fri Jul 11 16:45:39 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/fileutils.rb: handle ENOENT error with symlink targeted to
+	  non-exists file. [ruby-dev:45933] [Bug #6716]
+
+Fri Jul 11 15:59:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* array.c: Clarify documentation for Array#insert.
+	  [ruby-core:62934] [Bug #9901]
+
+Fri Jul 11 15:39:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* io.c: Improve Documentation by @dapplebeforedawn.
+	  [fix GH-658] [ruby-core:63579] [Bug #10012]
+
+Fri Jul 11 14:19:14 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Fix sign for cross_product [#9499]
+
+Fri Jul 11 11:11:50 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/prepare_so_k_nucleotide.rb: use require_relative.
+
+	* benchmark/prepare_so_reverse_complement.rb: ditto.
+
+Fri Jul 11 10:09:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* pack.c (encodes): fix buffer overrun by tail_lf.  Thanks to
+	  Mamoru Tasaka and Tomas Hoger.  [ruby-core:63604] [Bug #10019]
+
+Thu Jul 10 23:51:36 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* hash.c (ruby_setenv): Fix TestEnv#test_aset failure on Solaris 9.
+	  When name contains '=', ruby_setenv raises Errno::EINVAL.
+	  That is the same behavior as Solaris 10.
+	  NULL check for malloc return value is also added.
+
+Thu Jul 10 15:02:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_keyword_arg): adjust VM stack
+	  pointer to get rid of overwriting splat arguments by arguments
+	  for `to_hash` conversion.  [ruby-core:63593] [Bug #10016]
+
+Thu Jul 10 01:09:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* symbol.c: remove rb_gc_mark_symbols().
+
+	  fstrings referred by static symbols and pinned dynamic symbols
+	  are registered by rb_gc_register_mark_object().
+
+	  fstrings referred by dynamic symbols (not pinned symbols)
+	  are referred from global_symbols.dsymbol_fstr_hash (Hash object).
+
+	  Note that fstrings referred from dynamic symbols must live logger
+	  than symbol objects themselves because rb_gc_free_dsymbol() uses
+	  fstrings to remove from symbol tables.
+	  This is why we can not mark fstrings from dynamic symbols.
+
+	  This technique reduces root objects for GC marking.
+
+	* gc.c (gc_mark_roots): ditto.
+
+	* internal.h: ditto.
+
+Thu Jul 10 00:24:18 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* common.mk (DTRACE_DEPENDENT_OBJS): fix build failure on Solaris
+	  introduced in r46768. Object files containing dtrace probes should
+	  be listed in DTRACE_DEPENDENT_OBJS.
+
+Wed Jul  9 17:07:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* symbol.c, symbol.h: Symbol class implementation and internals,
+	  split from parse.y.
+
+Wed Jul  9 14:45:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: change Symbol <-> ID relationship to avoid
+	  exposing IDs from collectable symbols.
+	  [Bug #10014]
+
+	  Now, rb_check_id() returns 0 if corresponding symbol is
+	  pinned dynamic symbol.
+
+	  There is remaining intern_cstr_without_pindown(), it can return
+	  IDs from collectable symbols. We must be careful to use it
+	  (only used in parse.y).  I think it should be removed if
+	  it does not have impact for performance.
+
+	* parse.y:
+	  add:
+	  * STATIC_SYM2ID()
+	  * STATIC_ID2SYM()
+	  rename:
+	  * rb_pin_dynamic_symbol() -> dsymbol_pindown()
+
+	* internal.h:
+	  remove:
+	  * rb_check_id_without_pindown()
+	  * rb_sym2id_without_pindown()
+	  add:
+	  * rb_check_symbol()
+	  * rb_check_symbol_cstr()
+
+	* load.c: use rb_check_id() or rb_check_id_cstr().
+
+	* object.c: ditto.
+
+	* struct.c: ditto.
+
+	* thread.c: ditto.
+
+	* vm_method.c: ditto.
+
+	* string.c (sym_find): use only rb_check_symbol().
+
+	* sprintf.c (rb_str_format): use rb_check_symbol_cstr().
+
+Wed Jul  9 12:21:55 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (symbols_i): delete garbage symbols for Symbol.all_symbols.
+
+Wed Jul  9 05:49:08 2014  Eric Wong  <e@80x24.org>
+
+	* thread_pthread.h (struct rb_global_vm_lock_struct):
+	  do not expose pthread type for lock
+
+Wed Jul  9 05:41:40 2014  Eric Wong  <e@80x24.org>
+
+	* thread_pthread.h: remove unneeded semaphore.h include
+
+Wed Jul  9 00:12:28 2014  Keiju Ishitsuka  <keiju@ishitsuka.com>
+
+	* lib/irb/ruby-lex.rb: fix counting indent in identify_string_dvar.
+
+Tue Jul  8 16:58:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/memory_status.rb (Memory::PSCMD): use ps command which
+	  outputs expected result.  [ruby-dev:48370] [Bug #10010]
+
+Tue Jul  8 14:45:17 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (dsymbol_alloc): set global_symbols.minor_marked to 0.
+
+	* parse.y (dsymbol_check): set RSYMBOL(sym)->fstr to 0
+	  because we should not touch fstr after that.
+
+	* parse.y (rb_gc_free_dsymbol): skip deleting str and sym
+	  from tables if fstr == 0.
+
+Mon Jul  7 14:31:52 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: remove global_symbols::pinned_dsym
+	  (and ::pinned_dsym_minor_marked).
+
+	  Mark pinned dsymbols by rb_gc_register_mark_object() because
+	  they are immortal.
+
+	* parse.y (rb_gc_free_dsymbol): rename parameter name `ptr' to `sym'.
+
+Mon Jul  7 12:45:51 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: revert miss-commit.
+
+Mon Jul  7 12:40:59 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: need to use updated (re-created) symbols.
+
+Mon Jul  7 11:02:55 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/mkconfig.rb: remove not to require rbconfig/obsolete.rb.
+
+	* lib/rbconfig/obsolete.rb: removed.
+
+Mon Jul  7 10:52:03 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: do not use rb_gc_resurrect(), but create a new dynamic
+	  symbol for garbage dynamic symbol.
+
+	* common.mk: use gc.h by parse.y.
+
+Mon Jul  7 02:18:42 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* string.c (fstr_update_callback): do not use rb_gc_resurrect()
+	  any more.
+
+	  Make new frozen string and replace with garbage frozen string.
+
+	* common.mk: use gc.h from string.c.
+
+Mon Jul  7 00:36:13 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename is_dying_object() to is_garbage_object().
+
+	* gc.h: rb_objspace_garbage_object_p() as an exported function.
+
+Sun Jul  6 21:30:35 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (is_dying_object): fix missed condition.
+
+	* gc.c (is_live_object): move frequent path first.
+
+Sun Jul  6 21:00:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename is_dead_object() to is_dying_object().
+	  This function is not opposite against is_live_object()
+	  because is_dying_object() does *not* check object type.
+
+	* gc.c (is_dying_object): change condition.
+
+	* gc.c (is_live_object): use T_NONE instead of 0.
+
+	* gc.c (rb_objspace_dying_object_p): added.
+
+Sun Jul  6 13:37:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_register_mark_object): change data structure.
+	  From single array, to array of arrays. Each array only has 1024
+	  entries.
+
+	* vm.c (Init_vm_objects): change default capa from 1 to 128.
+
+Sat Jul  5 05:05:53 2014  Vipul A M  <vipulnsward@gmail.com>
+
+	* lib/irb/locale.rb (IRB::Locale#modifier): fix wrong attr_reader
+	  `modifieer` => `modifier` from irb locale.  [fix GH-656]
+
+Fri Jul  4 20:45:26 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: rename symbols::sym_id to symbols::str_id.
+	  This table is not {Symbol => ID} table, but
+	  {String => ID} table.
+
+	* parse.y (lookup_sym_id): also rename lookup_sym_id() to
+	  lookup_str_id() because key is not Symbol, but String.
+
+Fri Jul  4 18:42:04 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (must_be_dynamic_symbol): fix missed-condition.
+
+Fri Jul  4 18:38:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (rb_pin_dynamic_symbol): should be `static' function.
+
+Fri Jul  4 18:03:35 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y (must_be_dynamic_symbol): refactoring.
+	  * add `inline'.
+	  * use UNLIKELY().
+	  * check only DYNAMIC_SYM_P(), otherwise it is a bug.
+	  * lookup_id_str() is not needed in second condition.
+
+Fri Jul  4 11:53:56 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* parse.y: remove unused code
+	  surrounded by `#if ENABLE_SELECTOR_NAMESPACE'
+
+Fri Jul  4 10:08:24 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/rubygems/test_gem_package.rb: avoid tempfile leaks using Tempfile#close!
+	* test/rubygems/test_gem_request_set.rb: ditto.
+	* test/rubygems/test_gem_request_set_gem_dependency_api.rb: ditto.
+
+Fri Jul  4 04:42:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/response.rb (Net::Inflater#inflate_adapter):
+	  prevent automatic encoding conversion.
+
+Fri Jul  4 04:39:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/net/http/response.rb (Net::HTTPResponse.each_response_header):
+	  raise first exception even if inflate_body_io.finish raises error.
+	  when begin block raises error, finish usually raises error too.
+
+Fri Jul  4 02:56:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (URI::Generic#query=): remove validation, just
+	  escape. [Feature #2542]
+
+	* lib/uri/generic.rb (URI::Generic#fragment=): ditto.
+
+	* lib/uri/generic.rb (URI::Generic#check_query): removed.
+
+	* lib/uri/generic.rb (URI::Generic#set_query): ditto.
+
+	* lib/uri/generic.rb (URI::Generic#check_fragment): ditto.
+
+	* lib/uri/generic.rb (URI::Generic#set_fragment): ditto.
+
+Thu Jul  3 12:40:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (--with-static-linked-ext): fix for extensions to
+	  be linked statically.
+
+	* Makefile.in, common.mk: use ENCSTATIC for enc directory.
+
+	* ext/extmk.rb: supply dependencies of statically linked extension
+	  libraries.
+
+Wed Jul  2 15:45:49 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_heap_lazy_sweep): simplify logic.
+
+	* gc.c (gc_page_sweep): return TRUE if empty slots are available.
+
+Wed Jul  2 09:48:42 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* logger.rb: removed unmaintained code.
+	  [Feature #9860][ruby-core:62724]
+	* test/logger/test_application.rb: ditto.
+
+Wed Jul  2 03:20:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
+
+	* node.c (dump_node): handle nd_value == (NODE *)-1 to mean this
+	  keyword argument is required
+
+Wed Jul  2 02:57:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (rb_vm_env_local_variables): returns array of local
+	  variable name symbols in the environment by envval.
+
+	* proc.c (bind_local_variables): use rb_vm_env_local_variables.
+
+Wed Jul  2 02:23:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (bind_receiver): new method to return the bound receiver
+	  of the binding object.  [ruby-dev:47613] [Feature #8779]
+
+Wed Jul  2 02:14:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (bind_local_variables): update env from envval for each
+	  iterations.  [ruby-dev:48351] [Bug #10001]
+
+Tue Jul  1 23:46:34 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* NEWS: [DOC] mention about Binding#local_variables, introduced at
+	  r44392 (see [Feature #8773]).
+
+Tue Jul  1 23:30:51 2014  CHIKANAGA Tomoyuki  <nagachika@ruby-lang.org>
+
+	* numeric.c (num_step_scan_args): table argument of rb_get_kwargs() is
+	  array of IDs, not Symbols. [ruby-dev:48353] [Bug #9811]
+
+Tue Jul  1 16:18:22 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* ext/digest/lib/digest/hmac.rb, test/digest/test_digest_hmac.rb:
+	  Digest::HMAC is finally removed as previously noticed.
+	  [fix GH-648]
+
+Tue Jul  1 11:13:43 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/date/lib/date/format.rb: removed empty file by @vipulnsward.
+	* ext/date/lib/date.rb: removed needless require.
+	  [fix GH-647]
+
+Mon Jun 30 16:42:52 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_stat_internal): return size_t value instead of VALUE
+	  and remove `out' parameter.
+
+	* gc.c: add braces for `if' statements.
+
+	* gc.c (gc_stat_internal): fix comment.
+
+Mon Jun 30 15:07:34 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: support `USE_RGENGC == 0'.
+
+	* test/ruby/test_gc.rb: ditto.
+
+Mon Jun 30 11:36:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* file.c: [DOC] document File.join returns a string.
+	  Contributed by @dapplebeforedawn. [fix GH-646]
+
+Sat Jun 28 22:57:01 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/pathname/pathname.c (path_birthtime): Windows support.
+	  see [Feature #9857] [ruby-dev:48339]
+
+Sat Jun 28 22:44:16 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/pathname.c (path_birthtime): New method,
+	  Pathname#birthtime.
+	  Proposed by Kazuhiro NISHIYAMA.  [ruby-dev:48232] [Feature #9857]
+
+Sat Jun 28 20:29:03 2014  Simon Baird  <simon.baird@gmail.com>
+
+	* ext/bigdecimal/lib/bigdecimal/math.rb (BigMath#PI): change error
+	  message about zero or negative precision for clarity and
+	  consistency with other methods.  [GH-644]
+
+Sat Jun 28 15:32:57 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/utils.rb (create_listeners): Close socket objects.
+
+Sat Jun 28 13:58:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): should not overwrite SystemStackError
+	  backtrace if set already.  [ruby-core:63377] [Feature #6216]
+
+	* eval.c (setup_exception): get rid of method calls before raising
+	  stack overflow, not to cause stack overflow again.
+
+	* defs/id.def: add IDs for backtraces.
+
+Sat Jun 28 04:08:22 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/mailto.rb: update to latest specs, RFC 6068 and HTML5.
+
+	* lib/uri/mailto.rb (HEADER_PATTERN): removed.
+
+	* lib/uri/mailto.rb (HEADER_REGEXP): use RFC 6068 hfields.
+
+	* lib/uri/mailto.rb (EMAIL_REGEXP): use HTML5 email regexp.
+
+	* lib/uri/mailto.rb (URI::MailTo.build): support multiple to addresses.
+
+	* lib/uri/mailto.rb (URI::MailTo#initialize): Support multiple to
+	  addresses. Don't check with regexp, only split.
+
+	* lib/uri/mailto.rb (URI::MailTo#check_to): verify by matching
+	  URI path-rootless and HTML5 email regexp with unescaped one.
+
+	* lib/uri/mailto.rb (URI::MailTo#check_headers): verify only by
+	  HEADER_REGEXP.
+
+	* lib/uri/mailto.rb (URI::MailTo#set_headers): don't check by
+	  HEADER_REGEXP, only split it.
+
+Sat Jun 28 00:35:10 2014  Lauri Tirkkonen  <lotheac@iki.fi>
+
+	* tool/mkconfig.rb: fix empty RbConfig::CONFIG["prefix"] when
+	  configured --with-rubyarchprefix, remove prefix from rubyarchdir
+	  after expansion for the case it does not start with '$(prefix)'.
+	  [fix GH-643]
+
+Fri Jun 27 15:20:12 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems/test_case.rb: rescue Gem::LoadError in Gem::TestCase.
+	  because it's effected by removing minitest from stdlib.
+
+Fri Jun 27 12:29:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/rubygems/specification.rb: fixed broken condition caused
+	  by removing YAML::ENGINE.
+	* lib/rubygems/package/old.rb: ditto.
+
+Fri Jun 27 05:33:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_shift): fix memory leak on Windows, free environment
+	  strings block always.  [ruby-dev:48332] [Bug #9983]
+
+Fri Jun 27 03:41:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* sprintf.c (GETASTER): should not use the numbered argument to be
+	  formatted, raise ArgumentError instead.
+	  [ruby-dev:48330] [Bug #9982]
+
+Thu Jun 26 18:18:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/with_different_ofs.rb: move into test library directory.
+	* test/csv/base.rb: fix require path for with_different_ofs.rb.
+	* test/digest/test_digest_extend.rb: ditto.
+
+Thu Jun 26 18:06:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/profile_test_all.rb: move into test library directory.
+	* test/runner.rb: fix require path for profile_test_all.rb.
+
+Thu Jun 26 17:57:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/webrick/httpproxy.rb: remove useless assigned variables.
+	* lib/webrick/httpservlet/cgihandler.rb: ditto.
+	* lib/webrick/httpservlet/erbhandler.rb: ditto.
+	* lib/webrick/server.rb: ditto.
+
+Thu Jun 26 08:28:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_select): fix memory leak and crash on Windows, make
+	  keys array first instead of iterating on environ directly.
+	  [ruby-dev:48325] [Bug #9978]
+
+Thu Jun 26 02:45:04 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval_error.c (error_print): put a newline after an anonymous
+	  exception class name.
+
+Wed Jun 25 22:31:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (ruby_setenv): fix memory leak on Windows, free
+	  environment strings block after check for the size.
+	  [ruby-dev:48323] [Bug #9977]
+
+Wed Jun 25 15:44:12 2014  Eric Wong  <e@80x24.org>
+
+	* ccan/container_of/container_of.h (container_off_var):
+	  avoid warning with -Wcast-qual
+	  [ccan ba5ad771af4aa9e085498de6c3c665c52694460f (Rusty Russell)]
+
+Wed Jun 25 10:19:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_aset, env_has_key, env_assoc, env_has_value),
+	  (env_rassoc, env_key): prohibit tainted strings if $SAFE is
+	  non-zero.  [Bug #9976]
+
+Tue Jun 24 14:46:17 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/gserver.rb: remove redundant use of to_s in interpolation.
+	* lib/logger.rb: ditto.
+	* lib/optparse.rb: ditto.
+	* lib/rbconfig/obsolete.rb: ditto.
+	* lib/resolv.rb: ditto.
+	* lib/webrick/httpresponse.rb: ditto.
+
+Tue Jun 24 10:50:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (env_path_str_new): make PATH environment variable
+	  string, to be frozen.
+
+Tue Jun 24 10:40:52 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/make-snapshot: download bundle gems when package making.
+	  [Feature #9852][ruby-core:62676]
+	* gems/bundled_gems: listed bundled gems for Ruby 2.2.
+
+Tue Jun 24 10:20:35 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/downloader.rb: make Downloader class to general download utility.
+	  It can be used without config.guess and config.sub.
+	* tool/get-config_files: ditto.
+	* tool/make-snapshot: ditto.
+
+Tue Jun 24 06:17:52 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* eval.c (setup_exception): "mesg == sysstack_error" and
+	  sysstack_error_p(mesg) are duplicated.
+	  r46502 seems to want to use latter.
+
+Tue Jun 24 06:15:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/tk/tcltklib.c: fix format specifiers for VALUE and
+	  Tcl_Interp*.  [ruby-core:63283] [Bug #9972]
+
+Tue Jun 24 05:40:41 2014  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* nacl/nacl-config.rb: Use File.exist? instead of executable?
+	  for irt_core. Recent nacl_sdk has non-executable irt_core.
+	  Patch by Shinichiro Hamaji.
+	  [Fixes GH-529] https://github.com/ruby/ruby/pull/529
+
+Mon Jun 23 18:44:45 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/config_files.rb: rename class ConfigFiles to Downloader.
+	* tool/get-config_files: ditto.
+	* tool/make-snapshot: ditto.
+
+Mon Jun 23 18:03:13 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* tool/rbinstall.rb: support to install bundle gems.
+
+Mon Jun 23 17:33:11 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/net/imap.rb (Net::IMAP#fetch): [DOC] Describe how a range in
+	  +set+ is interpreted, and mention -1 which can be used for '*'.
+
+Mon Jun 23 16:22:50 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/ruby.h (struct RHash): no longer. [Feature #9889]
+
+	* include/ruby/ruby.h (RHASH): ditto.
+
+	* include/ruby/ruby.h (RHASH_ITER_LEV): deprecated.  Will be deleted later.
+
+	* include/ruby/ruby.h (RHASH_IFNONE): ditto.
+
+	* internal.h (struct RHash): moved here.
+
+	* internal.h (RHASH): ditto.
+
+	* hash.c (rb_hash_iter_lev): do not use this.
+
+	* hash.c (rb_hash_ifnone): ditto.
+
+Mon Jun 23 13:30:11 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/ruby.h (struct RComplex): no longer. [Feature #9888]
+
+	* include/ruby/ruby.h (RCOMPLEX): ditto.
+
+	* include/ruby/ruby.h (RCOMPLEX_SET_REAL): deprecated.  Will be deleted later.
+
+	* include/ruby/ruby.h (RCOMPLEX_SET_IMAG): ditto.
+
+	* internal.h (struct RFloat): moved here.
+
+	* internal.h (RCOMPLEX): ditto.
+
+	* complex.c (rb_complex_set_real): do not use this.
+
+	* complex.c (rb_complex_set_imag): ditto.
+
+Mon Jun 23 13:10:15 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* include/ruby/ruby.h (struct RFloat): no longer.  [Feature #9863]
+
+	* include/ruby/ruby.h (RFLOAT): ditto.
+
+	* internal.h (struct RFloat): moved here.
+
+	* internal.h (RFLOAT): ditto.
+
+Mon Jun 23 12:01:42 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb (check_port): allow strings for port= as
+	  described in rdoc.
+
+	* lib/uri/rfc3986_parser.rb (regexp): implementation detail of above.
+
+Mon Jun 23 11:35:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): set backtrace in system stack error
+	  other than the pre-allocated sysstack_error.  [Feature #6216]
+
+	* proc.c (Init_Proc): freeze the pre-allocated sysstack_error.
+
+	* vm_insnhelper.c (vm_stackoverflow): raise new instance for each
+	  times without calling any methods to keep the backtrace with no
+	  further stack overflow.
+
+	* object.c (rb_obj_copy_ivar): extract function to copy instance
+	  variables only for T_OBJECT from init_copy.
+
+Mon Jun 23 11:11:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (check_stack_overflow): drop the last tag too close to
+	  the fault page, to get rid of stack overflow deadlock.
+	  [Bug #9971]
+
+Sun Jun 22 09:11:15 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/generic.rb: remove registry.
+	  'registry' is not used and RFC3986 doesn't use it.
+
+Sun Jun 22 09:10:09 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/rfc3986_parser.rb: raise exception when given a URI string
+	  has non ASCII in order to keep the regexp compiled for US-ASCII.
+
+Sun Jun 22 09:05:42 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/common.rb (URI::REGEXP): move to lib/uri/rfc2396_parser.rb.
+
+	* lib/uri/common.rb (URI::Parser): ditto.
+
+	* lib/uri/common.rb (URI.split): use RFC3986_Parser. [Feature #2542]
+
+	* lib/uri/common.rb (URI.parse): ditto.
+
+	* lib/uri/common.rb (URI.join): ditto.
+
+	* lib/uri/common.rb (URI.extract): deprecated.
+
+	* lib/uri/common.rb (URI.regexp): ditto.
+
+	* lib/uri/rfc2396_parser.rb: added.
+
+	* lib/uri/rfc3986_parser.rb: added.
+
+Sun Jun 22 09:04:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/mailto.rb (initialize): as previous commit, fix arg_check
+
+Sun Jun 22 09:01:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/uri/ftp.rb (initialize): argument checking flag is arg_check,
+	  but arg[-1] is fragment.
+
+	* lib/uri/ftp.rb (initialize): explicitly specify arguments.
+
+Sat Jun 21 12:50:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/extconf.rb: supply 0 to fill RUBY_LIBFFI_MODVERSION
+	  with 3-digit.  libffi 3.1 returns just 2-digit.
+	  [ruby-core:62920] [Bug #9897]
+
+Sat Jun 21 07:06:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (enc_find): [DOC] never accepted a symbol.
+	  [ruby-dev:48308] [Bug #9966]
+
+Fri Jun 20 17:15:43 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/lib/tracepointchecker.rb: add to check TracePoint healthiness.
+
+	* test/runner.rb: use it.
+
+Fri Jun 20 07:26:44 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_settracefunc.rb: rewrite tests with
+	  assert_consistent_call_return().
+
+	  assert_consistent_call_return() is also modified to check
+	  consistency.
+
+Fri Jun 20 07:07:28 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* compile.c (rb_iseq_compile_node): put start label of block after
+	  trace (b_call).
+	  [Bug #9964]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+	  added assert_consistent_call_return() method check call/return
+	  consistency.
+
+Fri Jun 20 05:26:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_eval.c (rb_catch_protect): fix same problem of [Bug #9961].
+
+	* vm_eval.c (rb_iterate): ditto.
+
+Thu Jun 19 21:41:30 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (rb_vm_rewind_cfp): add new function to rewind specified cfp
+	  with invoking RUBY_EVENT_C_RETURN.
+	  [Bug #9961]
+
+	* vm_core.h: ditto.
+
+	* eval.c (rb_protect): use it.
+
+	* eval.c (rb_rescue2): ditto.
+
+	* vm_eval.c (rb_iterate): ditto.
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+	* vm_core.h (rb_vm_rewind_cfp): add the prototype declaration.
+
+Thu Jun 19 19:47:21 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (invoke_block_from_c): move call/return event timing for
+	  bmethod. It can invoke inconsistent call event if this call raises
+	  argument error.
+	  [Bug #9959]
+
+	* vm_insnhelper.c (vm_call_bmethod_body): ditto.
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+Thu Jun 19 18:14:47 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_core.h: add VM_FRAME_MAGIC_RESCUE to recognize normal block or
+	  rescue clause.
+
+	* vm.c (vm_exec): use VM_FRAME_MAGIC_RESCUE on at rescue/ensure.
+
+	* test/ruby/test_settracefunc.rb: should not invoke b_return at rescue
+	  clause.
+	  [Bug #9957]
+
+	* vm_dump.c (control_frame_dump): check VM_FRAME_MAGIC_RESCUE.
+
+	* vm_dump.c (vm_stack_dump_each): ditto.
+
+Thu Jun 19 13:39:11 2014  Arne Brasseur  <arne@arnebrasseur.net>
+
+	* proc.c (rb_method_curry): Implement Method#curry, which delegates
+	  to to_proc.curry.  [ruby-core:62212] [Feature #9783]
+
+Tue Jun 17 16:41:49 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (gets, readline): read lines without LF properly.
+	  [ruby-core:63205] [Bug #9949]
+
+	* test/net/ftp/test_buffered_socket.rb: related test.
+
+Tue Jun 17 12:35:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (extract_raise_opts): pass unknown options to the
+	  exception, so that exception class can receive a hash argument.
+	  [ruby-core:63203] [Feature #8257]
+
+Tue Jun 17 12:24:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (obj_memsize_of): memsize_of(T_ZOMBIE) returns 0, not a rb_bug.
+	  ObjectSpace.count_objects_size() uses memsize_of(T_ZOMBIE).
+
+	  This bug introduced at r46348.
+
+Mon Jun 16 19:00:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/runner.rb: failure message should be passed as an argument.
+
+Mon Jun 16 18:42:57 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/runner.rb: capture TracePoint stat before setup and compare
+	  it after teardown.
+
+Mon Jun 16 14:33:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (open): use UTF-8 version function to support
+	  non-ascii path properly.  [ruby-core:63185] [Bug #9946]
+
+Sat Jun 14 10:54:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rcombinate0): remove recursion, by looping with indexes
+	  stored in `p`.
+
+	* array.c (rpermute0): remove recursion, by looping with indexes
+	  stored in `p`.
+
+	* array.c (permute0): remove recursion, by looping with indexes
+	  stored in `p`.  [ruby-core:63103] [Bug #9932]
+
+Sat Jun 14 10:52:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_resize): update capa only when buffer get
+	  reallocated.
+	  http://d.hatena.ne.jp/nagachika/20140613/ruby_trunk_changes_46413_46420#r46413
+
+Sat Jun 14 08:28:59 2014  Zachary Scott  <e@zzak.io>
+
+	* man/rake.1: [DOC] Update links for Rake, patch by @hsbt [Bug #9904]
+	  [Fixes GH-628] https://github.com/ruby/ruby/pull/628
+
+Fri Jun 13 17:58:58 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: add new method TracePoint.stat to debug
+	  TracePoint mechanism.
+
+	  Ruby users should not use this method. So I don't note this method
+	  in the NEWS file.
+
+	* test/runner.rb: detect zombie active TracePoints with
+	  TracePoint.stat.
+
+Fri Jun 13 17:46:31 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm_trace.c: clear and restore recursive checking thread local data
+	  to avoid unexpected throw from TracePoint.
+	  [Bug #9940]
+
+	* test/ruby/test_settracefunc.rb: add a test.
+
+	* thread.c: added
+	  * rb_threadptr_reset_recursive_data(rb_thread_t *th);
+	  * rb_threadptr_restore_recursive_data(rb_thread_t *th, VALUE old);
+
+	* vm_core.h: ditto.
+
+Fri Jun 13 17:33:14 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_combination): iterate on a shared copy, and use
+	  array of indexes instead of array of chosen objects.
+	  [ruby-core:63149] [Bug #9939]
+
+	* array.c (yield_indexed_values): extract from permute0(),
+	  rpermute0(), and rcombinate0().
+
+Fri Jun 13 13:42:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_permutation): `p` is the array of size `r`, as
+	  commented at permute0().  since `n >= r` here, buffer overflow
+	  never happened, just reduce unnecessary allocation though.
+
+Thu Jun 12 20:32:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_resize): should consider the capacity instead
+	  of the old length, as pointed out by nagachika.
+
+Thu Jun 12 18:31:01 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/net/http/responses.rb: added Net::HTTPPermanentRedirect(308)
+	  Contributed by @yorkie [fix GH-638]
+
+Thu Jun 12 13:27:38 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_freeze): shrink the buffer before freezing, as
+	  pointed out by Eric Wong at [ruby-core:63119].
+
+Thu Jun 12 13:09:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (expand_path): shrink expanded path which no longer needs
+	  rooms to append.  [ruby-core:63114] [Bug #9934]
+
+Wed Jun 11 17:37:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_scalar_pthread_t): pthread_t is not required
+	  to be a scalar type.
+
+	* thread.c (fill_thread_id_string, thread_id_str): dump pthread_t
+	  in hexadecimal form if it is not a scalar type, assume it can be
+	  represented in a pointer form otherwise.  based on the patch by
+	  Rei Odaira at [ruby-core:62867].  [ruby-core:62857] [Bug #9884]
+
+	* thread_pthread.c (Init_native_thread, thread_start_func_1),
+	  (native_thread_create): set thread_id_str if needed.
+
+	* vm_core.h (rb_thread_t): add thread_id_string if needed.
+
+Wed Jun 11 01:53:22 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: invoke GC before memory allocation (xmalloc/xrealloc)
+	  when GC.stress = true.
+	  [Bug #9859]
+
+	* test/ruby/test_gc.rb: add a test.
+
+Tue Jun 10 13:20:14 2014  Takeyuki FUJIOKA  <xibbar@ruby-lang.org>
+
+	* lib/cgi/core.rb: Provide a mechanism to specify the
+	  max_multipart_length of multipart data.
+	  [Feature #8370] patch by Leif Eriksen <leif.eriksen.au@gmail.com>
+
+Tue Jun 10 10:57:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/csv.rb (CSV#<<): honor explicitly given encoding.  based on
+	  the patch by DAISUKE TANIWAKI <daisuketaniwaki AT gmail.com> at
+	  [ruby-core:62113].  [Bug #9766]
+
+Mon Jun  9 20:40:48 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change full GC timing to keep lower memory usage.
+
+	  Extend heap only at
+	  (1) after major GC
+	  or
+	  (2) after several (two times, at current) minor GC
+
+	  Details in https://bugs.ruby-lang.org/issues/9607#note-9
+	  [Bug #9607]
+
+Mon Jun  9 16:01:41 2014  Masahiro Ide  <imasahiro9@gmail.com>
+
+	* gc.c (gcdebug_sentinel): fix typo, "sentinel" not "sential".
+	  [fix GH-634]
+
+Mon Jun  9 00:04:25 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (posix_fadvise): disable use of posix_fadvise
+	  itself on 32-bit AIX.  [ruby-core:62968] [Bug #9914]
+
+Sun Jun  8 23:28:00 2014    <kanemoto@ruby-lang.org>
+
+	* io.c (rb_io_advise): AIX currently does not support a 32-bit call to
+	  posix_fadvise() if _LARGE_FILES is defined. Patch by Rei Odaira.
+	  [ruby-core:62968] [Bug #9914]
+
+Sun Jun  8 04:52:40 2014  Jun Hiroe  <Jun.Hiroe@gmail.com>
+
+	* string.c (rb_str_slice_bang): [DOC] update return value against
+	  a fixnum, which has changed because of M17N.  [fix GH-631]
+
+Sat Jun  7 22:13:42 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* numeric.c (do_coerce): Add a warning when an exception is raised
+	  or an invalid value is returned in #coerce called by
+	  numeric comparison operators and the exception
+	  thrown by the caller has no information on the failure.
+	  In the next release such exception should not be rescued or
+	  should be the cause of the caller exception. nil is accepted
+	  as the "no possible coercion" return value. See #7688.
+
+	* test/ruby/test_numeric.rb: Add corresponding test.
+
+Sat Jun  7 18:15:33 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* numeric.c (bit_coerce): remove constant parameter `err'
+	  (always TRUE) of bit_coerce().
+
+Sat Jun  7 16:01:57 2014  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* cont.c (rb_fiber_struct): keep context.uc_stack.ss_sp and context.uc_stack.ss_size
+	  for later use. Patch by Rei Odaira. [ruby-core:62945] [Bug #9905]
+
+Sat Jun  7 12:51:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (read_all): truncate the buffer before appending read data,
+	  instead of truncating before reading.
+	  [ruby-core:55951] [Bug #8625]
+
+Sat Jun  7 12:28:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/digest/digest.c (rb_digest_instance_equal): no need to call
+	  `to_s` twice.  [Bug #9913]
+
+Sat Jun  7 11:35:01 2014  Tanaka Akira  <akr@fsij.org>
+
+	* object.c (rb_mod_initialize_clone): Override Kernel#initialize_clone
+	  to avoid an exception on Class.new.freeze.clone.to_s.
+	  Reported by Andrew Grimm.  [ruby-core:41858] [Bug #5828]
+
+Sat Jun  7 06:03:11 2014  Benoit Daloze  <eregontp@gmail.com>
+
+	* ext/digest/digest.c (rb_digest_instance_equal):
+	  fix #== for non-string arguments. [ruby-core:62967] [Bug #9913]
+
+	* test/digest/test_digest.rb: add test for above.
+
+Fri Jun  6 22:19:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (private_recv_p): check by node type, instead of a
+	  magic number.
+
+	* node.h (NODE_PRIVATE_RECV), parse.y (attrset_gen): remove
+
+Fri Jun  6 17:07:08 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (iseq_compile_each), parse.y (new_attr_op_assign_gen):
+	  allow op assign to a private attribute.
+	  [ruby-core:62949] [Bug #9907]
+
+Fri Jun  6 13:39:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_setstrbuf, io_read): should not shorten the given buffer until
+	  read succeeds.  [ruby-core:55951] [Bug #8625]
+
+Fri Jun  6 07:41:41 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: dump empty symbols with a
+	  tag so that they can be parsed on input. [Bug #9873] [ruby-core:62825]
+	* test/psych/test_symbol.rb: test for change
+
+Thu Jun  5 16:08:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_page_sweep): refactoring.
+
+	* gc.c (gc_page_sweep): should not set, but add final_slots into
+	  sweep_page->final_slots.
+
+Thu Jun  5 14:36:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (jemalloc): check for the header regardless drop-in
+	  libjemalloc is found, for `malloc_conf` declaration.
+
+	* version.c (ruby_show_version): show `malloc_conf` if set.
+	  [Feature #9113]
+
+	* configure.in (with-jemalloc): also check for header, for ABIs
+	  which JEMALLOC_MANGLE is needed, i.e., Mach-O and PE-COFF
+	  platforms.  [ruby-core:62939] [Feature #9113]
+
+	* include/ruby/missing.h: include alternative malloc header to
+	  replace memory management functions.
+
+	* dln.c, io.c, parse.y, st.c: undef malloc family before
+	  re-definition to suppress warnings.
+
+Thu Jun  5 12:52:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* man/ruby.1: remove rubyforge entry.
+
+Thu Jun  5 12:45:32 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* misc/README: use github link instead of rubyforge.
+
+Thu Jun  5 10:03:29 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (obj_free): check also FL_PROMOTED bit by RVALUE_OLD_P().
+
+Thu Jun  5 03:45:28 2014  Eric Wong  <e@80x24.org>
+
+	* configure.in: add --with-jemalloc option
+	  [ruby-core:62912]
+
+Wed Jun  4 22:28:14 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: introduce RZombie to manage zombie objects.
+	  Rewrite finalizing logics with this type.
+
+	* gc.c (gc_verify_internal_consistency): verify zombie (finalizing)
+	  objects count.
+
+Wed Jun  4 22:09:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (match_aref, rb_reg_regsub): consider encoding of captured
+	  names, encoding-incompatible should not match.
+	  [ruby-dev:48278] [Bug #9903]
+
+Wed Jun  4 21:23:52 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (match_aref): should not ignore name after NUL byte.
+	  [ruby-dev:48275] [Bug #9902]
+
+Wed Jun  4 04:08:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (core_hash_merge_kwd): should return the result hash, which
+	  may be converted from and differ from the given argument.
+	  [ruby-core:62921] [Bug #9898]
+
+Tue Jun  3 23:32:34 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ruby.c (load_file_internal2): Extracted from load_file_internal.
+	  (load_file_internal): Invoke load_file_internal2 using rb_protect.
+	  Close an opened FD if load_file_internal2 raises an exception.
+
+Tue Jun  3 19:11:45 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_objspace_free): should not rest_sweep() here.
+	  Some data structures are already freed.
+
+Tue Jun  3 18:43:51 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: allocate more objects to invoke GC by newobj.
+	  GC allows extending pages depends on heap_increment.
+
+Tue Jun  3 18:01:27 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_call_finalizer_at_exit): add
+	  gc_verify_internal_consistency() when RGENGC_CHECK_MODE >= 2.
+
+Tue Jun  3 17:54:21 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: change the counting method for young objects.
+	  clear counter at the beginning of every GC and
+	  count promoted (infant->young) objects.
+
+	  Some promotions (infant->young) are transition of promoting to old
+	  objects. We should not count such promotions.
+
+	  With this technique, we don't need to check young objects
+	  at obj_free().
+
+Tue Jun  3 16:38:19 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: add verifying counters code in gc_verify_internal_consistency().
+	  gc_verify_internal_consistency() counts all
+	  - live objects
+	  - young objects (if age2 promotion)
+	  - old objects
+	  in all pages and compares with objspace managing counters.
+
+	* gc.c (gc_after_sweep): do gc_verify_internal_consistency()
+	  when RGENGC_CHECK_MODE >= 2.
+
+Tue Jun  3 13:14:04 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/imap.rb (body_type_1part): Gmail IMAP reports a body
+	  type as "MIXED" followed immediately by params
+	  [ruby-core:62864] [Bug #9885]
+	  Patch by @rayners (David Raynes). [Fixes GH-622]
+	  https://github.com/ruby/ruby/pull/622
+
+Tue Jun  3 13:18:24 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_live_slot): live slot count should not include final
+	  slot (contains T_ZOMBIE) count.
+
+Tue Jun  3 13:03:21 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (obj_free): fix spacing.
+
+Tue Jun  3 12:59:32 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (check_gen_consistency): fix error message.
+
+Tue Jun  3 12:40:23 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: count old/young objects more correctly.
+
+	* gc.c (RVALUE_DEMOTE_FROM_OLD): decrement old object count.
+
+	* gc.c (RVALUE_DEMOTE_FROM_YOUNG): decrement young object count.
+
+	* gc.c (rb_gc_resurrect): increment old object count.
+
+	* gc.c (gc_marks_body): should not add old object count.
+	  This code is completely my misunderstanding.
+
+	* gc.c (rb_gc_force_recycle): decrement young or old object count
+	  correctly.
+
+Tue Jun  3 12:26:47 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/memory_status.rb: add $LOAD_PATH to load test/unit
+	  correctly for fiddle/import unavailable environments.
+
+Tue Jun  3 09:45:13 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/openssl/test_ssl.rb (OpenSSL::TestSSL#test_verify_result):
+	  shouldn't use same server for respective tests, because the 1st
+	  test sometimes kills the server main loop silently.
+	  [Bug #9881] [ruby-dev:48266]
+
+Tue Jun  3 01:34:59 2014  Zachary Scott  <e@zzak.io>
+
+	* README.EXT: [DOC] Add rb_call_super when subclassing from @robin850
+	  [Fixes GH-623] https://github.com/ruby/ruby/pull/623
+
+Mon Jun  2 17:14:49 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (ruby_vm_destruct): remove useless call of
+	  rb_gc_force_recycle().
+
+	  At this line, a VM object is already freed
+	  (is changed to T_NONE) by rb_gc_call_finalizer_at_exit().
+
+Mon Jun  2 15:50:24 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* eval.c (rb_using_refinement): add write-barriers for
+	  cref->nd_refinements.
+
+Mon Jun  2 12:26:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* CONTRIBUTING.md: added contributing guide for github. [fix GH-625]
+
+Mon Jun  2 07:30:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/envutil.rb (default_warning): New method.
+
+	* test/ruby/test_autoload.rb: Use EnvUtil.default_warning.
+
+Mon Jun  2 07:05:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* include/ruby/encoding.h: constify `rb_encoding` arguments.
+
+	* include/ruby/oniguruma.h: constify `OnigEncoding` arguments.
+
+Sun Jun  1 12:05:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/drb: Wrap tests definitions by DRbTests module.  This makes
+	  several tests (ACLEntryTest, TestBug4409, etc.) easier to understand
+	  that they are tests for DRb.
+
+Sun Jun  1 11:36:25 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rinda/ring.rb (RingFinger#make_socket): Close the socket on
+	  exception.
+
+Sun Jun  1 06:55:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (intern_str): dynamic attrset ID is registered by
+	  `rb_id_attrset()` already, so no further registration is needed.
+	  [ruby-core:62861]
+
+Sun Jun  1 04:52:47 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/English.rb: [DOC] $LOADED_FEATURES moved to load.c [Fixes GH-620]
+	  Patch submitted by @leafac in https://github.com/ruby/ruby/pull/620
+	* doc/globals.rdoc: Added $LOADED_FEATURES to list
+
+Sat May 31 22:30:14 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/leakchecker.rb: Leak checker extracted from
+	  test/lib/minitest/unit.rb.
+
+Sat May 31 21:15:43 2014  URABE Shyouhei  <shyouhei@ruby-lang.org>
+
+	* thread.c (rb_thread_atfork_internal): My compiler complains
+	  about this variable being used before initialized. I looked at
+	  the code and expanded the macro and turned out it was actually
+	  USED for pointer arithmetic, not dereferenced.  So this was
+	  never a serious bug.  But is annoying indeed to see warnings
+	  every time.  I added `=0` and all went healthy.
+
+	* configure.in: Also, I found that the problematic macro expansion
+	  only happens when we lack __typeof__ C extension, which shall
+	  not be the case of my compiler.  I added AC_C_TYPEOF to kick ass.
+
+Sat May 31 16:32:50 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/ipaddr.rb: extracted inline tests into test dir.
+	* test/test_ipaddr.rb: ditto.
+
+Sat May 31 16:29:21 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/digest/lib/digest/hmac.rb: extracted inline tests into test dir.
+	* test/digest/test_digest_hmac.rb: ditto.
+
+Sat May 31 16:02:03 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_syslog.rb: remove executable.
+
+Sat May 31 08:58:32 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/unicode.c (init_case_fold_table): no longer need to
+	  initialize tables at runtime.
+
+	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
+	  lookup case unfolding table 3.
+
+	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
+	  lookup case unfolding table 2.
+
+	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
+	  lookup case unfolding table 1.
+
+	* enc/unicode/case-folding.rb (lookup_hash): make perfect hash to
+	  lookup case folding table.
+
+	* enc/unicode/case-folding.rb (print_table): merge non-locale and
+	  locale tables, and reduce initializing loops.
+
+	* enc/unicode/case-folding.rb (CaseFolding): modularize, and add
+	  --output-file option.
+
+	* enc/unicode/case-folding.rb: script to convert CaseFolding.txt,
+	  translated from CaseFolding.py.
+
+Sat May 31 08:31:41 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Check Tempfile leaks for each test method
+	  again.
+
+Sat May 31 03:50:50 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/delegate.rb: [DOC] Document raise in Delegator class
+	  Patch by @lucasmazza. [Fixes GH-621]
+	  https://github.com/ruby/ruby/pull/621
+
+Fri May 30 21:23:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/server.rb: Use a pipe to detect server shutdown.
+	  shutdown() or close() for listening socket is not a reliable.
+	  Actually, both doesn't work (doesn't wake up select()) on
+	  DragonFly BSD 3.6.2.
+
+	* test/webrick/utils.rb: :ShutdownSocketWithoutClose is not required
+	  now to immediate server shutdown detection.
+	  This fixes fd leaks.
+
+	* test/net/http/utils.rb: Ditto.
+
+Fri May 30 20:58:37 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (check_fd_leak): Sort the inspected
+	  objects list for a FD.
+
+Fri May 30 18:06:55 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (check_fd_leak): Try GC to delete leaked
+	  FDs.
+
+Fri May 30 12:05:59 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* test/lib/test/unit/parallel.rb (_run_suite): orig_stdout may be nil
+	  though I don't know the reason.
+
+Fri May 30 11:33:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_substr): need to reset code range for shared
+	  string too, not only copied string.
+	  [ruby-core:62842] [Bug #9882]
+
+Fri May 30 10:22:21 2014  Mark Lorenz  <mlorenz@covermymeds.com>
+
+	* lib/erb.rb (result): [DOC] no longer accepts a Proc, as
+	  Kernel.eval does not.  [fix GH-619]
+
+Fri May 30 07:25:46 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/-test-/dir: Dir#fileno implemented.
+
+	* test/lib/minitest/unit.rb (find_fds): Don't return the fd used to
+	  scan /proc/$$/fd.
+
+Fri May 30 04:48:00 2014  Eric Wong  <e@80x24.org>
+
+	* parse.y (rb_gc_mark_parser): remove, empty since r8758
+	* internal.h: ditto, not usable from extensions since 2.0.0
+	* gc.c (gc_mark_roots): remove checkpoint for parser
+
+Thu May 29 23:27:50 2014  Rei Odaira  <Rei.Odaira@gmail.com>
+
+	* signal.c (ruby_signal): should return either `old.sa_sigaction`
+	  or `old.sa_handler`, depending on whether `SA_SIGINFO` is set in
+	  `old.sa_flags`, because they may not be a union.
+	  [ruby-core:62836] [Bug #9878]
+
+Thu May 29 23:11:20 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (pipe_open): Close pipes when rb_execarg_fixup() raises
+	  an exception.
+	  (rb_execarg_fixup_v): New function.
+
+Thu May 29 22:18:57 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (capture_subprocess_io): Close fds.
+
+Thu May 29 19:47:08 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_s_pipe): Close pipes if io_encoding_set() raises an
+	  exception.
+	  (io_encoding_set_v): New function.
+
+Thu May 29 19:42:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/csv.rb (CSV.open): Close the opened file when an exception
+	  occur.
+
+Thu May 29 19:31:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (SSLServer#accept): Close a socket
+	  if any exception occur.
+
+Thu May 29 05:05:29 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/ruby.h: Hide Symbol internals.
+	  (struct RSymbol): moved to internal.h
+	  (RSYMBOL): ditto
+
+Thu May 29 00:28:56 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/unixsocket.c (rsock_init_unixsock): Open a socket
+	  after path length check.
+	  This fixes a fd leak by TestSocket_UNIXSocket#test_too_long_path.
+
+Wed May 28 23:04:35 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_io.rb (test_flush_in_finalizer1): Use
+	  ObjectSpace.each_object to close files.
+	  GC.start is not reliable.
+
+Wed May 28 19:00:31 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/net/imap.rb (Net::IMAP#initialize): Close the opened socket when
+	  any exception occur.
+	  This fixes a fd leak by IMAPTest#test_imaps_post_connection_check
+	  which start_tls_session() raises an exception.
+
+Wed May 28 18:06:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/ossl_ssl.c (ossl_ssl_close): Fix sync_close to work
+	  when SSL is not started.
+	  This fix the fd leak by test_https_proxy_authentication in
+	  test/net/http/test_https_proxy.rb.
+
+Wed May 28 10:29:28 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (rb_vm_living_threads_foreach): remove function
+	  [ruby-core:62745]
+	* thread.c (terminate_i): remove
+	* thread.c (terminate_all): implement (inlines old terminate_i)
+	* thread.c (rb_thread_terminate_all): use terminate_all
+	* thread.c (rb_thread_fd_close_i): remove
+	* thread.c (rb_thread_fd_close): iterate inline
+	* thread.c (thread_list_i): remove
+	* thread.c (rb_thread_list): iterate inline
+	* thread.c (rb_thread_atfork_internal): iterate inline
+	* thread.c (terminate_atfork_i): update types to remove casts
+	* thread.c (terminate_atfork_before_exec_i): ditto
+	* thread.c (struct thgroup_list_params): remove definition
+	* thread.c (thgroup_list_i): remove
+	* thread.c (thgroup_list): iterate inline
+	* thread.c (check_deadlock_i): remove
+	* thread.c (debug_deadlock_check): implement (inlines check_deadlock_i)
+	* thread.c (debug_i): remove
+	* thread.c (rb_check_deadlock): iterate inline
+	* vm.c (vm_mark_each_thread_func): remove
+	* vm.c (rb_vm_mark): iterate inline
+	* vm_core.h (rb_vm_living_threads_remove): remove
+	* vm_trace.c (clear_trace_func_i): remove
+	* vm_trace.c (rb_clear_trace_func): iterate inline
+
+Wed May 28 09:30:51 2014  Eric Wong  <e@80x24.org>
+
+	* signal.c (signal_exec): ignore immediate cmd for SIG_IGN
+	* signal.c (trap_handler): set cmd to true for SIG_IGN
+	* signal.c (trap): handle nil and true values for oldcmd
+	  [Bug #9835]
+
+Wed May 28 01:02:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tempfile.rb (Tempfile#inspect): Show "(closed)" if the tempfile
+	  is closed.
+
+Wed May 28 00:38:09 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Use Tempfile#close! instead of
+	  Tempfile#unlink to close file descriptors.
+
+	* test/openssl/test_config.rb: Ditto.
+
+	* test/ruby/test_io.rb: Ditto.
+
+Wed May 28 00:06:18 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/net/ftp.rb (transfercmd): Close TCP server socket even if an
+	  exception occur.
+
+Tue May 27 23:50:07 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/cgi/core.rb: Use Tempfile#close! instead of Tempfile#unlink
+	  to close file descriptors.
+
+Tue May 27 23:06:46 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_number_literal_suffix): refine error message for
+	  extra dot and digits.
+
+Tue May 27 22:44:20 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/rexml: Avoid fd leaks.
+
+Tue May 27 22:24:25 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb: Indent.
+
+Tue May 27 22:15:29 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_document.rb: Wrap by REXMLTests module.
+
+Tue May 27 22:11:10 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_encoding_2.rb: Remove a needless file.
+
+Tue May 27 22:10:30 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_contrib.rb: Indent.
+
+Tue May 27 21:28:16 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/socket/ifaddr.c (ifaddr_inspect_flags): support IFF_SIMPLEX.
+
+Tue May 27 21:03:03 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/: Use REXMLTests as wrapping module for REXML tests.
+	  I avoid using the same module for library in test because
+	  it provides "include REXML" environment in test. Normally,
+	  users don't use REXML on "include REXML" environment. So I
+	  don't want to write tests on "include REXML" environment.
+
+Tue May 27 20:59:37 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_comment.rb: Remove needless REXML module wrapping.
+
+Tue May 27 20:56:49 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/openssl/test_pkcs7.rb: Fix inverted expected and actual values.
+
+Tue May 27 20:26:06 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_io.rb (test_flush_in_finalizer1): some opened fds are
+	  remain before GC, so unlink the tempfile is failed.
+
+Tue May 27 19:07:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_autoclose_p): Don't raise on frozen IO.
+
+	* test/lib/minitest/unit.rb: IO#autoclose? may raise IOError.
+
+Tue May 27 19:01:49 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_pair.rb: Modify TestSSL#test_read_and_write
+	  to handle partial sysreads. [Bug #7398][ruby-core:49563]
+	* test/openssl/test_ssl.rb: ditto.
+
+Tue May 27 18:46:23 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_pkcs7.rb: Add tests for PKCS7#type= and add_data.
+	  [Feature #7399][ruby-core:49565]
+
+Tue May 27 17:45:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_hmac.rb (test_binary_update): Added Test for
+	  HMAC signing with UTF-8 String. [Bug #7512][ruby-core:50559]
+
+Tue May 27 17:10:14 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/runner.rb: fixed randomly test failure.
+	  [Bug #6573][ruby-core:45563]
+
+Tue May 27 16:58:12 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_timeout.rb (test_timeout): inverted test condition.
+	  [Bug #8523]
+
+Tue May 27 12:24:22 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Show leaked file descriptors.
+
+Tue May 27 11:12:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (rb_io_fileno, rb_io_inspect): non-modification does not
+	  error on frozen IO.  [ruby-dev:48241] [Bug #9865]
+
+Tue May 27 00:00:21 2014  yui-knk  <spiketeika@gmail.com>
+
+	* insns.def (defineclass): fix typo in the instruction comment.
+	  [fix GH-618]
+
+Mon May 26 16:33:15 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_file.rb: skip the test of atime on Windows, because
+	  Windows delays updating atime about 1 hour.
+	  see more details:
+	    http://msdn.microsoft.com/en-us/library/windows/desktop/ms724290%28v=vs.85%29.aspx
+
+Mon May 26 12:25:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optionparser.rb, lib/optparse.rb (OptParse): aliases.
+	  [ruby-core:62751] [Feature #9864]
+
+Mon May 26 07:59:34 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Show Finished threads line-by-line.
+
+Mon May 26 01:39:02 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/csv.rb: Reject nil as data source for CSV.new, patch by @Peeja.
+	  [Fixes GH-580] https://github.com/ruby/ruby/pull/580
+
+Mon May 26 01:07:51 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Show leaked threads and tempfiles
+	  line-by-line.
+
+Sun May 25 23:02:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (MiniTest::Assertions#diff): Remove
+	  tempfiles.
+
+Sun May 25 22:42:27 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Check tempfile leak for each test class.
+
+Sun May 25 20:31:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func_{getcontext,setcontext}): do not
+	  disable ucontext.h entirely, but disable use of functions only.
+	  `ucontext_t` is necessary in the signal handler now.
+
+Sun May 25 20:00:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (check_stack_overflow): revert part of r46100, the
+	  previous condition was correct, and fix compilation error on
+	  other architecture linux.  [ruby-core:62746] [Bug #9862]
+
+Sun May 25 17:09:13 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Less ObjectSpace.each_object(Tempfile)
+	  invocation.
+
+Sun May 25 16:54:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Use Thread.list instead of
+	  ObjectSpace.each_object(Thread).
+
+Sun May 25 15:53:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/rinda/ring.rb (Rinda::RingServer#shutdown): Join the killed
+	  threads.
+
+Sun May 25 15:26:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/utils.rb: Override the inspect method of the thread
+	  used in WEBrick::Utils::TimeoutHandler.
+
+Sun May 25 14:22:30 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/openssl: Join threads.
+
+Sun May 25 12:46:47 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* error.c (rb_bug_context): new function to report bug with
+	  context.
+
+	* vm_dump.c (rb_vm_bugreport): accepts `ucontext_t` argument to
+	  dump machine registers.  based on [GH-584].
+
+	* signal.c (sigbus, sigsegv): dump machine registers if available.
+
+Sun May 25 12:32:42 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Sort leaked threads and tempfiles.
+
+Sun May 25 12:15:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (check_stack_overflow): fix condition to use ucontext
+	  register, mcontext_t dereference, and its member names, on Mac
+	  OS X.
+
+Sun May 25 11:58:26 2014  Zachary Scott  <e@zzak.io>
+
+	* enumerator.c: [DOC] Fix example to show Enumerator#peek behavior
+	  Patch by Erik Hollembeak [Bug #9814]
+
+Sun May 25 11:56:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vsnprintf.c (BSD_vfprintf): fix string width when precision is
+	  given.  as the result of `memchr` is NULL or its offset from the
+	  start cannot exceed the size, the comparison was always false.
+	  [ruby-core:62737] [Bug #9861]
+
+Sun May 25 11:32:42 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/yaml.rb: Remove Psych::EngineManager [Bug #8344]
+	* test/psych/*: ditto.
+
+Sun May 25 10:34:15 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/regexp.rdoc: [DOC] Clarify whitespace matching by @allolex
+	  [Fixes GH-606] https://github.com/ruby/ruby/pull/606
+
+Sun May 25 10:19:34 2014  Zachary Scott  <e@zzak.io>
+
+	* enum.c: [DOC] Use #find in example to clarify alias by @rachellogie
+	  Patch submitted via documenting-ruby/ruby#34
+
+Sun May 25 10:16:43 2014  Zachary Scott  <e@zzak.io>
+
+	* cont.c: [DOC] Fix rdoc in example for Fiber#transfer by @majjoha
+	  Patch submitted via documenting-ruby/ruby#33
+
+Sun May 25 10:01:11 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/irb.rb: [DOC] Fixed syntax error in example by @jasdeepsingh.
+	  Patch submitted via documenting-ruby/ruby#32
+
+Sun May 25 09:58:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/fileutils/test_fileutils.rb (test_chown_R): Add tests for
+	  chown_R. [Feature #9383][ruby-core:59641]
+
+Sun May 25 09:57:09 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/fileutils/test_fileutils.rb: Added recursively chown tests.
+	  [Feature #9303][ruby-core:59325]
+
+Sun May 25 09:41:56 2014  Zachary Scott  <e@zzak.io>
+
+	* class.c: [DOC] Fixed grammar and examples of instance_methods.
+	  By @alex-frost via documenting-ruby/ruby#31
+
+Sun May 25 09:40:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb: Show leaked threads and tempfiles.
+
+Sun May 25 08:54:38 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/openssl/test_partial_record_read.rb: Testing read_nonblock on
+	  a partial TLS record results in IO::WaitReadable by @mohamedhafez.
+	  [fix GH-547]
+
+Sun May 25 08:43:16 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* lib/logger.rb: refactored to include Logger::Period.
+
+Sun May 25 06:50:19 2014  Zachary Scott  <e@zzak.io>
+
+	* vm_eval.c: [DOC] Improve instance_eval description when given a
+	  block or String arguments. By @nathanl via documenting-ruby/ruby#28
+
+Sun May 25 06:29:39 2014  Zachary Scott  <e@zzak.io>
+
+	* array.c: [DOC] Clarify default argument for Array.new.
+	  By @Elffers [Fixes GH-610]
+
+Sat May 24 22:37:20 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* array.c: [DOC] Add more documents to shuffle! and shuffle.
+	  Contributed by @JuanitoFatas [ci skip][fix GH-612]
+
+Sat May 24 22:28:55 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/lib/minitest/.document: removed unused configuration.
+
+Sat May 24 19:08:47 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/spec.rb: Unused file removed.
+
+	* test/lib/minitest/autorun.rb: Don't require minitest/spec.
+
+	* test/lib/minitest/benchmark.rb: Ditto.
+
+Sat May 24 18:45:30 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/benchmark/test_benchmark.rb: Use test/unit.
+
+Sat May 24 16:20:59 2014  Eric Wong  <e@80x24.org>
+
+	* process.c (proc_getgroups, proc_setgroups): use ALLOCV_N
+	  [Bug #9856]
+
+Sat May 24 15:49:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/unit.rb (parallelize_me!): Removed.
+	  This fixes the line-by-line structure of the test result in verbose
+	  mode.  [ruby-core:54905]
+
+	* test/lib/minitest/parallel_each.rb: Removed.
+
+	* test/minitest/test_minitest_mock.rb: Don't call parallelize_me!.
+
+	* test/minitest/test_minitest_spec.rb: Ditto.
+
+	* test/minitest/test_minitest_unit.rb: Ditto.
+	  Tests for parallel feature removed.
+
+Sat May 24 15:29:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest/hell.rb: Unused file removed.
+
+	* test/lib/minitest/pride.rb: Ditto.
+
+Sat May 24 15:05:32 2014  yui-knk  <spiketeika@gmail.com>
+
+	* enumerator.c (yielder_yield_push): Insert a break after the
+	  method return value.  [fix GH-617]
+
+Sat May 24 14:59:12 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/lib/minitest: Remove comments not appropriate now.
+
+	* test/minitest: Ditto.
+
+Sat May 24 14:02:04 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* NEWS: added minitest changes.
+
+Sat May 24 13:42:46 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/lib/test/unit/test-unit.gemspec: removed needless gemspec file.
+
+Sat May 24 09:39:06 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* defs/default_gems: removed minitest entry.
+
+Sat May 24 06:17:33 2014  Ryan Davis  <ryand-ruby@zenspider.com>
+
+	*  lib/minitest: minitest 4.7.5 removed. Need to support proper
+	  gem packaging / installation before minitest 5 can be added.
+
+Sat May 24 05:54:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: More constants
+
+Sat May 24 00:25:34 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* NEWS: add information of incompatibility about Prime.prime?
+	* lib/prime.rb: fix docs.
+
+Fri May 23 21:36:28 2014  Josh Goebel  <dreamer3@gmail.com>
+
+	* net/protocol.rb (using_each_crlf_line): fix SMTP dot-stuffing
+	  for messages not ending with a new-line.
+	  [ruby-core:61441] [Bug #9627] [fix GH-616]
+
+Fri May 23 03:48:08 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (rb_free_m_tbl): mark function as static
+
+	* method.h (rb_free_m_tbl): remove prototype
+
+Thu May 22 22:58:27 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: More TCP option constants.
+	  Describe Linux and glibc versions.
+
+Thu May 22 20:38:10 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (stat_birthtime): add birthtime support [Feature #9647]
+
+	* file.c (rb_stat_birthtime): add File::Stat.birthtime
+
+	* file.c (rb_file_s_birthtime): add File.birthtime
+
+	* file.c (rb_file_birthtime): add File#birthtime
+
+	* configure.in: check struct stat.st_birthtimespec.
+
+Thu May 22 19:38:14 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c: remove IO::Statfs because of reject. [Feature #9772]
+
+Thu May 22 14:02:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enc/jis/props.kwd: constify character property tables of JIS
+	  based encodings by perfect hash.
+
+	* enc/euc_jp.c, enc/shift_jis.c: use character property functions.
+
+Wed May 21 12:21:10 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c: Fix compilation error on Android.
+	  Bionic doesn't define TCP state constants.
+
+Wed May 21 11:42:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: workaround for Info.plist to get rid of `dsymutil`
+	  crash by wrong files in parent directories.
+	  [ruby-core:62594] [Bug #9840]
+
+Tue May 20 20:57:34 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_dir.rb (test_glob): added testcase of double
+	  slash path.
+
+Tue May 20 04:58:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: Don't check fields of struct tcp_info if the
+	  structure is not available.
+
+Mon May 19 23:13:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_tcp_info): Permit longer data.  (glibc
+	  2.7 adds tcpi_rcv_rtt, tcpi_rcv_space and tcpi_total_retrans to
+	  struct tcp_info.)
+
+Mon May 19 20:49:07 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/option.c (inspect_tcp_info): New function to inspect
+	  struct tcp_info.
+	  (sockopt_inspect): Use inspect_tcp_info.
+
+	* ext/socket/extconf.rb: Check tcp_info related things.
+
+	* ext/socket/rubysocket.h: Include netinet/tcp_fsm.h if available.
+
+Mon May 19 19:36:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/dbm/test_dbm.rb: Use Etc.uname.
+
+	* test/gdbm/test_gdbm.rb: Ditto.
+
+Mon May 19 16:54:22 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/etc/etc.c (etc_uname): add support for Windows using
+	  GetVersionExW(), GetSystemInfo(), and GetComputerNameExW() with
+	  `ComputerNameDnsHostname`.  [Feature #9842]
+
+Mon May 19 16:29:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_pat_search): advance by byte offset but not by char
+	  offset.  [ruby-core:62669] [Bug #9849]
+
+Mon May 19 14:06:18 2014  Shota Fukumori  <her@sorah.jp>
+
+	* bin/testrb: Removed. Forgot to remove in r45971.
+	  [Feature #9711] [ruby-core:62620]
+
+Sun May 18 16:42:08 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_m17n_comb.rb (test_str_crypt): Use Etc.confstr to
+	  detect the glibc version.
+	  libc.so is not an executable on Debian GNU/kFreeBSD 7.0 (wheezy).
+
+Sun May 18 12:15:54 2014  Jonathan Mukai-Heidt  <johnnymukai@gmail.com>
+
+	* io.c (argf_each_line, argf_inplace_mode_set): [DOC] Update ARGF
+	  documentation examples.  `ARGF.lines` has been deprecated in
+	  favor of `ARGF.each_line`.  [Fixes GH-615]
+
+Sun May 18 11:59:25 2014  Tanaka Akira  <akr@fsij.org>
+
+	* missing/nextafter.c: Include ruby/missing.h.
+
+Sun May 18 11:09:28 2014  Tanaka Akira  <akr@fsij.org>
+
+	* win32/Makefile.sub: Add nextafter.obj to MISSING.
+
+Sun May 18 10:46:04 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/etc.c: Etc.sysconf, Etc.confstr and IO#pathconf implemented.
+
+	* ext/etc/extconf.rb: Check sysconf(), confstr() and fpathconf().
+
+	* ext/etc/mkconstants.rb: New file.
+
+	   [ruby-core:62600] [Feature #9842]
+
+Sun May 18 09:58:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/etc.c: Etc.uname method implemented.
+
+	* ext/etc/extconf.rb: Check uname() function.
+
+	  [ruby-core:62139] [Feature #9770]
+
+Sun May 18 09:16:33 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Check nextafter() availability.
+
+	* include/ruby/missing.h (nextafter): New optional declaration.
+
+	* missing/nextafter.c: New file.
+
+	* numeric.c: Float#next_float and Float#prev_float implemented.
+
+	   [ruby-core:62562] [Feature #9834]
+
+Sun May 18 09:02:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c: Enumerable#slice_after implemented.
+
+	* enumerator.c: Enumerator::Lazy#slice_after implemented.
+
+	  Requested by Tsuyoshi Sawada.  [ruby-core:58123] [Feature #9071]
+
+Sun May 18 08:22:25 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_setstrbuf): always check if the buffer is modifiable.
+	  [ruby-core:62643] [Bug #9847]
+
+Sun May 18 01:21:23 2014  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h: Hide Rational internal.
+	  (RRational): Moved to internal.h
+	  (RRATIONAL): Ditto.
+	  (RRATIONAL_SET_NUM): Moved to rational.c.
+	  (RRATIONAL_SET_DEN): Ditto.
+
+	* rational.c (rb_rational_num): New function.
+	  (rb_rational_den): Ditto.
+
+	* include/ruby/intern.h (rb_rational_num): Declared.
+	  (rb_rational_den): Ditto.
+
+	* ext/bigdecimal/bigdecimal.c: Follow the above change.
+
+	* ext/date/date_core.c: Ditto.
+
+	  [ruby-core:60665] [Feature #9513]
+
+Sat May 17 17:04:32 2014  Shota Fukumori  <her@sorah.jp>
+
+	* NEWS: Add news about removal of lib/test/**/*.rb.
+
+Sat May 17 16:57:33 2014  Shota Fukumori  <her@sorah.jp>
+
+	* lib/test: Removed because ruby's test cases now independent to
+	  lib/test by r45970. [Feature #9711] [ruby-core:62620]
+
+	  I'm still considering about the future of lib/minitest, lib/test.
+	  (bundling gems?)
+
+Sat May 17 15:06:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/runner.rb: remove dependency test-unit and minitest
+	  from stdlib when running with test-all.
+	  [Feature #9711][ruby-core:61890]
+	* test/testunit/*.rb: ditto.
+	* test/lib: ditto.
+
+Sat May 17 11:02:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): try match PLAIN as well as ALPHA, which are
+	  separated by previous commits.  [ruby-core:61552] [Bug #9648]
+
+	* dir.c (glob_make_pattern): set PLAIN for non-magical path to
+	  skip parts which not need to glob.
+	  [ruby-core:61552] [Bug #9648]
+
+	* dir.c (has_magic): return ALPHA at alphabetical name regardless
+	  FNM_CASEFOLD flag.
+
+	* dir.c (glob_helper): fix conditions for ALPHA.
+	  [ruby-core:61552] [Bug #9648]
+
+Sat May 17 01:49:27 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_helper): reduce matching at non-magical path on
+	  Windows.
+
+Sat May 17 01:49:23 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (glob_pattern_type): separate names with alphabet but no
+	  magical from plain.
+
+	* dir.c (glob_helper): match plain names as-is to treat super-root
+	  same as the root.  [ruby-core:61552] [Bug #9648]
+
+Fri May 16 17:38:22 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_marks, gc_marks_body): increase the counter of young objects
+	  at the major GC because AGE2Promotion changes all old objects into
+	  young objects at major GC.
+
+Fri May 16 17:26:24 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_before_sweep): heap_pages_swept_slots should contains
+	  heap_pages_increment.
+
+	  For example, GC by exceeding malloc_limit can remain
+	  heap_pages_increment.
+
+Thu May 15 21:18:43 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* configure.in: enable SSE2 on mingw. target='i386-pc-mingw32'.
+	  [ruby-core:62095] [Bug #8358]
+
+Thu May 15 21:04:06 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* lib/test/unit/parallel.rb: fix test-all parallel failure if a test
+	  is skipped after raise.
+	  DL::TestFunc#test_sinf is skipped after raise on mingw ruby.
+	  But it causes Marshal.load failure due to undefined class/module
+	  DL::DLError when doing test-all parallel and test-all doesn't
+	  complete. We create new MiniTest::Skip object to avoid Marshal.load
+	  failure.
+	  [ruby-core:62133] [Bug #9767]
+
+	* test/testunit/test_parallel.rb (TestParallel): add a test.
+
+	* test/testunit/tests_for_parallel/ptest_forth.rb: ditto.
+
+Thu May 15 18:57:23 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (garbage_collect_body): move gc_heap_prepare_minimum_pages()
+	  from gc_sweep().
+
+Thu May 15 18:51:25 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_extend_pages): calculate next growing heap size.
+
+	* gc.c (heap_set_increment): accept addition pages instead of
+	  minimum pages.
+
+	* gc.c (gc_after_sweep): use heap_etend_pages().
+
+	* gc.c (gc_heap_prepare_minimum_pages): add only 1 page.
+
+	* gc.c (heap_ready_to_gc): add only 1 page.
+
+Thu May 15 18:42:49 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: introduce macros to remove magic number.
+
+	  GC_HEAP_FREE_SLOTS_MIN_RATIO = 0.3: guarantee minimum empty slots
+	                                      ratio after sweep.
+	  GC_HEAP_FREE_SLOTS_MAX_RATIO = 0.8: allow to free pages 0.2 (= 1-0.8)
+	                                      of current existing slots.
+
+Thu May 15 17:32:51 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* thread_win32.c (rb_w32_stack_overflow_handler): use Structured
+	  Exception Handling by AddVectoredExceptionHandler() for machine
+	  stack overflow on mingw.
+	  This would be equivalent to the handling using __try and __except
+	  on mswin introduced by r43748.
+
+Wed May 14 19:31:03 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/openssl/depend: remove dependency from internal headers.
+	  [Feature #9612]
+
+	* ext/openssl/ossl.c (ossl_fips_mode_set): ditto.
+
+	* ext/coverage/depend: ditto.
+
+	* include/ruby/thread_native.h: added.
+
+	  This header file only provides wrapper functions to control
+	  native threads. These wrapper functions are used by MRI
+	  implementation.
+
+	* vm_core.h: use include/ruby/thread_native.h.
+
+	* thread.c: ditto.
+
+	* thread_pthread.h: ditto.
+
+	* thread_win32.h: ditto.
+
+	* thread_native.h: removed.
+
+Wed May 14 18:03:28 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: enable RGENGC_AGE2_PROMOTION.
+
+Wed May 14 18:02:30 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rgengc_rememberset_mark): promote remembered object earlier.
+
+Mon May 12 23:57:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_atan2_inf_c99): check whether runtime atan2
+	  handles Inf as C99. [ruby-core:62536] [Bug #9831]
+
+Mon May 12 20:33:01 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: Invoke AC_REPLACE_FUNCS for each function.
+
+Mon May 12 19:52:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: count young object correctly and show it in GC.stat
+	  on RGENGC_AGE2_PROMOTION.
+
+	* gc.c (RVALUE_PROMOTE_YOUNG): decrement young object count on
+	  YOUNG->OLD.
+
+	* gc.c (obj_free): decrement young object count when young object
+	  freed.
+
+	* gc.c (gc_marks): should not clear young object count.
+
+	* gc.c (gc_stat_internal): GC.stat :young_object information.
+
+Mon May 12 01:30:59 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ifaddr.c (IS_IFADDRS): Unused macro removed.
+
+	* ext/strscan/strscan.c (BUFSIZE): Ditto.
+
+	* ext/zlib/zlib.c (OBJ_IS_FREED): Ditto.
+
+Sun May 11 22:27:18 2014  Tanaka Akira  <akr@fsij.org>
+
+	* compile.c (BUFSIZE): Unused macro removed.
+
+	* vm.c (BUFSIZE): Ditto.
+
+	* pack.c (INT64toNUM): Ditto.
+	  (UINT64toNUM): Ditto.
+	  (BYTEWIDTH): Ditto.
+
+	* time.c (lshift): Ditto.
+	  (UINT64toNUM): Ditto.
+	  (id_lshift): Unused variable removed.
+
+Sun May 11 21:23:27 2014  Tanaka Akira  <akr@fsij.org>
+
+	* pack.c (swaps): Unused macro removed.
+	  (swapi): Ditto.
+	  (swapl): Ditto.
+	  (swapll): Ditto.
+
+Sun May 11 08:02:49 2014  Eric Wong  <e@80x24.org>
+
+	* vm_core.h (rb_vm_t): list_head and counter for living_threads
+	  (rb_thread_t): vmlt_node for living_threads linkage
+	  (rb_vm_living_threads_init): new function wrapper
+	  (rb_vm_living_threads_insert): ditto
+	  (rb_vm_living_threads_remove): ditto
+	* vm.c (rb_vm_living_threads_foreach): new function wrapper
+	* thread.c (terminate_i, thread_start_func_2, thread_create_core,
+	  thread_fd_close_i, thread_fd_close): update to use new APIs
+	* vm.c (vm_mark_each_thread_func, rb_vm_mark, ruby_vm_destruct,
+	  vm_memsize, vm_init2, Init_VM): ditto
+	* vm_trace.c (clear_trace_func_i, rb_clear_trace_func): ditto
+	* benchmark/bm_vm_thread_close.rb: added to show improvement
+	* ccan/build_assert/build_assert.h: added as a dependency of list.h
+	* ccan/check_type/check_type.h: ditto
+	* ccan/container_of/container_of.h: ditto
+	* ccan/licenses/BSD-MIT: ditto
+	* ccan/licenses/CC0: ditto
+	* ccan/str/str.h: ditto (stripped of unused macros)
+	* ccan/list/list.h: ditto
+	* common.mk: add CCAN_LIST_INCLUDES
+	  [ruby-core:61871][Feature #9632 (part 1)]
+
+Sun May 11 01:10:31 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* signal.c (rb_f_kill): directly enqueue an ignored signal to self,
+	  except for SIGSEGV and SIGBUS.  [ruby-dev:48203] [Bug #9820]
+
+Sat May 10 22:37:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* dir.c (push_glob): match in UTF-8 on Mac OS X.
+	  [ruby-dev:48213] [Bug #9825]
+
+Sat May 10 13:32:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* thread.c (thread_start_func_2): stop if forked in a sub-thread,
+	  the thread has become the main thread.
+	  [ruby-core:62070] [Bug #9751]
+
+Sat May 10 09:32:19 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* man/ruby.1: remove deadlink. [ruby-core:62145][Bug #9773]
+
+Sat May 10 08:47:36 2014  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (trap): Return "SYSTEM_DEFAULT" if SIG_DFL is set.
+
+Fri May  9 14:27:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (RUBY_SETJMP_TYPE): check for setjmp type after
+	  CCDLFLAGS is appended to CFLAGS, since __builtin_setjmp can be
+	  affected.  [ruby-core:62469] [Bug #9818]
+
+Fri May  9 03:59:06 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/delegate.rb: Fix example of using delegator.
+	  patched from Andrey Koleshko. [Fixes GH-505]
+
+Fri May  9 03:42:43 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/shell.rb: add documentation in lib/shell.rb
+	  patched from reprah. [Fixes GH-516]
+
+Fri May  9 03:28:04 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/fileutils.rb: show fileutils require at top.
+	  patched from Richard Schneeman. [Fixes GH-604]
+
+Fri May  9 03:07:09 2014  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* lib/prime.rb (Prime#prime?): negative numbers can't be primes
+	  by definition. reported by Ivan Kataitsev. [Bug #7395]
+	* test/test_prime.rb: add test.
+
+Thu May  8 14:34:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mod_init_copy): always clear instance variable,
+	  constant and method tables first, regardless the source tables.
+	  [ruby-dev:48182] [Bug #9813]
+
+Thu May  8 10:53:14 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: OpenBSD needs to include sys/param.h before include
+	  sys/mount.h. [ruby-dev:48167]
+
+Thu May  8 10:17:04 2014  Karsten Sperling  <karsten@sperling.co.nz>
+
+	* lib/webrick/httpserver.rb (WEBrick::HTTPServer#run): stop
+	  handling requests on shutdown, even if the socket is readable
+	  and IO.select() returns true.  [Fixes GH-607]
+
+	* lib/webrick/server.rb (WEBrick::GenericServer#start): IO.select()
+	  raises ENOTSOCK on shutdown on Windows.
+
+Wed May  7 21:45:00 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/openssl/lib/openssl/ssl.rb (OpenSSL::SSL::SSLServer#accept):
+	  Consider Socket#accept as well as TCPServer#accept.
+	  Reported by Sam Stelfox.  [ruby-core:62064] [Bug #9750]
+
+Wed May  7 17:24:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (num_step_scan_args): check keyword arguments and fail
+	  if they conflict with positional arguments.
+	  [ruby-dev:48177] [Bug #9811]
+
+Wed May  7 12:06:14 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: remove debug output and output results into
+	  specified file.
+
+Wed May  7 11:55:40 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: add '--rawdata-output=[FILE] option to output
+	  raw results into FILE.
+
+Wed May  7 11:25:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_eval.c (rb_f_local_variables): exclude variables hidden by
+	  shadowing.  [ruby-core:60501] [Bug #9486]
+
+	* vm.c (collect_local_variables_in_iseq): ditto.
+
+Tue May  6 23:29:05 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (new_bv_gen): no duplicated names, if already added in
+	  shadowing_lvar().
+
+	* parse.y (local_tbl_gen): remove local variables duplicated with
+	  arguments.
+	  [ruby-core:60501] [Bug #9486]
+
+Tue May  6 18:48:50 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.make_time): Adjust the time zone of "now".
+
+Tue May  6 18:33:12 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* io.c (io_{read,write}_nonblock): use rb_get_kwargs instead of
+	  rb_hash_aref.
+
+Tue May  6 18:03:05 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.make_time): Argument validation code moved from
+	  Time.parse and Time.strptime.
+
+Tue May  6 17:27:06 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.parse): [DOC] Fix an example in the documentation
+	  to use EST.
+	  Reported by Marcus Stollsteimer.
+	  [ruby-core:60778] [Bug #9521] and [ruby-core:61718] [Bug #9682]
+
+Tue May  6 04:31:48 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* file.c (rb_f_test): removed meaningless "case 'a'".
+
+Tue May  6 01:28:14 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open-uri.rb (OpenURI.open_uri): Call StringIO#close only if
+	  the StringIO object is not closed yet.
+	  Reported by Jordi Massaguer Pla.  [ruby-core:42538] [Bug #6010]
+
+Tue May  6 01:08:01 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: define File::NULL if not defined and /dev/null
+	  is available to run benchmark driver on ruby 1.9.2.
+
+Mon May  5 23:53:24 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/mkconstants.rb: Add IP_TRANSPARENT.
+	  IP_TRANSPARENT is provieded since glibc-2.12.
+	  Reported by Eliezer Croitoru.  [ruby-core:50372] [Bug #7476]
+
+Mon May  5 22:29:47 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (check_exec_redirect): Open the file in write mode for
+	  redirect from [:out, :err].
+	  Proposed and implemented by Yusuke Endoh.
+	  [ruby-dev:41430] [Feature #3348]
+
+Mon May  5 21:52:35 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/lib/pathname.rb (cleanpath_aggressive): make all
+	  separators File::SEPARATOR from File::ALT_SEPARATOR.
+	  Reported by Daniel Rikowski.
+	  Fixed by Nobuyoshi Nakada.  [Bug #9618]
+
+	* ext/pathname/lib/pathname.rb (cleanpath_conservative): ditto.
+
+Mon May  5 21:48:04 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/pathname/lib/pathname.rb (Pathname#/): Aliased to Pathname#+.
+	  Suggested by Alexey Muranov.  [ruby-core:61432] [Feature #9625]
+
+Mon May  5 17:26:09 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* math.c (rb_math_sqrt): omitted exporting an unused function,
+	  anyway.
+	* internal.h: follows the above change.
+
+Mon May  5 11:44:03 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.strptime): Raise ArgumentError if Date._strptime
+	  doesn't extract date information.
+	  Reported by tadayoshi funaba.  [ruby-core:62349]
+
+Mon May  5 01:12:27 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (rt_rewrite_frags): a new feature (not a
+	  bug fix) of strptime.  applies offset even if the given date is
+	  not local time (%s and %Q).  This is an exceptional feature and
+	  I do NOT recommend to use this at all.  Thank you git community.
+
+Sun May  4 20:51:32 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.force_zone!): Use usual local time if it has
+	  expected offset from UTC.
+
+Sun May  4 17:58:12 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.force_zone!): New private method.
+	  (Time.make_time): Use Time.force_zone!.
+	  (Time.strptime): Ditto.
+	  (Time.rfc2822): Ditto.
+	  (Time.xmlschema): Ditto.
+
+	* lib/rss/rss.rb (Time.w3cdtf): Use Time.force_zone!.
+
+Sun May  4 10:22:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* math.c (math_atan2): return values like as expected by C99 if
+	  both two arguments are infinity.  based on the patch by cremno
+	  phobia <cremno AT mail.ru> in [ruby-core:62310].  [Feature #9799]
+
+Sun May  4 03:46:42 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.httpdate): Always return a UTC Time object.
+
+Sun May  4 03:26:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.make_time): Refactored.
+
+Sun May  4 02:53:17 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.rfc2822): Fix year completion.
+	  Produce fixed-offset time object if appropriate.
+	  (Time.xmlschema): Produce fixed-offset time object if appropriate.
+
+Sat May  3 23:52:20 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (make_time): Produce fixed-offset time object if
+	  appropriate.
+	  (Time.strptime): Use d[:zone] instead of d[:offset].
+
+	* lib/rss/rss.rb (Time.w3cdtf): Produce fixed-offset time object if
+	  appropriate.
+
+Sat May  3 20:21:38 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/time.rb (Time.strptime): Use d[:offset] if d[:seconds] is not
+	  given.
+	  Reported by tadayoshi funaba.  [ruby-core:62322]
+
+Sat May  3 04:04:16 2014  Eric Wong  <e@80x24.org>
+
+	* complex.c (parse_comp): replace ALLOCA_N with ALLOCV_N/ALLOCV_END
+	  [Bug #9608]
+	* rational.c (read_digits): ditto
+
+Sat May  3 00:06:30 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* file.c (HAVE_STRUCT_STATVFS_F_BASETYPE): File::Statfs#fstypename
+	  is supported on AIX, HP-UX, and Solaris, by using the value of
+	  struct statvfs.f_basetype.
+
+	* configure.in (HAVE_STRUCT_STATVFS_F_BASETYPE): check struct
+	  statvfs.f_basetype which is available on AIX, HP-UX, and Solaris.
+
+Fri May  2 21:04:02 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (next_id): no reason to set ID_STATIC_SYM here, as ID
+	  returned by rb_intern3 can be a dynamic symbol and the static
+	  symbol flag is set otherwise.  [Bug #9787]
+
+Fri May  2 11:32:51 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/ruby/test_io.rb (test_seek, test_seek_symwhence): defer
+	  File::Statfs#type call which may not be implemented, to mitigate
+	  errors on platforms where SEEK_DATA is available but f_type in
+	  struct statfs is not.  [ruby-dev:48154] [Bug #9789]
+
+Fri May  2 10:37:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_id_attrset): turn dynamically interned Symbol into
+	  an ID, since rb_str_dynamic_intern returns a Symbol but not an
+	  ID.  [ruby-core:62226] [Bug #9787]
+
+Thu May  1 22:19:34 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* file.c: Change AND condition to nested condition.
+
+Thu May  1 00:36:26 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* file.c (FSTATFS): check availability of struct statfs and
+	  struct statvfs in addition to fstatfs(2) and fstatvfs(2).
+	  This fixes error in Solaris. [Bug #9788] [ruby-dev:48145]
+
+Wed Apr 30 19:46:23 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c (gc_after_sweep): suppress unnecessary expanding heap.
+	  Tomb heap pages are freed pages here, so expanding heap is
+	  not required.
+
+Wed Apr 30 17:58:40 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* vm.c (invoke_block_from_c): add VM_FRAME_FLAG_BMETHOD to record
+	  it is bmethod frame.
+
+	* vm.c (vm_exec): invoke RUBY_EVENT_RETURN event if rollbacked frame
+	  is VM_FRAME_FLAG_BMETHOD.
+	  [Bug #9759]
+
+	* test/ruby/test_settracefunc.rb: add a test for TracePoint/set_trace_func.
+
+	* vm_core.h: rename rb_thread_t::passed_me to
+	  rb_thread_t::passed_bmethod_me to clarify the usage.
+
+	* vm_insnhelper.c (vm_call_bmethod_body): use renamed member.
+
+Wed Apr 30 17:06:49 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_id_attrset): pin down dynamic symbol only. it is
+	  possible that attrset ID can be registered as a static symbol
+	  after the corresponding attrget ID has been registered as a
+	  dynamic, and then the latter may be collected.
+	  [ruby-core:62226] [Bug #9787]
+
+Tue Apr 29 14:17:57 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb: Rescue LoadError on etc.so for miniruby.
+	  Revert r45707, r45711, r45717.
+
+Tue Apr 29 12:50:02 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/fileutils.rb: Don't need to define fu_get_gid and fu_get_gid in
+	  rescue LoadError on 'etc'.
+
+Tue Apr 29 10:21:38 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* parse.y (symbols_i): like r45492, call rb_gc_resurrect().
+
+Tue Apr 29 04:29:05 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* file.c (HAVE_STRUCT_STATFS_T_F_FSTYPENAME): Add new macro for
+	  statfs_t.
+	* file.c (HAVE_STRUCT_STATFS_T_F_TYPE): ditto.
+
+	* file.c (rb_io_statfs): check FSTATFS macro only instead of
+	  HAVE_FSTATFS and HAVE_FSTATVFS.
+
+	* file.c (statfs_type): use new macro.
+	* file.c (statfs_fstypename): ditto.
+	* file.c (statfs_inspect): ditto.
+
+Tue Apr 29 00:20:26 2014  Rajarshi Das  <rajarshid@cybage.com>
+
+	* bootstraptest/test_literal.rb: fix typo of "dynamic".  [ci skip]
+
+	* regexp.rdoc: fix typo of "organized".  [ci skip]
+
+	* lib/session.rb: fix typo of "recognized".  [ci skip]
+
+Mon Apr 28 21:40:27 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in (HAVE_STRUCT_STATFS_F_TYPE): check struct statfs.f_type
+	  to support OpenBSD.
+
+	* file.c (statfs_type): use above macro to switch.
+
+	* file.c (statfs_inspect): ditto.
+
+Mon Apr 28 18:06:08 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: check struct statvfs and struct statvfs.f_fstypename.
+
+	* configure.in: on NetBSD fstatfs is obsoleted.
+
+	* file.c: support NetBSD for File::Statfs.
+
+Mon Apr 28 17:42:42 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: This argument must be a pointer.
+
+Mon Apr 28 17:40:15 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* gc.c: Fix typos. These are undefined variables.
+
+Sun Apr 27 19:39:42 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_strptime.c (date__strptime_internal): do not
+	  overwrite century.
+
+Sat Apr 26 11:50:08 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/ruby/test_enum.rb (test_flat_map): Added test for flat_map.
+	  Contribute from @igaiga. [fix GH-598]
+
+Sat Apr 26 10:55:33 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* compile.c (compile_array_): make copy a first hash not to modify
+	  the argument itself.  keyword splat should be non-destructive.
+	  [ruby-core:62161] [Bug #9776]
+
+Sat Apr 26 08:05:36 2014  Tanaka Akira  <akr@fsij.org>
+
+	* test/ruby/test_process.rb (test_rlimit_nofile): Don't limit
+	  RLIMIT_NOFILE too small.
+	  This fix sporadic "[ASYNC BUG] thread_timer: select" on GNU/Linux.
+
+Fri Apr 25 22:54:34 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* lib/fileutils.rb (rmdir): rescue Errno::EEXIST in addition to
+	  ENOTEMPTY (and ENOENT), because SUSv3 describes that "If the
+	  directory is not an empty directory, rmdir() shall fail and set
+	  errno to [EEXIST] or [ENOTEMPTY]" and Solaris uses EEXIST.
+	  [Bug #9571] [ruby-dev:48017]
+
+Fri Apr 25 19:16:30 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/webrick/utils.rb: Don't rescue LoadError for 'etc' extension.
+
+Fri Apr 25 14:55:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_func___builtin_unreachable): try with an
+	  external variable not only by a warning, which might not be
+	  shown due to the optimization.  [ruby-core:61647] [Bug #9665]
+
+Fri Apr 25 13:11:49 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: NetBSD's ksh, used by configure, needs escapes.
+
+Fri Apr 25 12:51:08 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: correct pthread_setname_np's prototype on NetBSD.
+	  [Bug #9586]
+
+Thu Apr 24 23:17:25 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/fileutils.rb (fu_get_uid, fu_get_gid): Etc.getpwnam/getgrnam may
+	  returns nil.
+
+	* lib/webrick/utils.rb (su): ditto.
+
+Thu Apr 24 22:55:22 2014  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/test_io.rb: Add etc.so to $" before require 'tmpdir'.
+
+Thu Apr 24 21:09:55 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* man/ruby.1: fix broken link.
+
+Thu Apr 24 20:53:02 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/tmpdir.rb: Don't need to rescue LoadError for etc.so.
+
+Thu Apr 24 17:39:53 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (statfs_inspect): suppress warnings.
+	  assume those values won't be larger than LONG_LONG_MAX.
+
+Thu Apr 24 11:53:28 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_asn1.c (ossl_asn1_initialize): SYMID on a value
+	  other than Symbol is an undefined behavior.  fix up r31699.
+	  [ruby-core:62142] [Bug #9771]
+
+Thu Apr 24 11:21:37 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (rb_sym2id, rb_sym2id_without_pindown): return 0 for
+	  non-symbol values, for the time being.
+
+Thu Apr 24 05:50:13 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* parse.y (dsym_node_gen): like r45492, call rb_gc_resurrect().
+
+Wed Apr 23 20:36:22 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/etc/extconf.rb: Build ext/etc unconditionally.
+
+Wed Apr 23 14:10:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c (statfs_fsid): remove statfs.f_fsid because it doesn't return
+	  meaningful value portably. http://togetter.com/li/658517
+
+Wed Apr 23 11:03:41 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_write): use rb_str_append to
+	  reuse coderange bits other than ASCII-8BIT, and keep
+	  taintedness.  [ruby-dev:48118] [Bug #9769]
+
+Wed Apr 23 00:43:00 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c, include/ruby/win32.h (ustatfs): implementation of
+	  statfs(2) clone. [EXPERIMENTAL]
+
+	* file.c (rb_io_statfs): use above function.
+
+	* configure.in, win32/Makefile.sub (struct statfs): available.
+
+Tue Apr 22 23:56:24 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_io_stafs): use statfs(2) if fstatfs(2) is unavailable.
+
+	* configure.in (fstatfs): check it.
+
+Tue Apr 22 22:15:51 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (rb_io_statfs): need to define even if the system doesn't have
+	  fstatfs(2).
+
+	* test/ruby/test_file.rb (TestFile#test_statfs): skip if IO#stafs is not
+	  implemented.
+
+Tue Apr 22 19:32:48 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* file.c: newly added a class File::Statfs. (experimental)
+
+Tue Apr 22 08:22:33 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_malloc_increase): don't cause GC by malloc_increase
+	  when memop type is MEMOP_TYPE_REALLOC.
+
+	  GC at realloc is not well maintained.
+	  We need a time to make it safe.
+	  [ruby-dev:48117]
+
+Tue Apr 22 06:54:15 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (objspace_malloc_increase): run full mark if 0x04 bit is
+	  set in ruby_gc_stress.  [ruby-core:62103] [Feature #9761]
+
+	* gc.c (objspace_malloc_increase): run GC after realloc not only
+	  malloc and calloc by GC.stress.  [ruby-core:62103] [Feature #9761]
+
+Mon Apr 21 19:12:20 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (rb_str_coderange_scan_restartable): coderange is always
+	  ENC_CODERANGE_VALID if the string is ASCII-8BIT and already has a non
+	  ASCII character.
+
+Mon Apr 21 19:02:44 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (coderange_scan): remove useless condition `p < e` after
+	  search_nonascii.
+
+	* string.c (rb_str_coderange_scan_restartable): ditto.
+
+Mon Apr 21 18:55:21 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* ext/-test-/string/coderange.c: add Bug::String.new#coderange_scan
+	  to explicitly scan coderange.
+
+Mon Apr 21 18:19:35 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (coderange_scan): remove unused logic.
+
+	* string.c (rb_str_coderange_scan_restartable): ditto.
+
+Mon Apr 21 14:11:48 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/stringio/stringio.c (strio_putc): fix for non-ascii
+	  encoding, like as IO#putc.  [ruby-dev:48114] [Bug #9765]
+
+Sun Apr 20 12:57:15 2014  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* st.c (st_foreach_check): change start point of search at check
+	  from top to current. [ruby-dev:48047] [Bug #9646]
+
+Sun Apr 20 08:41:33 2014  Andrew DeMaria  <ademariad@gmail.com>
+
+	* lib/mkmf.rb (link_command, libpathflag, create_makefile): prefer
+	  user specified `$LIBPATH` than `$DEFLIBPATH`.  [ruby-core:62100]
+	  [ruby-trunk - Bug #9760]
+
+Sun Apr 20 06:01:18 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (rb_gc_writebarrier): drop special case for big hash/array
+	  [Bug #9518]
+
+Sat Apr 19 15:38:29 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (primary): flush cmdarg flags inside left-paren in a
+	  command argument, to allow parenthesed do-block as an argument
+	  without arguments parentheses.  [ruby-core:61950] [Bug #9726]
+
+Sat Apr 19 10:07:24 2014  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (struct RBignum): Use size_t for len.
+
+	* include/ruby/intern.h (rb_big_new): Use size_t instead of long to
+	  specify the size of bignum.
+	  (rb_big_resize): Ditto.
+
+	* bignum.c: Follow above changes.
+
+	* rational.c: Follow above changes.
+
+	* marshal.c: Follow above changes.
+
+Sat Apr 19 00:32:07 2014  Tanaka Akira  <akr@fsij.org>
+
+	* numeric.c (rb_num2long): Returns a long.
+	  (rb_num2ulong): Returns a unsigned long.
+
+	* bignum.c (rb_big2long): Returns a long.
+	  (rb_big2ulong): Returns a unsigned long.
+
+	* include/ruby/intern.h: Follow above changes.
+
+	* include/ruby/ruby.h: Follow above changes.
+	  (rb_num2long_inline): No need to cast.
+	  (rb_num2ulong_inline): Ditto.
+
+Sat Apr 19 00:17:20 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (SHARABLE_SUBSTRING_P): predicate if substring can be
+	  shared with the original string.  true if just at the end of the
+	  original string, for the time being.  all substring will be able to
+	  be shared in the future.
+
+Fri Apr 18 21:48:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (rb_str_new_frozen): consider the shared string at
+	  middle.
+
+	* string.c (rb_str_subseq, rb_str_substr, str_byte_substr): share
+	  middle of a string.
+
+Fri Apr 18 15:40:05 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c: use uintptr_t instead of VALUE because they are not ruby
+	  object.
+
+Fri Apr 18 14:51:42 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c: check str_strlen's argument, and add comment or
+	  use NULL if simply it uses str's enc.
+
+Fri Apr 18 14:32:40 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (str_strlen): use enc_strlen if the coderange is known.
+
+Fri Apr 18 14:21:21 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (enc_strlen): move UTF-8 optimization from str_strlen to
+	  enc_strlen.
+
+Fri Apr 18 08:50:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (rb_cv_getcwd_malloc): check if getcwd allocates
+	  buffer if NULL is given [ruby-core:62072] [Bug #9752]
+
+Thu Apr 17 16:28:10 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* prelude.rb: [DOC] Update Thread::exclusive docs by @stevenharman.
+
+Thu Apr 17 10:03:53 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils#copy_entry): update rdoc about
+	  preserve option and permissions, following r31123.
+	  [ruby-core:62065] [Bug #9748]
+
+Wed Apr 16 23:47:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* enum.c (dont_recycle_block_arg): fix condition to recycle block
+	  argument.  lambda with rest can get internal array directly.
+	  [ruby-core:62060] [Bug #9749]
+
+Wed Apr 16 09:51:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl_pkey.c (ossl_pkey_verify): as EVP_VerifyFinal()
+	  finalizes only a copy of the digest context, the context must be
+	  cleaned up after initialization by EVP_MD_CTX_cleanup() or a
+	  memory leak will occur.  [ruby-core:62038] [Bug #9743]
+
+Tue Apr 15 19:36:42 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* include/ruby/win32.h (rb_w32_cmdvector): removed.
+
+	* win32/win32.c (rb_w32_sysinit): use WCHAR version of GetCommandLine()
+	  internally.
+
+	* win32/win32.c (w32_cmdvector): renamed from rb_w32_cmdvector.  use
+	  WCHAR* instead of char* internally.
+
+	these changes are expected to not changing the behavior yet.
+
+Tue Apr 15 19:26:05 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/extmk.rb: Re-generate extmk.mk and dummy makefiles only if
+	  really required.
+	  This fixes a problem to run multiple test-all concurrently as:
+	  make test-all & make test-all & make test-all & ...
+
+Tue Apr 15 12:49:53 2014  Sam Rawlins  <sam.rawlins@gmail.com>
+
+	* enum.c (enum_each_slice, enum_each_cons): make more efficient by
+	  allocating less and recycling block argument arrays if possible.
+	  [Fixes GH-596]
+
+Mon Apr 14 18:44:45 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): get base addrs in fill_lines to use it
+	  with dladdr_fbases introduced at r45563.
+	  it didn't get before if the executable is not pie.
+
+Mon Apr 14 18:05:48 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (main_exe_path): support FreeBSD.
+	  At least sh, csh, tcsh, bash, and zsh sets realpath of the main
+	  executable for dladdr, but gdb doesn't.
+
+Mon Apr 14 17:20:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (umethod_bind): use the ancestor iclass instead of new
+	  iclass to get rid of infinite recursion, if the defined module
+	  is already included.  [ruby-core:62014] [Bug #9721]
+
+Sun Apr 13 12:46:58 2014  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (SIZEOF_BDIGIT): Renamed from SIZEOF_BDIGITS.
+
+	* internal.h: Ditto.
+
+	* marshal.c: Ditto.
+
+	* rational.c: Ditto.
+
+Sun Apr 13 10:18:09 2014  Tanaka Akira  <akr@fsij.org>
+
+	* common.mk: Unused target, $(MKMAIN_CMD), removed.
+
+	* Makefile.in (MKMAIN_CMD): Unused macro removed.
+
+	* win32/Makefile.sub (MKMAIN_CMD): Ditto.
+
+Sat Apr 12 22:11:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (sym_to_proc), proc.c (rb_block_clear_env_self): clear
+	  caller's self which is useless, so that it can get collected.
+	  [Fixes GH-592]
+
+Sat Apr 12 09:26:48 2014  Eric Hodel  <drbrain@segment7.net>
+
+	* ext/openssl/ossl_ocsp.c:  [DOC] Document OpenSSL::OCSP.
+
+Fri Apr 11 18:52:38 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (ARY_SET): added.
+
+	  ARY_SET() is same functionality of RARRAY_ASET(), but
+	  it has an assertion (`ary' doesn't have shared array).
+
+Fri Apr 11 16:54:26 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c: make shared arrays WB-protected objects.
+
+	  Shared arrays were WB-unprotected object because
+	  sharing array can modify shared array's buffer
+	  if it occupied shared array.
+
+	  [sharing array (ary)] -> [shared array (shared)] -> <buff>
+	                |                                       A
+	                +---------------------------------------+
+	             write `buff' with WB(ary, &buff[i], obj)
+	             -> if `ary' and `shared' are old, then only `ary'
+	                will be remembered.
+	             -> traverse from `ary'. But `shared' is old, so
+	                that written `obj' is not marked.
+
+	  It cause WB miss so that shared arrays were WB-unprotected.
+	  (WB-unprotected objects are marked everytime if it is living)
+
+	  This patch insert WB() for `shared' if it is needed.
+
+Fri Apr 11 15:05:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* proc.c (rb_method_call_with_block, umethod_bind): call with
+	  IClass including the module for a module instance method.
+	  [ruby-core:61936] [Bug #9721]
+
+	* vm_insnhelper.c (vm_search_super_method): allow bound
+	  UnboundMethod case.
+
+Fri Apr 11 12:02:30 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): set base address
+	  which is retrieved from dladdr to dladdr_fbases, to skip already
+	  parsed objects.
+
+Fri Apr 11 12:44:50 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (ary_reject): may be turned into a shared array during
+	  the given block.  [ruby-dev:48101] [Bug #9727]
+
+Thu Apr 10 23:41:21 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/net/ftp.rb (Net::FTP#login): [DOC] The default password for
+	  anonymous login was changed to "anonymous@" in r25313.
+
+Thu Apr 10 19:22:58 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_array.rb: remove useless `assert'.
+
+Thu Apr 10 19:11:11 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* array.c (rb_ary_modify): remember shared array owner if a shared
+	  array owner is promoted and a shared array is not promoted.
+
+	  Now, shared array is WB-unprotected so that shared arrays are not
+	  promoted.  All objects referred from shared array should be marked
+	  correctly.
+
+	  [ruby-core:61919] [ruby-trunk - Bug #9718]
+
+	* test/ruby/test_array.rb: add a test for above.
+
+Thu Apr 10 18:57:12 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_verify_internal_consistency): move lines and enable
+	  allrefs_dump() on RGENGC_CHECK_MODE >= 4.
+
+Thu Apr 10 15:01:06 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (append_obj): clear allocated memory.
+
+	* addr2line.c (rb_dump_backtrace_with_lines): free `base_addrs'.
+
+Thu Apr 10 14:40:18 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (rb_gc_writebarrier_unprotect_promoted): disable to dump debug
+	  message when RGENGC_CHECK_MODE == 0.
+
+Thu Apr 10 08:13:47 2014  Tanaka Akira  <akr@fsij.org>
+
+	* signal.c (check_stack_overflow): Don't use ucontext_t if ucontext.h
+	  is not available.
+	  Fixes build on Android (x86).
+
+Wed Apr  9 23:22:44 2014  Tanaka Akira  <akr@fsij.org>
+
+	* gc.c (mark_current_machine_context): Call SET_STACK_END.
+	  This reverts a hunk of r40703 by ko1.
+	  This fixes [ruby-dev:48098] [Bug #9717].
+
+Wed Apr  9 21:02:04 2014  Tanaka Akira  <akr@fsij.org>
+
+	* process.c (OBJ2UID1): Defined even if getpwnam_r is not usable.
+	  (OBJ2GID1): Defined even if getgrnam_r is not usable.
+	  This fixes compilation error on Android.
+
+Wed Apr  9 15:16:59 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* encoding.c (rb_enc_default_internal): fix rdoc.  `__FILE__` is
+	  in filesystem encoding but not `default_internal`.
+	  [ruby-core:61894] [Bug #9713]
+
+Wed Apr  9 14:43:00 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: more long timeout.
+	  This test failed under RGENGC_CHECK_MODE >= 2.
+
+Wed Apr  9 13:07:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in: get rid of __builtin_setjmp/__builtin_longjmp on
+	  x64-mingw, which causes SEGV with callcc.
+	  [ruby-core:61887] [Bug #9710]
+
+Wed Apr  9 12:44:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* string.c (str_buf_cat): should round up the capacity by 4KiB,
+	  but not number of rooms.  [ruby-core:61886] [Bug #9709]
+
+Tue Apr  8 22:55:32 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb (MakeMakefile#dir_config): [DOC] Improve
+	  documentation.
+
+Tue Apr  8 22:31:44 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: rename `RGENGC_THREEGEN' to `RGENGC_AGE2_PROMOTION'.
+
+	* gc.c (rgengc_rememberset_mark): don't promote, but remain in
+	  remember set for infant objects.
+
+	* gc.c (RVALUE_PROMOTE_INFANT, RVALUE_PROMOTE_YOUNG): count numbers
+	  in these functions.
+
+Mon Apr  7 21:11:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/socket.c (sock_s_getnameinfo): Save errno for EAI_SYSTEM.
+	  Reported by Saravana kumar.  [ruby-core:61820] [Bug #9697]
+	  Fixed by Heesob Park.  [ruby-core:61868]
+
+Mon Apr  7 07:20:23 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/xmlrpc/client.rb (do_rpc): don't check body length.
+	  If HTTP content-encoding is used, the length may be different.
+	  [Bug #8182] [ruby-core:53811]
+
+Mon Apr  7 02:39:48 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* lib/matrix.rb: Add Matrix#cofactor [fix GH-568]
+	  Add first_minor [fix GH-568]
+	  Handle empty diagonal matrix case [fix GH-576]
+	  Patches by gogotanaka
+
+Sun Apr  6 08:52:50 2014  Bugra Barin  <bugrabarin@hotmail.com>
+
+	* dln.c (dln_load): use wchar version to load a library in
+	  non-ascii path on Windows.  based on the patch by Bugra Barin
+	  <bugrabarin AT hotmail.com> in [ruby-core:61845].  [Bug #9699]
+
+Sat Apr  5 19:36:33 2014  Tadayoshi Funaba  <tadf@dotrb.org>
+
+	* ext/date/date_core.c (d_lite_cmp): should compare with #<.
+
+Sat Apr  5 00:31:21 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/extconf.rb (rl_hook_func_t): check pointer type.
+	  [ruby-dev:48089] [Bug #9702]
+
+Fri Apr  4 07:13:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func___builtin_setjmp): should not skip
+	  flags restoration in RUBY_WERROR_FLAG by `break`.
+	  [ruby-dev:48086] [Bug #9698]
+
+Wed Apr  2 21:50:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func___builtin_setjmp): __builtin_longjmp()
+	  in Apple LLVM 5.1 (LLVM 3.4svn) uses `void**`, not `jmp_buf`.
+	  [Bug #9692]
+
+Wed Apr  2 20:57:15 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c, gc.h (rb_objspace_each_objects_without_setup):
+	  Add a new (hidden) C-API to iterate objspace snapshot.
+
+	  This API is not safe to call any C-APIs in a given callback
+	  function. Be careful to use this C-API.
+
+Wed Apr  2 17:43:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (ac_cv_func___builtin_setjmp): gcc 4.9 disallows a
+	  variable as the second argument of __builtin_longjmp().
+	  [ruby-core:61800] [Bug #9692]
+
+Wed Apr  2 15:12:18 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* common.mk: Use redmine-2.x url for DeveloperHowto wiki.
+	  [ruby-core:60657] [Bug #9511]
+
+Wed Apr  2 11:46:29 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/pathname/lib/pathname.rb (Pathname#join): Fix error with
+	  empty args. Reported by ko1 via IRC.
+
+	* test/pathname/test_pathname.rb (TestPathname#test_join): Add the
+	  test for above case.
+
+Tue Apr  1 11:39:57 2014  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: Symbol HeaderConverter: strip leading/trailing space.
+	  Reported by Skye Shaw
+	  [Fixes GH-575]
+
+Tue Apr  1 11:34:04 2014  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: Don't attempt to convert nil headers.
+	  Reported by Skye Shaw
+
+Tue Apr  1 17:29:35 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* tool/config_files.rb (ConfigFiles.download): show failed URI.
+	  [ruby-core:61792] [Bug #9690]
+
+Tue Apr  1 12:06:49 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): don't depend hard coded
+	  symbol '_start'.
+
+	* addr2line.c (fill_lines): instead of above, get a dynamic symbol
+	  in the main executable and use it to know the base address.
+
+	* addr2line.c (follow_debuglink0): use obj_info_t instead of
+	  line_info_t to handle object related data.
+
+	* addr2line.c (main_exe_path): defined for Linux.
+
+Tue Apr  1 08:58:39 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* parse.y (rb_str_dynamic_intern): set mark bit if dynamic symbol
+	  is before sweeping.
+
+Tue Apr  1 07:37:00 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): use dynsym, which is used for dynamic
+	  linking and always exists, if there's no symtab.
+
+Tue Apr  1 07:27:15 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump.c (rb_print_backtrace): current implementation
+	  uses dladdr to get the path of objects.
+
+Mon Mar 31 23:57:45 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/extconf.rb: fix typo, `$defs` not `$DEFS`.
+	  [ruby-core:61756] [Bug #9578]
+
+Mon Mar 31 17:23:50 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/memory_status.rb: require envutil before accessing EnvUtil
+	  module.  reported by ko1 via twitter.
+
+Mon Mar 31 10:28:01 2014  Eric Wong  <e@80x24.org>
+
+	* st.c (st_init_table_with_size): update comment
+	  [Feature #9425]
+
+Sun Mar 30 23:39:26 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_accept, open_ifs_socket, socketpair_internal):
+	  reset inherit flag of socket to avoid unintentional inheritance of
+	  socket.  note that the return value of SetHandleInformation() is not
+	  verified intentionally because old Windows may return an error.
+	  [Bug #9688] [ruby-core:61754]
+
+Sat Mar 29 13:04:22 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (gc_before_sweep): cap `malloc_limit' to
+	  gc_params.malloc_limit_max.  It can grow and grow with such case:
+	    `loop{"a" * (1024 ** 2)}'
+	  [Bug #9687]
+
+	  This issue is pointed by Tim Robertson.
+	  http://www.omniref.com/blog/blog/2014/03/27/ruby-garbage-collection-still-not-ready-for-production/
+
+Fri Mar 28 19:32:13 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* struct.c (not_a_member): extract name error and use same error
+	  messages.  based on the patch by Marcus Stollsteimer <sto.mar AT
+	  web.de> at [ruby-core:61721].  [Bug #9684]
+
+Fri Mar 28 09:21:54 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/psych/psych.gemspec: update gemspec for psych-2.0.5
+
+Fri Mar 28 09:11:06 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* ext/psych/lib/psych.rb: Merge psych-2.0.5. bump version to
+	  libyaml-0.1.6 for CVE-2014-2525.
+	* ext/psych/yaml/config.h: ditto.
+	* ext/psych/yaml/scanner.c: ditto.
+	* ext/psych/yaml/yaml_private.h: ditto.
+
+Thu Mar 27 18:58:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* re.c (match_regexp): set regexp for MatchData from string.
+
+	* re.c (rb_backref_set_string): create MatchData from string and
+	  set backref.
+
+	* string.c (rb_pat_search, rb_str_sub, rb_str_sub_bang, str_gsub),
+	  (scan_once, rb_str_scan, rb_str_partition): use rb_str_index
+	  instead of rb_reg_search() when pattern is a String.  based on
+	  the patch by Sam Rawlins <sam.rawlins@gmail.com> [Fixes GH-579]
+
+Thu Mar 27 11:58:55 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): check shdr[i].sh_type because even if
+	  .symtab section exists, the section's type can be SHT_NOBITS and
+	  actual data doesn't exist in the file.
+	  revert r45441.
+
+Wed Mar 26 14:57:35 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* parse.y: inline must be static (for mswin).
+	  fixed build error introduced at r45426.
+
+Wed Mar 26 14:33:00 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* internal.h (USE_SYMBOL_GC): enable Symbol GC by default (USE_SYMBOL_GC == 1).
+
+Tue Mar 25 22:57:11 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* parse.y: support Symbol GC. [ruby-trunk Feature #9634]
+	  See this ticket about Symbol GC.
+
+	* include/ruby/ruby.h:
+	  Declare few functions.
+	  * rb_sym2id: almost same as old SYM2ID but support dynamic symbols.
+	  * rb_id2sym: almost same as old ID2SYM but support dynamic symbols.
+	  * rb_sym2str: almost same as `rb_id2str(SYM2ID(sym))` but not
+	    pin down a dynamic symbol.
+	  Declare a new struct.
+	  * struct RSymbol: represents a dynamic symbol as object in
+	    Ruby's heaps.
+	  Add few macros.
+	  * STATIC_SYM_P: check a static symbol.
+	  * DYNAMIC_SYM_P: check a dynamic symbol.
+	  * RSYMBOL: cast to RSymbol
+
+	* gc.c: declare RSymbol. support T_SYMBOL.
+
+	* internal.h: Declare few functions.
+	  * rb_gc_free_dsymbol: free up a dynamic symbol. GC call this
+	    function at a sweep phase.
+	  * rb_str_dynamic_intern: convert a string to a dynamic symbol.
+	  * rb_check_id_without_pindown: not pinning function.
+	  * rb_sym2id_without_pindown: ditto.
+	  * rb_check_id_cstr_without_pindown: ditto.
+
+	* string.c (Init_String): String#intern and String#to_sym use
+	  rb_str_dynamic_intern.
+
+	* template/id.h.tmpl: use LSB of ID as a flag for determining a
+	  static symbol, so we shift left other ruby_id_types.
+
+	* string.c: use rb_sym2str instead `rb_id2str(SYM2ID(sym))` to
+	  avoid pinning.
+
+	* load.c: use xx_without_pindown function at creating temporary ID
+	  to avoid pinning.
+
+	* object.c: ditto.
+
+	* sprintf.c: ditto.
+
+	* struct.c: ditto.
+
+	* thread.c: ditto.
+
+	* variable.c: ditto.
+
+	* vm_method.c: ditto.
+
+Wed Mar 26 13:25:54 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): loop reverse order not to overwrite
+	  the basis of base addresses comparison.
+
+	* addr2line.c: use uintptr_t instead of intptr_t for pointers.
+
+	* addr2line.c (rb_dump_backtrace_with_lines): don't use syms.
+
+	* vm_dump.c (rb_print_backtrace): ditto.
+
+	* addr2line.h: ditto.
+
+Wed Mar 26 11:20:50 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (w_object): internal objects are not dumpable.
+	  [ruby-core:61677] [Bug #9674]
+
+	* ext/thread/thread.c (undumpable): ConditionVariable and Queue
+	  are not dumpable.  [ruby-core:61677] [Bug #9674]
+
+Wed Mar 26 10:36:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (follow_debuglink): show message if it closes opened
+	  (and maybe used) elf binary.
+
+Wed Mar 26 10:34:25 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_line): pass and use offset instead of
+	  curobj_baseaddr.
+
+Wed Mar 26 09:07:48 2014  Yutaka Kanemoto  <kanemoto@ruby-lang.org>
+
+	* configure.in: add --disable-pie. [Feature #9673]
+
+Wed Mar 26 08:47:04 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): don't run fill_lines multiple times.
+
+Wed Mar 26 08:45:00 2014  Sam Rawlins  <sam.rawlins@gmail.com>
+
+	* internal.h: add prototype for rb_reg_search0
+
+	* re.c: rename rb_reg_search to rb_reg_search0, add set_backref_str
+	  argument to allow callers to indicate that they don't require the
+	  backref string to be allocated.
+
+	* string.c: don't allocate backref str if replacement string is provided
+
+	[GH-578] [Bug #9676] [ruby-core:61682]
+
+Wed Mar 26 08:29:43 2014  mo khan  <mo@mokhan.ca>
+
+	* lib/rubygems.rb: fix spelling of Jim Weirich.  [Fixes GH-577]
+
+Wed Mar 26 01:55:45 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): a function to get must
+	  be a function in the main executable, whose absolute path is not
+	  available by dladdr, and ruby get it by /proc/self/exe on Linux.
+
+Wed Mar 26 01:34:50 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): skip if path is NULL.
+
+Tue Mar 25 23:57:17 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (parser_yylex): only a newline after label should be
+	  significant.  [ruby-core:61658] [Bug #9669]
+
+Tue Mar 25 23:32:25 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/pathname/lib/pathname.rb (Pathname#join): remove unnecessary
+	  unshift.
+
+	* test/pathname/test_pathname.rb (TestPathname#test_join): add tests.
+
+Tue Mar 25 16:47:36 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lex_state_e, parser_params, f_arglist, parser_yylex):
+	  separate EXPR_LABELARG from EXPR_BEG and let newline significant,
+	  so that required keyword argument can place at the end of
+	  argument list without parentheses.  [ruby-core:61658] [Bug #9669]
+
+Mon Mar 24 22:19:56 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (ripper_initialize): filename can not be modified.
+
+Mon Mar 24 15:19:47 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): fetch path of the
+	  executable from /proc/self/exe on Linux.
+
+Mon Mar 24 14:14:37 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* gc.c: Fix up default GC params by @csfrancis [fix GH-556]
+
+Mon Mar 24 13:13:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (parse_debug_line_cu): explicitly specify signed char
+	  because DWARF's line_Base is signed char and char maybe unsigned.
+	  patched by Rei Odaira. [ruby-dev:48068] [Bug #9654]
+
+Sun Mar 23 11:03:50 2014  Kohei Suzuki  <eagletmt@gmail.com>
+
+	* vm_method.c (rb_method_entry_get_without_cache): me->klass is 0
+	  for a method aliased in a module.  [ruby-core:61636] [Bug #9663]
+
+Sun Mar 23 08:12:27 2014  Eric Wong  <e@80x24.org>
+
+	* st.c (hash_pos): use bitwise AND to avoid slow modulo op
+	  (new_size): power-of-two sizes for hash_pos change
+	  (st_numhash): adjust for common keys due to lack of prime modulo
+	  [Feature #9425]
+	* hash.c (rb_any_hash): right shift for symbols
+	* benchmark/bm_hash_aref_miss.rb: added to show improvement
+	* benchmark/bm_hash_aref_sym_long.rb: ditto
+	* benchmark/bm_hash_aref_str.rb: ditto
+	* benchmark/bm_hash_aref_sym.rb: ditto
+	* benchmark/bm_hash_ident_num.rb: added to prevent regression
+	* benchmark/bm_hash_ident_obj.rb: ditto
+	* benchmark/bm_hash_ident_str.rb: ditto
+	* benchmark/bm_hash_ident_sym.rb: ditto
+
+Sat Mar 22 22:56:45 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): compare the file names of object in which
+	  symbols exist. [Bug #9654] [ruby-dev:48058]
+
+Sat Mar 22 06:46:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/cgi/util.rb (escape_html, unescape_html): make synonyms
+	  aliases instead of wrapper methods.
+
+	* lib/cgi/util.rb (escape_element, unescape_element): ditto.
+	  [Fixes GH-573]
+
+Fri Mar 21 21:57:34 2014  Akinori MUSHA  <knu@iDaemons.org>
+
+	* configure.in: Fix a build problem with clang and --with-opt-dir.
+	  If ruby is configured with --with-opt-dir=dir when using clang
+	  as compiler, a warning `clang: warning: argument unused during
+	  compilation: '-I dir'` is emitted almost every time clang
+	  compiles a file.  Unfortunately, RUBY_CHECK_PRINTF_PREFIX takes
+	  any output from the compiler as fatal error, and the check thus
+	  fails due to the warning.  This is an attempt to fix the problem
+	  by adding a flag -Qunused-arguments to CFLAGS locally in the
+	  function to suppress the warning. [ruby-dev:48062] [Bug #9658]
+	  [Fixes GH-571] https://github.com/ruby/ruby/pull/571
+
+Fri Mar 21 16:31:56 2014  Zachary Scott  <e@zzak.io>
+
+	* gc.c: [DOC] Fix call-seq for GC.start by @jasonrclark [Fixes GH-572]
+	  https://github.com/ruby/ruby/pull/572
+
+Thu Mar 20 11:37:28 2014  James Edward Gray II  <james@graysoftinc.com>
+
+	* lib/csv.rb: Fixed a broken regular expression that was causing
+	  CSV to miss escaping some special meaning characters when used
+	  in parsing.
+	  Reported by David Unric
+	  [ruby-core:54986] [Bug #8405]
+
+Thu Mar 20 16:53:07 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (objspace_malloc_increase): should not invoke
+	  garbage_collect_with_gvl() here on non-ruby threads.
+
+	  Should just ignore the malloc_increase.
+
+	  This issue is pointed by Eric Wong [ruby-core:61519].
+
+Thu Mar 20 13:05:16 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* struct.c (rb_struct_alloc): use RARRAY_CONST_PTR() instead of
+	  RARRAY_PTR().
+
+Thu Mar 20 12:59:39 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* include/ruby/intern.h (rb_obj_call_init, rb_class_new_instance):
+	  constify a parameter (VALUE *).
+	  I believe this incompatibility doesn't break any code.
+	  However, if you have trouble, please tell us.
+
+	* eval.c, object.c: ditto.
+
+Thu Mar 20 12:31:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_method.c (rb_method_entry_get_without_cache): get rid of
+	  infinite recursion at aliases in a subclass and a superclass.
+	  return actually defined class for other than singleton class.
+	  [ruby-core:60431] [Bug #9475]
+
+Wed Mar 19 17:13:06 2014  Eric Wong  <e@80x24.org>
+
+	* time.c (time_mload): freeze and preserve marshal-loaded time zone
+	* test/ruby/test_time.rb: add test for GC on loaded object
+	  [Bug #9652]
+
+Tue Mar 18 23:20:12 2014  Shota Fukumori  <her@sorah.jp>
+
+	* vm_eval.c (eval_string_with_cref): Unify to use NIL_P.
+
+Tue Mar 18 22:03:41 2014  Shota Fukumori  <her@sorah.jp>
+
+	* vm_eval.c (eval_string_with_cref): Use file path even if scope is
+	  given. Related to [ruby-core:56099] [Bug #8662] and r42103.
+
+Mon Mar 17 13:17:47 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* enumerator.c (enumerator_block_call): use RARRAY_CONST_PTR()
+	  instead of RARRAY_PTR().
+
+	* io.c (rb_io_s_popen): ditto.
+
+	* numeric.c (num_step_size): ditto.
+
+	* vm_eval.c (rb_apply): ditto.
+
+	* vm_eval.c (rb_eval_cmd): ditto.
+
+Mon Mar 17 10:11:59 2014  Eric Wong  <e@80x24.org>
+
+	* variable.c (rb_const_set): delete existing entry on redefinition
+	  [Bug #9645]
+	* test/ruby/test_const.rb (test_redefinition): test for leak
+
+Sun Mar 16 21:33:01 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/time.rb: [DOC] Fix timezone in example of Time.parse [Bug #9521]
+	  Based on patch by @stomar
+
+Sun Mar 16 13:21:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): insert a space between option and its
+	  argument for non-GCC compilers.  [ruby-core:61429] [Bug #9624]
+
+Sun Mar 16 08:05:06 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (objspace_xcalloc): fix GC accounting
+
+Sun Mar 16 06:33:35 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): return address is just after calling
+	  address. Therefore noreturn function with tail call's return
+	  address may be in another function.
+
+Sun Mar 16 05:51:55 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/gserver.rb: [DOC] Fixed typo in example by @stomar [Bug #9543]
+
+Sat Mar 15 18:54:03 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/.document: remove refinement from documentable directories.
+
+Sat Mar 15 11:02:58 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* configure.in (DLDFLAGS): check for each options to control
+	  symbol resolution.  [ruby-core:61429] [Bug #9624]
+
+Sat Mar 15 07:02:35 2014  Eric Wong  <e@80x24.org>
+
+	* st.c (st_update): remove unnecessary assignment
+
+Fri Mar 14 14:58:38 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* addr2line.c (fill_lines): fetch symbol names from ELF binary's
+	  symbol table if it is built with cc -g and not stripped.
+	  Now ruby can show static symbols on Linux though glibc's
+	  backtrace_symbols(3) don't show them.
+
+	* addr2line.c (rb_dump_backtrace_with_lines): use dladdr(3) to
+	  detect what object file declares the symbol because
+	  dl_iterate_phdr can't detect the main executable file
+	  and codes on the stack.
+	  NOTE: signal trampolines sometimes on the user stack. (FreeBSD)
+
+	* addr2line.c (rb_dump_backtrace_with_lines): stop showing
+	  backtrace if the function's name is main.
+	  NOTE: FreeBSD's backtrace (libexecinfo) shows _start and
+	  an additional address. Why it doesn't remove them on dladdr phase
+	  is, dladdr may fail to detect the main function but detect
+	  as _start function. Therefore it must be after scanning
+	  the symbol table and getting correct name.
+
+
+Fri Mar 14 12:07:46 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/syntax/literals.rdoc: [DOC] Single quote strings allows escape
+	  of backslash as well, patch by @idupree [Fixes GH-553]
+	  https://github.com/ruby/ruby/pull/553
+
+Fri Mar 14 01:18:24 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm.c (invoke_block_from_c): add splattable argument.
+
+	* vm.c (vm_invoke_proc): disallow to splat when directly invoked.
+
+	* vm_insnhelper.c (vm_callee_setup_arg_complex, vm_callee_setup_arg):
+	  relax arity check of yielded lambda.  [ruby-core:61340] [Bug #9605]
+
+	* test/ruby/test_yield.rb (TestRubyYieldGen#emu_bind_params): no
+	  longer raise ArgumentError when splatting to lambda.
+
+Thu Mar 13 23:51:02 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/-test-/win32/dln/libdlntest.c (dlntest_ordinal): no need to
+	  specify export in the source file because .def file do it.
+	  get rid of warning on linking.
+
+Wed Mar 12 11:19:03 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_callee_setup_arg): disable fastpath if splat
+	  argument, since argc may differ for each calls.
+	  [ruby-core:61422] [Bug #9622]
+
+	* vm_insnhelper.c (vm_callee_setup_arg): turn a macro into an
+	  inline function.
+
+Wed Mar 12 07:26:05 2014  Eric Wong  <e@80x24.org>
+
+	* insns.def (opt_regexpmatch2): respect redefined match op
+	  Thanks to Sam Rawlins for the fix.
+	* test/ruby/test_string.rb: test based on Tsuyoshi Sawada's report
+	  [Bug #9581]
+
+Tue Mar 11 22:31:25 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/.document: add objspace/objspace_dump.c to document file.
+
+Tue Mar 11 22:22:38 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* test/objspace/test_objspace.rb (TestObjSpace#test_dump_uninitialized_file):
+	  remove dependency on json library.
+
+Tue Mar 11 10:55:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* README.EXT{,.ja} (Appendix B): update contents of `ruby_options`
+	  and replace `ruby_run` with `ruby_run_node`.  based on the patch
+	  by Kaneko Yuichiro at [ruby-dev:48030] [Bug #9619].
+
+Tue Mar 11 06:54:00 2014  Scott Francis  <scott.francis@shopify.com>
+
+	* ext/objspace/objspace_dump.c: Check fptr before trying to dump RFILE
+	  object fd. [GH-562]
+
+	* test/objspace/test_objspace.rb: add test
+
+Tue Mar 11 02:04:36 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm_dump.c (rb_vm_bugreport): show vm maps on FreeBSD.
+
+	* vm_dump.c (procstat_vm): copied from FreeBSD.
+	  http://svnweb.freebsd.org/base/head/usr.bin/procstat/procstat_vm.c?revision=261780
+
+Mon Mar 10 12:14:26 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: always check dladdr(1).
+
+	* addr2line.c (fill_lines): show the line number in C backtrace if
+	  ruby is built without --enable-shared (PIE) on Linux.
+	  patch is originally by Shinichiro Hamaji
+	  https://twitter.com/shinh/status/441957774264504321
+	  NOTE: ld doesn't insert __executable_start for PIE.
+	  dladdr(3)'s argument must be a function pointer.
+
+Mon Mar 10 10:51:17 2014  ksss  <co000ri@gmail.com>
+
+	* test/ruby/test_enumerator.rb (test_iterators): fix test for hash
+	  iterators.  [Fixes GH-558]
+
+Sun Mar  9 14:14:49 2014  Eric Wong  <e@80x24.org>
+
+	* class.c (rb_class_subclass_add): use xmalloc
+	* class.c (rb_module_add_to_subclasses_list): ditto
+	* class.c (rb_class_remove_from_super_subclasses): use xfree
+	* class.c (rb_class_remove_from_module_subclasses): ditto
+	  [Bug #9616]
+
+Sun Mar  9 13:51:16 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/fiddle/function.c (function_call): fix memory leak when an
+	  exception occurs at argument conversion or the function call.
+
+Sun Mar  9 06:42:40 2014  Eric Wong  <e@80x24.org>
+
+	* variable.c (struct global_variable): shrink by 8 bytes on 64-bit
+
+Sat Mar  8 17:42:51 2014  Eric Wong  <e@80x24.org>
+
+	* vm.c (add_opt_method): cleanup to use rb_method_entry_at
+
+Sat Mar  8 13:46:40 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/dl/cptr.c (dlptr_free), ext/dl/handle.c (dlhandle_free),
+	  ext/fiddle/handle.c (fiddle_handle_free),
+	  ext/fiddle/pointer.c (fiddle_ptr_free): fix memory leak.
+	  based on the patch Heesob Park at [ruby-dev:48021] [Bug #9599].
+
+Sat Mar  8 13:30:39 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* process.c (obj2uid, obj2gid): now getpwnam_r() and getgrnam_r()
+	  may need larger buffers than sysconf values, so retry with
+	  expanding the buffer when ERANGE is returned.
+	  [ruby-core:61325] [Bug #9600]
+
+Fri Mar  7 19:29:13 2014  Eric Wong  <e@80x24.org>
+
+	* vm_eval.c (vm_call0_body): use RARRAY_CONST_PTR
+	  (check_funcall_exec): ditto
+	  [ruby-core:61360]
+
+Fri Mar  7 19:14:11 2014  Eric Wong  <e@80x24.org>
+
+	* vm_eval.c (vm_call0_body): fix RB_GC_GUARD location
+	  (check_funcall_exec): ditto
+	  [Bug #9609]
+
+Fri Mar  7 14:48:17 2014  Narihiro Nakamura  <authornari@gmail.com>
+
+	* parse.y (ENC_SINGLE): Unused macro removed.
+
+Fri Mar  7 12:06:19 2014  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* test/openssl/test_ssl.rb: Reuse TLS default options from
+	  OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.
+
+Thu Mar  6 15:15:24 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/syntax/assignment.rdoc: [DOC] Fix assignment directions
+	  By @idupree [Fixes GH-555] https://github.com/ruby/ruby/pull/555
+
+Thu Mar  6 15:07:18 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/syntax/methods.rdoc: [DOC] Fix example for block arguments
+	  By @idupree [Fixes GH-554] https://github.com/ruby/ruby/pull/554
+
+Thu Mar  6 10:33:31 2014  Martin Bosslet  <Martin.Bosslet@gmail.com>
+
+	* lib/openssl/ssl.rb: Explicitly whitelist the default
+	  SSL/TLS ciphers. Forbid SSLv2 and SSLv3, disable
+	  compression by default.
+	  Reported by Jeff Hodges.
+	  [ruby-core:59829] [Bug #9424]
+
+Wed Mar  5 15:56:18 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (f_arg_asgn): define optional arguments as argument
+	  variables in the rhs default expressions.
+	  [ruby-core:61299] [Bug #9593]
+
+Wed Mar  5 11:58:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/openssl/ossl.c (ossl_make_error): check NULL for unknown
+	  error reasons with old OpenSSL, and insert a colon iff formatted
+	  message is not empty.
+
+Wed Mar  5 00:42:00 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* ext/pathname/lib/pathname.rb (Pathname#find): add "ignore_error"
+	  keyword argument defaulted to true as well as Find#find.
+
+Tue Mar  4 23:00:18 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_eval.rb (TestEval#make_test_binding): renamed.
+	  it's not test method.
+
+Tue Mar  4 20:50:59 2014  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* st.c (st_foreach): fix type of hash. not st_data_t but st_index_t.
+
+Tue Mar  4 19:41:40 2014  Tanaka Akira  <akr@fsij.org>
+
+	* Makefile.in: ".DEFAULT" target removed because it is not for
+	  specifying default target.
+
+Tue Mar  4 00:25:35 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
+
+	* lib/find.rb (Find#find): should pass ignore_error option to enumerators.
+
+Mon Mar  3 13:27:35 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/test_find.rb (TestFind#test_unsearchable_dir): ruby cannot make
+	  directory unreachable by owner on Windows.
+
+Mon Mar  3 08:10:04 2014  Eric Wong  <e@80x24.org>
+
+	* vm_method.c (rb_method_entry_get_without_cache): disable GMC
+	  writing if GMC is disabled.
+	  [ruby-core:61218]
+
+Mon Mar  3 07:47:17 2014  Eric Wong  <e@80x24.org>
+
+	* README.EXT: wrap GetDBM with do/while(0)
+	* README.EXT.ja: ditto
+	* ext/dbm/dbm.c: ditto, likewise for GetDBM2
+	* ext/gdbm/gdbm.c: ditto
+	* ext/sdbm/init.c: ditto
+	  [ruby-core:61217]
+
+Mon Mar  3 07:17:31 2014  Zachary Scott  <e@zzak.io>
+
+	* NEWS: [DOC] Update doc regarding filesystem load when flushing IO
+
+Mon Mar  3 04:37:50 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_fsync): need to fsync even if on Windows.  fixed mistake
+	  of r45254 and r45256.
+
+Mon Mar  3 04:21:34 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/win32ole: get rid of warnings (unused variable).
+
+Mon Mar  3 02:53:53 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* io.c (rb_io_flush_raw): [EXPERIMENTAL] remove force syncing for Win32
+	  to speed up IO.  this may break some tests, and they'll be fixed
+	  later.
+	  [ruby-core:58570] [Bug #9153]
+
+Mon Mar  3 00:17:43 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* test/ruby/test_backtrace.rb: get rid of warnings.  unused variable,
+	  shadowing.
+
+Sun Mar  2 11:15:10 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/find.rb (Find#find): add "ignore_error" keyword argument
+	  defaulted to true.  [ruby-core:51025] [Feature #7596]
+
+Sun Mar  2 11:13:30 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/readline/extconf.rb (rl_hook_func_t): define as Function for
+	  very old readline versions.  [ruby-core:61209] [Bug #9578]
+
+Sun Mar  2 10:47:58 2014  Eric Wong  <e@80x24.org>
+
+	* load.c (ruby_init_ext): make idempotent to suppress warnings
+
+Sat Mar  1 19:51:42 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/open3.rb (Open3.capture3): Ignore Errno::EPIPE for writing
+	  stdin_data.
+	  (Open3.capture2): Ditto.
+	  (Open3.capture2e): Ditto.
+
+Sat Mar  1 19:06:47 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (ruby_gc_set_params): simplify condition
+
+Sat Mar  1 16:18:40 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/readline/readline.c (Init_readline): Use rl_hook_func_t instead
+	  of Function to support readline-6.3.  (rl_hook_func_t is available
+	  since readline-4.2.)
+	  Reported by Dmitry Medvinsky.  [ruby-core:61141] [Bug #9578]
+
+Sat Mar  1 16:05:58 2014  Eric Wong  <e@80x24.org>
+
+	* gc.c (ruby_gc_set_params): fix building without RGenGC
+
+Sat Mar  1 11:08:00 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: support dumping Encoding
+	  objects.
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: support loading Encoding
+	  objects.
+
+	* test/psych/test_encoding.rb: add test
+
+	* ext/psych/lib/psych.rb: add version
+
+Sat Mar  1 10:52:34 2014  Zachary Scott  <e@zzak.io>
+
+	* README.EXT.ja: [DOC] Fix typo "macro macro" @utenmiki [Fixes GH-551]
+	  https://github.com/ruby/ruby/pull/551
+
+Fri Feb 28 11:16:55 2014  Marc-Andre Lafortune  <ruby-core@marc-andre.ca>
+
+	* numeric.c: Fix Numeric#step with 0 unit [Bug #9575]
+
+Thu Feb 27 17:59:01 2014  Zachary Scott  <e@zzak.io>
+
+	* lib/optparse.rb: [DOC] Add example of generating help with optparse.
+	  Patch by @joelmccracken documenting-ruby/ruby#19
+	  https://github.com/documenting-ruby/ruby/pull/19
+
+Thu Feb 27 12:10:09 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* numeric.c (ruby_num_interval_step_size): check signs and get rid
+	  of implementation dependent behavior of negative division.
+	  [ruby-core:61106] [Bug #9570]
+
+Thu Feb 27 03:55:45 2014  Zachary Scott  <e@zzak.io>
+
+	* thread.c: [DOC] Typo in comment for _FORTIFY_SOURCE [Fixes GH-548]
+	  Patch by @qnet-herwin https://github.com/ruby/ruby/pull/548
+
+Wed Feb 26 18:43:43 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (heap_pages_free_unused_pages): check tomb page availability
+	  at first.
+	  And return immediately if we don't touch sorted list any more.
+
+Wed Feb 26 14:10:44 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (setup_exception): preserve exception class name encoding
+	  in debug mode messages.
+
+	* eval.c (setup_exception): preserve errinfo across calling #to_s
+	  method on the exception.  [ruby-core:61091] [Bug #9568]
+
+Wed Feb 26 01:29:27 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* string.c (sym_find): Add Symbol.find(str), which returns whether given
+	  string is defined as symbol or not. [Feature #7854]
+
+Tue Feb 25 22:52:02 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/dl/dl.c (rb_dl_realloc): use NUM2SIZET instead of NUM2INT.
+
+	* ext/fiddle/fiddle.c (rb_fiddle_realloc): ditto.
+
+Tue Feb 25 22:49:30 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/dl/dl.c (rb_dl_malloc): use NUM2SIZET instead of NUM2INT.
+	  Coverity Scan found this bug.
+
+	* ext/fiddle/fiddle.c (rb_fiddle_malloc): ditto.
+
+Tue Feb 25 12:06:13 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* win32/Makefile.sub: define PACKED_STRUCT.
+
+Mon Feb 24 21:41:56 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* README.md, README.ja.md: removed (wrong) mode setting for emacs.
+
+Mon Feb 24 20:05:41 2014  Eric Wong  <e@80x24.org>
+
+	* configure.in: define PACKED_STRUCT_UNALIGNED for x86*
+	* timev.h (struct vtm): use PACKED_STRUCT_UNALIGNED
+	* time.c (struct time_object): ditto
+	  [Bug #9558] non-x86 cannot safely access unaligned addresses
+
+Mon Feb 24 18:10:02 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/fiddle/test_function.rb: remove unused variables.
+	* test/fileutils/test_fileutils.rb: ditto.
+	* test/io/console/test_io_console.rb: ditto.
+
+Mon Feb 24 12:37:51 2014  Eric Wong  <e@80x24.org>
+
+	* configure.in: use -Wno-packed-bitfield-compat for GCC 4.4+
+	  use __attribute__((packed)) if available
+	* timev.h: shrink and pack struct vtm
+	* time.c: pack struct time_object and adjust/introduce helpers
+	  [ruby-core:60794]
+
+Sun Feb 23 17:55:50 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/xmltokens.rb: Add missing non ASCII valid characters
+	  to element name characters. Now, REXML name tokens exactly
+	  match "[5] Name" in the XML spec and "[4] NCName" in the
+	  Namespaces in XML spec. See comment about the details.
+	  [Bug #9539]  [ruby-core:60901]
+	  Reported by Mario Barcala. Thanks!!!
+
+	* test/rexml/xpath/test_node.rb: Add tests for the above case.
+
+Sun Feb 23 12:18:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/raddrinfo.c (inet_pton): use rb_w32_inet_pton, instead of
+	  inet_pton directly, which is unavailable on older version Windows.
+
+	* include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a
+	  wrapper function for inet_pton minimum supported client is
+	  Vista, as well as inet_ntop.
+
+Sun Feb 23 11:33:25 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/net/imap/test_imap.rb: remove unused variables.
+	* test/net/imap/test_imap_response_parser.rb: ditto.
+	* test/net/pop/test_pop.rb: ditto.
+
+Sun Feb 23 02:19:51 2014  Tanaka Akira  <akr@fsij.org>
+
+	* lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
+	  security.mac.portacl.port_high is changed.
+	  See mac_portacl(4) for details.
+	  Reported by Jakub Szafranski.  [ruby-core:60917] [Bug #9544]
+
+Sat Feb 22 23:17:01 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rexml/xpath_parser.rb: Fix indent.
+
+Sat Feb 22 23:15:35 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/xpath/test_attribute.rb: Simplify.
+
+Sat Feb 22 20:28:47 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/redmine-backporter.rb: more friendly.
+
+Sat Feb 22 20:24:43 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/test_xpath*.rb: Move to ...
+	* test/rexml/xpath/*.rb: ... here.
+
+Sat Feb 22 20:04:41 2014  Kouhei Sutou  <kou@cozmixng.org>
+
+	* test/rexml/listener.rb: Untabify.
+
+Sat Feb 22 19:07:31 2014  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/io/console/console.c (console_dev): need read access for conout$
+	  because some functions need it.  [Bug#9554]
+
+Sat Feb 22 18:40:58 2014  Eric Wong  <e@80x24.org>
+
+	* .gitignore: ignore benchmark files
+
+Sat Feb 22 01:22:24 2014  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* bignum.c (bary_mul_precheck): fix a copy-paste error.
+	  Coverity Scan found this bug.
+
+Sat Feb 22 00:58:51 2014  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
+
+	* ext/socket/raddrinfo.c (rb_getaddrinfo): second argument of
+	  MEMZERO is type.  Coverity Scan found this bug.
+
+Fri Feb 21 23:47:24 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* ext/socket/init.c (wait_connectable): break if the socket is
+	  writable to avoid infinite loops on FreeBSD and other platforms
+	  which conforms to SUSv3.  This problem cannot be reproduced with
+	  loopback interfaces, so it's hard to write test code.
+	  rsock_connect() and wait_connectable() are overly complicated, so
+	  they should be refactored, but I commit this fix as a workaround
+	  for the release of Ruby 1.9.3 scheduled on Feb 24.
+	  [ruby-core:60940] [Bug #9547]
+
+Fri Feb 21 23:03:39 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/redmine-backporter.rb: added to handle redmine tickets.
+
+Fri Feb 21 20:42:01 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* class.c (rb_mod_init_copy): do nothing if copying self.
+	  [ruby-dev:47989] [Bug #9535]
+
+	* hash.c (rb_hash_initialize_copy): ditto.
+
+Fri Feb 21 16:45:54 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/logger.rb (next_rotate_time, previous_period_end): consider
+	  DST change.
+
+	* lib/logger.rb (Logger::LogDevice#check_shift_log): compare the
+	  current time with the time for the next rotation to fix rotation
+	  miss when date changed between the comparison and log writing.
+	  based on the patch by megayu <yuhg2310 AT gmail.com>.
+	  [Fixes GH-539]
+
+Fri Feb 21 10:39:33 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	*  test/monitor/test_monitor.rb: remove unused variables.
+	*  test/resolv/test_dns.rb: ditto.
+	*  test/rexml/test_functions.rb: ditto.
+	*  test/rss/test_setup_maker_itunes.rb: ditto.
+
+Fri Feb 21 09:48:56 2014  Eric Wong  <e@80x24.org>
+
+	* ext/socket/ancdata.c (bsock_sendmsg_internal): only retry on error
+	  (bsock_recvmsg_internal): ditto
+	* test/socket/test_unix.rb: test above for infinite loop
+
+Fri Feb 21 08:27:19 2014  Eric Wong  <e@80x24.org>
+
+	* include/ruby/ruby.h (RB_GC_GUARD):
+	  use rb_gc_guarded_ptr_val on non-GCC/MSC
+	* gc.c (rb_gc_guarded_ptr_val): rename and adjust argument.
+	  RB_GC_GUARD should be robust enough for any compiler.
+	  [ruby-core:60816] [Bug #7805]
+
+Thu Feb 20 22:21:26 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/raddrinfo.c (numeric_getaddrinfo): Use xcalloc.
+	  Suggested by Eric Wong.
+	  https://bugs.ruby-lang.org/issues/9525#note-14
+
+Thu Feb 20 11:21:13 2014  Masaki Matsushita  <glass.saga@gmail.com>
+
+	* hash.c (rb_hash_flatten): fix behavior of flatten(-1).
+	  [ruby-dev:47988] [Bug #9533]
+
+	* test/ruby/test_array.rb: test for above.
+
+Wed Feb 19 18:57:02 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: Bypass getaddrinfo() if node and serv are numeric.
+	  Reporeted by Naotoshi Seo.  [ruby-core:60801] [Bug #9525]
+
+	* ext/socket/extconf.rb: Detect struct sockaddr_in6.sin6_len.
+
+	* ext/socket/sockport.h (SET_SIN6_LEN): New macro.
+	  (INIT_SOCKADDR_IN6): Ditto.
+
+	* ext/socket/rubysocket.h (struct rb_addrinfo): Add
+	  allocated_by_malloc field.
+
+	* ext/socket/raddrinfo.c (numeric_getaddrinfo): New function.
+	  (rb_getaddrinfo): Call numeric_getaddrinfo at first.
+	  (rb_freeaddrinfo): Free struct addrinfo properly when it is
+	  allocated by numeric_getaddrinfo.
+
+Wed Feb 19 18:31:48 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket: Wrap struct addrinfo by struct rb_addrinfo.
+
+Wed Feb 19 17:47:01 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ipsocket.c (ip_s_getaddress): Don't access freed memory.
+
+Wed Feb 19 11:39:41 2014  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* configure.in: it must see rb_cv_broken_memmem not rb_cv_func_memmem.
+
+Tue Feb 18 23:18:41 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/socket/test_socket.rb: unix socket is required by test case.
+
+Tue Feb 18 20:48:38 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/socket/test_addrinfo.rb: remove unused variables.
+	* test/socket/test_nonblock.rb: ditto.
+	* test/socket/test_socket.rb: ditto.
+	* test/socket/test_unix.rb: ditto.
+	* test/testunit/test_parallel.rb: ditto.
+	* test/webrick/test_filehandler.rb: ditto.
+	* test/xmlrpc/test_features.rb: ditto.
+	* test/zlib/test_zlib.rb: ditto.
+
+Tue Feb 18 14:27:18 2014  Shota Fukumori  <her@sorah.jp>
+
+	* lib/test/unit.rb: Requires minitest < 5.0.0 if Gem is available.
+
+Tue Feb 18 14:24:07 2014  Shota Fukumori  <her@sorah.jp>
+
+	* lib/test/unit/test-unit.gemspec: Add minitest < 5.0.0 dependency
+
+	* tool/rbinstall.rb: Add empty implementations for `add_dependency`,
+	  `add_runtime_dependency`, `add_development_dependency` for
+	  Gem::Specification.
+
+Tue Feb 18 12:06:39 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (FILE_COUNT): Removed.  (win32.c defines it in itself.)
+	  (FILE_READPTR): Ditto.
+
+Tue Feb 18 09:35:44 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test/psych/test_string.rb: remove unused variables.
+	* test/test/psych/test_yaml.rb: ditto.
+
+Mon Feb 17 21:31:31 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_gc.rb: ignore warning messages for running with -w
+	  option such as chkbuild.
+
+Mon Feb 17 20:00:27 2014  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: Move BDIGIT and related definitions from
+	  include/ruby/defines.h.
+
+Mon Feb 17 17:41:55 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* marshal.c (marshal_dump, marshal_load): do not recycle wrapper
+	  objects, to prevent from segfault with continuation.
+	  [ruby-dev:47970] [Bug #9523]
+
+Mon Feb 17 15:43:59 2014  Zachary Scott  <e@zzak.io>
+
+	* doc/keywords.rdoc: [DOC] Add keywords doc by documenting-ruby/ruby#29
+	  https://github.com/documenting-ruby/ruby/pull/29
+
+Mon Feb 17 12:31:31 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c (get_envparam_double): fix a warning message.
+
+Mon Feb 17 12:09:52 2014  Koichi Sasada  <ko1@atdot.net>
+
+	* gc.c: introduce new environment variable
+	  "RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" to control major/minor GC
+	  frequency.
+
+	  Do full GC when the number of old objects is more than R * N
+	  where R is this factor and
+                N is the number of old objects just after last full GC.
+
+	* test/ruby/test_gc.rb: add a test.
+
+Mon Feb 17 11:28:40 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_pty.rb: ignore warnings to unused variables.
+
+Mon Feb 17 11:27:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_find.rb: remove unused variables.
+
+Sun Feb 17 02:12:00 2014  Kenta Murata  <mrkn@mrkn.jp>
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_initialize): Insert GC guard.
+
+	* ext/bigdecimal/bigdecimal.c (BigDecimal_global_new): ditto.
+
+Sun Feb 16 15:53:36 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/test_securerandom.rb: File.exists? is deprecated. use File.exist?
+
+Sun Feb 16 15:05:00 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/pathname/test_pathname.rb: File.exists? is deprecated. use File.exist?
+
+Sun Feb 16 15:00:28 2014  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+
+	* test/net/ftp/test_ftp.rb: remove unused variables.
+	* test/logger/test_logger.rb: ditto.
+
+Sun Feb 16 14:52:46 2014  Eric Wong  <e@80x24.org>
+
+	* dir.c (dir_s_glob): RB_GC_GUARD instead of volatile
+
+Sun Feb 16 14:33:52 2014  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h (RBIGNUM_SIGN): Defined for compatibility.
+	  (RBIGNUM_POSITIVE_P): Ditto.
+	  (RBIGNUM_NEGATIVE_P): Ditto.
+
+Sun Feb 16 12:46:47 2014  Eric Wong  <e@80x24.org>
+
+	* io.c (rb_f_backquote): trade volatile for manual recycle
+	  rb_gc_force_recycle ensures object is visible until recycle
+
+Sun Feb 16 11:55:14 2014  Eric Wong  <e@80x24.org>
+
+	* marshal.c (marshal_dump): use rb_gc_force_recycle for GC-safety
+	  (marshal_load): ditto
+	  [ruby-core:60730] [Bug #7805]
+
+Sun Feb 16 08:11:23 2014  Zachary Scott  <e@zzak.io>
+
+	* README.EXT.ja: [DOC] Fix typo by @utenmiki [Fixes GH-534]
+	  https://github.com/ruby/ruby/pull/534
+
+Sun Feb 16 07:48:20 2014  Tanaka Akira  <akr@fsij.org>
+
+	* ext/bigdecimal/bigdecimal.c (BIGNUM_ZERO_P): Unused macro removed.
+
+Sun Feb 16 06:12:23 2014  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h: Rename macro names: RBIGNUM_FOO to BIGNUM_FOO.
+	  (BIGNUM_EMBED_LEN_NUMBITS): Renamed from RBIGNUM_EMBED_LEN_NUMBITS.
+	  (BIGNUM_EMBED_LEN_MAX): Renamed from RBIGNUM_EMBED_LEN_MAX.
+	  (BIGNUM_SIGN_BIT): Renamed from RBIGNUM_SIGN_BIT.
+	  (BIGNUM_SIGN): Renamed from RBIGNUM_SIGN.
+	  (BIGNUM_SET_SIGN): Renamed from RBIGNUM_SET_SIGN.
+	  (BIGNUM_POSITIVE_P): Renamed from RBIGNUM_POSITIVE_P.
+	  (BIGNUM_NEGATIVE_P): Renamed from RBIGNUM_NEGATIVE_P.
+	  (BIGNUM_EMBED_FLAG): Renamed from RBIGNUM_EMBED_FLAG.
+	  (BIGNUM_EMBED_LEN_MASK): Renamed from RBIGNUM_EMBED_LEN_MASK.
+	  (BIGNUM_EMBED_LEN_SHIFT): Renamed from RBIGNUM_EMBED_LEN_SHIFT.
+	  (BIGNUM_LEN): Renamed from RBIGNUM_LEN.
+	  (RBIGNUM_DIGITS): Renamed from RBIGNUM_DIGITS.
+	  (BIGNUM_LENINT): Renamed from RBIGNUM_LENINT.
+
+	* bignum.c: Follow the above change.
+
+	* gc.c: Ditto.
+
+	* marshal.c: Ditto.
+
+	* math.c: Ditto.
+
+	* numeric.c: Ditto.
+
+	* random.c: Ditto.
+
+	* rational.c: Ditto.
+
+	* sprintf.c: Ditto.
+
+	* ext/-test-/bignum/bigzero.c: Ditto.
+
+	* ext/-test-/bignum/intpack.c: Ditto.
+
+	* ext/bigdecimal/bigdecimal.c: Ditto.
+
+Sat Feb 15 20:48:49 2014  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in (FILE_READEND): Don't detect it because it is not used.
+
+Sat Feb 15 13:22:28 2014  Eric Wong  <e@80x24.org>
+
+	* probes_helper.h (RUBY_DTRACE_HOOK): correct type for _id
+
+Sat Feb 15 11:47:47 2014  Tanaka Akira  <akr@fsij.org>
+
+	* bignum.c (rb_big_cmp): Avoid bignum allocation for comparison
+	  between bignum and fixnum.
+
+Sat Feb 15 10:55:12 2014  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
+
+	* ext/-test-/win32/fd_setsize/depend: fix wrong dependencies.
+	  [ruby-dev:47253]
+
+Sat Feb 15 00:38:54 2014  Tanaka Akira  <akr@fsij.org>
+
+	* enum.c: Enumerable#{min,min_by,max,max_by} extended to take an
+	  optional argument.
+	  (nmin_cmp): New function.
+	  (nmin_block_cmp): Ditto
+	  (nmin_filter): Ditto.
+	  (nmin_i): Ditto.
+	  (nmin_run): Ditto.
+	  (enum_min): Call nmin_run if the optional argument is given.
+	  (nmin_max): Ditto.
+	  (nmin_min_by): Ditto.
+	  (nmin_max_by): Ditto.
+
+	* range.c: Range#{min,max} extended to take an optional argument.
+	  (range_min): Call range_first if the optional argument is given.
+	  (range_max): Call rb_call_super if the optional argument is given.
+
+	[ruby-core:57111] [Feature #8887]
+
+Sat Feb 15 00:27:46 2014  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/ruby.h,
+	  internal.h,
+	  ext/-test-/bignum/bigzero.c: Hide a Bignum definition.
+	  [ruby-core:42891] [Feature #6083]
+
+Sat Feb 15 00:13:14 2014  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/intern.h,
+	  include/ruby/io.h,
+	  include/ruby/ruby.h,
+	  include/ruby/win32.h,
+	  include/ruby/backward/rubysig.h,
+	  bignum.c,
+	  gc.c,
+	  io.c,
+	  process.c,
+	  safe.c,
+	  struct.c,
+	  thread.c,
+	  ext/socket/rubysocket.h,
+	  ext/-test-/old_thread_select: Remove deprecated definitions
+	  [ruby-core:60581] [Feature #9502]
+
+Fri Feb 14 18:38:46 2014  Eric Wong  <e@80x24.org>
+
+	* string.c (rb_str_format_m): trade volatile for RB_GC_GUARD
+	  RB_GC_GUARD meaning is clear and has better code generation.
+	  [ruby-core:60688]
+
+Thu Feb 13 23:30:30 2014  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* vm_insnhelper.c (vm_call_method): should check ci->me->flag of
+	  a refining method in case the method is private.
+	  [ruby-core:60111] [Bug #9452]
+
+	* vm_method.c (make_method_entry_refined): set me->flag of a refined
+	  method entry to NOEX_PUBLIC in case the original method is private
+	  and it is refined as a public method.  The original flag is stored
+	  in me->def->body.orig_me, so it's OK to make a refined method
+	  entry public.  [ruby-core:60111] [Bug #9452]
+
+	* test/ruby/test_refinement.rb: related tests.
+
 Thu Feb 13 18:38:15 2014  Eric Wong  <e@80x24.org>
 
 	* re.c (rb_reg_raise): remove volatile
@@ -690,7 +14183,7 @@ Mon Jan 13 14:47:07 2014  Zachary Scott  <e@zzak.io>
 
 Mon Jan 13 14:25:55 2014  Zachary Scott  <e@zzak.io>
 
-	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Sz?cs [Bug #9243]
+	* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]
 
 Mon Jan 13 12:03:00 2014  Charlie Somerville  <charliesome@ruby-lang.org>
 
diff --git a/LEGAL b/LEGAL
index 65706459cd..24e36e6231 100644
--- a/LEGAL
+++ b/LEGAL
@@ -5,6 +5,37 @@ All the files in this distribution are covered under either the Ruby's
 license (see the file COPYING) or public-domain except some files
 mentioned below.
 
+ccan/build_assert/build_assert.h
+ccan/check_type/check_type.h
+ccan/container_of/container_of.h
+ccan/str/str.h
+
+  These files are licensed under the CC0.
+
+    http://creativecommons.org/choose/zero/
+
+ccan/list/list.h
+
+  This file is licensed under the MIT License.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+    all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+    THE SOFTWARE.
+
 include/ruby/oniguruma.h:
 regcomp.c:
 regenc.[ch]:
@@ -56,7 +87,7 @@ http://www.geocities.jp/kosako3/oniguruma/
 http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/oniguruma/
 http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/
 
-   When this software is partly used or it is distributed with Ruby, 
+   When this software is partly used or it is distributed with Ruby,
    this of Ruby follows the license of Ruby.
 
 configure:
@@ -98,7 +129,7 @@ tool/config.sub:
 
 parse.c:
 
-  This file is licensed under the GPL, but is incorporated into Ruby and 
+  This file is licensed under the GPL, but is incorporated into Ruby and
   redistributed under the terms of the Ruby license, as permitted by the
   exception to the GPL below.
 
@@ -193,11 +224,11 @@ random.c
     This is a faster version by taking Shawn Cokus's optimization,
     Matthe Bellew's simplification, Isaku Wada's real version.
 
-    Before using, initialize the state by using init_genrand(seed) 
+    Before using, initialize the state by using init_genrand(seed)
     or init_by_array(init_key, key_length).
 
     Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura,
-    All rights reserved.                          
+    All rights reserved.
 
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions
@@ -210,8 +241,8 @@ random.c
 	 notice, this list of conditions and the following disclaimer in the
 	 documentation and/or other materials provided with the distribution.
 
-      3. The names of its contributors may not be used to endorse or promote 
-	 products derived from this software without specific prior written 
+      3. The names of its contributors may not be used to endorse or promote
+	 products derived from this software without specific prior written
 	 permission.
 
     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -231,6 +262,34 @@ random.c
     http://www.math.keio.ac.jp/matumoto/emt.html
     email: matumoto@math.keio.ac.jp
 
+vm_dump.c:procstat_vm
+
+ * Copyright (c) 2007 Robert N. M. Watson
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: head/usr.bin/procstat/procstat_vm.c 261780 2014-02-11 21:57:37Z jhb $
+
 vsnprintf.c:
 
   This file is under the old-style BSD license.  Note that the
@@ -476,7 +535,7 @@ ext/nkf/nkf-utf8/utf8tbl.c:
   copyrighted semi-public-domain software.
 
     Copyright (C) 1987, Fujitsu LTD. (Itaru ICHIKAWA)
-       Everyone is permitted to do anything on this program 
+       Everyone is permitted to do anything on this program
        including copying, modifying, improving,
        as long as you don't try to pretend that you wrote it.
        i.e., the above copyright notice has to appear in all copies.
@@ -527,7 +586,7 @@ ext/win32ole/win32ole.c:
 
     Other modifications Copyright (c) 1997, 1998 by Gurusamy Sarathy
     <gsar@umich.edu> and Jan Dubois <jan.dubois@ibm.net>
- 
+
     You may distribute under the terms of either the GNU General Public
     License or the Artistic License, as specified in the README file
     of the Perl distribution.
diff --git a/Makefile.in b/Makefile.in
index d3313bea2e..7da2488b46 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,7 +1,7 @@
 SHELL = /bin/sh
 NULLCMD = @NULLCMD@
 n=$(NULLCMD)
-ECHO1 = $(V:1=@$n)
+ECHO1 = $(V:1=$n)
 RUNCMD = $(SHELL)
 CDPATH = .
 CHDIR = @CHDIR@
@@ -25,6 +25,7 @@ AUTOCONF = autoconf
 @SET_MAKE@
 MKFILES = @MAKEFILES@
 BASERUBY = @BASERUBY@
+HAVE_BASERUBY = @HAVE_BASERUBY@
 TEST_RUNNABLE = @TEST_RUNNABLE@
 CROSS_COMPILING = @CROSS_COMPILING@
 DOXYGEN = @DOXYGEN@
@@ -57,7 +58,8 @@ CC_VERSION = @CC_VERSION@
 OUTFLAG = @OUTFLAG@$(empty)
 COUTFLAG = @COUTFLAG@$(empty)
 ARCH_FLAG = @ARCH_FLAG@
-CFLAGS = @CFLAGS@ $(ARCH_FLAG)
+CFLAGS_NO_ARCH = @CFLAGS@
+CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG)
 cflags = @cflags@
 optflags = @optflags@
 debugflags = @debugflags@
@@ -89,7 +91,6 @@ 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)
@@ -113,8 +114,6 @@ XRUBY_LIBDIR = @XRUBY_LIBDIR@
 XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@
 XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@
 
-DEFAULT_PRELUDES = $(GEM_PRELUDE)
-
 #### End of system configuration section. ####
 
 MAJOR=	@MAJOR@
@@ -131,12 +130,26 @@ LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@
 LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@
 LIBRUBY_A_OBJS = @LIBRUBY_A_OBJS@
 
+DTRACE_REBUILD_OBJS = $(DTRACE_REBUILD:yes=$(DTRACE_DEPENDENT_OBJS))
+
+DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
+			eval.$(OBJEXT) \
+			gc.$(OBJEXT) \
+			hash.$(OBJEXT) \
+			load.$(OBJEXT) \
+			object.$(OBJEXT) \
+			parse.$(OBJEXT) \
+			string.$(OBJEXT) \
+			symbol.$(OBJEXT) \
+			vm.$(OBJEXT)
+
 THREAD_MODEL  = @THREAD_MODEL@
 
 PREP          = @PREP@
 ARCHFILE      = @ARCHFILE@
 SETUP         =
 EXTSTATIC     = @EXTSTATIC@
+ENCSTATIC     = @ENCSTATIC@
 SET_LC_MESSAGES = env LC_MESSAGES=C
 
 MAKEDIRS      = @MKDIR_P@
@@ -160,8 +173,9 @@ VCS           = @VCS@
 VCSUP         = @VCSUP@
 DTRACE        = @DTRACE@
 DTRACE_EXT    = @DTRACE_EXT@
-DTRACE_OBJ   = @DTRACE_OBJ@
-DTRACE_GLOMMED_OBJ = @DTRACE_GLOMMED_OBJ@
+DTRACE_OBJ    = @DTRACE_OBJ@
+DTRACE_REBUILD= @DTRACE_REBUILD@
+DTRACE_GLOMMED_OBJ = $(DTRACE_REBUILD:yes=ruby-glommed.$(OBJEXT))
 
 OBJEXT        = @OBJEXT@
 ASMEXT        = S
@@ -171,10 +185,9 @@ SYMBOL_PREFIX = @SYMBOL_PREFIX@
 
 INSTALLED_LIST= .installed.list
 
-MKMAIN_CMD    = mkmain.sh
-
 NEWLINE_C     = newline.c
 MINIPRELUDE_C = miniprelude.c
+PRELUDE_C     = prelude.c
 RBCONFIG      = .rbconfig.time
 
 SRC_FILE      = $<
@@ -187,6 +200,8 @@ MESSAGE_END = ; do echo "$$line"; done
 ECHO_BEGIN = @sep=''; for word in
 ECHO_END = ; do echo @ECHO_N@ "$$sep'$$word'@ECHO_C@"; sep=' '; done; echo
 
+DESTDIR       = @DESTDIR@
+
 configure_args = @configure_args@
 #### End of variables
 
@@ -194,15 +209,13 @@ configure_args = @configure_args@
 
 all:
 
-.DEFAULT: all
-
 # Prevent GNU make v3 from overflowing arg limit on SysV.
 .NOEXPORT:
 
 miniruby$(EXEEXT):
 		@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
 		$(ECHO) linking $@
-		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(DTRACE_OBJ) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
+		$(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@
 
 $(PROGRAM):
 		@$(RM) $@
@@ -216,7 +229,7 @@ $(PROGRAM):
 $(LIBRUBY_A):
 		@$(RM) $@
 		$(ECHO) linking static-library $@
-		$(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(DMYEXT)
+		$(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(INITOBJS)
 		@-$(RANLIB) $@ 2> /dev/null || true
 		$(ECHO) verifying static-library $@
 		@$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT)
@@ -225,7 +238,7 @@ $(LIBRUBY_A):
 $(LIBRUBY_SO):
 		@-$(PRE_LIBRUBY_UPDATE)
 		$(ECHO) linking shared-library $@
-		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(DTRACE_OBJ) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@
+		$(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(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; \
@@ -258,7 +271,7 @@ install-cross: $(arch)-fake.rb $(RBCONFIG) rbconfig.rb $(arch_hdrdir)/ruby/confi
 
 Makefile:	$(srcdir)/Makefile.in $(srcdir)/enc/Makefile.in
 
-$(MKFILES): config.status
+$(MKFILES): config.status $(srcdir)/version.h
 		@[ -f $@ ] && mv $@ $@.old
 		MAKE=$(MAKE) $(SHELL) ./config.status $@
 		@cmp $@ $@.old > /dev/null 2>&1 && echo $@ unchanged && exit 0; \
@@ -329,6 +342,22 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
 	  $(CP) $@ $(?:.kwd=.h.blt); \
 	fi
 
+JIS_PROPS_OPTIONS = -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property
+
+enc/jis/props.h: enc/jis/props.kwd
+	$(MAKEDIRS) $(@D)
+	@set +e; \
+	if cmp -s $(?:.kwd=.src) $?; then \
+	  set -x; \
+	  $(CP) $(?:.kwd=.h.blt) $@; \
+	else \
+	  set -x; \
+	  gperf $(JIS_PROPS_OPTIONS) $? | \
+	  sed 's/(int)(long)&((\([a-zA-Z_0-9 ]*[a-zA-Z_0-9]\) *\*)0)->\([a-zA-Z0-9_]*\),/(char)offsetof(\1, \2),/g' > $@ && \
+	  $(CP) $? $(?:.kwd=.src) && \
+	  $(CP) $@ $(?:.kwd=.h.blt); \
+	fi
+
 .c.@OBJEXT@:
 	@$(ECHO) compiling $<
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c $<
@@ -355,25 +384,24 @@ enc/unicode/name2ctype.h: enc/unicode/name2ctype.kwd
 	@$(ECHO) copying dummy $(DEST_FILE)
 	$(Q) $(CP) $(OS_SRC_FILE) $(OS_DEST_FILE)
 
-probes.@OBJEXT@: $(srcdir)/probes.d
+probes.stamp: $(DTRACE_REBUILD_OBJS)
+	$(Q) if test -f $@ -o -f probes.$(OBJEXT); then \
+	  $(RM) $(DTRACE_REBUILD_OBJS) $@; \
+	  $(ECHO0) "rebuilding objects which were modified by \"dtrace -G\""; \
+	  $(MAKE) $(DTRACE_REBUILD_OBJS); \
+	fi
+	$(Q) touch $@
+
+probes.@OBJEXT@: $(srcdir)/probes.d probes.stamp
 	@$(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)
+	$(Q) $(RM) $@
+	$(Q) $(DTRACE) -G -C $(INCFLAGS) -s $(srcdir)/probes.d -o $@ $(DTRACE_REBUILD_OBJS)
 
 # DTrace static library hacks described here:
 # http://mail.opensolaris.org/pipermail/dtrace-discuss/2005-August/000207.html
 ruby-glommed.$(OBJEXT):
 	@$(ECHO) generating a glommed object with DTrace probes for static library
-	$(Q) $(LD) -r -o $@ $(OBJS) $(DTRACE_OBJ)
+	$(Q) $(LD) -r -o $@ $(OBJS)
 
 clean-local::
 	$(Q)$(RM) ext/extinit.c ext/extinit.$(OBJEXT) ext/ripper/y.output \
@@ -408,24 +436,12 @@ distclean-ext realclean-ext::
 	-$(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)
 	$(ECHO) compiling $@
 	$(Q) $(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(COUTFLAG)$@ -c ext/extinit.c
@@ -435,10 +451,7 @@ 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
+after-update:: update-config_files common-srcs
 
 update-mspec:
 	@$(CHDIR) $(srcdir); \
@@ -465,6 +478,17 @@ update-rubyspec: update-mspec
 test-rubyspec-precheck:
 	@if [ ! -d $(srcdir)/spec/rubyspec ]; then echo No rubyspec here.  make update-rubyspec first.; exit 1; fi
 
+update-coverage:
+	@$(CHDIR) $(srcdir); \
+	if [ -d coverage/simplecov ]; then \
+	  cd coverage/simplecov; \
+	  echo updating simplecov ...; \
+	  exec git pull; \
+	else \
+	  echo retrieving simplecov ...; \
+	  exec git clone $(SIMPLECOV_GIT_URL) coverage/simplecov; \
+	fi
+
 INSNS	= opt_sc.inc optinsn.inc optunifs.inc insns.inc insns_info.inc \
 	  vmtc.inc vm.inc
 
@@ -474,6 +498,8 @@ $(INSNS): $(srcdir)/insns.def vm_opts.h \
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@
 
+verconf.h: $(RBCONFIG)
+
 loadpath: verconf.h
 	@$(CPP) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/loadpath.c | \
 	sed -e '1,/^const char ruby_initial_load_paths/d;/;/,$$d' \
diff --git a/NEWS b/NEWS
index 0c70db07bc..5ac07db507 100644
--- a/NEWS
+++ b/NEWS
@@ -13,15 +13,351 @@ with all sufficient information, see the ChangeLog file.
 
 === Language changes
 
+* nil/true/false
+  * nil/true/false objects are frozen. [Feature #8923]
+
+* Hash literal
+  * Symbol key followed by a colon can be quoted. [Feature #4276]
+
+* default argument
+  fixed a very longstanding bug that an optional argument was not
+  accessible in its default value expression.  [Bug #9593]
+
 === Core classes updates (outstanding ones only)
 
+* Binding
+  * New methods:
+    * Binding#local_variables
+    * Binding#receiver
+
+* Dir
+  * New methods:
+    * Dir#fileno
+
+* Enumerable
+  * New methods:
+    * Enumerable#slice_after
+    * Enumerable#slice_when
+  * Extended methods:
+    * min, min_by, max and max_by supports optional argument to return
+      multiple elements.
+
+* Float
+  * New methods:
+    * Float#next_float
+    * Float#prev_float
+
+* File
+  * New methods:
+    * File.birthtime
+    * File#birthtime
+
+* File::Stat
+  * New methods:
+    * File::Stat#birthtime
+
+* GC
+  * GC.latest_gc_info returns :state to represent current GC status.
+  * Improvements
+    * Introduce incremental marking for major GC. [Feature #10137]
+
+* IO
+  * Improvements
+    * IO#nonblock_read and IO#nonblock_write for pipes on Windows are supported.
+
+* Kernel
+  * New methods:
+    * Kernel#itself
+  * Improvements
+    * Kernel#throw raises UncaughtThrowError, subclass of ArgumentError when
+      there is no corresponding catch block, instead of ArgumentError.
+
+* Process
+  * Extended method:
+    * Process execution methods such as Process.spawn opens the file in write
+      mode for redirect from [:out, :err].
+
+* String
+  * New methods:
+    * String#unicode_normalize
+    * String#unicode_normalize!
+    * String#unicode_normalized?
+
+* Symbol
+  * Improvements
+    * Most symbols which are returned by String#to_sym and
+      String#intern are GC-able.
+
+* Method
+  * New methods:
+    * Method#curry([arity]) returns a curried Proc.
+    * Method#super_method returns a Method of superclass, which would be called
+      when super is used.
+
 === Core classes compatibility issues (excluding feature bug fixes)
 
+* Enumerable
+  * Enumerable#slice_before's state management deprecated.
+  * Enumerable#chunk's state management deprecated.
+
+* GC
+  * incompatible changes:
+    * Rename GC.stat entries. [Feature #9924]
+      See https://docs.google.com/spreadsheets/d/11Ua4uBr6o0k-nORrZLEIIUkHJ9JRzRR0NyZfrhEEnc8/edit?usp=sharing
+
+* Hash
+  * incompatible changes:
+    * Change overriding policy for duplicated key. [Bug #10315]
+      { **hash1, **hash2 } contains values of hash2 for duplicated keys.
+
+* IO
+  * incompatible changes:
+    * When flushing file IO with IO#flush, you cannot assume that the metadata
+      of the file is updated immediately.  On some platforms (especially
+      Windows), it is delayed until the filesystem load is decreased.
+      Use IO#fsync if you want to guarantee updating metadata.
+  * IO#each_codepoint raises an exception at incomplete character
+    before EOF when conversion takes place.  [Bug #11444]
+
+* Math
+  * incompatible changes:
+    * Math.log now raises Math::DomainError instead of returning NaN if the
+      base is less than 0, and returns NaN instead of -infinity if both of
+      two arguments are 0.
+    * Math.atan2 now returns values like as expected by C99 if both two
+      arguments are infinity.
+
+* Proc
+  * incompatible changes:
+    * ArgumentError is no longer raised when lambda Proc is passed as a
+      block, and the number of yielded arguments does not match the formal
+      arguments of the lambda, if just an array is yielded and its length
+      matches.
+
+* Process
+  * Process execution methods such as Process.spawn opens the file in write
+    mode for redirect from [:out, :err].
+    Before Ruby 2.2, it was opened in read mode.
+
 === Stdlib updates (outstanding ones only)
 
+* Continuation
+  * callcc is obsolete. use Fiber instead.
+
+* Digest
+
+  * Digest() should now be thread-safe.  If you have a problem with
+    regard to on-demand loading under a multi-threaded environment,
+    preload "digest/*" modules on boot or use this method instead of
+    directly referencing Digest::*.
+  * Digest::HMAC has been removed just as previously noticed.
+
+* DL
+  * DL has been removed from stdlib. Please use Fiddle instead!
+
+* Etc
+  * New methods:
+    * Etc.uname
+    * Etc.sysconf
+    * Etc.confstr
+    * IO#pathconf
+    * Etc.nprocessors
+
+* Find, Pathname
+  * Extended methods:
+    * find method accepts "ignore_error" keyword argument.
+
+* Matrix
+  * New methods:
+    * Matrix#first_minor(row, column) returns the submatrix obtained
+      by deleting the specified row and column.
+    * Matrix#cofactor(row, column) returns the (row, column) cofactor
+      which is obtained by multiplying the first minor by (-1)**(row + column).
+    * Matrix#adjugate returns the adjugate of the matrix.
+    * hstack and vstack are new instance and class methods to stack matrices
+      horizontally and vertically.
+    * Matrix#laplace_expansion(row_or_column: num) returns the laplace_expansion
+      along the +num+ -th row or column.
+    * Vector.basis(size:, index:) returns the specified basis vector.
+    * Unary - and + added for Vector and Matrix.
+    * Vector#cross_product generalized to arbitrary dimensions.
+    * Vector#dot and #cross are aliases for #inner_product and #cross_product.
+    * Vector#angle_with returns the angle with its argument
+    * New instance and class method independent? to test linear independence.
+
+* Pathname
+  * Pathname#/ is aliased to Pathname#+.
+  * New methods:
+    * Pathname#birthtime
+
+* Rake
+  * Updated to Rake 10.4.0.  For full release notes see:
+
+    http://docs.seattlerb.org/rake/History_rdoc.html#label-10.4.0
+
+* RubyGems
+  * Updated to RubyGems 2.4.2.  For full release notes see:
+
+    http://docs.seattlerb.org/rubygems/History_txt.html#label-2.4.2+%2F+2014-10-01
+
+* TSort
+  * TSort.tsort_each, TSort.each_strongly_connected_component and
+    TSort.each_strongly_connected_component_from returns an enumerator if
+    no block given.
+
+* XMLRPC
+  * Added new parser class named LibXMLStreamParser.
+
 === Stdlib compatibility issues (excluding feature bug fixes)
 
+* lib/mathn.rb
+  * Show deprecated warning [Feature #10169]
+
+* ext/date/lib/date/format.rb
+  * Removed because it's empty file.
+
+* Digest
+  * Digest::HMAC has finally ceased to exist.  Use OpenSSL::HMAC or an external gem instead.
+
+* time.rb
+  * Time.parse, Time.strptime, Time.rfc2822, Time.xmlschema may produce
+    fixed-offset Time objects.
+    It is happen when usual localtime doesn't preserve the offset from UTC.
+  * Time.httpdate produces always UTC Time object.
+  * Time.strptime raises ArgumentError when no date information.
+
+* lib/rational.rb
+  * Removed because it is deprecated from 2009.
+
+* lib/complex.rb
+  * Removed because it is deprecated from 2009.
+
+* lib/prettyprint.rb
+  * Removed PrettyPrint#first?
+
+* lib/minitest/*.rb
+  * Removed because it conflicts to minitest 5. [Feature #9711]
+
+* lib/test/**/*.rb
+  * Removed because it conflicts to minitest 5, and it was just an wrapper
+    of minitest 4. [Feature #9711]
+
+* lib/uri
+  * support RFC 3986. [Feature #2542]
+
+* GServer
+  * GServer is extracted to gserver gem. It's unmaintain code.
+
+* Logger
+  * Logger::Application is extracted to logger-application gem. It's unmaintain code.
+
+* ObjectSpace (after requiring "objspace")
+  * ObjectSpace.memsize_of(obj) returns a size includes sizeof(RVALUE).
+    [Bug #8984]
+
+* Prime
+  * incompatible changes:
+    * Prime.prime? now returns false for negative numbers. This method
+      should not be used to know the number is composite or not. [Bug #7395]
+
+* Psych
+  * Removed Psych::EngineManager [Bug #8344]
+
 === Built-in global variables compatibility issues
 
 === C API updates
 
+* Deprecated APIs removed.  [Feature #9502]
+
+  Check_SafeStr -> SafeStringValue
+  rb_check_safe_str -> SafeStringValue
+  rb_quad_pack -> rb_integer_pack
+  rb_quad_unpack -> rb_integer_unpack
+  rb_read_check : access struct FILE internal. no replacement.
+  rb_struct_iv_get : internal function. no replacement.
+  struct rb_blocking_region_buffer : internal type. no replacement.
+  rb_thread_blocking_region_begin -> rb_thread_call_without_gvl family
+  rb_thread_blocking_region_end -> rb_thread_call_without_gvl family
+  TRAP_BEG -> rb_thread_call_without_gvl family
+  TRAP_END -> rb_thread_call_without_gvl family
+  rb_thread_select -> rb_thread_fd_select
+  struct rb_exec_arg : internal type. no replacement.
+  rb_exec : internal function. no replacement.
+  rb_exec_arg_addopt : internal function. no replacement.
+  rb_exec_arg_fixup : internal function. no replacement.
+  rb_exec_arg_init : internal function. no replacement.
+  rb_exec_err : internal function. no replacement.
+  rb_fork : internal function. no replacement.
+  rb_fork_err : internal function. no replacement.
+  rb_proc_exec_n : internal function. no replacement.
+  rb_run_exec_options : internal function. no replacement.
+  rb_run_exec_options_err : internal function. no replacement.
+  rb_thread_blocking_region -> rb_thread_call_without_gvl family
+  rb_thread_polling -> rb_thread_wait_for
+  rb_big2str0 : internal function. no replacement.
+  rb_big2ulong_pack -> rb_integer_pack
+  rb_gc_set_params : internal function. no replacement.
+  rb_io_mode_flags -> rb_io_modestr_fmode
+  rb_io_modenum_flags -> rb_io_oflags_fmode
+
+* struct RBignum is hidden.  [Feature #6083]
+  Use rb_integer_pack and rb_integer_unpack instead.
+
+* struct RRational is hidden.  [Feature #9513]
+  Use rb_rational_num and rb_rational_den instead.
+
+* rb_big_new and rb_big_resize takes a size_t instead of long.
+
+* rb_num2long returns a long instead of SIGNED_VALUE.
+
+* rb_num2ulong returns an unsigned long instead of VALUE.
+
+* st hash table uses power-of-two sizes for speed [Feature #9425].
+  Lookups are 10-25% faster if using appropriate hash functions.
+  However, weaknesses in hash distribution can no longer be masked
+  by prime number-sized tables, so extensions may need to tweak
+  hash functions to ensure good distribution.
+
+* rb_sym2str() added. This is almost same as `rb_id2str(SYM2ID(sym))`
+  but not pinning a dynamic symbol.
+
+* rb_str_cat_cstr() added. This is same as `rb_str_cat2()`.
+
+* `rb_str_substr()` and `rb_str_subseq()` will share middle of a string,
+  but not only the end of a string, in the future.  Therefore, result
+  strings may not be NUL-terminated, `StringValueCStr()` is needed
+  calling to obtain a NUL-terminated C string.
+
+* rb_tracepoint_new() supports new internal events accessible only from C:
+  * RUBY_INTERNAL_EVENT_GC_ENTER
+  * RUBY_INTERNAL_EVENT_GC_EXIT
+    r47528
+
+* rb_hash_delete() now does not call the block given to the current method.
+
+* rb_extract_keywords() and rb_get_kwargs() exported.  See README.EXT
+  for details.
+
+=== Build system updates
+
+* jemalloc is optionally supported via `./configure --with-jemalloc`
+  jemalloc may be suitable when system malloc is slow or prone
+  to fragmentation.  [Feature #9113]
+
+=== Implementation changes
+
+* GC
+    * Most symbols which are returned by String#to_sym and
+      String#intern are GC-able [Feature #9634]
+    * Introduce incremental marking for major GC. [Feature #10137]
+    * Enable lazy sweep on GC caused by malloc().
+
+* VM
+    * Use frozen string literals for Hash#[] and Hash#[]=
+    * Fast keyword arguments passing [Feature #10440]
+    * Allow to receive huge splatted array by a rest argument
+      [Feature #10440]
+
+* Process
+    * Process creation methods, such as spawn(), uses vfork() system call.
+      vfork() is faster than fork() when the parent process uses huge memory.
diff --git a/README.EXT b/README.EXT
index b1a816c271..3e010c3002 100644
--- a/README.EXT
+++ b/README.EXT
@@ -9,7 +9,7 @@ Ruby variables do not have a static type, and data themselves have
 types, so data will need to be converted between the languages.
 
 Data in Ruby are represented by the C type `VALUE'.  Each VALUE data
-has its data-type.
+has its data type.
 
 To retrieve C data from a VALUE, you need to:
 
@@ -18,7 +18,7 @@ To retrieve C data from a VALUE, you need to:
 
 Converting to the wrong data type may cause serious problems.
 
-== Data-Types
+== Data Types
 
 The Ruby interpreter has the following data types:
 
@@ -74,7 +74,7 @@ data types, your code will look something like this:
       break;
   }
 
-There is the data-type check function
+There is the data type check function
 
   void Check_Type(VALUE value, int type)
 
@@ -94,7 +94,7 @@ 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
+This size depends 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
@@ -102,32 +102,32 @@ 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,
+numbers into C integers.  These macros include 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*
+StringValuePtr(var) does the same replacement and returns char*
 representation of var.  These macros will skip the replacement if var
 is a String.  Notice that the macros take only the lvalue as their
 argument, to change the value of var in place.
 
 You can also use the macro named StringValueCStr(). This is just
-like StringValuePtr(), but always add nul character at the end of
-the result. If the result contains nul character, this macro causes
+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.
+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".  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.
+to access RXXXX data directly because these data structures are complex.
+Use corresponding rb_xxx() functions to access the internal struct.
 For example, to access an entry of array, use rb_ary_entry(ary, offset)
 and rb_ary_store(ary, offset, obj).
 
@@ -145,22 +145,22 @@ To convert C data to Ruby values:
 
 FIXNUM ::
 
-  left shift 1 bit, and turn on LSB.
+  left shift 1 bit, and turn on its least significant bit (LSB).
 
 Other pointer values::
 
   cast to VALUE.
 
-You can determine whether a VALUE is pointer or not by checking its LSB.
+You can determine whether a VALUE is a pointer or not by checking its LSB.
 
-Notice Ruby does not allow arbitrary pointer values to be a VALUE.  They
+Notice: Ruby does not allow arbitrary pointer values to be a VALUE.  They
 should be pointers to the structures which Ruby knows about.  The known
 structures are defined in <ruby.h>.
 
-To convert C numbers to Ruby values, use these macros.
+To convert C numbers to Ruby values, use these macros:
 
 INT2FIX() :: for integers within 31bits.
-INT2NUM() :: for arbitrary sized integer.
+INT2NUM() :: for arbitrary sized integers.
 
 INT2NUM() converts an integer into a Bignum if it is out of the FIXNUM
 range, but is a bit slower.
@@ -184,6 +184,10 @@ 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_str_new_literal(const char *ptr) ::
+
+  Creates a new Ruby string from a C string literal.
+
 rb_tainted_str_new(const char *ptr, long len) ::
 
   Creates a new tainted Ruby string.  Strings from external data
@@ -199,15 +203,17 @@ 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.
+  Note: In the format string, "%"PRIsVALUE can be used for Object#to_s
+  (or Object#inspect if '+' flag is set) output (and related argument
+  must be a VALUE).  Since it conflicts with "%i", for integers in
+  format strings, use "%d".
 
 rb_str_cat(VALUE str, const char *ptr, long len) ::
 
   Appends len bytes of data from ptr to the Ruby string.
 
 rb_str_cat2(VALUE str, const char* ptr) ::
+rb_str_cat_cstr(VALUE str, const char* ptr) ::
 
   Appends C string ptr to Ruby string str.  This function is
   equivalent to rb_str_cat(str, ptr, strlen(ptr)).
@@ -225,14 +231,34 @@ rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc) ::
 
   Creates a new Ruby string with the specified encoding.
 
+rb_enc_str_new_literal(const char *ptr) ::
+
+  Creates a new Ruby string from a C string literal with the specified
+  encoding.
+
 rb_usascii_str_new(const char *ptr, long len) ::
 rb_usascii_str_new_cstr(const char *ptr) ::
 
   Creates a new Ruby string with encoding US-ASCII.
 
+rb_usascii_str_new_literal(const char *ptr) ::
+
+  Creates a new Ruby string from a C string literal with encoding
+  US-ASCII.
+
+rb_utf8_str_new(const char *ptr, long len) ::
+rb_utf8_str_new_cstr(const char *ptr) ::
+
+  Creates a new Ruby string with encoding UTF-8.
+
+rb_utf8_str_new_literal(const char *ptr) ::
+
+  Creates a new Ruby string from a C string literal with encoding
+  UTF-8.
+
 rb_str_resize(VALUE str, long len) ::
 
-  Resizes Ruby string to len bytes.  If str is not modifiable, this
+  Resizes a 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
@@ -242,9 +268,9 @@ rb_str_resize(VALUE str, long len) ::
 
 rb_str_set_len(VALUE str, long len) ::
 
-  Sets the length of Ruby string.  If str is not modifiable, this
+  Sets the length of a 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
+  up to len bytes, regardless RSTRING_LEN(str).  len must not exceed
   the capacity of str.
 
 === Array Functions
@@ -372,9 +398,9 @@ There are two functions to define private/protected methods:
   void rb_define_protected_method(VALUE klass, const char *name,
 			          VALUE (*func)(), int argc)
 
-At last, rb_define_module_function defines a module functions,
+At last, rb_define_module_function defines a module function,
 which are private AND singleton methods of the module.
-For example, sqrt is the module function defined in Math module.
+For example, sqrt is a module function defined in the Math module.
 It can be called in the following way:
 
   Math.sqrt(4)
@@ -411,6 +437,16 @@ 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.
 
+If you are overriding an existing method of any ancestor of your class,
+you may rely on:
+
+  VALUE rb_call_super(int argc, const VALUE *argv)
+
+To achieve the receiver of the current scope (if no other way is
+available), you can use:
+
+  VALUE rb_current_receiver(void)
+
 === Constant Definition
 
 We have 2 functions to define constants:
@@ -440,7 +476,7 @@ 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
+It returns nil when an error occurred. Moreover, *state is zero if str was
 successfully evaluated, or nonzero otherwise.
 
 === ID or Symbol
@@ -476,6 +512,16 @@ 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 retrieve Symbol from Ruby object (Symbol or String) given as
+an argument by using
+
+  rb_to_symbol(VALUE name)
+  rb_check_symbol(volatile VALUE *namep)
+  rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc)
+
+These functions are similar to above functions except that these
+return a Symbol instead of an ID.
+
 You can convert C ID to Ruby Symbol by using
 
   VALUE ID2SYM(ID id)
@@ -514,7 +560,7 @@ See also Constant Definition above.
 
 = Information Sharing Between Ruby and C
 
-=== Ruby Constants That C Can Be Accessed From C
+=== Ruby Constants That Can Be Accessed From C
 
 As stated in section 1.3,
 the following Ruby constants can be referred from C.
@@ -612,7 +658,7 @@ A pointer to the structure will be assigned to the variable sval.
 
 See the example below for details.
 
-= Example - Creating dbm Extension
+= Example - Creating the dbm Extension
 
 OK, here's the example of making an extension library.  This is the
 extension to access DBMs.  The full source is included in the ext/
@@ -649,8 +695,8 @@ Here's the example of an initializing function.
   Init_dbm(void)
   {
       /* define DBM class */
-      cDBM = rb_define_class("DBM", rb_cObject);
-      /* DBM includes Enumerate module */
+      VALUE cDBM = rb_define_class("DBM", rb_cObject);
+      /* DBM includes Enumerable module */
       rb_include_module(cDBM, rb_mEnumerable);
 
       /* DBM has class method open(): arguments are received as C array */
@@ -683,10 +729,11 @@ 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) do {\
+      Data_Get_Struct((obj), struct dbmdata, (dbmp));\
+      if ((dbmp) == 0) closed_dbm();\
+      if ((dbmp)->di_dbm == 0) closed_dbm();\
+  } while (0)
 
 This sort of complicated macro does the retrieving and close checking for
 the DBM.
@@ -1080,6 +1127,15 @@ rb_float_new(f) ::
 
   double -> Float
 
+RSTRING_LEN(str) ::
+
+  String -> length of String data in bytes
+
+RSTRING_PTR(str) ::
+
+  String -> pointer to String data
+  Note that the result pointer may not be NUL-terminated
+
 StringValue(value) ::
 
   Object with #to_str -> String
@@ -1090,13 +1146,14 @@ StringValuePtr(value) ::
 
 StringValueCStr(value) ::
 
-  Object with #to_str -> pointer to String data without NULL bytes
+  Object with #to_str -> pointer to String data without NUL bytes
+  It is guaranteed that the result data is NUL-terminated
 
 rb_str_new2(s) ::
 
   char * -> String
 
-== Defining Class and Module
+== Defining Classes and Modules
 
 VALUE rb_define_class(const char *name, VALUE super) ::
 
@@ -1136,7 +1193,7 @@ void rb_define_readonly_variable(const char *name, VALUE *var) ::
   Defines a read-only global variable.  Works just like
   rb_define_variable(), except the defined variable is read-only.
 
-void rb_define_virtual_variable(const char *name, VALUE (*getter)(), VALUE (*setter)()) ::
+void rb_define_virtual_variable(const char *name, VALUE (*getter)(), void (*setter)()) ::
 
   Defines a virtual variable, whose behavior is defined by a pair of C
   functions.  The getter function is called when the variable is
@@ -1148,7 +1205,7 @@ void rb_define_virtual_variable(const char *name, VALUE (*getter)(), VALUE (*set
 
   The getter function must return the value for the access.
 
-void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), VALUE (*setter)()) ::
+void rb_define_hooked_variable(const char *name, VALUE *var, VALUE (*getter)(), void (*setter)()) ::
 
   Defines hooked variable.  It's a virtual variable with a C variable.
   The getter is called as
@@ -1175,7 +1232,7 @@ void rb_define_global_const(const char *name, VALUE val) ::
 
   Defines a global constant.  This is just the same as
 
-    rb_define_const(cKernal, name, val)
+    rb_define_const(rb_cObject, name, val)
 
 == Method Definition
 
@@ -1249,6 +1306,26 @@ rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
   The number of given arguments, excluding an option hash or iterator
   block, is returned.
 
+int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values)
+
+  Retrieves argument VALUEs bound to keywords, which directed by +table+
+  into +values+.  First +required+ number of IDs referred by +table+ are
+  mandatory, and succeeding +optional+ (- +optional+ - 1 if
+  +optional+ is negative) number of IDs are optional.  If a
+  mandatory key is not contained in +keyword_hash+, raises "missing
+  keyword" +ArgumentError+.  If an optional key is not present in
+  +keyword_hash+, the corresponding element in +values+ is not changed.
+  If +optional+ is negative, rest of +keyword_hash+ are stored in the
+  next to optional +values+ as a new Hash, otherwise raises "unknown
+  keyword" +ArgumentError+.
+
+VALUE rb_extract_keywords(VALUE *original_hash)
+
+  Extracts pairs whose key is a symbol into a new hash from a hash
+  object referred by +original_hash+.  If the original hash contains
+  non-symbol keys, then they are copied to another hash and the new hash
+  is stored through +original_hash+, else 0 is stored.
+
 == Invoking Ruby method
 
 VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
@@ -1283,7 +1360,7 @@ char *rb_class2name(VALUE klass) ::
 
   Returns the name of the class.
 
-int rb_respond_to(VALUE object, ID id) ::
+int rb_respond_to(VALUE obj, ID id) ::
 
   Returns true if the object responds to the message specified by id.
 
@@ -1311,7 +1388,7 @@ VALUE rb_block_call(VALUE recv, ID mid, int argc, VALUE * argv, VALUE (*func) (A
   whereas yielded values can be gotten via argc/argv of the third/fourth
   arguments.
 
-[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2) ::
+[OBSOLETE] VALUE rb_iterate(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE 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
@@ -1393,9 +1470,10 @@ void rb_bug(const char *fmt, ...) ::
   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.
+Note: In the format string, "%"PRIsVALUE can be used for Object#to_s
+(or Object#inspect if '+' flag is set) output (and related argument
+must be a VALUE).  Since it conflicts with "%i", for integers in
+format strings, use "%d".
 
 == Initialize and Start the Interpreter
 
@@ -1405,13 +1483,18 @@ void ruby_init() ::
 
   Initializes the interpreter.
 
-void ruby_options(int argc, char **argv) ::
+void *ruby_options(int argc, char **argv) ::
 
   Process command line arguments for the interpreter.
+  And compiles the Ruby source to execute.
+  It returns an opaque pointer to the compiled source
+  or an internal special value.
 
-void ruby_run() ::
+int ruby_run_node(void *n) ::
 
-  Starts execution of the interpreter.
+  Runs the given compiled source and exits this process.
+  It returns EXIT_SUCCESS if successfully runs the source.
+  Otherwise, it returns other value.
 
 void ruby_script(char *name) ::
 
@@ -1591,6 +1674,56 @@ available in in include/ruby/ruby.h. An example is available in iseq.c.
 For a complete guide for RGenGC and write barriers, please refer to
 <https://bugs.ruby-lang.org/projects/ruby-trunk/wiki/RGenGC>.
 
+= Appendix E. RB_GC_GUARD to protect from premature GC
+
+C Ruby currently uses conservative garbage collection, thus VALUE
+variables must remain visible on the stack or registers to ensure any
+associated data remains usable.  Optimizing C compilers are not designed
+with conservative garbage collection in mind, so they may optimize away
+the original VALUE even if the code depends on data associated with that
+VALUE.
+
+The following example illustrates the use of RB_GC_GUARD to ensure
+the contents of sptr remain valid while the second invocation of
+rb_str_new_cstr is running.
+
+  VALUE s, w;
+  const char *sptr;
+
+  s = rb_str_new_cstr("hello world!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+  sptr = RSTRING_PTR(s);
+  w = rb_str_new_cstr(sptr + 6); /* Possible GC invocation */
+
+  RB_GC_GUARD(s); /* ensure s (and thus sptr) do not get GC-ed */
+
+In the above example, RB_GC_GUARD must be placed _after_ the last use of
+sptr.  Placing RB_GC_GUARD before dereferencing sptr would be of no use.
+RB_GC_GUARD is only effective on the VALUE data type, not converted C
+data types.
+
+RB_GC_GUARD would not be necessary at all in the above example if
+non-inlined function calls are made on the `s' VALUE after sptr is
+dereferenced.  Thus, in the above example, calling any un-inlined
+function on `s' such as:
+
+  rb_str_modify(s);
+
+Will ensure `s' stays on the stack or register to prevent a
+GC invocation from prematurely freeing it.
+
+Using the RB_GC_GUARD macro is preferable to using the "volatile"
+keyword in C.  RB_GC_GUARD has the following advantages:
+
+1) the intent of the macro use is clear
+
+2) RB_GC_GUARD only affects its call site, "volatile" generates some
+   extra code every time the variable is used, hurting optimization.
+
+3) "volatile" implementations may be buggy/inconsistent in some
+   compilers and architectures. RB_GC_GUARD is customizable for broken
+   systems/compilers without those without negatively affecting other
+   systems.
+
 /*
  * Local variables:
  * fill-column: 70
diff --git a/README.EXT.ja b/README.EXT.ja
index 17be4e4c1c..b662d4dfdb 100644
--- a/README.EXT.ja
+++ b/README.EXT.ja
@@ -111,8 +111,8 @@ FIXNUMとNILに関してはより高速な判別マクロが用意されてい�
 換結果がintのサイズに収まらない場合には例外を発生します．
 それから，FIXNUMに限らずRubyのデータを整数に変換する
 「NUM2INT()」および「NUM2LONG()」というマクロがあります．こ
-れらのマクロはマクロはデータタイプのチェック無しで使えます
-(整数に変換できない場合には例外が発生する)．同様にチェック無
+れらのマクロはデータタイプのチェック無しで使えます
+(整数に変換できない場合には例外が発生する)．同様にチェック無し
 で使える変換マクロはdoubleを取り出す「NUM2DBL()」があります．
 
 char* を取り出す場合， StringValue() と StringValuePtr()
@@ -126,10 +126,10 @@ var は lvalue である必要があります．
 また，StringValuePtr() に類似した StringValueCStr() というマ
 クロもあります．StringValueCStr(var) は var を String に置き
 換えてから var の文字列表現に対する char* を返します．返され
-る文字列の末尾には nul 文字が付加されます．なお，途中に nul
+る文字列の末尾には NUL 文字が付加されます．なお，途中に NUL
 文字が含まれる場合は ArgumentError が発生します．
-一方，StringValuePtr() では，末尾に nul 文字がある保証はなく，
-途中に nul 文字が含まれている可能性もあります．
+一方，StringValuePtr() では，末尾に NUL 文字がある保証はなく，
+途中に NUL 文字が含まれている可能性もあります．
 
 それ以外のデータタイプは対応するCの構造体があります．対応す
 る構造体のあるVALUEはそのままキャスト(型変換)すれば構造体の
@@ -209,6 +209,10 @@ rb_str_new_cstr(const char *ptr)
   Cの文字列からRubyの文字列を生成する．この関数の機能は
   rb_str_new(ptr, strlen(ptr))と同等である．
 
+rb_str_new_literal(const char *ptr)
+
+  Cのリテラル文字列からRubyの文字列を生成する．
+
 rb_tainted_str_new(const char *ptr, long len)
 
   汚染マークが付加された新しいRubyの文字列を生成する．外部
@@ -226,14 +230,16 @@ rb_vsprintf(const char *format, va_list ap)
   Cの文字列formatと続く引数をprintf(3)のフォーマットにしたがって
   整形し，Rubyの文字列を生成する．
 
-  注意: %iはObject#to_s('+'フラグが指定されているときはObject#inspect)を
-  使ったVALUEの出力に使用されているため，整数には%dを使用すること．
+  注意: "%"PRIsVALUEがObject#to_s('+'フラグが指定されている
+  ときはObject#inspect)を使ったVALUEの出力に利用できる．これ
+  は"%i"と衝突するため，整数には"%d"を使用すること．
 
 rb_str_cat(VALUE str, const char *ptr, long len)
 
   Rubyの文字列strにlenバイトの文字列ptrを追加する．
 
 rb_str_cat2(VALUE str, const char* ptr)
+rb_str_cat_cstr(VALUE str, const char* ptr)
 
   Rubyの文字列strにCの文字列ptrを追加する．この関数の機能は
   rb_str_cat(str, ptr, strlen(ptr))と同等である．
@@ -251,11 +257,28 @@ rb_enc_str_new_cstr(const char *ptr, rb_encoding *enc)
 
   指定されたエンコーディングでRubyの文字列を生成する.
 
+rb_enc_str_new_literal(const char *ptr)
+
+  Cのリテラル文字列から指定されたエンコーディングでRubyの文字列を生成する．
+
 rb_usascii_str_new(const char *ptr, long len)
 rb_usascii_str_new_cstr(const char *ptr)
 
   エンコーディングがUS-ASCIIのRubyの文字列を生成する.
 
+rb_usascii_str_new_literal(const char *ptr)
+
+  Cのリテラル文字列からエンコーディングがUS-ASCIIのRubyの文字列を生成する．
+
+rb_utf8_str_new(const char *ptr, long len)
+rb_utf8_str_new_cstr(const char *ptr)
+
+  エンコーディングがUTF-8のRubyの文字列を生成する.
+
+rb_utf8_str_new_literal(const char *ptr)
+
+  Cのリテラル文字列からエンコーディングがUTF-8のRubyの文字列を生成する．
+
 rb_str_resize(VALUE str, long len)
 
   Rubyの文字列のサイズをlenバイトに変更する．strの長さは前
@@ -450,6 +473,17 @@ funcはクラスを引数として受け取って，新しく割り当てられ�
 ソースなどを含まない，できるだけ「空」のままにしておいたほう
 がよいでしょう．
 
+継承したクラスにある既存のメソッドをオーバーライドしているな
+ら，オーバーライドされたメソッドを呼び出すには以下の関数を使
+います．
+
+  VALUE rb_call_super(int argc, const VALUE *argv)
+
+現在のスコープのレシーバは(他に方法がなければ)，以下の関数で
+得ることができます．
+
+  VALUE rb_current_receiver(void)
+
 === 定数定義
 
 拡張ライブラリが必要な定数はあらかじめ定義しておいた方が良い
@@ -516,13 +550,23 @@ IDとは変数名，メソッド名を表す整数です．Rubyの中では
   rb_check_id(volatile VALUE *name)
   rb_check_id_cstr(const char *name, long len, rb_encoding *enc)
 
-もし引数がシンボルでも文字列でもなければ、to_strメソッドで文
+もし引数がシンボルでも文字列でもなければ，to_strメソッドで文
 字列に変換しようとします．第二の関数はその変換結果を*nameに保
 存し,その名前が既知のシンボルでない場合は0を返します．この関
-数が0以外を返した場合は*nameは常にシンボルか文字列であり、0を
+数が0以外を返した場合は*nameは常にシンボルか文字列であり，0を
 返した場合は常に文字列です．第三の関数はRubyの文字列ではなく
 NUL終端されたCの文字列を使います．
 
+Rubyから引数として与えられたシンボル(または文字列)をシンボル
+に変換するには以下の関数を使います．
+
+  rb_to_symbol(VALUE name)
+  rb_check_symbol(volatile VALUE *namep)
+  rb_check_symbol_cstr(const char *ptr, long len, rb_encoding *enc)
+
+これらの関数は，IDの代わりにシンボルを返すことを除けば上記の
+関数と同じです．
+
 === CからRubyのメソッドを呼び出す
 
 Cから文字列を経由せずにRubyのメソッドを呼び出すためには以下
@@ -725,8 +769,8 @@ Rubyは拡張ライブラリをロードする時に「Init_ライブラリ名�
   Init_dbm(void)
   {
       /* DBMクラスを定義する */
-      cDBM = rb_define_class("DBM", rb_cObject);
-      /* DBMはEnumerateモジュールをインクルードする */
+      VALUE cDBM = rb_define_class("DBM", rb_cObject);
+      /* DBMはEnumerableモジュールをインクルードする */
       rb_include_module(cDBM, rb_mEnumerable);
 
       /* DBMクラスのクラスメソッドopen(): 引数はCの配列で受ける */
@@ -763,10 +807,11 @@ dbm.cではData_Make_Structを以下のように使っています．
 Dataオブジェクトからdbmstruct構造体のポインタを取り出すため
 に以下のマクロを使っています．
 
-  #define GetDBM(obj, dbmp) {\
-      Data_Get_Struct(obj, struct dbmdata, dbmp);\
-      if (dbmp->di_dbm == 0) closed_dbm();\
-  }
+  #define GetDBM(obj, dbmp) do {\
+      Data_Get_Struct((obj), struct dbmdata, (dbmp));\
+      if ((dbmp) == 0) closed_dbm();\
+      if ((dbmp)->di_dbm == 0) closed_dbm();\
+  } while (0)
 
 ちょっと複雑なマクロですが，要するにdbmdata構造体のポインタ
 の取り出しと，closeされているかどうかのチェックをまとめてい
@@ -942,10 +987,10 @@ variable.c :: 変数と定数
 
 == Rubyの構文解析器
 
-  parse.y      : 字句解析器と構文定義
-    -> parse.c : 自動生成
-  keywords     : 予約語
-    -> lex.c   : 自動生成
+  parse.y       : 字句解析器と構文定義
+    -> parse.c  : 自動生成
+  defs/keywords : 予約語
+    -> lex.c    : 自動生成
 
 == Rubyの評価器 (通称YARV)
   compile.c
@@ -965,12 +1010,12 @@ variable.c :: 変数と定数
   vm_insnhelper.c
   vm_method.c
 
-  opt_insns_unif.def  : 命令融合
-  opt_operand.def     : 最適化のための定義
+  defs/opt_insns_unif.def  : 命令融合
+  defs/opt_operand.def     : 最適化のための定義
 
-    -> insn*.inc      : 自動生成
-    -> opt*.inc       : 自動生成
-    -> vm.inc         : 自動生成
+    -> insn*.inc           : 自動生成
+    -> opt*.inc            : 自動生成
+    -> vm.inc              : 自動生成
 
 == 正規表現エンジン (鬼車)
 
@@ -1118,6 +1163,8 @@ Data_Get_Struct(data, type, sval) ::
   rb_integer_pack(value, words, numwords, wordsize, nails, flags), rb_integer_unpack(words, numwords, wordsize, nails, flags)
   NUM2DBL(value)
   rb_float_new(f)
+  RSTRING_LEN(str)
+  RSTRING_PTR(str)
   StringValue(value)
   StringValuePtr(value)
   StringValueCStr(value)
@@ -1261,6 +1308,25 @@ rb_scan_args(int argc, VALUE *argv, const char *fmt, ...) ::
   返り値は与えられた引数の数です．オプションハッシュおよびイ
   テレータブロックは数えません．
 
+int rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, VALUE *values)
+
+  キーワードで指定された値をtableにしたがって取り出します．
+  tableの最初のrequired個のIDは必須キーワードを表し，続く
+  optional (optionalが負の場合は-optional-1) 個のIDは省略可能
+  キーワードです．必須キーワードがkeyword_hash中にない場合，
+  "missing keyword"ArgumentErrorが発生します．省略可能キーワー
+  ドがない場合は，values中の対応する要素は変更されません．
+  keyword_hashに使用されない要素がある場合は，optionalが負なら
+  新しいHashとして省略可能引数の次に保存されますが，そうでなけ
+  れば"unknown keyword"ArgumentErrorが発生します．
+
+VALUE rb_extract_keywords(VALUE *original_hash)
+
+  original_hashで参照されるHashオブジェクトから，Symbolである
+  キーとその値を新しいHashに取り出します．original_hashの指す
+  先には，元のHashがSymbol以外のキーを含んでいた場合はそれらが
+  コピーされた別の新しいHash，そうでなければ0が保存されます．
+
 == Rubyメソッド呼び出し
 
 VALUE rb_funcall(VALUE recv, ID mid, int narg, ...) ::
@@ -1404,8 +1470,9 @@ void rb_bug(const char *fmt, ...) ::
   状況の時呼ぶ．インタープリタはコアダンプし直ちに終了する．
   例外処理は一切行なわれない．
 
-注意: %iはObject#to_s('+'フラグが指定されているときはObject#inspect)を
-使ったVALUEの出力に使用されているため，整数には%dを使用すること．
+注意: "%"PRIsVALUEがObject#to_s('+'フラグが指定されていると
+きはObject#inspect)を使ったVALUEの出力に利用できる．これは
+"%i"と衝突するため，整数には"%d"を使用すること．
 
 == Rubyの初期化・実行
 
@@ -1416,13 +1483,16 @@ void ruby_init() ::
 
   Rubyインタプリタの初期化を行なう．
 
-void ruby_options(int argc, char **argv) ::
+void *ruby_options(int argc, char **argv) ::
 
-  Rubyインタプリタのコマンドライン引数の処理を行なう．
+  Rubyインタプリタのコマンドライン引数の処理を行ない，
+  Rubyのソースコードをコンパイルする．
+  コンパイルされたソースへのポインタ，もしくは特殊値を返す.
 
-void ruby_run() ::
+int ruby_run_node(void *n) ::
 
-  Rubyインタプリタを実行する．
+  コンパイルされたコードを実行する．
+  実行に成功した場合はEXIT_SUCCESSを，エラーが起こったときはそれ以外を返す．
 
 void ruby_script(char *name) ::
 
@@ -1624,24 +1694,24 @@ pkg_config(pkg, option=nil) ::
   2. {pkg}-config {option}
   3. pkg-config {option} {pkg}
 
-  optionが指定された場合は、上記の配列の代わりにそのオプションを
+  optionが指定された場合は，上記の配列の代わりにそのオプションを
   指定して得られた出力をstripしたものを返す．
 
 = Appendix D. 世代別GC
 
-Ruby 2.1から世代別GCに対応しました。我々はこれをRGenGCと呼んでいます。
-RGenGCは、過去の拡張ライブラリに（ほぼ）互換性を保つように開発されている
-ため、拡張ライブラリ側の対応はほぼ不要です。
+Ruby 2.1から世代別GCに対応しました．我々はこれをRGenGCと呼んでいます．
+RGenGCは，過去の拡張ライブラリに（ほぼ）互換性を保つように開発されている
+ため，拡張ライブラリ側の対応はほぼ不要です．
 
-ただし、対応をすることで性能を向上することができる可能性があります。もし
-拡張ライブラリに高い性能が必要である場合は対応を検討して下さい。
+ただし，対応をすることで性能を向上することができる可能性があります．もし
+拡張ライブラリに高い性能が必要である場合は対応を検討して下さい．
 
 とくにRARRAY_PTR()/RHASH_TBL()のようなマクロを用いてポインタに直接アクセ
-スするようなコードは書かないようにして下さい。代わりに、rb_ary_aref(),
-rb_ary_store() などの、適切な API 関数を利用するようにして下さい。
+スするようなコードは書かないようにして下さい．代わりに，rb_ary_aref(),
+rb_ary_store() などの，適切な API 関数を利用するようにして下さい．
 
-そのほか、対応についての詳細は README.EXT の「Appendix D. Generational
-GC」を参照して下さい。
+そのほか，対応についての詳細は README.EXT の「Appendix D. Generational
+GC」を参照して下さい．
 
 /*
  * Local variables:
diff --git a/README.ja.md b/README.ja.md
index 1f887435bc..1e9bae7e0c 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -1,10 +1,10 @@
 # Rubyとは
 
-Rubyはシンプルかつ強力なオブジェクト指向スクリプト言語です． Rubyは最初から純粋なオブジェクト指向言語として設計されていま
-すから，オブジェクト指向プログラミングを手軽に行う事が出来ま す．もちろん通常の手続き型のプログラミングも可能です．
+Rubyはシンプルかつ強力なオブジェクト指向スクリプト言語です． Rubyは純粋なオブジェクト指向言語として設計されているので，
+オブジェクト指向プログラミングを手軽に行う事が出来ます．もちろん普通の手続き型のプログラミングも可能です．
 
-Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい強力 です．さらにシンプルな文法と，例外処理やイテレータなどの機構
-によって，より分かりやすいプログラミングが出来ます．
+Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい強力です．さらにシンプルな文法と，
+例外処理やイテレータなどの機構によって，より分かりやすいプログラミングが出来ます．
 
 ## Rubyの特長
 
@@ -16,7 +16,7 @@ Rubyはテキスト処理関係の能力などに優れ，Perlと同じくらい
 *   イテレータとクロージャ
 *   ガーベージコレクタ
 *   ダイナミックローディング (アーキテクチャによる)
-*   移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で 動くだけでなく，Windows， Mac OS
+*   移植性が高い．多くのUnix-like/POSIX互換プラットフォーム上で動くだけでなく，Windows， Mac OS
     X，BeOSなどの上でも動く cf.
     http://bugs.ruby-lang.org/projects/ruby-trunk/wiki/SupportedPlatformsJa
 
@@ -65,14 +65,14 @@ mailto:ruby-list-request@ruby-lang.org
 
 と書いて送って下さい。
 
-Ruby開発者向けメーリングリストもあります。こちらではrubyのバ グ、将来の仕様拡張など実装上の問題について議論されています。 参加希望の方は
+Ruby開発者向けメーリングリストもあります。こちらではrubyのバグ、将来の仕様拡張など実装上の問題について議論されています。 参加希望の方は
 
 mailto:ruby-dev-request@ruby-lang.org
 
 までruby-listと同様の方法でメールしてください。
 
-Ruby拡張モジュールについて話し合うruby-extメーリングリストと 数学関係の話題について話し合うruby-mathメーリングリストと
-英語で話し合うruby-talkメーリングリストもあります。参加方法 はどれも同じです。
+Ruby拡張モジュールについて話し合うruby-extメーリングリストと数学関係の話題について話し合うruby-mathメーリングリストと
+英語でrubyについて話し合うruby-talkメーリングリストもあります。参加方法はどれも同じです。
 
 ## コンパイル・インストール
 
@@ -83,25 +83,25 @@ Ruby拡張モジュールについて話し合うruby-extメーリングリス�
 
 2.  `configure` を実行して `Makefile` などを生成する
 
-    環境によってはデフォルトのCコンパイラ用オプションが付き ます． `configure` オプションで `optflags=..`
-    `warnflags=..` 等 で上書きできます．
+    環境によってはデフォルトのCコンパイラ用オプションが付きます． `configure` オプションで `optflags=..`
+    `warnflags=..` 等で上書きできます．
 
 3.  (必要ならば)`defines.h` を編集する
 
     多分，必要無いと思います．
 
-4.  (必要ならば)`ext/Setup` に静的にリンクする拡張モジュールを 指定する
+4.  (必要ならば)`ext/Setup` に静的にリンクする拡張モジュールを指定する
 
     `ext/Setup` に記述したモジュールは静的にリンクされます．
 
-    ダイナミックローディングをサポートしていないアーキテク チャでは `Setup` の1行目の「`option nodynamic`」という行のコ
-    メントを外す必要があります．また，このアーキテクチャで 拡張モジュールを利用するためには，あらかじめ静的にリン クしておく必要があります．
+    ダイナミックローディングをサポートしていないアーキテクチャでは `Setup` の1行目の「`option nodynamic`」という行のコ
+    メントを外す必要があります．また，このアーキテクチャで拡張モジュールを利用するためには，あらかじめ静的にリンクをしておく必要があります．
 
 5.  `make` を実行してコンパイルする
 
 6.  `make check`でテストを行う．
 
-    「`check succeeded`」と表示されれば成功です．ただしテスト に成功しても完璧だと保証されている訳ではありません．
+    「`check succeeded`」と表示されれば成功です．ただしテストに成功しても完璧だと保証されている訳ではありません．
 
 7.  `make install`
 
@@ -131,27 +131,26 @@ Ruby拡張モジュールについて話し合うruby-extメーリングリス�
     RubyのAPIバージョンが'*x.y.z*'であれば，`${MAJOR}`は
     '*x*'で，`${MINOR}`は'*y*'，`${TEENY}`は'*z*'です．
 
-    **注意**: APIバージョンの `teeny` は，Rubyプログラムのバージョ ンとは異なることがあります．
+    **注意**: APIバージョンの `teeny` は，Rubyプログラムのバージョンとは異なることがあります．
 
     `root` で作業する必要があるかもしれません．
 
 
-もし，コンパイル時にエラーが発生した場合にはエラーのログとマ シン，OSの種類を含むできるだけ詳しいレポートを作者に送ってく
-ださると他の方のためにもなります．
+もし，コンパイル時にエラーが発生した場合にはエラーのログとマシン，OSの種類を含むできるだけ詳しいレポートを作者に送って下さると他の方のためにもなります．
 
 ## 移植
 
-UNIXであれば `configure` がほとんどの差異を吸収してくれるはずで すが，思わぬ見落としがあった場合(あるに違いない)，作者にその
-ことをレポートすれば，解決できるかも知れません．
+UNIXであれば `configure` がほとんどの差異を吸収してくれるはずですが，思わぬ見落としがあった場合(ある事が多い)，作者にその
+ことを報告すれば，解決できる可能性があります．
 
 アーキテクチャにもっとも依存するのはGC部です．RubyのGCは対象
-のアーキテクチャが`setjmp()`または`getcontext()`によって全てのレ ジスタを `jmp_buf` や `ucontext_t`
+のアーキテクチャが`setjmp()`または`getcontext()`によって全てのレジスタを `jmp_buf` や `ucontext_t`
 に格納することと， `jmp_buf` や `ucontext_t` とスタックが32bitアラインメントされていることを仮定
 しています．特に前者が成立しない場合の対応は非常に困難でしょう． 後者の解決は比較的簡単で， `gc.c` でスタックをマークしている
-部分にアラインメントのバイト数だけずらしてマークするコードを 追加するだけで済みます．`defined(_\*mc68000*\_)`で括られてい
+部分にアラインメントのバイト数だけずらしてマークするコードを追加するだけで済みます．`defined(_\*mc68000*\_)`で括られてい
 る部分を参考にしてください．
 
-レジスタウィンドウを持つCPUでは，レジスタウィンドウをスタッ クにフラッシュするアセンブラコードを追加する必要があるかも知 れません．
+レジスタウィンドウを持つCPUでは，レジスタウィンドウをスタックにフラッシュするアセンブラコードを追加する必要があるかもしれません．
 
 ## 配布条件
 
@@ -161,4 +160,4 @@ UNIXであれば `configure` がほとんどの差異を吸収してくれるは
 
 コメント，バグレポートその他は mailto:matz@ruby-lang.org まで．
 ---
-created at: Thu Aug  3 11:57:36 JST 1995 -- Local variables: mode: rdoc end:
+created at: Thu Aug  3 11:57:36 JST 1995
diff --git a/README.md b/README.md
index 104314bee8..c6498a8cca 100644
--- a/README.md
+++ b/README.md
@@ -87,7 +87,7 @@ This is what you need to do to compile and install Ruby:
     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
+    architectures which do not allow dynamic loading), remove comment mark
     from the line "`#option nodynamic`" in `ext/Setup`.
 
     Usually this step will not be needed.
@@ -159,5 +159,3 @@ Ruby was originally designed and developed by Yukihiro Matsumoto (Matz) in
 1995.
 
 <mailto:matz@ruby-lang.org>
-
--- Local variables: mode: rdoc end:
diff --git a/addr2line.c b/addr2line.c
index f936694724..c8faf48d62 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -55,11 +55,8 @@ void *alloca();
 # endif	/* HAVE_ALLOCA_H */
 #endif /* __GNUC__ */
 
-#ifdef HAVE_DL_ITERATE_PHDR
-# ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
-# endif
-# include <link.h>
+#ifdef HAVE_DLADDR
+# include <dlfcn.h>
 #endif
 
 #define DW_LNS_copy                     0x01
@@ -88,6 +85,13 @@ void *alloca();
 #  define ElfW(x) Elf32##_##x
 # endif
 #endif
+#ifndef ELF_ST_TYPE
+# if SIZEOF_VOIDP == 8
+#  define ELF_ST_TYPE ELF64_ST_TYPE
+# else
+#  define ELF_ST_TYPE ELF32_ST_TYPE
+# endif
+#endif
 #ifndef PATH_MAX
 #define PATH_MAX 4096
 #endif
@@ -97,13 +101,22 @@ int kprintf(const char *fmt, ...);
 typedef struct {
     const char *dirname;
     const char *filename;
+    const char *path; /* object path */
     int line;
 
+    uintptr_t base_addr;
+    uintptr_t saddr;
+    const char *sname; /* function name */
+} line_info_t;
+typedef struct obj_info obj_info_t;
+struct obj_info {
+    const char *path; /* object path */
     int fd;
     void *mapped;
     size_t mapped_size;
-    unsigned long base_addr;
-} line_info_t;
+    uintptr_t base_addr;
+    obj_info_t *next;
+};
 
 /* Avoid consuming stack as this module may be used from signal handler */
 static char binary_filename[PATH_MAX];
@@ -196,34 +209,15 @@ fill_filename(int file, char *include_directories, char *filenames,
     }
 }
 
-static int
-get_path_from_symbol(const char *symbol, const char **p, size_t *len)
-{
-    if (symbol[0] == '0') {
-	/* libexecinfo */
-	*p   = strchr(symbol, '/');
-	if (*p == NULL) return 0;
-	*len = strlen(*p);
-    }
-    else {
-	/* glibc */
-	const char *q;
-	*p   = symbol;
-	q   = strchr(symbol, '(');
-	if (q == NULL) return 0;
-	*len = q - symbol;
-    }
-    return 1;
-}
-
 static void
-fill_line(int num_traces, void **traces,
-	  unsigned long addr, int file, int line,
-	  char *include_directories, char *filenames, line_info_t *lines)
+fill_line(int num_traces, void **traces, uintptr_t addr, int file, int line,
+	  char *include_directories, char *filenames,
+	  obj_info_t *obj, line_info_t *lines, int offset)
 {
     int i;
-    for (i = 0; i < num_traces; i++) {
-	unsigned long a = (unsigned long)traces[i] - lines[i].base_addr;
+    addr += obj->base_addr;
+    for (i = offset; i < num_traces; i++) {
+	uintptr_t a = (uintptr_t)traces[i];
 	/* We assume one line code doesn't result >100 bytes of native code.
        We may want more reliable way eventually... */
 	if (addr < a && a < addr + 100) {
@@ -234,8 +228,8 @@ fill_line(int num_traces, void **traces,
 }
 
 static void
-parse_debug_line_cu(int num_traces, void **traces,
-		    char **debug_line, line_info_t *lines)
+parse_debug_line_cu(int num_traces, void **traces, char **debug_line,
+		obj_info_t *obj, line_info_t *lines, int offset)
 {
     char *p, *cu_end, *cu_start, *include_directories, *filenames;
     unsigned long unit_length;
@@ -281,7 +275,7 @@ parse_debug_line_cu(int num_traces, void **traces,
     is_stmt = default_is_stmt = *(unsigned char *)p;
     p++;
 
-    line_base = *(char *)p;
+    line_base = *(signed char *)p;
     p++;
 
     line_range = *(unsigned char *)p;
@@ -309,7 +303,8 @@ parse_debug_line_cu(int num_traces, void **traces,
 #define FILL_LINE()						    \
     do {							    \
 	fill_line(num_traces, traces, addr, file, line,		    \
-		  include_directories, filenames, lines);	    \
+		  include_directories, filenames,		    \
+		  obj, lines, offset);				    \
 	/*basic_block = prologue_end = epilogue_begin = 0;*/	    \
     } while (0)
 
@@ -408,11 +403,12 @@ parse_debug_line_cu(int num_traces, void **traces,
 
 static void
 parse_debug_line(int num_traces, void **traces,
-		 char *debug_line, unsigned long size, line_info_t *lines)
+		 char *debug_line, unsigned long size,
+		 obj_info_t *obj, line_info_t *lines, int offset)
 {
     char *debug_line_end = debug_line + size;
     while (debug_line < debug_line_end) {
-	parse_debug_line_cu(num_traces, traces, &debug_line, lines);
+	parse_debug_line_cu(num_traces, traces, &debug_line, obj, lines, offset);
     }
     if (debug_line != debug_line_end) {
 	kprintf("Unexpected size of .debug_line in %s\n",
@@ -421,19 +417,27 @@ parse_debug_line(int num_traces, void **traces,
 }
 
 /* read file and fill lines */
+static uintptr_t
+fill_lines(int num_traces, void **traces, int check_debuglink,
+	   obj_info_t **objp, line_info_t *lines, int offset);
+
 static void
-fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
-	   line_info_t *current_line, line_info_t *lines);
+append_obj(obj_info_t **objp) {
+    obj_info_t *newobj = calloc(1, sizeof(obj_info_t));
+    if (*objp) (*objp)->next = newobj;
+    *objp = newobj;
+}
 
 static void
-follow_debuglink(char *debuglink, int num_traces, void **traces, char **syms,
-		 line_info_t *current_line, line_info_t *lines)
+follow_debuglink(char *debuglink, int num_traces, void **traces,
+		 obj_info_t **objp, line_info_t *lines, int offset)
 {
     /* Ideally we should check 4 paths to follow gnu_debuglink,
        but we handle only one case for now as this format is used
        by some linux distributions. See GDB's info for detail. */
     static const char global_debug_dir[] = "/usr/lib/debug";
     char *p, *subdir;
+    obj_info_t *o1 = *objp, *o2;
 
     p = strrchr(binary_filename, '/');
     if (!p) {
@@ -444,22 +448,22 @@ follow_debuglink(char *debuglink, int num_traces, void **traces, char **syms,
     subdir = (char *)alloca(strlen(binary_filename) + 1);
     strcpy(subdir, binary_filename);
     strcpy(binary_filename, global_debug_dir);
-    strncat(binary_filename, subdir,
-	    PATH_MAX - strlen(binary_filename) - 1);
-    strncat(binary_filename, debuglink,
-	    PATH_MAX - strlen(binary_filename) - 1);
-
-    munmap(current_line->mapped, current_line->mapped_size);
-    close(current_line->fd);
-    fill_lines(num_traces, traces, syms, 0, current_line, lines);
+    strlcat(binary_filename, subdir, PATH_MAX);
+    strlcat(binary_filename, debuglink, PATH_MAX);
+
+    append_obj(objp);
+    o2 = *objp;
+    o2->base_addr = o1->base_addr;
+    o2->path = o1->path;
+    fill_lines(num_traces, traces, 0, objp, lines, offset);
 }
 
 /* read file and fill lines */
-static void
-fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
-	   line_info_t *current_line, line_info_t *lines)
+static uintptr_t
+fill_lines(int num_traces, void **traces, int check_debuglink,
+	   obj_info_t **objp, line_info_t *lines, int offset)
 {
-    int i;
+    int i, j;
     char *shstr;
     char *section_name;
     ElfW(Ehdr) *ehdr;
@@ -468,23 +472,27 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
     int fd;
     off_t filesize;
     char *file;
+    ElfW(Shdr) *symtab_shdr = NULL, *strtab_shdr = NULL;
+    ElfW(Shdr) *dynsym_shdr = NULL, *dynstr_shdr = NULL;
+    obj_info_t *obj = *objp;
+    uintptr_t dladdr_fbase = 0;
 
     fd = open(binary_filename, O_RDONLY);
     if (fd < 0) {
-	return;
+	goto fail;
     }
     filesize = lseek(fd, 0, SEEK_END);
     if (filesize < 0) {
 	int e = errno;
 	close(fd);
 	kprintf("lseek: %s\n", strerror(e));
-	return;
+	goto fail;
     }
 #if SIZEOF_OFF_T > SIZEOF_SIZE_T
     if (filesize > (off_t)SIZE_MAX) {
 	close(fd);
 	kprintf("Too large file %s\n", binary_filename);
-	return;
+	goto fail;
     }
 #endif
     lseek(fd, 0, SEEK_SET);
@@ -494,7 +502,7 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
 	int e = errno;
 	close(fd);
 	kprintf("mmap: %s\n", strerror(e));
-	return;
+	goto fail;
     }
 
     ehdr = (ElfW(Ehdr) *)file;
@@ -504,21 +512,12 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
 	 * it match non-elf file.
 	 */
 	close(fd);
-	return;
+	goto fail;
     }
 
-    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;
-	}
-    }
+    obj->fd = fd;
+    obj->mapped = file;
+    obj->mapped_size = (size_t)filesize;
 
     shdr = (ElfW(Shdr) *)(file + ehdr->e_shoff);
 
@@ -527,11 +526,88 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
 
     for (i = 0; i < ehdr->e_shnum; i++) {
 	section_name = shstr + shdr[i].sh_name;
-	if (!strcmp(section_name, ".debug_line")) {
-	    debug_line_shdr = shdr + i;
+	switch (shdr[i].sh_type) {
+	  case SHT_STRTAB:
+	    if (!strcmp(section_name, ".strtab")) {
+		strtab_shdr = shdr + i;
+	    }
+	    else if (!strcmp(section_name, ".dynstr")) {
+		dynstr_shdr = shdr + i;
+	    }
+	    break;
+	  case SHT_SYMTAB:
+	    /* if (!strcmp(section_name, ".symtab")) */
+	    symtab_shdr = shdr + i;
+	    break;
+	  case SHT_DYNSYM:
+	    /* if (!strcmp(section_name, ".dynsym")) */
+	    dynsym_shdr = shdr + i;
 	    break;
-	} else if (!strcmp(section_name, ".gnu_debuglink")) {
-	    gnu_debuglink_shdr = shdr + i;
+	  case SHT_PROGBITS:
+	    if (!strcmp(section_name, ".debug_line")) {
+		debug_line_shdr = shdr + i;
+	    }
+	    else if (!strcmp(section_name, ".gnu_debuglink")) {
+		gnu_debuglink_shdr = shdr + i;
+	    }
+	    break;
+	}
+    }
+
+    if (offset == -1) {
+	/* main executable */
+	offset = 0;
+	if (dynsym_shdr && dynstr_shdr) {
+	    char *strtab = file + dynstr_shdr->sh_offset;
+	    ElfW(Sym) *symtab = (ElfW(Sym) *)(file + dynsym_shdr->sh_offset);
+	    int symtab_count = (int)(dynsym_shdr->sh_size / sizeof(ElfW(Sym)));
+	    for (j = 0; j < symtab_count; j++) {
+		ElfW(Sym) *sym = &symtab[j];
+		Dl_info info;
+		void *h, *s;
+		if (ELF_ST_TYPE(sym->st_info) != STT_FUNC || sym->st_size <= 0) continue;
+		h = dlopen(NULL, RTLD_NOW|RTLD_LOCAL);
+		if (!h) continue;
+		s = dlsym(h, strtab + sym->st_name);
+		if (!s) continue;
+		if (dladdr(s, &info)) {
+		    dladdr_fbase = (uintptr_t)info.dli_fbase;
+		    break;
+		}
+	    }
+	    if (ehdr->e_type == ET_EXEC) {
+		obj->base_addr = 0;
+	    }
+	    else {
+		/* PIE (position-independent executable) */
+		obj->base_addr = dladdr_fbase;
+	    }
+	}
+    }
+
+    if (!symtab_shdr) {
+	symtab_shdr = dynsym_shdr;
+	strtab_shdr = dynstr_shdr;
+    }
+
+    if (symtab_shdr && strtab_shdr) {
+	char *strtab = file + strtab_shdr->sh_offset;
+	ElfW(Sym) *symtab = (ElfW(Sym) *)(file + symtab_shdr->sh_offset);
+	int symtab_count = (int)(symtab_shdr->sh_size / sizeof(ElfW(Sym)));
+	for (j = 0; j < symtab_count; j++) {
+	    ElfW(Sym) *sym = &symtab[j];
+	    uintptr_t saddr = (uintptr_t)sym->st_value + obj->base_addr;
+	    if (ELF_ST_TYPE(sym->st_info) != STT_FUNC || sym->st_size <= 0) continue;
+	    for (i = offset; i < num_traces; i++) {
+		uintptr_t d = (uintptr_t)traces[i] - saddr;
+		if (lines[i].line > 0 || d <= 0 || d > (uintptr_t)sym->st_size)
+		    continue;
+		/* fill symbol name and addr from .symtab */
+		lines[i].sname = strtab + sym->st_name;
+		lines[i].saddr = saddr;
+		lines[i].path  = obj->path;
+		lines[i].base_addr = obj->base_addr;
+	    }
 	}
     }
 
@@ -540,111 +616,161 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink,
 	   let's check .gnu_debuglink section instead. */
 	if (gnu_debuglink_shdr && check_debuglink) {
 	    follow_debuglink(file + gnu_debuglink_shdr->sh_offset,
-			     num_traces, traces, syms,
-			     current_line, lines);
+			     num_traces, traces,
+			     objp, lines, offset);
 	}
-	return;
+	goto finish;
     }
 
     parse_debug_line(num_traces, traces,
 		     file + debug_line_shdr->sh_offset,
 		     debug_line_shdr->sh_size,
-		     lines);
+		     obj, lines, offset);
+finish:
+    return dladdr_fbase;
+fail:
+    return (uintptr_t)-1;
 }
 
-#ifdef HAVE_DL_ITERATE_PHDR
-
-typedef struct {
-    int num_traces;
-    char **syms;
-    line_info_t *lines;
-} fill_base_addr_state_t;
-
-static int
-fill_base_addr(struct dl_phdr_info *info, size_t size, void *data)
+#define HAVE_MAIN_EXE_PATH
+#if defined(__FreeBSD__)
+# include <sys/sysctl.h>
+#endif
+/* ssize_t main_exe_path(void)
+ *
+ * store the path of the main executable to `binary_filename`,
+ * and returns strlen(binary_filename).
+ * it is NUL terminated.
+ */
+#if defined(__linux__)
+ssize_t
+main_exe_path(void)
 {
-    int i;
-    fill_base_addr_state_t *st = (fill_base_addr_state_t *)data;
-    for (i = 0; i < st->num_traces; i++) {
-	const char *path;
-	size_t len;
-	size_t name_len = strlen(info->dlpi_name);
-
-	if (get_path_from_symbol(st->syms[i], &path, &len) &&
-		(len == name_len || (len > name_len && path[len-name_len-1] == '/')) &&
-		!strncmp(path+len-name_len, info->dlpi_name, name_len)) {
-	    st->lines[i].base_addr = info->dlpi_addr;
-	}
+# define PROC_SELF_EXE "/proc/self/exe"
+    ssize_t len = readlink(PROC_SELF_EXE, binary_filename, PATH_MAX);
+    binary_filename[len] = 0;
+    return len;
+}
+#elif defined(__FreeBSD__)
+ssize_t
+main_exe_path(void)
+{
+    int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
+    size_t len = PATH_MAX;
+    int err = sysctl(mib, 4, binary_filename, &len, NULL, 0);
+    if (err) {
+	kprintf("Can't get the path of ruby");
+	return -1;
     }
-    return 0;
+    len--; /* sysctl sets strlen+1 */
+    return len;
 }
-
-#endif /* HAVE_DL_ITERATE_PHDR */
+#else
+#undef HAVE_MAIN_EXE_PATH
+#endif
 
 void
-rb_dump_backtrace_with_lines(int num_traces, void **trace, char **syms)
+rb_dump_backtrace_with_lines(int num_traces, void **traces)
 {
     int i;
     /* async-signal unsafe */
-    line_info_t *lines = (line_info_t *)calloc(num_traces,
-					       sizeof(line_info_t));
-
-    /* Note that line info of shared objects might not be shown
-       if we don't have dl_iterate_phdr */
-#ifdef HAVE_DL_ITERATE_PHDR
-    fill_base_addr_state_t fill_base_addr_state;
-
-    fill_base_addr_state.num_traces = num_traces;
-    fill_base_addr_state.syms = syms;
-    fill_base_addr_state.lines = lines;
-    /* maybe async-signal unsafe */
-    dl_iterate_phdr(fill_base_addr, &fill_base_addr_state);
-#endif /* HAVE_DL_ITERATE_PHDR */
-
-    for (i = 0; i < num_traces; i++) {
-	const char *path;
-	size_t len;
-	if (lines[i].line) {
-	    continue;
-	}
-
-	if (!get_path_from_symbol(syms[i], &path, &len)) {
-	    continue;
+    line_info_t *lines = (line_info_t *)calloc(num_traces, sizeof(line_info_t));
+    obj_info_t *obj = NULL;
+    /* 2 is NULL + main executable */
+    void **dladdr_fbases = (void **)calloc(num_traces+2, sizeof(void *));
+#ifdef HAVE_MAIN_EXE_PATH
+    char *main_path = NULL; /* used on printing backtrace */
+    ssize_t len;
+    if ((len = main_exe_path()) > 0) {
+	main_path = (char *)alloca(len + 1);
+	if (main_path) {
+	    uintptr_t addr;
+	    memcpy(main_path, binary_filename, len+1);
+	    append_obj(&obj);
+	    obj->path = main_path;
+	    addr = fill_lines(num_traces, traces, 1, &obj, lines, -1);
+	    if (addr != (uintptr_t)-1) {
+		dladdr_fbases[0] = (void *)addr;
+	    }
 	}
-
-	strncpy(binary_filename, path, len);
-	binary_filename[len] = '\0';
-
-	fill_lines(num_traces, trace, syms, 1, &lines[i], lines);
     }
+#endif
 
+    /* fill source lines by reading dwarf */
     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);
+	Dl_info info;
+	if (lines[i].line) continue;
+	if (dladdr(traces[i], &info)) {
+	    const char *path;
+	    void **p;
+
+	    /* skip symbols which is in already checked objects */
+	    /* if the binary is strip-ed, this may effect */
+	    for (p=dladdr_fbases; *p; p++) {
+		if (*p == info.dli_fbase) {
+		    lines[i].path = info.dli_fname;
+		    lines[i].sname = info.dli_sname;
+		    goto next_line;
 		}
-		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]);
+	    *p = info.dli_fbase;
+
+	    append_obj(&obj);
+	    obj->base_addr = (uintptr_t)info.dli_fbase;
+	    path = info.dli_fname;
+	    obj->path = path;
+	    lines[i].path = path;
+	    strcpy(binary_filename, path);
+	    fill_lines(num_traces, traces, 1, &obj, lines, i);
 	}
+next_line:
+	continue;
     }
 
+    /* output */
     for (i = 0; i < num_traces; i++) {
 	line_info_t *line = &lines[i];
-	if (line->fd) {
-	    munmap(line->mapped, line->mapped_size);
-	    close(line->fd);
+	uintptr_t addr = (uintptr_t)traces[i];
+	uintptr_t d = addr - line->saddr;
+	if (!line->path) {
+	    kprintf("[0x%lx]\n", addr);
+	}
+	else if (!line->saddr || !line->sname) {
+	    kprintf("%s [0x%lx]\n", line->path, addr);
+	}
+	else if (line->line <= 0) {
+	    kprintf("%s(%s+0x%lx) [0x%lx]\n", line->path, line->sname,
+		    d, addr);
+	}
+	else if (!line->filename) {
+	    kprintf("%s(%s+0x%lx) [0x%lx] ???:%d\n", line->path, line->sname,
+		    d, addr, line->line);
+	}
+	else if (line->dirname && line->dirname[0]) {
+	    kprintf("%s(%s+0x%lx) [0x%lx] %s/%s:%d\n", line->path, line->sname,
+		    d, addr, line->dirname, line->filename, line->line);
+	}
+	else {
+	    kprintf("%s(%s+0x%lx) [0x%lx] %s:%d\n", line->path, line->sname,
+		    d, addr, line->filename, line->line);
+	}
+	/* FreeBSD's backtrace may show _start and so on */
+	if (line->sname && strcmp("main", line->sname) == 0)
+	    break;
+    }
+
+    /* free */
+    while (obj) {
+	obj_info_t *o = obj;
+	obj = o->next;
+	if (o->fd) {
+	    munmap(o->mapped, o->mapped_size);
+	    close(o->fd);
 	}
+	free(o);
     }
     free(lines);
+    free(dladdr_fbases);
 }
 
 /* From FreeBSD's lib/libstand/printf.c */
diff --git a/addr2line.h b/addr2line.h
index 3782d89e07..d99f010934 100644
--- a/addr2line.h
+++ b/addr2line.h
@@ -14,7 +14,7 @@
 #ifdef USE_ELF
 
 void
-rb_dump_backtrace_with_lines(int num_traces, void **traces, char **syms);
+rb_dump_backtrace_with_lines(int num_traces, void **traces);
 
 #endif /* USE_ELF */
 
diff --git a/array.c b/array.c
index 5cf995c303..28e43c68c0 100644
--- a/array.c
+++ b/array.c
@@ -11,11 +11,9 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/util.h"
 #include "ruby/st.h"
-#include "ruby/encoding.h"
-#include "internal.h"
 #include "probes.h"
 #include "id.h"
 
@@ -31,70 +29,6 @@ static ID id_cmp, id_div, id_power;
 #define ARY_DEFAULT_SIZE 16
 #define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE))
 
-void
-rb_mem_clear(register VALUE *mem, register long size)
-{
-    while (size--) {
-	*mem++ = Qnil;
-    }
-}
-
-static void
-ary_mem_clear(VALUE ary, long beg, long size)
-{
-    RARRAY_PTR_USE(ary, ptr, {
-	rb_mem_clear(ptr + beg, size);
-    });
-}
-
-static inline void
-memfill(register VALUE *mem, register long size, register VALUE val)
-{
-    while (size--) {
-	*mem++ = val;
-    }
-}
-
-static void
-ary_memfill(VALUE ary, long beg, long size, VALUE val)
-{
-    RARRAY_PTR_USE(ary, ptr, {
-	memfill(ptr + beg, size, val);
-	RB_OBJ_WRITTEN(ary, Qundef, val);
-    });
-}
-
-static void
-ary_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++) {
-		    RB_OBJ_WRITE(ary, &ptr[i+beg], argv[i]);
-		}
-	    });
-	}
-    }
-    else {
-	RARRAY_PTR_USE(ary, ptr, {
-	    MEMCPY(ptr+beg, argv, VALUE, argc);
-	});
-    }
-#else
-    /* giveup write barrier (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)
@@ -195,6 +129,74 @@ ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv)
     FL_SET((ary), RARRAY_SHARED_ROOT_FLAG); \
 } while (0)
 
+#define ARY_SET(a, i, v) RARRAY_ASET((assert(!ARY_SHARED_P(a)), (a)), (i), (v))
+
+void
+rb_mem_clear(register VALUE *mem, register long size)
+{
+    while (size--) {
+	*mem++ = Qnil;
+    }
+}
+
+static void
+ary_mem_clear(VALUE ary, long beg, long size)
+{
+    RARRAY_PTR_USE(ary, ptr, {
+	rb_mem_clear(ptr + beg, size);
+    });
+}
+
+static inline void
+memfill(register VALUE *mem, register long size, register VALUE val)
+{
+    while (size--) {
+	*mem++ = val;
+    }
+}
+
+static void
+ary_memfill(VALUE ary, long beg, long size, VALUE val)
+{
+    RARRAY_PTR_USE(ary, ptr, {
+	memfill(ptr + beg, size, val);
+	RB_OBJ_WRITTEN(ary, Qundef, val);
+    });
+}
+
+static void
+ary_memcpy0(VALUE ary, long beg, long argc, const VALUE *argv, VALUE buff_owner_ary)
+{
+#if 1
+    assert(!ARY_SHARED_P(buff_owner_ary));
+
+    if (argc > (int)(128/sizeof(VALUE)) /* is magic number (cache line size) */) {
+	rb_gc_writebarrier_remember(buff_owner_ary);
+	RARRAY_PTR_USE(ary, ptr, {
+	    MEMCPY(ptr+beg, argv, VALUE, argc);
+	});
+    }
+    else {
+	int i;
+	RARRAY_PTR_USE(ary, ptr, {
+	    for (i=0; i<argc; i++) {
+		RB_OBJ_WRITE(buff_owner_ary, &ptr[i+beg], argv[i]);
+	    }
+	});
+    }
+#else
+    /* giveup write barrier (traditional way) */
+    RARRAY_PTR(buff_owner_ary);
+    MEMCPY(RARRAY_PTR(ary)+beg, argv, VALUE, argc);
+#endif
+}
+
+static void
+ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv)
+{
+    ary_memcpy0(ary, beg, argc, argv, ary);
+}
+
 static void
 ary_resize_capa(VALUE ary, long capacity)
 {
@@ -343,21 +345,28 @@ rb_ary_modify(VALUE ary)
             ARY_SET_CAPA(ary, len);
             ARY_SET_PTR(ary, ptr);
         }
+
+	rb_gc_writebarrier_remember(ary);
     }
 }
 
-static void
+static VALUE
 ary_ensure_room_for_push(VALUE ary, long add_len)
 {
-    long new_len = RARRAY_LEN(ary) + add_len;
+    long old_len = RARRAY_LEN(ary);
+    long new_len = old_len + add_len;
     long capa;
 
+    if (old_len > ARY_MAX_SIZE - add_len) {
+	rb_raise(rb_eIndexError, "index %ld too big", new_len);
+    }
     if (ARY_SHARED_P(ary)) {
 	if (new_len > RARRAY_EMBED_LEN_MAX) {
 	    VALUE shared = ARY_SHARED(ary);
 	    if (ARY_SHARED_OCCUPIED(shared)) {
 		if (RARRAY_CONST_PTR(ary) - RARRAY_CONST_PTR(shared) + new_len <= RARRAY_LEN(shared)) {
 		    rb_ary_modify_check(ary);
+		    return shared;
 		}
 		else {
 		    /* if array is shared, then it is likely it participate in push/shift pattern */
@@ -366,8 +375,8 @@ ary_ensure_room_for_push(VALUE ary, long add_len)
 		    if (new_len > capa - (capa >> 6)) {
 			ary_double_capa(ary, new_len);
 		    }
+		    return ary;
 		}
-		return;
 	    }
 	}
     }
@@ -376,6 +385,8 @@ ary_ensure_room_for_push(VALUE ary, long add_len)
     if (new_len > capa) {
 	ary_double_capa(ary, new_len);
     }
+
+    return ary;
 }
 
 /*
@@ -465,17 +476,14 @@ ary_new(VALUE klass, long capa)
 	RUBY_DTRACE_ARRAY_CREATE(capa, rb_sourcefile(), rb_sourceline());
     }
 
+    ary = ary_alloc(klass);
     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;
 }
@@ -493,7 +501,7 @@ rb_ary_new(void)
 }
 
 VALUE
-rb_ary_new_from_args(long n, ...)
+(rb_ary_new_from_args)(long n, ...)
 {
     va_list ar;
     VALUE ary;
@@ -503,7 +511,7 @@ rb_ary_new_from_args(long n, ...)
 
     va_start(ar, n);
     for (i=0; i<n; i++) {
-	RARRAY_ASET(ary, i, va_arg(ar, VALUE));
+	ARY_SET(ary, i, va_arg(ar, VALUE));
     }
     va_end(ar);
 
@@ -531,6 +539,15 @@ rb_ary_tmp_new(long capa)
     return ary_new(0, capa);
 }
 
+VALUE
+rb_ary_tmp_new_fill(long capa)
+{
+    VALUE ary = ary_new(0, capa);
+    ary_memfill(ary, 0, capa, Qnil);
+    ARY_SET_LEN(ary, capa);
+    return ary;
+}
+
 void
 rb_ary_free(VALUE ary)
 {
@@ -576,7 +593,7 @@ ary_make_shared(VALUE ary)
     }
     else {
 	long capa = ARY_CAPA(ary), len = RARRAY_LEN(ary);
-	NEWOBJ_OF(shared, struct RArray, 0, T_ARRAY); /* keep shared ary as non-WB-protected */
+	NEWOBJ_OF(shared, struct RArray, 0, T_ARRAY | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0));
         FL_UNSET_EMBED(shared);
 
 	ARY_SET_LEN((VALUE)shared, capa);
@@ -652,16 +669,16 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary)
 
 /*
  *  call-seq:
- *     Array.new(size=0, obj=nil)
+ *     Array.new(size=0, default=nil)
  *     Array.new(array)
  *     Array.new(size) {|index| block }
  *
  *  Returns a new array.
  *
  *  In the first form, 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+.
+ *  When a +size+ and an optional +default+ are sent, an array is created with
+ *  +size+ copies of +default+.  Take notice that all elements will reference the
+ *  same object +default+.
  *
  *  The second form creates a copy of the array passed as a parameter (the
  *  array is generated by calling to_ary on the parameter).
@@ -810,7 +827,7 @@ rb_ary_store(VALUE ary, long idx, VALUE val)
     if (idx >= len) {
 	ARY_SET_LEN(ary, idx + 1);
     }
-    RARRAY_ASET(ary, idx, val);
+    ARY_SET(ary, idx, val);
 }
 
 static VALUE
@@ -854,7 +871,7 @@ enum ary_take_pos_flags
 };
 
 static VALUE
-ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
+ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
 {
     VALUE nv;
     long n;
@@ -893,33 +910,20 @@ VALUE
 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)
-{
-    long idx = RARRAY_LEN(ary);
-
-    if (idx >= ARY_CAPA(ary)) {
-	ary_double_capa(ary, idx);
-    }
-    RARRAY_ASET(ary, idx, item);
+    VALUE target_ary = ary_ensure_room_for_push(ary, 1);
+    RARRAY_PTR_USE(ary, ptr, {
+	RB_OBJ_WRITE(target_ary, &ptr[idx], item);
+    });
     ARY_SET_LEN(ary, idx + 1);
     return ary;
 }
 
 VALUE
-rb_ary_cat(VALUE ary, const VALUE *ptr, long len)
+rb_ary_cat(VALUE ary, const VALUE *argv, long len)
 {
     long oldlen = RARRAY_LEN(ary);
-
-    ary_ensure_room_for_push(ary, len);
-    ary_memcpy(ary, oldlen, len, ptr);
+    VALUE target_ary = ary_ensure_room_for_push(ary, len);
+    ary_memcpy0(ary, oldlen, len, argv, target_ary);
     ARY_SET_LEN(ary, oldlen + len);
     return ary;
 }
@@ -1016,11 +1020,11 @@ rb_ary_shift(VALUE ary)
 	}
         assert(!ARY_EMBED_P(ary)); /* ARY_EMBED_LEN_MAX < ARY_DEFAULT_SIZE */
 
-	RARRAY_ASET(ary, 0, Qnil);
+	ARY_SET(ary, 0, Qnil);
 	ary_make_shared(ary);
     }
     else if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) {
-	RARRAY_ASET(ary, 0, Qnil);
+	RARRAY_PTR_USE(ary, ptr, ptr[0] = Qnil);
     }
     ARY_INCREASE_PTR(ary, 1);		/* shift ptr */
     ARY_INCREASE_LEN(ary, -1);
@@ -1080,7 +1084,7 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
     return result;
 }
 
-static void
+static VALUE
 ary_ensure_room_for_unshift(VALUE ary, int argc)
 {
     long len = RARRAY_LEN(ary);
@@ -1088,6 +1092,10 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
     long capa;
     const VALUE *head, *sharedp;
 
+    if (len > ARY_MAX_SIZE - argc) {
+	rb_raise(rb_eIndexError, "index %ld too big", new_len);
+    }
+
     if (ARY_SHARED_P(ary)) {
 	VALUE shared = ARY_SHARED(ary);
 	capa = RARRAY_LEN(shared);
@@ -1122,12 +1130,16 @@ ary_ensure_room_for_unshift(VALUE ary, int argc)
 	    head = sharedp + argc + room;
 	}
 	ARY_SET_PTR(ary, head - argc);
+	assert(ARY_SHARED_OCCUPIED(ARY_SHARED(ary)));
+	return ARY_SHARED(ary);
     }
     else {
 	/* sliding items */
 	RARRAY_PTR_USE(ary, ptr, {
 	    MEMMOVE(ptr + argc, ptr, VALUE, len);
 	});
+
+	return ary;
     }
 }
 
@@ -1147,14 +1159,15 @@ static VALUE
 rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
 {
     long len = RARRAY_LEN(ary);
+    VALUE target_ary;
 
     if (argc == 0) {
 	rb_ary_modify_check(ary);
 	return ary;
     }
 
-    ary_ensure_room_for_unshift(ary, argc);
-    ary_memcpy(ary, 0, argc, argv);
+    target_ary = ary_ensure_room_for_unshift(ary, argc);
+    ary_memcpy0(ary, 0, argc, argv, target_ary);
     ARY_SET_LEN(ary, len + argc);
     return ary;
 }
@@ -1241,7 +1254,7 @@ rb_ary_subseq(VALUE ary, long beg, long len)
  */
 
 VALUE
-rb_ary_aref(int argc, VALUE *argv, VALUE ary)
+rb_ary_aref(int argc, const VALUE *argv, VALUE ary)
 {
     VALUE arg;
     long beg, len;
@@ -1336,7 +1349,7 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary)
  */
 
 VALUE
-rb_ary_last(int argc, VALUE *argv, VALUE ary)
+rb_ary_last(int argc, const VALUE *argv, VALUE ary)
 {
     if (argc == 0) {
 	long len = RARRAY_LEN(ary);
@@ -1565,20 +1578,24 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
 	olen = RARRAY_LEN(ary);	/* ary may be resized in rpl.to_ary too */
     }
     if (beg >= olen) {
+	VALUE target_ary;
 	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 */
+	target_ary = ary_ensure_room_for_push(ary, rlen-len); /* len is 0 or negative */
 	len = beg + rlen;
 	ary_mem_clear(ary, olen, beg - olen);
 	if (rlen > 0) {
-	    ary_memcpy(ary, beg, rlen, RARRAY_CONST_PTR(rpl));
+	    ary_memcpy0(ary, beg, rlen, RARRAY_CONST_PTR(rpl), target_ary);
 	}
 	ARY_SET_LEN(ary, len);
     }
     else {
 	long alen;
 
+	if (olen - len > ARY_MAX_SIZE - rlen) {
+	    rb_raise(rb_eIndexError, "index %ld too big", olen + rlen - len);
+	}
 	rb_ary_modify(ary);
 	alen = olen + rlen - len;
 	if (alen >= ARY_CAPA(ary)) {
@@ -1595,6 +1612,7 @@ rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
 	    MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_CONST_PTR(rpl), VALUE, rlen);
 	}
     }
+    RB_GC_GUARD(rpl);
 }
 
 void
@@ -1730,7 +1748,9 @@ fixnum:
  *  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.
+ *  the last element. If a negative index is used, the given values will be
+ *  inserted after that element, so using an index of +-1+ will insert the
+ *  values at the end of the array.
  *
  *     a = %w{ a b c d }
  *     a.insert(2, 99)         #=> ["a", "b", 99, "c", "d"]
@@ -2724,7 +2744,7 @@ rb_ary_collect_bang(VALUE ary)
 }
 
 VALUE
-rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VALUE, long))
+rb_get_values_at(VALUE obj, long olen, int argc, const VALUE *argv, VALUE (*func) (VALUE, long))
 {
     VALUE result = rb_ary_new2(argc);
     long beg, len, i, j;
@@ -3079,7 +3099,7 @@ ary_reject(VALUE orig, VALUE result)
     for (i = 0; i < RARRAY_LEN(orig); i++) {
 	VALUE v = RARRAY_AREF(orig, i);
 	if (!RTEST(rb_yield(v))) {
-	    rb_ary_push_1(result, v);
+	    rb_ary_push(result, v);
 	}
     }
     return result;
@@ -3494,7 +3514,7 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
 	for (i=beg; i<end; i++) {
 	    v = rb_yield(LONG2NUM(i));
 	    if (i>=RARRAY_LEN(ary)) break;
-	    RARRAY_ASET(ary, i, v);
+	    ARY_SET(ary, i, v);
 	}
     }
     else {
@@ -3516,6 +3536,13 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary)
  *     c                         #=> [ "a", "b", "c", "d", "e", "f" ]
  *     a                         #=> [ "a", "b", "c" ]
  *
+ *  Note that
+ *     x += y
+ *  is the same as
+ *     x = x + y
+ *  This means that it produces a new array. As a consequence,
+ *  repeated use of <code>+=</code> on arrays can be quite inefficient.
+ *
  *  See also Array#concat.
  */
 
@@ -3747,7 +3774,7 @@ rb_ary_equal(VALUE ary1, VALUE ary2)
 {
     if (ary1 == ary2) return Qtrue;
     if (!RB_TYPE_P(ary2, T_ARRAY)) {
-	if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
+	if (!rb_respond_to(ary2, idTo_ary)) {
 	    return Qfalse;
 	}
 	return rb_equal(ary2, ary1);
@@ -3796,6 +3823,8 @@ rb_ary_eql(VALUE ary1, VALUE ary2)
  *
  *  Two arrays with the same content will have the same hash code (and will
  *  compare using #eql?).
+ *
+ *  See also Object#hash.
  */
 
 static VALUE
@@ -3831,9 +3860,15 @@ VALUE
 rb_ary_includes(VALUE ary, VALUE item)
 {
     long i;
+    VALUE e;
 
     for (i=0; i<RARRAY_LEN(ary); i++) {
-	if (rb_equal(RARRAY_AREF(ary, i), item)) {
+	e = RARRAY_AREF(ary, i);
+	switch (rb_equal_opt(e, item)) {
+	  case Qundef:
+	    if (rb_equal(e, item)) return Qtrue;
+	    break;
+	  case Qtrue:
 	    return Qtrue;
 	}
     }
@@ -3967,6 +4002,7 @@ ary_recycle_hash(VALUE hash)
 	RHASH(hash)->ntbl = 0;
 	st_free_table(tbl);
     }
+    RB_GC_GUARD(hash);
 }
 
 /*
@@ -3990,7 +4026,7 @@ static VALUE
 rb_ary_diff(VALUE ary1, VALUE ary2)
 {
     VALUE ary3;
-    volatile VALUE hash;
+    VALUE hash;
     long i;
 
     hash = ary_make_hash(to_ary(ary2));
@@ -4347,7 +4383,7 @@ flatten(VALUE ary, int level, int *modified)
 
     st_free_table(memo);
 
-    RBASIC_SET_CLASS(result, rb_class_of(ary));
+    RBASIC_SET_CLASS(result, rb_obj_class(ary));
     return result;
 }
 
@@ -4445,7 +4481,13 @@ static ID id_random;
  *
  *  Shuffles elements in +self+ in place.
  *
+ *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
+ *     a.shuffle!                #=> [2, 3, 1]
+ *     a                         #=> [2, 3, 1]
+ *
  *  The optional +rng+ argument will be used as the random number generator.
+ *
+ *     a.shuffle!(random: Random.new(1))  #=> [1, 3, 2]
  */
 
 static VALUE
@@ -4492,6 +4534,7 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
  *
  *     a = [ 1, 2, 3 ]           #=> [1, 2, 3]
  *     a.shuffle                 #=> [2, 3, 1]
+ *     a                         #=> [1, 2, 3]
  *
  *  The optional +rng+ argument will be used as the random number generator.
  *
@@ -4702,8 +4745,26 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
 #define tmpary_discard(a) (ary_discard(a), RBASIC_SET_CLASS_RAW(a, rb_cArray))
 
 /*
- * Recursively compute permutations of +r+ elements of the set
- * <code>[0..n-1]</code>.
+ * Build a ruby array of the corresponding values and yield it to the
+ * associated block.
+ * Return the class of +values+ for reentry check.
+ */
+static int
+yield_indexed_values(const VALUE values, const long r, const long *const p)
+{
+    const VALUE result = rb_ary_new2(r);
+    VALUE *const result_array = RARRAY_PTR(result);
+    const VALUE *const values_array = RARRAY_CONST_PTR(values);
+    long i;
+
+    for (i = 0; i < r; i++) result_array[i] = values_array[p[i]];
+    ARY_SET_LEN(result, r);
+    rb_yield(result);
+    return !RBASIC(values)->klass;
+}
+
+/*
+ * Compute permutations of +r+ elements of the set <code>[0..n-1]</code>.
  *
  * When we have a complete permutation of array indexes, copy the values
  * at those indexes into a new array and yield that array.
@@ -4711,38 +4772,40 @@ rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
  * n: the size of the set
  * r: the number of elements in each permutation
  * p: the array (of size r) that we're filling in
- * index: what index we're filling in now
  * used: an array of booleans: whether a given index is already used
  * values: the Ruby array that holds the actual values to permute
  */
 static void
-permute0(long n, long r, long *p, long index, char *used, VALUE values)
+permute0(const long n, const long r, long *const p, char *const used, const VALUE values)
 {
-    long i,j;
-    for (i = 0; i < n; i++) {
-	if (used[i] == 0) {
+    long i = 0, index = 0;
+
+    for (;;) {
+	const char *const unused = memchr(&used[i], 0, n-i);
+	if (!unused) {
+	    if (!index) break;
+	    i = p[--index];                /* pop index */
+	    used[i++] = 0;                 /* index unused */
+	}
+	else {
+	    i = unused - used;
 	    p[index] = i;
+	    used[i] = 1;                   /* mark index used */
+	    ++index;
 	    if (index < r-1) {             /* if not done yet */
-		used[i] = 1;               /* mark index used */
-		permute0(n, r, p, index+1, /* recurse */
-			 used, values);
-		used[i] = 0;               /* index unused */
+		p[index] = i = 0;
+		continue;
 	    }
-	    else {
-		/* We have a complete permutation of array indexes */
-		/* Build a ruby array of the corresponding values */
-		/* And yield it to the associated block */
-		VALUE result = rb_ary_new2(r);
-		VALUE *result_array = RARRAY_PTR(result);
-		const VALUE *values_array = RARRAY_PTR(values);
-
-		for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
-		ARY_SET_LEN(result, r);
-		rb_yield(result);
-		if (RBASIC(values)->klass) {
+	    for (i = 0; i < n; ++i) {
+		if (used[i]) continue;
+		p[index] = i;
+		if (!yield_indexed_values(values, r, p)) {
 		    rb_raise(rb_eRuntimeError, "permute reentered");
 		}
 	    }
+	    i = p[--index];                /* pop index */
+	    used[i] = 0;                   /* index unused */
+	    p[index] = ++i;
 	}
     }
 }
@@ -4837,23 +4900,42 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
 	}
     }
     else {             /* this is the general case */
-	volatile VALUE t0 = tmpbuf(n,sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
-	volatile VALUE t1 = tmpbuf(n,sizeof(char));
-	char *used = (char*)RSTRING_PTR(t1);
+	volatile VALUE t0;
+	long *p = (long*)ALLOCV(t0, r*sizeof(long)+n*sizeof(char));
+	char *used = (char*)(p + r);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
 	RBASIC_CLEAR_CLASS(ary0);
 
 	MEMZERO(used, char, n); /* initialize array */
 
-	permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */
-	tmpbuf_discard(t0);
-	tmpbuf_discard(t1);
+	permute0(n, r, p, used, ary0); /* compute and yield permutations */
+	ALLOCV_END(t0);
 	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
+static void
+combinate0(const long len, const long n, long *const stack, const VALUE values)
+{
+    long lev = 0;
+
+    MEMZERO(stack+1, long, n);
+    stack[0] = -1;
+    for (;;) {
+	for (lev++; lev < n; lev++) {
+	    stack[lev+1] = stack[lev]+1;
+	}
+	if (!yield_indexed_values(values, n, stack+1)) {
+	    rb_raise(rb_eRuntimeError, "combination reentered");
+	}
+	do {
+	    if (lev == 0) return;
+	    stack[lev--]++;
+	} while (stack[lev+1]+n == len+lev+1);
+    }
+}
+
 static VALUE
 rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj)
 {
@@ -4891,7 +4973,7 @@ rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj)
 static VALUE
 rb_ary_combination(VALUE ary, VALUE num)
 {
-    long n, i, len;
+    long i, n, len;
 
     n = NUM2LONG(num);
     RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_combination_size);
@@ -4908,37 +4990,20 @@ rb_ary_combination(VALUE ary, VALUE num)
 	}
     }
     else {
-	volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
-	long *stack = (long*)RSTRING_PTR(t0);
-	volatile VALUE cc = tmpary(n);
-	VALUE *chosen = RARRAY_PTR(cc);
-	long lev = 0;
-
-	MEMZERO(stack, long, n);
-	stack[0] = -1;
-	for (;;) {
-	    chosen[lev] = RARRAY_AREF(ary, stack[lev+1]);
-	    for (lev++; lev < n; lev++) {
-		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 (stack[lev+1]+n == len+lev+1);
-	}
-    done:
-	tmpbuf_discard(t0);
-	tmpary_discard(cc);
+	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
+	volatile VALUE t0;
+	long *stack = ALLOCV_N(long, t0, n+1);
+
+	RBASIC_CLEAR_CLASS(ary0);
+	combinate0(len, n, stack, ary0);
+	ALLOCV_END(t0);
+	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
 /*
- * Recursively compute repeated permutations of +r+ elements of the set
+ * 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
@@ -4947,33 +5012,28 @@ rb_ary_combination(VALUE ary, VALUE num)
  * n: the size of the set
  * r: the number of elements in each permutation
  * p: the array (of size r) that we're filling in
- * index: what index we're filling in now
  * values: the Ruby array that holds the actual values to permute
  */
 static void
-rpermute0(long n, long r, long *p, long index, VALUE values)
+rpermute0(const long n, const long r, long *const p, const VALUE values)
 {
-    long i, j;
-    for (i = 0; i < n; i++) {
-	p[index] = i;
-	if (index < r-1) {              /* if not done yet */
-	    rpermute0(n, r, p, index+1, values); /* recurse */
+    long i = 0, index = 0;
+
+    p[index] = i;
+    for (;;) {
+	if (++index < r-1) {
+	    p[index] = i = 0;
+	    continue;
 	}
-	else {
-	    /* We have a complete permutation of array indexes */
-	    /* Build a ruby array of the corresponding values */
-	    /* And yield it to the associated block */
-	    VALUE result = rb_ary_new2(r);
-	    VALUE *result_array = RARRAY_PTR(result);
-	    const VALUE *values_array = RARRAY_PTR(values);
-
-	    for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
-	    ARY_SET_LEN(result, r);
-	    rb_yield(result);
-	    if (RBASIC(values)->klass) {
+	for (i = 0; i < n; ++i) {
+	    p[index] = i;
+	    if (!yield_indexed_values(values, r, p)) {
 		rb_raise(rb_eRuntimeError, "repeated permute reentered");
 	    }
 	}
+	do {
+	    if (index <= 0) return;
+	} while ((i = ++p[--index]) >= n);
     }
 }
 
@@ -5036,39 +5096,38 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num)
 	}
     }
     else {             /* this is the general case */
-	volatile VALUE t0 = tmpbuf(r, sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
+	volatile VALUE t0;
+	long *p = ALLOCV_N(long, t0, r);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
 	RBASIC_CLEAR_CLASS(ary0);
 
-	rpermute0(n, r, p, 0, ary0); /* compute and yield repeated permutations */
-	tmpbuf_discard(t0);
+	rpermute0(n, r, p, ary0); /* compute and yield repeated permutations */
+	ALLOCV_END(t0);
 	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
 }
 
 static void
-rcombinate0(long n, long r, long *p, long index, long rest, VALUE values)
+rcombinate0(const long n, const long r, long *const p, const long rest, const VALUE values)
 {
-    long j;
-    if (rest > 0) {
-	for (; index < n; ++index) {
-	    p[r-rest] = index;
-	    rcombinate0(n, r, p, index, rest-1, values);
+    long i = 0, index = 0;
+
+    p[index] = i;
+    for (;;) {
+	if (++index < r-1) {
+	    p[index] = i;
+	    continue;
 	}
-    }
-    else {
-	VALUE result = rb_ary_new2(r);
-	VALUE *result_array = RARRAY_PTR(result);
-	const VALUE *values_array = RARRAY_PTR(values);
-
-	for (j = 0; j < r; ++j) result_array[j] = values_array[p[j]];
-	ARY_SET_LEN(result, r);
-	rb_yield(result);
-	if (RBASIC(values)->klass) {
-	    rb_raise(rb_eRuntimeError, "repeated combination reentered");
+	for (; i < n; ++i) {
+	    p[index] = i;
+	    if (!yield_indexed_values(values, r, p)) {
+		rb_raise(rb_eRuntimeError, "repeated combination reentered");
+	    }
 	}
+	do {
+	    if (index <= 0) return;
+	} while ((i = ++p[--index]) >= n);
     }
 }
 
@@ -5133,13 +5192,13 @@ rb_ary_repeated_combination(VALUE ary, VALUE num)
 	/* yield nothing */
     }
     else {
-	volatile VALUE t0 = tmpbuf(n, sizeof(long));
-	long *p = (long*)RSTRING_PTR(t0);
+	volatile VALUE t0;
+	long *p = ALLOCV_N(long, t0, n);
 	VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */
 	RBASIC_CLEAR_CLASS(ary0);
 
-	rcombinate0(len, n, p, 0, n, ary0); /* compute and yield repeated combinations */
-	tmpbuf_discard(t0);
+	rcombinate0(len, n, p, n, ary0); /* compute and yield repeated combinations */
+	ALLOCV_END(t0);
 	RBASIC_SET_CLASS_RAW(ary0, rb_cArray);
     }
     return ary;
@@ -5370,6 +5429,31 @@ rb_ary_drop_while(VALUE ary)
 }
 
 /*
+ *  call-seq:
+ *     ary.any? [{ |obj| block }]   -> true or false
+ *
+ *  See also Enumerable#any?
+ */
+
+static VALUE
+rb_ary_any_p(VALUE ary)
+{
+    long i, len = RARRAY_LEN(ary);
+    const VALUE *ptr = RARRAY_CONST_PTR(ary);
+
+    if (!len) return Qfalse;
+    if (!rb_block_given_p()) {
+	for (i = 0; i < len; ++i) if (RTEST(ptr[i])) return Qtrue;
+    }
+    else {
+	for (i = 0; i < RARRAY_LEN(ary); ++i) {
+	    if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qtrue;
+	}
+    }
+    return Qfalse;
+}
+
+/*
  *  Arrays are ordered, integer-indexed collections of any object.
  *
  *  Array indexing starts at 0, as in C or Java.  A negative index is assumed
@@ -5718,6 +5802,7 @@ Init_Array(void)
     rb_define_method(rb_cArray, "drop", rb_ary_drop, 1);
     rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
     rb_define_method(rb_cArray, "bsearch", rb_ary_bsearch, 0);
+    rb_define_method(rb_cArray, "any?", rb_ary_any_p, 0);
 
     id_cmp = rb_intern("<=>");
     id_random = rb_intern("random");
diff --git a/benchmark/bm_app_aobench.rb b/benchmark/bm_app_aobench.rb
index 807349089f..ffab116fcd 100644
--- a/benchmark/bm_app_aobench.rb
+++ b/benchmark/bm_app_aobench.rb
@@ -1,7 +1,6 @@
-# AO rebder benchmark
+# AO render 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
+#      https://code.google.com/p/aobench/
 # Ruby(yarv2llvm) version by Hideki Miura
 #
 
diff --git a/benchmark/bm_app_lc_fizzbuzz.rb b/benchmark/bm_app_lc_fizzbuzz.rb
new file mode 100644
index 0000000000..f09574bbeb
--- /dev/null
+++ b/benchmark/bm_app_lc_fizzbuzz.rb
@@ -0,0 +1,52 @@
+#
+# FizzBuzz program using only lambda calculus
+#
+# This program is quoted from
+#   "Understanding Computation" by Tom Stuart
+#   http://computationbook.com/
+#
+# You can understand why this program works fine by reading this book.
+#
+
+solution = -> k { -> f { -> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> l { -> x { -> g { -> b { b }[-> p { p[-> x { -> y { x } }] }[l]][x][-> y { g[f[-> l { -> p { p[-> x { -> y { y } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][x][g]][-> l { -> p { p[-> x { -> y { x } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][y] }] } } } }][k][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> l { -> x { -> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[l][f[x]] } }] } }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[m][n]][-> x { -> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[f[-> n { -> p { -> x { p[n[p][x]] } } }[m]][n]][m][x] }][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]] } } }][-> p { -> x { p[x] } }][-> p { -> x { p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[x]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] } }]][-> n { -> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[p[p[p[p[p[p[p[p[p[p[p[p[x]]]]]]]]]]]]]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[x]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> b { b }[-> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]]][-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> n { -> p { -> x { p[n[p][x]] } } }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]]]][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> n { -> l { -> x { -> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> l { -> x { -> g { -> b { b }[-> p { p[-> x { -> y { x } }] }[l]][x][-> y { g[f[-> l { -> p { p[-> x { -> y { y } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][x][g]][-> l { -> p { p[-> x { -> y { x } }] }[-> p { p[-> x { -> y { y } }] }[l]] }[l]][y] }] } } } }][l][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }[-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][x]][-> l { -> x { -> x { -> y { -> f { f[x][y] } } }[-> x { -> y { y } }][-> x { -> y { -> f { f[x][y] } } }[x][l]] } }] } }[-> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }[-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]]][-> x { -> y { -> f { f[x][y] } } }[-> x { -> y { x } }][-> x { -> y { x } }]][-> x { f[-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { -> n { -> p { -> x { p[n[p][x]] } } }[f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n]][x] }][-> p { -> x { x } }] } } }][n][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]][x] }]][-> f { -> x { f[-> y { x[x][y] }] }[-> x { f[-> y { x[x][y] }] }] }[-> f { -> m { -> n { -> b { b }[-> m { -> n { -> n { n[-> x { -> x { -> y { y } } }][-> x { -> y { x } }] }[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]] } }[n][m]][-> x { f[-> m { -> n { n[-> n { -> p { p[-> x { -> y { x } }] }[n[-> p { -> x { -> y { -> f { f[x][y] } } }[-> p { p[-> x { -> y { y } }] }[p]][-> n { -> p { -> x { p[n[p][x]] } } }[-> p { p[-> x { -> y { y } }] }[p]]] }][-> x { -> y { -> f { f[x][y] } } }[-> p { -> x { x } }][-> p { -> x { x } }]]] }][m] } }[m][n]][n][x] }][m] } } }][n][-> m { -> n { n[-> m { -> n { n[-> n { -> p { -> x { p[n[p][x]] } } }][m] } }[m]][-> p { -> x { x } }] } }[-> p { -> x { p[p[x]] } }][-> p { -> x { p[p[p[p[p[x]]]]] } }]]] } }][n]]]] }]
+
+FIRST     = -> l { LEFT[RIGHT[l]] }
+IF        = -> b { b }
+LEFT      = -> p { p[-> x { -> y { x } } ] }
+RIGHT     = -> p { p[-> x { -> y { y } } ] }
+IS_EMPTY  = LEFT
+REST      = -> l { RIGHT[RIGHT[l]] }
+
+def to_integer(proc)
+  proc[-> n { n + 1 }][0]
+end
+
+def to_boolean(proc)
+  IF[proc][true][false]
+end
+
+def to_array(proc)
+  array = []
+
+  until to_boolean(IS_EMPTY[proc])
+    array.push(FIRST[proc])
+    proc = REST[proc]
+  end
+
+  array
+end
+
+def to_char(c)
+  '0123456789BFiuz'.slice(to_integer(c))
+end
+
+def to_string(s)
+  to_array(s).map { |c| to_char(c) }.join
+end
+
+answer = to_array(solution).map do |p|
+  to_string(p)
+end
+
+answer_ary = answer.to_a
+# puts answer_ary
diff --git a/benchmark/bm_hash_aref_flo.rb b/benchmark/bm_hash_aref_flo.rb
new file mode 100644
index 0000000000..2217274c82
--- /dev/null
+++ b/benchmark/bm_hash_aref_flo.rb
@@ -0,0 +1,4 @@
+h = {}
+strs = [*1..10000].map! {|i| i.fdiv(10)}
+strs.each { |s| h[s] = s }
+50.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_miss.rb b/benchmark/bm_hash_aref_miss.rb
new file mode 100644
index 0000000000..b0913dd4bb
--- /dev/null
+++ b/benchmark/bm_hash_aref_miss.rb
@@ -0,0 +1,5 @@
+h = {}
+strs = ('a'..'z').to_a.map!(&:freeze)
+strs.each { |s| h[s] = s }
+strs = ('A'..'Z').to_a
+200_000.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_str.rb b/benchmark/bm_hash_aref_str.rb
new file mode 100644
index 0000000000..19439b061b
--- /dev/null
+++ b/benchmark/bm_hash_aref_str.rb
@@ -0,0 +1,4 @@
+h = {}
+strs = ('a'..'z').to_a.map!(&:freeze)
+strs.each { |s| h[s] = s }
+200_000.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_sym.rb b/benchmark/bm_hash_aref_sym.rb
new file mode 100644
index 0000000000..f75d163fe6
--- /dev/null
+++ b/benchmark/bm_hash_aref_sym.rb
@@ -0,0 +1,9 @@
+h = {}
+syms = ('a'..'z').to_a
+begin
+  syms = eval("%i[#{syms.join(' ')}]")
+rescue SyntaxError # <= 1.9.3
+  syms.map!(&:to_sym)
+end
+syms.each { |s| h[s] = s }
+200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_aref_sym_long.rb b/benchmark/bm_hash_aref_sym_long.rb
new file mode 100644
index 0000000000..9dab8df7be
--- /dev/null
+++ b/benchmark/bm_hash_aref_sym_long.rb
@@ -0,0 +1,13 @@
+h = {}
+syms = %w[puts warn syswrite write stat bacon lettuce tomato
+some symbols in this array may already be interned  others should not be
+hash browns make good breakfast but not cooked using prime numbers
+shift for division entries delete_if keys exist?
+]
+begin
+  syms = eval("%i[#{syms.join(' ')}]")
+rescue SyntaxError # <= 1.9.3
+  syms.map!(&:to_sym)
+end
+syms.each { |s| h[s] = s }
+200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_ident_flo.rb b/benchmark/bm_hash_ident_flo.rb
new file mode 100644
index 0000000000..0c7edfed3e
--- /dev/null
+++ b/benchmark/bm_hash_ident_flo.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+strs = (1..10000).to_a.map!(&:to_f)
+strs.each { |s| h[s] = s }
+50.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_ident_num.rb b/benchmark/bm_hash_ident_num.rb
new file mode 100644
index 0000000000..b226736c6f
--- /dev/null
+++ b/benchmark/bm_hash_ident_num.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+nums = (1..26).to_a
+nums.each { |n| h[n] = n }
+200_000.times { nums.each { |n| h[n] } }
diff --git a/benchmark/bm_hash_ident_obj.rb b/benchmark/bm_hash_ident_obj.rb
new file mode 100644
index 0000000000..4b3b58edec
--- /dev/null
+++ b/benchmark/bm_hash_ident_obj.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+objs = 26.times.map { Object.new }
+objs.each { |o| h[o] = o }
+200_000.times { objs.each { |o| h[o] } }
diff --git a/benchmark/bm_hash_ident_str.rb b/benchmark/bm_hash_ident_str.rb
new file mode 100644
index 0000000000..8582b38e31
--- /dev/null
+++ b/benchmark/bm_hash_ident_str.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+strs = ('a'..'z').to_a
+strs.each { |s| h[s] = s }
+200_000.times { strs.each { |s| h[s] } }
diff --git a/benchmark/bm_hash_ident_sym.rb b/benchmark/bm_hash_ident_sym.rb
new file mode 100644
index 0000000000..4c81e3d28e
--- /dev/null
+++ b/benchmark/bm_hash_ident_sym.rb
@@ -0,0 +1,4 @@
+h = {}.compare_by_identity
+syms = ('a'..'z').to_a.map(&:to_sym)
+syms.each { |s| h[s] = s }
+200_000.times { syms.each { |s| h[s] } }
diff --git a/benchmark/bm_marshal_dump_flo.rb b/benchmark/bm_marshal_dump_flo.rb
new file mode 100644
index 0000000000..9b8d0c6afb
--- /dev/null
+++ b/benchmark/bm_marshal_dump_flo.rb
@@ -0,0 +1,2 @@
+bug10761 = 10000.times.map { |x| x.to_f }
+100.times { Marshal.dump(bug10761) }
diff --git a/benchmark/bm_securerandom.rb b/benchmark/bm_securerandom.rb
new file mode 100644
index 0000000000..a082ea6d5b
--- /dev/null
+++ b/benchmark/bm_securerandom.rb
@@ -0,0 +1,5 @@
+require "securerandom"
+
+20_0000.times do
+  SecureRandom.random_number(100)
+end
diff --git a/benchmark/bm_vm2_newlambda.rb b/benchmark/bm_vm2_newlambda.rb
new file mode 100644
index 0000000000..6422c9b0d0
--- /dev/null
+++ b/benchmark/bm_vm2_newlambda.rb
@@ -0,0 +1,5 @@
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  lambda {}
+end
diff --git a/benchmark/bm_vm2_struct_big_aref_hi.rb b/benchmark/bm_vm2_struct_big_aref_hi.rb
new file mode 100644
index 0000000000..22cb26b0a5
--- /dev/null
+++ b/benchmark/bm_vm2_struct_big_aref_hi.rb
@@ -0,0 +1,7 @@
+s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+x = s.new
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  x.z # x[25]
+end
diff --git a/benchmark/bm_vm2_struct_big_aref_lo.rb b/benchmark/bm_vm2_struct_big_aref_lo.rb
new file mode 100644
index 0000000000..5e61a7087e
--- /dev/null
+++ b/benchmark/bm_vm2_struct_big_aref_lo.rb
@@ -0,0 +1,7 @@
+s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+x = s.new
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  x.k # x[10]
+end
diff --git a/benchmark/bm_vm2_struct_big_aset.rb b/benchmark/bm_vm2_struct_big_aset.rb
new file mode 100644
index 0000000000..5a1c3d16f3
--- /dev/null
+++ b/benchmark/bm_vm2_struct_big_aset.rb
@@ -0,0 +1,7 @@
+s = Struct.new(*('a'..'z').map { |x| x.to_sym })
+x = s.new
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  x.k = i # x[10] = i
+end
diff --git a/benchmark/bm_vm2_struct_small_aref.rb b/benchmark/bm_vm2_struct_small_aref.rb
new file mode 100644
index 0000000000..8eaa555b41
--- /dev/null
+++ b/benchmark/bm_vm2_struct_small_aref.rb
@@ -0,0 +1,7 @@
+s = Struct.new(:a, :b, :c)
+x = s.new
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  x.a
+end
diff --git a/benchmark/bm_vm2_struct_small_aset.rb b/benchmark/bm_vm2_struct_small_aset.rb
new file mode 100644
index 0000000000..ecd0f95669
--- /dev/null
+++ b/benchmark/bm_vm2_struct_small_aset.rb
@@ -0,0 +1,7 @@
+s = Struct.new(:a, :b, :c)
+x = s.new
+i = 0
+while i<6_000_000 # benchmark loop 2
+  i += 1
+  x.a = i
+end
diff --git a/benchmark/bm_vm_thread_close.rb b/benchmark/bm_vm_thread_close.rb
new file mode 100644
index 0000000000..3e9a265ce8
--- /dev/null
+++ b/benchmark/bm_vm_thread_close.rb
@@ -0,0 +1,6 @@
+1000.times { Thread.new { sleep } }
+i = 0
+while i<100_000 # benchmark loop 3
+  i += 1
+  IO.pipe.each(&:close)
+end
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
index cbc72cf604..3904e25503 100644
--- a/benchmark/driver.rb
+++ b/benchmark/driver.rb
@@ -77,6 +77,7 @@ class BenchmarkDriver
     @exclude = opt[:exclude] || nil
     @verbose = opt[:quiet] ? false : (opt[:verbose] || false)
     @output = opt[:output] ? open(opt[:output], 'w') : nil
+    @rawdata_output = opt[:rawdata_output] ? open(opt[:rawdata_output], 'w') : nil
     @loop_wl1 = @loop_wl2 = nil
     @ruby_arg = opt[:ruby_arg] || nil
     @opt = opt
@@ -128,6 +129,14 @@ class BenchmarkDriver
       message "Elapsed time: #{Time.now - @start_time} (sec)"
     end
 
+    if @rawdata_output
+      h = {}
+      h[:cpuinfo] = File.read('/proc/cpuinfo') if File.exist?('/proc/cpuinfo')
+      h[:executables] = @execs
+      h[:results] = @results
+      @rawdata_output.puts h.inspect
+    end
+
     output '-----------------------------------------------------------'
     output 'benchmark results:'
 
@@ -238,6 +247,12 @@ class BenchmarkDriver
     result
   end
 
+  unless defined?(File::NULL)
+    if File.exist?('/dev/null')
+      File::NULL = '/dev/null'
+    end
+  end
+
   def measure executable, file
     cmd = "#{executable} #{@ruby_arg} #{file}"
 
@@ -260,6 +275,7 @@ if __FILE__ == $0
     :dir => File.dirname(__FILE__),
     :repeat => 1,
     :output => "bmlog-#{Time.now.strftime('%Y%m%d-%H%M%S')}.#{$$}",
+    :raw_output => nil
   }
 
   parser = OptionParser.new{|o|
@@ -287,12 +303,16 @@ if __FILE__ == $0
     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('--rawdata-output [FILE]', 'output rawdata'){|r|
+      opt[:rawdata_output] = r
     }
     o.on('-v', '--verbose'){|v|
       opt[:verbose] = v
     }
+    o.on('-q', '--quiet', "Run without notify information except result table."){|q|
+      opt[:quiet] = q
+      opt[:verbose] = false
+    }
   }
 
   parser.parse!(ARGV)
diff --git a/benchmark/prepare_so_k_nucleotide.rb b/benchmark/prepare_so_k_nucleotide.rb
index f28f4460a1..d83aeb7a7e 100644
--- a/benchmark/prepare_so_k_nucleotide.rb
+++ b/benchmark/prepare_so_k_nucleotide.rb
@@ -1,2 +1,2 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
+require_relative 'make_fasta_output'
 prepare_fasta_output(100_000)
diff --git a/benchmark/prepare_so_reverse_complement.rb b/benchmark/prepare_so_reverse_complement.rb
index 7f089109de..da3ec2df14 100644
--- a/benchmark/prepare_so_reverse_complement.rb
+++ b/benchmark/prepare_so_reverse_complement.rb
@@ -1,2 +1,2 @@
-require File.join(File.dirname(__FILE__), 'make_fasta_output')
+require_relative 'make_fasta_output'
 prepare_fasta_output(2_500_000)
diff --git a/bignum.c b/bignum.c
index 3f1bb38341..fbf2778f9b 100644
--- a/bignum.c
+++ b/bignum.c
@@ -9,10 +9,9 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/thread.h"
 #include "ruby/util.h"
-#include "internal.h"
 
 #ifdef HAVE_STRINGS_H
 #include <strings.h>
@@ -45,17 +44,17 @@ const char ruby_digitmap[] = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 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(sizeof_bdigit, SIZEOF_BDIGIT <= sizeof(BDIGIT));
+STATIC_ASSERT(sizeof_bdigit_and_dbl, SIZEOF_BDIGIT*2 <= SIZEOF_BDIGIT_DBL);
 STATIC_ASSERT(bdigit_signedness, 0 < (BDIGIT)-1);
 STATIC_ASSERT(bdigit_dbl_signedness, 0 < (BDIGIT_DBL)-1);
 STATIC_ASSERT(bdigit_dbl_signed_signedness, 0 > (BDIGIT_DBL_SIGNED)-1);
-STATIC_ASSERT(rbignum_embed_len_max, RBIGNUM_EMBED_LEN_MAX <= (RBIGNUM_EMBED_LEN_MASK >> RBIGNUM_EMBED_LEN_SHIFT));
+STATIC_ASSERT(rbignum_embed_len_max, BIGNUM_EMBED_LEN_MAX <= (BIGNUM_EMBED_LEN_MASK >> BIGNUM_EMBED_LEN_SHIFT));
 
-#if SIZEOF_BDIGITS < SIZEOF_LONG
-STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_LONG % SIZEOF_BDIGITS == 0);
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_LONG % SIZEOF_BDIGIT == 0);
 #else
-STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGITS % SIZEOF_LONG == 0);
+STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGIT % SIZEOF_LONG == 0);
 #endif
 
 #ifdef WORDS_BIGENDIAN
@@ -71,8 +70,8 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGITS % SIZEOF_LONG == 0);
 #define FILL_LOWBITS(d, numbits) ((d) | (LSHIFTX(((d)*0+1), (numbits))-1))
 #define POW2_P(x) (((x)&((x)-1))==0)
 
-#define BDIGITS(x) (RBIGNUM_DIGITS(x))
-#define BITSPERDIG (SIZEOF_BDIGITS*CHAR_BIT)
+#define BDIGITS(x) (BIGNUM_DIGITS(x))
+#define BITSPERDIG (SIZEOF_BDIGIT*CHAR_BIT)
 #define BIGRAD ((BDIGIT_DBL)1 << BITSPERDIG)
 #define BIGRAD_HALF ((BDIGIT)(BIGRAD >> 1))
 #define BDIGIT_MSB(d) (((d) & BIGRAD_HALF) != 0)
@@ -82,25 +81,25 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGITS % SIZEOF_LONG == 0);
 #define BDIGMAX ((BDIGIT)(BIGRAD-1))
 #define BDIGIT_DBL_MAX (~(BDIGIT_DBL)0)
 
-#if SIZEOF_BDIGITS == 2
+#if SIZEOF_BDIGIT == 2
 #   define swap_bdigit(x) swap16(x)
-#elif SIZEOF_BDIGITS == 4
+#elif SIZEOF_BDIGIT == 4
 #   define swap_bdigit(x) swap32(x)
-#elif SIZEOF_BDIGITS == 8
+#elif SIZEOF_BDIGIT == 8
 #   define swap_bdigit(x) swap64(x)
 #endif
 
-#define BIGZEROP(x) (RBIGNUM_LEN(x) == 0 || \
+#define BIGZEROP(x) (BIGNUM_LEN(x) == 0 || \
 		     (BDIGITS(x)[0] == 0 && \
-		      (RBIGNUM_LEN(x) == 1 || bigzero_p(x))))
-#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) : \
+		      (BIGNUM_LEN(x) == 1 || bigzero_p(x))))
+#define BIGSIZE(x) (BIGNUM_LEN(x) == 0 ? (size_t)0 : \
+    BDIGITS(x)[BIGNUM_LEN(x)-1] ? \
+        (size_t)(BIGNUM_LEN(x)*SIZEOF_BDIGIT - nlz(BDIGITS(x)[BIGNUM_LEN(x)-1])/CHAR_BIT) : \
     rb_absint_size(x, NULL))
 
 #define BIGDIVREM_EXTRA_WORDS 1
 #define roomof(n, m) ((long)(((n)+(m)-1) / (m)))
-#define bdigit_roomof(n) roomof(n, SIZEOF_BDIGITS)
+#define bdigit_roomof(n) roomof(n, SIZEOF_BDIGIT)
 #define BARY_ARGS(ary) ary, numberof(ary)
 
 #define BARY_ADD(z, x, y) bary_add(BARY_ARGS(z), BARY_ARGS(x), BARY_ARGS(y))
@@ -109,8 +108,8 @@ STATIC_ASSERT(sizeof_long_and_sizeof_bdigit, SIZEOF_BDIGITS % SIZEOF_LONG == 0);
 #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 BIGNUM_SET_NEGATIVE_SIGN(b) BIGNUM_SET_SIGN(b, 0)
+#define BIGNUM_SET_POSITIVE_SIGN(b) BIGNUM_SET_SIGN(b, 1)
 
 #define bignew(len,sign) bignew_1(rb_cBignum,(len),(sign))
 
@@ -148,21 +147,21 @@ static void bary_divmod(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BD
 
 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 VALUE bignew_1(VALUE klass, size_t len, int sign);
 static inline VALUE bigtrunc(VALUE x);
 
 static VALUE bigsq(VALUE x);
 static void bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp);
 static inline VALUE power_cache_get_power(int base, int power_level, size_t *numdigits_ret);
 
-#if SIZEOF_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; }
+#if SIZEOF_BDIGIT <= SIZEOF_INT
+static int nlz(BDIGIT x) { return nlz_int((unsigned int)x) - (SIZEOF_INT-SIZEOF_BDIGIT) * CHAR_BIT; }
+#elif SIZEOF_BDIGIT <= SIZEOF_LONG
+static int nlz(BDIGIT x) { return nlz_long((unsigned long)x) - (SIZEOF_LONG-SIZEOF_BDIGIT) * CHAR_BIT; }
+#elif SIZEOF_BDIGIT <= SIZEOF_LONG_LONG
+static int nlz(BDIGIT x) { return nlz_long_long((unsigned LONG_LONG)x) - (SIZEOF_LONG_LONG-SIZEOF_BDIGIT) * CHAR_BIT; }
+#elif SIZEOF_BDIGIT <= SIZEOF_INT128_T
+static int nlz(BDIGIT x) { return nlz_int128((uint128_t)x) - (SIZEOF_INT128_T-SIZEOF_BDIGIT) * CHAR_BIT; }
 #endif
 
 #define U16(a) ((uint16_t)(a))
@@ -218,7 +217,7 @@ end
 
  */
 
-#ifdef HAVE_UINT16_T
+#if SIZEOF_BDIGIT_DBL == 2
 static const int maxpow16_exp[35] = {
     15, 10, 7, 6, 6, 5, 5, 5, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3,
     3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
@@ -234,8 +233,7 @@ static const uint16_t maxpow16_num[35] = {
     U16(0x00006978), U16(0x0000745f), U16(0x00008000), U16(0x00008c61),
     U16(0x00009988), U16(0x0000a77b), U16(0x0000b640),
 };
-#endif
-#ifdef HAVE_UINT32_T
+#elif SIZEOF_BDIGIT_DBL == 4
 static const int maxpow32_exp[35] = {
     31, 20, 15, 13, 12, 11, 10, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, 7,
     7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
@@ -251,8 +249,7 @@ static const uint32_t maxpow32_num[35] = {
     U32(0x2b73a840), U32(0x34e63b41), U32(0x40000000), U32(0x4cfa3cc1),
     U32(0x5c13d840), U32(0x6d91b519), U32(0x81bf1000),
 };
-#endif
-#ifdef HAVE_UINT64_T
+#elif SIZEOF_BDIGIT_DBL == 8 && defined HAVE_UINT64_T
 static const int maxpow64_exp[35] = {
     63, 40, 31, 27, 24, 22, 21, 20, 19, 18, 17, 17, 16, 16, 15, 15, 15,
     15, 14, 14, 14, 14, 13, 13, 13, 13, 13, 13, 13, 12, 12, 12, 12, 12,
@@ -278,8 +275,7 @@ static const uint64_t maxpow64_num[35] = {
     U64(0x211e44f7,0xd02c1000), U64(0x2ee56725,0xf06e5c71),
     U64(0x41c21cb8,0xe1000000),
 };
-#endif
-#ifdef HAVE_UINT128_T
+#elif SIZEOF_BDIGIT_DBL == 16 && defined HAVE_UINT128_T
 static const int maxpow128_exp[35] = {
     127, 80, 63, 55, 49, 45, 42, 40, 38, 37, 35, 34, 33, 32, 31, 31, 30,
     30, 29, 29, 28, 28, 27, 27, 27, 26, 26, 26, 26, 25, 25, 25, 25, 24,
@@ -665,7 +661,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                     *((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 defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
                 if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
                     uint16_t u = (uint16_t)(d = dp[0]);
                     if (need_swap) u = swap16(u);
@@ -673,7 +669,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                     return ((1 < de - dp || CLEAR_LOWBITS(d, 16) != 0) ? 2 : 1) * sign;
                 }
 #endif
-#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGITS
+#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
                 if (wordsize == 4 && (uintptr_t)words % ALIGNOF(uint32_t) == 0) {
                     uint32_t u = (uint32_t)(d = dp[0]);
                     if (need_swap) u = swap32(u);
@@ -681,7 +677,7 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                     return ((1 < de - dp || CLEAR_LOWBITS(d, 32) != 0) ? 2 : 1) * sign;
                 }
 #endif
-#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGITS
+#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
                 if (wordsize == 8 && (uintptr_t)words % ALIGNOF(uint64_t) == 0) {
                     uint64_t u = (uint64_t)(d = dp[0]);
                     if (need_swap) u = swap64(u);
@@ -696,40 +692,40 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
                     *((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 defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
                 if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
                     uint16_t u = (uint16_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
                     if (need_swap) u = swap16(u);
                     *((uint16_t *)words) = u;
-                    return (wordsize == SIZEOF_BDIGITS && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
+                    return (wordsize == SIZEOF_BDIGIT && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
                         (1 < de - dp || FILL_LOWBITS(d, 16) != -1) ? -2 : -1;
                 }
 #endif
-#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGITS
+#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
                 if (wordsize == 4 && (uintptr_t)words % ALIGNOF(uint32_t) == 0) {
                     uint32_t u = (uint32_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
                     if (need_swap) u = swap32(u);
                     *((uint32_t *)words) = u;
-                    return (wordsize == SIZEOF_BDIGITS && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
+                    return (wordsize == SIZEOF_BDIGIT && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
                         (1 < de - dp || FILL_LOWBITS(d, 32) != -1) ? -2 : -1;
                 }
 #endif
-#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGITS
+#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
                 if (wordsize == 8 && (uintptr_t)words % ALIGNOF(uint64_t) == 0) {
                     uint64_t u = (uint64_t)(d = -(BDIGIT_DBL_SIGNED)dp[0]);
                     if (need_swap) u = swap64(u);
                     *((uint64_t *)words) = u;
-                    return (wordsize == SIZEOF_BDIGITS && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
+                    return (wordsize == SIZEOF_BDIGIT && de - dp == 2 && dp[1] == 1 && dp[0] == 0) ? -1 :
                         (1 < de - dp || FILL_LOWBITS(d, 64) != -1) ? -2 : -1;
                 }
 #endif
             }
         }
 #if !defined(WORDS_BIGENDIAN)
-        if (nails == 0 && SIZEOF_BDIGITS == sizeof(BDIGIT) &&
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
             (flags & INTEGER_PACK_WORDORDER_MASK) == INTEGER_PACK_LSWORD_FIRST &&
             (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_MSBYTE_FIRST) {
-            size_t src_size = (de - dp) * SIZEOF_BDIGITS;
+            size_t src_size = (de - dp) * SIZEOF_BDIGIT;
             size_t dst_size = numwords * wordsize;
             int overflow = 0;
             while (0 < src_size && ((unsigned char *)ds)[src_size-1] == 0)
@@ -757,9 +753,9 @@ bary_pack(int sign, BDIGIT *ds, size_t num_bdigits, void *words, size_t numwords
             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;
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            wordsize % SIZEOF_BDIGIT == 0 && (uintptr_t)words % ALIGNOF(BDIGIT) == 0) {
+            size_t bdigits_per_word = wordsize / SIZEOF_BDIGIT;
             size_t src_num_bdigits = de - dp;
             size_t dst_num_bdigits = numwords * bdigits_per_word;
             int overflow = 0;
@@ -970,7 +966,7 @@ integer_unpack_num_bdigits_small(size_t numwords, size_t wordsize, size_t nails,
 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 */
+    /* BITSPERDIG = SIZEOF_BDIGIT * CHAR_BIT */
     /* num_bits = (wordsize * CHAR_BIT - nails) * numwords */
     /* num_bdigits = (num_bits + BITSPERDIG - 1) / BITSPERDIG */
 
@@ -1067,7 +1063,7 @@ 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) :
+            ((size == SIZEOF_BDIGIT && u == 0) ? -2 : -1) :
             ((u >> (size * CHAR_BIT - 1)) ? -1 : 1);
         if (sign < 0) {
             u |= LSHIFTX(BDIGMAX, size * CHAR_BIT);
@@ -1099,19 +1095,19 @@ bary_unpack_internal(BDIGIT *bdigits, size_t num_bdigits, const void *words, siz
             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 defined(HAVE_UINT16_T) && 2 <= SIZEOF_BDIGIT
             if (wordsize == 2 && (uintptr_t)words % ALIGNOF(uint16_t) == 0) {
                 uint16_t u = *(uint16_t *)buf;
                 return integer_unpack_single_bdigit(need_swap ? swap16(u) : u, sizeof(uint16_t), flags, dp);
             }
 #endif
-#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGITS
+#if defined(HAVE_UINT32_T) && 4 <= SIZEOF_BDIGIT
             if (wordsize == 4 && (uintptr_t)words % ALIGNOF(uint32_t) == 0) {
                 uint32_t u = *(uint32_t *)buf;
                 return integer_unpack_single_bdigit(need_swap ? swap32(u) : u, sizeof(uint32_t), flags, dp);
             }
 #endif
-#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGITS
+#if defined(HAVE_UINT64_T) && 8 <= SIZEOF_BDIGIT
             if (wordsize == 8 && (uintptr_t)words % ALIGNOF(uint64_t) == 0) {
                 uint64_t u = *(uint64_t *)buf;
                 return integer_unpack_single_bdigit(need_swap ? swap64(u) : u, sizeof(uint64_t), flags, dp);
@@ -1119,11 +1115,11 @@ bary_unpack_internal(BDIGIT *bdigits, size_t num_bdigits, const void *words, siz
 #endif
         }
 #if !defined(WORDS_BIGENDIAN)
-        if (nails == 0 && SIZEOF_BDIGITS == sizeof(BDIGIT) &&
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
             (flags & INTEGER_PACK_WORDORDER_MASK) == INTEGER_PACK_LSWORD_FIRST &&
             (flags & INTEGER_PACK_BYTEORDER_MASK) != INTEGER_PACK_MSBYTE_FIRST) {
             size_t src_size = numwords * wordsize;
-            size_t dst_size = num_bdigits * SIZEOF_BDIGITS;
+            size_t dst_size = num_bdigits * SIZEOF_BDIGIT;
             MEMCPY(dp, words, char, src_size);
             if (flags & INTEGER_PACK_2COMP) {
                 if (flags & INTEGER_PACK_NEGATIVE) {
@@ -1149,9 +1145,9 @@ bary_unpack_internal(BDIGIT *bdigits, size_t num_bdigits, const void *words, siz
             return sign;
         }
 #endif
-        if (nails == 0 && SIZEOF_BDIGITS == sizeof(BDIGIT) &&
-            wordsize % SIZEOF_BDIGITS == 0) {
-            size_t bdigits_per_word = wordsize / SIZEOF_BDIGITS;
+        if (nails == 0 && SIZEOF_BDIGIT == sizeof(BDIGIT) &&
+            wordsize % SIZEOF_BDIGIT == 0) {
+            size_t bdigits_per_word = wordsize / SIZEOF_BDIGIT;
             int mswordfirst_p = (flags & INTEGER_PACK_MSWORD_FIRST) != 0;
             int msbytefirst_p = (flags & INTEGER_PACK_NATIVE_BYTE_ORDER) ? HOST_BIGENDIAN_P :
                 (flags & INTEGER_PACK_MSBYTE_FIRST) != 0;
@@ -1542,8 +1538,8 @@ bary_mul_normal(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIG
 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));
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
     bary_mul_normal(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn);
     RB_GC_GUARD(x);
     RB_GC_GUARD(y);
@@ -1611,7 +1607,7 @@ bary_sq_fast(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn)
 VALUE
 rb_big_sq_fast(VALUE x)
 {
-    size_t xn = RBIGNUM_LEN(x), zn = 2 * xn;
+    size_t xn = BIGNUM_LEN(x), zn = 2 * xn;
     VALUE z = bignew(zn, 1);
     bary_sq_fast(BDIGITS(z), zn, BDIGITS(x), xn);
     RB_GC_GUARD(x);
@@ -1653,7 +1649,7 @@ bary_mul_balance_with_mulfunc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t
             }
             tds = zds + n;
             MEMCPY(wds, zds + n, BDIGIT, xn);
-            mulfunc(tds, tn, xds, xn, yds + n, r, wds-xn, wn-xn);
+            mulfunc(tds, tn, xds, xn, yds + n, r, wds+xn, wn-xn);
             bary_add(zds + n, tn,
                      zds + n, tn,
                      wds, xn);
@@ -1670,8 +1666,8 @@ bary_mul_balance_with_mulfunc(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t
 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));
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
     bary_mul_balance_with_mulfunc(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, NULL, 0, bary_mul_toom3_start);
     RB_GC_GUARD(x);
     RB_GC_GUARD(y);
@@ -1826,12 +1822,12 @@ bary_mul_karatsuba(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const B
     }
 
     /*
-    if (SIZEOF_BDIGITS * zn <= 16) {
+    if (SIZEOF_BDIGIT * 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]; }
+        for (x = 0, i = xn-1; 0 <= i; i--) { x <<= SIZEOF_BDIGIT*CHAR_BIT; x |= xds[i]; }
+        for (y = 0, i = yn-1; 0 <= i; i--) { y <<= SIZEOF_BDIGIT*CHAR_BIT; y |= yds[i]; }
+        for (z = 0, i = zn-1; 0 <= i; i--) { z <<= SIZEOF_BDIGIT*CHAR_BIT; z |= zds[i]; }
         assert(z == x * y);
     }
     */
@@ -1851,8 +1847,8 @@ bary_mul_karatsuba(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const B
 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));
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
     if (!((xn <= yn && yn < 2) || KARATSUBA_BALANCED(xn, yn)))
         rb_raise(rb_eArgError, "unexpected bignum length for karatsuba");
     bary_mul_karatsuba(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, NULL, 0);
@@ -2248,8 +2244,8 @@ bary_mul_toom3(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGI
 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));
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
     if (xn > yn || yn < 3 || !TOOM3_BALANCED(xn,yn))
         rb_raise(rb_eArgError, "unexpected bignum length for toom3");
     bary_mul_toom3(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn, NULL, 0);
@@ -2262,7 +2258,7 @@ rb_big_mul_toom3(VALUE x, VALUE y)
 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;
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
     mpz_t x, y, z;
     size_t count;
 
@@ -2289,8 +2285,8 @@ bary_mul_gmp(BDIGIT *zds, size_t zn, const BDIGIT *xds, size_t xn, const BDIGIT
 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));
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), zn = xn + yn;
+    VALUE z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
     bary_mul_gmp(BDIGITS(z), zn, BDIGITS(x), xn, BDIGITS(y), yn);
     RB_GC_GUARD(x);
     RB_GC_GUARD(y);
@@ -2363,7 +2359,7 @@ bary_mul_precheck(BDIGIT **zdsp, size_t *znp, const BDIGIT **xdsp, size_t *xnp,
         }
         else {
             do {
-                if (xds[0] != 0)
+                if (yds[0] != 0)
                     break;
                 yds++;
                 yn--;
@@ -2700,7 +2696,7 @@ bary_divmod_normal(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT
 VALUE
 rb_big_divrem_normal(VALUE x, VALUE y)
 {
-    size_t xn = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y), qn, rn;
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), qn, rn;
     BDIGIT *xds = BDIGITS(x), *yds = BDIGITS(y), *qds, *rds;
     VALUE q, r;
 
@@ -2713,11 +2709,11 @@ rb_big_divrem_normal(VALUE x, VALUE y)
         return rb_assoc_new(LONG2FIX(0), x);
 
     qn = xn + BIGDIVREM_EXTRA_WORDS;
-    q = bignew(qn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    q = bignew(qn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
     qds = BDIGITS(q);
 
     rn = yn;
-    r = bignew(rn, RBIGNUM_SIGN(x));
+    r = bignew(rn, BIGNUM_SIGN(x));
     rds = BDIGITS(r);
 
     bary_divmod_normal(qds, qn, rds, rn, xds, xn, yds, yn);
@@ -2735,7 +2731,7 @@ rb_big_divrem_normal(VALUE x, VALUE y)
 static void
 bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xds, size_t xn, const BDIGIT *yds, size_t yn)
 {
-    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGITS)*CHAR_BIT;
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
     mpz_t x, y, q, r;
     size_t count;
 
@@ -2781,7 +2777,7 @@ bary_divmod_gmp(BDIGIT *qds, size_t qn, BDIGIT *rds, size_t rn, const BDIGIT *xd
 VALUE
 rb_big_divrem_gmp(VALUE x, VALUE y)
 {
-    size_t xn = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y), qn, rn;
+    size_t xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y), qn, rn;
     BDIGIT *xds = BDIGITS(x), *yds = BDIGITS(y), *qds, *rds;
     VALUE q, r;
 
@@ -2794,11 +2790,11 @@ rb_big_divrem_gmp(VALUE x, VALUE y)
         return rb_assoc_new(LONG2FIX(0), x);
 
     qn = xn - yn + 1;
-    q = bignew(qn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    q = bignew(qn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
     qds = BDIGITS(q);
 
     rn = yn;
-    r = bignew(rn, RBIGNUM_SIGN(x));
+    r = bignew(rn, BIGNUM_SIGN(x));
     rds = BDIGITS(r);
 
     bary_divmod_gmp(qds, qn, rds, rn, xds, xn, yds, yn);
@@ -2878,11 +2874,11 @@ 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("%c0x0", BIGNUM_SIGN(x) ? '+' : '-');
+    for (i = BIGNUM_LEN(x); i--; ) {
+        printf("_%0*"PRIxBDIGIT, SIZEOF_BDIGIT*2, BDIGITS(x)[i]);
     }
-    printf(", len=%lu", RBIGNUM_LEN(x));
+    printf(", len=%"PRIuSIZE, BIGNUM_LEN(x));
     puts("");
 }
 
@@ -2899,7 +2895,7 @@ rb_big_dump(VALUE x)
 static int
 bigzero_p(VALUE x)
 {
-    return bary_zero_p(BDIGITS(x), RBIGNUM_LEN(x));
+    return bary_zero_p(BDIGITS(x), BIGNUM_LEN(x));
 }
 
 int
@@ -2922,7 +2918,7 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
     }
     if (RB_BIGNUM_TYPE_P(val)) {
 	if (BIGZEROP(val)) return 0;
-	if (RBIGNUM_SIGN(val)) return 1;
+	if (BIGNUM_SIGN(val)) return 1;
 	return -1;
     }
     if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1;
@@ -2930,31 +2926,31 @@ rb_cmpint(VALUE val, VALUE a, VALUE b)
     return 0;
 }
 
-#define RBIGNUM_SET_LEN(b,l) \
-    ((RBASIC(b)->flags & RBIGNUM_EMBED_FLAG) ? \
+#define BIGNUM_SET_LEN(b,l) \
+    ((RBASIC(b)->flags & BIGNUM_EMBED_FLAG) ? \
      (void)(RBASIC(b)->flags = \
-	    (RBASIC(b)->flags & ~RBIGNUM_EMBED_LEN_MASK) | \
-	    ((l) << RBIGNUM_EMBED_LEN_SHIFT)) : \
+	    (RBASIC(b)->flags & ~BIGNUM_EMBED_LEN_MASK) | \
+	    ((l) << BIGNUM_EMBED_LEN_SHIFT)) : \
      (void)(RBIGNUM(b)->as.heap.len = (l)))
 
 static void
-rb_big_realloc(VALUE big, long len)
+rb_big_realloc(VALUE big, size_t len)
 {
     BDIGIT *ds;
-    if (RBASIC(big)->flags & RBIGNUM_EMBED_FLAG) {
-	if (RBIGNUM_EMBED_LEN_MAX < len) {
+    if (RBASIC(big)->flags & BIGNUM_EMBED_FLAG) {
+	if (BIGNUM_EMBED_LEN_MAX < len) {
 	    ds = ALLOC_N(BDIGIT, len);
-	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, RBIGNUM_EMBED_LEN_MAX);
-	    RBIGNUM(big)->as.heap.len = RBIGNUM_LEN(big);
+	    MEMCPY(ds, RBIGNUM(big)->as.ary, BDIGIT, BIGNUM_EMBED_LEN_MAX);
+	    RBIGNUM(big)->as.heap.len = BIGNUM_LEN(big);
 	    RBIGNUM(big)->as.heap.digits = ds;
-	    RBASIC(big)->flags &= ~RBIGNUM_EMBED_FLAG;
+	    RBASIC(big)->flags &= ~BIGNUM_EMBED_FLAG;
 	}
     }
     else {
-	if (len <= RBIGNUM_EMBED_LEN_MAX) {
+	if (len <= BIGNUM_EMBED_LEN_MAX) {
 	    ds = RBIGNUM(big)->as.heap.digits;
-	    RBASIC(big)->flags |= RBIGNUM_EMBED_FLAG;
-	    RBIGNUM_SET_LEN(big, len);
+	    RBASIC(big)->flags |= BIGNUM_EMBED_FLAG;
+	    BIGNUM_SET_LEN(big, len);
             (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary));
 	    if (ds) {
 		MEMCPY(RBIGNUM(big)->as.ary, ds, BDIGIT, len);
@@ -2962,7 +2958,7 @@ rb_big_realloc(VALUE big, long len)
 	    }
 	}
 	else {
-	    if (RBIGNUM_LEN(big) == 0) {
+	    if (BIGNUM_LEN(big) == 0) {
 		RBIGNUM(big)->as.heap.digits = ALLOC_N(BDIGIT, len);
 	    }
 	    else {
@@ -2973,20 +2969,20 @@ rb_big_realloc(VALUE big, long len)
 }
 
 void
-rb_big_resize(VALUE big, long len)
+rb_big_resize(VALUE big, size_t len)
 {
     rb_big_realloc(big, len);
-    RBIGNUM_SET_LEN(big, len);
+    BIGNUM_SET_LEN(big, len);
 }
 
 static VALUE
-bignew_1(VALUE klass, long len, int sign)
+bignew_1(VALUE klass, size_t len, int sign)
 {
     NEWOBJ_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);
+    BIGNUM_SET_SIGN(big, sign?1:0);
+    if (len <= BIGNUM_EMBED_LEN_MAX) {
+	RBASIC(big)->flags |= BIGNUM_EMBED_FLAG;
+	BIGNUM_SET_LEN(big, len);
         (void)VALGRIND_MAKE_MEM_UNDEFINED((void*)RBIGNUM(big)->as.ary, sizeof(RBIGNUM(big)->as.ary));
     }
     else {
@@ -2998,7 +2994,7 @@ bignew_1(VALUE klass, long len, int sign)
 }
 
 VALUE
-rb_big_new(long len, int sign)
+rb_big_new(size_t len, int sign)
 {
     return bignew(len, sign != 0);
 }
@@ -3006,8 +3002,8 @@ rb_big_new(long len, int sign)
 VALUE
 rb_big_clone(VALUE x)
 {
-    long len = RBIGNUM_LEN(x);
-    VALUE z = bignew_1(CLASS_OF(x), len, RBIGNUM_SIGN(x));
+    size_t len = BIGNUM_LEN(x);
+    VALUE z = bignew_1(CLASS_OF(x), len, BIGNUM_SIGN(x));
 
     MEMCPY(BDIGITS(z), BDIGITS(x), BDIGIT, len);
     return z;
@@ -3016,15 +3012,15 @@ rb_big_clone(VALUE x)
 static void
 big_extend_carry(VALUE x)
 {
-    rb_big_resize(x, RBIGNUM_LEN(x)+1);
-    BDIGITS(x)[RBIGNUM_LEN(x)-1] = 1;
+    rb_big_resize(x, BIGNUM_LEN(x)+1);
+    BDIGITS(x)[BIGNUM_LEN(x)-1] = 1;
 }
 
 /* modify a bignum by 2's complement */
 static void
 get2comp(VALUE x)
 {
-    long i = RBIGNUM_LEN(x);
+    long i = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
 
     if (bary_2comp(ds, i)) {
@@ -3042,13 +3038,13 @@ static BDIGIT
 abs2twocomp(VALUE *xp, long *n_ret)
 {
     VALUE x = *xp;
-    long n = RBIGNUM_LEN(x);
+    long n = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
     BDIGIT hibits = 0;
 
     BARY_TRUNC(ds, n);
 
-    if (n != 0 && RBIGNUM_NEGATIVE_P(x)) {
+    if (n != 0 && BIGNUM_NEGATIVE_P(x)) {
         VALUE z = bignew_1(CLASS_OF(x), n, 0);
         MEMCPY(BDIGITS(z), ds, BDIGIT, n);
         bary_2comp(BDIGITS(z), n);
@@ -3062,7 +3058,7 @@ abs2twocomp(VALUE *xp, long *n_ret)
 static void
 twocomp2abs_bang(VALUE x, int hibits)
 {
-    RBIGNUM_SET_SIGN(x, !hibits);
+    BIGNUM_SET_SIGN(x, !hibits);
     if (hibits) {
         get2comp(x);
     }
@@ -3071,12 +3067,12 @@ twocomp2abs_bang(VALUE x, int hibits)
 static inline VALUE
 bigtrunc(VALUE x)
 {
-    long len = RBIGNUM_LEN(x);
+    size_t len = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
 
     if (len == 0) return x;
     while (--len && !ds[len]);
-    if (RBIGNUM_LEN(x) > len+1) {
+    if (BIGNUM_LEN(x) > len+1) {
 	rb_big_resize(x, len+1);
     }
     return x;
@@ -3085,9 +3081,9 @@ bigtrunc(VALUE x)
 static inline VALUE
 bigfixize(VALUE x)
 {
-    size_t n = RBIGNUM_LEN(x);
+    size_t n = BIGNUM_LEN(x);
     BDIGIT *ds = BDIGITS(x);
-#if SIZEOF_BDIGITS < SIZEOF_LONG
+#if SIZEOF_BDIGIT < SIZEOF_LONG
     unsigned long u;
 #else
     BDIGIT u;
@@ -3097,8 +3093,8 @@ bigfixize(VALUE x)
 
     if (n == 0) return INT2FIX(0);
 
-#if SIZEOF_BDIGITS < SIZEOF_LONG
-    if (sizeof(long)/SIZEOF_BDIGITS < n)
+#if SIZEOF_BDIGIT < SIZEOF_LONG
+    if (sizeof(long)/SIZEOF_BDIGIT < n)
         goto return_big;
     else {
         int i = (int)n;
@@ -3107,14 +3103,14 @@ bigfixize(VALUE x)
             u = (unsigned long)(BIGUP(u) + ds[i]);
         }
     }
-#else /* SIZEOF_BDIGITS >= SIZEOF_LONG */
+#else /* SIZEOF_BDIGIT >= SIZEOF_LONG */
     if (1 < n)
         goto return_big;
     else
         u = ds[0];
 #endif
 
-    if (RBIGNUM_POSITIVE_P(x)) {
+    if (BIGNUM_POSITIVE_P(x)) {
         if (POSFIXABLE(u)) return LONG2FIX((long)u);
     }
     else {
@@ -3148,7 +3144,7 @@ rb_uint2big(VALUE n)
     VALUE big = bignew(bdigit_roomof(SIZEOF_VALUE), 1);
     BDIGIT *digits = BDIGITS(big);
 
-#if SIZEOF_BDIGITS >= SIZEOF_VALUE
+#if SIZEOF_BDIGIT >= SIZEOF_VALUE
     digits[0] = n;
 #else
     for (i = 0; i < bdigit_roomof(SIZEOF_VALUE); i++) {
@@ -3159,7 +3155,7 @@ rb_uint2big(VALUE n)
 
     i = bdigit_roomof(SIZEOF_VALUE);
     while (--i && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
+    BIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
@@ -3179,7 +3175,7 @@ rb_int2big(SIGNED_VALUE n)
     }
     big = rb_uint2big(u);
     if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+	BIGNUM_SET_SIGN(big, 0);
     }
     return big;
 }
@@ -3246,7 +3242,7 @@ rb_absint_size(VALUE val, int *nlz_bits_ret)
         if (v < 0) {
             v = -v;
         }
-#if SIZEOF_BDIGITS >= SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
         fixbuf[0] = v;
 #else
         {
@@ -3262,7 +3258,7 @@ rb_absint_size(VALUE val, int *nlz_bits_ret)
     }
     else {
         dp = BDIGITS(val);
-        de = dp + RBIGNUM_LEN(val);
+        de = dp + BIGNUM_LEN(val);
     }
     while (dp < de && de[-1] == 0)
         de--;
@@ -3274,7 +3270,7 @@ rb_absint_size(VALUE val, int *nlz_bits_ret)
     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;
+    return (de - dp) * SIZEOF_BDIGIT - num_leading_zeros / CHAR_BIT;
 }
 
 static size_t
@@ -3297,7 +3293,7 @@ absint_numwords_generic(size_t numbytes, int nlz_bits_in_msbyte, size_t word_num
     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 nlz_bits_in_msbyte_bary[1];
     BDIGIT word_numbits_bary[bdigit_roomof(sizeof(word_numbits))];
     BDIGIT div_bary[numberof(val_numbits_bary) + BIGDIVREM_EXTRA_WORDS];
     BDIGIT mod_bary[numberof(word_numbits_bary)];
@@ -3307,6 +3303,8 @@ absint_numwords_generic(size_t numbytes, int nlz_bits_in_msbyte, size_t word_num
     int sign;
     size_t numwords;
 
+    nlz_bits_in_msbyte_bary[0] = nlz_bits_in_msbyte;
+
     /*
      * val_numbits = numbytes * CHAR_BIT - nlz_bits_in_msbyte
      * div, mod = val_numbits.divmod(word_numbits)
@@ -3411,7 +3409,7 @@ rb_absint_numwords(VALUE val, size_t word_numbits, size_t *nlz_bits_ret)
  * 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);
+ *   int neg = FIXNUM_P(val) ? FIX2LONG(val) < 0 : BIGNUM_NEGATIVE_P(val);
  *   size = rb_absint_numwords(val, 1, NULL)
  *   if (size == (size_t)-1) ...overflow...
  *   if (neg && rb_absint_singlebit_p(val))
@@ -3421,7 +3419,7 @@ rb_absint_numwords(VALUE val, size_t word_numbits, size_t *nlz_bits_ret)
  * 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 neg = FIXNUM_P(val) ? FIX2LONG(val) < 0 : BIGNUM_NEGATIVE_P(val);
  *   int nlz_bits;
  *   size = rb_absint_size(val, &nlz_bits);
  *   if (nlz_bits == 0 && !(neg && rb_absint_singlebit_p(val)))
@@ -3442,7 +3440,7 @@ rb_absint_singlebit_p(VALUE val)
         if (v < 0) {
             v = -v;
         }
-#if SIZEOF_BDIGITS >= SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
         fixbuf[0] = v;
 #else
         {
@@ -3458,7 +3456,7 @@ rb_absint_singlebit_p(VALUE val)
     }
     else {
         dp = BDIGITS(val);
-        de = dp + RBIGNUM_LEN(val);
+        de = dp + BIGNUM_LEN(val);
     }
     while (dp < de && de[-1] == 0)
         de--;
@@ -3547,7 +3545,7 @@ rb_integer_pack(VALUE val, void *words, size_t numwords, size_t wordsize, size_t
         else {
             sign = 1;
         }
-#if SIZEOF_BDIGITS >= SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
         fixbuf[0] = v;
 #else
         {
@@ -3562,9 +3560,9 @@ rb_integer_pack(VALUE val, void *words, size_t numwords, size_t wordsize, size_t
         num_bdigits = numberof(fixbuf);
     }
     else {
-        sign = RBIGNUM_POSITIVE_P(val) ? 1 : -1;
+        sign = BIGNUM_POSITIVE_P(val) ? 1 : -1;
         ds = BDIGITS(val);
-        num_bdigits = RBIGNUM_LEN(val);
+        num_bdigits = BIGNUM_LEN(val);
     }
 
     return bary_pack(sign, ds, num_bdigits, words, numwords, wordsize, nails, flags);
@@ -3677,33 +3675,15 @@ rb_integer_unpack(const void *words, size_t numwords, size_t wordsize, size_t na
     }
 
     if ((flags & INTEGER_PACK_FORCE_BIGNUM) && sign != 0 &&
-        bary_zero_p(BDIGITS(val), RBIGNUM_LEN(val)))
+        bary_zero_p(BDIGITS(val), BIGNUM_LEN(val)))
         sign = 0;
-    RBIGNUM_SET_SIGN(val, 0 <= sign);
+    BIGNUM_SET_SIGN(val, 0 <= sign);
 
     if (flags & INTEGER_PACK_FORCE_BIGNUM)
         return bigtrunc(val);
     return bignorm(val);
 }
 
-#define QUAD_SIZE 8
-
-void
-rb_quad_pack(char *buf, VALUE val)
-{
-    rb_integer_pack(val, buf, 1, QUAD_SIZE, 0,
-            INTEGER_PACK_NATIVE_BYTE_ORDER|
-            INTEGER_PACK_2COMP);
-}
-
-VALUE
-rb_quad_unpack(const char *buf, int signed_p)
-{
-    return rb_integer_unpack(buf, 1, QUAD_SIZE, 0,
-            INTEGER_PACK_NATIVE_BYTE_ORDER|
-            (signed_p ? INTEGER_PACK_2COMP : 0));
-}
-
 #define conv_digit(c) (ruby_digit36_to_number_table[(unsigned char)(c)])
 
 static void
@@ -3889,11 +3869,11 @@ str2big_karatsuba(
     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_mul(vds+i, unit*2, BDIGITS(powerv), BIGNUM_LEN(powerv), uds+i+unit, unit);
                 bary_add(vds+i, unit*2, vds+i, unit*2, uds+i, unit);
             }
             else if (unit <= num_bdigits - i) {
-                bary_mul(vds+i, num_bdigits-i, BDIGITS(powerv), RBIGNUM_LEN(powerv), uds+i+unit, num_bdigits-(i+unit));
+                bary_mul(vds+i, num_bdigits-i, BDIGITS(powerv), BIGNUM_LEN(powerv), uds+i+unit, num_bdigits-(i+unit));
                 bary_add(vds+i, num_bdigits-i, vds+i, num_bdigits-i, uds+i, unit);
             }
             else {
@@ -3926,7 +3906,7 @@ str2big_gmp(
     size_t num_bdigits,
     int base)
 {
-    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGITS)*CHAR_BIT;
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
     char *buf, *p;
     const char *q;
     VALUE tmps;
@@ -4054,8 +4034,10 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 	    if (c == '_') {
 		if (++us >= 2)
 		    break;
-	    } else
+	    }
+	    else {
 		us = 0;
+	    }
 	}
 	if (!(c = *str) || ISSPACE(c)) --str;
     }
@@ -4087,7 +4069,7 @@ rb_cstr_to_inum(const char *str, int base, int badcheck)
 	}
 	else {
 	    VALUE big = rb_uint2big(val);
-	    RBIGNUM_SET_SIGN(big, sign);
+	    BIGNUM_SET_SIGN(big, sign);
 	    return bignorm(big);
 	}
     }
@@ -4318,7 +4300,7 @@ rb_ull2big(unsigned LONG_LONG n)
     VALUE big = bignew(bdigit_roomof(SIZEOF_LONG_LONG), 1);
     BDIGIT *digits = BDIGITS(big);
 
-#if SIZEOF_BDIGITS >= SIZEOF_LONG_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG_LONG
     digits[0] = n;
 #else
     for (i = 0; i < bdigit_roomof(SIZEOF_LONG_LONG); i++) {
@@ -4329,7 +4311,7 @@ rb_ull2big(unsigned LONG_LONG n)
 
     i = bdigit_roomof(SIZEOF_LONG_LONG);
     while (i-- && !digits[i]) ;
-    RBIGNUM_SET_LEN(big, i+1);
+    BIGNUM_SET_LEN(big, i+1);
     return big;
 }
 
@@ -4349,7 +4331,7 @@ rb_ll2big(LONG_LONG n)
     }
     big = rb_ull2big(u);
     if (neg) {
-	RBIGNUM_SET_SIGN(big, 0);
+	BIGNUM_SET_SIGN(big, 0);
     }
     return big;
 }
@@ -4397,8 +4379,8 @@ big_shift3(VALUE x, int lshift_p, size_t shift_numdigits, int shift_numbits)
         }
         s1 = shift_numdigits;
         s2 = shift_numbits;
-        xn = RBIGNUM_LEN(x);
-        z = bignew(xn+s1+1, RBIGNUM_SIGN(x));
+        xn = BIGNUM_LEN(x);
+        z = bignew(xn+s1+1, BIGNUM_SIGN(x));
         zds = BDIGITS(z);
         BDIGITS_ZERO(zds, s1);
         xds = BDIGITS(x);
@@ -4407,9 +4389,9 @@ big_shift3(VALUE x, int lshift_p, size_t shift_numdigits, int shift_numbits)
     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)))
+        if (LONG_MAX < shift_numdigits || (size_t)BIGNUM_LEN(x) <= shift_numdigits) {
+            if (BIGNUM_POSITIVE_P(x) ||
+                bary_zero_p(BDIGITS(x), BIGNUM_LEN(x)))
                 return INT2FIX(0);
             else
                 return INT2FIX(-1);
@@ -4456,7 +4438,7 @@ big_shift2(VALUE x, int lshift_p, VALUE y)
     }
     else {
         if (1 < sign || CHAR_BIT <= lens[1])
-            return RBIGNUM_POSITIVE_P(x) ? INT2FIX(0) : INT2FIX(-1);
+            return BIGNUM_POSITIVE_P(x) ? INT2FIX(0) : INT2FIX(-1);
     }
     shift_numbits = (int)(lens[0] & (BITSPERDIG-1));
     shift_numdigits = (lens[0] >> bit_length(BITSPERDIG-1)) |
@@ -4540,61 +4522,6 @@ power_cache_get_power(int base, int power_level, size_t *numdigits_ret)
     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)) {
-	bits = (SIZEOF_LONG*CHAR_BIT - 1)/2 + 1;
-    }
-    else if (BIGZEROP(x)) {
-	return 0;
-    }
-    else if (RBIGNUM_LEN(x) >= LONG_MAX/BITSPERDIG) {
-	rb_raise(rb_eRangeError, "bignum too big to convert into `string'");
-    }
-    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;
@@ -4700,7 +4627,7 @@ big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
 
     lower_power_level = power_level-1;
     b = power_cache_get_power(b2s->base, lower_power_level, &lower_numdigits);
-    bn = RBIGNUM_LEN(b);
+    bn = BIGNUM_LEN(b);
     bds = BDIGITS(b);
 
     half_numdigits = lower_numdigits;
@@ -4710,7 +4637,7 @@ big2str_karatsuba(struct big2str_struct *b2s, BDIGIT *xds, size_t xn, size_t wn,
              (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);
+        bn = BIGNUM_LEN(b);
         bds = BDIGITS(b);
     }
 
@@ -4783,12 +4710,12 @@ big2str_base_poweroftwo(VALUE x, int base)
     VALUE result;
     char *ptr;
     numwords = rb_absint_numwords(x, word_numbits, NULL);
-    if (RBIGNUM_NEGATIVE_P(x)) {
+    if (BIGNUM_NEGATIVE_P(x)) {
         if (LONG_MAX-1 < numwords)
             rb_raise(rb_eArgError, "too big number");
         result = rb_usascii_str_new(0, 1+numwords);
         ptr = RSTRING_PTR(result);
-        *ptr++ = RBIGNUM_POSITIVE_P(x) ? '+' : '-';
+        *ptr++ = BIGNUM_POSITIVE_P(x) ? '+' : '-';
     }
     else {
         if (LONG_MAX < numwords)
@@ -4822,7 +4749,7 @@ big2str_generic(VALUE x, int base)
     VALUE power;
 
     xds = BDIGITS(x);
-    xn = RBIGNUM_LEN(x);
+    xn = BIGNUM_LEN(x);
     BARY_TRUNC(xds, xn);
 
     if (xn == 0) {
@@ -4839,13 +4766,13 @@ big2str_generic(VALUE x, int base)
     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) {
+           (size_t)BIGNUM_LEN(power) <= (xn+1)/2) {
         power_level++;
         power = power_cache_get_power(base, power_level, NULL);
     }
     assert(power_level != MAX_BASE36_POWER_TABLE_ENTRIES);
 
-    if ((size_t)RBIGNUM_LEN(power) <= xn) {
+    if ((size_t)BIGNUM_LEN(power) <= xn) {
         /*
          * This increment guarantees x < power_cache_get_power(base, power_level)
          * without invoking it actually.
@@ -4859,7 +4786,7 @@ big2str_generic(VALUE x, int base)
         power_level++;
     }
 
-    b2s_data.negative = RBIGNUM_NEGATIVE_P(x);
+    b2s_data.negative = BIGNUM_NEGATIVE_P(x);
     b2s_data.base = base;
     b2s_data.hbase2 = maxpow_in_bdigit_dbl(base, &b2s_data.hbase2_numdigits);
 
@@ -4873,7 +4800,7 @@ big2str_generic(VALUE x, int base)
         VALUE tmpw = 0;
         BDIGIT *wds;
         size_t wn;
-        wn = power_level * BIGDIVREM_EXTRA_WORDS + RBIGNUM_LEN(power);
+        wn = power_level * BIGDIVREM_EXTRA_WORDS + BIGNUM_LEN(power);
         wds = ALLOCV_N(BDIGIT, tmpw, xn + wn);
         MEMCPY(wds, xds, BDIGIT, xn);
 	big2str_karatsuba(&b2s_data, wds, xn, wn, power_level, 0);
@@ -4899,19 +4826,19 @@ rb_big2str_generic(VALUE x, int base)
 VALUE
 big2str_gmp(VALUE x, int base)
 {
-    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGITS)*CHAR_BIT;
+    const size_t nails = (sizeof(BDIGIT)-SIZEOF_BDIGIT)*CHAR_BIT;
     mpz_t mx;
     size_t size;
     VALUE str;
     BDIGIT *xds = BDIGITS(x);
-    size_t xn = RBIGNUM_LEN(x);
+    size_t xn = BIGNUM_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)) {
+    if (BIGNUM_NEGATIVE_P(x)) {
         mpz_neg(mx, mx);
         str = rb_usascii_str_new(0, size+1);
     }
@@ -4948,7 +4875,7 @@ rb_big2str1(VALUE x, int base)
 
     bigtrunc(x);
     xds = BDIGITS(x);
-    xn = RBIGNUM_LEN(x);
+    xn = BIGNUM_LEN(x);
     BARY_TRUNC(xds, xn);
 
     if (xn == 0) {
@@ -4976,41 +4903,6 @@ rb_big2str1(VALUE x, int base)
     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)
 {
@@ -5049,7 +4941,7 @@ rb_big_to_s(int argc, VALUE *argv, VALUE x)
 static unsigned long
 big2ulong(VALUE x, const char *type)
 {
-    long len = RBIGNUM_LEN(x);
+    size_t len = BIGNUM_LEN(x);
     unsigned long num;
     BDIGIT *ds;
 
@@ -5059,7 +4951,7 @@ big2ulong(VALUE x, const char *type)
         rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
     }
     ds = BDIGITS(x);
-#if SIZEOF_LONG <= SIZEOF_BDIGITS
+#if SIZEOF_LONG <= SIZEOF_BDIGIT
     num = (unsigned long)ds[0];
 #else
     num = 0;
@@ -5071,22 +4963,12 @@ big2ulong(VALUE x, const char *type)
     return num;
 }
 
-/* deprecated */
-VALUE
-rb_big2ulong_pack(VALUE x)
-{
-    unsigned long num;
-    rb_integer_pack(x, &num, 1, sizeof(num), 0,
-        INTEGER_PACK_NATIVE_BYTE_ORDER|INTEGER_PACK_2COMP);
-    return num;
-}
-
-VALUE
+unsigned long
 rb_big2ulong(VALUE x)
 {
     unsigned long num = big2ulong(x, "unsigned long");
 
-    if (RBIGNUM_POSITIVE_P(x)) {
+    if (BIGNUM_POSITIVE_P(x)) {
         return num;
     }
     else {
@@ -5098,12 +4980,12 @@ rb_big2ulong(VALUE x)
     rb_raise(rb_eRangeError, "bignum out of range of unsigned long");
 }
 
-SIGNED_VALUE
+long
 rb_big2long(VALUE x)
 {
     unsigned long num = big2ulong(x, "long");
 
-    if (RBIGNUM_POSITIVE_P(x)) {
+    if (BIGNUM_POSITIVE_P(x)) {
         if (num <= LONG_MAX)
             return num;
     }
@@ -5121,7 +5003,7 @@ rb_big2long(VALUE x)
 static unsigned LONG_LONG
 big2ull(VALUE x, const char *type)
 {
-    long len = RBIGNUM_LEN(x);
+    size_t len = BIGNUM_LEN(x);
     unsigned LONG_LONG num;
     BDIGIT *ds = BDIGITS(x);
 
@@ -5129,7 +5011,7 @@ big2ull(VALUE x, const char *type)
         return 0;
     if (BIGSIZE(x) > SIZEOF_LONG_LONG)
 	rb_raise(rb_eRangeError, "bignum too big to convert into `%s'", type);
-#if SIZEOF_LONG_LONG <= SIZEOF_BDIGITS
+#if SIZEOF_LONG_LONG <= SIZEOF_BDIGIT
     num = (unsigned LONG_LONG)ds[0];
 #else
     num = 0;
@@ -5146,7 +5028,7 @@ rb_big2ull(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "unsigned long long");
 
-    if (RBIGNUM_POSITIVE_P(x)) {
+    if (BIGNUM_POSITIVE_P(x)) {
         return num;
     }
     else {
@@ -5163,7 +5045,7 @@ rb_big2ll(VALUE x)
 {
     unsigned LONG_LONG num = big2ull(x, "long long");
 
-    if (RBIGNUM_POSITIVE_P(x)) {
+    if (BIGNUM_POSITIVE_P(x)) {
         if (num <= LLONG_MAX)
             return num;
     }
@@ -5220,7 +5102,7 @@ static double
 big2dbl(VALUE x)
 {
     double d = 0.0;
-    long i = (bigtrunc(x), RBIGNUM_LEN(x)), lo = 0, bits;
+    long i = (bigtrunc(x), BIGNUM_LEN(x)), lo = 0, bits;
     BDIGIT *ds = BDIGITS(x), dl;
 
     if (i) {
@@ -5262,7 +5144,7 @@ big2dbl(VALUE x)
 	    }
 	}
     }
-    if (!RBIGNUM_SIGN(x)) d = -d;
+    if (!BIGNUM_SIGN(x)) d = -d;
     return d;
 }
 
@@ -5395,13 +5277,17 @@ rb_big_cmp(VALUE x, VALUE y)
 {
     int cmp;
 
-    if (y == INT2FIX(0)) {
-        if (BIGZEROP(x)) return INT2FIX(0);
-        if (RBIGNUM_NEGATIVE_P(x)) return INT2FIX(-1);
-        return INT2FIX(1);
-    }
-    else if (FIXNUM_P(y)) {
-	y = rb_int2big(FIX2LONG(y));
+    if (FIXNUM_P(y)) {
+        x = bignorm(x);
+        if (FIXNUM_P(x)) {
+            if (FIX2LONG(x) > FIX2LONG(y)) return INT2FIX(1);
+            if (FIX2LONG(x) < FIX2LONG(y)) return INT2FIX(-1);
+            return INT2FIX(0);
+        }
+        else {
+            if (BIGNUM_NEGATIVE_P(x)) return INT2FIX(-1);
+            return INT2FIX(1);
+        }
     }
     else if (RB_BIGNUM_TYPE_P(y)) {
     }
@@ -5412,11 +5298,11 @@ rb_big_cmp(VALUE x, VALUE y)
 	return rb_num_coerce_cmp(x, y, rb_intern("<=>"));
     }
 
-    if (RBIGNUM_SIGN(x) > RBIGNUM_SIGN(y)) return INT2FIX(1);
-    if (RBIGNUM_SIGN(x) < RBIGNUM_SIGN(y)) return INT2FIX(-1);
+    if (BIGNUM_SIGN(x) > BIGNUM_SIGN(y)) return INT2FIX(1);
+    if (BIGNUM_SIGN(x) < BIGNUM_SIGN(y)) return INT2FIX(-1);
 
-    cmp = bary_cmp(BDIGITS(x), RBIGNUM_LEN(x), BDIGITS(y), RBIGNUM_LEN(y));
-    if (RBIGNUM_SIGN(x))
+    cmp = bary_cmp(BDIGITS(x), BIGNUM_LEN(x), BDIGITS(y), BIGNUM_LEN(y));
+    if (BIGNUM_SIGN(x))
         return INT2FIX(cmp);
     else
         return INT2FIX(-cmp);
@@ -5546,9 +5432,9 @@ rb_big_eq(VALUE x, VALUE y)
     else {
 	return rb_equal(y, x);
     }
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y)) return Qfalse;
-    if (RBIGNUM_LEN(x) != RBIGNUM_LEN(y)) return Qfalse;
-    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,RBIGNUM_LEN(y)) != 0) return Qfalse;
+    if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y)) return Qfalse;
+    if (BIGNUM_LEN(x) != BIGNUM_LEN(y)) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,BIGNUM_LEN(y)) != 0) return Qfalse;
     return Qtrue;
 }
 
@@ -5567,9 +5453,9 @@ VALUE
 rb_big_eql(VALUE x, VALUE y)
 {
     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;
+    if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y)) return Qfalse;
+    if (BIGNUM_LEN(x) != BIGNUM_LEN(y)) return Qfalse;
+    if (MEMCMP(BDIGITS(x),BDIGITS(y),BDIGIT,BIGNUM_LEN(y)) != 0) return Qfalse;
     return Qtrue;
 }
 
@@ -5585,7 +5471,7 @@ rb_big_uminus(VALUE x)
 {
     VALUE z = rb_big_clone(x);
 
-    RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+    BIGNUM_SET_SIGN(z, !BIGNUM_SIGN(x));
 
     return bignorm(z);
 }
@@ -5607,22 +5493,22 @@ rb_big_neg(VALUE x)
 {
     VALUE z = rb_big_clone(x);
     BDIGIT *ds = BDIGITS(z);
-    long n = RBIGNUM_LEN(z);
+    long n = BIGNUM_LEN(z);
 
     if (!n) return INT2FIX(-1);
 
-    if (RBIGNUM_POSITIVE_P(z)) {
+    if (BIGNUM_POSITIVE_P(z)) {
         if (bary_add_one(ds, n)) {
             big_extend_carry(z);
         }
-        RBIGNUM_SET_NEGATIVE_SIGN(z);
+        BIGNUM_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);
+        BIGNUM_SET_POSITIVE_SIGN(z);
     }
 
     return bignorm(z);
@@ -5635,8 +5521,8 @@ bigsub(VALUE x, VALUE y)
     BDIGIT *xds, *yds, *zds;
     long xn, yn, zn;
 
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
+    xn = BIGNUM_LEN(x);
+    yn = BIGNUM_LEN(y);
     zn = xn < yn ? yn : xn;
 
     z = bignew(zn, 1);
@@ -5647,7 +5533,7 @@ bigsub(VALUE x, VALUE y)
 
     if (bary_sub(zds, zn, xds, xn, yds, yn)) {
         bary_2comp(zds, zn);
-        RBIGNUM_SET_NEGATIVE_SIGN(z);
+        BIGNUM_SET_NEGATIVE_SIGN(z);
     }
 
     return z;
@@ -5666,24 +5552,24 @@ bigsub_int(VALUE x, long y0)
 
     y = y0;
     xds = BDIGITS(x);
-    xn = RBIGNUM_LEN(x);
+    xn = BIGNUM_LEN(x);
 
     if (xn == 0)
         return LONG2NUM(-y0);
 
     zn = xn;
-#if SIZEOF_BDIGITS < SIZEOF_LONG
+#if SIZEOF_BDIGIT < SIZEOF_LONG
     if (zn < bdigit_roomof(SIZEOF_LONG))
         zn = bdigit_roomof(SIZEOF_LONG);
 #endif
-    z = bignew(zn, RBIGNUM_SIGN(x));
+    z = bignew(zn, BIGNUM_SIGN(x));
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS >= SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     assert(xn == zn);
     num = (BDIGIT_DBL_SIGNED)xds[0] - y;
     if (xn == 1 && num < 0) {
-	RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+	BIGNUM_SET_SIGN(z, !BIGNUM_SIGN(x));
 	zds[0] = (BDIGIT)-num;
 	RB_GC_GUARD(x);
 	return bignorm(z);
@@ -5720,7 +5606,7 @@ bigsub_int(VALUE x, long y0)
 	zds[i] = BIGLO(num);
 	num = BIGDN(num);
     }
-#if SIZEOF_BDIGITS < SIZEOF_LONG
+#if SIZEOF_BDIGIT < SIZEOF_LONG
     for (; i < zn; i++) {
       y_is_zero_z:
         if (num == 0) goto num_is_zero_z;
@@ -5734,7 +5620,7 @@ bigsub_int(VALUE x, long y0)
       num_is_zero_x:
 	zds[i] = xds[i];
     }
-#if SIZEOF_BDIGITS < SIZEOF_LONG
+#if SIZEOF_BDIGIT < SIZEOF_LONG
     for (; i < zn; i++) {
       num_is_zero_z:
         zds[i] = 0;
@@ -5746,7 +5632,7 @@ bigsub_int(VALUE x, long y0)
     assert(num == 0 || num == -1);
     if (num < 0) {
         get2comp(z);
-	RBIGNUM_SET_SIGN(z, !RBIGNUM_SIGN(x));
+	BIGNUM_SET_SIGN(z, !BIGNUM_SIGN(x));
     }
     RB_GC_GUARD(x);
     return bignorm(z);
@@ -5762,22 +5648,22 @@ bigadd_int(VALUE x, long y)
     long i;
 
     xds = BDIGITS(x);
-    xn = RBIGNUM_LEN(x);
+    xn = BIGNUM_LEN(x);
 
     if (xn == 0)
         return LONG2NUM(y);
 
     zn = xn;
-#if SIZEOF_BDIGITS < SIZEOF_LONG
+#if SIZEOF_BDIGIT < SIZEOF_LONG
     if (zn < bdigit_roomof(SIZEOF_LONG))
         zn = bdigit_roomof(SIZEOF_LONG);
 #endif
     zn++;
 
-    z = bignew(zn, RBIGNUM_SIGN(x));
+    z = bignew(zn, BIGNUM_SIGN(x));
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS >= SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     num = (BDIGIT_DBL)xds[0] + y;
     zds[0] = BIGLO(num);
     num = BIGDN(num);
@@ -5839,25 +5725,25 @@ static VALUE
 bigadd(VALUE x, VALUE y, int sign)
 {
     VALUE z;
-    long len;
+    size_t len;
 
-    sign = (sign == RBIGNUM_SIGN(y));
-    if (RBIGNUM_SIGN(x) != sign) {
+    sign = (sign == BIGNUM_SIGN(y));
+    if (BIGNUM_SIGN(x) != sign) {
 	if (sign) return bigsub(y, x);
 	return bigsub(x, y);
     }
 
-    if (RBIGNUM_LEN(x) > RBIGNUM_LEN(y)) {
-	len = RBIGNUM_LEN(x) + 1;
+    if (BIGNUM_LEN(x) > BIGNUM_LEN(y)) {
+	len = BIGNUM_LEN(x) + 1;
     }
     else {
-	len = RBIGNUM_LEN(y) + 1;
+	len = BIGNUM_LEN(y) + 1;
     }
     z = bignew(len, sign);
 
-    bary_add(BDIGITS(z), RBIGNUM_LEN(z),
-             BDIGITS(x), RBIGNUM_LEN(x),
-             BDIGITS(y), RBIGNUM_LEN(y));
+    bary_add(BDIGITS(z), BIGNUM_LEN(z),
+             BDIGITS(x), BIGNUM_LEN(x),
+             BDIGITS(y), BIGNUM_LEN(y));
 
     return z;
 }
@@ -5876,7 +5762,7 @@ rb_big_plus(VALUE x, VALUE y)
 
     if (FIXNUM_P(y)) {
 	n = FIX2LONG(y);
-	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	if ((n > 0) != BIGNUM_SIGN(x)) {
 	    if (n < 0) {
 		n = -n;
 	    }
@@ -5912,7 +5798,7 @@ rb_big_minus(VALUE x, VALUE y)
 
     if (FIXNUM_P(y)) {
 	n = FIX2LONG(y);
-	if ((n > 0) != RBIGNUM_SIGN(x)) {
+	if ((n > 0) != BIGNUM_SIGN(x)) {
 	    if (n < 0) {
 		n = -n;
 	    }
@@ -5941,7 +5827,7 @@ bigsq(VALUE x)
     VALUE z;
     BDIGIT *xds, *zds;
 
-    xn = RBIGNUM_LEN(x);
+    xn = BIGNUM_LEN(x);
     zn = 2 * xn;
 
     z = bignew(zn, 1);
@@ -5975,11 +5861,11 @@ bigmul0(VALUE x, VALUE y)
     if (x == y)
         return bigsq(x);
 
-    xn = RBIGNUM_LEN(x);
-    yn = RBIGNUM_LEN(y);
+    xn = BIGNUM_LEN(x);
+    yn = BIGNUM_LEN(y);
     zn = xn + yn;
 
-    z = bignew(zn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+    z = bignew(zn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
 
     xds = BDIGITS(x);
     yds = BDIGITS(y);
@@ -6020,7 +5906,7 @@ rb_big_mul(VALUE x, VALUE y)
 static VALUE
 bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
 {
-    long xn = RBIGNUM_LEN(x), yn = RBIGNUM_LEN(y);
+    long xn = BIGNUM_LEN(x), yn = BIGNUM_LEN(y);
     VALUE z;
     BDIGIT *xds, *yds, *zds;
     BDIGIT dd;
@@ -6044,12 +5930,12 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
     }
     if (yn == 1) {
 	dd = yds[0];
-	z = bignew(xn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+	z = bignew(xn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
 	zds = BDIGITS(z);
         dd = bigdivrem_single(zds, xds, xn, dd);
 	if (modp) {
 	    *modp = rb_uint2big((VALUE)dd);
-	    RBIGNUM_SET_SIGN(*modp, RBIGNUM_SIGN(x));
+	    BIGNUM_SET_SIGN(*modp, BIGNUM_SIGN(x));
 	}
 	if (divp) *divp = z;
 	return Qnil;
@@ -6060,14 +5946,14 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
         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));
+            z = bignew(bdigit_roomof(sizeof(BDIGIT_DBL)), BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
             zds = BDIGITS(z);
             zds[0] = BIGLO(q0);
             zds[1] = BIGLO(BIGDN(q0));
             *divp = z;
         }
         if (modp) {
-            z = bignew(bdigit_roomof(sizeof(BDIGIT_DBL)), RBIGNUM_SIGN(x));
+            z = bignew(bdigit_roomof(sizeof(BDIGIT_DBL)), BIGNUM_SIGN(x));
             zds = BDIGITS(z);
             zds[0] = BIGLO(r0);
             zds[1] = BIGLO(BIGDN(r0));
@@ -6078,7 +5964,7 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
 
     if (divp) {
         qn = xn + BIGDIVREM_EXTRA_WORDS;
-        q = bignew(qn, RBIGNUM_SIGN(x)==RBIGNUM_SIGN(y));
+        q = bignew(qn, BIGNUM_SIGN(x)==BIGNUM_SIGN(y));
         qds = BDIGITS(q);
     }
     else {
@@ -6088,7 +5974,7 @@ bigdivrem(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
 
     if (modp) {
         rn = yn;
-        r = bignew(rn, RBIGNUM_SIGN(x));
+        r = bignew(rn, BIGNUM_SIGN(x));
         rds = BDIGITS(r);
     }
     else {
@@ -6116,7 +6002,7 @@ bigdivmod(VALUE x, VALUE y, volatile VALUE *divp, volatile VALUE *modp)
     VALUE mod;
 
     bigdivrem(x, y, divp, &mod);
-    if (RBIGNUM_SIGN(x) != RBIGNUM_SIGN(y) && !BIGZEROP(mod)) {
+    if (BIGNUM_SIGN(x) != BIGNUM_SIGN(y) && !BIGZEROP(mod)) {
 	if (divp) *divp = bigadd(*divp, rb_int2big(1), 0);
 	if (modp) *modp = bigadd(mod, y, 1);
     }
@@ -6273,7 +6159,7 @@ big_fdiv(VALUE x, VALUE y, long ey)
     long l, ex;
 
     bigtrunc(x);
-    l = RBIGNUM_LEN(x);
+    l = BIGNUM_LEN(x);
     ex = l * BITSPERDIG - nlz(BDIGITS(x)[l-1]);
     ex -= 2 * DBL_BIGDIG * BITSPERDIG;
     if (ex) x = big_shift(x, ex);
@@ -6295,7 +6181,7 @@ big_fdiv_int(VALUE x, VALUE y)
 {
     long l, ey;
     bigtrunc(y);
-    l = RBIGNUM_LEN(y);
+    l = BIGNUM_LEN(y);
     ey = l * BITSPERDIG - nlz(BDIGITS(y)[l-1]);
     ey -= DBL_BIGDIG * BITSPERDIG;
     if (ey) y = big_shift(y, ey);
@@ -6362,7 +6248,7 @@ rb_big_fdiv(VALUE x, VALUE y)
  *
  *    123456789 ** 2      #=> 15241578750190521
  *    123456789 ** 1.2    #=> 5126464716.09932
- *    123456789 ** -2     #=> 6.5610001194102e-17
+ *    123456789 ** -2     #=> (1/15241578750190521)
  */
 
 VALUE
@@ -6375,7 +6261,7 @@ rb_big_pow(VALUE x, VALUE y)
     if (y == INT2FIX(0)) return INT2FIX(1);
     if (RB_FLOAT_TYPE_P(y)) {
 	d = RFLOAT_VALUE(y);
-	if ((!RBIGNUM_SIGN(x) && !BIGZEROP(x)) && d != round(d))
+	if ((!BIGNUM_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)) {
@@ -6432,7 +6318,7 @@ bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y)
     if (xn == 0) return hibitsx ? LONG2NUM(y) : 0;
     hibitsy = 0 <= y ? 0 : BDIGMAX;
     xds = BDIGITS(x);
-#if SIZEOF_BDIGITS >= SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     if (!hibitsy) {
 	y &= xds[0];
 	return LONG2NUM(y);
@@ -6440,7 +6326,7 @@ bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y)
 #endif
 
     zn = xn;
-#if SIZEOF_BDIGITS < SIZEOF_LONG
+#if SIZEOF_BDIGIT < SIZEOF_LONG
     if (hibitsx && zn < bdigit_roomof(SIZEOF_LONG))
         zn = bdigit_roomof(SIZEOF_LONG);
 #endif
@@ -6448,7 +6334,7 @@ bigand_int(VALUE x, long xn, BDIGIT hibitsx, long y)
     z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS >= SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     i = 1;
     zds[0] = xds[0] & BIGLO(y);
 #else
@@ -6546,15 +6432,15 @@ bigor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
     hibitsy = 0 <= y ? 0 : BDIGMAX;
     xds = BDIGITS(x);
 
-    zn = RBIGNUM_LEN(x);
-#if SIZEOF_BDIGITS < SIZEOF_LONG
+    zn = BIGNUM_LEN(x);
+#if SIZEOF_BDIGIT < SIZEOF_LONG
     if (zn < bdigit_roomof(SIZEOF_LONG))
         zn = bdigit_roomof(SIZEOF_LONG);
 #endif
     z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS >= SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     i = 1;
     zds[0] = xds[0] | BIGLO(y);
     if (i < zn)
@@ -6669,15 +6555,15 @@ bigxor_int(VALUE x, long xn, BDIGIT hibitsx, long y)
 
     hibitsy = 0 <= y ? 0 : BDIGMAX;
     xds = BDIGITS(x);
-    zn = RBIGNUM_LEN(x);
-#if SIZEOF_BDIGITS < SIZEOF_LONG
+    zn = BIGNUM_LEN(x);
+#if SIZEOF_BDIGIT < SIZEOF_LONG
     if (zn < bdigit_roomof(SIZEOF_LONG))
         zn = bdigit_roomof(SIZEOF_LONG);
 #endif
     z = bignew(zn, 0);
     zds = BDIGITS(z);
 
-#if SIZEOF_BDIGITS >= SIZEOF_LONG
+#if SIZEOF_BDIGIT >= SIZEOF_LONG
     i = 1;
     zds[0] = xds[0] ^ BIGLO(y);
 #else
@@ -6853,33 +6739,38 @@ static VALUE
 rb_big_aref(VALUE x, VALUE y)
 {
     BDIGIT *xds;
-    unsigned long shift;
-    long i, s1, s2;
+    size_t shift;
+    size_t i, s1, s2;
+    long l;
     BDIGIT bit;
 
     if (RB_BIGNUM_TYPE_P(y)) {
-	if (!RBIGNUM_SIGN(y))
+	if (!BIGNUM_SIGN(y))
 	    return INT2FIX(0);
 	bigtrunc(y);
-	if (BIGSIZE(y) > sizeof(long)) {
+	if (BIGSIZE(y) > sizeof(size_t)) {
 	  out_of_range:
-	    return RBIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
+	    return BIGNUM_SIGN(x) ? INT2FIX(0) : INT2FIX(1);
 	}
+#if SIZEOF_SIZE_T <= SIZEOF_LONG
 	shift = big2ulong(y, "long");
+#else
+	shift = big2ull(y, "long long");
+#endif
     }
     else {
-	i = NUM2LONG(y);
-	if (i < 0) return INT2FIX(0);
-	shift = i;
+	l = NUM2LONG(y);
+	if (l < 0) return INT2FIX(0);
+	shift = (size_t)l;
     }
     s1 = shift/BITSPERDIG;
     s2 = shift%BITSPERDIG;
     bit = (BDIGIT)1 << s2;
 
-    if (s1 >= RBIGNUM_LEN(x)) goto out_of_range;
+    if (s1 >= BIGNUM_LEN(x)) goto out_of_range;
 
     xds = BDIGITS(x);
-    if (RBIGNUM_POSITIVE_P(x))
+    if (BIGNUM_POSITIVE_P(x))
         return (xds[s1] & bit) ? INT2FIX(1) : INT2FIX(0);
     if (xds[s1] & (bit-1))
         return (xds[s1] & bit) ? INT2FIX(0) : INT2FIX(1);
@@ -6894,14 +6785,16 @@ rb_big_aref(VALUE x, VALUE y)
  *   big.hash   -> fixnum
  *
  * Compute a hash based on the value of _big_.
+ *
+ * See also Object#hash.
  */
 
-static VALUE
+VALUE
 rb_big_hash(VALUE x)
 {
     st_index_t hash;
 
-    hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*RBIGNUM_LEN(x)) ^ RBIGNUM_SIGN(x);
+    hash = rb_memhash(BDIGITS(x), sizeof(BDIGIT)*BIGNUM_LEN(x)) ^ BIGNUM_SIGN(x);
     return INT2FIX(hash);
 }
 
@@ -6945,9 +6838,9 @@ rb_big_coerce(VALUE x, VALUE y)
 static VALUE
 rb_big_abs(VALUE x)
 {
-    if (!RBIGNUM_SIGN(x)) {
+    if (!BIGNUM_SIGN(x)) {
 	x = rb_big_clone(x);
-	RBIGNUM_SET_SIGN(x, 1);
+	BIGNUM_SET_SIGN(x, 1);
     }
     return x;
 }
@@ -7024,7 +6917,7 @@ rb_big_bit_length(VALUE big)
     if (numbytes == 0)
         return LONG2FIX(0);
 
-    if (RBIGNUM_NEGATIVE_P(big) && rb_absint_singlebit_p(big)) {
+    if (BIGNUM_NEGATIVE_P(big) && rb_absint_singlebit_p(big)) {
         if (nlz_bits != CHAR_BIT-1) {
             nlz_bits++;
         }
@@ -7059,7 +6952,7 @@ rb_big_bit_length(VALUE big)
 static VALUE
 rb_big_odd_p(VALUE num)
 {
-    if (RBIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
+    if (BIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
 	return Qtrue;
     }
     return Qfalse;
@@ -7075,7 +6968,7 @@ rb_big_odd_p(VALUE num)
 static VALUE
 rb_big_even_p(VALUE num)
 {
-    if (RBIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
+    if (BIGNUM_LEN(num) != 0 && BDIGITS(num)[0] & 1) {
 	return Qfalse;
     }
     return Qtrue;
@@ -7145,6 +7038,7 @@ Init_Bignum(void)
     rb_define_method(rb_cBignum, "even?", rb_big_even_p, 0);
 
 #ifdef USE_GMP
+    /* The version of loaded GMP. */
     rb_define_const(rb_cBignum, "GMP_VERSION", rb_sprintf("GMP %s", gmp_version));
 #endif
 
diff --git a/bin/erb b/bin/erb
index 6a7ea7d593..1ba49c9dc1 100755
--- a/bin/erb
+++ b/bin/erb
@@ -11,7 +11,8 @@ class ERB
       return nil if self.empty?
       arg = self.shift
       return nil if arg == '--'
-      if arg =~ /^-(.)(.*)/
+      case arg
+      when /\A-(.)(.*)/
         if $1 == '-'
           arg, @maybe_arg = arg.split(/=/, 2)
           return arg
@@ -24,6 +25,8 @@ class ERB
           @maybe_arg = nil
         end
         "-#{$1}"
+      when /\A(\w+)=/
+        arg
       else
         self.unshift arg
         nil
@@ -54,6 +57,7 @@ class ERB
     def run(factory=ERB)
       trim_mode = 0
       disable_percent = false
+      variables = {}
       begin
         while switch = ARGV.switch
           case switch
@@ -72,7 +76,7 @@ class ERB
             require ARGV.req_arg
           when '-S'                        # security level
             arg = ARGV.req_arg
-            raise "invalid safe_level #{arg.dump}" unless arg =~ /^[0-3]$/
+            raise "invalid safe_level #{arg.dump}" unless arg =~ /\A[0-3]\z/
             safe_level = arg.to_i
           when '-T'                        # trim mode
             arg = ARGV.req_arg
@@ -80,7 +84,7 @@ class ERB
               trim_mode = arg
               next
             end
-            raise "invalid trim mode #{arg.dump}" unless arg =~ /^[0-2]$/
+            raise "invalid trim mode #{arg.dump}" unless arg =~ /\A[0-2]\z/
             trim_mode = arg.to_i
           when '-E', '--encoding'
             arg = ARGV.req_arg
@@ -91,14 +95,17 @@ class ERB
             disable_percent = true
           when '--help'
             raise "print this help"
-          else
+          when /\A-/
             raise "unknown switch #{switch.dump}"
+          else
+            var, val = *switch.split('=', 2)
+            (variables ||= {})[var] = val
           end
         end
       rescue                               # usage
         STDERR.puts $!.to_s
         STDERR.puts File.basename($0) +
-          " [switches] [inputfile]"
+          " [switches] [var=value...] [inputfile]"
         STDERR.puts <<EOU
   -x               print ruby script
   -n               print ruby script with line number
@@ -110,6 +117,7 @@ class ERB
   -U               set default encoding to UTF-8.
   -T trim_mode     specify trim_mode (0..2, -)
   -P               ignore lines which start with "%"
+  var=value        set variable
 EOU
         exit 1
       end
@@ -130,15 +138,23 @@ EOU
           puts erb.src
         end
       else
-        erb.run(TOPLEVEL_BINDING.taint)
+        bind = TOPLEVEL_BINDING.taint
+        if variables
+          enc = erb.encoding
+          for var, val in variables do
+            val = val.encode(enc) if val
+            bind.local_variable_set(var, val)
+          end
+        end
+        erb.run(bind)
       end
     end
     module_function :run
 
     def set_encoding(extern, intern = nil)
       verbose, $VERBOSE = $VERBOSE, nil
-      Encoding.default_external = extern unless extern.nil? || extern.empty?
-      Encoding.default_internal = intern unless intern.nil? || intern.empty?
+      Encoding.default_external = extern unless extern.nil? || extern == ""
+      Encoding.default_internal = intern unless intern.nil? || intern == ""
       [$stdin, $stdout, $stderr].each do |io|
         io.set_encoding(extern, intern)
       end
diff --git a/bin/testrb b/bin/testrb
deleted file mode 100755
index 23a00b439f..0000000000
--- a/bin/testrb
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require 'test/unit'
-exit Test::Unit::AutoRunner.run(true)
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index 5fdfc42a63..d58b824386 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -140,9 +140,8 @@ End
     @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 = ""
+    @passed = @failed = @reset = ""
   end
   unless quiet
     puts Time.now
@@ -163,28 +162,44 @@ End
   }
 end
 
+def erase(e = true)
+  if e and @columns > 0 and !@verbose
+    "\r#{" "*@columns}\r"
+  else
+    ""
+  end
+end
+
 def exec_test(pathes)
   @count = 0
   @error = 0
   @errbuf = []
   @location = nil
+  @columns = 0
+  @width = pathes.map {|path| File.basename(path).size}.max + 2
   pathes.each do |path|
     @basename = File.basename(path)
-    $stderr.print @basename, " "
+    $stderr.printf("%s%-*s ", erase(@quiet), @width, @basename)
+    $stderr.flush
+    @columns = @width + 1
     $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
+        msg = "PASS #{@count-count}"
+        @columns += msg.size - 1
+        $stderr.print "#{@progress_bs}#{@passed}#{msg}#{@reset}"
       else
-        $stderr.print "#{@progress_bs}#{@failed}FAIL #{@error-error}/#{@count-count}#{@reset}"
+        msg = "FAIL #{@error-error}/#{@count-count}"
+        $stderr.print "#{@progress_bs}#{@failed}#{msg}#{@reset}"
+        @columns = 0
       end
     end
-    $stderr.puts unless @quiet and @tty
+    $stderr.puts unless @quiet and @tty and @error == error
   end
+  $stderr.print(erase) if @quiet
   if @error == 0
     if @count == 0
       $stderr.puts "No tests, no problem"
@@ -207,23 +222,28 @@ def show_progress(message = '')
   elsif @tty
     $stderr.print "#{@progress_bs}#{@progress[@count % @progress.size]}"
   end
+  t = Time.now if @verbose
   faildesc, errout = with_stderr {yield}
+  t = Time.now - t if @verbose
   if !faildesc
     if @tty
       $stderr.print "#{@progress_bs}#{@progress[@count % @progress.size]}"
+    elsif @verbose
+      $stderr.printf(". %.3f\n", t)
     else
       $stderr.print '.'
     end
-    $stderr.puts if @verbose
   else
-    $stderr.print "#{@failed}F#{@reset}"
+    $stderr.print "#{@failed}F"
+    $stderr.printf(" %.3f", t) if @verbose
+    $stderr.print "#{@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]
+      $stderr.printf("%-*s%s", @width, @basename, @progress[@count % @progress.size])
     end
   end
 rescue Interrupt
@@ -385,7 +405,7 @@ end
 INDENT = 27
 
 def adjust_indent(src)
-  untabify(src).gsub(/^ {#{INDENT}}/o, '').gsub(/^/, '   ')
+  untabify(src).gsub(/^ {#{INDENT}}/o, '').gsub(/^/, '   ').sub(/\s*\z/, "\n")
 end
 
 def untabify(str)
@@ -445,7 +465,7 @@ end
 def error(msg, additional_message)
   msg = "#{@failed}\##{@count} #{@location}#{@reset}: #{msg}  #{additional_message}"
   if @tty
-    $stderr.puts "#{@erase}#{msg}"
+    $stderr.puts "#{erase}#{msg}"
   else
     @errbuf.push msg
   end
diff --git a/bootstraptest/test_block.rb b/bootstraptest/test_block.rb
index 6a2ccfc6da..cdc5960a59 100644
--- a/bootstraptest/test_block.rb
+++ b/bootstraptest/test_block.rb
@@ -597,3 +597,17 @@ assert_equal 'true', %q{
   C1.new.foo{}
 }
 
+assert_equal 'ok', %q{
+  1.times do
+    begin
+      raise
+    rescue
+      begin
+        raise
+      rescue
+        break
+      end
+    end
+  end
+  'ok'
+}
diff --git a/bootstraptest/test_fork.rb b/bootstraptest/test_fork.rb
index 384294727f..5de6ee1b12 100644
--- a/bootstraptest/test_fork.rb
+++ b/bootstraptest/test_fork.rb
@@ -22,26 +22,32 @@ assert_finish 10, %q{
 }, '[ruby-core:22158]'
 
 assert_normal_exit(<<'End', '[ruby-dev:37934]')
-  Thread.new { sleep 1; Thread.kill Thread.main }
+  main = Thread.current
+  Thread.new { sleep 0.01 until main.stop?; Thread.kill main }
   Process.setrlimit(:NPROC, 1)
   fork {}
 End
 
 assert_equal 'ok', %q{
   begin
+    r, w = IO.pipe
     if pid1 = fork
-      sleep 1
+      w.close
+      r.read(1)
       Process.kill("USR1", pid1)
       _, s = Process.wait2(pid1)
       s.success? ? :ok : :ng
     else
+      r.close
       if pid2 = fork
-        trap("USR1") { Time.now.to_s }
+        trap("USR1") { Time.now.to_s; Process.kill("USR2", pid2) }
+        w.close
         Process.wait2(pid2)
       else
-        sleep 2
+        w.close
+        sleep 0.2
       end
-      exit 0
+      exit true
     end
   rescue NotImplementedError
     :ok
@@ -50,17 +56,17 @@ assert_equal 'ok', %q{
 
 assert_equal '[1, 2]', %q{
   a = []
-  trap(:INT) { a.push(1) }
-  trap(:TERM) { a.push(2) }
+  main = Thread.current
+  trap(:INT) { a.push(1).size == 2 and main.wakeup }
+  trap(:TERM) { a.push(2).size == 2 and main.wakeup }
   pid = $$
   begin
-    fork do
-      sleep 0.5
+    pid = fork do
       Process.kill(:INT, pid)
       Process.kill(:TERM, pid)
     end
-
-    sleep 1
+    Process.wait(pid)
+    100.times {break if a.size > 1; sleep 0.001}
     a.sort
   rescue NotImplementedError
     [1, 2]
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
index f7360f34b3..1d2b19368a 100644
--- a/bootstraptest/test_io.rb
+++ b/bootstraptest/test_io.rb
@@ -2,9 +2,8 @@ assert_finish 5, %q{
   r, w = IO.pipe
   t1 = Thread.new { r.sysread(1) }
   t2 = Thread.new { r.sysread(1) }
-  sleep 0.1
+  sleep 0.01 until t1.stop? and t2.stop?
   w.write "a"
-  sleep 0.1
   w.write "a"
 }, '[ruby-dev:31866]'
 
@@ -27,16 +26,16 @@ assert_finish 10, %q{
       t1.join
       t2.join
     end
-  rescue LoadError, TimeoutError, NotImplementedError
+  rescue LoadError, Timeout::Error, NotImplementedError
   end
 }, '[ruby-dev:32566]'
 
 assert_finish 1, %q{
   r, w = IO.pipe
   Thread.new {
-  w << "ab"
-  sleep 0.1
-  w << "ab"
+    w << "ab"
+    sleep 0.01
+    w << "ab"
   }
   r.gets("abab")
 }
@@ -91,7 +90,8 @@ assert_normal_exit %q{
     megacontent = "abc" * 12345678
     #File.open("megasrc", "w") {|f| f << megacontent }
 
-    Thread.new { sleep rand*0.2; Process.kill(:INT, $$) }
+    t0 = Thread.main
+    Thread.new { sleep 0.001 until t0.stop?; Process.kill(:INT, $$) }
 
     r1, w1 = IO.pipe
     r2, w2 = IO.pipe
diff --git a/bootstraptest/test_literal.rb b/bootstraptest/test_literal.rb
index b95a2f2d0a..aa65bddae1 100644
--- a/bootstraptest/test_literal.rb
+++ b/bootstraptest/test_literal.rb
@@ -84,7 +84,7 @@ 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
+# dynamic regexp
 assert_equal 'regexp',          %q(/re#{'ge'}xp/.source)
 assert_equal 'Regexp',          %q(/re#{'ge'}xp/.class)
 
diff --git a/bootstraptest/test_string.rb b/bootstraptest/test_string.rb
new file mode 100644
index 0000000000..849dcd45b0
--- /dev/null
+++ b/bootstraptest/test_string.rb
@@ -0,0 +1,3 @@
+assert_normal_exit %q{
+  inspect.clear
+}, '[ruby-core:68110]'
diff --git a/bootstraptest/test_thread.rb b/bootstraptest/test_thread.rb
index 7baa806a45..d64f44be49 100644
--- a/bootstraptest/test_thread.rb
+++ b/bootstraptest/test_thread.rb
@@ -85,7 +85,7 @@ assert_equal %q{ok}, %q{
       ans = :ok
     end
   }
-  Thread.pass
+  Thread.pass until t.stop?
   t.kill
   t.join
   ans
@@ -241,16 +241,16 @@ assert_equal 'ok', %{
 }
 
 assert_finish 3, %{
-  th = Thread.new {sleep 2}
-  th.join(1)
+  th = Thread.new {sleep 0.2}
+  th.join(0.1)
   th.join
 }
 
 assert_finish 3, %{
   require 'timeout'
-  th = Thread.new {sleep 2}
+  th = Thread.new {sleep 0.2}
   begin
-    Timeout.timeout(1) {th.join}
+    Timeout.timeout(0.1) {th.join}
   rescue Timeout::Error
   end
   th.join
@@ -276,7 +276,7 @@ assert_normal_exit %q{
 assert_equal 'ok', %q{
   def m
     t = Thread.new { while true; // =~ "" end }
-    sleep 0.1
+    sleep 0.01
     10.times {
       if /((ab)*(ab)*)*(b)/ =~ "ab"*7
         return :ng if !$4
@@ -340,8 +340,9 @@ assert_equal 'ok', %q{
 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
+    f1 = f2 = false
+    Thread.new { m1.lock; f2 = true; sleep 0.001 until f1; m2.lock }
+    m2.lock; f1 = true; sleep 0.001 until f2; m1.lock
     :ng
   rescue Exception
     :ok
@@ -350,7 +351,7 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %q{
   m = Mutex.new
-  Thread.new { m.lock }; sleep 1; m.lock
+  Thread.new { m.lock }; sleep 0.1; m.lock
   :ok
 }
 
@@ -368,15 +369,15 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %q{
   m = Mutex.new
-  Thread.new { m.lock; sleep 2 }
-  sleep 1; m.lock
+  Thread.new { m.lock; sleep 0.2 }
+  sleep 0.1; m.lock
   :ok
 }
 
 assert_equal 'ok', %q{
   m = Mutex.new
-  Thread.new { m.lock; sleep 2; m.unlock }
-  sleep 1; m.lock
+  Thread.new { m.lock; sleep 0.2; m.unlock }
+  sleep 0.1; m.lock
   :ok
 }
 
@@ -398,19 +399,20 @@ assert_equal 'ok', %q{
 
 assert_equal 'ok', %{
   open("zzz.rb", "w") do |f|
-    f.puts <<-END
+    f.puts <<-'end;' # do
       begin
         m = Mutex.new
-        Thread.new { m.lock; sleep 1 }
-        sleep 0.3
         parent = Thread.current
+        th1 = Thread.new { m.lock; sleep }
+        sleep 0.01 until th1.stop?
         Thread.new do
-          sleep 0.3
+          sleep 0.01 until parent.stop?
           begin
             fork { GC.start }
           rescue Exception
             parent.raise $!
           end
+          th1.run
         end
         m.lock
         pid, status = Process.wait2
@@ -418,7 +420,7 @@ assert_equal 'ok', %{
       rescue NotImplementedError
         $result = :ok
       end
-    END
+    end;
   end
   require "./zzz.rb"
   $result
@@ -448,17 +450,27 @@ assert_finish 3, %q{
 
 assert_equal 'ok', %q{
   begin
-    Process.waitpid2(fork {sleep 1})[1].success? ? 'ok' : 'ng'
+    Process.waitpid2(fork {})[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 }
+  i = 0
+  Thread.start {sleep 1; exit!}
+  f = proc {|s, c| /#{c.call; s}/o }
+  th2 = Thread.new {
+    sleep 0.01 until i == 1
+    i = 2
+    f.call("bar", proc {sleep 2});
+    nil
+  }
+  th1 = Thread.new {
+    f.call("foo", proc {i = 1; sleep 0.01 until i == 2; sleep 0.01})
+    nil
+  }
+  [th1, th2].each {|t| t.join }
   GC.start
   f.call.source
 }
diff --git a/ccan/build_assert/build_assert.h b/ccan/build_assert/build_assert.h
new file mode 100644
index 0000000000..a04d1d4709
--- /dev/null
+++ b/ccan/build_assert/build_assert.h
@@ -0,0 +1,40 @@
+/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
+#ifndef CCAN_BUILD_ASSERT_H
+#define CCAN_BUILD_ASSERT_H
+
+/**
+ * BUILD_ASSERT - assert a build-time dependency.
+ * @cond: the compile-time condition which must be true.
+ *
+ * Your compile will fail if the condition isn't true, or can't be evaluated
+ * by the compiler.  This can only be used within a function.
+ *
+ * Example:
+ *	#include <stddef.h>
+ *	...
+ *	static char *foo_to_char(struct foo *foo)
+ *	{
+ *		// This code needs string to be at start of foo.
+ *		BUILD_ASSERT(offsetof(struct foo, string) == 0);
+ *		return (char *)foo;
+ *	}
+ */
+#define BUILD_ASSERT(cond) \
+	do { (void) sizeof(char [1 - 2*!(cond)]); } while(0)
+
+/**
+ * BUILD_ASSERT_OR_ZERO - assert a build-time dependency, as an expression.
+ * @cond: the compile-time condition which must be true.
+ *
+ * Your compile will fail if the condition isn't true, or can't be evaluated
+ * by the compiler.  This can be used in an expression: its value is "0".
+ *
+ * Example:
+ *	#define foo_to_char(foo)					\
+ *		 ((char *)(foo)						\
+ *		  + BUILD_ASSERT_OR_ZERO(offsetof(struct foo, string) == 0))
+ */
+#define BUILD_ASSERT_OR_ZERO(cond) \
+	(sizeof(char [1 - 2*!(cond)]) - 1)
+
+#endif /* CCAN_BUILD_ASSERT_H */
diff --git a/ccan/check_type/check_type.h b/ccan/check_type/check_type.h
new file mode 100644
index 0000000000..1f77a535e4
--- /dev/null
+++ b/ccan/check_type/check_type.h
@@ -0,0 +1,63 @@
+/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
+#ifndef CCAN_CHECK_TYPE_H
+#define CCAN_CHECK_TYPE_H
+
+/**
+ * check_type - issue a warning or build failure if type is not correct.
+ * @expr: the expression whose type we should check (not evaluated).
+ * @type: the exact type we expect the expression to be.
+ *
+ * This macro is usually used within other macros to try to ensure that a macro
+ * argument is of the expected type.  No type promotion of the expression is
+ * done: an unsigned int is not the same as an int!
+ *
+ * check_type() always evaluates to 0.
+ *
+ * If your compiler does not support typeof, then the best we can do is fail
+ * to compile if the sizes of the types are unequal (a less complete check).
+ *
+ * Example:
+ *	// They should always pass a 64-bit value to _set_some_value!
+ *	#define set_some_value(expr)			\
+ *		_set_some_value((check_type((expr), uint64_t), (expr)))
+ */
+
+/**
+ * check_types_match - issue a warning or build failure if types are not same.
+ * @expr1: the first expression (not evaluated).
+ * @expr2: the second expression (not evaluated).
+ *
+ * This macro is usually used within other macros to try to ensure that
+ * arguments are of identical types.  No type promotion of the expressions is
+ * done: an unsigned int is not the same as an int!
+ *
+ * check_types_match() always evaluates to 0.
+ *
+ * If your compiler does not support typeof, then the best we can do is fail
+ * to compile if the sizes of the types are unequal (a less complete check).
+ *
+ * Example:
+ *	// Do subtraction to get to enclosing type, but make sure that
+ *	// pointer is of correct type for that member.
+ *	#define container_of(mbr_ptr, encl_type, mbr)			\
+ *		(check_types_match((mbr_ptr), &((encl_type *)0)->mbr),	\
+ *		 ((encl_type *)						\
+ *		  ((char *)(mbr_ptr) - offsetof(enclosing_type, mbr))))
+ */
+#if HAVE_TYPEOF
+#define check_type(expr, type)			\
+	((typeof(expr) *)0 != (type *)0)
+
+#define check_types_match(expr1, expr2)		\
+	((typeof(expr1) *)0 != (typeof(expr2) *)0)
+#else
+#include "ccan/build_assert/build_assert.h"
+/* Without typeof, we can only test the sizes. */
+#define check_type(expr, type)					\
+	BUILD_ASSERT_OR_ZERO(sizeof(expr) == sizeof(type))
+
+#define check_types_match(expr1, expr2)				\
+	BUILD_ASSERT_OR_ZERO(sizeof(expr1) == sizeof(expr2))
+#endif /* HAVE_TYPEOF */
+
+#endif /* CCAN_CHECK_TYPE_H */
diff --git a/ccan/container_of/container_of.h b/ccan/container_of/container_of.h
new file mode 100644
index 0000000000..ae3e1fc81f
--- /dev/null
+++ b/ccan/container_of/container_of.h
@@ -0,0 +1,142 @@
+/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
+#ifndef CCAN_CONTAINER_OF_H
+#define CCAN_CONTAINER_OF_H
+#include "ccan/check_type/check_type.h"
+
+/**
+ * container_of - get pointer to enclosing structure
+ * @member_ptr: pointer to the structure member
+ * @containing_type: the type this member is within
+ * @member: the name of this member within the structure.
+ *
+ * Given a pointer to a member of a structure, this macro does pointer
+ * subtraction to return the pointer to the enclosing type.
+ *
+ * Example:
+ *	struct foo {
+ *		int fielda, fieldb;
+ *		// ...
+ *	};
+ *	struct info {
+ *		int some_other_field;
+ *		struct foo my_foo;
+ *	};
+ *
+ *	static struct info *foo_to_info(struct foo *foo)
+ *	{
+ *		return container_of(foo, struct info, my_foo);
+ *	}
+ */
+#define container_of(member_ptr, containing_type, member)		\
+	 ((containing_type *)						\
+	  ((char *)(member_ptr)						\
+	   - container_off(containing_type, member))			\
+	  + check_types_match(*(member_ptr), ((containing_type *)0)->member))
+
+
+/**
+ * container_of_or_null - get pointer to enclosing structure, or NULL
+ * @member_ptr: pointer to the structure member
+ * @containing_type: the type this member is within
+ * @member: the name of this member within the structure.
+ *
+ * Given a pointer to a member of a structure, this macro does pointer
+ * subtraction to return the pointer to the enclosing type, unless it
+ * is given NULL, in which case it also returns NULL.
+ *
+ * Example:
+ *	struct foo {
+ *		int fielda, fieldb;
+ *		// ...
+ *	};
+ *	struct info {
+ *		int some_other_field;
+ *		struct foo my_foo;
+ *	};
+ *
+ *	static struct info *foo_to_info_allowing_null(struct foo *foo)
+ *	{
+ *		return container_of_or_null(foo, struct info, my_foo);
+ *	}
+ */
+static inline char *container_of_or_null_(void *member_ptr, size_t offset)
+{
+	return member_ptr ? (char *)member_ptr - offset : NULL;
+}
+#define container_of_or_null(member_ptr, containing_type, member)	\
+	((containing_type *)						\
+	 container_of_or_null_(member_ptr,				\
+			       container_off(containing_type, member))	\
+	 + check_types_match(*(member_ptr), ((containing_type *)0)->member))
+
+/**
+ * container_off - get offset to enclosing structure
+ * @containing_type: the type this member is within
+ * @member: the name of this member within the structure.
+ *
+ * Given a pointer to a member of a structure, this macro does
+ * typechecking and figures out the offset to the enclosing type.
+ *
+ * Example:
+ *	struct foo {
+ *		int fielda, fieldb;
+ *		// ...
+ *	};
+ *	struct info {
+ *		int some_other_field;
+ *		struct foo my_foo;
+ *	};
+ *
+ *	static struct info *foo_to_info(struct foo *foo)
+ *	{
+ *		size_t off = container_off(struct info, my_foo);
+ *		return (void *)((char *)foo - off);
+ *	}
+ */
+#define container_off(containing_type, member)	\
+	offsetof(containing_type, member)
+
+/**
+ * container_of_var - get pointer to enclosing structure using a variable
+ * @member_ptr: pointer to the structure member
+ * @container_var: a pointer of same type as this member's container
+ * @member: the name of this member within the structure.
+ *
+ * Given a pointer to a member of a structure, this macro does pointer
+ * subtraction to return the pointer to the enclosing type.
+ *
+ * Example:
+ *	static struct info *foo_to_i(struct foo *foo)
+ *	{
+ *		struct info *i = container_of_var(foo, i, my_foo);
+ *		return i;
+ *	}
+ */
+#if HAVE_TYPEOF
+#define container_of_var(member_ptr, container_var, member) \
+	container_of(member_ptr, typeof(*container_var), member)
+#else
+#define container_of_var(member_ptr, container_var, member)	\
+	((void *)((char *)(member_ptr)	-			\
+		  container_off_var(container_var, member)))
+#endif
+
+/**
+ * container_off_var - get offset of a field in enclosing structure
+ * @container_var: a pointer to a container structure
+ * @member: the name of a member within the structure.
+ *
+ * Given (any) pointer to a structure and a its member name, this
+ * macro does pointer subtraction to return offset of member in a
+ * structure memory layout.
+ *
+ */
+#if HAVE_TYPEOF
+#define container_off_var(var, member)		\
+	container_off(typeof(*var), member)
+#else
+#define container_off_var(var, member)			\
+	((const char *)&(var)->member - (const char *)(var))
+#endif
+
+#endif /* CCAN_CONTAINER_OF_H */
diff --git a/ccan/licenses/BSD-MIT b/ccan/licenses/BSD-MIT
new file mode 100644
index 0000000000..89de354795
--- /dev/null
+++ b/ccan/licenses/BSD-MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/ccan/licenses/CC0 b/ccan/licenses/CC0
new file mode 100644
index 0000000000..feb9b118e6
--- /dev/null
+++ b/ccan/licenses/CC0
@@ -0,0 +1,28 @@
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
+
+    the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
+    moral rights retained by the original author(s) and/or performer(s);
+    publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
+    rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
+    rights protecting the extraction, dissemination, use and reuse of data in a Work;
+    database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
+    other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+    No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
+    Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
+    Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
+    Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.
diff --git a/ccan/list/list.h b/ccan/list/list.h
new file mode 100644
index 0000000000..749db7849a
--- /dev/null
+++ b/ccan/list/list.h
@@ -0,0 +1,635 @@
+/* Licensed under BSD-MIT - see ccan/licenses/BSD-MIT file for details */
+#ifndef CCAN_LIST_H
+#define CCAN_LIST_H
+#include <assert.h>
+#include "ccan/str/str.h"
+#include "ccan/container_of/container_of.h"
+#include "ccan/check_type/check_type.h"
+
+/**
+ * struct list_node - an entry in a doubly-linked list
+ * @next: next entry (self if empty)
+ * @prev: previous entry (self if empty)
+ *
+ * This is used as an entry in a linked list.
+ * Example:
+ *	struct child {
+ *		const char *name;
+ *		// Linked list of all us children.
+ *		struct list_node list;
+ *	};
+ */
+struct list_node
+{
+	struct list_node *next, *prev;
+};
+
+/**
+ * struct list_head - the head of a doubly-linked list
+ * @h: the list_head (containing next and prev pointers)
+ *
+ * This is used as the head of a linked list.
+ * Example:
+ *	struct parent {
+ *		const char *name;
+ *		struct list_head children;
+ *		unsigned int num_children;
+ *	};
+ */
+struct list_head
+{
+	struct list_node n;
+};
+
+#define LIST_LOC __FILE__  ":" stringify(__LINE__)
+#define list_debug(h, loc) (h)
+#define list_debug_node(n, loc) (n)
+
+/**
+ * LIST_HEAD_INIT - initializer for an empty list_head
+ * @name: the name of the list.
+ *
+ * Explicit initializer for an empty list.
+ *
+ * See also:
+ *	LIST_HEAD, list_head_init()
+ *
+ * Example:
+ *	static struct list_head my_list = LIST_HEAD_INIT(my_list);
+ */
+#define LIST_HEAD_INIT(name) { { &name.n, &name.n } }
+
+/**
+ * LIST_HEAD - define and initialize an empty list_head
+ * @name: the name of the list.
+ *
+ * The LIST_HEAD macro defines a list_head and initializes it to an empty
+ * list.  It can be prepended by "static" to define a static list_head.
+ *
+ * See also:
+ *	LIST_HEAD_INIT, list_head_init()
+ *
+ * Example:
+ *	static LIST_HEAD(my_global_list);
+ */
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+/**
+ * list_head_init - initialize a list_head
+ * @h: the list_head to set to the empty list
+ *
+ * Example:
+ *	...
+ *	struct parent *parent = malloc(sizeof(*parent));
+ *
+ *	list_head_init(&parent->children);
+ *	parent->num_children = 0;
+ */
+static inline void list_head_init(struct list_head *h)
+{
+	h->n.next = h->n.prev = &h->n;
+}
+
+/**
+ * list_node_init - initialize a list_node
+ * @n: the list_node to link to itself.
+ *
+ * You don't need to use this normally!  But it lets you list_del(@n)
+ * safely.
+ */
+static inline void list_node_init(struct list_node *n)
+{
+	n->next = n->prev = n;
+}
+
+/**
+ * list_add - add an entry at the start of a linked list.
+ * @h: the list_head to add the node to
+ * @n: the list_node to add to the list.
+ *
+ * The list_node does not need to be initialized; it will be overwritten.
+ * Example:
+ *	struct child *child = malloc(sizeof(*child));
+ *
+ *	child->name = "marvin";
+ *	list_add(&parent->children, &child->list);
+ *	parent->num_children++;
+ */
+#define list_add(h, n) list_add_(h, n, LIST_LOC)
+static inline void list_add_(struct list_head *h,
+			     struct list_node *n,
+			     const char *abortstr)
+{
+	n->next = h->n.next;
+	n->prev = &h->n;
+	h->n.next->prev = n;
+	h->n.next = n;
+	(void)list_debug(h, abortstr);
+}
+
+/**
+ * list_add_tail - add an entry at the end of a linked list.
+ * @h: the list_head to add the node to
+ * @n: the list_node to add to the list.
+ *
+ * The list_node does not need to be initialized; it will be overwritten.
+ * Example:
+ *	list_add_tail(&parent->children, &child->list);
+ *	parent->num_children++;
+ */
+#define list_add_tail(h, n) list_add_tail_(h, n, LIST_LOC)
+static inline void list_add_tail_(struct list_head *h,
+				  struct list_node *n,
+				  const char *abortstr)
+{
+	n->next = &h->n;
+	n->prev = h->n.prev;
+	h->n.prev->next = n;
+	h->n.prev = n;
+	(void)list_debug(h, abortstr);
+}
+
+/**
+ * list_empty - is a list empty?
+ * @h: the list_head
+ *
+ * If the list is empty, returns true.
+ *
+ * Example:
+ *	assert(list_empty(&parent->children) == (parent->num_children == 0));
+ */
+#define list_empty(h) list_empty_(h, LIST_LOC)
+static inline int list_empty_(const struct list_head *h, const char* abortstr)
+{
+	(void)list_debug(h, abortstr);
+	return h->n.next == &h->n;
+}
+
+/**
+ * list_empty_nodebug - is a list empty (and don't perform debug checks)?
+ * @h: the list_head
+ *
+ * If the list is empty, returns true.
+ * This differs from list_empty() in that if CCAN_LIST_DEBUG is set it
+ * will NOT perform debug checks. Only use this function if you REALLY
+ * know what you're doing.
+ *
+ * Example:
+ *	assert(list_empty_nodebug(&parent->children) == (parent->num_children == 0));
+ */
+#ifndef CCAN_LIST_DEBUG
+#define list_empty_nodebug(h) list_empty(h)
+#else
+static inline int list_empty_nodebug(const struct list_head *h)
+{
+	return h->n.next == &h->n;
+}
+#endif
+
+/**
+ * list_del - delete an entry from an (unknown) linked list.
+ * @n: the list_node to delete from the list.
+ *
+ * Note that this leaves @n in an undefined state; it can be added to
+ * another list, but not deleted again.
+ *
+ * See also:
+ *	list_del_from(), list_del_init()
+ *
+ * Example:
+ *	list_del(&child->list);
+ *	parent->num_children--;
+ */
+#define list_del(n) list_del_(n, LIST_LOC)
+static inline void list_del_(struct list_node *n, const char* abortstr)
+{
+	(void)list_debug_node(n, abortstr);
+	n->next->prev = n->prev;
+	n->prev->next = n->next;
+#ifdef CCAN_LIST_DEBUG
+	/* Catch use-after-del. */
+	n->next = n->prev = NULL;
+#endif
+}
+
+/**
+ * list_del_init - delete a node, and reset it so it can be deleted again.
+ * @n: the list_node to be deleted.
+ *
+ * list_del(@n) or list_del_init() again after this will be safe,
+ * which can be useful in some cases.
+ *
+ * See also:
+ *	list_del_from(), list_del()
+ *
+ * Example:
+ *	list_del_init(&child->list);
+ *	parent->num_children--;
+ */
+#define list_del_init(n) list_del_init_(n, LIST_LOC)
+static inline void list_del_init_(struct list_node *n, const char *abortstr)
+{
+	list_del_(n, abortstr);
+	list_node_init(n);
+}
+
+/**
+ * list_del_from - delete an entry from a known linked list.
+ * @h: the list_head the node is in.
+ * @n: the list_node to delete from the list.
+ *
+ * This explicitly indicates which list a node is expected to be in,
+ * which is better documentation and can catch more bugs.
+ *
+ * See also: list_del()
+ *
+ * Example:
+ *	list_del_from(&parent->children, &child->list);
+ *	parent->num_children--;
+ */
+static inline void list_del_from(struct list_head *h, struct list_node *n)
+{
+#ifdef CCAN_LIST_DEBUG
+	{
+		/* Thorough check: make sure it was in list! */
+		struct list_node *i;
+		for (i = h->n.next; i != n; i = i->next)
+			assert(i != &h->n);
+	}
+#endif /* CCAN_LIST_DEBUG */
+
+	/* Quick test that catches a surprising number of bugs. */
+	assert(!list_empty(h));
+	list_del(n);
+}
+
+/**
+ * list_entry - convert a list_node back into the structure containing it.
+ * @n: the list_node
+ * @type: the type of the entry
+ * @member: the list_node member of the type
+ *
+ * Example:
+ *	// First list entry is children.next; convert back to child.
+ *	child = list_entry(parent->children.n.next, struct child, list);
+ *
+ * See Also:
+ *	list_top(), list_for_each()
+ */
+#define list_entry(n, type, member) container_of(n, type, member)
+
+/**
+ * list_top - get the first entry in a list
+ * @h: the list_head
+ * @type: the type of the entry
+ * @member: the list_node member of the type
+ *
+ * If the list is empty, returns NULL.
+ *
+ * Example:
+ *	struct child *first;
+ *	first = list_top(&parent->children, struct child, list);
+ *	if (!first)
+ *		printf("Empty list!\n");
+ */
+#define list_top(h, type, member)					\
+	((type *)list_top_((h), list_off_(type, member)))
+
+static inline const void *list_top_(const struct list_head *h, size_t off)
+{
+	if (list_empty(h))
+		return NULL;
+	return (const char *)h->n.next - off;
+}
+
+/**
+ * list_pop - remove the first entry in a list
+ * @h: the list_head
+ * @type: the type of the entry
+ * @member: the list_node member of the type
+ *
+ * If the list is empty, returns NULL.
+ *
+ * Example:
+ *	struct child *one;
+ *	one = list_pop(&parent->children, struct child, list);
+ *	if (!one)
+ *		printf("Empty list!\n");
+ */
+#define list_pop(h, type, member)					\
+	((type *)list_pop_((h), list_off_(type, member)))
+
+static inline const void *list_pop_(const struct list_head *h, size_t off)
+{
+	struct list_node *n;
+
+	if (list_empty(h))
+		return NULL;
+	n = h->n.next;
+	list_del(n);
+	return (const char *)n - off;
+}
+
+/**
+ * list_tail - get the last entry in a list
+ * @h: the list_head
+ * @type: the type of the entry
+ * @member: the list_node member of the type
+ *
+ * If the list is empty, returns NULL.
+ *
+ * Example:
+ *	struct child *last;
+ *	last = list_tail(&parent->children, struct child, list);
+ *	if (!last)
+ *		printf("Empty list!\n");
+ */
+#define list_tail(h, type, member) \
+	((type *)list_tail_((h), list_off_(type, member)))
+
+static inline const void *list_tail_(const struct list_head *h, size_t off)
+{
+	if (list_empty(h))
+		return NULL;
+	return (const char *)h->n.prev - off;
+}
+
+/**
+ * list_for_each - iterate through a list.
+ * @h: the list_head (warning: evaluated multiple times!)
+ * @i: the structure containing the list_node
+ * @member: the list_node member of the structure
+ *
+ * This is a convenient wrapper to iterate @i over the entire list.  It's
+ * a for loop, so you can break and continue as normal.
+ *
+ * Example:
+ *	list_for_each(&parent->children, child, list)
+ *		printf("Name: %s\n", child->name);
+ */
+#define list_for_each(h, i, member)					\
+	list_for_each_off(h, i, list_off_var_(i, member))
+
+/**
+ * list_for_each_rev - iterate through a list backwards.
+ * @h: the list_head
+ * @i: the structure containing the list_node
+ * @member: the list_node member of the structure
+ *
+ * This is a convenient wrapper to iterate @i over the entire list.  It's
+ * a for loop, so you can break and continue as normal.
+ *
+ * Example:
+ *	list_for_each_rev(&parent->children, child, list)
+ *		printf("Name: %s\n", child->name);
+ */
+#define list_for_each_rev(h, i, member)					\
+	for (i = container_of_var(list_debug(h,	LIST_LOC)->n.prev, i, member); \
+	     &i->member != &(h)->n;					\
+	     i = container_of_var(i->member.prev, i, member))
+
+/**
+ * list_for_each_safe - iterate through a list, maybe during deletion
+ * @h: the list_head
+ * @i: the structure containing the list_node
+ * @nxt: the structure containing the list_node
+ * @member: the list_node member of the structure
+ *
+ * This is a convenient wrapper to iterate @i over the entire list.  It's
+ * a for loop, so you can break and continue as normal.  The extra variable
+ * @nxt is used to hold the next element, so you can delete @i from the list.
+ *
+ * Example:
+ *	struct child *next;
+ *	list_for_each_safe(&parent->children, child, next, list) {
+ *		list_del(&child->list);
+ *		parent->num_children--;
+ *	}
+ */
+#define list_for_each_safe(h, i, nxt, member)				\
+	list_for_each_safe_off(h, i, nxt, list_off_var_(i, member))
+
+/**
+ * list_next - get the next entry in a list
+ * @h: the list_head
+ * @i: a pointer to an entry in the list.
+ * @member: the list_node member of the structure
+ *
+ * If @i was the last entry in the list, returns NULL.
+ *
+ * Example:
+ *	struct child *second;
+ *	second = list_next(&parent->children, first, list);
+ *	if (!second)
+ *		printf("No second child!\n");
+ */
+#define list_next(h, i, member)						\
+	((list_typeof(i))list_entry_or_null(list_debug(h,		\
+					    __FILE__ ":" stringify(__LINE__)), \
+					    (i)->member.next,		\
+					    list_off_var_((i), member)))
+
+/**
+ * list_prev - get the previous entry in a list
+ * @h: the list_head
+ * @i: a pointer to an entry in the list.
+ * @member: the list_node member of the structure
+ *
+ * If @i was the first entry in the list, returns NULL.
+ *
+ * Example:
+ *	first = list_prev(&parent->children, second, list);
+ *	if (!first)
+ *		printf("Can't go back to first child?!\n");
+ */
+#define list_prev(h, i, member)						\
+	((list_typeof(i))list_entry_or_null(list_debug(h,		\
+					    __FILE__ ":" stringify(__LINE__)), \
+					    (i)->member.prev,		\
+					    list_off_var_((i), member)))
+
+/**
+ * list_append_list - empty one list onto the end of another.
+ * @to: the list to append into
+ * @from: the list to empty.
+ *
+ * This takes the entire contents of @from and moves it to the end of
+ * @to.  After this @from will be empty.
+ *
+ * Example:
+ *	struct list_head adopter;
+ *
+ *	list_append_list(&adopter, &parent->children);
+ *	assert(list_empty(&parent->children));
+ *	parent->num_children = 0;
+ */
+#define list_append_list(t, f) list_append_list_(t, f,			\
+				   __FILE__ ":" stringify(__LINE__))
+static inline void list_append_list_(struct list_head *to,
+				     struct list_head *from,
+				     const char *abortstr)
+{
+	struct list_node *from_tail = list_debug(from, abortstr)->n.prev;
+	struct list_node *to_tail = list_debug(to, abortstr)->n.prev;
+
+	/* Sew in head and entire list. */
+	to->n.prev = from_tail;
+	from_tail->next = &to->n;
+	to_tail->next = &from->n;
+	from->n.prev = to_tail;
+
+	/* Now remove head. */
+	list_del(&from->n);
+	list_head_init(from);
+}
+
+/**
+ * list_prepend_list - empty one list into the start of another.
+ * @to: the list to prepend into
+ * @from: the list to empty.
+ *
+ * This takes the entire contents of @from and moves it to the start
+ * of @to.  After this @from will be empty.
+ *
+ * Example:
+ *	list_prepend_list(&adopter, &parent->children);
+ *	assert(list_empty(&parent->children));
+ *	parent->num_children = 0;
+ */
+#define list_prepend_list(t, f) list_prepend_list_(t, f, LIST_LOC)
+static inline void list_prepend_list_(struct list_head *to,
+				      struct list_head *from,
+				      const char *abortstr)
+{
+	struct list_node *from_tail = list_debug(from, abortstr)->n.prev;
+	struct list_node *to_head = list_debug(to, abortstr)->n.next;
+
+	/* Sew in head and entire list. */
+	to->n.next = &from->n;
+	from->n.prev = &to->n;
+	to_head->prev = from_tail;
+	from_tail->next = to_head;
+
+	/* Now remove head. */
+	list_del(&from->n);
+	list_head_init(from);
+}
+
+/**
+ * list_for_each_off - iterate through a list of memory regions.
+ * @h: the list_head
+ * @i: the pointer to a memory region wich contains list node data.
+ * @off: offset(relative to @i) at which list node data resides.
+ *
+ * This is a low-level wrapper to iterate @i over the entire list, used to
+ * implement all oher, more high-level, for-each constructs. It's a for loop,
+ * so you can break and continue as normal.
+ *
+ * WARNING! Being the low-level macro that it is, this wrapper doesn't know
+ * nor care about the type of @i. The only assumtion made is that @i points
+ * to a chunk of memory that at some @offset, relative to @i, contains a
+ * properly filled `struct node_list' which in turn contains pointers to
+ * memory chunks and it's turtles all the way down. Whith all that in mind
+ * remember that given the wrong pointer/offset couple this macro will
+ * happilly churn all you memory untill SEGFAULT stops it, in other words
+ * caveat emptor.
+ *
+ * It is worth mentioning that one of legitimate use-cases for that wrapper
+ * is operation on opaque types with known offset for `struct list_node'
+ * member(preferably 0), because it allows you not to disclose the type of
+ * @i.
+ *
+ * Example:
+ *	list_for_each_off(&parent->children, child,
+ *				offsetof(struct child, list))
+ *		printf("Name: %s\n", child->name);
+ */
+#define list_for_each_off(h, i, off)                                    \
+	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.next,	\
+				   (off));				\
+       list_node_from_off_((void *)i, (off)) != &(h)->n;                \
+       i = list_node_to_off_(list_node_from_off_((void *)i, (off))->next, \
+                             (off)))
+
+/**
+ * list_for_each_safe_off - iterate through a list of memory regions, maybe
+ * during deletion
+ * @h: the list_head
+ * @i: the pointer to a memory region wich contains list node data.
+ * @nxt: the structure containing the list_node
+ * @off: offset(relative to @i) at which list node data resides.
+ *
+ * For details see `list_for_each_off' and `list_for_each_safe'
+ * descriptions.
+ *
+ * Example:
+ *	list_for_each_safe_off(&parent->children, child,
+ *		next, offsetof(struct child, list))
+ *		printf("Name: %s\n", child->name);
+ */
+#define list_for_each_safe_off(h, i, nxt, off)                          \
+	for (i = list_node_to_off_(list_debug(h, LIST_LOC)->n.next,	\
+				   (off)),				\
+         nxt = list_node_to_off_(list_node_from_off_(i, (off))->next,   \
+                                 (off));                                \
+       list_node_from_off_(i, (off)) != &(h)->n;                        \
+       i = nxt,                                                         \
+         nxt = list_node_to_off_(list_node_from_off_(i, (off))->next,   \
+                                 (off)))
+
+
+/* Other -off variants. */
+#define list_entry_off(n, type, off)		\
+	((type *)list_node_from_off_((n), (off)))
+
+#define list_head_off(h, type, off)		\
+	((type *)list_head_off((h), (off)))
+
+#define list_tail_off(h, type, off)		\
+	((type *)list_tail_((h), (off)))
+
+#define list_add_off(h, n, off)                 \
+	list_add((h), list_node_from_off_((n), (off)))
+
+#define list_del_off(n, off)                    \
+	list_del(list_node_from_off_((n), (off)))
+
+#define list_del_from_off(h, n, off)			\
+	list_del_from(h, list_node_from_off_((n), (off)))
+
+/* Offset helper functions so we only single-evaluate. */
+static inline void *list_node_to_off_(struct list_node *node, size_t off)
+{
+	return (void *)((char *)node - off);
+}
+static inline struct list_node *list_node_from_off_(void *ptr, size_t off)
+{
+	return (struct list_node *)((char *)ptr + off);
+}
+
+/* Get the offset of the member, but make sure it's a list_node. */
+#define list_off_(type, member)					\
+	(container_off(type, member) +				\
+	 check_type(((type *)0)->member, struct list_node))
+
+#define list_off_var_(var, member)			\
+	(container_off_var(var, member) +		\
+	 check_type(var->member, struct list_node))
+
+#if HAVE_TYPEOF
+#define list_typeof(var) typeof(var)
+#else
+#define list_typeof(var) void *
+#endif
+
+/* Returns member, or NULL if at end of list. */
+static inline void *list_entry_or_null(const struct list_head *h,
+				       const struct list_node *n,
+				       size_t off)
+{
+	if (n == &h->n)
+		return NULL;
+	return (char *)n - off;
+}
+#endif /* CCAN_LIST_H */
diff --git a/ccan/str/str.h b/ccan/str/str.h
new file mode 100644
index 0000000000..9a9da9cd3f
--- /dev/null
+++ b/ccan/str/str.h
@@ -0,0 +1,16 @@
+/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
+#ifndef CCAN_STR_H
+#define CCAN_STR_H
+/**
+ * stringify - Turn expression into a string literal
+ * @expr: any C expression
+ *
+ * Example:
+ *	#define PRINT_COND_IF_FALSE(cond) \
+ *		((cond) || printf("%s is false!", stringify(cond)))
+ */
+#define stringify(expr)		stringify_1(expr)
+/* Double-indirection required to stringify expansions */
+#define stringify_1(expr)	#expr
+
+#endif /* CCAN_STR_H */
diff --git a/class.c b/class.c
index 2d5657d865..f142f4472a 100644
--- a/class.c
+++ b/class.c
@@ -23,17 +23,13 @@
  * \{
  */
 
-#include "ruby/ruby.h"
+#include "internal.h"
 #include "ruby/st.h"
 #include "method.h"
 #include "constant.h"
 #include "vm_core.h"
-#include "internal.h"
 #include <ctype.h>
 
-int rb_vm_add_root_module(ID id, VALUE module);
-
-
 #define id_attached id__attached__
 
 void
@@ -42,7 +38,7 @@ rb_class_subclass_add(VALUE super, VALUE klass)
     rb_subclass_entry_t *entry, *head;
 
     if (super && super != Qundef) {
-	entry = malloc(sizeof(*entry));
+	entry = ALLOC(rb_subclass_entry_t);
 	entry->klass = klass;
 	entry->next = NULL;
 
@@ -62,7 +58,7 @@ rb_module_add_to_subclasses_list(VALUE module, VALUE iclass)
 {
     rb_subclass_entry_t *entry, *head;
 
-    entry = malloc(sizeof(*entry));
+    entry = ALLOC(rb_subclass_entry_t);
     entry->klass = iclass;
     entry->next = NULL;
 
@@ -88,7 +84,7 @@ rb_class_remove_from_super_subclasses(VALUE klass)
 	if (entry->next) {
 	    RCLASS_EXT(entry->next->klass)->parent_subclasses = RCLASS_EXT(klass)->parent_subclasses;
 	}
-	free(entry);
+	xfree(entry);
     }
 
     RCLASS_EXT(klass)->parent_subclasses = NULL;
@@ -107,7 +103,7 @@ rb_class_remove_from_module_subclasses(VALUE klass)
 	    RCLASS_EXT(entry->next->klass)->module_subclasses = RCLASS_EXT(klass)->module_subclasses;
 	}
 
-	free(entry);
+	xfree(entry);
     }
 
     RCLASS_EXT(klass)->module_subclasses = NULL;
@@ -154,7 +150,7 @@ rb_class_detach_module_subclasses(VALUE klass)
 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));
+    NEWOBJ_OF(obj, struct RClass, klass, (flags & T_MASK) | FL_PROMOTED1 /* start from age == 2 */ | (RGENGC_WB_PROTECTED_CLASS ? FL_WB_PROTECTED : 0));
     obj->ptr = ALLOC(rb_classext_t);
     RCLASS_IV_TBL(obj) = 0;
     RCLASS_CONST_TBL(obj) = 0;
@@ -233,25 +229,6 @@ rb_class_new(VALUE super)
 }
 
 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);
-	    RB_OBJ_WRITE(new_node, &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;
@@ -260,7 +237,7 @@ clone_method(VALUE klass, ID mid, const rb_method_entry_t *me)
 	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);
+	rb_vm_rewrite_cref_stack(me->def->body.iseq->cref_stack, me->klass, klass, &new_cref);
 	RB_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);
@@ -321,19 +298,28 @@ 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 (!OBJ_INIT_COPY(clone, orig)) return clone;
     if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
 	RBASIC_SET_CLASS(clone, rb_singleton_class_clone(orig));
 	rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
     }
     RCLASS_SET_SUPER(clone, RCLASS_SUPER(orig));
     RCLASS_EXT(clone)->allocator = RCLASS_EXT(orig)->allocator;
+    if (RCLASS_IV_TBL(clone)) {
+	st_free_table(RCLASS_IV_TBL(clone));
+	RCLASS_IV_TBL(clone) = 0;
+    }
+    if (RCLASS_CONST_TBL(clone)) {
+	rb_free_const_table(RCLASS_CONST_TBL(clone));
+	RCLASS_CONST_TBL(clone) = 0;
+    }
+    if (RCLASS_M_TBL_WRAPPER(clone)) {
+	rb_free_m_tbl_wrapper(RCLASS_M_TBL_WRAPPER(clone));
+	RCLASS_M_TBL_WRAPPER(clone) = 0;
+    }
     if (RCLASS_IV_TBL(orig)) {
 	st_data_t id;
 
-	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);
@@ -344,18 +330,13 @@ rb_mod_init_copy(VALUE clone, VALUE orig)
     }
     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_WRAPPER(clone)) {
-	    rb_free_m_tbl_wrapper(RCLASS_M_TBL_WRAPPER(clone));
-	}
 	RCLASS_M_TBL_INIT(clone);
 	st_foreach(RCLASS_M_TBL(orig), clone_method_i, (st_data_t)clone);
     }
@@ -535,7 +516,7 @@ Init_class_hierarchy(void)
     rb_cModule = boot_defclass("Module", rb_cObject);
     rb_cClass =  boot_defclass("Class",  rb_cModule);
 
-    rb_const_set(rb_cObject, rb_intern("BasicObject"), rb_cBasicObject);
+    rb_const_set(rb_cObject, rb_intern_const("BasicObject"), rb_cBasicObject);
     RBASIC_SET_CLASS(rb_cClass, rb_cClass);
     RBASIC_SET_CLASS(rb_cModule, rb_cClass);
     RBASIC_SET_CLASS(rb_cObject, rb_cClass);
@@ -699,16 +680,16 @@ rb_define_class_id_under(VALUE outer, ID id, VALUE super)
     if (rb_const_defined_at(outer, id)) {
 	klass = rb_const_get_at(outer, id);
 	if (!RB_TYPE_P(klass, T_CLASS)) {
-	    rb_raise(rb_eTypeError, "%s is not a class", rb_id2name(id));
+	    rb_raise(rb_eTypeError, "%"PRIsVALUE" is not a class", rb_id2str(id));
 	}
 	if (rb_class_real(RCLASS_SUPER(klass)) != super) {
-	    rb_name_error(id, "%s is already defined", rb_id2name(id));
+	    rb_name_error(id, "%"PRIsVALUE" is already defined", rb_id2str(id));
 	}
 	return klass;
     }
     if (!super) {
-	rb_warn("no super class for `%s::%s', Object assumed",
-		rb_class2name(outer), rb_id2name(id));
+	rb_warn("no super class for `%"PRIsVALUE"::%"PRIsVALUE"', Object assumed",
+		rb_class_path(outer), rb_id2str(id));
     }
     klass = rb_define_class_id(id, super);
     rb_set_class_path_string(klass, outer, rb_id2str(id));
@@ -879,7 +860,8 @@ include_modules_at(const VALUE klass, VALUE c, VALUE module)
 
 	if (BUILTIN_TYPE(module) == T_ICLASS) {
 	    rb_module_add_to_subclasses_list(RBASIC(module)->klass, iclass);
-	} else {
+	}
+	else {
 	    rb_module_add_to_subclasses_list(module, iclass);
 	}
 
@@ -935,7 +917,6 @@ move_refined_method(st_data_t key, st_data_t value, st_data_t data)
 void
 rb_prepend_module(VALUE klass, VALUE module)
 {
-    void rb_vm_check_redefinition_by_prepend(VALUE klass);
     VALUE origin;
     int changed = 0;
 
@@ -948,10 +929,10 @@ rb_prepend_module(VALUE klass, VALUE module)
     origin = RCLASS_ORIGIN(klass);
     if (origin == klass) {
 	origin = class_alloc(T_ICLASS, klass);
-	OBJ_WB_UNPROTECT(origin); /* TODO: conservertive shading. Need more survery. */
+	OBJ_WB_UNPROTECT(origin); /* TODO: conservative shading. Need more survey. */
 	RCLASS_SET_SUPER(origin, RCLASS_SUPER(klass));
 	RCLASS_SET_SUPER(klass, origin);
-	RCLASS_ORIGIN(klass) = origin;
+	RB_OBJ_WRITE(klass, &RCLASS_ORIGIN(klass), origin);
 	RCLASS_M_TBL_WRAPPER(origin) = RCLASS_M_TBL_WRAPPER(klass);
 	RCLASS_M_TBL_INIT(klass);
 	st_foreach(RCLASS_M_TBL(origin), move_refined_method,
@@ -1036,16 +1017,18 @@ rb_mod_include_p(VALUE mod, VALUE mod2)
  *  call-seq:
  *     mod.ancestors -> array
  *
- *  Returns a list of modules included in <i>mod</i> (including
- *  <i>mod</i> itself).
+ *  Returns a list of modules included/prepended in <i>mod</i>
+ *  (including <i>mod</i> itself).
  *
  *     module Mod
  *       include Math
  *       include Comparable
+ *       prepend Enumerable
  *     end
  *
- *     Mod.ancestors    #=> [Mod, Comparable, Math]
- *     Math.ancestors   #=> [Math]
+ *     Mod.ancestors        #=> [Enumerable, Mod, Comparable, Math]
+ *     Math.ancestors       #=> [Math]
+ *     Enumerable.ancestors #=> [Enumerable]
  */
 
 VALUE
@@ -1112,35 +1095,42 @@ ins_methods_pub_i(st_data_t name, st_data_t type, st_data_t ary)
     return ins_methods_push((ID)name, (long)type, (VALUE)ary, NOEX_PUBLIC);
 }
 
+struct method_entry_arg {
+    st_table *list;
+    int recur;
+};
+
 static int
 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;
+    struct method_entry_arg *arg = (struct method_entry_arg *)data;
     long type;
 
     if (me && me->def->type == VM_METHOD_TYPE_REFINED) {
+	VALUE klass = me->klass;
 	me = rb_resolve_refined_method(Qnil, me, NULL);
 	if (!me) return ST_CONTINUE;
+	if (!arg->recur && me->klass != klass) return ST_CONTINUE;
     }
-    if (!st_lookup(list, key, 0)) {
+    if (!st_lookup(arg->list, key, 0)) {
 	if (UNDEFINED_METHOD_ENTRY_P(me)) {
 	    type = -1; /* none */
 	}
 	else {
 	    type = VISI(me->flag);
 	}
-	st_add_direct(list, key, type);
+	st_add_direct(arg->list, key, type);
     }
     return ST_CONTINUE;
 }
 
 static VALUE
-class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func) (st_data_t, st_data_t, st_data_t))
+class_instance_method_list(int argc, const VALUE *argv, VALUE mod, int obj, int (*func) (st_data_t, st_data_t, st_data_t))
 {
     VALUE ary;
     int recur, prepended = 0;
-    st_table *list;
+    struct method_entry_arg me_arg;
 
     if (argc == 0) {
 	recur = TRUE;
@@ -1156,16 +1146,17 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func
 	prepended = 1;
     }
 
-    list = st_init_numtable();
+    me_arg.list = st_init_numtable();
+    me_arg.recur = recur;
     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 (RCLASS_M_TBL(mod)) st_foreach(RCLASS_M_TBL(mod), method_entry_i, (st_data_t)&me_arg);
 	if (BUILTIN_TYPE(mod) == T_ICLASS && !prepended) continue;
 	if (obj && FL_TEST(mod, FL_SINGLETON)) continue;
 	if (!recur) break;
     }
     ary = rb_ary_new();
-    st_foreach(list, func, ary);
-    st_free_table(list);
+    st_foreach(me_arg.list, func, ary);
+    st_free_table(me_arg.list);
 
     return ary;
 }
@@ -1176,29 +1167,29 @@ class_instance_method_list(int argc, VALUE *argv, VALUE mod, int obj, int (*func
  *
  *  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.
+ *  for a class, they are the instance (not singleton) methods. If the optional
+ *  parameter is <code>false</code>, the methods of any ancestors are not included.
  *
  *     module A
  *       def method1()  end
  *     end
  *     class B
+ *       include A
  *       def method2()  end
  *     end
  *     class C < B
  *       def method3()  end
  *     end
  *
- *     A.instance_methods                #=> [:method1]
- *     B.instance_methods(false)         #=> [:method2]
- *     C.instance_methods(false)         #=> [:method3]
- *     C.instance_methods(true).length   #=> 43
+ *     A.instance_methods(false)                   #=> [:method1]
+ *     B.instance_methods(false)                   #=> [:method2]
+ *     B.instance_methods(true).include?(:method1) #=> true
+ *     C.instance_methods(false)                   #=> [:method3]
+ *     C.instance_methods.include?(:method2)       #=> true
  */
 
 VALUE
-rb_class_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_instance_methods(int argc, const VALUE *argv, VALUE mod)
 {
     return class_instance_method_list(argc, argv, mod, 0, ins_methods_i);
 }
@@ -1208,12 +1199,12 @@ rb_class_instance_methods(int argc, VALUE *argv, VALUE mod)
  *     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.
+ *  <i>mod</i>. If the optional parameter is <code>false</code>, the
+ *  methods of any ancestors are not included.
  */
 
 VALUE
-rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_protected_instance_methods(int argc, const VALUE *argv, VALUE mod)
 {
     return class_instance_method_list(argc, argv, mod, 0, ins_methods_prot_i);
 }
@@ -1223,8 +1214,8 @@ rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
  *     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.
+ *  <i>mod</i>. If the optional parameter is <code>false</code>, the
+ *  methods of any ancestors are not included.
  *
  *     module Mod
  *       def method1()  end
@@ -1236,7 +1227,7 @@ rb_class_protected_instance_methods(int argc, VALUE *argv, VALUE mod)
  */
 
 VALUE
-rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_private_instance_methods(int argc, const VALUE *argv, VALUE mod)
 {
     return class_instance_method_list(argc, argv, mod, 0, ins_methods_priv_i);
 }
@@ -1246,12 +1237,12 @@ rb_class_private_instance_methods(int argc, VALUE *argv, VALUE mod)
  *     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.
+ *  If the optional parameter is <code>false</code>, the methods of
+ *  any ancestors are not included.
  */
 
 VALUE
-rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
+rb_class_public_instance_methods(int argc, const VALUE *argv, VALUE mod)
 {
     return class_instance_method_list(argc, argv, mod, 0, ins_methods_pub_i);
 }
@@ -1263,8 +1254,8 @@ rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
  *  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,
+ *  If the optional parameter is <code>false</code>, it
+ *  returns an array of <i>obj<i>'s public and protected singleton methods,
  *  the array will not include methods in modules included in <i>obj</i>.
  *
  *     class Klass
@@ -1275,7 +1266,7 @@ rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
  *     k.methods[0..9]    #=> [:klass_method, :nil?, :===,
  *                        #    :==~, :!, :eql?
  *                        #    :hash, :<=>, :class, :singleton_class]
- *     k.methods.length   #=> 57
+ *     k.methods.length   #=> 56
  *
  *     k.methods(false)   #=> []
  *     def k.singleton_method; end
@@ -1287,7 +1278,7 @@ rb_class_public_instance_methods(int argc, VALUE *argv, VALUE mod)
  */
 
 VALUE
-rb_obj_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_methods(int argc, const VALUE *argv, VALUE obj)
 {
     rb_check_arity(argc, 0, 1);
     if (argc > 0 && !RTEST(argv[0])) {
@@ -1306,7 +1297,7 @@ rb_obj_methods(int argc, VALUE *argv, VALUE obj)
  */
 
 VALUE
-rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_protected_methods(int argc, const VALUE *argv, VALUE obj)
 {
     return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_prot_i);
 }
@@ -1321,7 +1312,7 @@ rb_obj_protected_methods(int argc, VALUE *argv, VALUE obj)
  */
 
 VALUE
-rb_obj_private_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_private_methods(int argc, const VALUE *argv, VALUE obj)
 {
     return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_priv_i);
 }
@@ -1336,7 +1327,7 @@ rb_obj_private_methods(int argc, VALUE *argv, VALUE obj)
  */
 
 VALUE
-rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_public_methods(int argc, const VALUE *argv, VALUE obj)
 {
     return class_instance_method_list(argc, argv, CLASS_OF(obj), 1, ins_methods_pub_i);
 }
@@ -1375,10 +1366,11 @@ rb_obj_public_methods(int argc, VALUE *argv, VALUE obj)
  */
 
 VALUE
-rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
+rb_obj_singleton_methods(int argc, const VALUE *argv, VALUE obj)
 {
     VALUE recur, ary, klass, origin;
-    st_table *list, *mtbl;
+    struct method_entry_arg me_arg;
+    st_table *mtbl;
 
     if (argc == 0) {
 	recur = Qtrue;
@@ -1388,22 +1380,23 @@ rb_obj_singleton_methods(int argc, VALUE *argv, VALUE obj)
     }
     klass = CLASS_OF(obj);
     origin = RCLASS_ORIGIN(klass);
-    list = st_init_numtable();
+    me_arg.list = st_init_numtable();
+    me_arg.recur = RTEST(recur);
     if (klass && FL_TEST(klass, FL_SINGLETON)) {
 	if ((mtbl = RCLASS_M_TBL(origin)) != 0)
-	    st_foreach(mtbl, method_entry_i, (st_data_t)list);
+	    st_foreach(mtbl, method_entry_i, (st_data_t)&me_arg);
 	klass = RCLASS_SUPER(klass);
     }
     if (RTEST(recur)) {
 	while (klass && (FL_TEST(klass, FL_SINGLETON) || RB_TYPE_P(klass, T_ICLASS))) {
 	    if (klass != origin && (mtbl = RCLASS_M_TBL(klass)) != 0)
-		st_foreach(mtbl, method_entry_i, (st_data_t)list);
+		st_foreach(mtbl, method_entry_i, (st_data_t)&me_arg);
 	    klass = RCLASS_SUPER(klass);
 	}
     }
     ary = rb_ary_new();
-    st_foreach(list, ins_methods_i, ary);
-    st_free_table(list);
+    st_foreach(me_arg.list, ins_methods_i, ary);
+    st_free_table(me_arg.list);
 
     return ary;
 }
@@ -1538,7 +1531,8 @@ singleton_class_of(VALUE obj)
 {
     VALUE klass;
 
-    if (FIXNUM_P(obj) || FLONUM_P(obj) || SYMBOL_P(obj)) {
+    if (FIXNUM_P(obj) || FLONUM_P(obj) || STATIC_SYM_P(obj)) {
+      no_singleton:
 	rb_raise(rb_eTypeError, "can't define singleton");
     }
     if (SPECIAL_CONST_P(obj)) {
@@ -1548,18 +1542,16 @@ singleton_class_of(VALUE 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");
+	switch (BUILTIN_TYPE(obj)) {
+	  case T_FLOAT: case T_BIGNUM: case T_SYMBOL:
+	    goto no_singleton;
 	}
     }
 
-    if (FL_TEST(RBASIC(obj)->klass, FL_SINGLETON) &&
-	rb_ivar_get(RBASIC(obj)->klass, id_attached) == obj) {
-	klass = RBASIC(obj)->klass;
-    }
-    else {
-	klass = rb_make_metaclass(obj, RBASIC(obj)->klass);
+    klass = RBASIC(obj)->klass;
+    if (!(FL_TEST(klass, FL_SINGLETON) &&
+	  rb_ivar_get(klass, id_attached) == obj)) {
+	klass = rb_make_metaclass(obj, klass);
     }
 
     if (OBJ_TAINTED(obj)) {
@@ -1568,11 +1560,24 @@ singleton_class_of(VALUE obj)
     else {
 	FL_UNSET(klass, FL_TAINT);
     }
-    if (OBJ_FROZEN(obj)) OBJ_FREEZE(klass);
+    if (OBJ_FROZEN(obj)) OBJ_FREEZE_RAW(klass);
 
     return klass;
 }
 
+void
+rb_freeze_singleton_class(VALUE x)
+{
+    /* should not propagate to meta-meta-class, and so on */
+    if (!(RBASIC(x)->flags & FL_SINGLETON)) {
+	VALUE klass = RBASIC_CLASS(x);
+	if (klass && (klass = RCLASS_ORIGIN(klass)) != 0 &&
+	    FL_TEST(klass, (FL_SINGLETON|FL_FREEZE)) == FL_SINGLETON) {
+	    OBJ_FREEZE_RAW(klass);
+	}
+    }
+}
+
 /*!
  * Returns the singleton class of \a obj, or nil if obj is not a
  * singleton object.
@@ -1844,11 +1849,12 @@ rb_scan_args(int argc, const VALUE *argv, const char *fmt, ...)
     return argc;
 }
 
-NORETURN(static void keyword_error(const char *error, VALUE keys));
-static void
-keyword_error(const char *error, VALUE keys)
+VALUE
+rb_keyword_error_new(const char *error, VALUE keys)
 {
     const char *msg = "";
+    VALUE error_message;
+
     if (RARRAY_LEN(keys) == 1) {
 	keys = RARRAY_AREF(keys, 0);
     }
@@ -1856,21 +1862,33 @@ keyword_error(const char *error, VALUE keys)
 	keys = rb_ary_join(keys, rb_usascii_str_new2(", "));
 	msg = "s";
     }
-    rb_raise(rb_eArgError, "%s keyword%s: %"PRIsVALUE, error, msg, keys);
+
+    error_message = rb_sprintf("%s keyword%s: %"PRIsVALUE, error, msg, keys);
+
+    return rb_exc_new_str(rb_eArgError, error_message);
+}
+
+NORETURN(static void rb_keyword_error(const char *error, VALUE keys));
+static void
+rb_keyword_error(const char *error, VALUE keys)
+{
+    rb_exc_raise(rb_keyword_error_new(error, keys));
 }
 
 NORETURN(static void unknown_keyword_error(VALUE hash, const ID *table, int keywords));
 static void
 unknown_keyword_error(VALUE hash, const ID *table, int keywords)
 {
+    st_table *tbl = rb_hash_tbl_raw(hash);
     VALUE keys;
     int i;
     for (i = 0; i < keywords; i++) {
-	rb_hash_delete(hash, ID2SYM(table[i]));
+	st_data_t key = ID2SYM(table[i]);
+	st_delete(tbl, &key, NULL);
     }
     keys = rb_funcall(hash, rb_intern("keys"), 0, 0);
     if (!RB_TYPE_P(keys, T_ARRAY)) rb_raise(rb_eArgError, "unknown keyword");
-    keyword_error("unknown", keys);
+    rb_keyword_error("unknown", keys);
 }
 
 static int
@@ -1937,7 +1955,7 @@ rb_get_kwargs(VALUE keyword_hash, const ID *table, int required, int optional, V
 	    rb_ary_push(missing, keyword);
 	}
 	if (!NIL_P(missing)) {
-	    keyword_error("missing", missing);
+	    rb_keyword_error("missing", missing);
 	}
     }
     j = i;
diff --git a/common.mk b/common.mk
index 8c097e374b..a5ce202910 100644
--- a/common.mk
+++ b/common.mk
@@ -8,16 +8,21 @@ dll: $(LIBRUBY_SO)
 V = 0
 Q1 = $(V:1=)
 Q = $(Q1:0=@)
-ECHO = $(ECHO1:0=@echo)
+ECHO0 = $(ECHO1:0=echo)
+ECHO = @$(ECHO0)
+
+UNICODE_VERSION = 7.0.0
 
 RUBYLIB       = $(PATH_SEPARATOR)
 RUBYOPT       = -
 RUN_OPTS      = --disable-gems
 
-SPEC_GIT_BASE = git://github.com/nurse
+SPEC_GIT_BASE = git://github.com/ruby
 MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
 RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
 
+SIMPLECOV_GIT_URL = git://github.com/hsbt/simplecov.git
+
 STATIC_RUBY   = static-ruby
 
 EXTCONF       = extconf.rb
@@ -25,13 +30,13 @@ LIBRUBY_EXTS  = ./.libruby-with-ext.time
 REVISION_H    = ./.revision.time
 PLATFORM_D    = ./$(PLATFORM_DIR)/.time
 RDOCOUT       = $(EXTOUT)/rdoc
+HTMLOUT       = $(EXTOUT)/html
 CAPIOUT       = doc/capi
 
-DMYEXT	      = dmyext.$(OBJEXT)
+INITOBJS      = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
 MAINOBJ       = $(NORMALMAINOBJ)
-EXTOBJS	      =
-DLDOBJS	      = $(DMYEXT)
+DLDOBJS	      = $(INITOBJS)
 EXTSOLIBS     =
 MINIOBJS      = $(ARCHMINIOBJS) miniinit.$(OBJEXT) miniprelude.$(OBJEXT)
 ENC_MK        = enc.mk
@@ -81,6 +86,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		strftime.$(OBJEXT) \
 		string.$(OBJEXT) \
 		struct.$(OBJEXT) \
+		symbol.$(OBJEXT) \
 		time.$(OBJEXT) \
 		transcode.$(OBJEXT) \
 		util.$(OBJEXT) \
@@ -95,6 +101,7 @@ COMMONOBJS    = array.$(OBJEXT) \
 		vm_trace.$(OBJEXT) \
 		thread.$(OBJEXT) \
 		cont.$(OBJEXT) \
+		$(DTRACE_OBJ) \
 		$(BUILTIN_ENCOBJS) \
 		$(BUILTIN_TRANSOBJS) \
 		$(MISSING)
@@ -105,21 +112,23 @@ EXPORTOBJS    = $(DLNOBJ) \
 		$(COMMONOBJS)
 
 OBJS          = $(EXPORTOBJS) prelude.$(OBJEXT)
-ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT)
+ALLOBJS       = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS)
 
 GOLFOBJS      = goruby.$(OBJEXT) golf_prelude.$(OBJEXT)
 
+DEFAULT_PRELUDES = $(GEM_PRELUDE)
 PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES)
-GEM_PRELUDE = $(srcdir)/gem_prelude.rb
-PRELUDES      = prelude.c miniprelude.c
-GOLFPRELUDES = golf_prelude.c
+GEM_PRELUDE   = $(srcdir)/gem_prelude.rb
+PRELUDES      = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c
+GOLFPRELUDES  = {$(srcdir)}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="V=$(V) MINIRUBY='$(MINIRUBY)'" --
+		--make-flags="V=$(V) MINIRUBY='$(MINIRUBY)'" --gnumake=$(gnumake) \
+		--
 INSTRUBY      =	$(SUDO) $(RUNRUBY) -r./$(arch)-fake $(srcdir)/tool/rbinstall.rb
 INSTRUBY_ARGS =	$(SCRIPT_ARGS) \
 		--data-mode=$(INSTALL_DATA_MODE) \
@@ -139,11 +148,11 @@ TESTRUN_SCRIPT = $(srcdir)/test.rb
 
 BOOTSTRAPRUBY = $(BASERUBY)
 
-COMPILE_PRELUDE = $(MINIRUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb
+COMPILE_PRELUDE = $(srcdir)/tool/generic_erb.rb $(srcdir)/template/prelude.c.tmpl
 
 all: showflags main docs
 
-main: showflags $(EXTSTATIC:static=lib)encs exts
+main: showflags exts $(ENCSTATIC:static=lib)encs
 	@$(NULLCMD)
 
 .PHONY: showflags
@@ -177,16 +186,14 @@ $(EXTS_MK): $(MKFILES) all-incs $(PREP) $(RBCONFIG) $(LIBRUBY)
 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)
+	$(Q)$(MAKE) -f $(EXTS_MK) $(MFLAGS) libdir="$(libdir)" LIBRUBY_EXTS=$(LIBRUBY_EXTS) \
+	    EXTENCS="$(ENCOBJS)" UPDATE_LIBRARIES=no $(EXTSTATIC)
 
 prog: program wprogram
 
 $(PREP): $(MKFILES)
 
-miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE) $(DTRACE_OBJ)
+miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE)
 
 objs: $(ALLOBJS)
 
@@ -204,7 +211,7 @@ $(CAPIOUT)/.timestamp: Doxyfile $(PREP)
 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="$(BASERUBY)"
+	--srcdir="$(srcdir)" --miniruby="$(MINIRUBY)"
 
 program: showflags $(PROGRAM)
 wprogram: showflags $(WPROGRAM)
@@ -212,7 +219,7 @@ mini: PHONY miniruby$(EXEEXT)
 
 $(PROGRAM) $(WPROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
 
-$(LIBRUBY_A):	$(OBJS) $(MAINOBJ) $(DTRACE_OBJ) $(DTRACE_GLOMMED_OBJ) $(DMYEXT) $(ARCHFILE)
+$(LIBRUBY_A):	$(LIBRUBY_A_OBJS) $(MAINOBJ) $(INITOBJS) $(ARCHFILE)
 
 $(LIBRUBY_SO):	$(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)
 
@@ -234,80 +241,80 @@ 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
+pre-install-all:: all pre-install-local pre-install-ext pre-install-doc
+do-install-all: pre-install-all
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=all --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: main
+do-install-nodoc: main pre-install-nodoc
 	$(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: $(PROGRAM)
+do-install-local: $(PROGRAM) pre-install-local
 	$(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: exts
+do-install-ext: exts pre-install-ext
 	$(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: main
+do-install-arch: main do-install-arch
 	$(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: $(PREP)
+do-install-comm: $(PREP) pre-install-comm
 	$(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: $(PROGRAM)
+do-install-bin: $(PROGRAM) pre-install-bin
 	$(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: $(PREP)
+do-install-lib: $(PREP) pre-install-lib
 	$(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: exts
+do-install-ext-comm: exts pre-install-ext-comm
 	$(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: exts
+do-install-ext-arch: exts pre-install-ext-arch
 	$(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: $(PREP)
+do-install-man: $(PREP) pre-install-man
 	$(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)
+do-install-capi: $(PREP) pre-install-capi
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=capi
 post-install-capi::
 	@$(NULLCMD)
@@ -322,10 +329,10 @@ dont-install-all: $(PROGRAM)
 post-no-install-all:: post-no-install-local post-no-install-ext post-no-install-doc
 	@$(NULLCMD)
 
-uninstall: $(INSTALLED_LIST)
+uninstall: $(INSTALLED_LIST) sudo-precheck
 	$(Q)$(SUDO) $(MINIRUBY) $(srcdir)/tool/rbuninstall.rb --destdir=$(DESTDIR) $(INSTALLED_LIST)
 
-reinstall: uninstall install
+reinstall: all uninstall install
 
 what-where-nodoc: no-install-nodoc
 no-install-nodoc: pre-no-install-nodoc dont-install-nodoc post-no-install-nodoc
@@ -404,14 +411,14 @@ post-no-install-man::
 
 install-doc: rdoc pre-install-doc do-install-doc post-install-doc
 pre-install-doc:: install-prereq
-do-install-doc: $(PROGRAM)
+do-install-doc: $(PROGRAM) pre-install-doc
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=rdoc --rdoc-output="$(RDOCOUT)"
 post-install-doc::
 	@$(NULLCMD)
 
 install-gem: pre-install-gem do-install-gem post-install-gem
 pre-install-gem:: pre-install-bin pre-install-lib pre-install-man
-do-install-gem: $(PROGRAM)
+do-install-gem: $(PROGRAM) pre-install-gem
 	$(INSTRUBY) --make="$(MAKE)" $(INSTRUBY_ARGS) --install=gem
 post-install-gem::
 	@$(NULLCMD)
@@ -420,6 +427,10 @@ rdoc: PHONY main
 	@echo Generating RDoc documentation
 	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri --op "$(RDOCOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
 
+html: PHONY main
+	@echo Generating RDoc HTML files
+	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --op "$(HTMLOUT)" --debug $(RDOCFLAGS) "$(srcdir)"
+
 rdoc-coverage: PHONY main
 	@echo Generating RDoc coverage report
 	$(Q) $(XRUBY) "$(srcdir)/bin/rdoc" --root "$(srcdir)" --encoding=UTF-8 --all --quiet -C $(RDOCFLAGS) "$(srcdir)"
@@ -446,52 +457,79 @@ post-no-install-doc::
 
 CLEAR_INSTALLED_LIST = clear-installed-list
 
-install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake PHONY
+install-prereq: $(CLEAR_INSTALLED_LIST) yes-fake sudo-precheck PHONY
 
 clear-installed-list: PHONY
 	@> $(INSTALLED_LIST) set MAKE="$(MAKE)"
 
 clean: clean-ext clean-local clean-enc clean-golf clean-rdoc clean-capi clean-extout clean-platform
-clean-local:: PHONY
+clean-local:: clean-runnable
 	$(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)
+	$(Q)$(RM) $(PROGRAM) $(WPROGRAM) miniruby$(EXEEXT) dmyext.$(OBJEXT) dmyenc.$(OBJEXT) $(ARCHFILE) .*.time
+	$(Q)$(RM) y.tab.c y.output encdb.h transdb.h config.log rbconfig.rb $(ruby_pc) probes.h probes.$(OBJEXT) probes.stamp ruby-glommed.$(OBJEXT)
+	$(Q)$(RM) GNUmakefile.old Makefile.old $(arch)-fake.rb
+clean-runnable:: PHONY
+	$(Q)$(CHDIR) bin 2>$(NULL) && $(RM) $(PROGRAM) $(WPROGRAM) $(GORUBY)$(EXEEXT) bin/*.$(DLEXT) 2>$(NULL) || exit 0
+	$(Q)$(CHDIR) lib 2>$(NULL) && $(RM) $(LIBRUBY_A) $(LIBRUBY) $(LIBRUBY_ALIASES) $(RUBY_BASE_NAME)/$(RUBY_PROGRAM_VERSION) $(RUBY_BASE_NAME)/vendor_ruby 2>$(NULL) || exit 0
+	$(Q)$(RMDIR) lib/$(RUBY_BASE_NAME) lib bin 2>$(NULL) || exit 0
 clean-ext:: PHONY
 clean-golf: PHONY
 	$(Q)$(RM) $(GORUBY)$(EXEEXT) $(GOLFOBJS)
 clean-rdoc: PHONY
+clean-html: PHONY
 clean-capi: PHONY
 clean-platform: PHONY
 clean-extout: PHONY
-clean-docs: clean-rdoc clean-capi
+	-$(Q)$(RMDIR) $(EXTOUT)/$(arch) $(EXTOUT) 2> $(NULL) || exit 0
+clean-docs: clean-rdoc clean-html clean-capi
 
 distclean: distclean-ext distclean-local distclean-enc distclean-golf distclean-extout distclean-platform
 distclean-local:: clean-local
-	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc
+	$(Q)$(RM) $(MKFILES) yasmdata.rb *.inc $(arch)-fake.rb
 	$(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-html: PHONY
 distclean-capi: PHONY
 distclean-extout: clean-extout
 distclean-platform: clean-platform
 
 realclean:: realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 realclean-local:: distclean-local
-	$(Q)$(RM) parse.c parse.h lex.c newline.c miniprelude.c revision.h
+	$(Q)$(RM) parse.c parse.h lex.c newline.c $(PRELUDES) revision.h
+	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) parse.c parse.h lex.c newline.c $(PRELUDES) revision.h
+	$(Q)$(CHDIR) $(srcdir) && $(exec) $(RM) configure tool/config.guess tool/config.sub gems/*.gem
 realclean-ext:: PHONY
 realclean-golf: distclean-golf
+	$(Q)$(RM) $(GOLFPRELUDES)
 realclean-capi: PHONY
 realclean-extout: distclean-extout
 
 clean-ext distclean-ext realclean-ext::
 	$(Q)$(RM) $(EXTS_MK)
 	$(Q)$(RM) $(EXTOUT)/.timestamp/.*.time
+	$(Q)$(RMDIR) $(EXTOUT)/.timestamp 2> $(NULL) || exit 0
 
 clean-enc distclean-enc realclean-enc: PHONY
 
+clean-rdoc distclean-rdoc realclean-rdoc:
+	@echo $(@:-rdoc=ing) rdoc
+	$(Q)$(RMALL) $(RDOCOUT)
+
+clean-html distclean-html realclean-html:
+	@echo $(@:-html=ing) HTML
+	$(Q)$(RMALL) $(HTMLOUT)
+
+clean-capi distclean-capi realclean-capi:
+	@echo $(@:-capi=ing) capi
+	$(Q)$(RMALL) $(CAPIOUT)
+
+clean-platform:
+	$(Q) $(RM) $(PLATFORM_D)
+	-$(Q) $(RMDIR) $(PLATFORM_DIR) 2> $(NULL) || exit 0
+
 check: main test test-all
 	$(ECHO) check succeeded
 check-ruby: test test-ruby
@@ -546,8 +584,8 @@ $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(PREP
 
 test-rubyspec-precheck:
 
-test-rubyspec: test-rubyspec-precheck
-	$(RUNRUBY) $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
+test-rubyspec: test-rubyspec-precheck $(arch)-fake.rb
+	$(RUNRUBY) -r./$(arch)-fake $(srcdir)/spec/mspec/bin/mspec run -B $(srcdir)/spec/default.mspec $(MSPECOPT)
 
 RUNNABLE = $(LIBRUBY_RELATIVE:no=un)-runnable
 runnable: $(RUNNABLE) prog $(srcdir)/tool/mkrunnable.rb PHONY
@@ -556,7 +594,7 @@ yes-runnable: PHONY
 
 encs: enc trans
 libencs: libenc libtrans
-encs enc trans libencs libenc libtrans: showflags $(ENC_MK) $(LIBRUBY) $(PREP)
+encs enc trans libencs libenc libtrans: showflags $(ENC_MK) $(LIBRUBY) $(PREP) PHONY
 	$(ECHO) making $@
 	$(Q) $(MAKE) -f $(ENC_MK) V="$(V)" \
 		RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" \
@@ -569,14 +607,14 @@ 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)
+	$(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $@ $(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: clean clean-ext clean-local clean-enc clean-golf clean-rdoc clean-html clean-extout
 .PHONY: distclean distclean-ext distclean-local distclean-enc distclean-golf distclean-extout
 .PHONY: realclean realclean-ext realclean-local realclean-enc realclean-golf realclean-extout
 .PHONY: check test test-all btest btest-ruby test-sample test-knownbug
@@ -603,15 +641,11 @@ $(PLATFORM_D):
 	@exit > $@
 
 ###
+CCAN_DIR = {$(VPATH)}ccan
 
 RUBY_H_INCLUDES    = {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}defines.h \
 		     {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \
 		     {$(VPATH)}subst.h
-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
 
 ###
 
@@ -625,7 +659,7 @@ flock.$(OBJEXT): {$(VPATH)}flock.c
 memcmp.$(OBJEXT): {$(VPATH)}memcmp.c
 memmove.$(OBJEXT): {$(VPATH)}memmove.c
 mkdir.$(OBJEXT): {$(VPATH)}mkdir.c
-setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c {$(VPATH)}util.h $(RUBY_H_INCLUDES) $(hdrdir)/ruby.h
+setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c
 strchr.$(OBJEXT): {$(VPATH)}strchr.c
 strdup.$(OBJEXT): {$(VPATH)}strdup.c
 strerror.$(OBJEXT): {$(VPATH)}strerror.c
@@ -642,225 +676,28 @@ ia64.$(OBJEXT): {$(VPATH)}ia64.s
 
 ###
 
-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
-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)
-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 \
-  {$(VPATH)}util.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)
+# dependencies for generated C sources.
+parse.$(OBJEXT): {$(VPATH)}parse.c
+miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c
+prelude.$(OBJEXT): {$(VPATH)}prelude.c
+
+# dependencies for optional sources.
+compile.$(OBJEXT): {$(VPATH)}opt_sc.inc {$(VPATH)}optunifs.inc
 
 win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}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)
+win32/file.$(OBJEXT): {$(VPATH)}win32/file.c {$(VPATH)}thread.h \
+  $(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
+newline.$(OBJEXT): $(NEWLINE_C)
 
-verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(RBCONFIG)
+verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb
 	$(ECHO) creating $@
-	$(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" $(srcdir)/template/verconf.h.tmpl > $@
-
-DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \
-		eval.$(OBJEXT) \
-		gc.$(OBJEXT) \
-		hash.$(OBJEXT) \
-		load.$(OBJEXT) \
-		object.$(OBJEXT) \
-		parse.$(OBJEXT) \
-		string.$(OBJEXT) \
-		vm.$(OBJEXT)
+	$(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" -o $@ $(srcdir)/template/verconf.h.tmpl
 
-probes.$(OBJEXT): $(DTRACE_DEPENDENT_OBJS)
-ruby-glommed.$(OBJEXT): $(OBJS) $(DTRACE_OBJ)
+ruby-glommed.$(OBJEXT): $(OBJS)
 
 $(OBJS):  {$(VPATH)}config.h {$(VPATH)}missing.h
 
@@ -882,20 +719,30 @@ INSNS2VMOPT = --srcdir="$(srcdir)"
 
 {$(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
+common-srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c \
+	     srcs-lib srcs-ext
 
-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: common-srcs srcs-enc
+
+EXT_SRCS = $(srcdir)/ext/ripper/ripper.c \
+	   $(srcdir)/ext/rbconfig/sizeof/sizes.c
 
 srcs-ext: $(EXT_SRCS)
 
+srcs-extra: $(srcdir)/ext/json/parser/parser.c
+
+LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
+
+srcs-lib: $(LIB_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
+all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h
+incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \
+      $(srcdir)/revision.h $(REVISION_H) enc/unicode/name2ctype.h enc/jis/props.h \
+      {$(VPATH)}id.h {$(VPATH)}probes.dmyh
 
 insns: $(INSNS)
 
@@ -927,20 +774,23 @@ known_errors.inc: $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_
 	$(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
+$(MINIPRELUDE_C): $(COMPILE_PRELUDE)
 	$(ECHO) generating $@
-	$(Q) $(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -o $@ \
+		$(srcdir)/template/prelude.c.tmpl
 
-prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) \
-	   $(srcdir)/lib/rubygems/defaults.rb \
-	   $(srcdir)/lib/rubygems/core_ext/kernel_gem.rb \
-	   $(PRELUDE_SCRIPTS) $(PREP)
+$(PRELUDE_C): $(COMPILE_PRELUDE) \
+	   {$(srcdir)}lib/rubygems/defaults.rb \
+	   {$(srcdir)}lib/rubygems/core_ext/kernel_gem.rb \
+	   $(PRELUDE_SCRIPTS) $(LIB_SRCS)
 	$(ECHO) generating $@
-	$(Q) $(COMPILE_PRELUDE) $(PRELUDE_SCRIPTS) $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
+		$(srcdir)/template/prelude.c.tmpl $(PRELUDE_SCRIPTS)
 
-golf_prelude.c: $(srcdir)/tool/compile_prelude.rb $(RBCONFIG) $(srcdir)/prelude.rb $(srcdir)/golf_prelude.rb $(PREP)
+{$(VPATH)}golf_prelude.c: $(COMPILE_PRELUDE) {$(srcdir)}golf_prelude.rb
 	$(ECHO) generating $@
-	$(Q) $(COMPILE_PRELUDE) $(srcdir)/golf_prelude.rb $@
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb -I$(srcdir) -c -o $@ \
+		$(srcdir)/template/prelude.c.tmpl golf_prelude.rb
 
 probes.dmyh: {$(srcdir)}probes.d $(srcdir)/tool/gen_dummy_probes.rb
 	$(BASERUBY) $(srcdir)/tool/gen_dummy_probes.rb $(srcdir)/probes.d > $@
@@ -949,6 +799,7 @@ probes.h: {$(VPATH)}probes.$(DTRACE_EXT)
 
 prereq: incs srcs preludes PHONY
 
+preludes: {$(VPATH)}prelude.c
 preludes: {$(VPATH)}miniprelude.c
 preludes: {$(srcdir)}golf_prelude.c
 
@@ -962,18 +813,15 @@ $(REVISION_H): $(srcdir)/version.h $(srcdir)/ChangeLog $(srcdir)/tool/file2lastr
 $(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)"
+		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" VPATH="$(PWD)" \
+		top_srcdir=../.. srcdir=. \
+		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 $@
@@ -1038,25 +886,91 @@ gdb-ruby: $(PROGRAM) run.gdb PHONY
 	$(Q) $(RUNRUBY_COMMAND) $(RUNRUBY_DEBUGGER) -- $(TESTRUN_SCRIPT)
 
 dist:
-	$(BASERUBY) $(srcdir)/tool/make-snapshot tmp $(RELNAME)
+	$(BASERUBY) $(srcdir)/tool/make-snapshot -srcdir=$(srcdir) tmp $(RELNAME)
 
 up::
-	-$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
+	-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) REVISION_FORCE=PHONY "$(REVISION_H)"
+
+up::
+	-$(Q)$(MAKE) $(MFLAGS) Q=$(Q) after-update
+
+after-update:: update-unicode update-gems extract-extlibs
+
+update-config_files: PHONY
+	$(Q) $(BASERUBY) -C "$(srcdir)/tool" \
+	    ../tool/downloader.rb -e gnu \
+	    config.guess config.sub
+
+update-gems: PHONY
+	$(ECHO) Downloading bundled gem files...
+	$(Q) $(BASERUBY) -C "$(srcdir)/gems" \
+	    -I../tool -rdownloader -answ \
+	    -e 'gem, ver = *$$F' \
+	    -e 'old = Dir.glob("#{gem}-*.gem")' \
+	    -e 'gem = "#{gem}-#{ver}.gem"' \
+	    -e 'Downloader::RubyGems.download(gem, nil, nil) and' \
+	    -e 'File.unlink(*(old-[gem]))' \
+	    bundled_gems
+
+UPDATE_LIBRARIES = no
+
+### set the following environment variable or uncomment the line if
+### the Unicode data files are updated every minute.
+# ALWAYS_UPDATE_UNICODE = yes
+
+UNICODE_FILES = $(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/UnicodeData.txt \
+		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/CompositionExclusions.txt \
+		$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)/NormalizationTest.txt
+
+update-unicode: $(UNICODE_FILES) PHONY
+
+UNICODE_FILES_DEPS0 = $(UPDATE_LIBRARIES:yes=download-unicode-data)
+UNICODE_FILES_DEPS = $(UNICODE_FILES_DEPS0:no=)
+$(UNICODE_FILES): $(UNICODE_FILES_DEPS)
+
+download-unicode-data: ./.unicode-$(UNICODE_VERSION).time
+./.unicode-$(UNICODE_VERSION).time: PHONY
+	$(ECHO) Downloading Unicode $(UNICODE_VERSION) data files...
+	$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data/$(UNICODE_VERSION)"
+	$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb \
+	    -d enc/unicode/data/$(UNICODE_VERSION) \
+	    -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
+	    $(UNICODE_VERSION)/ucd/UnicodeData.txt \
+	    $(UNICODE_VERSION)/ucd/CompositionExclusions.txt \
+	    $(UNICODE_VERSION)/ucd/NormalizationTest.txt
+	@exit > $@
 
-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)
+$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): \
+	$(UNICODE_FILES_DEPS:download-unicode-data=./.unicode-tables.time)
+
+./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
+		$(UNICODE_FILES) $(UNICODE_FILES_DEPS) \
+		$(srcdir)/template/unicode_norm_gen.tmpl
+	$(Q) $(BASERUBY) $(srcdir)/tool/generic_erb.rb \
+		-c -t$@ -o $(srcdir)/lib/unicode_normalize/tables.rb \
+		-I $(srcdir) \
+		$(srcdir)/template/unicode_norm_gen.tmpl \
+		enc/unicode/data/$(UNICODE_VERSION) lib/unicode_normalize
+
+download-extlibs:
+	$(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --download ext
+
+extract-extlibs:
+	$(Q) $(BASERUBY) -C $(srcdir) -w tool/extlibs.rb --all ext
+
+clean-extlibs:
+	$(Q) $(RMALL) $(srcdir)/.downloaded-cache
+
+CLEAN_CACHE = clean-extlibs
 
 info: info-program info-libruby_a info-libruby_so info-arch
-info-program:
+info-program: PHONY
 	@echo PROGRAM=$(PROGRAM)
-info-libruby_a:
+info-libruby_a: PHONY
 	@echo LIBRUBY_A=$(LIBRUBY_A)
-info-libruby_so:
+info-libruby_so: PHONY
 	@echo LIBRUBY_SO=$(LIBRUBY_SO)
-info-arch:
+info-arch: PHONY
 	@echo arch=$(arch)
 
 change: PHONY
@@ -1067,7 +981,7 @@ love: sudo-precheck up all test install test-all
 
 yes-test-all: sudo-precheck
 
-sudo-precheck:
+sudo-precheck: PHONY
 	@$(SUDO) echo > $(NULL)
 
 help: PHONY
@@ -1102,5 +1016,1384 @@ help: PHONY
 	"  golf:            for golfers" \
 	"" \
 	"see DeveloperHowto for more detail: " \
-	"  http://bugs.ruby-lang.org/wiki/ruby/DeveloperHowto" \
+	"  https://bugs.ruby-lang.org/projects/ruby/wiki/DeveloperHowto" \
 	$(MESSAGE_END)
+
+# AUTOGENERATED DEPENDENCIES START
+addr2line.$(OBJEXT): {$(VPATH)}addr2line.c
+addr2line.$(OBJEXT): {$(VPATH)}addr2line.h
+addr2line.$(OBJEXT): {$(VPATH)}config.h
+addr2line.$(OBJEXT): {$(VPATH)}missing.h
+array.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+array.$(OBJEXT): $(top_srcdir)/include/ruby.h
+array.$(OBJEXT): {$(VPATH)}array.c
+array.$(OBJEXT): {$(VPATH)}config.h
+array.$(OBJEXT): {$(VPATH)}defines.h
+array.$(OBJEXT): {$(VPATH)}encoding.h
+array.$(OBJEXT): {$(VPATH)}id.h
+array.$(OBJEXT): {$(VPATH)}intern.h
+array.$(OBJEXT): {$(VPATH)}internal.h
+array.$(OBJEXT): {$(VPATH)}io.h
+array.$(OBJEXT): {$(VPATH)}missing.h
+array.$(OBJEXT): {$(VPATH)}oniguruma.h
+array.$(OBJEXT): {$(VPATH)}probes.h
+array.$(OBJEXT): {$(VPATH)}st.h
+array.$(OBJEXT): {$(VPATH)}subst.h
+array.$(OBJEXT): {$(VPATH)}util.h
+array.$(OBJEXT): {$(VPATH)}vm_opts.h
+ascii.$(OBJEXT): {$(VPATH)}ascii.c
+ascii.$(OBJEXT): {$(VPATH)}config.h
+ascii.$(OBJEXT): {$(VPATH)}defines.h
+ascii.$(OBJEXT): {$(VPATH)}missing.h
+ascii.$(OBJEXT): {$(VPATH)}oniguruma.h
+ascii.$(OBJEXT): {$(VPATH)}regenc.h
+bignum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+bignum.$(OBJEXT): $(top_srcdir)/include/ruby.h
+bignum.$(OBJEXT): {$(VPATH)}bignum.c
+bignum.$(OBJEXT): {$(VPATH)}config.h
+bignum.$(OBJEXT): {$(VPATH)}defines.h
+bignum.$(OBJEXT): {$(VPATH)}encoding.h
+bignum.$(OBJEXT): {$(VPATH)}intern.h
+bignum.$(OBJEXT): {$(VPATH)}internal.h
+bignum.$(OBJEXT): {$(VPATH)}io.h
+bignum.$(OBJEXT): {$(VPATH)}missing.h
+bignum.$(OBJEXT): {$(VPATH)}oniguruma.h
+bignum.$(OBJEXT): {$(VPATH)}st.h
+bignum.$(OBJEXT): {$(VPATH)}subst.h
+bignum.$(OBJEXT): {$(VPATH)}thread.h
+bignum.$(OBJEXT): {$(VPATH)}util.h
+class.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+class.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+class.$(OBJEXT): $(CCAN_DIR)/list/list.h
+class.$(OBJEXT): $(CCAN_DIR)/str/str.h
+class.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+class.$(OBJEXT): $(top_srcdir)/include/ruby.h
+class.$(OBJEXT): {$(VPATH)}class.c
+class.$(OBJEXT): {$(VPATH)}config.h
+class.$(OBJEXT): {$(VPATH)}constant.h
+class.$(OBJEXT): {$(VPATH)}defines.h
+class.$(OBJEXT): {$(VPATH)}encoding.h
+class.$(OBJEXT): {$(VPATH)}id.h
+class.$(OBJEXT): {$(VPATH)}intern.h
+class.$(OBJEXT): {$(VPATH)}internal.h
+class.$(OBJEXT): {$(VPATH)}io.h
+class.$(OBJEXT): {$(VPATH)}method.h
+class.$(OBJEXT): {$(VPATH)}missing.h
+class.$(OBJEXT): {$(VPATH)}node.h
+class.$(OBJEXT): {$(VPATH)}oniguruma.h
+class.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+class.$(OBJEXT): {$(VPATH)}st.h
+class.$(OBJEXT): {$(VPATH)}subst.h
+class.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+class.$(OBJEXT): {$(VPATH)}thread_native.h
+class.$(OBJEXT): {$(VPATH)}vm_core.h
+class.$(OBJEXT): {$(VPATH)}vm_debug.h
+class.$(OBJEXT): {$(VPATH)}vm_opts.h
+compar.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+compar.$(OBJEXT): {$(VPATH)}compar.c
+compar.$(OBJEXT): {$(VPATH)}config.h
+compar.$(OBJEXT): {$(VPATH)}defines.h
+compar.$(OBJEXT): {$(VPATH)}intern.h
+compar.$(OBJEXT): {$(VPATH)}missing.h
+compar.$(OBJEXT): {$(VPATH)}st.h
+compar.$(OBJEXT): {$(VPATH)}subst.h
+compile.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+compile.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+compile.$(OBJEXT): $(CCAN_DIR)/list/list.h
+compile.$(OBJEXT): $(CCAN_DIR)/str/str.h
+compile.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+compile.$(OBJEXT): $(top_srcdir)/include/ruby.h
+compile.$(OBJEXT): {$(VPATH)}compile.c
+compile.$(OBJEXT): {$(VPATH)}config.h
+compile.$(OBJEXT): {$(VPATH)}defines.h
+compile.$(OBJEXT): {$(VPATH)}encoding.h
+compile.$(OBJEXT): {$(VPATH)}id.h
+compile.$(OBJEXT): {$(VPATH)}insns.inc
+compile.$(OBJEXT): {$(VPATH)}insns_info.inc
+compile.$(OBJEXT): {$(VPATH)}intern.h
+compile.$(OBJEXT): {$(VPATH)}internal.h
+compile.$(OBJEXT): {$(VPATH)}io.h
+compile.$(OBJEXT): {$(VPATH)}iseq.h
+compile.$(OBJEXT): {$(VPATH)}method.h
+compile.$(OBJEXT): {$(VPATH)}missing.h
+compile.$(OBJEXT): {$(VPATH)}node.h
+compile.$(OBJEXT): {$(VPATH)}oniguruma.h
+compile.$(OBJEXT): {$(VPATH)}optinsn.inc
+compile.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+compile.$(OBJEXT): {$(VPATH)}st.h
+compile.$(OBJEXT): {$(VPATH)}subst.h
+compile.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+compile.$(OBJEXT): {$(VPATH)}thread_native.h
+compile.$(OBJEXT): {$(VPATH)}vm_core.h
+compile.$(OBJEXT): {$(VPATH)}vm_debug.h
+compile.$(OBJEXT): {$(VPATH)}vm_opts.h
+complex.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+complex.$(OBJEXT): $(top_srcdir)/include/ruby.h
+complex.$(OBJEXT): {$(VPATH)}complex.c
+complex.$(OBJEXT): {$(VPATH)}config.h
+complex.$(OBJEXT): {$(VPATH)}defines.h
+complex.$(OBJEXT): {$(VPATH)}encoding.h
+complex.$(OBJEXT): {$(VPATH)}intern.h
+complex.$(OBJEXT): {$(VPATH)}internal.h
+complex.$(OBJEXT): {$(VPATH)}io.h
+complex.$(OBJEXT): {$(VPATH)}missing.h
+complex.$(OBJEXT): {$(VPATH)}oniguruma.h
+complex.$(OBJEXT): {$(VPATH)}st.h
+complex.$(OBJEXT): {$(VPATH)}subst.h
+cont.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+cont.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+cont.$(OBJEXT): $(CCAN_DIR)/list/list.h
+cont.$(OBJEXT): $(CCAN_DIR)/str/str.h
+cont.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+cont.$(OBJEXT): $(top_srcdir)/include/ruby.h
+cont.$(OBJEXT): {$(VPATH)}config.h
+cont.$(OBJEXT): {$(VPATH)}cont.c
+cont.$(OBJEXT): {$(VPATH)}defines.h
+cont.$(OBJEXT): {$(VPATH)}encoding.h
+cont.$(OBJEXT): {$(VPATH)}eval_intern.h
+cont.$(OBJEXT): {$(VPATH)}gc.h
+cont.$(OBJEXT): {$(VPATH)}id.h
+cont.$(OBJEXT): {$(VPATH)}intern.h
+cont.$(OBJEXT): {$(VPATH)}internal.h
+cont.$(OBJEXT): {$(VPATH)}io.h
+cont.$(OBJEXT): {$(VPATH)}method.h
+cont.$(OBJEXT): {$(VPATH)}missing.h
+cont.$(OBJEXT): {$(VPATH)}node.h
+cont.$(OBJEXT): {$(VPATH)}oniguruma.h
+cont.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+cont.$(OBJEXT): {$(VPATH)}st.h
+cont.$(OBJEXT): {$(VPATH)}subst.h
+cont.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+cont.$(OBJEXT): {$(VPATH)}thread_native.h
+cont.$(OBJEXT): {$(VPATH)}vm_core.h
+cont.$(OBJEXT): {$(VPATH)}vm_debug.h
+cont.$(OBJEXT): {$(VPATH)}vm_opts.h
+debug.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+debug.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+debug.$(OBJEXT): $(CCAN_DIR)/list/list.h
+debug.$(OBJEXT): $(CCAN_DIR)/str/str.h
+debug.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+debug.$(OBJEXT): $(top_srcdir)/include/ruby.h
+debug.$(OBJEXT): {$(VPATH)}config.h
+debug.$(OBJEXT): {$(VPATH)}debug.c
+debug.$(OBJEXT): {$(VPATH)}defines.h
+debug.$(OBJEXT): {$(VPATH)}encoding.h
+debug.$(OBJEXT): {$(VPATH)}eval_intern.h
+debug.$(OBJEXT): {$(VPATH)}id.h
+debug.$(OBJEXT): {$(VPATH)}intern.h
+debug.$(OBJEXT): {$(VPATH)}internal.h
+debug.$(OBJEXT): {$(VPATH)}io.h
+debug.$(OBJEXT): {$(VPATH)}method.h
+debug.$(OBJEXT): {$(VPATH)}missing.h
+debug.$(OBJEXT): {$(VPATH)}node.h
+debug.$(OBJEXT): {$(VPATH)}oniguruma.h
+debug.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+debug.$(OBJEXT): {$(VPATH)}st.h
+debug.$(OBJEXT): {$(VPATH)}subst.h
+debug.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+debug.$(OBJEXT): {$(VPATH)}thread_native.h
+debug.$(OBJEXT): {$(VPATH)}util.h
+debug.$(OBJEXT): {$(VPATH)}vm_core.h
+debug.$(OBJEXT): {$(VPATH)}vm_debug.h
+debug.$(OBJEXT): {$(VPATH)}vm_opts.h
+dir.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dir.$(OBJEXT): $(top_srcdir)/include/ruby.h
+dir.$(OBJEXT): {$(VPATH)}config.h
+dir.$(OBJEXT): {$(VPATH)}defines.h
+dir.$(OBJEXT): {$(VPATH)}dir.c
+dir.$(OBJEXT): {$(VPATH)}encoding.h
+dir.$(OBJEXT): {$(VPATH)}intern.h
+dir.$(OBJEXT): {$(VPATH)}internal.h
+dir.$(OBJEXT): {$(VPATH)}io.h
+dir.$(OBJEXT): {$(VPATH)}missing.h
+dir.$(OBJEXT): {$(VPATH)}oniguruma.h
+dir.$(OBJEXT): {$(VPATH)}st.h
+dir.$(OBJEXT): {$(VPATH)}subst.h
+dir.$(OBJEXT): {$(VPATH)}util.h
+dln.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dln.$(OBJEXT): {$(VPATH)}config.h
+dln.$(OBJEXT): {$(VPATH)}defines.h
+dln.$(OBJEXT): {$(VPATH)}dln.c
+dln.$(OBJEXT): {$(VPATH)}dln.h
+dln.$(OBJEXT): {$(VPATH)}intern.h
+dln.$(OBJEXT): {$(VPATH)}missing.h
+dln.$(OBJEXT): {$(VPATH)}st.h
+dln.$(OBJEXT): {$(VPATH)}subst.h
+dln_find.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dln_find.$(OBJEXT): {$(VPATH)}config.h
+dln_find.$(OBJEXT): {$(VPATH)}defines.h
+dln_find.$(OBJEXT): {$(VPATH)}dln.h
+dln_find.$(OBJEXT): {$(VPATH)}dln_find.c
+dln_find.$(OBJEXT): {$(VPATH)}intern.h
+dln_find.$(OBJEXT): {$(VPATH)}missing.h
+dln_find.$(OBJEXT): {$(VPATH)}st.h
+dln_find.$(OBJEXT): {$(VPATH)}subst.h
+dmydln.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+dmydln.$(OBJEXT): {$(VPATH)}config.h
+dmydln.$(OBJEXT): {$(VPATH)}defines.h
+dmydln.$(OBJEXT): {$(VPATH)}dmydln.c
+dmydln.$(OBJEXT): {$(VPATH)}intern.h
+dmydln.$(OBJEXT): {$(VPATH)}missing.h
+dmydln.$(OBJEXT): {$(VPATH)}st.h
+dmydln.$(OBJEXT): {$(VPATH)}subst.h
+dmyenc.$(OBJEXT): {$(VPATH)}dmyenc.c
+dmyext.$(OBJEXT): {$(VPATH)}dmyext.c
+encoding.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+encoding.$(OBJEXT): $(top_srcdir)/include/ruby.h
+encoding.$(OBJEXT): {$(VPATH)}config.h
+encoding.$(OBJEXT): {$(VPATH)}defines.h
+encoding.$(OBJEXT): {$(VPATH)}encoding.c
+encoding.$(OBJEXT): {$(VPATH)}encoding.h
+encoding.$(OBJEXT): {$(VPATH)}intern.h
+encoding.$(OBJEXT): {$(VPATH)}internal.h
+encoding.$(OBJEXT): {$(VPATH)}io.h
+encoding.$(OBJEXT): {$(VPATH)}missing.h
+encoding.$(OBJEXT): {$(VPATH)}oniguruma.h
+encoding.$(OBJEXT): {$(VPATH)}regenc.h
+encoding.$(OBJEXT): {$(VPATH)}st.h
+encoding.$(OBJEXT): {$(VPATH)}subst.h
+encoding.$(OBJEXT): {$(VPATH)}util.h
+enum.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enum.$(OBJEXT): $(top_srcdir)/include/ruby.h
+enum.$(OBJEXT): {$(VPATH)}config.h
+enum.$(OBJEXT): {$(VPATH)}defines.h
+enum.$(OBJEXT): {$(VPATH)}encoding.h
+enum.$(OBJEXT): {$(VPATH)}enum.c
+enum.$(OBJEXT): {$(VPATH)}id.h
+enum.$(OBJEXT): {$(VPATH)}intern.h
+enum.$(OBJEXT): {$(VPATH)}internal.h
+enum.$(OBJEXT): {$(VPATH)}io.h
+enum.$(OBJEXT): {$(VPATH)}missing.h
+enum.$(OBJEXT): {$(VPATH)}node.h
+enum.$(OBJEXT): {$(VPATH)}oniguruma.h
+enum.$(OBJEXT): {$(VPATH)}st.h
+enum.$(OBJEXT): {$(VPATH)}subst.h
+enum.$(OBJEXT): {$(VPATH)}util.h
+enumerator.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enumerator.$(OBJEXT): $(top_srcdir)/include/ruby.h
+enumerator.$(OBJEXT): {$(VPATH)}config.h
+enumerator.$(OBJEXT): {$(VPATH)}defines.h
+enumerator.$(OBJEXT): {$(VPATH)}encoding.h
+enumerator.$(OBJEXT): {$(VPATH)}enumerator.c
+enumerator.$(OBJEXT): {$(VPATH)}intern.h
+enumerator.$(OBJEXT): {$(VPATH)}internal.h
+enumerator.$(OBJEXT): {$(VPATH)}io.h
+enumerator.$(OBJEXT): {$(VPATH)}missing.h
+enumerator.$(OBJEXT): {$(VPATH)}node.h
+enumerator.$(OBJEXT): {$(VPATH)}oniguruma.h
+enumerator.$(OBJEXT): {$(VPATH)}st.h
+enumerator.$(OBJEXT): {$(VPATH)}subst.h
+error.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+error.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+error.$(OBJEXT): $(CCAN_DIR)/list/list.h
+error.$(OBJEXT): $(CCAN_DIR)/str/str.h
+error.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+error.$(OBJEXT): $(top_srcdir)/include/ruby.h
+error.$(OBJEXT): {$(VPATH)}config.h
+error.$(OBJEXT): {$(VPATH)}defines.h
+error.$(OBJEXT): {$(VPATH)}encoding.h
+error.$(OBJEXT): {$(VPATH)}error.c
+error.$(OBJEXT): {$(VPATH)}id.h
+error.$(OBJEXT): {$(VPATH)}intern.h
+error.$(OBJEXT): {$(VPATH)}internal.h
+error.$(OBJEXT): {$(VPATH)}io.h
+error.$(OBJEXT): {$(VPATH)}known_errors.inc
+error.$(OBJEXT): {$(VPATH)}method.h
+error.$(OBJEXT): {$(VPATH)}missing.h
+error.$(OBJEXT): {$(VPATH)}node.h
+error.$(OBJEXT): {$(VPATH)}oniguruma.h
+error.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+error.$(OBJEXT): {$(VPATH)}st.h
+error.$(OBJEXT): {$(VPATH)}subst.h
+error.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+error.$(OBJEXT): {$(VPATH)}thread_native.h
+error.$(OBJEXT): {$(VPATH)}vm_core.h
+error.$(OBJEXT): {$(VPATH)}vm_debug.h
+error.$(OBJEXT): {$(VPATH)}vm_opts.h
+eval.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+eval.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+eval.$(OBJEXT): $(CCAN_DIR)/list/list.h
+eval.$(OBJEXT): $(CCAN_DIR)/str/str.h
+eval.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+eval.$(OBJEXT): $(top_srcdir)/include/ruby.h
+eval.$(OBJEXT): {$(VPATH)}config.h
+eval.$(OBJEXT): {$(VPATH)}defines.h
+eval.$(OBJEXT): {$(VPATH)}encoding.h
+eval.$(OBJEXT): {$(VPATH)}eval.c
+eval.$(OBJEXT): {$(VPATH)}eval_error.c
+eval.$(OBJEXT): {$(VPATH)}eval_intern.h
+eval.$(OBJEXT): {$(VPATH)}eval_jump.c
+eval.$(OBJEXT): {$(VPATH)}gc.h
+eval.$(OBJEXT): {$(VPATH)}id.h
+eval.$(OBJEXT): {$(VPATH)}intern.h
+eval.$(OBJEXT): {$(VPATH)}internal.h
+eval.$(OBJEXT): {$(VPATH)}io.h
+eval.$(OBJEXT): {$(VPATH)}iseq.h
+eval.$(OBJEXT): {$(VPATH)}method.h
+eval.$(OBJEXT): {$(VPATH)}missing.h
+eval.$(OBJEXT): {$(VPATH)}node.h
+eval.$(OBJEXT): {$(VPATH)}oniguruma.h
+eval.$(OBJEXT): {$(VPATH)}probes.h
+eval.$(OBJEXT): {$(VPATH)}probes_helper.h
+eval.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+eval.$(OBJEXT): {$(VPATH)}st.h
+eval.$(OBJEXT): {$(VPATH)}subst.h
+eval.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+eval.$(OBJEXT): {$(VPATH)}thread_native.h
+eval.$(OBJEXT): {$(VPATH)}vm.h
+eval.$(OBJEXT): {$(VPATH)}vm_core.h
+eval.$(OBJEXT): {$(VPATH)}vm_debug.h
+eval.$(OBJEXT): {$(VPATH)}vm_opts.h
+file.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+file.$(OBJEXT): $(top_srcdir)/include/ruby.h
+file.$(OBJEXT): {$(VPATH)}config.h
+file.$(OBJEXT): {$(VPATH)}defines.h
+file.$(OBJEXT): {$(VPATH)}dln.h
+file.$(OBJEXT): {$(VPATH)}encoding.h
+file.$(OBJEXT): {$(VPATH)}file.c
+file.$(OBJEXT): {$(VPATH)}intern.h
+file.$(OBJEXT): {$(VPATH)}internal.h
+file.$(OBJEXT): {$(VPATH)}io.h
+file.$(OBJEXT): {$(VPATH)}missing.h
+file.$(OBJEXT): {$(VPATH)}oniguruma.h
+file.$(OBJEXT): {$(VPATH)}st.h
+file.$(OBJEXT): {$(VPATH)}subst.h
+file.$(OBJEXT): {$(VPATH)}thread.h
+file.$(OBJEXT): {$(VPATH)}util.h
+gc.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+gc.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+gc.$(OBJEXT): $(CCAN_DIR)/list/list.h
+gc.$(OBJEXT): $(CCAN_DIR)/str/str.h
+gc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+gc.$(OBJEXT): $(top_srcdir)/include/ruby.h
+gc.$(OBJEXT): {$(VPATH)}config.h
+gc.$(OBJEXT): {$(VPATH)}constant.h
+gc.$(OBJEXT): {$(VPATH)}debug.h
+gc.$(OBJEXT): {$(VPATH)}defines.h
+gc.$(OBJEXT): {$(VPATH)}encoding.h
+gc.$(OBJEXT): {$(VPATH)}eval_intern.h
+gc.$(OBJEXT): {$(VPATH)}gc.c
+gc.$(OBJEXT): {$(VPATH)}gc.h
+gc.$(OBJEXT): {$(VPATH)}id.h
+gc.$(OBJEXT): {$(VPATH)}intern.h
+gc.$(OBJEXT): {$(VPATH)}internal.h
+gc.$(OBJEXT): {$(VPATH)}io.h
+gc.$(OBJEXT): {$(VPATH)}method.h
+gc.$(OBJEXT): {$(VPATH)}missing.h
+gc.$(OBJEXT): {$(VPATH)}node.h
+gc.$(OBJEXT): {$(VPATH)}oniguruma.h
+gc.$(OBJEXT): {$(VPATH)}probes.h
+gc.$(OBJEXT): {$(VPATH)}re.h
+gc.$(OBJEXT): {$(VPATH)}regenc.h
+gc.$(OBJEXT): {$(VPATH)}regex.h
+gc.$(OBJEXT): {$(VPATH)}regint.h
+gc.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+gc.$(OBJEXT): {$(VPATH)}st.h
+gc.$(OBJEXT): {$(VPATH)}subst.h
+gc.$(OBJEXT): {$(VPATH)}thread.h
+gc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+gc.$(OBJEXT): {$(VPATH)}thread_native.h
+gc.$(OBJEXT): {$(VPATH)}util.h
+gc.$(OBJEXT): {$(VPATH)}vm_core.h
+gc.$(OBJEXT): {$(VPATH)}vm_debug.h
+gc.$(OBJEXT): {$(VPATH)}vm_opts.h
+golf_prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+golf_prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+golf_prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
+golf_prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h
+golf_prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+golf_prelude.$(OBJEXT): $(top_srcdir)/include/ruby.h
+golf_prelude.$(OBJEXT): {$(VPATH)}config.h
+golf_prelude.$(OBJEXT): {$(VPATH)}defines.h
+golf_prelude.$(OBJEXT): {$(VPATH)}encoding.h
+golf_prelude.$(OBJEXT): {$(VPATH)}golf_prelude.c
+golf_prelude.$(OBJEXT): {$(VPATH)}id.h
+golf_prelude.$(OBJEXT): {$(VPATH)}intern.h
+golf_prelude.$(OBJEXT): {$(VPATH)}internal.h
+golf_prelude.$(OBJEXT): {$(VPATH)}io.h
+golf_prelude.$(OBJEXT): {$(VPATH)}method.h
+golf_prelude.$(OBJEXT): {$(VPATH)}missing.h
+golf_prelude.$(OBJEXT): {$(VPATH)}node.h
+golf_prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
+golf_prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+golf_prelude.$(OBJEXT): {$(VPATH)}st.h
+golf_prelude.$(OBJEXT): {$(VPATH)}subst.h
+golf_prelude.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+golf_prelude.$(OBJEXT): {$(VPATH)}thread_native.h
+golf_prelude.$(OBJEXT): {$(VPATH)}vm_core.h
+golf_prelude.$(OBJEXT): {$(VPATH)}vm_debug.h
+golf_prelude.$(OBJEXT): {$(VPATH)}vm_opts.h
+goruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+goruby.$(OBJEXT): $(top_srcdir)/include/ruby.h
+goruby.$(OBJEXT): {$(VPATH)}config.h
+goruby.$(OBJEXT): {$(VPATH)}defines.h
+goruby.$(OBJEXT): {$(VPATH)}goruby.c
+goruby.$(OBJEXT): {$(VPATH)}intern.h
+goruby.$(OBJEXT): {$(VPATH)}main.c
+goruby.$(OBJEXT): {$(VPATH)}missing.h
+goruby.$(OBJEXT): {$(VPATH)}node.h
+goruby.$(OBJEXT): {$(VPATH)}st.h
+goruby.$(OBJEXT): {$(VPATH)}subst.h
+goruby.$(OBJEXT): {$(VPATH)}vm_debug.h
+hash.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+hash.$(OBJEXT): $(top_srcdir)/include/ruby.h
+hash.$(OBJEXT): {$(VPATH)}config.h
+hash.$(OBJEXT): {$(VPATH)}defines.h
+hash.$(OBJEXT): {$(VPATH)}encoding.h
+hash.$(OBJEXT): {$(VPATH)}hash.c
+hash.$(OBJEXT): {$(VPATH)}id.h
+hash.$(OBJEXT): {$(VPATH)}intern.h
+hash.$(OBJEXT): {$(VPATH)}internal.h
+hash.$(OBJEXT): {$(VPATH)}io.h
+hash.$(OBJEXT): {$(VPATH)}missing.h
+hash.$(OBJEXT): {$(VPATH)}oniguruma.h
+hash.$(OBJEXT): {$(VPATH)}probes.h
+hash.$(OBJEXT): {$(VPATH)}st.h
+hash.$(OBJEXT): {$(VPATH)}subst.h
+hash.$(OBJEXT): {$(VPATH)}symbol.h
+hash.$(OBJEXT): {$(VPATH)}util.h
+hash.$(OBJEXT): {$(VPATH)}vm_opts.h
+inits.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+inits.$(OBJEXT): $(top_srcdir)/include/ruby.h
+inits.$(OBJEXT): {$(VPATH)}config.h
+inits.$(OBJEXT): {$(VPATH)}defines.h
+inits.$(OBJEXT): {$(VPATH)}encoding.h
+inits.$(OBJEXT): {$(VPATH)}inits.c
+inits.$(OBJEXT): {$(VPATH)}intern.h
+inits.$(OBJEXT): {$(VPATH)}internal.h
+inits.$(OBJEXT): {$(VPATH)}io.h
+inits.$(OBJEXT): {$(VPATH)}missing.h
+inits.$(OBJEXT): {$(VPATH)}oniguruma.h
+inits.$(OBJEXT): {$(VPATH)}st.h
+inits.$(OBJEXT): {$(VPATH)}subst.h
+io.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+io.$(OBJEXT): $(top_srcdir)/include/ruby.h
+io.$(OBJEXT): {$(VPATH)}config.h
+io.$(OBJEXT): {$(VPATH)}defines.h
+io.$(OBJEXT): {$(VPATH)}dln.h
+io.$(OBJEXT): {$(VPATH)}encoding.h
+io.$(OBJEXT): {$(VPATH)}id.h
+io.$(OBJEXT): {$(VPATH)}intern.h
+io.$(OBJEXT): {$(VPATH)}internal.h
+io.$(OBJEXT): {$(VPATH)}io.c
+io.$(OBJEXT): {$(VPATH)}io.h
+io.$(OBJEXT): {$(VPATH)}missing.h
+io.$(OBJEXT): {$(VPATH)}oniguruma.h
+io.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+io.$(OBJEXT): {$(VPATH)}st.h
+io.$(OBJEXT): {$(VPATH)}subst.h
+io.$(OBJEXT): {$(VPATH)}thread.h
+io.$(OBJEXT): {$(VPATH)}util.h
+iseq.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+iseq.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+iseq.$(OBJEXT): $(CCAN_DIR)/list/list.h
+iseq.$(OBJEXT): $(CCAN_DIR)/str/str.h
+iseq.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+iseq.$(OBJEXT): $(top_srcdir)/include/ruby.h
+iseq.$(OBJEXT): {$(VPATH)}config.h
+iseq.$(OBJEXT): {$(VPATH)}defines.h
+iseq.$(OBJEXT): {$(VPATH)}encoding.h
+iseq.$(OBJEXT): {$(VPATH)}eval_intern.h
+iseq.$(OBJEXT): {$(VPATH)}gc.h
+iseq.$(OBJEXT): {$(VPATH)}id.h
+iseq.$(OBJEXT): {$(VPATH)}insns.inc
+iseq.$(OBJEXT): {$(VPATH)}insns_info.inc
+iseq.$(OBJEXT): {$(VPATH)}intern.h
+iseq.$(OBJEXT): {$(VPATH)}internal.h
+iseq.$(OBJEXT): {$(VPATH)}io.h
+iseq.$(OBJEXT): {$(VPATH)}iseq.c
+iseq.$(OBJEXT): {$(VPATH)}iseq.h
+iseq.$(OBJEXT): {$(VPATH)}method.h
+iseq.$(OBJEXT): {$(VPATH)}missing.h
+iseq.$(OBJEXT): {$(VPATH)}node.h
+iseq.$(OBJEXT): {$(VPATH)}node_name.inc
+iseq.$(OBJEXT): {$(VPATH)}oniguruma.h
+iseq.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+iseq.$(OBJEXT): {$(VPATH)}st.h
+iseq.$(OBJEXT): {$(VPATH)}subst.h
+iseq.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+iseq.$(OBJEXT): {$(VPATH)}thread_native.h
+iseq.$(OBJEXT): {$(VPATH)}util.h
+iseq.$(OBJEXT): {$(VPATH)}vm_core.h
+iseq.$(OBJEXT): {$(VPATH)}vm_debug.h
+iseq.$(OBJEXT): {$(VPATH)}vm_opts.h
+load.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+load.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+load.$(OBJEXT): $(CCAN_DIR)/list/list.h
+load.$(OBJEXT): $(CCAN_DIR)/str/str.h
+load.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+load.$(OBJEXT): $(top_srcdir)/include/ruby.h
+load.$(OBJEXT): {$(VPATH)}config.h
+load.$(OBJEXT): {$(VPATH)}defines.h
+load.$(OBJEXT): {$(VPATH)}dln.h
+load.$(OBJEXT): {$(VPATH)}encoding.h
+load.$(OBJEXT): {$(VPATH)}eval_intern.h
+load.$(OBJEXT): {$(VPATH)}id.h
+load.$(OBJEXT): {$(VPATH)}intern.h
+load.$(OBJEXT): {$(VPATH)}internal.h
+load.$(OBJEXT): {$(VPATH)}io.h
+load.$(OBJEXT): {$(VPATH)}load.c
+load.$(OBJEXT): {$(VPATH)}method.h
+load.$(OBJEXT): {$(VPATH)}missing.h
+load.$(OBJEXT): {$(VPATH)}node.h
+load.$(OBJEXT): {$(VPATH)}oniguruma.h
+load.$(OBJEXT): {$(VPATH)}probes.h
+load.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+load.$(OBJEXT): {$(VPATH)}st.h
+load.$(OBJEXT): {$(VPATH)}subst.h
+load.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+load.$(OBJEXT): {$(VPATH)}thread_native.h
+load.$(OBJEXT): {$(VPATH)}util.h
+load.$(OBJEXT): {$(VPATH)}vm_core.h
+load.$(OBJEXT): {$(VPATH)}vm_debug.h
+load.$(OBJEXT): {$(VPATH)}vm_opts.h
+loadpath.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+loadpath.$(OBJEXT): $(hdrdir)/ruby/version.h
+loadpath.$(OBJEXT): $(top_srcdir)/version.h
+loadpath.$(OBJEXT): {$(VPATH)}config.h
+loadpath.$(OBJEXT): {$(VPATH)}defines.h
+loadpath.$(OBJEXT): {$(VPATH)}intern.h
+loadpath.$(OBJEXT): {$(VPATH)}loadpath.c
+loadpath.$(OBJEXT): {$(VPATH)}missing.h
+loadpath.$(OBJEXT): {$(VPATH)}st.h
+loadpath.$(OBJEXT): {$(VPATH)}subst.h
+loadpath.$(OBJEXT): {$(VPATH)}verconf.h
+localeinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+localeinit.$(OBJEXT): $(top_srcdir)/include/ruby.h
+localeinit.$(OBJEXT): {$(VPATH)}config.h
+localeinit.$(OBJEXT): {$(VPATH)}defines.h
+localeinit.$(OBJEXT): {$(VPATH)}encoding.h
+localeinit.$(OBJEXT): {$(VPATH)}intern.h
+localeinit.$(OBJEXT): {$(VPATH)}internal.h
+localeinit.$(OBJEXT): {$(VPATH)}io.h
+localeinit.$(OBJEXT): {$(VPATH)}localeinit.c
+localeinit.$(OBJEXT): {$(VPATH)}missing.h
+localeinit.$(OBJEXT): {$(VPATH)}oniguruma.h
+localeinit.$(OBJEXT): {$(VPATH)}st.h
+localeinit.$(OBJEXT): {$(VPATH)}subst.h
+main.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+main.$(OBJEXT): $(top_srcdir)/include/ruby.h
+main.$(OBJEXT): {$(VPATH)}config.h
+main.$(OBJEXT): {$(VPATH)}defines.h
+main.$(OBJEXT): {$(VPATH)}intern.h
+main.$(OBJEXT): {$(VPATH)}main.c
+main.$(OBJEXT): {$(VPATH)}missing.h
+main.$(OBJEXT): {$(VPATH)}node.h
+main.$(OBJEXT): {$(VPATH)}st.h
+main.$(OBJEXT): {$(VPATH)}subst.h
+main.$(OBJEXT): {$(VPATH)}vm_debug.h
+marshal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+marshal.$(OBJEXT): $(top_srcdir)/include/ruby.h
+marshal.$(OBJEXT): {$(VPATH)}config.h
+marshal.$(OBJEXT): {$(VPATH)}defines.h
+marshal.$(OBJEXT): {$(VPATH)}encoding.h
+marshal.$(OBJEXT): {$(VPATH)}intern.h
+marshal.$(OBJEXT): {$(VPATH)}internal.h
+marshal.$(OBJEXT): {$(VPATH)}io.h
+marshal.$(OBJEXT): {$(VPATH)}marshal.c
+marshal.$(OBJEXT): {$(VPATH)}missing.h
+marshal.$(OBJEXT): {$(VPATH)}oniguruma.h
+marshal.$(OBJEXT): {$(VPATH)}st.h
+marshal.$(OBJEXT): {$(VPATH)}subst.h
+marshal.$(OBJEXT): {$(VPATH)}util.h
+math.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+math.$(OBJEXT): $(top_srcdir)/include/ruby.h
+math.$(OBJEXT): {$(VPATH)}config.h
+math.$(OBJEXT): {$(VPATH)}defines.h
+math.$(OBJEXT): {$(VPATH)}encoding.h
+math.$(OBJEXT): {$(VPATH)}intern.h
+math.$(OBJEXT): {$(VPATH)}internal.h
+math.$(OBJEXT): {$(VPATH)}io.h
+math.$(OBJEXT): {$(VPATH)}math.c
+math.$(OBJEXT): {$(VPATH)}missing.h
+math.$(OBJEXT): {$(VPATH)}oniguruma.h
+math.$(OBJEXT): {$(VPATH)}st.h
+math.$(OBJEXT): {$(VPATH)}subst.h
+miniinit.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+miniinit.$(OBJEXT): {$(VPATH)}config.h
+miniinit.$(OBJEXT): {$(VPATH)}defines.h
+miniinit.$(OBJEXT): {$(VPATH)}encoding.h
+miniinit.$(OBJEXT): {$(VPATH)}intern.h
+miniinit.$(OBJEXT): {$(VPATH)}miniinit.c
+miniinit.$(OBJEXT): {$(VPATH)}missing.h
+miniinit.$(OBJEXT): {$(VPATH)}oniguruma.h
+miniinit.$(OBJEXT): {$(VPATH)}st.h
+miniinit.$(OBJEXT): {$(VPATH)}subst.h
+miniprelude.$(OBJEXT): {$(VPATH)}miniprelude.c
+newline.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+newline.$(OBJEXT): {$(VPATH)}config.h
+newline.$(OBJEXT): {$(VPATH)}defines.h
+newline.$(OBJEXT): {$(VPATH)}intern.h
+newline.$(OBJEXT): {$(VPATH)}missing.h
+newline.$(OBJEXT): {$(VPATH)}newline.c
+newline.$(OBJEXT): {$(VPATH)}st.h
+newline.$(OBJEXT): {$(VPATH)}subst.h
+newline.$(OBJEXT): {$(VPATH)}transcode_data.h
+node.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+node.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+node.$(OBJEXT): $(CCAN_DIR)/list/list.h
+node.$(OBJEXT): $(CCAN_DIR)/str/str.h
+node.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+node.$(OBJEXT): $(top_srcdir)/include/ruby.h
+node.$(OBJEXT): {$(VPATH)}config.h
+node.$(OBJEXT): {$(VPATH)}defines.h
+node.$(OBJEXT): {$(VPATH)}encoding.h
+node.$(OBJEXT): {$(VPATH)}id.h
+node.$(OBJEXT): {$(VPATH)}intern.h
+node.$(OBJEXT): {$(VPATH)}internal.h
+node.$(OBJEXT): {$(VPATH)}io.h
+node.$(OBJEXT): {$(VPATH)}method.h
+node.$(OBJEXT): {$(VPATH)}missing.h
+node.$(OBJEXT): {$(VPATH)}node.c
+node.$(OBJEXT): {$(VPATH)}node.h
+node.$(OBJEXT): {$(VPATH)}oniguruma.h
+node.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+node.$(OBJEXT): {$(VPATH)}st.h
+node.$(OBJEXT): {$(VPATH)}subst.h
+node.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+node.$(OBJEXT): {$(VPATH)}thread_native.h
+node.$(OBJEXT): {$(VPATH)}vm_core.h
+node.$(OBJEXT): {$(VPATH)}vm_debug.h
+node.$(OBJEXT): {$(VPATH)}vm_opts.h
+numeric.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+numeric.$(OBJEXT): $(top_srcdir)/include/ruby.h
+numeric.$(OBJEXT): {$(VPATH)}config.h
+numeric.$(OBJEXT): {$(VPATH)}defines.h
+numeric.$(OBJEXT): {$(VPATH)}encoding.h
+numeric.$(OBJEXT): {$(VPATH)}id.h
+numeric.$(OBJEXT): {$(VPATH)}intern.h
+numeric.$(OBJEXT): {$(VPATH)}internal.h
+numeric.$(OBJEXT): {$(VPATH)}io.h
+numeric.$(OBJEXT): {$(VPATH)}missing.h
+numeric.$(OBJEXT): {$(VPATH)}numeric.c
+numeric.$(OBJEXT): {$(VPATH)}oniguruma.h
+numeric.$(OBJEXT): {$(VPATH)}st.h
+numeric.$(OBJEXT): {$(VPATH)}subst.h
+numeric.$(OBJEXT): {$(VPATH)}util.h
+object.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+object.$(OBJEXT): $(top_srcdir)/include/ruby.h
+object.$(OBJEXT): {$(VPATH)}config.h
+object.$(OBJEXT): {$(VPATH)}constant.h
+object.$(OBJEXT): {$(VPATH)}defines.h
+object.$(OBJEXT): {$(VPATH)}encoding.h
+object.$(OBJEXT): {$(VPATH)}id.h
+object.$(OBJEXT): {$(VPATH)}intern.h
+object.$(OBJEXT): {$(VPATH)}internal.h
+object.$(OBJEXT): {$(VPATH)}io.h
+object.$(OBJEXT): {$(VPATH)}missing.h
+object.$(OBJEXT): {$(VPATH)}object.c
+object.$(OBJEXT): {$(VPATH)}oniguruma.h
+object.$(OBJEXT): {$(VPATH)}probes.h
+object.$(OBJEXT): {$(VPATH)}st.h
+object.$(OBJEXT): {$(VPATH)}subst.h
+object.$(OBJEXT): {$(VPATH)}util.h
+object.$(OBJEXT): {$(VPATH)}vm_opts.h
+pack.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+pack.$(OBJEXT): $(top_srcdir)/include/ruby.h
+pack.$(OBJEXT): {$(VPATH)}config.h
+pack.$(OBJEXT): {$(VPATH)}defines.h
+pack.$(OBJEXT): {$(VPATH)}encoding.h
+pack.$(OBJEXT): {$(VPATH)}intern.h
+pack.$(OBJEXT): {$(VPATH)}internal.h
+pack.$(OBJEXT): {$(VPATH)}io.h
+pack.$(OBJEXT): {$(VPATH)}missing.h
+pack.$(OBJEXT): {$(VPATH)}oniguruma.h
+pack.$(OBJEXT): {$(VPATH)}pack.c
+pack.$(OBJEXT): {$(VPATH)}st.h
+pack.$(OBJEXT): {$(VPATH)}subst.h
+parse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+parse.$(OBJEXT): $(top_srcdir)/include/ruby.h
+parse.$(OBJEXT): {$(VPATH)}config.h
+parse.$(OBJEXT): {$(VPATH)}defines.h
+parse.$(OBJEXT): {$(VPATH)}defs/keywords
+parse.$(OBJEXT): {$(VPATH)}encoding.h
+parse.$(OBJEXT): {$(VPATH)}id.h
+parse.$(OBJEXT): {$(VPATH)}intern.h
+parse.$(OBJEXT): {$(VPATH)}internal.h
+parse.$(OBJEXT): {$(VPATH)}io.h
+parse.$(OBJEXT): {$(VPATH)}lex.c
+parse.$(OBJEXT): {$(VPATH)}missing.h
+parse.$(OBJEXT): {$(VPATH)}node.h
+parse.$(OBJEXT): {$(VPATH)}oniguruma.h
+parse.$(OBJEXT): {$(VPATH)}parse.c
+parse.$(OBJEXT): {$(VPATH)}parse.h
+parse.$(OBJEXT): {$(VPATH)}parse.y
+parse.$(OBJEXT): {$(VPATH)}probes.h
+parse.$(OBJEXT): {$(VPATH)}regenc.h
+parse.$(OBJEXT): {$(VPATH)}regex.h
+parse.$(OBJEXT): {$(VPATH)}st.h
+parse.$(OBJEXT): {$(VPATH)}subst.h
+parse.$(OBJEXT): {$(VPATH)}symbol.h
+parse.$(OBJEXT): {$(VPATH)}util.h
+parse.$(OBJEXT): {$(VPATH)}vm_opts.h
+prelude.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+prelude.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+prelude.$(OBJEXT): $(CCAN_DIR)/list/list.h
+prelude.$(OBJEXT): $(CCAN_DIR)/str/str.h
+prelude.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+prelude.$(OBJEXT): $(top_srcdir)/include/ruby.h
+prelude.$(OBJEXT): {$(VPATH)}config.h
+prelude.$(OBJEXT): {$(VPATH)}defines.h
+prelude.$(OBJEXT): {$(VPATH)}encoding.h
+prelude.$(OBJEXT): {$(VPATH)}id.h
+prelude.$(OBJEXT): {$(VPATH)}intern.h
+prelude.$(OBJEXT): {$(VPATH)}internal.h
+prelude.$(OBJEXT): {$(VPATH)}io.h
+prelude.$(OBJEXT): {$(VPATH)}method.h
+prelude.$(OBJEXT): {$(VPATH)}missing.h
+prelude.$(OBJEXT): {$(VPATH)}node.h
+prelude.$(OBJEXT): {$(VPATH)}oniguruma.h
+prelude.$(OBJEXT): {$(VPATH)}prelude.c
+prelude.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+prelude.$(OBJEXT): {$(VPATH)}st.h
+prelude.$(OBJEXT): {$(VPATH)}subst.h
+prelude.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+prelude.$(OBJEXT): {$(VPATH)}thread_native.h
+prelude.$(OBJEXT): {$(VPATH)}vm_core.h
+prelude.$(OBJEXT): {$(VPATH)}vm_debug.h
+prelude.$(OBJEXT): {$(VPATH)}vm_opts.h
+proc.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+proc.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+proc.$(OBJEXT): $(CCAN_DIR)/list/list.h
+proc.$(OBJEXT): $(CCAN_DIR)/str/str.h
+proc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+proc.$(OBJEXT): $(top_srcdir)/include/ruby.h
+proc.$(OBJEXT): {$(VPATH)}config.h
+proc.$(OBJEXT): {$(VPATH)}defines.h
+proc.$(OBJEXT): {$(VPATH)}encoding.h
+proc.$(OBJEXT): {$(VPATH)}eval_intern.h
+proc.$(OBJEXT): {$(VPATH)}gc.h
+proc.$(OBJEXT): {$(VPATH)}id.h
+proc.$(OBJEXT): {$(VPATH)}intern.h
+proc.$(OBJEXT): {$(VPATH)}internal.h
+proc.$(OBJEXT): {$(VPATH)}io.h
+proc.$(OBJEXT): {$(VPATH)}iseq.h
+proc.$(OBJEXT): {$(VPATH)}method.h
+proc.$(OBJEXT): {$(VPATH)}missing.h
+proc.$(OBJEXT): {$(VPATH)}node.h
+proc.$(OBJEXT): {$(VPATH)}oniguruma.h
+proc.$(OBJEXT): {$(VPATH)}proc.c
+proc.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+proc.$(OBJEXT): {$(VPATH)}st.h
+proc.$(OBJEXT): {$(VPATH)}subst.h
+proc.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+proc.$(OBJEXT): {$(VPATH)}thread_native.h
+proc.$(OBJEXT): {$(VPATH)}vm_core.h
+proc.$(OBJEXT): {$(VPATH)}vm_debug.h
+proc.$(OBJEXT): {$(VPATH)}vm_opts.h
+process.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+process.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+process.$(OBJEXT): $(CCAN_DIR)/list/list.h
+process.$(OBJEXT): $(CCAN_DIR)/str/str.h
+process.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+process.$(OBJEXT): $(top_srcdir)/include/ruby.h
+process.$(OBJEXT): {$(VPATH)}config.h
+process.$(OBJEXT): {$(VPATH)}defines.h
+process.$(OBJEXT): {$(VPATH)}dln.h
+process.$(OBJEXT): {$(VPATH)}encoding.h
+process.$(OBJEXT): {$(VPATH)}id.h
+process.$(OBJEXT): {$(VPATH)}intern.h
+process.$(OBJEXT): {$(VPATH)}internal.h
+process.$(OBJEXT): {$(VPATH)}io.h
+process.$(OBJEXT): {$(VPATH)}method.h
+process.$(OBJEXT): {$(VPATH)}missing.h
+process.$(OBJEXT): {$(VPATH)}node.h
+process.$(OBJEXT): {$(VPATH)}oniguruma.h
+process.$(OBJEXT): {$(VPATH)}process.c
+process.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+process.$(OBJEXT): {$(VPATH)}st.h
+process.$(OBJEXT): {$(VPATH)}subst.h
+process.$(OBJEXT): {$(VPATH)}thread.h
+process.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+process.$(OBJEXT): {$(VPATH)}thread_native.h
+process.$(OBJEXT): {$(VPATH)}util.h
+process.$(OBJEXT): {$(VPATH)}vm_core.h
+process.$(OBJEXT): {$(VPATH)}vm_debug.h
+process.$(OBJEXT): {$(VPATH)}vm_opts.h
+random.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+random.$(OBJEXT): $(top_srcdir)/include/ruby.h
+random.$(OBJEXT): {$(VPATH)}config.h
+random.$(OBJEXT): {$(VPATH)}defines.h
+random.$(OBJEXT): {$(VPATH)}encoding.h
+random.$(OBJEXT): {$(VPATH)}intern.h
+random.$(OBJEXT): {$(VPATH)}internal.h
+random.$(OBJEXT): {$(VPATH)}io.h
+random.$(OBJEXT): {$(VPATH)}missing.h
+random.$(OBJEXT): {$(VPATH)}oniguruma.h
+random.$(OBJEXT): {$(VPATH)}random.c
+random.$(OBJEXT): {$(VPATH)}siphash.c
+random.$(OBJEXT): {$(VPATH)}siphash.h
+random.$(OBJEXT): {$(VPATH)}st.h
+random.$(OBJEXT): {$(VPATH)}subst.h
+range.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+range.$(OBJEXT): $(top_srcdir)/include/ruby.h
+range.$(OBJEXT): {$(VPATH)}config.h
+range.$(OBJEXT): {$(VPATH)}defines.h
+range.$(OBJEXT): {$(VPATH)}encoding.h
+range.$(OBJEXT): {$(VPATH)}id.h
+range.$(OBJEXT): {$(VPATH)}intern.h
+range.$(OBJEXT): {$(VPATH)}internal.h
+range.$(OBJEXT): {$(VPATH)}io.h
+range.$(OBJEXT): {$(VPATH)}missing.h
+range.$(OBJEXT): {$(VPATH)}oniguruma.h
+range.$(OBJEXT): {$(VPATH)}range.c
+range.$(OBJEXT): {$(VPATH)}st.h
+range.$(OBJEXT): {$(VPATH)}subst.h
+rational.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+rational.$(OBJEXT): $(top_srcdir)/include/ruby.h
+rational.$(OBJEXT): {$(VPATH)}config.h
+rational.$(OBJEXT): {$(VPATH)}defines.h
+rational.$(OBJEXT): {$(VPATH)}encoding.h
+rational.$(OBJEXT): {$(VPATH)}intern.h
+rational.$(OBJEXT): {$(VPATH)}internal.h
+rational.$(OBJEXT): {$(VPATH)}io.h
+rational.$(OBJEXT): {$(VPATH)}missing.h
+rational.$(OBJEXT): {$(VPATH)}oniguruma.h
+rational.$(OBJEXT): {$(VPATH)}rational.c
+rational.$(OBJEXT): {$(VPATH)}st.h
+rational.$(OBJEXT): {$(VPATH)}subst.h
+re.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+re.$(OBJEXT): $(top_srcdir)/include/ruby.h
+re.$(OBJEXT): {$(VPATH)}config.h
+re.$(OBJEXT): {$(VPATH)}defines.h
+re.$(OBJEXT): {$(VPATH)}encoding.h
+re.$(OBJEXT): {$(VPATH)}intern.h
+re.$(OBJEXT): {$(VPATH)}internal.h
+re.$(OBJEXT): {$(VPATH)}io.h
+re.$(OBJEXT): {$(VPATH)}missing.h
+re.$(OBJEXT): {$(VPATH)}oniguruma.h
+re.$(OBJEXT): {$(VPATH)}re.c
+re.$(OBJEXT): {$(VPATH)}re.h
+re.$(OBJEXT): {$(VPATH)}regenc.h
+re.$(OBJEXT): {$(VPATH)}regex.h
+re.$(OBJEXT): {$(VPATH)}regint.h
+re.$(OBJEXT): {$(VPATH)}st.h
+re.$(OBJEXT): {$(VPATH)}subst.h
+re.$(OBJEXT): {$(VPATH)}util.h
+regcomp.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regcomp.$(OBJEXT): {$(VPATH)}config.h
+regcomp.$(OBJEXT): {$(VPATH)}defines.h
+regcomp.$(OBJEXT): {$(VPATH)}intern.h
+regcomp.$(OBJEXT): {$(VPATH)}missing.h
+regcomp.$(OBJEXT): {$(VPATH)}oniguruma.h
+regcomp.$(OBJEXT): {$(VPATH)}regcomp.c
+regcomp.$(OBJEXT): {$(VPATH)}regenc.h
+regcomp.$(OBJEXT): {$(VPATH)}regint.h
+regcomp.$(OBJEXT): {$(VPATH)}regparse.h
+regcomp.$(OBJEXT): {$(VPATH)}st.h
+regcomp.$(OBJEXT): {$(VPATH)}subst.h
+regenc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regenc.$(OBJEXT): {$(VPATH)}config.h
+regenc.$(OBJEXT): {$(VPATH)}defines.h
+regenc.$(OBJEXT): {$(VPATH)}intern.h
+regenc.$(OBJEXT): {$(VPATH)}missing.h
+regenc.$(OBJEXT): {$(VPATH)}oniguruma.h
+regenc.$(OBJEXT): {$(VPATH)}regenc.c
+regenc.$(OBJEXT): {$(VPATH)}regenc.h
+regenc.$(OBJEXT): {$(VPATH)}regint.h
+regenc.$(OBJEXT): {$(VPATH)}st.h
+regenc.$(OBJEXT): {$(VPATH)}subst.h
+regerror.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regerror.$(OBJEXT): {$(VPATH)}config.h
+regerror.$(OBJEXT): {$(VPATH)}defines.h
+regerror.$(OBJEXT): {$(VPATH)}intern.h
+regerror.$(OBJEXT): {$(VPATH)}missing.h
+regerror.$(OBJEXT): {$(VPATH)}oniguruma.h
+regerror.$(OBJEXT): {$(VPATH)}regenc.h
+regerror.$(OBJEXT): {$(VPATH)}regerror.c
+regerror.$(OBJEXT): {$(VPATH)}regint.h
+regerror.$(OBJEXT): {$(VPATH)}st.h
+regerror.$(OBJEXT): {$(VPATH)}subst.h
+regexec.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regexec.$(OBJEXT): {$(VPATH)}config.h
+regexec.$(OBJEXT): {$(VPATH)}defines.h
+regexec.$(OBJEXT): {$(VPATH)}intern.h
+regexec.$(OBJEXT): {$(VPATH)}missing.h
+regexec.$(OBJEXT): {$(VPATH)}oniguruma.h
+regexec.$(OBJEXT): {$(VPATH)}regenc.h
+regexec.$(OBJEXT): {$(VPATH)}regexec.c
+regexec.$(OBJEXT): {$(VPATH)}regint.h
+regexec.$(OBJEXT): {$(VPATH)}st.h
+regexec.$(OBJEXT): {$(VPATH)}subst.h
+regparse.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regparse.$(OBJEXT): {$(VPATH)}config.h
+regparse.$(OBJEXT): {$(VPATH)}defines.h
+regparse.$(OBJEXT): {$(VPATH)}intern.h
+regparse.$(OBJEXT): {$(VPATH)}missing.h
+regparse.$(OBJEXT): {$(VPATH)}oniguruma.h
+regparse.$(OBJEXT): {$(VPATH)}regenc.h
+regparse.$(OBJEXT): {$(VPATH)}regint.h
+regparse.$(OBJEXT): {$(VPATH)}regparse.c
+regparse.$(OBJEXT): {$(VPATH)}regparse.h
+regparse.$(OBJEXT): {$(VPATH)}st.h
+regparse.$(OBJEXT): {$(VPATH)}subst.h
+regsyntax.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+regsyntax.$(OBJEXT): {$(VPATH)}config.h
+regsyntax.$(OBJEXT): {$(VPATH)}defines.h
+regsyntax.$(OBJEXT): {$(VPATH)}intern.h
+regsyntax.$(OBJEXT): {$(VPATH)}missing.h
+regsyntax.$(OBJEXT): {$(VPATH)}oniguruma.h
+regsyntax.$(OBJEXT): {$(VPATH)}regenc.h
+regsyntax.$(OBJEXT): {$(VPATH)}regint.h
+regsyntax.$(OBJEXT): {$(VPATH)}regsyntax.c
+regsyntax.$(OBJEXT): {$(VPATH)}st.h
+regsyntax.$(OBJEXT): {$(VPATH)}subst.h
+ruby.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+ruby.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+ruby.$(OBJEXT): $(CCAN_DIR)/list/list.h
+ruby.$(OBJEXT): $(CCAN_DIR)/str/str.h
+ruby.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+ruby.$(OBJEXT): $(top_srcdir)/include/ruby.h
+ruby.$(OBJEXT): {$(VPATH)}config.h
+ruby.$(OBJEXT): {$(VPATH)}defines.h
+ruby.$(OBJEXT): {$(VPATH)}dln.h
+ruby.$(OBJEXT): {$(VPATH)}encoding.h
+ruby.$(OBJEXT): {$(VPATH)}eval_intern.h
+ruby.$(OBJEXT): {$(VPATH)}id.h
+ruby.$(OBJEXT): {$(VPATH)}intern.h
+ruby.$(OBJEXT): {$(VPATH)}internal.h
+ruby.$(OBJEXT): {$(VPATH)}io.h
+ruby.$(OBJEXT): {$(VPATH)}method.h
+ruby.$(OBJEXT): {$(VPATH)}missing.h
+ruby.$(OBJEXT): {$(VPATH)}node.h
+ruby.$(OBJEXT): {$(VPATH)}oniguruma.h
+ruby.$(OBJEXT): {$(VPATH)}ruby.c
+ruby.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+ruby.$(OBJEXT): {$(VPATH)}st.h
+ruby.$(OBJEXT): {$(VPATH)}subst.h
+ruby.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+ruby.$(OBJEXT): {$(VPATH)}thread_native.h
+ruby.$(OBJEXT): {$(VPATH)}util.h
+ruby.$(OBJEXT): {$(VPATH)}vm_core.h
+ruby.$(OBJEXT): {$(VPATH)}vm_debug.h
+ruby.$(OBJEXT): {$(VPATH)}vm_opts.h
+safe.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+safe.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+safe.$(OBJEXT): $(CCAN_DIR)/list/list.h
+safe.$(OBJEXT): $(CCAN_DIR)/str/str.h
+safe.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+safe.$(OBJEXT): $(top_srcdir)/include/ruby.h
+safe.$(OBJEXT): {$(VPATH)}config.h
+safe.$(OBJEXT): {$(VPATH)}defines.h
+safe.$(OBJEXT): {$(VPATH)}encoding.h
+safe.$(OBJEXT): {$(VPATH)}id.h
+safe.$(OBJEXT): {$(VPATH)}intern.h
+safe.$(OBJEXT): {$(VPATH)}internal.h
+safe.$(OBJEXT): {$(VPATH)}io.h
+safe.$(OBJEXT): {$(VPATH)}method.h
+safe.$(OBJEXT): {$(VPATH)}missing.h
+safe.$(OBJEXT): {$(VPATH)}node.h
+safe.$(OBJEXT): {$(VPATH)}oniguruma.h
+safe.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+safe.$(OBJEXT): {$(VPATH)}safe.c
+safe.$(OBJEXT): {$(VPATH)}st.h
+safe.$(OBJEXT): {$(VPATH)}subst.h
+safe.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+safe.$(OBJEXT): {$(VPATH)}thread_native.h
+safe.$(OBJEXT): {$(VPATH)}vm_core.h
+safe.$(OBJEXT): {$(VPATH)}vm_debug.h
+safe.$(OBJEXT): {$(VPATH)}vm_opts.h
+setproctitle.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+setproctitle.$(OBJEXT): $(top_srcdir)/include/ruby.h
+setproctitle.$(OBJEXT): {$(VPATH)}config.h
+setproctitle.$(OBJEXT): {$(VPATH)}defines.h
+setproctitle.$(OBJEXT): {$(VPATH)}intern.h
+setproctitle.$(OBJEXT): {$(VPATH)}missing.h
+setproctitle.$(OBJEXT): {$(VPATH)}setproctitle.c
+setproctitle.$(OBJEXT): {$(VPATH)}st.h
+setproctitle.$(OBJEXT): {$(VPATH)}subst.h
+setproctitle.$(OBJEXT): {$(VPATH)}util.h
+signal.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+signal.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+signal.$(OBJEXT): $(CCAN_DIR)/list/list.h
+signal.$(OBJEXT): $(CCAN_DIR)/str/str.h
+signal.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+signal.$(OBJEXT): $(top_srcdir)/include/ruby.h
+signal.$(OBJEXT): {$(VPATH)}config.h
+signal.$(OBJEXT): {$(VPATH)}defines.h
+signal.$(OBJEXT): {$(VPATH)}encoding.h
+signal.$(OBJEXT): {$(VPATH)}eval_intern.h
+signal.$(OBJEXT): {$(VPATH)}id.h
+signal.$(OBJEXT): {$(VPATH)}intern.h
+signal.$(OBJEXT): {$(VPATH)}internal.h
+signal.$(OBJEXT): {$(VPATH)}io.h
+signal.$(OBJEXT): {$(VPATH)}method.h
+signal.$(OBJEXT): {$(VPATH)}missing.h
+signal.$(OBJEXT): {$(VPATH)}node.h
+signal.$(OBJEXT): {$(VPATH)}oniguruma.h
+signal.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+signal.$(OBJEXT): {$(VPATH)}signal.c
+signal.$(OBJEXT): {$(VPATH)}st.h
+signal.$(OBJEXT): {$(VPATH)}subst.h
+signal.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+signal.$(OBJEXT): {$(VPATH)}thread_native.h
+signal.$(OBJEXT): {$(VPATH)}vm_core.h
+signal.$(OBJEXT): {$(VPATH)}vm_debug.h
+signal.$(OBJEXT): {$(VPATH)}vm_opts.h
+sprintf.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+sprintf.$(OBJEXT): $(top_srcdir)/include/ruby.h
+sprintf.$(OBJEXT): {$(VPATH)}config.h
+sprintf.$(OBJEXT): {$(VPATH)}defines.h
+sprintf.$(OBJEXT): {$(VPATH)}encoding.h
+sprintf.$(OBJEXT): {$(VPATH)}id.h
+sprintf.$(OBJEXT): {$(VPATH)}intern.h
+sprintf.$(OBJEXT): {$(VPATH)}internal.h
+sprintf.$(OBJEXT): {$(VPATH)}io.h
+sprintf.$(OBJEXT): {$(VPATH)}missing.h
+sprintf.$(OBJEXT): {$(VPATH)}oniguruma.h
+sprintf.$(OBJEXT): {$(VPATH)}re.h
+sprintf.$(OBJEXT): {$(VPATH)}regex.h
+sprintf.$(OBJEXT): {$(VPATH)}sprintf.c
+sprintf.$(OBJEXT): {$(VPATH)}st.h
+sprintf.$(OBJEXT): {$(VPATH)}subst.h
+sprintf.$(OBJEXT): {$(VPATH)}vsnprintf.c
+st.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+st.$(OBJEXT): $(top_srcdir)/include/ruby.h
+st.$(OBJEXT): {$(VPATH)}config.h
+st.$(OBJEXT): {$(VPATH)}defines.h
+st.$(OBJEXT): {$(VPATH)}encoding.h
+st.$(OBJEXT): {$(VPATH)}intern.h
+st.$(OBJEXT): {$(VPATH)}internal.h
+st.$(OBJEXT): {$(VPATH)}io.h
+st.$(OBJEXT): {$(VPATH)}missing.h
+st.$(OBJEXT): {$(VPATH)}oniguruma.h
+st.$(OBJEXT): {$(VPATH)}st.c
+st.$(OBJEXT): {$(VPATH)}st.h
+st.$(OBJEXT): {$(VPATH)}subst.h
+strftime.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+strftime.$(OBJEXT): {$(VPATH)}config.h
+strftime.$(OBJEXT): {$(VPATH)}defines.h
+strftime.$(OBJEXT): {$(VPATH)}encoding.h
+strftime.$(OBJEXT): {$(VPATH)}intern.h
+strftime.$(OBJEXT): {$(VPATH)}missing.h
+strftime.$(OBJEXT): {$(VPATH)}oniguruma.h
+strftime.$(OBJEXT): {$(VPATH)}st.h
+strftime.$(OBJEXT): {$(VPATH)}strftime.c
+strftime.$(OBJEXT): {$(VPATH)}subst.h
+strftime.$(OBJEXT): {$(VPATH)}timev.h
+string.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+string.$(OBJEXT): $(top_srcdir)/include/ruby.h
+string.$(OBJEXT): {$(VPATH)}config.h
+string.$(OBJEXT): {$(VPATH)}defines.h
+string.$(OBJEXT): {$(VPATH)}encoding.h
+string.$(OBJEXT): {$(VPATH)}gc.h
+string.$(OBJEXT): {$(VPATH)}intern.h
+string.$(OBJEXT): {$(VPATH)}internal.h
+string.$(OBJEXT): {$(VPATH)}io.h
+string.$(OBJEXT): {$(VPATH)}missing.h
+string.$(OBJEXT): {$(VPATH)}oniguruma.h
+string.$(OBJEXT): {$(VPATH)}probes.h
+string.$(OBJEXT): {$(VPATH)}re.h
+string.$(OBJEXT): {$(VPATH)}regex.h
+string.$(OBJEXT): {$(VPATH)}st.h
+string.$(OBJEXT): {$(VPATH)}string.c
+string.$(OBJEXT): {$(VPATH)}subst.h
+string.$(OBJEXT): {$(VPATH)}vm_opts.h
+strlcat.$(OBJEXT): {$(VPATH)}config.h
+strlcat.$(OBJEXT): {$(VPATH)}missing.h
+strlcat.$(OBJEXT): {$(VPATH)}strlcat.c
+strlcpy.$(OBJEXT): {$(VPATH)}config.h
+strlcpy.$(OBJEXT): {$(VPATH)}missing.h
+strlcpy.$(OBJEXT): {$(VPATH)}strlcpy.c
+struct.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+struct.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+struct.$(OBJEXT): $(CCAN_DIR)/list/list.h
+struct.$(OBJEXT): $(CCAN_DIR)/str/str.h
+struct.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+struct.$(OBJEXT): $(top_srcdir)/include/ruby.h
+struct.$(OBJEXT): {$(VPATH)}config.h
+struct.$(OBJEXT): {$(VPATH)}defines.h
+struct.$(OBJEXT): {$(VPATH)}encoding.h
+struct.$(OBJEXT): {$(VPATH)}id.h
+struct.$(OBJEXT): {$(VPATH)}intern.h
+struct.$(OBJEXT): {$(VPATH)}internal.h
+struct.$(OBJEXT): {$(VPATH)}io.h
+struct.$(OBJEXT): {$(VPATH)}method.h
+struct.$(OBJEXT): {$(VPATH)}missing.h
+struct.$(OBJEXT): {$(VPATH)}node.h
+struct.$(OBJEXT): {$(VPATH)}oniguruma.h
+struct.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+struct.$(OBJEXT): {$(VPATH)}st.h
+struct.$(OBJEXT): {$(VPATH)}struct.c
+struct.$(OBJEXT): {$(VPATH)}subst.h
+struct.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+struct.$(OBJEXT): {$(VPATH)}thread_native.h
+struct.$(OBJEXT): {$(VPATH)}vm_core.h
+struct.$(OBJEXT): {$(VPATH)}vm_debug.h
+struct.$(OBJEXT): {$(VPATH)}vm_opts.h
+symbol.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+symbol.$(OBJEXT): $(top_srcdir)/include/ruby.h
+symbol.$(OBJEXT): {$(VPATH)}config.h
+symbol.$(OBJEXT): {$(VPATH)}defines.h
+symbol.$(OBJEXT): {$(VPATH)}encoding.h
+symbol.$(OBJEXT): {$(VPATH)}gc.h
+symbol.$(OBJEXT): {$(VPATH)}id.c
+symbol.$(OBJEXT): {$(VPATH)}id.h
+symbol.$(OBJEXT): {$(VPATH)}intern.h
+symbol.$(OBJEXT): {$(VPATH)}internal.h
+symbol.$(OBJEXT): {$(VPATH)}io.h
+symbol.$(OBJEXT): {$(VPATH)}missing.h
+symbol.$(OBJEXT): {$(VPATH)}node.h
+symbol.$(OBJEXT): {$(VPATH)}oniguruma.h
+symbol.$(OBJEXT): {$(VPATH)}probes.h
+symbol.$(OBJEXT): {$(VPATH)}st.h
+symbol.$(OBJEXT): {$(VPATH)}subst.h
+symbol.$(OBJEXT): {$(VPATH)}symbol.c
+symbol.$(OBJEXT): {$(VPATH)}symbol.h
+symbol.$(OBJEXT): {$(VPATH)}vm_opts.h
+thread.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+thread.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+thread.$(OBJEXT): $(CCAN_DIR)/list/list.h
+thread.$(OBJEXT): $(CCAN_DIR)/str/str.h
+thread.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+thread.$(OBJEXT): $(top_srcdir)/include/ruby.h
+thread.$(OBJEXT): {$(VPATH)}config.h
+thread.$(OBJEXT): {$(VPATH)}defines.h
+thread.$(OBJEXT): {$(VPATH)}encoding.h
+thread.$(OBJEXT): {$(VPATH)}eval_intern.h
+thread.$(OBJEXT): {$(VPATH)}gc.h
+thread.$(OBJEXT): {$(VPATH)}id.h
+thread.$(OBJEXT): {$(VPATH)}intern.h
+thread.$(OBJEXT): {$(VPATH)}internal.h
+thread.$(OBJEXT): {$(VPATH)}io.h
+thread.$(OBJEXT): {$(VPATH)}method.h
+thread.$(OBJEXT): {$(VPATH)}missing.h
+thread.$(OBJEXT): {$(VPATH)}node.h
+thread.$(OBJEXT): {$(VPATH)}oniguruma.h
+thread.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+thread.$(OBJEXT): {$(VPATH)}st.h
+thread.$(OBJEXT): {$(VPATH)}subst.h
+thread.$(OBJEXT): {$(VPATH)}thread.c
+thread.$(OBJEXT): {$(VPATH)}thread.h
+thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).c
+thread.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+thread.$(OBJEXT): {$(VPATH)}thread_native.h
+thread.$(OBJEXT): {$(VPATH)}timev.h
+thread.$(OBJEXT): {$(VPATH)}vm_core.h
+thread.$(OBJEXT): {$(VPATH)}vm_debug.h
+thread.$(OBJEXT): {$(VPATH)}vm_opts.h
+time.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+time.$(OBJEXT): $(top_srcdir)/include/ruby.h
+time.$(OBJEXT): {$(VPATH)}config.h
+time.$(OBJEXT): {$(VPATH)}defines.h
+time.$(OBJEXT): {$(VPATH)}encoding.h
+time.$(OBJEXT): {$(VPATH)}intern.h
+time.$(OBJEXT): {$(VPATH)}internal.h
+time.$(OBJEXT): {$(VPATH)}io.h
+time.$(OBJEXT): {$(VPATH)}missing.h
+time.$(OBJEXT): {$(VPATH)}oniguruma.h
+time.$(OBJEXT): {$(VPATH)}st.h
+time.$(OBJEXT): {$(VPATH)}subst.h
+time.$(OBJEXT): {$(VPATH)}time.c
+time.$(OBJEXT): {$(VPATH)}timev.h
+transcode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+transcode.$(OBJEXT): $(top_srcdir)/include/ruby.h
+transcode.$(OBJEXT): {$(VPATH)}config.h
+transcode.$(OBJEXT): {$(VPATH)}defines.h
+transcode.$(OBJEXT): {$(VPATH)}encoding.h
+transcode.$(OBJEXT): {$(VPATH)}intern.h
+transcode.$(OBJEXT): {$(VPATH)}internal.h
+transcode.$(OBJEXT): {$(VPATH)}io.h
+transcode.$(OBJEXT): {$(VPATH)}missing.h
+transcode.$(OBJEXT): {$(VPATH)}oniguruma.h
+transcode.$(OBJEXT): {$(VPATH)}st.h
+transcode.$(OBJEXT): {$(VPATH)}subst.h
+transcode.$(OBJEXT): {$(VPATH)}transcode.c
+transcode.$(OBJEXT): {$(VPATH)}transcode_data.h
+unicode.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+unicode.$(OBJEXT): {$(VPATH)}config.h
+unicode.$(OBJEXT): {$(VPATH)}defines.h
+unicode.$(OBJEXT): {$(VPATH)}intern.h
+unicode.$(OBJEXT): {$(VPATH)}missing.h
+unicode.$(OBJEXT): {$(VPATH)}oniguruma.h
+unicode.$(OBJEXT): {$(VPATH)}regenc.h
+unicode.$(OBJEXT): {$(VPATH)}regint.h
+unicode.$(OBJEXT): {$(VPATH)}st.h
+unicode.$(OBJEXT): {$(VPATH)}subst.h
+unicode.$(OBJEXT): {$(VPATH)}unicode.c
+unicode.$(OBJEXT): {$(VPATH)}unicode/casefold.h
+unicode.$(OBJEXT): {$(VPATH)}unicode/name2ctype.h
+us_ascii.$(OBJEXT): {$(VPATH)}config.h
+us_ascii.$(OBJEXT): {$(VPATH)}defines.h
+us_ascii.$(OBJEXT): {$(VPATH)}missing.h
+us_ascii.$(OBJEXT): {$(VPATH)}oniguruma.h
+us_ascii.$(OBJEXT): {$(VPATH)}regenc.h
+us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c
+utf_8.$(OBJEXT): {$(VPATH)}config.h
+utf_8.$(OBJEXT): {$(VPATH)}defines.h
+utf_8.$(OBJEXT): {$(VPATH)}missing.h
+utf_8.$(OBJEXT): {$(VPATH)}oniguruma.h
+utf_8.$(OBJEXT): {$(VPATH)}regenc.h
+utf_8.$(OBJEXT): {$(VPATH)}utf_8.c
+util.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+util.$(OBJEXT): $(top_srcdir)/include/ruby.h
+util.$(OBJEXT): {$(VPATH)}config.h
+util.$(OBJEXT): {$(VPATH)}defines.h
+util.$(OBJEXT): {$(VPATH)}encoding.h
+util.$(OBJEXT): {$(VPATH)}intern.h
+util.$(OBJEXT): {$(VPATH)}internal.h
+util.$(OBJEXT): {$(VPATH)}io.h
+util.$(OBJEXT): {$(VPATH)}missing.h
+util.$(OBJEXT): {$(VPATH)}oniguruma.h
+util.$(OBJEXT): {$(VPATH)}st.h
+util.$(OBJEXT): {$(VPATH)}subst.h
+util.$(OBJEXT): {$(VPATH)}util.c
+util.$(OBJEXT): {$(VPATH)}util.h
+variable.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+variable.$(OBJEXT): $(top_srcdir)/include/ruby.h
+variable.$(OBJEXT): {$(VPATH)}config.h
+variable.$(OBJEXT): {$(VPATH)}constant.h
+variable.$(OBJEXT): {$(VPATH)}defines.h
+variable.$(OBJEXT): {$(VPATH)}encoding.h
+variable.$(OBJEXT): {$(VPATH)}id.h
+variable.$(OBJEXT): {$(VPATH)}intern.h
+variable.$(OBJEXT): {$(VPATH)}internal.h
+variable.$(OBJEXT): {$(VPATH)}io.h
+variable.$(OBJEXT): {$(VPATH)}missing.h
+variable.$(OBJEXT): {$(VPATH)}node.h
+variable.$(OBJEXT): {$(VPATH)}oniguruma.h
+variable.$(OBJEXT): {$(VPATH)}st.h
+variable.$(OBJEXT): {$(VPATH)}subst.h
+variable.$(OBJEXT): {$(VPATH)}util.h
+variable.$(OBJEXT): {$(VPATH)}variable.c
+version.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+version.$(OBJEXT): $(hdrdir)/ruby/version.h
+version.$(OBJEXT): $(top_srcdir)/revision.h
+version.$(OBJEXT): $(top_srcdir)/version.h
+version.$(OBJEXT): {$(VPATH)}config.h
+version.$(OBJEXT): {$(VPATH)}defines.h
+version.$(OBJEXT): {$(VPATH)}intern.h
+version.$(OBJEXT): {$(VPATH)}missing.h
+version.$(OBJEXT): {$(VPATH)}st.h
+version.$(OBJEXT): {$(VPATH)}subst.h
+version.$(OBJEXT): {$(VPATH)}version.c
+vm.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+vm.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+vm.$(OBJEXT): $(CCAN_DIR)/list/list.h
+vm.$(OBJEXT): $(CCAN_DIR)/str/str.h
+vm.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm.$(OBJEXT): $(top_srcdir)/include/ruby.h
+vm.$(OBJEXT): {$(VPATH)}config.h
+vm.$(OBJEXT): {$(VPATH)}constant.h
+vm.$(OBJEXT): {$(VPATH)}defines.h
+vm.$(OBJEXT): {$(VPATH)}encoding.h
+vm.$(OBJEXT): {$(VPATH)}eval_intern.h
+vm.$(OBJEXT): {$(VPATH)}gc.h
+vm.$(OBJEXT): {$(VPATH)}id.h
+vm.$(OBJEXT): {$(VPATH)}insns.def
+vm.$(OBJEXT): {$(VPATH)}insns.inc
+vm.$(OBJEXT): {$(VPATH)}intern.h
+vm.$(OBJEXT): {$(VPATH)}internal.h
+vm.$(OBJEXT): {$(VPATH)}io.h
+vm.$(OBJEXT): {$(VPATH)}iseq.h
+vm.$(OBJEXT): {$(VPATH)}method.h
+vm.$(OBJEXT): {$(VPATH)}missing.h
+vm.$(OBJEXT): {$(VPATH)}node.h
+vm.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm.$(OBJEXT): {$(VPATH)}probes.h
+vm.$(OBJEXT): {$(VPATH)}probes_helper.h
+vm.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm.$(OBJEXT): {$(VPATH)}st.h
+vm.$(OBJEXT): {$(VPATH)}subst.h
+vm.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+vm.$(OBJEXT): {$(VPATH)}thread_native.h
+vm.$(OBJEXT): {$(VPATH)}vm.c
+vm.$(OBJEXT): {$(VPATH)}vm.h
+vm.$(OBJEXT): {$(VPATH)}vm.inc
+vm.$(OBJEXT): {$(VPATH)}vm_args.c
+vm.$(OBJEXT): {$(VPATH)}vm_core.h
+vm.$(OBJEXT): {$(VPATH)}vm_debug.h
+vm.$(OBJEXT): {$(VPATH)}vm_eval.c
+vm.$(OBJEXT): {$(VPATH)}vm_exec.c
+vm.$(OBJEXT): {$(VPATH)}vm_exec.h
+vm.$(OBJEXT): {$(VPATH)}vm_insnhelper.c
+vm.$(OBJEXT): {$(VPATH)}vm_insnhelper.h
+vm.$(OBJEXT): {$(VPATH)}vm_method.c
+vm.$(OBJEXT): {$(VPATH)}vm_opts.h
+vm.$(OBJEXT): {$(VPATH)}vmtc.inc
+vm_backtrace.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+vm_backtrace.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+vm_backtrace.$(OBJEXT): $(CCAN_DIR)/list/list.h
+vm_backtrace.$(OBJEXT): $(CCAN_DIR)/str/str.h
+vm_backtrace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm_backtrace.$(OBJEXT): $(top_srcdir)/include/ruby.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}config.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}debug.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}defines.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}encoding.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}eval_intern.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}id.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}intern.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}internal.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}io.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}iseq.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}method.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}missing.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}node.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}st.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}subst.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+vm_backtrace.$(OBJEXT): {$(VPATH)}thread_native.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}vm_backtrace.c
+vm_backtrace.$(OBJEXT): {$(VPATH)}vm_core.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}vm_debug.h
+vm_backtrace.$(OBJEXT): {$(VPATH)}vm_opts.h
+vm_dump.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+vm_dump.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+vm_dump.$(OBJEXT): $(CCAN_DIR)/list/list.h
+vm_dump.$(OBJEXT): $(CCAN_DIR)/str/str.h
+vm_dump.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm_dump.$(OBJEXT): $(top_srcdir)/include/ruby.h
+vm_dump.$(OBJEXT): {$(VPATH)}addr2line.h
+vm_dump.$(OBJEXT): {$(VPATH)}config.h
+vm_dump.$(OBJEXT): {$(VPATH)}defines.h
+vm_dump.$(OBJEXT): {$(VPATH)}encoding.h
+vm_dump.$(OBJEXT): {$(VPATH)}id.h
+vm_dump.$(OBJEXT): {$(VPATH)}intern.h
+vm_dump.$(OBJEXT): {$(VPATH)}internal.h
+vm_dump.$(OBJEXT): {$(VPATH)}io.h
+vm_dump.$(OBJEXT): {$(VPATH)}iseq.h
+vm_dump.$(OBJEXT): {$(VPATH)}method.h
+vm_dump.$(OBJEXT): {$(VPATH)}missing.h
+vm_dump.$(OBJEXT): {$(VPATH)}node.h
+vm_dump.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_dump.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm_dump.$(OBJEXT): {$(VPATH)}st.h
+vm_dump.$(OBJEXT): {$(VPATH)}subst.h
+vm_dump.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+vm_dump.$(OBJEXT): {$(VPATH)}thread_native.h
+vm_dump.$(OBJEXT): {$(VPATH)}vm_core.h
+vm_dump.$(OBJEXT): {$(VPATH)}vm_debug.h
+vm_dump.$(OBJEXT): {$(VPATH)}vm_dump.c
+vm_dump.$(OBJEXT): {$(VPATH)}vm_opts.h
+vm_trace.$(OBJEXT): $(CCAN_DIR)/check_type/check_type.h
+vm_trace.$(OBJEXT): $(CCAN_DIR)/container_of/container_of.h
+vm_trace.$(OBJEXT): $(CCAN_DIR)/list/list.h
+vm_trace.$(OBJEXT): $(CCAN_DIR)/str/str.h
+vm_trace.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+vm_trace.$(OBJEXT): $(top_srcdir)/include/ruby.h
+vm_trace.$(OBJEXT): {$(VPATH)}config.h
+vm_trace.$(OBJEXT): {$(VPATH)}debug.h
+vm_trace.$(OBJEXT): {$(VPATH)}defines.h
+vm_trace.$(OBJEXT): {$(VPATH)}encoding.h
+vm_trace.$(OBJEXT): {$(VPATH)}eval_intern.h
+vm_trace.$(OBJEXT): {$(VPATH)}id.h
+vm_trace.$(OBJEXT): {$(VPATH)}intern.h
+vm_trace.$(OBJEXT): {$(VPATH)}internal.h
+vm_trace.$(OBJEXT): {$(VPATH)}io.h
+vm_trace.$(OBJEXT): {$(VPATH)}method.h
+vm_trace.$(OBJEXT): {$(VPATH)}missing.h
+vm_trace.$(OBJEXT): {$(VPATH)}node.h
+vm_trace.$(OBJEXT): {$(VPATH)}oniguruma.h
+vm_trace.$(OBJEXT): {$(VPATH)}ruby_atomic.h
+vm_trace.$(OBJEXT): {$(VPATH)}st.h
+vm_trace.$(OBJEXT): {$(VPATH)}subst.h
+vm_trace.$(OBJEXT): {$(VPATH)}thread_$(THREAD_MODEL).h
+vm_trace.$(OBJEXT): {$(VPATH)}thread_native.h
+vm_trace.$(OBJEXT): {$(VPATH)}vm_core.h
+vm_trace.$(OBJEXT): {$(VPATH)}vm_debug.h
+vm_trace.$(OBJEXT): {$(VPATH)}vm_opts.h
+vm_trace.$(OBJEXT): {$(VPATH)}vm_trace.c
+# AUTOGENERATED DEPENDENCIES END
diff --git a/compar.c b/compar.c
index 893cde79fc..3d0a3e81dc 100644
--- a/compar.c
+++ b/compar.c
@@ -18,17 +18,16 @@ static ID cmp;
 void
 rb_cmperr(VALUE x, VALUE y)
 {
-    const char *classname;
+    VALUE classname;
 
-    if (SPECIAL_CONST_P(y)) {
-	y = rb_inspect(y);
-	classname = StringValuePtr(y);
+    if (SPECIAL_CONST_P(y) || BUILTIN_TYPE(y) == T_FLOAT) {
+	classname = rb_inspect(y);
     }
     else {
-	classname = rb_obj_classname(y);
+	classname = rb_obj_class(y);
     }
-    rb_raise(rb_eArgError, "comparison of %s with %s failed",
-	     rb_obj_classname(x), classname);
+    rb_raise(rb_eArgError, "comparison of %"PRIsVALUE" with %"PRIsVALUE" failed",
+	     rb_obj_class(x), classname);
 }
 
 static VALUE
diff --git a/compile.c b/compile.c
index 55f500b489..36db683c4a 100644
--- a/compile.c
+++ b/compile.c
@@ -9,7 +9,6 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
 #include "internal.h"
 #include <math.h>
 
@@ -19,6 +18,10 @@
 #include "insns.inc"
 #include "insns_info.inc"
 
+#ifdef HAVE_DLADDR
+# include <dlfcn.h>
+#endif
+
 #define FIXNUM_INC(n, i) ((n)+(INT2FIX(i)&~FIXNUM_FLAG))
 #define FIXNUM_OR(n, i) ((n)|INT2FIX(i))
 
@@ -38,6 +41,13 @@ typedef struct iseq_link_anchor {
     LINK_ELEMENT *last;
 } LINK_ANCHOR;
 
+typedef enum {
+    LABEL_RESCUE_NONE,
+    LABEL_RESCUE_BEG,
+    LABEL_RESCUE_END,
+    LABEL_RESCUE_TYPE_MAX
+} LABEL_RESCUE_TYPE;
+
 typedef struct iseq_label_data {
     LINK_ELEMENT link;
     int label_no;
@@ -45,6 +55,7 @@ typedef struct iseq_label_data {
     int sc_state;
     int set;
     int sp;
+    unsigned int rescued: 2;
 } LABEL;
 
 typedef struct iseq_insn_data {
@@ -184,11 +195,20 @@ r_value(VALUE value)
 #define ADD_INSN(seq, line, insn) \
   ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
 
+/* insert an instruction before prev */
+#define INSERT_BEFORE_INSN(prev, line, insn) \
+  INSERT_ELEM_PREV(&(prev)->link, (LINK_ELEMENT *) new_insn_body(iseq, (line), BIN(insn), 0))
+
 /* add an instruction with some operands (1, 2, 3, 5) */
 #define ADD_INSN1(seq, line, insn, op1) \
   ADD_ELEM((seq), (LINK_ELEMENT *) \
            new_insn_body(iseq, (line), BIN(insn), 1, (VALUE)(op1)))
 
+/* insert an instruction with some operands (1, 2, 3, 5) before prev */
+#define INSERT_BEFORE_INSN1(prev, line, insn, op1) \
+  INSERT_ELEM_PREV(&(prev)->link, (LINK_ELEMENT *) \
+           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)
 
@@ -202,25 +222,30 @@ r_value(VALUE value)
 
 /* Specific Insn factory */
 #define ADD_SEND(seq, line, id, argc) \
-  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(0))
+  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(0), NULL)
+
+#define ADD_SEND_WITH_FLAG(seq, line, id, argc, flag) \
+  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)(flag), NULL)
+
+#define ADD_SEND_WITH_BLOCK(seq, line, id, argc, block) \
+  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)(block), (VALUE)INT2FIX(0), NULL)
 
 #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))
+  ADD_SEND_R((seq), (line), (id), (argc), (VALUE)Qfalse, (VALUE)INT2FIX(VM_CALL_FCALL), NULL)
 
 #define ADD_CALL_WITH_BLOCK(seq, line, id, argc, block) \
-  ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL))
+  ADD_SEND_R((seq), (line), (id), (argc), (block), (VALUE)INT2FIX(VM_CALL_FCALL), NULL)
 
-#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_SEND_R(seq, line, id, argc, block, flag, keywords) \
+  ADD_ELEM((seq), (LINK_ELEMENT *) new_insn_send(iseq, (line), (id), (VALUE)(argc), (VALUE)(block), (VALUE)(flag), (keywords)))
 
 #define ADD_TRACE(seq, line, event) \
   do { \
       if ((event) == RUBY_EVENT_LINE && iseq->coverage && \
+	  (line) > 0 && \
 	  (line) != iseq->compile_data->last_coverable_line) { \
 	  RARRAY_ASET(iseq->coverage, (line) - 1, INT2FIX(0)); \
 	  iseq->compile_data->last_coverable_line = (line); \
@@ -265,6 +290,11 @@ r_value(VALUE value)
   (debug_compile("== " desc "\n", \
                  iseq_compile_each(iseq, (anchor), (node), (poped))))
 
+#define COMPILE_RECV(anchor, desc, node) \
+    (private_recv_p(node) ? \
+     (ADD_INSN(anchor, nd_line(node), putself), VM_CALL_FCALL) : \
+     (COMPILE(anchor, desc, node->nd_recv), 0))
+
 #define OPERAND_AT(insn, idx) \
   (((INSN*)(insn))->operands[(idx)])
 
@@ -316,9 +346,6 @@ r_value(VALUE value)
 
 #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);
@@ -326,7 +353,7 @@ static void dump_disasm_list(LINK_ELEMENT *elem);
 static int insn_data_length(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 INSN *new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int argc, ...);
 static LABEL *new_label_body(rb_iseq_t *iseq, long line);
 static ADJUST *new_adjust_body(rb_iseq_t *iseq, LABEL *label, int line);
 
@@ -335,7 +362,7 @@ 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_local_table(rb_iseq_t *iseq, const ID *tbl);
 static int iseq_set_exception_local_table(rb_iseq_t *iseq);
 static int iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *anchor, NODE * node);
 
@@ -439,7 +466,8 @@ validate_label(st_data_t name, st_data_t label, st_data_t arg)
 	do {
 	    int ret;
 	    COMPILE_ERROR((ruby_sourcefile, lobj->position,
-			   "%s: undefined label", rb_id2name((ID)name)));
+			   "%"PRIsVALUE": undefined label",
+			   rb_id2str((ID)name)));
 	    if (ret) break;
 	} while (0);
     }
@@ -478,8 +506,11 @@ rb_iseq_compile_node(VALUE self, NODE *node)
 		LABEL *start = iseq->compile_data->start_label = NEW_LABEL(0);
 		LABEL *end = iseq->compile_data->end_label = NEW_LABEL(0);
 
-		ADD_LABEL(ret, start);
+		start->rescued = LABEL_RESCUE_BEG;
+		end->rescued = LABEL_RESCUE_END;
+
 		ADD_TRACE(ret, FIX2INT(iseq->location.first_lineno), RUBY_EVENT_B_CALL);
+		ADD_LABEL(ret, start);
 		COMPILE(ret, "block body", node->nd_body);
 		ADD_LABEL(ret, end);
 		ADD_TRACE(ret, nd_line(node), RUBY_EVENT_B_RETURN);
@@ -562,10 +593,7 @@ 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);
+    unsigned int i;
 
     for (i = 0; i < iseq->iseq_size; /* */ ) {
 	int insn = (int)iseq->iseq_encoded[i];
@@ -573,43 +601,141 @@ rb_iseq_translate_threaded_code(rb_iseq_t *iseq)
 	iseq->iseq_encoded[i] = (VALUE)table[insn];
 	i += len;
     }
-#else
-    iseq->iseq_encoded = iseq->iseq;
 #endif
     return COMPILE_OK;
 }
 
+#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
+static int
+rb_vm_insn_addr2insn(const void *addr) /* cold path */
+{
+    int insn;
+    const void * const *table = rb_vm_get_insns_address_table();
+
+    for (insn = 0; insn < VM_INSTRUCTION_SIZE; insn++) {
+	if (table[insn] == addr) {
+	    return insn;
+	}
+    }
+    rb_bug("rb_vm_insn_addr2insn: invalid insn address: %p", addr);
+}
+#endif
+
+VALUE *
+rb_iseq_original_iseq(rb_iseq_t *iseq) /* cold path */
+{
+    if (iseq->iseq) return iseq->iseq;
+
+    iseq->iseq = ALLOC_N(VALUE, iseq->iseq_size);
+
+    MEMCPY(iseq->iseq, iseq->iseq_encoded, VALUE, iseq->iseq_size);
+
+#if OPT_DIRECT_THREADED_CODE || OPT_CALL_THREADED_CODE
+    {
+	unsigned int i;
+
+	for (i = 0; i < iseq->iseq_size; /* */ ) {
+	    const void *addr = (const void *)iseq->iseq[i];
+	    const int insn = rb_vm_insn_addr2insn(addr);
+
+	    iseq->iseq[i] = insn;
+	    i += insn_len(insn);
+	}
+    }
+#endif
+    return iseq->iseq;
+}
+
 /*********************************************/
 /* definition of data structure for compiler */
 /*********************************************/
 
+/*
+ * On 32-bit SPARC, GCC by default generates SPARC V7 code that may require
+ * 8-byte word alignment. On the other hand, Oracle Solaris Studio seems to
+ * generate SPARCV8PLUS code with unaligned memory accesss instructions.
+ * That is why the STRICT_ALIGNMENT is defined only with GCC.
+ */
+#if defined(__sparc) && SIZEOF_VOIDP == 4 && defined(__GNUC__)
+  #define STRICT_ALIGNMENT
+#endif
+
+#ifdef STRICT_ALIGNMENT
+  #if defined(HAVE_TRUE_LONG_LONG) && SIZEOF_LONG_LONG > SIZEOF_VALUE
+    #define ALIGNMENT_SIZE SIZEOF_LONG_LONG
+  #else
+    #define ALIGNMENT_SIZE SIZEOF_VALUE
+  #endif
+  #define PADDING_SIZE_MAX    ((size_t)((ALIGNMENT_SIZE) - 1))
+  #define ALIGNMENT_SIZE_MASK PADDING_SIZE_MAX
+  /* Note: ALIGNMENT_SIZE == (2 ** N) is expected. */
+#else
+  #define PADDING_SIZE_MAX 0
+#endif /* STRICT_ALIGNMENT */
+
+#ifdef STRICT_ALIGNMENT
+/* calculate padding size for aligned memory access */
+static size_t
+calc_padding(void *ptr, size_t size)
+{
+    size_t mis;
+    size_t padding = 0;
+
+    mis = (size_t)ptr & ALIGNMENT_SIZE_MASK;
+    if (mis > 0) {
+        padding = ALIGNMENT_SIZE - mis;
+    }
+/*
+ * On 32-bit sparc or equivalents, when a single VALUE is requested
+ * and padding == sizeof(VALUE), it is clear that no padding is needed.
+ */
+#if ALIGNMENT_SIZE > SIZEOF_VALUE
+    if (size == sizeof(VALUE) && padding == sizeof(VALUE)) {
+        padding = 0;
+    }
+#endif
+
+    return padding;
+}
+#endif /* STRICT_ALIGNMENT */
+
 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;
+#ifdef STRICT_ALIGNMENT
+    size_t padding = calc_padding((void *)&storage->buff[storage->pos], size);
+#else
+    const size_t padding = 0; /* expected to be optimized by compiler */
+#endif /* STRICT_ALIGNMENT */
 
-    if (storage->pos + size > storage->size) {
-	unsigned long alloc_size = storage->size * 2;
+    if (size >= INT_MAX - padding) rb_memerror();
+    if (storage->pos + size + padding > storage->size) {
+	unsigned int alloc_size = storage->size;
 
-      retry:
-	if (alloc_size < size) {
+	while (alloc_size < size + PADDING_SIZE_MAX) {
+	    if (alloc_size >= INT_MAX / 2) rb_memerror();
 	    alloc_size *= 2;
-	    goto retry;
 	}
 	storage->next = (void *)ALLOC_N(char, alloc_size +
-					sizeof(struct
-					       iseq_compile_data_storage));
+					SIZEOF_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);
+#ifdef STRICT_ALIGNMENT
+        padding = calc_padding((void *)&storage->buff[storage->pos], size);
+#endif /* STRICT_ALIGNMENT */
     }
 
+#ifdef STRICT_ALIGNMENT
+    storage->pos += (int)padding;
+#endif /* STRICT_ALIGNMENT */
+
     ptr = (void *)&storage->buff[storage->pos];
-    storage->pos += size;
+    storage->pos += (int)size;
     return ptr;
 }
 
@@ -632,34 +758,32 @@ compile_data_alloc_adjust(rb_iseq_t *iseq)
 }
 
 /*
- * elem1, elemX => elem1, elem2, elemX
+ * elem1, elemX => elemX, elem2, elem1
  */
 static void
-INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
-    elem2->next = elem1->next;
-    elem2->prev = elem1;
-    elem1->next = elem2;
-    if (elem2->next) {
-	elem2->next->prev = elem2;
+    elem2->prev = elem1->prev;
+    elem2->next = elem1;
+    elem1->prev = elem2;
+    if (elem2->prev) {
+	elem2->prev->next = elem2;
     }
 }
 
-#if 0 /* unused */
 /*
- * elemX, elem1 => elemX, elem2, elem1
+ * elem1, elemX => elem1, elem2, elemX
  */
 static void
-INSERT_ELEM_PREV(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
+INSERT_ELEM_NEXT(LINK_ELEMENT *elem1, LINK_ELEMENT *elem2)
 {
-    elem2->prev = elem1->prev;
-    elem2->next = elem1;
-    elem1->prev = elem2;
-    if (elem2->prev) {
-	elem2->prev->next = elem2;
+    elem2->next = elem1->next;
+    elem2->prev = elem1;
+    elem1->next = elem2;
+    if (elem2->next) {
+	elem2->next->prev = elem2;
     }
 }
-#endif
 
 /*
  * elemX, elem1, elemY => elemX, elem2, elemY
@@ -692,13 +816,11 @@ FIRST_ELEMENT(LINK_ANCHOR *anchor)
     return anchor->anchor.next;
 }
 
-#if 0 /* unused */
 static LINK_ELEMENT *
 LAST_ELEMENT(LINK_ANCHOR *anchor)
 {
-  return anchor->last;
+    return anchor->last;
 }
-#endif
 
 static LINK_ELEMENT *
 POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
@@ -713,32 +835,6 @@ POP_ELEMENT(ISEQ_ARG_DECLARE LINK_ANCHOR *anchor)
 #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)
 {
@@ -800,65 +896,6 @@ INSERT_LIST(ISEQ_ARG_DECLARE LINK_ANCHOR *anc1, LINK_ANCHOR *anc2)
 #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)
@@ -893,6 +930,8 @@ new_label_body(rb_iseq_t *iseq, long line)
     labelobj->label_no = iseq->compile_data->label_no++;
     labelobj->sc_state = 0;
     labelobj->sp = -1;
+    labelobj->set = 0;
+    labelobj->rescued = LABEL_RESCUE_NONE;
     return labelobj;
 }
 
@@ -925,7 +964,7 @@ new_insn_core(rb_iseq_t *iseq, int line_no,
 }
 
 static INSN *
-new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...)
+new_insn_body(rb_iseq_t *iseq, int line_no, enum ruby_vminsn_type insn_id, int argc, ...)
 {
     VALUE *operands = 0;
     va_list argv;
@@ -943,23 +982,33 @@ new_insn_body(rb_iseq_t *iseq, int line_no, int insn_id, int argc, ...)
 }
 
 static rb_call_info_t *
-new_callinfo(rb_iseq_t *iseq, ID mid, int argc, VALUE block, unsigned long flag)
+new_callinfo(rb_iseq_t *iseq, ID mid, int argc, VALUE block, unsigned int flag, rb_call_info_kw_arg_t *kw_arg)
 {
     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;
+    ci->kw_arg = kw_arg;
+
+    if (kw_arg) {
+	ci->argc += kw_arg->keyword_len;
+	ci->orig_argc += kw_arg->keyword_len;
+    }
 
     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;
-	}
     }
+
+    if (!(ci->flag & (VM_CALL_ARGS_SPLAT | VM_CALL_ARGS_BLOCKARG)) &&
+	ci->blockiseq == NULL && ci->kw_arg == NULL) {
+	ci->flag |= VM_CALL_ARGS_SIMPLE;
+    }
+
     ci->method_state = 0;
     ci->class_serial = 0;
     ci->blockptr = 0;
@@ -972,10 +1021,10 @@ new_callinfo(rb_iseq_t *iseq, ID mid, int argc, VALUE block, unsigned long flag)
 }
 
 static INSN *
-new_insn_send(rb_iseq_t *iseq, int line_no, VALUE id, VALUE argc, VALUE block, VALUE flag)
+new_insn_send(rb_iseq_t *iseq, int line_no, ID id, VALUE argc, VALUE block, VALUE flag, rb_call_info_kw_arg_t *keywords)
 {
     VALUE *operands = (VALUE *)compile_data_alloc(iseq, sizeof(VALUE) * 1);
-    operands[0] = (VALUE)new_callinfo(iseq, SYM2ID(id), FIX2INT(argc), block, FIX2INT(flag));
+    operands[0] = (VALUE)new_callinfo(iseq, id, FIX2INT(argc), block, FIX2INT(flag), keywords);
     return new_insn_core(iseq, line_no, BIN(send), 1, operands);
 }
 
@@ -1118,6 +1167,43 @@ get_dyna_var_idx(rb_iseq_t *iseq, ID id, int *level, int *ls)
     return idx;
 }
 
+static void
+iseq_calc_param_size(rb_iseq_t *iseq)
+{
+    if (iseq->param.flags.has_opt ||
+	iseq->param.flags.has_post ||
+	iseq->param.flags.has_rest ||
+	iseq->param.flags.has_block ||
+	iseq->param.flags.has_kw ||
+	iseq->param.flags.has_kwrest) {
+
+	if (iseq->param.flags.has_block) {
+	    iseq->param.size = iseq->param.block_start + 1;
+	}
+	else if (iseq->param.flags.has_kwrest) {
+	    iseq->param.size = iseq->param.keyword->rest_start + 1;
+	}
+	else if (iseq->param.flags.has_kw) {
+	    iseq->param.size = iseq->param.keyword->bits_start + 1;
+	}
+	else if (iseq->param.flags.has_post) {
+	    iseq->param.size = iseq->param.post_start + iseq->param.post_num;
+	}
+	else if (iseq->param.flags.has_rest) {
+	    iseq->param.size = iseq->param.rest_start + 1;
+	}
+	else if (iseq->param.flags.has_opt) {
+	    iseq->param.size = iseq->param.lead_num + iseq->param.opt_num;
+	}
+	else {
+	    rb_bug("unreachable");
+	}
+    }
+    else {
+	iseq->param.size = iseq->param.lead_num;
+    }
+}
+
 static int
 iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 {
@@ -1135,8 +1221,9 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 	}
 
 
-	iseq->argc = (int)args->pre_args_num;
-	debugs("  - argc: %d\n", iseq->argc);
+	iseq->param.lead_num = (int)args->pre_args_num;
+	if (iseq->param.lead_num > 0) iseq->param.flags.has_lead = TRUE;
+	debugs("  - argc: %d\n", iseq->param.lead_num);
 
 	rest_id = args->rest_arg;
 	if (rest_id == 1) {
@@ -1146,8 +1233,9 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 	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;
+	    iseq->param.post_start = get_dyna_var_idx_at_raw(iseq, args->first_post_arg);
+	    iseq->param.post_num = args->post_args_num;
+	    iseq->param.flags.has_post = TRUE;
 	}
 
 	if (args->opt_args) {
@@ -1169,60 +1257,83 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 	    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;
+	    iseq->param.opt_num = i;
+	    iseq->param.opt_table = ALLOC_N(VALUE, i+1);
+	    MEMCPY(iseq->param.opt_table, RARRAY_CONST_PTR(labels), VALUE, i+1);
+	    for (j = 0; j < i+1; j++) {
+		iseq->param.opt_table[j] &= ~1;
 	    }
 	    rb_ary_clear(labels);
-	}
-	else {
-	    iseq->arg_opts = 0;
+
+	    iseq->param.flags.has_opt = TRUE;
 	}
 
 	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;
+	    const VALUE default_values = rb_ary_tmp_new(1);
+	    const VALUE complex_mark = rb_str_tmp_new(0);
+	    int kw = 0, rkw = 0, di = 0, i;
+
+	    iseq->param.flags.has_kw = TRUE;
+	    iseq->param.keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+	    iseq->param.keyword->bits_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
 
-	    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;
+		NODE *val_node = node->nd_body->nd_value;
+		VALUE dv;
+
+		if (val_node == (NODE *)-1) {
+		    ++rkw;
+		}
+		else {
+		    switch (nd_type(val_node)) {
+		      case NODE_LIT:
+			dv = val_node->nd_lit;
+			iseq_add_mark_object(iseq, dv);
+			break;
+		      case NODE_NIL:
+			dv = Qnil;
+			break;
+		      case NODE_TRUE:
+			dv = Qtrue;
+			break;
+		      case NODE_FALSE:
+			dv = Qfalse;
+			break;
+		      default:
+			COMPILE_POPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */
+			dv = complex_mark;
+		    }
+
+		    iseq->param.keyword->num = ++di;
+		    rb_ary_push(default_values, dv);
 		}
-		rb_ary_push(list, INT2FIX(node->nd_body->nd_vid));
-		COMPILE_POPED(optargs, "kwarg", node); /* nd_type(node) == NODE_KW_ARG */
+
+		kw++;
 		node = node->nd_next;
-		i += 1;
 	    }
-	    iseq->arg_keyword_check = args->kw_rest_arg->nd_cflag != 0;
-	    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;
+
+	    iseq->param.keyword->num = kw;
+
+	    if (args->kw_rest_arg->nd_cflag != 0) {
+		iseq->param.keyword->rest_start =  get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_cflag);
+		iseq->param.flags.has_kwrest = TRUE;
 	    }
-	    for (j = 0; j < i; j++) {
-		iseq->arg_keyword_table[j] = FIX2INT(RARRAY_AREF(keywords, j));
+	    iseq->param.keyword->required_num = rkw;
+	    iseq->param.keyword->table = &iseq->local_table[iseq->param.keyword->bits_start - iseq->param.keyword->num];
+	    iseq->param.keyword->default_values = ALLOC_N(VALUE, RARRAY_LEN(default_values));
+
+	    for (i = 0; i < RARRAY_LEN(default_values); i++) {
+		VALUE dv = RARRAY_AREF(default_values, i);
+		if (dv == complex_mark) dv = Qundef;
+		iseq->param.keyword->default_values[i] = dv;
 	    }
-	    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;
+	    iseq->param.flags.has_kwrest = TRUE;
+	    iseq->param.keyword = ZALLOC_N(struct rb_iseq_param_keyword, 1);
+	    iseq->param.keyword->rest_start = get_dyna_var_idx_at_raw(iseq, args->kw_rest_arg->nd_vid);
 	}
 
 	if (args->pre_init) { /* m_init */
@@ -1233,70 +1344,42 @@ iseq_set_arguments(rb_iseq_t *iseq, LINK_ANCHOR *optargs, NODE *node_args)
 	}
 
 	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");
-	    }
+	    iseq->param.rest_start = get_dyna_var_idx_at_raw(iseq, rest_id);
+	    iseq->param.flags.has_rest = TRUE;
+	    assert(iseq->param.rest_start != -1);
 
-	    if (iseq->arg_post_start == 0) {
-		iseq->arg_post_start = iseq->arg_rest + 1;
+	    if (iseq->param.post_start == 0) { /* TODO: why that? */
+		iseq->param.post_start = iseq->param.rest_start + 1;
 	    }
 	}
 
 	if (block_id) {
-	    iseq->arg_block = get_dyna_var_idx_at_raw(iseq, block_id);
+	    iseq->param.block_start = get_dyna_var_idx_at_raw(iseq, block_id);
+	    iseq->param.flags.has_block = TRUE;
 	}
 
-	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;
-	}
+	iseq_calc_param_size(iseq);
 
 	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) {
+	    if (iseq->param.flags.has_opt    == FALSE &&
+		iseq->param.flags.has_post   == FALSE &&
+		iseq->param.flags.has_rest   == FALSE &&
+		iseq->param.flags.has_kw     == FALSE &&
+		iseq->param.flags.has_kwrest == FALSE) {
+
+		if (iseq->param.lead_num == 1 && last_comma == 0) {
 		    /* {|a|} */
-		    iseq->arg_simple |= 0x02;
+		    iseq->param.flags.ambiguous_param0 = TRUE;
 		}
 	    }
 	}
     }
-    else {
-	iseq->arg_simple = 1;
-    }
 
     return COMPILE_OK;
 }
 
 static int
-iseq_set_local_table(rb_iseq_t *iseq, ID *tbl)
+iseq_set_local_table(rb_iseq_t *iseq, const ID *tbl)
 {
     int size;
 
@@ -1436,8 +1519,7 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
     /* 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->is_entries = ZALLOC_N(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); */
 
@@ -1564,6 +1646,9 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 			    generated_iseq[pos + 1 + j] = (VALUE)entry;
 			}
 			break;
+		      case TS_FUNCPTR:
+			generated_iseq[pos + 1 + j] = operands[j];
+			break;
 		      default:
 			rb_compile_error(RSTRING_PTR(iseq->location.path), iobj->line_no,
 					 "unknown operand type: %c", type);
@@ -1620,8 +1705,8 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 			    line_info_table[k].position = pos;
 			    k++;
 			}
-			generated_iseq[pos++] = BIN(jump);
-			generated_iseq[pos++] = 0;
+			generated_iseq[pos++] = BIN(nop);
+			generated_iseq[pos++] = BIN(nop);
 		    }
 		    else {
 			rb_bug("iseq_set_sequence: adjust bug");
@@ -1636,18 +1721,11 @@ iseq_set_sequence(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 	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_encoded = (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));
+    REALLOC_N(line_info_table, struct iseq_line_info_entry, k);
     iseq->line_info_table = line_info_table;
     iseq->line_info_size = k;
 
@@ -1676,12 +1754,15 @@ iseq_set_exception_table(rb_iseq_t *iseq)
     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;
+    iseq->catch_table = 0;
+    if (tlen > 0) {
+	iseq->catch_table = xmalloc(iseq_catch_table_bytes(tlen));
+	iseq->catch_table->size = tlen;
+    }
 
-    for (i = 0; i < tlen; i++) {
+    if (iseq->catch_table) for (i = 0; i < iseq->catch_table->size; i++) {
 	ptr = RARRAY_CONST_PTR(tptr[i]);
-	entry = &iseq->catch_table[i];
+	entry = &iseq->catch_table->entries[i];
 	entry->type = (enum catch_type)(ptr[0] & 0xffff);
 	entry->start = label_get_position((LABEL *)(ptr[1] & ~1));
 	entry->end = label_get_position((LABEL *)(ptr[2] & ~1));
@@ -1728,10 +1809,9 @@ 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]);
+    if (iseq->param.flags.has_opt) {
+	for (i = 0; i < iseq->param.opt_num + 1; i++) {
+	    iseq->param.opt_table[i] = label_get_position((LABEL *)iseq->param.opt_table[i]);
 	}
     }
     return COMPILE_OK;
@@ -1890,7 +1970,7 @@ iseq_peephole_optimize(rb_iseq_t *iseq, LINK_ELEMENT *list, const int do_tailcal
 	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)) {
+	if (previ == BIN(send) || previ == BIN(opt_send_without_block) || previ == BIN(invokesuper)) {
 	    rb_call_info_t *ci = (rb_call_info_t *)piobj->operands[0];
 	    if (ci->blockiseq == 0) {
 		ci->flag |= VM_CALL_TAILCALL;
@@ -1914,7 +1994,7 @@ insn_set_specialized_instruction(rb_iseq_t *iseq, INSN *iobj, int 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);
+	iobj->operands[1] = (VALUE)new_callinfo(iseq, idEq, 1, 0, 0, NULL);
     }
 
     return COMPILE_OK;
@@ -1927,7 +2007,7 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 	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) {
+	if (ci->flag & VM_CALL_ARGS_SIMPLE) {
 	    switch (ci->orig_argc) {
 	      case 0:
 		switch (ci->mid) {
@@ -1962,8 +2042,9 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
 		break;
 	    }
 	}
-	if (ci->flag & VM_CALL_ARGS_SKIP_SETUP) {
-	    iobj->insn_id = BIN(opt_send_simple);
+
+	if ((ci->flag & VM_CALL_ARGS_BLOCKARG) == 0 && ci->blockiseq == NULL) {
+	    iobj->insn_id = BIN(opt_send_without_block);
 	}
     }
 #undef SP_INSN
@@ -1971,20 +2052,37 @@ iseq_specialized_instruction(rb_iseq_t *iseq, INSN *iobj)
     return COMPILE_OK;
 }
 
+static inline int
+tailcallable_p(rb_iseq_t *iseq)
+{
+    switch (iseq->type) {
+      case ISEQ_TYPE_RESCUE:
+      case ISEQ_TYPE_ENSURE:
+	/* rescue block can't tail call because of errinfo */
+	return FALSE;
+      default:
+	return TRUE;
+    }
+}
+
 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_tailcallopt = tailcallable_p(iseq) &&
+	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;
+    int rescue_level = 0;
+    int tailcallopt = do_tailcallopt;
+
     list = FIRST_ELEMENT(anchor);
 
     while (list) {
 	if (list->type == ISEQ_ELEMENT_INSN) {
 	    if (do_peepholeopt) {
-		iseq_peephole_optimize(iseq, list, do_tailcallopt);
+		iseq_peephole_optimize(iseq, list, tailcallopt);
 	    }
 	    if (do_si) {
 		iseq_specialized_instruction(iseq, (INSN *)list);
@@ -1993,6 +2091,17 @@ iseq_optimize(rb_iseq_t *iseq, LINK_ANCHOR *anchor)
 		insn_operands_unification((INSN *)list);
 	    }
 	}
+	if (list->type == ISEQ_ELEMENT_LABEL) {
+	    switch (((LABEL *)list)->rescued) {
+	      case LABEL_RESCUE_BEG:
+		rescue_level++;
+		tailcallopt = FALSE;
+		break;
+	      case LABEL_RESCUE_END:
+		if (!--rescue_level) tailcallopt = do_tailcallopt;
+		break;
+	    }
+	}
 	list = list->next;
     }
     return COMPILE_OK;
@@ -2344,6 +2453,52 @@ compile_branch_condition(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * cond,
     return COMPILE_OK;
 }
 
+static int
+compile_array_keyword_arg(rb_iseq_t *iseq, LINK_ANCHOR *ret, const NODE * const root_node, rb_call_info_kw_arg_t ** const kw_arg_ptr)
+{
+    if (kw_arg_ptr == NULL) return FALSE;
+
+    if (nd_type(root_node) == NODE_HASH && root_node->nd_head && nd_type(root_node->nd_head) == NODE_ARRAY) {
+	NODE *node = root_node->nd_head;
+
+	while (node) {
+	    NODE *key_node = node->nd_head;
+
+	    assert(nd_type(node) == NODE_ARRAY);
+	    if (key_node && nd_type(key_node) == NODE_LIT && RB_TYPE_P(key_node->nd_lit, T_SYMBOL)) {
+		/* can be keywords */
+	    }
+	    else {
+		return FALSE;
+	    }
+	    node = node->nd_next; /* skip value node */
+	    node = node->nd_next;
+	}
+
+	/* may be keywords */
+	node = root_node->nd_head;
+	{
+	    int len = (int)node->nd_alen / 2;
+	    rb_call_info_kw_arg_t *kw_arg  = (rb_call_info_kw_arg_t *)ruby_xmalloc(sizeof(rb_call_info_kw_arg_t) + sizeof(VALUE) * (len - 1));
+	    VALUE *keywords = kw_arg->keywords;
+	    int i = 0;
+	    kw_arg->keyword_len = len;
+
+	    *kw_arg_ptr = kw_arg;
+
+	    for (i=0; node != NULL; i++, node = node->nd_next->nd_next) {
+		NODE *key_node = node->nd_head;
+		NODE *val_node = node->nd_next->nd_head;
+		keywords[i] = key_node->nd_lit;
+		COMPILE(ret, "keyword values", val_node);
+	    }
+	    assert(i == len);
+	    return TRUE;
+	}
+    }
+    return FALSE;
+}
+
 enum compile_array_type_t {
     COMPILE_ARRAY_TYPE_ARRAY,
     COMPILE_ARRAY_TYPE_HASH,
@@ -2352,7 +2507,7 @@ enum compile_array_type_t {
 
 static int
 compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
-	       enum compile_array_type_t type, int poped)
+	       enum compile_array_type_t type, rb_call_info_kw_arg_t **keywords_ptr, int poped)
 {
     NODE *node = node_root;
     int line = (int)nd_line(node);
@@ -2383,18 +2538,26 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
 		    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;
+		if (type != COMPILE_ARRAY_TYPE_ARRAY && !node->nd_head) {
 		    kw = node->nd_next;
-		    node = kw->nd_next;
-		    kw = kw->nd_head;
+		    node = 0;
+		    if (kw) {
+			opt_p = 0;
+			node = kw->nd_next;
+			kw = kw->nd_head;
+		    }
 		    break;
 		}
 		if (opt_p && nd_type(node->nd_head) != NODE_LIT) {
 		    opt_p = 0;
 		}
 
-		COMPILE_(anchor, "array element", node->nd_head, poped);
+		if (type == COMPILE_ARRAY_TYPE_ARGS && node->nd_next == NULL /* last node */ && compile_array_keyword_arg(iseq, anchor, node->nd_head, keywords_ptr)) {
+		    len--;
+		}
+		else {
+		    COMPILE_(anchor, "array element", node->nd_head, poped);
+		}
 	    }
 
 	    if (opt_p && type != COMPILE_ARRAY_TYPE_ARGS) {
@@ -2429,7 +2592,7 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
 			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));
+			    ADD_SEND(ret, line, id_core_hash_from_ary, INT2FIX(1));
 			}
 		    }
 		    else {
@@ -2440,7 +2603,7 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
 			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));
+			    ADD_SEND(ret, line, id_core_hash_merge_ary, INT2FIX(1));
 			}
 		    }
 		}
@@ -2470,7 +2633,7 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
 				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));
+				ADD_SEND(ret, line, id_core_hash_merge_ptr, INT2FIX(i + 1));
 			    }
 			}
 			if (kw) {
@@ -2478,7 +2641,8 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
 			    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);
+			    ADD_SEND(ret, line, id_core_hash_merge_kwd, nhash);
+			    if (nhash == INT2FIX(1)) ADD_SEND(ret, line, rb_intern("dup"), INT2FIX(0));
 			}
 			first = 0;
 			break;
@@ -2500,7 +2664,7 @@ compile_array_(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE* node_root,
 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);
+    return compile_array_(iseq, ret, node_root, type, NULL, 0);
 }
 
 static VALUE
@@ -2570,19 +2734,22 @@ compile_massign_lhs(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *node)
 	INSN *iobj;
 	rb_call_info_t *ci;
 	VALUE dupidx;
+	int line = nd_line(node);
 
 	COMPILE_POPED(ret, "masgn lhs (NODE_ATTRASGN)", node);
 
-	POP_ELEMENT(ret);        /* pop pop insn */
-	iobj = (INSN *)POP_ELEMENT(ret); /* pop send insn */
+	iobj = (INSN *)get_prev_insn((INSN *)LAST_ELEMENT(ret)); /* send insn */
 	ci = (rb_call_info_t *)iobj->operands[0];
-	ci->orig_argc += 1; ci->argc = ci->orig_argc;
+	ci->orig_argc += 1;
 	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    */
+	INSERT_BEFORE_INSN1(iobj, line, topn, dupidx);
+	if (ci->flag & VM_CALL_ARGS_SPLAT) {
+	    --ci->orig_argc;
+	    INSERT_BEFORE_INSN1(iobj, line, newarray, INT2FIX(1));
+	    INSERT_BEFORE_INSN(iobj, line, concatarray);
+	}
+	ADD_INSN(ret, line, pop);	/* result */
 	break;
       }
       case NODE_MASGN: {
@@ -2785,6 +2952,8 @@ compile_cpath(LINK_ANCHOR *ret, rb_iseq_t *iseq, NODE *cpath)
     }
 }
 
+#define private_recv_p(node) (nd_type((node)->nd_recv) == NODE_SELF)
+
 #define defined_expr defined_expr0
 static int
 defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
@@ -2888,17 +3057,10 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
       case NODE_VCALL:
       case NODE_FCALL:
       case NODE_ATTRASGN:{
-	int self = TRUE;
+	const int explicit_receiver =
+	    (type == NODE_CALL ||
+	     (type == NODE_ATTRASGN && !private_recv_p(node)));
 
-	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));
 	}
@@ -2906,7 +3068,7 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 	    defined_expr(iseq, ret, node->nd_args, lfinish, Qfalse);
 	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
 	}
-	if (!self) {
+	if (explicit_receiver) {
 	    defined_expr(iseq, ret, node->nd_recv, lfinish, Qfalse);
 	    ADD_INSNL(ret, nd_line(node), branchunless, lfinish[1]);
 	    COMPILE(ret, "defined/recv", node->nd_recv);
@@ -2988,6 +3150,8 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
 						       ("defined guard in "),
 						       iseq->location.label),
 					 ISEQ_TYPE_DEFINED_GUARD, 0);
+	lstart->rescued = LABEL_RESCUE_BEG;
+	lend->rescued = LABEL_RESCUE_END;
 	APPEND_LABEL(ret, lcur, lstart);
 	ADD_LABEL(ret, lend);
 	ADD_CATCH_ENTRY(CATCH_TYPE_RESCUE, lstart, lend, rescue, lfinish[1]);
@@ -2995,8 +3159,6 @@ defined_expr(rb_iseq_t *iseq, LINK_ANCHOR *ret,
     return done;
 }
 
-#define BUFSIZE 0x100
-
 static VALUE
 make_name_for_block(rb_iseq_t *iseq)
 {
@@ -3085,7 +3247,7 @@ add_ensure_iseq(LINK_ANCHOR *ret, rb_iseq_t *iseq, int is_return)
 }
 
 static VALUE
-setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
+setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, unsigned int *flag, rb_call_info_kw_arg_t **keywords)
 {
     VALUE argc = INT2FIX(0);
     int nsplat = 0;
@@ -3105,6 +3267,7 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
 	switch (nd_type(argn)) {
 	  case NODE_SPLAT: {
 	    COMPILE(args, "args (splat)", argn->nd_head);
+	    ADD_INSN1(args, nd_line(argn), splatarray, Qfalse);
 	    argc = INT2FIX(1);
 	    nsplat++;
 	    *flag |= VM_CALL_ARGS_SPLAT;
@@ -3117,16 +3280,11 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
 
 	    INIT_ANCHOR(tmp);
 	    COMPILE(tmp, "args (cat: splat)", argn->nd_body);
-	    if (next_is_array && nsplat == 0) {
-		/* none */
+	    if (nd_type(argn) == NODE_ARGSCAT) {
+		ADD_INSN1(tmp, nd_line(argn), splatarray, Qfalse);
 	    }
 	    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));
-		}
+		ADD_INSN1(tmp, nd_line(argn), newarray, INT2FIX(1));
 	    }
 	    INSERT_LIST(args_splat, tmp);
 	    nsplat++;
@@ -3141,10 +3299,11 @@ setup_args(rb_iseq_t *iseq, LINK_ANCHOR *args, NODE *argn, VALUE *flag)
 	    }
 	    break;
 	  }
-	  case NODE_ARRAY: {
-	    argc = INT2FIX(compile_array(iseq, args, argn, COMPILE_ARRAY_TYPE_ARGS));
-	    break;
-	  }
+	  case NODE_ARRAY:
+	    {
+		argc = INT2FIX(compile_array_(iseq, args, argn, COMPILE_ARRAY_TYPE_ARGS, keywords, FALSE));
+		break;
+	    }
 	  default: {
 	    rb_bug("setup_arg: unknown node: %s\n", ruby_node_name(nd_type(argn)));
 	  }
@@ -3175,7 +3334,7 @@ build_postexe_iseq(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE *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);
+    ADD_CALL_WITH_BLOCK(ret, line, id_core_set_postexe, argc, block);
     iseq_set_local_table(iseq, 0);
     return Qnil;
 }
@@ -3202,16 +3361,23 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	return COMPILE_OK;
     }
 
-    iseq->compile_data->last_line = line = (int)nd_line(node);
+    line = (int)nd_line(node);
+
+    if (iseq->compile_data->last_line == line) {
+	/* ignore */
+    }
+    else {
+	if (node->flags & NODE_FL_NEWLINE) {
+	    iseq->compile_data->last_line = line;
+	    ADD_TRACE(ret, line, RUBY_EVENT_LINE);
+	    saved_last_element = ret->last;
+	}
+    }
+
     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) {
@@ -3460,7 +3626,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	}
 	else {
 	    ADD_CALL_RECEIVER(ret, line);
-	    ADD_CALL(ret, line, ID2SYM(idGets), INT2FIX(0));
+	    ADD_CALL(ret, line, idGets, INT2FIX(0));
 	    ADD_INSNL(ret, line, branchif, redo_label);
 	    /* opt_n */
 	}
@@ -3509,8 +3675,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		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));
+	    ADD_SEND_WITH_BLOCK(ret, line, idEach, INT2FIX(0), iseq->compile_data->current_block);
 	}
 	else {
 	    iseq->compile_data->current_block =
@@ -3757,6 +3922,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    rb_str_concat(rb_str_new2("rescue in "), iseq->location.label),
 	    ISEQ_TYPE_RESCUE, line);
 
+	lstart->rescued = LABEL_RESCUE_BEG;
+	lend->rescued = LABEL_RESCUE_END;
 	ADD_LABEL(ret, lstart);
 	COMPILE(ret, "rescue head", node->nd_head);
 	ADD_LABEL(ret, lend);
@@ -3902,7 +4069,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	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);
+	debugs("lvar: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx);
 	COMPILE(ret, "rvalue", node->nd_value);
 
 	if (!poped) {
@@ -3916,7 +4083,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       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) : "*"));
+	debugi("dassn id", rb_id2str(node->nd_vid) ? node->nd_vid : '*');
 
 	if (!poped) {
 	    ADD_INSN(ret, line, dup);
@@ -3925,7 +4092,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	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));
+	    rb_bug("NODE_DASGN(_CURR): unknown id (%"PRIsVALUE")", rb_id2str(node->nd_vid));
 	}
 
 	ADD_INSN2(ret, line, setlocal, INT2FIX(ls - idx), INT2FIX(lv));
@@ -3981,7 +4148,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_OP_ASGN1: {
 	DECL_ANCHOR(args);
 	VALUE argc;
-	VALUE flag = 0;
+	unsigned int flag = 0;
+	unsigned int asgnflag = 0;
 	ID id = node->nd_mid;
 	int boff = 0;
 
@@ -4011,7 +4179,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	if (!poped) {
 	    ADD_INSN(ret, line, putnil);
 	}
-	COMPILE(ret, "NODE_OP_ASGN1 recv", node->nd_recv);
+	asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN1 recv", node);
 	switch (nd_type(node->nd_args->nd_head)) {
 	  case NODE_ZARRAY:
 	    argc = INT2FIX(0);
@@ -4020,11 +4188,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    boff = 1;
 	  default:
 	    INIT_ANCHOR(args);
-	    argc = setup_args(iseq, args, node->nd_args->nd_head, &flag);
+	    argc = setup_args(iseq, args, node->nd_args->nd_head, &flag, NULL);
 	    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));
+	flag |= asgnflag;
+	ADD_SEND_WITH_FLAG(ret, line, idAREF, argc, INT2FIX(flag));
 
 	if (id == 0 || id == 1) {
 	    /* 0: or, 1: and
@@ -4067,14 +4236,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		    ADD_INSN(ret, line, pop);
 		    ADD_INSN(ret, line, pop);
 		}
-		ADD_SEND_R(ret, line, ID2SYM(idASET),
-			   argc, Qfalse, LONG2FIX(flag));
+		ADD_SEND_WITH_FLAG(ret, line, idASET, argc, INT2FIX(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_SEND_WITH_FLAG(ret, line, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
 	    }
 	    ADD_INSN(ret, line, pop);
 	    ADD_INSNL(ret, line, jump, lfin);
@@ -4087,7 +4254,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	}
 	else {
 	    COMPILE(ret, "NODE_OP_ASGN1 args->body: ", node->nd_args->nd_body);
-	    ADD_SEND(ret, line, ID2SYM(id), INT2FIX(1));
+	    ADD_SEND(ret, line, id, INT2FIX(1));
 	    if (!poped) {
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2+boff));
 	    }
@@ -4104,14 +4271,12 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		    ADD_INSN(ret, line, pop);
 		    ADD_INSN(ret, line, pop);
 		}
-		ADD_SEND_R(ret, line, ID2SYM(idASET),
-			   argc, Qfalse, LONG2FIX(flag));
+		ADD_SEND_WITH_FLAG(ret, line, idASET, argc, INT2FIX(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_SEND_WITH_FLAG(ret, line, idASET, FIXNUM_INC(argc, 1), INT2FIX(flag));
 	    }
 	    ADD_INSN(ret, line, pop);
 	}
@@ -4120,6 +4285,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       }
       case NODE_OP_ASGN2:{
 	ID atype = node->nd_next->nd_mid;
+	VALUE asgnflag;
 	LABEL *lfin = NEW_LABEL(line);
 	LABEL *lcfin = NEW_LABEL(line);
 	/*
@@ -4164,10 +4330,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 
 	*/
 
-	COMPILE(ret, "NODE_OP_ASGN2#recv", node->nd_recv);
+	asgnflag = COMPILE_RECV(ret, "NODE_OP_ASGN2#recv", node);
 	ADD_INSN(ret, line, dup);
-	ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_vid),
-		 INT2FIX(0));
+	ADD_SEND_WITH_FLAG(ret, line, node->nd_next->nd_vid, INT2FIX(0), INT2FIX(asgnflag));
 
 	if (atype == 0 || atype == 1) {	/* 0: OR or 1: AND */
 	    ADD_INSN(ret, line, dup);
@@ -4181,8 +4346,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    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_SEND_WITH_FLAG(ret, line, node->nd_next->nd_aid, INT2FIX(1), INT2FIX(asgnflag));
 	    ADD_INSNL(ret, line, jump, lfin);
 
 	    ADD_LABEL(ret, lcfin);
@@ -4197,14 +4361,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	}
 	else {
 	    COMPILE(ret, "NODE_OP_ASGN2 val", node->nd_value);
-	    ADD_SEND(ret, line, ID2SYM(node->nd_next->nd_mid),
+	    ADD_SEND(ret, line, 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_SEND_WITH_FLAG(ret, line, node->nd_next->nd_aid, INT2FIX(1), INT2FIX(asgnflag));
 	    ADD_INSN(ret, line, pop);
 	}
 	break;
@@ -4266,7 +4429,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	else {
 	    COMPILE(ret, "NODE_OP_CDECL#nd_value", node->nd_value);
 	    /* cref obj value */
-	    ADD_CALL(ret, line, ID2SYM(node->nd_aid), INT2FIX(1));
+	    ADD_CALL(ret, line, node->nd_aid, INT2FIX(1));
 	    /* cref value */
 	    ADD_INSN(ret, line, swap); /* value cref */
 	    if (!poped) {
@@ -4323,8 +4486,9 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	 *   "literal".freeze -> opt_str_freeze("literal")
 	 */
 	if (node->nd_recv && nd_type(node->nd_recv) == NODE_STR &&
-	    node->nd_mid == idFreeze && node->nd_args == NULL)
-	{
+	    node->nd_mid == idFreeze && node->nd_args == NULL &&
+	    iseq->compile_data->current_block == Qfalse &&
+	    iseq->compile_data->option->specialized_instruction) {
 	    VALUE str = rb_fstring(node->nd_recv->nd_lit);
 	    iseq_add_mark_object(iseq, str);
 	    ADD_INSN1(ret, line, opt_str_freeze, str);
@@ -4336,15 +4500,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	/* optimization shortcut
 	 *   obj["literal"] -> opt_aref_with(obj, "literal")
 	 */
-	if (node->nd_mid == idAREF && node->nd_recv != (NODE *)1 && node->nd_args &&
+	if (node->nd_mid == idAREF && !private_recv_p(node) && node->nd_args &&
 	    nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 1 &&
-	    nd_type(node->nd_args->nd_head) == NODE_STR)
-	{
+	    nd_type(node->nd_args->nd_head) == NODE_STR &&
+	    iseq->compile_data->current_block == Qfalse &&
+	    iseq->compile_data->option->specialized_instruction) {
 	    VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
 	    node->nd_args->nd_head->nd_lit = str;
 	    COMPILE(ret, "recv", node->nd_recv);
 	    ADD_INSN2(ret, line, opt_aref_with,
-		      new_callinfo(iseq, idAREF, 1, 0, 0), str);
+		      new_callinfo(iseq, idAREF, 1, 0, 0, NULL), str);
 	    if (poped) {
 		ADD_INSN(ret, line, pop);
 	    }
@@ -4361,7 +4526,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	DECL_ANCHOR(args);
 	ID mid = node->nd_mid;
 	VALUE argc;
-	VALUE flag = 0;
+	unsigned int flag = 0;
+	rb_call_info_kw_arg_t *keywords = NULL;
 	VALUE parent_block = iseq->compile_data->current_block;
 	iseq->compile_data->current_block = Qfalse;
 
@@ -4441,7 +4607,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 
 	/* args */
 	if (nd_type(node) != NODE_VCALL) {
-	    argc = setup_args(iseq, args, node->nd_args, &flag);
+	    argc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
 	}
 	else {
 	    argc = INT2FIX(0);
@@ -4461,8 +4627,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    flag |= VM_CALL_FCALL;
 	}
 
-	ADD_SEND_R(ret, line, ID2SYM(mid),
-		   argc, parent_block, LONG2FIX(flag));
+	ADD_SEND_R(ret, line, mid, argc, parent_block, INT2FIX(flag), keywords);
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -4473,13 +4638,14 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_ZSUPER:{
 	DECL_ANCHOR(args);
 	int argc;
-	VALUE flag = 0;
+	unsigned int flag = 0;
+	rb_call_info_kw_arg_t *keywords = NULL;
 	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);
+	    VALUE vargc = setup_args(iseq, args, node->nd_args, &flag, &keywords);
 	    argc = FIX2INT(vargc);
 	}
 	else {
@@ -4488,78 +4654,91 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    rb_iseq_t *liseq = iseq->local_iseq;
 	    int lvar_level = get_lvar_level(iseq);
 
-	    argc = liseq->argc;
+	    argc = liseq->param.lead_num;
 
 	    /* normal arguments */
-	    for (i = 0; i < liseq->argc; i++) {
+	    for (i = 0; i < liseq->param.lead_num; 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 */
+	    if (liseq->param.flags.has_opt) {
+		/* optional arguments */
+		int j;
+		for (j = 0; j < liseq->param.opt_num; j++) {
+		    int idx = liseq->local_size - (i + j);
+		    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		}
+		i += j;
+		argc = i;
+	    }
+	    if (liseq->param.flags.has_rest) {
+		/* rest argument */
+		int idx = liseq->local_size - liseq->param.rest_start;
+		ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
+		argc = liseq->param.rest_start + 1;
+		flag |= VM_CALL_ARGS_SPLAT;
+	    }
+	    if (liseq->param.flags.has_post) {
+		/* post arguments */
+		int post_len = liseq->param.post_num;
+		int post_start = liseq->param.post_start;
+
+		if (liseq->param.flags.has_rest) {
 		    int j;
-		    for (j = 0; j < liseq->arg_opts - 1; j++) {
-			int idx = liseq->local_size - (i + 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));
 		    }
-		    i += j;
-		    argc = i;
+		    ADD_INSN1(args, line, newarray, INT2FIX(j));
+		    ADD_INSN (args, line, concatarray);
+		    /* argc is settled at above */
 		}
-
-		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;
+		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_post_len) {
-		    /* post arguments */
-		    int post_len = liseq->arg_post_len;
-		    int post_start = liseq->arg_post_start;
+	    if (liseq->param.flags.has_kw) { /* TODO: support keywords */
+		int local_size = liseq->local_size;
+		argc++;
 
-		    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;
-		    }
-		}
+		ADD_INSN1(args, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 
-		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));
+		if (liseq->param.flags.has_kwrest) {
+		    ADD_INSN2(args, line, getlocal, INT2FIX(liseq->local_size - liseq->param.keyword->rest_start), INT2FIX(lvar_level));
+		    ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
+		}
+		else {
+		    ADD_INSN1(args, line, newhash, INT2FIX(0));
+		}
+		for (i = 0; i < liseq->param.keyword->num; ++i) {
+		    ID id = liseq->param.keyword->table[i];
+		    int idx = local_size - get_local_var_idx(liseq, id);
+		    ADD_INSN1(args, line, putobject, ID2SYM(id));
 		    ADD_INSN2(args, line, getlocal, INT2FIX(idx), INT2FIX(lvar_level));
-		    ADD_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;
-		    }
+		}
+		ADD_SEND(args, line, id_core_hash_merge_ptr, INT2FIX(i * 2 + 1));
+		if (liseq->param.flags.has_rest) {
+		    ADD_INSN1(args, line, newarray, INT2FIX(1));
+		    ADD_INSN (args, line, concatarray);
+		    --argc;
+		}
+	    }
+	    else if (liseq->param.flags.has_kwrest) {
+		ADD_INSN2(args, line, getlocal, INT2FIX(liseq->local_size - liseq->param.keyword->rest_start), INT2FIX(lvar_level));
+		ADD_SEND (args, line, rb_intern("dup"), INT2FIX(0));
+		if (liseq->param.flags.has_rest) {
+		    ADD_INSN1(args, line, newarray, INT2FIX(1));
+		    ADD_INSN (args, line, concatarray);
+		}
+		else {
+		    argc++;
 		}
 	    }
 	}
@@ -4568,7 +4747,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	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));
+						       flag | VM_CALL_SUPER | VM_CALL_FCALL, keywords));
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -4576,7 +4755,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	break;
       }
       case NODE_ARRAY:{
-	compile_array_(iseq, ret, node, COMPILE_ARRAY_TYPE_ARRAY, poped);
+	compile_array_(iseq, ret, node, COMPILE_ARRAY_TYPE_ARRAY, NULL, poped);
 	break;
       }
       case NODE_ZARRAY:{
@@ -4662,7 +4841,8 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_YIELD:{
 	DECL_ANCHOR(args);
 	VALUE argc;
-	VALUE flag = 0;
+	unsigned int flag = 0;
+	rb_call_info_kw_arg_t *keywords = NULL;
 
 	INIT_ANCHOR(args);
 	if (iseq->type == ISEQ_TYPE_TOP) {
@@ -4670,14 +4850,14 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	}
 
 	if (node->nd_head) {
-	    argc = setup_args(iseq, args, node->nd_head, &flag);
+	    argc = setup_args(iseq, args, node->nd_head, &flag, &keywords);
 	}
 	else {
 	    argc = INT2FIX(0);
 	}
 
 	ADD_SEQ(ret, args);
-	ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), 0, flag));
+	ADD_INSN1(ret, line, invokeblock, new_callinfo(iseq, 0, FIX2INT(argc), 0, flag, keywords));
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -4689,7 +4869,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int 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);
+	    debugs("id: %"PRIsVALUE" idx: %d\n", rb_id2str(id), idx);
 	    ADD_INSN2(ret, line, getlocal, INT2FIX(idx), INT2FIX(get_lvar_level(iseq)));
 	}
 	break;
@@ -4700,7 +4880,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	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));
+		rb_bug("unknown dvar (%"PRIsVALUE")", rb_id2str(node->nd_vid));
 	    }
 	    ADD_INSN2(ret, line, getlocal, INT2FIX(ls - idx), INT2FIX(lv));
 	}
@@ -4753,6 +4933,10 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       }
       case NODE_NTH_REF:{
         if (!poped) {
+	    if (!node->nd_nth) {
+		ADD_INSN(ret, line, putnil);
+		break;
+	    }
 	    ADD_INSN2(ret, line, getspecial, INT2FIX(1) /* '~'  */,
 		      INT2FIX(node->nd_nth << 1));
 	}
@@ -4801,13 +4985,13 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    else {
 		ADD_SEQ(ret, recv);
 		ADD_SEQ(ret, val);
-		ADD_INSN1(ret, line, opt_regexpmatch2, new_callinfo(iseq, idEqTilde, 1, 0, 0));
+		ADD_INSN1(ret, line, opt_regexpmatch2, new_callinfo(iseq, idEqTilde, 1, 0, 0, NULL));
 	    }
 	}
 	else {
 	    ADD_SEQ(ret, recv);
 	    ADD_SEQ(ret, val);
-	    ADD_SEND(ret, line, ID2SYM(idEqTilde), INT2FIX(1));
+	    ADD_SEND(ret, line, idEqTilde, INT2FIX(1));
 	}
 
 	if (poped) {
@@ -4842,7 +5026,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	node->nd_lit = rb_fstring(node->nd_lit);
 	ADD_CALL_RECEIVER(ret, line);
 	ADD_INSN1(ret, line, putobject, node->nd_lit);
-	ADD_CALL(ret, line, ID2SYM(idBackquote), INT2FIX(1));
+	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -4852,7 +5036,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_DXSTR:{
 	ADD_CALL_RECEIVER(ret, line);
 	compile_dstr(iseq, ret, node);
-	ADD_CALL(ret, line, ID2SYM(idBackquote), INT2FIX(1));
+	ADD_CALL(ret, line, idBackquote, INT2FIX(1));
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -4942,7 +5126,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	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));
+	ADD_SEND (ret, line, id_core_define_method, INT2FIX(3));
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -4962,7 +5146,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	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));
+	ADD_SEND (ret, line, id_core_define_singleton_method, INT2FIX(3));
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -4974,7 +5158,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	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));
+	ADD_SEND(ret, line, id_core_set_method_alias, INT2FIX(3));
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -4985,7 +5169,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	ADD_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));
+	ADD_SEND(ret, line, id_core_set_variable_alias, INT2FIX(2));
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -4996,7 +5180,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	ADD_INSN1(ret, line, putspecialobject, INT2FIX(VM_SPECIAL_OBJECT_VMCORE));
 	ADD_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));
+	ADD_SEND(ret, line, id_core_undef_method, INT2FIX(2));
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -5007,7 +5191,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	VALUE iseqval =
 	    NEW_CHILD_ISEQVAL(
 		node->nd_body,
-		rb_sprintf("<class:%s>", rb_id2name(node->nd_cpath->nd_mid)),
+		rb_sprintf("<class:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)),
 		ISEQ_TYPE_CLASS, line);
 	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
 	int flags = VM_DEFINECLASS_TYPE_CLASS;
@@ -5025,7 +5209,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_MODULE:{
 	VALUE iseqval = NEW_CHILD_ISEQVAL(
 	    node->nd_body,
-	    rb_sprintf("<module:%s>", rb_id2name(node->nd_cpath->nd_mid)),
+	    rb_sprintf("<module:%"PRIsVALUE">", rb_id2str(node->nd_cpath->nd_mid)),
 	    ISEQ_TYPE_CLASS, line);
 
 	VALUE noscope = compile_cpath(ret, iseq, node->nd_cpath);
@@ -5093,8 +5277,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    /* 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));
+	    ADD_CALL(ret, line, node->nd_mid, INT2FIX(1));
 	}
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -5267,47 +5450,41 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	}
 	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;
+      case NODE_KW_ARG:
+	{
+	    LABEL *end_label = NEW_LABEL(nd_line(node));
+	    NODE *default_value = node->nd_body->nd_value;
+
+	    if (default_value == (NODE *)-1) {
+		/* required argument. do nothing */
+		rb_bug("unreachable");
+	    }
+	    else if (nd_type(default_value) == NODE_LIT ||
+		     nd_type(default_value) == NODE_NIL ||
+		     nd_type(default_value) == NODE_TRUE ||
+		     nd_type(default_value) == NODE_FALSE) {
+		rb_bug("unreachable");
+	    }
+	    else {
+		/* if keywordcheck(_kw_bits, nth_keyword)
+		 *   kw = default_value
+		 * end
+		 */
+		int kw_bits_idx = iseq->local_size - iseq->param.keyword->bits_start;
+		int keyword_idx = iseq->param.keyword->num;
+
+		ADD_INSN2(ret, line, checkkeyword, INT2FIX(kw_bits_idx), INT2FIX(keyword_idx));
+		ADD_INSNL(ret, line, branchif, end_label);
+		COMPILE_POPED(ret, "keyword default argument", node->nd_body);
+		ADD_LABEL(ret, end_label);
+	    }
 
-	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));
+	    ADD_SEND(ret, line, idIntern, INT2FIX(0));
 	}
 	else {
 	    ADD_INSN(ret, line, pop);
@@ -5317,15 +5494,18 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
       case NODE_ATTRASGN:{
 	DECL_ANCHOR(recv);
 	DECL_ANCHOR(args);
-	VALUE flag = 0;
+	unsigned int flag = 0;
 	VALUE argc;
+	int asgnflag;
 
 	/* optimization shortcut
 	 *   obj["literal"] = value -> opt_aset_with(obj, "literal", value)
 	 */
-	if (node->nd_mid == idASET && node->nd_recv != (NODE *)1 && node->nd_args &&
+	if (node->nd_mid == idASET && !private_recv_p(node) && node->nd_args &&
 	    nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 2 &&
-	    nd_type(node->nd_args->nd_head) == NODE_STR)
+	    nd_type(node->nd_args->nd_head) == NODE_STR &&
+	    iseq->compile_data->current_block == Qfalse &&
+	    iseq->compile_data->option->specialized_instruction)
 	{
 	    VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
 	    node->nd_args->nd_head->nd_lit = str;
@@ -5337,22 +5517,16 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		ADD_INSN1(ret, line, topn, INT2FIX(1));
 	    }
 	    ADD_INSN2(ret, line, opt_aset_with,
-		      new_callinfo(iseq, idASET, 2, 0, 0), str);
+		      new_callinfo(iseq, idASET, 2, 0, 0, NULL), str);
 	    ADD_INSN(ret, line, pop);
 	    break;
 	}
 
 	INIT_ANCHOR(recv);
 	INIT_ANCHOR(args);
-	argc = setup_args(iseq, args, node->nd_args, &flag);
+	argc = setup_args(iseq, args, node->nd_args, &flag, NULL);
 
-	if (node->nd_recv == (NODE *) 1) {
-	    flag |= VM_CALL_FCALL;
-	    ADD_INSN(recv, line, putself);
-	}
-	else {
-	    COMPILE(recv, "recv", node->nd_recv);
-	}
+	flag |= (asgnflag = COMPILE_RECV(recv, "recv", node));
 
 	debugp_param("argc", argc);
 	debugp_param("nd_mid", ID2SYM(node->nd_mid));
@@ -5366,7 +5540,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 		ADD_INSN1(ret, line, topn, INT2FIX(1));
 		if (flag & VM_CALL_ARGS_SPLAT) {
 		    ADD_INSN1(ret, line, putobject, INT2FIX(-1));
-		    ADD_SEND(ret, line, ID2SYM(idAREF), INT2FIX(1));
+		    ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag));
 		}
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 3));
 		ADD_INSN (ret, line, pop);
@@ -5374,7 +5548,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    else if (flag & VM_CALL_ARGS_SPLAT) {
 		ADD_INSN(ret, line, dup);
 		ADD_INSN1(ret, line, putobject, INT2FIX(-1));
-		ADD_SEND(ret, line, ID2SYM(idAREF), INT2FIX(1));
+		ADD_SEND_WITH_FLAG(ret, line, idAREF, INT2FIX(1), INT2FIX(asgnflag));
 		ADD_INSN1(ret, line, setn, FIXNUM_INC(argc, 2));
 		ADD_INSN (ret, line, pop);
 	    }
@@ -5386,7 +5560,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	    ADD_SEQ(ret, recv);
 	    ADD_SEQ(ret, args);
 	}
-	ADD_SEND_R(ret, line, ID2SYM(node->nd_mid), argc, 0, LONG2FIX(flag));
+	ADD_SEND_WITH_FLAG(ret, line, node->nd_mid, argc, INT2FIX(flag));
 	ADD_INSN(ret, line, pop);
 
 	break;
@@ -5401,7 +5575,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
 	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);
+	ADD_CALL_WITH_BLOCK(ret, line, idLambda, argc, block);
 
 	if (poped) {
 	    ADD_INSN(ret, line, pop);
@@ -5504,7 +5678,7 @@ insn_data_to_s_detail(INSN *iobj)
 		{
 		    struct rb_global_entry *entry = (struct rb_global_entry *)
 		      (OPERAND_AT(iobj, j) & (~1));
-		    rb_str_cat2(str, rb_id2name(entry->id));
+		    rb_str_append(str, rb_id2str(entry->id));
 		    break;
 		}
 	      case TS_IC:	/* inline cache */
@@ -5513,12 +5687,28 @@ insn_data_to_s_detail(INSN *iobj)
 	      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);
+		    rb_str_cat2(str, "<callinfo:");
+		    if (ci->mid)
+			rb_str_catf(str, "%"PRIsVALUE, rb_id2str(ci->mid));
+		    rb_str_catf(str, ", %d>", ci->orig_argc);
 		    break;
 		}
 	      case TS_CDHASH:	/* case/when condition cache */
 		rb_str_cat2(str, "<ch>");
 		break;
+	      case TS_FUNCPTR:
+		{
+		    rb_insn_func_t func = (rb_insn_func_t)OPERAND_AT(iobj, j);
+#ifdef HAVE_DLADDR
+		    Dl_info info;
+		    if (dladdr(func, &info) && info.dli_sname) {
+			rb_str_cat2(str, info.dli_sname);
+			break;
+		    }
+#endif
+		    rb_str_catf(str, "<%p>", func);
+		}
+		break;
 	      default:{
 		rb_raise(rb_eSyntaxError, "unknown operand type: %c", type);
 	      }
@@ -5651,9 +5841,9 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
 	VALUE v, type, eiseqval;
 	const VALUE *ptr;
 	LABEL *lstart, *lend, *lcont;
-	int sp;
+	unsigned int sp;
 
-	RB_GC_GUARD(v) = rb_convert_type(RARRAY_AREF(exception, i), T_ARRAY,
+	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");
@@ -5670,11 +5860,13 @@ iseq_build_from_ary_exception(rb_iseq_t *iseq, struct st_table *labels_table,
 	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]);
+	sp     = NUM2UINT(ptr[5]);
 
 	(void)sp;
 
 	ADD_CATCH_ENTRY(type, lstart, lend, eiseqval, lcont);
+
+	RB_GC_GUARD(v);
     }
     return COMPILE_OK;
 }
@@ -5710,6 +5902,44 @@ iseq_build_load_iseq(rb_iseq_t *iseq, VALUE op)
     return iseqval;
 }
 
+static VALUE
+iseq_build_callinfo_from_hash(rb_iseq_t *iseq, VALUE op)
+{
+    ID mid = 0;
+    int orig_argc = 0;
+    VALUE block = 0;
+    unsigned int flag = 0;
+    rb_call_info_kw_arg_t *kw_arg = 0;
+
+    if (!NIL_P(op)) {
+	VALUE vmid = rb_hash_aref(op, ID2SYM(rb_intern("mid")));
+	VALUE vflag = rb_hash_aref(op, ID2SYM(rb_intern("flag")));
+	VALUE vorig_argc = rb_hash_aref(op, ID2SYM(rb_intern("orig_argc")));
+	VALUE vblock = rb_hash_aref(op, ID2SYM(rb_intern("blockptr")));
+	VALUE vkw_arg = rb_hash_aref(op, ID2SYM(rb_intern("kw_arg")));
+
+	if (!NIL_P(vmid)) mid = SYM2ID(vmid);
+	if (!NIL_P(vflag)) flag = NUM2UINT(vflag);
+	if (!NIL_P(vorig_argc)) orig_argc = FIX2INT(vorig_argc);
+	if (!NIL_P(vblock)) block = iseq_build_load_iseq(iseq, vblock);
+
+	if (!NIL_P(vkw_arg)) {
+	    int i;
+	    int len = RARRAY_LENINT(vkw_arg);
+	    size_t n = sizeof(rb_call_info_kw_arg_t) + sizeof(VALUE) * (len - 1);
+
+	    kw_arg = xmalloc(n);
+	    kw_arg->keyword_len = len;
+	    for (i = 0; i < len; i++) {
+		VALUE kw = RARRAY_AREF(vkw_arg, i);
+		SYM2ID(kw);	/* make immortal */
+		kw_arg->keywords[i] = kw;
+	    }
+	}
+    }
+
+    return (VALUE)new_callinfo(iseq, mid, orig_argc, block, flag, kw_arg);
+}
 static int
 iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 		VALUE body, struct st_table *labels_table)
@@ -5748,9 +5978,9 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 	    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));
+				 "unknown instruction: %"PRIsVALUE,
+				 rb_inspect(insn));
 	    }
 
 	    if (argc != insn_len((VALUE)insn_id)-1) {
@@ -5798,25 +6028,7 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 			}
 			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("blockptr")));
-
-				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);
-			}
+			argv[j] = iseq_build_callinfo_from_hash(iseq, op);
 			break;
 		      case TS_ID:
 			argv[j] = rb_convert_type(op, T_SYMBOL,
@@ -5825,16 +6037,31 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 		      case TS_CDHASH:
 			{
 			    int i;
+			    VALUE map = rb_hash_new();
+
+			    rb_hash_tbl_raw(map)->type = &cdhash_type;
 			    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);
+				VALUE key = RARRAY_AREF(op, i);
+				VALUE sym = RARRAY_AREF(op, i+1);
 				LABEL *label =
 				  register_label(iseq, labels_table, sym);
-				rb_ary_store(op, i+1, (VALUE)label | 1);
+				rb_hash_aset(map, key, (VALUE)label | 1);
 			    }
-			    argv[j] = op;
-			    iseq_add_mark_object_compile_time(iseq, op);
+			    RB_GC_GUARD(op);
+			    argv[j] = map;
+			    rb_iseq_add_mark_object(iseq, map);
+			}
+			break;
+		      case TS_FUNCPTR:
+			{
+#if SIZEOF_VALUE <= SIZEOF_LONG
+			    long funcptr = NUM2LONG(op);
+#else
+			    LONG_LONG funcptr = NUM2LL(op);
+#endif
+			    argv[j] = (VALUE)funcptr;
 			}
 			break;
 		      default:
@@ -5857,74 +6084,178 @@ iseq_build_from_ary_body(rb_iseq_t *iseq, LINK_ANCHOR *anchor,
 }
 
 #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;}
+
+static int
+int_param(int *dst, VALUE param, VALUE sym)
+{
+    VALUE val = rb_hash_aref(param, sym);
+    switch (TYPE(val)) {
+      case T_NIL:
+	return FALSE;
+      case T_FIXNUM:
+	*dst = FIX2INT(val);
+	return TRUE;
+      default:
+	rb_raise(rb_eTypeError, "invalid %+"PRIsVALUE" Fixnum: %+"PRIsVALUE,
+		 sym, val);
+    }
+    return FALSE;
+}
+
+static void
+iseq_build_kw(rb_iseq_t *iseq, VALUE params, VALUE keywords)
+{
+    int i, j;
+    int len = RARRAY_LENINT(keywords);
+    int default_len;
+    VALUE key, sym, default_val;
+
+    iseq->param.flags.has_kw = TRUE;
+
+    iseq->param.keyword = ZALLOC(struct rb_iseq_param_keyword);
+    iseq->param.keyword->num = len;
+#define SYM(s) ID2SYM(rb_intern(#s))
+    (void)int_param(&iseq->param.keyword->bits_start, params, SYM(kwbits));
+    i = iseq->param.keyword->bits_start - iseq->param.keyword->num;
+    iseq->param.keyword->table = &iseq->local_table[i];
+#undef SYM
+
+    /* required args */
+    for (i = 0; i < len; i++) {
+	VALUE val = RARRAY_AREF(keywords, i);
+
+	if (!SYMBOL_P(val)) {
+	    goto default_values;
+	}
+	iseq->param.keyword->table[i] = SYM2ID(val);
+	iseq->param.keyword->required_num++;
+    }
+
+default_values: /* note: we intentionally preserve `i' from previous loop */
+    default_len = len - i;
+    if (default_len == 0) {
+	return;
+    }
+
+    iseq->param.keyword->default_values = ALLOC_N(VALUE, default_len);
+
+    for (j = 0; i < len; i++, j++) {
+	key = RARRAY_AREF(keywords, i);
+	CHECK_ARRAY(key);
+
+	switch (RARRAY_LEN(key)) {
+	  case 1:
+	    sym = RARRAY_AREF(key, 0);
+	    default_val = Qundef;
+	    break;
+	  case 2:
+	    sym = RARRAY_AREF(key, 0);
+	    default_val = RARRAY_AREF(key, 1);
+	    break;
+	  default:
+	    rb_raise(rb_eTypeError,
+		     "keyword default has unsupported len %+"PRIsVALUE,
+		     key);
+	}
+	iseq->param.keyword->table[i] = SYM2ID(sym);
+	iseq->param.keyword->default_values[j] = default_val;
+    }
+}
 
 VALUE
-rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE locals, VALUE args,
+rb_iseq_build_from_ary(rb_iseq_t *iseq, VALUE misc, VALUE locals, VALUE params,
 			 VALUE exception, VALUE body)
 {
-    int i;
+#define SYM(s) ID2SYM(rb_intern(#s))
+    int i, len;
     ID *tbl;
     struct st_table *labels_table = st_init_numtable();
+    VALUE arg_opt_labels = rb_hash_aref(params, SYM(opt));
+    VALUE keywords = rb_hash_aref(params, SYM(keyword));
+    VALUE sym_arg_rest = ID2SYM(rb_intern("#arg_rest"));
     DECL_ANCHOR(anchor);
     INIT_ANCHOR(anchor);
 
-    iseq->local_table_size = RARRAY_LENINT(locals);
+    len = RARRAY_LENINT(locals);
+    iseq->local_table_size = len;
     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++) {
+    for (i = 0; i < len; 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;
+	if (sym_arg_rest == lv) {
+	    tbl[i] = 0;
 	}
 	else {
-	    iseq->arg_size = iseq->argc + (iseq->arg_opts ? iseq->arg_opts - 1 : 0);
+	    tbl[i] = FIXNUM_P(lv) ? (ID)FIX2LONG(lv) : SYM2ID(CHECK_SYMBOL(lv));
 	}
+    }
+
+    /*
+     * we currently ignore misc params,
+     * local_size, stack_size and param.size are all calculated
+     */
+
+#define INT_PARAM(F) int_param(&iseq->param.F, params, SYM(F))
+    if (INT_PARAM(lead_num)) {
+	iseq->param.flags.has_lead = TRUE;
+    }
+    if (INT_PARAM(post_num)) iseq->param.flags.has_post = TRUE;
+    if (INT_PARAM(post_start)) iseq->param.flags.has_post = TRUE;
+    if (INT_PARAM(rest_start)) iseq->param.flags.has_rest = TRUE;
+    if (INT_PARAM(block_start)) iseq->param.flags.has_block = TRUE;
+#undef INT_PARAM
+
+    switch (TYPE(arg_opt_labels)) {
+      case T_ARRAY:
+	len = RARRAY_LENINT(arg_opt_labels);
+	iseq->param.flags.has_opt = !!(len - 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));
+	if (iseq->param.flags.has_opt) {
+	    iseq->param.opt_num = len - 1;
+	    iseq->param.opt_table = (VALUE *)ALLOC_N(VALUE, len);
+
+	    for (i = 0; i < len; i++) {
+		VALUE ent = RARRAY_AREF(arg_opt_labels, i);
+		LABEL *label = register_label(iseq, labels_table, ent);
+
+		iseq->param.opt_table[i] = (VALUE)label;
+	    }
 	}
+      case T_NIL:
+	break;
+      default:
+	rb_raise(rb_eTypeError, ":opt param is not an array: %+"PRIsVALUE,
+		 arg_opt_labels);
+    }
+
+    switch (TYPE(keywords)) {
+      case T_ARRAY:
+	iseq_build_kw(iseq, params, keywords);
+      case T_NIL:
+	break;
+      default:
+	rb_raise(rb_eTypeError, ":keywords param is not an array: %+"PRIsVALUE,
+		 keywords);
+    }
 
-	iseq->arg_simple = NUM2INT(arg_simple);
+    if (Qtrue == rb_hash_aref(params, SYM(ambiguous_param0))) {
+	iseq->param.flags.ambiguous_param0 = TRUE;
     }
 
+    if (int_param(&i, params, SYM(kwrest))) {
+        if (!iseq->param.keyword) {
+          iseq->param.keyword = ZALLOC(struct rb_iseq_param_keyword);
+        }
+        iseq->param.keyword->rest_start = i;
+        iseq->param.flags.has_kwrest = TRUE;
+
+    }
+#undef SYM
+    iseq_calc_param_size(iseq);
+
     /* exception */
     iseq_build_from_ary_exception(iseq, labels_table, exception);
 
@@ -5990,3 +6321,95 @@ rb_parse_in_main(void)
 {
     return GET_THREAD()->parse_in_eval < 0;
 }
+
+static int
+caller_location(VALUE *path, VALUE *absolute_path)
+{
+    const rb_thread_t *const th = GET_THREAD();
+    const rb_control_frame_t *const cfp =
+	rb_vm_get_ruby_level_next_cfp(th, th->cfp);
+
+    if (cfp) {
+	int line = rb_vm_get_sourceline(cfp);
+	*path = cfp->iseq->location.path;
+	*absolute_path = cfp->iseq->location.absolute_path;
+	return line;
+    }
+    else {
+	*path = rb_str_new2("<compiled>");
+	*absolute_path = *path;
+	return 1;
+    }
+}
+
+typedef struct {
+    VALUE arg;
+    rb_insn_func_t func;
+    int line;
+} accessor_args;
+
+static VALUE
+method_for_self(VALUE name, VALUE arg, rb_insn_func_t func,
+		VALUE (*build)(rb_iseq_t *, LINK_ANCHOR *, VALUE))
+{
+    VALUE path, absolute_path;
+    accessor_args acc;
+
+    acc.arg = arg;
+    acc.func = func;
+    acc.line = caller_location(&path, &absolute_path);
+    return rb_iseq_new_with_opt(NEW_IFUNC(build, (VALUE)&acc),
+				rb_sym2str(name), path, absolute_path,
+				INT2FIX(acc.line), 0, ISEQ_TYPE_METHOD, 0);
+}
+
+static VALUE
+for_self_aref(rb_iseq_t *iseq, LINK_ANCHOR *ret, VALUE a)
+{
+    const accessor_args *const args = (void *)a;
+    const int line = args->line;
+
+    iseq_set_local_table(iseq, 0);
+    iseq->param.lead_num = 0;
+    iseq->param.size = 0;
+
+    ADD_INSN1(ret, line, putobject, args->arg);
+    ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func);
+    return Qnil;
+}
+
+static VALUE
+for_self_aset(rb_iseq_t *iseq, LINK_ANCHOR *ret, VALUE a)
+{
+    const accessor_args *const args = (void *)a;
+    const int line = args->line;
+    static const ID vars[] = {1, idUScore};
+
+    iseq_set_local_table(iseq, vars);
+    iseq->param.lead_num = 1;
+    iseq->param.size = 1;
+
+    ADD_INSN2(ret, line, getlocal, INT2FIX(numberof(vars)-0), INT2FIX(0));
+    ADD_INSN1(ret, line, putobject, args->arg);
+    ADD_INSN1(ret, line, opt_call_c_function, (VALUE)args->func);
+    ADD_INSN(ret, line, pop);
+    return Qnil;
+}
+
+/*
+ * func (index) -> (value)
+ */
+VALUE
+rb_method_for_self_aref(VALUE name, VALUE arg, rb_insn_func_t func)
+{
+    return method_for_self(name, arg, func, for_self_aref);
+}
+
+/*
+ * func (index, value) -> (index, value)
+ */
+VALUE
+rb_method_for_self_aset(VALUE name, VALUE arg, rb_insn_func_t func)
+{
+    return method_for_self(name, arg, func, for_self_aset);
+}
diff --git a/complex.c b/complex.c
index 3e9d63117a..4548c5e2a5 100644
--- a/complex.c
+++ b/complex.c
@@ -5,7 +5,6 @@
   which is written in ruby.
 */
 
-#include "ruby.h"
 #include "internal.h"
 #include <math.h>
 
@@ -18,10 +17,10 @@
 
 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,
+static ID id_abs, id_arg, id_convert,
+    id_denominator, id_eqeq_p, id_expt, id_fdiv,
+    id_negate, id_numerator, id_quo,
+    id_real_p, id_to_f, id_to_i, id_to_r,
     id_i_real, id_i_imag;
 
 #define f_boolcast(x) ((x) ? Qtrue : Qfalse)
@@ -76,20 +75,6 @@ f_add(VALUE x, VALUE 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)
@@ -106,16 +91,6 @@ f_gt_p(VALUE x, VALUE 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
@@ -152,16 +127,10 @@ f_sub(VALUE x, VALUE 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
@@ -180,9 +149,6 @@ f_to_f(VALUE x)
 }
 
 fun1(to_r)
-fun1(to_s)
-
-fun2(divmod)
 
 inline static VALUE
 f_eqeq_p(VALUE x, VALUE y)
@@ -194,7 +160,6 @@ f_eqeq_p(VALUE x, VALUE y)
 
 fun2(expt)
 fun2(fdiv)
-fun2(idiv)
 fun2(quo)
 
 inline static VALUE
@@ -258,12 +223,6 @@ k_numeric_p(VALUE x)
 }
 
 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);
@@ -457,13 +416,6 @@ nucomp_s_new(int argc, VALUE *argv, VALUE klass)
 }
 
 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));
@@ -478,6 +430,8 @@ f_complex_new2(VALUE klass, VALUE x, VALUE y)
  *
  *    Complex(1, 2)    #=> (1+2i)
  *    Complex('1+2i')  #=> (1+2i)
+ *    Complex(nil)     #=> TypeError
+ *    Complex(1, nil)  #=> TypeError
  *
  * Syntax of string form:
  *
@@ -537,7 +491,6 @@ m_log_bang(VALUE x)
 
 imp1(sin)
 imp1(sinh)
-imp1(sqrt)
 
 static VALUE
 m_cos(VALUE x)
@@ -570,6 +523,8 @@ m_sin(VALUE x)
 }
 
 #if 0
+imp1(sqrt)
+
 static VALUE
 m_sqrt(VALUE x)
 {
@@ -1285,7 +1240,7 @@ f_format(VALUE self, VALUE (*func)(VALUE))
 static VALUE
 nucomp_to_s(VALUE self)
 {
-    return f_format(self, f_to_s);
+    return f_format(self, rb_String);
 }
 
 /*
@@ -1306,7 +1261,7 @@ nucomp_inspect(VALUE self)
     VALUE s;
 
     s = rb_usascii_str_new2("(");
-    rb_str_concat(s, f_format(self, f_inspect));
+    rb_str_concat(s, f_format(self, rb_inspect));
     rb_str_cat2(s, ")");
 
     return s;
@@ -1386,6 +1341,20 @@ rb_Complex(VALUE x, VALUE y)
     return nucomp_s_convert(2, a, rb_cComplex);
 }
 
+VALUE
+rb_complex_set_real(VALUE cmp, VALUE r)
+{
+    RCOMPLEX_SET_REAL(cmp, r);
+    return cmp;
+}
+
+VALUE
+rb_complex_set_imag(VALUE cmp, VALUE i)
+{
+    RCOMPLEX_SET_IMAG(cmp, i);
+    return cmp;
+}
+
 /*
  * call-seq:
  *    cmp.to_i  ->  integer
@@ -1403,9 +1372,8 @@ 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));
+	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Integer",
+		 self);
     }
     return f_to_i(dat->real);
 }
@@ -1427,9 +1395,8 @@ 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));
+	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Float",
+		 self);
     }
     return f_to_f(dat->real);
 }
@@ -1453,9 +1420,8 @@ 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));
+	rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
+		 self);
     }
     return f_to_r(dat->real);
 }
@@ -1481,9 +1447,8 @@ nucomp_rationalize(int argc, VALUE *argv, VALUE 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));
+       rb_raise(rb_eRangeError, "can't convert %"PRIsVALUE" into Rational",
+                self);
     }
     return rb_funcall2(dat->real, rb_intern("rationalize"), argc, argv);
 }
@@ -1668,8 +1633,6 @@ isimagunit(int c)
 	    c == 'j' || c == 'J');
 }
 
-VALUE rb_cstr_to_rat(const char *, int);
-
 static VALUE
 str2num(char *s)
 {
@@ -1774,19 +1737,26 @@ parse_comp(const char *s, int strict,
 	   VALUE *num)
 {
     char *buf, *b;
+    VALUE tmp;
+    int ret = 1;
 
-    buf = ALLOCA_N(char, strlen(s) + 1);
+    buf = ALLOCV_N(char, tmp, strlen(s) + 1);
     b = buf;
 
     skip_ws(&s);
-    if (!read_comp(&s, strict, num, &b))
-	return 0;
-    skip_ws(&s);
+    if (!read_comp(&s, strict, num, &b)) {
+	ret = 0;
+    }
+    else {
+	skip_ws(&s);
 
-    if (strict)
-	if (*s != '\0')
-	    return 0;
-    return 1;
+	if (strict)
+	    if (*s != '\0')
+		ret = 0;
+    }
+    ALLOCV_END(tmp);
+
+    return ret;
 }
 
 static VALUE
@@ -1812,9 +1782,8 @@ string_to_c_strict(VALUE self)
 	s = (char *)"";
 
     if (!parse_comp(s, 1, &num)) {
-	VALUE ins = f_inspect(self);
-	rb_raise(rb_eArgError, "invalid value for convert(): %s",
-		 StringValuePtr(ins));
+	rb_raise(rb_eArgError, "invalid value for convert(): %+"PRIsVALUE,
+		 self);
     }
 
     return num;
@@ -2091,29 +2060,19 @@ Init_Complex(void)
     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 */
 
@@ -2205,7 +2164,7 @@ Init_Complex(void)
     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);
+    compat = rb_define_class_under(rb_cComplex, "compatible", rb_cObject); /* :nodoc: */
     rb_define_private_method(compat, "marshal_load", nucomp_marshal_load, 1);
     rb_marshal_define_compat(rb_cComplex, compat, nucomp_dumper, nucomp_loader);
 
@@ -2247,6 +2206,8 @@ Init_Complex(void)
      */
     rb_define_const(rb_cComplex, "I",
 		    f_complex_new_bang2(rb_cComplex, ZERO, ONE));
+
+    rb_provide("complex.so");	/* for backward compatibility */
 }
 
 /*
diff --git a/configure.in b/configure.in
index d1ed8b26d4..0470d5cc0a 100644
--- a/configure.in
+++ b/configure.in
@@ -45,15 +45,14 @@ 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
+    $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub
+    HAVE_BASERUBY=yes
 else
     BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
+    HAVE_BASERUBY=no
 fi
 AC_SUBST(BASERUBY)
-
-for conf in config.guess config.sub; do
-    test -f "$srcdir/tool/$conf" && continue
-    $BASERUBY -C "$srcdir/tool" get-config_files $conf
-done
+AC_SUBST(HAVE_BASERUBY)
 
 AC_DEFUN([RUBY_MINGW32],
 [AS_CASE(["$host_os"],
@@ -99,8 +98,15 @@ AC_DEFUN([RUBY_NACL],
                        [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(["$target_cpu"],
+          [x86_64], [nacl_cv_cpu_nick=x86
+                     nacl_cv_cpu_nick2=x86_64],
+          [i?86], [nacl_cv_cpu_nick=x86
+                   nacl_cv_cpu_nick2=x86_32],
+          [le32], [nacl_cv_cpu_nick=pnacl
+                   nacl_cv_cpu_nick2=pnacl
+                   ac_cv_exeext=.pexe],
+          [nacl_cv_cpu_nick=$target_cpu])
   AS_CASE(["$build_os"],
           [linux*], [nacl_cv_os_nick=linux],
           [darwin*], [nacl_cv_os_nick=mac],
@@ -111,9 +117,15 @@ AC_DEFUN([RUBY_NACL],
   ac_tool_prefix="$host_cpu-nacl-"
 
   AC_MSG_CHECKING([NativeClient toolchain])
-  if test -d \
+  if test x"$nacl_cv_cpu_nick" = xpnacl; then
+    NACL_TOOLCHAIN="${nacl_cv_os_nick}_pnacl"
+    ac_tool_prefix=pnacl-
+  elif test -d \
     "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"; then
     NACL_TOOLCHAIN="${nacl_cv_os_nick}_${nacl_cv_cpu_nick}_${nacl_cv_build_variant}"
+  elif test -d \
+    "${NACL_SDK_ROOT}/toolchain/${nacl_cv_os_nick}_x86_${nacl_cv_cpu_nick}/${nacl_cv_build_variant}"; then
+    NACL_TOOLCHAIN="${nacl_cv_os_nick}_x86_${nacl_cv_cpu_nick}/${nacl_cv_build_variant}"
   else
     AS_CASE(
       ["${nacl_cv_build_variant}"],
@@ -141,10 +153,32 @@ AC_DEFUN([RUBY_NACL],
   if ! echo -- "${PATH}" | grep -F "${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin" > /dev/null; then
     PATH="${PATH}:${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin"
   fi
+  AC_MSG_RESULT(${NACL_SDK_ROOT}/toolchain/${NACL_TOOLCHAIN}/bin)
+
+  RUBY_APPEND_OPTIONS(XCFLAGS, '-I$(NACL_SDK_ROOT)/include')
+  if test x"${nacl_cv_cpu_nick}" = xpnacl; then
+    RUBY_APPEND_OPTIONS(XCFLAGS, '-isystem $(NACL_SDK_ROOT)/include/pnacl')
+  elif test x"${nacl_cv_build_variant}" = xnewlib; then
+    RUBY_APPEND_OPTIONS(XCFLAGS, '-isystem $(NACL_SDK_ROOT)/include/newlib')
+  fi
+
+  AC_MSG_CHECKING([nacl library path])
+  if test -d "${NACL_SDK_ROOT}/lib/${nacl_cv_build_variant}_${nacl_cv_cpu_nick2}/Release"; then
+    nacl_cv_libpath="${nacl_cv_build_variant}_${nacl_cv_cpu_nick2}"
+  elif test -d "${NACL_SDK_ROOT}/lib/${nacl_cv_cpu_nick2}/Release"; then
+    nacl_cv_libpath="${nacl_cv_cpu_nick2}"
+  else
+    AC_MSG_ERROR([not found])
+  fi
+  AC_MSG_RESULT([${nacl_cv_libpath}])
+  RUBY_APPEND_OPTIONS(XLDFLAGS, '-L$(NACL_SDK_ROOT)/'"lib/${nacl_cv_libpath}/Release")
 
   AC_SUBST(NACL_TOOLCHAIN)
   AC_SUBST(NACL_SDK_ROOT)
-  AC_SUBST(NACL_SDK_VARIANT, nacl_cv_build_variant)
+  AC_SUBST(NACL_SDK_VARIANT, "${nacl_cv_build_variant}")
+  AC_SUBST(NACL_LIB_PATH, "${nacl_cv_libpath}")
+  AC_CHECK_TOOLS(CC, [clang gcc])
+  AC_CHECK_TOOLS(CXX, [clang++ g++])
 ])])
 
 AC_DEFUN([RUBY_NACL_CHECK_PEPPER_TYPES],
@@ -197,8 +231,6 @@ 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
@@ -231,6 +263,9 @@ test -z "$CXX" || ac_cv_prog_CXX="$CXX"
 if test "$program_prefix" = NONE; then
   program_prefix=
 fi
+if test "$prefix" -ef .; then
+  AC_MSG_ERROR(--prefix cannot be the current working directory.)
+fi
 RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"`
 RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"`
 AC_SUBST(RUBY_BASE_NAME)
@@ -242,14 +277,21 @@ 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.
 
-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=$withval],
+	[os_version_style=full
+	    AS_CASE($target_os, [[*[0-9].*]],
+		[AS_CASE([`/usr/bin/ruby -e 'puts RUBY_PLATFORM' 2>/dev/null`],
+		    [[*-*[0-9].*.0]], [os_version_style=minor+0],
+		    [[*-*[0-9].*.*]], [os_version_style=full],
+		    [[*-*[0-9].0]  ], [os_version_style=major+0],
+		    [[*-*[0-9].*]  ], [os_version_style=minor],
+		    [[*-*[0-9]]    ], [os_version_style=major],
+		)])
+	])
 os_version_style_transform=
 AS_CASE("${os_version_style}",
 	[full|teeny], [],
@@ -308,9 +350,11 @@ AC_MSG_RESULT([$ARCH_FLAG])
 
 AC_DEFUN([RUBY_UNIVERSAL_ARCH], [
 # RUBY_UNIVERSAL_ARCH begin
+ARCH_FLAG=`expr " $CXXFLAGS " : ['.* \(-m[0-9][0-9]*\) ']`
+test ${CXXFLAGS+set} && CXXFLAGS=`echo "$CXXFLAGS" | sed [-e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g']`
 ARCH_FLAG=`expr " $CFLAGS " : ['.* \(-m[0-9][0-9]*\) ']`
-test ${CFLAGS+set} && CFLAGS=`echo "$CFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
-test ${LDFLAGS+set} && LDFLAGS=`echo "$LDFLAGS" | sed -e 's/ *-arch  *[^ ]*//g' -e 's/ *-m32//g' -e 's/ *-m64//g'`
+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])
@@ -423,7 +467,7 @@ fi
 RUBY_NACL
 AS_CASE(["$host_os:$build_os"],
 [darwin*:darwin*], [
-    AC_CHECK_TOOLS(CC, [gcc-4.2 clang gcc cc])
+    AC_CHECK_TOOLS(CC, [clang gcc cc])
     # Following Apple deployed clang are broken
     # clang version 1.0 (http://llvm.org/svn/llvm-project/cfe/tags/Apple/clang-23 exported)
     # Apple clang version 2.0 (tags/Apple/clang-137) (based on LLVM 2.9svn)
@@ -453,7 +497,9 @@ if test "$GCC" = yes; then
     linker_flag=-Wl,
     : ${optflags=-O3}
     gcc_major=`echo =__GNUC__ | $CC -E -xc - | sed '/^=/!d;s///'`
+    gcc_minor=`echo =__GNUC_MINOR__ | $CC -E -xc - | sed '/^=/!d;s///'`
     test -n "$gcc_major" || gcc_major=0
+    test -n "$gcc_minor" || gcc_minor=0
     # RUBY_APPEND_OPTIONS(XCFLAGS, ["-include ruby/config.h" "-include ruby/missing.h"])
 else
     linker_flag=
@@ -597,9 +643,11 @@ _PROBES
     int main(void){ CONFTEST_FIRE(); return 0; }
 _CONF
     $CC $CFLAGS $CPPFLAGS -c -o conftest.o conftest.c &&
+    cp -p conftest.o conftest.oo &&
     $DTRACE -G -s conftest_provider.d conftest.o 2>/dev/null
   }; then
     rb_cv_prog_dtrace_g=yes
+    cmp -b conftest.o conftest.oo || rb_cv_prog_dtrace_g=rebuild
   else
     rb_cv_prog_dtrace_g=no
   fi
@@ -684,16 +732,25 @@ RUBY_WERROR_FLAG([
 	]
     )
     AC_MSG_CHECKING([whether LDFLAGS is valid])
+    {
+	mkdir tmp.$$.try_link &&
+	cd tmp.$$.try_link &&
+	cp ../confdefs.h . &&
+	echo '<?xml?><plist><dict><key>CFBundleIdentifier</key><string></string></dict></plist>' > Info.plist &&
+	:
+    } || AC_MSG_ERROR([faild to make temporary directory])
     AC_TRY_LINK([], [],
 	[AC_MSG_RESULT(yes)],
 	[
+	cd .. && rm -fr tmp.$$.try_link
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR([something wrong with LDFLAGS="$LDFLAGS"])
 	]
     )
+    cd .. && rm -fr tmp.$$.try_link
 ])
 
-AC_DEFUN(RUBY_TRY_CFLAGS, [
+AC_DEFUN([RUBY_TRY_CFLAGS], [
     AC_MSG_CHECKING([whether ]$1[ is accepted as CFLAGS])
     RUBY_WERROR_FLAG([
     CFLAGS="[$]CFLAGS $1"
@@ -705,7 +762,7 @@ AC_DEFUN(RUBY_TRY_CFLAGS, [
     ])
 ])
 
-AC_DEFUN(RUBY_TRY_LDFLAGS, [
+AC_DEFUN([RUBY_TRY_LDFLAGS], [
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="[$]LDFLAGS $1"
     AC_MSG_CHECKING([whether $1 is accepted as LDFLAGS])
@@ -746,6 +803,7 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
 		 -Werror=implicit-function-declaration \
 		 -Werror=division-by-zero \
 		 -Werror=deprecated-declarations \
+		 -Wno-packed-bitfield-compat \
 		 $extra_warning \
 		 ; do
 	if test "$particular_werror_flags" != yes; then
@@ -771,13 +829,19 @@ if test "$GCC:${warnflags+set}:no" = yes::no; then
     rb_cv_warnflags="$warnflags"
     warnflags=
 fi
+RUBY_TRY_CFLAGS(-Qunused-arguments, [RUBY_APPEND_OPTIONS(rb_cv_wsuppress_flags, -Qunused-arguments)])
+
 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)])
+    # NaCl's glibc build generates undefined references to __memset_chk.
+    # TODO(sbc): Remove this once NaCl's glibc is fixed.
+    AS_CASE(["$target_os"], [nacl], [], [
+      # -D_FORTIFY_SOURCE
+      # When defined _FORTIFY_SOURCE, glibc enables some additional sanity
+      # argument check. The performance drop is very little and Ubuntu enables
+      # _FORTIFY_SOURCE=2 by default. So, let's support it for protecting us from
+      # a mistake of silly C extensions.
+      RUBY_TRY_CFLAGS(-D_FORTIFY_SOURCE=2, [RUBY_APPEND_OPTION(XCFLAGS, -D_FORTIFY_SOURCE=2)])
+   ])
 
     # -fstack-protector
     AS_CASE(["$target_os"],
@@ -803,7 +867,7 @@ if test "$GCC" = yes; then
       # comments.   We  bypass  ANSI   C  mode  for  them.   Otherwise
       # extension libs cannot include those headers.
     ],
-    [cygwin*|darwin*|netbsd*], [
+    [cygwin*|darwin*|netbsd*|nacl], [
       # need lgamma_r(), finite()
     ],
     [haiku], [
@@ -816,7 +880,7 @@ if test "$GCC" = yes; then
 	for ansi_options in -std=iso9899:1999 "-ansi -std=iso9899:199409"; do
 	    RUBY_TRY_CFLAGS(${ansi_options}, [
 		RUBY_APPEND_OPTIONS(warnflags, ${ansi_options})
-	  	RUBY_APPEND_OPTIONS(strict_warnflags, ${ansi_options})
+		RUBY_APPEND_OPTIONS(strict_warnflags, ${ansi_options})
 	    ], [ansi_options=])
 	    test "x${ansi_options}" = x || break
 	done
@@ -860,22 +924,6 @@ if test "$GCC" = yes; then
     for oflag in -fno-fast-math; do
 	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
     done
-    AS_CASE(["$target"],
-	[*-darwin*], [
-	    # doesn't seem necessary on Mac OS X
-	],
-	[[i[4-6]86*]], [
-	    RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [
-		RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse)
-	    ])
-            AS_CASE(["$XCFLAGS"],
-                [[*-msse2*]], [
-                    RUBY_TRY_CFLAGS(-mstackrealign, [
-                        RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign)
-                    ])
-                ])
-	]
-    )
 fi
 
 AC_ARG_WITH(opt-dir,
@@ -950,7 +998,8 @@ AS_CASE(["$target_os"],
 		    [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
+		    ac_cv_func_getcontext=no
+		    ac_cv_func_setcontext=no
 		else
 		    AC_DEFINE(BROKEN_SETREUID, 1)
 		    AC_DEFINE(BROKEN_SETREGID, 1)
@@ -958,6 +1007,10 @@ AS_CASE(["$target_os"],
 		ac_cv_type_getgroups=gid_t # getgroups() on Rosetta fills garbage
 		ac_cv_lib_crypt_crypt=no
 		ac_cv_func_fdatasync=no # Mac OS X wrongly reports it has fdatasync()
+		ac_cv_func_vfork=no
+		if test $gcc_major -lt 4 -o \( $gcc_major -eq 4 -a $gcc_minor -lt 3 \); then
+		    ac_cv_func___builtin_setjmp=no
+		fi
                 AC_CACHE_CHECK(for broken crypt with 8bit chars, rb_cv_broken_crypt,
                     [AC_TRY_RUN([
 #include <stdio.h>
@@ -1049,9 +1102,10 @@ main()
                 ac_cv_func_clock_gettime=yes
                 ac_cv_func_clock_getres=yes
 		ac_cv_func_malloc_usable_size=no
+		{ test "$target_cpu" = x64 && ac_cv_func___builtin_setjmp=no; }
 		AC_CHECK_TYPE([NET_LUID], [], [],
-			      [@%:@include <windows.h>
-		  	      @%:@include <iphlpapi.h>])
+			      [@%:@include <winsock2.h>
+			      @%:@include <iphlpapi.h>])
 		if test x"$ac_cv_type_NET_LUID" = xyes; then
 		    AC_DEFINE(HAVE_TYPE_NET_LUID, 1)
 		fi
@@ -1070,21 +1124,23 @@ main()
 		ac_cv_func_shutdown=no
 		ac_cv_func_close=no
 		],
+[netbsd*], [	LIBS="-lm $LIBS"
+		],
 [dragonfly*], [	LIBS="-lm $LIBS"
 		# isinf() and isnan() are macros on DragonFly.
 		ac_cv_func_isinf=yes
 		ac_cv_func_isnan=yes
 		],
+[aix*],[	LIBS="-lm $LIBS"
+		ac_cv_func_round=no
+		],
 [nacl], [
   LIBS="-lm $LIBS"
   if test "${nacl_cv_build_variant}" = "newlib"; then
     RUBY_APPEND_OPTION(CPPFLAGS, -DNACL_NEWLIB)
-    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"])
 
@@ -1105,10 +1161,10 @@ AC_CHECK_HEADERS( \
   sys/syscall.h \
   fcntl.h \
   sys/fcntl.h \
+  sys/param.h \
   sys/select.h \
   sys/time.h \
   sys/times.h \
-  sys/param.h \
   syscall.h \
   pwd.h \
   grp.h \
@@ -1135,7 +1191,9 @@ AC_CHECK_HEADERS( \
   malloc.h \
   malloc_np.h \
   malloc/malloc.h \
-  setjmpex.h
+  setjmpex.h \
+  sys/attr.h \
+  sys/id.h
 )
 
 AC_ARG_WITH([gmp],
@@ -1150,6 +1208,38 @@ AS_IF([test "x$with_gmp" != xno],
    with_gmp="$ac_cv_lib_gmp___gmpz_init"
    AS_IF([test -z "$with_gmp"], [with_gmp=no])])
 
+AC_ARG_WITH([jemalloc],
+  [AS_HELP_STRING([--with-jemalloc],[use jemalloc allocator])],
+  [with_jemalloc=$withval], [with_jemalloc=no])
+AS_IF([test "x$with_jemalloc" = xyes],[
+  AC_CHECK_LIB([jemalloc], [malloc_conf], [], [with_jemalloc=no])
+  AC_CHECK_HEADER(jemalloc/jemalloc.h, [
+    AC_DEFINE(RUBY_ALTERNATIVE_MALLOC_HEADER, [<jemalloc/jemalloc.h>])
+  ])
+  AS_IF([test "x$with_jemalloc" = xno], [
+    AC_CACHE_CHECK([for jemalloc with JEMALLOC_MANGLE], rb_cv_jemalloc_demangle,
+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([@%:@define JEMALLOC_MANGLE 1
+      @%:@ifdef RUBY_ALTERNATIVE_MALLOC_HEADER
+      @%:@include RUBY_ALTERNATIVE_MALLOC_HEADER
+      @%:@else
+      @%:@include <jemalloc.h>
+      @%:@endif], [return !&malloc_conf])],
+      [rb_cv_jemalloc_demangle=yes],
+      [rb_cv_jemalloc_demangle=no])
+    ])
+  ])
+  AS_IF([test "x$rb_cv_jemalloc_demangle" = xyes], [
+    AC_DEFINE(JEMALLOC_MANGLE)
+    with_jemalloc=yes
+  ])
+  AS_IF([test "x$with_jemalloc" = xyes],
+    [
+      ac_cv_func_malloc_usable_size=yes
+    ],
+    [AC_MSG_ERROR([jemalloc requested but not found])
+  ])
+])
+
 dnl check for large file stuff
 mv confdefs.h confdefs1.h
 : > confdefs.h
@@ -1158,13 +1248,25 @@ 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])
+AS_CASE(["$target_os"],
+    [mingw*], [ac_cv_type_off_t=yes;ac_cv_sizeof_off_t=8],
+    [aix*], [
+    AS_CASE(["$target_cpu:$ac_cv_sys_large_files"],
+	[ppc64:*|powerpc64:*], [],
+	[*:no|*:unknown], [],
+	[
+	    # AIX currently does not support a 32-bit call to posix_fadvise()
+	    # if _LARGE_FILES is defined.
+	    ac_cv_func_posix_fadvise=no
+	])
+    ])
 
 AC_C_BIGENDIAN
 AC_C_CONST
 AC_C_CHAR_UNSIGNED
 AC_C_INLINE
 AC_C_VOLATILE
+AC_C_TYPEOF
 
 AS_CASE(":$ac_cv_c_const:$ac_cv_c_volatile:",
     [*:no:*], [AC_MSG_ERROR(ANSI C-conforming const and volatile are mandatory)])
@@ -1271,10 +1373,29 @@ RUBY_CHECK_SIZEOF(double)
 RUBY_CHECK_SIZEOF(time_t, [long "long long"], [], [@%:@include <time.h>])
 RUBY_CHECK_SIZEOF(clock_t, [], [], [@%:@include <time.h>])
 
+AC_CACHE_CHECK(packed struct attribute, rb_cv_packed_struct,
+    [rb_cv_packed_struct=no
+    for mac in \
+	"__pragma(pack(push, 1)) x __pragma(pack(pop))" \
+	"x __attribute__((packed))" \
+	; do
+	AC_TRY_COMPILE([@%:@define PACKED_STRUCT(x) $mac
+			PACKED_STRUCT(struct { int a; });], [],
+		[rb_cv_packed_struct=$mac; break])
+    done])
+packed_struct_unaligned=x
+if test "$rb_cv_packed_struct" != no; then
+    AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], [$rb_cv_packed_struct])
+else
+    AC_DEFINE_UNQUOTED([PACKED_STRUCT(x)], x)
+fi
+AC_DEFINE_UNQUOTED(PACKED_STRUCT_UNALIGNED(x), $packed_struct_unaligned)
+
 AC_DEFUN([RUBY_CHECK_PRINTF_PREFIX], [
 AC_CACHE_CHECK([for printf prefix for $1], [rb_cv_pri_prefix_]AS_TR_SH($1),[
     [rb_cv_pri_prefix_]AS_TR_SH($1)=[NONE]
-    RUBY_WERROR_FLAG(for pri in $2; do
+    RUBY_WERROR_FLAG(RUBY_APPEND_OPTIONS(CFLAGS, $rb_cv_wsuppress_flags)
+    for pri in $2; do
         AC_TRY_COMPILE(
             [@%:@include <stdio.h>
 	    @%:@include <stddef.h>
@@ -1474,11 +1595,16 @@ m4_ifval([$3], dnl
   [AS_VAR_PUSHDEF([rbcv],[$3])], dnl
   [AS_VAR_PUSHDEF([rbcv],[rb_cv_func_][$1])]dnl
 )dnl
+m4_pushdef([attrib_code],[m4_bpatsubst([$1],["],[\\"])])
 m4_ifval([$4], [rbcv_cond=["$4"]; test "$rbcv_cond" || unset rbcv_cond])
-AC_CACHE_CHECK(for [$1] function attribute, rbcv,
+AC_CACHE_CHECK(for m4_ifval([$2],[$2],[$1]) function attribute, rbcv,
 [rbcv=x
 RUBY_WERROR_FLAG([
-for mac in "__attribute__ (($1)) x" "x __attribute__ (($1))" "__declspec($1) x" x; do
+for mac in \
+    "__attribute__ ((attrib_code)) x" \
+    "x __attribute__ ((attrib_code))" \
+    "__declspec(attrib_code) x" \
+    x; do
   m4_ifval([$4],mac="$mac"${rbcv_cond+" /* only if $rbcv_cond */"})
   AC_TRY_COMPILE(
     m4_ifval([$4],${rbcv_cond+[@%:@if ]$rbcv_cond})
@@ -1493,7 +1619,7 @@ done
 if test "$rbcv" != x; then
     RUBY_DEFINE_IF(m4_ifval([$4],[${rbcv_cond}]), attrib[(x)], $rbcv)
 fi
-m4_ifval([$4], [unset rbcv_cond])dnl
+m4_ifval([$4], [unset rbcv_cond]) dnl
 AS_VAR_POPDEF([attrib])dnl
 AS_VAR_POPDEF([rbcv])dnl
 ])
@@ -1506,6 +1632,7 @@ if_i386=${universal_binary+[defined __i386__]}
 RUBY_FUNC_ATTRIBUTE(stdcall,  [], [], ${if_i386})
 RUBY_FUNC_ATTRIBUTE(cdecl,    [], [], ${if_i386})
 RUBY_FUNC_ATTRIBUTE(fastcall, [], [], ${if_i386})
+RUBY_FUNC_ATTRIBUTE(optimize("-Os","-fomit-frame-pointer"), FUNC_MINIMIZED, rb_cv_func_minimized)
 
 if test "$GCC" = yes; then
     AC_CACHE_CHECK([for function alias], [rb_cv_gcc_function_alias],
@@ -1530,6 +1657,7 @@ if test "$GCC" = yes; then
 			__atomic_exchange_n(&atomic_var, 1, __ATOMIC_SEQ_CST);
 			__atomic_fetch_add(&atomic_var, 1, __ATOMIC_SEQ_CST);
 			__atomic_fetch_sub(&atomic_var, 1, __ATOMIC_SEQ_CST);
+			__atomic_or_fetch(&atomic_var, 1, __ATOMIC_SEQ_CST);
 		    ],
 		    [rb_cv_gcc_atomic_builtins=yes],
 		    [rb_cv_gcc_atomic_builtins=no])])
@@ -1544,6 +1672,8 @@ if test "$GCC" = yes; then
 			__sync_lock_test_and_set(&atomic_var, 1);
 			__sync_fetch_and_add(&atomic_var, 1);
 			__sync_fetch_and_sub(&atomic_var, 1);
+			__sync_or_and_fetch(&atomic_var, 1);
+			__sync_val_compare_and_swap(&atomic_var, 0, 1);
 		    ],
 		    [rb_cv_gcc_sync_builtins=yes],
 		    [rb_cv_gcc_sync_builtins=no])])
@@ -1553,8 +1683,8 @@ if test "$GCC" = yes; then
 
     AC_CACHE_CHECK(for __builtin_unreachable, rb_cv_func___builtin_unreachable,
     [RUBY_WERROR_FLAG(
-    [AC_TRY_LINK([@%:@include <stdlib.h>],
-	[exit(0); __builtin_unreachable();],
+    [AC_TRY_LINK([volatile int zero;],
+	[if (zero) __builtin_unreachable();],
 	[rb_cv_func___builtin_unreachable=yes],
 	[rb_cv_func___builtin_unreachable=no])
     ])
@@ -1628,10 +1758,11 @@ 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>])
+RUBY_CHECK_SIZEOF([struct stat.st_size], [off_t int long "long long"], [], [@%:@include <sys/stat.h>])
 if test "$ac_cv_member_struct_stat_st_blocks" = yes; then
-    RUBY_CHECK_SIZEOF([struct stat.st_blocks], [int long "long long"], [], [@%:@include <sys/stat.h>])
+    RUBY_CHECK_SIZEOF([struct stat.st_blocks], [off_t int long "long long"], [], [@%:@include <sys/stat.h>])
 fi
+RUBY_CHECK_SIZEOF([struct stat.st_ino], [long "long long"], [], [@%:@include <sys/stat.h>])
 AC_CHECK_MEMBERS([struct stat.st_atim])
 AC_CHECK_MEMBERS([struct stat.st_atimespec])
 AC_CHECK_MEMBERS([struct stat.st_atimensec])
@@ -1641,6 +1772,7 @@ AC_CHECK_MEMBERS([struct stat.st_mtimensec])
 AC_CHECK_MEMBERS([struct stat.st_ctim])
 AC_CHECK_MEMBERS([struct stat.st_ctimespec])
 AC_CHECK_MEMBERS([struct stat.st_ctimensec])
+AC_CHECK_MEMBERS([struct stat.st_birthtimespec])
 
 AC_CHECK_TYPES([struct timeval], [], [], [@%:@ifdef HAVE_TIME_H
 @%:@include <time.h>
@@ -1840,10 +1972,28 @@ 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)
+
+AC_REPLACE_FUNCS(acosh)
+AC_REPLACE_FUNCS(cbrt)
+AC_REPLACE_FUNCS(crypt)
+AC_REPLACE_FUNCS(dup2)
+AC_REPLACE_FUNCS(erf)
+AC_REPLACE_FUNCS(ffs)
+AC_REPLACE_FUNCS(finite)
+AC_REPLACE_FUNCS(flock)
+AC_REPLACE_FUNCS(hypot)
+AC_REPLACE_FUNCS(isinf)
+AC_REPLACE_FUNCS(isnan)
+AC_REPLACE_FUNCS(lgamma_r)
+AC_REPLACE_FUNCS(memmove)
+AC_REPLACE_FUNCS(nextafter)
+AC_REPLACE_FUNCS(setproctitle)
+AC_REPLACE_FUNCS(strchr)
+AC_REPLACE_FUNCS(strerror)
+AC_REPLACE_FUNCS(strlcat)
+AC_REPLACE_FUNCS(strlcpy)
+AC_REPLACE_FUNCS(strstr)
+AC_REPLACE_FUNCS(tgamma)
 
 # for missing/setproctitle.c
 AS_CASE(["$target_os"],
@@ -1865,17 +2015,22 @@ else
   AC_LIBOBJ([signbit])
 fi
 
+AC_FUNC_FORK
+
 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(atan2l atan2f)
 AC_CHECK_FUNCS(chroot)
 AC_CHECK_FUNCS(chsize)
 AC_CHECK_FUNCS(clock_gettime)
 AC_CHECK_FUNCS(cosh)
 AC_CHECK_FUNCS(daemon)
+AC_CHECK_FUNCS(dirfd)
 AC_CHECK_FUNCS(dl_iterate_phdr)
 AC_CHECK_FUNCS(dlopen)
+AC_CHECK_FUNCS(dladdr)
 AC_CHECK_FUNCS(dup)
 AC_CHECK_FUNCS(dup3)
 AC_CHECK_FUNCS(eaccess)
@@ -1884,21 +2039,27 @@ AC_CHECK_FUNCS(fchmod)
 AC_CHECK_FUNCS(fchown)
 AC_CHECK_FUNCS(fcntl)
 AC_CHECK_FUNCS(fdatasync)
+AC_CHECK_FUNCS(fgetattrlist)
 AC_CHECK_FUNCS(fmod)
-AC_CHECK_FUNCS(fork)
 AC_CHECK_FUNCS(fsync)
 AC_CHECK_FUNCS(ftruncate)
 AC_CHECK_FUNCS(ftruncate64)		# used for Win32 platform
+AC_CHECK_FUNCS(getattrlist)
 AC_CHECK_FUNCS(getcwd)
+AC_CHECK_FUNCS(getgidx)
+AC_CHECK_FUNCS(getgrnam)
 AC_CHECK_FUNCS(getgrnam_r)
 AC_CHECK_FUNCS(getgroups)
 AC_CHECK_FUNCS(getpgid)
 AC_CHECK_FUNCS(getpgrp)
 AC_CHECK_FUNCS(getpriority)
 AC_CHECK_FUNCS(getpwnam_r)
+AC_CHECK_FUNCS(getresgid)
+AC_CHECK_FUNCS(getresuid)
 AC_CHECK_FUNCS(getrlimit)
 AC_CHECK_FUNCS(getsid)
 AC_CHECK_FUNCS(gettimeofday)		# for making ac_cv_func_gettimeofday
+AC_CHECK_FUNCS(getuidx)
 AC_CHECK_FUNCS(gmtime_r)
 AC_CHECK_FUNCS(initgroups)
 AC_CHECK_FUNCS(ioctl)
@@ -1929,6 +2090,7 @@ AC_CHECK_FUNCS(pread)
 AC_CHECK_FUNCS(qsort_r)
 AC_CHECK_FUNCS(readlink)
 AC_CHECK_FUNCS(round)
+AC_CHECK_FUNCS(sched_getaffinity)
 AC_CHECK_FUNCS(seekdir)
 AC_CHECK_FUNCS(select_large_fdset)
 AC_CHECK_FUNCS(sendfile)
@@ -1969,10 +2131,41 @@ AC_CHECK_FUNCS(utimes)
 AC_CHECK_FUNCS(wait4)
 AC_CHECK_FUNCS(waitpid)
 
+AS_IF([test "$ac_cv_func_getcwd" = yes], [
+    AC_CACHE_CHECK(if getcwd allocates buffer if NULL is given, [rb_cv_getcwd_malloc],
+	[AC_TRY_RUN([
+@%:@include <stddef.h>
+@%:@include <stdio.h>
+@%:@ifdef HAVE_UNISTD_H
+@%:@include <unistd.h>
+@%:@endif
+@%:@ifndef EXIT_SUCCESS
+@%:@define EXIT_SUCCESS 0
+@%:@endif
+@%:@ifndef EXIT_FAILURE
+@%:@define EXIT_FAILURE 1
+@%:@endif
+
+int
+main(int argc, char **argv)
+{
+    if (!getcwd(NULL, 0)) return EXIT_FAILURE;
+    return EXIT_SUCCESS;
+}
+],
+	    rb_cv_getcwd_malloc=yes,
+	    rb_cv_getcwd_malloc=no,
+	    AS_CASE($target_os,
+		[linux*|darwin*|*bsd|cygwin*|mingw*|mswin*],
+		[rb_cv_getcwd_malloc=yes],
+		[rb_cv_getcwd_malloc=no]))])
+    AS_IF([test "$rb_cv_getcwd_malloc" = no], [AC_DEFINE(NO_GETCWD_MALLOC, 1)])
+])
+
 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;])],
+    [AC_LANG_PROGRAM([int foo;], [$2;])],
     [AS_TR_SH(rb_cv_builtin_$1)=yes],
     [AS_TR_SH(rb_cv_builtin_$1)=no])])
 if test "${AS_TR_SH(rb_cv_builtin_$1)}" != no; then
@@ -1985,6 +2178,7 @@ RUBY_CHECK_BUILTIN_FUNC(__builtin_clz, [__builtin_clz(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_clzl, [__builtin_clzl(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_clzll, [__builtin_clzll(0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr, [__builtin_choose_expr(0, 0, 0)])
+RUBY_CHECK_BUILTIN_FUNC(__builtin_choose_expr_constant_p, [__builtin_choose_expr(__builtin_constant_p(foo), 0, 0)])
 RUBY_CHECK_BUILTIN_FUNC(__builtin_types_compatible_p, [__builtin_types_compatible_p(int, int)])
 
 if test "$ac_cv_func_qsort_r" != no; then
@@ -2013,6 +2207,70 @@ void qsort_r(void *base, size_t nmemb, size_t size,
   ])
 fi
 
+AC_CACHE_CHECK(whether atan2 handles Inf as C99, rb_cv_atan2_inf_c99, [
+    AS_IF([test $ac_cv_func_atan2f:$ac_cv_func_atan2l = yes:yes], [
+	AC_TRY_RUN([
+@%:@include <math.h>
+@%:@ifdef HAVE_UNISTD_H
+@%:@include <unistd.h>
+@%:@endif
+@%:@ifndef EXIT_SUCCESS
+@%:@define EXIT_SUCCESS 0
+@%:@endif
+@%:@ifndef EXIT_FAILURE
+@%:@define EXIT_FAILURE 1
+@%:@endif
+
+int
+main(int argc, char **argv)
+{
+    if (fabs(atan2(INFINITY, INFINITY) - M_PI_4) <= 0.01) return EXIT_SUCCESS;
+    return EXIT_FAILURE;
+}
+],
+	[rb_cv_atan2_inf_c99=yes],
+	[rb_cv_atan2_inf_c99=no],
+	[AS_CASE($target_os, [mingw*|mswin*], [rb_cv_atan2_inf_c99=no], [rb_cv_atan2_inf_c99=yes])]
+	)
+    ], [rb_cv_atan2_inf_c99=no])
+])
+AS_IF([test "x$rb_cv_atan2_inf_c99" = xyes], [AC_DEFINE(ATAN2_INF_C99)])
+
+AS_IF([test "x$ac_cv_func_lgamma_r" = xyes], [
+    AC_CACHE_CHECK(whether lgamma_r handles -0.0, rb_cv_lgamma_r_m0, [
+	AC_TRY_RUN([
+@%:@include <math.h>
+@%:@ifdef HAVE_UNISTD_H
+@%:@include <unistd.h>
+@%:@endif
+@%:@ifndef EXIT_SUCCESS
+@%:@define EXIT_SUCCESS 0
+@%:@endif
+@%:@ifndef EXIT_FAILURE
+@%:@define EXIT_FAILURE 1
+@%:@endif
+
+int
+main(int argc, char **argv)
+{
+    int sign;
+    double x = lgamma_r(-0.0, &sign);
+
+    /* should be [+inf, -1] */
+    if (x <= 0) return EXIT_FAILURE;
+    if (!isinf(x)) return EXIT_FAILURE;
+    if (sign != -1) return EXIT_FAILURE;
+    return EXIT_SUCCESS;
+}
+],
+	[rb_cv_lgamma_r_m0=yes],
+	[rb_cv_lgamma_r_m0=no],
+	[rb_cv_lgamma_r_m0=yes]
+	)
+    ])
+    AS_IF([test "x$rb_cv_lgamma_r_m0" = xno], [AC_DEFINE(LGAMMA_R_M0_FIX)])
+])
+
 # Some platform need -lrt for clock_gettime, but the other don't.
 if test x"$ac_cv_func_clock_gettime" != xyes; then
     # glibc 2.17 moves clock_* functions from librt to the main C library.
@@ -2042,17 +2300,35 @@ AC_CACHE_CHECK(for sigsetjmp as a macro or function, ac_cv_func_sigsetjmp,
 	ac_cv_func_sigsetjmp=yes,
 	ac_cv_func_sigsetjmp=no)])
 
+AC_DEFUN([RUBY_CHECK_BUILTIN_SETJMP], [
+if test x"${ac_cv_func___builtin_setjmp}" = xyes; then
+   unset ac_cv_func___builtin_setjmp
+fi
 AC_CACHE_CHECK(for __builtin_setjmp, ac_cv_func___builtin_setjmp,
-[AC_TRY_LINK([@%:@include <setjmp.h>
-    jmp_buf jb; void t(v) int v; {__builtin_longjmp(jb, v);}],
-    [__builtin_setjmp(jb);],
-    [ac_cv_func___builtin_setjmp=yes],
-    [ac_cv_func___builtin_setjmp=no])
+    [
+    ac_cv_func___builtin_setjmp=no
+    for cast in "" "(void **)"; do
+	RUBY_WERROR_FLAG(
+	[AC_TRY_LINK([@%:@include <setjmp.h>
+	    @%:@include <stdio.h>
+	    jmp_buf jb;
+	    void t(void) {__builtin_longjmp($cast jb, 1);}
+	    int jump(void) {(void)(__builtin_setjmp($cast jb) ? 1 : 0); return 0;}],
+	    [
+	    void (*volatile f)(void) = t;
+	    if (!jump()) printf("%d\n", f != 0);
+	    ],
+	    [ac_cv_func___builtin_setjmp="yes with cast ($cast)"])
+	])
+	test "$ac_cv_func___builtin_setjmp" = no || break
+    done])
 ])
 
 # we don't use _setjmp if _longjmp doesn't exist.
 test x$ac_cv_func__longjmp = xno && ac_cv_func__setjmp=no
 
+AC_DEFUN([RUBY_SETJMP_TYPE], [
+RUBY_CHECK_BUILTIN_SETJMP
 AC_MSG_CHECKING(for setjmp type)
 setjmp_suffix=
 AC_ARG_WITH(setjmp-type,
@@ -2066,11 +2342,13 @@ AC_ARG_WITH(setjmp-type,
 	[setjmpex], [ setjmp_prefix= setjmp_suffix=ex],
 	[''], [ unset setjmp_prefix],
 	[   AC_MSG_ERROR(invalid setjmp type: $withval)])], [unset setjmp_prefix])
+setjmp_cast=
 if test ${setjmp_prefix+set}; then
     if test "${setjmp_prefix}" && eval test '$ac_cv_func_'${setjmp_prefix}setjmp${setjmp_suffix} = no; then
 	AC_MSG_ERROR(${setjmp_prefix}setjmp${setjmp_suffix} is not available)
     fi
-elif test "$ac_cv_func___builtin_setjmp" = yes; then
+elif { AS_CASE("$ac_cv_func___builtin_setjmp", [yes*], [true], [false]) }; then
+    setjmp_cast=`expr "$ac_cv_func___builtin_setjmp" : "yes with cast (\(.*\))"`
     setjmp_prefix=__builtin_
     setjmp_suffix=
 elif test "$ac_cv_header_setjmpex_h:$ac_cv_func__setjmpex" = yes:yes; then
@@ -2091,10 +2369,11 @@ if test x$setjmp_prefix = xsig; then
 else
     unset setjmp_sigmask
 fi
-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_MSG_RESULT(${setjmp_prefix}setjmp${setjmp_suffix}${setjmp_cast:+\($setjmp_cast\)})
+AC_DEFINE_UNQUOTED([RUBY_SETJMP(env)], [${setjmp_prefix}setjmp${setjmp_suffix}($setjmp_cast(env)${setjmp_sigmask+,0})])
+AC_DEFINE_UNQUOTED([RUBY_LONGJMP(env,val)], [${setjmp_prefix}longjmp($setjmp_cast(env),val)])
 AC_DEFINE_UNQUOTED(RUBY_JMP_BUF, ${setjmp_sigmask+${setjmp_prefix}}jmp_buf)
+])
 # End of setjmp check.
 
 AC_ARG_ENABLE(setreuid,
@@ -2317,70 +2596,10 @@ else
   AC_DEFINE(RSHIFT(x,y), (((x)<0) ? ~((~(x))>>(int)(y)) : (x)>>(int)(y)))
 fi
 
-# 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
-     readCount	dnl
-     _rcount	dnl for emx0.9c
-; do
-    AC_TRY_COMPILE([#include <stdio.h>
-],
-	[FILE *f = stdin; f->$fcnt = 0;],
-	[rb_cv_fcnt="$fcnt"; break])
-done])
-AS_CASE("$rb_cv_fcnt",
-	["not found"*], [rb_cv_fcnt="not found"],
-	[AC_DEFINE_UNQUOTED(FILE_COUNT, $rb_cv_fcnt)])
-
-# 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>
-],
-	[FILE *f = stdin; char buf[256]; f->$frptr = buf;],
-	rb_cv_frptr="$frptr"; break,
-	rb_cv_frptr="not found")
-done])
-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_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")
-    done])
-    if test "$rb_cv_frend" != "not found"; then
-      AC_DEFINE_UNQUOTED(FILE_READEND, $rb_cv_frend)
-    fi
-  fi
-fi
-
 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),
@@ -2397,7 +2616,7 @@ if test "$ac_cv_func_sysconf" = yes; then
   RUBY_CHECK_SYSCONF(CLK_TCK)
 fi
 
-AC_DEFUN(RUBY_STACK_GROW_DIRECTION, [
+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"],
@@ -2478,25 +2697,81 @@ if test x"$enable_pthread" = xyes; then
     else
 	AC_MSG_WARN("Don't know how to find pthread library on your system -- thread support disabled")
     fi
+    AC_CACHE_CHECK([whether pthread_t is scalar type], [rb_cv_scalar_pthread_t], [
+	AC_TRY_COMPILE([
+	    @%:@include <pthread.h>
+	    ], [
+	    pthread_t thread_id;
+	    thread_id = 0;
+	    if (!thread_id) return 0;
+	    ], [rb_cv_scalar_pthread_t=yes], [rb_cv_scalar_pthread_t=no])
+    ])
+    if test x"$rb_cv_scalar_pthread_t" = xyes; then
+	: # RUBY_CHECK_SIZEOF(pthread_t, [void* int long], [], [@%:@include <pthread.h>])
+    else
+	AC_DEFINE(NON_SCALAR_THREAD_ID)
+    fi
     AC_CHECK_FUNCS(sched_yield pthread_attr_setinheritsched \
-	pthread_getattr_np pthread_attr_get_np pthread_attr_getstack\
+	pthread_attr_get_np pthread_attr_getstack\
 	pthread_get_stackaddr_np pthread_get_stacksize_np \
 	thr_stksegment pthread_stackseg_np pthread_getthrds_np \
 	pthread_cond_init pthread_condattr_setclock pthread_condattr_init \
 	pthread_sigmask pthread_setname_np)
+    AS_CASE(["$target_os"],[aix*],[ac_cv_func_pthread_getattr_np=no],[AC_CHECK_FUNCS(pthread_getattr_np)])
     if test "${host_os}" = "nacl"; then
       ac_cv_func_pthread_attr_init=no
     else
       AC_CHECK_FUNCS(pthread_attr_init)
     fi
+    if test "$ac_cv_func_pthread_setname_np" = yes; then
+	AC_CACHE_CHECK([arguments of pthread_setname_np], [rb_cv_func_pthread_setname_np_arguments],
+	    [rb_cv_func_pthread_setname_np_arguments=
+	    # Linux,AIX,  (pthread_self(), name)
+	    # NetBSD (pthread_self(), name, \"%s\")
+	    # Darwin (name)
+	    for mac in \
+		"(pthread_self(), name)" \
+		"(pthread_self(), name, \"%s\")" \
+		"(name)" \
+		; do
+		AC_TRY_COMPILE([
+		    @%:@include <pthread.h>
+		    @%:@ifdef HAVE_PTHREAD_NP_H
+		    @%:@include <pthread_np.h>
+		    @%:@endif
+		    @%:@define SET_THREAD_NAME(name) pthread_setname_np${mac}
+		    ],
+		    [if (SET_THREAD_NAME("conftest")) return 1;],
+		    [rb_cv_func_pthread_setname_np_arguments="${mac}"
+		    break])
+	    done
+	    ]
+	)
+	if test -n "${rb_cv_func_pthread_setname_np_arguments}"; then
+	    AC_DEFINE_UNQUOTED(SET_THREAD_NAME(name), pthread_setname_np${rb_cv_func_pthread_setname_np_arguments})
+	else
+	    AC_DEFINE_UNQUOTED(SET_THREAD_NAME(name), (void)0)
+	fi
+    fi
 fi
 if test x"$ac_cv_header_ucontext_h" = xyes; then
+    AC_CACHE_CHECK([if mcontext_t is a pointer], [rb_cv_mcontext_t_ptr],
+	[AC_TRY_COMPILE([@%:@include <ucontext.h>
+	mcontext_t test(mcontext_t mc) {return mc+1;}
+	],
+	[test(0);],
+	[rb_cv_mcontext_t_ptr=yes], [rb_cv_mcontext_t_ptr=no])])
+    if test x"$rb_cv_mcontext_t_ptr" = xyes; then
+	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t mc = (uc)->uc_mcontext)
+    else
+	AC_DEFINE_UNQUOTED(DEFINE_MCONTEXT_PTR(mc, uc), mcontext_t *mc = &(uc)->uc_mcontext)
+    fi
     if test x"$rb_with_pthread" = xyes; then
 	AC_CHECK_FUNCS(getcontext setcontext)
     fi
 fi
 
-if test "$ac_cv_func_fork" = "yes" -a "$rb_with_pthread" = "yes"; then
+if test "$ac_cv_func_fork_works" = "yes" -a "$rb_with_pthread" = "yes"; then
     AC_CACHE_CHECK([if fork works with pthread], rb_cv_fork_with_pthread,
 	[AC_TRY_RUN([
 #include <stdlib.h>
@@ -2580,8 +2855,8 @@ AC_ARG_WITH(dln-a-out,
 
 AC_CACHE_CHECK(whether ELF binaries are produced, rb_cv_binary_elf,
 [AC_TRY_LINK([],[], [
-AS_CASE(["`head -1 conftest$EXEEXT | cat -e`"],
-['^?ELF'*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
+AS_CASE(["`head -1 conftest$EXEEXT | tr -dc '\177ELF' | tr '\177' .`"],
+[.ELF*], [rb_cv_binary_elf=yes], [rb_cv_binary_elf=no])],
 rb_cv_binary_elf=no)])
 
 if test "$rb_cv_binary_elf" = yes; then
@@ -2614,6 +2889,7 @@ AC_SUBST(LDSHAREDXX)dnl
 AC_SUBST(DLEXT)dnl
 AC_SUBST(DLEXT2)dnl
 AC_SUBST(LIBEXT)dnl
+AC_SUBST(ASMEXT, S)dnl
 
 STATIC=
 : ${PATHFLAG=''}
@@ -2659,7 +2935,7 @@ if test "$with_dln_a_out" != yes; then
 			    RPATHFLAG=' +b %1$-s'
 			fi
 			rb_cv_dlopen=yes],
-	[solaris*], [ 	if test "$GCC" = yes; then
+	[solaris*], [	if test "$GCC" = yes; then
 			    : ${LDSHARED='$(CC) -shared'}
 			    if test "$rb_cv_prog_gnu_ld" = yes; then
 				LDFLAGS="$LDFLAGS -Wl,-E"
@@ -2711,10 +2987,6 @@ if test "$with_dln_a_out" != yes; then
 			fi
 			rb_cv_dlopen=yes],
 	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
-			RUBY_APPEND_OPTIONS(DLDFLAGS, [ \
-			    "${linker_flag}-undefined${linker_flag:+,}dynamic_lookup" \
-			    "${linker_flag}-multiply_defined${linker_flag:+,}suppress" \
-			    ])
 			: ${LDFLAGS=""}
 			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
 			# /usr/local/include is always searched for
@@ -2778,9 +3050,25 @@ if test "$with_dln_a_out" != yes; then
 	[os2-emx*], [	LDFLAGS="$LDFLAGS -Zomf"
 			],
         [nacl], [ LDSHARED='$(CC) -shared' ],
-	[ 	: ${LDSHARED='$(LD)'}])
+	[	: ${LDSHARED='$(LD)'}])
   AC_MSG_RESULT($rb_cv_dlopen)
 
+  if test "$rb_cv_dlopen" = yes; then
+    AS_CASE(["$target_os"],
+      [darwin*], [
+	for flag in \
+	  "-undefined dynamic_lookup" \
+	  "-multiply_defined suppress" \
+	  ; do
+	  test "x${linker_flag}" = x || flag="${linker_flag}`echo ${flag} | tr ' ' ,`"
+	  RUBY_TRY_LDFLAGS([$flag], [], [flag=])
+	  if test "x$flag" != x; then
+	    RUBY_APPEND_OPTIONS(DLDFLAGS, [$flag])
+	  fi
+	done
+      ])
+  fi
+
   if test "$enable_rpath" = yes; then
     if test x"${RPATHFLAG}" = x; then
       for rpathflag in -R "-rpath "; do
@@ -2834,11 +3122,19 @@ if test "x$OPT_DIR" != x; then
     LDFLAGS_OPTDIR="$val"
 fi
 
+AS_CASE(["$target_os"],
+[freebsd*], [
+    AC_CHECK_LIB([procstat], [procstat_open_sysctl])
+    if test "x$ac_cv_lib_procstat_procstat_open_sysctl" = xyes; then
+	AC_CHECK_FUNCS(procstat_getvmmap)
+    fi
+    ])
 AS_CASE(["$target_cpu-$target_os"],
 [*-darwin*], [
     AC_CHECK_HEADERS([execinfo.h])
     if test "x$ac_cv_header_execinfo_h" = xyes; then
 	AC_CHECK_LIB([execinfo], [backtrace])
+	AC_CHECK_HEADERS([libunwind.h])
     fi],
 [*-freebsd*|x86_64-netbsd*], [
     AC_CHECK_HEADERS([execinfo.h])
@@ -2867,24 +3163,25 @@ void sigsegv(int signum, siginfo_t *info, void *ctx){
     if (n > 0) {
 	/*fprintf(stdout, "backtrace:%d\n",n);*/
     } else {
-	abort();
+	_exit(EXIT_FAILURE);
     }
-    _exit(0);
+    _exit(EXIT_SUCCESS);
 }
 int
-main()
+main(void)
 {
+    volatile int *a = NULL;
     stack_t ss;
     ss.ss_sp = malloc(SIGSTKSZ);
     if (ss.ss_sp == NULL) {
 	fprintf(stderr, "cannot allocate memory for sigaltstack\n");
-	abort();
+	return EXIT_FAILURE;
     }
     ss.ss_size = SIGSTKSZ;
     ss.ss_flags = 0;
     if (sigaltstack(&ss, NULL) == -1) {
 	fprintf(stderr, "sigaltstack failed\n");
-	abort();
+	return EXIT_FAILURE;
     }
     struct sigaction sa;
     memset(&sa, 0, sizeof(struct sigaction));
@@ -2893,9 +3190,8 @@ main()
     sa.sa_flags |= SA_SIGINFO;
     sa.sa_flags |= SA_ONSTACK;
     sigaction(SIGSEGV, &sa, NULL);
-    int *a = NULL;
     a[0] = 1;
-    return 0;
+    return EXIT_SUCCESS;
 }
 ],
 	rb_cv_broken_backtrace=no,
@@ -2956,7 +3252,6 @@ else
 	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
@@ -2997,16 +3292,27 @@ EXTSTATIC=
 AC_SUBST(EXTSTATIC)dnl
 AC_ARG_WITH(static-linked-ext,
 	    AS_HELP_STRING([--with-static-linked-ext], [link external modules statically]),
-            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static])])
-if test x"$EXTSTATIC" = xstatic; then
+            [AS_CASE([$withval],[yes],[STATIC=;EXTSTATIC=static],[no],[],[EXTSTATIC="$withval"])])
+AS_CASE([",$EXTSTATIC,"], [,static,|*,enc,*], [
   ENCOBJS='enc/encinit.$(OBJEXT) enc/libenc.$(LIBEXT) enc/libtrans.$(LIBEXT)'
   EXTOBJS='ext/extinit.$(OBJEXT)'
   AC_DEFINE_UNQUOTED(EXTSTATIC, 1)
-fi
+  AC_SUBST(ENCSTATIC, static)
+], [
+  ENCOBJS='dmyenc.$(OBJEXT)'
+  EXTOBJS='dmyext.$(OBJEXT)'
+])
 AC_SUBST(ENCOBJS)
 AC_SUBST(EXTOBJS)
 
-if test -f "$srcdir/ext/Setup.$target_os"; then
+AC_ARG_WITH(setup,
+	    AS_HELP_STRING([--with-setup=SETUP], [use extension libraries setup]),
+	    [setup=$withval])
+if test -n "$setup"; then
+    if ! test -f "ext/$setup" -o -f "$srcdir/ext/$setup"; then
+	AC_MSG_ERROR(Setup file $setup not found under ext or $srcdir/ext)
+    fi
+elif test -f "$srcdir/ext/Setup.$target_os"; then
     setup="Setup.$target_os"
 else
     setup=
@@ -3259,7 +3565,9 @@ AS_CASE("$enable_shared", [yes], [
   LIBRUBYARG_SHARED=
 
   # enable PIE if possible
-  pie=
+  AC_ARG_ENABLE(pie,
+          AS_HELP_STRING([--disable-pie], [disable PIE feature]),
+          [pie=$enableval], [pie=])
   AS_CASE(["$target_os"],
   [haiku], [
     # gcc supports PIE, but doesn't work correctly in Haiku
@@ -3329,6 +3637,7 @@ if test "${enable_dtrace}" = "auto"; then
 fi
 
 LIBRUBY_A_OBJS='$(OBJS)'
+DTRACE_REBUILD=
 if test "${enable_dtrace}" = "yes"; then
     if test -z "$DTRACE"; then
         AC_MSG_ERROR([dtrace(1) is missing])
@@ -3341,9 +3650,11 @@ if test "${enable_dtrace}" = "yes"; then
             AC_MSG_ERROR([--enable-dtrace, however, USDT is not available])
         fi
         RUBY_DTRACE_POSTPROCESS()
-        if test "$rb_cv_prog_dtrace_g" = 'yes'; then
+        if test "$rb_cv_prog_dtrace_g" != 'no'; then
             DTRACE_OBJ='probes.$(OBJEXT)'
-            DTRACE_GLOMMED_OBJ='ruby-glommed.$(OBJEXT)'
+        fi
+        if test "$rb_cv_prog_dtrace_g" = 'rebuild'; then
+            DTRACE_REBUILD=yes
             LIBRUBY_A_OBJS='$(DTRACE_GLOMMED_OBJ)'
         fi
         AS_CASE("${target_os}", [freebsd*], [
@@ -3357,9 +3668,10 @@ else
 fi
 AC_SUBST(DTRACE_EXT)
 AC_SUBST(DTRACE_OBJ)
-AC_SUBST(DTRACE_GLOMMED_OBJ)
+AC_SUBST(DTRACE_REBUILD)
 AC_SUBST(LIBRUBY_A_OBJS)
 
+RUBY_SETJMP_TYPE
 }
 { # build section
 
@@ -3374,7 +3686,7 @@ AC_ARG_ENABLE(install-rdoc,
       [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])
+      [install_capi=$enableval], [install_capi=no])
 
 if test "$install_doc" != no; then
     if test "$install_rdoc" != no; then
@@ -3507,6 +3819,9 @@ AS_CASE(["$target_os"],
 AS_CASE(["$with_gmp: $SOLIBS "], [no:* | *' -lgmp '*|*' $(LIBS) '*], [],
 	[SOLIBS="-lgmp $SOLIBS"])
 
+AS_CASE(["$with_jemalloc: $LIBS "], [no:* | *' -ljemalloc '*], [],
+	[LIBS="-ljemalloc $LIBS"])
+
 MINIOBJS="$MINIDLNOBJ"
 
 AS_CASE(["$THREAD_MODEL"],
@@ -3585,6 +3900,10 @@ if test "${universal_binary-no}" = yes ; then
     mv -f confdefs1.h confdefs.h
     AC_MSG_ERROR([failed])
     ])])
+    AC_CACHE_CHECK(whether __ARCHITECTURE__ is available, rb_cv_architecture_available,
+	AC_TRY_COMPILE([@%:@include <stdio.h>
+		const char arch[[]] = __ARCHITECTURE__;], [puts(arch);],
+		[rb_cv_architecture_available=yes], [rb_cv_architecture_available=no]))
 fi
 
 if test "$ac_cv_func_memmem" = yes; then
@@ -3617,7 +3936,7 @@ main()
     rb_cv_broken_memmem=yes,
     rb_cv_broken_memmem=yes)
   ])
-  AS_CASE([$ac_cv_func_memmem],[yes],[ac_cv_func_memmem=no])
+  test x"$rb_cv_broken_memmem" = xyes && ac_cv_func_memmem=no
 fi
 
 
@@ -3745,7 +4064,7 @@ if test ${RUBY_LIB_VERSION_STYLE+set}; then
 elif test -z "${ruby_version}"; then
     AC_MSG_ERROR([No ruby version, No place for bundled libraries])
 else
-    RUBY_LIB_VERSION="\"${ruby_version}\""
+    RUBY_LIB_VERSION="${ruby_version}"
 fi
 AC_SUBST(RUBY_LIB_VERSION_STYLE)
 AC_SUBST(RUBY_LIB_VERSION)
@@ -3802,9 +4121,6 @@ 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
@@ -3823,7 +4139,8 @@ if test "${universal_binary-no}" = yes ; then
     AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS)
 else
     arch="${target_cpu}-${target_os}"
-    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}")
+    AS_CASE(["$arch"], [le32-nacl], [arch="pnacl"])
+    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
 fi
 
 unset sitearch
@@ -3966,6 +4283,7 @@ AC_CONFIG_FILES(Makefile, [
 		["git svn"], [VCSUP='$(VCS) rebase $(GITSVNREBASEOPTIONS)'],
 		[git],       [VCSUP='$(VCS) pull $(GITPULLOPTIONS)'],
 		[VCSUP='$(VCS)'])
+	sed -n 's/^@%:@define \(RUBY_RELEASE_DATE\) "\(.*\)"/\1 = \2/p' "$srcdir/version.h"
 	sed '/^MISSING/s/\$U\././g;/^VCS *=/s#@VCS@#'"$VCS"'#;/^VCSUP *=/s#@VCSUP@#'"$VCSUP"'#' Makefile
 	echo; test x"$EXEEXT" = x || echo 'miniruby: miniruby$(EXEEXT)'
 	if test "$gnumake" != yes; then
@@ -3997,6 +4315,11 @@ AC_ARG_WITH([ruby-pc],
 AC_SUBST(ruby_pc)
 AC_SUBST(exec, [exec])
 
+AC_ARG_WITH(destdir,
+	    AS_HELP_STRING([--with-destdir=DESTDIR], [specify default directory to install]),
+	    [DESTDIR="$withval"])
+AC_SUBST(DESTDIR)
+
 AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
     [
     if sed ['s/\$(\([A-Za-z_][A-Za-z0-9_]*\))/${\1}/g;s/@[A-Za-z_][A-Za-z0-9_]*@//'] $ruby_pc > ruby.tmp.pc &&
diff --git a/constant.h b/constant.h
index 153654604b..c7de5da533 100644
--- a/constant.h
+++ b/constant.h
@@ -13,9 +13,15 @@
 
 typedef enum {
     CONST_PUBLIC    = 0x00,
-    CONST_PRIVATE   = 0x01
+    CONST_PRIVATE,
+    CONST_VISIBILITY_MAX
 } rb_const_flag_t;
 
+#define RB_CONST_PRIVATE_P(ce) \
+    ((ce)->flag == CONST_PRIVATE)
+#define RB_CONST_PUBLIC_P(ce) \
+    ((ce)->flag == CONST_PUBLIC)
+
 typedef struct rb_const_entry_struct {
     rb_const_flag_t flag;
     int line;
@@ -23,8 +29,8 @@ typedef struct rb_const_entry_struct {
     const VALUE file;             /* should be mark */
 } 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);
+VALUE rb_mod_private_constant(int argc, const VALUE *argv, VALUE obj);
+VALUE rb_mod_public_constant(int argc, const 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);
@@ -32,5 +38,6 @@ VALUE rb_public_const_get_from(VALUE klass, ID id);
 int rb_public_const_defined(VALUE klass, ID id);
 int rb_public_const_defined_at(VALUE klass, ID id);
 int rb_public_const_defined_from(VALUE klass, ID id);
+rb_const_entry_t *rb_const_lookup(VALUE klass, ID id);
 
 #endif /* CONSTANT_H */
diff --git a/cont.c b/cont.c
index 3b05f995d4..bfa37d1a87 100644
--- a/cont.c
+++ b/cont.c
@@ -9,7 +9,6 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
 #include "internal.h"
 #include "vm_core.h"
 #include "gc.h"
@@ -89,8 +88,8 @@ enum context_type {
 
 typedef struct rb_context_struct {
     enum context_type type;
-    VALUE self;
     int argc;
+    VALUE self;
     VALUE value;
     VALUE *vm_stack;
 #ifdef CAPTURE_JUST_VALID_VM_STACK
@@ -107,7 +106,7 @@ typedef struct rb_context_struct {
 	int register_stack_size;
 #endif
     } machine;
-    rb_thread_t saved_thread;
+    rb_thread_t saved_thread; /* selected properties of GET_THREAD() (see cont_save_thread) */
     rb_jmpbuf_t jmpbuf;
     rb_ensure_entry_t *ensure_array;
     rb_ensure_list_t *ensure_list;
@@ -130,26 +129,30 @@ 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 {
+struct rb_fiber_struct {
     rb_context_t cont;
-    VALUE prev;
+    struct rb_fiber_struct *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;
+    int transferred;
 
 #if FIBER_USE_NATIVE
 #ifdef _WIN32
     void *fib_handle;
 #else
     ucontext_t context;
+    /* Because context.uc_stack.ss_sp and context.uc_stack.ss_size
+     * are not necessarily valid after makecontext() or swapcontext(),
+     * they are saved in these variables for later use.
+     */
+    void *ss_sp;
+    size_t ss_size;
 #endif
 #endif
-} rb_fiber_t;
+};
 
 static const rb_data_type_t cont_data_type, fiber_data_type;
 static VALUE rb_cContinuation;
@@ -185,7 +188,7 @@ cont_mark(void *ptr)
 	    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,
+	    rb_gc_mark_locations(cont->vm_stack,
 				 cont->vm_stack, cont->saved_thread.stack_size);
 #endif
 	}
@@ -201,7 +204,7 @@ cont_mark(void *ptr)
 		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) {
+		if ((th->fiber != fib) && fib->status == RUNNING) {
 		    rb_gc_mark_locations(cont->machine.stack,
 					 cont->machine.stack + cont->machine.stack_size);
 		}
@@ -232,8 +235,9 @@ cont_free(void *ptr)
 	}
 	else {
 	    /* fiber */
+	    rb_fiber_t *fib = (rb_fiber_t*)cont;
 #ifdef _WIN32
-	    if (GET_THREAD()->fiber != cont->self && cont->type != ROOT_FIBER_CONTEXT) {
+	    if (GET_THREAD()->fiber != fib && cont->type != ROOT_FIBER_CONTEXT) {
 		/* don't delete root fiber handle */
 		rb_fiber_t *fib = (rb_fiber_t*)cont;
 		if (fib->fib_handle) {
@@ -241,13 +245,13 @@ cont_free(void *ptr)
 		}
 	    }
 #else /* not WIN32 */
-	    if (GET_THREAD()->fiber != cont->self) {
+	    if (GET_THREAD()->fiber != fib) {
                 rb_fiber_t *fib = (rb_fiber_t*)cont;
-                if (fib->context.uc_stack.ss_sp) {
+                if (fib->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);
+		    munmap((void*)fib->ss_sp, fib->ss_size);
 		}
 	    }
             else {
@@ -300,40 +304,26 @@ cont_memsize(const void *ptr)
     return size;
 }
 
+void
+rb_fiber_mark_self(rb_fiber_t *fib)
+{
+    if (fib)
+	rb_gc_mark(fib->cont.self);
+}
+
 static void
 fiber_mark(void *ptr)
 {
     RUBY_MARK_ENTER("cont");
     if (ptr) {
 	rb_fiber_t *fib = ptr;
-	rb_gc_mark(fib->prev);
+	rb_fiber_mark_self(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");
@@ -343,7 +333,6 @@ fiber_free(void *ptr)
 	    fib->cont.saved_thread.local_storage) {
 	    st_free_table(fib->cont.saved_thread.local_storage);
 	}
-	fiber_link_remove(fib);
 
 	cont_free(&fib->cont);
     }
@@ -424,21 +413,40 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
 static const rb_data_type_t cont_data_type = {
     "continuation",
     {cont_mark, cont_free, cont_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
-static void
+static inline void
 cont_save_thread(rb_context_t *cont, rb_thread_t *th)
 {
+    rb_thread_t *sth = &cont->saved_thread;
+
     /* save thread context */
-    cont->saved_thread = *th;
+    sth->stack = th->stack;
+    sth->stack_size = th->stack_size;
+    sth->local_storage = th->local_storage;
+    sth->cfp = th->cfp;
+    sth->safe_level = th->safe_level;
+    sth->raised_flag = th->raised_flag;
+    sth->state = th->state;
+    sth->status = th->status;
+    sth->tag = th->tag;
+    sth->protect_tag = th->protect_tag;
+    sth->errinfo = th->errinfo;
+    sth->first_proc = th->first_proc;
+    sth->root_lep = th->root_lep;
+    sth->root_svar = th->root_svar;
+    sth->ensure_list = th->ensure_list;
+
+    sth->trace_arg = th->trace_arg;
+
     /* saved_thread->machine.stack_(start|end) should be NULL */
     /* because it may happen GC afterward */
-    cont->saved_thread.machine.stack_start = 0;
-    cont->saved_thread.machine.stack_end = 0;
+    sth->machine.stack_start = 0;
+    sth->machine.stack_end = 0;
 #ifdef __ia64
-    cont->saved_thread.machine.register_stack_start = 0;
-    cont->saved_thread.machine.register_stack_end = 0;
+    sth->machine.register_stack_start = 0;
+    sth->machine.register_stack_end = 0;
 #endif
 }
 
@@ -447,7 +455,12 @@ cont_init(rb_context_t *cont, rb_thread_t *th)
 {
     /* save thread context */
     cont_save_thread(cont, th);
+    cont->saved_thread.self = th->self;
+    cont->saved_thread.machine.stack_maxsize = th->machine.stack_maxsize;
+    cont->saved_thread.fiber = th->fiber;
     cont->saved_thread.local_storage = 0;
+    cont->saved_thread.local_storage_recursive_hash = Qnil;
+    cont->saved_thread.local_storage_recursive_hash_for_trace = Qnil;
 }
 
 static rb_context_t *
@@ -466,19 +479,22 @@ cont_new(VALUE klass)
 
 static VALUE
 cont_capture(volatile int *stat)
+#if defined(__clang__) && \
+    __clang_major__ == 3 && __clang_minor__ == 8 && __clang_patch__ == 0
+__attribute__ ((optnone))
+#endif
 {
     rb_context_t *cont;
-    rb_thread_t *th = GET_THREAD(), *sth;
+    rb_thread_t *th = GET_THREAD();
     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_slen = th->cfp->sp - th->stack;
     cont->vm_stack_clen = th->stack + th->stack_size - (VALUE*)th->cfp;
     cont->vm_stack = ALLOC_N(VALUE, cont->vm_stack_slen + cont->vm_stack_clen);
     MEMCPY(cont->vm_stack, th->stack, VALUE, cont->vm_stack_slen);
@@ -487,7 +503,7 @@ cont_capture(volatile int *stat)
     cont->vm_stack = ALLOC_N(VALUE, th->stack_size);
     MEMCPY(cont->vm_stack, th->stack, VALUE, th->stack_size);
 #endif
-    sth->stack = 0;
+    cont->saved_thread.stack = 0;
 
     cont_save_machine_stack(th, cont);
 
@@ -510,6 +526,7 @@ cont_capture(volatile int *stat)
     if (ruby_setjmp(cont->jmpbuf)) {
 	volatile VALUE value;
 
+	VAR_INITIALIZED(cont);
 	value = cont->value;
 	if (cont->argc == -1) rb_exc_raise(value);
 	cont->value = Qnil;
@@ -522,7 +539,7 @@ cont_capture(volatile int *stat)
     }
 }
 
-static void
+static inline void
 cont_restore_thread(rb_context_t *cont)
 {
     rb_thread_t *th = GET_THREAD(), *sth = &cont->saved_thread;
@@ -530,16 +547,14 @@ cont_restore_thread(rb_context_t *cont)
     /* restore thread context */
     if (cont->type == CONTINUATION_CONTEXT) {
 	/* continuation */
-	VALUE fib;
+	rb_fiber_t *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;
+	    th->stack_size = fib->cont.saved_thread.stack_size;
+	    th->stack = fib->cont.saved_thread.stack;
 	}
 #ifdef CAPTURE_JUST_VALID_VM_STACK
 	MEMCPY(th->stack, cont->vm_stack, VALUE, cont->vm_stack_slen);
@@ -554,7 +569,9 @@ cont_restore_thread(rb_context_t *cont)
 	th->stack = sth->stack;
 	th->stack_size = sth->stack_size;
 	th->local_storage = sth->local_storage;
-	th->fiber = cont->self;
+	th->local_storage_recursive_hash = sth->local_storage_recursive_hash;
+	th->local_storage_recursive_hash_for_trace = sth->local_storage_recursive_hash_for_trace;
+	th->fiber = (rb_fiber_t*)cont;
     }
 
     th->cfp = sth->cfp;
@@ -667,6 +684,8 @@ fiber_initialize_machine_stack_context(rb_fiber_t *fib, size_t size)
     context->uc_link = NULL;
     context->uc_stack.ss_sp = ptr;
     context->uc_stack.ss_size = size;
+    fib->ss_sp = ptr;
+    fib->ss_size = size;
     makecontext(context, rb_fiber_start, 0);
     sth->machine.stack_start = (VALUE*)(ptr + STACK_DIR_UPPER(0, size));
     sth->machine.stack_maxsize = size - RB_PAGE_SIZE;
@@ -713,7 +732,7 @@ fiber_setcontext(rb_fiber_t *newfib, rb_fiber_t *oldfib)
     /* 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) {
+    if (!newfib->context.uc_stack.ss_sp && th->root_fiber != newfib) {
 	rb_bug("non_root_fiber->context.uc_stac.ss_sp should not be NULL");
     }
 #endif
@@ -929,7 +948,7 @@ rb_callcc(VALUE self)
 }
 
 static VALUE
-make_passing_arg(int argc, VALUE *argv)
+make_passing_arg(int argc, const VALUE *argv)
 {
     switch (argc) {
       case 0:
@@ -1045,9 +1064,6 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
 	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");
 	}
@@ -1081,7 +1097,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
  *  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
+ *  When a fiber is created it will not run automatically. Rather it must
  *  be explicitly asked to run using the <code>Fiber#resume</code> method.
  *  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
@@ -1133,7 +1149,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
 static const rb_data_type_t fiber_data_type = {
     "fiber",
     {fiber_mark, fiber_free, fiber_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
@@ -1153,12 +1169,11 @@ fiber_t_alloc(VALUE fibval)
     }
 
     THREAD_MUST_BE_RUNNING(th);
-    fib = ALLOC(rb_fiber_t);
-    memset(fib, 0, sizeof(rb_fiber_t));
+    fib = ZALLOC(rb_fiber_t);
     fib->cont.self = fibval;
     fib->cont.type = FIBER_CONTEXT;
     cont_init(&fib->cont, th);
-    fib->prev = Qnil;
+    fib->prev = NULL;
     fib->status = CREATED;
 
     DATA_PTR(fibval) = fib;
@@ -1172,6 +1187,7 @@ 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;
+    rb_thread_t *cth = GET_THREAD();
 
     /* initialize cont */
     cont->vm_stack = 0;
@@ -1179,9 +1195,7 @@ fiber_init(VALUE fibval, VALUE proc)
     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_size = cth->vm->default_params.fiber_vm_stack_size / sizeof(VALUE);
     th->stack = ALLOC_N(VALUE, th->stack_size);
 
     th->cfp = (void *)(th->stack + th->stack_size);
@@ -1202,11 +1216,13 @@ fiber_init(VALUE fibval, VALUE proc)
     th->cfp->me = 0;
     th->tag = 0;
     th->local_storage = st_init_numtable();
+    th->local_storage_recursive_hash = Qnil;
+    th->local_storage_recursive_hash_for_trace = Qnil;
 
     th->first_proc = proc;
 
 #if !FIBER_USE_NATIVE
-    MEMCPY(&cont->jmpbuf, &th->root_jmpbuf, rb_jmpbuf_t, 1);
+    MEMCPY(&cont->jmpbuf, &cth->root_jmpbuf, rb_jmpbuf_t, 1);
 #endif
 
     return fibval;
@@ -1225,61 +1241,19 @@ 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);
-}
+static void rb_fiber_terminate(rb_fiber_t *fib);
 
 void
 rb_fiber_start(void)
 {
     rb_thread_t *th = GET_THREAD();
-    rb_fiber_t *fib;
-    rb_context_t *cont;
+    rb_fiber_t *fib = th->fiber;
     rb_proc_t *proc;
     int state;
 
-    GetFiberPtr(th->fiber, fib);
-    cont = &fib->cont;
-
     TH_PUSH_TAG(th);
     if ((state = EXEC_TAG()) == 0) {
+	rb_context_t *cont = &VAR_FROM_MEMORY(fib)->cont;
 	int argc;
 	const VALUE *argv, args = cont->value;
 	GetProcPtr(cont->saved_thread.first_proc, proc);
@@ -1323,90 +1297,117 @@ root_fiber_alloc(rb_thread_t *th)
 #endif
 #endif
     fib->status = RUNNING;
-    fib->prev_fiber = fib->next_fiber = fib;
 
     return fib;
 }
 
-VALUE
-rb_fiber_current(void)
+static inline rb_fiber_t*
+fiber_current(void)
 {
     rb_thread_t *th = GET_THREAD();
     if (th->fiber == 0) {
 	/* save root */
 	rb_fiber_t *fib = root_fiber_alloc(th);
-	th->root_fiber = th->fiber = fib->cont.self;
+	th->root_fiber = th->fiber = fib;
     }
     return th->fiber;
 }
 
-static VALUE
-fiber_store(rb_fiber_t *next_fib)
+static inline rb_fiber_t*
+return_fiber(void)
+{
+    rb_fiber_t *fib = fiber_current();
+    rb_fiber_t *prev = fib->prev;
+
+    if (!prev) {
+	rb_fiber_t *root_fiber = GET_THREAD()->root_fiber;
+
+	if (root_fiber == fib) {
+	    rb_raise(rb_eFiberError, "can't yield from root fiber");
+	}
+	return root_fiber;
+    }
+    else {
+	fib->prev = NULL;
+	return prev;
+    }
+}
+
+VALUE
+rb_fiber_current(void)
+{
+    return fiber_current()->cont.self;
+}
+
+static inline VALUE
+fiber_store(rb_fiber_t *next_fib, rb_thread_t *th)
 {
-    rb_thread_t *th = GET_THREAD();
     rb_fiber_t *fib;
 
     if (th->fiber) {
-	GetFiberPtr(th->fiber, fib);
+	fib = th->fiber;
 	cont_save_thread(&fib->cont, th);
     }
     else {
 	/* create current fiber */
 	fib = root_fiber_alloc(th);
-	th->root_fiber = th->fiber = fib->cont.self;
+	th->root_fiber = th->fiber = fib;
     }
 
-#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);
+    fiber_setcontext(next_fib, fib);
+    /* restored */
 #ifndef _WIN32
-	if (terminated_machine_stack.ptr) {
-	    if (machine_stack_cache_index < MAX_MACHINE_STACK_CACHE) {
-		machine_stack_cache[machine_stack_cache_index].ptr = terminated_machine_stack.ptr;
-		machine_stack_cache[machine_stack_cache_index].size = terminated_machine_stack.size;
-		machine_stack_cache_index++;
+    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 {
-		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");
-		}
+		rb_bug("terminated fiber resumed");
 	    }
-	    terminated_machine_stack.ptr = NULL;
-	    terminated_machine_stack.size = 0;
 	}
-#endif
-#endif
+	terminated_machine_stack.ptr = NULL;
+	terminated_machine_stack.size = 0;
+    }
+#endif /* not _WIN32 */
+    fib = th->fiber;
+    if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
+    return fib->cont.value;
+
+#else /* FIBER_USE_NATIVE */
+    cont_save_machine_stack(th, &fib->cont);
+    if (ruby_setjmp(fib->cont.jmpbuf)) {
 	/* restored */
-	GetFiberPtr(th->fiber, fib);
+	fib = th->fiber;
 	if (fib->cont.argc == -1) rb_exc_raise(fib->cont.value);
+	if (next_fib->cont.value == Qundef) {
+	    cont_restore_0(&next_fib->cont, &next_fib->cont.value);
+	    rb_bug("rb_fiber_resume: unreachable");
+	}
 	return fib->cont.value;
     }
-#if !FIBER_USE_NATIVE
     else {
-	return Qundef;
+	VALUE undef = Qundef;
+	cont_restore_0(&next_fib->cont, &undef);
+	rb_bug("rb_fiber_resume: unreachable");
     }
-#endif
+#endif /* FIBER_USE_NATIVE */
 }
 
 static inline VALUE
-fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
+fiber_switch(rb_fiber_t *fib, int argc, const VALUE *argv, int is_resume)
 {
     VALUE value;
-    rb_fiber_t *fib;
-    rb_context_t *cont;
+    rb_context_t *cont = &fib->cont;
     rb_thread_t *th = GET_THREAD();
 
-    GetFiberPtr(fibval, fib);
-    cont = &fib->cont;
-
-    if (th->fiber == fibval) {
+    if (th->fiber == fib) {
 	/* ignore fiber context switch
          * because destination fiber is same as current fiber
 	 */
@@ -1421,34 +1422,25 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
     }
     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;
+
+	if (th->fiber->status != TERMINATED) rb_exc_raise(value);
+
+	/* th->fiber is also dead => switch to root fiber */
+	/* (this means we're being called from rb_fiber_terminate, */
+	/* and the terminated fiber's return_fiber() is already dead) */
+	cont = &th->root_fiber->cont;
 	cont->argc = -1;
 	cont->value = value;
 #if FIBER_USE_NATIVE
-	{
-	    VALUE oldfibval;
-	    rb_fiber_t *oldfib;
-	    oldfibval = rb_fiber_current();
-	    GetFiberPtr(oldfibval, oldfib);
-	    fiber_setcontext(fib, oldfib);
-	}
+	fiber_setcontext(th->root_fiber, th->fiber);
 #else
 	cont_restore_0(cont, &value);
 #endif
+	/* unreachable */
     }
 
     if (is_resume) {
-	fib->prev = rb_fiber_current();
+	fib->prev = fiber_current();
     }
     else {
 	/* restore `tracing' context. see [Feature #4347] */
@@ -1458,56 +1450,67 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume)
     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
+    value = fiber_store(fib, th);
     RUBY_VM_CHECK_INTS(th);
 
     return value;
 }
 
 VALUE
-rb_fiber_transfer(VALUE fib, int argc, VALUE *argv)
+rb_fiber_transfer(VALUE fibval, int argc, const VALUE *argv)
 {
+    rb_fiber_t *fib;
+    GetFiberPtr(fibval, fib);
     return fiber_switch(fib, argc, argv, 0);
 }
 
+static void
+rb_fiber_terminate(rb_fiber_t *fib)
+{
+    VALUE value = fib->cont.value;
+    fib->status = TERMINATED;
+#if FIBER_USE_NATIVE && !defined(_WIN32)
+    /* Ruby must not switch to other thread until storing terminated_machine_stack */
+    terminated_machine_stack.ptr = fib->ss_sp;
+    terminated_machine_stack.size = fib->ss_size / sizeof(VALUE);
+    fib->ss_sp = NULL;
+    fib->context.uc_stack.ss_sp = NULL;
+    fib->cont.machine.stack = NULL;
+    fib->cont.machine.stack_size = 0;
+#endif
+    fiber_switch(return_fiber(), 1, &value, 0);
+}
+
 VALUE
-rb_fiber_resume(VALUE fibval, int argc, VALUE *argv)
+rb_fiber_resume(VALUE fibval, int argc, const VALUE *argv)
 {
     rb_fiber_t *fib;
     GetFiberPtr(fibval, fib);
 
-    if (fib->prev != Qnil || fib->cont.type == ROOT_FIBER_CONTEXT) {
+    if (fib->prev != 0 || fib->cont.type == ROOT_FIBER_CONTEXT) {
 	rb_raise(rb_eFiberError, "double resume");
     }
-    if (fib->transfered != 0) {
+    if (fib->transferred != 0) {
 	rb_raise(rb_eFiberError, "cannot resume transferred Fiber");
     }
 
-    return fiber_switch(fibval, argc, argv, 1);
+    return fiber_switch(fib, argc, argv, 1);
 }
 
 VALUE
-rb_fiber_yield(int argc, VALUE *argv)
+rb_fiber_yield(int argc, const VALUE *argv)
 {
-    return rb_fiber_transfer(return_fiber(), argc, argv);
+    return fiber_switch(return_fiber(), argc, argv, 0);
 }
 
 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;
+	th->local_storage = th->root_fiber->cont.saved_thread.local_storage;
     }
 }
 
@@ -1587,7 +1590,7 @@ rb_fiber_m_resume(int argc, VALUE *argv, VALUE fib)
  *    fiber2.resume
  *    fiber3.resume
  *
- *    <em>produces</em>
+ *  <em>produces</em>
  *
  *    In fiber 2
  *    In fiber 1
@@ -1599,8 +1602,8 @@ 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);
+    fib->transferred = 1;
+    return fiber_switch(fib, argc, argv, 0);
 }
 
 /*
diff --git a/coverage/README b/coverage/README
new file mode 100644
index 0000000000..7e4ff59e2a
--- /dev/null
+++ b/coverage/README
@@ -0,0 +1,17 @@
+Usage
+
+The make task `update-coverage' retrieves simplecov for coverage report.
+
+COVERAGE=1 make test-all TESTS=test/cgi
+
+it generate test coverage to coverage directory.
+
+Limitation
+
+ * test_coverage.rb and test_process.rb broke test suit with SimpleCov
+ * some tests failed randomly.
+
+TODO
+
+ * more reduce bundled simplecov(additional configuration, formatter, etc)
+ * measure rubyspec coverage
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in
index 5bd414d786..768a1b6b7f 100644
--- a/cygwin/GNUmakefile.in
+++ b/cygwin/GNUmakefile.in
@@ -33,7 +33,7 @@ WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 -include uncommon.mk
 
 SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
-EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
+override EXTOBJS += $(if $(filter-out $(RUBYW_INSTALL_NAME),$(@:$(EXEEXT)=)),$(RUBY_INSTALL_NAME),$(@:$(EXEEXT)=)).res.$(OBJEXT)
 RCFILES = $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc
 RUBYDEF = $(DLL_BASE_NAME).def
 
diff --git a/debug.c b/debug.c
index 2f1e03cc3a..b526ab9523 100644
--- a/debug.c
+++ b/debug.c
@@ -33,8 +33,9 @@ const union {
         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_PROMOTED0   = FL_PROMOTED0,
+        RUBY_FL_PROMOTED1   = FL_PROMOTED1,
+        RUBY_FL_PROMOTED    = FL_PROMOTED0|FL_PROMOTED1,
         RUBY_FL_FINALIZE    = FL_FINALIZE,
         RUBY_FL_TAINT       = FL_TAINT,
         RUBY_FL_EXIVAR      = FL_EXIVAR,
@@ -114,7 +115,7 @@ 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));
+	fprintf(stderr, "DBG> %s: %"PRIsVALUE"\n", header, rb_id2str(id));
 	fflush(stderr);
     }
     return id;
@@ -139,18 +140,20 @@ ruby_debug_breakpoint(void)
 static void
 set_debug_option(const char *str, int len, void *arg)
 {
-#define SET_WHEN(name, var) do {	    \
+#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
+    extern int ruby_w32_rtc_error;
+#endif
+#define SET_WHEN(name, var, val) do {	    \
 	if (len == sizeof(name) - 1 &&	    \
 	    strncmp(str, (name), len) == 0) { \
-	    extern int var;	    \
-	    var = 1;		    \
+	    (var) = (val);		    \
 	    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);
+    SET_WHEN("gc_stress", *ruby_initial_gc_stress_ptr, Qtrue);
+    SET_WHEN("core", ruby_enable_coredump, 1);
+#if defined _WIN32 && RUBY_MSVCRT_VERSION >= 80
+    SET_WHEN("rtc_error", ruby_w32_rtc_error, 1);
 #endif
     fprintf(stderr, "unexpected debug option: %.*s\n", len, str);
 }
diff --git a/defs/default_gems b/defs/default_gems
index e73e383b26..ce9010910a 100644
--- a/defs/default_gems
+++ b/defs/default_gems
@@ -1,5 +1,4 @@
 # gem		base directory		versioning file			[executable files under bin]
-rake		lib/rake		lib/rake/version.rb		[rake]
+rake		lib/rake		lib/rake.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
index 0acb88ef57..f5033b2245 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -1,19 +1,45 @@
 # -*- makefile-gmake -*-
+gnumake = yes
+
 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)
+TEST_DEPENDS += $(if $(filter all,$(INSTALLDOC)),docs)
+
+ifneq ($(filter -O0 -Od,$(optflags)),)
+override XCFLAGS := $(filter-out -D_FORTIFY_SOURCE=%,$(XCFLAGS))
+endif
+
+ifneq ($(filter universal-%,$(arch)),)
+define archcmd
+%.$(1).S: %.c
+	@$$(ECHO) translating $$< with $(2)
+	$$(Q) $$(CC) $$(CFLAGS_NO_ARCH) $(2) $$(XCFLAGS) $$(CPPFLAGS) $$(COUTFLAG)$$@ -S $$<
+
+%.S: %.$(1).S
+
+%.$(1).i: %.c
+	@$$(ECHO) preprocessing $$< with $(2)
+	$$(Q) $$(CPP) $$(warnflags) $(2) $$(XCFLAGS) $$(CPPFLAGS) $$(COUTFLAG)$$@ -E $$< > $$@
 
-ifneq ($(filter check% test,$(MAKECMDGOALS)),)
+%.i: %.$(1).i
+endef
+
+$(foreach arch,$(filter -arch=%,$(subst -arch ,-arch=,$(ARCH_FLAG))),\
+	$(eval $(call archcmd,$(patsubst -arch=%,%,$(value arch)),$(patsubst -arch=%,-arch %,$(value arch)))))
+endif
+
+ifneq ($(filter love 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)),)
+ifneq ($(filter love 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))),)
+ifneq ($(filter love check%,$(MAKECMDGOALS))$(if $(filter test-all,$(MAKECMDGOALS)),$(filter test-knownbug,$(MAKECMDGOALS))),)
 yes-test-all yes-test-ruby: yes-test-knownbug
 endif
 
@@ -25,5 +51,13 @@ $(word 1,$(install-targets)): $(word 0,$(install-targets))
 endif
 
 ifneq ($(filter reinstall,$(MAKECMDGOALS)),)
-install: uninstall
+install-prereq: uninstall
+uninstall sudo-precheck: all $(if $(filter all,$(INSTALLDOC)),docs)
+endif
+
+ifneq ($(filter love,$(MAKECMDGOALS)),)
+showflags: up
+sudo-precheck: test
+install-prereq: sudo-precheck
+yes-test-all no-test-all: install
 endif
diff --git a/defs/id.def b/defs/id.def
index 53ed3775ad..d4cd5e77de 100644
--- a/defs/id.def
+++ b/defs/id.def
@@ -26,6 +26,22 @@ firstline, predefined = __LINE__+1, %[\
   initialize_copy
   initialize_clone
   initialize_dup
+  to_int
+  to_ary
+  to_str
+  to_sym
+  to_hash
+  to_proc
+  to_io
+  to_a
+  to_s
+  to_i
+  bt
+  bt_locations
+  call
+  mesg
+  exception
+
   _                                                     UScore
   "/*NULL*/"                                            NULL
   empty?
@@ -59,6 +75,7 @@ instance_ids = []
 global_ids = []
 const_ids = []
 class_ids = []
+attrset_ids = []
 names = {}
 predefined.split(/^/).each_with_index do |line, num|
   next if /^#/ =~ line
@@ -88,8 +105,7 @@ predefined.split(/^/).each_with_index do |line, num|
   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)
+  when /\A((?!\d)\w+)=\z/; attrset_ids
   else preserved_ids
   end << token
   predefined_ids[token] = name
@@ -100,6 +116,7 @@ end
   "GLOBAL" => global_ids,
   "CONST" => const_ids,
   "CLASS" => class_ids,
+  "ATTRSET" => attrset_ids,
   :preserved => preserved_ids,
   :predefined => predefined_ids,
 }
diff --git a/defs/keywords b/defs/keywords
index 1b5719aa85..0d4d70b8cf 100644
--- a/defs/keywords
+++ b/defs/keywords
@@ -13,7 +13,7 @@ __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
+alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM
 and, {keyword_and, keyword_and}, EXPR_VALUE
 begin, {keyword_begin, keyword_begin}, EXPR_BEG
 break, {keyword_break, keyword_break}, EXPR_MID
@@ -43,7 +43,7 @@ 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
+undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM
 unless, {keyword_unless, modifier_unless}, EXPR_VALUE
 until, {keyword_until, modifier_until}, EXPR_VALUE
 when, {keyword_when, keyword_when}, EXPR_VALUE
diff --git a/defs/known_errors.def b/defs/known_errors.def
index 3cebe90a8e..b9c490d3a2 100644
--- a/defs/known_errors.def
+++ b/defs/known_errors.def
@@ -143,3 +143,6 @@ EPROGMISMATCH
 EPROGUNAVAIL
 ERPCMISMATCH
 EIPSEC
+EHWPOISON
+ECAPMODE
+ENOTCAPABLE
diff --git a/defs/lex.c.src b/defs/lex.c.src
index 1b5719aa85..0d4d70b8cf 100644
--- a/defs/lex.c.src
+++ b/defs/lex.c.src
@@ -13,7 +13,7 @@ __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
+alias, {keyword_alias, keyword_alias}, EXPR_FNAME|EXPR_FITEM
 and, {keyword_and, keyword_and}, EXPR_VALUE
 begin, {keyword_begin, keyword_begin}, EXPR_BEG
 break, {keyword_break, keyword_break}, EXPR_MID
@@ -43,7 +43,7 @@ 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
+undef, {keyword_undef, keyword_undef}, EXPR_FNAME|EXPR_FITEM
 unless, {keyword_unless, modifier_unless}, EXPR_VALUE
 until, {keyword_until, modifier_until}, EXPR_VALUE
 when, {keyword_when, keyword_when}, EXPR_VALUE
diff --git a/dir.c b/dir.c
index 4f62cb2125..84413c6b57 100644
--- a/dir.c
+++ b/dir.c
@@ -11,8 +11,6 @@
 
 **********************************************************************/
 
-#include "ruby/ruby.h"
-#include "ruby/encoding.h"
 #include "internal.h"
 
 #include <sys/types.h>
@@ -73,24 +71,63 @@ char *strchr(char*,char);
 #define rmdir(p) rb_w32_urmdir(p)
 #undef opendir
 #define opendir(p) rb_w32_uopendir(p)
+#define IS_WIN32 1
+#else
+#define IS_WIN32 0
+#endif
+
+#ifdef HAVE_SYS_ATTR_H
+#include <sys/attr.h>
+#endif
+
+#ifdef HAVE_GETATTRLIST
+# define USE_NAME_ON_FS 1
+# define RUP32(size) ((size)+3/4)
+# define SIZEUP32(type) RUP32(sizeof(type))
+#elif defined _WIN32
+# define USE_NAME_ON_FS 1
+#elif defined DOSISH
+# define USE_NAME_ON_FS 2	/* by fnmatch */
+#else
+# define USE_NAME_ON_FS 0
 #endif
 
 #ifdef __APPLE__
-# define HAVE_HFS 1
+# define NORMALIZE_UTF8PATH 1
 #else
-# define HAVE_HFS 0
+# define NORMALIZE_UTF8PATH 0
 #endif
-#if HAVE_HFS
+
+#if NORMALIZE_UTF8PATH
 #include <sys/param.h>
 #include <sys/mount.h>
+#include <sys/vnode.h>
 
+# if defined HAVE_FGETATTRLIST || !defined HAVE_GETATTRLIST
+#   define need_normalization(dirp, path) need_normalization(dirp)
+# else
+#   define need_normalization(dirp, path) need_normalization(path)
+# endif
 static inline int
-is_hfs(DIR *dirp)
-{
-    struct statfs buf;
-    if (fstatfs(dirfd(dirp), &buf) == 0) {
-	return buf.f_type == 17; /* HFS on darwin */
+need_normalization(DIR *dirp, const char *path)
+{
+# if defined HAVE_FGETATTRLIST || defined HAVE_GETATTRLIST
+    u_int32_t attrbuf[SIZEUP32(fsobj_tag_t)];
+    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_OBJTAG,};
+#   if defined HAVE_FGETATTRLIST
+    int ret = fgetattrlist(dirfd(dirp), &al, attrbuf, sizeof(attrbuf), 0);
+#   else
+    int ret = getattrlist(path, &al, attrbuf, sizeof(attrbuf), 0);
+#   endif
+    if (!ret) {
+	const fsobj_tag_t *tag = (void *)(attrbuf+1);
+	switch (*tag) {
+	  case VT_HFS:
+	  case VT_CIFS:
+	    return TRUE;
+	}
     }
+# endif
     return FALSE;
 }
 
@@ -105,9 +142,9 @@ has_nonascii(const char *ptr, size_t len)
     return 0;
 }
 
-# define IF_HAVE_HFS(something) something
+# define IF_NORMALIZE_UTF8PATH(something) something
 #else
-# define IF_HAVE_HFS(something) /* nothing */
+# define IF_NORMALIZE_UTF8PATH(something) /* nothing */
 #endif
 
 #define FNM_NOESCAPE	0x01
@@ -381,7 +418,7 @@ dir_memsize(const void *ptr)
 static const rb_data_type_t dir_data_type = {
     "dir",
     {dir_mark, dir_free, dir_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE dir_close(VALUE);
@@ -425,6 +462,7 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
     rb_encoding  *fsenc;
     VALUE dirname, opt, orig;
     static ID keyword_ids[1];
+    const char *path;
 
     if (!keyword_ids[0]) {
 	keyword_ids[0] = rb_intern("encoding");
@@ -452,13 +490,24 @@ dir_initialize(int argc, VALUE *argv, VALUE dir)
     dp->dir = NULL;
     dp->path = Qnil;
     dp->enc = fsenc;
-    dp->dir = opendir(RSTRING_PTR(dirname));
+    path = RSTRING_PTR(dirname);
+    dp->dir = opendir(path);
     if (dp->dir == NULL) {
 	if (errno == EMFILE || errno == ENFILE) {
 	    rb_gc();
-	    dp->dir = opendir(RSTRING_PTR(dirname));
+	    dp->dir = opendir(path);
+	}
+#ifdef HAVE_GETATTRLIST
+	else if (errno == EIO) {
+	    u_int32_t attrbuf[1];
+	    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0};
+	    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW) == 0) {
+		dp->dir = opendir(path);
+	    }
 	}
+#endif
 	if (dp->dir == NULL) {
+	    RB_GC_GUARD(dirname);
 	    rb_sys_fail_path(orig);
 	}
     }
@@ -539,6 +588,37 @@ dir_inspect(VALUE dir)
     return rb_funcall(dir, rb_intern("to_s"), 0, 0);
 }
 
+#ifdef HAVE_DIRFD
+/*
+ *  call-seq:
+ *     dir.fileno -> integer
+ *
+ *  Returns the file descriptor used in <em>dir</em>.
+ *
+ *     d = Dir.new("..")
+ *     d.fileno   #=> 8
+ *
+ *  This method uses dirfd() function defined by POSIX 2008.
+ *  NotImplementedError is raised on other platforms, such as Windows,
+ *  which doesn't provide the function.
+ *
+ */
+static VALUE
+dir_fileno(VALUE dir)
+{
+    struct dir_data *dirp;
+    int fd;
+
+    GetDIR(dir, dirp);
+    fd = dirfd(dirp->dir);
+    if (fd == -1)
+	rb_sys_fail("dirfd");
+    return INT2NUM(fd);
+}
+#else
+#define dir_fileno rb_f_notimplement
+#endif
+
 /*
  *  call-seq:
  *     dir.path -> string or nil
@@ -619,18 +699,18 @@ dir_each(VALUE dir)
 {
     struct dir_data *dirp;
     struct dirent *dp;
-    IF_HAVE_HFS(int hfs_p);
+    IF_NORMALIZE_UTF8PATH(int norm_p);
 
     RETURN_ENUMERATOR(dir, 0, 0);
     GetDIR(dir, dirp);
     rewinddir(dirp->dir);
-    IF_HAVE_HFS(hfs_p = is_hfs(dirp->dir));
+    IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp->dir, RSTRING_PTR(dirp->path)));
     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) &&
+#if NORMALIZE_UTF8PATH
+	if (norm_p && has_nonascii(name, namlen) &&
 	    !NIL_P(path = rb_str_normalize_ospath(name, namlen))) {
 	    path = rb_external_str_with_enc(path, dirp->enc);
 	}
@@ -1011,19 +1091,49 @@ dir_s_rmdir(VALUE obj, VALUE dir)
     return INT2FIX(0);
 }
 
+struct warning_args {
+#ifdef RUBY_FUNCTION_NAME_STRING
+    const char *func;
+#endif
+    const char *mesg;
+    rb_encoding *enc;
+};
+
+#ifndef RUBY_FUNCTION_NAME_STRING
+#define sys_enc_warning_in(func, mesg, enc) sys_enc_warning(mesg, enc)
+#endif
+
 static VALUE
 sys_warning_1(VALUE mesg)
 {
-    rb_sys_warning("%s:%s", strerror(errno), (const char *)mesg);
+    const struct warning_args *arg = (struct warning_args *)mesg;
+#ifdef RUBY_FUNCTION_NAME_STRING
+    rb_sys_enc_warning(arg->enc, "%s: %s", arg->func, arg->mesg);
+#else
+    rb_sys_enc_warning(arg->enc, "%s", arg->mesg);
+#endif
     return Qnil;
 }
 
+static void
+sys_enc_warning_in(const char *func, const char *mesg, rb_encoding *enc)
+{
+    struct warning_args arg;
+#ifdef RUBY_FUNCTION_NAME_STRING
+    arg.func = func;
+#endif
+    arg.mesg = mesg;
+    arg.enc = enc;
+    rb_protect(sys_warning_1, (VALUE)&arg, 0);
+}
+
 #define GLOB_VERBOSE	(1U << (sizeof(int) * CHAR_BIT - 1))
-#define sys_warning(val) \
-    (void)((flags & GLOB_VERBOSE) && rb_protect(sys_warning_1, (VALUE)(val), 0))
+#define sys_warning(val, enc) \
+    ((flags & GLOB_VERBOSE) ? sys_enc_warning_in(RUBY_FUNCTION_NAME_STRING, (val), (enc)) :(void)0)
 
 #define GLOB_ALLOC(type) ((type *)malloc(sizeof(type)))
 #define GLOB_ALLOC_N(type, n) ((type *)malloc(sizeof(type) * (n)))
+#define GLOB_REALLOC(ptr, size) realloc((ptr), (size))
 #define GLOB_FREE(ptr) free(ptr)
 #define GLOB_JUMP_TAG(status) (((status) == -1) ? rb_memerror() : rb_jump_tag(status))
 
@@ -1041,23 +1151,22 @@ sys_warning_1(VALUE mesg)
 
 /* System call with warning */
 static int
-do_stat(const char *path, struct stat *pst, int flags)
-
+do_stat(const char *path, struct stat *pst, int flags, rb_encoding *enc)
 {
     int ret = STAT(path, pst);
     if (ret < 0 && !to_be_ignored(errno))
-	sys_warning(path);
+	sys_warning(path, enc);
 
     return ret;
 }
 
 #if defined HAVE_LSTAT || defined lstat
 static int
-do_lstat(const char *path, struct stat *pst, int flags)
+do_lstat(const char *path, struct stat *pst, int flags, rb_encoding *enc)
 {
     int ret = lstat(path, pst);
     if (ret < 0 && !to_be_ignored(errno))
-	sys_warning(path);
+	sys_warning(path, enc);
 
     return ret;
 }
@@ -1070,7 +1179,7 @@ do_opendir(const char *path, int flags, rb_encoding *enc)
 {
     DIR *dirp;
 #ifdef _WIN32
-    volatile VALUE tmp;
+    VALUE tmp = 0;
     if (enc != rb_usascii_encoding() &&
 	enc != rb_ascii8bit_encoding() &&
 	enc != rb_utf8_encoding()) {
@@ -1081,17 +1190,23 @@ do_opendir(const char *path, int flags, rb_encoding *enc)
 #endif
     dirp = opendir(path);
     if (dirp == NULL && !to_be_ignored(errno))
-	sys_warning(path);
+	sys_warning(path, enc);
+#ifdef _WIN32
+    if (tmp) rb_str_resize(tmp, 0); /* GC guard */
+#endif
 
     return dirp;
 }
 
+/* Globing pattern */
+enum glob_pattern_type { PLAIN, ALPHA, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
+
 /* Return nonzero if S has any special globbing chars in it.  */
-static int
+static enum glob_pattern_type
 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;
+    int hasalpha = 0;
 
     register char c;
 
@@ -1100,22 +1215,32 @@ has_magic(const char *p, const char *pend, int flags, rb_encoding *enc)
 	  case '*':
 	  case '?':
 	  case '[':
-	    return 1;
+	    return MAGICAL;
 
 	  case '\\':
-	    if (escape && !(c = *p++))
-		return 0;
-	    continue;
+	    if (escape && p++ >= pend)
+		continue;
+	    break;
+
+#ifdef _WIN32
+	  case '.':
+	    break;
 
+	  case '~':
+	    hasalpha = 1;
+	    break;
+#endif
 	  default:
-	    if (!FNM_SYSCASE && ISALPHA(c) && nocase)
-		return 1;
+	    if (IS_WIN32 || ISALPHA(c)) {
+		hasalpha = 1;
+	    }
+	    break;
 	}
 
 	p = Next(p-1, pend, enc);
     }
 
-    return 0;
+    return hasalpha ? ALPHA : PLAIN;
 }
 
 /* Find separator in globbing pattern. */
@@ -1179,9 +1304,6 @@ remove_backslashes(char *p, register const char *pend, rb_encoding *enc)
     return p;
 }
 
-/* Globing pattern */
-enum glob_pattern_type { PLAIN, MAGICAL, RECURSIVE, MATCH_ALL, MATCH_DIR };
-
 struct glob_pattern {
     char *str;
     enum glob_pattern_type type;
@@ -1200,7 +1322,7 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
     while (p < e && *p) {
 	tmp = GLOB_ALLOC(struct glob_pattern);
 	if (!tmp) goto error;
-	if (p[0] == '*' && p[1] == '*' && p[2] == '/') {
+	if (p + 2 < e && p[0] == '*' && p[1] == '*' && p[2] == '/') {
 	    /* fold continuous RECURSIVEs (needed in glob_helper) */
 	    do { p += 3; while (*p == '/') p++; } while (p[0] == '*' && p[1] == '*' && p[2] == '/');
 	    tmp->type = RECURSIVE;
@@ -1210,12 +1332,13 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
 	}
 	else {
 	    const char *m = find_dirsep(p, e, flags, enc);
-	    const int magic = has_magic(p, m, flags, enc);
+	    const enum glob_pattern_type magic = has_magic(p, m, flags, enc);
+	    const enum glob_pattern_type non_magic = (USE_NAME_ON_FS || FNM_SYSCASE) ? PLAIN : ALPHA;
 	    char *buf;
 
-	    if (!(FNM_SYSCASE || HAVE_HFS || magic) && !recursive && *m) {
+	    if (!(FNM_SYSCASE || magic > non_magic) && !recursive && *m) {
 		const char *m2;
-		while (!has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) &&
+		while (has_magic(m+1, m2 = find_dirsep(m+1, e, flags, enc), flags, enc) <= non_magic &&
 		       *m2) {
 		    m = m2;
 		}
@@ -1227,7 +1350,7 @@ glob_make_pattern(const char *p, const char *e, int flags, rb_encoding *enc)
 	    }
 	    memcpy(buf, p, m-p);
 	    buf[m-p] = '\0';
-	    tmp->type = magic ? MAGICAL : PLAIN;
+	    tmp->type = magic > MAGICAL ? MAGICAL : magic > non_magic ? magic : PLAIN;
 	    tmp->str = buf;
 	    if (*m) {
 		dirsep = 1;
@@ -1284,6 +1407,124 @@ join_path(const char *path, long len, int dirsep, const char *name, size_t namle
     return buf;
 }
 
+#ifdef HAVE_GETATTRLIST
+static int
+is_case_sensitive(DIR *dirp)
+{
+    u_int32_t attrbuf[SIZEUP32(vol_capabilities_attr_t) + 1];
+    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, 0, ATTR_VOL_INFO|ATTR_VOL_CAPABILITIES};
+    const vol_capabilities_attr_t *cap = (void *)(attrbuf+1);
+    const int idx = VOL_CAPABILITIES_FORMAT;
+    const uint32_t mask = VOL_CAP_FMT_CASE_SENSITIVE;
+    struct statfs sf;
+
+    if (fstatfs(dirfd(dirp), &sf)) return -1;
+    if (getattrlist(sf.f_mntonname, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
+	return -1;
+    if (!(cap->valid[idx] & mask))
+	return -1;
+    return (cap->capabilities[idx] & mask) != 0;
+}
+
+static char *
+replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p)
+{
+    u_int32_t attrbuf[SIZEUP32(attrreference_t) + RUP32(MAXPATHLEN * 3) + 1];
+    struct attrlist al = {ATTR_BIT_MAP_COUNT, 0, ATTR_CMN_NAME};
+    const attrreference_t *ar = (void *)(attrbuf+1);
+    const char *name;
+    long len;
+    char *tmp;
+    IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
+
+    if (getattrlist(path, &al, attrbuf, sizeof(attrbuf), FSOPT_NOFOLLOW))
+	return path;
+
+    name = (char *)ar + ar->attr_dataoffset;
+    len = (long)ar->attr_length - 1;
+    if (name + len > (char *)attrbuf + sizeof(attrbuf))
+	return path;
+
+# if NORMALIZE_UTF8PATH
+    if (norm_p && has_nonascii(name, len)) {
+	if (!NIL_P(utf8str = rb_str_normalize_ospath(name, len))) {
+	    RSTRING_GETMEM(utf8str, name, len);
+	}
+    }
+# endif
+
+    tmp = GLOB_REALLOC(path, base + len + 1);
+    if (tmp) {
+	path = tmp;
+	memcpy(path + base, name, len);
+	path[base + len] = '\0';
+    }
+    IF_NORMALIZE_UTF8PATH(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
+    return path;
+}
+#elif defined _WIN32
+VALUE rb_w32_conv_from_wchar(const WCHAR *wstr, rb_encoding *enc);
+
+static char *
+replace_real_basename(char *path, long base, rb_encoding *enc, int norm_p)
+{
+    char *plainname = path;
+    volatile VALUE tmp = 0;
+    WIN32_FIND_DATAW fd;
+    WIN32_FILE_ATTRIBUTE_DATA fa;
+    WCHAR *wplain;
+    HANDLE h = INVALID_HANDLE_VALUE;
+    long wlen;
+    if (enc &&
+	enc != rb_usascii_encoding() &&
+	enc != rb_ascii8bit_encoding() &&
+	enc != rb_utf8_encoding()) {
+	tmp = rb_enc_str_new_cstr(plainname, enc);
+	tmp = rb_str_encode_ospath(tmp);
+	plainname = RSTRING_PTR(tmp);
+    }
+    wplain = rb_w32_mbstr_to_wstr(CP_UTF8, plainname, -1, &wlen);
+    if (tmp) rb_str_resize(tmp, 0);
+    if (!wplain) return path;
+    if (GetFileAttributesExW(wplain, GetFileExInfoStandard, &fa))
+	h = FindFirstFileW(wplain, &fd);
+    free(wplain);
+    if (h == INVALID_HANDLE_VALUE) return path;
+    FindClose(h);
+    if (tmp) {
+	char *buf;
+	tmp = rb_w32_conv_from_wchar(fd.cFileName, enc);
+	wlen = RSTRING_LEN(tmp);
+	buf = GLOB_REALLOC(path, base + wlen + 1);
+	if (buf) {
+	    path = buf;
+	    memcpy(path + base, RSTRING_PTR(tmp), wlen);
+	    path[base + wlen] = 0;
+	}
+	rb_str_resize(tmp, 0);
+    }
+    else {
+	char *utf8filename;
+	wlen = WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, NULL, 0, NULL, NULL);
+	utf8filename = GLOB_REALLOC(0, wlen);
+	if (utf8filename) {
+	    char *buf;
+	    WideCharToMultiByte(CP_UTF8, 0, fd.cFileName, -1, utf8filename, wlen, NULL, NULL);
+	    buf = GLOB_REALLOC(path, base + wlen + 1);
+	    if (buf) {
+		path = buf;
+		memcpy(path + base, utf8filename, wlen);
+		path[base + wlen] = 0;
+	    }
+	    GLOB_FREE(utf8filename);
+	}
+    }
+    return path;
+}
+#elif USE_NAME_ON_FS == 1
+# error not implemented
+#endif
+
 enum answer {UNKNOWN = -1, NO, YES};
 
 #ifndef S_ISDIR
@@ -1305,17 +1546,17 @@ struct glob_args {
     rb_encoding *enc;
 };
 
+#define glob_call_func(func, path, arg, enc) (*(func))((path), (arg), (void *)(enc))
+
 static VALUE
 glob_func_caller(VALUE val)
 {
     struct glob_args *args = (struct glob_args *)val;
 
-    (*args->func)(args->path, args->value, args->enc);
+    glob_call_func(args->func, args->path, args->value, args->enc);
     return Qnil;
 }
 
-#define glob_call_func(func, path, arg, enc) (*(func))((path), (arg), (enc))
-
 static int
 glob_helper(
     const char *path,
@@ -1346,8 +1587,15 @@ glob_helper(
 	  case PLAIN:
 	    plain = 1;
 	    break;
-	  case MAGICAL:
+	  case ALPHA:
+#if USE_NAME_ON_FS == 1
+	    plain = 1;
+#else
 	    magical = 1;
+#endif
+	    break;
+	  case MAGICAL:
+	    magical = 2;
 	    break;
 	  case MATCH_ALL:
 	    match_all = 1;
@@ -1363,7 +1611,7 @@ glob_helper(
     pathlen = strlen(path);
     if (*path) {
 	if (match_all && exist == UNKNOWN) {
-	    if (do_lstat(path, &st, flags) == 0) {
+	    if (do_lstat(path, &st, flags, enc) == 0) {
 		exist = YES;
 		isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
 	    }
@@ -1373,7 +1621,7 @@ glob_helper(
 	    }
 	}
 	if (match_dir && isdir == UNKNOWN) {
-	    if (do_stat(path, &st, flags) == 0) {
+	    if (do_stat(path, &st, flags, enc) == 0) {
 		exist = YES;
 		isdir = S_ISDIR(st.st_mode) ? YES : NO;
 	    }
@@ -1397,28 +1645,43 @@ glob_helper(
 
     if (exist == NO || isdir == NO) return 0;
 
-    if (magical || recursive || ((FNM_SYSCASE || HAVE_HFS) && plain)) {
+    if (magical || recursive) {
 	struct dirent *dp;
 	DIR *dirp;
-	IF_HAVE_HFS(int hfs_p);
+# if USE_NAME_ON_FS == 2
+	char *plainname = 0;
+# endif
+	IF_NORMALIZE_UTF8PATH(int norm_p);
+# if USE_NAME_ON_FS == 2
+	if (cur + 1 == end && (*cur)->type <= ALPHA) {
+	    plainname = join_path(path, pathlen, dirsep, (*cur)->str, strlen((*cur)->str));
+	    if (!plainname) return -1;
+	    dirp = do_opendir(plainname, flags, enc);
+	    GLOB_FREE(plainname);
+	}
+	else
+# endif
 	dirp = do_opendir(*path ? path : ".", flags, enc);
 	if (dirp == NULL) {
-# if FNM_SYSCASE || HAVE_HFS
-	    if (!(magical || recursive) && (errno == EACCES)) {
+# if FNM_SYSCASE || NORMALIZE_UTF8PATH
+	    if ((magical < 2) && !recursive && (errno == EACCES)) {
 		/* no read permission, fallback */
 		goto literally;
 	    }
 # endif
 	    return 0;
 	}
-	IF_HAVE_HFS(hfs_p = is_hfs(dirp));
+	IF_NORMALIZE_UTF8PATH(norm_p = need_normalization(dirp, *path ? path : "."));
 
-# if HAVE_HFS
-	if (!(hfs_p || magical || recursive)) {
+# if NORMALIZE_UTF8PATH
+	if (!(norm_p || magical || recursive)) {
 	    closedir(dirp);
 	    goto literally;
 	}
-	flags |= FNM_CASEFOLD;
+# endif
+# ifdef HAVE_GETATTRLIST
+	if (is_case_sensitive(dirp) == 0)
+	    flags |= FNM_CASEFOLD;
 # endif
 	while ((dp = READDIR(dirp, enc)) != NULL) {
 	    char *buf;
@@ -1426,7 +1689,7 @@ glob_helper(
 	    const char *name;
 	    size_t namlen;
 	    int dotfile = 0;
-	    IF_HAVE_HFS(VALUE utf8str = Qnil);
+	    IF_NORMALIZE_UTF8PATH(VALUE utf8str = Qnil);
 
 	    if (recursive && dp->d_name[0] == '.') {
 		++dotfile;
@@ -1443,15 +1706,15 @@ glob_helper(
 
 	    name = dp->d_name;
 	    namlen = NAMLEN(dp);
-# if HAVE_HFS
-	    if (hfs_p && has_nonascii(name, namlen)) {
+# if NORMALIZE_UTF8PATH
+	    if (norm_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_NORMALIZE_UTF8PATH(if (!NIL_P(utf8str)) rb_str_resize(utf8str, 0));
 	    if (!buf) {
 		status = -1;
 		break;
@@ -1460,7 +1723,7 @@ glob_helper(
 	    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)
+		if (do_lstat(buf, &st, flags, enc) == 0)
 		    new_isdir = S_ISDIR(st.st_mode) ? YES : S_ISLNK(st.st_mode) ? UNKNOWN : NO;
 		else
 		    new_isdir = NO;
@@ -1483,9 +1746,20 @@ glob_helper(
 			*new_end++ = p; /* append recursive pattern */
 		    p = p->next; /* 0 times recursion */
 		}
-		if (p->type == PLAIN || p->type == MAGICAL) {
+		switch (p->type) {
+		  case ALPHA:
+# if USE_NAME_ON_FS == 2
+		    if (plainname) {
+			*new_end++ = p->next;
+			break;
+		    }
+# endif
+		  case PLAIN:
+		  case MAGICAL:
 		    if (fnmatch(p->str, enc, name, flags) == 0)
 			*new_end++ = p->next;
+		  default:
+		    break;
 		}
 	    }
 
@@ -1501,13 +1775,13 @@ glob_helper(
     else if (plain) {
 	struct glob_pattern **copy_beg, **copy_end, **cur2;
 
-# if FNM_SYSCASE || HAVE_HFS
+# if FNM_SYSCASE || NORMALIZE_UTF8PATH
       literally:
 # endif
 	copy_beg = copy_end = GLOB_ALLOC_N(struct glob_pattern *, end - beg);
 	if (!copy_beg) return -1;
 	for (cur = beg; cur < end; ++cur)
-	    *copy_end++ = (*cur)->type == PLAIN ? *cur : 0;
+	    *copy_end++ = (*cur)->type <= ALPHA ? *cur : 0;
 
 	for (cur = copy_beg; cur < copy_end; ++cur) {
 	    if (*cur) {
@@ -1544,6 +1818,12 @@ glob_helper(
 		    status = -1;
 		    break;
 		}
+#if USE_NAME_ON_FS == 1
+		if ((*cur)->type == ALPHA) {
+		    long base = pathlen + (dirsep != 0);
+		    buf = replace_real_basename(buf, base, enc, IF_NORMALIZE_UTF8PATH(1)+0);
+		}
+#endif
 		status = glob_helper(buf, 1, UNKNOWN, UNKNOWN, new_beg,
 				     new_end, flags, func, arg, enc);
 		GLOB_FREE(buf);
@@ -1696,7 +1976,7 @@ ruby_brace_expand(const char *str, int flags, ruby_glob_func *func, VALUE arg,
 	GLOB_FREE(buf);
     }
     else if (!lbrace && !rbrace) {
-	status = (*func)(s, arg, enc);
+	status = glob_call_func(func, s, arg, enc);
     }
 
     return status;
@@ -1745,10 +2025,16 @@ static int
 push_glob(VALUE ary, VALUE str, int flags)
 {
     struct glob_args args;
+#ifdef __APPLE__
+    rb_encoding *enc = rb_utf8_encoding();
+
+    str = rb_str_encode_ospath(str);
+#else
     rb_encoding *enc = rb_enc_get(str);
 
     if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding();
     if (enc == rb_usascii_encoding()) enc = rb_ascii8bit_encoding();
+#endif
     args.func = push_pattern;
     args.value = ary;
     args.enc = enc;
@@ -1804,11 +2090,9 @@ dir_globs(long argc, const VALUE *argv, int flags)
 
 /*
  *  call-seq:
- *     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>string,...</i><code>],0)</code>.
  *
  */
@@ -1912,8 +2196,9 @@ dir_s_glob(int argc, VALUE *argv, VALUE obj)
 	ary = rb_push_glob(str, flags);
     }
     else {
-	volatile VALUE v = ary;
+	VALUE v = ary;
 	ary = dir_globs(RARRAY_LEN(v), RARRAY_CONST_PTR(v), flags);
+	RB_GC_GUARD(v);
     }
 
     if (rb_block_given_p()) {
@@ -2176,18 +2461,23 @@ dir_s_home(int argc, VALUE *argv, VALUE obj)
 /*
  * 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()
+rb_file_directory_p(void)
 {
 }
 #endif
 
+/*
+ * call-seq:
+ *   Dir.exists?(file_name)  ->  true or false
+ *
+ * Deprecated method. Don't use.
+ */
 static VALUE
 rb_dir_exists_p(VALUE obj, VALUE fname)
 {
@@ -2219,6 +2509,7 @@ Init_Dir(void)
     rb_define_singleton_method(rb_cDir, "entries", dir_entries, -1);
 
     rb_define_method(rb_cDir,"initialize", dir_initialize, -1);
+    rb_define_method(rb_cDir,"fileno", dir_fileno, 0);
     rb_define_method(rb_cDir,"path", dir_path, 0);
     rb_define_method(rb_cDir,"to_path", dir_path, 0);
     rb_define_method(rb_cDir,"inspect", dir_inspect, 0);
@@ -2281,5 +2572,11 @@ Init_Dir(void)
      *  Allows file globbing through "{a,b}" in File.fnmatch patterns.
      */
     rb_file_const("FNM_EXTGLOB", INT2FIX(FNM_EXTGLOB));
+
+    /*  Document-const: File::Constants::FNM_SYSCASE
+     *
+     *  System default case insensitiveness, equals to FNM_CASEFOLD or
+     *  0.
+     */
     rb_file_const("FNM_SYSCASE", INT2FIX(FNM_SYSCASE));
 }
diff --git a/dln.c b/dln.c
index e6b20d54e3..e5269ca441 100644
--- a/dln.c
+++ b/dln.c
@@ -47,6 +47,7 @@ void *xcalloc();
 void *xrealloc();
 #endif
 
+#undef free
 #define free(x) xfree(x)
 
 #include <stdio.h>
@@ -105,13 +106,12 @@ dln_loaderror(const char *format, ...)
 # define USE_DLN_DLOPEN
 #endif
 
-#ifndef FUNCNAME_PATTERN
-# 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_PREFIX "Init_"
-# endif
+#if defined(__hp9000s300) || ((defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)) && !defined(__ELF__)) || defined(__BORLANDC__) || defined(NeXT) || defined(__WATCOMC__) || defined(MACOSX_DYLD)
+# define EXTERNAL_PREFIX "_"
+#else
+# define EXTERNAL_PREFIX ""
 #endif
+#define FUNCNAME_PREFIX EXTERNAL_PREFIX"Init_"
 
 #if defined __CYGWIN__ || defined DOSISH
 #define isdirsep(x) ((x) == '/' || (x) == '\\')
@@ -1178,25 +1178,26 @@ dln_strerror(void)
 static void
 aix_loaderror(const char *pathname)
 {
-  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("\" ");
+    char *message[1024], errbuf[1024];
+    int i;
+#define ERRBUF_APPEND(s) strlcat(errbuf, (s), sizeof(errbuf))
+    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_APPEND("\n");
+    }
+    else {
+	ERRBUF_APPEND(strerror(errno));
+	ERRBUF_APPEND("[loadquery failed]");
     }
-    ERRBUF_APPEND("\n");
-  } else {
-    ERRBUF_APPEND(strerror(errno));
-    ERRBUF_APPEND("[loadquery failed]");
-  }
-  dln_loaderror("%s", errbuf);
+    dln_loaderror("%s", errbuf);
 }
 #endif
 
@@ -1255,20 +1256,25 @@ dln_load(const char *file)
 
 #if defined _WIN32 && !defined __CYGWIN__
     HINSTANCE handle;
-    char winfile[MAXPATHLEN];
+    WCHAR *winfile;
     char message[1024];
     void (*init_fct)();
     char *buf;
 
-    if (strlen(file) >= MAXPATHLEN) dln_loaderror("filename too long");
-
     /* Load the file as an object one */
     init_funcname(&buf, file);
 
-    strlcpy(winfile, file, sizeof(winfile));
+    /* Convert the file path to wide char */
+    winfile = rb_w32_mbstr_to_wstr(CP_UTF8, file, -1, NULL);
+    if (!winfile) {
+	dln_memerror();
+    }
 
     /* Load file */
-    if ((handle = LoadLibrary(winfile)) == NULL) {
+    handle = LoadLibraryW(winfile);
+    free(winfile);
+
+    if (!handle) {
 	error = dln_strerror();
 	goto failed;
     }
@@ -1318,33 +1324,30 @@ dln_load(const char *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;
 	}
+# if defined RUBY_EXPORT
+	{
+	    static const char incompatible[] = "incompatible library version";
+	    void *ex = dlsym(handle, EXTERNAL_PREFIX"ruby_xmalloc");
+	    if (ex && ex != ruby_xmalloc) {
+
+#   if defined __APPLE__
+		/* dlclose() segfaults */
+		rb_fatal("%s - %s", incompatible, file);
+#   else
+		dlclose(handle);
+		error = incompatible;
+		goto failed;
+#   endif
+	    }
+	}
+# endif
 
 	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);
diff --git a/dln_find.c b/dln_find.c
index f41ceb051d..56a19818cf 100644
--- a/dln_find.c
+++ b/dln_find.c
@@ -78,11 +78,12 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size
     }
 
     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
+	path =
+	    "/usr/local/bin" PATH_SEP
+	    "/usr/ucb" PATH_SEP
+	    "/usr/bin" PATH_SEP
+	    "/bin" PATH_SEP
+	    ".";
     }
     buf = dln_find_1(fname, path, buf, size, 1 DLN_FIND_EXTRA_ARG);
     if (envpath) free(envpath);
diff --git a/dmyenc.c b/dmyenc.c
new file mode 100644
index 0000000000..7e006e826c
--- /dev/null
+++ b/dmyenc.c
@@ -0,0 +1,10 @@
+#define require(name) ruby_require_internal(name, (unsigned int)sizeof(name)-1)
+int ruby_require_internal(const char *, int);
+
+void
+Init_enc(void)
+{
+    if (require("enc/encdb.so") == 1) {
+	require("enc/trans/transdb.so");
+    }
+}
diff --git a/dmyext.c b/dmyext.c
index 34ea7a02f4..4d273f7faf 100644
--- a/dmyext.c
+++ b/dmyext.c
@@ -2,8 +2,3 @@ void
 Init_ext(void)
 {
 }
-
-void
-Init_enc(void)
-{
-}
diff --git a/doc/ChangeLog-1.8.0 b/doc/ChangeLog-1.8.0
index 07d7c6b165..0d00266735 100644
--- a/doc/ChangeLog-1.8.0
+++ b/doc/ChangeLog-1.8.0
@@ -1454,7 +1454,7 @@ Fri Jun 27 03:24:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 Thu Jun 26 21:34:49 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* class.c (class_instance_method_list): get rid of warning about
-	  arguement type mismatch, and inline method_list().
+	  argument type mismatch, and inline method_list().
 	  [ruby-core:01198]
 
 Wed Jun 25 14:40:33 2003  Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
@@ -3361,7 +3361,7 @@ Fri Apr 11 02:41:35 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 Thu Apr 10 21:12:19 2003  Minero Aoki  <aamine@loveruby.net>
 
-	* lib/net/pop.rb: Exception line was accidentaly removed.
+	* lib/net/pop.rb: Exception line was accidentally removed.
 	  [ruby-dev:19989]
 
 Thu Apr 10 18:42:13 2003  Tadayoshi Funaba  <tadf@dotrb.org>
@@ -5986,7 +5986,7 @@ Thu Nov  7 09:51:37 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 Wed Nov  6 16:57:06 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* class.c (rb_define_method): do not set NOEX_CFUNC if klass is
-	  really a module, whose methods must be safe for reciever's type.
+	  really a module, whose methods must be safe for receiver's type.
 
 	* eval.c (rb_eval): nosuper should not be inherited unless the
 	  overwritten method is an undef placeholder.
diff --git a/doc/ChangeLog-1.9.3 b/doc/ChangeLog-1.9.3
index e9ede641f5..b3deb551b0 100644
--- a/doc/ChangeLog-1.9.3
+++ b/doc/ChangeLog-1.9.3
@@ -3541,7 +3541,7 @@ Sun May 15 23:45:11 2011  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 Sun May 15 22:26:39 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
 
 	* signal.c (rb_f_kill): accept '-SIGXXX' style signal with Symbol or
-	  implicit convertion with #to_str. [ruby-dev:43169] fixes #4362
+	  implicit conversion with #to_str. [ruby-dev:43169] fixes #4362
 	* test/ruby/test_signal.rb (test_signal_process_group): add a test
 	  for send signal to process group.
 
@@ -8041,7 +8041,7 @@ Sat Dec 25 17:33:55 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	  anonymous classes.
 
 	* lib/csv.rb (CSV#init_separators): use IO#gets with length
-	  parameter to get rid of wrong convertion.
+	  parameter to get rid of wrong conversion.
 
 	* lib/csv.rb (CSV::foreach, CSV#initialize): directly use encoding
 
@@ -8382,7 +8382,7 @@ Tue Dec 14 14:24:15 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 	  to 'test_io' because the old one is meaningless and inconvenient.
 
 	* test/ruby/test_io.rb (test_binmode_after_closed): the temporary file
-	  maked by make_temfile is already closed.
+	  made by make_temfile is already closed.
 
 Tue Dec 14 13:52:19 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
@@ -22363,7 +22363,7 @@ Tue Sep 29 22:19:36 2009  Tanaka Akira  <akr@fsij.org>
 
 Tue Sep 29 21:16:35 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
-	* io.c (rb_scan_open_args): add UTF8-MAC to no-convertion encoding.
+	* io.c (rb_scan_open_args): add UTF8-MAC to no-conversion encoding.
 
 Tue Sep 29 21:21:15 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
@@ -33712,7 +33712,7 @@ Thu Dec 25 14:51:43 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 Thu Dec 25 14:32:23 2008  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_insnhelper.c (vm_method_search): fix control flow bug.
-	  (commited at r20981)
+	  (committed at r20981)
 
 Thu Dec 25 13:28:20 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
@@ -71774,7 +71774,7 @@ Wed Mar  1 17:13:37 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 Thu Mar  2 17:54:45 2006  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* gc.c: commited magic for reducing RVALUE size on windows. (24->20byte)
+	* gc.c: committed magic for reducing RVALUE size on windows. (24->20byte)
 	  [ruby-core:7474]
 
 Thu Mar  2 14:12:26 2006  Tanaka Akira  <akr@m17n.org>
@@ -73761,7 +73761,7 @@ Fri Oct 21 15:42:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* ext/socket/extconf.rb: BeOS is only one platform should call
 	  closesocket, so check __BEOS__ macro directly. (I was worried
-	  accidently HAVE_CLOSESOCKET is defined on windows again because
+	  accidentally HAVE_CLOSESOCKET is defined on windows again because
 	  it has it)
 
 	* ext/socket/{getaddrinfo.c,socket.c}: ditto.
@@ -73770,7 +73770,7 @@ Fri Oct 21 15:42:28 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 Fri Oct 21 15:23:23 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* bignum.c (bignew_1): convertion from `int' to `char' discards
+	* bignum.c (bignew_1): conversion 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)
@@ -74937,7 +74937,7 @@ Mon Sep 12 20:32:00 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 Mon Sep 12 19:58:53 2005  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* dln.c: avoid warning of const to non-const convertion.
+	* dln.c: avoid warning of const to non-const conversion.
 	  [ruby-dev:27041]
 
 	* eval.c, io.c, ruby.c: ditto.
@@ -83155,7 +83155,7 @@ Thu Aug 19 16:29:45 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk.rb: Fail to treat a hash value of 'font' option.
 
-	* ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion infomation.
+	* ext/tk/lib/tk.rb: bindinfo cannot return '%' substiturion information.
 
 	* ext/tk/lib/menu.rb: typo bug.
 
@@ -83584,7 +83584,7 @@ Wed Jul 14 18:05:21 2004  GOTOU Yuuzou  <gotoyuzo@notwork.org>
 Wed Jul 14 12:20:05 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]
+	  "-I.FE-X" which both "I" and "F" are omitted. [ruby-dev:23883]
 
 	* test/ruby/test_float.rb (test_strtod): add test for bug fix.
 
@@ -84298,7 +84298,7 @@ Sat May 22 11:54:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 Sat May 22 05:37:11 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
-	* ext/tk/lib/remote-tk.rb: (NEW library) controll Tk interpreters
+	* ext/tk/lib/remote-tk.rb: (NEW library) control Tk interpreters
 	  on the other processes by Tcl/Tk's 'send' command
 
 Fri May 21 09:22:05 2004  Dave Thomas  <dave@pragprog.com>
@@ -85607,10 +85607,10 @@ Wed Mar 17 00:22:03 2004  Kazuo Saito  <ksaito@uranus.dti.ne.jp>
 Tue Mar 16 11:14:17 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* dir.c (fnmatch_helper): File.fnmatch('\.', '.') should return true.
-	  (Rev1.112 lost compatiblity)
+	  (Rev1.112 lost compatibility)
 
 	* dir.c (fnmatch_helper): File.fnmatch('\/', '/', File::FNM_PATHNAME)
-	  should return true. (Rev1.112 lost compatiblity)
+	  should return true. (Rev1.112 lost compatibility)
 
 	* dir.c (fnmatch): File.fnmatch('**/.boo', '.foo/.boo',
 	  File::FNM_PATHNAME) should return false because of leading period.
@@ -86434,7 +86434,7 @@ Mon Feb 16 22:22:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
 Mon Feb 16 20:28:52 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
-	* bcc32/Makefile.sub: show more warnings. (refering to mingw)
+	* bcc32/Makefile.sub: show more warnings. (referring to mingw)
 
 	* bcc32/setup.mak: ditto.
 
@@ -86492,7 +86492,7 @@ Mon Feb 16 12:29:10 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 Mon Feb 16 10:29:52 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* dir.c (CompareImpl): File.fnmatch and Dir.glob get better performance
-	  in Win32. This is achived by calling downcase() for single-byte
+	  in Win32. This is achieved by calling downcase() for single-byte
 	  characters. (CharLower() is slower than downcase())
 
 Mon Feb 16 02:14:29 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
@@ -86561,7 +86561,7 @@ Sat Feb 14 11:14:12 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 Fri Feb 13 21:51:00 2004  Gavin Sinclair  <gsinclair@soyabean.com.au>
 
-	* lib/fileutils.rb: slighly improved documentation (sync with 1.8)
+	* lib/fileutils.rb: slightly improved documentation (sync with 1.8)
 
 Fri Feb 13 19:57:01 2004  Kouhei Sutou  <kou@cozmixng.org>
 
@@ -89179,7 +89179,7 @@ Thu Nov 27 22:05:48 2003  Akinori MUSHA  <knu@iDaemons.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.
+	  TkTimer#wait receives 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>
diff --git a/doc/ChangeLog-YARV b/doc/ChangeLog-YARV
index 529854586c..6a6cfbd0c9 100644
--- a/doc/ChangeLog-YARV
+++ b/doc/ChangeLog-YARV
@@ -2428,7 +2428,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 2006-02-14(Tue) 05:53:56 +0900  Minero Aoki  <aamine@loveruby.net>
 
 	* eval.c (ruby_cleanup): th->errinfo contains a NODE while
-	  break'ing, check it before refering klass.
+	  break'ing, check it before referring klass.
 
 
 2006-02-14(Tue) 05:45:07 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -2461,7 +2461,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 2006-02-14(Tue) 01:42:11 +0900  Koichi Sasada  <ko1@atdot.net>
 
-	* error.c : fix include file positon
+	* error.c : fix include file position
 
 	* test/ruby/test_signal.rb : skip test_exit_action on cygwin
 
@@ -6168,7 +6168,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* test.rb : restore $" after evaluation with ruby
 
-	* rb/insns2vm.rb : remove unnecesary each
+	* rb/insns2vm.rb : remove unnecessary each
 
 
 2004-12-17(Fri) 18:56:38 +0900  Koichi Sasada  <ko1@atdot.net>
@@ -6397,7 +6397,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 
 	* vm.c : fix stack dump routine
 
-	* vm.c : impliment thread_funcall (temporarily)
+	* vm.c : implement thread_funcall (temporarily)
 
 	* yarv.h : add IS_YARV_WORKING(), SET_YARV_START(), SET_YARV_STOP()
 
@@ -6590,7 +6590,7 @@ Sun Dec 31 17:42:05 2006  Koichi Sasada  <ko1@atdot.net>
 	* yarvcore.h, yarvcore.c : add idThrow*
 
 	* insns.def, compile.c, vm.c : support retry, break,
-	next, redo, return(imcomplete)
+	next, redo, return(incomplete)
 
 
 2004-09-03(Fri) 13:40:08 +0900  Koichi Sasada  <ko1@atdot.net>
diff --git a/doc/NEWS-1.8.7 b/doc/NEWS-1.8.7
index 51fb5f1c6a..38571fe103 100644
--- a/doc/NEWS-1.8.7
+++ b/doc/NEWS-1.8.7
@@ -230,7 +230,7 @@ with all sufficient information, see the ChangeLog file.
   * ARGF.lines
   * ARGF.readbyte
 
-    New methods. 
+    New methods.
 
   * Method#name
   * Method#owner
@@ -638,7 +638,7 @@ with all sufficient information, see the ChangeLog file.
       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)
diff --git a/doc/NEWS-2.0.0 b/doc/NEWS-2.0.0
index f99ba3e882..9ad7254317 100644
--- a/doc/NEWS-2.0.0
+++ b/doc/NEWS-2.0.0
@@ -168,7 +168,7 @@ with all sufficient information, see the ChangeLog file.
     * RUBY_FIBER_VM_STACK_SIZE: vm stack size used at fiber creation.
       default: 64KB or 128KB.
     * RUBY_FIBER_MACHINE_STACK_SIZE: machine stack size used at fiber
-      creation. default: 256KB or 256KB.
+      creation. default: 256KB or 512KB.
     These variables are checked only at launched time.
   * added constant DEFAULT_PARAMS to get above default parameters.
 
diff --git a/doc/NEWS-2.1.0 b/doc/NEWS-2.1.0
index 2776c27551..5d4152b8dc 100644
--- a/doc/NEWS-2.1.0
+++ b/doc/NEWS-2.1.0
@@ -104,6 +104,8 @@ with all sufficient information, see the ChangeLog file.
     * 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.
+      `by` can be 0, in which case the same value will be generated
+      indefinitely.
 
 * Process
   * New methods:
diff --git a/doc/contributing.rdoc b/doc/contributing.rdoc
index c6ccc68302..0809947346 100644
--- a/doc/contributing.rdoc
+++ b/doc/contributing.rdoc
@@ -456,7 +456,7 @@ tracker. Alternatively you can submit a pull request, but for the best chances
 to receive feedback add it is recommended you add it to redmine.
 
 Since git is a distributed system, you are welcome to host your git repository
-on any {publically accessible hosting
+on any {publicly accessible hosting
 site}[https://git.wiki.kernel.org/index.php/GitHosting], including {hosting your
 own}[https://www.kernel.org/pub/software/scm/git/docs/user-manual.html#public-repositories]
 You may use the {'git format-patch'}[http://git-scm.com/docs/git-format-patch]
diff --git a/doc/etc.rd.ja b/doc/etc.rd.ja
index b36e05c994..877356bb6e 100644
--- a/doc/etc.rd.ja
+++ b/doc/etc.rd.ja
@@ -33,7 +33,7 @@
 	    age		# エージ(整数)
 	    class	# ユーザアクセスクラス(文字列)
 	    comment	# コメント(文字列)
-	    expire	# アカウント有効期限(整数)	    
+	    expire	# アカウント有効期限(整数)
 	  end
 
 	詳細はgetpwnam(3)を参照のこと．
diff --git a/doc/forwardable.rd.ja b/doc/forwardable.rd.ja
index 6a5ff2e236..171724b2e5 100644
--- a/doc/forwardable.rd.ja
+++ b/doc/forwardable.rd.ja
@@ -9,8 +9,8 @@
 
 == 使い方
 
-クラスに対してextendして使います. 
-  
+クラスに対してextendして使います.
+
   class Foo
     extend Forwardable
 
@@ -50,7 +50,7 @@
 
 == 使い方
 
-オブジェクトに対して((|extend|))して使います. 
+オブジェクトに対して((|extend|))して使います.
 
   g = Goo.new
   g.extend SingleForwardable
diff --git a/doc/globals.rdoc b/doc/globals.rdoc
index f82b6f8796..3bc7e05623 100644
--- a/doc/globals.rdoc
+++ b/doc/globals.rdoc
@@ -31,6 +31,7 @@ $DEBUG::     The debug flag, which is set by the -d switch.  Enabling debug
              backtrace).  Setting this to a true value enables debug output as
              if -d were given on the command line.  Setting this to a false
              value disables debug output.
+$LOADED_FEATURES:: The alias to the $".
 $FILENAME::  Current input file from $<. Same as $<.filename.
 $LOAD_PATH:: The alias to the $:.
 $stderr::    The current standard error output.
diff --git a/doc/irb/irb-tools.rd.ja b/doc/irb/irb-tools.rd.ja
index 3c95faeb8a..b997f0edea 100644
--- a/doc/irb/irb-tools.rd.ja
+++ b/doc/irb/irb-tools.rd.ja
@@ -112,7 +112,7 @@ XMPメソッド群のコンテキストは, 呼び出す前のコンテキスト
 マルチスレッドには対応していません.
 
 = frame.rb
-現在実行中のフレーム情報を取り扱うためのクラスです. 
+現在実行中のフレーム情報を取り扱うためのクラスです.
 
 * IRB::Frame.top(n = 0)
   上からn番目のコンテキストを取り出します. nは0が最上位になります.
@@ -127,7 +127,7 @@ set_trace_funcを用いてRubyの実行をトレースしています. マルチ
 は対応していません.
 
 = completion.rb
-irbのcompletion機能を提供するものです. 
+irbのcompletion機能を提供するものです.
 
 == 使い方
 
@@ -144,7 +144,7 @@ irb実行中に (TAB) を押すとコンプレーションします.
 トップレベルで(TAB)を押すとすべての構文要素, クラス, メソッドの候補がで
 ます. 候補が唯一ならば完全に補完します.
 
-  irb(main):001:0> in    
+  irb(main):001:0> in
   in                    inspect               instance_eval
   include               install_alias_method  instance_of?
   initialize            install_aliases       instance_variables
@@ -168,8 +168,8 @@ irb実行中に (TAB) を押すとコンプレーションします.
   foo.dup                 foo.kind_of?            foo.to_s
   foo.eql?                foo.method              foo.type
   foo.equal?              foo.methods             foo.untaint
-  foo.extend              foo.nil?                
-  foo.freeze              foo.private_methods     
+  foo.extend              foo.nil?
+  foo.freeze              foo.private_methods
 
 =end
 
diff --git a/doc/keywords.rdoc b/doc/keywords.rdoc
new file mode 100644
index 0000000000..98bbd5e864
--- /dev/null
+++ b/doc/keywords.rdoc
@@ -0,0 +1,158 @@
+== Keywords
+
+The following keywords are used by Ruby.
+
+__ENCODING__::
+  The script encoding of the current file.  See Encoding.
+
+__LINE__::
+  The line number of this keyword in the current file.
+
+__FILE__::
+  The path to the current file.
+
+BEGIN::
+  Runs before any other code in the current file.  See {miscellaneous
+  syntax}[rdoc-ref:syntax/miscellaneous.rdoc]
+
+END::
+  Runs after any other code in the current file.  See {miscellaneous
+  syntax}[rdoc-ref:syntax/miscellaneous.rdoc]
+
+alias::
+  Creates an alias between two methods (and other things).  See {modules and
+  classes syntax}[rdoc-ref:syntax/modules_and_classes.rdoc]
+
+and::
+  Short-circuit Boolean and with lower precedence than <code>&&</code>
+
+begin::
+  Starts an exception handling block.  See {exceptions
+  syntax}[rdoc-ref:syntax/exceptions.rdoc]
+
+break::
+  Leaves a block early.  See {control expressions
+  syntax}[rdoc-ref:syntax/control_expressions.rdoc]
+
+case::
+  Starts a +case+ expression.  See {control expressions
+  syntax}[rdoc-ref:syntax/control_expressions.rdoc]
+
+class::
+  Creates or opens a class.  See {modules and classes
+  syntax}[rdoc-ref:syntax/modules_and_classes.rdoc]
+
+def::
+  Defines a method.  See {methods syntax}[rdoc-ref:syntax/methods.rdoc]
+
+defined?::
+  Returns a string describing its argument.  See {miscellaneous
+  syntax}[rdoc-ref:syntax/miscellaneous.rdoc]
+
+do::
+  Starts a block.
+
+else::
+  The unhandled condition in +case+, +if+ and +unless+ expressions.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+elsif::
+  An alternate condition for an +if+ expression.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+end::
+  The end of a syntax block.  Used by classes, modules, methods, exception
+  handling and control expressions.
+
+ensure::
+  Starts a section of code that is always run when an exception is raised.
+  See {exception handling}[rdoc-ref:syntax/exceptions.rdoc]
+
+false::
+  Boolean false.  See {literals}[rdoc-ref:syntax/literals.rdoc]
+
+for::
+  A loop that is similar to using the +each+ method.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+if::
+  Used for +if+ and modifier +if+ expressions.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+in::
+  Used to separate the iterable object and iterator variable in a +for+ loop.
+  See {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+module::
+  Creates or opens a module.  See {modules and classes
+  syntax}[rdoc-ref:syntax/modules_and_classes.rdoc]
+
+next::
+  Skips the rest of the block.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+nil::
+  A false value usually indicating "no value" or "unknown".  See
+  {literals}[rdoc-ref:syntax/literals.rdoc]
+
+not::
+  Inverts the following boolean expression.  Has a lower precedence than
+  <code>!</code>
+
+or::
+  Boolean or with lower precedence than <code>||</code>
+
+redo::
+  Restarts execution in the current block.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+rescue::
+  Starts an exception section of code in a +begin+ block.  See {exception
+  handling}[rdoc-ref:syntax/exceptions.rdoc]
+
+retry::
+  Retries an exception block.  See {exception
+  handling}[rdoc-ref:syntax/exceptions.rdoc]
+
+return::
+  Exits a method.  See {methods}[rdoc-ref:syntax/methods.rdoc]
+
+self::
+  The object the current method is attached to.  See
+  {methods}[rdoc-ref:syntax/methods.rdoc]
+
+super::
+  Calls the current method in a superclass.  See
+  {methods}[rdoc-ref:syntax/methods.rdoc]
+
+then::
+  Indicates the end of conditional blocks in control structures.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+true::
+  Boolean true.  See {literals}[rdoc-ref:syntax/literals.rdoc]
+
+undef::
+  Prevents a class or module from responding to a method call.
+  See {modules and classes}[rdoc-ref:syntax/modules_and_classes.rdoc]
+
+unless::
+  Used for +unless+ and modifier +unless+ expressions.  See {control
+  expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+until::
+  Creates a loop that executes until the condition is true.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+when::
+  A condition in a +case+ expression.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+while::
+  Creates a loop that executes while the condition is true.  See
+  {control expressions}[rdoc-ref:syntax/control_expressions.rdoc]
+
+yield::
+  Starts execution of the block sent to the current method.  See
+  {methods}[rdoc-ref:syntax/methods.rdoc]
+
diff --git a/doc/pty/README.ja b/doc/pty/README.ja
index 9b9d306bf7..2d83ffa033 100644
--- a/doc/pty/README.ja
+++ b/doc/pty/README.ja
@@ -34,7 +34,7 @@ pty 拡張モジュール version 0.3 by A.ito
       数がブロックパラメータ付きで呼ばれた場合には，そのブロックの中で
       のみ例外が発生します．子プロセスをモニターしているスレッドはブロッ
       クを抜けるときに終了します．
-      
+
    protect_signal
    reset_signal
 
diff --git a/doc/regexp.rdoc b/doc/regexp.rdoc
index 3c13b6683f..8564258115 100644
--- a/doc/regexp.rdoc
+++ b/doc/regexp.rdoc
@@ -545,7 +545,7 @@ Options may also be used with <tt>Regexp.new</tt>:
 As mentioned above, the <tt>x</tt> option enables <i>free-spacing</i>
 mode. Literal white space inside the pattern is ignored, and the
 octothorpe (<tt>#</tt>) character introduces a comment until the end of
-the line. This allows the components of the pattern to be organised in a
+the line. This allows the components of the pattern to be organized in a
 potentially more readable fashion.
 
 A contrived pattern to match a number with optional decimal places:
@@ -558,13 +558,19 @@ A contrived pattern to match a number with optional decimal places:
     \Z/x
     float_pat.match('3.14') #=> #<MatchData "3.14" 1:".14">
 
-*Note*: To match whitespace in an <tt>x</tt> pattern use an escape such as
-<tt>\s</tt> or <tt>\p{Space}</tt>.
+There are a number of strategies for matching whitespace:
+
+* Use a pattern such as <tt>\s</tt> or <tt>\p{Space}</tt>.
+* Use escaped whitespace such as <tt>\ </tt>, i.e. a space preceded by a backslash.
+* Use a character class such as <tt>[ ]</tt>.
 
 Comments can be included in a non-<tt>x</tt> pattern with the
 <tt>(?#</tt><i>comment</i><tt>)</tt> construct, where <i>comment</i> is
 arbitrary text ignored by the regexp engine.
 
+Comments in regexp literals cannot include unescaped terminator
+characters.
+
 == Encoding
 
 Regular expressions are assumed to use the source encoding. This can be
diff --git a/doc/shell.rd.ja b/doc/shell.rd.ja
index 053b11fb99..a9507fe92a 100644
--- a/doc/shell.rd.ja
+++ b/doc/shell.rd.ja
@@ -47,7 +47,7 @@ OS上のコマンドを実行するにはまず, Shellのメソッドとして�
 
 --- Shell.def_system_command(command, path = command)
 
-      Shellのメソッドとしてcommandを登録します. 
+      Shellのメソッドとしてcommandを登録します.
 
       例)
       Shell.def_system_command "ls"
@@ -62,7 +62,7 @@ OS上のコマンドを実行するにはまず, Shellのメソッドとして�
 
 --- Shell.alias_command(ali, command, *opts) {...}
 
-      commandのaliasをします. 
+      commandのaliasをします.
 
       例)
         Shell.alias_command "lsC", "ls", "-CBF", "--show-control-chars"
@@ -139,7 +139,7 @@ OS上のコマンドを実行するにはまず, Shellのメソッドとして�
 --- Shell#test(command, file1, file2)
 --- Shell#[command, file1, file2]
 
-      ファイルテスト関数testと同じ. 
+      ファイルテスト関数testと同じ.
       例)
           sh[?e, "foo"]
           sh[:e, "foo"]
@@ -185,7 +185,7 @@ OS上のコマンドを実行するにはまず, Shellのメソッドとして�
 --- Shell#glob(patten)
 --- Shell#tee(file)
 
-      これらは実行すると, それらを内容とするFilterオブジェクトを返します. 
+      これらは実行すると, それらを内容とするFilterオブジェクトを返します.
 
 --- Filter#each &block
 
diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc
index 448635758b..00eae208c6 100644
--- a/doc/standard_library.rdoc
+++ b/doc/standard_library.rdoc
@@ -96,7 +96,6 @@ Date:: A subclass of Object includes Comparable module for handling dates
 DateTime:: Subclass of Date to handling dates, hours, minutes, seconds, offsets
 DBM:: Provides a wrapper for the UNIX-style Database Manager Library
 Digest:: Provides a framework for message digest libraries
-DL:: Provides a wrapper for the UNIX dlopen() library
 Etc:: Provides access to information typically stored in UNIX /etc directory
 Fcntl:: Loads constants defined in the OS fcntl.h C header file
 Fiddle:: A libffi wrapper for Ruby
diff --git a/doc/syntax/assignment.rdoc b/doc/syntax/assignment.rdoc
index 7424d4885f..adfe6485a4 100644
--- a/doc/syntax/assignment.rdoc
+++ b/doc/syntax/assignment.rdoc
@@ -354,7 +354,7 @@ Here is an example:
 
   p a # prints 1
 
-Note that these two operators behave more like <code>a || a = 0<code> than
+Note that these two operators behave more like <code>a || a = 0</code> than
 <code>a = a || 0</code>.
 
 == Implicit Array Assignment
@@ -374,7 +374,7 @@ assigning.  This is similar to multiple assignment:
 
   p a # prints [1, 2, 3]
 
-You can splat anywhere in the left-hand side of the assignment:
+You can splat anywhere in the right-hand side of the assignment:
 
   a = 1, *[2, 3]
 
@@ -382,7 +382,7 @@ You can splat anywhere in the left-hand side of the assignment:
 
 == Multiple Assignment
 
-You can assign multiple values on the left-hand side to multiple variables:
+You can assign multiple values on the right-hand side to multiple variables:
 
   a, b = 1, 2
 
@@ -408,8 +408,8 @@ You can use multiple assignment to swap two values in-place:
   p new_value: new_value, old_value: old_value
   # prints {:new_value=>1, :old_value=>2}
 
-If you have more values on the left hand side of the assignment than variables
-on the right hand side the extra values are ignored:
+If you have more values on the right hand side of the assignment than variables
+on the left hand side the extra values are ignored:
 
   a, b = 1, 2, 3
 
@@ -422,7 +422,7 @@ the assignment.
 
   p a: a, b: b # prints {:a=>1, :b=>[2, 3]}
 
-The <code>*</code> can appear anywhere on the right-hand side:
+The <code>*</code> can appear anywhere on the left-hand side:
 
   *a, b = 1, 2, 3
 
diff --git a/doc/syntax/literals.rdoc b/doc/syntax/literals.rdoc
index e01b6875d4..194945abbd 100644
--- a/doc/syntax/literals.rdoc
+++ b/doc/syntax/literals.rdoc
@@ -100,7 +100,8 @@ single-quote strings:
   '#{1 + 1}' #=> "\#{1 + 1}"
 
 In addition to disabling interpolation, single-quoted strings also disable all
-escape sequences except for the single-quote (<tt>\'</tt>).
+escape sequences except for the single-quote (<tt>\'</tt>) and backslash
+(<tt>\\\\</tt>).
 
 You may also create strings using <tt>%</tt>:
 
@@ -198,9 +199,6 @@ You may also create symbols by interpolation:
   :"my_symbol1"
   :"my_symbol#{1 + 1}"
 
-Note that symbols are never garbage collected so be careful when referencing
-symbols using interpolation.
-
 Like strings, a single-quote may be used to disable interpolation:
 
   :'my_symbol#{1 + 1}' #=> :"my_symbol\#{1 + 1}"
diff --git a/doc/syntax/methods.rdoc b/doc/syntax/methods.rdoc
index d7610f161d..2c01810b4c 100644
--- a/doc/syntax/methods.rdoc
+++ b/doc/syntax/methods.rdoc
@@ -109,6 +109,25 @@ operator with an <code>@</code> as in <code>+@</code> or <code>!@</code>:
 
 Unary methods accept zero arguments.
 
+Additionally, methods for element reference and assignment may be defined:
+<code>[]</code> and <code>[]=</code> respectively. Both can take one or more
+arguments, and element reference can take none.
+
+  class C
+    def [](a, b)
+      puts a + b
+    end
+
+    def []=(a, b, c)
+      puts a * b + c
+    end
+  end
+
+  obj = C.new
+
+  obj[2, 3]     # prints "5"
+  obj[2, 3] = 4 # prints "10"
+
 == Return Values
 
 By default, a method returns the last expression that was evaluated in the body
@@ -383,7 +402,7 @@ arguments must appear before any keyword arguments.
 The block argument is indicated by <code>&</code> and must come last:
 
   def my_method(&my_block)
-    my_method.call(self)
+    my_block.call(self)
   end
 
 Most frequently the block argument is used to pass a block to another method:
diff --git a/doc/syntax/refinements.rdoc b/doc/syntax/refinements.rdoc
index 62405a78b7..3ba03f6d58 100644
--- a/doc/syntax/refinements.rdoc
+++ b/doc/syntax/refinements.rdoc
@@ -9,11 +9,6 @@ Refinements are designed to reduce the impact of monkey patching on other
 users of the monkey-patched class.  Refinements provide a way to extend a
 class locally.
 
-Refinements are an experimental feature in Ruby 2.0.  At the time of writing,
-refinements are expected to exist in future versions of Ruby but the
-specification of refinements may change.  You will receive a warning the first
-time you define or activate a refinement.
-
 Here is a basic refinement:
 
   class C
diff --git a/enc/big5.c b/enc/big5.c
index 9d7738d8f9..27315c4ba9 100644
--- a/enc/big5.c
+++ b/enc/big5.c
@@ -167,19 +167,19 @@ big5_mbc_enc_len0(const UChar* p, const UChar* e, int tridx, const int tbl[])
 static int
 big5_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
 {
-    return big5_mbc_enc_len0(p, e, 0, EncLen_BIG5);
+  return big5_mbc_enc_len0(p, e, 0, EncLen_BIG5);
 }
 
 static int
 big5_hkscs_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
 {
-    return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_HKSCS);
+  return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_HKSCS);
 }
 
 static int
 big5_uao_mbc_enc_len(const UChar* p, const UChar* e, OnigEncoding enc ARG_UNUSED)
 {
-    return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_UAO);
+  return big5_mbc_enc_len0(p, e, 2, EncLen_BIG5_UAO);
 }
 
 static OnigCodePoint
diff --git a/enc/depend b/enc/depend
index 5750a0dc49..9bbbe5c81e 100644
--- a/enc/depend
+++ b/enc/depend
@@ -82,15 +82,9 @@ srcs: $(TRANSCSRCS)
 
 % unless ENCS.empty? or TRANS.empty?
 
-%   unless ENCS.empty?
-$(ENCOBJS): $(hdrdir)/ruby.h regenc.h oniguruma.h config.h defines.h ruby.h missing.h subst.h intern.h st.h encoding.h
-%   end
 %   ENC_DEPS.each do |e, deps|
 enc/<%=e%>.$(OBJEXT): <%=deps.map {|n| rule_subst % n}.join(' ')%>
 %   end
-%   unless TRANS.empty?
-$(TRANSOBJS): $(hdrdir)/ruby.h ruby.h intern.h config.h defines.h missing.h encoding.h oniguruma.h st.h transcode_data.h subst.h encoding.h
-%   end
 %   ATRANS.each do |e|
 %     src = "#{e}.trans"
 
@@ -144,6 +138,7 @@ clean:
 % @ignore_error = $nmake ? '' : ' 2> /dev/null || true'
 % unless inplace
 	$(Q)$(RM) enc/unicode/name2ctype.h
+	$(Q)$(RM) enc/jis/props.h
 	-$(Q)$(RMDIR) enc/unicode<%=@ignore_error%>
 % end
 % workdirs.reverse_each do|d|
@@ -154,7 +149,420 @@ clean-srcs:
 	$(Q)$(RM) <%=pathrep['$(TRANSCSRCS)']%>
 	-$(Q)$(RMDIR) <%=pathrep['enc/trans']%><%=@ignore_error%>
 	$(Q)$(RM) enc/unicode/name2ctype.h
+	$(Q)$(RM) enc/jis/props.h
 	-$(Q)$(RMDIR) <%=pathrep['enc/unicode']%><%=@ignore_error%>
+	-$(Q)$(RMDIR) <%=pathrep['enc/props']%><%=@ignore_error%>
 	-$(Q)$(RMDIR) <%=pathrep['enc']%><%=@ignore_error%>
 
 <%# vim: set ft=eruby noexpandtab ts=8 sw=2 : -%>
+
+# AUTOGENERATED DEPENDENCIES START
+enc/big5.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/big5.$(OBJEXT): config.h
+enc/big5.$(OBJEXT): defines.h
+enc/big5.$(OBJEXT): enc/big5.c
+enc/big5.$(OBJEXT): missing.h
+enc/big5.$(OBJEXT): oniguruma.h
+enc/cp949.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/cp949.$(OBJEXT): config.h
+enc/cp949.$(OBJEXT): defines.h
+enc/cp949.$(OBJEXT): enc/cp949.c
+enc/cp949.$(OBJEXT): missing.h
+enc/cp949.$(OBJEXT): oniguruma.h
+enc/emacs_mule.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/emacs_mule.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/emacs_mule.$(OBJEXT): $(top_srcdir)/regint.h
+enc/emacs_mule.$(OBJEXT): config.h
+enc/emacs_mule.$(OBJEXT): defines.h
+enc/emacs_mule.$(OBJEXT): enc/emacs_mule.c
+enc/emacs_mule.$(OBJEXT): intern.h
+enc/emacs_mule.$(OBJEXT): missing.h
+enc/emacs_mule.$(OBJEXT): oniguruma.h
+enc/emacs_mule.$(OBJEXT): st.h
+enc/emacs_mule.$(OBJEXT): subst.h
+enc/encdb.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/encdb.$(OBJEXT): $(top_srcdir)/include/ruby.h
+enc/encdb.$(OBJEXT): $(top_srcdir)/internal.h
+enc/encdb.$(OBJEXT): config.h
+enc/encdb.$(OBJEXT): defines.h
+enc/encdb.$(OBJEXT): enc/encdb.c
+enc/encdb.$(OBJEXT): encdb.h
+enc/encdb.$(OBJEXT): encoding.h
+enc/encdb.$(OBJEXT): intern.h
+enc/encdb.$(OBJEXT): io.h
+enc/encdb.$(OBJEXT): missing.h
+enc/encdb.$(OBJEXT): oniguruma.h
+enc/encdb.$(OBJEXT): st.h
+enc/encdb.$(OBJEXT): subst.h
+enc/euc_jp.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/euc_jp.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/euc_jp.$(OBJEXT): $(top_srcdir)/regint.h
+enc/euc_jp.$(OBJEXT): config.h
+enc/euc_jp.$(OBJEXT): defines.h
+enc/euc_jp.$(OBJEXT): enc/euc_jp.c
+enc/euc_jp.$(OBJEXT): enc/jis/props.h
+enc/euc_jp.$(OBJEXT): enc/jis/props.kwd
+enc/euc_jp.$(OBJEXT): intern.h
+enc/euc_jp.$(OBJEXT): missing.h
+enc/euc_jp.$(OBJEXT): oniguruma.h
+enc/euc_jp.$(OBJEXT): st.h
+enc/euc_jp.$(OBJEXT): subst.h
+enc/euc_kr.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/euc_kr.$(OBJEXT): config.h
+enc/euc_kr.$(OBJEXT): defines.h
+enc/euc_kr.$(OBJEXT): enc/euc_kr.c
+enc/euc_kr.$(OBJEXT): missing.h
+enc/euc_kr.$(OBJEXT): oniguruma.h
+enc/euc_tw.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/euc_tw.$(OBJEXT): config.h
+enc/euc_tw.$(OBJEXT): defines.h
+enc/euc_tw.$(OBJEXT): enc/euc_tw.c
+enc/euc_tw.$(OBJEXT): missing.h
+enc/euc_tw.$(OBJEXT): oniguruma.h
+enc/gb18030.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/gb18030.$(OBJEXT): config.h
+enc/gb18030.$(OBJEXT): defines.h
+enc/gb18030.$(OBJEXT): enc/gb18030.c
+enc/gb18030.$(OBJEXT): missing.h
+enc/gb18030.$(OBJEXT): oniguruma.h
+enc/gb2312.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/gb2312.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/gb2312.$(OBJEXT): config.h
+enc/gb2312.$(OBJEXT): defines.h
+enc/gb2312.$(OBJEXT): enc/gb2312.c
+enc/gb2312.$(OBJEXT): encoding.h
+enc/gb2312.$(OBJEXT): intern.h
+enc/gb2312.$(OBJEXT): missing.h
+enc/gb2312.$(OBJEXT): oniguruma.h
+enc/gb2312.$(OBJEXT): st.h
+enc/gb2312.$(OBJEXT): subst.h
+enc/gbk.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/gbk.$(OBJEXT): config.h
+enc/gbk.$(OBJEXT): defines.h
+enc/gbk.$(OBJEXT): enc/gbk.c
+enc/gbk.$(OBJEXT): missing.h
+enc/gbk.$(OBJEXT): oniguruma.h
+enc/iso_8859_1.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_1.$(OBJEXT): config.h
+enc/iso_8859_1.$(OBJEXT): defines.h
+enc/iso_8859_1.$(OBJEXT): enc/iso_8859_1.c
+enc/iso_8859_1.$(OBJEXT): missing.h
+enc/iso_8859_1.$(OBJEXT): oniguruma.h
+enc/iso_8859_10.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_10.$(OBJEXT): config.h
+enc/iso_8859_10.$(OBJEXT): defines.h
+enc/iso_8859_10.$(OBJEXT): enc/iso_8859_10.c
+enc/iso_8859_10.$(OBJEXT): missing.h
+enc/iso_8859_10.$(OBJEXT): oniguruma.h
+enc/iso_8859_11.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_11.$(OBJEXT): config.h
+enc/iso_8859_11.$(OBJEXT): defines.h
+enc/iso_8859_11.$(OBJEXT): enc/iso_8859_11.c
+enc/iso_8859_11.$(OBJEXT): missing.h
+enc/iso_8859_11.$(OBJEXT): oniguruma.h
+enc/iso_8859_13.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_13.$(OBJEXT): config.h
+enc/iso_8859_13.$(OBJEXT): defines.h
+enc/iso_8859_13.$(OBJEXT): enc/iso_8859_13.c
+enc/iso_8859_13.$(OBJEXT): missing.h
+enc/iso_8859_13.$(OBJEXT): oniguruma.h
+enc/iso_8859_14.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_14.$(OBJEXT): config.h
+enc/iso_8859_14.$(OBJEXT): defines.h
+enc/iso_8859_14.$(OBJEXT): enc/iso_8859_14.c
+enc/iso_8859_14.$(OBJEXT): missing.h
+enc/iso_8859_14.$(OBJEXT): oniguruma.h
+enc/iso_8859_15.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_15.$(OBJEXT): config.h
+enc/iso_8859_15.$(OBJEXT): defines.h
+enc/iso_8859_15.$(OBJEXT): enc/iso_8859_15.c
+enc/iso_8859_15.$(OBJEXT): missing.h
+enc/iso_8859_15.$(OBJEXT): oniguruma.h
+enc/iso_8859_16.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_16.$(OBJEXT): config.h
+enc/iso_8859_16.$(OBJEXT): defines.h
+enc/iso_8859_16.$(OBJEXT): enc/iso_8859_16.c
+enc/iso_8859_16.$(OBJEXT): missing.h
+enc/iso_8859_16.$(OBJEXT): oniguruma.h
+enc/iso_8859_2.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_2.$(OBJEXT): config.h
+enc/iso_8859_2.$(OBJEXT): defines.h
+enc/iso_8859_2.$(OBJEXT): enc/iso_8859_2.c
+enc/iso_8859_2.$(OBJEXT): missing.h
+enc/iso_8859_2.$(OBJEXT): oniguruma.h
+enc/iso_8859_3.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_3.$(OBJEXT): config.h
+enc/iso_8859_3.$(OBJEXT): defines.h
+enc/iso_8859_3.$(OBJEXT): enc/iso_8859_3.c
+enc/iso_8859_3.$(OBJEXT): missing.h
+enc/iso_8859_3.$(OBJEXT): oniguruma.h
+enc/iso_8859_4.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_4.$(OBJEXT): config.h
+enc/iso_8859_4.$(OBJEXT): defines.h
+enc/iso_8859_4.$(OBJEXT): enc/iso_8859_4.c
+enc/iso_8859_4.$(OBJEXT): missing.h
+enc/iso_8859_4.$(OBJEXT): oniguruma.h
+enc/iso_8859_5.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_5.$(OBJEXT): config.h
+enc/iso_8859_5.$(OBJEXT): defines.h
+enc/iso_8859_5.$(OBJEXT): enc/iso_8859_5.c
+enc/iso_8859_5.$(OBJEXT): missing.h
+enc/iso_8859_5.$(OBJEXT): oniguruma.h
+enc/iso_8859_6.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_6.$(OBJEXT): config.h
+enc/iso_8859_6.$(OBJEXT): defines.h
+enc/iso_8859_6.$(OBJEXT): enc/iso_8859_6.c
+enc/iso_8859_6.$(OBJEXT): missing.h
+enc/iso_8859_6.$(OBJEXT): oniguruma.h
+enc/iso_8859_7.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_7.$(OBJEXT): config.h
+enc/iso_8859_7.$(OBJEXT): defines.h
+enc/iso_8859_7.$(OBJEXT): enc/iso_8859_7.c
+enc/iso_8859_7.$(OBJEXT): missing.h
+enc/iso_8859_7.$(OBJEXT): oniguruma.h
+enc/iso_8859_8.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_8.$(OBJEXT): config.h
+enc/iso_8859_8.$(OBJEXT): defines.h
+enc/iso_8859_8.$(OBJEXT): enc/iso_8859_8.c
+enc/iso_8859_8.$(OBJEXT): missing.h
+enc/iso_8859_8.$(OBJEXT): oniguruma.h
+enc/iso_8859_9.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/iso_8859_9.$(OBJEXT): config.h
+enc/iso_8859_9.$(OBJEXT): defines.h
+enc/iso_8859_9.$(OBJEXT): enc/iso_8859_9.c
+enc/iso_8859_9.$(OBJEXT): missing.h
+enc/iso_8859_9.$(OBJEXT): oniguruma.h
+enc/koi8_r.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/koi8_r.$(OBJEXT): config.h
+enc/koi8_r.$(OBJEXT): defines.h
+enc/koi8_r.$(OBJEXT): enc/koi8_r.c
+enc/koi8_r.$(OBJEXT): missing.h
+enc/koi8_r.$(OBJEXT): oniguruma.h
+enc/koi8_u.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/koi8_u.$(OBJEXT): config.h
+enc/koi8_u.$(OBJEXT): defines.h
+enc/koi8_u.$(OBJEXT): enc/koi8_u.c
+enc/koi8_u.$(OBJEXT): missing.h
+enc/koi8_u.$(OBJEXT): oniguruma.h
+enc/shift_jis.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/shift_jis.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/shift_jis.$(OBJEXT): $(top_srcdir)/regint.h
+enc/shift_jis.$(OBJEXT): config.h
+enc/shift_jis.$(OBJEXT): defines.h
+enc/shift_jis.$(OBJEXT): enc/jis/props.h
+enc/shift_jis.$(OBJEXT): enc/jis/props.kwd
+enc/shift_jis.$(OBJEXT): enc/shift_jis.c
+enc/shift_jis.$(OBJEXT): intern.h
+enc/shift_jis.$(OBJEXT): missing.h
+enc/shift_jis.$(OBJEXT): oniguruma.h
+enc/shift_jis.$(OBJEXT): st.h
+enc/shift_jis.$(OBJEXT): subst.h
+enc/trans/big5.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/big5.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/big5.$(OBJEXT): config.h
+enc/trans/big5.$(OBJEXT): defines.h
+enc/trans/big5.$(OBJEXT): enc/trans/big5.c
+enc/trans/big5.$(OBJEXT): intern.h
+enc/trans/big5.$(OBJEXT): missing.h
+enc/trans/big5.$(OBJEXT): st.h
+enc/trans/big5.$(OBJEXT): subst.h
+enc/trans/chinese.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/chinese.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/chinese.$(OBJEXT): config.h
+enc/trans/chinese.$(OBJEXT): defines.h
+enc/trans/chinese.$(OBJEXT): enc/trans/chinese.c
+enc/trans/chinese.$(OBJEXT): intern.h
+enc/trans/chinese.$(OBJEXT): missing.h
+enc/trans/chinese.$(OBJEXT): st.h
+enc/trans/chinese.$(OBJEXT): subst.h
+enc/trans/emoji.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/emoji.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji.$(OBJEXT): config.h
+enc/trans/emoji.$(OBJEXT): defines.h
+enc/trans/emoji.$(OBJEXT): enc/trans/emoji.c
+enc/trans/emoji.$(OBJEXT): intern.h
+enc/trans/emoji.$(OBJEXT): missing.h
+enc/trans/emoji.$(OBJEXT): st.h
+enc/trans/emoji.$(OBJEXT): subst.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): config.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): defines.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): enc/trans/emoji_iso2022_kddi.c
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): intern.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): missing.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): st.h
+enc/trans/emoji_iso2022_kddi.$(OBJEXT): subst.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): config.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): defines.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): enc/trans/emoji_sjis_docomo.c
+enc/trans/emoji_sjis_docomo.$(OBJEXT): intern.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): missing.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): st.h
+enc/trans/emoji_sjis_docomo.$(OBJEXT): subst.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): config.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): defines.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): enc/trans/emoji_sjis_kddi.c
+enc/trans/emoji_sjis_kddi.$(OBJEXT): intern.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): missing.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): st.h
+enc/trans/emoji_sjis_kddi.$(OBJEXT): subst.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): config.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): defines.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): enc/trans/emoji_sjis_softbank.c
+enc/trans/emoji_sjis_softbank.$(OBJEXT): intern.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): missing.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): st.h
+enc/trans/emoji_sjis_softbank.$(OBJEXT): subst.h
+enc/trans/escape.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/escape.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/escape.$(OBJEXT): config.h
+enc/trans/escape.$(OBJEXT): defines.h
+enc/trans/escape.$(OBJEXT): enc/trans/escape.c
+enc/trans/escape.$(OBJEXT): intern.h
+enc/trans/escape.$(OBJEXT): missing.h
+enc/trans/escape.$(OBJEXT): st.h
+enc/trans/escape.$(OBJEXT): subst.h
+enc/trans/gb18030.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/gb18030.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/gb18030.$(OBJEXT): config.h
+enc/trans/gb18030.$(OBJEXT): defines.h
+enc/trans/gb18030.$(OBJEXT): enc/trans/gb18030.c
+enc/trans/gb18030.$(OBJEXT): intern.h
+enc/trans/gb18030.$(OBJEXT): missing.h
+enc/trans/gb18030.$(OBJEXT): st.h
+enc/trans/gb18030.$(OBJEXT): subst.h
+enc/trans/gbk.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/gbk.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/gbk.$(OBJEXT): config.h
+enc/trans/gbk.$(OBJEXT): defines.h
+enc/trans/gbk.$(OBJEXT): enc/trans/gbk.c
+enc/trans/gbk.$(OBJEXT): intern.h
+enc/trans/gbk.$(OBJEXT): missing.h
+enc/trans/gbk.$(OBJEXT): st.h
+enc/trans/gbk.$(OBJEXT): subst.h
+enc/trans/iso2022.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/iso2022.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/iso2022.$(OBJEXT): config.h
+enc/trans/iso2022.$(OBJEXT): defines.h
+enc/trans/iso2022.$(OBJEXT): enc/trans/iso2022.c
+enc/trans/iso2022.$(OBJEXT): intern.h
+enc/trans/iso2022.$(OBJEXT): missing.h
+enc/trans/iso2022.$(OBJEXT): st.h
+enc/trans/iso2022.$(OBJEXT): subst.h
+enc/trans/japanese.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/japanese.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/japanese.$(OBJEXT): config.h
+enc/trans/japanese.$(OBJEXT): defines.h
+enc/trans/japanese.$(OBJEXT): enc/trans/japanese.c
+enc/trans/japanese.$(OBJEXT): intern.h
+enc/trans/japanese.$(OBJEXT): missing.h
+enc/trans/japanese.$(OBJEXT): st.h
+enc/trans/japanese.$(OBJEXT): subst.h
+enc/trans/japanese_euc.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/japanese_euc.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/japanese_euc.$(OBJEXT): config.h
+enc/trans/japanese_euc.$(OBJEXT): defines.h
+enc/trans/japanese_euc.$(OBJEXT): enc/trans/japanese_euc.c
+enc/trans/japanese_euc.$(OBJEXT): intern.h
+enc/trans/japanese_euc.$(OBJEXT): missing.h
+enc/trans/japanese_euc.$(OBJEXT): st.h
+enc/trans/japanese_euc.$(OBJEXT): subst.h
+enc/trans/japanese_sjis.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/japanese_sjis.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/japanese_sjis.$(OBJEXT): config.h
+enc/trans/japanese_sjis.$(OBJEXT): defines.h
+enc/trans/japanese_sjis.$(OBJEXT): enc/trans/japanese_sjis.c
+enc/trans/japanese_sjis.$(OBJEXT): intern.h
+enc/trans/japanese_sjis.$(OBJEXT): missing.h
+enc/trans/japanese_sjis.$(OBJEXT): st.h
+enc/trans/japanese_sjis.$(OBJEXT): subst.h
+enc/trans/korean.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/korean.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/korean.$(OBJEXT): config.h
+enc/trans/korean.$(OBJEXT): defines.h
+enc/trans/korean.$(OBJEXT): enc/trans/korean.c
+enc/trans/korean.$(OBJEXT): intern.h
+enc/trans/korean.$(OBJEXT): missing.h
+enc/trans/korean.$(OBJEXT): st.h
+enc/trans/korean.$(OBJEXT): subst.h
+enc/trans/single_byte.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/single_byte.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/single_byte.$(OBJEXT): config.h
+enc/trans/single_byte.$(OBJEXT): defines.h
+enc/trans/single_byte.$(OBJEXT): enc/trans/single_byte.c
+enc/trans/single_byte.$(OBJEXT): intern.h
+enc/trans/single_byte.$(OBJEXT): missing.h
+enc/trans/single_byte.$(OBJEXT): st.h
+enc/trans/single_byte.$(OBJEXT): subst.h
+enc/trans/transdb.$(OBJEXT): enc/trans/transdb.c
+enc/trans/transdb.$(OBJEXT): transdb.h
+enc/trans/utf8_mac.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/utf8_mac.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/utf8_mac.$(OBJEXT): config.h
+enc/trans/utf8_mac.$(OBJEXT): defines.h
+enc/trans/utf8_mac.$(OBJEXT): enc/trans/utf8_mac.c
+enc/trans/utf8_mac.$(OBJEXT): intern.h
+enc/trans/utf8_mac.$(OBJEXT): missing.h
+enc/trans/utf8_mac.$(OBJEXT): st.h
+enc/trans/utf8_mac.$(OBJEXT): subst.h
+enc/trans/utf_16_32.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/trans/utf_16_32.$(OBJEXT): $(top_srcdir)/transcode_data.h
+enc/trans/utf_16_32.$(OBJEXT): config.h
+enc/trans/utf_16_32.$(OBJEXT): defines.h
+enc/trans/utf_16_32.$(OBJEXT): enc/trans/utf_16_32.c
+enc/trans/utf_16_32.$(OBJEXT): intern.h
+enc/trans/utf_16_32.$(OBJEXT): missing.h
+enc/trans/utf_16_32.$(OBJEXT): st.h
+enc/trans/utf_16_32.$(OBJEXT): subst.h
+enc/utf_16be.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/utf_16be.$(OBJEXT): config.h
+enc/utf_16be.$(OBJEXT): defines.h
+enc/utf_16be.$(OBJEXT): enc/utf_16be.c
+enc/utf_16be.$(OBJEXT): missing.h
+enc/utf_16be.$(OBJEXT): oniguruma.h
+enc/utf_16le.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/utf_16le.$(OBJEXT): config.h
+enc/utf_16le.$(OBJEXT): defines.h
+enc/utf_16le.$(OBJEXT): enc/utf_16le.c
+enc/utf_16le.$(OBJEXT): missing.h
+enc/utf_16le.$(OBJEXT): oniguruma.h
+enc/utf_32be.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/utf_32be.$(OBJEXT): config.h
+enc/utf_32be.$(OBJEXT): defines.h
+enc/utf_32be.$(OBJEXT): enc/utf_32be.c
+enc/utf_32be.$(OBJEXT): missing.h
+enc/utf_32be.$(OBJEXT): oniguruma.h
+enc/utf_32le.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/utf_32le.$(OBJEXT): config.h
+enc/utf_32le.$(OBJEXT): defines.h
+enc/utf_32le.$(OBJEXT): enc/utf_32le.c
+enc/utf_32le.$(OBJEXT): missing.h
+enc/utf_32le.$(OBJEXT): oniguruma.h
+enc/windows_1251.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_1251.$(OBJEXT): config.h
+enc/windows_1251.$(OBJEXT): defines.h
+enc/windows_1251.$(OBJEXT): enc/windows_1251.c
+enc/windows_1251.$(OBJEXT): missing.h
+enc/windows_1251.$(OBJEXT): oniguruma.h
+enc/windows_31j.$(OBJEXT): $(hdrdir)/ruby/ruby.h
+enc/windows_31j.$(OBJEXT): $(top_srcdir)/regenc.h
+enc/windows_31j.$(OBJEXT): $(top_srcdir)/regint.h
+enc/windows_31j.$(OBJEXT): config.h
+enc/windows_31j.$(OBJEXT): defines.h
+enc/windows_31j.$(OBJEXT): enc/jis/props.h
+enc/windows_31j.$(OBJEXT): enc/jis/props.kwd
+enc/windows_31j.$(OBJEXT): enc/shift_jis.c
+enc/windows_31j.$(OBJEXT): enc/windows_31j.c
+enc/windows_31j.$(OBJEXT): intern.h
+enc/windows_31j.$(OBJEXT): missing.h
+enc/windows_31j.$(OBJEXT): oniguruma.h
+enc/windows_31j.$(OBJEXT): st.h
+enc/windows_31j.$(OBJEXT): subst.h
+# AUTOGENERATED DEPENDENCIES END
diff --git a/enc/encdb.c b/enc/encdb.c
index fa04a5f7f6..a41e4edc6d 100644
--- a/enc/encdb.c
+++ b/enc/encdb.c
@@ -9,13 +9,8 @@
 
 **********************************************************************/
 
-int rb_encdb_replicate(const char *alias, const char *orig);
-int rb_encdb_alias(const char *alias, const char *orig);
-int rb_encdb_dummy(const char *name);
-void rb_encdb_declare(const char *name);
-void rb_enc_set_base(const char *name, const char *orig);
-int rb_enc_set_dummy(int index);
-void rb_encdb_set_unicode(int index);
+#include "internal.h"
+
 #define ENC_REPLICATE(name, orig) rb_encdb_replicate((name), (orig))
 #define ENC_ALIAS(name, orig) rb_encdb_alias((name), (orig))
 #define ENC_DUMMY(name) rb_encdb_dummy(name)
diff --git a/enc/encinit.c.erb b/enc/encinit.c.erb
index fd3ade0c4b..70c2a1934c 100644
--- a/enc/encinit.c.erb
+++ b/enc/encinit.c.erb
@@ -8,19 +8,30 @@
     ruby_init_ext(name, func);	\
 }
 
+#define init_enc(name) init(Init_##name, "enc/"#name".so")
+#define init_trans(name) init(Init_trans_##name, "enc/trans/"#name".so")
+#define provide(func, name) { \
+    extern void Init_##func(void); \
+    Init_##func(); \
+    rb_provide(name".so"); \
+}
+
 void ruby_init_ext(const char *name, void (*init)(void));
+void rb_provide(const char *feature);
 
 void
 Init_enc(void)
 {
+    provide(encdb, "encdb");
 % ENCS.each do |enc|
-    init(Init_<%= enc %>, "enc/<%= enc %>.so");
+%   next if enc == 'encdb'
+    init_enc(<%= enc %>);
 % end
 
-    init(Init_transdb, "enc/trans/transdb.so");
+    provide(transdb, "trans/transdb");
 % TRANS.each do |trans|
 %   next if trans == 'trans/transdb'
-    init(Init_trans_<%= File.basename trans %>, "enc/<%= trans %>.so");
+    init_trans(<%= File.basename trans %>);
 % end
 }
 <%# vim: set ft=eruby sw=2 : -%>
diff --git a/enc/euc_jp.c b/enc/euc_jp.c
index d7af1abaee..e4d3b70167 100644
--- a/enc/euc_jp.c
+++ b/enc/euc_jp.c
@@ -293,7 +293,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc)
 {
   return onigenc_apply_all_case_fold_with_map(
-            sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+            numberof(CaseFoldMap), CaseFoldMap, 0,
             flag, f, arg);
 }
 
@@ -381,8 +381,10 @@ mbc_case_fold(OnigCaseFoldType flag,
     OnigCodePoint code;
     int len;
 
+    len = mbc_enc_len(p, end, enc);
     code = get_lower_case(mbc_to_code(p, end, enc));
     len = code_to_mbc(code, lower, enc);
+    if (len == ONIGERR_INVALID_CODE_POINT_VALUE) len = 1;
     (*pp) += len;
     return len; /* return byte length of converted char to lower */
   }
@@ -418,12 +420,6 @@ is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_
 }
 
 
-static int PropertyInited = 0;
-static const OnigCodePoint** PropertyList;
-static int PropertyListNum;
-static int PropertyListSize;
-static hash_table_type* PropertyNameTable;
-
 static const OnigCodePoint CR_Hiragana[] = {
   1,
 #ifdef ENC_EUC_JIS_2004
@@ -504,41 +500,20 @@ static const OnigCodePoint CR_Cyrillic[] = {
   /* TODO: add JIS X 0212 row 7 */
 }; /* CR_Cyrillic */
 
-static int
-init_property_list(void)
-{
-  int r;
-
-  PROPERTY_LIST_ADD_PROP("hiragana", CR_Hiragana);
-  PROPERTY_LIST_ADD_PROP("katakana", CR_Katakana);
-  PROPERTY_LIST_ADD_PROP("han", CR_Han);
-  PROPERTY_LIST_ADD_PROP("latin", CR_Latin);
-  PROPERTY_LIST_ADD_PROP("greek", CR_Greek);
-  PROPERTY_LIST_ADD_PROP("cyrillic", CR_Cyrillic);
-  PropertyInited = 1;
-
- end:
-  return r;
-}
+#include "enc/jis/props.h"
 
 static int
 property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
 {
-  st_data_t ctype;
-  UChar *s, *e;
-
-  PROPERTY_LIST_INIT_CHECK;
+  UChar *s = p, *e = end;
+  const struct enc_property *prop =
+    onig_jis_property((const char* )s, (unsigned int )(e - s));
 
-  s = e = ALLOCA_N(UChar, end-p+1);
-  for (; p < end; p++) {
-    *e++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-  }
-
-  if (onig_st_lookup_strend(PropertyNameTable, s, e, &ctype) == 0) {
+  if (!prop) {
     return onigenc_minimum_property_name_to_ctype(enc, s, e);
   }
 
-  return (int )ctype;
+  return (int )prop->ctype;
 }
 
 static int
@@ -554,8 +529,6 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
     }
   }
   else {
-    PROPERTY_LIST_INIT_CHECK;
-
     ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
     if (ctype >= (unsigned int )PropertyListNum)
       return ONIGERR_TYPE_BUG;
@@ -576,8 +549,6 @@ get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
   else {
     *sb_out = 0x80;
 
-    PROPERTY_LIST_INIT_CHECK;
-
     ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
     if (ctype >= (OnigCtype )PropertyListNum)
       return ONIGERR_TYPE_BUG;
diff --git a/enc/iso_8859_1.c b/enc/iso_8859_1.c
index 92dc14f978..e3315876cd 100644
--- a/enc/iso_8859_1.c
+++ b/enc/iso_8859_1.c
@@ -29,8 +29,6 @@
 
 #include "regenc.h"
 
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-
 #define ENC_IS_ISO_8859_1_CTYPE(code,ctype) \
   ((EncISO_8859_1_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
 
@@ -277,13 +275,3 @@ OnigEncodingDefine(iso_8859_1, ISO_8859_1) = {
   ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-1", "ISO-8859-1")
-
-/*
- * Name: windows-1252
- * MIBenum: 2252
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1252.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1252
- */
-ENC_REPLICATE("Windows-1252", "ISO-8859-1")
-ENC_ALIAS("CP1252", "Windows-1252")
diff --git a/enc/iso_8859_10.c b/enc/iso_8859_10.c
index ec20a15baa..ab71a5adcf 100644
--- a/enc/iso_8859_10.c
+++ b/enc/iso_8859_10.c
@@ -208,7 +208,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 			       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -219,7 +219,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
diff --git a/enc/iso_8859_13.c b/enc/iso_8859_13.c
index 4d7b328818..5607013c80 100644
--- a/enc/iso_8859_13.c
+++ b/enc/iso_8859_13.c
@@ -158,6 +158,10 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc ARG_UNUSE
 }
 
 static const OnigPairCaseFoldCodes CaseFoldMap[] = {
+ { 0xa8, 0xb8 },
+ { 0xaa, 0xba },
+ { 0xaf, 0xbf },
+ 
  { 0xc0, 0xe0 },
  { 0xc1, 0xe1 },
  { 0xc2, 0xe2 },
@@ -197,7 +201,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 				OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -208,7 +212,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
diff --git a/enc/iso_8859_14.c b/enc/iso_8859_14.c
index 1271c8a7a6..2939e89b7b 100644
--- a/enc/iso_8859_14.c
+++ b/enc/iso_8859_14.c
@@ -210,7 +210,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 				OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -221,7 +221,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
diff --git a/enc/iso_8859_15.c b/enc/iso_8859_15.c
index 451033e158..fdb7ca12d7 100644
--- a/enc/iso_8859_15.c
+++ b/enc/iso_8859_15.c
@@ -204,7 +204,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 				OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -215,7 +215,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
diff --git a/enc/iso_8859_16.c b/enc/iso_8859_16.c
index 5234cf0e7f..5e53f3b6d0 100644
--- a/enc/iso_8859_16.c
+++ b/enc/iso_8859_16.c
@@ -206,7 +206,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 				OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -217,7 +217,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 				       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
diff --git a/enc/iso_8859_2.c b/enc/iso_8859_2.c
index f4cb9100df..9302e62fc1 100644
--- a/enc/iso_8859_2.c
+++ b/enc/iso_8859_2.c
@@ -29,8 +29,6 @@
 
 #include "regenc.h"
 
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
-
 #define ENC_ISO_8859_2_TO_LOWER_CASE(c) EncISO_8859_2_ToLowerCaseTable[c]
 #define ENC_IS_ISO_8859_2_CTYPE(code,ctype) \
   ((EncISO_8859_2_CtypeTable[code] & CTYPE_TO_BIT(ctype)) != 0)
@@ -242,13 +240,3 @@ OnigEncodingDefine(iso_8859_2, ISO_8859_2) = {
   ONIGENC_FLAG_NONE,
 };
 ENC_ALIAS("ISO8859-2", "ISO-8859-2")
-
-/*
- * Name: windows-1250
- * MIBenum: 2250
- * Link: http://www.iana.org/assignments/character-sets
- * Link: http://www.microsoft.com/globaldev/reference/sbcs/1250.mspx
- * Link: http://en.wikipedia.org/wiki/Windows-1250
- */
-ENC_REPLICATE("Windows-1250", "ISO-8859-2")
-ENC_ALIAS("CP1250", "Windows-1250")
diff --git a/enc/iso_8859_3.c b/enc/iso_8859_3.c
index 85572574b8..863a575020 100644
--- a/enc/iso_8859_3.c
+++ b/enc/iso_8859_3.c
@@ -204,7 +204,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -215,7 +215,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
diff --git a/enc/iso_8859_4.c b/enc/iso_8859_4.c
index 771a2cf6e7..6a74406303 100644
--- a/enc/iso_8859_4.c
+++ b/enc/iso_8859_4.c
@@ -166,6 +166,7 @@ static const OnigPairCaseFoldCodes CaseFoldMap[] = {
  { 0xab, 0xbb },
  { 0xac, 0xbc },
  { 0xae, 0xbe },
+ { 0xbd, 0xbf },
 
  { 0xc0, 0xe0 },
  { 0xc1, 0xe1 },
@@ -206,7 +207,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -217,7 +218,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
diff --git a/enc/iso_8859_5.c b/enc/iso_8859_5.c
index 4ee27b10d8..e71a488c4c 100644
--- a/enc/iso_8859_5.c
+++ b/enc/iso_8859_5.c
@@ -194,7 +194,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             numberof(CaseFoldMap), CaseFoldMap, 0,
              flag, f, arg);
 }
 
@@ -205,7 +205,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     numberof(CaseFoldMap), CaseFoldMap, 0,
 	     flag, p, end, items);
 }
 
diff --git a/enc/iso_8859_7.c b/enc/iso_8859_7.c
index aa82f880f9..8d07cb6310 100644
--- a/enc/iso_8859_7.c
+++ b/enc/iso_8859_7.c
@@ -190,7 +190,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             numberof(CaseFoldMap), CaseFoldMap, 0,
              flag, f, arg);
 }
 
@@ -201,7 +201,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 			   OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     numberof(CaseFoldMap), CaseFoldMap, 0,
 	     flag, p, end, items);
 }
 
diff --git a/enc/iso_8859_9.c b/enc/iso_8859_9.c
index 0adafa3ed4..211ba3b2f3 100644
--- a/enc/iso_8859_9.c
+++ b/enc/iso_8859_9.c
@@ -197,7 +197,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 			       OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+             numberof(CaseFoldMap), CaseFoldMap, 1,
              flag, f, arg);
 }
 
@@ -208,7 +208,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag,
 				      OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 1,
+	     numberof(CaseFoldMap), CaseFoldMap, 1,
 	     flag, p, end, items);
 }
 
diff --git a/enc/jis/props.h b/enc/jis/props.h
new file mode 100644
index 0000000000..4ae2e1fd23
--- /dev/null
+++ b/enc/jis/props.h
@@ -0,0 +1,227 @@
+/* C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property enc/jis/props.kwd  */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+#line 1 "enc/jis/props.kwd"
+/* -*- c -*- */
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRNCMP 1
+
+static inline int
+gperf_case_strncmp(const char *s1, const char *s2, unsigned int n)
+{
+    const UChar *str = (const UChar *)s1;
+    const UChar *s = (const UChar *)s2;
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
+}
+
+enum onigenc_jis_ctype {
+    onigenc_jis_min = ONIGENC_MAX_STD_CTYPE,
+    onigenc_jis_hiragana,
+    onigenc_jis_katakana,
+    onigenc_jis_han,
+    onigenc_jis_latin,
+    onigenc_jis_greek,
+    onigenc_jis_cyrillic,
+    onigenc_jis_max
+};
+
+enum {PropertyListNum = onigenc_jis_max - onigenc_jis_min - 1};
+
+static const OnigCodePoint* const PropertyList[PropertyListNum] = {
+    CR_Hiragana,
+    CR_Katakana,
+    CR_Han,
+    CR_Latin,
+    CR_Greek,
+    CR_Cyrillic,
+};
+
+struct enc_property {
+    signed char name;
+    unsigned char ctype;
+};
+
+static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
+#line 43 "enc/jis/props.kwd"
+struct enc_property;
+
+#define TOTAL_KEYWORDS 6
+#define MIN_WORD_LENGTH 3
+#define MAX_WORD_LENGTH 8
+#define MIN_HASH_VALUE 5
+#define MAX_HASH_VALUE 12
+/* maximum key range = 8, duplicates = 0 */
+
+#ifndef GPERF_DOWNCASE
+#define GPERF_DOWNCASE 1
+static unsigned char gperf_downcase[256] =
+  {
+      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
+     15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+     30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+     45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+     60,  61,  62,  63,  64,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106,
+    107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+    122,  91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104,
+    105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+    120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+    135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+    150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+    165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+    180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+    195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+    210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+    225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+    240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+    255
+  };
+#endif
+
+#ifndef GPERF_CASE_STRNCMP
+#define GPERF_CASE_STRNCMP 1
+static int
+gperf_case_strncmp (s1, s2, n)
+     register const char *s1;
+     register const char *s2;
+     register unsigned int n;
+{
+  for (; n > 0;)
+    {
+      unsigned char c1 = gperf_downcase[(unsigned char)*s1++];
+      unsigned char c2 = gperf_downcase[(unsigned char)*s2++];
+      if (c1 != 0 && c1 == c2)
+        {
+          n--;
+          continue;
+        }
+      return (int)c1 - (int)c2;
+    }
+  return 0;
+}
+#endif
+
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
+inline
+#elif defined(__GNUC__)
+__inline
+#endif
+static unsigned int
+onig_jis_property_hash (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static const unsigned char asso_values[] =
+    {
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13,  3, 13,  2,
+      13,  1,  1, 13, 13,  2,  1, 13,  1, 13,
+      13, 13,  1, 13,  1, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13,  3,
+      13,  2, 13,  1,  1, 13, 13,  2,  1, 13,
+       1, 13, 13, 13,  1, 13,  1, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13
+    };
+  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
+}
+
+struct onig_jis_property_pool_t
+  {
+    char onig_jis_property_pool_str5[sizeof("han")];
+    char onig_jis_property_pool_str7[sizeof("latin")];
+    char onig_jis_property_pool_str8[sizeof("greek")];
+    char onig_jis_property_pool_str10[sizeof("hiragana")];
+    char onig_jis_property_pool_str11[sizeof("katakana")];
+    char onig_jis_property_pool_str12[sizeof("cyrillic")];
+  };
+static const struct onig_jis_property_pool_t onig_jis_property_pool_contents =
+  {
+    "han",
+    "latin",
+    "greek",
+    "hiragana",
+    "katakana",
+    "cyrillic"
+  };
+#define onig_jis_property_pool ((const char *) &onig_jis_property_pool_contents)
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct enc_property *
+onig_jis_property (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static const struct enc_property wordlist[] =
+    {
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 48 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str5),      onigenc_jis_han},
+      {-1},
+#line 49 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str7),    onigenc_jis_latin},
+#line 50 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str8),    onigenc_jis_greek},
+      {-1},
+#line 46 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str10), onigenc_jis_hiragana},
+#line 47 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str11), onigenc_jis_katakana},
+#line 51 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str12), onigenc_jis_cyrillic}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = onig_jis_property_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + onig_jis_property_pool;
+
+              if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strncmp (str, s, len) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+#line 52 "enc/jis/props.kwd"
+
diff --git a/enc/jis/props.h.blt b/enc/jis/props.h.blt
new file mode 100644
index 0000000000..4ae2e1fd23
--- /dev/null
+++ b/enc/jis/props.h.blt
@@ -0,0 +1,227 @@
+/* C code produced by gperf version 3.0.4 */
+/* Command-line: gperf -k1,3 -7 -c -j1 -i1 -t -C -P -t --ignore-case -H onig_jis_property_hash -Q onig_jis_property_pool -N onig_jis_property enc/jis/props.kwd  */
+
+#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
+/* The character set is not based on ISO-646.  */
+error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
+#endif
+
+#line 1 "enc/jis/props.kwd"
+/* -*- c -*- */
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRNCMP 1
+
+static inline int
+gperf_case_strncmp(const char *s1, const char *s2, unsigned int n)
+{
+    const UChar *str = (const UChar *)s1;
+    const UChar *s = (const UChar *)s2;
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
+}
+
+enum onigenc_jis_ctype {
+    onigenc_jis_min = ONIGENC_MAX_STD_CTYPE,
+    onigenc_jis_hiragana,
+    onigenc_jis_katakana,
+    onigenc_jis_han,
+    onigenc_jis_latin,
+    onigenc_jis_greek,
+    onigenc_jis_cyrillic,
+    onigenc_jis_max
+};
+
+enum {PropertyListNum = onigenc_jis_max - onigenc_jis_min - 1};
+
+static const OnigCodePoint* const PropertyList[PropertyListNum] = {
+    CR_Hiragana,
+    CR_Katakana,
+    CR_Han,
+    CR_Latin,
+    CR_Greek,
+    CR_Cyrillic,
+};
+
+struct enc_property {
+    signed char name;
+    unsigned char ctype;
+};
+
+static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
+#line 43 "enc/jis/props.kwd"
+struct enc_property;
+
+#define TOTAL_KEYWORDS 6
+#define MIN_WORD_LENGTH 3
+#define MAX_WORD_LENGTH 8
+#define MIN_HASH_VALUE 5
+#define MAX_HASH_VALUE 12
+/* maximum key range = 8, duplicates = 0 */
+
+#ifndef GPERF_DOWNCASE
+#define GPERF_DOWNCASE 1
+static unsigned char gperf_downcase[256] =
+  {
+      0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,
+     15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
+     30,  31,  32,  33,  34,  35,  36,  37,  38,  39,  40,  41,  42,  43,  44,
+     45,  46,  47,  48,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,
+     60,  61,  62,  63,  64,  97,  98,  99, 100, 101, 102, 103, 104, 105, 106,
+    107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+    122,  91,  92,  93,  94,  95,  96,  97,  98,  99, 100, 101, 102, 103, 104,
+    105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+    120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+    135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,
+    150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164,
+    165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,
+    180, 181, 182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194,
+    195, 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209,
+    210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224,
+    225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239,
+    240, 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254,
+    255
+  };
+#endif
+
+#ifndef GPERF_CASE_STRNCMP
+#define GPERF_CASE_STRNCMP 1
+static int
+gperf_case_strncmp (s1, s2, n)
+     register const char *s1;
+     register const char *s2;
+     register unsigned int n;
+{
+  for (; n > 0;)
+    {
+      unsigned char c1 = gperf_downcase[(unsigned char)*s1++];
+      unsigned char c2 = gperf_downcase[(unsigned char)*s2++];
+      if (c1 != 0 && c1 == c2)
+        {
+          n--;
+          continue;
+        }
+      return (int)c1 - (int)c2;
+    }
+  return 0;
+}
+#endif
+
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__cplusplus) || defined(__GNUC_STDC_INLINE__)
+inline
+#elif defined(__GNUC__)
+__inline
+#endif
+static unsigned int
+onig_jis_property_hash (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static const unsigned char asso_values[] =
+    {
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13,  3, 13,  2,
+      13,  1,  1, 13, 13,  2,  1, 13,  1, 13,
+      13, 13,  1, 13,  1, 13, 13, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13, 13,  3,
+      13,  2, 13,  1,  1, 13, 13,  2,  1, 13,
+       1, 13, 13, 13,  1, 13,  1, 13, 13, 13,
+      13, 13, 13, 13, 13, 13, 13, 13
+    };
+  return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]];
+}
+
+struct onig_jis_property_pool_t
+  {
+    char onig_jis_property_pool_str5[sizeof("han")];
+    char onig_jis_property_pool_str7[sizeof("latin")];
+    char onig_jis_property_pool_str8[sizeof("greek")];
+    char onig_jis_property_pool_str10[sizeof("hiragana")];
+    char onig_jis_property_pool_str11[sizeof("katakana")];
+    char onig_jis_property_pool_str12[sizeof("cyrillic")];
+  };
+static const struct onig_jis_property_pool_t onig_jis_property_pool_contents =
+  {
+    "han",
+    "latin",
+    "greek",
+    "hiragana",
+    "katakana",
+    "cyrillic"
+  };
+#define onig_jis_property_pool ((const char *) &onig_jis_property_pool_contents)
+#ifdef __GNUC__
+__inline
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+const struct enc_property *
+onig_jis_property (str, len)
+     register const char *str;
+     register unsigned int len;
+{
+  static const struct enc_property wordlist[] =
+    {
+      {-1}, {-1}, {-1}, {-1}, {-1},
+#line 48 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str5),      onigenc_jis_han},
+      {-1},
+#line 49 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str7),    onigenc_jis_latin},
+#line 50 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str8),    onigenc_jis_greek},
+      {-1},
+#line 46 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str10), onigenc_jis_hiragana},
+#line 47 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str11), onigenc_jis_katakana},
+#line 51 "enc/jis/props.kwd"
+      {(char)offsetof(struct onig_jis_property_pool_t, onig_jis_property_pool_str12), onigenc_jis_cyrillic}
+    };
+
+  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
+    {
+      register int key = onig_jis_property_hash (str, len);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register int o = wordlist[key].name;
+          if (o >= 0)
+            {
+              register const char *s = o + onig_jis_property_pool;
+
+              if ((((unsigned char)*str ^ (unsigned char)*s) & ~32) == 0 && !gperf_case_strncmp (str, s, len) && s[len] == '\0')
+                return &wordlist[key];
+            }
+        }
+    }
+  return 0;
+}
+#line 52 "enc/jis/props.kwd"
+
diff --git a/enc/jis/props.kwd b/enc/jis/props.kwd
new file mode 100644
index 0000000000..f3235c0100
--- /dev/null
+++ b/enc/jis/props.kwd
@@ -0,0 +1,52 @@
+%{/* -*- c -*- */
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRNCMP 1
+
+static inline int
+gperf_case_strncmp(const char *s1, const char *s2, unsigned int n)
+{
+    const UChar *str = (const UChar *)s1;
+    const UChar *s = (const UChar *)s2;
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
+}
+
+enum onigenc_jis_ctype {
+    onigenc_jis_min = ONIGENC_MAX_STD_CTYPE,
+    onigenc_jis_hiragana,
+    onigenc_jis_katakana,
+    onigenc_jis_han,
+    onigenc_jis_latin,
+    onigenc_jis_greek,
+    onigenc_jis_cyrillic,
+    onigenc_jis_max
+};
+
+enum {PropertyListNum = onigenc_jis_max - onigenc_jis_min - 1};
+
+static const OnigCodePoint* const PropertyList[PropertyListNum] = {
+    CR_Hiragana,
+    CR_Katakana,
+    CR_Han,
+    CR_Latin,
+    CR_Greek,
+    CR_Cyrillic,
+};
+
+struct enc_property {
+    signed char name;
+    unsigned char ctype;
+};
+
+static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
+%}
+
+struct enc_property;
+
+%%
+hiragana, onigenc_jis_hiragana
+katakana, onigenc_jis_katakana
+han,      onigenc_jis_han
+latin,    onigenc_jis_latin
+greek,    onigenc_jis_greek
+cyrillic, onigenc_jis_cyrillic
+%%
diff --git a/enc/jis/props.src b/enc/jis/props.src
new file mode 100644
index 0000000000..f3235c0100
--- /dev/null
+++ b/enc/jis/props.src
@@ -0,0 +1,52 @@
+%{/* -*- c -*- */
+#define GPERF_DOWNCASE 1
+#define GPERF_CASE_STRNCMP 1
+
+static inline int
+gperf_case_strncmp(const char *s1, const char *s2, unsigned int n)
+{
+    const UChar *str = (const UChar *)s1;
+    const UChar *s = (const UChar *)s2;
+    return onigenc_with_ascii_strnicmp(ONIG_ENCODING_ASCII, str, str + n, s, n);
+}
+
+enum onigenc_jis_ctype {
+    onigenc_jis_min = ONIGENC_MAX_STD_CTYPE,
+    onigenc_jis_hiragana,
+    onigenc_jis_katakana,
+    onigenc_jis_han,
+    onigenc_jis_latin,
+    onigenc_jis_greek,
+    onigenc_jis_cyrillic,
+    onigenc_jis_max
+};
+
+enum {PropertyListNum = onigenc_jis_max - onigenc_jis_min - 1};
+
+static const OnigCodePoint* const PropertyList[PropertyListNum] = {
+    CR_Hiragana,
+    CR_Katakana,
+    CR_Han,
+    CR_Latin,
+    CR_Greek,
+    CR_Cyrillic,
+};
+
+struct enc_property {
+    signed char name;
+    unsigned char ctype;
+};
+
+static const struct enc_property *onig_jis_property(const char *str, unsigned int len);
+%}
+
+struct enc_property;
+
+%%
+hiragana, onigenc_jis_hiragana
+katakana, onigenc_jis_katakana
+han,      onigenc_jis_han
+latin,    onigenc_jis_latin
+greek,    onigenc_jis_greek
+cyrillic, onigenc_jis_cyrillic
+%%
diff --git a/enc/koi8_r.c b/enc/koi8_r.c
index 8ec48747f8..85fa72287e 100644
--- a/enc/koi8_r.c
+++ b/enc/koi8_r.c
@@ -183,7 +183,7 @@ koi8_r_apply_all_case_fold(OnigCaseFoldType flag,
 			   void* arg, OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             numberof(CaseFoldMap), CaseFoldMap, 0,
              flag, f, arg);
 }
 
@@ -193,7 +193,7 @@ koi8_r_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 		  OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     numberof(CaseFoldMap), CaseFoldMap, 0,
 	     flag, p, end, items);
 }
 
diff --git a/enc/koi8_u.c b/enc/koi8_u.c
index 0e51b6eb80..0ae449ca21 100644
--- a/enc/koi8_u.c
+++ b/enc/koi8_u.c
@@ -187,7 +187,7 @@ koi8_u_apply_all_case_fold(OnigCaseFoldType flag,
 			   void* arg, OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_apply_all_case_fold_with_map(
-             sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+             numberof(CaseFoldMap), CaseFoldMap, 0,
              flag, f, arg);
 }
 
@@ -197,7 +197,7 @@ koi8_u_get_case_fold_codes_by_str(OnigCaseFoldType flag,
 		  OnigCaseFoldCodeItem items[], OnigEncoding enc ARG_UNUSED)
 {
   return onigenc_get_case_fold_codes_by_str_with_map(
-	     sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+	     numberof(CaseFoldMap), CaseFoldMap, 0,
 	     flag, p, end, items);
 }
 
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb
index b917eca0bd..6ea2213686 100755
--- a/enc/make_encmake.rb
+++ b/enc/make_encmake.rb
@@ -120,8 +120,9 @@ open(ARGV[0], 'wb') {|f|
   f.puts mkin, dep
 }
 if MODULE_TYPE == :static
-  erb = ERB.new(File.read(File.join($srcdir, "encinit.c.erb")), nil, '%-')
-  erb.filename = "enc/encinit.c.cerb"
+  filename = "encinit.c.erb"
+  erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-')
+  erb.filename = "enc/#{filename}"
   tmp = erb.result(binding)
   begin
     Dir.mkdir 'enc'
diff --git a/enc/prelude.rb b/enc/prelude.rb
index 8ce59f957a..be7c0c9445 100644
--- a/enc/prelude.rb
+++ b/enc/prelude.rb
@@ -1,6 +1,4 @@
-%w'enc/encdb.so enc/trans/transdb.so'.each do |init|
-  begin
-    require(init)
-  rescue LoadError
-  end
+begin
+  require 'unicode_normalize'
+rescue LoadError
 end
diff --git a/enc/shift_jis.c b/enc/shift_jis.c
index 5f5a802874..cbd3f02051 100644
--- a/enc/shift_jis.c
+++ b/enc/shift_jis.c
@@ -278,7 +278,7 @@ apply_all_case_fold(OnigCaseFoldType flag,
 		    OnigApplyAllCaseFoldFunc f, void* arg, OnigEncoding enc)
 {
   return onigenc_apply_all_case_fold_with_map(
-            sizeof(CaseFoldMap)/sizeof(OnigPairCaseFoldCodes), CaseFoldMap, 0,
+            numberof(CaseFoldMap), CaseFoldMap, 0,
             flag, f, arg);
 }
 
@@ -433,12 +433,6 @@ is_allowed_reverse_match(const UChar* s, const UChar* end, OnigEncoding enc ARG_
 }
 
 
-static int PropertyInited = 0;
-static const OnigCodePoint** PropertyList;
-static int PropertyListNum;
-static int PropertyListSize;
-static hash_table_type* PropertyNameTable;
-
 static const OnigCodePoint CR_Hiragana[] = {
   1,
   0x829f, 0x82f1
@@ -493,41 +487,20 @@ static const OnigCodePoint CR_Cyrillic[] = {
   0x8480, 0x8491,
 }; /* CR_Cyrillic */
 
-static int
-init_property_list(void)
-{
-  int r;
-
-  PROPERTY_LIST_ADD_PROP("hiragana", CR_Hiragana);
-  PROPERTY_LIST_ADD_PROP("katakana", CR_Katakana);
-  PROPERTY_LIST_ADD_PROP("han", CR_Han);
-  PROPERTY_LIST_ADD_PROP("latin", CR_Latin);
-  PROPERTY_LIST_ADD_PROP("greek", CR_Greek);
-  PROPERTY_LIST_ADD_PROP("cyrillic", CR_Cyrillic);
-  PropertyInited = 1;
-
- end:
-  return r;
-}
+#include "enc/jis/props.h"
 
 static int
 property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end)
 {
-  hash_data_type ctype;
-  UChar *s, *e;
-
-  PROPERTY_LIST_INIT_CHECK;
+  UChar *s = p, *e = end;
+  const struct enc_property *prop =
+    onig_jis_property((const char* )s, (unsigned int )(e - s));
 
-  s = e = ALLOCA_N(UChar, end-p+1);
-  for (; p < end; p++) {
-    *e++ = ONIGENC_ASCII_CODE_TO_LOWER_CASE(*p);
-  }
-
-  if (onig_st_lookup_strend(PropertyNameTable, s, e, &ctype) == 0) {
+  if (!prop) {
     return onigenc_minimum_property_name_to_ctype(enc, s, e);
   }
 
-  return (int )ctype;
+  return (int )prop->ctype;
 }
 
 static int
@@ -543,8 +516,6 @@ is_code_ctype(OnigCodePoint code, unsigned int ctype, OnigEncoding enc)
     }
   }
   else {
-    PROPERTY_LIST_INIT_CHECK;
-
     ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
     if (ctype >= (unsigned int )PropertyListNum)
       return ONIGERR_TYPE_BUG;
@@ -565,8 +536,6 @@ get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
   else {
     *sb_out = 0x80;
 
-    PROPERTY_LIST_INIT_CHECK;
-
     ctype -= (ONIGENC_MAX_STD_CTYPE + 1);
     if (ctype >= (OnigCtype )PropertyListNum)
       return ONIGERR_TYPE_BUG;
diff --git a/enc/trans/JIS/JISX0201-KANA%UCS.src b/enc/trans/JIS/JISX0201-KANA%UCS.src
index d25b580fed..d56b97f7cc 100644
--- a/enc/trans/JIS/JISX0201-KANA%UCS.src
+++ b/enc/trans/JIS/JISX0201-KANA%UCS.src
@@ -12,27 +12,16 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
+# JIS0201.TXT
+# Date: 2015-12-02 23:49:00 GMT [KW]
+# © 2015 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
 #	Name:             JIS X 0201 (1976) to Unicode 1.1 Table
 #	Unicode version:  1.1
-#	Table version:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ BEGIN_MAP
 # same as those used by actual products, nor may they be the best suited
 # for all uses.  For more information on the mappings between various code
 # pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# JIS X 0201 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0201 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
+# VENDORS mapping data.
 #
 #
 #	Format:  Three tab-separated columns
@@ -60,6 +41,22 @@ BEGIN_MAP
 #
 #	The entries are in JIS order
 #
+#  Revision History:
+#
+#    [v2.0, 2015 December 02]
+#    updates to copyright notice and terms of use
+#    no changes to character mappings
+#
+#    [v1.0, 2011 October 14]
+#    Updated terms of use to current wording.
+#    Updated contact information.
+#    No changes to the mapping data.
+#
+#    [v0.9, 8 March 1994]
+#    First release.
+#
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+#    for any questions or comments or to report errors in the data.
 #
 0x21 = 0xFF61
 0x22 = 0xFF62
diff --git a/enc/trans/JIS/JISX0208@1990%UCS.src b/enc/trans/JIS/JISX0208@1990%UCS.src
index c2cacd422e..7875969b95 100644
--- a/enc/trans/JIS/JISX0208@1990%UCS.src
+++ b/enc/trans/JIS/JISX0208@1990%UCS.src
@@ -12,27 +12,17 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
+#
+# JIS0208.TXT
+# Date: 2015-12-02 23:50:00 GMT [KW]
+# © 2015 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
 #	Name:             JIS X 0208 (1990) to Unicode
 #	Unicode version:  1.1
-#	Table version:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +32,7 @@ BEGIN_MAP
 # same as those used by actual products, nor may they be the best suited
 # for all uses.  For more information on the mappings between various code
 # pages incorporating the repertoire of JIS X 0208 (1990) and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# JIS X 0208 (1990) and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0208 (1990)
-# and Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
+# VENDORS mapping data.
 #
 #
 #	Format:  Four tab-separated columns
@@ -77,12 +59,22 @@ BEGIN_MAP
 #			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
 #			0x7426 -> 0x5406 -> 8406
 #
-#   The kanji mappings are a normative part of ISO/IEC 10646.  The
-#       non-kanji mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies
+#  Revision History:
+#
+#    [v2.0, 2015 December 02]
+#    updates to copyright notice and terms of use
+#    no changes to character mappings
+#
+#    [v1.0, 2011 October 14]
+#    Updated terms of use to current wording.
+#    Updated contact information.
+#    No changes to the mapping data.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#    [v0.9, 8 March 1994]
+#    First release.
 #
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+#    for any questions or comments or to report errors in the data.
 #
 # NetBSD specific modification:
 #	2003-08-18 : change the conversion for reverse solidus (0x2140).
diff --git a/enc/trans/JIS/JISX0212%UCS.src b/enc/trans/JIS/JISX0212%UCS.src
index cf4e7ecf62..aa51257b99 100644
--- a/enc/trans/JIS/JISX0212%UCS.src
+++ b/enc/trans/JIS/JISX0212%UCS.src
@@ -12,27 +12,16 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
+# JIS0212.TXT
+# Date: 2015-12-02 23:51:00 GMT [KW]
+# © 2015 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
 #	Name:             JIS X 0212 (1990) to Unicode
 #	Unicode version:  1.1
-#	Table version:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ BEGIN_MAP
 # same as those used by actual products, nor may they be the best suited
 # for all uses.  For more information on the mappings between various code
 # pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# JIS X 0212 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0212 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
+# VENDORS mapping data.
 #
 #
 #	Format:  Three tab-separated columns
@@ -76,17 +57,11 @@ BEGIN_MAP
 #			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
 #			0x6D63 -> 0x4D43 -> 7767
 #
-#   The kanji mappings are a normative part of ISO/IEC 10646.  The
-#       non-kanji mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
 #	Notes:
 #
 #	1. JIS X 0212 apparently unified the following two symbols
 #	   into a single character at 0x2922:
-#	
+#
 #	   LATIN CAPITAL LETTER D WITH STROKE
 #	   LATIN CAPITAL LETTER ETH
 #
@@ -96,7 +71,24 @@ BEGIN_MAP
 #	   0x2922 and 0x2942 are intended to be a capital/small pair.
 #	   Consequently, in the Unicode mapping, 0x2922 is treated as
 #	   LATIN CAPITAL LETTER D WITH STROKE.
-#	  
+#
+#  Revision History:
+#
+#    [v2.0, 2015 December 02]
+#    updates to copyright notice and terms of use
+#    no changes to character mappings
+#
+#    [v1.0, 2011 October 14]
+#    Updated terms of use to current wording.
+#    Updated contact information.
+#    No changes to the mapping data.
+#
+#    [v0.9, 8 March 1994]
+#    First release.
+#
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+#    for any questions or comments or to report errors in the data.
+#
 0x222F = 0x02D8
 0x2230 = 0x02C7
 0x2231 = 0x00B8
diff --git a/enc/trans/JIS/UCS%JISX0201-KANA.src b/enc/trans/JIS/UCS%JISX0201-KANA.src
index 57ae00f23b..fac6ae8afe 100644
--- a/enc/trans/JIS/UCS%JISX0201-KANA.src
+++ b/enc/trans/JIS/UCS%JISX0201-KANA.src
@@ -12,27 +12,16 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
+# JIS0201.TXT
+# Date: 2015-12-02 23:49:00 GMT [KW]
+# © 2015 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
 #	Name:             JIS X 0201 (1976) to Unicode 1.1 Table
 #	Unicode version:  1.1
-#	Table version:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ BEGIN_MAP
 # same as those used by actual products, nor may they be the best suited
 # for all uses.  For more information on the mappings between various code
 # pages incorporating the repertoire of JIS X 0201 and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# JIS X 0201 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0201 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
+# VENDORS mapping data.
 #
 #
 #	Format:  Three tab-separated columns
@@ -60,6 +41,23 @@ BEGIN_MAP
 #
 #	The entries are in JIS order
 #
+#  Revision History:
+#
+#    [v2.0, 2015 December 02]
+#    updates to copyright notice and terms of use
+#    no changes to character mappings
+#
+#    [v1.0, 2011 October 14]
+#    Updated terms of use to current wording.
+#    Updated contact information.
+#    No changes to the mapping data.
+#
+#    [v0.9, 8 March 1994]
+#    First release.
+#
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+#    for any questions or comments or to report errors in the data.
+#
 #
 0xFF61 = 0x21
 0xFF62 = 0x22
diff --git a/enc/trans/JIS/UCS%JISX0208@1990.src b/enc/trans/JIS/UCS%JISX0208@1990.src
index 977171ccda..b06e6de231 100644
--- a/enc/trans/JIS/UCS%JISX0208@1990.src
+++ b/enc/trans/JIS/UCS%JISX0208@1990.src
@@ -12,27 +12,16 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
+# JIS0208.TXT
+# Date: 2015-12-02 23:50:00 GMT [KW]
+# © 2015 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
 #	Name:             JIS X 0208 (1990) to Unicode
 #	Unicode version:  1.1
-#	Table version:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ BEGIN_MAP
 # same as those used by actual products, nor may they be the best suited
 # for all uses.  For more information on the mappings between various code
 # pages incorporating the repertoire of JIS X 0208 (1990) and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# JIS X 0208 (1990) and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0208 (1990)
-# and Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
+# VENDORS mapping data.
 #
 #
 #	Format:  Four tab-separated columns
@@ -77,12 +58,22 @@ BEGIN_MAP
 #			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
 #			0x7426 -> 0x5406 -> 8406
 #
-#   The kanji mappings are a normative part of ISO/IEC 10646.  The
-#       non-kanji mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies
+#  Revision History:
+#
+#    [v2.0, 2015 December 02]
+#    updates to copyright notice and terms of use
+#    no changes to character mappings
+#
+#    [v1.0, 2011 October 14]
+#    Updated terms of use to current wording.
+#    Updated contact information.
+#    No changes to the mapping data.
 #
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
+#    [v0.9, 8 March 1994]
+#    First release.
 #
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+#    for any questions or comments or to report errors in the data.
 #
 # NetBSD specific modification:
 #	2003-08-18 : add U+FF3C -> 0x2140 conversion.
diff --git a/enc/trans/JIS/UCS%JISX0212.src b/enc/trans/JIS/UCS%JISX0212.src
index f3b2e7089b..65383a1c9f 100644
--- a/enc/trans/JIS/UCS%JISX0212.src
+++ b/enc/trans/JIS/UCS%JISX0212.src
@@ -12,27 +12,16 @@ BEGIN_MAP
 # This mapping data is made from the mapping data provided by Unicode, Inc.
 # Original notice:
 #
+# JIS0212.TXT
+# Date: 2015-12-02 23:51:00 GMT [KW]
+# © 2015 Unicode®, Inc.
+# For terms of use, see http://www.unicode.org/terms_of_use.html
+#
 #	Name:             JIS X 0212 (1990) to Unicode
 #	Unicode version:  1.1
-#	Table version:    0.9
+#	Table version:    2.0
 #	Table format:     Format A
-#	Date:             8 March 1994
-#
-#	Copyright (c) 1991-1994 Unicode, Inc.  All Rights reserved.
-#
-#	This file is provided as-is by Unicode, Inc. (The Unicode Consortium).
-#	No claims are made as to fitness for any particular purpose.  No
-#	warranties of any kind are expressed or implied.  The recipient
-#	agrees to determine applicability of information provided.  If this
-#	file has been provided on magnetic media by Unicode, Inc., the sole
-#	remedy for any claim will be exchange of defective media within 90
-#	days of receipt.
-#
-#	Recipient is granted the right to make copies in any form for
-#	internal distribution and to freely use the information supplied
-#	in the creation of products supporting Unicode.  Unicode, Inc.
-#	specifically excludes the right to re-distribute this file directly
-#	to third parties or other organizations whether for profit or not.
+#	Date:             2011 October 14 (header updated: 2015 December 02)
 #
 #	General notes:
 #
@@ -42,15 +31,7 @@ BEGIN_MAP
 # same as those used by actual products, nor may they be the best suited
 # for all uses.  For more information on the mappings between various code
 # pages incorporating the repertoire of JIS X 0212 and Unicode, consult the
-# VENDORS mapping data.  Normative information on the mapping between
-# JIS X 0212 and Unicode may be found in the Unihan.txt file in the
-# latest Unicode Character Database.
-#
-# If you have carefully considered the fact that the mappings in
-# this table are only one possible set of mappings between JIS X 0212 and
-# Unicode and have no normative status, but still feel that you
-# have located an error in the table that requires fixing, you may
-# report any such error to errata@unicode.org.
+# VENDORS mapping data.
 #
 #
 #	Format:  Three tab-separated columns
@@ -76,17 +57,11 @@ BEGIN_MAP
 #			the kuten form.  For example, 0x2121 -> 0x0101 -> 0101;
 #			0x6D63 -> 0x4D43 -> 7767
 #
-#   The kanji mappings are a normative part of ISO/IEC 10646.  The
-#       non-kanji mappings are provisional, pending definition of
-#       official mappings by Japanese standards bodies
-#
-#	Any comments or problems, contact <John_Jenkins@taligent.com>
-#
 #	Notes:
 #
 #	1. JIS X 0212 apparently unified the following two symbols
 #	   into a single character at 0x2922:
-#	
+#
 #	   LATIN CAPITAL LETTER D WITH STROKE
 #	   LATIN CAPITAL LETTER ETH
 #
@@ -97,6 +72,24 @@ BEGIN_MAP
 #	   Consequently, in the Unicode mapping, 0x2922 is treated as
 #	   LATIN CAPITAL LETTER D WITH STROKE.
 #
+#  Revision History:
+#
+#    [v2.0, 2015 December 02]
+#    updates to copyright notice and terms of use
+#    no changes to character mappings
+#
+#    [v1.0, 2011 October 14]
+#    Updated terms of use to current wording.
+#    Updated contact information.
+#    No changes to the mapping data.
+#
+#    [v0.9, 8 March 1994]
+#    First release.
+#
+#  Use the Unicode reporting form <http://www.unicode.org/reporting.html>
+#    for any questions or comments or to report errors in the data.
+#
+#
 # Ruby specific modification:
 #     remove 0x007E to 0x2237 conversion.
 #
diff --git a/enc/trans/escape.trans b/enc/trans/escape.trans
index 550e4ac767..c76ffa0e06 100644
--- a/enc/trans/escape.trans
+++ b/enc/trans/escape.trans
@@ -6,19 +6,19 @@
   end
 
   transcode_tblgen("", "amp_escape", [
-    ["{00-25,27-FF}", :nomap], 
+    ["{00-25,27-FF}", :nomap],
     ["26", hexstr("&amp;")]
   ], nil)
 
   transcode_tblgen("", "xml_text_escape", [
-    ["{00-25,27-3B,3D,3F-FF}", :nomap], 
+    ["{00-25,27-3B,3D,3F-FF}", :nomap],
     ["26", hexstr("&amp;")],
     ["3C", hexstr("&lt;")],
     ["3E", hexstr("&gt;")]
   ], nil)
 
   transcode_tblgen("", "xml_attr_content_escape", [
-    ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap], 
+    ["{00-21,23-25,27-3B,3D,3F-FF}", :nomap],
     ["22", hexstr("&quot;")],
     ["26", hexstr("&amp;")],
     ["3C", hexstr("&lt;")],
diff --git a/enc/trans/euckr-tbl.rb b/enc/trans/euckr-tbl.rb
index 773cd90122..4ce8521a8a 100644
--- a/enc/trans/euckr-tbl.rb
+++ b/enc/trans/euckr-tbl.rb
@@ -162,6 +162,8 @@ EUCKR_TO_UCS_TBL = [
   ["A2E3",0x33C2],
   ["A2E4",0x33D8],
   ["A2E5",0x2121],
+  ["A2E6",0x20AC],
+  ["A2E7",0x00AE],
   ["A3A1",0xFF01],
   ["A3A2",0xFF02],
   ["A3A3",0xFF03],
diff --git a/enc/trans/gb18030.trans b/enc/trans/gb18030.trans
index 94c866eb39..f42f8fd2d5 100644
--- a/enc/trans/gb18030.trans
+++ b/enc/trans/gb18030.trans
@@ -2,9 +2,9 @@
 
 <%
   require "gb18030-tbl"
-  
+
   def linear(code)
-    bytes = [code].pack('H8').unpack 'C4' 
+    bytes = [code].pack('H8').unpack 'C4'
     ((bytes[0]*10+bytes[1])*126+bytes[2])*10+bytes[3]
   end
 
@@ -31,7 +31,7 @@
       code
     end
   end
-  
+
   def calculate_differences_utf_gb(table)
     table_rev = table.map{|a,b| [b,a]}
     table_rev.collect do |code|
@@ -123,7 +123,7 @@ fun_sio_to_gb18030(void *statep, const unsigned char *s, size_t l, VALUE info, u
 {
     unsigned int diff = (unsigned int)(info >> 8);
     unsigned int u;    /* Unicode Scalar Value */
-    
+
     u = ((s[0]&0x0F)<<12) | ((s[1]&0x3F)<<6) | (s[2]&0x3F);
 
     if (diff & 0x20000) { /* GB18030 4 bytes */
diff --git a/enc/unicode.c b/enc/unicode.c
index 20990c1e54..f0ef89880f 100644
--- a/enc/unicode.c
+++ b/enc/unicode.c
@@ -71,8 +71,6 @@ static const unsigned short EncUNICODE_ISO_8859_1_CtypeTable[256] = {
   0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2, 0x30e2
 };
 
-#include "enc/unicode/name2ctype.h"
-
 typedef struct {
   int n;
   OnigCodePoint code[3];
@@ -103,10 +101,46 @@ typedef struct {
   CodePointList2 to;
 } CaseUnfold_13_Type;
 
+static inline int
+bits_of(const OnigCodePoint c, const int n)
+{
+  return (c >> (2 - n) * 7) & 127;
+}
+
+static inline int
+bits_at(const OnigCodePoint *c, const int n)
+{
+  return bits_of(c[n / 3], n % 3);
+}
+
+static int
+code1_equal(const OnigCodePoint x, const OnigCodePoint y)
+{
+  if (x != y) return 0;
+  return 1;
+}
+
+static int
+code2_equal(const OnigCodePoint *x, const OnigCodePoint *y)
+{
+  if (x[0] != y[0]) return 0;
+  if (x[1] != y[1]) return 0;
+  return 1;
+}
+
+static int
+code3_equal(const OnigCodePoint *x, const OnigCodePoint *y)
+{
+  if (x[0] != y[0]) return 0;
+  if (x[1] != y[1]) return 0;
+  if (x[2] != y[2]) return 0;
+  return 1;
+}
+
 #include "enc/unicode/casefold.h"
 
+#include "enc/unicode/name2ctype.h"
 
-#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
 #define CODE_RANGES_NUM numberof(CodeRanges)
 
 extern int
@@ -143,7 +177,7 @@ onigenc_unicode_ctype_code_range(int ctype, const OnigCodePoint* ranges[])
 extern int
 onigenc_utf16_32_get_ctype_code_range(OnigCtype ctype, OnigCodePoint* sb_out,
                                       const OnigCodePoint* ranges[],
-				      struct OnigEncodingTypeST* enc ARG_UNUSED)
+				      OnigEncoding enc ARG_UNUSED)
 {
   *sb_out = 0x00;
   return onigenc_unicode_ctype_code_range(ctype, ranges);
@@ -184,120 +218,21 @@ onigenc_unicode_property_name_to_ctype(OnigEncoding enc, UChar* name, UChar* end
   return ctype;
 }
 
-
-static int
-code2_cmp(OnigCodePoint* x, OnigCodePoint* y)
-{
-  if (x[0] == y[0] && x[1] == y[1]) return 0;
-  return 1;
-}
-
-static st_index_t
-code2_hash(OnigCodePoint* x)
-{
-  return (st_index_t )(x[0] + x[1]);
-}
-
-static const struct st_hash_type type_code2_hash = {
-  code2_cmp,
-  code2_hash,
-};
-
-static int
-code3_cmp(OnigCodePoint* x, OnigCodePoint* y)
-{
-  if (x[0] == y[0] && x[1] == y[1] && x[2] == y[2]) return 0;
-  return 1;
-}
-
-static st_index_t
-code3_hash(OnigCodePoint* x)
-{
-  return (st_index_t )(x[0] + x[1] + x[2]);
-}
-
-static const struct st_hash_type type_code3_hash = {
-  code3_cmp,
-  code3_hash,
-};
-
-
-static st_table* FoldTable;    /* fold-1, fold-2, fold-3 */
-static st_table* Unfold1Table;
-static st_table* Unfold2Table;
-static st_table* Unfold3Table;
-static int CaseFoldInited = 0;
-
-static int init_case_fold_table(void)
-{
-  const CaseFold_11_Type   *p;
-  const CaseUnfold_11_Type *p1;
-  const CaseUnfold_12_Type *p2;
-  const CaseUnfold_13_Type *p3;
-  int i;
-
-  THREAD_ATOMIC_START;
-
-  FoldTable = st_init_numtable_with_size(FOLD_TABLE_SIZE);
-  if (ONIG_IS_NULL(FoldTable)) return ONIGERR_MEMORY;
-  for (i = 0; i < numberof(CaseFold); i++) {
-    p = &CaseFold[i];
-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
-  }
-  for (i = 0; i < numberof(CaseFold_Locale); i++) {
-    p = &CaseFold_Locale[i];
-    st_add_direct(FoldTable, (st_data_t )p->from, (st_data_t )&(p->to));
-  }
-
-  Unfold1Table = st_init_numtable_with_size(UNFOLD1_TABLE_SIZE);
-  if (ONIG_IS_NULL(Unfold1Table)) return ONIGERR_MEMORY;
-
-  for (i = 0; i < numberof(CaseUnfold_11); i++) {
-    p1 = &CaseUnfold_11[i];
-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
-  }
-  for (i = 0; i < numberof(CaseUnfold_11_Locale); i++) {
-    p1 = &CaseUnfold_11_Locale[i];
-    st_add_direct(Unfold1Table, (st_data_t )p1->from, (st_data_t )&(p1->to));
-  }
-
-  Unfold2Table = st_init_table_with_size(&type_code2_hash, UNFOLD2_TABLE_SIZE);
-  if (ONIG_IS_NULL(Unfold2Table)) return ONIGERR_MEMORY;
-
-  for (i = 0; i < numberof(CaseUnfold_12); i++) {
-    p2 = &CaseUnfold_12[i];
-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
-  }
-  for (i = 0; i < numberof(CaseUnfold_12_Locale); i++) {
-    p2 = &CaseUnfold_12_Locale[i];
-    st_add_direct(Unfold2Table, (st_data_t )p2->from, (st_data_t )(&p2->to));
-  }
-
-  Unfold3Table = st_init_table_with_size(&type_code3_hash, UNFOLD3_TABLE_SIZE);
-  if (ONIG_IS_NULL(Unfold3Table)) return ONIGERR_MEMORY;
-
-  for (i = 0; i < numberof(CaseUnfold_13); i++) {
-    p3 = &CaseUnfold_13[i];
-    st_add_direct(Unfold3Table, (st_data_t )p3->from, (st_data_t )(&p3->to));
-  }
-
-  CaseFoldInited = 1;
-  THREAD_ATOMIC_END;
-  return 0;
-}
+#define onigenc_unicode_fold_lookup onigenc_unicode_CaseFold_11_lookup
+#define onigenc_unicode_unfold1_lookup onigenc_unicode_CaseUnfold_11_lookup
+#define onigenc_unicode_unfold2_lookup onigenc_unicode_CaseUnfold_12_lookup
+#define onigenc_unicode_unfold3_lookup onigenc_unicode_CaseUnfold_13_lookup
 
 extern int
 onigenc_unicode_mbc_case_fold(OnigEncoding enc,
     OnigCaseFoldType flag ARG_UNUSED, const UChar** pp, const UChar* end,
     UChar* fold)
 {
-  CodePointList3 *to;
+  const CodePointList3 *to;
   OnigCodePoint code;
   int i, len, rlen;
   const UChar *p = *pp;
 
-  if (CaseFoldInited == 0) init_case_fold_table();
-
   code = ONIGENC_MBC_TO_CODE(enc, p, end);
   len = enclen(enc, p, end);
   *pp += len;
@@ -313,7 +248,7 @@ onigenc_unicode_mbc_case_fold(OnigEncoding enc,
   }
 #endif
 
-  if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
+  if ((to = onigenc_unicode_fold_lookup(code)) != 0) {
     if (to->n == 1) {
       return ONIGENC_CODE_TO_MBC(enc, to->code[0], fold);
     }
@@ -349,8 +284,6 @@ onigenc_unicode_apply_all_case_fold(OnigCaseFoldType flag,
   OnigCodePoint code;
   int i, j, k, r;
 
-  /* if (CaseFoldInited == 0) init_case_fold_table(); */
-
   for (i = 0; i < numberof(CaseUnfold_11); i++) {
     p11 = &CaseUnfold_11[i];
     for (j = 0; j < p11->to.n; j++) {
@@ -483,10 +416,8 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 {
   int n, i, j, k, len;
   OnigCodePoint code, codes[3];
-  CodePointList3 *to, *z3;
-  CodePointList2 *z2;
-
-  if (CaseFoldInited == 0) init_case_fold_table();
+  const CodePointList3 *to, *z3;
+  const CodePointList2 *z2;
 
   n = 0;
 
@@ -522,7 +453,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
   }
 #endif
 
-  if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0) {
+  if ((to = onigenc_unicode_fold_lookup(code)) != 0) {
     if (to->n == 1) {
       OnigCodePoint orig_code = code;
 
@@ -532,7 +463,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
       n++;
 
       code = to->code[0];
-      if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
+      if ((to = onigenc_unicode_unfold1_lookup(code)) != 0) {
 	for (i = 0; i < to->n; i++) {
 	  if (to->code[i] != orig_code) {
 	    items[n].byte_len = len;
@@ -549,8 +480,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
       for (fn = 0; fn < to->n; fn++) {
 	cs[fn][0] = to->code[fn];
-	if (onig_st_lookup(Unfold1Table, (st_data_t )cs[fn][0],
-			   (void* )&z3) != 0) {
+	if ((z3 = onigenc_unicode_unfold1_lookup(cs[fn][0])) != 0) {
 	  for (i = 0; i < z3->n; i++) {
 	    cs[fn][i+1] = z3->code[i];
 	  }
@@ -571,8 +501,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 	  }
 	}
 
-	if (onig_st_lookup(Unfold2Table, (st_data_t )to->code,
-			   (void* )&z2) != 0) {
+	if ((z2 = onigenc_unicode_unfold2_lookup(to->code)) != 0) {
 	  for (i = 0; i < z2->n; i++) {
 	    if (z2->code[i] == code) continue;
 
@@ -597,8 +526,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 	  }
 	}
 
-	if (onig_st_lookup(Unfold3Table, (st_data_t )to->code,
-			   (void* )&z2) != 0) {
+	if ((z2 = onigenc_unicode_unfold3_lookup(to->code)) != 0) {
 	  for (i = 0; i < z2->n; i++) {
 	    if (z2->code[i] == code) continue;
 
@@ -615,7 +543,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
     }
   }
   else {
-    if (onig_st_lookup(Unfold1Table, (st_data_t )code, (void* )&to) != 0) {
+    if ((to = onigenc_unicode_unfold1_lookup(code)) != 0) {
       for (i = 0; i < to->n; i++) {
 	items[n].byte_len = len;
 	items[n].code_len = 1;
@@ -633,7 +561,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
       codes[0] = code;
       code = ONIGENC_MBC_TO_CODE(enc, p, end);
-      if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
+      if ((to = onigenc_unicode_fold_lookup(code)) != 0
 	  && to->n == 1) {
 	codes[1] = to->code[0];
       }
@@ -642,7 +570,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
       clen = enclen(enc, p, end);
       len += clen;
-      if (onig_st_lookup(Unfold2Table, (st_data_t )codes, (void* )&z2) != 0) {
+      if ((z2 = onigenc_unicode_unfold2_lookup(codes)) != 0) {
 	for (i = 0; i < z2->n; i++) {
 	  items[n].byte_len = len;
 	  items[n].code_len = 1;
@@ -654,7 +582,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
       p += clen;
       if (p < end) {
 	code = ONIGENC_MBC_TO_CODE(enc, p, end);
-	if (onig_st_lookup(FoldTable, (st_data_t )code, (void* )&to) != 0
+	if ((to = onigenc_unicode_fold_lookup(code)) != 0
 	    && to->n == 1) {
 	  codes[2] = to->code[0];
 	}
@@ -663,8 +591,7 @@ onigenc_unicode_get_case_fold_codes_by_str(OnigEncoding enc,
 
 	clen = enclen(enc, p, end);
 	len += clen;
-	if (onig_st_lookup(Unfold3Table, (st_data_t )codes,
-			   (void* )&z2) != 0) {
+	if ((z2 = onigenc_unicode_unfold3_lookup(codes)) != 0) {
 	  for (i = 0; i < z2->n; i++) {
 	    items[n].byte_len = len;
 	    items[n].code_len = 1;
diff --git a/enc/unicode/case-folding.rb b/enc/unicode/case-folding.rb
new file mode 100755
index 0000000000..d93de6581b
--- /dev/null
+++ b/enc/unicode/case-folding.rb
@@ -0,0 +1,196 @@
+#!/usr/bin/ruby
+
+# Usage:
+#   $ wget http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+#   $ ruby case-folding.rb CaseFolding.txt -o casefold.h
+
+class CaseFolding
+  module Util
+    module_function
+
+    def hex_seq(v)
+      v.map {|i| "0x%04x" % i}.join(", ")
+    end
+
+    def print_table_1(dest, data)
+      for k, v in data = data.sort
+        sk = (Array === k and k.length > 1) ? "{#{hex_seq(k)}}" : ("0x%04x" % k)
+        dest.print("  {#{sk}, {#{v.length}, {#{hex_seq(v)}}}},\n")
+      end
+      data
+    end
+
+    def print_table(dest, type, data)
+      dest.print("static const #{type}_Type #{type}_Table[] = {\n")
+      i = 0
+      ret = data.inject([]) do |a, (n, d)|
+        dest.print("#define #{n} (*(#{type}_Type (*)[#{d.size}])(#{type}_Table+#{i}))\n")
+        i += d.size
+        a.concat(print_table_1(dest, d))
+      end
+      dest.print("};\n\n")
+      ret
+    end
+  end
+
+  include Util
+
+  attr_reader :fold, :fold_locale, :unfold, :unfold_locale
+
+  def load(filename)
+    pattern = /([0-9A-F]{4,6}); ([CFT]); ([0-9A-F]{4,6})(?: ([0-9A-F]{4,6}))?(?: ([0-9A-F]{4,6}))?;/
+
+    @fold = fold = {}
+    @unfold = unfold = [{}, {}, {}]
+    turkic = []
+
+    IO.foreach(filename) do |line|
+      next unless res = pattern.match(line)
+      ch_from = res[1].to_i(16)
+
+      if res[2] == 'T'
+        # Turkic case folding
+        turkic << ch_from
+        next
+      end
+
+      # store folding data
+      ch_to = res[3..6].inject([]) do |a, i|
+        break a unless i
+        a << i.to_i(16)
+      end
+      fold[ch_from] = ch_to
+
+      # store unfolding data
+      i = ch_to.length - 1
+      (unfold[i][ch_to] ||= []) << ch_from
+    end
+
+    # move locale dependent data to (un)fold_locale
+    @fold_locale = fold_locale = {}
+    @unfold_locale = unfold_locale = [{}, {}]
+    for ch_from in turkic
+      key = fold[ch_from]
+      i = key.length - 1
+      unfold_locale[i][i == 0 ? key[0] : key] = unfold[i].delete(key)
+      fold_locale[ch_from] = fold.delete(ch_from)
+    end
+    self
+  end
+
+  def range_check(code)
+    "#{code} <= MAX_CODE_VALUE && #{code} >= MIN_CODE_VALUE"
+  end
+
+  def lookup_hash(key, type, data)
+    hash = "onigenc_unicode_#{key}_hash"
+    lookup = "onigenc_unicode_#{key}_lookup"
+    arity = Array(data[0][0]).size
+    gperf = %W"gperf -7 -k#{[*1..(arity*3)].join(",")} -F,-1 -c -j1 -i1 -t -T -E -C -H #{hash} -N #{lookup} -n"
+    argname = arity > 1 ? "codes" : "code"
+    argdecl = "const OnigCodePoint #{arity > 1 ? "*": ""}#{argname}"
+    n = 7
+    m = (1 << n) - 1
+    min, max = data.map {|c, *|c}.flatten.minmax
+    src = IO.popen(gperf, "r+") {|f|
+      f << "short\n%%\n"
+      data.each_with_index {|(k, _), i|
+        k = Array(k)
+        ks = k.map {|j| [(j >> n*2) & m, (j >> n) & m, (j) & m]}.flatten.map {|c| "\\x%.2x" % c}.join("")
+        f.printf "\"%s\", ::::/*%s*/ %d\n", ks, k.map {|c| "0x%.4x" % c}.join(","), i
+      }
+      f << "%%\n"
+      f.close_write
+      f.read
+    }
+    src.sub!(/^(#{hash})\s*\(.*?\).*?\n\{\n(.*)^\}/m) {
+      name = $1
+      body = $2
+      body.gsub!(/\(unsigned char\)str\[(\d+)\]/, "bits_#{arity > 1 ? 'at' : 'of'}(#{argname}, \\1)")
+      "#{name}(#{argdecl})\n{\n#{body}}"
+    }
+    src.sub!(/const short *\*\n^(#{lookup})\s*\(.*?\).*?\n\{\n(.*)^\}/m) {
+      name = $1
+      body = $2
+      body.sub!(/\benum\s+\{(\n[ \t]+)/, "\\&MIN_CODE_VALUE = 0x#{min.to_s(16)},\\1""MAX_CODE_VALUE = 0x#{max.to_s(16)},\\1")
+      body.gsub!(/(#{hash})\s*\(.*?\)/, "\\1(#{argname})")
+      body.gsub!(/\{"",-1}/, "-1")
+      body.gsub!(/\{"(?:[^"]|\\")+", *::::(.*)\}/, '\1')
+      body.sub!(/(\s+if\s)\(len\b.*\)/) do
+        "#$1(" <<
+          (arity > 1 ? (0...arity).map {|i| range_check("#{argname}[#{i}]")}.join(" &&\n      ") : range_check(argname)) <<
+          ")"
+      end
+      v = nil
+      body.sub!(/(if\s*\(.*MAX_HASH_VALUE.*\)\n([ \t]*))\{(.*?)\n\2\}/m) {
+        pre = $1
+        indent = $2
+        s = $3
+        s.sub!(/const char *\* *(\w+)( *= *wordlist\[\w+\]).\w+/, 'short \1 = wordlist[key]')
+        v = $1
+        s.sub!(/\bif *\(.*\)/, "if (#{v} >= 0 && code#{arity}_equal(#{argname}, #{key}_Table[#{v}].from))")
+        "#{pre}{#{s}\n#{indent}}"
+      }
+      body.sub!(/\b(return\s+&)([^;]+);/, '\1'"#{key}_Table[#{v}].to;")
+      "static const #{type} *\n#{name}(#{argdecl})\n{\n#{body}}"
+    }
+    src
+  end
+
+  def display(dest)
+    # print the header
+    dest.print("/* DO NOT EDIT THIS FILE. */\n")
+    dest.print("/* Generated by enc/unicode/case-folding.rb */\n\n")
+
+    # print folding data
+
+    # CaseFold + CaseFold_Locale
+    name = "CaseFold_11"
+    data = print_table(dest, name, "CaseFold"=>fold, "CaseFold_Locale"=>fold_locale)
+    dest.print lookup_hash(name, "CodePointList3", data)
+
+    # print unfolding data
+
+    # CaseUnfold_11 + CaseUnfold_11_Locale
+    name = "CaseUnfold_11"
+    data = print_table(dest, name, name=>unfold[0], "#{name}_Locale"=>unfold_locale[0])
+    dest.print lookup_hash(name, "CodePointList3", data)
+
+    # CaseUnfold_12 + CaseUnfold_12_Locale
+    name = "CaseUnfold_12"
+    data = print_table(dest, name, name=>unfold[1], "#{name}_Locale"=>unfold_locale[1])
+    dest.print lookup_hash(name, "CodePointList2", data)
+
+    # CaseUnfold_13
+    name = "CaseUnfold_13"
+    data = print_table(dest, name, name=>unfold[2])
+    dest.print lookup_hash(name, "CodePointList2", data)
+  end
+
+  def self.load(*args)
+    new.load(*args)
+  end
+end
+
+if $0 == __FILE__
+  require 'optparse'
+  dest = nil
+  fold_1 = false
+  ARGV.options do |opt|
+    opt.banner << " [INPUT]"
+    opt.on("--output-file=FILE", "-o", "output to the FILE instead of STDOUT") {|output|
+      dest = (output unless output == '-')
+    }
+    opt.parse!
+    abort(opt.to_s) if ARGV.size > 1
+  end
+  filename = ARGV[0] || 'CaseFolding.txt'
+  data = CaseFolding.load(filename)
+  if dest
+    open(dest, "wb") do |f|
+      data.display(f)
+    end
+  else
+    data.display(STDOUT)
+  end
+end
diff --git a/enc/unicode/casefold.h b/enc/unicode/casefold.h
index b9559de4a3..475a20a48e 100644
--- a/enc/unicode/casefold.h
+++ b/enc/unicode/casefold.h
@@ -1,2238 +1,5619 @@
 /* DO NOT EDIT THIS FILE. */
-/* Generated by tool/CaseFolding.py */
+/* Generated by enc/unicode/case-folding.rb */
 
-static const CaseFold_11_Type CaseFold[] = {
- { 0x0041, {1, {0x0061}}},
- { 0x0042, {1, {0x0062}}},
- { 0x0043, {1, {0x0063}}},
- { 0x0044, {1, {0x0064}}},
- { 0x0045, {1, {0x0065}}},
- { 0x0046, {1, {0x0066}}},
- { 0x0047, {1, {0x0067}}},
- { 0x0048, {1, {0x0068}}},
- { 0x004a, {1, {0x006a}}},
- { 0x004b, {1, {0x006b}}},
- { 0x004c, {1, {0x006c}}},
- { 0x004d, {1, {0x006d}}},
- { 0x004e, {1, {0x006e}}},
- { 0x004f, {1, {0x006f}}},
- { 0x0050, {1, {0x0070}}},
- { 0x0051, {1, {0x0071}}},
- { 0x0052, {1, {0x0072}}},
- { 0x0053, {1, {0x0073}}},
- { 0x0054, {1, {0x0074}}},
- { 0x0055, {1, {0x0075}}},
- { 0x0056, {1, {0x0076}}},
- { 0x0057, {1, {0x0077}}},
- { 0x0058, {1, {0x0078}}},
- { 0x0059, {1, {0x0079}}},
- { 0x005a, {1, {0x007a}}},
- { 0x00b5, {1, {0x03bc}}},
- { 0x00c0, {1, {0x00e0}}},
- { 0x00c1, {1, {0x00e1}}},
- { 0x00c2, {1, {0x00e2}}},
- { 0x00c3, {1, {0x00e3}}},
- { 0x00c4, {1, {0x00e4}}},
- { 0x00c5, {1, {0x00e5}}},
- { 0x00c6, {1, {0x00e6}}},
- { 0x00c7, {1, {0x00e7}}},
- { 0x00c8, {1, {0x00e8}}},
- { 0x00c9, {1, {0x00e9}}},
- { 0x00ca, {1, {0x00ea}}},
- { 0x00cb, {1, {0x00eb}}},
- { 0x00cc, {1, {0x00ec}}},
- { 0x00cd, {1, {0x00ed}}},
- { 0x00ce, {1, {0x00ee}}},
- { 0x00cf, {1, {0x00ef}}},
- { 0x00d0, {1, {0x00f0}}},
- { 0x00d1, {1, {0x00f1}}},
- { 0x00d2, {1, {0x00f2}}},
- { 0x00d3, {1, {0x00f3}}},
- { 0x00d4, {1, {0x00f4}}},
- { 0x00d5, {1, {0x00f5}}},
- { 0x00d6, {1, {0x00f6}}},
- { 0x00d8, {1, {0x00f8}}},
- { 0x00d9, {1, {0x00f9}}},
- { 0x00da, {1, {0x00fa}}},
- { 0x00db, {1, {0x00fb}}},
- { 0x00dc, {1, {0x00fc}}},
- { 0x00dd, {1, {0x00fd}}},
- { 0x00de, {1, {0x00fe}}},
- { 0x00df, {2, {0x0073, 0x0073}}},
- { 0x0100, {1, {0x0101}}},
- { 0x0102, {1, {0x0103}}},
- { 0x0104, {1, {0x0105}}},
- { 0x0106, {1, {0x0107}}},
- { 0x0108, {1, {0x0109}}},
- { 0x010a, {1, {0x010b}}},
- { 0x010c, {1, {0x010d}}},
- { 0x010e, {1, {0x010f}}},
- { 0x0110, {1, {0x0111}}},
- { 0x0112, {1, {0x0113}}},
- { 0x0114, {1, {0x0115}}},
- { 0x0116, {1, {0x0117}}},
- { 0x0118, {1, {0x0119}}},
- { 0x011a, {1, {0x011b}}},
- { 0x011c, {1, {0x011d}}},
- { 0x011e, {1, {0x011f}}},
- { 0x0120, {1, {0x0121}}},
- { 0x0122, {1, {0x0123}}},
- { 0x0124, {1, {0x0125}}},
- { 0x0126, {1, {0x0127}}},
- { 0x0128, {1, {0x0129}}},
- { 0x012a, {1, {0x012b}}},
- { 0x012c, {1, {0x012d}}},
- { 0x012e, {1, {0x012f}}},
- { 0x0132, {1, {0x0133}}},
- { 0x0134, {1, {0x0135}}},
- { 0x0136, {1, {0x0137}}},
- { 0x0139, {1, {0x013a}}},
- { 0x013b, {1, {0x013c}}},
- { 0x013d, {1, {0x013e}}},
- { 0x013f, {1, {0x0140}}},
- { 0x0141, {1, {0x0142}}},
- { 0x0143, {1, {0x0144}}},
- { 0x0145, {1, {0x0146}}},
- { 0x0147, {1, {0x0148}}},
- { 0x0149, {2, {0x02bc, 0x006e}}},
- { 0x014a, {1, {0x014b}}},
- { 0x014c, {1, {0x014d}}},
- { 0x014e, {1, {0x014f}}},
- { 0x0150, {1, {0x0151}}},
- { 0x0152, {1, {0x0153}}},
- { 0x0154, {1, {0x0155}}},
- { 0x0156, {1, {0x0157}}},
- { 0x0158, {1, {0x0159}}},
- { 0x015a, {1, {0x015b}}},
- { 0x015c, {1, {0x015d}}},
- { 0x015e, {1, {0x015f}}},
- { 0x0160, {1, {0x0161}}},
- { 0x0162, {1, {0x0163}}},
- { 0x0164, {1, {0x0165}}},
- { 0x0166, {1, {0x0167}}},
- { 0x0168, {1, {0x0169}}},
- { 0x016a, {1, {0x016b}}},
- { 0x016c, {1, {0x016d}}},
- { 0x016e, {1, {0x016f}}},
- { 0x0170, {1, {0x0171}}},
- { 0x0172, {1, {0x0173}}},
- { 0x0174, {1, {0x0175}}},
- { 0x0176, {1, {0x0177}}},
- { 0x0178, {1, {0x00ff}}},
- { 0x0179, {1, {0x017a}}},
- { 0x017b, {1, {0x017c}}},
- { 0x017d, {1, {0x017e}}},
- { 0x017f, {1, {0x0073}}},
- { 0x0181, {1, {0x0253}}},
- { 0x0182, {1, {0x0183}}},
- { 0x0184, {1, {0x0185}}},
- { 0x0186, {1, {0x0254}}},
- { 0x0187, {1, {0x0188}}},
- { 0x0189, {1, {0x0256}}},
- { 0x018a, {1, {0x0257}}},
- { 0x018b, {1, {0x018c}}},
- { 0x018e, {1, {0x01dd}}},
- { 0x018f, {1, {0x0259}}},
- { 0x0190, {1, {0x025b}}},
- { 0x0191, {1, {0x0192}}},
- { 0x0193, {1, {0x0260}}},
- { 0x0194, {1, {0x0263}}},
- { 0x0196, {1, {0x0269}}},
- { 0x0197, {1, {0x0268}}},
- { 0x0198, {1, {0x0199}}},
- { 0x019c, {1, {0x026f}}},
- { 0x019d, {1, {0x0272}}},
- { 0x019f, {1, {0x0275}}},
- { 0x01a0, {1, {0x01a1}}},
- { 0x01a2, {1, {0x01a3}}},
- { 0x01a4, {1, {0x01a5}}},
- { 0x01a6, {1, {0x0280}}},
- { 0x01a7, {1, {0x01a8}}},
- { 0x01a9, {1, {0x0283}}},
- { 0x01ac, {1, {0x01ad}}},
- { 0x01ae, {1, {0x0288}}},
- { 0x01af, {1, {0x01b0}}},
- { 0x01b1, {1, {0x028a}}},
- { 0x01b2, {1, {0x028b}}},
- { 0x01b3, {1, {0x01b4}}},
- { 0x01b5, {1, {0x01b6}}},
- { 0x01b7, {1, {0x0292}}},
- { 0x01b8, {1, {0x01b9}}},
- { 0x01bc, {1, {0x01bd}}},
- { 0x01c4, {1, {0x01c6}}},
- { 0x01c5, {1, {0x01c6}}},
- { 0x01c7, {1, {0x01c9}}},
- { 0x01c8, {1, {0x01c9}}},
- { 0x01ca, {1, {0x01cc}}},
- { 0x01cb, {1, {0x01cc}}},
- { 0x01cd, {1, {0x01ce}}},
- { 0x01cf, {1, {0x01d0}}},
- { 0x01d1, {1, {0x01d2}}},
- { 0x01d3, {1, {0x01d4}}},
- { 0x01d5, {1, {0x01d6}}},
- { 0x01d7, {1, {0x01d8}}},
- { 0x01d9, {1, {0x01da}}},
- { 0x01db, {1, {0x01dc}}},
- { 0x01de, {1, {0x01df}}},
- { 0x01e0, {1, {0x01e1}}},
- { 0x01e2, {1, {0x01e3}}},
- { 0x01e4, {1, {0x01e5}}},
- { 0x01e6, {1, {0x01e7}}},
- { 0x01e8, {1, {0x01e9}}},
- { 0x01ea, {1, {0x01eb}}},
- { 0x01ec, {1, {0x01ed}}},
- { 0x01ee, {1, {0x01ef}}},
- { 0x01f0, {2, {0x006a, 0x030c}}},
- { 0x01f1, {1, {0x01f3}}},
- { 0x01f2, {1, {0x01f3}}},
- { 0x01f4, {1, {0x01f5}}},
- { 0x01f6, {1, {0x0195}}},
- { 0x01f7, {1, {0x01bf}}},
- { 0x01f8, {1, {0x01f9}}},
- { 0x01fa, {1, {0x01fb}}},
- { 0x01fc, {1, {0x01fd}}},
- { 0x01fe, {1, {0x01ff}}},
- { 0x0200, {1, {0x0201}}},
- { 0x0202, {1, {0x0203}}},
- { 0x0204, {1, {0x0205}}},
- { 0x0206, {1, {0x0207}}},
- { 0x0208, {1, {0x0209}}},
- { 0x020a, {1, {0x020b}}},
- { 0x020c, {1, {0x020d}}},
- { 0x020e, {1, {0x020f}}},
- { 0x0210, {1, {0x0211}}},
- { 0x0212, {1, {0x0213}}},
- { 0x0214, {1, {0x0215}}},
- { 0x0216, {1, {0x0217}}},
- { 0x0218, {1, {0x0219}}},
- { 0x021a, {1, {0x021b}}},
- { 0x021c, {1, {0x021d}}},
- { 0x021e, {1, {0x021f}}},
- { 0x0220, {1, {0x019e}}},
- { 0x0222, {1, {0x0223}}},
- { 0x0224, {1, {0x0225}}},
- { 0x0226, {1, {0x0227}}},
- { 0x0228, {1, {0x0229}}},
- { 0x022a, {1, {0x022b}}},
- { 0x022c, {1, {0x022d}}},
- { 0x022e, {1, {0x022f}}},
- { 0x0230, {1, {0x0231}}},
- { 0x0232, {1, {0x0233}}},
- { 0x023a, {1, {0x2c65}}},
- { 0x023b, {1, {0x023c}}},
- { 0x023d, {1, {0x019a}}},
- { 0x023e, {1, {0x2c66}}},
- { 0x0241, {1, {0x0242}}},
- { 0x0243, {1, {0x0180}}},
- { 0x0244, {1, {0x0289}}},
- { 0x0245, {1, {0x028c}}},
- { 0x0246, {1, {0x0247}}},
- { 0x0248, {1, {0x0249}}},
- { 0x024a, {1, {0x024b}}},
- { 0x024c, {1, {0x024d}}},
- { 0x024e, {1, {0x024f}}},
- { 0x0345, {1, {0x03b9}}},
- { 0x0370, {1, {0x0371}}},
- { 0x0372, {1, {0x0373}}},
- { 0x0376, {1, {0x0377}}},
- { 0x0386, {1, {0x03ac}}},
- { 0x0388, {1, {0x03ad}}},
- { 0x0389, {1, {0x03ae}}},
- { 0x038a, {1, {0x03af}}},
- { 0x038c, {1, {0x03cc}}},
- { 0x038e, {1, {0x03cd}}},
- { 0x038f, {1, {0x03ce}}},
- { 0x0390, {3, {0x03b9, 0x0308, 0x0301}}},
- { 0x0391, {1, {0x03b1}}},
- { 0x0392, {1, {0x03b2}}},
- { 0x0393, {1, {0x03b3}}},
- { 0x0394, {1, {0x03b4}}},
- { 0x0395, {1, {0x03b5}}},
- { 0x0396, {1, {0x03b6}}},
- { 0x0397, {1, {0x03b7}}},
- { 0x0398, {1, {0x03b8}}},
- { 0x0399, {1, {0x03b9}}},
- { 0x039a, {1, {0x03ba}}},
- { 0x039b, {1, {0x03bb}}},
- { 0x039c, {1, {0x03bc}}},
- { 0x039d, {1, {0x03bd}}},
- { 0x039e, {1, {0x03be}}},
- { 0x039f, {1, {0x03bf}}},
- { 0x03a0, {1, {0x03c0}}},
- { 0x03a1, {1, {0x03c1}}},
- { 0x03a3, {1, {0x03c3}}},
- { 0x03a4, {1, {0x03c4}}},
- { 0x03a5, {1, {0x03c5}}},
- { 0x03a6, {1, {0x03c6}}},
- { 0x03a7, {1, {0x03c7}}},
- { 0x03a8, {1, {0x03c8}}},
- { 0x03a9, {1, {0x03c9}}},
- { 0x03aa, {1, {0x03ca}}},
- { 0x03ab, {1, {0x03cb}}},
- { 0x03b0, {3, {0x03c5, 0x0308, 0x0301}}},
- { 0x03c2, {1, {0x03c3}}},
- { 0x03cf, {1, {0x03d7}}},
- { 0x03d0, {1, {0x03b2}}},
- { 0x03d1, {1, {0x03b8}}},
- { 0x03d5, {1, {0x03c6}}},
- { 0x03d6, {1, {0x03c0}}},
- { 0x03d8, {1, {0x03d9}}},
- { 0x03da, {1, {0x03db}}},
- { 0x03dc, {1, {0x03dd}}},
- { 0x03de, {1, {0x03df}}},
- { 0x03e0, {1, {0x03e1}}},
- { 0x03e2, {1, {0x03e3}}},
- { 0x03e4, {1, {0x03e5}}},
- { 0x03e6, {1, {0x03e7}}},
- { 0x03e8, {1, {0x03e9}}},
- { 0x03ea, {1, {0x03eb}}},
- { 0x03ec, {1, {0x03ed}}},
- { 0x03ee, {1, {0x03ef}}},
- { 0x03f0, {1, {0x03ba}}},
- { 0x03f1, {1, {0x03c1}}},
- { 0x03f4, {1, {0x03b8}}},
- { 0x03f5, {1, {0x03b5}}},
- { 0x03f7, {1, {0x03f8}}},
- { 0x03f9, {1, {0x03f2}}},
- { 0x03fa, {1, {0x03fb}}},
- { 0x03fd, {1, {0x037b}}},
- { 0x03fe, {1, {0x037c}}},
- { 0x03ff, {1, {0x037d}}},
- { 0x0400, {1, {0x0450}}},
- { 0x0401, {1, {0x0451}}},
- { 0x0402, {1, {0x0452}}},
- { 0x0403, {1, {0x0453}}},
- { 0x0404, {1, {0x0454}}},
- { 0x0405, {1, {0x0455}}},
- { 0x0406, {1, {0x0456}}},
- { 0x0407, {1, {0x0457}}},
- { 0x0408, {1, {0x0458}}},
- { 0x0409, {1, {0x0459}}},
- { 0x040a, {1, {0x045a}}},
- { 0x040b, {1, {0x045b}}},
- { 0x040c, {1, {0x045c}}},
- { 0x040d, {1, {0x045d}}},
- { 0x040e, {1, {0x045e}}},
- { 0x040f, {1, {0x045f}}},
- { 0x0410, {1, {0x0430}}},
- { 0x0411, {1, {0x0431}}},
- { 0x0412, {1, {0x0432}}},
- { 0x0413, {1, {0x0433}}},
- { 0x0414, {1, {0x0434}}},
- { 0x0415, {1, {0x0435}}},
- { 0x0416, {1, {0x0436}}},
- { 0x0417, {1, {0x0437}}},
- { 0x0418, {1, {0x0438}}},
- { 0x0419, {1, {0x0439}}},
- { 0x041a, {1, {0x043a}}},
- { 0x041b, {1, {0x043b}}},
- { 0x041c, {1, {0x043c}}},
- { 0x041d, {1, {0x043d}}},
- { 0x041e, {1, {0x043e}}},
- { 0x041f, {1, {0x043f}}},
- { 0x0420, {1, {0x0440}}},
- { 0x0421, {1, {0x0441}}},
- { 0x0422, {1, {0x0442}}},
- { 0x0423, {1, {0x0443}}},
- { 0x0424, {1, {0x0444}}},
- { 0x0425, {1, {0x0445}}},
- { 0x0426, {1, {0x0446}}},
- { 0x0427, {1, {0x0447}}},
- { 0x0428, {1, {0x0448}}},
- { 0x0429, {1, {0x0449}}},
- { 0x042a, {1, {0x044a}}},
- { 0x042b, {1, {0x044b}}},
- { 0x042c, {1, {0x044c}}},
- { 0x042d, {1, {0x044d}}},
- { 0x042e, {1, {0x044e}}},
- { 0x042f, {1, {0x044f}}},
- { 0x0460, {1, {0x0461}}},
- { 0x0462, {1, {0x0463}}},
- { 0x0464, {1, {0x0465}}},
- { 0x0466, {1, {0x0467}}},
- { 0x0468, {1, {0x0469}}},
- { 0x046a, {1, {0x046b}}},
- { 0x046c, {1, {0x046d}}},
- { 0x046e, {1, {0x046f}}},
- { 0x0470, {1, {0x0471}}},
- { 0x0472, {1, {0x0473}}},
- { 0x0474, {1, {0x0475}}},
- { 0x0476, {1, {0x0477}}},
- { 0x0478, {1, {0x0479}}},
- { 0x047a, {1, {0x047b}}},
- { 0x047c, {1, {0x047d}}},
- { 0x047e, {1, {0x047f}}},
- { 0x0480, {1, {0x0481}}},
- { 0x048a, {1, {0x048b}}},
- { 0x048c, {1, {0x048d}}},
- { 0x048e, {1, {0x048f}}},
- { 0x0490, {1, {0x0491}}},
- { 0x0492, {1, {0x0493}}},
- { 0x0494, {1, {0x0495}}},
- { 0x0496, {1, {0x0497}}},
- { 0x0498, {1, {0x0499}}},
- { 0x049a, {1, {0x049b}}},
- { 0x049c, {1, {0x049d}}},
- { 0x049e, {1, {0x049f}}},
- { 0x04a0, {1, {0x04a1}}},
- { 0x04a2, {1, {0x04a3}}},
- { 0x04a4, {1, {0x04a5}}},
- { 0x04a6, {1, {0x04a7}}},
- { 0x04a8, {1, {0x04a9}}},
- { 0x04aa, {1, {0x04ab}}},
- { 0x04ac, {1, {0x04ad}}},
- { 0x04ae, {1, {0x04af}}},
- { 0x04b0, {1, {0x04b1}}},
- { 0x04b2, {1, {0x04b3}}},
- { 0x04b4, {1, {0x04b5}}},
- { 0x04b6, {1, {0x04b7}}},
- { 0x04b8, {1, {0x04b9}}},
- { 0x04ba, {1, {0x04bb}}},
- { 0x04bc, {1, {0x04bd}}},
- { 0x04be, {1, {0x04bf}}},
- { 0x04c0, {1, {0x04cf}}},
- { 0x04c1, {1, {0x04c2}}},
- { 0x04c3, {1, {0x04c4}}},
- { 0x04c5, {1, {0x04c6}}},
- { 0x04c7, {1, {0x04c8}}},
- { 0x04c9, {1, {0x04ca}}},
- { 0x04cb, {1, {0x04cc}}},
- { 0x04cd, {1, {0x04ce}}},
- { 0x04d0, {1, {0x04d1}}},
- { 0x04d2, {1, {0x04d3}}},
- { 0x04d4, {1, {0x04d5}}},
- { 0x04d6, {1, {0x04d7}}},
- { 0x04d8, {1, {0x04d9}}},
- { 0x04da, {1, {0x04db}}},
- { 0x04dc, {1, {0x04dd}}},
- { 0x04de, {1, {0x04df}}},
- { 0x04e0, {1, {0x04e1}}},
- { 0x04e2, {1, {0x04e3}}},
- { 0x04e4, {1, {0x04e5}}},
- { 0x04e6, {1, {0x04e7}}},
- { 0x04e8, {1, {0x04e9}}},
- { 0x04ea, {1, {0x04eb}}},
- { 0x04ec, {1, {0x04ed}}},
- { 0x04ee, {1, {0x04ef}}},
- { 0x04f0, {1, {0x04f1}}},
- { 0x04f2, {1, {0x04f3}}},
- { 0x04f4, {1, {0x04f5}}},
- { 0x04f6, {1, {0x04f7}}},
- { 0x04f8, {1, {0x04f9}}},
- { 0x04fa, {1, {0x04fb}}},
- { 0x04fc, {1, {0x04fd}}},
- { 0x04fe, {1, {0x04ff}}},
- { 0x0500, {1, {0x0501}}},
- { 0x0502, {1, {0x0503}}},
- { 0x0504, {1, {0x0505}}},
- { 0x0506, {1, {0x0507}}},
- { 0x0508, {1, {0x0509}}},
- { 0x050a, {1, {0x050b}}},
- { 0x050c, {1, {0x050d}}},
- { 0x050e, {1, {0x050f}}},
- { 0x0510, {1, {0x0511}}},
- { 0x0512, {1, {0x0513}}},
- { 0x0514, {1, {0x0515}}},
- { 0x0516, {1, {0x0517}}},
- { 0x0518, {1, {0x0519}}},
- { 0x051a, {1, {0x051b}}},
- { 0x051c, {1, {0x051d}}},
- { 0x051e, {1, {0x051f}}},
- { 0x0520, {1, {0x0521}}},
- { 0x0522, {1, {0x0523}}},
- { 0x0524, {1, {0x0525}}},
- { 0x0526, {1, {0x0527}}},
- { 0x0531, {1, {0x0561}}},
- { 0x0532, {1, {0x0562}}},
- { 0x0533, {1, {0x0563}}},
- { 0x0534, {1, {0x0564}}},
- { 0x0535, {1, {0x0565}}},
- { 0x0536, {1, {0x0566}}},
- { 0x0537, {1, {0x0567}}},
- { 0x0538, {1, {0x0568}}},
- { 0x0539, {1, {0x0569}}},
- { 0x053a, {1, {0x056a}}},
- { 0x053b, {1, {0x056b}}},
- { 0x053c, {1, {0x056c}}},
- { 0x053d, {1, {0x056d}}},
- { 0x053e, {1, {0x056e}}},
- { 0x053f, {1, {0x056f}}},
- { 0x0540, {1, {0x0570}}},
- { 0x0541, {1, {0x0571}}},
- { 0x0542, {1, {0x0572}}},
- { 0x0543, {1, {0x0573}}},
- { 0x0544, {1, {0x0574}}},
- { 0x0545, {1, {0x0575}}},
- { 0x0546, {1, {0x0576}}},
- { 0x0547, {1, {0x0577}}},
- { 0x0548, {1, {0x0578}}},
- { 0x0549, {1, {0x0579}}},
- { 0x054a, {1, {0x057a}}},
- { 0x054b, {1, {0x057b}}},
- { 0x054c, {1, {0x057c}}},
- { 0x054d, {1, {0x057d}}},
- { 0x054e, {1, {0x057e}}},
- { 0x054f, {1, {0x057f}}},
- { 0x0550, {1, {0x0580}}},
- { 0x0551, {1, {0x0581}}},
- { 0x0552, {1, {0x0582}}},
- { 0x0553, {1, {0x0583}}},
- { 0x0554, {1, {0x0584}}},
- { 0x0555, {1, {0x0585}}},
- { 0x0556, {1, {0x0586}}},
- { 0x0587, {2, {0x0565, 0x0582}}},
- { 0x10a0, {1, {0x2d00}}},
- { 0x10a1, {1, {0x2d01}}},
- { 0x10a2, {1, {0x2d02}}},
- { 0x10a3, {1, {0x2d03}}},
- { 0x10a4, {1, {0x2d04}}},
- { 0x10a5, {1, {0x2d05}}},
- { 0x10a6, {1, {0x2d06}}},
- { 0x10a7, {1, {0x2d07}}},
- { 0x10a8, {1, {0x2d08}}},
- { 0x10a9, {1, {0x2d09}}},
- { 0x10aa, {1, {0x2d0a}}},
- { 0x10ab, {1, {0x2d0b}}},
- { 0x10ac, {1, {0x2d0c}}},
- { 0x10ad, {1, {0x2d0d}}},
- { 0x10ae, {1, {0x2d0e}}},
- { 0x10af, {1, {0x2d0f}}},
- { 0x10b0, {1, {0x2d10}}},
- { 0x10b1, {1, {0x2d11}}},
- { 0x10b2, {1, {0x2d12}}},
- { 0x10b3, {1, {0x2d13}}},
- { 0x10b4, {1, {0x2d14}}},
- { 0x10b5, {1, {0x2d15}}},
- { 0x10b6, {1, {0x2d16}}},
- { 0x10b7, {1, {0x2d17}}},
- { 0x10b8, {1, {0x2d18}}},
- { 0x10b9, {1, {0x2d19}}},
- { 0x10ba, {1, {0x2d1a}}},
- { 0x10bb, {1, {0x2d1b}}},
- { 0x10bc, {1, {0x2d1c}}},
- { 0x10bd, {1, {0x2d1d}}},
- { 0x10be, {1, {0x2d1e}}},
- { 0x10bf, {1, {0x2d1f}}},
- { 0x10c0, {1, {0x2d20}}},
- { 0x10c1, {1, {0x2d21}}},
- { 0x10c2, {1, {0x2d22}}},
- { 0x10c3, {1, {0x2d23}}},
- { 0x10c4, {1, {0x2d24}}},
- { 0x10c5, {1, {0x2d25}}},
- { 0x10c7, {1, {0x2d27}}},
- { 0x10cd, {1, {0x2d2d}}},
- { 0x1e00, {1, {0x1e01}}},
- { 0x1e02, {1, {0x1e03}}},
- { 0x1e04, {1, {0x1e05}}},
- { 0x1e06, {1, {0x1e07}}},
- { 0x1e08, {1, {0x1e09}}},
- { 0x1e0a, {1, {0x1e0b}}},
- { 0x1e0c, {1, {0x1e0d}}},
- { 0x1e0e, {1, {0x1e0f}}},
- { 0x1e10, {1, {0x1e11}}},
- { 0x1e12, {1, {0x1e13}}},
- { 0x1e14, {1, {0x1e15}}},
- { 0x1e16, {1, {0x1e17}}},
- { 0x1e18, {1, {0x1e19}}},
- { 0x1e1a, {1, {0x1e1b}}},
- { 0x1e1c, {1, {0x1e1d}}},
- { 0x1e1e, {1, {0x1e1f}}},
- { 0x1e20, {1, {0x1e21}}},
- { 0x1e22, {1, {0x1e23}}},
- { 0x1e24, {1, {0x1e25}}},
- { 0x1e26, {1, {0x1e27}}},
- { 0x1e28, {1, {0x1e29}}},
- { 0x1e2a, {1, {0x1e2b}}},
- { 0x1e2c, {1, {0x1e2d}}},
- { 0x1e2e, {1, {0x1e2f}}},
- { 0x1e30, {1, {0x1e31}}},
- { 0x1e32, {1, {0x1e33}}},
- { 0x1e34, {1, {0x1e35}}},
- { 0x1e36, {1, {0x1e37}}},
- { 0x1e38, {1, {0x1e39}}},
- { 0x1e3a, {1, {0x1e3b}}},
- { 0x1e3c, {1, {0x1e3d}}},
- { 0x1e3e, {1, {0x1e3f}}},
- { 0x1e40, {1, {0x1e41}}},
- { 0x1e42, {1, {0x1e43}}},
- { 0x1e44, {1, {0x1e45}}},
- { 0x1e46, {1, {0x1e47}}},
- { 0x1e48, {1, {0x1e49}}},
- { 0x1e4a, {1, {0x1e4b}}},
- { 0x1e4c, {1, {0x1e4d}}},
- { 0x1e4e, {1, {0x1e4f}}},
- { 0x1e50, {1, {0x1e51}}},
- { 0x1e52, {1, {0x1e53}}},
- { 0x1e54, {1, {0x1e55}}},
- { 0x1e56, {1, {0x1e57}}},
- { 0x1e58, {1, {0x1e59}}},
- { 0x1e5a, {1, {0x1e5b}}},
- { 0x1e5c, {1, {0x1e5d}}},
- { 0x1e5e, {1, {0x1e5f}}},
- { 0x1e60, {1, {0x1e61}}},
- { 0x1e62, {1, {0x1e63}}},
- { 0x1e64, {1, {0x1e65}}},
- { 0x1e66, {1, {0x1e67}}},
- { 0x1e68, {1, {0x1e69}}},
- { 0x1e6a, {1, {0x1e6b}}},
- { 0x1e6c, {1, {0x1e6d}}},
- { 0x1e6e, {1, {0x1e6f}}},
- { 0x1e70, {1, {0x1e71}}},
- { 0x1e72, {1, {0x1e73}}},
- { 0x1e74, {1, {0x1e75}}},
- { 0x1e76, {1, {0x1e77}}},
- { 0x1e78, {1, {0x1e79}}},
- { 0x1e7a, {1, {0x1e7b}}},
- { 0x1e7c, {1, {0x1e7d}}},
- { 0x1e7e, {1, {0x1e7f}}},
- { 0x1e80, {1, {0x1e81}}},
- { 0x1e82, {1, {0x1e83}}},
- { 0x1e84, {1, {0x1e85}}},
- { 0x1e86, {1, {0x1e87}}},
- { 0x1e88, {1, {0x1e89}}},
- { 0x1e8a, {1, {0x1e8b}}},
- { 0x1e8c, {1, {0x1e8d}}},
- { 0x1e8e, {1, {0x1e8f}}},
- { 0x1e90, {1, {0x1e91}}},
- { 0x1e92, {1, {0x1e93}}},
- { 0x1e94, {1, {0x1e95}}},
- { 0x1e96, {2, {0x0068, 0x0331}}},
- { 0x1e97, {2, {0x0074, 0x0308}}},
- { 0x1e98, {2, {0x0077, 0x030a}}},
- { 0x1e99, {2, {0x0079, 0x030a}}},
- { 0x1e9a, {2, {0x0061, 0x02be}}},
- { 0x1e9b, {1, {0x1e61}}},
- { 0x1e9e, {2, {0x0073, 0x0073}}},
- { 0x1ea0, {1, {0x1ea1}}},
- { 0x1ea2, {1, {0x1ea3}}},
- { 0x1ea4, {1, {0x1ea5}}},
- { 0x1ea6, {1, {0x1ea7}}},
- { 0x1ea8, {1, {0x1ea9}}},
- { 0x1eaa, {1, {0x1eab}}},
- { 0x1eac, {1, {0x1ead}}},
- { 0x1eae, {1, {0x1eaf}}},
- { 0x1eb0, {1, {0x1eb1}}},
- { 0x1eb2, {1, {0x1eb3}}},
- { 0x1eb4, {1, {0x1eb5}}},
- { 0x1eb6, {1, {0x1eb7}}},
- { 0x1eb8, {1, {0x1eb9}}},
- { 0x1eba, {1, {0x1ebb}}},
- { 0x1ebc, {1, {0x1ebd}}},
- { 0x1ebe, {1, {0x1ebf}}},
- { 0x1ec0, {1, {0x1ec1}}},
- { 0x1ec2, {1, {0x1ec3}}},
- { 0x1ec4, {1, {0x1ec5}}},
- { 0x1ec6, {1, {0x1ec7}}},
- { 0x1ec8, {1, {0x1ec9}}},
- { 0x1eca, {1, {0x1ecb}}},
- { 0x1ecc, {1, {0x1ecd}}},
- { 0x1ece, {1, {0x1ecf}}},
- { 0x1ed0, {1, {0x1ed1}}},
- { 0x1ed2, {1, {0x1ed3}}},
- { 0x1ed4, {1, {0x1ed5}}},
- { 0x1ed6, {1, {0x1ed7}}},
- { 0x1ed8, {1, {0x1ed9}}},
- { 0x1eda, {1, {0x1edb}}},
- { 0x1edc, {1, {0x1edd}}},
- { 0x1ede, {1, {0x1edf}}},
- { 0x1ee0, {1, {0x1ee1}}},
- { 0x1ee2, {1, {0x1ee3}}},
- { 0x1ee4, {1, {0x1ee5}}},
- { 0x1ee6, {1, {0x1ee7}}},
- { 0x1ee8, {1, {0x1ee9}}},
- { 0x1eea, {1, {0x1eeb}}},
- { 0x1eec, {1, {0x1eed}}},
- { 0x1eee, {1, {0x1eef}}},
- { 0x1ef0, {1, {0x1ef1}}},
- { 0x1ef2, {1, {0x1ef3}}},
- { 0x1ef4, {1, {0x1ef5}}},
- { 0x1ef6, {1, {0x1ef7}}},
- { 0x1ef8, {1, {0x1ef9}}},
- { 0x1efa, {1, {0x1efb}}},
- { 0x1efc, {1, {0x1efd}}},
- { 0x1efe, {1, {0x1eff}}},
- { 0x1f08, {1, {0x1f00}}},
- { 0x1f09, {1, {0x1f01}}},
- { 0x1f0a, {1, {0x1f02}}},
- { 0x1f0b, {1, {0x1f03}}},
- { 0x1f0c, {1, {0x1f04}}},
- { 0x1f0d, {1, {0x1f05}}},
- { 0x1f0e, {1, {0x1f06}}},
- { 0x1f0f, {1, {0x1f07}}},
- { 0x1f18, {1, {0x1f10}}},
- { 0x1f19, {1, {0x1f11}}},
- { 0x1f1a, {1, {0x1f12}}},
- { 0x1f1b, {1, {0x1f13}}},
- { 0x1f1c, {1, {0x1f14}}},
- { 0x1f1d, {1, {0x1f15}}},
- { 0x1f28, {1, {0x1f20}}},
- { 0x1f29, {1, {0x1f21}}},
- { 0x1f2a, {1, {0x1f22}}},
- { 0x1f2b, {1, {0x1f23}}},
- { 0x1f2c, {1, {0x1f24}}},
- { 0x1f2d, {1, {0x1f25}}},
- { 0x1f2e, {1, {0x1f26}}},
- { 0x1f2f, {1, {0x1f27}}},
- { 0x1f38, {1, {0x1f30}}},
- { 0x1f39, {1, {0x1f31}}},
- { 0x1f3a, {1, {0x1f32}}},
- { 0x1f3b, {1, {0x1f33}}},
- { 0x1f3c, {1, {0x1f34}}},
- { 0x1f3d, {1, {0x1f35}}},
- { 0x1f3e, {1, {0x1f36}}},
- { 0x1f3f, {1, {0x1f37}}},
- { 0x1f48, {1, {0x1f40}}},
- { 0x1f49, {1, {0x1f41}}},
- { 0x1f4a, {1, {0x1f42}}},
- { 0x1f4b, {1, {0x1f43}}},
- { 0x1f4c, {1, {0x1f44}}},
- { 0x1f4d, {1, {0x1f45}}},
- { 0x1f50, {2, {0x03c5, 0x0313}}},
- { 0x1f52, {3, {0x03c5, 0x0313, 0x0300}}},
- { 0x1f54, {3, {0x03c5, 0x0313, 0x0301}}},
- { 0x1f56, {3, {0x03c5, 0x0313, 0x0342}}},
- { 0x1f59, {1, {0x1f51}}},
- { 0x1f5b, {1, {0x1f53}}},
- { 0x1f5d, {1, {0x1f55}}},
- { 0x1f5f, {1, {0x1f57}}},
- { 0x1f68, {1, {0x1f60}}},
- { 0x1f69, {1, {0x1f61}}},
- { 0x1f6a, {1, {0x1f62}}},
- { 0x1f6b, {1, {0x1f63}}},
- { 0x1f6c, {1, {0x1f64}}},
- { 0x1f6d, {1, {0x1f65}}},
- { 0x1f6e, {1, {0x1f66}}},
- { 0x1f6f, {1, {0x1f67}}},
- { 0x1f80, {2, {0x1f00, 0x03b9}}},
- { 0x1f81, {2, {0x1f01, 0x03b9}}},
- { 0x1f82, {2, {0x1f02, 0x03b9}}},
- { 0x1f83, {2, {0x1f03, 0x03b9}}},
- { 0x1f84, {2, {0x1f04, 0x03b9}}},
- { 0x1f85, {2, {0x1f05, 0x03b9}}},
- { 0x1f86, {2, {0x1f06, 0x03b9}}},
- { 0x1f87, {2, {0x1f07, 0x03b9}}},
- { 0x1f88, {2, {0x1f00, 0x03b9}}},
- { 0x1f89, {2, {0x1f01, 0x03b9}}},
- { 0x1f8a, {2, {0x1f02, 0x03b9}}},
- { 0x1f8b, {2, {0x1f03, 0x03b9}}},
- { 0x1f8c, {2, {0x1f04, 0x03b9}}},
- { 0x1f8d, {2, {0x1f05, 0x03b9}}},
- { 0x1f8e, {2, {0x1f06, 0x03b9}}},
- { 0x1f8f, {2, {0x1f07, 0x03b9}}},
- { 0x1f90, {2, {0x1f20, 0x03b9}}},
- { 0x1f91, {2, {0x1f21, 0x03b9}}},
- { 0x1f92, {2, {0x1f22, 0x03b9}}},
- { 0x1f93, {2, {0x1f23, 0x03b9}}},
- { 0x1f94, {2, {0x1f24, 0x03b9}}},
- { 0x1f95, {2, {0x1f25, 0x03b9}}},
- { 0x1f96, {2, {0x1f26, 0x03b9}}},
- { 0x1f97, {2, {0x1f27, 0x03b9}}},
- { 0x1f98, {2, {0x1f20, 0x03b9}}},
- { 0x1f99, {2, {0x1f21, 0x03b9}}},
- { 0x1f9a, {2, {0x1f22, 0x03b9}}},
- { 0x1f9b, {2, {0x1f23, 0x03b9}}},
- { 0x1f9c, {2, {0x1f24, 0x03b9}}},
- { 0x1f9d, {2, {0x1f25, 0x03b9}}},
- { 0x1f9e, {2, {0x1f26, 0x03b9}}},
- { 0x1f9f, {2, {0x1f27, 0x03b9}}},
- { 0x1fa0, {2, {0x1f60, 0x03b9}}},
- { 0x1fa1, {2, {0x1f61, 0x03b9}}},
- { 0x1fa2, {2, {0x1f62, 0x03b9}}},
- { 0x1fa3, {2, {0x1f63, 0x03b9}}},
- { 0x1fa4, {2, {0x1f64, 0x03b9}}},
- { 0x1fa5, {2, {0x1f65, 0x03b9}}},
- { 0x1fa6, {2, {0x1f66, 0x03b9}}},
- { 0x1fa7, {2, {0x1f67, 0x03b9}}},
- { 0x1fa8, {2, {0x1f60, 0x03b9}}},
- { 0x1fa9, {2, {0x1f61, 0x03b9}}},
- { 0x1faa, {2, {0x1f62, 0x03b9}}},
- { 0x1fab, {2, {0x1f63, 0x03b9}}},
- { 0x1fac, {2, {0x1f64, 0x03b9}}},
- { 0x1fad, {2, {0x1f65, 0x03b9}}},
- { 0x1fae, {2, {0x1f66, 0x03b9}}},
- { 0x1faf, {2, {0x1f67, 0x03b9}}},
- { 0x1fb2, {2, {0x1f70, 0x03b9}}},
- { 0x1fb3, {2, {0x03b1, 0x03b9}}},
- { 0x1fb4, {2, {0x03ac, 0x03b9}}},
- { 0x1fb6, {2, {0x03b1, 0x0342}}},
- { 0x1fb7, {3, {0x03b1, 0x0342, 0x03b9}}},
- { 0x1fb8, {1, {0x1fb0}}},
- { 0x1fb9, {1, {0x1fb1}}},
- { 0x1fba, {1, {0x1f70}}},
- { 0x1fbb, {1, {0x1f71}}},
- { 0x1fbc, {2, {0x03b1, 0x03b9}}},
- { 0x1fbe, {1, {0x03b9}}},
- { 0x1fc2, {2, {0x1f74, 0x03b9}}},
- { 0x1fc3, {2, {0x03b7, 0x03b9}}},
- { 0x1fc4, {2, {0x03ae, 0x03b9}}},
- { 0x1fc6, {2, {0x03b7, 0x0342}}},
- { 0x1fc7, {3, {0x03b7, 0x0342, 0x03b9}}},
- { 0x1fc8, {1, {0x1f72}}},
- { 0x1fc9, {1, {0x1f73}}},
- { 0x1fca, {1, {0x1f74}}},
- { 0x1fcb, {1, {0x1f75}}},
- { 0x1fcc, {2, {0x03b7, 0x03b9}}},
- { 0x1fd2, {3, {0x03b9, 0x0308, 0x0300}}},
- { 0x1fd3, {3, {0x03b9, 0x0308, 0x0301}}},
- { 0x1fd6, {2, {0x03b9, 0x0342}}},
- { 0x1fd7, {3, {0x03b9, 0x0308, 0x0342}}},
- { 0x1fd8, {1, {0x1fd0}}},
- { 0x1fd9, {1, {0x1fd1}}},
- { 0x1fda, {1, {0x1f76}}},
- { 0x1fdb, {1, {0x1f77}}},
- { 0x1fe2, {3, {0x03c5, 0x0308, 0x0300}}},
- { 0x1fe3, {3, {0x03c5, 0x0308, 0x0301}}},
- { 0x1fe4, {2, {0x03c1, 0x0313}}},
- { 0x1fe6, {2, {0x03c5, 0x0342}}},
- { 0x1fe7, {3, {0x03c5, 0x0308, 0x0342}}},
- { 0x1fe8, {1, {0x1fe0}}},
- { 0x1fe9, {1, {0x1fe1}}},
- { 0x1fea, {1, {0x1f7a}}},
- { 0x1feb, {1, {0x1f7b}}},
- { 0x1fec, {1, {0x1fe5}}},
- { 0x1ff2, {2, {0x1f7c, 0x03b9}}},
- { 0x1ff3, {2, {0x03c9, 0x03b9}}},
- { 0x1ff4, {2, {0x03ce, 0x03b9}}},
- { 0x1ff6, {2, {0x03c9, 0x0342}}},
- { 0x1ff7, {3, {0x03c9, 0x0342, 0x03b9}}},
- { 0x1ff8, {1, {0x1f78}}},
- { 0x1ff9, {1, {0x1f79}}},
- { 0x1ffa, {1, {0x1f7c}}},
- { 0x1ffb, {1, {0x1f7d}}},
- { 0x1ffc, {2, {0x03c9, 0x03b9}}},
- { 0x2126, {1, {0x03c9}}},
- { 0x212a, {1, {0x006b}}},
- { 0x212b, {1, {0x00e5}}},
- { 0x2132, {1, {0x214e}}},
- { 0x2160, {1, {0x2170}}},
- { 0x2161, {1, {0x2171}}},
- { 0x2162, {1, {0x2172}}},
- { 0x2163, {1, {0x2173}}},
- { 0x2164, {1, {0x2174}}},
- { 0x2165, {1, {0x2175}}},
- { 0x2166, {1, {0x2176}}},
- { 0x2167, {1, {0x2177}}},
- { 0x2168, {1, {0x2178}}},
- { 0x2169, {1, {0x2179}}},
- { 0x216a, {1, {0x217a}}},
- { 0x216b, {1, {0x217b}}},
- { 0x216c, {1, {0x217c}}},
- { 0x216d, {1, {0x217d}}},
- { 0x216e, {1, {0x217e}}},
- { 0x216f, {1, {0x217f}}},
- { 0x2183, {1, {0x2184}}},
- { 0x24b6, {1, {0x24d0}}},
- { 0x24b7, {1, {0x24d1}}},
- { 0x24b8, {1, {0x24d2}}},
- { 0x24b9, {1, {0x24d3}}},
- { 0x24ba, {1, {0x24d4}}},
- { 0x24bb, {1, {0x24d5}}},
- { 0x24bc, {1, {0x24d6}}},
- { 0x24bd, {1, {0x24d7}}},
- { 0x24be, {1, {0x24d8}}},
- { 0x24bf, {1, {0x24d9}}},
- { 0x24c0, {1, {0x24da}}},
- { 0x24c1, {1, {0x24db}}},
- { 0x24c2, {1, {0x24dc}}},
- { 0x24c3, {1, {0x24dd}}},
- { 0x24c4, {1, {0x24de}}},
- { 0x24c5, {1, {0x24df}}},
- { 0x24c6, {1, {0x24e0}}},
- { 0x24c7, {1, {0x24e1}}},
- { 0x24c8, {1, {0x24e2}}},
- { 0x24c9, {1, {0x24e3}}},
- { 0x24ca, {1, {0x24e4}}},
- { 0x24cb, {1, {0x24e5}}},
- { 0x24cc, {1, {0x24e6}}},
- { 0x24cd, {1, {0x24e7}}},
- { 0x24ce, {1, {0x24e8}}},
- { 0x24cf, {1, {0x24e9}}},
- { 0x2c00, {1, {0x2c30}}},
- { 0x2c01, {1, {0x2c31}}},
- { 0x2c02, {1, {0x2c32}}},
- { 0x2c03, {1, {0x2c33}}},
- { 0x2c04, {1, {0x2c34}}},
- { 0x2c05, {1, {0x2c35}}},
- { 0x2c06, {1, {0x2c36}}},
- { 0x2c07, {1, {0x2c37}}},
- { 0x2c08, {1, {0x2c38}}},
- { 0x2c09, {1, {0x2c39}}},
- { 0x2c0a, {1, {0x2c3a}}},
- { 0x2c0b, {1, {0x2c3b}}},
- { 0x2c0c, {1, {0x2c3c}}},
- { 0x2c0d, {1, {0x2c3d}}},
- { 0x2c0e, {1, {0x2c3e}}},
- { 0x2c0f, {1, {0x2c3f}}},
- { 0x2c10, {1, {0x2c40}}},
- { 0x2c11, {1, {0x2c41}}},
- { 0x2c12, {1, {0x2c42}}},
- { 0x2c13, {1, {0x2c43}}},
- { 0x2c14, {1, {0x2c44}}},
- { 0x2c15, {1, {0x2c45}}},
- { 0x2c16, {1, {0x2c46}}},
- { 0x2c17, {1, {0x2c47}}},
- { 0x2c18, {1, {0x2c48}}},
- { 0x2c19, {1, {0x2c49}}},
- { 0x2c1a, {1, {0x2c4a}}},
- { 0x2c1b, {1, {0x2c4b}}},
- { 0x2c1c, {1, {0x2c4c}}},
- { 0x2c1d, {1, {0x2c4d}}},
- { 0x2c1e, {1, {0x2c4e}}},
- { 0x2c1f, {1, {0x2c4f}}},
- { 0x2c20, {1, {0x2c50}}},
- { 0x2c21, {1, {0x2c51}}},
- { 0x2c22, {1, {0x2c52}}},
- { 0x2c23, {1, {0x2c53}}},
- { 0x2c24, {1, {0x2c54}}},
- { 0x2c25, {1, {0x2c55}}},
- { 0x2c26, {1, {0x2c56}}},
- { 0x2c27, {1, {0x2c57}}},
- { 0x2c28, {1, {0x2c58}}},
- { 0x2c29, {1, {0x2c59}}},
- { 0x2c2a, {1, {0x2c5a}}},
- { 0x2c2b, {1, {0x2c5b}}},
- { 0x2c2c, {1, {0x2c5c}}},
- { 0x2c2d, {1, {0x2c5d}}},
- { 0x2c2e, {1, {0x2c5e}}},
- { 0x2c60, {1, {0x2c61}}},
- { 0x2c62, {1, {0x026b}}},
- { 0x2c63, {1, {0x1d7d}}},
- { 0x2c64, {1, {0x027d}}},
- { 0x2c67, {1, {0x2c68}}},
- { 0x2c69, {1, {0x2c6a}}},
- { 0x2c6b, {1, {0x2c6c}}},
- { 0x2c6d, {1, {0x0251}}},
- { 0x2c6e, {1, {0x0271}}},
- { 0x2c6f, {1, {0x0250}}},
- { 0x2c70, {1, {0x0252}}},
- { 0x2c72, {1, {0x2c73}}},
- { 0x2c75, {1, {0x2c76}}},
- { 0x2c7e, {1, {0x023f}}},
- { 0x2c7f, {1, {0x0240}}},
- { 0x2c80, {1, {0x2c81}}},
- { 0x2c82, {1, {0x2c83}}},
- { 0x2c84, {1, {0x2c85}}},
- { 0x2c86, {1, {0x2c87}}},
- { 0x2c88, {1, {0x2c89}}},
- { 0x2c8a, {1, {0x2c8b}}},
- { 0x2c8c, {1, {0x2c8d}}},
- { 0x2c8e, {1, {0x2c8f}}},
- { 0x2c90, {1, {0x2c91}}},
- { 0x2c92, {1, {0x2c93}}},
- { 0x2c94, {1, {0x2c95}}},
- { 0x2c96, {1, {0x2c97}}},
- { 0x2c98, {1, {0x2c99}}},
- { 0x2c9a, {1, {0x2c9b}}},
- { 0x2c9c, {1, {0x2c9d}}},
- { 0x2c9e, {1, {0x2c9f}}},
- { 0x2ca0, {1, {0x2ca1}}},
- { 0x2ca2, {1, {0x2ca3}}},
- { 0x2ca4, {1, {0x2ca5}}},
- { 0x2ca6, {1, {0x2ca7}}},
- { 0x2ca8, {1, {0x2ca9}}},
- { 0x2caa, {1, {0x2cab}}},
- { 0x2cac, {1, {0x2cad}}},
- { 0x2cae, {1, {0x2caf}}},
- { 0x2cb0, {1, {0x2cb1}}},
- { 0x2cb2, {1, {0x2cb3}}},
- { 0x2cb4, {1, {0x2cb5}}},
- { 0x2cb6, {1, {0x2cb7}}},
- { 0x2cb8, {1, {0x2cb9}}},
- { 0x2cba, {1, {0x2cbb}}},
- { 0x2cbc, {1, {0x2cbd}}},
- { 0x2cbe, {1, {0x2cbf}}},
- { 0x2cc0, {1, {0x2cc1}}},
- { 0x2cc2, {1, {0x2cc3}}},
- { 0x2cc4, {1, {0x2cc5}}},
- { 0x2cc6, {1, {0x2cc7}}},
- { 0x2cc8, {1, {0x2cc9}}},
- { 0x2cca, {1, {0x2ccb}}},
- { 0x2ccc, {1, {0x2ccd}}},
- { 0x2cce, {1, {0x2ccf}}},
- { 0x2cd0, {1, {0x2cd1}}},
- { 0x2cd2, {1, {0x2cd3}}},
- { 0x2cd4, {1, {0x2cd5}}},
- { 0x2cd6, {1, {0x2cd7}}},
- { 0x2cd8, {1, {0x2cd9}}},
- { 0x2cda, {1, {0x2cdb}}},
- { 0x2cdc, {1, {0x2cdd}}},
- { 0x2cde, {1, {0x2cdf}}},
- { 0x2ce0, {1, {0x2ce1}}},
- { 0x2ce2, {1, {0x2ce3}}},
- { 0x2ceb, {1, {0x2cec}}},
- { 0x2ced, {1, {0x2cee}}},
- { 0x2cf2, {1, {0x2cf3}}},
- { 0xa640, {1, {0xa641}}},
- { 0xa642, {1, {0xa643}}},
- { 0xa644, {1, {0xa645}}},
- { 0xa646, {1, {0xa647}}},
- { 0xa648, {1, {0xa649}}},
- { 0xa64a, {1, {0xa64b}}},
- { 0xa64c, {1, {0xa64d}}},
- { 0xa64e, {1, {0xa64f}}},
- { 0xa650, {1, {0xa651}}},
- { 0xa652, {1, {0xa653}}},
- { 0xa654, {1, {0xa655}}},
- { 0xa656, {1, {0xa657}}},
- { 0xa658, {1, {0xa659}}},
- { 0xa65a, {1, {0xa65b}}},
- { 0xa65c, {1, {0xa65d}}},
- { 0xa65e, {1, {0xa65f}}},
- { 0xa660, {1, {0xa661}}},
- { 0xa662, {1, {0xa663}}},
- { 0xa664, {1, {0xa665}}},
- { 0xa666, {1, {0xa667}}},
- { 0xa668, {1, {0xa669}}},
- { 0xa66a, {1, {0xa66b}}},
- { 0xa66c, {1, {0xa66d}}},
- { 0xa680, {1, {0xa681}}},
- { 0xa682, {1, {0xa683}}},
- { 0xa684, {1, {0xa685}}},
- { 0xa686, {1, {0xa687}}},
- { 0xa688, {1, {0xa689}}},
- { 0xa68a, {1, {0xa68b}}},
- { 0xa68c, {1, {0xa68d}}},
- { 0xa68e, {1, {0xa68f}}},
- { 0xa690, {1, {0xa691}}},
- { 0xa692, {1, {0xa693}}},
- { 0xa694, {1, {0xa695}}},
- { 0xa696, {1, {0xa697}}},
- { 0xa722, {1, {0xa723}}},
- { 0xa724, {1, {0xa725}}},
- { 0xa726, {1, {0xa727}}},
- { 0xa728, {1, {0xa729}}},
- { 0xa72a, {1, {0xa72b}}},
- { 0xa72c, {1, {0xa72d}}},
- { 0xa72e, {1, {0xa72f}}},
- { 0xa732, {1, {0xa733}}},
- { 0xa734, {1, {0xa735}}},
- { 0xa736, {1, {0xa737}}},
- { 0xa738, {1, {0xa739}}},
- { 0xa73a, {1, {0xa73b}}},
- { 0xa73c, {1, {0xa73d}}},
- { 0xa73e, {1, {0xa73f}}},
- { 0xa740, {1, {0xa741}}},
- { 0xa742, {1, {0xa743}}},
- { 0xa744, {1, {0xa745}}},
- { 0xa746, {1, {0xa747}}},
- { 0xa748, {1, {0xa749}}},
- { 0xa74a, {1, {0xa74b}}},
- { 0xa74c, {1, {0xa74d}}},
- { 0xa74e, {1, {0xa74f}}},
- { 0xa750, {1, {0xa751}}},
- { 0xa752, {1, {0xa753}}},
- { 0xa754, {1, {0xa755}}},
- { 0xa756, {1, {0xa757}}},
- { 0xa758, {1, {0xa759}}},
- { 0xa75a, {1, {0xa75b}}},
- { 0xa75c, {1, {0xa75d}}},
- { 0xa75e, {1, {0xa75f}}},
- { 0xa760, {1, {0xa761}}},
- { 0xa762, {1, {0xa763}}},
- { 0xa764, {1, {0xa765}}},
- { 0xa766, {1, {0xa767}}},
- { 0xa768, {1, {0xa769}}},
- { 0xa76a, {1, {0xa76b}}},
- { 0xa76c, {1, {0xa76d}}},
- { 0xa76e, {1, {0xa76f}}},
- { 0xa779, {1, {0xa77a}}},
- { 0xa77b, {1, {0xa77c}}},
- { 0xa77d, {1, {0x1d79}}},
- { 0xa77e, {1, {0xa77f}}},
- { 0xa780, {1, {0xa781}}},
- { 0xa782, {1, {0xa783}}},
- { 0xa784, {1, {0xa785}}},
- { 0xa786, {1, {0xa787}}},
- { 0xa78b, {1, {0xa78c}}},
- { 0xa78d, {1, {0x0265}}},
- { 0xa790, {1, {0xa791}}},
- { 0xa792, {1, {0xa793}}},
- { 0xa7a0, {1, {0xa7a1}}},
- { 0xa7a2, {1, {0xa7a3}}},
- { 0xa7a4, {1, {0xa7a5}}},
- { 0xa7a6, {1, {0xa7a7}}},
- { 0xa7a8, {1, {0xa7a9}}},
- { 0xa7aa, {1, {0x0266}}},
- { 0xfb00, {2, {0x0066, 0x0066}}},
- { 0xfb01, {2, {0x0066, 0x0069}}},
- { 0xfb02, {2, {0x0066, 0x006c}}},
- { 0xfb03, {3, {0x0066, 0x0066, 0x0069}}},
- { 0xfb04, {3, {0x0066, 0x0066, 0x006c}}},
- { 0xfb05, {2, {0x0073, 0x0074}}},
- { 0xfb06, {2, {0x0073, 0x0074}}},
- { 0xfb13, {2, {0x0574, 0x0576}}},
- { 0xfb14, {2, {0x0574, 0x0565}}},
- { 0xfb15, {2, {0x0574, 0x056b}}},
- { 0xfb16, {2, {0x057e, 0x0576}}},
- { 0xfb17, {2, {0x0574, 0x056d}}},
- { 0xff21, {1, {0xff41}}},
- { 0xff22, {1, {0xff42}}},
- { 0xff23, {1, {0xff43}}},
- { 0xff24, {1, {0xff44}}},
- { 0xff25, {1, {0xff45}}},
- { 0xff26, {1, {0xff46}}},
- { 0xff27, {1, {0xff47}}},
- { 0xff28, {1, {0xff48}}},
- { 0xff29, {1, {0xff49}}},
- { 0xff2a, {1, {0xff4a}}},
- { 0xff2b, {1, {0xff4b}}},
- { 0xff2c, {1, {0xff4c}}},
- { 0xff2d, {1, {0xff4d}}},
- { 0xff2e, {1, {0xff4e}}},
- { 0xff2f, {1, {0xff4f}}},
- { 0xff30, {1, {0xff50}}},
- { 0xff31, {1, {0xff51}}},
- { 0xff32, {1, {0xff52}}},
- { 0xff33, {1, {0xff53}}},
- { 0xff34, {1, {0xff54}}},
- { 0xff35, {1, {0xff55}}},
- { 0xff36, {1, {0xff56}}},
- { 0xff37, {1, {0xff57}}},
- { 0xff38, {1, {0xff58}}},
- { 0xff39, {1, {0xff59}}},
- { 0xff3a, {1, {0xff5a}}},
- { 0x10400, {1, {0x10428}}},
- { 0x10401, {1, {0x10429}}},
- { 0x10402, {1, {0x1042a}}},
- { 0x10403, {1, {0x1042b}}},
- { 0x10404, {1, {0x1042c}}},
- { 0x10405, {1, {0x1042d}}},
- { 0x10406, {1, {0x1042e}}},
- { 0x10407, {1, {0x1042f}}},
- { 0x10408, {1, {0x10430}}},
- { 0x10409, {1, {0x10431}}},
- { 0x1040a, {1, {0x10432}}},
- { 0x1040b, {1, {0x10433}}},
- { 0x1040c, {1, {0x10434}}},
- { 0x1040d, {1, {0x10435}}},
- { 0x1040e, {1, {0x10436}}},
- { 0x1040f, {1, {0x10437}}},
- { 0x10410, {1, {0x10438}}},
- { 0x10411, {1, {0x10439}}},
- { 0x10412, {1, {0x1043a}}},
- { 0x10413, {1, {0x1043b}}},
- { 0x10414, {1, {0x1043c}}},
- { 0x10415, {1, {0x1043d}}},
- { 0x10416, {1, {0x1043e}}},
- { 0x10417, {1, {0x1043f}}},
- { 0x10418, {1, {0x10440}}},
- { 0x10419, {1, {0x10441}}},
- { 0x1041a, {1, {0x10442}}},
- { 0x1041b, {1, {0x10443}}},
- { 0x1041c, {1, {0x10444}}},
- { 0x1041d, {1, {0x10445}}},
- { 0x1041e, {1, {0x10446}}},
- { 0x1041f, {1, {0x10447}}},
- { 0x10420, {1, {0x10448}}},
- { 0x10421, {1, {0x10449}}},
- { 0x10422, {1, {0x1044a}}},
- { 0x10423, {1, {0x1044b}}},
- { 0x10424, {1, {0x1044c}}},
- { 0x10425, {1, {0x1044d}}},
- { 0x10426, {1, {0x1044e}}},
- { 0x10427, {1, {0x1044f}}},
+static const CaseFold_11_Type CaseFold_11_Table[] = {
+#define CaseFold (*(CaseFold_11_Type (*)[1178])(CaseFold_11_Table+0))
+  {0x0041, {1, {0x0061}}},
+  {0x0042, {1, {0x0062}}},
+  {0x0043, {1, {0x0063}}},
+  {0x0044, {1, {0x0064}}},
+  {0x0045, {1, {0x0065}}},
+  {0x0046, {1, {0x0066}}},
+  {0x0047, {1, {0x0067}}},
+  {0x0048, {1, {0x0068}}},
+  {0x004a, {1, {0x006a}}},
+  {0x004b, {1, {0x006b}}},
+  {0x004c, {1, {0x006c}}},
+  {0x004d, {1, {0x006d}}},
+  {0x004e, {1, {0x006e}}},
+  {0x004f, {1, {0x006f}}},
+  {0x0050, {1, {0x0070}}},
+  {0x0051, {1, {0x0071}}},
+  {0x0052, {1, {0x0072}}},
+  {0x0053, {1, {0x0073}}},
+  {0x0054, {1, {0x0074}}},
+  {0x0055, {1, {0x0075}}},
+  {0x0056, {1, {0x0076}}},
+  {0x0057, {1, {0x0077}}},
+  {0x0058, {1, {0x0078}}},
+  {0x0059, {1, {0x0079}}},
+  {0x005a, {1, {0x007a}}},
+  {0x00b5, {1, {0x03bc}}},
+  {0x00c0, {1, {0x00e0}}},
+  {0x00c1, {1, {0x00e1}}},
+  {0x00c2, {1, {0x00e2}}},
+  {0x00c3, {1, {0x00e3}}},
+  {0x00c4, {1, {0x00e4}}},
+  {0x00c5, {1, {0x00e5}}},
+  {0x00c6, {1, {0x00e6}}},
+  {0x00c7, {1, {0x00e7}}},
+  {0x00c8, {1, {0x00e8}}},
+  {0x00c9, {1, {0x00e9}}},
+  {0x00ca, {1, {0x00ea}}},
+  {0x00cb, {1, {0x00eb}}},
+  {0x00cc, {1, {0x00ec}}},
+  {0x00cd, {1, {0x00ed}}},
+  {0x00ce, {1, {0x00ee}}},
+  {0x00cf, {1, {0x00ef}}},
+  {0x00d0, {1, {0x00f0}}},
+  {0x00d1, {1, {0x00f1}}},
+  {0x00d2, {1, {0x00f2}}},
+  {0x00d3, {1, {0x00f3}}},
+  {0x00d4, {1, {0x00f4}}},
+  {0x00d5, {1, {0x00f5}}},
+  {0x00d6, {1, {0x00f6}}},
+  {0x00d8, {1, {0x00f8}}},
+  {0x00d9, {1, {0x00f9}}},
+  {0x00da, {1, {0x00fa}}},
+  {0x00db, {1, {0x00fb}}},
+  {0x00dc, {1, {0x00fc}}},
+  {0x00dd, {1, {0x00fd}}},
+  {0x00de, {1, {0x00fe}}},
+  {0x00df, {2, {0x0073, 0x0073}}},
+  {0x0100, {1, {0x0101}}},
+  {0x0102, {1, {0x0103}}},
+  {0x0104, {1, {0x0105}}},
+  {0x0106, {1, {0x0107}}},
+  {0x0108, {1, {0x0109}}},
+  {0x010a, {1, {0x010b}}},
+  {0x010c, {1, {0x010d}}},
+  {0x010e, {1, {0x010f}}},
+  {0x0110, {1, {0x0111}}},
+  {0x0112, {1, {0x0113}}},
+  {0x0114, {1, {0x0115}}},
+  {0x0116, {1, {0x0117}}},
+  {0x0118, {1, {0x0119}}},
+  {0x011a, {1, {0x011b}}},
+  {0x011c, {1, {0x011d}}},
+  {0x011e, {1, {0x011f}}},
+  {0x0120, {1, {0x0121}}},
+  {0x0122, {1, {0x0123}}},
+  {0x0124, {1, {0x0125}}},
+  {0x0126, {1, {0x0127}}},
+  {0x0128, {1, {0x0129}}},
+  {0x012a, {1, {0x012b}}},
+  {0x012c, {1, {0x012d}}},
+  {0x012e, {1, {0x012f}}},
+  {0x0132, {1, {0x0133}}},
+  {0x0134, {1, {0x0135}}},
+  {0x0136, {1, {0x0137}}},
+  {0x0139, {1, {0x013a}}},
+  {0x013b, {1, {0x013c}}},
+  {0x013d, {1, {0x013e}}},
+  {0x013f, {1, {0x0140}}},
+  {0x0141, {1, {0x0142}}},
+  {0x0143, {1, {0x0144}}},
+  {0x0145, {1, {0x0146}}},
+  {0x0147, {1, {0x0148}}},
+  {0x0149, {2, {0x02bc, 0x006e}}},
+  {0x014a, {1, {0x014b}}},
+  {0x014c, {1, {0x014d}}},
+  {0x014e, {1, {0x014f}}},
+  {0x0150, {1, {0x0151}}},
+  {0x0152, {1, {0x0153}}},
+  {0x0154, {1, {0x0155}}},
+  {0x0156, {1, {0x0157}}},
+  {0x0158, {1, {0x0159}}},
+  {0x015a, {1, {0x015b}}},
+  {0x015c, {1, {0x015d}}},
+  {0x015e, {1, {0x015f}}},
+  {0x0160, {1, {0x0161}}},
+  {0x0162, {1, {0x0163}}},
+  {0x0164, {1, {0x0165}}},
+  {0x0166, {1, {0x0167}}},
+  {0x0168, {1, {0x0169}}},
+  {0x016a, {1, {0x016b}}},
+  {0x016c, {1, {0x016d}}},
+  {0x016e, {1, {0x016f}}},
+  {0x0170, {1, {0x0171}}},
+  {0x0172, {1, {0x0173}}},
+  {0x0174, {1, {0x0175}}},
+  {0x0176, {1, {0x0177}}},
+  {0x0178, {1, {0x00ff}}},
+  {0x0179, {1, {0x017a}}},
+  {0x017b, {1, {0x017c}}},
+  {0x017d, {1, {0x017e}}},
+  {0x017f, {1, {0x0073}}},
+  {0x0181, {1, {0x0253}}},
+  {0x0182, {1, {0x0183}}},
+  {0x0184, {1, {0x0185}}},
+  {0x0186, {1, {0x0254}}},
+  {0x0187, {1, {0x0188}}},
+  {0x0189, {1, {0x0256}}},
+  {0x018a, {1, {0x0257}}},
+  {0x018b, {1, {0x018c}}},
+  {0x018e, {1, {0x01dd}}},
+  {0x018f, {1, {0x0259}}},
+  {0x0190, {1, {0x025b}}},
+  {0x0191, {1, {0x0192}}},
+  {0x0193, {1, {0x0260}}},
+  {0x0194, {1, {0x0263}}},
+  {0x0196, {1, {0x0269}}},
+  {0x0197, {1, {0x0268}}},
+  {0x0198, {1, {0x0199}}},
+  {0x019c, {1, {0x026f}}},
+  {0x019d, {1, {0x0272}}},
+  {0x019f, {1, {0x0275}}},
+  {0x01a0, {1, {0x01a1}}},
+  {0x01a2, {1, {0x01a3}}},
+  {0x01a4, {1, {0x01a5}}},
+  {0x01a6, {1, {0x0280}}},
+  {0x01a7, {1, {0x01a8}}},
+  {0x01a9, {1, {0x0283}}},
+  {0x01ac, {1, {0x01ad}}},
+  {0x01ae, {1, {0x0288}}},
+  {0x01af, {1, {0x01b0}}},
+  {0x01b1, {1, {0x028a}}},
+  {0x01b2, {1, {0x028b}}},
+  {0x01b3, {1, {0x01b4}}},
+  {0x01b5, {1, {0x01b6}}},
+  {0x01b7, {1, {0x0292}}},
+  {0x01b8, {1, {0x01b9}}},
+  {0x01bc, {1, {0x01bd}}},
+  {0x01c4, {1, {0x01c6}}},
+  {0x01c5, {1, {0x01c6}}},
+  {0x01c7, {1, {0x01c9}}},
+  {0x01c8, {1, {0x01c9}}},
+  {0x01ca, {1, {0x01cc}}},
+  {0x01cb, {1, {0x01cc}}},
+  {0x01cd, {1, {0x01ce}}},
+  {0x01cf, {1, {0x01d0}}},
+  {0x01d1, {1, {0x01d2}}},
+  {0x01d3, {1, {0x01d4}}},
+  {0x01d5, {1, {0x01d6}}},
+  {0x01d7, {1, {0x01d8}}},
+  {0x01d9, {1, {0x01da}}},
+  {0x01db, {1, {0x01dc}}},
+  {0x01de, {1, {0x01df}}},
+  {0x01e0, {1, {0x01e1}}},
+  {0x01e2, {1, {0x01e3}}},
+  {0x01e4, {1, {0x01e5}}},
+  {0x01e6, {1, {0x01e7}}},
+  {0x01e8, {1, {0x01e9}}},
+  {0x01ea, {1, {0x01eb}}},
+  {0x01ec, {1, {0x01ed}}},
+  {0x01ee, {1, {0x01ef}}},
+  {0x01f0, {2, {0x006a, 0x030c}}},
+  {0x01f1, {1, {0x01f3}}},
+  {0x01f2, {1, {0x01f3}}},
+  {0x01f4, {1, {0x01f5}}},
+  {0x01f6, {1, {0x0195}}},
+  {0x01f7, {1, {0x01bf}}},
+  {0x01f8, {1, {0x01f9}}},
+  {0x01fa, {1, {0x01fb}}},
+  {0x01fc, {1, {0x01fd}}},
+  {0x01fe, {1, {0x01ff}}},
+  {0x0200, {1, {0x0201}}},
+  {0x0202, {1, {0x0203}}},
+  {0x0204, {1, {0x0205}}},
+  {0x0206, {1, {0x0207}}},
+  {0x0208, {1, {0x0209}}},
+  {0x020a, {1, {0x020b}}},
+  {0x020c, {1, {0x020d}}},
+  {0x020e, {1, {0x020f}}},
+  {0x0210, {1, {0x0211}}},
+  {0x0212, {1, {0x0213}}},
+  {0x0214, {1, {0x0215}}},
+  {0x0216, {1, {0x0217}}},
+  {0x0218, {1, {0x0219}}},
+  {0x021a, {1, {0x021b}}},
+  {0x021c, {1, {0x021d}}},
+  {0x021e, {1, {0x021f}}},
+  {0x0220, {1, {0x019e}}},
+  {0x0222, {1, {0x0223}}},
+  {0x0224, {1, {0x0225}}},
+  {0x0226, {1, {0x0227}}},
+  {0x0228, {1, {0x0229}}},
+  {0x022a, {1, {0x022b}}},
+  {0x022c, {1, {0x022d}}},
+  {0x022e, {1, {0x022f}}},
+  {0x0230, {1, {0x0231}}},
+  {0x0232, {1, {0x0233}}},
+  {0x023a, {1, {0x2c65}}},
+  {0x023b, {1, {0x023c}}},
+  {0x023d, {1, {0x019a}}},
+  {0x023e, {1, {0x2c66}}},
+  {0x0241, {1, {0x0242}}},
+  {0x0243, {1, {0x0180}}},
+  {0x0244, {1, {0x0289}}},
+  {0x0245, {1, {0x028c}}},
+  {0x0246, {1, {0x0247}}},
+  {0x0248, {1, {0x0249}}},
+  {0x024a, {1, {0x024b}}},
+  {0x024c, {1, {0x024d}}},
+  {0x024e, {1, {0x024f}}},
+  {0x0345, {1, {0x03b9}}},
+  {0x0370, {1, {0x0371}}},
+  {0x0372, {1, {0x0373}}},
+  {0x0376, {1, {0x0377}}},
+  {0x037f, {1, {0x03f3}}},
+  {0x0386, {1, {0x03ac}}},
+  {0x0388, {1, {0x03ad}}},
+  {0x0389, {1, {0x03ae}}},
+  {0x038a, {1, {0x03af}}},
+  {0x038c, {1, {0x03cc}}},
+  {0x038e, {1, {0x03cd}}},
+  {0x038f, {1, {0x03ce}}},
+  {0x0390, {3, {0x03b9, 0x0308, 0x0301}}},
+  {0x0391, {1, {0x03b1}}},
+  {0x0392, {1, {0x03b2}}},
+  {0x0393, {1, {0x03b3}}},
+  {0x0394, {1, {0x03b4}}},
+  {0x0395, {1, {0x03b5}}},
+  {0x0396, {1, {0x03b6}}},
+  {0x0397, {1, {0x03b7}}},
+  {0x0398, {1, {0x03b8}}},
+  {0x0399, {1, {0x03b9}}},
+  {0x039a, {1, {0x03ba}}},
+  {0x039b, {1, {0x03bb}}},
+  {0x039c, {1, {0x03bc}}},
+  {0x039d, {1, {0x03bd}}},
+  {0x039e, {1, {0x03be}}},
+  {0x039f, {1, {0x03bf}}},
+  {0x03a0, {1, {0x03c0}}},
+  {0x03a1, {1, {0x03c1}}},
+  {0x03a3, {1, {0x03c3}}},
+  {0x03a4, {1, {0x03c4}}},
+  {0x03a5, {1, {0x03c5}}},
+  {0x03a6, {1, {0x03c6}}},
+  {0x03a7, {1, {0x03c7}}},
+  {0x03a8, {1, {0x03c8}}},
+  {0x03a9, {1, {0x03c9}}},
+  {0x03aa, {1, {0x03ca}}},
+  {0x03ab, {1, {0x03cb}}},
+  {0x03b0, {3, {0x03c5, 0x0308, 0x0301}}},
+  {0x03c2, {1, {0x03c3}}},
+  {0x03cf, {1, {0x03d7}}},
+  {0x03d0, {1, {0x03b2}}},
+  {0x03d1, {1, {0x03b8}}},
+  {0x03d5, {1, {0x03c6}}},
+  {0x03d6, {1, {0x03c0}}},
+  {0x03d8, {1, {0x03d9}}},
+  {0x03da, {1, {0x03db}}},
+  {0x03dc, {1, {0x03dd}}},
+  {0x03de, {1, {0x03df}}},
+  {0x03e0, {1, {0x03e1}}},
+  {0x03e2, {1, {0x03e3}}},
+  {0x03e4, {1, {0x03e5}}},
+  {0x03e6, {1, {0x03e7}}},
+  {0x03e8, {1, {0x03e9}}},
+  {0x03ea, {1, {0x03eb}}},
+  {0x03ec, {1, {0x03ed}}},
+  {0x03ee, {1, {0x03ef}}},
+  {0x03f0, {1, {0x03ba}}},
+  {0x03f1, {1, {0x03c1}}},
+  {0x03f4, {1, {0x03b8}}},
+  {0x03f5, {1, {0x03b5}}},
+  {0x03f7, {1, {0x03f8}}},
+  {0x03f9, {1, {0x03f2}}},
+  {0x03fa, {1, {0x03fb}}},
+  {0x03fd, {1, {0x037b}}},
+  {0x03fe, {1, {0x037c}}},
+  {0x03ff, {1, {0x037d}}},
+  {0x0400, {1, {0x0450}}},
+  {0x0401, {1, {0x0451}}},
+  {0x0402, {1, {0x0452}}},
+  {0x0403, {1, {0x0453}}},
+  {0x0404, {1, {0x0454}}},
+  {0x0405, {1, {0x0455}}},
+  {0x0406, {1, {0x0456}}},
+  {0x0407, {1, {0x0457}}},
+  {0x0408, {1, {0x0458}}},
+  {0x0409, {1, {0x0459}}},
+  {0x040a, {1, {0x045a}}},
+  {0x040b, {1, {0x045b}}},
+  {0x040c, {1, {0x045c}}},
+  {0x040d, {1, {0x045d}}},
+  {0x040e, {1, {0x045e}}},
+  {0x040f, {1, {0x045f}}},
+  {0x0410, {1, {0x0430}}},
+  {0x0411, {1, {0x0431}}},
+  {0x0412, {1, {0x0432}}},
+  {0x0413, {1, {0x0433}}},
+  {0x0414, {1, {0x0434}}},
+  {0x0415, {1, {0x0435}}},
+  {0x0416, {1, {0x0436}}},
+  {0x0417, {1, {0x0437}}},
+  {0x0418, {1, {0x0438}}},
+  {0x0419, {1, {0x0439}}},
+  {0x041a, {1, {0x043a}}},
+  {0x041b, {1, {0x043b}}},
+  {0x041c, {1, {0x043c}}},
+  {0x041d, {1, {0x043d}}},
+  {0x041e, {1, {0x043e}}},
+  {0x041f, {1, {0x043f}}},
+  {0x0420, {1, {0x0440}}},
+  {0x0421, {1, {0x0441}}},
+  {0x0422, {1, {0x0442}}},
+  {0x0423, {1, {0x0443}}},
+  {0x0424, {1, {0x0444}}},
+  {0x0425, {1, {0x0445}}},
+  {0x0426, {1, {0x0446}}},
+  {0x0427, {1, {0x0447}}},
+  {0x0428, {1, {0x0448}}},
+  {0x0429, {1, {0x0449}}},
+  {0x042a, {1, {0x044a}}},
+  {0x042b, {1, {0x044b}}},
+  {0x042c, {1, {0x044c}}},
+  {0x042d, {1, {0x044d}}},
+  {0x042e, {1, {0x044e}}},
+  {0x042f, {1, {0x044f}}},
+  {0x0460, {1, {0x0461}}},
+  {0x0462, {1, {0x0463}}},
+  {0x0464, {1, {0x0465}}},
+  {0x0466, {1, {0x0467}}},
+  {0x0468, {1, {0x0469}}},
+  {0x046a, {1, {0x046b}}},
+  {0x046c, {1, {0x046d}}},
+  {0x046e, {1, {0x046f}}},
+  {0x0470, {1, {0x0471}}},
+  {0x0472, {1, {0x0473}}},
+  {0x0474, {1, {0x0475}}},
+  {0x0476, {1, {0x0477}}},
+  {0x0478, {1, {0x0479}}},
+  {0x047a, {1, {0x047b}}},
+  {0x047c, {1, {0x047d}}},
+  {0x047e, {1, {0x047f}}},
+  {0x0480, {1, {0x0481}}},
+  {0x048a, {1, {0x048b}}},
+  {0x048c, {1, {0x048d}}},
+  {0x048e, {1, {0x048f}}},
+  {0x0490, {1, {0x0491}}},
+  {0x0492, {1, {0x0493}}},
+  {0x0494, {1, {0x0495}}},
+  {0x0496, {1, {0x0497}}},
+  {0x0498, {1, {0x0499}}},
+  {0x049a, {1, {0x049b}}},
+  {0x049c, {1, {0x049d}}},
+  {0x049e, {1, {0x049f}}},
+  {0x04a0, {1, {0x04a1}}},
+  {0x04a2, {1, {0x04a3}}},
+  {0x04a4, {1, {0x04a5}}},
+  {0x04a6, {1, {0x04a7}}},
+  {0x04a8, {1, {0x04a9}}},
+  {0x04aa, {1, {0x04ab}}},
+  {0x04ac, {1, {0x04ad}}},
+  {0x04ae, {1, {0x04af}}},
+  {0x04b0, {1, {0x04b1}}},
+  {0x04b2, {1, {0x04b3}}},
+  {0x04b4, {1, {0x04b5}}},
+  {0x04b6, {1, {0x04b7}}},
+  {0x04b8, {1, {0x04b9}}},
+  {0x04ba, {1, {0x04bb}}},
+  {0x04bc, {1, {0x04bd}}},
+  {0x04be, {1, {0x04bf}}},
+  {0x04c0, {1, {0x04cf}}},
+  {0x04c1, {1, {0x04c2}}},
+  {0x04c3, {1, {0x04c4}}},
+  {0x04c5, {1, {0x04c6}}},
+  {0x04c7, {1, {0x04c8}}},
+  {0x04c9, {1, {0x04ca}}},
+  {0x04cb, {1, {0x04cc}}},
+  {0x04cd, {1, {0x04ce}}},
+  {0x04d0, {1, {0x04d1}}},
+  {0x04d2, {1, {0x04d3}}},
+  {0x04d4, {1, {0x04d5}}},
+  {0x04d6, {1, {0x04d7}}},
+  {0x04d8, {1, {0x04d9}}},
+  {0x04da, {1, {0x04db}}},
+  {0x04dc, {1, {0x04dd}}},
+  {0x04de, {1, {0x04df}}},
+  {0x04e0, {1, {0x04e1}}},
+  {0x04e2, {1, {0x04e3}}},
+  {0x04e4, {1, {0x04e5}}},
+  {0x04e6, {1, {0x04e7}}},
+  {0x04e8, {1, {0x04e9}}},
+  {0x04ea, {1, {0x04eb}}},
+  {0x04ec, {1, {0x04ed}}},
+  {0x04ee, {1, {0x04ef}}},
+  {0x04f0, {1, {0x04f1}}},
+  {0x04f2, {1, {0x04f3}}},
+  {0x04f4, {1, {0x04f5}}},
+  {0x04f6, {1, {0x04f7}}},
+  {0x04f8, {1, {0x04f9}}},
+  {0x04fa, {1, {0x04fb}}},
+  {0x04fc, {1, {0x04fd}}},
+  {0x04fe, {1, {0x04ff}}},
+  {0x0500, {1, {0x0501}}},
+  {0x0502, {1, {0x0503}}},
+  {0x0504, {1, {0x0505}}},
+  {0x0506, {1, {0x0507}}},
+  {0x0508, {1, {0x0509}}},
+  {0x050a, {1, {0x050b}}},
+  {0x050c, {1, {0x050d}}},
+  {0x050e, {1, {0x050f}}},
+  {0x0510, {1, {0x0511}}},
+  {0x0512, {1, {0x0513}}},
+  {0x0514, {1, {0x0515}}},
+  {0x0516, {1, {0x0517}}},
+  {0x0518, {1, {0x0519}}},
+  {0x051a, {1, {0x051b}}},
+  {0x051c, {1, {0x051d}}},
+  {0x051e, {1, {0x051f}}},
+  {0x0520, {1, {0x0521}}},
+  {0x0522, {1, {0x0523}}},
+  {0x0524, {1, {0x0525}}},
+  {0x0526, {1, {0x0527}}},
+  {0x0528, {1, {0x0529}}},
+  {0x052a, {1, {0x052b}}},
+  {0x052c, {1, {0x052d}}},
+  {0x052e, {1, {0x052f}}},
+  {0x0531, {1, {0x0561}}},
+  {0x0532, {1, {0x0562}}},
+  {0x0533, {1, {0x0563}}},
+  {0x0534, {1, {0x0564}}},
+  {0x0535, {1, {0x0565}}},
+  {0x0536, {1, {0x0566}}},
+  {0x0537, {1, {0x0567}}},
+  {0x0538, {1, {0x0568}}},
+  {0x0539, {1, {0x0569}}},
+  {0x053a, {1, {0x056a}}},
+  {0x053b, {1, {0x056b}}},
+  {0x053c, {1, {0x056c}}},
+  {0x053d, {1, {0x056d}}},
+  {0x053e, {1, {0x056e}}},
+  {0x053f, {1, {0x056f}}},
+  {0x0540, {1, {0x0570}}},
+  {0x0541, {1, {0x0571}}},
+  {0x0542, {1, {0x0572}}},
+  {0x0543, {1, {0x0573}}},
+  {0x0544, {1, {0x0574}}},
+  {0x0545, {1, {0x0575}}},
+  {0x0546, {1, {0x0576}}},
+  {0x0547, {1, {0x0577}}},
+  {0x0548, {1, {0x0578}}},
+  {0x0549, {1, {0x0579}}},
+  {0x054a, {1, {0x057a}}},
+  {0x054b, {1, {0x057b}}},
+  {0x054c, {1, {0x057c}}},
+  {0x054d, {1, {0x057d}}},
+  {0x054e, {1, {0x057e}}},
+  {0x054f, {1, {0x057f}}},
+  {0x0550, {1, {0x0580}}},
+  {0x0551, {1, {0x0581}}},
+  {0x0552, {1, {0x0582}}},
+  {0x0553, {1, {0x0583}}},
+  {0x0554, {1, {0x0584}}},
+  {0x0555, {1, {0x0585}}},
+  {0x0556, {1, {0x0586}}},
+  {0x0587, {2, {0x0565, 0x0582}}},
+  {0x10a0, {1, {0x2d00}}},
+  {0x10a1, {1, {0x2d01}}},
+  {0x10a2, {1, {0x2d02}}},
+  {0x10a3, {1, {0x2d03}}},
+  {0x10a4, {1, {0x2d04}}},
+  {0x10a5, {1, {0x2d05}}},
+  {0x10a6, {1, {0x2d06}}},
+  {0x10a7, {1, {0x2d07}}},
+  {0x10a8, {1, {0x2d08}}},
+  {0x10a9, {1, {0x2d09}}},
+  {0x10aa, {1, {0x2d0a}}},
+  {0x10ab, {1, {0x2d0b}}},
+  {0x10ac, {1, {0x2d0c}}},
+  {0x10ad, {1, {0x2d0d}}},
+  {0x10ae, {1, {0x2d0e}}},
+  {0x10af, {1, {0x2d0f}}},
+  {0x10b0, {1, {0x2d10}}},
+  {0x10b1, {1, {0x2d11}}},
+  {0x10b2, {1, {0x2d12}}},
+  {0x10b3, {1, {0x2d13}}},
+  {0x10b4, {1, {0x2d14}}},
+  {0x10b5, {1, {0x2d15}}},
+  {0x10b6, {1, {0x2d16}}},
+  {0x10b7, {1, {0x2d17}}},
+  {0x10b8, {1, {0x2d18}}},
+  {0x10b9, {1, {0x2d19}}},
+  {0x10ba, {1, {0x2d1a}}},
+  {0x10bb, {1, {0x2d1b}}},
+  {0x10bc, {1, {0x2d1c}}},
+  {0x10bd, {1, {0x2d1d}}},
+  {0x10be, {1, {0x2d1e}}},
+  {0x10bf, {1, {0x2d1f}}},
+  {0x10c0, {1, {0x2d20}}},
+  {0x10c1, {1, {0x2d21}}},
+  {0x10c2, {1, {0x2d22}}},
+  {0x10c3, {1, {0x2d23}}},
+  {0x10c4, {1, {0x2d24}}},
+  {0x10c5, {1, {0x2d25}}},
+  {0x10c7, {1, {0x2d27}}},
+  {0x10cd, {1, {0x2d2d}}},
+  {0x1e00, {1, {0x1e01}}},
+  {0x1e02, {1, {0x1e03}}},
+  {0x1e04, {1, {0x1e05}}},
+  {0x1e06, {1, {0x1e07}}},
+  {0x1e08, {1, {0x1e09}}},
+  {0x1e0a, {1, {0x1e0b}}},
+  {0x1e0c, {1, {0x1e0d}}},
+  {0x1e0e, {1, {0x1e0f}}},
+  {0x1e10, {1, {0x1e11}}},
+  {0x1e12, {1, {0x1e13}}},
+  {0x1e14, {1, {0x1e15}}},
+  {0x1e16, {1, {0x1e17}}},
+  {0x1e18, {1, {0x1e19}}},
+  {0x1e1a, {1, {0x1e1b}}},
+  {0x1e1c, {1, {0x1e1d}}},
+  {0x1e1e, {1, {0x1e1f}}},
+  {0x1e20, {1, {0x1e21}}},
+  {0x1e22, {1, {0x1e23}}},
+  {0x1e24, {1, {0x1e25}}},
+  {0x1e26, {1, {0x1e27}}},
+  {0x1e28, {1, {0x1e29}}},
+  {0x1e2a, {1, {0x1e2b}}},
+  {0x1e2c, {1, {0x1e2d}}},
+  {0x1e2e, {1, {0x1e2f}}},
+  {0x1e30, {1, {0x1e31}}},
+  {0x1e32, {1, {0x1e33}}},
+  {0x1e34, {1, {0x1e35}}},
+  {0x1e36, {1, {0x1e37}}},
+  {0x1e38, {1, {0x1e39}}},
+  {0x1e3a, {1, {0x1e3b}}},
+  {0x1e3c, {1, {0x1e3d}}},
+  {0x1e3e, {1, {0x1e3f}}},
+  {0x1e40, {1, {0x1e41}}},
+  {0x1e42, {1, {0x1e43}}},
+  {0x1e44, {1, {0x1e45}}},
+  {0x1e46, {1, {0x1e47}}},
+  {0x1e48, {1, {0x1e49}}},
+  {0x1e4a, {1, {0x1e4b}}},
+  {0x1e4c, {1, {0x1e4d}}},
+  {0x1e4e, {1, {0x1e4f}}},
+  {0x1e50, {1, {0x1e51}}},
+  {0x1e52, {1, {0x1e53}}},
+  {0x1e54, {1, {0x1e55}}},
+  {0x1e56, {1, {0x1e57}}},
+  {0x1e58, {1, {0x1e59}}},
+  {0x1e5a, {1, {0x1e5b}}},
+  {0x1e5c, {1, {0x1e5d}}},
+  {0x1e5e, {1, {0x1e5f}}},
+  {0x1e60, {1, {0x1e61}}},
+  {0x1e62, {1, {0x1e63}}},
+  {0x1e64, {1, {0x1e65}}},
+  {0x1e66, {1, {0x1e67}}},
+  {0x1e68, {1, {0x1e69}}},
+  {0x1e6a, {1, {0x1e6b}}},
+  {0x1e6c, {1, {0x1e6d}}},
+  {0x1e6e, {1, {0x1e6f}}},
+  {0x1e70, {1, {0x1e71}}},
+  {0x1e72, {1, {0x1e73}}},
+  {0x1e74, {1, {0x1e75}}},
+  {0x1e76, {1, {0x1e77}}},
+  {0x1e78, {1, {0x1e79}}},
+  {0x1e7a, {1, {0x1e7b}}},
+  {0x1e7c, {1, {0x1e7d}}},
+  {0x1e7e, {1, {0x1e7f}}},
+  {0x1e80, {1, {0x1e81}}},
+  {0x1e82, {1, {0x1e83}}},
+  {0x1e84, {1, {0x1e85}}},
+  {0x1e86, {1, {0x1e87}}},
+  {0x1e88, {1, {0x1e89}}},
+  {0x1e8a, {1, {0x1e8b}}},
+  {0x1e8c, {1, {0x1e8d}}},
+  {0x1e8e, {1, {0x1e8f}}},
+  {0x1e90, {1, {0x1e91}}},
+  {0x1e92, {1, {0x1e93}}},
+  {0x1e94, {1, {0x1e95}}},
+  {0x1e96, {2, {0x0068, 0x0331}}},
+  {0x1e97, {2, {0x0074, 0x0308}}},
+  {0x1e98, {2, {0x0077, 0x030a}}},
+  {0x1e99, {2, {0x0079, 0x030a}}},
+  {0x1e9a, {2, {0x0061, 0x02be}}},
+  {0x1e9b, {1, {0x1e61}}},
+  {0x1e9e, {2, {0x0073, 0x0073}}},
+  {0x1ea0, {1, {0x1ea1}}},
+  {0x1ea2, {1, {0x1ea3}}},
+  {0x1ea4, {1, {0x1ea5}}},
+  {0x1ea6, {1, {0x1ea7}}},
+  {0x1ea8, {1, {0x1ea9}}},
+  {0x1eaa, {1, {0x1eab}}},
+  {0x1eac, {1, {0x1ead}}},
+  {0x1eae, {1, {0x1eaf}}},
+  {0x1eb0, {1, {0x1eb1}}},
+  {0x1eb2, {1, {0x1eb3}}},
+  {0x1eb4, {1, {0x1eb5}}},
+  {0x1eb6, {1, {0x1eb7}}},
+  {0x1eb8, {1, {0x1eb9}}},
+  {0x1eba, {1, {0x1ebb}}},
+  {0x1ebc, {1, {0x1ebd}}},
+  {0x1ebe, {1, {0x1ebf}}},
+  {0x1ec0, {1, {0x1ec1}}},
+  {0x1ec2, {1, {0x1ec3}}},
+  {0x1ec4, {1, {0x1ec5}}},
+  {0x1ec6, {1, {0x1ec7}}},
+  {0x1ec8, {1, {0x1ec9}}},
+  {0x1eca, {1, {0x1ecb}}},
+  {0x1ecc, {1, {0x1ecd}}},
+  {0x1ece, {1, {0x1ecf}}},
+  {0x1ed0, {1, {0x1ed1}}},
+  {0x1ed2, {1, {0x1ed3}}},
+  {0x1ed4, {1, {0x1ed5}}},
+  {0x1ed6, {1, {0x1ed7}}},
+  {0x1ed8, {1, {0x1ed9}}},
+  {0x1eda, {1, {0x1edb}}},
+  {0x1edc, {1, {0x1edd}}},
+  {0x1ede, {1, {0x1edf}}},
+  {0x1ee0, {1, {0x1ee1}}},
+  {0x1ee2, {1, {0x1ee3}}},
+  {0x1ee4, {1, {0x1ee5}}},
+  {0x1ee6, {1, {0x1ee7}}},
+  {0x1ee8, {1, {0x1ee9}}},
+  {0x1eea, {1, {0x1eeb}}},
+  {0x1eec, {1, {0x1eed}}},
+  {0x1eee, {1, {0x1eef}}},
+  {0x1ef0, {1, {0x1ef1}}},
+  {0x1ef2, {1, {0x1ef3}}},
+  {0x1ef4, {1, {0x1ef5}}},
+  {0x1ef6, {1, {0x1ef7}}},
+  {0x1ef8, {1, {0x1ef9}}},
+  {0x1efa, {1, {0x1efb}}},
+  {0x1efc, {1, {0x1efd}}},
+  {0x1efe, {1, {0x1eff}}},
+  {0x1f08, {1, {0x1f00}}},
+  {0x1f09, {1, {0x1f01}}},
+  {0x1f0a, {1, {0x1f02}}},
+  {0x1f0b, {1, {0x1f03}}},
+  {0x1f0c, {1, {0x1f04}}},
+  {0x1f0d, {1, {0x1f05}}},
+  {0x1f0e, {1, {0x1f06}}},
+  {0x1f0f, {1, {0x1f07}}},
+  {0x1f18, {1, {0x1f10}}},
+  {0x1f19, {1, {0x1f11}}},
+  {0x1f1a, {1, {0x1f12}}},
+  {0x1f1b, {1, {0x1f13}}},
+  {0x1f1c, {1, {0x1f14}}},
+  {0x1f1d, {1, {0x1f15}}},
+  {0x1f28, {1, {0x1f20}}},
+  {0x1f29, {1, {0x1f21}}},
+  {0x1f2a, {1, {0x1f22}}},
+  {0x1f2b, {1, {0x1f23}}},
+  {0x1f2c, {1, {0x1f24}}},
+  {0x1f2d, {1, {0x1f25}}},
+  {0x1f2e, {1, {0x1f26}}},
+  {0x1f2f, {1, {0x1f27}}},
+  {0x1f38, {1, {0x1f30}}},
+  {0x1f39, {1, {0x1f31}}},
+  {0x1f3a, {1, {0x1f32}}},
+  {0x1f3b, {1, {0x1f33}}},
+  {0x1f3c, {1, {0x1f34}}},
+  {0x1f3d, {1, {0x1f35}}},
+  {0x1f3e, {1, {0x1f36}}},
+  {0x1f3f, {1, {0x1f37}}},
+  {0x1f48, {1, {0x1f40}}},
+  {0x1f49, {1, {0x1f41}}},
+  {0x1f4a, {1, {0x1f42}}},
+  {0x1f4b, {1, {0x1f43}}},
+  {0x1f4c, {1, {0x1f44}}},
+  {0x1f4d, {1, {0x1f45}}},
+  {0x1f50, {2, {0x03c5, 0x0313}}},
+  {0x1f52, {3, {0x03c5, 0x0313, 0x0300}}},
+  {0x1f54, {3, {0x03c5, 0x0313, 0x0301}}},
+  {0x1f56, {3, {0x03c5, 0x0313, 0x0342}}},
+  {0x1f59, {1, {0x1f51}}},
+  {0x1f5b, {1, {0x1f53}}},
+  {0x1f5d, {1, {0x1f55}}},
+  {0x1f5f, {1, {0x1f57}}},
+  {0x1f68, {1, {0x1f60}}},
+  {0x1f69, {1, {0x1f61}}},
+  {0x1f6a, {1, {0x1f62}}},
+  {0x1f6b, {1, {0x1f63}}},
+  {0x1f6c, {1, {0x1f64}}},
+  {0x1f6d, {1, {0x1f65}}},
+  {0x1f6e, {1, {0x1f66}}},
+  {0x1f6f, {1, {0x1f67}}},
+  {0x1f80, {2, {0x1f00, 0x03b9}}},
+  {0x1f81, {2, {0x1f01, 0x03b9}}},
+  {0x1f82, {2, {0x1f02, 0x03b9}}},
+  {0x1f83, {2, {0x1f03, 0x03b9}}},
+  {0x1f84, {2, {0x1f04, 0x03b9}}},
+  {0x1f85, {2, {0x1f05, 0x03b9}}},
+  {0x1f86, {2, {0x1f06, 0x03b9}}},
+  {0x1f87, {2, {0x1f07, 0x03b9}}},
+  {0x1f88, {2, {0x1f00, 0x03b9}}},
+  {0x1f89, {2, {0x1f01, 0x03b9}}},
+  {0x1f8a, {2, {0x1f02, 0x03b9}}},
+  {0x1f8b, {2, {0x1f03, 0x03b9}}},
+  {0x1f8c, {2, {0x1f04, 0x03b9}}},
+  {0x1f8d, {2, {0x1f05, 0x03b9}}},
+  {0x1f8e, {2, {0x1f06, 0x03b9}}},
+  {0x1f8f, {2, {0x1f07, 0x03b9}}},
+  {0x1f90, {2, {0x1f20, 0x03b9}}},
+  {0x1f91, {2, {0x1f21, 0x03b9}}},
+  {0x1f92, {2, {0x1f22, 0x03b9}}},
+  {0x1f93, {2, {0x1f23, 0x03b9}}},
+  {0x1f94, {2, {0x1f24, 0x03b9}}},
+  {0x1f95, {2, {0x1f25, 0x03b9}}},
+  {0x1f96, {2, {0x1f26, 0x03b9}}},
+  {0x1f97, {2, {0x1f27, 0x03b9}}},
+  {0x1f98, {2, {0x1f20, 0x03b9}}},
+  {0x1f99, {2, {0x1f21, 0x03b9}}},
+  {0x1f9a, {2, {0x1f22, 0x03b9}}},
+  {0x1f9b, {2, {0x1f23, 0x03b9}}},
+  {0x1f9c, {2, {0x1f24, 0x03b9}}},
+  {0x1f9d, {2, {0x1f25, 0x03b9}}},
+  {0x1f9e, {2, {0x1f26, 0x03b9}}},
+  {0x1f9f, {2, {0x1f27, 0x03b9}}},
+  {0x1fa0, {2, {0x1f60, 0x03b9}}},
+  {0x1fa1, {2, {0x1f61, 0x03b9}}},
+  {0x1fa2, {2, {0x1f62, 0x03b9}}},
+  {0x1fa3, {2, {0x1f63, 0x03b9}}},
+  {0x1fa4, {2, {0x1f64, 0x03b9}}},
+  {0x1fa5, {2, {0x1f65, 0x03b9}}},
+  {0x1fa6, {2, {0x1f66, 0x03b9}}},
+  {0x1fa7, {2, {0x1f67, 0x03b9}}},
+  {0x1fa8, {2, {0x1f60, 0x03b9}}},
+  {0x1fa9, {2, {0x1f61, 0x03b9}}},
+  {0x1faa, {2, {0x1f62, 0x03b9}}},
+  {0x1fab, {2, {0x1f63, 0x03b9}}},
+  {0x1fac, {2, {0x1f64, 0x03b9}}},
+  {0x1fad, {2, {0x1f65, 0x03b9}}},
+  {0x1fae, {2, {0x1f66, 0x03b9}}},
+  {0x1faf, {2, {0x1f67, 0x03b9}}},
+  {0x1fb2, {2, {0x1f70, 0x03b9}}},
+  {0x1fb3, {2, {0x03b1, 0x03b9}}},
+  {0x1fb4, {2, {0x03ac, 0x03b9}}},
+  {0x1fb6, {2, {0x03b1, 0x0342}}},
+  {0x1fb7, {3, {0x03b1, 0x0342, 0x03b9}}},
+  {0x1fb8, {1, {0x1fb0}}},
+  {0x1fb9, {1, {0x1fb1}}},
+  {0x1fba, {1, {0x1f70}}},
+  {0x1fbb, {1, {0x1f71}}},
+  {0x1fbc, {2, {0x03b1, 0x03b9}}},
+  {0x1fbe, {1, {0x03b9}}},
+  {0x1fc2, {2, {0x1f74, 0x03b9}}},
+  {0x1fc3, {2, {0x03b7, 0x03b9}}},
+  {0x1fc4, {2, {0x03ae, 0x03b9}}},
+  {0x1fc6, {2, {0x03b7, 0x0342}}},
+  {0x1fc7, {3, {0x03b7, 0x0342, 0x03b9}}},
+  {0x1fc8, {1, {0x1f72}}},
+  {0x1fc9, {1, {0x1f73}}},
+  {0x1fca, {1, {0x1f74}}},
+  {0x1fcb, {1, {0x1f75}}},
+  {0x1fcc, {2, {0x03b7, 0x03b9}}},
+  {0x1fd2, {3, {0x03b9, 0x0308, 0x0300}}},
+  {0x1fd3, {3, {0x03b9, 0x0308, 0x0301}}},
+  {0x1fd6, {2, {0x03b9, 0x0342}}},
+  {0x1fd7, {3, {0x03b9, 0x0308, 0x0342}}},
+  {0x1fd8, {1, {0x1fd0}}},
+  {0x1fd9, {1, {0x1fd1}}},
+  {0x1fda, {1, {0x1f76}}},
+  {0x1fdb, {1, {0x1f77}}},
+  {0x1fe2, {3, {0x03c5, 0x0308, 0x0300}}},
+  {0x1fe3, {3, {0x03c5, 0x0308, 0x0301}}},
+  {0x1fe4, {2, {0x03c1, 0x0313}}},
+  {0x1fe6, {2, {0x03c5, 0x0342}}},
+  {0x1fe7, {3, {0x03c5, 0x0308, 0x0342}}},
+  {0x1fe8, {1, {0x1fe0}}},
+  {0x1fe9, {1, {0x1fe1}}},
+  {0x1fea, {1, {0x1f7a}}},
+  {0x1feb, {1, {0x1f7b}}},
+  {0x1fec, {1, {0x1fe5}}},
+  {0x1ff2, {2, {0x1f7c, 0x03b9}}},
+  {0x1ff3, {2, {0x03c9, 0x03b9}}},
+  {0x1ff4, {2, {0x03ce, 0x03b9}}},
+  {0x1ff6, {2, {0x03c9, 0x0342}}},
+  {0x1ff7, {3, {0x03c9, 0x0342, 0x03b9}}},
+  {0x1ff8, {1, {0x1f78}}},
+  {0x1ff9, {1, {0x1f79}}},
+  {0x1ffa, {1, {0x1f7c}}},
+  {0x1ffb, {1, {0x1f7d}}},
+  {0x1ffc, {2, {0x03c9, 0x03b9}}},
+  {0x2126, {1, {0x03c9}}},
+  {0x212a, {1, {0x006b}}},
+  {0x212b, {1, {0x00e5}}},
+  {0x2132, {1, {0x214e}}},
+  {0x2160, {1, {0x2170}}},
+  {0x2161, {1, {0x2171}}},
+  {0x2162, {1, {0x2172}}},
+  {0x2163, {1, {0x2173}}},
+  {0x2164, {1, {0x2174}}},
+  {0x2165, {1, {0x2175}}},
+  {0x2166, {1, {0x2176}}},
+  {0x2167, {1, {0x2177}}},
+  {0x2168, {1, {0x2178}}},
+  {0x2169, {1, {0x2179}}},
+  {0x216a, {1, {0x217a}}},
+  {0x216b, {1, {0x217b}}},
+  {0x216c, {1, {0x217c}}},
+  {0x216d, {1, {0x217d}}},
+  {0x216e, {1, {0x217e}}},
+  {0x216f, {1, {0x217f}}},
+  {0x2183, {1, {0x2184}}},
+  {0x24b6, {1, {0x24d0}}},
+  {0x24b7, {1, {0x24d1}}},
+  {0x24b8, {1, {0x24d2}}},
+  {0x24b9, {1, {0x24d3}}},
+  {0x24ba, {1, {0x24d4}}},
+  {0x24bb, {1, {0x24d5}}},
+  {0x24bc, {1, {0x24d6}}},
+  {0x24bd, {1, {0x24d7}}},
+  {0x24be, {1, {0x24d8}}},
+  {0x24bf, {1, {0x24d9}}},
+  {0x24c0, {1, {0x24da}}},
+  {0x24c1, {1, {0x24db}}},
+  {0x24c2, {1, {0x24dc}}},
+  {0x24c3, {1, {0x24dd}}},
+  {0x24c4, {1, {0x24de}}},
+  {0x24c5, {1, {0x24df}}},
+  {0x24c6, {1, {0x24e0}}},
+  {0x24c7, {1, {0x24e1}}},
+  {0x24c8, {1, {0x24e2}}},
+  {0x24c9, {1, {0x24e3}}},
+  {0x24ca, {1, {0x24e4}}},
+  {0x24cb, {1, {0x24e5}}},
+  {0x24cc, {1, {0x24e6}}},
+  {0x24cd, {1, {0x24e7}}},
+  {0x24ce, {1, {0x24e8}}},
+  {0x24cf, {1, {0x24e9}}},
+  {0x2c00, {1, {0x2c30}}},
+  {0x2c01, {1, {0x2c31}}},
+  {0x2c02, {1, {0x2c32}}},
+  {0x2c03, {1, {0x2c33}}},
+  {0x2c04, {1, {0x2c34}}},
+  {0x2c05, {1, {0x2c35}}},
+  {0x2c06, {1, {0x2c36}}},
+  {0x2c07, {1, {0x2c37}}},
+  {0x2c08, {1, {0x2c38}}},
+  {0x2c09, {1, {0x2c39}}},
+  {0x2c0a, {1, {0x2c3a}}},
+  {0x2c0b, {1, {0x2c3b}}},
+  {0x2c0c, {1, {0x2c3c}}},
+  {0x2c0d, {1, {0x2c3d}}},
+  {0x2c0e, {1, {0x2c3e}}},
+  {0x2c0f, {1, {0x2c3f}}},
+  {0x2c10, {1, {0x2c40}}},
+  {0x2c11, {1, {0x2c41}}},
+  {0x2c12, {1, {0x2c42}}},
+  {0x2c13, {1, {0x2c43}}},
+  {0x2c14, {1, {0x2c44}}},
+  {0x2c15, {1, {0x2c45}}},
+  {0x2c16, {1, {0x2c46}}},
+  {0x2c17, {1, {0x2c47}}},
+  {0x2c18, {1, {0x2c48}}},
+  {0x2c19, {1, {0x2c49}}},
+  {0x2c1a, {1, {0x2c4a}}},
+  {0x2c1b, {1, {0x2c4b}}},
+  {0x2c1c, {1, {0x2c4c}}},
+  {0x2c1d, {1, {0x2c4d}}},
+  {0x2c1e, {1, {0x2c4e}}},
+  {0x2c1f, {1, {0x2c4f}}},
+  {0x2c20, {1, {0x2c50}}},
+  {0x2c21, {1, {0x2c51}}},
+  {0x2c22, {1, {0x2c52}}},
+  {0x2c23, {1, {0x2c53}}},
+  {0x2c24, {1, {0x2c54}}},
+  {0x2c25, {1, {0x2c55}}},
+  {0x2c26, {1, {0x2c56}}},
+  {0x2c27, {1, {0x2c57}}},
+  {0x2c28, {1, {0x2c58}}},
+  {0x2c29, {1, {0x2c59}}},
+  {0x2c2a, {1, {0x2c5a}}},
+  {0x2c2b, {1, {0x2c5b}}},
+  {0x2c2c, {1, {0x2c5c}}},
+  {0x2c2d, {1, {0x2c5d}}},
+  {0x2c2e, {1, {0x2c5e}}},
+  {0x2c60, {1, {0x2c61}}},
+  {0x2c62, {1, {0x026b}}},
+  {0x2c63, {1, {0x1d7d}}},
+  {0x2c64, {1, {0x027d}}},
+  {0x2c67, {1, {0x2c68}}},
+  {0x2c69, {1, {0x2c6a}}},
+  {0x2c6b, {1, {0x2c6c}}},
+  {0x2c6d, {1, {0x0251}}},
+  {0x2c6e, {1, {0x0271}}},
+  {0x2c6f, {1, {0x0250}}},
+  {0x2c70, {1, {0x0252}}},
+  {0x2c72, {1, {0x2c73}}},
+  {0x2c75, {1, {0x2c76}}},
+  {0x2c7e, {1, {0x023f}}},
+  {0x2c7f, {1, {0x0240}}},
+  {0x2c80, {1, {0x2c81}}},
+  {0x2c82, {1, {0x2c83}}},
+  {0x2c84, {1, {0x2c85}}},
+  {0x2c86, {1, {0x2c87}}},
+  {0x2c88, {1, {0x2c89}}},
+  {0x2c8a, {1, {0x2c8b}}},
+  {0x2c8c, {1, {0x2c8d}}},
+  {0x2c8e, {1, {0x2c8f}}},
+  {0x2c90, {1, {0x2c91}}},
+  {0x2c92, {1, {0x2c93}}},
+  {0x2c94, {1, {0x2c95}}},
+  {0x2c96, {1, {0x2c97}}},
+  {0x2c98, {1, {0x2c99}}},
+  {0x2c9a, {1, {0x2c9b}}},
+  {0x2c9c, {1, {0x2c9d}}},
+  {0x2c9e, {1, {0x2c9f}}},
+  {0x2ca0, {1, {0x2ca1}}},
+  {0x2ca2, {1, {0x2ca3}}},
+  {0x2ca4, {1, {0x2ca5}}},
+  {0x2ca6, {1, {0x2ca7}}},
+  {0x2ca8, {1, {0x2ca9}}},
+  {0x2caa, {1, {0x2cab}}},
+  {0x2cac, {1, {0x2cad}}},
+  {0x2cae, {1, {0x2caf}}},
+  {0x2cb0, {1, {0x2cb1}}},
+  {0x2cb2, {1, {0x2cb3}}},
+  {0x2cb4, {1, {0x2cb5}}},
+  {0x2cb6, {1, {0x2cb7}}},
+  {0x2cb8, {1, {0x2cb9}}},
+  {0x2cba, {1, {0x2cbb}}},
+  {0x2cbc, {1, {0x2cbd}}},
+  {0x2cbe, {1, {0x2cbf}}},
+  {0x2cc0, {1, {0x2cc1}}},
+  {0x2cc2, {1, {0x2cc3}}},
+  {0x2cc4, {1, {0x2cc5}}},
+  {0x2cc6, {1, {0x2cc7}}},
+  {0x2cc8, {1, {0x2cc9}}},
+  {0x2cca, {1, {0x2ccb}}},
+  {0x2ccc, {1, {0x2ccd}}},
+  {0x2cce, {1, {0x2ccf}}},
+  {0x2cd0, {1, {0x2cd1}}},
+  {0x2cd2, {1, {0x2cd3}}},
+  {0x2cd4, {1, {0x2cd5}}},
+  {0x2cd6, {1, {0x2cd7}}},
+  {0x2cd8, {1, {0x2cd9}}},
+  {0x2cda, {1, {0x2cdb}}},
+  {0x2cdc, {1, {0x2cdd}}},
+  {0x2cde, {1, {0x2cdf}}},
+  {0x2ce0, {1, {0x2ce1}}},
+  {0x2ce2, {1, {0x2ce3}}},
+  {0x2ceb, {1, {0x2cec}}},
+  {0x2ced, {1, {0x2cee}}},
+  {0x2cf2, {1, {0x2cf3}}},
+  {0xa640, {1, {0xa641}}},
+  {0xa642, {1, {0xa643}}},
+  {0xa644, {1, {0xa645}}},
+  {0xa646, {1, {0xa647}}},
+  {0xa648, {1, {0xa649}}},
+  {0xa64a, {1, {0xa64b}}},
+  {0xa64c, {1, {0xa64d}}},
+  {0xa64e, {1, {0xa64f}}},
+  {0xa650, {1, {0xa651}}},
+  {0xa652, {1, {0xa653}}},
+  {0xa654, {1, {0xa655}}},
+  {0xa656, {1, {0xa657}}},
+  {0xa658, {1, {0xa659}}},
+  {0xa65a, {1, {0xa65b}}},
+  {0xa65c, {1, {0xa65d}}},
+  {0xa65e, {1, {0xa65f}}},
+  {0xa660, {1, {0xa661}}},
+  {0xa662, {1, {0xa663}}},
+  {0xa664, {1, {0xa665}}},
+  {0xa666, {1, {0xa667}}},
+  {0xa668, {1, {0xa669}}},
+  {0xa66a, {1, {0xa66b}}},
+  {0xa66c, {1, {0xa66d}}},
+  {0xa680, {1, {0xa681}}},
+  {0xa682, {1, {0xa683}}},
+  {0xa684, {1, {0xa685}}},
+  {0xa686, {1, {0xa687}}},
+  {0xa688, {1, {0xa689}}},
+  {0xa68a, {1, {0xa68b}}},
+  {0xa68c, {1, {0xa68d}}},
+  {0xa68e, {1, {0xa68f}}},
+  {0xa690, {1, {0xa691}}},
+  {0xa692, {1, {0xa693}}},
+  {0xa694, {1, {0xa695}}},
+  {0xa696, {1, {0xa697}}},
+  {0xa698, {1, {0xa699}}},
+  {0xa69a, {1, {0xa69b}}},
+  {0xa722, {1, {0xa723}}},
+  {0xa724, {1, {0xa725}}},
+  {0xa726, {1, {0xa727}}},
+  {0xa728, {1, {0xa729}}},
+  {0xa72a, {1, {0xa72b}}},
+  {0xa72c, {1, {0xa72d}}},
+  {0xa72e, {1, {0xa72f}}},
+  {0xa732, {1, {0xa733}}},
+  {0xa734, {1, {0xa735}}},
+  {0xa736, {1, {0xa737}}},
+  {0xa738, {1, {0xa739}}},
+  {0xa73a, {1, {0xa73b}}},
+  {0xa73c, {1, {0xa73d}}},
+  {0xa73e, {1, {0xa73f}}},
+  {0xa740, {1, {0xa741}}},
+  {0xa742, {1, {0xa743}}},
+  {0xa744, {1, {0xa745}}},
+  {0xa746, {1, {0xa747}}},
+  {0xa748, {1, {0xa749}}},
+  {0xa74a, {1, {0xa74b}}},
+  {0xa74c, {1, {0xa74d}}},
+  {0xa74e, {1, {0xa74f}}},
+  {0xa750, {1, {0xa751}}},
+  {0xa752, {1, {0xa753}}},
+  {0xa754, {1, {0xa755}}},
+  {0xa756, {1, {0xa757}}},
+  {0xa758, {1, {0xa759}}},
+  {0xa75a, {1, {0xa75b}}},
+  {0xa75c, {1, {0xa75d}}},
+  {0xa75e, {1, {0xa75f}}},
+  {0xa760, {1, {0xa761}}},
+  {0xa762, {1, {0xa763}}},
+  {0xa764, {1, {0xa765}}},
+  {0xa766, {1, {0xa767}}},
+  {0xa768, {1, {0xa769}}},
+  {0xa76a, {1, {0xa76b}}},
+  {0xa76c, {1, {0xa76d}}},
+  {0xa76e, {1, {0xa76f}}},
+  {0xa779, {1, {0xa77a}}},
+  {0xa77b, {1, {0xa77c}}},
+  {0xa77d, {1, {0x1d79}}},
+  {0xa77e, {1, {0xa77f}}},
+  {0xa780, {1, {0xa781}}},
+  {0xa782, {1, {0xa783}}},
+  {0xa784, {1, {0xa785}}},
+  {0xa786, {1, {0xa787}}},
+  {0xa78b, {1, {0xa78c}}},
+  {0xa78d, {1, {0x0265}}},
+  {0xa790, {1, {0xa791}}},
+  {0xa792, {1, {0xa793}}},
+  {0xa796, {1, {0xa797}}},
+  {0xa798, {1, {0xa799}}},
+  {0xa79a, {1, {0xa79b}}},
+  {0xa79c, {1, {0xa79d}}},
+  {0xa79e, {1, {0xa79f}}},
+  {0xa7a0, {1, {0xa7a1}}},
+  {0xa7a2, {1, {0xa7a3}}},
+  {0xa7a4, {1, {0xa7a5}}},
+  {0xa7a6, {1, {0xa7a7}}},
+  {0xa7a8, {1, {0xa7a9}}},
+  {0xa7aa, {1, {0x0266}}},
+  {0xa7ab, {1, {0x025c}}},
+  {0xa7ac, {1, {0x0261}}},
+  {0xa7ad, {1, {0x026c}}},
+  {0xa7b0, {1, {0x029e}}},
+  {0xa7b1, {1, {0x0287}}},
+  {0xfb00, {2, {0x0066, 0x0066}}},
+  {0xfb01, {2, {0x0066, 0x0069}}},
+  {0xfb02, {2, {0x0066, 0x006c}}},
+  {0xfb03, {3, {0x0066, 0x0066, 0x0069}}},
+  {0xfb04, {3, {0x0066, 0x0066, 0x006c}}},
+  {0xfb05, {2, {0x0073, 0x0074}}},
+  {0xfb06, {2, {0x0073, 0x0074}}},
+  {0xfb13, {2, {0x0574, 0x0576}}},
+  {0xfb14, {2, {0x0574, 0x0565}}},
+  {0xfb15, {2, {0x0574, 0x056b}}},
+  {0xfb16, {2, {0x057e, 0x0576}}},
+  {0xfb17, {2, {0x0574, 0x056d}}},
+  {0xff21, {1, {0xff41}}},
+  {0xff22, {1, {0xff42}}},
+  {0xff23, {1, {0xff43}}},
+  {0xff24, {1, {0xff44}}},
+  {0xff25, {1, {0xff45}}},
+  {0xff26, {1, {0xff46}}},
+  {0xff27, {1, {0xff47}}},
+  {0xff28, {1, {0xff48}}},
+  {0xff29, {1, {0xff49}}},
+  {0xff2a, {1, {0xff4a}}},
+  {0xff2b, {1, {0xff4b}}},
+  {0xff2c, {1, {0xff4c}}},
+  {0xff2d, {1, {0xff4d}}},
+  {0xff2e, {1, {0xff4e}}},
+  {0xff2f, {1, {0xff4f}}},
+  {0xff30, {1, {0xff50}}},
+  {0xff31, {1, {0xff51}}},
+  {0xff32, {1, {0xff52}}},
+  {0xff33, {1, {0xff53}}},
+  {0xff34, {1, {0xff54}}},
+  {0xff35, {1, {0xff55}}},
+  {0xff36, {1, {0xff56}}},
+  {0xff37, {1, {0xff57}}},
+  {0xff38, {1, {0xff58}}},
+  {0xff39, {1, {0xff59}}},
+  {0xff3a, {1, {0xff5a}}},
+  {0x10400, {1, {0x10428}}},
+  {0x10401, {1, {0x10429}}},
+  {0x10402, {1, {0x1042a}}},
+  {0x10403, {1, {0x1042b}}},
+  {0x10404, {1, {0x1042c}}},
+  {0x10405, {1, {0x1042d}}},
+  {0x10406, {1, {0x1042e}}},
+  {0x10407, {1, {0x1042f}}},
+  {0x10408, {1, {0x10430}}},
+  {0x10409, {1, {0x10431}}},
+  {0x1040a, {1, {0x10432}}},
+  {0x1040b, {1, {0x10433}}},
+  {0x1040c, {1, {0x10434}}},
+  {0x1040d, {1, {0x10435}}},
+  {0x1040e, {1, {0x10436}}},
+  {0x1040f, {1, {0x10437}}},
+  {0x10410, {1, {0x10438}}},
+  {0x10411, {1, {0x10439}}},
+  {0x10412, {1, {0x1043a}}},
+  {0x10413, {1, {0x1043b}}},
+  {0x10414, {1, {0x1043c}}},
+  {0x10415, {1, {0x1043d}}},
+  {0x10416, {1, {0x1043e}}},
+  {0x10417, {1, {0x1043f}}},
+  {0x10418, {1, {0x10440}}},
+  {0x10419, {1, {0x10441}}},
+  {0x1041a, {1, {0x10442}}},
+  {0x1041b, {1, {0x10443}}},
+  {0x1041c, {1, {0x10444}}},
+  {0x1041d, {1, {0x10445}}},
+  {0x1041e, {1, {0x10446}}},
+  {0x1041f, {1, {0x10447}}},
+  {0x10420, {1, {0x10448}}},
+  {0x10421, {1, {0x10449}}},
+  {0x10422, {1, {0x1044a}}},
+  {0x10423, {1, {0x1044b}}},
+  {0x10424, {1, {0x1044c}}},
+  {0x10425, {1, {0x1044d}}},
+  {0x10426, {1, {0x1044e}}},
+  {0x10427, {1, {0x1044f}}},
+  {0x118a0, {1, {0x118c0}}},
+  {0x118a1, {1, {0x118c1}}},
+  {0x118a2, {1, {0x118c2}}},
+  {0x118a3, {1, {0x118c3}}},
+  {0x118a4, {1, {0x118c4}}},
+  {0x118a5, {1, {0x118c5}}},
+  {0x118a6, {1, {0x118c6}}},
+  {0x118a7, {1, {0x118c7}}},
+  {0x118a8, {1, {0x118c8}}},
+  {0x118a9, {1, {0x118c9}}},
+  {0x118aa, {1, {0x118ca}}},
+  {0x118ab, {1, {0x118cb}}},
+  {0x118ac, {1, {0x118cc}}},
+  {0x118ad, {1, {0x118cd}}},
+  {0x118ae, {1, {0x118ce}}},
+  {0x118af, {1, {0x118cf}}},
+  {0x118b0, {1, {0x118d0}}},
+  {0x118b1, {1, {0x118d1}}},
+  {0x118b2, {1, {0x118d2}}},
+  {0x118b3, {1, {0x118d3}}},
+  {0x118b4, {1, {0x118d4}}},
+  {0x118b5, {1, {0x118d5}}},
+  {0x118b6, {1, {0x118d6}}},
+  {0x118b7, {1, {0x118d7}}},
+  {0x118b8, {1, {0x118d8}}},
+  {0x118b9, {1, {0x118d9}}},
+  {0x118ba, {1, {0x118da}}},
+  {0x118bb, {1, {0x118db}}},
+  {0x118bc, {1, {0x118dc}}},
+  {0x118bd, {1, {0x118dd}}},
+  {0x118be, {1, {0x118de}}},
+  {0x118bf, {1, {0x118df}}},
+#define CaseFold_Locale (*(CaseFold_11_Type (*)[2])(CaseFold_11_Table+1178))
+  {0x0049, {1, {0x0069}}},
+  {0x0130, {2, {0x0069, 0x0307}}},
 };
 
-static const CaseFold_11_Type CaseFold_Locale[] = {
- { 0x0049, {1, {0x0069}}},
- { 0x0130, {2, {0x0069, 0x0307}}},
-};
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseFold_11_hash -N onigenc_unicode_CaseFold_11_lookup -n  */
 
-static const CaseUnfold_11_Type CaseUnfold_11[] = {
- { 0x0061, {1, {0x0041 }}},
- { 0x0062, {1, {0x0042 }}},
- { 0x0063, {1, {0x0043 }}},
- { 0x0064, {1, {0x0044 }}},
- { 0x0065, {1, {0x0045 }}},
- { 0x0066, {1, {0x0046 }}},
- { 0x0067, {1, {0x0047 }}},
- { 0x0068, {1, {0x0048 }}},
- { 0x006a, {1, {0x004a }}},
- { 0x006b, {2, {0x004b, 0x212a }}},
- { 0x006c, {1, {0x004c }}},
- { 0x006d, {1, {0x004d }}},
- { 0x006e, {1, {0x004e }}},
- { 0x006f, {1, {0x004f }}},
- { 0x0070, {1, {0x0050 }}},
- { 0x0071, {1, {0x0051 }}},
- { 0x0072, {1, {0x0052 }}},
- { 0x0073, {2, {0x0053, 0x017f }}},
- { 0x0074, {1, {0x0054 }}},
- { 0x0075, {1, {0x0055 }}},
- { 0x0076, {1, {0x0056 }}},
- { 0x0077, {1, {0x0057 }}},
- { 0x0078, {1, {0x0058 }}},
- { 0x0079, {1, {0x0059 }}},
- { 0x007a, {1, {0x005a }}},
- { 0x00e0, {1, {0x00c0 }}},
- { 0x00e1, {1, {0x00c1 }}},
- { 0x00e2, {1, {0x00c2 }}},
- { 0x00e3, {1, {0x00c3 }}},
- { 0x00e4, {1, {0x00c4 }}},
- { 0x00e5, {2, {0x00c5, 0x212b }}},
- { 0x00e6, {1, {0x00c6 }}},
- { 0x00e7, {1, {0x00c7 }}},
- { 0x00e8, {1, {0x00c8 }}},
- { 0x00e9, {1, {0x00c9 }}},
- { 0x00ea, {1, {0x00ca }}},
- { 0x00eb, {1, {0x00cb }}},
- { 0x00ec, {1, {0x00cc }}},
- { 0x00ed, {1, {0x00cd }}},
- { 0x00ee, {1, {0x00ce }}},
- { 0x00ef, {1, {0x00cf }}},
- { 0x00f0, {1, {0x00d0 }}},
- { 0x00f1, {1, {0x00d1 }}},
- { 0x00f2, {1, {0x00d2 }}},
- { 0x00f3, {1, {0x00d3 }}},
- { 0x00f4, {1, {0x00d4 }}},
- { 0x00f5, {1, {0x00d5 }}},
- { 0x00f6, {1, {0x00d6 }}},
- { 0x00f8, {1, {0x00d8 }}},
- { 0x00f9, {1, {0x00d9 }}},
- { 0x00fa, {1, {0x00da }}},
- { 0x00fb, {1, {0x00db }}},
- { 0x00fc, {1, {0x00dc }}},
- { 0x00fd, {1, {0x00dd }}},
- { 0x00fe, {1, {0x00de }}},
- { 0x00ff, {1, {0x0178 }}},
- { 0x0101, {1, {0x0100 }}},
- { 0x0103, {1, {0x0102 }}},
- { 0x0105, {1, {0x0104 }}},
- { 0x0107, {1, {0x0106 }}},
- { 0x0109, {1, {0x0108 }}},
- { 0x010b, {1, {0x010a }}},
- { 0x010d, {1, {0x010c }}},
- { 0x010f, {1, {0x010e }}},
- { 0x0111, {1, {0x0110 }}},
- { 0x0113, {1, {0x0112 }}},
- { 0x0115, {1, {0x0114 }}},
- { 0x0117, {1, {0x0116 }}},
- { 0x0119, {1, {0x0118 }}},
- { 0x011b, {1, {0x011a }}},
- { 0x011d, {1, {0x011c }}},
- { 0x011f, {1, {0x011e }}},
- { 0x0121, {1, {0x0120 }}},
- { 0x0123, {1, {0x0122 }}},
- { 0x0125, {1, {0x0124 }}},
- { 0x0127, {1, {0x0126 }}},
- { 0x0129, {1, {0x0128 }}},
- { 0x012b, {1, {0x012a }}},
- { 0x012d, {1, {0x012c }}},
- { 0x012f, {1, {0x012e }}},
- { 0x0133, {1, {0x0132 }}},
- { 0x0135, {1, {0x0134 }}},
- { 0x0137, {1, {0x0136 }}},
- { 0x013a, {1, {0x0139 }}},
- { 0x013c, {1, {0x013b }}},
- { 0x013e, {1, {0x013d }}},
- { 0x0140, {1, {0x013f }}},
- { 0x0142, {1, {0x0141 }}},
- { 0x0144, {1, {0x0143 }}},
- { 0x0146, {1, {0x0145 }}},
- { 0x0148, {1, {0x0147 }}},
- { 0x014b, {1, {0x014a }}},
- { 0x014d, {1, {0x014c }}},
- { 0x014f, {1, {0x014e }}},
- { 0x0151, {1, {0x0150 }}},
- { 0x0153, {1, {0x0152 }}},
- { 0x0155, {1, {0x0154 }}},
- { 0x0157, {1, {0x0156 }}},
- { 0x0159, {1, {0x0158 }}},
- { 0x015b, {1, {0x015a }}},
- { 0x015d, {1, {0x015c }}},
- { 0x015f, {1, {0x015e }}},
- { 0x0161, {1, {0x0160 }}},
- { 0x0163, {1, {0x0162 }}},
- { 0x0165, {1, {0x0164 }}},
- { 0x0167, {1, {0x0166 }}},
- { 0x0169, {1, {0x0168 }}},
- { 0x016b, {1, {0x016a }}},
- { 0x016d, {1, {0x016c }}},
- { 0x016f, {1, {0x016e }}},
- { 0x0171, {1, {0x0170 }}},
- { 0x0173, {1, {0x0172 }}},
- { 0x0175, {1, {0x0174 }}},
- { 0x0177, {1, {0x0176 }}},
- { 0x017a, {1, {0x0179 }}},
- { 0x017c, {1, {0x017b }}},
- { 0x017e, {1, {0x017d }}},
- { 0x0180, {1, {0x0243 }}},
- { 0x0183, {1, {0x0182 }}},
- { 0x0185, {1, {0x0184 }}},
- { 0x0188, {1, {0x0187 }}},
- { 0x018c, {1, {0x018b }}},
- { 0x0192, {1, {0x0191 }}},
- { 0x0195, {1, {0x01f6 }}},
- { 0x0199, {1, {0x0198 }}},
- { 0x019a, {1, {0x023d }}},
- { 0x019e, {1, {0x0220 }}},
- { 0x01a1, {1, {0x01a0 }}},
- { 0x01a3, {1, {0x01a2 }}},
- { 0x01a5, {1, {0x01a4 }}},
- { 0x01a8, {1, {0x01a7 }}},
- { 0x01ad, {1, {0x01ac }}},
- { 0x01b0, {1, {0x01af }}},
- { 0x01b4, {1, {0x01b3 }}},
- { 0x01b6, {1, {0x01b5 }}},
- { 0x01b9, {1, {0x01b8 }}},
- { 0x01bd, {1, {0x01bc }}},
- { 0x01bf, {1, {0x01f7 }}},
- { 0x01c6, {2, {0x01c4, 0x01c5 }}},
- { 0x01c9, {2, {0x01c7, 0x01c8 }}},
- { 0x01cc, {2, {0x01ca, 0x01cb }}},
- { 0x01ce, {1, {0x01cd }}},
- { 0x01d0, {1, {0x01cf }}},
- { 0x01d2, {1, {0x01d1 }}},
- { 0x01d4, {1, {0x01d3 }}},
- { 0x01d6, {1, {0x01d5 }}},
- { 0x01d8, {1, {0x01d7 }}},
- { 0x01da, {1, {0x01d9 }}},
- { 0x01dc, {1, {0x01db }}},
- { 0x01dd, {1, {0x018e }}},
- { 0x01df, {1, {0x01de }}},
- { 0x01e1, {1, {0x01e0 }}},
- { 0x01e3, {1, {0x01e2 }}},
- { 0x01e5, {1, {0x01e4 }}},
- { 0x01e7, {1, {0x01e6 }}},
- { 0x01e9, {1, {0x01e8 }}},
- { 0x01eb, {1, {0x01ea }}},
- { 0x01ed, {1, {0x01ec }}},
- { 0x01ef, {1, {0x01ee }}},
- { 0x01f3, {2, {0x01f1, 0x01f2 }}},
- { 0x01f5, {1, {0x01f4 }}},
- { 0x01f9, {1, {0x01f8 }}},
- { 0x01fb, {1, {0x01fa }}},
- { 0x01fd, {1, {0x01fc }}},
- { 0x01ff, {1, {0x01fe }}},
- { 0x0201, {1, {0x0200 }}},
- { 0x0203, {1, {0x0202 }}},
- { 0x0205, {1, {0x0204 }}},
- { 0x0207, {1, {0x0206 }}},
- { 0x0209, {1, {0x0208 }}},
- { 0x020b, {1, {0x020a }}},
- { 0x020d, {1, {0x020c }}},
- { 0x020f, {1, {0x020e }}},
- { 0x0211, {1, {0x0210 }}},
- { 0x0213, {1, {0x0212 }}},
- { 0x0215, {1, {0x0214 }}},
- { 0x0217, {1, {0x0216 }}},
- { 0x0219, {1, {0x0218 }}},
- { 0x021b, {1, {0x021a }}},
- { 0x021d, {1, {0x021c }}},
- { 0x021f, {1, {0x021e }}},
- { 0x0223, {1, {0x0222 }}},
- { 0x0225, {1, {0x0224 }}},
- { 0x0227, {1, {0x0226 }}},
- { 0x0229, {1, {0x0228 }}},
- { 0x022b, {1, {0x022a }}},
- { 0x022d, {1, {0x022c }}},
- { 0x022f, {1, {0x022e }}},
- { 0x0231, {1, {0x0230 }}},
- { 0x0233, {1, {0x0232 }}},
- { 0x023c, {1, {0x023b }}},
- { 0x023f, {1, {0x2c7e }}},
- { 0x0240, {1, {0x2c7f }}},
- { 0x0242, {1, {0x0241 }}},
- { 0x0247, {1, {0x0246 }}},
- { 0x0249, {1, {0x0248 }}},
- { 0x024b, {1, {0x024a }}},
- { 0x024d, {1, {0x024c }}},
- { 0x024f, {1, {0x024e }}},
- { 0x0250, {1, {0x2c6f }}},
- { 0x0251, {1, {0x2c6d }}},
- { 0x0252, {1, {0x2c70 }}},
- { 0x0253, {1, {0x0181 }}},
- { 0x0254, {1, {0x0186 }}},
- { 0x0256, {1, {0x0189 }}},
- { 0x0257, {1, {0x018a }}},
- { 0x0259, {1, {0x018f }}},
- { 0x025b, {1, {0x0190 }}},
- { 0x0260, {1, {0x0193 }}},
- { 0x0263, {1, {0x0194 }}},
- { 0x0265, {1, {0xa78d }}},
- { 0x0266, {1, {0xa7aa }}},
- { 0x0268, {1, {0x0197 }}},
- { 0x0269, {1, {0x0196 }}},
- { 0x026b, {1, {0x2c62 }}},
- { 0x026f, {1, {0x019c }}},
- { 0x0271, {1, {0x2c6e }}},
- { 0x0272, {1, {0x019d }}},
- { 0x0275, {1, {0x019f }}},
- { 0x027d, {1, {0x2c64 }}},
- { 0x0280, {1, {0x01a6 }}},
- { 0x0283, {1, {0x01a9 }}},
- { 0x0288, {1, {0x01ae }}},
- { 0x0289, {1, {0x0244 }}},
- { 0x028a, {1, {0x01b1 }}},
- { 0x028b, {1, {0x01b2 }}},
- { 0x028c, {1, {0x0245 }}},
- { 0x0292, {1, {0x01b7 }}},
- { 0x0371, {1, {0x0370 }}},
- { 0x0373, {1, {0x0372 }}},
- { 0x0377, {1, {0x0376 }}},
- { 0x037b, {1, {0x03fd }}},
- { 0x037c, {1, {0x03fe }}},
- { 0x037d, {1, {0x03ff }}},
- { 0x03ac, {1, {0x0386 }}},
- { 0x03ad, {1, {0x0388 }}},
- { 0x03ae, {1, {0x0389 }}},
- { 0x03af, {1, {0x038a }}},
- { 0x03b1, {1, {0x0391 }}},
- { 0x03b2, {2, {0x0392, 0x03d0 }}},
- { 0x03b3, {1, {0x0393 }}},
- { 0x03b4, {1, {0x0394 }}},
- { 0x03b5, {2, {0x0395, 0x03f5 }}},
- { 0x03b6, {1, {0x0396 }}},
- { 0x03b7, {1, {0x0397 }}},
- { 0x03b8, {3, {0x0398, 0x03d1, 0x03f4 }}},
- { 0x03b9, {3, {0x0345, 0x0399, 0x1fbe }}},
- { 0x03ba, {2, {0x039a, 0x03f0 }}},
- { 0x03bb, {1, {0x039b }}},
- { 0x03bc, {2, {0x00b5, 0x039c }}},
- { 0x03bd, {1, {0x039d }}},
- { 0x03be, {1, {0x039e }}},
- { 0x03bf, {1, {0x039f }}},
- { 0x03c0, {2, {0x03a0, 0x03d6 }}},
- { 0x03c1, {2, {0x03a1, 0x03f1 }}},
- { 0x03c3, {2, {0x03a3, 0x03c2 }}},
- { 0x03c4, {1, {0x03a4 }}},
- { 0x03c5, {1, {0x03a5 }}},
- { 0x03c6, {2, {0x03a6, 0x03d5 }}},
- { 0x03c7, {1, {0x03a7 }}},
- { 0x03c8, {1, {0x03a8 }}},
- { 0x03c9, {2, {0x03a9, 0x2126 }}},
- { 0x03ca, {1, {0x03aa }}},
- { 0x03cb, {1, {0x03ab }}},
- { 0x03cc, {1, {0x038c }}},
- { 0x03cd, {1, {0x038e }}},
- { 0x03ce, {1, {0x038f }}},
- { 0x03d7, {1, {0x03cf }}},
- { 0x03d9, {1, {0x03d8 }}},
- { 0x03db, {1, {0x03da }}},
- { 0x03dd, {1, {0x03dc }}},
- { 0x03df, {1, {0x03de }}},
- { 0x03e1, {1, {0x03e0 }}},
- { 0x03e3, {1, {0x03e2 }}},
- { 0x03e5, {1, {0x03e4 }}},
- { 0x03e7, {1, {0x03e6 }}},
- { 0x03e9, {1, {0x03e8 }}},
- { 0x03eb, {1, {0x03ea }}},
- { 0x03ed, {1, {0x03ec }}},
- { 0x03ef, {1, {0x03ee }}},
- { 0x03f2, {1, {0x03f9 }}},
- { 0x03f8, {1, {0x03f7 }}},
- { 0x03fb, {1, {0x03fa }}},
- { 0x0430, {1, {0x0410 }}},
- { 0x0431, {1, {0x0411 }}},
- { 0x0432, {1, {0x0412 }}},
- { 0x0433, {1, {0x0413 }}},
- { 0x0434, {1, {0x0414 }}},
- { 0x0435, {1, {0x0415 }}},
- { 0x0436, {1, {0x0416 }}},
- { 0x0437, {1, {0x0417 }}},
- { 0x0438, {1, {0x0418 }}},
- { 0x0439, {1, {0x0419 }}},
- { 0x043a, {1, {0x041a }}},
- { 0x043b, {1, {0x041b }}},
- { 0x043c, {1, {0x041c }}},
- { 0x043d, {1, {0x041d }}},
- { 0x043e, {1, {0x041e }}},
- { 0x043f, {1, {0x041f }}},
- { 0x0440, {1, {0x0420 }}},
- { 0x0441, {1, {0x0421 }}},
- { 0x0442, {1, {0x0422 }}},
- { 0x0443, {1, {0x0423 }}},
- { 0x0444, {1, {0x0424 }}},
- { 0x0445, {1, {0x0425 }}},
- { 0x0446, {1, {0x0426 }}},
- { 0x0447, {1, {0x0427 }}},
- { 0x0448, {1, {0x0428 }}},
- { 0x0449, {1, {0x0429 }}},
- { 0x044a, {1, {0x042a }}},
- { 0x044b, {1, {0x042b }}},
- { 0x044c, {1, {0x042c }}},
- { 0x044d, {1, {0x042d }}},
- { 0x044e, {1, {0x042e }}},
- { 0x044f, {1, {0x042f }}},
- { 0x0450, {1, {0x0400 }}},
- { 0x0451, {1, {0x0401 }}},
- { 0x0452, {1, {0x0402 }}},
- { 0x0453, {1, {0x0403 }}},
- { 0x0454, {1, {0x0404 }}},
- { 0x0455, {1, {0x0405 }}},
- { 0x0456, {1, {0x0406 }}},
- { 0x0457, {1, {0x0407 }}},
- { 0x0458, {1, {0x0408 }}},
- { 0x0459, {1, {0x0409 }}},
- { 0x045a, {1, {0x040a }}},
- { 0x045b, {1, {0x040b }}},
- { 0x045c, {1, {0x040c }}},
- { 0x045d, {1, {0x040d }}},
- { 0x045e, {1, {0x040e }}},
- { 0x045f, {1, {0x040f }}},
- { 0x0461, {1, {0x0460 }}},
- { 0x0463, {1, {0x0462 }}},
- { 0x0465, {1, {0x0464 }}},
- { 0x0467, {1, {0x0466 }}},
- { 0x0469, {1, {0x0468 }}},
- { 0x046b, {1, {0x046a }}},
- { 0x046d, {1, {0x046c }}},
- { 0x046f, {1, {0x046e }}},
- { 0x0471, {1, {0x0470 }}},
- { 0x0473, {1, {0x0472 }}},
- { 0x0475, {1, {0x0474 }}},
- { 0x0477, {1, {0x0476 }}},
- { 0x0479, {1, {0x0478 }}},
- { 0x047b, {1, {0x047a }}},
- { 0x047d, {1, {0x047c }}},
- { 0x047f, {1, {0x047e }}},
- { 0x0481, {1, {0x0480 }}},
- { 0x048b, {1, {0x048a }}},
- { 0x048d, {1, {0x048c }}},
- { 0x048f, {1, {0x048e }}},
- { 0x0491, {1, {0x0490 }}},
- { 0x0493, {1, {0x0492 }}},
- { 0x0495, {1, {0x0494 }}},
- { 0x0497, {1, {0x0496 }}},
- { 0x0499, {1, {0x0498 }}},
- { 0x049b, {1, {0x049a }}},
- { 0x049d, {1, {0x049c }}},
- { 0x049f, {1, {0x049e }}},
- { 0x04a1, {1, {0x04a0 }}},
- { 0x04a3, {1, {0x04a2 }}},
- { 0x04a5, {1, {0x04a4 }}},
- { 0x04a7, {1, {0x04a6 }}},
- { 0x04a9, {1, {0x04a8 }}},
- { 0x04ab, {1, {0x04aa }}},
- { 0x04ad, {1, {0x04ac }}},
- { 0x04af, {1, {0x04ae }}},
- { 0x04b1, {1, {0x04b0 }}},
- { 0x04b3, {1, {0x04b2 }}},
- { 0x04b5, {1, {0x04b4 }}},
- { 0x04b7, {1, {0x04b6 }}},
- { 0x04b9, {1, {0x04b8 }}},
- { 0x04bb, {1, {0x04ba }}},
- { 0x04bd, {1, {0x04bc }}},
- { 0x04bf, {1, {0x04be }}},
- { 0x04c2, {1, {0x04c1 }}},
- { 0x04c4, {1, {0x04c3 }}},
- { 0x04c6, {1, {0x04c5 }}},
- { 0x04c8, {1, {0x04c7 }}},
- { 0x04ca, {1, {0x04c9 }}},
- { 0x04cc, {1, {0x04cb }}},
- { 0x04ce, {1, {0x04cd }}},
- { 0x04cf, {1, {0x04c0 }}},
- { 0x04d1, {1, {0x04d0 }}},
- { 0x04d3, {1, {0x04d2 }}},
- { 0x04d5, {1, {0x04d4 }}},
- { 0x04d7, {1, {0x04d6 }}},
- { 0x04d9, {1, {0x04d8 }}},
- { 0x04db, {1, {0x04da }}},
- { 0x04dd, {1, {0x04dc }}},
- { 0x04df, {1, {0x04de }}},
- { 0x04e1, {1, {0x04e0 }}},
- { 0x04e3, {1, {0x04e2 }}},
- { 0x04e5, {1, {0x04e4 }}},
- { 0x04e7, {1, {0x04e6 }}},
- { 0x04e9, {1, {0x04e8 }}},
- { 0x04eb, {1, {0x04ea }}},
- { 0x04ed, {1, {0x04ec }}},
- { 0x04ef, {1, {0x04ee }}},
- { 0x04f1, {1, {0x04f0 }}},
- { 0x04f3, {1, {0x04f2 }}},
- { 0x04f5, {1, {0x04f4 }}},
- { 0x04f7, {1, {0x04f6 }}},
- { 0x04f9, {1, {0x04f8 }}},
- { 0x04fb, {1, {0x04fa }}},
- { 0x04fd, {1, {0x04fc }}},
- { 0x04ff, {1, {0x04fe }}},
- { 0x0501, {1, {0x0500 }}},
- { 0x0503, {1, {0x0502 }}},
- { 0x0505, {1, {0x0504 }}},
- { 0x0507, {1, {0x0506 }}},
- { 0x0509, {1, {0x0508 }}},
- { 0x050b, {1, {0x050a }}},
- { 0x050d, {1, {0x050c }}},
- { 0x050f, {1, {0x050e }}},
- { 0x0511, {1, {0x0510 }}},
- { 0x0513, {1, {0x0512 }}},
- { 0x0515, {1, {0x0514 }}},
- { 0x0517, {1, {0x0516 }}},
- { 0x0519, {1, {0x0518 }}},
- { 0x051b, {1, {0x051a }}},
- { 0x051d, {1, {0x051c }}},
- { 0x051f, {1, {0x051e }}},
- { 0x0521, {1, {0x0520 }}},
- { 0x0523, {1, {0x0522 }}},
- { 0x0525, {1, {0x0524 }}},
- { 0x0527, {1, {0x0526 }}},
- { 0x0561, {1, {0x0531 }}},
- { 0x0562, {1, {0x0532 }}},
- { 0x0563, {1, {0x0533 }}},
- { 0x0564, {1, {0x0534 }}},
- { 0x0565, {1, {0x0535 }}},
- { 0x0566, {1, {0x0536 }}},
- { 0x0567, {1, {0x0537 }}},
- { 0x0568, {1, {0x0538 }}},
- { 0x0569, {1, {0x0539 }}},
- { 0x056a, {1, {0x053a }}},
- { 0x056b, {1, {0x053b }}},
- { 0x056c, {1, {0x053c }}},
- { 0x056d, {1, {0x053d }}},
- { 0x056e, {1, {0x053e }}},
- { 0x056f, {1, {0x053f }}},
- { 0x0570, {1, {0x0540 }}},
- { 0x0571, {1, {0x0541 }}},
- { 0x0572, {1, {0x0542 }}},
- { 0x0573, {1, {0x0543 }}},
- { 0x0574, {1, {0x0544 }}},
- { 0x0575, {1, {0x0545 }}},
- { 0x0576, {1, {0x0546 }}},
- { 0x0577, {1, {0x0547 }}},
- { 0x0578, {1, {0x0548 }}},
- { 0x0579, {1, {0x0549 }}},
- { 0x057a, {1, {0x054a }}},
- { 0x057b, {1, {0x054b }}},
- { 0x057c, {1, {0x054c }}},
- { 0x057d, {1, {0x054d }}},
- { 0x057e, {1, {0x054e }}},
- { 0x057f, {1, {0x054f }}},
- { 0x0580, {1, {0x0550 }}},
- { 0x0581, {1, {0x0551 }}},
- { 0x0582, {1, {0x0552 }}},
- { 0x0583, {1, {0x0553 }}},
- { 0x0584, {1, {0x0554 }}},
- { 0x0585, {1, {0x0555 }}},
- { 0x0586, {1, {0x0556 }}},
- { 0x1d79, {1, {0xa77d }}},
- { 0x1d7d, {1, {0x2c63 }}},
- { 0x1e01, {1, {0x1e00 }}},
- { 0x1e03, {1, {0x1e02 }}},
- { 0x1e05, {1, {0x1e04 }}},
- { 0x1e07, {1, {0x1e06 }}},
- { 0x1e09, {1, {0x1e08 }}},
- { 0x1e0b, {1, {0x1e0a }}},
- { 0x1e0d, {1, {0x1e0c }}},
- { 0x1e0f, {1, {0x1e0e }}},
- { 0x1e11, {1, {0x1e10 }}},
- { 0x1e13, {1, {0x1e12 }}},
- { 0x1e15, {1, {0x1e14 }}},
- { 0x1e17, {1, {0x1e16 }}},
- { 0x1e19, {1, {0x1e18 }}},
- { 0x1e1b, {1, {0x1e1a }}},
- { 0x1e1d, {1, {0x1e1c }}},
- { 0x1e1f, {1, {0x1e1e }}},
- { 0x1e21, {1, {0x1e20 }}},
- { 0x1e23, {1, {0x1e22 }}},
- { 0x1e25, {1, {0x1e24 }}},
- { 0x1e27, {1, {0x1e26 }}},
- { 0x1e29, {1, {0x1e28 }}},
- { 0x1e2b, {1, {0x1e2a }}},
- { 0x1e2d, {1, {0x1e2c }}},
- { 0x1e2f, {1, {0x1e2e }}},
- { 0x1e31, {1, {0x1e30 }}},
- { 0x1e33, {1, {0x1e32 }}},
- { 0x1e35, {1, {0x1e34 }}},
- { 0x1e37, {1, {0x1e36 }}},
- { 0x1e39, {1, {0x1e38 }}},
- { 0x1e3b, {1, {0x1e3a }}},
- { 0x1e3d, {1, {0x1e3c }}},
- { 0x1e3f, {1, {0x1e3e }}},
- { 0x1e41, {1, {0x1e40 }}},
- { 0x1e43, {1, {0x1e42 }}},
- { 0x1e45, {1, {0x1e44 }}},
- { 0x1e47, {1, {0x1e46 }}},
- { 0x1e49, {1, {0x1e48 }}},
- { 0x1e4b, {1, {0x1e4a }}},
- { 0x1e4d, {1, {0x1e4c }}},
- { 0x1e4f, {1, {0x1e4e }}},
- { 0x1e51, {1, {0x1e50 }}},
- { 0x1e53, {1, {0x1e52 }}},
- { 0x1e55, {1, {0x1e54 }}},
- { 0x1e57, {1, {0x1e56 }}},
- { 0x1e59, {1, {0x1e58 }}},
- { 0x1e5b, {1, {0x1e5a }}},
- { 0x1e5d, {1, {0x1e5c }}},
- { 0x1e5f, {1, {0x1e5e }}},
- { 0x1e61, {2, {0x1e60, 0x1e9b }}},
- { 0x1e63, {1, {0x1e62 }}},
- { 0x1e65, {1, {0x1e64 }}},
- { 0x1e67, {1, {0x1e66 }}},
- { 0x1e69, {1, {0x1e68 }}},
- { 0x1e6b, {1, {0x1e6a }}},
- { 0x1e6d, {1, {0x1e6c }}},
- { 0x1e6f, {1, {0x1e6e }}},
- { 0x1e71, {1, {0x1e70 }}},
- { 0x1e73, {1, {0x1e72 }}},
- { 0x1e75, {1, {0x1e74 }}},
- { 0x1e77, {1, {0x1e76 }}},
- { 0x1e79, {1, {0x1e78 }}},
- { 0x1e7b, {1, {0x1e7a }}},
- { 0x1e7d, {1, {0x1e7c }}},
- { 0x1e7f, {1, {0x1e7e }}},
- { 0x1e81, {1, {0x1e80 }}},
- { 0x1e83, {1, {0x1e82 }}},
- { 0x1e85, {1, {0x1e84 }}},
- { 0x1e87, {1, {0x1e86 }}},
- { 0x1e89, {1, {0x1e88 }}},
- { 0x1e8b, {1, {0x1e8a }}},
- { 0x1e8d, {1, {0x1e8c }}},
- { 0x1e8f, {1, {0x1e8e }}},
- { 0x1e91, {1, {0x1e90 }}},
- { 0x1e93, {1, {0x1e92 }}},
- { 0x1e95, {1, {0x1e94 }}},
- { 0x1ea1, {1, {0x1ea0 }}},
- { 0x1ea3, {1, {0x1ea2 }}},
- { 0x1ea5, {1, {0x1ea4 }}},
- { 0x1ea7, {1, {0x1ea6 }}},
- { 0x1ea9, {1, {0x1ea8 }}},
- { 0x1eab, {1, {0x1eaa }}},
- { 0x1ead, {1, {0x1eac }}},
- { 0x1eaf, {1, {0x1eae }}},
- { 0x1eb1, {1, {0x1eb0 }}},
- { 0x1eb3, {1, {0x1eb2 }}},
- { 0x1eb5, {1, {0x1eb4 }}},
- { 0x1eb7, {1, {0x1eb6 }}},
- { 0x1eb9, {1, {0x1eb8 }}},
- { 0x1ebb, {1, {0x1eba }}},
- { 0x1ebd, {1, {0x1ebc }}},
- { 0x1ebf, {1, {0x1ebe }}},
- { 0x1ec1, {1, {0x1ec0 }}},
- { 0x1ec3, {1, {0x1ec2 }}},
- { 0x1ec5, {1, {0x1ec4 }}},
- { 0x1ec7, {1, {0x1ec6 }}},
- { 0x1ec9, {1, {0x1ec8 }}},
- { 0x1ecb, {1, {0x1eca }}},
- { 0x1ecd, {1, {0x1ecc }}},
- { 0x1ecf, {1, {0x1ece }}},
- { 0x1ed1, {1, {0x1ed0 }}},
- { 0x1ed3, {1, {0x1ed2 }}},
- { 0x1ed5, {1, {0x1ed4 }}},
- { 0x1ed7, {1, {0x1ed6 }}},
- { 0x1ed9, {1, {0x1ed8 }}},
- { 0x1edb, {1, {0x1eda }}},
- { 0x1edd, {1, {0x1edc }}},
- { 0x1edf, {1, {0x1ede }}},
- { 0x1ee1, {1, {0x1ee0 }}},
- { 0x1ee3, {1, {0x1ee2 }}},
- { 0x1ee5, {1, {0x1ee4 }}},
- { 0x1ee7, {1, {0x1ee6 }}},
- { 0x1ee9, {1, {0x1ee8 }}},
- { 0x1eeb, {1, {0x1eea }}},
- { 0x1eed, {1, {0x1eec }}},
- { 0x1eef, {1, {0x1eee }}},
- { 0x1ef1, {1, {0x1ef0 }}},
- { 0x1ef3, {1, {0x1ef2 }}},
- { 0x1ef5, {1, {0x1ef4 }}},
- { 0x1ef7, {1, {0x1ef6 }}},
- { 0x1ef9, {1, {0x1ef8 }}},
- { 0x1efb, {1, {0x1efa }}},
- { 0x1efd, {1, {0x1efc }}},
- { 0x1eff, {1, {0x1efe }}},
- { 0x1f00, {1, {0x1f08 }}},
- { 0x1f01, {1, {0x1f09 }}},
- { 0x1f02, {1, {0x1f0a }}},
- { 0x1f03, {1, {0x1f0b }}},
- { 0x1f04, {1, {0x1f0c }}},
- { 0x1f05, {1, {0x1f0d }}},
- { 0x1f06, {1, {0x1f0e }}},
- { 0x1f07, {1, {0x1f0f }}},
- { 0x1f10, {1, {0x1f18 }}},
- { 0x1f11, {1, {0x1f19 }}},
- { 0x1f12, {1, {0x1f1a }}},
- { 0x1f13, {1, {0x1f1b }}},
- { 0x1f14, {1, {0x1f1c }}},
- { 0x1f15, {1, {0x1f1d }}},
- { 0x1f20, {1, {0x1f28 }}},
- { 0x1f21, {1, {0x1f29 }}},
- { 0x1f22, {1, {0x1f2a }}},
- { 0x1f23, {1, {0x1f2b }}},
- { 0x1f24, {1, {0x1f2c }}},
- { 0x1f25, {1, {0x1f2d }}},
- { 0x1f26, {1, {0x1f2e }}},
- { 0x1f27, {1, {0x1f2f }}},
- { 0x1f30, {1, {0x1f38 }}},
- { 0x1f31, {1, {0x1f39 }}},
- { 0x1f32, {1, {0x1f3a }}},
- { 0x1f33, {1, {0x1f3b }}},
- { 0x1f34, {1, {0x1f3c }}},
- { 0x1f35, {1, {0x1f3d }}},
- { 0x1f36, {1, {0x1f3e }}},
- { 0x1f37, {1, {0x1f3f }}},
- { 0x1f40, {1, {0x1f48 }}},
- { 0x1f41, {1, {0x1f49 }}},
- { 0x1f42, {1, {0x1f4a }}},
- { 0x1f43, {1, {0x1f4b }}},
- { 0x1f44, {1, {0x1f4c }}},
- { 0x1f45, {1, {0x1f4d }}},
- { 0x1f51, {1, {0x1f59 }}},
- { 0x1f53, {1, {0x1f5b }}},
- { 0x1f55, {1, {0x1f5d }}},
- { 0x1f57, {1, {0x1f5f }}},
- { 0x1f60, {1, {0x1f68 }}},
- { 0x1f61, {1, {0x1f69 }}},
- { 0x1f62, {1, {0x1f6a }}},
- { 0x1f63, {1, {0x1f6b }}},
- { 0x1f64, {1, {0x1f6c }}},
- { 0x1f65, {1, {0x1f6d }}},
- { 0x1f66, {1, {0x1f6e }}},
- { 0x1f67, {1, {0x1f6f }}},
- { 0x1f70, {1, {0x1fba }}},
- { 0x1f71, {1, {0x1fbb }}},
- { 0x1f72, {1, {0x1fc8 }}},
- { 0x1f73, {1, {0x1fc9 }}},
- { 0x1f74, {1, {0x1fca }}},
- { 0x1f75, {1, {0x1fcb }}},
- { 0x1f76, {1, {0x1fda }}},
- { 0x1f77, {1, {0x1fdb }}},
- { 0x1f78, {1, {0x1ff8 }}},
- { 0x1f79, {1, {0x1ff9 }}},
- { 0x1f7a, {1, {0x1fea }}},
- { 0x1f7b, {1, {0x1feb }}},
- { 0x1f7c, {1, {0x1ffa }}},
- { 0x1f7d, {1, {0x1ffb }}},
- { 0x1fb0, {1, {0x1fb8 }}},
- { 0x1fb1, {1, {0x1fb9 }}},
- { 0x1fd0, {1, {0x1fd8 }}},
- { 0x1fd1, {1, {0x1fd9 }}},
- { 0x1fe0, {1, {0x1fe8 }}},
- { 0x1fe1, {1, {0x1fe9 }}},
- { 0x1fe5, {1, {0x1fec }}},
- { 0x214e, {1, {0x2132 }}},
- { 0x2170, {1, {0x2160 }}},
- { 0x2171, {1, {0x2161 }}},
- { 0x2172, {1, {0x2162 }}},
- { 0x2173, {1, {0x2163 }}},
- { 0x2174, {1, {0x2164 }}},
- { 0x2175, {1, {0x2165 }}},
- { 0x2176, {1, {0x2166 }}},
- { 0x2177, {1, {0x2167 }}},
- { 0x2178, {1, {0x2168 }}},
- { 0x2179, {1, {0x2169 }}},
- { 0x217a, {1, {0x216a }}},
- { 0x217b, {1, {0x216b }}},
- { 0x217c, {1, {0x216c }}},
- { 0x217d, {1, {0x216d }}},
- { 0x217e, {1, {0x216e }}},
- { 0x217f, {1, {0x216f }}},
- { 0x2184, {1, {0x2183 }}},
- { 0x24d0, {1, {0x24b6 }}},
- { 0x24d1, {1, {0x24b7 }}},
- { 0x24d2, {1, {0x24b8 }}},
- { 0x24d3, {1, {0x24b9 }}},
- { 0x24d4, {1, {0x24ba }}},
- { 0x24d5, {1, {0x24bb }}},
- { 0x24d6, {1, {0x24bc }}},
- { 0x24d7, {1, {0x24bd }}},
- { 0x24d8, {1, {0x24be }}},
- { 0x24d9, {1, {0x24bf }}},
- { 0x24da, {1, {0x24c0 }}},
- { 0x24db, {1, {0x24c1 }}},
- { 0x24dc, {1, {0x24c2 }}},
- { 0x24dd, {1, {0x24c3 }}},
- { 0x24de, {1, {0x24c4 }}},
- { 0x24df, {1, {0x24c5 }}},
- { 0x24e0, {1, {0x24c6 }}},
- { 0x24e1, {1, {0x24c7 }}},
- { 0x24e2, {1, {0x24c8 }}},
- { 0x24e3, {1, {0x24c9 }}},
- { 0x24e4, {1, {0x24ca }}},
- { 0x24e5, {1, {0x24cb }}},
- { 0x24e6, {1, {0x24cc }}},
- { 0x24e7, {1, {0x24cd }}},
- { 0x24e8, {1, {0x24ce }}},
- { 0x24e9, {1, {0x24cf }}},
- { 0x2c30, {1, {0x2c00 }}},
- { 0x2c31, {1, {0x2c01 }}},
- { 0x2c32, {1, {0x2c02 }}},
- { 0x2c33, {1, {0x2c03 }}},
- { 0x2c34, {1, {0x2c04 }}},
- { 0x2c35, {1, {0x2c05 }}},
- { 0x2c36, {1, {0x2c06 }}},
- { 0x2c37, {1, {0x2c07 }}},
- { 0x2c38, {1, {0x2c08 }}},
- { 0x2c39, {1, {0x2c09 }}},
- { 0x2c3a, {1, {0x2c0a }}},
- { 0x2c3b, {1, {0x2c0b }}},
- { 0x2c3c, {1, {0x2c0c }}},
- { 0x2c3d, {1, {0x2c0d }}},
- { 0x2c3e, {1, {0x2c0e }}},
- { 0x2c3f, {1, {0x2c0f }}},
- { 0x2c40, {1, {0x2c10 }}},
- { 0x2c41, {1, {0x2c11 }}},
- { 0x2c42, {1, {0x2c12 }}},
- { 0x2c43, {1, {0x2c13 }}},
- { 0x2c44, {1, {0x2c14 }}},
- { 0x2c45, {1, {0x2c15 }}},
- { 0x2c46, {1, {0x2c16 }}},
- { 0x2c47, {1, {0x2c17 }}},
- { 0x2c48, {1, {0x2c18 }}},
- { 0x2c49, {1, {0x2c19 }}},
- { 0x2c4a, {1, {0x2c1a }}},
- { 0x2c4b, {1, {0x2c1b }}},
- { 0x2c4c, {1, {0x2c1c }}},
- { 0x2c4d, {1, {0x2c1d }}},
- { 0x2c4e, {1, {0x2c1e }}},
- { 0x2c4f, {1, {0x2c1f }}},
- { 0x2c50, {1, {0x2c20 }}},
- { 0x2c51, {1, {0x2c21 }}},
- { 0x2c52, {1, {0x2c22 }}},
- { 0x2c53, {1, {0x2c23 }}},
- { 0x2c54, {1, {0x2c24 }}},
- { 0x2c55, {1, {0x2c25 }}},
- { 0x2c56, {1, {0x2c26 }}},
- { 0x2c57, {1, {0x2c27 }}},
- { 0x2c58, {1, {0x2c28 }}},
- { 0x2c59, {1, {0x2c29 }}},
- { 0x2c5a, {1, {0x2c2a }}},
- { 0x2c5b, {1, {0x2c2b }}},
- { 0x2c5c, {1, {0x2c2c }}},
- { 0x2c5d, {1, {0x2c2d }}},
- { 0x2c5e, {1, {0x2c2e }}},
- { 0x2c61, {1, {0x2c60 }}},
- { 0x2c65, {1, {0x023a }}},
- { 0x2c66, {1, {0x023e }}},
- { 0x2c68, {1, {0x2c67 }}},
- { 0x2c6a, {1, {0x2c69 }}},
- { 0x2c6c, {1, {0x2c6b }}},
- { 0x2c73, {1, {0x2c72 }}},
- { 0x2c76, {1, {0x2c75 }}},
- { 0x2c81, {1, {0x2c80 }}},
- { 0x2c83, {1, {0x2c82 }}},
- { 0x2c85, {1, {0x2c84 }}},
- { 0x2c87, {1, {0x2c86 }}},
- { 0x2c89, {1, {0x2c88 }}},
- { 0x2c8b, {1, {0x2c8a }}},
- { 0x2c8d, {1, {0x2c8c }}},
- { 0x2c8f, {1, {0x2c8e }}},
- { 0x2c91, {1, {0x2c90 }}},
- { 0x2c93, {1, {0x2c92 }}},
- { 0x2c95, {1, {0x2c94 }}},
- { 0x2c97, {1, {0x2c96 }}},
- { 0x2c99, {1, {0x2c98 }}},
- { 0x2c9b, {1, {0x2c9a }}},
- { 0x2c9d, {1, {0x2c9c }}},
- { 0x2c9f, {1, {0x2c9e }}},
- { 0x2ca1, {1, {0x2ca0 }}},
- { 0x2ca3, {1, {0x2ca2 }}},
- { 0x2ca5, {1, {0x2ca4 }}},
- { 0x2ca7, {1, {0x2ca6 }}},
- { 0x2ca9, {1, {0x2ca8 }}},
- { 0x2cab, {1, {0x2caa }}},
- { 0x2cad, {1, {0x2cac }}},
- { 0x2caf, {1, {0x2cae }}},
- { 0x2cb1, {1, {0x2cb0 }}},
- { 0x2cb3, {1, {0x2cb2 }}},
- { 0x2cb5, {1, {0x2cb4 }}},
- { 0x2cb7, {1, {0x2cb6 }}},
- { 0x2cb9, {1, {0x2cb8 }}},
- { 0x2cbb, {1, {0x2cba }}},
- { 0x2cbd, {1, {0x2cbc }}},
- { 0x2cbf, {1, {0x2cbe }}},
- { 0x2cc1, {1, {0x2cc0 }}},
- { 0x2cc3, {1, {0x2cc2 }}},
- { 0x2cc5, {1, {0x2cc4 }}},
- { 0x2cc7, {1, {0x2cc6 }}},
- { 0x2cc9, {1, {0x2cc8 }}},
- { 0x2ccb, {1, {0x2cca }}},
- { 0x2ccd, {1, {0x2ccc }}},
- { 0x2ccf, {1, {0x2cce }}},
- { 0x2cd1, {1, {0x2cd0 }}},
- { 0x2cd3, {1, {0x2cd2 }}},
- { 0x2cd5, {1, {0x2cd4 }}},
- { 0x2cd7, {1, {0x2cd6 }}},
- { 0x2cd9, {1, {0x2cd8 }}},
- { 0x2cdb, {1, {0x2cda }}},
- { 0x2cdd, {1, {0x2cdc }}},
- { 0x2cdf, {1, {0x2cde }}},
- { 0x2ce1, {1, {0x2ce0 }}},
- { 0x2ce3, {1, {0x2ce2 }}},
- { 0x2cec, {1, {0x2ceb }}},
- { 0x2cee, {1, {0x2ced }}},
- { 0x2cf3, {1, {0x2cf2 }}},
- { 0x2d00, {1, {0x10a0 }}},
- { 0x2d01, {1, {0x10a1 }}},
- { 0x2d02, {1, {0x10a2 }}},
- { 0x2d03, {1, {0x10a3 }}},
- { 0x2d04, {1, {0x10a4 }}},
- { 0x2d05, {1, {0x10a5 }}},
- { 0x2d06, {1, {0x10a6 }}},
- { 0x2d07, {1, {0x10a7 }}},
- { 0x2d08, {1, {0x10a8 }}},
- { 0x2d09, {1, {0x10a9 }}},
- { 0x2d0a, {1, {0x10aa }}},
- { 0x2d0b, {1, {0x10ab }}},
- { 0x2d0c, {1, {0x10ac }}},
- { 0x2d0d, {1, {0x10ad }}},
- { 0x2d0e, {1, {0x10ae }}},
- { 0x2d0f, {1, {0x10af }}},
- { 0x2d10, {1, {0x10b0 }}},
- { 0x2d11, {1, {0x10b1 }}},
- { 0x2d12, {1, {0x10b2 }}},
- { 0x2d13, {1, {0x10b3 }}},
- { 0x2d14, {1, {0x10b4 }}},
- { 0x2d15, {1, {0x10b5 }}},
- { 0x2d16, {1, {0x10b6 }}},
- { 0x2d17, {1, {0x10b7 }}},
- { 0x2d18, {1, {0x10b8 }}},
- { 0x2d19, {1, {0x10b9 }}},
- { 0x2d1a, {1, {0x10ba }}},
- { 0x2d1b, {1, {0x10bb }}},
- { 0x2d1c, {1, {0x10bc }}},
- { 0x2d1d, {1, {0x10bd }}},
- { 0x2d1e, {1, {0x10be }}},
- { 0x2d1f, {1, {0x10bf }}},
- { 0x2d20, {1, {0x10c0 }}},
- { 0x2d21, {1, {0x10c1 }}},
- { 0x2d22, {1, {0x10c2 }}},
- { 0x2d23, {1, {0x10c3 }}},
- { 0x2d24, {1, {0x10c4 }}},
- { 0x2d25, {1, {0x10c5 }}},
- { 0x2d27, {1, {0x10c7 }}},
- { 0x2d2d, {1, {0x10cd }}},
- { 0xa641, {1, {0xa640 }}},
- { 0xa643, {1, {0xa642 }}},
- { 0xa645, {1, {0xa644 }}},
- { 0xa647, {1, {0xa646 }}},
- { 0xa649, {1, {0xa648 }}},
- { 0xa64b, {1, {0xa64a }}},
- { 0xa64d, {1, {0xa64c }}},
- { 0xa64f, {1, {0xa64e }}},
- { 0xa651, {1, {0xa650 }}},
- { 0xa653, {1, {0xa652 }}},
- { 0xa655, {1, {0xa654 }}},
- { 0xa657, {1, {0xa656 }}},
- { 0xa659, {1, {0xa658 }}},
- { 0xa65b, {1, {0xa65a }}},
- { 0xa65d, {1, {0xa65c }}},
- { 0xa65f, {1, {0xa65e }}},
- { 0xa661, {1, {0xa660 }}},
- { 0xa663, {1, {0xa662 }}},
- { 0xa665, {1, {0xa664 }}},
- { 0xa667, {1, {0xa666 }}},
- { 0xa669, {1, {0xa668 }}},
- { 0xa66b, {1, {0xa66a }}},
- { 0xa66d, {1, {0xa66c }}},
- { 0xa681, {1, {0xa680 }}},
- { 0xa683, {1, {0xa682 }}},
- { 0xa685, {1, {0xa684 }}},
- { 0xa687, {1, {0xa686 }}},
- { 0xa689, {1, {0xa688 }}},
- { 0xa68b, {1, {0xa68a }}},
- { 0xa68d, {1, {0xa68c }}},
- { 0xa68f, {1, {0xa68e }}},
- { 0xa691, {1, {0xa690 }}},
- { 0xa693, {1, {0xa692 }}},
- { 0xa695, {1, {0xa694 }}},
- { 0xa697, {1, {0xa696 }}},
- { 0xa723, {1, {0xa722 }}},
- { 0xa725, {1, {0xa724 }}},
- { 0xa727, {1, {0xa726 }}},
- { 0xa729, {1, {0xa728 }}},
- { 0xa72b, {1, {0xa72a }}},
- { 0xa72d, {1, {0xa72c }}},
- { 0xa72f, {1, {0xa72e }}},
- { 0xa733, {1, {0xa732 }}},
- { 0xa735, {1, {0xa734 }}},
- { 0xa737, {1, {0xa736 }}},
- { 0xa739, {1, {0xa738 }}},
- { 0xa73b, {1, {0xa73a }}},
- { 0xa73d, {1, {0xa73c }}},
- { 0xa73f, {1, {0xa73e }}},
- { 0xa741, {1, {0xa740 }}},
- { 0xa743, {1, {0xa742 }}},
- { 0xa745, {1, {0xa744 }}},
- { 0xa747, {1, {0xa746 }}},
- { 0xa749, {1, {0xa748 }}},
- { 0xa74b, {1, {0xa74a }}},
- { 0xa74d, {1, {0xa74c }}},
- { 0xa74f, {1, {0xa74e }}},
- { 0xa751, {1, {0xa750 }}},
- { 0xa753, {1, {0xa752 }}},
- { 0xa755, {1, {0xa754 }}},
- { 0xa757, {1, {0xa756 }}},
- { 0xa759, {1, {0xa758 }}},
- { 0xa75b, {1, {0xa75a }}},
- { 0xa75d, {1, {0xa75c }}},
- { 0xa75f, {1, {0xa75e }}},
- { 0xa761, {1, {0xa760 }}},
- { 0xa763, {1, {0xa762 }}},
- { 0xa765, {1, {0xa764 }}},
- { 0xa767, {1, {0xa766 }}},
- { 0xa769, {1, {0xa768 }}},
- { 0xa76b, {1, {0xa76a }}},
- { 0xa76d, {1, {0xa76c }}},
- { 0xa76f, {1, {0xa76e }}},
- { 0xa77a, {1, {0xa779 }}},
- { 0xa77c, {1, {0xa77b }}},
- { 0xa77f, {1, {0xa77e }}},
- { 0xa781, {1, {0xa780 }}},
- { 0xa783, {1, {0xa782 }}},
- { 0xa785, {1, {0xa784 }}},
- { 0xa787, {1, {0xa786 }}},
- { 0xa78c, {1, {0xa78b }}},
- { 0xa791, {1, {0xa790 }}},
- { 0xa793, {1, {0xa792 }}},
- { 0xa7a1, {1, {0xa7a0 }}},
- { 0xa7a3, {1, {0xa7a2 }}},
- { 0xa7a5, {1, {0xa7a4 }}},
- { 0xa7a7, {1, {0xa7a6 }}},
- { 0xa7a9, {1, {0xa7a8 }}},
- { 0xff41, {1, {0xff21 }}},
- { 0xff42, {1, {0xff22 }}},
- { 0xff43, {1, {0xff23 }}},
- { 0xff44, {1, {0xff24 }}},
- { 0xff45, {1, {0xff25 }}},
- { 0xff46, {1, {0xff26 }}},
- { 0xff47, {1, {0xff27 }}},
- { 0xff48, {1, {0xff28 }}},
- { 0xff49, {1, {0xff29 }}},
- { 0xff4a, {1, {0xff2a }}},
- { 0xff4b, {1, {0xff2b }}},
- { 0xff4c, {1, {0xff2c }}},
- { 0xff4d, {1, {0xff2d }}},
- { 0xff4e, {1, {0xff2e }}},
- { 0xff4f, {1, {0xff2f }}},
- { 0xff50, {1, {0xff30 }}},
- { 0xff51, {1, {0xff31 }}},
- { 0xff52, {1, {0xff32 }}},
- { 0xff53, {1, {0xff33 }}},
- { 0xff54, {1, {0xff34 }}},
- { 0xff55, {1, {0xff35 }}},
- { 0xff56, {1, {0xff36 }}},
- { 0xff57, {1, {0xff37 }}},
- { 0xff58, {1, {0xff38 }}},
- { 0xff59, {1, {0xff39 }}},
- { 0xff5a, {1, {0xff3a }}},
- { 0x10428, {1, {0x10400 }}},
- { 0x10429, {1, {0x10401 }}},
- { 0x1042a, {1, {0x10402 }}},
- { 0x1042b, {1, {0x10403 }}},
- { 0x1042c, {1, {0x10404 }}},
- { 0x1042d, {1, {0x10405 }}},
- { 0x1042e, {1, {0x10406 }}},
- { 0x1042f, {1, {0x10407 }}},
- { 0x10430, {1, {0x10408 }}},
- { 0x10431, {1, {0x10409 }}},
- { 0x10432, {1, {0x1040a }}},
- { 0x10433, {1, {0x1040b }}},
- { 0x10434, {1, {0x1040c }}},
- { 0x10435, {1, {0x1040d }}},
- { 0x10436, {1, {0x1040e }}},
- { 0x10437, {1, {0x1040f }}},
- { 0x10438, {1, {0x10410 }}},
- { 0x10439, {1, {0x10411 }}},
- { 0x1043a, {1, {0x10412 }}},
- { 0x1043b, {1, {0x10413 }}},
- { 0x1043c, {1, {0x10414 }}},
- { 0x1043d, {1, {0x10415 }}},
- { 0x1043e, {1, {0x10416 }}},
- { 0x1043f, {1, {0x10417 }}},
- { 0x10440, {1, {0x10418 }}},
- { 0x10441, {1, {0x10419 }}},
- { 0x10442, {1, {0x1041a }}},
- { 0x10443, {1, {0x1041b }}},
- { 0x10444, {1, {0x1041c }}},
- { 0x10445, {1, {0x1041d }}},
- { 0x10446, {1, {0x1041e }}},
- { 0x10447, {1, {0x1041f }}},
- { 0x10448, {1, {0x10420 }}},
- { 0x10449, {1, {0x10421 }}},
- { 0x1044a, {1, {0x10422 }}},
- { 0x1044b, {1, {0x10423 }}},
- { 0x1044c, {1, {0x10424 }}},
- { 0x1044d, {1, {0x10425 }}},
- { 0x1044e, {1, {0x10426 }}},
- { 0x1044f, {1, {0x10427 }}},
-};
+/* maximum key range = 1867, duplicates = 0 */
 
-static const CaseUnfold_11_Type CaseUnfold_11_Locale[] = {
- { 0x0069, {1, {0x0049 }}},
-};
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseFold_11_hash(const OnigCodePoint code)
+{
+  static const unsigned short asso_values[] =
+    {
+        12,  212,    5,  217,    6, 1878,  173,   13,    2,   11,
+       123,    5, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878,
+      1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878,
+      1878, 1878, 1878,  220, 1878, 1878, 1878, 1878, 1878, 1878,
+      1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878,  382,
+      1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878, 1878,
+         8,    4,  219,    1, 1878,  343,  607,  274, 1202,  305,
+      1362,  209,  259,  412, 1443,  174,  290,   35,  442,   21,
+      1434,   70, 1472,  105,  362,  193,  591,   51,    3,    7,
+      1414,   86, 1391,  371, 1358,  398, 1456,  149, 1266,  245,
+      1263,  135, 1231,  121, 1096,  446,  932,  323, 1033,  428,
+      1155,  466, 1084,  991, 1160,  474, 1131,  977,  298,  749,
+       990,  491, 1010,  482, 1021,  696,  161,  729,   46,  966,
+      1209,  813, 1043,  616,  848,  917, 1019,  594, 1201,  526,
+      1127,  540,  943,  900,  171,  774, 1283,  760,  626,  935,
+      1025,  554,  288,  955,  103,  788,  423, 1113,   24, 1005,
+        20,  711,    9,  573,  358,  668,    5,  885,  228,  649,
+       102,  628,  612,  515,  800,  871,   77, 1132,   17, 1072,
+         1, 1188,   47, 1276,  244, 1326,  887, 1289,  202,  740,
+       258, 1168,  222
+    };
+  return asso_values[bits_of(code, 2)+65] + asso_values[bits_of(code, 1)] + asso_values[bits_of(code, 0)];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+static const CodePointList3 *
+onigenc_unicode_CaseFold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x41,
+      MAX_CODE_VALUE = 0x118bf,
+      TOTAL_KEYWORDS = 1180,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 11,
+      MAX_HASH_VALUE = 1877
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x10417*/ 1129,
+      -1, -1,
+      /*0x1ff3*/ 794,
+      /*0x10418*/ 1130,
+      /*0x1f97*/ 729,
+      /*0x0417*/ 320,
+      /*0x2c17*/ 873,
+      /*0x1e97*/ 600,
+      /*0x1f98*/ 730,
+      /*0x0418*/ 321,
+      /*0x2c18*/ 874,
+      /*0x1e98*/ 601,
+      /*0x0118*/ 69,
+      /*0x0218*/ 202,
+      /*0x2c98*/ 924,
+      /*0x1e18*/ 536,
+      /*0x0397*/ 248,
+      /*0x1040e*/ 1120,
+      /*0x0498*/ 369,
+      -1,
+      /*0x0398*/ 249,
+      /*0xa798*/ 1053,
+      /*0x1f8e*/ 720,
+      /*0x040e*/ 311,
+      /*0x2c0e*/ 864,
+      /*0x1e8e*/ 595,
+      /*0x010e*/ 64,
+      /*0x020e*/ 197,
+      /*0x2c8e*/ 919,
+      /*0x1e0e*/ 531,
+      /*0x03f1*/ 288,
+      /*0x1040c*/ 1118,
+      /*0x048e*/ 364,
+      -1,
+      /*0x038e*/ 239,
+      /*0xa698*/ 1000,
+      /*0x1f8c*/ 718,
+      /*0x040c*/ 309,
+      /*0x2c0c*/ 862,
+      /*0x1e8c*/ 594,
+      /*0x010c*/ 63,
+      /*0x020c*/ 196,
+      /*0x2c8c*/ 918,
+      /*0x1e0c*/ 530,
+      -1, -1,
+      /*0x048c*/ 363,
+      /*0x10416*/ 1128,
+      /*0x038c*/ 238,
+      /*0xa68e*/ 995,
+      /*0x2c75*/ 909,
+      /*0x013f*/ 87,
+      /*0x1f96*/ 728,
+      /*0x0416*/ 319,
+      /*0x2c16*/ 872,
+      /*0x1e96*/ 599,
+      /*0x0116*/ 68,
+      /*0x0216*/ 201,
+      /*0x2c96*/ 923,
+      /*0x1e16*/ 535,
+      /*0x03f5*/ 290,
+      -1,
+      /*0x0496*/ 368,
+      /*0xa68c*/ 994,
+      /*0x0396*/ 247,
+      /*0xa796*/ 1052,
+      /*0x10410*/ 1122,
+      -1, -1, -1, -1,
+      /*0x1f90*/ 722,
+      /*0x0410*/ 313,
+      /*0x2c10*/ 866,
+      /*0x1e90*/ 596,
+      /*0x0110*/ 65,
+      /*0x0210*/ 198,
+      /*0x2c90*/ 920,
+      /*0x1e10*/ 532,
+      /*0xa696*/ 999,
+      /*0x2c6f*/ 906,
+      /*0x0490*/ 365,
+      /*0x1041a*/ 1132,
+      /*0x0390*/ 241,
+      /*0xa790*/ 1050,
+      -1, -1,
+      /*0x1f9a*/ 732,
+      /*0x041a*/ 323,
+      /*0x2c1a*/ 876,
+      /*0x1e9a*/ 603,
+      /*0x011a*/ 70,
+      /*0x021a*/ 203,
+      /*0x2c9a*/ 925,
+      /*0x1e1a*/ 537,
+      -1, -1,
+      /*0x049a*/ 370,
+      /*0xa690*/ 996,
+      /*0x039a*/ 251,
+      /*0xa79a*/ 1054,
+      /*0x10412*/ 1124,
+      -1,
+      /*0x1fe9*/ 789,
+      /*0x1fd9*/ 780,
+      /*0x2c69*/ 902,
+      /*0x1f92*/ 724,
+      /*0x0412*/ 315,
+      /*0x2c12*/ 868,
+      /*0x1e92*/ 597,
+      /*0x0112*/ 66,
+      /*0x0212*/ 199,
+      /*0x2c92*/ 921,
+      /*0x1e12*/ 533,
+      /*0xa69a*/ 1001,
+      /*0x0059*/ 23,
+      /*0x0492*/ 366,
+      /*0x10426*/ 1144,
+      /*0x0392*/ 243,
+      /*0xa792*/ 1051,
+      -1, -1,
+      /*0x1fa6*/ 744,
+      /*0x0426*/ 335,
+      /*0x2c26*/ 888,
+      /*0x1ea6*/ 609,
+      /*0x0126*/ 76,
+      /*0x0226*/ 209,
+      /*0x2ca6*/ 931,
+      /*0x1e26*/ 543,
+      /*0x0518*/ 433,
+      /*0x10424*/ 1142,
+      /*0x04a6*/ 376,
+      /*0xa692*/ 997,
+      /*0x03a6*/ 262,
+      /*0xa7a6*/ 1060,
+      /*0x1fa4*/ 742,
+      /*0x0424*/ 333,
+      /*0x2c24*/ 886,
+      /*0x1ea4*/ 608,
+      /*0x0124*/ 75,
+      /*0x0224*/ 208,
+      /*0x2ca4*/ 930,
+      /*0x1e24*/ 542,
+      /*0x050e*/ 428,
+      /*0x10420*/ 1138,
+      /*0x04a4*/ 375,
+      -1,
+      /*0x03a4*/ 260,
+      /*0xa7a4*/ 1059,
+      /*0x1fa0*/ 738,
+      /*0x0420*/ 329,
+      /*0x2c20*/ 882,
+      /*0x1ea0*/ 606,
+      /*0x0120*/ 73,
+      /*0x0220*/ 206,
+      /*0x2ca0*/ 928,
+      /*0x1e20*/ 540,
+      /*0x050c*/ 427,
+      -1,
+      /*0x04a0*/ 373,
+      -1,
+      /*0x03a0*/ 257,
+      /*0xa7a0*/ 1057,
+      -1, -1,
+      /*0x013d*/ 86,
+      /*0x023d*/ 218,
+      -1,
+      /*0x053f*/ 459,
+      /*0x1040a*/ 1116,
+      -1, -1, -1,
+      /*0x0516*/ 432,
+      /*0x1f8a*/ 716,
+      /*0x040a*/ 307,
+      /*0x2c0a*/ 860,
+      /*0x1e8a*/ 593,
+      /*0x010a*/ 62,
+      /*0x020a*/ 195,
+      /*0x2c8a*/ 917,
+      /*0x1e0a*/ 529,
+      /*0x004f*/ 13,
+      /*0x03cf*/ 270,
+      /*0x048a*/ 362,
+      -1,
+      /*0x038a*/ 237,
+      -1,
+      /*0x10414*/ 1126,
+      -1, -1, -1,
+      /*0x0510*/ 429,
+      /*0x1f94*/ 726,
+      /*0x0414*/ 317,
+      /*0x2c14*/ 870,
+      /*0x1e94*/ 598,
+      /*0x0114*/ 67,
+      /*0x0214*/ 200,
+      /*0x2c94*/ 922,
+      /*0x1e14*/ 534,
+      /*0xa68a*/ 993,
+      /*0x1ffb*/ 801,
+      /*0x0494*/ 367,
+      /*0x10406*/ 1112,
+      /*0x0394*/ 245,
+      /*0x017b*/ 118,
+      -1,
+      /*0x051a*/ 434,
+      /*0x1f86*/ 712,
+      /*0x0406*/ 303,
+      /*0x2c06*/ 856,
+      /*0x1e86*/ 591,
+      /*0x0106*/ 60,
+      /*0x0206*/ 193,
+      /*0x2c86*/ 915,
+      /*0x1e06*/ 527,
+      -1, -1,
+      /*0x0197*/ 136,
+      /*0xa694*/ 998,
+      /*0x0386*/ 234,
+      /*0xa786*/ 1047,
+      /*0x0198*/ 137,
+      /*0x2c7f*/ 911,
+      /*0x1f18*/ 662,
+      /*0x017f*/ 120,
+      /*0x0512*/ 430,
+      /*0x1fe7*/ 787,
+      -1,
+      /*0x2c67*/ 901,
+      /*0x00df*/ 56,
+      -1,
+      /*0x01f1*/ 181,
+      /*0x03ff*/ 296,
+      /*0x00dd*/ 54,
+      /*0xa686*/ 991,
+      /*0x018e*/ 129,
+      /*0x1f5f*/ 697,
+      /*0x1f0e*/ 660,
+      /*0x10422*/ 1140,
+      -1,
+      /*0x1f5d*/ 696,
+      /*0x0526*/ 440,
+      /*0x1ff7*/ 797,
+      /*0x1fa2*/ 740,
+      /*0x0422*/ 331,
+      /*0x2c22*/ 884,
+      /*0x1ea2*/ 607,
+      /*0x0122*/ 74,
+      /*0x0222*/ 207,
+      /*0x2ca2*/ 929,
+      /*0x1e22*/ 541,
+      /*0x1f0c*/ 658,
+      /*0x10407*/ 1113,
+      /*0x04a2*/ 374,
+      /*0x03f7*/ 291,
+      /*0x0524*/ 439,
+      /*0xa7a2*/ 1058,
+      /*0x1f87*/ 713,
+      /*0x0407*/ 304,
+      /*0x2c07*/ 857,
+      /*0x017d*/ 119,
+      /*0x0587*/ 483,
+      /*0x1f3f*/ 683,
+      /*0x10bf*/ 515,
+      -1,
+      /*0x0196*/ 135,
+      -1,
+      /*0x10402*/ 1108,
+      /*0x03fd*/ 294,
+      /*0x0520*/ 437,
+      -1, -1,
+      /*0x1f82*/ 708,
+      /*0x0402*/ 299,
+      /*0x2c02*/ 852,
+      /*0x1e82*/ 589,
+      /*0x0102*/ 58,
+      /*0x0202*/ 191,
+      /*0x2c82*/ 913,
+      /*0x1e02*/ 525,
+      -1,
+      /*0x053d*/ 457,
+      -1,
+      /*0x1040b*/ 1117,
+      /*0x0190*/ 131,
+      /*0xa782*/ 1045,
+      /*0x1fd7*/ 778,
+      -1,
+      /*0x1f8b*/ 717,
+      /*0x040b*/ 308,
+      /*0x2c0b*/ 861,
+      /*0x054f*/ 475,
+      -1,
+      /*0x1f6f*/ 705,
+      /*0x050a*/ 426,
+      -1, -1,
+      /*0x0057*/ 21,
+      /*0x10404*/ 1110,
+      /*0xa682*/ 989,
+      -1,
+      /*0xa78b*/ 1048,
+      /*0x1f1a*/ 664,
+      /*0x1f84*/ 710,
+      /*0x0404*/ 301,
+      /*0x2c04*/ 854,
+      /*0x1e84*/ 590,
+      /*0x0104*/ 59,
+      /*0x0204*/ 192,
+      /*0x2c84*/ 914,
+      /*0x1e04*/ 526,
+      -1,
+      /*0x00d9*/ 50,
+      /*0x0514*/ 431,
+      -1, -1,
+      /*0xa784*/ 1046,
+      /*0x01d9*/ 169,
+      /*0x1f69*/ 699,
+      /*0x1f59*/ 694,
+      -1,
+      /*0x1faa*/ 748,
+      /*0x042a*/ 339,
+      /*0x2c2a*/ 892,
+      /*0x1eaa*/ 611,
+      /*0x012a*/ 78,
+      /*0x022a*/ 211,
+      /*0x2caa*/ 933,
+      /*0x1e2a*/ 545,
+      /*0x0506*/ 424,
+      /*0xa684*/ 990,
+      /*0x04aa*/ 378,
+      -1,
+      /*0x03aa*/ 266,
+      /*0xa7aa*/ 1062,
+      /*0x01a6*/ 144,
+      /*0x10400*/ 1106,
+      -1,
+      /*0x10a6*/ 490,
+      -1, -1,
+      /*0x1f80*/ 706,
+      /*0x0400*/ 297,
+      /*0x2c00*/ 850,
+      /*0x1e80*/ 588,
+      /*0x0100*/ 57,
+      /*0x0200*/ 190,
+      /*0x2c80*/ 912,
+      /*0x1e00*/ 524,
+      /*0x01a4*/ 143,
+      -1,
+      /*0x0480*/ 361,
+      /*0x10a4*/ 488,
+      -1,
+      /*0xa780*/ 1044,
+      /*0x10413*/ 1125,
+      /*0x1fe3*/ 784,
+      -1,
+      /*0x2c63*/ 899,
+      -1,
+      /*0x1f93*/ 725,
+      /*0x0413*/ 316,
+      /*0x2c13*/ 869,
+      /*0x01a0*/ 141,
+      /*0x1041c*/ 1134,
+      /*0x0522*/ 438,
+      /*0x10a0*/ 484,
+      -1,
+      /*0xa680*/ 988,
+      /*0x1f9c*/ 734,
+      /*0x041c*/ 325,
+      /*0x2c1c*/ 878,
+      /*0x0393*/ 244,
+      /*0x011c*/ 71,
+      /*0x021c*/ 204,
+      /*0x2c9c*/ 926,
+      /*0x1e1c*/ 538,
+      /*0x1f3d*/ 681,
+      /*0x10bd*/ 513,
+      /*0x049c*/ 371,
+      /*0x00cf*/ 41,
+      /*0x039c*/ 253,
+      /*0xa79c*/ 1055,
+      -1, -1,
+      /*0x01cf*/ 164,
+      -1, -1,
+      /*0x018a*/ 127,
+      -1,
+      /*0x1f0a*/ 656,
+      /*0x1041e*/ 1136,
+      /*0x037f*/ 233,
+      -1,
+      /*0x0502*/ 422,
+      -1,
+      /*0x1f9e*/ 736,
+      /*0x041e*/ 327,
+      /*0x2c1e*/ 880,
+      /*0x1e9e*/ 605,
+      /*0x011e*/ 72,
+      /*0x021e*/ 205,
+      /*0x2c9e*/ 927,
+      /*0x1e1e*/ 539,
+      -1,
+      /*0x10408*/ 1114,
+      /*0x049e*/ 372,
+      /*0x0194*/ 134,
+      /*0x039e*/ 255,
+      /*0xa79e*/ 1056,
+      /*0x1f88*/ 714,
+      /*0x0408*/ 305,
+      /*0x2c08*/ 858,
+      /*0x1e88*/ 592,
+      /*0x0108*/ 61,
+      /*0x0208*/ 194,
+      /*0x2c88*/ 916,
+      /*0x1e08*/ 528,
+      /*0x0535*/ 449,
+      /*0x118bf*/ 1177,
+      -1,
+      /*0x1fdb*/ 782,
+      /*0x0388*/ 235,
+      /*0x0186*/ 124,
+      -1,
+      /*0x0504*/ 423,
+      /*0x1fac*/ 750,
+      /*0x042c*/ 341,
+      /*0x2c2c*/ 894,
+      /*0x1eac*/ 612,
+      /*0x012c*/ 79,
+      /*0x022c*/ 212,
+      /*0x2cac*/ 934,
+      /*0x1e2c*/ 546,
+      -1,
+      /*0x1040d*/ 1119,
+      /*0x04ac*/ 379,
+      /*0xa688*/ 992,
+      -1,
+      /*0xa7ac*/ 1064,
+      /*0x1f8d*/ 719,
+      /*0x040d*/ 310,
+      /*0x2c0d*/ 863,
+      /*0x052a*/ 442,
+      /*0x1fa8*/ 746,
+      /*0x0428*/ 337,
+      /*0x2c28*/ 890,
+      /*0x1ea8*/ 610,
+      /*0x0128*/ 77,
+      /*0x0228*/ 210,
+      /*0x2ca8*/ 932,
+      /*0x1e28*/ 544,
+      -1,
+      /*0xa78d*/ 1049,
+      /*0x04a8*/ 377,
+      /*0x24bf*/ 833,
+      /*0x03a8*/ 264,
+      /*0xa7a8*/ 1061,
+      /*0x01f7*/ 185,
+      /*0x01a2*/ 142,
+      -1, -1,
+      /*0x10a2*/ 486,
+      /*0x0500*/ 421,
+      /*0x1fae*/ 752,
+      /*0x042e*/ 343,
+      /*0x2c2e*/ 896,
+      /*0x1eae*/ 613,
+      /*0x012e*/ 80,
+      /*0x022e*/ 213,
+      /*0x2cae*/ 935,
+      /*0x1e2e*/ 547,
+      /*0x1fb2*/ 754,
+      /*0x0187*/ 125,
+      /*0x04ae*/ 380,
+      /*0x1eb2*/ 615,
+      /*0x0132*/ 81,
+      /*0x0232*/ 215,
+      /*0x2cb2*/ 937,
+      /*0x1e32*/ 549,
+      /*0x1fba*/ 761,
+      -1,
+      /*0x04b2*/ 382,
+      /*0x1eba*/ 619,
+      /*0xff26*/ 1085,
+      /*0x023a*/ 216,
+      /*0x2cba*/ 941,
+      /*0x1e3a*/ 553,
+      /*0x0182*/ 122,
+      /*0x1fb8*/ 759,
+      /*0x04ba*/ 386,
+      /*0x051c*/ 435,
+      /*0x1eb8*/ 618,
+      -1,
+      /*0x118a6*/ 1152,
+      /*0x2cb8*/ 940,
+      /*0x1e38*/ 552,
+      -1,
+      /*0xff24*/ 1083,
+      /*0x04b8*/ 385,
+      -1, -1,
+      /*0x01d7*/ 168,
+      /*0xfb17*/ 1079,
+      /*0x018b*/ 128,
+      -1,
+      /*0x1f0b*/ 657,
+      /*0x00b5*/ 25,
+      /*0x118a4*/ 1150,
+      -1, -1, -1,
+      /*0x01b5*/ 153,
+      /*0x1fec*/ 792,
+      /*0x046c*/ 351,
+      /*0x10b5*/ 505,
+      /*0x1eec*/ 644,
+      /*0x016c*/ 110,
+      /*0x051e*/ 436,
+      /*0x0184*/ 123,
+      /*0x1e6c*/ 578,
+      -1,
+      /*0x118a0*/ 1146,
+      /*0x04ec*/ 411,
+      /*0x1fca*/ 772,
+      /*0x03ec*/ 285,
+      -1,
+      /*0x1eca*/ 627,
+      /*0x014a*/ 93,
+      /*0x024a*/ 226,
+      /*0x2cca*/ 949,
+      /*0x1e4a*/ 561,
+      /*0x0508*/ 425,
+      -1,
+      /*0x118bd*/ 1175,
+      /*0x004a*/ 8,
+      -1, -1,
+      /*0x1fcc*/ 774,
+      /*0x1f2a*/ 670,
+      /*0x10aa*/ 494,
+      /*0x1ecc*/ 628,
+      /*0x014c*/ 94,
+      /*0x024c*/ 227,
+      /*0x2ccc*/ 950,
+      /*0x1e4c*/ 562,
+      -1, -1,
+      /*0x052c*/ 443,
+      /*0x004c*/ 10,
+      -1,
+      /*0xfb16*/ 1078,
+      /*0x1fd6*/ 777,
+      /*0xa726*/ 1004,
+      -1,
+      /*0x1ed6*/ 633,
+      /*0x0156*/ 99,
+      -1,
+      /*0x2cd6*/ 955,
+      /*0x1e56*/ 567,
+      -1, -1,
+      /*0x04d6*/ 400,
+      /*0x0056*/ 20,
+      /*0x03d6*/ 274,
+      -1,
+      /*0x0528*/ 441,
+      /*0xa724*/ 1003,
+      -1, -1,
+      /*0x24bd*/ 831,
+      /*0x1fe2*/ 783,
+      /*0x0462*/ 346,
+      /*0x2c62*/ 898,
+      /*0x1ee2*/ 639,
+      /*0x0162*/ 105,
+      /*0x0193*/ 133,
+      /*0x2ce2*/ 961,
+      /*0x1e62*/ 573,
+      -1,
+      /*0x24cf*/ 849,
+      /*0x04e2*/ 406,
+      -1,
+      /*0x03e2*/ 280,
+      /*0x10415*/ 1127,
+      /*0x019c*/ 138,
+      /*0x052e*/ 444,
+      /*0x1f1c*/ 666,
+      -1,
+      /*0x1f95*/ 727,
+      /*0x0415*/ 318,
+      /*0x2c15*/ 871,
+      /*0x1fc8*/ 770,
+      -1,
+      /*0x0532*/ 446,
+      /*0x1ec8*/ 626,
+      -1,
+      /*0x0248*/ 225,
+      /*0x2cc8*/ 948,
+      /*0x1e48*/ 560,
+      /*0x10401*/ 1107,
+      /*0x0395*/ 246,
+      /*0x053a*/ 454,
+      /*0x0048*/ 7,
+      -1,
+      /*0x1f81*/ 707,
+      /*0x0401*/ 298,
+      /*0x2c01*/ 851,
+      /*0xff22*/ 1081,
+      /*0x2165*/ 812,
+      /*0x1feb*/ 791,
+      /*0x0538*/ 452,
+      /*0x2c6b*/ 903,
+      /*0x2161*/ 808,
+      /*0x1fc4*/ 767,
+      -1,
+      /*0x2ceb*/ 962,
+      /*0x1ec4*/ 624,
+      /*0x118a2*/ 1148,
+      /*0x0244*/ 222,
+      /*0x2cc4*/ 946,
+      /*0x1e44*/ 558,
+      -1, -1,
+      /*0x1fd3*/ 776,
+      /*0x0044*/ 3,
+      /*0x1fea*/ 790,
+      /*0x046a*/ 350,
+      /*0x1f08*/ 654,
+      /*0x1eea*/ 643,
+      /*0x016a*/ 109,
+      -1,
+      /*0x00db*/ 52,
+      /*0x1e6a*/ 577,
+      /*0xa77b*/ 1041,
+      /*0x0053*/ 17,
+      /*0x04ea*/ 410,
+      /*0x01db*/ 170,
+      /*0x03ea*/ 284,
+      /*0x1f5b*/ 695,
+      -1, -1,
+      /*0x01ac*/ 147,
+      -1,
+      /*0x1f2c*/ 672,
+      /*0x10ac*/ 496,
+      /*0x054a*/ 470,
+      /*0x1fe8*/ 788,
+      /*0x0468*/ 349,
+      -1,
+      /*0x1ee8*/ 642,
+      /*0x0168*/ 108,
+      -1, -1,
+      /*0x1e68*/ 576,
+      -1, -1,
+      /*0x04e8*/ 409,
+      /*0x1f0d*/ 659,
+      /*0x03e8*/ 283,
+      /*0x054c*/ 472,
+      /*0xff35*/ 1100,
+      /*0x1f28*/ 668,
+      /*0x10a8*/ 492,
+      -1, -1,
+      /*0x1fe4*/ 785,
+      /*0x0464*/ 347,
+      /*0x2c64*/ 900,
+      /*0x1ee4*/ 640,
+      /*0x0164*/ 106,
+      /*0x118b5*/ 1167,
+      -1,
+      /*0x1e64*/ 574,
+      /*0x0556*/ 482,
+      -1,
+      /*0x04e4*/ 407,
+      /*0xa722*/ 1002,
+      /*0x03e4*/ 281,
+      -1,
+      /*0x01ae*/ 148,
+      /*0x216f*/ 822,
+      /*0x1f2e*/ 674,
+      /*0x10ae*/ 498,
+      -1, -1,
+      /*0xff2a*/ 1089,
+      -1,
+      /*0x01b2*/ 151,
+      -1,
+      /*0xa77d*/ 1042,
+      /*0x10b2*/ 502,
+      -1,
+      /*0xfb14*/ 1076,
+      /*0x1fbc*/ 763,
+      -1,
+      /*0x118aa*/ 1156,
+      /*0x1ebc*/ 620,
+      /*0x1f3a*/ 678,
+      /*0x10ba*/ 510,
+      /*0x2cbc*/ 942,
+      /*0x1e3c*/ 554,
+      -1, -1,
+      /*0x04bc*/ 387,
+      /*0x01b8*/ 155,
+      /*0x2169*/ 816,
+      /*0x1f38*/ 676,
+      /*0x10b8*/ 508,
+      /*0xfb06*/ 1074,
+      /*0x0460*/ 345,
+      /*0x2c60*/ 897,
+      /*0x1ee0*/ 638,
+      /*0x0160*/ 104,
+      /*0x0548*/ 468,
+      /*0x2ce0*/ 960,
+      /*0x1e60*/ 572,
+      -1, -1,
+      /*0x04e0*/ 405,
+      -1,
+      /*0x03e0*/ 279,
+      -1, -1, -1,
+      /*0x2126*/ 803,
+      -1,
+      /*0x1fbe*/ 764,
+      -1,
+      /*0x01ec*/ 178,
+      /*0x1ebe*/ 621,
+      /*0x1f6c*/ 702,
+      /*0x023e*/ 219,
+      /*0x2cbe*/ 943,
+      /*0x1e3e*/ 555,
+      /*0x00ca*/ 36,
+      /*0x0544*/ 464,
+      /*0x04be*/ 388,
+      /*0x1ffc*/ 802,
+      /*0x047c*/ 359,
+      /*0x01ca*/ 161,
+      /*0x1efc*/ 652,
+      /*0x1f4a*/ 686,
+      -1, -1,
+      /*0x1e7c*/ 586,
+      /*0x0553*/ 479,
+      /*0x1fb6*/ 757,
+      /*0x04fc*/ 419,
+      /*0x00cc*/ 38,
+      /*0x1eb6*/ 617,
+      /*0x0136*/ 83,
+      -1,
+      /*0x2cb6*/ 939,
+      /*0x1e36*/ 551,
+      /*0xa72a*/ 1006,
+      /*0x1f4c*/ 688,
+      /*0x04b6*/ 384,
+      /*0x1fd2*/ 775,
+      -1, -1,
+      /*0x1ed2*/ 631,
+      /*0x0152*/ 97,
+      /*0x00d6*/ 48,
+      /*0x2cd2*/ 953,
+      /*0x1e52*/ 565,
+      -1, -1,
+      /*0x04d2*/ 398,
+      /*0x0052*/ 16,
+      /*0x1f56*/ 693,
+      -1, -1, -1,
+      /*0xfb02*/ 1070,
+      /*0x1ed0*/ 630,
+      /*0x0150*/ 96,
+      -1,
+      /*0x2cd0*/ 952,
+      /*0x1e50*/ 564,
+      -1, -1,
+      /*0x04d0*/ 397,
+      /*0x0050*/ 14,
+      /*0x03d0*/ 271,
+      -1,
+      /*0x1fda*/ 781,
+      /*0x01e2*/ 173,
+      -1,
+      /*0x1eda*/ 635,
+      /*0x015a*/ 101,
+      /*0xff2c*/ 1091,
+      /*0x2cda*/ 957,
+      /*0x1e5a*/ 569,
+      -1,
+      /*0xa66c*/ 987,
+      /*0x04da*/ 402,
+      /*0x005a*/ 24,
+      /*0x03da*/ 276,
+      -1,
+      /*0x2c6d*/ 904,
+      /*0x118ac*/ 1158,
+      -1,
+      /*0x00c8*/ 34,
+      /*0x2ced*/ 963,
+      /*0xfb04*/ 1072,
+      /*0xa64a*/ 970,
+      -1,
+      /*0x01c8*/ 160,
+      /*0xff28*/ 1087,
+      /*0x1f48*/ 684,
+      /*0x1fc2*/ 765,
+      -1, -1,
+      /*0x1ec2*/ 623,
+      -1,
+      /*0x053c*/ 456,
+      /*0x2cc2*/ 945,
+      /*0x1e42*/ 557,
+      /*0x118a8*/ 1154,
+      /*0xa64c*/ 971,
+      /*0x0181*/ 121,
+      /*0x0042*/ 1,
+      /*0x03c2*/ 269,
+      -1,
+      /*0x00c4*/ 30,
+      -1, -1,
+      /*0x1f6b*/ 701,
+      /*0xff2e*/ 1093,
+      /*0x01c4*/ 157,
+      -1,
+      /*0x2167*/ 814,
+      /*0x10c4*/ 520,
+      /*0xa656*/ 976,
+      /*0x00d3*/ 45,
+      -1,
+      /*0xff32*/ 1097,
+      -1,
+      /*0x118ae*/ 1160,
+      /*0x01d3*/ 166,
+      -1,
+      /*0x01ea*/ 177,
+      /*0xfb00*/ 1068,
+      /*0x1f6a*/ 700,
+      /*0xff3a*/ 1105,
+      -1,
+      /*0x118b2*/ 1164,
+      -1,
+      /*0x053e*/ 458,
+      /*0x0145*/ 90,
+      /*0x0245*/ 223,
+      -1,
+      /*0xa662*/ 982,
+      /*0xff38*/ 1103,
+      /*0x118ba*/ 1172,
+      /*0x04c5*/ 392,
+      /*0x0045*/ 4,
+      -1, -1,
+      /*0xa72c*/ 1007,
+      -1,
+      /*0xfb13*/ 1075,
+      /*0x01e8*/ 176,
+      /*0x118b8*/ 1170,
+      /*0x1f68*/ 698,
+      -1, -1, -1,
+      /*0x0536*/ 450,
+      /*0x046e*/ 352,
+      /*0x2c6e*/ 905,
+      /*0x1eee*/ 645,
+      /*0x016e*/ 111,
+      /*0xa648*/ 969,
+      -1,
+      /*0x1e6e*/ 579,
+      -1,
+      /*0xa728*/ 1005,
+      /*0x04ee*/ 412,
+      /*0x0552*/ 478,
+      /*0x03ee*/ 286,
+      /*0x01e4*/ 174,
+      /*0x1fe6*/ 786,
+      /*0x0466*/ 348,
+      /*0x1ff9*/ 799,
+      /*0x1ee6*/ 641,
+      /*0x0166*/ 107,
+      -1,
+      /*0x0179*/ 117,
+      /*0x1e66*/ 575,
+      /*0x24ba*/ 828,
+      -1,
+      /*0x04e6*/ 408,
+      /*0x0550*/ 476,
+      /*0x03e6*/ 282,
+      /*0xa644*/ 967,
+      /*0x03f9*/ 292,
+      /*0xa72e*/ 1008,
+      -1,
+      /*0x24b8*/ 826,
+      /*0x1ece*/ 629,
+      /*0x014e*/ 95,
+      /*0x024e*/ 228,
+      /*0x2cce*/ 951,
+      /*0x1e4e*/ 563,
+      /*0xa732*/ 1009,
+      -1,
+      /*0xa66a*/ 986,
+      /*0x004e*/ 12,
+      /*0x01bc*/ 156,
+      -1,
+      /*0x1f3c*/ 680,
+      /*0x10bc*/ 512,
+      /*0xa73a*/ 1013,
+      /*0x1fc6*/ 768,
+      -1, -1,
+      /*0x1ec6*/ 625,
+      -1,
+      /*0x0246*/ 224,
+      /*0x2cc6*/ 947,
+      /*0x1e46*/ 559,
+      /*0xa738*/ 1012,
+      -1,
+      /*0x01e0*/ 172,
+      /*0x0046*/ 5,
+      /*0x212a*/ 804,
+      -1,
+      /*0xa668*/ 985,
+      /*0x1fa9*/ 747,
+      /*0x0429*/ 338,
+      /*0x2c29*/ 891,
+      /*0x0542*/ 462,
+      -1,
+      /*0x24ca*/ 844,
+      /*0x1ed4*/ 632,
+      /*0x0154*/ 98,
+      -1,
+      /*0x2cd4*/ 954,
+      /*0x1e54*/ 566,
+      -1,
+      /*0x03a9*/ 265,
+      /*0x04d4*/ 399,
+      /*0x0054*/ 18,
+      /*0x1f3e*/ 682,
+      /*0x10be*/ 514,
+      /*0xa76c*/ 1038,
+      /*0xa664*/ 983,
+      /*0x24cc*/ 846,
+      -1,
+      /*0x04cd*/ 396,
+      /*0x004d*/ 11,
+      /*0x1fd8*/ 779,
+      /*0x01fc*/ 188,
+      -1,
+      /*0x1ed8*/ 634,
+      /*0x0158*/ 100,
+      /*0xa74a*/ 1021,
+      /*0x2cd8*/ 956,
+      /*0x1e58*/ 568,
+      -1,
+      /*0x2163*/ 810,
+      /*0x04d8*/ 401,
+      /*0x0058*/ 22,
+      /*0x03d8*/ 275,
+      /*0x10b6*/ 506,
+      /*0x1ec0*/ 622,
+      /*0x0545*/ 465,
+      /*0x00d2*/ 44,
+      /*0x2cc0*/ 944,
+      /*0x1e40*/ 556,
+      /*0xa74c*/ 1022,
+      -1,
+      /*0x04c0*/ 389,
+      /*0x1fb4*/ 756,
+      /*0x1f52*/ 691,
+      -1,
+      /*0x1eb4*/ 616,
+      /*0x0134*/ 82,
+      -1,
+      /*0x2cb4*/ 938,
+      /*0x1e34*/ 550,
+      /*0x00d0*/ 42,
+      -1,
+      /*0x04b4*/ 383,
+      /*0xa756*/ 1027,
+      -1,
+      /*0x1fb7*/ 758,
+      -1,
+      /*0x1f50*/ 690,
+      /*0xa660*/ 981,
+      /*0x1eb0*/ 614,
+      /*0x0130*/ 1179,
+      /*0x0230*/ 214,
+      /*0x2cb0*/ 936,
+      /*0x1e30*/ 548,
+      /*0x00da*/ 51,
+      -1,
+      /*0x04b0*/ 381,
+      -1,
+      /*0x03b0*/ 268,
+      /*0xa7b0*/ 1066,
+      /*0x24c8*/ 842,
+      -1,
+      /*0xa762*/ 1033,
+      /*0x1ede*/ 637,
+      /*0x015e*/ 103,
+      /*0x1fb9*/ 760,
+      /*0x2cde*/ 959,
+      /*0x1e5e*/ 571,
+      -1,
+      /*0x0139*/ 84,
+      /*0x04de*/ 404,
+      -1,
+      /*0x03de*/ 278,
+      /*0x1f6d*/ 703,
+      /*0x1fc7*/ 769,
+      /*0x0345*/ 229,
+      /*0x1fbb*/ 762,
+      /*0x054e*/ 474,
+      /*0x0147*/ 91,
+      /*0x00c2*/ 28,
+      /*0x013b*/ 85,
+      /*0x023b*/ 217,
+      /*0x24c4*/ 838,
+      /*0xa748*/ 1020,
+      /*0x04c7*/ 393,
+      /*0x0047*/ 6,
+      -1,
+      /*0x10c2*/ 518,
+      /*0x1fab*/ 749,
+      /*0x042b*/ 340,
+      /*0x2c2b*/ 893,
+      /*0x0055*/ 19,
+      /*0x03d5*/ 273,
+      -1,
+      /*0x0546*/ 466,
+      -1, -1,
+      /*0xa652*/ 974,
+      /*0x1fc3*/ 766,
+      -1,
+      /*0x03ab*/ 267,
+      /*0xa7ab*/ 1063,
+      /*0x0143*/ 89,
+      /*0x0243*/ 221,
+      -1,
+      /*0xa744*/ 1018,
+      -1, -1,
+      /*0x04c3*/ 391,
+      /*0x0043*/ 2,
+      -1,
+      /*0xa650*/ 973,
+      /*0x0554*/ 480,
+      -1,
+      /*0x00c5*/ 31,
+      -1, -1,
+      /*0xa76a*/ 1037,
+      -1,
+      /*0x01c5*/ 158,
+      /*0x054d*/ 473,
+      -1,
+      /*0x10c5*/ 521,
+      -1, -1,
+      /*0xa65a*/ 978,
+      /*0x118bc*/ 1174,
+      /*0x1ff2*/ 793,
+      /*0x0472*/ 354,
+      /*0x2c72*/ 908,
+      /*0x1ef2*/ 647,
+      /*0x0172*/ 113,
+      -1,
+      /*0x2cf2*/ 964,
+      /*0x1e72*/ 581,
+      /*0x2132*/ 806,
+      -1,
+      /*0x04f2*/ 414,
+      /*0xa768*/ 1036,
+      /*0x1faf*/ 753,
+      /*0x042f*/ 344,
+      -1,
+      /*0x01ee*/ 179,
+      /*0x0540*/ 460,
+      /*0x1f6e*/ 704,
+      -1,
+      /*0x10427*/ 1145,
+      -1,
+      /*0xfb15*/ 1077,
+      -1,
+      /*0xa642*/ 966,
+      /*0x1fa7*/ 745,
+      /*0x0427*/ 336,
+      /*0x2c27*/ 889,
+      /*0x0534*/ 448,
+      -1,
+      /*0x01e6*/ 175,
+      /*0xa764*/ 1034,
+      -1,
+      /*0x118be*/ 1176,
+      -1, -1,
+      /*0x24bc*/ 830,
+      /*0x03a7*/ 263,
+      /*0xfb01*/ 1069,
+      -1,
+      /*0x00ce*/ 40,
+      /*0x0537*/ 451,
+      -1,
+      /*0xff36*/ 1101,
+      -1,
+      /*0x1edc*/ 636,
+      /*0x015c*/ 102,
+      -1,
+      /*0x2cdc*/ 958,
+      /*0x1e5c*/ 570,
+      /*0x216c*/ 819,
+      -1,
+      /*0x04dc*/ 403,
+      /*0x118b6*/ 1168,
+      /*0x03dc*/ 277,
+      -1,
+      /*0x1fcb*/ 773,
+      /*0x00c6*/ 32,
+      -1,
+      /*0xa73c*/ 1014,
+      /*0x1fb3*/ 755,
+      /*0x0539*/ 453,
+      /*0x0470*/ 353,
+      /*0x2c70*/ 907,
+      /*0x1ef0*/ 646,
+      /*0x0170*/ 112,
+      /*0x04cb*/ 395,
+      /*0x004b*/ 9,
+      /*0x1e70*/ 580,
+      /*0x24be*/ 832,
+      /*0x0547*/ 467,
+      /*0x04f0*/ 413,
+      /*0x053b*/ 455,
+      /*0x03f0*/ 287,
+      /*0xa760*/ 1032,
+      /*0x00d4*/ 46,
+      /*0x0555*/ 481,
+      /*0x01a9*/ 146,
+      -1,
+      /*0x1f29*/ 669,
+      /*0x10a9*/ 493,
+      -1,
+      /*0x1f54*/ 692,
+      /*0x00cd*/ 39,
+      /*0x1fad*/ 751,
+      /*0x042d*/ 342,
+      /*0x2c2d*/ 895,
+      -1,
+      /*0x01cd*/ 163,
+      /*0x24b6*/ 824,
+      /*0x1f4d*/ 689,
+      /*0x10cd*/ 523,
+      /*0xa73e*/ 1015,
+      -1,
+      /*0x0543*/ 463,
+      /*0x00d8*/ 49,
+      /*0xa666*/ 984,
+      /*0xa7ad*/ 1065,
+      /*0x047e*/ 360,
+      /*0x2c7e*/ 910,
+      /*0x1efe*/ 653,
+      -1,
+      /*0xa7b1*/ 1067,
+      -1,
+      /*0x1e7e*/ 587,
+      -1,
+      /*0x00c0*/ 26,
+      /*0x04fe*/ 420,
+      /*0x2162*/ 809,
+      /*0x03fe*/ 295,
+      -1,
+      /*0xa64e*/ 972,
+      /*0xa736*/ 1011,
+      -1,
+      /*0x10c0*/ 516,
+      -1, -1,
+      /*0x1ff4*/ 795,
+      /*0x0474*/ 355,
+      -1,
+      /*0x1ef4*/ 648,
+      /*0x0174*/ 114,
+      -1,
+      /*0xa752*/ 1025,
+      /*0x1e74*/ 582,
+      /*0x10b4*/ 504,
+      /*0x10403*/ 1109,
+      /*0x04f4*/ 415,
+      /*0xa646*/ 968,
+      /*0x03f4*/ 289,
+      /*0x1fc9*/ 771,
+      /*0x1f83*/ 709,
+      /*0x0403*/ 300,
+      /*0x2c03*/ 853,
+      /*0x0149*/ 92,
+      /*0x01b7*/ 154,
+      -1,
+      /*0xa750*/ 1024,
+      /*0x10b7*/ 507,
+      /*0x10b0*/ 500,
+      /*0x04c9*/ 394,
+      /*0x0049*/ 1178,
+      /*0x0141*/ 88,
+      /*0x0241*/ 220,
+      -1,
+      /*0x00de*/ 55,
+      /*0xa654*/ 975,
+      /*0x216b*/ 818,
+      /*0x04c1*/ 390,
+      /*0x0041*/ 0,
+      /*0x01de*/ 171,
+      /*0xa75a*/ 1029,
+      -1,
+      /*0x24c2*/ 836,
+      -1,
+      /*0x10425*/ 1143,
+      -1,
+      /*0x1f39*/ 677,
+      /*0x10b9*/ 509,
+      /*0x00c7*/ 33,
+      /*0x1fa5*/ 743,
+      /*0x0425*/ 334,
+      /*0x2c25*/ 887,
+      /*0x216a*/ 817,
+      /*0x01c7*/ 159,
+      /*0x00d5*/ 47,
+      /*0xa658*/ 977,
+      /*0x10c7*/ 522,
+      /*0x1f3b*/ 679,
+      /*0x10bb*/ 511,
+      /*0x01d5*/ 167,
+      -1,
+      /*0x03a5*/ 261,
+      /*0x0372*/ 231,
+      -1, -1,
+      /*0xa742*/ 1017,
+      /*0xa640*/ 965,
+      /*0x054b*/ 471,
+      -1,
+      /*0x1f2b*/ 671,
+      /*0x10ab*/ 495,
+      /*0x0533*/ 447,
+      /*0x00c3*/ 29,
+      /*0x2168*/ 815,
+      -1, -1,
+      /*0x10423*/ 1141,
+      /*0x24c5*/ 839,
+      -1,
+      /*0x10421*/ 1139,
+      /*0x10c3*/ 519,
+      /*0x1fa3*/ 741,
+      /*0x0423*/ 332,
+      /*0x2c23*/ 885,
+      /*0x1fa1*/ 739,
+      /*0x0421*/ 330,
+      /*0x2c21*/ 883,
+      -1, -1, -1, -1, -1,
+      /*0x2164*/ 811,
+      /*0x03a3*/ 259,
+      /*0x1ff6*/ 796,
+      /*0x0476*/ 356,
+      /*0x03a1*/ 258,
+      /*0x1ef6*/ 649,
+      /*0x0176*/ 115,
+      -1,
+      /*0x0531*/ 445,
+      /*0x1e76*/ 583,
+      -1, -1,
+      /*0x04f6*/ 416,
+      /*0xa65e*/ 980,
+      /*0x01f2*/ 182,
+      /*0x1ffa*/ 800,
+      /*0x047a*/ 358,
+      -1,
+      /*0x1efa*/ 651,
+      -1,
+      /*0x0051*/ 15,
+      /*0x03d1*/ 272,
+      /*0x1e7a*/ 585,
+      /*0xff29*/ 1088,
+      -1,
+      /*0x04fa*/ 418,
+      /*0x01af*/ 149,
+      /*0x03fa*/ 293,
+      /*0x1f2f*/ 675,
+      /*0x10af*/ 499,
+      /*0x0370*/ 230,
+      /*0xa76e*/ 1039,
+      -1,
+      /*0x118a9*/ 1155,
+      -1, -1, -1,
+      /*0x24ce*/ 848,
+      /*0x01a7*/ 145,
+      -1, -1,
+      /*0x10a7*/ 491,
+      -1,
+      /*0x2160*/ 807,
+      -1,
+      /*0xa766*/ 1035,
+      -1,
+      /*0xa779*/ 1040,
+      -1,
+      /*0x0549*/ 469,
+      /*0x00dc*/ 53,
+      -1,
+      /*0x1ff8*/ 798,
+      /*0x0478*/ 357,
+      /*0x24c6*/ 840,
+      /*0x1ef8*/ 650,
+      /*0x0178*/ 116,
+      /*0x0541*/ 461,
+      -1,
+      /*0x1e78*/ 584,
+      /*0xa74e*/ 1023,
+      -1,
+      /*0x04f8*/ 417,
+      -1,
+      /*0x00cb*/ 37,
+      -1, -1, -1,
+      /*0xff34*/ 1099,
+      /*0x01cb*/ 162,
+      -1,
+      /*0x1f4b*/ 687,
+      -1,
+      /*0x01b3*/ 152,
+      /*0x01f0*/ 180,
+      -1,
+      /*0x10b3*/ 503,
+      /*0xa746*/ 1019,
+      /*0x118b4*/ 1166,
+      /*0x1041d*/ 1135,
+      /*0x24cd*/ 847,
+      /*0xff37*/ 1102,
+      /*0xff30*/ 1095,
+      /*0x10405*/ 1111,
+      /*0x1f9d*/ 735,
+      /*0x041d*/ 326,
+      /*0x2c1d*/ 879,
+      -1,
+      /*0x1f85*/ 711,
+      /*0x0405*/ 302,
+      /*0x2c05*/ 855,
+      /*0x118b7*/ 1169,
+      /*0x118b0*/ 1162,
+      -1, -1,
+      /*0xa754*/ 1026,
+      /*0x039d*/ 254,
+      -1, -1,
+      /*0x1f2d*/ 673,
+      /*0x10ad*/ 497,
+      /*0xff39*/ 1104,
+      /*0x01b1*/ 150,
+      /*0x24c0*/ 834,
+      -1,
+      /*0x10b1*/ 501,
+      -1, -1, -1, -1,
+      /*0x01fe*/ 189,
+      /*0x118b9*/ 1171,
+      /*0x1041b*/ 1133,
+      -1, -1,
+      /*0xa758*/ 1028,
+      -1,
+      /*0x1f9b*/ 733,
+      /*0x041b*/ 324,
+      /*0x2c1b*/ 877,
+      /*0x1e9b*/ 604,
+      /*0xa65c*/ 979,
+      /*0x118bb*/ 1173,
+      -1,
+      /*0xff2b*/ 1090,
+      -1,
+      /*0xa740*/ 1016,
+      /*0x24b7*/ 825,
+      -1,
+      /*0x039b*/ 252,
+      /*0x01f4*/ 183,
+      /*0x0551*/ 477,
+      /*0x216d*/ 820,
+      -1,
+      /*0x118ab*/ 1157,
+      /*0x10419*/ 1131,
+      -1,
+      /*0xa734*/ 1010,
+      /*0x00c9*/ 35,
+      -1,
+      /*0x1f99*/ 731,
+      /*0x0419*/ 322,
+      /*0x2c19*/ 875,
+      /*0x1e99*/ 602,
+      -1,
+      /*0x1f49*/ 685,
+      /*0x00c1*/ 27,
+      /*0x24b9*/ 827,
+      -1, -1, -1, -1,
+      /*0x0399*/ 250,
+      -1,
+      /*0x10c1*/ 517,
+      /*0x1040f*/ 1121,
+      /*0x24c7*/ 841,
+      -1,
+      /*0x24bb*/ 829,
+      -1,
+      /*0x1f8f*/ 721,
+      /*0x040f*/ 312,
+      /*0x2c0f*/ 865,
+      -1,
+      /*0x10409*/ 1115,
+      /*0xa75e*/ 1031,
+      -1, -1, -1,
+      /*0x1f89*/ 715,
+      /*0x0409*/ 306,
+      /*0x2c09*/ 859,
+      /*0x038f*/ 240,
+      -1,
+      /*0x0376*/ 232,
+      /*0xff2f*/ 1094,
+      /*0x10a5*/ 489,
+      /*0x1041f*/ 1137,
+      -1, -1,
+      /*0x24c3*/ 837,
+      /*0x0389*/ 236,
+      /*0x1f9f*/ 737,
+      /*0x041f*/ 328,
+      /*0x2c1f*/ 881,
+      /*0x118af*/ 1161,
+      -1,
+      /*0xff27*/ 1086,
+      -1, -1, -1, -1, -1,
+      /*0x10411*/ 1123,
+      /*0x039f*/ 256,
+      -1, -1,
+      /*0x118a7*/ 1153,
+      /*0x1f91*/ 723,
+      /*0x0411*/ 314,
+      /*0x2c11*/ 867,
+      /*0x2183*/ 823,
+      -1,
+      /*0x216e*/ 821,
+      -1, -1, -1, -1,
+      /*0x10a3*/ 487,
+      -1,
+      /*0x0391*/ 242,
+      /*0x10a1*/ 485,
+      -1, -1, -1, -1, -1,
+      /*0x2166*/ 813,
+      /*0x01f6*/ 184,
+      -1,
+      /*0x00d1*/ 43,
+      -1,
+      /*0xff33*/ 1098,
+      -1, -1,
+      /*0x01d1*/ 165,
+      -1, -1, -1, -1, -1,
+      /*0x01fa*/ 187,
+      /*0x118b3*/ 1165,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff2d*/ 1092,
+      -1, -1, -1, -1,
+      /*0xff31*/ 1096,
+      -1, -1, -1, -1,
+      /*0x118ad*/ 1159,
+      -1, -1, -1, -1,
+      /*0x118b1*/ 1163,
+      -1, -1,
+      /*0x24cb*/ 845,
+      -1, -1, -1,
+      /*0x01f8*/ 186,
+      -1, -1, -1, -1,
+      /*0xa75c*/ 1030,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x019d*/ 139,
+      -1,
+      /*0x1f1d*/ 667,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff25*/ 1084,
+      -1, -1, -1, -1, -1,
+      /*0xa77e*/ 1043,
+      -1, -1, -1,
+      /*0x118a5*/ 1151,
+      -1, -1,
+      /*0x1f1b*/ 665,
+      -1, -1,
+      /*0x24c9*/ 843,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x24c1*/ 835,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff23*/ 1082,
+      -1, -1,
+      /*0xff21*/ 1080,
+      /*0x1f19*/ 663,
+      -1, -1, -1, -1, -1,
+      /*0x118a3*/ 1149,
+      /*0x212b*/ 805,
+      -1,
+      /*0x118a1*/ 1147,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x018f*/ 130,
+      -1,
+      /*0x1f0f*/ 661,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0189*/ 126,
+      -1,
+      /*0x1f09*/ 655,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x019f*/ 140,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x0191*/ 132,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xfb03*/ 1071,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0xfb05*/ 1073
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register int key = onigenc_unicode_CaseFold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code1_equal(code, CaseFold_11_Table[s].from))
+            return &CaseFold_11_Table[s].to;
+        }
+    }
+  return 0;
+}
 
-static const CaseUnfold_12_Type CaseUnfold_12[] = {
- { {0x0061, 0x02be}, {1, {0x1e9a }}},
- { {0x0066, 0x0066}, {1, {0xfb00 }}},
- { {0x0066, 0x0069}, {1, {0xfb01 }}},
- { {0x0066, 0x006c}, {1, {0xfb02 }}},
- { {0x0068, 0x0331}, {1, {0x1e96 }}},
- { {0x006a, 0x030c}, {1, {0x01f0 }}},
- { {0x0073, 0x0073}, {2, {0x00df, 0x1e9e }}},
- { {0x0073, 0x0074}, {2, {0xfb05, 0xfb06 }}},
- { {0x0074, 0x0308}, {1, {0x1e97 }}},
- { {0x0077, 0x030a}, {1, {0x1e98 }}},
- { {0x0079, 0x030a}, {1, {0x1e99 }}},
- { {0x02bc, 0x006e}, {1, {0x0149 }}},
- { {0x03ac, 0x03b9}, {1, {0x1fb4 }}},
- { {0x03ae, 0x03b9}, {1, {0x1fc4 }}},
- { {0x03b1, 0x0342}, {1, {0x1fb6 }}},
- { {0x03b1, 0x03b9}, {2, {0x1fb3, 0x1fbc }}},
- { {0x03b7, 0x0342}, {1, {0x1fc6 }}},
- { {0x03b7, 0x03b9}, {2, {0x1fc3, 0x1fcc }}},
- { {0x03b9, 0x0342}, {1, {0x1fd6 }}},
- { {0x03c1, 0x0313}, {1, {0x1fe4 }}},
- { {0x03c5, 0x0313}, {1, {0x1f50 }}},
- { {0x03c5, 0x0342}, {1, {0x1fe6 }}},
- { {0x03c9, 0x0342}, {1, {0x1ff6 }}},
- { {0x03c9, 0x03b9}, {2, {0x1ff3, 0x1ffc }}},
- { {0x03ce, 0x03b9}, {1, {0x1ff4 }}},
- { {0x0565, 0x0582}, {1, {0x0587 }}},
- { {0x0574, 0x0565}, {1, {0xfb14 }}},
- { {0x0574, 0x056b}, {1, {0xfb15 }}},
- { {0x0574, 0x056d}, {1, {0xfb17 }}},
- { {0x0574, 0x0576}, {1, {0xfb13 }}},
- { {0x057e, 0x0576}, {1, {0xfb16 }}},
- { {0x1f00, 0x03b9}, {2, {0x1f80, 0x1f88 }}},
- { {0x1f01, 0x03b9}, {2, {0x1f81, 0x1f89 }}},
- { {0x1f02, 0x03b9}, {2, {0x1f82, 0x1f8a }}},
- { {0x1f03, 0x03b9}, {2, {0x1f83, 0x1f8b }}},
- { {0x1f04, 0x03b9}, {2, {0x1f84, 0x1f8c }}},
- { {0x1f05, 0x03b9}, {2, {0x1f85, 0x1f8d }}},
- { {0x1f06, 0x03b9}, {2, {0x1f86, 0x1f8e }}},
- { {0x1f07, 0x03b9}, {2, {0x1f87, 0x1f8f }}},
- { {0x1f20, 0x03b9}, {2, {0x1f90, 0x1f98 }}},
- { {0x1f21, 0x03b9}, {2, {0x1f91, 0x1f99 }}},
- { {0x1f22, 0x03b9}, {2, {0x1f92, 0x1f9a }}},
- { {0x1f23, 0x03b9}, {2, {0x1f93, 0x1f9b }}},
- { {0x1f24, 0x03b9}, {2, {0x1f94, 0x1f9c }}},
- { {0x1f25, 0x03b9}, {2, {0x1f95, 0x1f9d }}},
- { {0x1f26, 0x03b9}, {2, {0x1f96, 0x1f9e }}},
- { {0x1f27, 0x03b9}, {2, {0x1f97, 0x1f9f }}},
- { {0x1f60, 0x03b9}, {2, {0x1fa0, 0x1fa8 }}},
- { {0x1f61, 0x03b9}, {2, {0x1fa1, 0x1fa9 }}},
- { {0x1f62, 0x03b9}, {2, {0x1fa2, 0x1faa }}},
- { {0x1f63, 0x03b9}, {2, {0x1fa3, 0x1fab }}},
- { {0x1f64, 0x03b9}, {2, {0x1fa4, 0x1fac }}},
- { {0x1f65, 0x03b9}, {2, {0x1fa5, 0x1fad }}},
- { {0x1f66, 0x03b9}, {2, {0x1fa6, 0x1fae }}},
- { {0x1f67, 0x03b9}, {2, {0x1fa7, 0x1faf }}},
- { {0x1f70, 0x03b9}, {1, {0x1fb2 }}},
- { {0x1f74, 0x03b9}, {1, {0x1fc2 }}},
- { {0x1f7c, 0x03b9}, {1, {0x1ff2 }}},
+static const CaseUnfold_11_Type CaseUnfold_11_Table[] = {
+#define CaseUnfold_11 (*(CaseUnfold_11_Type (*)[1054])(CaseUnfold_11_Table+0))
+  {0x0061, {1, {0x0041}}},
+  {0x0062, {1, {0x0042}}},
+  {0x0063, {1, {0x0043}}},
+  {0x0064, {1, {0x0044}}},
+  {0x0065, {1, {0x0045}}},
+  {0x0066, {1, {0x0046}}},
+  {0x0067, {1, {0x0047}}},
+  {0x0068, {1, {0x0048}}},
+  {0x006a, {1, {0x004a}}},
+  {0x006b, {2, {0x004b, 0x212a}}},
+  {0x006c, {1, {0x004c}}},
+  {0x006d, {1, {0x004d}}},
+  {0x006e, {1, {0x004e}}},
+  {0x006f, {1, {0x004f}}},
+  {0x0070, {1, {0x0050}}},
+  {0x0071, {1, {0x0051}}},
+  {0x0072, {1, {0x0052}}},
+  {0x0073, {2, {0x0053, 0x017f}}},
+  {0x0074, {1, {0x0054}}},
+  {0x0075, {1, {0x0055}}},
+  {0x0076, {1, {0x0056}}},
+  {0x0077, {1, {0x0057}}},
+  {0x0078, {1, {0x0058}}},
+  {0x0079, {1, {0x0059}}},
+  {0x007a, {1, {0x005a}}},
+  {0x00e0, {1, {0x00c0}}},
+  {0x00e1, {1, {0x00c1}}},
+  {0x00e2, {1, {0x00c2}}},
+  {0x00e3, {1, {0x00c3}}},
+  {0x00e4, {1, {0x00c4}}},
+  {0x00e5, {2, {0x00c5, 0x212b}}},
+  {0x00e6, {1, {0x00c6}}},
+  {0x00e7, {1, {0x00c7}}},
+  {0x00e8, {1, {0x00c8}}},
+  {0x00e9, {1, {0x00c9}}},
+  {0x00ea, {1, {0x00ca}}},
+  {0x00eb, {1, {0x00cb}}},
+  {0x00ec, {1, {0x00cc}}},
+  {0x00ed, {1, {0x00cd}}},
+  {0x00ee, {1, {0x00ce}}},
+  {0x00ef, {1, {0x00cf}}},
+  {0x00f0, {1, {0x00d0}}},
+  {0x00f1, {1, {0x00d1}}},
+  {0x00f2, {1, {0x00d2}}},
+  {0x00f3, {1, {0x00d3}}},
+  {0x00f4, {1, {0x00d4}}},
+  {0x00f5, {1, {0x00d5}}},
+  {0x00f6, {1, {0x00d6}}},
+  {0x00f8, {1, {0x00d8}}},
+  {0x00f9, {1, {0x00d9}}},
+  {0x00fa, {1, {0x00da}}},
+  {0x00fb, {1, {0x00db}}},
+  {0x00fc, {1, {0x00dc}}},
+  {0x00fd, {1, {0x00dd}}},
+  {0x00fe, {1, {0x00de}}},
+  {0x00ff, {1, {0x0178}}},
+  {0x0101, {1, {0x0100}}},
+  {0x0103, {1, {0x0102}}},
+  {0x0105, {1, {0x0104}}},
+  {0x0107, {1, {0x0106}}},
+  {0x0109, {1, {0x0108}}},
+  {0x010b, {1, {0x010a}}},
+  {0x010d, {1, {0x010c}}},
+  {0x010f, {1, {0x010e}}},
+  {0x0111, {1, {0x0110}}},
+  {0x0113, {1, {0x0112}}},
+  {0x0115, {1, {0x0114}}},
+  {0x0117, {1, {0x0116}}},
+  {0x0119, {1, {0x0118}}},
+  {0x011b, {1, {0x011a}}},
+  {0x011d, {1, {0x011c}}},
+  {0x011f, {1, {0x011e}}},
+  {0x0121, {1, {0x0120}}},
+  {0x0123, {1, {0x0122}}},
+  {0x0125, {1, {0x0124}}},
+  {0x0127, {1, {0x0126}}},
+  {0x0129, {1, {0x0128}}},
+  {0x012b, {1, {0x012a}}},
+  {0x012d, {1, {0x012c}}},
+  {0x012f, {1, {0x012e}}},
+  {0x0133, {1, {0x0132}}},
+  {0x0135, {1, {0x0134}}},
+  {0x0137, {1, {0x0136}}},
+  {0x013a, {1, {0x0139}}},
+  {0x013c, {1, {0x013b}}},
+  {0x013e, {1, {0x013d}}},
+  {0x0140, {1, {0x013f}}},
+  {0x0142, {1, {0x0141}}},
+  {0x0144, {1, {0x0143}}},
+  {0x0146, {1, {0x0145}}},
+  {0x0148, {1, {0x0147}}},
+  {0x014b, {1, {0x014a}}},
+  {0x014d, {1, {0x014c}}},
+  {0x014f, {1, {0x014e}}},
+  {0x0151, {1, {0x0150}}},
+  {0x0153, {1, {0x0152}}},
+  {0x0155, {1, {0x0154}}},
+  {0x0157, {1, {0x0156}}},
+  {0x0159, {1, {0x0158}}},
+  {0x015b, {1, {0x015a}}},
+  {0x015d, {1, {0x015c}}},
+  {0x015f, {1, {0x015e}}},
+  {0x0161, {1, {0x0160}}},
+  {0x0163, {1, {0x0162}}},
+  {0x0165, {1, {0x0164}}},
+  {0x0167, {1, {0x0166}}},
+  {0x0169, {1, {0x0168}}},
+  {0x016b, {1, {0x016a}}},
+  {0x016d, {1, {0x016c}}},
+  {0x016f, {1, {0x016e}}},
+  {0x0171, {1, {0x0170}}},
+  {0x0173, {1, {0x0172}}},
+  {0x0175, {1, {0x0174}}},
+  {0x0177, {1, {0x0176}}},
+  {0x017a, {1, {0x0179}}},
+  {0x017c, {1, {0x017b}}},
+  {0x017e, {1, {0x017d}}},
+  {0x0180, {1, {0x0243}}},
+  {0x0183, {1, {0x0182}}},
+  {0x0185, {1, {0x0184}}},
+  {0x0188, {1, {0x0187}}},
+  {0x018c, {1, {0x018b}}},
+  {0x0192, {1, {0x0191}}},
+  {0x0195, {1, {0x01f6}}},
+  {0x0199, {1, {0x0198}}},
+  {0x019a, {1, {0x023d}}},
+  {0x019e, {1, {0x0220}}},
+  {0x01a1, {1, {0x01a0}}},
+  {0x01a3, {1, {0x01a2}}},
+  {0x01a5, {1, {0x01a4}}},
+  {0x01a8, {1, {0x01a7}}},
+  {0x01ad, {1, {0x01ac}}},
+  {0x01b0, {1, {0x01af}}},
+  {0x01b4, {1, {0x01b3}}},
+  {0x01b6, {1, {0x01b5}}},
+  {0x01b9, {1, {0x01b8}}},
+  {0x01bd, {1, {0x01bc}}},
+  {0x01bf, {1, {0x01f7}}},
+  {0x01c6, {2, {0x01c4, 0x01c5}}},
+  {0x01c9, {2, {0x01c7, 0x01c8}}},
+  {0x01cc, {2, {0x01ca, 0x01cb}}},
+  {0x01ce, {1, {0x01cd}}},
+  {0x01d0, {1, {0x01cf}}},
+  {0x01d2, {1, {0x01d1}}},
+  {0x01d4, {1, {0x01d3}}},
+  {0x01d6, {1, {0x01d5}}},
+  {0x01d8, {1, {0x01d7}}},
+  {0x01da, {1, {0x01d9}}},
+  {0x01dc, {1, {0x01db}}},
+  {0x01dd, {1, {0x018e}}},
+  {0x01df, {1, {0x01de}}},
+  {0x01e1, {1, {0x01e0}}},
+  {0x01e3, {1, {0x01e2}}},
+  {0x01e5, {1, {0x01e4}}},
+  {0x01e7, {1, {0x01e6}}},
+  {0x01e9, {1, {0x01e8}}},
+  {0x01eb, {1, {0x01ea}}},
+  {0x01ed, {1, {0x01ec}}},
+  {0x01ef, {1, {0x01ee}}},
+  {0x01f3, {2, {0x01f1, 0x01f2}}},
+  {0x01f5, {1, {0x01f4}}},
+  {0x01f9, {1, {0x01f8}}},
+  {0x01fb, {1, {0x01fa}}},
+  {0x01fd, {1, {0x01fc}}},
+  {0x01ff, {1, {0x01fe}}},
+  {0x0201, {1, {0x0200}}},
+  {0x0203, {1, {0x0202}}},
+  {0x0205, {1, {0x0204}}},
+  {0x0207, {1, {0x0206}}},
+  {0x0209, {1, {0x0208}}},
+  {0x020b, {1, {0x020a}}},
+  {0x020d, {1, {0x020c}}},
+  {0x020f, {1, {0x020e}}},
+  {0x0211, {1, {0x0210}}},
+  {0x0213, {1, {0x0212}}},
+  {0x0215, {1, {0x0214}}},
+  {0x0217, {1, {0x0216}}},
+  {0x0219, {1, {0x0218}}},
+  {0x021b, {1, {0x021a}}},
+  {0x021d, {1, {0x021c}}},
+  {0x021f, {1, {0x021e}}},
+  {0x0223, {1, {0x0222}}},
+  {0x0225, {1, {0x0224}}},
+  {0x0227, {1, {0x0226}}},
+  {0x0229, {1, {0x0228}}},
+  {0x022b, {1, {0x022a}}},
+  {0x022d, {1, {0x022c}}},
+  {0x022f, {1, {0x022e}}},
+  {0x0231, {1, {0x0230}}},
+  {0x0233, {1, {0x0232}}},
+  {0x023c, {1, {0x023b}}},
+  {0x023f, {1, {0x2c7e}}},
+  {0x0240, {1, {0x2c7f}}},
+  {0x0242, {1, {0x0241}}},
+  {0x0247, {1, {0x0246}}},
+  {0x0249, {1, {0x0248}}},
+  {0x024b, {1, {0x024a}}},
+  {0x024d, {1, {0x024c}}},
+  {0x024f, {1, {0x024e}}},
+  {0x0250, {1, {0x2c6f}}},
+  {0x0251, {1, {0x2c6d}}},
+  {0x0252, {1, {0x2c70}}},
+  {0x0253, {1, {0x0181}}},
+  {0x0254, {1, {0x0186}}},
+  {0x0256, {1, {0x0189}}},
+  {0x0257, {1, {0x018a}}},
+  {0x0259, {1, {0x018f}}},
+  {0x025b, {1, {0x0190}}},
+  {0x025c, {1, {0xa7ab}}},
+  {0x0260, {1, {0x0193}}},
+  {0x0261, {1, {0xa7ac}}},
+  {0x0263, {1, {0x0194}}},
+  {0x0265, {1, {0xa78d}}},
+  {0x0266, {1, {0xa7aa}}},
+  {0x0268, {1, {0x0197}}},
+  {0x0269, {1, {0x0196}}},
+  {0x026b, {1, {0x2c62}}},
+  {0x026c, {1, {0xa7ad}}},
+  {0x026f, {1, {0x019c}}},
+  {0x0271, {1, {0x2c6e}}},
+  {0x0272, {1, {0x019d}}},
+  {0x0275, {1, {0x019f}}},
+  {0x027d, {1, {0x2c64}}},
+  {0x0280, {1, {0x01a6}}},
+  {0x0283, {1, {0x01a9}}},
+  {0x0287, {1, {0xa7b1}}},
+  {0x0288, {1, {0x01ae}}},
+  {0x0289, {1, {0x0244}}},
+  {0x028a, {1, {0x01b1}}},
+  {0x028b, {1, {0x01b2}}},
+  {0x028c, {1, {0x0245}}},
+  {0x0292, {1, {0x01b7}}},
+  {0x029e, {1, {0xa7b0}}},
+  {0x0371, {1, {0x0370}}},
+  {0x0373, {1, {0x0372}}},
+  {0x0377, {1, {0x0376}}},
+  {0x037b, {1, {0x03fd}}},
+  {0x037c, {1, {0x03fe}}},
+  {0x037d, {1, {0x03ff}}},
+  {0x03ac, {1, {0x0386}}},
+  {0x03ad, {1, {0x0388}}},
+  {0x03ae, {1, {0x0389}}},
+  {0x03af, {1, {0x038a}}},
+  {0x03b1, {1, {0x0391}}},
+  {0x03b2, {2, {0x0392, 0x03d0}}},
+  {0x03b3, {1, {0x0393}}},
+  {0x03b4, {1, {0x0394}}},
+  {0x03b5, {2, {0x0395, 0x03f5}}},
+  {0x03b6, {1, {0x0396}}},
+  {0x03b7, {1, {0x0397}}},
+  {0x03b8, {3, {0x0398, 0x03d1, 0x03f4}}},
+  {0x03b9, {3, {0x0345, 0x0399, 0x1fbe}}},
+  {0x03ba, {2, {0x039a, 0x03f0}}},
+  {0x03bb, {1, {0x039b}}},
+  {0x03bc, {2, {0x00b5, 0x039c}}},
+  {0x03bd, {1, {0x039d}}},
+  {0x03be, {1, {0x039e}}},
+  {0x03bf, {1, {0x039f}}},
+  {0x03c0, {2, {0x03a0, 0x03d6}}},
+  {0x03c1, {2, {0x03a1, 0x03f1}}},
+  {0x03c3, {2, {0x03a3, 0x03c2}}},
+  {0x03c4, {1, {0x03a4}}},
+  {0x03c5, {1, {0x03a5}}},
+  {0x03c6, {2, {0x03a6, 0x03d5}}},
+  {0x03c7, {1, {0x03a7}}},
+  {0x03c8, {1, {0x03a8}}},
+  {0x03c9, {2, {0x03a9, 0x2126}}},
+  {0x03ca, {1, {0x03aa}}},
+  {0x03cb, {1, {0x03ab}}},
+  {0x03cc, {1, {0x038c}}},
+  {0x03cd, {1, {0x038e}}},
+  {0x03ce, {1, {0x038f}}},
+  {0x03d7, {1, {0x03cf}}},
+  {0x03d9, {1, {0x03d8}}},
+  {0x03db, {1, {0x03da}}},
+  {0x03dd, {1, {0x03dc}}},
+  {0x03df, {1, {0x03de}}},
+  {0x03e1, {1, {0x03e0}}},
+  {0x03e3, {1, {0x03e2}}},
+  {0x03e5, {1, {0x03e4}}},
+  {0x03e7, {1, {0x03e6}}},
+  {0x03e9, {1, {0x03e8}}},
+  {0x03eb, {1, {0x03ea}}},
+  {0x03ed, {1, {0x03ec}}},
+  {0x03ef, {1, {0x03ee}}},
+  {0x03f2, {1, {0x03f9}}},
+  {0x03f3, {1, {0x037f}}},
+  {0x03f8, {1, {0x03f7}}},
+  {0x03fb, {1, {0x03fa}}},
+  {0x0430, {1, {0x0410}}},
+  {0x0431, {1, {0x0411}}},
+  {0x0432, {1, {0x0412}}},
+  {0x0433, {1, {0x0413}}},
+  {0x0434, {1, {0x0414}}},
+  {0x0435, {1, {0x0415}}},
+  {0x0436, {1, {0x0416}}},
+  {0x0437, {1, {0x0417}}},
+  {0x0438, {1, {0x0418}}},
+  {0x0439, {1, {0x0419}}},
+  {0x043a, {1, {0x041a}}},
+  {0x043b, {1, {0x041b}}},
+  {0x043c, {1, {0x041c}}},
+  {0x043d, {1, {0x041d}}},
+  {0x043e, {1, {0x041e}}},
+  {0x043f, {1, {0x041f}}},
+  {0x0440, {1, {0x0420}}},
+  {0x0441, {1, {0x0421}}},
+  {0x0442, {1, {0x0422}}},
+  {0x0443, {1, {0x0423}}},
+  {0x0444, {1, {0x0424}}},
+  {0x0445, {1, {0x0425}}},
+  {0x0446, {1, {0x0426}}},
+  {0x0447, {1, {0x0427}}},
+  {0x0448, {1, {0x0428}}},
+  {0x0449, {1, {0x0429}}},
+  {0x044a, {1, {0x042a}}},
+  {0x044b, {1, {0x042b}}},
+  {0x044c, {1, {0x042c}}},
+  {0x044d, {1, {0x042d}}},
+  {0x044e, {1, {0x042e}}},
+  {0x044f, {1, {0x042f}}},
+  {0x0450, {1, {0x0400}}},
+  {0x0451, {1, {0x0401}}},
+  {0x0452, {1, {0x0402}}},
+  {0x0453, {1, {0x0403}}},
+  {0x0454, {1, {0x0404}}},
+  {0x0455, {1, {0x0405}}},
+  {0x0456, {1, {0x0406}}},
+  {0x0457, {1, {0x0407}}},
+  {0x0458, {1, {0x0408}}},
+  {0x0459, {1, {0x0409}}},
+  {0x045a, {1, {0x040a}}},
+  {0x045b, {1, {0x040b}}},
+  {0x045c, {1, {0x040c}}},
+  {0x045d, {1, {0x040d}}},
+  {0x045e, {1, {0x040e}}},
+  {0x045f, {1, {0x040f}}},
+  {0x0461, {1, {0x0460}}},
+  {0x0463, {1, {0x0462}}},
+  {0x0465, {1, {0x0464}}},
+  {0x0467, {1, {0x0466}}},
+  {0x0469, {1, {0x0468}}},
+  {0x046b, {1, {0x046a}}},
+  {0x046d, {1, {0x046c}}},
+  {0x046f, {1, {0x046e}}},
+  {0x0471, {1, {0x0470}}},
+  {0x0473, {1, {0x0472}}},
+  {0x0475, {1, {0x0474}}},
+  {0x0477, {1, {0x0476}}},
+  {0x0479, {1, {0x0478}}},
+  {0x047b, {1, {0x047a}}},
+  {0x047d, {1, {0x047c}}},
+  {0x047f, {1, {0x047e}}},
+  {0x0481, {1, {0x0480}}},
+  {0x048b, {1, {0x048a}}},
+  {0x048d, {1, {0x048c}}},
+  {0x048f, {1, {0x048e}}},
+  {0x0491, {1, {0x0490}}},
+  {0x0493, {1, {0x0492}}},
+  {0x0495, {1, {0x0494}}},
+  {0x0497, {1, {0x0496}}},
+  {0x0499, {1, {0x0498}}},
+  {0x049b, {1, {0x049a}}},
+  {0x049d, {1, {0x049c}}},
+  {0x049f, {1, {0x049e}}},
+  {0x04a1, {1, {0x04a0}}},
+  {0x04a3, {1, {0x04a2}}},
+  {0x04a5, {1, {0x04a4}}},
+  {0x04a7, {1, {0x04a6}}},
+  {0x04a9, {1, {0x04a8}}},
+  {0x04ab, {1, {0x04aa}}},
+  {0x04ad, {1, {0x04ac}}},
+  {0x04af, {1, {0x04ae}}},
+  {0x04b1, {1, {0x04b0}}},
+  {0x04b3, {1, {0x04b2}}},
+  {0x04b5, {1, {0x04b4}}},
+  {0x04b7, {1, {0x04b6}}},
+  {0x04b9, {1, {0x04b8}}},
+  {0x04bb, {1, {0x04ba}}},
+  {0x04bd, {1, {0x04bc}}},
+  {0x04bf, {1, {0x04be}}},
+  {0x04c2, {1, {0x04c1}}},
+  {0x04c4, {1, {0x04c3}}},
+  {0x04c6, {1, {0x04c5}}},
+  {0x04c8, {1, {0x04c7}}},
+  {0x04ca, {1, {0x04c9}}},
+  {0x04cc, {1, {0x04cb}}},
+  {0x04ce, {1, {0x04cd}}},
+  {0x04cf, {1, {0x04c0}}},
+  {0x04d1, {1, {0x04d0}}},
+  {0x04d3, {1, {0x04d2}}},
+  {0x04d5, {1, {0x04d4}}},
+  {0x04d7, {1, {0x04d6}}},
+  {0x04d9, {1, {0x04d8}}},
+  {0x04db, {1, {0x04da}}},
+  {0x04dd, {1, {0x04dc}}},
+  {0x04df, {1, {0x04de}}},
+  {0x04e1, {1, {0x04e0}}},
+  {0x04e3, {1, {0x04e2}}},
+  {0x04e5, {1, {0x04e4}}},
+  {0x04e7, {1, {0x04e6}}},
+  {0x04e9, {1, {0x04e8}}},
+  {0x04eb, {1, {0x04ea}}},
+  {0x04ed, {1, {0x04ec}}},
+  {0x04ef, {1, {0x04ee}}},
+  {0x04f1, {1, {0x04f0}}},
+  {0x04f3, {1, {0x04f2}}},
+  {0x04f5, {1, {0x04f4}}},
+  {0x04f7, {1, {0x04f6}}},
+  {0x04f9, {1, {0x04f8}}},
+  {0x04fb, {1, {0x04fa}}},
+  {0x04fd, {1, {0x04fc}}},
+  {0x04ff, {1, {0x04fe}}},
+  {0x0501, {1, {0x0500}}},
+  {0x0503, {1, {0x0502}}},
+  {0x0505, {1, {0x0504}}},
+  {0x0507, {1, {0x0506}}},
+  {0x0509, {1, {0x0508}}},
+  {0x050b, {1, {0x050a}}},
+  {0x050d, {1, {0x050c}}},
+  {0x050f, {1, {0x050e}}},
+  {0x0511, {1, {0x0510}}},
+  {0x0513, {1, {0x0512}}},
+  {0x0515, {1, {0x0514}}},
+  {0x0517, {1, {0x0516}}},
+  {0x0519, {1, {0x0518}}},
+  {0x051b, {1, {0x051a}}},
+  {0x051d, {1, {0x051c}}},
+  {0x051f, {1, {0x051e}}},
+  {0x0521, {1, {0x0520}}},
+  {0x0523, {1, {0x0522}}},
+  {0x0525, {1, {0x0524}}},
+  {0x0527, {1, {0x0526}}},
+  {0x0529, {1, {0x0528}}},
+  {0x052b, {1, {0x052a}}},
+  {0x052d, {1, {0x052c}}},
+  {0x052f, {1, {0x052e}}},
+  {0x0561, {1, {0x0531}}},
+  {0x0562, {1, {0x0532}}},
+  {0x0563, {1, {0x0533}}},
+  {0x0564, {1, {0x0534}}},
+  {0x0565, {1, {0x0535}}},
+  {0x0566, {1, {0x0536}}},
+  {0x0567, {1, {0x0537}}},
+  {0x0568, {1, {0x0538}}},
+  {0x0569, {1, {0x0539}}},
+  {0x056a, {1, {0x053a}}},
+  {0x056b, {1, {0x053b}}},
+  {0x056c, {1, {0x053c}}},
+  {0x056d, {1, {0x053d}}},
+  {0x056e, {1, {0x053e}}},
+  {0x056f, {1, {0x053f}}},
+  {0x0570, {1, {0x0540}}},
+  {0x0571, {1, {0x0541}}},
+  {0x0572, {1, {0x0542}}},
+  {0x0573, {1, {0x0543}}},
+  {0x0574, {1, {0x0544}}},
+  {0x0575, {1, {0x0545}}},
+  {0x0576, {1, {0x0546}}},
+  {0x0577, {1, {0x0547}}},
+  {0x0578, {1, {0x0548}}},
+  {0x0579, {1, {0x0549}}},
+  {0x057a, {1, {0x054a}}},
+  {0x057b, {1, {0x054b}}},
+  {0x057c, {1, {0x054c}}},
+  {0x057d, {1, {0x054d}}},
+  {0x057e, {1, {0x054e}}},
+  {0x057f, {1, {0x054f}}},
+  {0x0580, {1, {0x0550}}},
+  {0x0581, {1, {0x0551}}},
+  {0x0582, {1, {0x0552}}},
+  {0x0583, {1, {0x0553}}},
+  {0x0584, {1, {0x0554}}},
+  {0x0585, {1, {0x0555}}},
+  {0x0586, {1, {0x0556}}},
+  {0x1d79, {1, {0xa77d}}},
+  {0x1d7d, {1, {0x2c63}}},
+  {0x1e01, {1, {0x1e00}}},
+  {0x1e03, {1, {0x1e02}}},
+  {0x1e05, {1, {0x1e04}}},
+  {0x1e07, {1, {0x1e06}}},
+  {0x1e09, {1, {0x1e08}}},
+  {0x1e0b, {1, {0x1e0a}}},
+  {0x1e0d, {1, {0x1e0c}}},
+  {0x1e0f, {1, {0x1e0e}}},
+  {0x1e11, {1, {0x1e10}}},
+  {0x1e13, {1, {0x1e12}}},
+  {0x1e15, {1, {0x1e14}}},
+  {0x1e17, {1, {0x1e16}}},
+  {0x1e19, {1, {0x1e18}}},
+  {0x1e1b, {1, {0x1e1a}}},
+  {0x1e1d, {1, {0x1e1c}}},
+  {0x1e1f, {1, {0x1e1e}}},
+  {0x1e21, {1, {0x1e20}}},
+  {0x1e23, {1, {0x1e22}}},
+  {0x1e25, {1, {0x1e24}}},
+  {0x1e27, {1, {0x1e26}}},
+  {0x1e29, {1, {0x1e28}}},
+  {0x1e2b, {1, {0x1e2a}}},
+  {0x1e2d, {1, {0x1e2c}}},
+  {0x1e2f, {1, {0x1e2e}}},
+  {0x1e31, {1, {0x1e30}}},
+  {0x1e33, {1, {0x1e32}}},
+  {0x1e35, {1, {0x1e34}}},
+  {0x1e37, {1, {0x1e36}}},
+  {0x1e39, {1, {0x1e38}}},
+  {0x1e3b, {1, {0x1e3a}}},
+  {0x1e3d, {1, {0x1e3c}}},
+  {0x1e3f, {1, {0x1e3e}}},
+  {0x1e41, {1, {0x1e40}}},
+  {0x1e43, {1, {0x1e42}}},
+  {0x1e45, {1, {0x1e44}}},
+  {0x1e47, {1, {0x1e46}}},
+  {0x1e49, {1, {0x1e48}}},
+  {0x1e4b, {1, {0x1e4a}}},
+  {0x1e4d, {1, {0x1e4c}}},
+  {0x1e4f, {1, {0x1e4e}}},
+  {0x1e51, {1, {0x1e50}}},
+  {0x1e53, {1, {0x1e52}}},
+  {0x1e55, {1, {0x1e54}}},
+  {0x1e57, {1, {0x1e56}}},
+  {0x1e59, {1, {0x1e58}}},
+  {0x1e5b, {1, {0x1e5a}}},
+  {0x1e5d, {1, {0x1e5c}}},
+  {0x1e5f, {1, {0x1e5e}}},
+  {0x1e61, {2, {0x1e60, 0x1e9b}}},
+  {0x1e63, {1, {0x1e62}}},
+  {0x1e65, {1, {0x1e64}}},
+  {0x1e67, {1, {0x1e66}}},
+  {0x1e69, {1, {0x1e68}}},
+  {0x1e6b, {1, {0x1e6a}}},
+  {0x1e6d, {1, {0x1e6c}}},
+  {0x1e6f, {1, {0x1e6e}}},
+  {0x1e71, {1, {0x1e70}}},
+  {0x1e73, {1, {0x1e72}}},
+  {0x1e75, {1, {0x1e74}}},
+  {0x1e77, {1, {0x1e76}}},
+  {0x1e79, {1, {0x1e78}}},
+  {0x1e7b, {1, {0x1e7a}}},
+  {0x1e7d, {1, {0x1e7c}}},
+  {0x1e7f, {1, {0x1e7e}}},
+  {0x1e81, {1, {0x1e80}}},
+  {0x1e83, {1, {0x1e82}}},
+  {0x1e85, {1, {0x1e84}}},
+  {0x1e87, {1, {0x1e86}}},
+  {0x1e89, {1, {0x1e88}}},
+  {0x1e8b, {1, {0x1e8a}}},
+  {0x1e8d, {1, {0x1e8c}}},
+  {0x1e8f, {1, {0x1e8e}}},
+  {0x1e91, {1, {0x1e90}}},
+  {0x1e93, {1, {0x1e92}}},
+  {0x1e95, {1, {0x1e94}}},
+  {0x1ea1, {1, {0x1ea0}}},
+  {0x1ea3, {1, {0x1ea2}}},
+  {0x1ea5, {1, {0x1ea4}}},
+  {0x1ea7, {1, {0x1ea6}}},
+  {0x1ea9, {1, {0x1ea8}}},
+  {0x1eab, {1, {0x1eaa}}},
+  {0x1ead, {1, {0x1eac}}},
+  {0x1eaf, {1, {0x1eae}}},
+  {0x1eb1, {1, {0x1eb0}}},
+  {0x1eb3, {1, {0x1eb2}}},
+  {0x1eb5, {1, {0x1eb4}}},
+  {0x1eb7, {1, {0x1eb6}}},
+  {0x1eb9, {1, {0x1eb8}}},
+  {0x1ebb, {1, {0x1eba}}},
+  {0x1ebd, {1, {0x1ebc}}},
+  {0x1ebf, {1, {0x1ebe}}},
+  {0x1ec1, {1, {0x1ec0}}},
+  {0x1ec3, {1, {0x1ec2}}},
+  {0x1ec5, {1, {0x1ec4}}},
+  {0x1ec7, {1, {0x1ec6}}},
+  {0x1ec9, {1, {0x1ec8}}},
+  {0x1ecb, {1, {0x1eca}}},
+  {0x1ecd, {1, {0x1ecc}}},
+  {0x1ecf, {1, {0x1ece}}},
+  {0x1ed1, {1, {0x1ed0}}},
+  {0x1ed3, {1, {0x1ed2}}},
+  {0x1ed5, {1, {0x1ed4}}},
+  {0x1ed7, {1, {0x1ed6}}},
+  {0x1ed9, {1, {0x1ed8}}},
+  {0x1edb, {1, {0x1eda}}},
+  {0x1edd, {1, {0x1edc}}},
+  {0x1edf, {1, {0x1ede}}},
+  {0x1ee1, {1, {0x1ee0}}},
+  {0x1ee3, {1, {0x1ee2}}},
+  {0x1ee5, {1, {0x1ee4}}},
+  {0x1ee7, {1, {0x1ee6}}},
+  {0x1ee9, {1, {0x1ee8}}},
+  {0x1eeb, {1, {0x1eea}}},
+  {0x1eed, {1, {0x1eec}}},
+  {0x1eef, {1, {0x1eee}}},
+  {0x1ef1, {1, {0x1ef0}}},
+  {0x1ef3, {1, {0x1ef2}}},
+  {0x1ef5, {1, {0x1ef4}}},
+  {0x1ef7, {1, {0x1ef6}}},
+  {0x1ef9, {1, {0x1ef8}}},
+  {0x1efb, {1, {0x1efa}}},
+  {0x1efd, {1, {0x1efc}}},
+  {0x1eff, {1, {0x1efe}}},
+  {0x1f00, {1, {0x1f08}}},
+  {0x1f01, {1, {0x1f09}}},
+  {0x1f02, {1, {0x1f0a}}},
+  {0x1f03, {1, {0x1f0b}}},
+  {0x1f04, {1, {0x1f0c}}},
+  {0x1f05, {1, {0x1f0d}}},
+  {0x1f06, {1, {0x1f0e}}},
+  {0x1f07, {1, {0x1f0f}}},
+  {0x1f10, {1, {0x1f18}}},
+  {0x1f11, {1, {0x1f19}}},
+  {0x1f12, {1, {0x1f1a}}},
+  {0x1f13, {1, {0x1f1b}}},
+  {0x1f14, {1, {0x1f1c}}},
+  {0x1f15, {1, {0x1f1d}}},
+  {0x1f20, {1, {0x1f28}}},
+  {0x1f21, {1, {0x1f29}}},
+  {0x1f22, {1, {0x1f2a}}},
+  {0x1f23, {1, {0x1f2b}}},
+  {0x1f24, {1, {0x1f2c}}},
+  {0x1f25, {1, {0x1f2d}}},
+  {0x1f26, {1, {0x1f2e}}},
+  {0x1f27, {1, {0x1f2f}}},
+  {0x1f30, {1, {0x1f38}}},
+  {0x1f31, {1, {0x1f39}}},
+  {0x1f32, {1, {0x1f3a}}},
+  {0x1f33, {1, {0x1f3b}}},
+  {0x1f34, {1, {0x1f3c}}},
+  {0x1f35, {1, {0x1f3d}}},
+  {0x1f36, {1, {0x1f3e}}},
+  {0x1f37, {1, {0x1f3f}}},
+  {0x1f40, {1, {0x1f48}}},
+  {0x1f41, {1, {0x1f49}}},
+  {0x1f42, {1, {0x1f4a}}},
+  {0x1f43, {1, {0x1f4b}}},
+  {0x1f44, {1, {0x1f4c}}},
+  {0x1f45, {1, {0x1f4d}}},
+  {0x1f51, {1, {0x1f59}}},
+  {0x1f53, {1, {0x1f5b}}},
+  {0x1f55, {1, {0x1f5d}}},
+  {0x1f57, {1, {0x1f5f}}},
+  {0x1f60, {1, {0x1f68}}},
+  {0x1f61, {1, {0x1f69}}},
+  {0x1f62, {1, {0x1f6a}}},
+  {0x1f63, {1, {0x1f6b}}},
+  {0x1f64, {1, {0x1f6c}}},
+  {0x1f65, {1, {0x1f6d}}},
+  {0x1f66, {1, {0x1f6e}}},
+  {0x1f67, {1, {0x1f6f}}},
+  {0x1f70, {1, {0x1fba}}},
+  {0x1f71, {1, {0x1fbb}}},
+  {0x1f72, {1, {0x1fc8}}},
+  {0x1f73, {1, {0x1fc9}}},
+  {0x1f74, {1, {0x1fca}}},
+  {0x1f75, {1, {0x1fcb}}},
+  {0x1f76, {1, {0x1fda}}},
+  {0x1f77, {1, {0x1fdb}}},
+  {0x1f78, {1, {0x1ff8}}},
+  {0x1f79, {1, {0x1ff9}}},
+  {0x1f7a, {1, {0x1fea}}},
+  {0x1f7b, {1, {0x1feb}}},
+  {0x1f7c, {1, {0x1ffa}}},
+  {0x1f7d, {1, {0x1ffb}}},
+  {0x1fb0, {1, {0x1fb8}}},
+  {0x1fb1, {1, {0x1fb9}}},
+  {0x1fd0, {1, {0x1fd8}}},
+  {0x1fd1, {1, {0x1fd9}}},
+  {0x1fe0, {1, {0x1fe8}}},
+  {0x1fe1, {1, {0x1fe9}}},
+  {0x1fe5, {1, {0x1fec}}},
+  {0x214e, {1, {0x2132}}},
+  {0x2170, {1, {0x2160}}},
+  {0x2171, {1, {0x2161}}},
+  {0x2172, {1, {0x2162}}},
+  {0x2173, {1, {0x2163}}},
+  {0x2174, {1, {0x2164}}},
+  {0x2175, {1, {0x2165}}},
+  {0x2176, {1, {0x2166}}},
+  {0x2177, {1, {0x2167}}},
+  {0x2178, {1, {0x2168}}},
+  {0x2179, {1, {0x2169}}},
+  {0x217a, {1, {0x216a}}},
+  {0x217b, {1, {0x216b}}},
+  {0x217c, {1, {0x216c}}},
+  {0x217d, {1, {0x216d}}},
+  {0x217e, {1, {0x216e}}},
+  {0x217f, {1, {0x216f}}},
+  {0x2184, {1, {0x2183}}},
+  {0x24d0, {1, {0x24b6}}},
+  {0x24d1, {1, {0x24b7}}},
+  {0x24d2, {1, {0x24b8}}},
+  {0x24d3, {1, {0x24b9}}},
+  {0x24d4, {1, {0x24ba}}},
+  {0x24d5, {1, {0x24bb}}},
+  {0x24d6, {1, {0x24bc}}},
+  {0x24d7, {1, {0x24bd}}},
+  {0x24d8, {1, {0x24be}}},
+  {0x24d9, {1, {0x24bf}}},
+  {0x24da, {1, {0x24c0}}},
+  {0x24db, {1, {0x24c1}}},
+  {0x24dc, {1, {0x24c2}}},
+  {0x24dd, {1, {0x24c3}}},
+  {0x24de, {1, {0x24c4}}},
+  {0x24df, {1, {0x24c5}}},
+  {0x24e0, {1, {0x24c6}}},
+  {0x24e1, {1, {0x24c7}}},
+  {0x24e2, {1, {0x24c8}}},
+  {0x24e3, {1, {0x24c9}}},
+  {0x24e4, {1, {0x24ca}}},
+  {0x24e5, {1, {0x24cb}}},
+  {0x24e6, {1, {0x24cc}}},
+  {0x24e7, {1, {0x24cd}}},
+  {0x24e8, {1, {0x24ce}}},
+  {0x24e9, {1, {0x24cf}}},
+  {0x2c30, {1, {0x2c00}}},
+  {0x2c31, {1, {0x2c01}}},
+  {0x2c32, {1, {0x2c02}}},
+  {0x2c33, {1, {0x2c03}}},
+  {0x2c34, {1, {0x2c04}}},
+  {0x2c35, {1, {0x2c05}}},
+  {0x2c36, {1, {0x2c06}}},
+  {0x2c37, {1, {0x2c07}}},
+  {0x2c38, {1, {0x2c08}}},
+  {0x2c39, {1, {0x2c09}}},
+  {0x2c3a, {1, {0x2c0a}}},
+  {0x2c3b, {1, {0x2c0b}}},
+  {0x2c3c, {1, {0x2c0c}}},
+  {0x2c3d, {1, {0x2c0d}}},
+  {0x2c3e, {1, {0x2c0e}}},
+  {0x2c3f, {1, {0x2c0f}}},
+  {0x2c40, {1, {0x2c10}}},
+  {0x2c41, {1, {0x2c11}}},
+  {0x2c42, {1, {0x2c12}}},
+  {0x2c43, {1, {0x2c13}}},
+  {0x2c44, {1, {0x2c14}}},
+  {0x2c45, {1, {0x2c15}}},
+  {0x2c46, {1, {0x2c16}}},
+  {0x2c47, {1, {0x2c17}}},
+  {0x2c48, {1, {0x2c18}}},
+  {0x2c49, {1, {0x2c19}}},
+  {0x2c4a, {1, {0x2c1a}}},
+  {0x2c4b, {1, {0x2c1b}}},
+  {0x2c4c, {1, {0x2c1c}}},
+  {0x2c4d, {1, {0x2c1d}}},
+  {0x2c4e, {1, {0x2c1e}}},
+  {0x2c4f, {1, {0x2c1f}}},
+  {0x2c50, {1, {0x2c20}}},
+  {0x2c51, {1, {0x2c21}}},
+  {0x2c52, {1, {0x2c22}}},
+  {0x2c53, {1, {0x2c23}}},
+  {0x2c54, {1, {0x2c24}}},
+  {0x2c55, {1, {0x2c25}}},
+  {0x2c56, {1, {0x2c26}}},
+  {0x2c57, {1, {0x2c27}}},
+  {0x2c58, {1, {0x2c28}}},
+  {0x2c59, {1, {0x2c29}}},
+  {0x2c5a, {1, {0x2c2a}}},
+  {0x2c5b, {1, {0x2c2b}}},
+  {0x2c5c, {1, {0x2c2c}}},
+  {0x2c5d, {1, {0x2c2d}}},
+  {0x2c5e, {1, {0x2c2e}}},
+  {0x2c61, {1, {0x2c60}}},
+  {0x2c65, {1, {0x023a}}},
+  {0x2c66, {1, {0x023e}}},
+  {0x2c68, {1, {0x2c67}}},
+  {0x2c6a, {1, {0x2c69}}},
+  {0x2c6c, {1, {0x2c6b}}},
+  {0x2c73, {1, {0x2c72}}},
+  {0x2c76, {1, {0x2c75}}},
+  {0x2c81, {1, {0x2c80}}},
+  {0x2c83, {1, {0x2c82}}},
+  {0x2c85, {1, {0x2c84}}},
+  {0x2c87, {1, {0x2c86}}},
+  {0x2c89, {1, {0x2c88}}},
+  {0x2c8b, {1, {0x2c8a}}},
+  {0x2c8d, {1, {0x2c8c}}},
+  {0x2c8f, {1, {0x2c8e}}},
+  {0x2c91, {1, {0x2c90}}},
+  {0x2c93, {1, {0x2c92}}},
+  {0x2c95, {1, {0x2c94}}},
+  {0x2c97, {1, {0x2c96}}},
+  {0x2c99, {1, {0x2c98}}},
+  {0x2c9b, {1, {0x2c9a}}},
+  {0x2c9d, {1, {0x2c9c}}},
+  {0x2c9f, {1, {0x2c9e}}},
+  {0x2ca1, {1, {0x2ca0}}},
+  {0x2ca3, {1, {0x2ca2}}},
+  {0x2ca5, {1, {0x2ca4}}},
+  {0x2ca7, {1, {0x2ca6}}},
+  {0x2ca9, {1, {0x2ca8}}},
+  {0x2cab, {1, {0x2caa}}},
+  {0x2cad, {1, {0x2cac}}},
+  {0x2caf, {1, {0x2cae}}},
+  {0x2cb1, {1, {0x2cb0}}},
+  {0x2cb3, {1, {0x2cb2}}},
+  {0x2cb5, {1, {0x2cb4}}},
+  {0x2cb7, {1, {0x2cb6}}},
+  {0x2cb9, {1, {0x2cb8}}},
+  {0x2cbb, {1, {0x2cba}}},
+  {0x2cbd, {1, {0x2cbc}}},
+  {0x2cbf, {1, {0x2cbe}}},
+  {0x2cc1, {1, {0x2cc0}}},
+  {0x2cc3, {1, {0x2cc2}}},
+  {0x2cc5, {1, {0x2cc4}}},
+  {0x2cc7, {1, {0x2cc6}}},
+  {0x2cc9, {1, {0x2cc8}}},
+  {0x2ccb, {1, {0x2cca}}},
+  {0x2ccd, {1, {0x2ccc}}},
+  {0x2ccf, {1, {0x2cce}}},
+  {0x2cd1, {1, {0x2cd0}}},
+  {0x2cd3, {1, {0x2cd2}}},
+  {0x2cd5, {1, {0x2cd4}}},
+  {0x2cd7, {1, {0x2cd6}}},
+  {0x2cd9, {1, {0x2cd8}}},
+  {0x2cdb, {1, {0x2cda}}},
+  {0x2cdd, {1, {0x2cdc}}},
+  {0x2cdf, {1, {0x2cde}}},
+  {0x2ce1, {1, {0x2ce0}}},
+  {0x2ce3, {1, {0x2ce2}}},
+  {0x2cec, {1, {0x2ceb}}},
+  {0x2cee, {1, {0x2ced}}},
+  {0x2cf3, {1, {0x2cf2}}},
+  {0x2d00, {1, {0x10a0}}},
+  {0x2d01, {1, {0x10a1}}},
+  {0x2d02, {1, {0x10a2}}},
+  {0x2d03, {1, {0x10a3}}},
+  {0x2d04, {1, {0x10a4}}},
+  {0x2d05, {1, {0x10a5}}},
+  {0x2d06, {1, {0x10a6}}},
+  {0x2d07, {1, {0x10a7}}},
+  {0x2d08, {1, {0x10a8}}},
+  {0x2d09, {1, {0x10a9}}},
+  {0x2d0a, {1, {0x10aa}}},
+  {0x2d0b, {1, {0x10ab}}},
+  {0x2d0c, {1, {0x10ac}}},
+  {0x2d0d, {1, {0x10ad}}},
+  {0x2d0e, {1, {0x10ae}}},
+  {0x2d0f, {1, {0x10af}}},
+  {0x2d10, {1, {0x10b0}}},
+  {0x2d11, {1, {0x10b1}}},
+  {0x2d12, {1, {0x10b2}}},
+  {0x2d13, {1, {0x10b3}}},
+  {0x2d14, {1, {0x10b4}}},
+  {0x2d15, {1, {0x10b5}}},
+  {0x2d16, {1, {0x10b6}}},
+  {0x2d17, {1, {0x10b7}}},
+  {0x2d18, {1, {0x10b8}}},
+  {0x2d19, {1, {0x10b9}}},
+  {0x2d1a, {1, {0x10ba}}},
+  {0x2d1b, {1, {0x10bb}}},
+  {0x2d1c, {1, {0x10bc}}},
+  {0x2d1d, {1, {0x10bd}}},
+  {0x2d1e, {1, {0x10be}}},
+  {0x2d1f, {1, {0x10bf}}},
+  {0x2d20, {1, {0x10c0}}},
+  {0x2d21, {1, {0x10c1}}},
+  {0x2d22, {1, {0x10c2}}},
+  {0x2d23, {1, {0x10c3}}},
+  {0x2d24, {1, {0x10c4}}},
+  {0x2d25, {1, {0x10c5}}},
+  {0x2d27, {1, {0x10c7}}},
+  {0x2d2d, {1, {0x10cd}}},
+  {0xa641, {1, {0xa640}}},
+  {0xa643, {1, {0xa642}}},
+  {0xa645, {1, {0xa644}}},
+  {0xa647, {1, {0xa646}}},
+  {0xa649, {1, {0xa648}}},
+  {0xa64b, {1, {0xa64a}}},
+  {0xa64d, {1, {0xa64c}}},
+  {0xa64f, {1, {0xa64e}}},
+  {0xa651, {1, {0xa650}}},
+  {0xa653, {1, {0xa652}}},
+  {0xa655, {1, {0xa654}}},
+  {0xa657, {1, {0xa656}}},
+  {0xa659, {1, {0xa658}}},
+  {0xa65b, {1, {0xa65a}}},
+  {0xa65d, {1, {0xa65c}}},
+  {0xa65f, {1, {0xa65e}}},
+  {0xa661, {1, {0xa660}}},
+  {0xa663, {1, {0xa662}}},
+  {0xa665, {1, {0xa664}}},
+  {0xa667, {1, {0xa666}}},
+  {0xa669, {1, {0xa668}}},
+  {0xa66b, {1, {0xa66a}}},
+  {0xa66d, {1, {0xa66c}}},
+  {0xa681, {1, {0xa680}}},
+  {0xa683, {1, {0xa682}}},
+  {0xa685, {1, {0xa684}}},
+  {0xa687, {1, {0xa686}}},
+  {0xa689, {1, {0xa688}}},
+  {0xa68b, {1, {0xa68a}}},
+  {0xa68d, {1, {0xa68c}}},
+  {0xa68f, {1, {0xa68e}}},
+  {0xa691, {1, {0xa690}}},
+  {0xa693, {1, {0xa692}}},
+  {0xa695, {1, {0xa694}}},
+  {0xa697, {1, {0xa696}}},
+  {0xa699, {1, {0xa698}}},
+  {0xa69b, {1, {0xa69a}}},
+  {0xa723, {1, {0xa722}}},
+  {0xa725, {1, {0xa724}}},
+  {0xa727, {1, {0xa726}}},
+  {0xa729, {1, {0xa728}}},
+  {0xa72b, {1, {0xa72a}}},
+  {0xa72d, {1, {0xa72c}}},
+  {0xa72f, {1, {0xa72e}}},
+  {0xa733, {1, {0xa732}}},
+  {0xa735, {1, {0xa734}}},
+  {0xa737, {1, {0xa736}}},
+  {0xa739, {1, {0xa738}}},
+  {0xa73b, {1, {0xa73a}}},
+  {0xa73d, {1, {0xa73c}}},
+  {0xa73f, {1, {0xa73e}}},
+  {0xa741, {1, {0xa740}}},
+  {0xa743, {1, {0xa742}}},
+  {0xa745, {1, {0xa744}}},
+  {0xa747, {1, {0xa746}}},
+  {0xa749, {1, {0xa748}}},
+  {0xa74b, {1, {0xa74a}}},
+  {0xa74d, {1, {0xa74c}}},
+  {0xa74f, {1, {0xa74e}}},
+  {0xa751, {1, {0xa750}}},
+  {0xa753, {1, {0xa752}}},
+  {0xa755, {1, {0xa754}}},
+  {0xa757, {1, {0xa756}}},
+  {0xa759, {1, {0xa758}}},
+  {0xa75b, {1, {0xa75a}}},
+  {0xa75d, {1, {0xa75c}}},
+  {0xa75f, {1, {0xa75e}}},
+  {0xa761, {1, {0xa760}}},
+  {0xa763, {1, {0xa762}}},
+  {0xa765, {1, {0xa764}}},
+  {0xa767, {1, {0xa766}}},
+  {0xa769, {1, {0xa768}}},
+  {0xa76b, {1, {0xa76a}}},
+  {0xa76d, {1, {0xa76c}}},
+  {0xa76f, {1, {0xa76e}}},
+  {0xa77a, {1, {0xa779}}},
+  {0xa77c, {1, {0xa77b}}},
+  {0xa77f, {1, {0xa77e}}},
+  {0xa781, {1, {0xa780}}},
+  {0xa783, {1, {0xa782}}},
+  {0xa785, {1, {0xa784}}},
+  {0xa787, {1, {0xa786}}},
+  {0xa78c, {1, {0xa78b}}},
+  {0xa791, {1, {0xa790}}},
+  {0xa793, {1, {0xa792}}},
+  {0xa797, {1, {0xa796}}},
+  {0xa799, {1, {0xa798}}},
+  {0xa79b, {1, {0xa79a}}},
+  {0xa79d, {1, {0xa79c}}},
+  {0xa79f, {1, {0xa79e}}},
+  {0xa7a1, {1, {0xa7a0}}},
+  {0xa7a3, {1, {0xa7a2}}},
+  {0xa7a5, {1, {0xa7a4}}},
+  {0xa7a7, {1, {0xa7a6}}},
+  {0xa7a9, {1, {0xa7a8}}},
+  {0xff41, {1, {0xff21}}},
+  {0xff42, {1, {0xff22}}},
+  {0xff43, {1, {0xff23}}},
+  {0xff44, {1, {0xff24}}},
+  {0xff45, {1, {0xff25}}},
+  {0xff46, {1, {0xff26}}},
+  {0xff47, {1, {0xff27}}},
+  {0xff48, {1, {0xff28}}},
+  {0xff49, {1, {0xff29}}},
+  {0xff4a, {1, {0xff2a}}},
+  {0xff4b, {1, {0xff2b}}},
+  {0xff4c, {1, {0xff2c}}},
+  {0xff4d, {1, {0xff2d}}},
+  {0xff4e, {1, {0xff2e}}},
+  {0xff4f, {1, {0xff2f}}},
+  {0xff50, {1, {0xff30}}},
+  {0xff51, {1, {0xff31}}},
+  {0xff52, {1, {0xff32}}},
+  {0xff53, {1, {0xff33}}},
+  {0xff54, {1, {0xff34}}},
+  {0xff55, {1, {0xff35}}},
+  {0xff56, {1, {0xff36}}},
+  {0xff57, {1, {0xff37}}},
+  {0xff58, {1, {0xff38}}},
+  {0xff59, {1, {0xff39}}},
+  {0xff5a, {1, {0xff3a}}},
+  {0x10428, {1, {0x10400}}},
+  {0x10429, {1, {0x10401}}},
+  {0x1042a, {1, {0x10402}}},
+  {0x1042b, {1, {0x10403}}},
+  {0x1042c, {1, {0x10404}}},
+  {0x1042d, {1, {0x10405}}},
+  {0x1042e, {1, {0x10406}}},
+  {0x1042f, {1, {0x10407}}},
+  {0x10430, {1, {0x10408}}},
+  {0x10431, {1, {0x10409}}},
+  {0x10432, {1, {0x1040a}}},
+  {0x10433, {1, {0x1040b}}},
+  {0x10434, {1, {0x1040c}}},
+  {0x10435, {1, {0x1040d}}},
+  {0x10436, {1, {0x1040e}}},
+  {0x10437, {1, {0x1040f}}},
+  {0x10438, {1, {0x10410}}},
+  {0x10439, {1, {0x10411}}},
+  {0x1043a, {1, {0x10412}}},
+  {0x1043b, {1, {0x10413}}},
+  {0x1043c, {1, {0x10414}}},
+  {0x1043d, {1, {0x10415}}},
+  {0x1043e, {1, {0x10416}}},
+  {0x1043f, {1, {0x10417}}},
+  {0x10440, {1, {0x10418}}},
+  {0x10441, {1, {0x10419}}},
+  {0x10442, {1, {0x1041a}}},
+  {0x10443, {1, {0x1041b}}},
+  {0x10444, {1, {0x1041c}}},
+  {0x10445, {1, {0x1041d}}},
+  {0x10446, {1, {0x1041e}}},
+  {0x10447, {1, {0x1041f}}},
+  {0x10448, {1, {0x10420}}},
+  {0x10449, {1, {0x10421}}},
+  {0x1044a, {1, {0x10422}}},
+  {0x1044b, {1, {0x10423}}},
+  {0x1044c, {1, {0x10424}}},
+  {0x1044d, {1, {0x10425}}},
+  {0x1044e, {1, {0x10426}}},
+  {0x1044f, {1, {0x10427}}},
+  {0x118c0, {1, {0x118a0}}},
+  {0x118c1, {1, {0x118a1}}},
+  {0x118c2, {1, {0x118a2}}},
+  {0x118c3, {1, {0x118a3}}},
+  {0x118c4, {1, {0x118a4}}},
+  {0x118c5, {1, {0x118a5}}},
+  {0x118c6, {1, {0x118a6}}},
+  {0x118c7, {1, {0x118a7}}},
+  {0x118c8, {1, {0x118a8}}},
+  {0x118c9, {1, {0x118a9}}},
+  {0x118ca, {1, {0x118aa}}},
+  {0x118cb, {1, {0x118ab}}},
+  {0x118cc, {1, {0x118ac}}},
+  {0x118cd, {1, {0x118ad}}},
+  {0x118ce, {1, {0x118ae}}},
+  {0x118cf, {1, {0x118af}}},
+  {0x118d0, {1, {0x118b0}}},
+  {0x118d1, {1, {0x118b1}}},
+  {0x118d2, {1, {0x118b2}}},
+  {0x118d3, {1, {0x118b3}}},
+  {0x118d4, {1, {0x118b4}}},
+  {0x118d5, {1, {0x118b5}}},
+  {0x118d6, {1, {0x118b6}}},
+  {0x118d7, {1, {0x118b7}}},
+  {0x118d8, {1, {0x118b8}}},
+  {0x118d9, {1, {0x118b9}}},
+  {0x118da, {1, {0x118ba}}},
+  {0x118db, {1, {0x118bb}}},
+  {0x118dc, {1, {0x118bc}}},
+  {0x118dd, {1, {0x118bd}}},
+  {0x118de, {1, {0x118be}}},
+  {0x118df, {1, {0x118bf}}},
+#define CaseUnfold_11_Locale (*(CaseUnfold_11_Type (*)[1])(CaseUnfold_11_Table+1054))
+  {0x0069, {1, {0x0049}}},
 };
 
-static const CaseUnfold_12_Type CaseUnfold_12_Locale[] = {
- { {0x0069, 0x0307}, {1, {0x0130 }}},
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -k1,2,3 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_11_hash -N onigenc_unicode_CaseUnfold_11_lookup -n  */
+
+/* maximum key range = 1907, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_11_hash(const OnigCodePoint code)
+{
+  static const unsigned short asso_values[] =
+    {
+         1, 1915,    4,   12,  199,  716,    4,  230,    6,  134,
+       355,  116,    9,    3,    7,   13, 1915, 1915, 1915, 1915,
+      1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915,
+      1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915,
+      1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915, 1915,
+      1915, 1915, 1915,   40, 1915, 1915, 1915, 1915, 1915, 1915,
+      1915, 1915,   21, 1915,    2,    1,   11,   49,   50,  667,
+       131,  651,   26,  872,  251, 1136,   24,   42,  295, 1145,
+       111,   27,   47,   12,  812,  806,  107,  786,   21, 1070,
+        13,  967,   41,    5,  523, 1152,   71, 1077,   73,  948,
+        14,  601,   10,  575,   15,  764,    1,  929,   27, 1057,
+        23,  498,   15,  918, 1208,  753, 1211,  512, 1180,  736,
+      1082,  711,  441,  898,  410, 1028,  277,  887,  238,  684,
+       336,  425,  740,  406, 1016,  360,  972,  382, 1006,  354,
+      1168,  302,  999,  286,  901,  252,  546,  106, 1159,  148,
+      1121,  224, 1061,  132, 1152,  182,  871,  210, 1163,  235,
+      1183,  371, 1197,   64,  954,   90,  339,   79,  604,  168,
+       982,  159,  448,  328,  525,  634,  195,  620,  261,  852,
+       934,  312,  210,  836,  668,  983,  586,  823,  460,  955,
+      1176,  697,  119,  998
+    };
+  return asso_values[bits_of(code, 2)+66] + asso_values[bits_of(code, 1)+4] + asso_values[bits_of(code, 0)];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+static const CodePointList3 *
+onigenc_unicode_CaseUnfold_11_lookup(const OnigCodePoint code)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x61,
+      MAX_CODE_VALUE = 0x118df,
+      TOTAL_KEYWORDS = 1055,
+      MIN_WORD_LENGTH = 3,
+      MAX_WORD_LENGTH = 3,
+      MIN_HASH_VALUE = 8,
+      MAX_HASH_VALUE = 1914
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x1e1b*/ 490,
+      /*0x049b*/ 362,
+      /*0x011b*/ 69,
+      /*0x2c9b*/ 781,
+      /*0x021b*/ 178,
+      /*0x051b*/ 426,
+      /*0x1e91*/ 549,
+      /*0x1e11*/ 485,
+      /*0x0491*/ 357,
+      /*0x0111*/ 64,
+      /*0x2c91*/ 776,
+      /*0x0211*/ 173,
+      /*0x0511*/ 421,
+      /*0xa79b*/ 948,
+      /*0x1f24*/ 618,
+      /*0x1f00*/ 600,
+      /*0x1f11*/ 609,
+      /*0x0580*/ 468,
+      /*0x1f22*/ 616,
+      /*0x1f26*/ 620,
+      /*0xa791*/ 944,
+      /*0x1e8f*/ 548,
+      /*0x1e0f*/ 484,
+      /*0x048f*/ 356,
+      /*0x010f*/ 63,
+      /*0x2c8f*/ 775,
+      /*0x020f*/ 172,
+      /*0x050f*/ 420,
+      /*0xa69b*/ 897,
+      -1,
+      /*0x1f06*/ 606,
+      -1,
+      /*0x0586*/ 474,
+      -1, -1,
+      /*0xa691*/ 892,
+      /*0x1e8b*/ 546,
+      /*0x1e0b*/ 482,
+      /*0x048b*/ 354,
+      /*0x010b*/ 61,
+      /*0x2c8b*/ 773,
+      /*0x020b*/ 170,
+      /*0x050b*/ 418,
+      /*0x1e81*/ 541,
+      /*0x1e01*/ 477,
+      /*0x0481*/ 353,
+      /*0x0101*/ 56,
+      /*0x2c81*/ 768,
+      /*0x0201*/ 165,
+      /*0x0501*/ 413,
+      /*0xa68f*/ 891,
+      /*0x1f10*/ 608,
+      -1,
+      /*0x1f01*/ 601,
+      /*0x1f02*/ 602,
+      /*0x0581*/ 469,
+      /*0x0582*/ 470,
+      /*0xa781*/ 939,
+      /*0x1ee1*/ 584,
+      /*0x1e61*/ 525,
+      /*0x04e1*/ 397,
+      /*0x0161*/ 102,
+      /*0x2ce1*/ 816,
+      /*0x0261*/ 210,
+      /*0x0561*/ 437,
+      /*0xa68b*/ 889,
+      /*0x0461*/ 337,
+      -1,
+      /*0x1f61*/ 641,
+      -1, -1, -1,
+      /*0xa681*/ 884,
+      /*0x1ee5*/ 586,
+      /*0x1e65*/ 527,
+      /*0x04e5*/ 399,
+      /*0x0165*/ 104,
+      /*0x1f20*/ 614,
+      /*0x0265*/ 212,
+      /*0x0565*/ 441,
+      -1,
+      /*0x0465*/ 339,
+      -1,
+      /*0x1f65*/ 645,
+      /*0x1ee3*/ 585,
+      /*0x1e63*/ 526,
+      /*0x04e3*/ 398,
+      /*0x0163*/ 103,
+      /*0x2ce3*/ 817,
+      /*0x0263*/ 211,
+      /*0x0563*/ 439,
+      -1,
+      /*0x0463*/ 338,
+      -1,
+      /*0x1f63*/ 643,
+      -1, -1, -1,
+      /*0x2c61*/ 760,
+      /*0x24e1*/ 704,
+      /*0x1ed1*/ 576,
+      /*0x1e51*/ 517,
+      /*0x04d1*/ 389,
+      /*0x0151*/ 94,
+      /*0x2cd1*/ 808,
+      /*0x0251*/ 200,
+      /*0x1fe1*/ 667,
+      /*0xa761*/ 928,
+      /*0x0451*/ 322,
+      -1,
+      /*0x1f51*/ 636,
+      /*0x1f14*/ 612,
+      -1,
+      /*0x2c65*/ 761,
+      /*0x24e5*/ 708,
+      -1,
+      /*0x017e*/ 116,
+      -1, -1,
+      /*0x057e*/ 466,
+      -1,
+      /*0x1fe5*/ 668,
+      /*0xa765*/ 930,
+      -1,
+      /*0x03ae*/ 241,
+      /*0x24e3*/ 706,
+      /*0x1ed7*/ 579,
+      /*0x1e57*/ 520,
+      /*0x04d7*/ 392,
+      /*0x0157*/ 97,
+      /*0x2cd7*/ 811,
+      /*0x0257*/ 205,
+      /*0x03ac*/ 239,
+      /*0xa763*/ 929,
+      /*0x0457*/ 328,
+      /*0x1f04*/ 604,
+      /*0x1f57*/ 639,
+      /*0x0584*/ 472,
+      /*0x0280*/ 223,
+      -1,
+      /*0x2c51*/ 746,
+      /*0x24d1*/ 688,
+      /*0x1ed3*/ 577,
+      /*0x1e53*/ 518,
+      /*0x04d3*/ 390,
+      /*0x0153*/ 95,
+      /*0x2cd3*/ 809,
+      /*0x0253*/ 202,
+      /*0x1fd1*/ 665,
+      /*0xa751*/ 920,
+      /*0x0453*/ 324,
+      /*0x028a*/ 228,
+      /*0x1f53*/ 637,
+      /*0x1ee9*/ 588,
+      /*0x1e69*/ 529,
+      /*0x04e9*/ 401,
+      /*0x0169*/ 106,
+      -1,
+      /*0x0269*/ 215,
+      /*0x0569*/ 445,
+      -1,
+      /*0x0469*/ 341,
+      /*0x1ee7*/ 587,
+      /*0x1e67*/ 528,
+      /*0x04e7*/ 400,
+      /*0x0167*/ 105,
+      /*0x2c57*/ 752,
+      /*0x24d7*/ 694,
+      /*0x0567*/ 443,
+      /*0x028b*/ 229,
+      /*0x0467*/ 340,
+      /*0xa661*/ 877,
+      /*0x1f67*/ 647,
+      /*0x03e1*/ 277,
+      -1,
+      /*0xa757*/ 923,
+      /*0x1ed9*/ 580,
+      /*0x1e59*/ 521,
+      /*0x04d9*/ 393,
+      /*0x0159*/ 98,
+      /*0x2cd9*/ 812,
+      /*0x0259*/ 206,
+      /*0x2c53*/ 748,
+      /*0x24d3*/ 690,
+      /*0x0459*/ 330,
+      -1,
+      /*0xa665*/ 879,
+      -1,
+      /*0x03e5*/ 279,
+      -1, -1,
+      /*0xa753*/ 921,
+      -1,
+      /*0x2cee*/ 819,
+      /*0x24e9*/ 712,
+      /*0x056e*/ 450,
+      -1,
+      /*0xa663*/ 878,
+      /*0x029e*/ 232,
+      /*0x03e3*/ 278,
+      -1,
+      /*0x10428*/ 982,
+      /*0xa769*/ 932,
+      /*0x24e7*/ 710,
+      /*0x1edb*/ 581,
+      /*0x1e5b*/ 522,
+      /*0x04db*/ 394,
+      /*0x015b*/ 99,
+      /*0x2cdb*/ 813,
+      /*0x025b*/ 207,
+      /*0x0574*/ 456,
+      /*0xa767*/ 931,
+      /*0x045b*/ 332,
+      /*0xa651*/ 869,
+      /*0x1f74*/ 652,
+      /*0x1042e*/ 988,
+      /*0x2c59*/ 754,
+      /*0x24d9*/ 696,
+      /*0x1ed5*/ 578,
+      /*0x1e55*/ 519,
+      /*0x04d5*/ 391,
+      /*0x0155*/ 96,
+      /*0x2cd5*/ 810,
+      /*0x1042c*/ 986,
+      /*0x01a8*/ 130,
+      /*0xa759*/ 924,
+      /*0x0455*/ 326,
+      /*0x1042a*/ 984,
+      /*0x1f55*/ 638,
+      /*0x1edd*/ 582,
+      /*0x1e5d*/ 523,
+      /*0x04dd*/ 395,
+      /*0x015d*/ 100,
+      /*0x2cdd*/ 814,
+      /*0x0180*/ 117,
+      /*0x013e*/ 85,
+      -1,
+      /*0x045d*/ 334,
+      -1,
+      /*0xa657*/ 872,
+      /*0x043e*/ 303,
+      /*0x03d7*/ 272,
+      -1,
+      /*0x217e*/ 684,
+      /*0x2c5b*/ 756,
+      /*0x24db*/ 698,
+      /*0x1ecf*/ 575,
+      /*0x1e4f*/ 516,
+      /*0x04cf*/ 388,
+      /*0x014f*/ 93,
+      /*0x2ccf*/ 807,
+      /*0x024f*/ 198,
+      -1,
+      /*0xa75b*/ 925,
+      /*0x044f*/ 320,
+      /*0xa653*/ 870,
+      /*0x0061*/ 0,
+      -1,
+      /*0x2c55*/ 750,
+      /*0x24d5*/ 692,
+      -1,
+      /*0x0570*/ 452,
+      -1, -1,
+      /*0x019a*/ 125,
+      /*0x1f70*/ 648,
+      /*0xa669*/ 881,
+      /*0xa755*/ 922,
+      /*0x03e9*/ 281,
+      /*0x2c5d*/ 758,
+      /*0x24dd*/ 700,
+      /*0x0065*/ 4,
+      /*0x2c3e*/ 727,
+      -1,
+      /*0x013c*/ 84,
+      /*0xa667*/ 880,
+      /*0x023c*/ 190,
+      /*0x03e7*/ 280,
+      /*0xa75d*/ 926,
+      /*0x043c*/ 301,
+      /*0x1ecd*/ 574,
+      /*0x1e4d*/ 515,
+      /*0x0063*/ 2,
+      /*0x014d*/ 92,
+      /*0x2ccd*/ 806,
+      /*0x024d*/ 197,
+      /*0x2c4f*/ 744,
+      /*0x01e1*/ 151,
+      /*0x044d*/ 318,
+      /*0xa659*/ 873,
+      -1,
+      /*0x03d9*/ 273,
+      -1, -1,
+      /*0x019e*/ 126,
+      /*0xa74f*/ 919,
+      /*0x1ecb*/ 573,
+      /*0x1e4b*/ 514,
+      -1,
+      /*0x014b*/ 91,
+      /*0x2ccb*/ 805,
+      /*0x024b*/ 196,
+      /*0x01e5*/ 153,
+      /*0xa78c*/ 943,
+      /*0x044b*/ 316,
+      -1,
+      /*0x1ef3*/ 593,
+      /*0x1e73*/ 534,
+      /*0x04f3*/ 406,
+      /*0x0173*/ 111,
+      /*0x2cf3*/ 820,
+      /*0x2c3c*/ 725,
+      /*0x0573*/ 455,
+      /*0x01e3*/ 152,
+      /*0x0473*/ 346,
+      -1,
+      /*0x1f73*/ 651,
+      /*0xa65b*/ 874,
+      -1,
+      /*0x03db*/ 274,
+      /*0x2c4d*/ 742,
+      -1,
+      /*0x1eeb*/ 589,
+      /*0x1e6b*/ 530,
+      /*0x04eb*/ 402,
+      /*0x016b*/ 107,
+      -1,
+      /*0x026b*/ 216,
+      /*0x056b*/ 447,
+      /*0xa74d*/ 918,
+      /*0x046b*/ 342,
+      /*0xa655*/ 871,
+      -1,
+      /*0x0140*/ 86,
+      /*0x2174*/ 674,
+      /*0x0240*/ 192,
+      /*0x2c4b*/ 740,
+      /*0x118d1*/ 1039,
+      /*0x0440*/ 305,
+      /*0x0564*/ 440,
+      /*0x1f40*/ 630,
+      -1,
+      /*0xa65d*/ 875,
+      /*0x1f64*/ 644,
+      /*0x03dd*/ 275,
+      /*0xa74b*/ 917,
+      /*0x2c73*/ 766,
+      /*0x03be*/ 256,
+      /*0x1ec9*/ 572,
+      /*0x1e49*/ 513,
+      -1,
+      /*0x0069*/ 1054,
+      /*0x2cc9*/ 804,
+      /*0x0249*/ 195,
+      /*0x1ec5*/ 570,
+      /*0x1e45*/ 511,
+      /*0x0449*/ 314,
+      -1,
+      /*0x2cc5*/ 802,
+      /*0xa64f*/ 868,
+      /*0x0067*/ 6,
+      -1,
+      /*0x0445*/ 310,
+      /*0x118d7*/ 1045,
+      /*0x1f45*/ 635,
+      /*0x1edf*/ 583,
+      /*0x1e5f*/ 524,
+      /*0x04df*/ 396,
+      /*0x015f*/ 101,
+      /*0x2cdf*/ 815,
+      /*0x2c40*/ 729,
+      /*0xa76b*/ 933,
+      -1,
+      /*0x045f*/ 336,
+      /*0x24e4*/ 707,
+      -1,
+      /*0x1ec7*/ 571,
+      /*0x1e47*/ 512,
+      /*0x0288*/ 226,
+      /*0x118d3*/ 1041,
+      /*0x2cc7*/ 803,
+      /*0x0247*/ 194,
+      /*0x01e9*/ 155,
+      -1,
+      /*0x0447*/ 312,
+      /*0x2170*/ 670,
+      /*0x03bc*/ 254,
+      /*0x006e*/ 12,
+      /*0x2c49*/ 738,
+      -1, -1,
+      /*0x01e7*/ 154,
+      -1,
+      /*0xa64d*/ 867,
+      /*0x2c45*/ 734,
+      /*0x03cd*/ 270,
+      -1,
+      /*0xa749*/ 916,
+      -1, -1,
+      /*0x1ec3*/ 569,
+      /*0x1e43*/ 510,
+      /*0x0074*/ 18,
+      /*0xa745*/ 914,
+      /*0x2cc3*/ 801,
+      -1,
+      /*0x24df*/ 702,
+      /*0x013a*/ 83,
+      /*0x0443*/ 308,
+      /*0xa64b*/ 866,
+      /*0x1f43*/ 633,
+      /*0x03cb*/ 268,
+      /*0x043a*/ 299,
+      /*0x118d9*/ 1047,
+      /*0xa75f*/ 927,
+      -1,
+      /*0x2c47*/ 736,
+      -1, -1,
+      /*0x1ec1*/ 568,
+      /*0x1e41*/ 509,
+      /*0x03f3*/ 286,
+      /*0x028c*/ 230,
+      /*0x2cc1*/ 800,
+      -1,
+      /*0xa747*/ 915,
+      -1,
+      /*0x0441*/ 306,
+      -1,
+      /*0x1f41*/ 631,
+      -1, -1, -1, -1, -1,
+      /*0xa66b*/ 882,
+      /*0x2173*/ 673,
+      /*0x03eb*/ 282,
+      /*0x1043e*/ 1004,
+      -1,
+      /*0x2c43*/ 732,
+      /*0x118db*/ 1049,
+      -1,
+      /*0x0438*/ 297,
+      /*0x2c3a*/ 723,
+      /*0x03c0*/ 258,
+      /*0xff51*/ 972,
+      -1,
+      /*0x056a*/ 446,
+      /*0xa743*/ 913,
+      -1, -1,
+      /*0x1044f*/ 1021,
+      /*0x0070*/ 14,
+      -1,
+      /*0x118d5*/ 1043,
+      -1,
+      /*0x017a*/ 114,
+      /*0x01dd*/ 149,
+      /*0x2c41*/ 730,
+      /*0x057a*/ 462,
+      /*0xa649*/ 865,
+      -1,
+      /*0x03c9*/ 266,
+      /*0x1f7a*/ 658,
+      -1,
+      /*0x118dd*/ 1051,
+      /*0xa645*/ 863,
+      /*0xa741*/ 912,
+      /*0x03c5*/ 262,
+      -1, -1,
+      /*0xff57*/ 978,
+      -1,
+      /*0x0188*/ 120,
+      /*0x2c38*/ 721,
+      -1,
+      /*0x1043c*/ 1002,
+      /*0xa65f*/ 876,
+      -1,
+      /*0x03df*/ 276,
+      -1,
+      /*0x2c6a*/ 764,
+      /*0x118cf*/ 1037,
+      -1, -1,
+      /*0x1044d*/ 1019,
+      -1,
+      /*0xff53*/ 974,
+      /*0xa647*/ 864,
+      -1,
+      /*0x03c7*/ 264,
+      /*0x1ead*/ 558,
+      /*0x1e2d*/ 499,
+      /*0x04ad*/ 371,
+      /*0x012d*/ 78,
+      /*0x2cad*/ 790,
+      /*0x022d*/ 186,
+      /*0x052d*/ 435,
+      -1, -1, -1,
+      /*0x1044b*/ 1017,
+      /*0xa77a*/ 936,
+      /*0x0073*/ 17,
+      -1,
+      /*0x1eb3*/ 561,
+      /*0x1e33*/ 502,
+      /*0x04b3*/ 374,
+      /*0x0133*/ 80,
+      /*0x2cb3*/ 793,
+      /*0x0233*/ 189,
+      -1,
+      /*0xa643*/ 862,
+      /*0x0433*/ 292,
+      /*0x03c3*/ 260,
+      /*0x1f33*/ 625,
+      /*0x118cd*/ 1035,
+      /*0x018c*/ 121,
+      /*0x03ba*/ 252,
+      /*0x006b*/ 9,
+      /*0x2d1b*/ 848,
+      /*0xff59*/ 980,
+      /*0x2cec*/ 818,
+      /*0x026c*/ 217,
+      /*0x056c*/ 448,
+      /*0x2d24*/ 857,
+      /*0x2d00*/ 821,
+      /*0x2d11*/ 838,
+      /*0x2d18*/ 845,
+      /*0x2d22*/ 855,
+      /*0x0064*/ 3,
+      /*0xa641*/ 861,
+      /*0x118cb*/ 1033,
+      /*0x03c1*/ 259,
+      /*0x01f3*/ 159,
+      /*0x10440*/ 1006,
+      /*0x2d16*/ 843,
+      -1, -1,
+      /*0x2d0a*/ 831,
+      /*0xa72d*/ 903,
+      /*0x2d06*/ 827,
+      /*0x2d0f*/ 836,
+      -1,
+      /*0x0250*/ 199,
+      /*0x2c33*/ 716,
+      -1,
+      /*0x0450*/ 321,
+      -1,
+      /*0x03b8*/ 250,
+      /*0x01eb*/ 156,
+      -1, -1,
+      /*0x10449*/ 1015,
+      /*0xa733*/ 905,
+      -1,
+      /*0x2d1a*/ 847,
+      /*0x2d0b*/ 832,
+      /*0x2c6c*/ 765,
+      /*0x10445*/ 1011,
+      -1, -1,
+      /*0x2d10*/ 837,
+      /*0xff55*/ 976,
+      /*0x2d01*/ 822,
+      /*0x2d02*/ 823,
+      /*0x118c0*/ 1022,
+      -1,
+      /*0x1ea5*/ 554,
+      /*0x1e25*/ 495,
+      /*0x04a5*/ 367,
+      /*0x0125*/ 74,
+      /*0x2ca5*/ 786,
+      /*0x0225*/ 182,
+      /*0x0525*/ 431,
+      -1,
+      /*0x01c9*/ 139,
+      -1,
+      /*0x1f25*/ 619,
+      /*0x2c50*/ 745,
+      /*0x24d0*/ 687,
+      /*0x10447*/ 1013,
+      /*0xa7a5*/ 953,
+      /*0x217a*/ 680,
+      /*0x118c9*/ 1031,
+      /*0x0578*/ 460,
+      /*0x2d1e*/ 851,
+      /*0x1fd0*/ 664,
+      /*0x2d20*/ 853,
+      /*0x1f78*/ 656,
+      /*0x118c5*/ 1027,
+      /*0xff4f*/ 970,
+      -1,
+      /*0x01df*/ 150,
+      /*0x1ea3*/ 553,
+      /*0x1e23*/ 494,
+      /*0x04a3*/ 366,
+      /*0x0123*/ 73,
+      /*0x2ca3*/ 785,
+      /*0x0223*/ 181,
+      /*0x0523*/ 430,
+      /*0x118df*/ 1053,
+      /*0x0266*/ 213,
+      /*0x0566*/ 442,
+      /*0x1f23*/ 617,
+      /*0x10443*/ 1009,
+      /*0x03ad*/ 240,
+      /*0x1f66*/ 646,
+      /*0xa7a3*/ 952,
+      /*0x1043a*/ 1000,
+      -1, -1,
+      /*0x118c7*/ 1029,
+      /*0x1eef*/ 591,
+      /*0x1e6f*/ 532,
+      /*0x04ef*/ 404,
+      /*0x016f*/ 109,
+      /*0xa725*/ 899,
+      /*0x026f*/ 218,
+      /*0x056f*/ 451,
+      /*0x03b3*/ 245,
+      /*0x046f*/ 344,
+      /*0x2d14*/ 841,
+      -1,
+      /*0x10441*/ 1007,
+      /*0xff4d*/ 968,
+      /*0x2d0e*/ 835,
+      /*0x1eed*/ 590,
+      /*0x1e6d*/ 531,
+      /*0x04ed*/ 403,
+      /*0x016d*/ 108,
+      -1, -1,
+      /*0x056d*/ 449,
+      -1,
+      /*0x046d*/ 343,
+      /*0x118c3*/ 1025,
+      /*0x2c66*/ 762,
+      /*0x24e6*/ 709,
+      /*0x006a*/ 8,
+      /*0x10438*/ 998,
+      /*0xff4b*/ 966,
+      -1,
+      /*0xa723*/ 898,
+      /*0x1e85*/ 543,
+      /*0x1e05*/ 479,
+      /*0x2d04*/ 825,
+      /*0x0105*/ 58,
+      /*0x2c85*/ 770,
+      /*0x0205*/ 167,
+      /*0x0505*/ 415,
+      /*0x007a*/ 24,
+      -1, -1,
+      /*0x1f05*/ 605,
+      /*0x118c1*/ 1023,
+      /*0x0585*/ 473,
+      -1,
+      /*0xa785*/ 941,
+      /*0x0373*/ 234,
+      /*0x1e83*/ 542,
+      /*0x1e03*/ 478,
+      /*0xa76f*/ 935,
+      /*0x0103*/ 57,
+      /*0x2c83*/ 769,
+      /*0x0203*/ 166,
+      /*0x0503*/ 414,
+      /*0x0576*/ 458,
+      -1, -1,
+      /*0x1f03*/ 603,
+      /*0x1f76*/ 654,
+      /*0x0583*/ 471,
+      /*0xa685*/ 886,
+      /*0xa783*/ 940,
+      -1,
+      /*0xa76d*/ 934,
+      /*0x1ebf*/ 567,
+      /*0x1e3f*/ 508,
+      /*0x04bf*/ 380,
+      -1,
+      /*0x2cbf*/ 799,
+      /*0x023f*/ 191,
+      -1, -1,
+      /*0x043f*/ 304,
+      -1, -1, -1,
+      /*0xa683*/ 885,
+      /*0x1efd*/ 598,
+      /*0x1e7d*/ 539,
+      /*0x04fd*/ 411,
+      /*0xff49*/ 964,
+      /*0x03f8*/ 287,
+      /*0x027d*/ 222,
+      /*0x057d*/ 465,
+      /*0x1042d*/ 987,
+      /*0x047d*/ 351,
+      /*0xff45*/ 960,
+      /*0x1f7d*/ 661,
+      /*0x2c76*/ 767,
+      -1, -1,
+      /*0x1eb7*/ 563,
+      /*0x1e37*/ 504,
+      /*0x04b7*/ 376,
+      /*0x0137*/ 82,
+      /*0x2cb7*/ 795,
+      /*0x2178*/ 678,
+      /*0x1d7d*/ 476,
+      /*0x10433*/ 993,
+      /*0x0437*/ 296,
+      -1,
+      /*0x1f37*/ 629,
+      -1,
+      /*0x006c*/ 10,
+      /*0x2c3f*/ 728,
+      -1, -1,
+      /*0x01ad*/ 131,
+      /*0xff47*/ 962,
+      -1, -1, -1, -1,
+      /*0xa73f*/ 911,
+      -1,
+      /*0x03ef*/ 284,
+      /*0x1eb5*/ 562,
+      /*0x1e35*/ 503,
+      /*0x04b5*/ 375,
+      /*0x0135*/ 81,
+      /*0x2cb5*/ 794,
+      -1,
+      /*0x04c2*/ 381,
+      /*0x0142*/ 87,
+      /*0x0435*/ 294,
+      /*0x0242*/ 193,
+      /*0x1f35*/ 627,
+      /*0xa66d*/ 883,
+      /*0x0442*/ 307,
+      /*0x03ed*/ 283,
+      /*0x1f42*/ 632,
+      /*0x2c37*/ 720,
+      /*0xff43*/ 958,
+      /*0x1eb1*/ 560,
+      /*0x1e31*/ 501,
+      /*0x04b1*/ 373,
+      -1,
+      /*0x2cb1*/ 792,
+      /*0x0231*/ 188,
+      -1,
+      /*0xa737*/ 907,
+      /*0x0431*/ 290,
+      -1,
+      /*0x1f31*/ 623,
+      /*0x1ea7*/ 555,
+      /*0x1e27*/ 496,
+      /*0x04a7*/ 368,
+      /*0x0127*/ 75,
+      /*0x2ca7*/ 787,
+      /*0x0227*/ 183,
+      /*0x0527*/ 432,
+      /*0xff41*/ 956,
+      -1,
+      /*0x2d08*/ 829,
+      /*0x1f27*/ 621,
+      /*0x01d0*/ 142,
+      /*0x2c35*/ 718,
+      -1,
+      /*0xa7a7*/ 954,
+      /*0x00e1*/ 26,
+      /*0x2c42*/ 731,
+      /*0x2184*/ 686,
+      -1,
+      /*0x118d0*/ 1038,
+      /*0x0078*/ 22,
+      /*0xa735*/ 906,
+      /*0x1e95*/ 551,
+      /*0x1e15*/ 487,
+      /*0x0495*/ 359,
+      /*0x0115*/ 66,
+      /*0x2c95*/ 778,
+      /*0x0215*/ 175,
+      /*0x0515*/ 423,
+      /*0x2c31*/ 714,
+      /*0x00e5*/ 30,
+      -1,
+      /*0x1f15*/ 613,
+      -1,
+      /*0x2176*/ 676,
+      /*0x03bf*/ 257,
+      /*0x0283*/ 224,
+      /*0x1fb1*/ 663,
+      /*0x0066*/ 5,
+      -1,
+      /*0x01a5*/ 129,
+      /*0x00e3*/ 28,
+      /*0x1e93*/ 550,
+      /*0x1e13*/ 486,
+      /*0x0493*/ 358,
+      /*0x0113*/ 65,
+      /*0x2c93*/ 777,
+      /*0x0213*/ 174,
+      /*0x0513*/ 422,
+      /*0xa727*/ 900,
+      -1,
+      /*0xa695*/ 894,
+      /*0x1f13*/ 611,
+      /*0x2d0c*/ 833,
+      /*0x006f*/ 13,
+      -1,
+      /*0xa793*/ 945,
+      -1,
+      /*0x1f12*/ 610,
+      /*0x1ef9*/ 596,
+      /*0x1e79*/ 537,
+      /*0x04f9*/ 409,
+      /*0x03b7*/ 249,
+      /*0x217d*/ 683,
+      -1,
+      /*0x0579*/ 461,
+      /*0x01a3*/ 128,
+      /*0x0479*/ 349,
+      /*0x006d*/ 11,
+      /*0x1f79*/ 657,
+      /*0x00fe*/ 54,
+      /*0xa693*/ 893,
+      /*0x1ef5*/ 594,
+      /*0x1e75*/ 535,
+      /*0x04f5*/ 407,
+      /*0x0175*/ 112,
+      -1,
+      /*0x0275*/ 221,
+      /*0x0575*/ 457,
+      /*0x1d79*/ 475,
+      /*0x0475*/ 347,
+      -1,
+      /*0x1f75*/ 653,
+      -1, -1,
+      /*0x01ef*/ 158,
+      -1,
+      /*0x03b5*/ 247,
+      /*0x1ef1*/ 592,
+      /*0x1e71*/ 533,
+      /*0x04f1*/ 405,
+      /*0x0171*/ 110,
+      -1,
+      /*0x0271*/ 219,
+      /*0x0571*/ 453,
+      -1,
+      /*0x0471*/ 345,
+      -1,
+      /*0x1f71*/ 649,
+      /*0x01ed*/ 157,
+      -1, -1,
+      /*0x0076*/ 20,
+      -1,
+      /*0x03b1*/ 243,
+      -1, -1, -1,
+      /*0x1e87*/ 544,
+      /*0x1e07*/ 480,
+      /*0x00e9*/ 34,
+      /*0x0107*/ 59,
+      /*0x2c87*/ 771,
+      /*0x0207*/ 168,
+      /*0x0507*/ 416,
+      /*0x045a*/ 331,
+      /*0x0185*/ 119,
+      -1,
+      /*0x1f07*/ 607,
+      /*0x00e7*/ 32,
+      -1, -1,
+      /*0xa787*/ 942,
+      /*0x1ebd*/ 566,
+      /*0x1e3d*/ 507,
+      /*0x04bd*/ 379,
+      /*0x1043f*/ 1005,
+      /*0x2cbd*/ 798,
+      /*0xff50*/ 971,
+      -1, -1,
+      /*0x043d*/ 302,
+      /*0x0183*/ 118,
+      -1,
+      /*0x1eb9*/ 564,
+      /*0x1e39*/ 505,
+      /*0x04b9*/ 377,
+      /*0xa687*/ 887,
+      /*0x2cb9*/ 796,
+      /*0x04ce*/ 387,
+      -1, -1,
+      /*0x0439*/ 298,
+      -1, -1,
+      /*0x044e*/ 319,
+      /*0x00ee*/ 39,
+      /*0x2c5a*/ 755,
+      /*0x24da*/ 697,
+      /*0x01bf*/ 137,
+      -1, -1, -1,
+      /*0x10437*/ 997,
+      /*0x1eaf*/ 559,
+      /*0x1e2f*/ 500,
+      /*0x04af*/ 372,
+      /*0x012f*/ 79,
+      /*0x2caf*/ 791,
+      /*0x022f*/ 187,
+      /*0x052f*/ 436,
+      /*0x00f4*/ 45,
+      /*0x01fd*/ 163,
+      /*0x2c3d*/ 726,
+      -1,
+      /*0x1ea9*/ 556,
+      /*0x1e29*/ 497,
+      /*0x04a9*/ 369,
+      /*0x0129*/ 76,
+      /*0x2ca9*/ 788,
+      /*0x0229*/ 184,
+      /*0x0529*/ 433,
+      /*0xa73d*/ 910,
+      -1,
+      /*0x2c39*/ 722,
+      /*0x0272*/ 220,
+      /*0x0572*/ 454,
+      /*0x2c4e*/ 743,
+      /*0x10435*/ 995,
+      /*0xa7a9*/ 955,
+      /*0x1f72*/ 650,
+      /*0x0292*/ 231,
+      /*0x10442*/ 1008,
+      /*0xa739*/ 908,
+      /*0x1ea1*/ 552,
+      /*0x1e21*/ 493,
+      /*0x04a1*/ 365,
+      /*0x0121*/ 72,
+      /*0x2ca1*/ 784,
+      /*0x2179*/ 679,
+      /*0x0521*/ 429,
+      /*0x1efb*/ 597,
+      /*0x1e7b*/ 538,
+      /*0x04fb*/ 410,
+      /*0x1f21*/ 615,
+      /*0x10431*/ 991,
+      /*0x0562*/ 438,
+      /*0x057b*/ 463,
+      /*0xa7a1*/ 951,
+      /*0x047b*/ 350,
+      /*0x1f62*/ 642,
+      /*0x1f7b*/ 659,
+      /*0x2175*/ 675,
+      /*0xa72f*/ 904,
+      /*0x1e19*/ 489,
+      /*0x0499*/ 361,
+      /*0x0119*/ 68,
+      /*0x2c99*/ 780,
+      /*0x0219*/ 177,
+      /*0x0519*/ 425,
+      /*0x04c6*/ 383,
+      /*0x0146*/ 89,
+      /*0x00f0*/ 41,
+      /*0x118c2*/ 1024,
+      /*0xa729*/ 901,
+      -1,
+      /*0x0446*/ 311,
+      /*0xa799*/ 947,
+      /*0x2171*/ 671,
+      /*0x1ef7*/ 595,
+      /*0x1e77*/ 536,
+      /*0x04f7*/ 408,
+      /*0x0177*/ 113,
+      /*0x0268*/ 214,
+      /*0x0568*/ 444,
+      /*0x0577*/ 459,
+      -1,
+      /*0x0477*/ 348,
+      -1,
+      /*0x1f77*/ 655,
+      -1,
+      /*0x24e2*/ 705,
+      /*0xa699*/ 896,
+      -1,
+      /*0x1eff*/ 599,
+      /*0x1e7f*/ 540,
+      /*0x04ff*/ 412,
+      /*0x04cc*/ 386,
+      /*0x03bd*/ 255,
+      -1,
+      /*0x057f*/ 467,
+      /*0x0287*/ 225,
+      /*0x047f*/ 352,
+      /*0x044c*/ 317,
+      /*0x04c8*/ 384,
+      /*0x0148*/ 90,
+      -1, -1,
+      /*0x2c46*/ 735,
+      /*0x03b9*/ 251,
+      /*0x0448*/ 313,
+      /*0x0195*/ 123,
+      /*0x03ce*/ 271,
+      -1,
+      /*0x04c4*/ 382,
+      /*0x0144*/ 88,
+      /*0x2d2d*/ 860,
+      /*0x0079*/ 23,
+      /*0x2c68*/ 763,
+      /*0x24e8*/ 711,
+      /*0x0444*/ 309,
+      -1,
+      /*0x1f44*/ 634,
+      /*0x00f3*/ 44,
+      /*0x1ebb*/ 565,
+      /*0x1e3b*/ 506,
+      /*0x04bb*/ 378,
+      /*0x214e*/ 669,
+      /*0x2cbb*/ 797,
+      /*0x03af*/ 242,
+      /*0x0075*/ 19,
+      -1,
+      /*0x043b*/ 300,
+      -1, -1,
+      /*0x2c4c*/ 741,
+      -1,
+      /*0x0192*/ 122,
+      -1,
+      /*0x00eb*/ 36,
+      -1,
+      /*0x2d1c*/ 849,
+      /*0x2c48*/ 737,
+      /*0xa77f*/ 938,
+      -1,
+      /*0x03f2*/ 285,
+      /*0x0071*/ 15,
+      /*0x037d*/ 238,
+      /*0x01f9*/ 161,
+      -1,
+      /*0x00e4*/ 29,
+      -1,
+      /*0x2c44*/ 733,
+      /*0x1eab*/ 557,
+      /*0x1e2b*/ 498,
+      /*0x04ab*/ 370,
+      /*0x012b*/ 77,
+      /*0x2cab*/ 789,
+      /*0x022b*/ 185,
+      /*0x052b*/ 434,
+      /*0x2172*/ 672,
+      /*0x01f5*/ 160,
+      /*0x0256*/ 204,
+      -1,
+      /*0x2c3b*/ 724,
+      /*0x0456*/ 327,
+      /*0x03fb*/ 288,
+      /*0x1e17*/ 488,
+      /*0x0497*/ 360,
+      /*0x0117*/ 67,
+      /*0x2c97*/ 779,
+      /*0x0217*/ 176,
+      /*0x0517*/ 424,
+      /*0xa73b*/ 909,
+      /*0x1e1f*/ 492,
+      /*0x049f*/ 364,
+      /*0x011f*/ 71,
+      /*0x2c9f*/ 783,
+      /*0x021f*/ 180,
+      /*0x051f*/ 428,
+      /*0xa797*/ 946,
+      /*0x217b*/ 681,
+      /*0xff42*/ 957,
+      /*0x03c6*/ 263,
+      -1, -1,
+      /*0x0436*/ 295,
+      /*0xa79f*/ 950,
+      /*0x1f36*/ 628,
+      /*0x1043d*/ 1003,
+      -1, -1, -1,
+      /*0x2d25*/ 858,
+      -1,
+      /*0xa697*/ 895,
+      /*0x01da*/ 147,
+      /*0x2c56*/ 751,
+      /*0x24d6*/ 693,
+      -1,
+      /*0x10439*/ 999,
+      -1,
+      /*0xa72b*/ 902,
+      /*0x1044e*/ 1020,
+      /*0x118da*/ 1048,
+      -1, -1, -1, -1,
+      /*0x2177*/ 677,
+      /*0x03cc*/ 269,
+      -1,
+      /*0x01bd*/ 136,
+      -1, -1, -1, -1,
+      /*0x03c8*/ 265,
+      /*0x2c36*/ 719,
+      /*0x2d23*/ 856,
+      /*0x1042f*/ 989,
+      -1,
+      /*0x0254*/ 203,
+      /*0x01b9*/ 135,
+      /*0x217f*/ 685,
+      /*0x0454*/ 325,
+      /*0x01ce*/ 141,
+      /*0x03c4*/ 261,
+      /*0x0072*/ 16,
+      -1, -1,
+      /*0x10429*/ 983,
+      /*0x1e89*/ 545,
+      /*0x1e09*/ 481,
+      /*0x118ce*/ 1036,
+      /*0x0109*/ 60,
+      /*0x2c89*/ 772,
+      /*0x0209*/ 169,
+      /*0x0509*/ 417,
+      /*0x03bb*/ 253,
+      -1,
+      /*0x1e8d*/ 547,
+      /*0x1e0d*/ 483,
+      /*0x048d*/ 355,
+      /*0x010d*/ 62,
+      /*0x2c8d*/ 774,
+      /*0x020d*/ 171,
+      /*0x050d*/ 419,
+      /*0x0062*/ 1,
+      /*0x1e1d*/ 491,
+      /*0x049d*/ 363,
+      /*0x011d*/ 70,
+      /*0x2c9d*/ 782,
+      /*0x021d*/ 179,
+      /*0x051d*/ 427,
+      -1,
+      /*0x0458*/ 329,
+      /*0x2c54*/ 749,
+      /*0x24d4*/ 691,
+      /*0x00ea*/ 35,
+      /*0x0252*/ 201,
+      /*0xa689*/ 888,
+      /*0xa79d*/ 949,
+      /*0x0452*/ 323,
+      /*0x025c*/ 208,
+      -1,
+      /*0x04ca*/ 385,
+      /*0x045c*/ 333,
+      -1,
+      /*0x2d05*/ 826,
+      /*0xa68d*/ 890,
+      /*0x00fa*/ 50,
+      /*0x044a*/ 315,
+      /*0x01a1*/ 127,
+      /*0x10446*/ 1012,
+      /*0x017c*/ 115,
+      /*0x0068*/ 7,
+      /*0x0077*/ 21,
+      /*0x057c*/ 464,
+      -1,
+      /*0x01fb*/ 162,
+      -1,
+      /*0x1f7c*/ 660,
+      -1,
+      /*0x0434*/ 293,
+      /*0x2d03*/ 824,
+      /*0x1f34*/ 626,
+      /*0x045e*/ 335,
+      /*0x2c58*/ 753,
+      /*0x24d8*/ 695,
+      -1, -1,
+      /*0x0199*/ 124,
+      /*0x03b6*/ 248,
+      -1,
+      /*0x2c52*/ 747,
+      /*0x24d2*/ 689,
+      /*0x01c6*/ 138,
+      /*0x0260*/ 209,
+      /*0x2c5c*/ 757,
+      /*0x24dc*/ 699,
+      /*0x1044c*/ 1018,
+      /*0x0371*/ 233,
+      /*0x1f60*/ 640,
+      /*0x2c4a*/ 739,
+      /*0x118c6*/ 1028,
+      -1, -1,
+      /*0x10448*/ 1014,
+      -1, -1, -1,
+      /*0x0430*/ 289,
+      /*0xff5a*/ 981,
+      /*0x1f30*/ 622,
+      /*0x0432*/ 291,
+      /*0x2c34*/ 717,
+      /*0x1f32*/ 624,
+      /*0x10444*/ 1010,
+      /*0x2c5e*/ 759,
+      /*0x24de*/ 701,
+      /*0xa77c*/ 937,
+      -1,
+      /*0x01ff*/ 164,
+      /*0x01cc*/ 140,
+      -1, -1, -1, -1, -1,
+      /*0x1043b*/ 1001,
+      -1,
+      /*0x118cc*/ 1034,
+      -1,
+      /*0x24e0*/ 703,
+      -1,
+      /*0x00ec*/ 37,
+      -1, -1,
+      /*0x118c8*/ 1030,
+      -1,
+      /*0x1fe0*/ 666,
+      -1,
+      /*0xff4e*/ 969,
+      /*0x2c30*/ 713,
+      -1, -1,
+      /*0x2c32*/ 715,
+      -1,
+      /*0x118c4*/ 1026,
+      -1, -1,
+      /*0x1fb0*/ 662,
+      -1, -1, -1, -1, -1, -1,
+      /*0x1042b*/ 985,
+      -1, -1, -1, -1, -1,
+      /*0x0289*/ 227,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x03ca*/ 267,
+      -1, -1,
+      /*0x2d27*/ 859,
+      -1,
+      /*0x10436*/ 996,
+      -1,
+      /*0x01d6*/ 145,
+      -1, -1, -1, -1,
+      /*0x03b4*/ 246,
+      -1, -1,
+      /*0x118d6*/ 1044,
+      -1, -1,
+      /*0x00f8*/ 48,
+      -1, -1, -1, -1,
+      /*0x217c*/ 682,
+      -1,
+      /*0x2d15*/ 842,
+      /*0x037b*/ 236,
+      -1,
+      /*0x01b6*/ 134,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff46*/ 961,
+      /*0x00e6*/ 31,
+      -1, -1, -1, -1, -1, -1,
+      /*0x03b2*/ 244,
+      -1,
+      /*0x2d13*/ 840,
+      -1, -1, -1, -1, -1,
+      /*0x2d12*/ 839,
+      /*0x00ef*/ 40,
+      -1,
+      /*0x0377*/ 235,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0xff4c*/ 967,
+      -1, -1, -1,
+      /*0x00ed*/ 38,
+      /*0x01d4*/ 144,
+      -1,
+      /*0xff48*/ 963,
+      -1, -1, -1, -1, -1,
+      /*0x118d4*/ 1042,
+      -1, -1, -1,
+      /*0xff44*/ 959,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x1044a*/ 1016,
+      -1, -1, -1, -1, -1, -1,
+      /*0x01d8*/ 146,
+      -1,
+      /*0x00f6*/ 47,
+      -1, -1,
+      /*0x10434*/ 994,
+      -1,
+      /*0x01d2*/ 143,
+      /*0x118d8*/ 1046,
+      -1, -1,
+      /*0x01dc*/ 148,
+      -1,
+      /*0x2d07*/ 828,
+      -1,
+      /*0x118d2*/ 1040,
+      -1, -1, -1,
+      /*0x118dc*/ 1050,
+      -1, -1, -1, -1,
+      /*0x118ca*/ 1032,
+      -1,
+      /*0xff56*/ 977,
+      -1,
+      /*0x01b4*/ 133,
+      -1, -1,
+      /*0x00fd*/ 53,
+      -1,
+      /*0x10430*/ 990,
+      -1, -1,
+      /*0x10432*/ 992,
+      -1, -1,
+      /*0x118de*/ 1052,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x01b0*/ 132,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0xff54*/ 975,
+      -1, -1,
+      /*0x2d21*/ 854,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2d19*/ 846,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff58*/ 979,
+      -1, -1, -1, -1, -1, -1,
+      /*0xff52*/ 973,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0xff4a*/ 965,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x037c*/ 237,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00f9*/ 49,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x00f5*/ 46,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x00f1*/ 42,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2d17*/ 844,
+      -1, -1, -1, -1, -1, -1,
+      /*0x2d1f*/ 852,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1,
+      /*0x00f2*/ 43,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x2d09*/ 830,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x2d0d*/ 834,
+      -1,
+      /*0x00e2*/ 27,
+      /*0x00fb*/ 51,
+      -1, -1, -1,
+      /*0x2d1d*/ 850,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1,
+      /*0x00e8*/ 33,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x00ff*/ 55,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x00fc*/ 52,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1,
+      /*0x00e0*/ 25
+    };
+
+  if (code <= MAX_CODE_VALUE && code >= MIN_CODE_VALUE)
+    {
+      register int key = onigenc_unicode_CaseUnfold_11_hash(code);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code1_equal(code, CaseUnfold_11_Table[s].from))
+            return &CaseUnfold_11_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_12_Type CaseUnfold_12_Table[] = {
+#define CaseUnfold_12 (*(CaseUnfold_12_Type (*)[58])(CaseUnfold_12_Table+0))
+  {{0x0061, 0x02be}, {1, {0x1e9a}}},
+  {{0x0066, 0x0066}, {1, {0xfb00}}},
+  {{0x0066, 0x0069}, {1, {0xfb01}}},
+  {{0x0066, 0x006c}, {1, {0xfb02}}},
+  {{0x0068, 0x0331}, {1, {0x1e96}}},
+  {{0x006a, 0x030c}, {1, {0x01f0}}},
+  {{0x0073, 0x0073}, {2, {0x00df, 0x1e9e}}},
+  {{0x0073, 0x0074}, {2, {0xfb05, 0xfb06}}},
+  {{0x0074, 0x0308}, {1, {0x1e97}}},
+  {{0x0077, 0x030a}, {1, {0x1e98}}},
+  {{0x0079, 0x030a}, {1, {0x1e99}}},
+  {{0x02bc, 0x006e}, {1, {0x0149}}},
+  {{0x03ac, 0x03b9}, {1, {0x1fb4}}},
+  {{0x03ae, 0x03b9}, {1, {0x1fc4}}},
+  {{0x03b1, 0x0342}, {1, {0x1fb6}}},
+  {{0x03b1, 0x03b9}, {2, {0x1fb3, 0x1fbc}}},
+  {{0x03b7, 0x0342}, {1, {0x1fc6}}},
+  {{0x03b7, 0x03b9}, {2, {0x1fc3, 0x1fcc}}},
+  {{0x03b9, 0x0342}, {1, {0x1fd6}}},
+  {{0x03c1, 0x0313}, {1, {0x1fe4}}},
+  {{0x03c5, 0x0313}, {1, {0x1f50}}},
+  {{0x03c5, 0x0342}, {1, {0x1fe6}}},
+  {{0x03c9, 0x0342}, {1, {0x1ff6}}},
+  {{0x03c9, 0x03b9}, {2, {0x1ff3, 0x1ffc}}},
+  {{0x03ce, 0x03b9}, {1, {0x1ff4}}},
+  {{0x0565, 0x0582}, {1, {0x0587}}},
+  {{0x0574, 0x0565}, {1, {0xfb14}}},
+  {{0x0574, 0x056b}, {1, {0xfb15}}},
+  {{0x0574, 0x056d}, {1, {0xfb17}}},
+  {{0x0574, 0x0576}, {1, {0xfb13}}},
+  {{0x057e, 0x0576}, {1, {0xfb16}}},
+  {{0x1f00, 0x03b9}, {2, {0x1f80, 0x1f88}}},
+  {{0x1f01, 0x03b9}, {2, {0x1f81, 0x1f89}}},
+  {{0x1f02, 0x03b9}, {2, {0x1f82, 0x1f8a}}},
+  {{0x1f03, 0x03b9}, {2, {0x1f83, 0x1f8b}}},
+  {{0x1f04, 0x03b9}, {2, {0x1f84, 0x1f8c}}},
+  {{0x1f05, 0x03b9}, {2, {0x1f85, 0x1f8d}}},
+  {{0x1f06, 0x03b9}, {2, {0x1f86, 0x1f8e}}},
+  {{0x1f07, 0x03b9}, {2, {0x1f87, 0x1f8f}}},
+  {{0x1f20, 0x03b9}, {2, {0x1f90, 0x1f98}}},
+  {{0x1f21, 0x03b9}, {2, {0x1f91, 0x1f99}}},
+  {{0x1f22, 0x03b9}, {2, {0x1f92, 0x1f9a}}},
+  {{0x1f23, 0x03b9}, {2, {0x1f93, 0x1f9b}}},
+  {{0x1f24, 0x03b9}, {2, {0x1f94, 0x1f9c}}},
+  {{0x1f25, 0x03b9}, {2, {0x1f95, 0x1f9d}}},
+  {{0x1f26, 0x03b9}, {2, {0x1f96, 0x1f9e}}},
+  {{0x1f27, 0x03b9}, {2, {0x1f97, 0x1f9f}}},
+  {{0x1f60, 0x03b9}, {2, {0x1fa0, 0x1fa8}}},
+  {{0x1f61, 0x03b9}, {2, {0x1fa1, 0x1fa9}}},
+  {{0x1f62, 0x03b9}, {2, {0x1fa2, 0x1faa}}},
+  {{0x1f63, 0x03b9}, {2, {0x1fa3, 0x1fab}}},
+  {{0x1f64, 0x03b9}, {2, {0x1fa4, 0x1fac}}},
+  {{0x1f65, 0x03b9}, {2, {0x1fa5, 0x1fad}}},
+  {{0x1f66, 0x03b9}, {2, {0x1fa6, 0x1fae}}},
+  {{0x1f67, 0x03b9}, {2, {0x1fa7, 0x1faf}}},
+  {{0x1f70, 0x03b9}, {1, {0x1fb2}}},
+  {{0x1f74, 0x03b9}, {1, {0x1fc2}}},
+  {{0x1f7c, 0x03b9}, {1, {0x1ff2}}},
+#define CaseUnfold_12_Locale (*(CaseUnfold_12_Type (*)[1])(CaseUnfold_12_Table+58))
+  {{0x0069, 0x0307}, {1, {0x0130}}},
 };
 
-static const CaseUnfold_13_Type CaseUnfold_13[] = {
- { {0x0066, 0x0066, 0x0069}, {1, {0xfb03 }}},
- { {0x0066, 0x0066, 0x006c}, {1, {0xfb04 }}},
- { {0x03b1, 0x0342, 0x03b9}, {1, {0x1fb7 }}},
- { {0x03b7, 0x0342, 0x03b9}, {1, {0x1fc7 }}},
- { {0x03b9, 0x0308, 0x0300}, {1, {0x1fd2 }}},
- { {0x03b9, 0x0308, 0x0301}, {2, {0x0390, 0x1fd3 }}},
- { {0x03b9, 0x0308, 0x0342}, {1, {0x1fd7 }}},
- { {0x03c5, 0x0308, 0x0300}, {1, {0x1fe2 }}},
- { {0x03c5, 0x0308, 0x0301}, {2, {0x03b0, 0x1fe3 }}},
- { {0x03c5, 0x0308, 0x0342}, {1, {0x1fe7 }}},
- { {0x03c5, 0x0313, 0x0300}, {1, {0x1f52 }}},
- { {0x03c5, 0x0313, 0x0301}, {1, {0x1f54 }}},
- { {0x03c5, 0x0313, 0x0342}, {1, {0x1f56 }}},
- { {0x03c9, 0x0342, 0x03b9}, {1, {0x1ff7 }}},
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -k1,2,3,4,5,6 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_12_hash -N onigenc_unicode_CaseUnfold_12_lookup -n  */
+
+/* maximum key range = 71, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_12_hash(const OnigCodePoint *codes)
+{
+  static const unsigned char asso_values[] =
+    {
+       3, 58, 54, 57, 56, 16,  8,  2, 43, 82,
+       3,  1, 23, 82, 82, 82, 82, 82, 82,  4,
+      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+      82, 82, 52, 51, 50, 49, 48, 47, 46, 45,
+      82, 82, 82, 82, 43, 82, 42, 82, 82, 13,
+      82, 82, 82, 82, 82, 11, 82,  1, 82, 82,
+      14, 82,  1, 82, 82, 31,  3, 82, 82, 30,
+      82, 82, 82, 10, 82, 82, 82, 82, 37, 82,
+      82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+      82, 82, 82, 82, 82, 82, 37, 15, 36, 35,
+      34, 17,  1, 33, 12,  4, 23, 23, 26, 21,
+      13, 82, 27, 82, 82,  2,  5, 82, 11, 16,
+      82, 15, 82, 82, 23, 82,  8, 82
+    };
+  return asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+static const CodePointList2 *
+onigenc_unicode_CaseUnfold_12_lookup(const OnigCodePoint *codes)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x61,
+      MAX_CODE_VALUE = 0x1f7c,
+      TOTAL_KEYWORDS = 59,
+      MIN_WORD_LENGTH = 6,
+      MAX_WORD_LENGTH = 6,
+      MIN_HASH_VALUE = 11,
+      MAX_HASH_VALUE = 81
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1,
+      /*0x1f66,0x03b9*/ 53,
+      /*0x1f07,0x03b9*/ 38,
+      /*0x1f00,0x03b9*/ 31,
+      /*0x0066,0x0066*/ 1,
+      /*0x1f74,0x03b9*/ 56,
+      /*0x0073,0x0073*/ 6,
+      /*0x0066,0x0069*/ 2,
+      /*0x1f06,0x03b9*/ 37,
+      /*0x0073,0x0074*/ 7,
+      /*0x03b9,0x0342*/ 18,
+      /*0x03c9,0x03b9*/ 23,
+      /*0x03b7,0x03b9*/ 17,
+      /*0x0069,0x0307*/ 58,
+      /*0x03b1,0x03b9*/ 15,
+      /*0x1f61,0x03b9*/ 48,
+      /*0x1f05,0x03b9*/ 36,
+      /*0x1f65,0x03b9*/ 52,
+      /*0x0574,0x0576*/ 29,
+      /*0x03c9,0x0342*/ 22,
+      /*0x03b7,0x0342*/ 16,
+      /*0x057e,0x0576*/ 30,
+      /*0x03b1,0x0342*/ 14,
+      /*0x1f7c,0x03b9*/ 57,
+      /*0x0574,0x0565*/ 26,
+      /*0x0079,0x030a*/ 10,
+      /*0x0077,0x030a*/ 9,
+      /*0x1f70,0x03b9*/ 55,
+      /*0x0574,0x056d*/ 28,
+      /*0x0066,0x006c*/ 3,
+      /*0x0574,0x056b*/ 27,
+      /*0x0061,0x02be*/ 0,
+      /*0x0068,0x0331*/ 4,
+      /*0x1f67,0x03b9*/ 54,
+      /*0x1f64,0x03b9*/ 51,
+      /*0x1f63,0x03b9*/ 50,
+      /*0x1f62,0x03b9*/ 49,
+      /*0x1f60,0x03b9*/ 47,
+      /*0x03ce,0x03b9*/ 24,
+      /*0x03c5,0x0342*/ 21,
+      /*0x03c5,0x0313*/ 20,
+      /*0x03c1,0x0313*/ 19,
+      /*0x02bc,0x006e*/ 11,
+      /*0x03ae,0x03b9*/ 13,
+      /*0x03ac,0x03b9*/ 12,
+      /*0x1f27,0x03b9*/ 46,
+      /*0x1f26,0x03b9*/ 45,
+      /*0x1f25,0x03b9*/ 44,
+      /*0x1f24,0x03b9*/ 43,
+      /*0x1f23,0x03b9*/ 42,
+      /*0x1f22,0x03b9*/ 41,
+      /*0x1f21,0x03b9*/ 40,
+      /*0x1f20,0x03b9*/ 39,
+      /*0x006a,0x030c*/ 5,
+      /*0x1f02,0x03b9*/ 33,
+      /*0x0074,0x0308*/ 8,
+      /*0x1f04,0x03b9*/ 35,
+      /*0x1f03,0x03b9*/ 34,
+      /*0x1f01,0x03b9*/ 32,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0565,0x0582*/ 25
+    };
+
+  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
+      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE)
+    {
+      register int key = onigenc_unicode_CaseUnfold_12_hash(codes);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code2_equal(codes, CaseUnfold_12_Table[s].from))
+            return &CaseUnfold_12_Table[s].to;
+        }
+    }
+  return 0;
+}
+
+static const CaseUnfold_13_Type CaseUnfold_13_Table[] = {
+#define CaseUnfold_13 (*(CaseUnfold_13_Type (*)[14])(CaseUnfold_13_Table+0))
+  {{0x0066, 0x0066, 0x0069}, {1, {0xfb03}}},
+  {{0x0066, 0x0066, 0x006c}, {1, {0xfb04}}},
+  {{0x03b1, 0x0342, 0x03b9}, {1, {0x1fb7}}},
+  {{0x03b7, 0x0342, 0x03b9}, {1, {0x1fc7}}},
+  {{0x03b9, 0x0308, 0x0300}, {1, {0x1fd2}}},
+  {{0x03b9, 0x0308, 0x0301}, {2, {0x0390, 0x1fd3}}},
+  {{0x03b9, 0x0308, 0x0342}, {1, {0x1fd7}}},
+  {{0x03c5, 0x0308, 0x0300}, {1, {0x1fe2}}},
+  {{0x03c5, 0x0308, 0x0301}, {2, {0x03b0, 0x1fe3}}},
+  {{0x03c5, 0x0308, 0x0342}, {1, {0x1fe7}}},
+  {{0x03c5, 0x0313, 0x0300}, {1, {0x1f52}}},
+  {{0x03c5, 0x0313, 0x0301}, {1, {0x1f54}}},
+  {{0x03c5, 0x0313, 0x0342}, {1, {0x1f56}}},
+  {{0x03c9, 0x0342, 0x03b9}, {1, {0x1ff7}}},
 };
 
-#define FOLD_TABLE_SIZE		1357
-#define UNFOLD1_TABLE_SIZE	1207
-#define UNFOLD2_TABLE_SIZE	88
-#define UNFOLD3_TABLE_SIZE	23
+/* C code produced by gperf version 3.0.3 */
+/* Command-line: gperf -7 -k1,2,3,4,5,6,7,8,9 -F,-1 -c -j1 -i1 -t -T -E -C -H onigenc_unicode_CaseUnfold_13_hash -N onigenc_unicode_CaseUnfold_13_lookup -n  */
+
+/* maximum key range = 20, duplicates = 0 */
+
+#ifdef __GNUC__
+__inline
+#else
+#ifdef __cplusplus
+inline
+#endif
+#endif
+/*ARGSUSED*/
+static unsigned int
+onigenc_unicode_CaseUnfold_13_hash(const OnigCodePoint *codes)
+{
+  static const unsigned char asso_values[] =
+    {
+       7,  4, 47, 47, 47, 47,  1,  1,  2, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47,  1,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 11,
+      47, 47, 47, 47, 47, 10, 47,  2, 47, 47,
+      47, 47, 47, 47, 47, 47,  1, 47, 47,  1,
+      47, 47, 47,  9, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47,  1, 47, 47,  2, 47, 47,  1, 47,
+      47, 47, 47, 47, 47, 47, 47, 47, 47, 47,
+      47, 47, 47, 47, 47, 47, 47, 47
+    };
+  return asso_values[bits_at(codes, 8)] + asso_values[bits_at(codes, 7)] + asso_values[bits_at(codes, 6)] + asso_values[bits_at(codes, 5)] + asso_values[bits_at(codes, 4)] + asso_values[bits_at(codes, 3)] + asso_values[bits_at(codes, 2)] + asso_values[bits_at(codes, 1)] + asso_values[bits_at(codes, 0)];
+}
+
+#ifdef __GNUC__
+__inline
+#ifdef __GNUC_STDC_INLINE__
+__attribute__ ((__gnu_inline__))
+#endif
+#endif
+static const CodePointList2 *
+onigenc_unicode_CaseUnfold_13_lookup(const OnigCodePoint *codes)
+{
+  enum
+    {
+      MIN_CODE_VALUE = 0x66,
+      MAX_CODE_VALUE = 0x3c9,
+      TOTAL_KEYWORDS = 14,
+      MIN_WORD_LENGTH = 9,
+      MAX_WORD_LENGTH = 9,
+      MIN_HASH_VALUE = 27,
+      MAX_HASH_VALUE = 46
+    };
+
+  static const short wordlist[] =
+    {
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1, -1, -1, -1,
+      -1, -1, -1,
+      /*0x03c5,0x0313,0x0342*/ 12,
+      /*0x03c5,0x0308,0x0342*/ 9,
+      /*0x03b9,0x0308,0x0342*/ 6,
+      /*0x03c5,0x0313,0x0301*/ 11,
+      /*0x03c5,0x0308,0x0301*/ 8,
+      /*0x03b9,0x0308,0x0301*/ 5,
+      /*0x03c5,0x0313,0x0300*/ 10,
+      /*0x03c5,0x0308,0x0300*/ 7,
+      /*0x03b9,0x0308,0x0300*/ 4,
+      /*0x03c9,0x0342,0x03b9*/ 13,
+      /*0x03b7,0x0342,0x03b9*/ 3,
+      /*0x03b1,0x0342,0x03b9*/ 2,
+      -1, -1, -1, -1, -1, -1,
+      /*0x0066,0x0066,0x006c*/ 1,
+      /*0x0066,0x0066,0x0069*/ 0
+    };
+
+  if (codes[0] <= MAX_CODE_VALUE && codes[0] >= MIN_CODE_VALUE &&
+      codes[1] <= MAX_CODE_VALUE && codes[1] >= MIN_CODE_VALUE &&
+      codes[2] <= MAX_CODE_VALUE && codes[2] >= MIN_CODE_VALUE)
+    {
+      register int key = onigenc_unicode_CaseUnfold_13_hash(codes);
+
+      if (key <= MAX_HASH_VALUE && key >= 0)
+        {
+          register short s = wordlist[key];
+
+          if (s >= 0 && code3_equal(codes, CaseUnfold_13_Table[s].from))
+            return &CaseUnfold_13_Table[s].to;
+        }
+    }
+  return 0;
+}
+
diff --git a/enc/unicode/name2ctype.h b/enc/unicode/name2ctype.h