mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	merge revision(s) 56421,56422: [Backport #11736]
* object.c: Improve documentation for Integer conversion. [ruby-core:71661][Bug #11736][ci skip] * object.c: Improve documentation for Float conversion. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@56501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									a5b3244d89
								
							
						
					
					
						commit
						331fea278b
					
				
					 3 changed files with 14 additions and 6 deletions
				
			
		| 
						 | 
					@ -1,3 +1,8 @@
 | 
				
			||||||
 | 
					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>
 | 
					Fri Oct  7 02:44:57 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* lib/rubygems/ssl_certs/GlobalSignRootCA.pem: add for RubyGems.org.
 | 
						* lib/rubygems/ssl_certs/GlobalSignRootCA.pem: add for RubyGems.org.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										9
									
								
								object.c
									
										
									
									
									
								
							
							
						
						
									
										9
									
								
								object.c
									
										
									
									
									
								
							| 
						 | 
					@ -2953,11 +2953,14 @@ rb_Float(VALUE val)
 | 
				
			||||||
 *     Float(arg)    -> float
 | 
					 *     Float(arg)    -> float
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *  Returns <i>arg</i> converted to a float. Numeric types are converted
 | 
					 *  Returns <i>arg</i> converted to a float. Numeric types are converted
 | 
				
			||||||
 *  directly, the rest are converted using <i>arg</i>.to_f.
 | 
					 *  directly, and with exception to string and nil the rest are converted using <i>arg</i>.to_f.
 | 
				
			||||||
 | 
					 *  Converting a <code>string</code> with invalid characters will result in a <code>ArgumentError</code>.
 | 
				
			||||||
 *  Converting <code>nil</code> generates a <code>TypeError</code>.
 | 
					 *  Converting <code>nil</code> generates a <code>TypeError</code>.
 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 *     Float(1)           #=> 1.0
 | 
					 *     Float(1)                 #=> 1.0
 | 
				
			||||||
 *     Float("123.456")   #=> 123.456
 | 
					 *     Float("123.456")         #=> 123.456
 | 
				
			||||||
 | 
					 *     Float("123.0_badstring") #=> ArgumentError: invalid value for Float(): "123.0_badstring"
 | 
				
			||||||
 | 
					 *     Float(nil)               #=> TypeError: can't convert nil into Float
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static VALUE
 | 
					static VALUE
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,10 +1,10 @@
 | 
				
			||||||
#define RUBY_VERSION "2.2.6"
 | 
					#define RUBY_VERSION "2.2.6"
 | 
				
			||||||
#define RUBY_RELEASE_DATE "2016-10-07"
 | 
					#define RUBY_RELEASE_DATE "2016-10-27"
 | 
				
			||||||
#define RUBY_PATCHLEVEL 380
 | 
					#define RUBY_PATCHLEVEL 381
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define RUBY_RELEASE_YEAR 2016
 | 
					#define RUBY_RELEASE_YEAR 2016
 | 
				
			||||||
#define RUBY_RELEASE_MONTH 10
 | 
					#define RUBY_RELEASE_MONTH 10
 | 
				
			||||||
#define RUBY_RELEASE_DAY 7
 | 
					#define RUBY_RELEASE_DAY 27
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "ruby/version.h"
 | 
					#include "ruby/version.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue