diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | load.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_autoload.rb | 26 |
3 files changed, 36 insertions, 1 deletions
@@ -1,3 +1,12 @@ +Sun May 17 03:58:59 2015 Aaron Patterson <tenderlove@ruby-lang.org> + + * load.c (loaded_feature_path): stop returning false negatives for + filenames which are trailing substrings of file extensions. For + example, 'b', which a trailing substring of ".rb" should not return + false. [Bug #11155][ruby-core:69206] + + * test/ruby/test_autoload.rb: test for fix + Sat May 16 21:41:24 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> * string.c: added documentation for character sequence \' with String#sub @@ -317,7 +317,7 @@ loaded_feature_path(const char *name, long vlen, const char *feature, long len, const char *e; if (vlen < len+1) return 0; - if (!strncmp(name+(vlen-len), feature, len)) { + if (strchr(feature, '.') && !strncmp(name+(vlen-len), feature, len)) { plen = vlen - len; } else { diff --git a/test/ruby/test_autoload.rb b/test/ruby/test_autoload.rb index 5b1bbc0e0f..018cc1c326 100644 --- a/test/ruby/test_autoload.rb +++ b/test/ruby/test_autoload.rb @@ -55,6 +55,32 @@ p Foo::Bar } end + def test_autoload_with_unqualified_file_name # [ruby-core:69206] + lp = $LOAD_PATH.dup + lf = $LOADED_FEATURES.dup + + Dir.mktmpdir('autoload') { |tmpdir| + $LOAD_PATH << tmpdir + + Dir.chdir(tmpdir) do + eval <<-END + class ::Object + module A + autoload :C, 'b' + end + end + END + + File.open('b.rb', 'w') {|file| file.puts 'module A; class C; end; end'} + assert_kind_of Class, ::A::C + end + } + ensure + $LOAD_PATH.replace lp + $LOADED_FEATURES.replace lf + Object.send(:remove_const, :A) if Object.const_defined?(:A) + end + def test_require_explicit Tempfile.create(['autoload', '.rb']) {|file| file.puts 'class Object; AutoloadTest = 1; end' |