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

* string.c (IS_7BIT): removed.

Browse Source 
(single_byte_optimizable): new function to test optimizationability
  using single byte string.
  (str_strlen): use single_byte_optimizable instead of
  is_ascii_string.
  (str_nth): rename argument: asc -> singlebyte.
  (str_offset): ditto.
  (rb_str_substr): use single_byte_optimizable instead of IS_7BIT.
  (rb_str_index): ditto.
  (rb_str_rindex): ditto.
  (rb_str_splice): ditto.
  (rb_str_justify): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-12-31 10:39:20 +00:00
parent 1137af8a03
commit ca122fa53b
2 changed files with 50 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
Mon Dec 31 19:35:20 2007 Tanaka Akira <akr@fsij.org>
* string.c (IS_7BIT): removed.
(single_byte_optimizable): new function to test optimizationability
using single byte string.
(str_strlen): use single_byte_optimizable instead of
is_ascii_string.
(str_nth): rename argument: asc -> singlebyte.
(str_offset): ditto.
(rb_str_substr): use single_byte_optimizable instead of IS_7BIT.
(rb_str_index): ditto.
(rb_str_rindex): ditto.
(rb_str_splice): ditto.
(rb_str_justify): ditto.
Mon Dec 31 07:39:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Dec 31 07:39:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* main.c, goruby.c (RUBY_MAIN_INIT): removed. * main.c, goruby.c (RUBY_MAIN_INIT): removed.

54
string.c
View File

@ -93,9 +93,25 @@ VALUE rb_cSymbol;
} while (0) } while (0)
#define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) #define is_ascii_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT)
#define IS_7BIT(str) (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT)
#define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) #define is_broken_string(str) (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN)
static int
single_byte_optimizable(VALUE str)
{
rb_encoding *enc = rb_enc_get(str);
if (rb_enc_mbminlen(enc) == 1 && rb_enc_mbmaxlen(enc) == 1)
return 1;
/* Not precise. It may be ENC_CODERANGE_UNKNOWN. */
if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT)
return 1;
/* Not precise. Possibly single byte.
* "\xa1" in Shift_JIS for example. */
return 0;
}
VALUE rb_fs; VALUE rb_fs;
int int
@ -467,7 +483,7 @@ str_strlen(VALUE str, rb_encoding *enc)
{ {
long len; long len;
if (is_ascii_string(str)) return RSTRING_LEN(str); if (single_byte_optimizable(str)) return RSTRING_LEN(str);
if (!enc) enc = rb_enc_get(str); if (!enc) enc = rb_enc_get(str);
len = rb_enc_strlen(RSTRING_PTR(str), RSTRING_END(str), enc); len = rb_enc_strlen(RSTRING_PTR(str), RSTRING_END(str), enc);
if (len < 0) { if (len < 0) {
@ -745,9 +761,9 @@ rb_str_s_try_convert(VALUE dummy, VALUE str)
} }
static char* static char*
str_nth(char *p, char *e, int nth, rb_encoding *enc, int asc) str_nth(char *p, char *e, int nth, rb_encoding *enc, int singlebyte)
{ {
if (asc) if (singlebyte)
p += nth; p += nth;
else else
p = rb_enc_nth(p, e, nth, enc); p = rb_enc_nth(p, e, nth, enc);
@ -757,9 +773,9 @@ str_nth(char *p, char *e, int nth, rb_encoding *enc, int asc)
} }
static int static int
str_offset(char *p, char *e, int nth, rb_encoding *enc, int asc) str_offset(char *p, char *e, int nth, rb_encoding *enc, int singlebyte)
{ {
const char *pp = str_nth(p, e, nth, enc, asc); const char *pp = str_nth(p, e, nth, enc, singlebyte);
if (!pp) return e - p; if (!pp) return e - p;
return pp - p; return pp - p;
} }
@ -806,7 +822,7 @@ rb_str_substr(VALUE str, long beg, long len)
rb_encoding *enc = rb_enc_get(str); rb_encoding *enc = rb_enc_get(str);
VALUE str2; VALUE str2;
char *p, *s = RSTRING_PTR(str), *e = s + RSTRING_LEN(str); char *p, *s = RSTRING_PTR(str), *e = s + RSTRING_LEN(str);
int asc = IS_7BIT(str); int singlebyte = single_byte_optimizable(str);
if (len < 0) return Qnil; if (len < 0) return Qnil;
if (!RSTRING_LEN(str)) { if (!RSTRING_LEN(str)) {
@ -835,7 +851,7 @@ rb_str_substr(VALUE str, long beg, long len)
if (len == 0) { if (len == 0) {
p = 0; p = 0;
} }
else if ((p = str_nth(s, e, beg, enc, asc)) == e) { else if ((p = str_nth(s, e, beg, enc, singlebyte)) == e) {
len = 0; len = 0;
} }
else if (rb_enc_mbmaxlen(enc) == rb_enc_mbminlen(enc)) { else if (rb_enc_mbmaxlen(enc) == rb_enc_mbminlen(enc)) {
@ -846,7 +862,7 @@ rb_str_substr(VALUE str, long beg, long len)
len *= rb_enc_mbmaxlen(enc); len *= rb_enc_mbmaxlen(enc);
} }
else { else {
len = str_offset(p, e, len, enc, asc); len = str_offset(p, e, len, enc, singlebyte);
} }
sub: sub:
str2 = rb_str_new5(str, p, len); str2 = rb_str_new5(str, p, len);
@ -1476,7 +1492,7 @@ rb_str_index(VALUE str, VALUE sub, long offset)
if (len - offset < slen) return -1; if (len - offset < slen) return -1;
s = RSTRING_PTR(str); s = RSTRING_PTR(str);
if (offset) { if (offset) {
offset = str_offset(s, RSTRING_END(str), offset, enc, IS_7BIT(str)); offset = str_offset(s, RSTRING_END(str), offset, enc, single_byte_optimizable(str));
s += offset; s += offset;
} }
if (slen == 0) return offset; if (slen == 0) return offset;
@ -1573,7 +1589,7 @@ rb_str_rindex(VALUE str, VALUE sub, long pos)
long len, slen; long len, slen;
char *s, *sbeg, *e, *t; char *s, *sbeg, *e, *t;
rb_encoding *enc; rb_encoding *enc;
int asc = IS_7BIT(str); int singlebyte = single_byte_optimizable(str);
enc = rb_enc_check(str, sub); enc = rb_enc_check(str, sub);
if (is_broken_string(sub)) { if (is_broken_string(sub)) {
@ -1594,7 +1610,7 @@ rb_str_rindex(VALUE str, VALUE sub, long pos)
t = RSTRING_PTR(sub); t = RSTRING_PTR(sub);
slen = RSTRING_LEN(sub); slen = RSTRING_LEN(sub);
for (;;) { for (;;) {
s = str_nth(sbeg, e, pos, enc, asc); s = str_nth(sbeg, e, pos, enc, singlebyte);
if (!s) return -1; if (!s) return -1;
if (memcmp(s, t, slen) == 0) { if (memcmp(s, t, slen) == 0) {
return pos; return pos;
@ -2135,7 +2151,7 @@ rb_str_splice(VALUE str, long beg, long len, VALUE val)
long slen; long slen;
char *p, *e; char *p, *e;
rb_encoding *enc; rb_encoding *enc;
int asc = IS_7BIT(str); int singlebyte = single_byte_optimizable(str);
if (len < 0) rb_raise(rb_eIndexError, "negative length %ld", len); if (len < 0) rb_raise(rb_eIndexError, "negative length %ld", len);
@ -2157,9 +2173,9 @@ rb_str_splice(VALUE str, long beg, long len, VALUE val)
if (slen < len || slen < beg + len) { if (slen < len || slen < beg + len) {
len = slen - beg; len = slen - beg;
} }
p = str_nth(RSTRING_PTR(str), RSTRING_END(str), beg, enc, asc); p = str_nth(RSTRING_PTR(str), RSTRING_END(str), beg, enc, singlebyte);
if (!p) p = RSTRING_END(str); if (!p) p = RSTRING_END(str);
e = str_nth(p, RSTRING_END(str), len, enc, asc); e = str_nth(p, RSTRING_END(str), len, enc, singlebyte);
if (!e) e = RSTRING_END(str); if (!e) e = RSTRING_END(str);
/* error check */ /* error check */
beg = p - RSTRING_PTR(str); /* physical position */ beg = p - RSTRING_PTR(str); /* physical position */
@ -5069,7 +5085,7 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag)
char *p, *f = " "; char *p, *f = " ";
long n, llen, rlen; long n, llen, rlen;
volatile VALUE pad; volatile VALUE pad;
int asc = 1; int singlebyte = 1;
rb_scan_args(argc, argv, "11", &w, &pad); rb_scan_args(argc, argv, "11", &w, &pad);
enc = rb_enc_get(str); enc = rb_enc_get(str);
@ -5080,7 +5096,7 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag)
f = RSTRING_PTR(pad); f = RSTRING_PTR(pad);
flen = RSTRING_LEN(pad); flen = RSTRING_LEN(pad);
fclen = str_strlen(pad, enc); fclen = str_strlen(pad, enc);
asc = is_ascii_string(pad); singlebyte = single_byte_optimizable(pad);
if (flen == 0) { if (flen == 0) {
rb_raise(rb_eArgError, "zero width padding"); rb_raise(rb_eArgError, "zero width padding");
} }
@ -5103,7 +5119,7 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag)
llen -= fclen; llen -= fclen;
} }
else { else {
char *fp = str_nth(f, f+flen, llen, enc, asc); char *fp = str_nth(f, f+flen, llen, enc, singlebyte);
n = fp - f; n = fp - f;
memcpy(p,f,n); memcpy(p,f,n);
p+=n; p+=n;
@ -5123,7 +5139,7 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag)
rlen -= fclen; rlen -= fclen;
} }
else { else {
char *fp = str_nth(f, f+flen, rlen, enc, asc); char *fp = str_nth(f, f+flen, rlen, enc, singlebyte);
n = fp - f; n = fp - f;
memcpy(p,f,n); memcpy(p,f,n);
p+=n; p+=n;