1 files changed, 25 insertions, 46 deletions

diff --git a/eval.c b/eval.c
index 2c82d4f2b8..411e50727f 100644
--- a/eval.c
+++ b/eval.c
@@ -84,7 +84,7 @@ ruby_init(void)
  * @return an opaque pointer to the compiled source or an internal special value.
  * @sa ruby_executable_node().
  */
-ruby_opaque_t
+void *
 ruby_options(int argc, char **argv)
 {
     int state;
@@ -230,6 +230,26 @@ ruby_cleanup(volatile int ex)
     return ex;
 }
 
+static int
+ruby_exec_internal(void *n)
+{
+    volatile int state;
+    VALUE iseq = (VALUE)n;
+    rb_thread_t *th = GET_THREAD();
+
+    if (!n) return 0;
+
+    PUSH_TAG();
+    if ((state = EXEC_TAG()) == 0) {
+	SAVE_ROOT_JMPBUF(th, {
+	    th->base_block = 0;
+	    rb_iseq_eval_main(iseq);
+	});
+    }
+    POP_TAG();
+    return state;
+}
+
 /*! Calls ruby_cleanup() and exits the process */
 void
 ruby_stop(int ex)
@@ -250,7 +270,7 @@ ruby_stop(int ex)
  * @retval 0 if the given value is such a special value.
  */
 int
-ruby_executable_node(ruby_opaque_t n, int *status)
+ruby_executable_node(void *n, int *status)
 {
     VALUE v = (VALUE)n;
     int s;
@@ -266,36 +286,12 @@ ruby_executable_node(ruby_opaque_t n, int *status)
     return FALSE;
 }
 
-static int
-ruby_eval_main_internal(VALUE iseqval, VALUE* result)
-{
-    volatile int state;
-    volatile VALUE retval;
-    rb_thread_t *th = GET_THREAD();
-
-    if (!iseqval) {
-	*result = Qnil;
-	return 0;
-    }
-
-    PUSH_TAG();
-    if ((state = EXEC_TAG()) == 0) {
-	SAVE_ROOT_JMPBUF(th, {
-	    th->base_block = 0;
-	    retval = rb_iseq_eval_main(iseqval);
-	});
-    }
-    POP_TAG();
-    *result = state ? th->errinfo : retval;
-    return state;
-}
-
 /*! Runs the given compiled source and exits this process.
  * @retval 0 if successfully run thhe source
  * @retval non-zero if an error occurred.
 */
 int
-ruby_run_node(ruby_opaque_t n)
+ruby_run_node(void *n)
 {
     int status;
     if (!ruby_executable_node(n, &status)) {
@@ -307,27 +303,10 @@ ruby_run_node(ruby_opaque_t n)
 
 /*! Runs the given compiled source */
 int
-ruby_exec_node(ruby_opaque_t n)
+ruby_exec_node(void *n)
 {
-    VALUE dummy;
     ruby_init_stack((void *)&n);
-    return ruby_eval_main_internal((VALUE)n, &dummy);
-}
-
-
-/*!
- * Evaluates the given iseq in the main (toplevel) context.
- *
- * @param iseqval a VALUE that wraps an iseq.
- * @param result Stores the evaluated value if succeeded,
- *        or an exception if failed.
- * @retval 0 if succeeded
- * @retval non-zero if failed.
- */
-int
-ruby_eval_main(ruby_opaque_t n, VALUE *result)
-{
-    return !!ruby_eval_main_internal((VALUE)n, result);
+    return ruby_exec_internal(n);
 }
 
 /*