diff options
Diffstat (limited to 'builtin.c')
| -rw-r--r-- | builtin.c | 84 |
1 files changed, 67 insertions, 17 deletions
@@ -1,4 +1,5 @@ #include "internal.h" +#include "internal/box.h" #include "vm_core.h" #include "iseq.h" #include "builtin.h" @@ -22,18 +23,41 @@ bin4feature(const struct builtin_binary *bb, const char *feature, size_t *psize) static const unsigned char* builtin_lookup(const char *feature, size_t *psize) { - static int index = 0; - const unsigned char *bin = bin4feature(&builtin_binary[index++], feature, psize); + static size_t index = 0; + const unsigned char *bin = NULL; + + /* + * Fast path: + * builtin_binary is usually arranged in the same order + * as features are looked up in miniruby, so try the next entry first. + */ + if (builtin_binary[index].feature) { + bin = bin4feature(&builtin_binary[index], feature, psize); + index++; + } + if (bin) { + return bin; + } - // usually, `builtin_binary` order is loading order at miniruby. - for (const struct builtin_binary *bb = &builtin_binary[0]; bb->feature &&! bin; bb++) { - bin = bin4feature(bb++, feature, psize); + /* + * Fallback: + * In case the lookup order does not match the array order, + * scan the entire table to find the feature. + */ + for (const struct builtin_binary *bb = &builtin_binary[0]; + bb->feature; + bb++) { + bin = bin4feature(bb, feature, psize); + if (bin) { + break; + } } + return bin; } static void -load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table) +load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table, const rb_box_t *target_box) { // search binary size_t size; @@ -50,23 +74,41 @@ load_with_builtin_functions(const char *feature_name, const struct rb_builtin_fu ASSUME(iseq); // otherwise an exception should have raised vm->builtin_function_table = NULL; - rb_namespace_enable_builtin(); - // exec - if (rb_namespace_available() && rb_mNamespaceRefiner) { - rb_iseq_eval_with_refinement(rb_iseq_check(iseq), rb_mNamespaceRefiner); - } - else { - rb_iseq_eval(rb_iseq_check(iseq)); + rb_iseq_eval(rb_iseq_check(iseq), target_box); +} + +void +rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table) +{ + load_with_builtin_functions(feature_name, table, rb_root_box()); +} + +VALUE +rb_define_gem_modules(VALUE flags_value, VALUE _) +{ + rb_box_gem_flags_t *flags = (rb_box_gem_flags_t *)flags_value; + + if (flags->gem) { + rb_define_module("Gem"); + if (flags->error_highlight) { + rb_define_module("ErrorHighlight"); + } + if (flags->did_you_mean) { + rb_define_module("DidYouMean"); + } + if (flags->syntax_suggest) { + rb_define_module("SyntaxSuggest"); + } } - rb_namespace_disable_builtin(); + return Qnil; } void -rb_load_with_builtin_functions(const char *feature_name, const struct rb_builtin_function *table) +rb_load_gem_prelude(VALUE box) { - load_with_builtin_functions(feature_name, table); + load_with_builtin_functions("gem_prelude", NULL, (const rb_box_t *)box); } #endif @@ -86,5 +128,13 @@ Init_builtin(void) void Init_builtin_features(void) { - load_with_builtin_functions("gem_prelude", NULL); + +#ifdef BUILTIN_BINARY_SIZE + + rb_load_gem_prelude((VALUE)rb_root_box()); + + rb_load_gem_prelude((VALUE)rb_main_box()); + +#endif + } |