diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/mrbconf.h | 47 | ||||
| -rw-r--r-- | include/mruby.h | 1 | ||||
| -rw-r--r-- | include/mruby/dump.h | 14 |
3 files changed, 25 insertions, 37 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index b5cb58ee6..472bd12cf 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -43,59 +43,42 @@ /* page size of memory pool */ //#define POOL_PAGE_SIZE 16000 -/* -DDISABLE_XXXX to drop the feature */ +/* -DDISABLE_XXXX to drop following features */ //#define DISABLE_SPRINTF /* Kernel.sprintf method */ //#define DISABLE_MATH /* Math functions */ //#define DISABLE_TIME /* Time class */ //#define DISABLE_STRUCT /* Struct class */ //#define DISABLE_STDIO /* use of stdio */ -//#define ENABLE_DEBUG /* hooks for debugger */ -/* Now DISABLE_GEMS is added as a command line flag in Rakefile, */ -/* we do not need to set it here. */ - -#undef HAVE_UNISTD_H /* WINDOWS */ -#define HAVE_UNISTD_H /* LINUX */ +/* -DENABLE_XXXX to enable following features */ +//#define ENABLE_DEBUG /* hooks for debugger */ /* end of configuration */ #ifdef MRB_USE_FLOAT typedef float mrb_float; -# define mrb_float_to_str(buf, i) sprintf((buf), "%.7e", (i)) -# define str_to_mrb_float(buf) (mrb_float)strtof((buf),NULL) +# define mrb_float_to_str(buf, i) sprintf(buf, "%.7e", i) +# define str_to_mrb_float(buf) strtof(buf, NULL) #else typedef double mrb_float; -# define mrb_float_to_str(buf, i) sprintf((buf), "%.16e", (i)) -# define str_to_mrb_float(buf) (mrb_float)strtod((buf),NULL) +# define mrb_float_to_str(buf, i) sprintf(buf, "%.16e", i) +# define str_to_mrb_float(buf) strtod(buf, NULL) #endif -#ifdef MRB_NAN_BOXING -# ifdef MRB_INT64 +#ifdef MRB_INT64 +# ifdef MRB_NAN_BOXING # error Cannot use NaN boxing when mrb_int is 64bit # else - typedef int32_t mrb_int; -# define MRB_INT_MIN INT32_MIN -# define MRB_INT_MAX INT32_MAX -# define MRB_INT_FORMAT PRId32 -# define mrb_int_to_str(buf, i) sprintf((buf), "%" MRB_INT_FORMAT, (i)) -# define str_to_mrb_int(buf) (mrb_int)strtol((buf), NULL, 10) -# endif -#else -# ifdef MRB_INT64 typedef int64_t mrb_int; # define MRB_INT_MIN INT64_MIN # define MRB_INT_MAX INT64_MAX -# define MRB_INT_FORMAT PRId64 -# define mrb_int_to_str(buf, i) sprintf((buf), "%" MRB_INT_FORMAT, (i)) -# define str_to_mrb_int(buf) (mrb_int)strtoll((buf), NULL, 10) -# else - typedef int32_t mrb_int; -# define MRB_INT_MIN INT32_MIN -# define MRB_INT_MAX INT32_MAX -# define MRB_INT_FORMAT PRId32 -# define mrb_int_to_str(buf, i) sprintf((buf), "%" MRB_INT_FORMAT, (i)) -# define str_to_mrb_int(buf) (mrb_int)strtol((buf), NULL, 10) +# define str_to_mrb_int(buf) strtoll(buf, NULL, 10) # endif +#else + typedef int32_t mrb_int; +# define MRB_INT_MIN INT32_MIN +# define MRB_INT_MAX INT32_MAX +# define str_to_mrb_int(buf) strtol(buf, NULL, 10) #endif typedef short mrb_sym; diff --git a/include/mruby.h b/include/mruby.h index e10be59fe..61df6e9ed 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -272,7 +272,6 @@ mrb_value mrb_obj_clone(mrb_state *mrb, mrb_value self); mrb_value mrb_exc_new(mrb_state *mrb, struct RClass *c, const char *ptr, long len); void mrb_exc_raise(mrb_state *mrb, mrb_value exc); -int mrb_block_given_p(void); void mrb_raise(mrb_state *mrb, struct RClass *c, const char *msg); void mrb_raisef(mrb_state *mrb, struct RClass *c, const char *fmt, ...); void mrb_warn(const char *fmt, ...); diff --git a/include/mruby/dump.h b/include/mruby/dump.h index 650651a7e..eb8fe55dd 100644 --- a/include/mruby/dump.h +++ b/include/mruby/dump.h @@ -12,16 +12,22 @@ extern "C" { #endif #include "mruby.h" +#ifdef ENABLE_STDIO #include <stdio.h> +#endif #include <stdint.h> +#ifdef ENABLE_STDIO int mrb_dump_irep(mrb_state*,int,FILE*); -int mrb_read_irep(mrb_state*,const char*); +int mrb_bdump_irep(mrb_state *mrb, int n, FILE *f,const char *initname); + int mrb_read_irep_file(mrb_state*,FILE*); -/* mrb_value mrb_load_irep(mrb_state*,const char*); */ /* declared in <irep.h> */ -mrb_value mrb_load_irep_file(mrb_state*,FILE*); +#endif +int mrb_read_irep(mrb_state*,const char*); -int mrb_bdump_irep(mrb_state *mrb, int n, FILE *f,const char *initname); +#ifdef ENABLE_STDIO +mrb_value mrb_load_irep_file(mrb_state*,FILE*); +#endif /* dump type */ #define DUMP_TYPE_CODE 0 |