diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 13:49:29 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-14 13:49:29 +0000 |
commit | fd53f91cfdd218300965765398f620aeac84d7a7 (patch) | |
tree | 98c3bcc9a1f424ecdcf3e97bf0f35494b5ce17e9 /re.c | |
parent | c8e8fa7d9134f3a54e3035170d7846923d6212c5 (diff) | |
download | ruby-fd53f91cfdd218300965765398f620aeac84d7a7.tar.gz ruby-fd53f91cfdd218300965765398f620aeac84d7a7.tar.xz ruby-fd53f91cfdd218300965765398f620aeac84d7a7.zip |
* re.c (rb_char_to_option_kcode): use rb_enc_find_index() instead
of using fixed index value.
* enc/Makefile.in (encsrcdir): make US-ASCII built-in.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r-- | re.c | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -142,12 +142,6 @@ rb_memsearch(const void *x0, long m, const void *y0, long n) #define ARG_ENCODING_FIXED 16 #define ARG_ENCODING_NONE 32 -#define ARG_KCODE_NONE 0 -#define ARG_KCODE_EUC 1 -#define ARG_KCODE_SJIS 2 -#define ARG_KCODE_UTF8 3 -#define ARG_KCODE_MASK 3 - static int char_to_option(int c) { @@ -191,13 +185,13 @@ rb_char_to_option_kcode(int c, int *option, int *kcode) *kcode = -1; return (*option = ARG_ENCODING_NONE); case 'e': - *kcode = ARG_KCODE_EUC; + *kcode = rb_enc_find_index("EUC-JP"); break; case 's': - *kcode = ARG_KCODE_SJIS; + *kcode = rb_enc_find_index("Shitf_JIS"); break; case 'u': - *kcode = ARG_KCODE_UTF8; + *kcode = rb_enc_find_index("UTF-8"); break; default: *kcode = -1; |