diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-03 17:26:16 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-10-03 17:26:16 +0000 |
commit | 54b80158f2a1d6bfc6913917fd64ab6ab2c78213 (patch) | |
tree | 17ab16324a54bc614174d231f808a1cea7055189 | |
parent | a669f1f992105981efd4bb891d34cbf53b05696a (diff) |
merge revision(s) 56281,56282:
strscan.c: use S_RESTLEN
* 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/branches/ruby_2_3@56331 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ext/strscan/strscan.c | 24 | ||||
-rw-r--r-- | version.h | 8 |
2 files changed, 17 insertions, 15 deletions
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index f7592c9249..ba2c4eb1a0 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -64,6 +64,7 @@ struct strscanner Function Prototypes ======================================================================= */ +static inline long minl _((const long n, const long x)); static VALUE infect _((VALUE str, struct strscanner *p)); static VALUE extract_range _((struct strscanner *p, long beg_i, long end_i)); static VALUE extract_beg_len _((struct strscanner *p, long beg_i, long len)); @@ -140,12 +141,17 @@ str_new(struct strscanner *p, const char *ptr, long len) return str; } +static inline long +minl(const long x, const long y) +{ + return (x < y) ? x : y; +} + static VALUE extract_range(struct strscanner *p, long beg_i, long end_i) { if (beg_i > S_LEN(p)) return Qnil; - if (end_i > S_LEN(p)) - end_i = S_LEN(p); + end_i = minl(end_i, S_LEN(p)); return infect(str_new(p, S_PBEG(p) + beg_i, end_i - beg_i), p); } @@ -153,8 +159,7 @@ static VALUE extract_beg_len(struct strscanner *p, long beg_i, long len) { if (beg_i > S_LEN(p)) return Qnil; - if (beg_i + len > S_LEN(p)) - len = S_LEN(p) - beg_i; + len = minl(len, S_LEN(p) - beg_i); return infect(str_new(p, S_PBEG(p) + beg_i, len), p); } @@ -728,9 +733,7 @@ strscan_getch(VALUE self) return Qnil; len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str)); - if (p->curr + len > S_LEN(p)) { - len = S_LEN(p) - p->curr; - } + len = minl(len, S_RESTLEN(p)); p->prev = p->curr; p->curr += len; MATCHED(p); @@ -807,8 +810,7 @@ strscan_peek(VALUE self, VALUE vlen) if (EOS_P(p)) return infect(str_new(p, "", 0), p); - if (p->curr + len > S_LEN(p)) - len = S_LEN(p) - p->curr; + len = minl(len, S_RESTLEN(p)); return extract_beg_len(p, p->curr, len); } @@ -1116,7 +1118,7 @@ strscan_rest_size(VALUE self) if (EOS_P(p)) { return INT2FIX(0); } - i = S_LEN(p) - p->curr; + i = S_RESTLEN(p); return INT2FIX(i); } @@ -1202,7 +1204,7 @@ inspect2(struct strscanner *p) long len; if (EOS_P(p)) return rb_str_new2(""); - len = S_LEN(p) - p->curr; + len = S_RESTLEN(p); if (len > INSPECT_LENGTH) { str = rb_str_new(CURPTR(p), INSPECT_LENGTH); rb_str_cat2(str, "..."); @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.3.2" -#define RUBY_RELEASE_DATE "2016-09-26" -#define RUBY_PATCHLEVEL 192 +#define RUBY_RELEASE_DATE "2016-10-04" +#define RUBY_PATCHLEVEL 193 #define RUBY_RELEASE_YEAR 2016 -#define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 26 +#define RUBY_RELEASE_MONTH 10 +#define RUBY_RELEASE_DAY 4 #include "ruby/version.h" |