* parse.y (assignable_gen, keyword_to_name): __ENCODING__ was missing.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 297dfba15..ee3087860 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jan 26 23:42:15 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (assignable_gen, keyword_to_name): __ENCODING__ was missing.
+
 Sat Jan 26 19:08:45 2008  Tanaka Akira  <akr@fsij.org>
 
 	* marshal.c (w_object): dump string encoding in USERDEF.
diff --git a/parse.y b/parse.y
index b6dbcd7c2..c61c4a844 100644
--- a/parse.y
+++ b/parse.y
@@ -7630,6 +7630,9 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val)
     else if (id == keyword__LINE__) {
 	yyerror("Can't assign to __LINE__");
     }
+    else if (id == keyword__ENCODING__) {
+	yyerror("Can't assign to __ENCODING__");
+    }
     else if (is_local_id(id)) {
 	if (dyna_in_block()) {
 	    if (dvar_curr(id)) {
@@ -9562,6 +9565,7 @@ static const struct kw_assoc {
     {keyword_END,	"END"},
     {keyword__LINE__,	"__LINE__"},
     {keyword__FILE__,	"__FILE__"},
+    {keyword__ENCODING__, "__ENCODING__"},
     {0, NULL}
 };