summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-20 16:40:35 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-20 16:40:35 +0000
commit5c6e9bfd4fb4a90e660e4af6b32c650dc09b0d3c (patch)
treeeb184ae0f8f0c34391dfa0d918a302a614ba6491
parent1a4a3285cbfdecda6f8cd1e8a1c63bc99b168b66 (diff)
downloadruby-5c6e9bfd4fb4a90e660e4af6b32c650dc09b0d3c.tar.gz
ruby-5c6e9bfd4fb4a90e660e4af6b32c650dc09b0d3c.tar.xz
ruby-5c6e9bfd4fb4a90e660e4af6b32c650dc09b0d3c.zip
* parse.y (reswords): modifier token is no longer returned in fname
state. fixed: [ruby-dev:28775] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d5ec377d..f2bbba8ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 21 01:40:25 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (reswords): modifier token is no longer returned in fname
+ state. fixed: [ruby-dev:28775]
+
Tue Jun 20 23:28:34 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb (parse_args): provisional catch-up for the recent changes.
diff --git a/parse.y b/parse.y
index c542b35b7..7fc86e198 100644
--- a/parse.y
+++ b/parse.y
@@ -1655,7 +1655,7 @@ reswords : k__LINE__ | k__FILE__ | klBEGIN | klEND
| kFOR | kIN | kMODULE | kNEXT | kNIL | kNOT
| kOR | kREDO | kRESCUE | kRETRY | kRETURN | kSELF | kSUPER
| kTHEN | kTRUE | kUNDEF | kWHEN | kYIELD
- | kIF_MOD | kUNLESS_MOD | kWHILE_MOD | kUNTIL_MOD | kRESCUE_MOD
+ | kIF | kUNLESS | kWHILE | kUNTIL
;
arg : lhs '=' arg