From 259526006e4407c1ab40e2d8ad67ea6ad27f0c0c Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 26 Jan 2008 14:42:17 +0000 Subject: * parse.y (assignable_gen, keyword_to_name): __ENCODING__ was missing. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15256 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 297dfba15b..ee3087860f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat Jan 26 23:42:15 2008 Nobuyoshi Nakada + + * parse.y (assignable_gen, keyword_to_name): __ENCODING__ was missing. + Sat Jan 26 19:08:45 2008 Tanaka Akira * marshal.c (w_object): dump string encoding in USERDEF. diff --git a/parse.y b/parse.y index b6dbcd7c2b..c61c4a8447 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} }; -- cgit v1.2.3