summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-18 11:20:30 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-18 11:20:30 +0000
commit956666cf5ae92d1046106c24e298469d127e3a6e (patch)
treedc5f40d4da52e34f2b2fcb27ecab1560b0f355a2 /parse.y
parent5e0824bcd846a77520c6c1d6ff76dff23c7f52e6 (diff)
* 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
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y4
1 files changed, 3 insertions, 1 deletions
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;