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

merge revision(s) 28103:

Browse source 
* encoding.c (rb_enc_unicode_p): check the encoding is Unicode
	  or not by the name; not function's pointer. [ruby-dev:41479]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-06-05 17:56:55 +00:00
parent 09e9807a89
commit fce00b2422
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Jun 6 02:56:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (rb_enc_unicode_p): check the encoding is Unicode
or not by the name; not function's pointer. [ruby-dev:41479]
Sat Jun 5 23:15:42 2010 NARUSE, Yui <naruse@ruby-lang.org> Sat Jun 5 23:15:42 2010 NARUSE, Yui <naruse@ruby-lang.org>
* re.c (rb_reg_expr_str): ASCII incompatible strings * re.c (rb_reg_expr_str): ASCII incompatible strings

3
encoding.c
View file

@ -420,7 +420,8 @@ enc_ascii_compatible_p(VALUE enc)
int int
rb_enc_unicode_p(rb_encoding *enc) rb_enc_unicode_p(rb_encoding *enc)
{ {
return rb_utf8_encoding()->is_code_ctype == enc->is_code_ctype; const char *name = rb_enc_name(enc);
return name[0] == 'U' && name[1] == 'T' && name[2] == 'F' && name[4] != '7';
} }
static const char * static const char *

4
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #define RUBY_VERSION "1.9.2"
#define RUBY_RELEASE_DATE "2010-06-05" #define RUBY_RELEASE_DATE "2010-06-06"
#define RUBY_PATCHLEVEL -1 #define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -7,7 +7,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_YEAR 2010
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 5 #define RUBY_RELEASE_DAY 6
#include "ruby/version.h" #include "ruby/version.h"