path: root/include/ruby/regex.h
diff options
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-25 03:29:39 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-25 03:29:39 +0000
commita25fbe3b3e531bbe479f344af24eaf9d2eeae6ea (patch)
tree055e58ed569fb28012fadade94f518e0a888e47d /include/ruby/regex.h
parent0ada813abfe3a049da29bd423ba34606a00777bd (diff)
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing. * parse.y (pragma_encoding): encoding specification pragma. * parse.y (rb_intern3): encoding specified symbols. * string.c (rb_str_length): length based on characters. for older behavior, bytesize method added. * string.c (rb_str_index_m): index based on characters. rindex as well. * string.c (succ_char): encoding aware succeeding string. * string.c (rb_str_reverse): reverse based on characters. * string.c (rb_str_inspect): encoding aware string description. * string.c (rb_str_upcase_bang): encoding aware case conversion. downcase, capitalize, swapcase as well. * string.c (rb_str_tr_bang): tr based on characters. delete, squeeze, tr_s, count as well. * string.c (rb_str_split_m): split based on characters. * string.c (rb_str_each_line): encoding aware each_line. * string.c (rb_str_each_char): added. iteration based on characters. * string.c (rb_str_strip_bang): encoding aware whitespace stripping. lstrip, rstrip as well. * string.c (rb_str_justify): encoding aware justifying (ljust, rjust, center). * string.c (str_encoding): get encoding attribute from a string. * re.c (rb_reg_initialize): encoding aware regular expression * sprintf.c (rb_str_format): formatting (i.e. length count) based on characters. * io.c (rb_io_getc): getc to return one-character string. for older behavior, getbyte method added. * ext/stringio/stringio.c (strio_getc): ditto. * io.c (rb_io_ungetc): allow pushing arbitrary string at the current reading point. * ext/stringio/stringio.c (strio_ungetc): ditto. * ext/strscan/strscan.c: encoding support. git-svn-id: svn+ssh:// b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby/regex.h')
1 files changed, 3 insertions, 5 deletions
diff --git a/include/ruby/regex.h b/include/ruby/regex.h
index 118c37c480..ad736775fe 100644
--- a/include/ruby/regex.h
+++ b/include/ruby/regex.h
@@ -5,7 +5,7 @@
- Copyright (C) 1993-2005 Yukihiro Matsumoto
+ Copyright (C) 1993-2007 Yukihiro Matsumoto
@@ -29,10 +29,8 @@ extern "C" {
ONIG_EXTERN OnigEncoding OnigEncDefaultCharEncoding;
-#undef ismbchar
-#define ismbchar(c) (mbclen((c)) != 1)
-#define mbclen(c) \
- ONIGENC_MBC_ENC_LEN(OnigEncDefaultCharEncoding, (UChar* )(&c))
+#define ismbchar(p, enc) (mbclen((p),(enc)) != 1)
+#define mbclen(p,enc) rb_enc_mbclen((p), (enc))
#endif /* ifndef ONIG_RUBY_M17N */