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

eval_error.c: remove warn_printf

Browse Source 
* eval_error.c (warn_printf): remove.

* eval_error.c (error_pos_str): return error position string,
  split from error_pos.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-02-25 12:36:24 +00:00
parent 7feb182a08
commit 37d6a4dd99
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eval.c
View File

@ -534,17 +534,18 @@ setup_exception(rb_thread_t *th, int tag, volatile VALUE mesg, VALUE cause)
e = rb_obj_as_string(mesg); e = rb_obj_as_string(mesg);
th->errinfo = mesg; th->errinfo = mesg;
if (file && line) { if (file && line) {
warn_printf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n", e = rb_sprintf("Exception `%"PRIsVALUE"' at %s:%d - %"PRIsVALUE"\n",
rb_obj_class(mesg), file, line, e); rb_obj_class(mesg), file, line, e);
} }
else if (file) { else if (file) {
warn_printf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n", e = rb_sprintf("Exception `%"PRIsVALUE"' at %s - %"PRIsVALUE"\n",
rb_obj_class(mesg), file, e); rb_obj_class(mesg), file, e);
} }
else { else {
warn_printf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n", e = rb_sprintf("Exception `%"PRIsVALUE"' - %"PRIsVALUE"\n",
rb_obj_class(mesg), e); rb_obj_class(mesg), e);
} }
warn_print_str(e);
} }
TH_POP_TAG(); TH_POP_TAG();
if (status == TAG_FATAL && th->errinfo == exception_error) { if (status == TAG_FATAL && th->errinfo == exception_error) {

40
eval_error.c
View File

@ -3,24 +3,23 @@
* included by eval.c * included by eval.c
*/ */
static void
warn_printf(const char *fmt, ...)
{
VALUE str;
va_list args;
va_init_list(args, fmt);
str = rb_vsprintf(fmt, args);
va_end(args);
rb_write_error_str(str);
}
#define warn_print(x) rb_write_error(x) #define warn_print(x) rb_write_error(x)
#define warn_print2(x,l) rb_write_error2((x),(l)) #define warn_print2(x,l) rb_write_error2((x),(l))
#define warn_print_str(x) rb_write_error_str(x) #define warn_print_str(x) rb_write_error_str(x)
static VALUE error_pos_str(void);
static void static void
error_pos(void) error_pos(void)
{
VALUE str = error_pos_str();
if (!NIL_P(str)) {
warn_print_str(str);
}
}
static VALUE
error_pos_str(void)
{ {
int sourceline; int sourceline;
VALUE sourcefile = rb_source_location(&sourceline); VALUE sourcefile = rb_source_location(&sourceline);
@ -28,17 +27,18 @@ error_pos(void)
if (sourcefile) { if (sourcefile) {
ID caller_name; ID caller_name;
if (sourceline == 0) { if (sourceline == 0) {
warn_printf("%"PRIsVALUE": ", sourcefile); return rb_sprintf("%"PRIsVALUE": ", sourcefile);
} }
else if ((caller_name = rb_frame_callee()) != 0) { else if ((caller_name = rb_frame_callee()) != 0) {
warn_printf("%"PRIsVALUE":%d:in `%"PRIsVALUE"': ", return rb_sprintf("%"PRIsVALUE":%d:in `%"PRIsVALUE"': ",
sourcefile, sourceline, sourcefile, sourceline,
rb_id2str(caller_name)); rb_id2str(caller_name));
} }
else { else {
warn_printf("%"PRIsVALUE":%d: ", sourcefile, sourceline); return rb_sprintf("%"PRIsVALUE":%d: ", sourcefile, sourceline);
} }
} }
return Qnil;
} }
static VALUE static VALUE
@ -173,11 +173,11 @@ error_print(void)
for (i = 1; i < len; i++) { for (i = 1; i < len; i++) {
VALUE line = RARRAY_AREF(errat, i); VALUE line = RARRAY_AREF(errat, i);
if (RB_TYPE_P(line, T_STRING)) { if (RB_TYPE_P(line, T_STRING)) {
warn_printf("\tfrom %"PRIsVALUE"\n", line); warn_print_str(rb_sprintf("\tfrom %"PRIsVALUE"\n", line));
} }
if (skip && i == TRACE_HEAD && len > TRACE_MAX) { if (skip && i == TRACE_HEAD && len > TRACE_MAX) {
warn_printf("\t ... %ld levels...\n", warn_print_str(rb_sprintf("\t ... %ld levels...\n",
len - TRACE_HEAD - TRACE_TAIL); len - TRACE_HEAD - TRACE_TAIL));
i = len - TRACE_TAIL; i = len - TRACE_TAIL;
} }
} }