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

Added rb_syserr_new_path

Browse Source 
Similar to rb_syserr_fail_path, but just returns the created
exception instance instead of raising it.
This commit is contained in:
Nobuyoshi Nakada 2020-04-15 00:59:23 +09:00
parent 69b3e0ac59
commit d72fd1e45b
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2020-04-15 22:08:50 +09:00 
Merged: https://github.com/ruby/ruby/pull/3035
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
error.c
View File

@ -2829,6 +2829,12 @@ rb_sys_fail_path_in(const char *func_name, VALUE path)
void void
rb_syserr_fail_path_in(const char *func_name, int n, VALUE path) rb_syserr_fail_path_in(const char *func_name, int n, VALUE path)
{
rb_exc_raise(rb_syserr_new_path_in(func_name, n, path));
}
VALUE
rb_syserr_new_path_in(const char *func_name, int n, VALUE path)
{ {
VALUE args[2]; VALUE args[2];
@ -2841,7 +2847,7 @@ rb_syserr_fail_path_in(const char *func_name, int n, VALUE path)
} }
args[0] = path; args[0] = path;
args[1] = rb_str_new_cstr(func_name); args[1] = rb_str_new_cstr(func_name);
rb_exc_raise(rb_class_new_instance(2, args, get_syserr(n))); return rb_class_new_instance(2, args, get_syserr(n));
} }
#endif #endif

3
internal/error.h
View File

@ -32,9 +32,11 @@
#ifdef RUBY_FUNCTION_NAME_STRING #ifdef RUBY_FUNCTION_NAME_STRING
# define rb_sys_fail_path(path) rb_sys_fail_path_in(RUBY_FUNCTION_NAME_STRING, path) # define rb_sys_fail_path(path) rb_sys_fail_path_in(RUBY_FUNCTION_NAME_STRING, path)
# define rb_syserr_fail_path(err, path) rb_syserr_fail_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path)) # define rb_syserr_fail_path(err, path) rb_syserr_fail_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path))
# define rb_syserr_new_path(err, path) rb_syserr_new_path_in(RUBY_FUNCTION_NAME_STRING, (err), (path))
#else #else
# define rb_sys_fail_path(path) rb_sys_fail_str(path) # define rb_sys_fail_path(path) rb_sys_fail_str(path)
# define rb_syserr_fail_path(err, path) rb_syserr_fail_str((err), (path)) # define rb_syserr_fail_path(err, path) rb_syserr_fail_str((err), (path))
# define rb_syserr_new_path(err, path) rb_syserr_new_str((err), (path))
#endif #endif
/* error.c */ /* error.c */
@ -79,6 +81,7 @@ int rb_bug_reporter_add(void (*func)(FILE *, void *), void *data);
#ifdef RUBY_FUNCTION_NAME_STRING #ifdef RUBY_FUNCTION_NAME_STRING
NORETURN(void rb_sys_fail_path_in(const char *func_name, VALUE path)); NORETURN(void rb_sys_fail_path_in(const char *func_name, VALUE path));
NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path)); NORETURN(void rb_syserr_fail_path_in(const char *func_name, int err, VALUE path));
VALUE rb_syserr_new_path_in(const char *func_name, int n, VALUE path);
#endif #endif
RUBY_SYMBOL_EXPORT_END RUBY_SYMBOL_EXPORT_END