diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 23:35:38 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-18 23:35:38 +0000 |
commit | 8c2c2ebf385b7f3eda71c1a4200633bd9efaded3 (patch) | |
tree | 76b1538a643854a256c353a21bfa432bd6439fe9 /parse.y | |
parent | f256840920c9dac73c05a34a3d5e1e3b6021acc2 (diff) | |
download | ruby-8c2c2ebf385b7f3eda71c1a4200633bd9efaded3.tar.gz ruby-8c2c2ebf385b7f3eda71c1a4200633bd9efaded3.tar.xz ruby-8c2c2ebf385b7f3eda71c1a4200633bd9efaded3.zip |
* parse.y (parser_prepare): get encoding from the first line.
[ruby-dev:33168]
* ruby.c (load_file): set encoding to input with set_encoding.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -4764,7 +4764,6 @@ rb_parser_compile_string(volatile VALUE vparser, const char *f, VALUE s, int lin lex_gets = lex_get_str; lex_gets_ptr = 0; lex_input = s; - parser->enc = rb_enc_get(s); lex_pbeg = lex_p = lex_pend = 0; compile_for_eval = rb_parse_in_eval(); @@ -5957,6 +5956,7 @@ parser_prepare(struct parser_params *parser) return; } pushback(c); + parser->enc = rb_enc_get(lex_lastline); } #define IS_ARG() (lex_state == EXPR_ARG || lex_state == EXPR_CMDARG) @@ -9689,9 +9689,6 @@ 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; |