mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* eval.c (ruby_options): evaluator now expects iseq instead of tree.
* ruby.c (ruby_process_options): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22498 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
510f34d615
commit
5c94b5d113
3 changed files with 13 additions and 7 deletions
|
@ -1,3 +1,9 @@
|
|||
Sun Feb 22 13:03:12 2009 Yuki Sonoda (Yugui) <yugui@yugui.jp>
|
||||
|
||||
* eval.c (ruby_options): the evaluater now expects iseq instead of tree.
|
||||
|
||||
* ruby.c (ruby_process_options): ditto.
|
||||
|
||||
Sun Feb 22 13:03:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* Makefile.in (configure): unset PWD to use symlink to building
|
||||
|
|
8
eval.c
8
eval.c
|
@ -79,20 +79,20 @@ void *
|
|||
ruby_options(int argc, char **argv)
|
||||
{
|
||||
int state;
|
||||
void *tree = 0;
|
||||
void *iseq = 0;
|
||||
|
||||
Init_stack((void *)&state);
|
||||
PUSH_TAG();
|
||||
if ((state = EXEC_TAG()) == 0) {
|
||||
SAVE_ROOT_JMPBUF(GET_THREAD(), tree = ruby_process_options(argc, argv));
|
||||
SAVE_ROOT_JMPBUF(GET_THREAD(), iseq = ruby_process_options(argc, argv));
|
||||
}
|
||||
else {
|
||||
rb_clear_trace_func();
|
||||
state = error_handle(state);
|
||||
tree = (void *)INT2FIX(state);
|
||||
iseq = (void *)INT2FIX(state);
|
||||
}
|
||||
POP_TAG();
|
||||
return tree;
|
||||
return iseq;
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
6
ruby.c
6
ruby.c
|
@ -1791,7 +1791,7 @@ ruby_process_options(int argc, char **argv)
|
|||
{
|
||||
struct cmdline_arguments args;
|
||||
struct cmdline_options opt;
|
||||
NODE *tree;
|
||||
VALUE iseq;
|
||||
|
||||
ruby_script(argv[0]); /* for the time being */
|
||||
rb_argv0 = rb_str_new4(rb_progname);
|
||||
|
@ -1801,10 +1801,10 @@ ruby_process_options(int argc, char **argv)
|
|||
args.opt = cmdline_options_init(&opt);
|
||||
opt.ext.enc.index = -1;
|
||||
opt.intern.enc.index = -1;
|
||||
tree = (NODE *)rb_vm_call_cfunc(rb_vm_top_self(),
|
||||
iseq = rb_vm_call_cfunc(rb_vm_top_self(),
|
||||
process_options, (VALUE)&args,
|
||||
0, rb_progname);
|
||||
return tree;
|
||||
return (void*)(struct RData*)iseq;
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in a new issue