1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

load.c: resolve_feature_path

Browse Source 
* load.c (rb_resolve_feature_path): search the path for already
  loaded feature.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66661 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-12-31 01:14:51 +00:00
parent c5e8627f65
commit 58508e8b55
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
load.c
View File

@ -840,8 +840,10 @@ rb_f_require_relative(VALUE obj, VALUE fname)
return rb_require_safe(rb_file_absolute_path(fname, base), rb_safe_level()); return rb_require_safe(rb_file_absolute_path(fname, base), rb_safe_level());
} }
typedef int (*feature_func)(const char *feature, const char *ext, int rb, int expanded, const char **fn);
static int static int
search_required(VALUE fname, volatile VALUE *path, int safe_level) search_required(VALUE fname, volatile VALUE *path, int safe_level, feature_func rb_feature_p)
{ {
VALUE tmp; VALUE tmp;
char *ext, *ftptr; char *ext, *ftptr;
@ -945,6 +947,12 @@ load_ext(VALUE path)
/* Method is documented in vm.c */ /* Method is documented in vm.c */
static int
no_feature_p(const char *feature, const char *ext, int rb, int expanded, const char **fn)
{
return 0;
}
VALUE VALUE
rb_resolve_feature_path(VALUE klass, VALUE fname) rb_resolve_feature_path(VALUE klass, VALUE fname)
{ {
@ -954,7 +962,7 @@ rb_resolve_feature_path(VALUE klass, VALUE fname)
fname = rb_get_path_check(fname, 0); fname = rb_get_path_check(fname, 0);
path = rb_str_encode_ospath(fname); path = rb_str_encode_ospath(fname);
found = search_required(path, &path, 0); found = search_required(path, &path, 0, no_feature_p);
switch (found) { switch (found) {
case 'r': case 'r':
@ -1003,7 +1011,7 @@ rb_require_internal(VALUE fname, int safe)
rb_set_safe_level_force(0); rb_set_safe_level_force(0);
RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, RSTRING_PTR(fname)); RUBY_DTRACE_HOOK(FIND_REQUIRE_ENTRY, RSTRING_PTR(fname));
found = search_required(path, &path, safe); found = search_required(path, &path, safe, rb_feature_p);
RUBY_DTRACE_HOOK(FIND_REQUIRE_RETURN, RSTRING_PTR(fname)); RUBY_DTRACE_HOOK(FIND_REQUIRE_RETURN, RSTRING_PTR(fname));
if (found) { if (found) {

20
test/ruby/test_require.rb
View File

@ -897,4 +897,24 @@ class TestRequire < Test::Unit::TestCase
assert_operator(result, :end_with?, "/real/a.rb") assert_operator(result, :end_with?, "/real/a.rb")
} }
end end
if defined?(RubyVM.resolve_feature_path)
def test_resolve_feature_path
paths, loaded = $:.dup, $".dup
Dir.mktmpdir do |tmp|
Tempfile.create(%w[feature .rb], tmp) do |file|
file.close
path = File.realpath(file.path)
dir, base = File.split(path)
$:.unshift(dir)
assert_equal([:rb, path], RubyVM.resolve_feature_path(base))
$".push(path)
assert_equal([:rb, path], RubyVM.resolve_feature_path(base))
end
end
ensure
$:.replace(paths)
$".replace(loaded)
end
end
end end