Commit 97136825 authored by Masaki Muranaka's avatar Masaki Muranaka

Separate Kernel#sprintf support from mruby core. It's moved to mrbgems.

parent a5bc5b25
...@@ -20,6 +20,9 @@ MRuby::Build.new do |conf| ...@@ -20,6 +20,9 @@ MRuby::Build.new do |conf|
# Use standard Struct class # Use standard Struct class
conf.gem 'mrbgems/mruby-struct' conf.gem 'mrbgems/mruby-struct'
# Use standard Kernel#sprintf method
conf.gem 'mrbgems/mruby-sprintf'
# Generate binaries # Generate binaries
# conf.bins = %w(mrbc mruby mirb) # conf.bins = %w(mrbc mruby mirb)
......
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
//#define POOL_PAGE_SIZE 16000 //#define POOL_PAGE_SIZE 16000
/* -DDISABLE_XXXX to drop following features */ /* -DDISABLE_XXXX to drop following features */
//#define DISABLE_SPRINTF /* Kernel.sprintf method */
//#define DISABLE_STDIO /* use of stdio */ //#define DISABLE_STDIO /* use of stdio */
/* -DENABLE_XXXX to enable following features */ /* -DENABLE_XXXX to enable following features */
...@@ -83,9 +82,6 @@ ...@@ -83,9 +82,6 @@
typedef short mrb_sym; typedef short mrb_sym;
/* define ENABLE_XXXX from DISABLE_XXX */ /* define ENABLE_XXXX from DISABLE_XXX */
#ifndef DISABLE_SPRINTF
#define ENABLE_SPRINTF
#endif
#ifndef DISABLE_STDIO #ifndef DISABLE_STDIO
#define ENABLE_STDIO #define ENABLE_STDIO
#endif #endif
......
MRuby::Gem::Specification.new('mruby-sprintf') do |spec|
spec.license = 'MIT'
spec.authors = 'mruby developers'
end
/*
** kernel.c - Kernel module suppliment
**
** See Copyright Notice in mruby.h
*/
#include "mruby.h"
mrb_value mrb_f_sprintf(mrb_state *mrb, mrb_value obj); /* in sprintf.c */
void
mrb_mruby_sprintf_gem_init(mrb_state* mrb)
{
struct RClass *krn;
if (mrb->kernel_module == NULL) {
mrb->kernel_module = mrb_define_module(mrb, "Kernel"); /* Might be PARANOID. */
}
krn = mrb->kernel_module;
mrb_define_method(mrb, krn, "sprintf", mrb_f_sprintf, ARGS_ANY());
mrb_define_method(mrb, krn, "format", mrb_f_sprintf, ARGS_ANY());
}
void
mrb_mruby_sprintf_gem_final(mrb_state* mrb)
{
/* nothing to do. */
}
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
#include "mruby.h" #include "mruby.h"
#ifdef ENABLE_SPRINTF
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "mruby/string.h" #include "mruby/string.h"
...@@ -1091,5 +1089,3 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec) ...@@ -1091,5 +1089,3 @@ fmt_setup(char *buf, size_t size, int c, int flags, int width, int prec)
*buf++ = c; *buf++ = c;
*buf = '\0'; *buf = '\0';
} }
#endif /* ENABLE_SPRINTF */
##
# Kernel#sprintf Kernel#format Test
...@@ -1108,11 +1108,6 @@ mrb_init_kernel(mrb_state *mrb) ...@@ -1108,11 +1108,6 @@ 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, "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 */ mrb_define_method(mrb, krn, "to_s", mrb_any_to_s, ARGS_NONE()); /* 15.3.1.3.46 */
#ifdef ENABLE_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); mrb_include_module(mrb, mrb->object_class, mrb->kernel_module);
mrb_alias_method(mrb, mrb->module_class, mrb_intern(mrb, "dup"), mrb_intern(mrb, "clone")); mrb_alias_method(mrb, mrb->module_class, mrb_intern(mrb, "dup"), mrb_intern(mrb, "clone"));
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment