archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r24205 from trunk into ruby_1_9_1.

Browse source 
--
	* complex.c (make_patterns): do not use \d.

	* rational.c (make_patterns): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@27981 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-05-23 13:37:59 +00:00
parent 3ae8d8aa4d
commit ba595fe918
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Jul 19 20:41:24 2009 Tadayoshi Funaba <tadf@dotrb.org>
* complex.c (make_patterns): do not use \d.
* rational.c (make_patterns): ditto.
Fri Apr 30 03:38:14 2010 NAKAMURA Usaku <usa@ruby-lang.org> Fri Apr 30 03:38:14 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* numeric.c (fix_mul): the width of fixnum is same as long's on all * numeric.c (fix_mul): the width of fixnum is same as long's on all

2
complex.c
View file

@ -1054,7 +1054,7 @@ static VALUE comp_pat0, comp_pat1, comp_pat2, a_slash, a_dot_and_an_e,
null_string, underscores_pat, an_underscore; null_string, underscores_pat, an_underscore;
#define WS "\\s*" #define WS "\\s*"
#define DIGITS "(?:\\d(?:_\\d|\\d)*)" #define DIGITS "(?:[0-9](?:_[0-9]|[0-9])*)"
#define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?" #define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?"
#define DENOMINATOR DIGITS #define DENOMINATOR DIGITS
#define NUMBER "[-+]?" NUMERATOR "(?:\\/" DENOMINATOR ")?" #define NUMBER "[-+]?" NUMERATOR "(?:\\/" DENOMINATOR ")?"

2
rational.c
View file

@ -1313,7 +1313,7 @@ float_to_r(VALUE self)
static VALUE rat_pat, an_e_pat, a_dot_pat, underscores_pat, an_underscore; static VALUE rat_pat, an_e_pat, a_dot_pat, underscores_pat, an_underscore;
#define WS "\\s*" #define WS "\\s*"
#define DIGITS "(?:\\d(?:_\\d|\\d)*)" #define DIGITS "(?:[0-9](?:_[0-9]|[0-9])*)"
#define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?" #define NUMERATOR "(?:" DIGITS "?\\.)?" DIGITS "(?:[eE][-+]?" DIGITS ")?"
#define DENOMINATOR DIGITS #define DENOMINATOR DIGITS
#define PATTERN "\\A" WS "([-+])?(" NUMERATOR ")(?:\\/(" DENOMINATOR "))?" WS #define PATTERN "\\A" WS "([-+])?(" NUMERATOR ")(?:\\/(" DENOMINATOR "))?" WS

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 425 #define RUBY_PATCHLEVEL 426
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1