diff --git a/ChangeLog b/ChangeLog
index ea733b166a..e5343dd858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,13 @@
-Thu Jul  5 17:12:16 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Thu Jul  5 18:27:58 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/{intern,ruby}.h, compile.[ch], error.c, eval.c,
 	  eval_load.c, gc.c, iseq.c, main.c, parse.y, re.c, ruby.c,
 	  yarvcore.[ch] (ruby_eval_tree, ruby_sourcefile, ruby_sourceline,
 	  ruby_nerrs): purge global variables.
 
+	* ruby.c (proc_options): moved do_print and do_loop options
+	  handling from ruby_process_options().
+
 Thu Jul  5 16:37:34 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* numeric.c (int_pow): fix previous nubu's commit.
diff --git a/ruby.c b/ruby.c
index e58d069382..334703a338 100644
--- a/ruby.c
+++ b/ruby.c
@@ -456,6 +456,8 @@ process_sflag(void)
     sflag = 0;
 }
 
+NODE *rb_parser_append_print(VALUE, NODE *);
+NODE *rb_parser_while_loop(VALUE, NODE *, int, int);
 static NODE *proc_options(int argc, char **argv);
 
 static char *
@@ -881,6 +883,13 @@ proc_options(int argc, char **argv)
 	FL_UNSET(rb_load_path, FL_TAINT);
     }
 
+    if (do_print) {
+	tree = rb_parser_append_print(parser, tree);
+    }
+    if (do_loop) {
+	tree = rb_parser_while_loop(parser, tree, do_line, do_split);
+    }
+
     return tree;
 }
 
@@ -1232,9 +1241,6 @@ ruby_set_argv(int argc, char **argv)
     }
 }
 
-NODE *rb_parser_append_print(NODE *);
-NODE *rb_parser_while_loop(NODE *, int, int);
-
 void *
 ruby_process_options(int argc, char **argv)
 {
@@ -1255,11 +1261,5 @@ ruby_process_options(int argc, char **argv)
 	printf("Syntax OK\n");
 	exit(0);
     }
-    if (do_print) {
-	tree = rb_parser_append_print(tree);
-    }
-    if (do_loop) {
-	tree = rb_parser_while_loop(tree, do_line, do_split);
-    }
     return tree;
 }