summaryrefslogtreecommitdiff
path: root/vm_eval.c
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 13:16:44 +0000
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-24 13:16:44 +0000
commitf32f40cc495d9372cc71a1131ee8298e6bb46cd1 (patch)
treec7b988c299c0e704bc26cf38f639c41a460d37a1 /vm_eval.c
parent238738f31494c3bb88d6762efca170a89c1801b4 (diff)
* vm_eval.c (eval_string_with_cref): preserve parse_in_eval even if
exception raised. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
-rw-r--r--vm_eval.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/vm_eval.c b/vm_eval.c
index 7f01781d3b..8e4ddad2fd 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -664,12 +664,14 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
rb_thread_t *th = GET_THREAD();
rb_env_t *env = NULL;
rb_block_t block;
+ volatile int parse_in_eval;
if (file == 0) {
file = rb_sourcefile();
line = rb_sourceline();
}
+ parse_in_eval = th->parse_in_eval;
PUSH_TAG();
if ((state = EXEC_TAG()) == 0) {
rb_iseq_t *iseq;
@@ -726,6 +728,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
result = vm_eval_body(th);
}
POP_TAG();
+ th->parse_in_eval = parse_in_eval;
if (state) {
if (state == TAG_RAISE) {