summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-16 09:31:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-16 09:31:50 +0000
commit07784c78b95dc8cd88518387adb987433b37db61 (patch)
treec6b8496f74c4f3ea4bd6f25520c63f8c6281fe12
parentc1740d890adfb9faa6086c1e54a8e46d768e3fed (diff)
eval.c: move running
* eval.c (ruby_setup): set running state in the normal case before popping a tag. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index af1d295..3a8ba7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 16 18:31:46 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (ruby_setup): set running state in the normal case before
+ popping a tag.
+
Sat Jun 16 07:46:03 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): format workers
diff --git a/eval.c b/eval.c
index cc16e39..0d9942f 100644
--- a/eval.c
+++ b/eval.c
@@ -53,10 +53,10 @@ ruby_setup(void)
if ((state = EXEC_TAG()) == 0) {
rb_call_inits();
ruby_prog_init();
+ GET_VM()->running = 1;
}
POP_TAG();
- if (!state) GET_VM()->running = 1;
return state;
}