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

Make #inspect interruptible in Kernel#p

Browse Source 
Only writing the inspected result and a newline is
uninterruptible.
This commit is contained in:
Nobuyoshi Nakada 2020-04-10 10:52:33 +09:00
parent 230efaf2ae
commit 63a5412db7
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
io.c
View File

@ -7839,11 +7839,11 @@ rb_f_puts(int argc, VALUE *argv, VALUE recv)
return rb_funcallv(rb_stdout, rb_intern("puts"), argc, argv); return rb_funcallv(rb_stdout, rb_intern("puts"), argc, argv);
} }
void static VALUE
rb_p(VALUE obj) /* for debug print within C code */ rb_p_write(VALUE str)
{ {
VALUE args[2]; VALUE args[2];
args[0] = rb_obj_as_string(rb_inspect(obj)); args[0] = str;
args[1] = rb_default_rs; args[1] = rb_default_rs;
if (RB_TYPE_P(rb_stdout, T_FILE) && if (RB_TYPE_P(rb_stdout, T_FILE) &&
rb_method_basic_definition_p(CLASS_OF(rb_stdout), id_write)) { rb_method_basic_definition_p(CLASS_OF(rb_stdout), id_write)) {
@ -7852,25 +7852,20 @@ rb_p(VALUE obj) /* for debug print within C code */
else { else {
rb_io_writev(rb_stdout, 2, args); rb_io_writev(rb_stdout, 2, args);
} }
return Qnil;
} }
struct rb_f_p_arg { void
int argc; rb_p(VALUE obj) /* for debug print within C code */
VALUE *argv; {
}; rb_p_write(rb_obj_as_string(rb_inspect(obj)));
}
static VALUE static VALUE
rb_f_p_internal(VALUE arg) rb_p_result(int argc, const VALUE *argv)
{ {
struct rb_f_p_arg *arg1 = (struct rb_f_p_arg*)arg;
int argc = arg1->argc;
VALUE *argv = arg1->argv;
int i;
VALUE ret = Qnil; VALUE ret = Qnil;
for (i=0; i<argc; i++) {
rb_p(argv[i]);
}
if (argc == 1) { if (argc == 1) {
ret = argv[0]; ret = argv[0];
} }
@ -7904,11 +7899,12 @@ rb_f_p_internal(VALUE arg)
static VALUE static VALUE
rb_f_p(int argc, VALUE *argv, VALUE self) rb_f_p(int argc, VALUE *argv, VALUE self)
{ {
struct rb_f_p_arg arg; int i;
arg.argc = argc; for (i=0; i<argc; i++) {
arg.argv = argv; VALUE inspected = rb_obj_as_string(rb_inspect(argv[i]));
rb_uninterruptible(rb_p_write, inspected);
return rb_uninterruptible(rb_f_p_internal, (VALUE)&arg); }
return rb_p_result(argc, argv);
} }
/* /*