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

error.c: better names for rb_exc_new family

Browse Source 
* error.c (rb_exc_new_cstr): rename from rb_exc_new2.
* error.c (rb_exc_new_str): rename from rb_exc_new3.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-06-01 02:16:25 +00:00
parent d956526a76
commit e71d501ee0
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Jun 1 11:16:22 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* error.c (rb_exc_new_cstr): rename from rb_exc_new2.
* error.c (rb_exc_new_str): rename from rb_exc_new3.
Sat Jun 1 10:13:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jun 1 10:13:17 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_new[2-5], rb_{tainted,usascii}_str_new2), * string.c (rb_str_new[2-5], rb_{tainted,usascii}_str_new2),

6
error.c
View File

@ -534,7 +534,7 @@ VALUE rb_eSystemCallError;
VALUE rb_mErrno; VALUE rb_mErrno;
static VALUE rb_eNOERROR; static VALUE rb_eNOERROR;
#undef rb_exc_new2 #undef rb_exc_new_cstr
VALUE VALUE
rb_exc_new(VALUE etype, const char *ptr, long len) rb_exc_new(VALUE etype, const char *ptr, long len)
@ -543,13 +543,13 @@ rb_exc_new(VALUE etype, const char *ptr, long len)
} }
VALUE VALUE
rb_exc_new2(VALUE etype, const char *s) rb_exc_new_cstr(VALUE etype, const char *s)
{ {
return rb_exc_new(etype, s, strlen(s)); return rb_exc_new(etype, s, strlen(s));
} }
VALUE VALUE
rb_exc_new3(VALUE etype, VALUE str) rb_exc_new_str(VALUE etype, VALUE str)
{ {
StringValue(str); StringValue(str);
return rb_funcall(etype, rb_intern("new"), 1, str); return rb_funcall(etype, rb_intern("new"), 1, str);

10
include/ruby/intern.h
View File

@ -207,8 +207,10 @@ VALUE rb_enumeratorize_with_size(VALUE, VALUE, int, VALUE *, VALUE (*)(ANYARGS))
#define RETURN_ENUMERATOR(obj, argc, argv) RETURN_SIZED_ENUMERATOR(obj, argc, argv, 0) #define RETURN_ENUMERATOR(obj, argc, argv) RETURN_SIZED_ENUMERATOR(obj, argc, argv, 0)
/* error.c */ /* error.c */
VALUE rb_exc_new(VALUE, const char*, long); VALUE rb_exc_new(VALUE, const char*, long);
VALUE rb_exc_new2(VALUE, const char*); VALUE rb_exc_new_cstr(VALUE, const char*);
VALUE rb_exc_new3(VALUE, VALUE); VALUE rb_exc_new_str(VALUE, VALUE);
#define rb_exc_new2 rb_exc_new_cstr
#define rb_exc_new3 rb_exc_new_str
PRINTF_ARGS(NORETURN(void rb_loaderror(const char*, ...)), 1, 2); PRINTF_ARGS(NORETURN(void rb_loaderror(const char*, ...)), 1, 2);
PRINTF_ARGS(NORETURN(void rb_loaderror_with_path(VALUE path, const char*, ...)), 2, 3); PRINTF_ARGS(NORETURN(void rb_loaderror_with_path(VALUE path, const char*, ...)), 2, 3);
PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3); PRINTF_ARGS(NORETURN(void rb_name_error(ID, const char*, ...)), 2, 3);
@ -786,11 +788,11 @@ VALUE rb_str_ellipsize(VALUE, long);
rb_str_cat((str), (ptr), (long)strlen(ptr)) : \ rb_str_cat((str), (ptr), (long)strlen(ptr)) : \
rb_str_cat2((str), (ptr)); \ rb_str_cat2((str), (ptr)); \
}) })
#define rb_exc_new2(klass, ptr) __extension__ ( \ #define rb_exc_new_cstr(klass, ptr) __extension__ ( \
{ \ { \
(__builtin_constant_p(ptr)) ? \ (__builtin_constant_p(ptr)) ? \
rb_exc_new((klass), (ptr), (long)strlen(ptr)) : \ rb_exc_new((klass), (ptr), (long)strlen(ptr)) : \
rb_exc_new2((klass), (ptr)); \ rb_exc_new_cstr((klass), (ptr)); \
}) })
#endif #endif
#define rb_str_new2 rb_str_new_cstr #define rb_str_new2 rb_str_new_cstr