diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:29:38 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 10:29:38 +0000 |
commit | e86c91414055573dc914c83ab0725f43926f478f (patch) | |
tree | 4a693c412f1741fac43becf03e372d7d863711b4 | |
parent | e9ebea251d5d6c20f15e06cd232dab2522c4d16f (diff) |
merge revision(s) 15541, 15545, 15558:
* parse.y (yycompile): clear ruby_eval_tree_begin too before parse.
* parse.y (yycompile): clear ruby_eval_tree_begin if parse failed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | parse.y | 3 | ||||
-rw-r--r-- | test/ruby/test_beginendblock.rb | 12 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Sun Jun 15 19:24:42 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (yycompile): clear ruby_eval_tree_begin if parse failed. + +Sun Jun 15 19:23:23 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (yycompile): clear ruby_eval_tree_begin too before parse. + Sun Jun 15 19:21:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/pty/lib/expect.rb (IO#expect): check if peer is closed. @@ -2624,6 +2624,7 @@ yycompile(f, line) ruby__end__seen = 0; ruby_eval_tree = 0; + ruby_eval_tree_begin = 0; heredoc_end = 0; lex_strterm = 0; ruby_current_node = 0; @@ -2649,7 +2650,7 @@ yycompile(f, line) rb_gc_force_recycle((VALUE)tmp); } if (n == 0) node = ruby_eval_tree; - else ruby_eval_tree_begin = 0; + if (ruby_nerrs) ruby_eval_tree_begin = 0; return node; } diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb index b56b596a65..f8c9c846bd 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -54,4 +54,16 @@ EOW assert_equal(expected, File.read(erroutpath)) # expecting Tempfile to unlink launcher and errout file. end + + def test_begin_and_eval + $test_begin_and_eval = :ok + begin + eval("BEGIN{$test_begin_and_eval = :ng}\n_/a:a") + rescue SyntaxError + x1 = x2 = $test_begin_and_eval + eval("x2 = $test_begin_and_eval") + end + assert_equal(:ok, x1) + assert_equal(:ok, x2) + end end @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 179 +#define RUBY_PATCHLEVEL 180 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |