diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-19 08:25:03 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-19 08:25:03 +0000 |
| commit | 44cd8e457b808173147c499408ffc5e908f236dc (patch) | |
| tree | 357c92a92120e9e79054dbc58171b956e3d37e7f /regparse.c | |
| parent | 48a42a0387a0924955c8cf31f880bdecbf6023a8 (diff) | |
* regparse.c (PINC): use optimized enclen() instead of
ONIGENC_MBC_ENC_LEN().
* regparse.c (PFETCH): ditto.
* regparse.c (PFETCH): small optimization.
* regexec.c (slow_search): single byte encoding optimization.
* regenc.h (enclen): avoid calling function when encoding's
min_len == max_len.
* re.c (rb_reg_regsub): rb_enc_ascget() optimization for single
byte encoding.
* re.c (rb_reg_search): avoid allocating new re_registers if we
already have MatchData.
* re.c (match_init_copy): avoid unnecessary onig_region_free()
before onig_region_copy.
* encoding.c (rb_enc_get_index): remove implicit enc_capable check
each time.
* encoding.c (rb_enc_set_index): ditto.
* encoding.c (enc_compatible_p): small refactoring.
* include/ruby/encoding.h (rb_enc_dummy_p): inline
rb_enc_dummy_p() and export related code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16477 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
| -rw-r--r-- | regparse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regparse.c b/regparse.c index 1b2a0830ae..8d74efafea 100644 --- a/regparse.c +++ b/regparse.c @@ -253,12 +253,12 @@ strdup_with_null(OnigEncoding enc, UChar* s, UChar* end) #define PUNFETCH p = pfetch_prev #define PINC do { \ pfetch_prev = p; \ - p += ONIGENC_MBC_ENC_LEN(enc, p, end); \ + p += enclen(enc, p, end); \ } while (0) #define PFETCH(c) do { \ - c = ONIGENC_MBC_TO_CODE(enc, p, end); \ + c = ((enc->max_enc_len == 1) ? *p : ONIGENC_MBC_TO_CODE(enc, p, end)); \ pfetch_prev = p; \ - p += ONIGENC_MBC_ENC_LEN(enc, p, end); \ + p += enclen(enc, p, end); \ } while (0) #define PPEEK (p < end ? ONIGENC_MBC_TO_CODE(enc, p, end) : PEND_VALUE) |