summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 23:47:18 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-22 23:47:18 +0000
commit5b809a28f825015661e7f51f0ecb5ecdfa7b77bd (patch)
treeb2c58515f13f04df8820eaeee5470262ee7c6d61 /parse.y
parentcd42707d86eca75e22d7ac8053a0981ed8b1a90f (diff)
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@14504 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y6
1 files changed, 3 insertions, 3 deletions
diff --git a/parse.y b/parse.y
index 7b64c237a7..3427a3c1ec 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:;
}