Skip to content

Allow to use require_relative from eval and irb environment #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LTe wants to merge 4 commits into from
Closed

Allow to use require_relative from eval and irb environment #139

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2b02da
Allow to use require_relative from eval and irb environment
LTe Jul 5, 2012
f58d7c6
Remove unnecessary usage of rb_realpath_internal
LTe Jul 5, 2012
1caf6ed
We don't need use rb_find_file because rb_require_safe calls it
LTe Jul 6, 2012
fdb9712
Don't use FilePathValue, we can just use fname
LTe Jul 6, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unnecessary usage of rb_realpath_internal
  • Loading branch information
@LTe
LTe committed Jul 5, 2012
commit f58d7c686c469cbddcaa079fd65d88eb08949648
2 changes: 1 addition & 1 deletion load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ rb_f_require_relative(VALUE obj, VALUE fname)
VALUE path = rb_find_file(FilePathValue(fname));
Copy link
Member

@nobu nobu Jul 6, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also rb_find_file() is not needed, since rb_require_safe() calls it.

Copy link
Author

@LTe LTe Jul 6, 2012

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated, thanks for feedback :)

if (!path)
path = fname;
return rb_require_safe(rb_realpath_internal(Qnil, path, 0), rb_safe_level());
return rb_require_safe(path, rb_safe_level());
}
base = rb_file_dirname(base);
return rb_require_safe(rb_file_absolute_path(fname, base), rb_safe_level());
Expand Down