diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-02-01 11:19:13 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-02-01 11:19:13 +0900 |
| commit | d0ba7b95a94db0b695111433f4f309e4349b8100 (patch) | |
| tree | 4281b74b770b1846c8f6f141c2e9327785090f5f | |
| parent | 5cce4ad433abfe806e9bb9438a7ec5e8e8662828 (diff) | |
| parent | a9949f5da487c5f27ab6f60753c74cf58b1fa5e3 (diff) | |
| download | mruby-d0ba7b95a94db0b695111433f4f309e4349b8100.tar.gz mruby-d0ba7b95a94db0b695111433f4f309e4349b8100.zip | |
Merge pull request #5314 from dearblue/presym_init
Introduced `MRB_PRESYM_INIT_SYMBOLS()`
| -rw-r--r-- | include/mruby/presym/disable.h | 4 | ||||
| -rw-r--r-- | include/mruby/presym/enable.h | 5 | ||||
| -rw-r--r-- | src/class.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/include/mruby/presym/disable.h b/include/mruby/presym/disable.h index 701b37f59..45843fbf8 100644 --- a/include/mruby/presym/disable.h +++ b/include/mruby/presym/disable.h @@ -60,9 +60,11 @@ #define MRB_PRESYM_DEFINE_VAR_AND_INITER(name, size, ...) \ static mrb_sym name[size]; \ - static void init_##name(mrb_state *mrb) { \ + static void presym_init_##name(mrb_state *mrb) { \ mrb_sym name__[] = {__VA_ARGS__}; \ memcpy(name, name__, sizeof(name)); \ } +#define MRB_PRESYM_INIT_SYMBOLS(mrb, name) presym_init_##name(mrb) + #endif /* MRUBY_PRESYM_DISABLE_H */ diff --git a/include/mruby/presym/enable.h b/include/mruby/presym/enable.h index c70c86659..8ca0c3cc6 100644 --- a/include/mruby/presym/enable.h +++ b/include/mruby/presym/enable.h @@ -26,8 +26,9 @@ #define MRB_SYM_2(mrb, name) MRB_SYM__##name #define MRB_PRESYM_DEFINE_VAR_AND_INITER(name, size, ...) \ - static const mrb_sym name[] = {__VA_ARGS__}; \ - static void init_##name(mrb_state *mrb) {} + static const mrb_sym name[] = {__VA_ARGS__}; + +#define MRB_PRESYM_INIT_SYMBOLS(mrb, name) (void)(mrb) /* use MRB_SYM() for E_RUNTIME_ERROR etc. */ #undef MRB_ERROR_SYM diff --git a/src/class.c b/src/class.c index 126ac0004..ac8cf423e 100644 --- a/src/class.c +++ b/src/class.c @@ -2817,7 +2817,7 @@ init_class_new(mrb_state *mrb, struct RClass *cls) struct RProc *p; mrb_method_t m; - init_new_syms(mrb); + MRB_PRESYM_INIT_SYMBOLS(mrb, new_syms); p = mrb_proc_new(mrb, &new_irep); MRB_METHOD_FROM_PROC(m, p); mrb_define_method_raw(mrb, cls, MRB_SYM(new), m); |