yugui	2009-02-22 13:04:31 +0900 (Sun, 22 Feb 2009)

  New Revision: 22498

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22498

  Log:
    * eval.c (ruby_options): evaluator now expects iseq instead of tree.
    
    * ruby.c (ruby_process_options): ditto.

  Modified files:
    trunk/ChangeLog
    trunk/eval.c
    trunk/ruby.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 22497)
+++ ChangeLog	(revision 22498)
@@ -1,3 +1,9 @@
+Sun Feb 22 13:03:12 2009  Yuki Sonoda (Yugui)  <yugui@y...>
+
+	* 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@r...>
 
 	* Makefile.in (configure): unset PWD to use symlink to building
Index: eval.c
===================================================================
--- eval.c	(revision 22497)
+++ eval.c	(revision 22498)
@@ -79,20 +79,20 @@
 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
Index: ruby.c
===================================================================
--- ruby.c	(revision 22497)
+++ ruby.c	(revision 22498)
@@ -1791,7 +1791,7 @@
 {
     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 @@
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/