ruby-changes:49248
From: nagachika <ko1@a...>
Date: Wed, 20 Dec 2017 23:55:39 +0900 (JST)
Subject: [ruby-changes:49248] nagachika:r61363 (ruby_2_4): merge revision(s) 57686: [Backport #13233]
nagachika 2017-12-20 23:55:34 +0900 (Wed, 20 Dec 2017) New Revision: 61363 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=61363 Log: merge revision(s) 57686: [Backport #13233] rational.c: fix rdoc * rational.c: [DOC] fix wrong indentations and comment out some lines in code examples to make them valid Ruby code and syntax highlighted on the rendered page. [ci skip] [ruby-core:79607] [Bug #13233] Author: Marcus Stollsteimer <sto.mar@w...> Modified directories: branches/ruby_2_4/ Modified files: branches/ruby_2_4/rational.c branches/ruby_2_4/version.h Index: ruby_2_4/version.h =================================================================== --- ruby_2_4/version.h (revision 61362) +++ ruby_2_4/version.h (revision 61363) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1 #define RUBY_VERSION "2.4.4" #define RUBY_RELEASE_DATE "2017-12-20" -#define RUBY_PATCHLEVEL 210 +#define RUBY_PATCHLEVEL 211 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 12 Index: ruby_2_4/rational.c =================================================================== --- ruby_2_4/rational.c (revision 61362) +++ ruby_2_4/rational.c (revision 61363) @@ -1257,8 +1257,8 @@ nurat_negative_p(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/rational.c#L1257 * * Returns the absolute value of +rat+. * - * (1/2r).abs #=> 1/2r - * (-1/2r).abs #=> 1/2r + * (1/2r).abs #=> 1/2r + * (-1/2r).abs #=> 1/2r * * Rational#magnitude is an alias of Rational#abs. */ @@ -1294,8 +1294,7 @@ nurat_ceil(VALUE self) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/rational.c#L1294 * * Returns the truncated value as an integer. * - * Equivalent to - * rat.truncate. + * Equivalent to Rational#truncate. * * Rational(2, 3).to_i #=> 0 * Rational(3).to_i #=> 3 @@ -1435,9 +1434,9 @@ f_round_common(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_4/rational.c#L1434 * Rational(2, 3).floor #=> 0 * Rational(-3, 2).floor #=> -1 * - * decimal - 1 2 3 . 4 5 6 - * ^ ^ ^ ^ ^ ^ - * precision -3 -2 -1 0 +1 +2 + * # decimal - 1 2 3 . 4 5 6 + * # ^ ^ ^ ^ ^ ^ + * # precision -3 -2 -1 0 +1 +2 * * '%f' % Rational('-123.456').floor(+1) #=> "-123.500000" * '%f' % Rational('-123.456').floor(-1) #=> "-130.000000" @@ -1459,9 +1458,9 @@ nurat_floor_n(int argc, VALUE *argv, VAL https://github.com/ruby/ruby/blob/trunk/ruby_2_4/rational.c#L1458 * Rational(2, 3).ceil #=> 1 * Rational(-3, 2).ceil #=> -1 * - * decimal - 1 2 3 . 4 5 6 - * ^ ^ ^ ^ ^ ^ - * precision -3 -2 -1 0 +1 +2 + * # decimal - 1 2 3 . 4 5 6 + * # ^ ^ ^ ^ ^ ^ + * # precision -3 -2 -1 0 +1 +2 * * '%f' % Rational('-123.456').ceil(+1) #=> "-123.400000" * '%f' % Rational('-123.456').ceil(-1) #=> "-120.000000" @@ -1483,9 +1482,9 @@ nurat_ceil_n(int argc, VALUE *argv, VALU https://github.com/ruby/ruby/blob/trunk/ruby_2_4/rational.c#L1482 * Rational(2, 3).truncate #=> 0 * Rational(-3, 2).truncate #=> -1 * - * decimal - 1 2 3 . 4 5 6 - * ^ ^ ^ ^ ^ ^ - * precision -3 -2 -1 0 +1 +2 + * # decimal - 1 2 3 . 4 5 6 + * # ^ ^ ^ ^ ^ ^ + * # precision -3 -2 -1 0 +1 +2 * * '%f' % Rational('-123.456').truncate(+1) #=> "-123.400000" * '%f' % Rational('-123.456').truncate(-1) #=> "-120.000000" @@ -1508,9 +1507,9 @@ nurat_truncate_n(int argc, VALUE *argv, https://github.com/ruby/ruby/blob/trunk/ruby_2_4/rational.c#L1507 * Rational(2, 3).round #=> 1 * Rational(-3, 2).round #=> -2 * - * decimal - 1 2 3 . 4 5 6 - * ^ ^ ^ ^ ^ ^ - * precision -3 -2 -1 0 +1 +2 + * # decimal - 1 2 3 . 4 5 6 + * # ^ ^ ^ ^ ^ ^ + * # precision -3 -2 -1 0 +1 +2 * * '%f' % Rational('-123.456').round(+1) #=> "-123.500000" * '%f' % Rational('-123.456').round(-1) #=> "-120.000000" Index: ruby_2_4 =================================================================== --- ruby_2_4 (revision 61362) +++ ruby_2_4 (revision 61363) Property changes on: ruby_2_4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r57686 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/