jruby · Feb 17, 2018 · Feb 17, 2018 · Feb 17, 2018 · Feb 17, 2018 · Feb 17, 2018
diff --git a/lib/ruby/stdlib/English.rb b/lib/ruby/stdlib/English.rb
@@ -1,8 +1,4 @@
-# frozen_string_literal: false
-#
-#  Modified for JRuby
-#  In JRuby, we define these aliases by default, so this file
-#  does nothing.
+# frozen_string_literal: true
 #
 #  Include the English library file in a Ruby script, and you can
 #  reference the global variables such as \VAR{\$\_} using less
@@ -53,67 +49,69 @@
 #
 module English end if false
 
+=begin Modified for JRuby: we define these aliases by default
+
 # The exception object passed to +raise+.
-#alias $ERROR_INFO              $!
+alias $ERROR_INFO              $!
 
 # The stack backtrace generated by the last
 # exception. <tt>See Kernel.caller</tt> for details. Thread local.
-#alias $ERROR_POSITION          $@
+alias $ERROR_POSITION          $@
 
 # The default separator pattern used by <tt>String.split</tt>.  May be
 # set from the command line using the <tt>-F</tt> flag.
-#alias $FS                      $;
+alias $FS                      $;
 
 # The default separator pattern used by <tt>String.split</tt>.  May be
 # set from the command line using the <tt>-F</tt> flag.
-#alias $FIELD_SEPARATOR         $;
+alias $FIELD_SEPARATOR         $;
 
 # The separator string output between the parameters to methods such
 # as <tt>Kernel.print</tt> and <tt>Array.join</tt>. Defaults to +nil+,
 # which adds no text.
-#alias $OFS                     $,
+alias $OFS                     $,
 
 # The separator string output between the parameters to methods such
 # as <tt>Kernel.print</tt> and <tt>Array.join</tt>. Defaults to +nil+,
 # which adds no text.
-#alias $OUTPUT_FIELD_SEPARATOR  $,
+alias $OUTPUT_FIELD_SEPARATOR  $,
 
 # The input record separator (newline by default). This is the value
 # that routines such as <tt>Kernel.gets</tt> use to determine record
 # boundaries. If set to +nil+, +gets+ will read the entire file.
-#alias $RS                      $/
+alias $RS                      $/
 
 # The input record separator (newline by default). This is the value
 # that routines such as <tt>Kernel.gets</tt> use to determine record
 # boundaries. If set to +nil+, +gets+ will read the entire file.
-#alias $INPUT_RECORD_SEPARATOR  $/
+alias $INPUT_RECORD_SEPARATOR  $/
 
 # The string appended to the output of every call to methods such as
 # <tt>Kernel.print</tt> and <tt>IO.write</tt>. The default value is
 # +nil+.
-#alias $ORS                     $\
+alias $ORS                     $\
 
 # The string appended to the output of every call to methods such as
 # <tt>Kernel.print</tt> and <tt>IO.write</tt>. The default value is
 # +nil+.
-#alias $OUTPUT_RECORD_SEPARATOR $\
+alias $OUTPUT_RECORD_SEPARATOR $\
 
 # The number of the last line read from the current input file.
-#alias $INPUT_LINE_NUMBER       $.
+alias $INPUT_LINE_NUMBER       $.
 
 # The number of the last line read from the current input file.
-#alias $NR                      $.
+alias $NR                      $.
 
 # The last line read by <tt>Kernel.gets</tt> or
 # <tt>Kernel.readline</tt>. Many string-related functions in the
 # +Kernel+ module operate on <tt>$_</tt> by default. The variable is
 # local to the current scope. Thread local.
-#alias $LAST_READ_LINE          $_
+alias $LAST_READ_LINE          $_
 
 # The destination of output for <tt>Kernel.print</tt>
 # and <tt>Kernel.printf</tt>. The default value is
 # <tt>$stdout</tt>.
-#alias $DEFAULT_OUTPUT          $>
+alias $DEFAULT_OUTPUT          $>
 
 # An object that provides access to the concatenation
 # of the contents of all the files
@@ -138,54 +136,52 @@ module English end if false
 # returns a +File+ object for the file currently
 # being read. This may change as <tt>$<</tt> reads
 # through the files on the command line. Read only.
-#alias $DEFAULT_INPUT           $<
+alias $DEFAULT_INPUT           $<
 
 # The process number of the program being executed. Read only.
-#alias $PID                     $$
+alias $PID                     $$
 
 # The process number of the program being executed. Read only.
-#alias $PROCESS_ID              $$
+alias $PROCESS_ID              $$
 
 # The exit status of the last child process to terminate. Read
 # only. Thread local.
-#alias $CHILD_STATUS            $?
+alias $CHILD_STATUS            $?
 
 # A +MatchData+ object that encapsulates the results of a successful
 # pattern match. The variables <tt>$&</tt>, <tt>$`</tt>, <tt>$'</tt>,
 # and <tt>$1</tt> to <tt>$9</tt> are all derived from
 # <tt>$~</tt>. Assigning to <tt>$~</tt> changes the values of these
 # derived variables.  This variable is local to the current
 # scope.
-#alias $LAST_MATCH_INFO         $~
+alias $LAST_MATCH_INFO         $~
 
-# If set to any value apart from +nil+ or +false+, all pattern matches
-# will be case insensitive, string comparisons will ignore case, and
-# string hash values will be case insensitive. Deprecated
-#alias $IGNORECASE              $=
+# This variable is no longer effective. Deprecated.
+alias $IGNORECASE              $=
 
 # An array of strings containing the command-line
 # options from the invocation of the program. Options
 # used by the Ruby interpreter will have been
 # removed. Read only. Also known simply as +ARGV+.
-#alias $ARGV                    $*
+alias $ARGV                    $*
 
 # The string matched by the last successful pattern
 # match. This variable is local to the current
 # scope. Read only.
-#alias $MATCH                   $&
+alias $MATCH                   $&
 
 # The string preceding the match in the last
 # successful pattern match. This variable is local to
 # the current scope. Read only.
-#alias $PREMATCH                $`
+alias $PREMATCH                $`
 
 # The string following the match in the last
 # successful pattern match. This variable is local to
 # the current scope. Read only.
-#alias $POSTMATCH               $'
+alias $POSTMATCH               $'
 
 # The contents of the highest-numbered group matched in the last
 # successful pattern match. Thus, in <tt>"cat" =~ /(c|a)(t|z)/</tt>,
 # <tt>$+</tt> will be set to "t".  This variable is local to the
 # current scope. Read only.
-#alias $LAST_PAREN_MATCH        $+
+alias $LAST_PAREN_MATCH        $+
diff --git a/lib/ruby/stdlib/abbrev.rb b/lib/ruby/stdlib/abbrev.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # Copyright (c) 2001,2003 Akinori MUSHA <knu@iDaemons.org>
 #

diff --git a/lib/ruby/stdlib/base64.rb b/lib/ruby/stdlib/base64.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # = base64.rb: methods for base64-encoding and -decoding strings
 #
@@ -56,7 +56,7 @@ def encode64(bin)
   #    This is line three
   #    And so on...
   def decode64(str)
-    str.unpack("m").first
+    str.unpack1("m")
   end
 
   # Returns the Base64-encoded version of +bin+.
@@ -71,7 +71,7 @@ def strict_encode64(bin)
   # ArgumentError is raised if +str+ is incorrectly padded or contains
   # non-alphabet characters.  Note that CR or LF are also rejected.
   def strict_decode64(str)
-    str.unpack("m0").first
+    str.unpack1("m0")
   end
 
   # Returns the Base64-encoded version of +bin+.

diff --git a/lib/ruby/stdlib/benchmark.rb b/lib/ruby/stdlib/benchmark.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #--
 # benchmark.rb - a performance benchmarking library
 #

diff --git a/lib/ruby/stdlib/bigdecimal/math.rb b/lib/ruby/stdlib/bigdecimal/math.rb
@@ -38,7 +38,7 @@ module BigMath
   # Computes the square root of +decimal+ to the specified number of digits of
   # precision, +numeric+.
   #
-  #   BigMath.sqrt(BigDecimal.new('2'), 16).to_s
+  #   BigMath.sqrt(BigDecimal('2'), 16).to_s
   #   #=> "0.1414213562373095048801688724e1"
   #
   def sqrt(x, prec)
@@ -141,7 +141,7 @@ def cos(x, prec)
   #
   # If +decimal+ is NaN, returns NaN.
   #
-  #   BigMath.atan(BigDecimal.new('-1'), 16).to_s
+  #   BigMath.atan(BigDecimal('-1'), 16).to_s
   #   #=> "-0.785398163397448309615660845819878471907514682065e0"
   #
   def atan(x, prec)

diff --git a/lib/ruby/stdlib/bigdecimal/util.rb b/lib/ruby/stdlib/bigdecimal/util.rb
@@ -1,85 +1,91 @@
 # frozen_string_literal: false
-# BigDecimal extends the native Integer class to provide the #to_d method.
 #
-# When you require the BigDecimal library in your application, this method will
-# be available on Integer objects.
+#--
+# bigdecimal/util extends various native classes to provide the #to_d method,
+# and provides BigDecimal#to_d and BigDecimal#to_digits.
+#++
+
+
 class Integer < Numeric
   # call-seq:
   #     int.to_d  -> bigdecimal
   #
-  # Convert +int+ to a BigDecimal and return it.
+  # Returns the value of +int+ as a BigDecimal.
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     42.to_d
-  #     # => 0.42e2
+  #     42.to_d   # => 0.42e2
+  #
+  # See also BigDecimal::new.
   #
   def to_d
     BigDecimal(self)
   end
 end
 
-# BigDecimal extends the native Float class to provide the #to_d method.
-#
-# When you require BigDecimal in your application, this method will be
-# available on Float objects.
+
 class Float < Numeric
   # call-seq:
-  #     flt.to_d  -> bigdecimal
+  #     float.to_d             -> bigdecimal
+  #     float.to_d(precision)  -> bigdecimal
   #
-  # Convert +flt+ to a BigDecimal and return it.
+  # Returns the value of +float+ as a BigDecimal.
+  # The +precision+ parameter is used to determine the number of
+  # significant digits for the result (the default is Float::DIG).
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     0.5.to_d
-  #     # => 0.5e0
+  #     0.5.to_d         # => 0.5e0
+  #     1.234.to_d(2)    # => 0.12e1
+  #
+  # See also BigDecimal::new.
   #
   def to_d(precision=nil)
     BigDecimal(self, precision || Float::DIG)
   end
 end
 
-# BigDecimal extends the native String class to provide the #to_d method.
-#
-# When you require BigDecimal in your application, this method will be
-# available on String objects.
+
 class String
   # call-seq:
-  #     string.to_d  -> bigdecimal
+  #     str.to_d  -> bigdecimal
   #
-  # Convert +string+ to a BigDecimal and return it.
+  # Returns the result of interpreting leading characters in +str+
+  # as a BigDecimal.
   #
   #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     "0.5".to_d
-  #     # => 0.5e0
+  #     "0.5".to_d             # => 0.5e0
+  #     "123.45e1".to_d        # => 0.12345e4
+  #     "45.67 degrees".to_d   # => 0.4567e2
+  #
+  # See also BigDecimal::new.
   #
   def to_d
-    BigDecimal(self)
+    begin
+      BigDecimal(self)
+    rescue ArgumentError
+      BigDecimal(0)
+    end
   end
 end
 
-# BigDecimal extends the native Numeric class to provide the #to_digits and
-# #to_d methods.
-#
-# When you require BigDecimal in your application, this method will be
-# available on BigDecimal objects.
+
 class BigDecimal < Numeric
   # call-seq:
   #     a.to_digits -> string
   #
   # Converts a BigDecimal to a String of the form "nnnnnn.mmm".
   # This method is deprecated; use BigDecimal#to_s("F") instead.
   #
-  #     require 'bigdecimal'
   #     require 'bigdecimal/util'
   #
-  #     d = BigDecimal.new("3.14")
-  #     d.to_digits
-  #     # => "3.14"
+  #     d = BigDecimal("3.14")
+  #     d.to_digits                  # => "3.14"
+  #
   def to_digits
     if self.nan? || self.infinite? || self.zero?
       self.to_s
@@ -94,35 +100,35 @@ def to_digits
   #     a.to_d -> bigdecimal
   #
   # Returns self.
+  #
+  #     require 'bigdecimal/util'
+  #
+  #     d = BigDecimal("3.14")
+  #     d.to_d                       # => 0.314e1
+  #
   def to_d
     self
   end
 end
 
-# BigDecimal extends the native Rational class to provide the #to_d method.
-#
-# When you require BigDecimal in your application, this method will be
-# available on Rational objects.
+
 class Rational < Numeric
   # call-seq:
-  #   r.to_d(precision)   -> bigdecimal
+  #     rat.to_d(precision)  -> bigdecimal
   #
-  # Converts a Rational to a BigDecimal.
+  # Returns the value as a BigDecimal.
   #
-  # The required +precision+ parameter is used to determine the amount of
-  # significant digits for the result. See BigDecimal#div for more information,
-  # as it is used along with the #denominator and the +precision+ for
-  # parameters.
+  # The required +precision+ parameter is used to determine the number of
+  # significant digits for the result.
+  #
+  #     require 'bigdecimal'
+  #     require 'bigdecimal/util'
+  #
+  #     Rational(22, 7).to_d(3)   # => 0.314e1
+  #
+  # See also BigDecimal::new.
   #
-  #   r = (22/7.0).to_r
-  #   # => (7077085128725065/2251799813685248)
-  #   r.to_d(3)
-  #   # => 0.314e1
   def to_d(precision)
-    if precision <= 0
-      raise ArgumentError, "negative precision"
-    end
-    num = self.numerator
-    BigDecimal(num).div(self.denominator, precision)
+    BigDecimal(self, precision)
   end
 end
diff --git a/lib/ruby/stdlib/cgi.rb b/lib/ruby/stdlib/cgi.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 #
 # cgi.rb - cgi support library
 #