archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 09:04:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) r41598,r45181:

Browse source 
* eval_error.c (warn_printf): use rb_vsprintf instead so ruby specific
	  extensions like PRIsVALUE can be used in format strings

	* eval_error.c (error_print): use warn_print_str (alias for
	  rb_write_error_str) to print a string value instead of using
	  RSTRING_PTR and RSTRING_LEN manually

	* eval.c (setup_exception): use PRIsVALUE instead of %s and RSTRING_PTR

	* eval.c (setup_exception): preserve exception class name encoding
	  in debug mode messages.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-03-02 16:53:02 +00:00
parent 6df2fbf0f6
commit c6816d074b
5 changed files with 41 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
eval_error.c
View file

@ -6,17 +6,18 @@
static void
warn_printf(const char *fmt, ...)
{
char buf[BUFSIZ];
VALUE str;
va_list args;
va_init_list(args, fmt);
vsnprintf(buf, BUFSIZ, fmt, args);
str = rb_vsprintf(fmt, args);
va_end(args);
rb_write_error(buf);
rb_write_error_str(str);
}
#define warn_print(x) rb_write_error(x)
#define warn_print2(x,l) rb_write_error2((x),(l))
#define warn_print_str(x) rb_write_error_str(x)
static void
error_pos(void)
@ -117,7 +118,7 @@ error_print(void)
if (NIL_P(mesg))
error_pos();
else {
warn_print2(RSTRING_PTR(mesg), RSTRING_LEN(mesg));
warn_print_str(mesg);
}
}
@ -143,7 +144,7 @@ error_print(void)
epath = rb_class_name(eclass);
if (elen == 0) {
warn_print(": ");
warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
warn_print_str(epath);
warn_print("\n");
}
else {
@ -160,7 +161,7 @@ error_print(void)
warn_print2(einfo, len);
if (epath) {
warn_print(" (");
warn_print2(RSTRING_PTR(epath), RSTRING_LEN(epath));
warn_print_str(epath);
warn_print(")\n");
}
if (tail) {
@ -182,7 +183,7 @@ error_print(void)
for (i = 1; i < len; i++) {
if (RB_TYPE_P(ptr[i], T_STRING)) {
warn_printf("\tfrom %s\n", RSTRING_PTR(ptr[i]));
warn_printf("\tfrom %"PRIsVALUE"\n", ptr[i]);
}
if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
warn_printf("\t ... %ld levels...\n",