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

strscan.c: use S_RESTLEN

Browse Source 
* ext/strscan/strscan.c (strscan_getch, strscan_peek),
  (strscan_rest_size, inspect2): use S_RESTLEN consistently.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-09-28 05:11:20 +00:00
parent 6c8fc79f95
commit 604ae2e151
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/strscan/strscan.c
View File

@ -728,8 +728,8 @@ strscan_getch(VALUE self)
return Qnil; return Qnil;
len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str)); len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str));
if (p->curr + len > S_LEN(p)) { if (len > S_RESTLEN(p)) {
len = S_LEN(p) - p->curr; len = S_RESTLEN(p);
} }
p->prev = p->curr; p->prev = p->curr;
p->curr += len; p->curr += len;
@ -807,8 +807,8 @@ strscan_peek(VALUE self, VALUE vlen)
if (EOS_P(p)) if (EOS_P(p))
return infect(str_new(p, "", 0), p); return infect(str_new(p, "", 0), p);
if (p->curr + len > S_LEN(p)) if (len > S_RESTLEN(p))
len = S_LEN(p) - p->curr; len = S_RESTLEN(p);
return extract_beg_len(p, p->curr, len); return extract_beg_len(p, p->curr, len);
} }
@ -1116,7 +1116,7 @@ strscan_rest_size(VALUE self)
if (EOS_P(p)) { if (EOS_P(p)) {
return INT2FIX(0); return INT2FIX(0);
} }
i = S_LEN(p) - p->curr; i = S_RESTLEN(p);
return INT2FIX(i); return INT2FIX(i);
} }
@ -1202,7 +1202,7 @@ inspect2(struct strscanner *p)
long len; long len;
if (EOS_P(p)) return rb_str_new2(""); if (EOS_P(p)) return rb_str_new2("");
len = S_LEN(p) - p->curr; len = S_RESTLEN(p);
if (len > INSPECT_LENGTH) { if (len > INSPECT_LENGTH) {
str = rb_str_new(CURPTR(p), INSPECT_LENGTH); str = rb_str_new(CURPTR(p), INSPECT_LENGTH);
rb_str_cat2(str, "..."); rb_str_cat2(str, "...");