From 8c2c2ebf385b7f3eda71c1a4200633bd9efaded3 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 18 Jan 2008 23:35:38 +0000 Subject: * 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 --- parse.y | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'parse.y') diff --git a/parse.y b/parse.y index 6c0ed229c..88d168c32 100644 --- a/parse.y +++ b/parse.y @@ -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; -- cgit