kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* compile.c, iseq.c, ruby.c, vm.c, vm_core.h, vm_eval.c: add absolute

Browse source 
path field into rb_iseq_t.  The field contains a string representing
  a path to corresponding source file. or nil when the iseq is created
  from -e, stdin, eval, etc.  This field is used for require_relative.
  [ruby-dev:40004]

* load.c (rb_f_require_relative): add C implementation of
  require_relative.

* prelude.rb (require_relative): get rid of Ruby implementation of
  require_relative.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2010-03-16 17:40:00 +00:00
parent c4fdd64fe0
commit 6ff75042db
10 changed files with 89 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
Wed Mar 17 02:29:46 2010 Yusuke Endoh <mame@tsg.ne.jp>
* compile.c, iseq.c, ruby.c, vm.c, vm_core.h, vm_eval.c: add absolute
path field into rb_iseq_t. The field contains a string representing
a path to corresponding source file. or nil when the iseq is created
from -e, stdin, eval, etc. This field is used for require_relative.
[ruby-dev:40004]
* load.c (rb_f_require_relative): add C implementation of
require_relative.
* prelude.rb (require_relative): get rid of Ruby implementation of
require_relative.
Wed Mar 17 01:24:01 2010 Yusuke Endoh <mame@tsg.ne.jp> Wed Mar 17 01:24:01 2010 Yusuke Endoh <mame@tsg.ne.jp>
* parse.y (rb_intern3): prohibit Symbol with an invalid encoding. * parse.y (rb_intern3): prohibit Symbol with an invalid encoding.

5
compile.c
View file

@ -169,6 +169,9 @@ PRINTF_ARGS(void ruby_debug_printf(const char*, ...), 1, 2);
#define iseq_filename(iseq) \ #define iseq_filename(iseq) \
(((rb_iseq_t*)DATA_PTR(iseq))->filename) (((rb_iseq_t*)DATA_PTR(iseq))->filename)
#define iseq_filepath(iseq) \
(((rb_iseq_t*)DATA_PTR(iseq))->filepath)
#define NEW_ISEQVAL(node, name, type, line_no) \ #define NEW_ISEQVAL(node, name, type, line_no) \
new_child_iseq(iseq, node, name, 0, type, line_no) new_child_iseq(iseq, node, name, 0, type, line_no)
@ -917,7 +920,7 @@ new_child_iseq(rb_iseq_t *iseq, NODE *node,
VALUE ret; VALUE ret;
debugs("[new_child_iseq]> ---------------------------------------\n"); debugs("[new_child_iseq]> ---------------------------------------\n");
ret = rb_iseq_new_with_opt(node, name, iseq_filename(iseq->self), INT2FIX(line_no), ret = rb_iseq_new_with_opt(node, name, iseq_filename(iseq->self), iseq_filepath(iseq->self), INT2FIX(line_no),
parent, type, iseq->compile_data->option); parent, type, iseq->compile_data->option);
debugs("[new_child_iseq]< ---------------------------------------\n"); debugs("[new_child_iseq]< ---------------------------------------\n");
iseq_add_mark_object(iseq, ret); iseq_add_mark_object(iseq, ret);

10
file.c
View file

@ -3188,8 +3188,8 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, char *unresolved, VALUE loopche
} }
} }
static VALUE VALUE
realpath_internal(VALUE basedir, VALUE path, int strict) rb_realpath_internal(VALUE basedir, VALUE path, int strict)
{ {
long prefixlen; long prefixlen;
VALUE resolved; VALUE resolved;
@ -3277,7 +3277,7 @@ rb_file_s_realpath(int argc, VALUE *argv, VALUE klass)
{ {
VALUE path, basedir; VALUE path, basedir;
rb_scan_args(argc, argv, "11", &path, &basedir); rb_scan_args(argc, argv, "11", &path, &basedir);
return realpath_internal(basedir, path, 1); return rb_realpath_internal(basedir, path, 1);
} }
/* /*
@ -3297,7 +3297,7 @@ rb_file_s_realdirpath(int argc, VALUE *argv, VALUE klass)
{ {
VALUE path, basedir; VALUE path, basedir;
rb_scan_args(argc, argv, "11", &path, &basedir); rb_scan_args(argc, argv, "11", &path, &basedir);
return realpath_internal(basedir, path, 0); return rb_realpath_internal(basedir, path, 0);
} }
static size_t static size_t
@ -3429,7 +3429,7 @@ rb_file_s_basename(int argc, VALUE *argv)
* File.dirname("/home/gumby/work/ruby.rb") #=> "/home/gumby/work" * File.dirname("/home/gumby/work/ruby.rb") #=> "/home/gumby/work"
*/ */
static VALUE VALUE
rb_file_s_dirname(VALUE klass, VALUE fname) rb_file_s_dirname(VALUE klass, VALUE fname)
{ {
const char *name, *root, *p; const char *name, *root, *p;

54
iseq.c
View file

@ -98,6 +98,7 @@ iseq_mark(void *ptr)
RUBY_MARK_UNLESS_NULL(iseq->mark_ary); RUBY_MARK_UNLESS_NULL(iseq->mark_ary);
RUBY_MARK_UNLESS_NULL(iseq->name); RUBY_MARK_UNLESS_NULL(iseq->name);
RUBY_MARK_UNLESS_NULL(iseq->filename); RUBY_MARK_UNLESS_NULL(iseq->filename);
RUBY_MARK_UNLESS_NULL(iseq->filepath);
RUBY_MARK_UNLESS_NULL((VALUE)iseq->cref_stack); RUBY_MARK_UNLESS_NULL((VALUE)iseq->cref_stack);
RUBY_MARK_UNLESS_NULL(iseq->klass); RUBY_MARK_UNLESS_NULL(iseq->klass);
RUBY_MARK_UNLESS_NULL(iseq->coverage); RUBY_MARK_UNLESS_NULL(iseq->coverage);
@ -207,9 +208,11 @@ set_relation(rb_iseq_t *iseq, const VALUE parent)
} }
} }
VALUE rb_realpath_internal(VALUE basedir, VALUE path, int strict);
static VALUE static VALUE
prepare_iseq_build(rb_iseq_t *iseq, prepare_iseq_build(rb_iseq_t *iseq,
VALUE name, VALUE filename, VALUE line_no, VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
VALUE parent, VALUE type, VALUE block_opt, VALUE parent, VALUE type, VALUE block_opt,
const rb_compile_option_t *option) const rb_compile_option_t *option)
{ {
@ -218,6 +221,7 @@ prepare_iseq_build(rb_iseq_t *iseq,
iseq->name = name; iseq->name = name;
iseq->filename = filename; iseq->filename = filename;
iseq->filepath = filepath == Qnil ? Qnil : rb_realpath_internal(Qnil, filepath, 1);
iseq->line_no = line_no; iseq->line_no = line_no;
iseq->defined_method_id = 0; iseq->defined_method_id = 0;
iseq->mark_ary = rb_ary_tmp_new(3); iseq->mark_ary = rb_ary_tmp_new(3);
@ -361,31 +365,31 @@ make_compile_option_value(rb_compile_option_t *option)
} }
VALUE VALUE
rb_iseq_new(NODE *node, VALUE name, VALUE filename, rb_iseq_new(NODE *node, VALUE name, VALUE filename, VALUE filepath,
VALUE parent, VALUE type) VALUE parent, VALUE type)
{ {
return rb_iseq_new_with_opt(node, name, filename, INT2FIX(0), parent, type, return rb_iseq_new_with_opt(node, name, filename, filepath, INT2FIX(0), parent, type,
&COMPILE_OPTION_DEFAULT); &COMPILE_OPTION_DEFAULT);
} }
VALUE VALUE
rb_iseq_new_top(NODE *node, VALUE name, VALUE filename, VALUE parent) rb_iseq_new_top(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE parent)
{ {
return rb_iseq_new_with_opt(node, name, filename, INT2FIX(0), parent, ISEQ_TYPE_TOP, return rb_iseq_new_with_opt(node, name, filename, filepath, INT2FIX(0), parent, ISEQ_TYPE_TOP,
&COMPILE_OPTION_DEFAULT); &COMPILE_OPTION_DEFAULT);
} }
VALUE VALUE
rb_iseq_new_main(NODE *node, VALUE filename) rb_iseq_new_main(NODE *node, VALUE filename, VALUE filepath)
{ {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
VALUE parent = th->base_block->iseq->self; VALUE parent = th->base_block->iseq->self;
return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), filename, INT2FIX(0), return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), filename, filepath, INT2FIX(0),
parent, ISEQ_TYPE_MAIN, &COMPILE_OPTION_DEFAULT); parent, ISEQ_TYPE_MAIN, &COMPILE_OPTION_DEFAULT);
} }
static VALUE static VALUE
rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE filename, VALUE line_no, rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
VALUE parent, VALUE type, VALUE bopt, VALUE parent, VALUE type, VALUE bopt,
const rb_compile_option_t *option) const rb_compile_option_t *option)
{ {
@ -395,28 +399,28 @@ rb_iseq_new_with_bopt_and_opt(NODE *node, VALUE name, VALUE filename, VALUE line
GetISeqPtr(self, iseq); GetISeqPtr(self, iseq);
iseq->self = self; iseq->self = self;
prepare_iseq_build(iseq, name, filename, line_no, parent, type, bopt, option); prepare_iseq_build(iseq, name, filename, filepath, line_no, parent, type, bopt, option);
rb_iseq_compile_node(self, node); rb_iseq_compile_node(self, node);
cleanup_iseq_build(iseq); cleanup_iseq_build(iseq);
return self; return self;
} }
VALUE VALUE
rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE filename, VALUE line_no, rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
VALUE parent, VALUE type, VALUE parent, VALUE type,
const rb_compile_option_t *option) const rb_compile_option_t *option)
{ {
/* TODO: argument check */ /* TODO: argument check */
return rb_iseq_new_with_bopt_and_opt(node, name, filename, line_no, parent, type, return rb_iseq_new_with_bopt_and_opt(node, name, filename, filepath, line_no, parent, type,
Qfalse, option); Qfalse, option);
} }
VALUE VALUE
rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE filename, VALUE line_no, rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE line_no,
VALUE parent, VALUE type, VALUE bopt) VALUE parent, VALUE type, VALUE bopt)
{ {
/* TODO: argument check */ /* TODO: argument check */
return rb_iseq_new_with_bopt_and_opt(node, name, filename, line_no, parent, type, return rb_iseq_new_with_bopt_and_opt(node, name, filename, filepath, line_no, parent, type,
bopt, &COMPILE_OPTION_DEFAULT); bopt, &COMPILE_OPTION_DEFAULT);
} }
@ -430,7 +434,7 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
VALUE iseqval = iseq_alloc(self); VALUE iseqval = iseq_alloc(self);
VALUE magic, version1, version2, format_type, misc; VALUE magic, version1, version2, format_type, misc;
VALUE name, filename, line_no; VALUE name, filename, filepath, line_no;
VALUE type, body, locals, args, exception; VALUE type, body, locals, args, exception;
VALUE iseq_type; VALUE iseq_type;
@ -454,6 +458,7 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
name = CHECK_STRING(rb_ary_entry(data, i++)); name = CHECK_STRING(rb_ary_entry(data, i++));
filename = CHECK_STRING(rb_ary_entry(data, i++)); filename = CHECK_STRING(rb_ary_entry(data, i++));
filepath = CHECK_STRING(rb_ary_entry(data, i++));
line_no = CHECK_INTEGER(rb_ary_entry(data, i++)); line_no = CHECK_INTEGER(rb_ary_entry(data, i++));
type = CHECK_SYMBOL(rb_ary_entry(data, i++)); type = CHECK_SYMBOL(rb_ary_entry(data, i++));
@ -496,7 +501,7 @@ iseq_load(VALUE self, VALUE data, VALUE parent, VALUE opt)
} }
make_compile_option(&option, opt); make_compile_option(&option, opt);
prepare_iseq_build(iseq, name, filename, line_no, prepare_iseq_build(iseq, name, filename, filepath, line_no,
parent, iseq_type, 0, &option); parent, iseq_type, 0, &option);
rb_iseq_build_from_ary(iseq, locals, args, exception, body); rb_iseq_build_from_ary(iseq, locals, args, exception, body);
@ -533,7 +538,7 @@ parse_string(VALUE str, const char *file, int line)
} }
VALUE VALUE
rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt) rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE filepath, VALUE line, VALUE opt)
{ {
rb_compile_option_t option; rb_compile_option_t option;
const char *fn = StringValueCStr(file); const char *fn = StringValueCStr(file);
@ -544,11 +549,11 @@ rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt)
if (th->base_block && th->base_block->iseq) { if (th->base_block && th->base_block->iseq) {
return rb_iseq_new_with_opt(node, th->base_block->iseq->name, return rb_iseq_new_with_opt(node, th->base_block->iseq->name,
file, line, th->base_block->iseq->self, file, filepath, line, th->base_block->iseq->self,
ISEQ_TYPE_EVAL, &option); ISEQ_TYPE_EVAL, &option);
} }
else { else {
return rb_iseq_new_with_opt(node, rb_str_new2("<compiled>"), file, line, Qfalse, return rb_iseq_new_with_opt(node, rb_str_new2("<compiled>"), file, filepath, line, Qfalse,
ISEQ_TYPE_TOP, &option); ISEQ_TYPE_TOP, &option);
} }
} }
@ -556,21 +561,21 @@ rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt)
VALUE VALUE
rb_iseq_compile(VALUE src, VALUE file, VALUE line) rb_iseq_compile(VALUE src, VALUE file, VALUE line)
{ {
return rb_iseq_compile_with_option(src, file, line, Qnil); return rb_iseq_compile_with_option(src, file, Qnil, line, Qnil);
} }
static VALUE static VALUE
iseq_s_compile(int argc, VALUE *argv, VALUE self) iseq_s_compile(int argc, VALUE *argv, VALUE self)
{ {
VALUE src, file = Qnil, line = INT2FIX(1), opt = Qnil; VALUE src, file = Qnil, path = Qnil, line = INT2FIX(1), opt = Qnil;
rb_secure(1); rb_secure(1);
rb_scan_args(argc, argv, "13", &src, &file, &line, &opt); rb_scan_args(argc, argv, "13", &src, &file, &path, &line, &opt);
if (NIL_P(file)) file = rb_str_new2("<compiled>"); if (NIL_P(file)) file = rb_str_new2("<compiled>");
if (NIL_P(line)) line = INT2FIX(1); if (NIL_P(line)) line = INT2FIX(1);
return rb_iseq_compile_with_option(src, file, line, opt); return rb_iseq_compile_with_option(src, file, path, line, opt);
} }
static VALUE static VALUE
@ -593,7 +598,7 @@ iseq_s_compile_file(int argc, VALUE *argv, VALUE self)
parser = rb_parser_new(); parser = rb_parser_new();
node = rb_parser_compile_file(parser, fname, f, NUM2INT(line)); node = rb_parser_compile_file(parser, fname, f, NUM2INT(line));
make_compile_option(&option, opt); make_compile_option(&option, opt);
return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), file, line, Qfalse, return rb_iseq_new_with_opt(node, rb_str_new2("<main>"), file, file, line, Qfalse,
ISEQ_TYPE_TOP, &option); ISEQ_TYPE_TOP, &option);
} }
@ -1311,7 +1316,7 @@ iseq_data_to_ary(rb_iseq_t *iseq)
/* /*
* [:magic, :major_version, :minor_version, :format_type, :misc, * [:magic, :major_version, :minor_version, :format_type, :misc,
* :name, :filename, :line_no, :type, :locals, :args, * :name, :filename, :filepath, :line_no, :type, :locals, :args,
* :catch_table, :bytecode] * :catch_table, :bytecode]
*/ */
rb_ary_push(val, rb_str_new2("YARVInstructionSequence/SimpleDataFormat")); rb_ary_push(val, rb_str_new2("YARVInstructionSequence/SimpleDataFormat"));
@ -1321,6 +1326,7 @@ iseq_data_to_ary(rb_iseq_t *iseq)
rb_ary_push(val, misc); rb_ary_push(val, misc);
rb_ary_push(val, iseq->name); rb_ary_push(val, iseq->name);
rb_ary_push(val, iseq->filename); rb_ary_push(val, iseq->filename);
rb_ary_push(val, iseq->filepath);
rb_ary_push(val, iseq->line_no); rb_ary_push(val, iseq->line_no);
rb_ary_push(val, type); rb_ary_push(val, type);
rb_ary_push(val, locals); rb_ary_push(val, locals);

16
load.c
View file

@ -297,7 +297,7 @@ rb_load_internal(VALUE fname, int wrap)
th->mild_compile_error++; th->mild_compile_error++;
node = (NODE *)rb_load_file(RSTRING_PTR(fname)); node = (NODE *)rb_load_file(RSTRING_PTR(fname));
loaded = TRUE; loaded = TRUE;
iseq = rb_iseq_new_top(node, rb_str_new2("<top (required)>"), fname, Qfalse); iseq = rb_iseq_new_top(node, rb_str_new2("<top (required)>"), fname, fname, Qfalse);
th->mild_compile_error--; th->mild_compile_error--;
rb_iseq_eval(iseq); rb_iseq_eval(iseq);
} }
@ -448,6 +448,19 @@ rb_f_require(VALUE obj, VALUE fname)
return rb_require_safe(fname, rb_safe_level()); return rb_require_safe(fname, rb_safe_level());
} }
VALUE
rb_f_require_relative(VALUE obj, VALUE fname)
{
VALUE rb_current_realfilepath(void);
VALUE rb_file_s_dirname(VALUE klass, VALUE fname);
VALUE base = rb_current_realfilepath();
if (NIL_P(base)) {
rb_raise(rb_eLoadError, "cannot infer basepath");
}
base = rb_file_s_dirname(rb_cFile, base);
return rb_require_safe(rb_file_expand_path(fname, base), rb_safe_level());
}
static int static int
search_required(VALUE fname, volatile VALUE *path, int safe_level) search_required(VALUE fname, volatile VALUE *path, int safe_level)
{ {
@ -743,6 +756,7 @@ Init_load()
rb_define_global_function("load", rb_f_load, -1); rb_define_global_function("load", rb_f_load, -1);
rb_define_global_function("require", rb_f_require, 1); rb_define_global_function("require", rb_f_require, 1);
rb_define_global_function("require_relative", rb_f_require_relative, 1);
rb_define_method(rb_cModule, "autoload", rb_mod_autoload, 2); rb_define_method(rb_cModule, "autoload", rb_mod_autoload, 2);
rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, 1); rb_define_method(rb_cModule, "autoload?", rb_mod_autoload_p, 1);
rb_define_global_function("autoload", rb_f_autoload, 2); rb_define_global_function("autoload", rb_f_autoload, 2);

14
prelude.rb
View file

@ -22,17 +22,3 @@ class Thread
} }
end end
end end
module Kernel
module_function
def require_relative(relative_feature)
c = caller.first
e = c.rindex(/:\d+:in /)
file = $`
if /\A\((.*)\)/ =~ file # eval, etc.
raise LoadError, "require_relative is called in #{$1}"
end
absolute_feature = File.join(File.dirname(File.realpath(file)), relative_feature)
require absolute_feature
end
end

4
ruby.c
View file

@ -1454,7 +1454,9 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
} }
PREPARE_PARSE_MAIN({ PREPARE_PARSE_MAIN({
iseq = rb_iseq_new_main(tree, opt->script_name); VALUE path = Qnil;
if (!opt->e_script && strcmp(opt->script, "-")) path = opt->script_name;
iseq = rb_iseq_new_main(tree, opt->script_name, path);
}); });
if (opt->dump & DUMP_BIT(insns)) { if (opt->dump & DUMP_BIT(insns)) {

4
vm.c
View file

@ -1441,7 +1441,7 @@ rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg,
{ {
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
const rb_control_frame_t *reg_cfp = th->cfp; const rb_control_frame_t *reg_cfp = th->cfp;
volatile VALUE iseqval = rb_iseq_new(0, filename, filename, 0, ISEQ_TYPE_TOP); volatile VALUE iseqval = rb_iseq_new(0, filename, filename, filename, 0, ISEQ_TYPE_TOP);
VALUE val; VALUE val;
vm_push_frame(th, DATA_PTR(iseqval), VM_FRAME_MAGIC_TOP, vm_push_frame(th, DATA_PTR(iseqval), VM_FRAME_MAGIC_TOP,
@ -2052,7 +2052,7 @@ Init_VM(void)
rb_vm_t *vm = ruby_current_vm; rb_vm_t *vm = ruby_current_vm;
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
VALUE filename = rb_str_new2("<main>"); VALUE filename = rb_str_new2("<main>");
volatile VALUE iseqval = rb_iseq_new(0, filename, filename, 0, ISEQ_TYPE_TOP); volatile VALUE iseqval = rb_iseq_new(0, filename, filename, Qnil, 0, ISEQ_TYPE_TOP);
volatile VALUE th_self; volatile VALUE th_self;
rb_iseq_t *iseq; rb_iseq_t *iseq;

11
vm_core.h
View file

@ -155,6 +155,7 @@ struct rb_iseq_struct {
VALUE type; /* instruction sequence type */ VALUE type; /* instruction sequence type */
VALUE name; /* String: iseq name */ VALUE name; /* String: iseq name */
VALUE filename; /* file information where this sequence from */ VALUE filename; /* file information where this sequence from */
VALUE filepath; /* real file path or nil */
VALUE *iseq; /* iseq (insn number and openrads) */ VALUE *iseq; /* iseq (insn number and openrads) */
VALUE *iseq_encoded; /* encoded iseq */ VALUE *iseq_encoded; /* encoded iseq */
unsigned long iseq_size; unsigned long iseq_size;
@ -464,11 +465,11 @@ typedef struct rb_thread_struct
} rb_thread_t; } rb_thread_t;
/* iseq.c */ /* iseq.c */
VALUE rb_iseq_new(NODE*, VALUE, VALUE, VALUE, VALUE); VALUE rb_iseq_new(NODE*, VALUE, VALUE, VALUE, VALUE, VALUE);
VALUE rb_iseq_new_top(NODE *node, VALUE name, VALUE filename, VALUE parent); VALUE rb_iseq_new_top(NODE *node, VALUE name, VALUE filename, VALUE filepath, VALUE parent);
VALUE rb_iseq_new_main(NODE *node, VALUE filename); VALUE rb_iseq_new_main(NODE *node, VALUE filename, VALUE filepath);
VALUE rb_iseq_new_with_bopt(NODE*, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE); VALUE rb_iseq_new_with_bopt(NODE*, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE);
VALUE rb_iseq_new_with_opt(NODE*, VALUE, VALUE, VALUE, VALUE, VALUE, const rb_compile_option_t*); VALUE rb_iseq_new_with_opt(NODE*, VALUE, VALUE, VALUE, VALUE, VALUE, VALUE, const rb_compile_option_t*);
VALUE rb_iseq_compile(VALUE src, VALUE file, VALUE line); VALUE rb_iseq_compile(VALUE src, VALUE file, VALUE line);
VALUE rb_iseq_disasm(VALUE self); VALUE rb_iseq_disasm(VALUE self);
int rb_iseq_disasm_insn(VALUE str, VALUE *iseqval, size_t pos, rb_iseq_t *iseq, VALUE child); int rb_iseq_disasm_insn(VALUE str, VALUE *iseqval, size_t pos, rb_iseq_t *iseq, VALUE child);

10
vm_eval.c
View file

@ -1709,6 +1709,16 @@ rb_f_block_given_p(void)
} }
} }
VALUE
rb_current_realfilepath(void)
{
rb_thread_t *th = GET_THREAD();
rb_control_frame_t *cfp = th->cfp;
cfp = vm_get_ruby_level_caller_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(cfp));
if (cfp != 0) return cfp->iseq->filepath;
return Qnil;
}
void void
Init_vm_eval(void) Init_vm_eval(void)
{ {