kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* parse.y (parser_prepare): get encoding from the first line.

Browse source 
[ruby-dev:33168]

* ruby.c (load_file): set encoding to input with set_encoding.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-01-18 23:35:38 +00:00
parent 4920980d17
commit 9872d4d600
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Sat Jan 19 08:35:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (parser_prepare): get encoding from the first line.
[ruby-dev:33168]
* ruby.c (load_file): set encoding to input with set_encoding.
Sat Jan 19 03:46:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Sat Jan 19 03:46:42 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (thread_create_core): prohibit thread creation in the * thread.c (thread_create_core): prohibit thread creation in the

5
parse.y
View file

@ -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 = lex_get_str;
lex_gets_ptr = 0; lex_gets_ptr = 0;
lex_input = s; lex_input = s;
parser->enc = rb_enc_get(s);
lex_pbeg = lex_p = lex_pend = 0; lex_pbeg = lex_p = lex_pend = 0;
compile_for_eval = rb_parse_in_eval(); compile_for_eval = rb_parse_in_eval();
@ -5957,6 +5956,7 @@ parser_prepare(struct parser_params *parser)
return; return;
} }
pushback(c); pushback(c);
parser->enc = rb_enc_get(lex_lastline);
} }
#define IS_ARG() (lex_state == EXPR_ARG || lex_state == EXPR_CMDARG) #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); 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;

11
ruby.c
View file

@ -1038,6 +1038,7 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
VALUE f; VALUE f;
int line_start = 1; int line_start = 1;
NODE *tree = 0; NODE *tree = 0;
rb_encoding *enc;
if (!fname) if (!fname)
rb_load_fail(fname); rb_load_fail(fname);
@ -1151,10 +1152,16 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o
require_libraries(); /* Why here? unnatural */ require_libraries(); /* Why here? unnatural */
} }
if (opt->enc_index >= 0) { if (opt->enc_index >= 0) {
rb_enc_associate_index(f, opt->enc_index); enc = rb_enc_from_index(opt->enc_index);
} }
else if (f == rb_stdin) { else if (f == rb_stdin) {
rb_enc_associate(f, rb_locale_encoding()); enc = rb_locale_encoding();
}
else {
enc = 0;
}
if (enc) {
rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc));
} }
tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start); tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start);
if (script && rb_parser_end_seen_p(parser)) { if (script && rb_parser_end_seen_p(parser)) {