diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 14:06:00 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 14:06:00 +0000 |
| commit | eec614afc3df9cdfee349fe2ae4cfa00e4cc3ee2 (patch) | |
| tree | 51038152f32fdf52be12e5f11593d29c6b63fd63 /include/ruby/encoding.h | |
| parent | 91b63a480f4d26d4ac998c8aa0707fabe7452654 (diff) | |
| download | ruby-eec614afc3df9cdfee349fe2ae4cfa00e4cc3ee2.tar.gz ruby-eec614afc3df9cdfee349fe2ae4cfa00e4cc3ee2.tar.xz ruby-eec614afc3df9cdfee349fe2ae4cfa00e4cc3ee2.zip | |
* encoding.c (rb_enc_codepoint): implemented to raise invalid
encoding.
* include/ruby/encoding.h (rb_enc_codepoint): macro is replaced as a
declaration.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby/encoding.h')
| -rw-r--r-- | include/ruby/encoding.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h index 8b245e05a..6f763adaf 100644 --- a/include/ruby/encoding.h +++ b/include/ruby/encoding.h @@ -71,8 +71,8 @@ rb_encoding * rb_enc_find(const char *name); #define rb_enc_mbminlen(enc) (enc)->min_enc_len #define rb_enc_mbmaxlen(enc) (enc)->max_enc_len -/* ptr,endptr,encoding -> mbclen */ -int rb_enc_mbclen(const char*, const char *, rb_encoding*); +/* -> mbclen (no error notification, no exception, 0 < ret <= e-p) */ +int rb_enc_mbclen(const char *p, const char *e, rb_encoding *enc); /* -> chlen, invalid or needmore */ int rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc); @@ -83,14 +83,14 @@ int rb_enc_precise_mbclen(const char *p, const char *e, rb_encoding *enc); /* -> 0x00..0x7f, -1 */ int rb_enc_ascget(const char *p, const char *e, int *len, rb_encoding *enc); -/* code,encoding -> codelen */ -int rb_enc_codelen(int, rb_encoding*); +/* -> codelen or raise exception */ +int rb_enc_codelen(int code, rb_encoding *enc); /* code,ptr,encoding -> write buf */ #define rb_enc_mbcput(c,buf,enc) ONIGENC_CODE_TO_MBC(enc,c,(UChar*)buf) -/* ptr,ptr,encoding -> codepoint */ -#define rb_enc_codepoint(p,e,enc) ONIGENC_MBC_TO_CODE(enc,(UChar*)p,(UChar*)e) +/* -> code or raise exception */ +int rb_enc_codepoint(const char *p, const char *e, rb_encoding *enc); /* ptr, ptr, encoding -> prev_char */ #define rb_enc_prev_char(s,p,enc) (char *)onigenc_get_prev_char_head(enc,(UChar*)s,(UChar*)p) |