diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-06-14 21:10:49 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2015-06-14 21:10:49 +0900 |
| commit | 97a18ff4d9db48a72b3e63f2d6fd7c7958e98c97 (patch) | |
| tree | 9cd23a021e266aaeb478899951384784d1540e2d | |
| parent | d2433a7723e958e33b07d7abe583215756bd8840 (diff) | |
| parent | 5e8d2a4b841d59ceab9f6fcf3ae294d93b8332b5 (diff) | |
| download | mruby-97a18ff4d9db48a72b3e63f2d6fd7c7958e98c97.tar.gz mruby-97a18ff4d9db48a72b3e63f2d6fd7c7958e98c97.zip | |
Merge pull request #2833 from cremno/call-mrb_inspect
refactor code to call mrb_inspect() instead
| -rw-r--r-- | mrbgems/mruby-bin-mruby/tools/mruby/mruby.c | 6 | ||||
| -rw-r--r-- | src/print.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c index 44ad9bb06..141ea151b 100644 --- a/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c +++ b/mrbgems/mruby-bin-mruby/tools/mruby/mruby.c @@ -11,12 +11,8 @@ static void p(mrb_state *mrb, mrb_value obj) { - mrb_value val; + mrb_value val = mrb_inspect(mrb, obj); - val = mrb_funcall(mrb, obj, "inspect", 0); - if (!mrb_string_p(val)) { - val = mrb_obj_as_string(mrb, obj); - } fwrite(RSTRING_PTR(val), RSTRING_LEN(val), 1, stdout); putc('\n', stdout); } diff --git a/src/print.c b/src/print.c index b43936b13..c7c1ccd39 100644 --- a/src/print.c +++ b/src/print.c @@ -27,12 +27,8 @@ MRB_API void mrb_p(mrb_state *mrb, mrb_value obj) { #ifdef ENABLE_STDIO - mrb_value val; + mrb_value val = mrb_inspect(mrb, obj); - val = mrb_funcall(mrb, obj, "inspect", 0); - if (!mrb_string_p(val)) { - val = mrb_obj_as_string(mrb, obj); - } printstr(mrb, val); putc('\n', stdout); #endif |