From 956666cf5ae92d1046106c24e298469d127e3a6e Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 18 Jan 2008 11:20:30 +0000 Subject: * parse.y (ripper_initialize): too early to set parser->enc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15114 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e0dcab7fb4..6d3a0f4d72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jan 18 20:19:51 2008 NAKAMURA Usaku + + * parse.y (ripper_initialize): too early to set parser->enc. + Fri Jan 18 20:03:05 2008 NAKAMURA Usaku * win32/setup.mak (BASERUBY): nmake cannot execute ruby collectly diff --git a/parse.y b/parse.y index 5e4cc13b41..6c0ed229c1 100644 --- a/parse.y +++ b/parse.y @@ -9677,7 +9677,6 @@ ripper_initialize(int argc, VALUE *argv, VALUE self) else { StringValue(src); parser->parser_lex_gets = lex_get_str; - parser->enc = rb_enc_get(src); } parser->parser_lex_input = src; parser->eofp = Qfalse; @@ -9690,6 +9689,9 @@ ripper_initialize(int argc, VALUE *argv, VALUE self) rb_str_append(fname2, fname); } 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 = RSTRING_PTR(fname2)+1; -- cgit v1.2.3