diff options
Diffstat (limited to 'mini_builtin.c')
| -rw-r--r-- | mini_builtin.c | 49 |
1 files changed, 35 insertions, 14 deletions
diff --git a/mini_builtin.c b/mini_builtin.c index b38642e89b..2024d5d4a6 100644 --- a/mini_builtin.c +++ b/mini_builtin.c @@ -12,22 +12,16 @@ static struct st_table *loaded_builtin_table; #endif -VALUE rb_builtin_vast(const char *feature_name, VALUE *name_str); +bool pm_builtin_ast_value(pm_parse_result_t *result, const char *feature_name, VALUE *name_str); +VALUE rb_builtin_ast_value(const char *feature_name, VALUE *name_str); static const rb_iseq_t * builtin_iseq_load(const char *feature_name, const struct rb_builtin_function *table) { VALUE name_str = 0; - rb_ast_t *ast; - VALUE vast = rb_builtin_vast(feature_name, &name_str); - rb_vm_t *vm = GET_VM(); + const rb_iseq_t *iseq; - if (NIL_P(vast)) { - rb_fatal("builtin_iseq_load: can not find %s; " - "probably miniprelude.c is out of date", - feature_name); - } - vm->builtin_function_table = table; + rb_vm_t *vm = GET_VM(); static const rb_compile_option_t optimization = { .inline_const_cache = TRUE, .peephole_optimization = TRUE, @@ -40,11 +34,38 @@ builtin_iseq_load(const char *feature_name, const struct rb_builtin_function *ta .coverage_enabled = FALSE, .debug_level = 0, }; - ast = rb_ruby_ast_data_get(vast); - const rb_iseq_t *iseq = rb_iseq_new_with_opt(vast, name_str, name_str, Qnil, 0, NULL, 0, ISEQ_TYPE_TOP, &optimization, Qnil); - GET_VM()->builtin_function_table = NULL; - rb_ast_dispose(ast); + if (*rb_ruby_prism_ptr()) { + pm_parse_result_t result = { 0 }; + if (!pm_builtin_ast_value(&result, feature_name, &name_str)) { + rb_fatal("builtin_iseq_load: can not find %s; " + "probably miniprelude.c is out of date", + feature_name); + } + + vm->builtin_function_table = table; + iseq = pm_iseq_new_with_opt(&result.node, name_str, name_str, Qnil, 0, NULL, 0, ISEQ_TYPE_TOP, &optimization); + + GET_VM()->builtin_function_table = NULL; + pm_parse_result_free(&result); + } + else { + VALUE ast_value = rb_builtin_ast_value(feature_name, &name_str); + + if (NIL_P(ast_value)) { + rb_fatal("builtin_iseq_load: can not find %s; " + "probably miniprelude.c is out of date", + feature_name); + } + + rb_ast_t *ast = rb_ruby_ast_data_get(ast_value); + + vm->builtin_function_table = table; + iseq = rb_iseq_new_with_opt(ast_value, name_str, name_str, Qnil, 0, NULL, 0, ISEQ_TYPE_TOP, &optimization, Qnil); + + GET_VM()->builtin_function_table = NULL; + rb_ast_dispose(ast); + } // for debug if (0 && strcmp("prelude", feature_name) == 0) { |