From 69406aad505414de34dc8b560ac1eadf147b0dbc Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 6 Dec 2007 09:28:26 +0000 Subject: * encoding.c (rb_enc_precise_mbclen): new function for mbclen with validation. * include/ruby/encoding.h (rb_enc_precise_mbclen): declared. (MBCLEN_CHARFOUND): new macro. (MBCLEN_INVALID): new macro. (MBCLEN_NEEDMORE): new macro. * include/ruby/oniguruma.h (OnigEncodingTypeST): replace mbc_enc_len by precise_mbc_enc_len. (ONIGENC_PRECISE_MBC_ENC_LEN): new macro. (ONIGENC_CONSTRUCT_MBCLEN_CHARFOUND): new macro. (ONIGENC_CONSTRUCT_MBCLEN_INVALID): new macro. (ONIGENC_CONSTRUCT_MBCLEN_NEEDMORE): new macro. (ONIGENC_MBCLEN_CHARFOUND): new macro. (ONIGENC_MBCLEN_INVALID): new macro. (ONIGENC_MBCLEN_NEEDMORE): new macro. (ONIGENC_MBC_ENC_LEN): use ONIGENC_PRECISE_MBC_ENC_LEN. * enc/euc_jp.c: validation implemented. * enc/sjis.c: ditto. * enc/utf8.c: ditto. * string.c (rb_str_inspect): use rb_enc_precise_mbclen for invalid encoding. (rb_str_valid_encoding_p): new method String#valid_encoding?. * io.c (rb_io_getc): use rb_enc_precise_mbclen. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index ec7405f961..53ceac851d 100644 --- a/encoding.c +++ b/encoding.c @@ -494,6 +494,12 @@ rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc) return n; } +int +rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc) +{ + return ONIGENC_PRECISE_MBC_ENC_LEN(enc, (UChar*)p, (UChar*)e); +} + int rb_enc_codelen(int c, rb_encoding *enc) { -- cgit v1.2.3