1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* parse.y (ripper_initialize): too early to set parser->enc.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-01-18 11:20:30 +00:00
parent 5e0824bcd8
commit 956666cf5a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Jan 18 20:19:51 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* parse.y (ripper_initialize): too early to set parser->enc.
Fri Jan 18 20:03:05 2008 NAKAMURA Usaku <usa@ruby-lang.org> Fri Jan 18 20:03:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/setup.mak (BASERUBY): nmake cannot execute ruby collectly * win32/setup.mak (BASERUBY): nmake cannot execute ruby collectly

4
parse.y
View File

@ -9677,7 +9677,6 @@ ripper_initialize(int argc, VALUE *argv, VALUE self)
else { else {
StringValue(src); StringValue(src);
parser->parser_lex_gets = lex_get_str; parser->parser_lex_gets = lex_get_str;
parser->enc = rb_enc_get(src);
} }
parser->parser_lex_input = src; parser->parser_lex_input = src;
parser->eofp = Qfalse; parser->eofp = Qfalse;
@ -9690,6 +9689,9 @@ ripper_initialize(int argc, VALUE *argv, VALUE self)
rb_str_append(fname2, fname); rb_str_append(fname2, fname);
} }
parser_initialize(parser); parser_initialize(parser);
if (parser->parser_lex_gets == lex_get_str) {
parser->enc = rb_enc_get(src);
}
parser->parser_ruby_sourcefile_string = fname2; parser->parser_ruby_sourcefile_string = fname2;
parser->parser_ruby_sourcefile = RSTRING_PTR(fname2)+1; parser->parser_ruby_sourcefile = RSTRING_PTR(fname2)+1;