diff options
| author | KOBAYASHI Shuji <[email protected]> | 2020-11-21 21:14:40 +0900 |
|---|---|---|
| committer | KOBAYASHI Shuji <[email protected]> | 2020-11-21 21:14:40 +0900 |
| commit | 3d056d084aedd2a1a3a36e33b1cef4e90d282813 (patch) | |
| tree | f463c5ac01e1a32a6dea5b6868e2794f6b0479ef /include | |
| parent | 544784effd251656f7b406bc94880e1ef75af7b5 (diff) | |
| download | mruby-3d056d084aedd2a1a3a36e33b1cef4e90d282813.tar.gz mruby-3d056d084aedd2a1a3a36e33b1cef4e90d282813.zip | |
Rename `MRB_{ENABLE,DISABLE}_` to `MRB_{USE,NO}_`; close #5163
| Previous Name | New Name |
|------------------------------|-------------------------|
| MRB_ENABLE_ALL_SYMBOLS | MRB_USE_ALL_SYMBOLS |
| MRB_ENABLE_SYMBOLL_ALL | MRB_USE_ALL_SYMBOLS |
| MRB_ENABLE_CXX_ABI | MRB_USE_CXX_ABI |
| MRB_ENABLE_CXX_EXCEPTION | MRB_USE_CXX_EXCEPTION |
| MRB_ENABLE_DEBUG_HOOK | MRB_USE_DEBUG_HOOK |
| MRB_DISABLE_DIRECT_THREADING | MRB_NO_DIRECT_THREADING |
| MRB_DISABLE_STDIO | MRB_NO_STDIO |
| ENABLE_LINENOISE | MRB_USE_LINENOISE |
| ENABLE_READLINE | MRB_USE_READLINE |
| DISABLE_MIRB_UNDERSCORE | MRB_NO_MIRB_UNDERSCORE |
| DISABLE_GEMS | MRB_NO_GEMS |
* `MRB_ENABLE_SYMBOLL_ALL` seems to be a typo, so it is fixed.
* `MRB_` prefix is added to those without.
* The previous names can also be used for compatibility.
Diffstat (limited to 'include')
| -rw-r--r-- | include/mrbconf.h | 40 | ||||
| -rw-r--r-- | include/mruby.h | 4 | ||||
| -rw-r--r-- | include/mruby/common.h | 2 | ||||
| -rw-r--r-- | include/mruby/compile.h | 6 | ||||
| -rw-r--r-- | include/mruby/dump.h | 2 | ||||
| -rw-r--r-- | include/mruby/throw.h | 6 |
6 files changed, 35 insertions, 25 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index 89b3e9022..506fefb18 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -148,26 +148,36 @@ /* fixed size state atexit stack */ //#define MRB_FIXED_STATE_ATEXIT_STACK -/* -DMRB_DISABLE_XXXX to drop following features */ -//#define MRB_DISABLE_STDIO /* use of stdio */ +/* -DMRB_NO_XXXX to drop following features */ +//#define MRB_NO_STDIO /* use of stdio */ -/* -DMRB_ENABLE_XXXX to enable following features */ -//#define MRB_ENABLE_DEBUG_HOOK /* hooks for debugger */ -//#define MRB_ENABLE_ALL_SYMBOLS /* Symbols.all_symbols */ +/* -DMRB_USE_XXXX to enable following features */ +//#define MRB_USE_DEBUG_HOOK /* hooks for debugger */ +//#define MRB_USE_ALL_SYMBOLS /* Symbols.all_symbols */ -/* end of configuration */ - -/* define MRB_DISABLE_XXXX from DISABLE_XXX (for compatibility) */ -#ifdef DISABLE_STDIO -#define MRB_DISABLE_STDIO +/* obsolete configurations */ +#if defined(DISABLE_STDIO) || defined(MRB_DISABLE_STDIO) +# define MRB_NO_STDIO #endif - -/* define MRB_ENABLE_XXXX from ENABLE_XXX (for compatibility) */ -#ifdef ENABLE_DEBUG -#define MRB_ENABLE_DEBUG_HOOK +#ifdef MRB_DISABLE_DIRECT_THREADING +# define MRB_NO_DIRECT_THREADING +#endif +#if defined(ENABLE_DEBUG) || defined(MRB_ENABLE_DEBUG_HOOK) +# define MRB_USE_DEBUG_HOOK +#endif +#ifdef MRB_ENABLE_ALL_SYMBOLS +# define MRB_USE_ALL_SYMBOLS #endif +#ifdef MRB_ENABLE_CXX_ABI +# define MRB_USE_CXX_ABI +#endif +#ifdef MRB_ENABLE_CXX_EXCEPTION +# define MRB_USE_CXX_EXCEPTION +#endif + +/* end of configuration */ -#ifndef MRB_DISABLE_STDIO +#ifndef MRB_NO_STDIO # include <stdio.h> #endif diff --git a/include/mruby.h b/include/mruby.h index 8099a85e2..a5116f9ee 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -269,11 +269,11 @@ typedef struct mrb_state { struct symbol_name *symtbl; /* symbol table */ mrb_sym symhash[256]; size_t symcapa; -#ifndef MRB_ENABLE_SYMBOLL_ALL +#ifndef MRB_USE_ALL_SYMBOLS char symbuf[8]; /* buffer for small symbol names */ #endif -#ifdef MRB_ENABLE_DEBUG_HOOK +#ifdef MRB_USE_DEBUG_HOOK void (*code_fetch_hook)(struct mrb_state* mrb, const struct mrb_irep *irep, const mrb_code *pc, mrb_value *regs); void (*debug_op_hook)(struct mrb_state* mrb, const struct mrb_irep *irep, const mrb_code *pc, mrb_value *regs); #endif diff --git a/include/mruby/common.h b/include/mruby/common.h index 1f91c5607..90c97cf65 100644 --- a/include/mruby/common.h +++ b/include/mruby/common.h @@ -14,7 +14,7 @@ #endif #ifdef __cplusplus -#ifdef MRB_ENABLE_CXX_ABI +#ifdef MRB_USE_CXX_ABI #define MRB_BEGIN_DECL #define MRB_END_DECL #else diff --git a/include/mruby/compile.h b/include/mruby/compile.h index ce874da6b..7b5da4f69 100644 --- a/include/mruby/compile.h +++ b/include/mruby/compile.h @@ -115,7 +115,7 @@ struct mrb_parser_state { struct mrb_pool *pool; mrb_ast_node *cells; const char *s, *send; -#ifndef MRB_DISABLE_STDIO +#ifndef MRB_NO_STDIO /* If both f and s are non-null, it will be taken preferentially from s until s < send. */ FILE *f; #endif @@ -174,7 +174,7 @@ MRB_API void mrb_parser_set_filename(struct mrb_parser_state*, char const*); MRB_API mrb_sym mrb_parser_get_filename(struct mrb_parser_state*, uint16_t idx); /* utility functions */ -#ifndef MRB_DISABLE_STDIO +#ifndef MRB_NO_STDIO MRB_API struct mrb_parser_state* mrb_parse_file(mrb_state*,FILE*,mrbc_context*); #endif MRB_API struct mrb_parser_state* mrb_parse_string(mrb_state*,const char*,mrbc_context*); @@ -191,7 +191,7 @@ MRB_API mrb_value mrb_load_exec(mrb_state *mrb, struct mrb_parser_state *p, mrbc * mrb_value status = mrb_load_string(mrb, buffer); * mrb_gc_arena_restore(mrb, ai); */ -#ifndef MRB_DISABLE_STDIO +#ifndef MRB_NO_STDIO MRB_API mrb_value mrb_load_file(mrb_state*,FILE*); MRB_API mrb_value mrb_load_file_cxt(mrb_state*,FILE*, mrbc_context *cxt); MRB_API mrb_value mrb_load_detect_file_cxt(mrb_state *mrb, FILE *fp, mrbc_context *c); diff --git a/include/mruby/dump.h b/include/mruby/dump.h index 90eaca184..d3d37c6c1 100644 --- a/include/mruby/dump.h +++ b/include/mruby/dump.h @@ -19,7 +19,7 @@ MRB_BEGIN_DECL #define DUMP_DEBUG_INFO 1 int mrb_dump_irep(mrb_state *mrb, const mrb_irep *irep, uint8_t flags, uint8_t **bin, size_t *bin_size); -#ifndef MRB_DISABLE_STDIO +#ifndef MRB_NO_STDIO int mrb_dump_irep_binary(mrb_state*, const mrb_irep*, uint8_t, FILE*); int mrb_dump_irep_cfunc(mrb_state *mrb, const mrb_irep*, uint8_t flags, FILE *f, const char *initname); int mrb_dump_irep_cstruct(mrb_state *mrb, const mrb_irep*, uint8_t flags, FILE *f, const char *initname); diff --git a/include/mruby/throw.h b/include/mruby/throw.h index b5ea7312e..39f2c450b 100644 --- a/include/mruby/throw.h +++ b/include/mruby/throw.h @@ -7,13 +7,13 @@ #ifndef MRB_THROW_H #define MRB_THROW_H -#if defined(MRB_ENABLE_CXX_ABI) +#if defined(MRB_USE_CXX_ABI) # if !defined(__cplusplus) # error Trying to use C++ exception handling in C code # endif #endif -#if defined(MRB_ENABLE_CXX_EXCEPTION) +#if defined(MRB_USE_CXX_EXCEPTION) # if defined(__cplusplus) @@ -52,7 +52,7 @@ typedef mrb_int mrb_jmpbuf_impl; struct mrb_jmpbuf { mrb_jmpbuf_impl impl; -#if defined(MRB_ENABLE_CXX_EXCEPTION) +#if defined(MRB_USE_CXX_EXCEPTION) static mrb_int jmpbuf_id; # if defined(__cplusplus) mrb_jmpbuf() : impl(jmpbuf_id++) {} |
