diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-28 09:03:09 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-28 09:03:09 +0000 |
commit | 3c6969ec114d544d4e84c242171c30c346ccf23a (patch) | |
tree | a8e99598d6b241ae285ed8a2af9cfd844c1674f0 /parse.y | |
parent | 2f961c1f371e6dd0517a1ca4b9f245e2c2f1a90d (diff) |
* string.c, parse.y, re.c: use rb_ascii8bit_encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -271,7 +271,7 @@ struct parser_params { #define STR_NEW0() rb_enc_str_new(0,0,rb_usascii_encoding()) #define STR_NEW2(p) rb_enc_str_new((p),strlen(p),parser->enc) #define STR_NEW3(p,n,e,func) parser_str_new((p),(n),(e),(func),parser->enc) -#define STR_ENC(m) ((m)?parser->enc:rb_enc_from_index(0)) +#define STR_ENC(m) ((m)?parser->enc:rb_ascii8bit_encoding()) #define ENC_SINGLE(cr) ((cr)==ENC_CODERANGE_7BIT) #define TOK_INTERN(mb) rb_intern3(tok(), toklen(), STR_ENC(mb)) @@ -8842,7 +8842,7 @@ is_special_global_name(const char *m, const char *e, rb_encoding *enc) int rb_symname_p(const char *name) { - return rb_enc_symname_p(name, rb_enc_from_index(0)); + return rb_enc_symname_p(name, rb_ascii8bit_encoding()); } int @@ -8953,7 +8953,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc) case '$': id |= ID_GLOBAL; if ((mb = is_special_global_name(++m, e, enc)) != 0) { - if (!--mb) enc = rb_enc_from_index(0); + if (!--mb) enc = rb_ascii8bit_encoding(); goto new_id; } break; @@ -9039,7 +9039,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc) ID rb_intern2(const char *name, long len) { - return rb_intern3(name, len, rb_enc_from_index(0)); + return rb_intern3(name, len, rb_ascii8bit_encoding()); } #undef rb_intern |