diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-06-12 03:10:37 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2012-06-12 03:10:37 -0700 |
| commit | db1244cef5b21074945f26eb4351d7feecb31af4 (patch) | |
| tree | 8fb17d41725c706bd28aa3033648bcdb0b101be2 | |
| parent | f537e2bb96a85d7ca75777f64cad13fea8d4937c (diff) | |
| parent | e1e4ceb3e42dab35038a52d89064ca6378a08c7d (diff) | |
| download | mruby-db1244cef5b21074945f26eb4351d7feecb31af4.tar.gz mruby-db1244cef5b21074945f26eb4351d7feecb31af4.zip | |
Merge pull request #263 from monaka/pr-make-sprintf-optional
Make sprintf/format optional.
| -rw-r--r-- | include/mrbconf.h | 3 | ||||
| -rw-r--r-- | src/kernel.c | 2 | ||||
| -rw-r--r-- | src/sprintf.c | 5 |
3 files changed, 10 insertions, 0 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index 5a54ebeef..f2b23258e 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -34,6 +34,9 @@ typedef intptr_t mrb_sym; # define INCLUDE_ENCODING /* Regexp depends Encoding */ #endif +//#undef INCLUDE_KERNEL_SPRINTF /* not use Kernel.sprintf method. */ +#define INCLUDE_KERNEL_SPRINTF /* not use Kernel.sprintf method. */ + #ifdef MRUBY_DEBUG_BUILD # define PARSER_DUMP #endif diff --git a/src/kernel.c b/src/kernel.c index f233fdf6d..30c1c8a67 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -1394,8 +1394,10 @@ mrb_init_kernel(mrb_state *mrb) mrb_define_method(mrb, krn, "singleton_methods", mrb_obj_singleton_methods_m, ARGS_ANY()); /* 15.3.1.3.45 */ mrb_define_method(mrb, krn, "to_s", mrb_any_to_s, ARGS_NONE()); /* 15.3.1.3.46 */ +#ifdef INCLUDE_KERNEL_SPRINTF mrb_define_method(mrb, krn, "sprintf", mrb_f_sprintf, ARGS_ANY()); /* in sprintf.c */ mrb_define_method(mrb, krn, "format", mrb_f_sprintf, ARGS_ANY()); /* in sprintf.c */ +#endif mrb_include_module(mrb, mrb->object_class, mrb->kernel_module); } diff --git a/src/sprintf.c b/src/sprintf.c index 296a7c73e..c7e7badc4 100644 --- a/src/sprintf.c +++ b/src/sprintf.c @@ -5,6 +5,9 @@ */ #include "mruby.h" + +#ifdef INCLUDE_KERNEL_SPRINTF + #include <stdio.h> #include <string.h> #include "encoding.h" @@ -1078,3 +1081,5 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec) *buf++ = c; *buf = '\0'; } + +#endif //INCLUDE_KERNEL_SPRINTF |