diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 20:11:17 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 20:11:17 +0000 |
commit | b211ed6460916ff9db3f000113fcf2261f953f29 (patch) | |
tree | 4ced42963bdc8f061bec5ec052cd3bbc4c344b53 /parse.y | |
parent | d7cc14d4363cca3d0f9b0cf5ab81900e6ec17989 (diff) | |
download | ruby-b211ed6460916ff9db3f000113fcf2261f953f29.tar.gz |
* parse.y (parser_str_new, rb_intern3): rb_default_encoding() renamed.
* ext/nkf/nkf.c (rb_nkf_putchar): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14444 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -4844,7 +4844,7 @@ parser_str_new(const char *p, long n, rb_encoding *enc, int func) if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc) && rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) { - rb_enc_associate(str, rb_default_encoding()); + rb_enc_associate(str, rb_ascii_encoding()); } return str; @@ -8969,7 +8969,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc) } } if (m - name < len) id = ID_JUNK; - if (enc != rb_default_encoding()) { + if (enc != rb_ascii_encoding()) { /* * this clause makes sense only when called from other than * rb_intern_str() taking care of code-range. @@ -8978,7 +8978,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc) for (; m <= name + len; ++m) { if (!ISASCII(*m)) goto mbstr; } - enc = rb_default_encoding(); + enc = rb_ascii_encoding(); } mbstr:; } |