From 8549a3d99fd5bd480e7f2cfde53526c1a51eda29 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 16 Jun 2006 15:24:40 +0000 Subject: [PATCH] * 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 --- ChangeLog | 12 ++++++++---- parse.y | 2 +- 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 + + * parse.y (reswords): kDO_BLOCK was missing. fixed: [ruby-core:7995] + Sat Jun 17 00:02:15 2006 Masaki Suketa - * 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 Wed Jun 14 18:23:28 2006 Eric Hodel - * enum.c (enum_any): Documentation typo. + * enum.c (enum_any): Documentation typo. Wed Jun 14 15:01:09 2006 Eric Hodel @@ -30,12 +34,12 @@ Wed Jun 14 23:03:53 2006 Tanaka Akira * 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 * 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