summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/ripper/eventids2.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 9576ec964..4303ca4c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 23 16:17:54 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/ripper/eventids2.c (token_to_eventid): supper __ENCODING__
+ keyword. [ruby-dev:36478]
+
Tue Sep 23 15:30:53 2008 Koichi Sasada <ko1@atdot.net>
* common.mk, hash.c: remove unused inclusion.
diff --git a/ext/ripper/eventids2.c b/ext/ripper/eventids2.c
index 74ec1ce06..a557a41fa 100644
--- a/ext/ripper/eventids2.c
+++ b/ext/ripper/eventids2.c
@@ -182,6 +182,7 @@ static const struct token_assoc {
{keyword_yield, &ripper_id_kw},
{keyword__FILE__, &ripper_id_kw},
{keyword__LINE__, &ripper_id_kw},
+ {keyword__ENCODING__, &ripper_id_kw},
{keyword_BEGIN, &ripper_id_kw},
{keyword_END, &ripper_id_kw},
{tAMPER, &ripper_id_op},