1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PRISM] Use Prism for eval if enabled

Browse Source
This commit is contained in:
Matt Valentine-House 2024-01-31 20:56:08 +00:00 committed by Kevin Newton
parent 068b19bd53
commit fd3f776a05
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
iseq.c
View File

@ -925,6 +925,14 @@ rb_iseq_new_eval(const rb_ast_body_t *ast, VALUE name, VALUE path, VALUE realpat
parent, isolated_depth, ISEQ_TYPE_EVAL, &COMPILE_OPTION_DEFAULT); parent, isolated_depth, ISEQ_TYPE_EVAL, &COMPILE_OPTION_DEFAULT);
} }
rb_iseq_t *
pm_iseq_new_eval(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath,
int first_lineno, const rb_iseq_t *parent, int isolated_depth)
{
return pm_iseq_new_with_opt(node, name, path, realpath, first_lineno,
parent, isolated_depth, ISEQ_TYPE_EVAL, &COMPILE_OPTION_DEFAULT);
}
static inline rb_iseq_t * static inline rb_iseq_t *
iseq_translate(rb_iseq_t *iseq) iseq_translate(rb_iseq_t *iseq)
{ {

31
vm_eval.c
View File

@ -1642,10 +1642,41 @@ get_eval_default_path(void)
return eval_default_path; return eval_default_path;
} }
static const rb_iseq_t *
pm_eval_make_iseq(VALUE src, VALUE fname, int line,
const struct rb_block *base_block)
{
rb_iseq_t *iseq = NULL;
const rb_iseq_t *const parent = vm_block_iseq(base_block);
const rb_iseq_t *iseq = parent;
VALUE name = rb_fstring_lit("<compiled>");
fname = rb_fstring_lit("<compiled>");
pm_parse_result_t result = { 0 };
VALUE error;
error = pm_parse_string(&result, src, fname);
if (error == Qnil) {
iseq = pm_iseq_new_eval(&result.node, name, fname, fname, ln, parent, 0);
pm_parse_result_free(&result);
}
else {
pm_parse_result_free(&result);
rb_exc_raise(error);
}
return iseq;
}
static const rb_iseq_t * static const rb_iseq_t *
eval_make_iseq(VALUE src, VALUE fname, int line, eval_make_iseq(VALUE src, VALUE fname, int line,
const struct rb_block *base_block) const struct rb_block *base_block)
{ {
if (*rb_ruby_prism_ptr()) {
return pm_eval_make_iseq(src, fname, line, base_block);
}
const VALUE parser = rb_parser_new(); const VALUE parser = rb_parser_new();
const rb_iseq_t *const parent = vm_block_iseq(base_block); const rb_iseq_t *const parent = vm_block_iseq(base_block);
rb_iseq_t *iseq = NULL; rb_iseq_t *iseq = NULL;