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

* iseq.c (rb_iseq_compile_with_option): argument may be converted.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-10 01:54:01 +00:00
parent ee4fbaa37e
commit 756c803881
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Mar 10 10:53:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* iseq.c (rb_iseq_compile_with_option): argument may be converted.
Tue Mar 10 04:56:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Mar 10 04:56:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (MINIRUBY): keep macro into Makefile. * configure.in (MINIRUBY): keep macro into Makefile.

18
iseq.c
View file

@ -190,8 +190,7 @@ prepare_iseq_build(rb_iseq_t *iseq,
iseq->compile_data = ALLOC(struct iseq_compile_data); iseq->compile_data = ALLOC(struct iseq_compile_data);
MEMZERO(iseq->compile_data, struct iseq_compile_data, 1); MEMZERO(iseq->compile_data, struct iseq_compile_data, 1);
iseq->compile_data->mark_ary = rb_ary_new(); iseq->compile_data->mark_ary = rb_ary_tmp_new();
RBASIC(iseq->compile_data->mark_ary)->klass = 0;
iseq->compile_data->storage_head = iseq->compile_data->storage_current = iseq->compile_data->storage_head = iseq->compile_data->storage_current =
(struct iseq_compile_data_storage *) (struct iseq_compile_data_storage *)
@ -359,6 +358,7 @@ rb_iseq_new_with_opt(NODE *node, VALUE name, VALUE filename,
VALUE parent, VALUE type, VALUE parent, VALUE type,
const rb_compile_option_t *option) const rb_compile_option_t *option)
{ {
/* TODO: argument check */
return rb_iseq_new_with_bopt_and_opt(node, name, filename, parent, type, return rb_iseq_new_with_bopt_and_opt(node, name, filename, parent, type,
Qfalse, option); Qfalse, option);
} }
@ -367,6 +367,7 @@ VALUE
rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE filename, rb_iseq_new_with_bopt(NODE *node, VALUE name, VALUE filename,
VALUE parent, VALUE type, VALUE bopt) VALUE parent, VALUE type, VALUE bopt)
{ {
/* TODO: argument check */
return rb_iseq_new_with_bopt_and_opt(node, name, filename, parent, type, return rb_iseq_new_with_bopt_and_opt(node, name, filename, parent, type,
bopt, &COMPILE_OPTION_DEFAULT); bopt, &COMPILE_OPTION_DEFAULT);
} }
@ -471,11 +472,10 @@ rb_iseq_load(VALUE data, VALUE parent, VALUE opt)
} }
static NODE * static NODE *
compile_string(VALUE str, VALUE file, VALUE line) compile_string(VALUE str, const char *file, int line)
{ {
VALUE parser = rb_parser_new(); VALUE parser = rb_parser_new();
NODE *node = rb_parser_compile_string(parser, StringValueCStr(file), NODE *node = rb_parser_compile_string(parser, file, str, line);
str, NUM2INT(line));
if (!node) { if (!node) {
rb_exc_raise(GET_THREAD()->errinfo); /* TODO: check err */ rb_exc_raise(GET_THREAD()->errinfo); /* TODO: check err */
@ -487,7 +487,9 @@ VALUE
rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt) rb_iseq_compile_with_option(VALUE src, VALUE file, VALUE line, VALUE opt)
{ {
rb_compile_option_t option; rb_compile_option_t option;
NODE *node = compile_string(StringValue(src), file, line); const char *fn = StringValueCStr(file);
int ln = NUM2INT(line);
NODE *node = compile_string(StringValue(src), fn, ln);
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
make_compile_option(&option, opt); make_compile_option(&option, opt);
@ -516,8 +518,8 @@ iseq_s_compile(int argc, VALUE *argv, VALUE self)
rb_secure(1); rb_secure(1);
rb_scan_args(argc, argv, "13", &src, &file, &line, &opt); rb_scan_args(argc, argv, "13", &src, &file, &line, &opt);
file = file == Qnil ? rb_str_new2("<compiled>") : file; if (NIL_P(file)) file = rb_str_new2("<compiled>");
line = line == Qnil ? INT2FIX(1) : line; 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, line, opt);
} }