Merge branch 'master-2.4' into dist/2.4/xenial

Author: sorah

.revision.time

@@ -83,9 +83,8 @@ enc/windows_1251.c
 
 Oniguruma  ----   (C) K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
 
-http://www.geocities.jp/kosako3/oniguruma/
-http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/oniguruma/
-http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/
+https://github.com/kkos/oniguruma
+https://svnweb.freebsd.org/ports/head/devel/oniguruma/
 
    When this software is partly used or it is distributed with Ruby,
    this of Ruby follows the license of Ruby.
@@ -330,6 +329,8 @@ random.c
     http://www.math.keio.ac.jp/matumoto/emt.html
     email: [email protected]
 
+  The Wayback Machine url: http://web.archive.org/web/19990429082237/http://www.math.keio.ac.jp/matumoto/emt.html
+
 vm_dump.c:procstat_vm
 
   This file is under the new-style BSD license.
@@ -679,6 +680,8 @@ ext/win32ole/win32ole.c:
     License or the Artistic License, as specified in the README file
     of the Perl distribution.
 
+  The Wayback Machine url: http://web.archive.org/web/19970607104352/http://www.activeware.com:80/
+
 lib/rdoc/generator/template/darkfish/css/fonts.css:
 
   This file is licensed under the SIL Open Font License.

ChangeLog

@@ -2,7 +2,7 @@
 
   array.c -
 
-  $Author$
+  $Author: usa $
   created at: Fri Aug  6 09:46:12 JST 1993
 
   Copyright (C) 1993-2007 Yukihiro Matsumoto
@@ -5825,6 +5825,20 @@ rb_ary_sum(int argc, VALUE *argv, VALUE ary)
             else
                 goto not_float;
 
+            if (isnan(f)) continue;
+            if (isnan(x)) {
+                f = x;
+                continue;
+            }
+            if (isinf(x)) {
+                if (isinf(f) && signbit(x) != signbit(f))
+                    f = NAN;
+                else
+                    f = x;
+                continue;
+            }
+            if (isinf(f)) continue;
+
             t = f + x;
             if (fabs(f) >= fabs(x))
                 c += ((f - t) + x);

LEGAL

@@ -2,7 +2,7 @@
 
   bignum.c -
 
-  $Author$
+  $Author: nagachika $
   created at: Fri Jun 10 00:48:55 JST 1994
 
   Copyright (C) 1993-2007 Yukihiro Matsumoto

array.c

@@ -2,7 +2,7 @@
 #
 #   irb.rb - interactive ruby
 #   	$Release Version: 0.9.6 $
-#   	$Revision$
+#   	$Revision: 40560 $
 #   	by Keiju ISHITSUKA([email protected])
 #
 

bignum.c

@@ -1,6 +1,6 @@
 "exec" "${RUBY-ruby}" "-x" "$0" "$@" || true # -*- mode: ruby; coding: utf-8 -*-
 #!./ruby
-# $Id$
+# $Id: runner.rb 56395 2016-10-11 16:36:14Z kazu $
 
 # NOTE:
 # Never use optparse in this file.

bin/irb

@@ -2,7 +2,7 @@
 
   class.c -
 
-  $Author$
+  $Author: nagachika $
   created at: Tue Aug 10 15:05:44 JST 1993
 
   Copyright (C) 1993-2007 Yukihiro Matsumoto

bootstraptest/runner.rb

@@ -2,7 +2,7 @@
 
   compar.c -
 
-  $Author$
+  $Author: nobu $
   created at: Thu Aug 26 14:39:48 JST 1993
 
   Copyright (C) 1993-2007 Yukihiro Matsumoto

class.c

@@ -2,7 +2,7 @@
 
   compile.c - ruby node tree -> VM instruction sequence
 
-  $Author$
+  $Author: usa $
   created at: 04/01/01 03:42:15 JST
 
   Copyright (C) 2004-2007 Koichi Sasada
@@ -5177,6 +5177,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 1 &&
 	    nd_type(node->nd_args->nd_head) == NODE_STR &&
 	    ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
+            !ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal &&
 	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction) {
 	    VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);
 	    node->nd_args->nd_head->nd_lit = str;
@@ -6229,6 +6230,7 @@ iseq_compile_each(rb_iseq_t *iseq, LINK_ANCHOR *const ret, NODE *node, int poppe
 	    nd_type(node->nd_args) == NODE_ARRAY && node->nd_args->nd_alen == 2 &&
 	    nd_type(node->nd_args->nd_head) == NODE_STR &&
 	    ISEQ_COMPILE_DATA(iseq)->current_block == NULL &&
+            !ISEQ_COMPILE_DATA(iseq)->option->frozen_string_literal &&
 	    ISEQ_COMPILE_DATA(iseq)->option->specialized_instruction)
 	{
 	    VALUE str = rb_fstring(node->nd_args->nd_head->nd_lit);