diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-13 16:40:31 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-13 16:40:31 +0000 |
| commit | df2ac1e8911b04384839924e80a99c14b84ee74d (patch) | |
| tree | 0d5629d488672736c6252861e74f04a8e904e594 /include/ruby | |
| parent | 35010b8fc4a23254983b08ac423690437f47acb4 (diff) | |
| download | ruby-df2ac1e8911b04384839924e80a99c14b84ee74d.tar.gz ruby-df2ac1e8911b04384839924e80a99c14b84ee74d.tar.xz ruby-df2ac1e8911b04384839924e80a99c14b84ee74d.zip | |
* include/ruby/oniguruma.h (onigenc_get_right_adjust_char_head): add
end argument.
* include/ruby/encoding.h (rb_enc_right_char_head): add end argument.
* regenc.c (onigenc_get_right_adjust_char_head): use end argument.
* re.c (rb_reg_adjust_startpos): follow the interface change.
* string.c (rb_str_index): ditto.
* regexec.c (backward_search_range): ditto.
(onig_search): ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19330 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
| -rw-r--r-- | include/ruby/encoding.h | 2 | ||||
| -rw-r--r-- | include/ruby/oniguruma.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index a69940e26..45f5201d4 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -133,7 +133,7 @@ int rb_enc_codelen(int code, rb_encoding *enc); #define rb_enc_prev_char(s,p,enc) (char *)onigenc_get_prev_char_head(enc,(UChar*)(s),(UChar*)(p)) /* ptr, ptr, encoding -> next_char */ #define rb_enc_left_char_head(s,p,enc) (char *)onigenc_get_left_adjust_char_head(enc,(UChar*)(s),(UChar*)(p)) -#define rb_enc_right_char_head(s,p,enc) (char *)onigenc_get_right_adjust_char_head(enc,(UChar*)(s),(UChar*)(p)) +#define rb_enc_right_char_head(s,p,e,enc) (char *)onigenc_get_right_adjust_char_head(enc,(UChar*)(s),(UChar*)(p),(UChar*)(e)) /* ptr, ptr, encoding -> newline_or_not */ #define rb_enc_is_newline(p,end,enc) ONIGENC_IS_MBC_NEWLINE(enc,(UChar*)(p),(UChar*)(end)) diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h index 2e3b2bf29..cd4bedfe0 100644 --- a/include/ruby/oniguruma.h +++ b/include/ruby/oniguruma.h @@ -309,7 +309,7 @@ OnigUChar* onigenc_get_prev_char_head P_((OnigEncoding enc, const OnigUChar* sta ONIG_EXTERN OnigUChar* onigenc_get_left_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s)); ONIG_EXTERN -OnigUChar* onigenc_get_right_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s)); +OnigUChar* onigenc_get_right_adjust_char_head P_((OnigEncoding enc, const OnigUChar* start, const OnigUChar* s, const OnigUChar* end)); ONIG_EXTERN int onigenc_strlen P_((OnigEncoding enc, const OnigUChar* p, const OnigUChar* end)); ONIG_EXTERN |