admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2869 from cremno/refactor-print.c

Browse Source 
src/print.c: rewrite printstr() to get rid of code duplication
This commit is contained in:
Yukihiro "Matz" Matsumoto
2015-07-01 08:47:41 +09:00
parent 18c82d5359 6ed64e2367
commit ff49cf95fc
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/print.c
+12 -24
View File
@@ -8,45 +8,35 @@
#include "mruby/string.h"
#include "mruby/variable.h"
static void
printstr(mrb_state *mrb, mrb_value obj)
{
#ifdef ENABLE_STDIO
char *s;
int len;
static void
printstr(mrb_value obj, FILE *stream)
{
if (mrb_string_p(obj)) {
s = RSTRING_PTR(obj);
len = RSTRING_LEN(obj);
fwrite(s, len, 1, stdout);
fwrite(RSTRING_PTR(obj), RSTRING_LEN(obj), 1, stream);
putc('\n', stream);
}
#endif
}
#else
# define printstr(obj, stream) (void)0
#endif
MRB_API void
mrb_p(mrb_state *mrb, mrb_value obj)
{
#ifdef ENABLE_STDIO
mrb_value val = mrb_inspect(mrb, obj);
printstr(mrb, val);
putc('\n', stdout);
#endif
printstr(val, stdout);
}
MRB_API void
mrb_print_error(mrb_state *mrb)
{
#ifdef ENABLE_STDIO
mrb_value s;
mrb_print_backtrace(mrb);
s = mrb_funcall(mrb, mrb_obj_value(mrb->exc), "inspect", 0);
if (mrb_string_p(s)) {
fwrite(RSTRING_PTR(s), RSTRING_LEN(s), 1, stderr);
putc('\n', stderr);
}
#endif
printstr(s, stderr);
}
MRB_API void
@@ -55,8 +45,7 @@ mrb_show_version(mrb_state *mrb)
mrb_value msg;
msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_DESCRIPTION"));
printstr(mrb, msg);
printstr(mrb, mrb_str_new_lit(mrb, "\n"));
printstr(msg, stdout);
}
MRB_API void
@@ -65,6 +54,5 @@ mrb_show_copyright(mrb_state *mrb)
mrb_value msg;
msg = mrb_const_get(mrb, mrb_obj_value(mrb->object_class), mrb_intern_lit(mrb, "MRUBY_COPYRIGHT"));
printstr(mrb, msg);
printstr(mrb, mrb_str_new_lit(mrb, "\n"));
printstr(msg, stdout);
}