summaryrefslogtreecommitdiff
path: root/parse.y
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-28 14:14:59 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-28 14:14:59 +0000
commit046ac45ac1162226409b3e68a00258dbe40aa51b (patch)
tree5f631b4a068f29c92315855b6a7011166b139d61 /parse.y
parentb48105fcbbb6c814511b132a27487426c699c27e (diff)
merges r24557 from trunk into ruby_1_9_1.
-- * parse.y (yylex): should dispatch scan-event even when follows just after delayed-token. [ruby-dev:37855] [Bug #1071] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r--parse.y1
1 files changed, 0 insertions, 1 deletions
diff --git a/parse.y b/parse.y
index 3961733cd2..7c8a11ce9d 100644
--- a/parse.y
+++ b/parse.y
@@ -7666,7 +7666,6 @@ yylex(void *p)
#ifdef RIPPER
if (!NIL_P(parser->delayed)) {
ripper_dispatch_delayed_token(parser, t);
- return t;
}
if (t != 0)
ripper_dispatch_scan_event(parser, t);