summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-05-22 09:40:17 +0000
committeraamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2002-05-22 09:40:17 +0000
commit3caee29585a97cb84da7f3390c93e8e0c557122b (patch)
treec26ac84500da611da27eb6ea33c0c2adc0bdcaaa
parentce3ea1911ad63c43747734858e6d73ab214029cc (diff)
* parse.y (yylex): case '<': here-document label ate '-'.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 26f236e7d2..61efafc54e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 22 18:34:23 2002 Minero Aoki <aamine@loveruby.net>
+
+ * parse.y (yylex): Here-document label ate '-'.
+
Tue May 21 13:25:18 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* misc/ruby-mode.el (ruby-font-lock-keywords): symbols end with
diff --git a/parse.y b/parse.y
index 375fca8435..64a70d7de4 100644
--- a/parse.y
+++ b/parse.y
@@ -3166,6 +3166,9 @@ yylex()
return here_document(c2, indent);
}
pushback(c2);
+ if (indent) {
+ pushback('-');
+ }
}
switch (lex_state) {
case EXPR_FNAME: case EXPR_DOT: