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

ruby.c: use String path version parser functions

Browse source 
* ruby.c (load_file_internal): use rb_parser_compile_string_path and
  rb_parser_compile_file_path, String path name versions.  [Bug #8753]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-08-09 13:20:58 +00:00
parent a1a6481ae8
commit e941e50506
3 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Aug 9 22:20:51 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (load_file_internal): use rb_parser_compile_string_path and
rb_parser_compile_file_path, String path name versions. [Bug #8753]
Fri Aug 9 07:16:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
* ext/io/console/console.c: delete redefinition of rb_cloexec_open.

8
ruby.c
View file

@ -1587,9 +1587,9 @@ load_file_internal(VALUE arg)
extern VALUE rb_stdin;
struct load_file_arg *argp = (struct load_file_arg *)arg;
VALUE parser = argp->parser;
VALUE fname_v = rb_str_encode_ospath(argp->fname);
VALUE orig_fname = argp->fname;
VALUE fname_v = rb_str_encode_ospath(orig_fname);
const char *fname = StringValueCStr(fname_v);
const char *orig_fname = StringValueCStr(argp->fname);
int script = argp->script;
struct cmdline_options *opt = argp->opt;
VALUE f;
@ -1723,10 +1723,10 @@ load_file_internal(VALUE arg)
if (NIL_P(f)) {
f = rb_str_new(0, 0);
rb_enc_associate(f, enc);
return (VALUE)rb_parser_compile_string(parser, orig_fname, f, line_start);
return (VALUE)rb_parser_compile_string_path(parser, orig_fname, f, line_start);
}
rb_funcall(f, set_encoding, 2, rb_enc_from_encoding(enc), rb_str_new_cstr("-"));
tree = rb_parser_compile_file(parser, orig_fname, f, line_start);
tree = rb_parser_compile_file_path(parser, orig_fname, f, line_start);
rb_funcall(f, set_encoding, 1, rb_parser_encoding(parser));
if (script && tree && rb_parser_end_seen_p(parser)) {
/*

11
test/ruby/test_require.rb
View file

@ -68,6 +68,13 @@ class TestRequire < Test::Unit::TestCase
assert_require_nonascii_path(encoding, bug8676)
end
def test_require_nonascii_path_shift_jis
bug8676 = '[ruby-core:56136] [Bug #8676]'
encoding = Encoding::Shift_JIS
return if Encoding.find('filesystem') == encoding
assert_require_nonascii_path(encoding, bug8676)
end
def assert_require_nonascii_path(encoding, bug)
Dir.mktmpdir {|tmp|
dir = "\u3042" * 5
@ -77,7 +84,7 @@ class TestRequire < Test::Unit::TestCase
skip "cannot convert path encoding to #{encoding}"
end
Dir.mkdir(File.dirname(require_path))
open(require_path, "wb") {}
open(require_path, "wb") {|f| f.puts '$:.push __FILE__'}
begin
load_path = $:.dup
features = $".dup
@ -87,6 +94,8 @@ class TestRequire < Test::Unit::TestCase
$:.clear
assert_nothing_raised(LoadError, bug) {
assert(require(require_path), bug)
assert_equal(Encoding.find(encoding), $".last.encoding)
assert_equal(Encoding.find(encoding), $:.last.encoding, '[Bug #8753]')
assert(!require(require_path), bug)
}
ensure