From 59a213ed21d7d856d24112fd00fe0b4eb9c0e549 Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 19 Sep 2008 23:09:33 +0000 Subject: * parse.y: strings which contain only US-ASCII don't force to have US-ASCII encoding. [ruby-dev:36400] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 70d77e142..485a3979f 100644 --- a/parse.y +++ b/parse.y @@ -264,12 +264,11 @@ struct parser_params { #define UTF8_ENC() (parser->utf8 ? parser->utf8 : \ (parser->utf8 = rb_utf8_encoding())) #define STR_NEW(p,n) rb_enc_str_new((p),(n),parser->enc) -#define STR_NEW0() rb_usascii_str_new(0,0) +#define STR_NEW0() rb_enc_str_new(0,0,parser->enc) #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_usascii_encoding()) #define ENC_SINGLE(cr) ((cr)==ENC_CODERANGE_7BIT) -#define TOK_INTERN(mb) rb_intern3(tok(), toklen(), STR_ENC(mb)) +#define TOK_INTERN(mb) rb_intern3(tok(), toklen(), parser->enc) #ifdef YYMALLOC void *rb_parser_malloc(struct parser_params *, size_t); @@ -5150,7 +5149,6 @@ parser_str_new(const char *p, long n, rb_encoding *enc, int func, rb_encoding *e str = rb_enc_str_new(p, n, enc); if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc)) { if (rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) { - rb_enc_associate(str, rb_usascii_encoding()); } else if (enc0 == rb_usascii_encoding() && enc != rb_utf8_encoding()) { rb_enc_associate(str, rb_ascii8bit_encoding()); -- cgit