summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-22 09:39:45 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-08-22 09:39:45 +0000
commitcfa85982c5d3e8095fd973d478dd1ce2b4f142e9 (patch)
treeb4fe4e985dcbb0e7b0f352cba366afac45fc583c
parent0abbcb67d1aeab206eecf06310ad50a3d9e7f05f (diff)
remove semicolon warning. [ruby-dev:29299]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y3
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fd210ee233..f771be404c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@ Sat Aug 19 11:28:08 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_file_s_rename): use errno if set properly.
fixed: [ruby-dev:29293]
+Sat Aug 19 11:09:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * parse.y (then): remove semicolon warning. [ruby-dev:29299]
+
Thu Aug 17 19:15:16 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_stat_[rRwWxX]): check for super user.
diff --git a/parse.y b/parse.y
index 097a4c7a2a..e2982f2c80 100644
--- a/parse.y
+++ b/parse.y
@@ -1731,9 +1731,6 @@ primary_value : primary
then : term
| ':'
- {
- rb_warn("colon will be obsoleted; use semicolon");
- }
| kTHEN
| term kTHEN
;