aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-13 12:47:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-09-13 12:47:43 +0000
commit7c44a27cb256345cf3eb9c242909fd3cb13d03aa (patch)
tree232421f3651648e43088c1f6c042d8d3d73d0e1f
parent6cdf50d8be3d80f8da875d3cedc256a066ea6553 (diff)
downloadruby-7c44a27cb256345cf3eb9c242909fd3cb13d03aa.tar.gz
* eval.c (BEGIN_CALLARGS): pop halfly pushed status.
fixed: [ruby-dev:26881] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog11
-rw-r--r--eval.c4
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a6691e00d..b4d7dfe39b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 13 21:47:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (BEGIN_CALLARGS): pop halfly pushed status.
+ fixed: [ruby-dev:26881]
+
Tue Sep 13 20:24:37 2005 Tanaka Akira <akr@m17n.org>
* ruby.h (PRINTF_ARGS): new macro for printf style argument checking.
@@ -27,9 +32,9 @@ Tue Sep 13 12:33:05 2005 <why@ruby-lang.org>
continue support of Object#to_yaml_type.
* ext/syck/rubyext.c: new emitter code. yaml_new and yaml_initialize
- get called, should they be present. consolidated all the diaspora of internal
- node types into the family below YAML::Syck::Node -- Map,
- Seq, Scalar -- all of whom are SyckNode structs pointing to
+ get called, should they be present. consolidated all the diaspora of internal
+ node types into the family below YAML::Syck::Node -- Map,
+ Seq, Scalar -- all of whom are SyckNode structs pointing to
Ruby data. moved Object#yaml_new into the node_import and made it the
default behavior. the target_class is always called wih yaml_new, prepended
a parameter, which is the klass. loaded nodes through GenericResolver show their style.
diff --git a/eval.c b/eval.c
index d25120d147..52819f0996 100644
--- a/eval.c
+++ b/eval.c
@@ -2148,8 +2148,10 @@ copy_node_scope(NODE *node, NODE *rval)
#define BEGIN_CALLARGS do {\
struct BLOCK *tmp_block = ruby_block;\
int tmp_iter = ruby_iter->iter;\
- if (tmp_iter == ITER_PRE) {\
+ switch (tmp_iter) {\
+ case ITER_PRE:\
ruby_block = ruby_block->outer;\
+ case ITER_PAS:\
tmp_iter = ITER_NOT;\
}\
PUSH_ITER(tmp_iter)