From e336136d8a4943b4778ce93df7c3d944614416d4 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 23 Jan 2008 22:35:27 +0000 Subject: [PATCH] * parse.y (STR_NEW0): set encoding as US-ASCII. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15201 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0ca823e1f..0690076cf6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jan 24 07:34:34 2008 NARUSE, Yui + + * parse.y (STR_NEW0): set encoding as US-ASCII. + Thu Jan 24 03:47:41 2008 NARUSE, Yui * lib/rexml/text.rb, lib/rubygems/open-uri.rb, lib/open-uri.rb, diff --git a/parse.y b/parse.y index 050f7325e0..aabcc5c18f 100644 --- a/parse.y +++ b/parse.y @@ -268,7 +268,7 @@ 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_str_new(0,0) +#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)) #define STR_ENC(m) ((m)?parser->enc:rb_enc_from_index(0)) @@ -4667,7 +4667,7 @@ yycompile0(VALUE arg, int tracing) if (!compile_for_eval && rb_safe_level() == 0) { ruby_debug_lines = debug_lines(ruby_sourcefile); if (ruby_debug_lines && ruby_sourceline > 0) { - VALUE str = rb_str_new(0, 0); + VALUE str = STR_NEW0(); n = ruby_sourceline; do { rb_ary_push(ruby_debug_lines, str); @@ -7446,7 +7446,7 @@ literal_concat_gen(struct parser_params *parser, NODE *head, NODE *tail) htype = nd_type(head); if (htype == NODE_EVSTR) { - NODE *node = NEW_DSTR(rb_str_new(0, 0)); + NODE *node = NEW_DSTR(STR_NEW0()); head = list_append(node, head); } switch (nd_type(tail)) { @@ -7489,7 +7489,7 @@ static NODE * evstr2dstr_gen(struct parser_params *parser, NODE *node) { if (nd_type(node) == NODE_EVSTR) { - node = list_append(NEW_DSTR(rb_str_new(0, 0)), node); + node = list_append(NEW_DSTR(STR_NEW0()), node); } return node; }