diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:24:13 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-03 12:24:13 +0000 |
| commit | 78f0aebe1fecadd387989a8ac818c0fe3179ada0 (patch) | |
| tree | 23708bab33d3d48b2ea7fc223e7c0cfee99798ef /ChangeLog | |
| parent | 877a9a7d994fc9255db33f86d73f08870be8b234 (diff) | |
merges r32067 from trunk into ruby_1_9_2.
--
* parse.y (parser_parse_string): flush delayed token. based on a
patch by Masaya Tarui in [ruby-dev:43762]. Bug #4544
* parse.y (yylex): revert r24557. delayed token at the end of
string should be flushed already by the above change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,11 @@ +Mon Jun 13 23:38:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (parser_parse_string): flush delayed token. based on a + patch by Masaya Tarui in [ruby-dev:43762]. Bug #4544 + + * parse.y (yylex): revert r24557. delayed token at the end of + string should be flushed already by the above change. + Mon Jun 13 23:05:01 2011 Tanaka Akira <akr@fsij.org> * ext/socket/unixsocket.c (unix_send_io): race condition fixed. |