summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-16 15:24:54 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-16 15:24:54 +0000
commitd9d84316845291489fe0854afc10b9ca9364e1c9 (patch)
tree68baaa32726cd7c9a1c0c389a98e37369219ffe1
parent15d31c38bdecebd8639c69598e425009728fa7eb (diff)
downloadruby-d9d84316845291489fe0854afc10b9ca9364e1c9.tar.gz
ruby-d9d84316845291489fe0854afc10b9ca9364e1c9.tar.xz
ruby-d9d84316845291489fe0854afc10b9ca9364e1c9.zip
* eval.c (rb_add_method): preserve safe level in the environment
where a method is defined . * eval.c (rb_call0): restore preserved safe level in the method execution. * parse.y (lambda): need separate block variable stack manipulation and lpar_beg maintenance. based on a patch found in [ruby-core:05551] from Mauricio Fernandez <mfp@acm.org>. * parse.y (parser_yylex): adjust lpar_beg after tLAMBEG and kDO_LAMBDA. [ruby-core:05551] * parse.y (yycompile): remove unreachable code. [yarv-dev:570] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d5d19bb5..a913bb31e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,7 +47,6 @@ Sat Aug 13 21:11:05 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/tests/testOLEVARIANT.rb: ditto.
->>>>>>> 1.4488
Sat Aug 13 18:51:26 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_block_pass): distinguish current block from others.