8 files changed, 130 insertions, 25 deletions
@@ -897,12 +897,12 @@ rb_iseq_new_top(const VALUE ast_value, VALUE name, VALUE path, VALUE realpath, c
 * The main entry-point into the prism compiler when a file is required.
 */
 rb_iseq_t *
-pm_iseq_new_top(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent)
 {
 iseq_new_setup_coverage(path, (int) (node->parser->newline_list.size - 1));
 return pm_iseq_new_with_opt(node, name, path, realpath, 0, parent, 0,
- ISEQ_TYPE_TOP, &COMPILE_OPTION_DEFAULT);
 }
 rb_iseq_t *
@@ -921,13 +921,13 @@ rb_iseq_new_main(const VALUE ast_value, VALUE path, VALUE realpath, const rb_ise
 * main file in the program.
 */
 rb_iseq_t *
-pm_iseq_new_main(pm_scope_node_t *node, VALUE path, VALUE realpath, const rb_iseq_t *parent, int opt)
 {
 iseq_new_setup_coverage(path, (int) (node->parser->newline_list.size - 1));
 return pm_iseq_new_with_opt(node, rb_fstring_lit("<main>"),
 path, realpath, 0,
- parent, 0, ISEQ_TYPE_MAIN, opt ? &COMPILE_OPTION_DEFAULT : &COMPILE_OPTION_FALSE);
 }
 rb_iseq_t *
@@ -947,7 +947,7 @@ rb_iseq_new_eval(const VALUE ast_value, VALUE name, VALUE path, VALUE realpath,
 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)
 {
 if (rb_get_coverage_mode() & COVERAGE_TARGET_EVAL) {
 VALUE coverages = rb_get_coverages();
@@ -957,7 +957,7 @@ pm_iseq_new_eval(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath,
 }
 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 *
@@ -1013,6 +1013,25 @@ rb_iseq_new_with_opt(VALUE ast_value, VALUE name, VALUE path, VALUE realpath,
 return iseq_translate(iseq);
 }
 /**
 * This is a step in the prism compiler that is called once all of the various
 * options have been established. It is called from one of the pm_iseq_new_*
@@ -1028,7 +1047,7 @@ rb_iseq_new_with_opt(VALUE ast_value, VALUE name, VALUE path, VALUE realpath,
 rb_iseq_t *
 pm_iseq_new_with_opt(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath,
 int first_lineno, const rb_iseq_t *parent, int isolated_depth,
- enum rb_iseq_type type, const rb_compile_option_t *option)
 {
 rb_iseq_t *iseq = iseq_alloc();
 ISEQ_BODY(iseq)->prism = true;
@@ -1054,8 +1073,13 @@ pm_iseq_new_with_opt(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpa
 prepare_iseq_build(iseq, name, path, realpath, first_lineno, &code_location, -1,
 parent, isolated_depth, type, node->script_lines == NULL ? Qnil : *node->script_lines, option);
- pm_iseq_compile_node(iseq, node);
- finish_iseq_build(iseq);
 return iseq_translate(iseq);
 }
@@ -1313,8 +1337,15 @@ pm_iseq_compile_with_option(VALUE src, VALUE file, VALUE realpath, VALUE line, V
 }
 if (error == Qnil) {
- iseq = pm_iseq_new_with_opt(&result.node, name, file, realpath, ln, NULL, 0, ISEQ_TYPE_TOP, &option);
 pm_parse_result_free(&result);
 }
 else {
 pm_parse_result_free(&result);
@@ -1771,11 +1802,20 @@ iseqw_s_compile_file_prism(int argc, VALUE *argv, VALUE self)
 if (error == Qnil) {
 make_compile_option(&option, opt);
- ret = iseqw_new(pm_iseq_new_with_opt(&result.node, rb_fstring_lit("<main>"),
- file,
- rb_realpath_internal(Qnil, file, 1),
- 1, NULL, 0, ISEQ_TYPE_TOP, &option));
 pm_parse_result_free(&result);
 rb_vm_pop_frame(ec);
 RB_GC_GUARD(v);
 return ret;
@@ -752,8 +752,15 @@ load_iseq_eval(rb_execution_context_t *ec, VALUE fname)
 VALUE error = pm_load_parse_file(&result, fname, NULL);
 if (error == Qnil) {
- iseq = pm_iseq_new_top(&result.node, rb_fstring_lit("<top (required)>"), fname, realpath_internal_cached(realpath_map, fname), NULL);
 pm_parse_result_free(&result);
 }
 else {
 rb_vm_pop_frame(ec);
@@ -63,10 +63,16 @@ builtin_iseq_load(const char *feature_name, const struct rb_builtin_function *ta
 pm_prelude_load(&result, name_str, code, start_line);
 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);
 vm->builtin_function_table = NULL;
 pm_parse_result_free(&result);
 }
 else {
 VALUE ast_value = prelude_ast_value(name_str, code, start_line);
@@ -1268,11 +1268,17 @@ pm_new_child_iseq(rb_iseq_t *iseq, pm_scope_node_t *node, VALUE name, const rb_i
 {
 debugs("[new_child_iseq]> ---------------------------------------\n");
 int isolated_depth = ISEQ_COMPILE_DATA(iseq)->isolated_depth;
 rb_iseq_t *ret_iseq = pm_iseq_new_with_opt(node, name,
 rb_iseq_path(iseq), rb_iseq_realpath(iseq),
 line_no, parent,
 isolated_depth ? isolated_depth + 1 : 0,
- type, ISEQ_COMPILE_DATA(iseq)->option);
 debugs("[new_child_iseq]< ---------------------------------------\n");
 return ret_iseq;
 }
@@ -3479,6 +3485,7 @@ pm_compile_builtin_mandatory_only_method(rb_iseq_t *iseq, pm_scope_node_t *scope
 pm_scope_node_t next_scope_node;
 pm_scope_node_init(&def.base, &next_scope_node, scope_node);
 ISEQ_BODY(iseq)->mandatory_only_iseq = pm_iseq_new_with_opt(
 &next_scope_node,
 rb_iseq_base_label(iseq),
@@ -3488,9 +3495,15 @@ pm_compile_builtin_mandatory_only_method(rb_iseq_t *iseq, pm_scope_node_t *scope
 NULL,
 0,
 ISEQ_TYPE_METHOD,
- ISEQ_COMPILE_DATA(iseq)->option
 );
 pm_scope_node_destroy(&next_scope_node);
 return COMPILE_OK;
 }
@@ -90,10 +90,10 @@ VALUE pm_parse_string(pm_parse_result_t *result, VALUE source, VALUE filepath, V
 VALUE pm_parse_stdin(pm_parse_result_t *result);
 void pm_parse_result_free(pm_parse_result_t *result);
-rb_iseq_t *pm_iseq_new(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent, enum rb_iseq_type);
-rb_iseq_t *pm_iseq_new_top(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath, const rb_iseq_t *parent);
-rb_iseq_t *pm_iseq_new_main(pm_scope_node_t *node, VALUE path, VALUE realpath, const rb_iseq_t *parent, int opt);
-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);
-rb_iseq_t *pm_iseq_new_with_opt(pm_scope_node_t *node, VALUE name, VALUE path, VALUE realpath, int first_lineno, const rb_iseq_t *parent, int isolated_depth, enum rb_iseq_type, const rb_compile_option_t*);
 VALUE pm_iseq_compile_node(rb_iseq_t *iseq, pm_scope_node_t *node);
@@ -2609,8 +2609,15 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
 if (!result.ast) {
 pm_parse_result_t *pm = &result.prism;
- iseq = pm_iseq_new_main(&pm->node, opt->script_name, path, parent, optimize);
 pm_parse_result_free(pm);
 }
 else {
 rb_ast_t *ast = result.ast;
@@ -612,4 +612,28 @@ class TestEval < Test::Unit::TestCase
 x = orphan_lambda
 assert_equal(:ok, x.call)
 end
 end
@@ -1766,7 +1766,8 @@ pm_eval_make_iseq(VALUE src, VALUE fname, int line,
 iseq = ISEQ_BODY(iseq)->parent_iseq;
 }
- iseq = pm_iseq_new_eval(&result.node, name, fname, Qnil, line, parent, 0);
 pm_scope_node_t *prev = result.node.previous;
 while (prev) {
@@ -1778,6 +1779,13 @@ pm_eval_make_iseq(VALUE src, VALUE fname, int line,
 }
 pm_parse_result_free(&result);
 rb_exec_event_hook_script_compiled(GET_EC(), iseq, src);
 return iseq;