summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-06-07 08:35:04 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-06-07 08:35:04 +0000
commitefe332137c57f6b0a51fdfabde3a9553acf7289a (patch)
treea46f6c279e66fd63f7956754311ab42b5759b325
parent0cbd59ec60de5faf89c24dc4e0635b4e6dacfa06 (diff)
downloadruby-efe332137c57f6b0a51fdfabde3a9553acf7289a.tar.gz
ruby-efe332137c57f6b0a51fdfabde3a9553acf7289a.tar.xz
ruby-efe332137c57f6b0a51fdfabde3a9553acf7289a.zip
* parse.y (parser_yylex): small error fixed.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8581 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--parse.y1
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index de9e4f42f..db5b98852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,10 @@ Tue Jun 7 17:20:39 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (parser_yylex): allow ';;' to be block terminator in
place of 'end'. [highly experimental]
- * misc/ruby-mode.el (ruby-block-end-re): allow ';;' for a negative
- indent trigger. [highly experimental]
+ * misc/ruby-mode.el (ruby-block-end-re): allow ';;' to be a
+ negative indent trigger. [highly experimental]
+
+ * parse.y (parser_yylex): small error fixed.
Tue Jun 7 16:45:49 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
diff --git a/parse.y b/parse.y
index 0037f603d..d7107614e 100644
--- a/parse.y
+++ b/parse.y
@@ -6309,6 +6309,7 @@ parser_yylex(parser)
return kEND;
}
pushback(c);
+ c = ';';
command_start = Qtrue;
case ',':
lex_state = EXPR_BEG;