kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Replaced magic numbers tr table

Browse source
This commit is contained in:
Nobuyoshi Nakada 2020-12-21 21:46:10 +09:00
parent 84eebb3c9e
commit c7a5cc2c30
No known key found for this signature in database
GPG key ID: 7CD2805BFA3770C6
1 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
string.c
View file

@ -7580,13 +7580,14 @@ rb_str_tr(VALUE str, VALUE src, VALUE repl)
return str; return str;
} }
#define TR_TABLE_SIZE 257 #define TR_TABLE_MAX (UCHAR_MAX+1)
#define TR_TABLE_SIZE (TR_TABLE_MAX+1)
static void static void
tr_setup_table(VALUE str, char stable[TR_TABLE_SIZE], int first, tr_setup_table(VALUE str, char stable[TR_TABLE_SIZE], int first,
VALUE *tablep, VALUE *ctablep, rb_encoding *enc) VALUE *tablep, VALUE *ctablep, rb_encoding *enc)
{ {
const unsigned int errc = -1; const unsigned int errc = -1;
char buf[256]; char buf[TR_TABLE_MAX];
struct tr tr; struct tr tr;
unsigned int c; unsigned int c;
VALUE table = 0, ptable = 0; VALUE table = 0, ptable = 0;
@ -7600,26 +7601,26 @@ tr_setup_table(VALUE str, char stable[TR_TABLE_SIZE], int first,
tr.p += l; tr.p += l;
} }
if (first) { if (first) {
for (i=0; i<256; i++) { for (i=0; i<TR_TABLE_MAX; i++) {
stable[i] = 1; stable[i] = 1;
} }
stable[256] = cflag; stable[TR_TABLE_MAX] = cflag;
} }
else if (stable[256] && !cflag) { else if (stable[TR_TABLE_MAX] && !cflag) {
stable[256] = 0; stable[TR_TABLE_MAX] = 0;
} }
for (i=0; i<256; i++) { for (i=0; i<TR_TABLE_MAX; i++) {
buf[i] = cflag; buf[i] = cflag;
} }
while ((c = trnext(&tr, enc)) != errc) { while ((c = trnext(&tr, enc)) != errc) {
if (c < 256) { if (c < TR_TABLE_MAX) {
buf[c & 0xff] = !cflag; buf[(unsigned char)c] = !cflag;
} }
else { else {
VALUE key = UINT2NUM(c); VALUE key = UINT2NUM(c);
if (!table && (first || *tablep || stable[256])) { if (!table && (first || *tablep || stable[TR_TABLE_MAX])) {
if (cflag) { if (cflag) {
ptable = *ctablep; ptable = *ctablep;
table = ptable ? ptable : rb_hash_new(); table = ptable ? ptable : rb_hash_new();
@ -7636,7 +7637,7 @@ tr_setup_table(VALUE str, char stable[TR_TABLE_SIZE], int first,
} }
} }
} }
for (i=0; i<256; i++) { for (i=0; i<TR_TABLE_MAX; i++) {
stable[i] = stable[i] && buf[i]; stable[i] = stable[i] && buf[i];
} }
if (!table && !cflag) { if (!table && !cflag) {
@ -7648,7 +7649,7 @@ tr_setup_table(VALUE str, char stable[TR_TABLE_SIZE], int first,
static int static int
tr_find(unsigned int c, const char table[TR_TABLE_SIZE], VALUE del, VALUE nodel) tr_find(unsigned int c, const char table[TR_TABLE_SIZE], VALUE del, VALUE nodel)
{ {
if (c < 256) { if (c < TR_TABLE_MAX) {
return table[c] != 0; return table[c] != 0;
} }
else { else {
@ -7663,7 +7664,7 @@ tr_find(unsigned int c, const char table[TR_TABLE_SIZE], VALUE del, VALUE nodel)
else if (nodel && !NIL_P(rb_hash_lookup(nodel, v))) { else if (nodel && !NIL_P(rb_hash_lookup(nodel, v))) {
return FALSE; return FALSE;
} }
return table[256] ? TRUE : FALSE; return table[TR_TABLE_MAX] ? TRUE : FALSE;
} }
} }
@ -8647,7 +8648,7 @@ rb_str_enumerate_bytes(VALUE str, VALUE ary)
long i; long i;
for (i=0; i<RSTRING_LEN(str); i++) { for (i=0; i<RSTRING_LEN(str); i++) {
ENUM_ELEM(ary, INT2FIX(RSTRING_PTR(str)[i] & 0xff)); ENUM_ELEM(ary, INT2FIX((unsigned char)RSTRING_PTR(str)[i]));
} }
if (ary) if (ary)
return ary; return ary;