diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-22 09:49:28 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-22 09:49:28 +0000 |
commit | 68a2b3cf7f4ba888501b760c26b6855bb9ad0092 (patch) | |
tree | 75b6d78f4885dcf985e7927b2b9ba24bc8ac6a8c /compile.c | |
parent | 6bfaf6e20957d57f88500b78e3ae67719cc99941 (diff) |
merges r23474 from trunk into ruby_1_9_1.
--
* compile.c (rb_parse_in_eval): returns true in true eval, not in
main. [ruby-dev:38382]
* parse.y (program): inherits dvars in eval or main.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'compile.c')
-rw-r--r-- | compile.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5413,7 +5413,7 @@ rb_local_defined(ID id) int rb_parse_in_eval(void) { - return GET_THREAD()->parse_in_eval != 0; + return GET_THREAD()->parse_in_eval > 0; } int |