1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* string.c (rb_enc_str_coderange): set ENC_CODERANGE_BROKEN using

Browse Source 
rb_enc_precise_mbclen.
  (rb_str_valid_encoding_p): just check coderange is
  ENC_CODERANGE_BROKEN or not.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14262 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-12-17 07:41:21 +00:00
parent d4f5b77d3a
commit 0d0a8a55fc
2 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Mon Dec 17 16:39:25 2007 Tanaka Akira <akr@fsij.org>
* string.c (rb_enc_str_coderange): set ENC_CODERANGE_BROKEN using
rb_enc_precise_mbclen.
(rb_str_valid_encoding_p): just check coderange is
ENC_CODERANGE_BROKEN or not.
Mon Dec 17 16:04:16 2007 GOTOU Yuuzou <gotoyuzo@notwork.org> Mon Dec 17 16:04:16 2007 GOTOU Yuuzou <gotoyuzo@notwork.org>
* ext/openssl/lib/openssl/buffering.rb (Buffering#gets): added second * ext/openssl/lib/openssl/buffering.rb (Buffering#gets): added second

52
string.c
View File

@ -105,27 +105,26 @@ rb_enc_str_coderange(VALUE str)
if (cr == ENC_CODERANGE_UNKNOWN) { if (cr == ENC_CODERANGE_UNKNOWN) {
rb_encoding *enc = rb_enc_get(str); rb_encoding *enc = rb_enc_get(str);
if (!rb_enc_asciicompat(enc)) { const char *p = RSTRING_PTR(str);
cr = ENC_CODERANGE_VALID; const char *e = p + RSTRING_LEN(str);
ENC_CODERANGE_SET(str, cr);
return cr;
}
else {
const char *p = RSTRING_PTR(str);
const char *e = p + RSTRING_LEN(str);
cr = ENC_CODERANGE_7BIT; cr = rb_enc_asciicompat(enc) ? ENC_CODERANGE_7BIT : ENC_CODERANGE_VALID;
while (p < e) { while (p < e) {
int c = (unsigned char)*p; int ret = rb_enc_precise_mbclen(p, e, enc);
int len = MBCLEN_CHARFOUND(ret);
if (!rb_enc_isascii(c, enc)) { if (len) {
cr = ENC_CODERANGE_VALID; if (len != 1 || !rb_enc_isascii((unsigned char)*p, enc)) {
break; cr = ENC_CODERANGE_VALID;
} }
p++; p += len;
} }
ENC_CODERANGE_SET(str, cr); else {
} cr = ENC_CODERANGE_BROKEN;
break;
}
}
ENC_CODERANGE_SET(str, cr);
} }
return cr; return cr;
} }
@ -5316,20 +5315,9 @@ rb_str_force_encoding(VALUE str, VALUE enc)
static VALUE static VALUE
rb_str_valid_encoding_p(VALUE str) rb_str_valid_encoding_p(VALUE str)
{ {
char *p = RSTRING_PTR(str); int cr = rb_enc_str_coderange(str);
char *pend = RSTRING_END(str);
rb_encoding *enc = rb_enc_get(str);
while (p < pend) { return cr == ENC_CODERANGE_BROKEN ? Qfalse : Qtrue;
int n;
n = rb_enc_precise_mbclen(p, pend, enc);
if (!MBCLEN_CHARFOUND(n)) {
return Qfalse;
}
p += n;
}
return Qtrue;
} }
/********************************************************************** /**********************************************************************