summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-16 15:24:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-16 15:24:40 +0000
commit8549a3d99fd5bd480e7f2cfde53526c1a51eda29 (patch)
tree366045d539cea6dbb0cad62bcee439a823b53961
parent04d2c873b88af2858826437c349014a3922ad52c (diff)
* parse.y (reswords): kDO_BLOCK was missing. fixed: [ruby-core:7995]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10281 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog12
-rw-r--r--parse.y2
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index aa54f411f8..aba5ea1443 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
+Sat Jun 17 00:23:58 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (reswords): kDO_BLOCK was missing. fixed: [ruby-core:7995]
+
Sat Jun 17 00:02:15 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
- * ext/win32ole/win32ole.c (ole_propertyput): support
+ * ext/win32ole/win32ole.c (ole_propertyput): support
PROPERTYPUTREF. [ruby-talk:183042]
* ext/win32ole/tests/test_propertyputref.rb: ditto.
@@ -19,7 +23,7 @@ Thu Jun 15 23:02:47 2006 Masaki Suketa <masaki.suketa@nifty.ne.jp>
Wed Jun 14 18:23:28 2006 Eric Hodel <drbrain@segment7.net>
- * enum.c (enum_any): Documentation typo.
+ * enum.c (enum_any): Documentation typo.
Wed Jun 14 15:01:09 2006 Eric Hodel <drbrain@segment7.net>
@@ -30,12 +34,12 @@ Wed Jun 14 23:03:53 2006 Tanaka Akira <akr@m17n.org>
* configure.in: check sizeof(rlim_t).
check setrlimit.
-
+
* process.c (proc_getrlimit): new method Process.getrlimit.
(proc_setrlimit): new method Process.setrlimit.
* ruby.h (NUM2ULL): new macro.
-
+
Mon Jun 12 22:25:09 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* sprintf.c (rb_f_sprintf): adjust precision length to prevent
diff --git a/parse.y b/parse.y
index b6ee2c5a8d..651c7986f2 100644
--- a/parse.y
+++ b/parse.y
@@ -964,7 +964,7 @@ op : '|' { $$ = '|'; }
reswords : k__LINE__ | k__FILE__ | klBEGIN | klEND
| kALIAS | kAND | kBEGIN | kBREAK | kCASE | kCLASS | kDEF
- | kDEFINED | kDO | kELSE | kELSIF | kEND | kENSURE | kFALSE
+ | kDEFINED | kDO | kDO_BLOCK | kELSE | kELSIF | kEND | kENSURE | kFALSE
| kFOR | kIN | kMODULE | kNEXT | kNIL | kNOT
| kOR | kREDO | kRESCUE | kRETRY | kRETURN | kSELF | kSUPER
| kTHEN | kTRUE | kUNDEF | kWHEN | kYIELD