From 9817450d161faabcb3de99e8d715402ddf3d0096 Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 22 Dec 2007 23:47:18 +0000 Subject: * include/ruby/encoding.h, encoding.c, re.c, io.c, parse.y, numeric.c, ruby.c, transcode.c: rename rb_ascii_encoding. to rb_ascii8bit_encoding. rb_ascii_encoding is ambiguous with ASCII-8BIT and US-ASCII. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 7b64c237a..3427a3c1e 100644 --- a/parse.y +++ b/parse.y @@ -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_ascii_encoding()); + rb_enc_associate(str, rb_ascii8bit_encoding()); } return str; @@ -8968,7 +8968,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc) } } if (m - name < len) id = ID_JUNK; - if (enc != rb_ascii_encoding()) { + if (enc != rb_ascii8bit_encoding()) { /* * this clause makes sense only when called from other than * rb_intern_str() taking care of code-range. @@ -8977,7 +8977,7 @@ rb_intern3(const char *name, long len, rb_encoding *enc) for (; m <= name + len; ++m) { if (!ISASCII(*m)) goto mbstr; } - enc = rb_ascii_encoding(); + enc = rb_ascii8bit_encoding(); } mbstr:; } -- cgit