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

* eval.c (search_required): required name must not be changed before

Browse source 
loading.  [ruby-dev:24492]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-10-19 15:25:49 +00:00
parent db00c782f4
commit 60a7b3a935
2 changed files with 6 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 @@
Wed Oct 20 00:25:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (search_required): required name must not be changed before
loading. [ruby-dev:24492]
Tue Oct 19 23:59:46 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_require_safe): provide the feature after loaded.

6
eval.c
View file

@ -6678,7 +6678,7 @@ search_required(fname, featurep, path)
char *ext, *ftptr;
int type;
*featurep = fname;
*featurep = fname = rb_str_new4(fname);
*path = 0;
ext = strrchr(ftptr = RSTRING(fname)->ptr, '.');
if (ext && !strchr(ext, '/')) {
@ -6777,10 +6777,6 @@ rb_require_safe(fname, safe)
/* partial state */
ftptr = ruby_strdup(RSTRING(feature)->ptr);
st_insert(loading_tbl, (st_data_t)ftptr, (st_data_t)curr_thread);
if (feature == fname && !OBJ_FROZEN(feature)) {
feature = rb_str_dup(feature);
OBJ_FREEZE(feature);
}
rb_load(path, 0);
break;