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

merge revision(s) 50515: [Backport #11155]

Browse source 
* 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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-06-11 16:12:29 +00:00
parent 2e081760e3
commit b9ae7528dd
4 changed files with 40 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Fri Jun 12 01:11:52 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
Sun May 24 03:56:27 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun May 24 03:56:27 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (r_symreal): register symbol names as strings first so * marshal.c (r_symreal): register symbol names as strings first so

2
load.c
View file

@ -318,7 +318,7 @@ loaded_feature_path(const char *name, long vlen, const char *feature, long len,
const char *e; const char *e;
if (vlen < len+1) return 0; 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; plen = vlen - len;
} }
else { else {

26
test/ruby/test_autoload.rb
View file

@ -55,6 +55,32 @@ p Foo::Bar
} }
end 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 def test_require_explicit
Tempfile.create(['autoload', '.rb']) {|file| Tempfile.create(['autoload', '.rb']) {|file|
file.puts 'class Object; AutoloadTest = 1; end' file.puts 'class Object; AutoloadTest = 1; end'

8
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.3" #define RUBY_VERSION "2.2.3"
#define RUBY_RELEASE_DATE "2015-05-24" #define RUBY_RELEASE_DATE "2015-06-12"
#define RUBY_PATCHLEVEL 129 #define RUBY_PATCHLEVEL 130
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 24 #define RUBY_RELEASE_DAY 12
#include "ruby/version.h" #include "ruby/version.h"