From 3041f2156eae5dbcbe14562b6eef9389c9c50bdd Mon Sep 17 00:00:00 2001 From: nagachika Date: Sun, 30 Mar 2014 15:06:25 +0000 Subject: merge revision(s) r42230,r42231: [Backport #9651] parse.y, vm_eval.c: file encoding in eval * parse.y (yycompile): store file name as String to keep the encoding. * parse.y (rb_parser_compile_string_path, rb_parser_compile_file_path): new functions to pass file name as a String. * parse.y (gettable_gen): return a copy of the original file name, not a copy in filesystem encoding. * vm_eval.c (eval_string_with_cref): use Qundef instead of "(eval)". * parse.y (yycompile): store file name as String to keep the encoding. * parse.y (rb_parser_compile_string_path, rb_parser_compile_file_path): new functions to pass file name as a String. * parse.y (gettable_gen): return a copy of the original file name, not a copy in filesystem encoding. * vm_eval.c (eval_string_with_cref): use Qundef instead of "(eval)". git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- node.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'node.h') diff --git a/node.h b/node.h index 0fa72545c2..d294fcc492 100644 --- a/node.h +++ b/node.h @@ -482,6 +482,8 @@ NODE *rb_parser_while_loop(VALUE, NODE *, int, int); NODE *rb_parser_compile_cstr(volatile VALUE, const char*, const char*, int, int); NODE *rb_parser_compile_string(volatile VALUE, const char*, VALUE, int); NODE *rb_parser_compile_file(volatile VALUE, const char*, VALUE, int); +NODE *rb_parser_compile_string_path(volatile VALUE vparser, VALUE fname, VALUE src, int line); +NODE *rb_parser_compile_file_path(volatile VALUE vparser, VALUE fname, VALUE input, int line); NODE *rb_compile_cstr(const char*, const char*, int, int); NODE *rb_compile_string(const char*, VALUE, int); -- cgit v1.2.3