* 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
This commit is contained in:
nobu 2008-01-26 14:42:17 +00:00
Родитель 4e6bba219e
Коммит 259526006e
2 изменённых файлов: 8 добавлений и 0 удалений

Просмотреть файл

@ -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> Sat Jan 26 19:08:45 2008 Tanaka Akira <akr@fsij.org>
* marshal.c (w_object): dump string encoding in USERDEF. * marshal.c (w_object): dump string encoding in USERDEF.

Просмотреть файл

@ -7630,6 +7630,9 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val)
else if (id == keyword__LINE__) { else if (id == keyword__LINE__) {
yyerror("Can't assign to __LINE__"); yyerror("Can't assign to __LINE__");
} }
else if (id == keyword__ENCODING__) {
yyerror("Can't assign to __ENCODING__");
}
else if (is_local_id(id)) { else if (is_local_id(id)) {
if (dyna_in_block()) { if (dyna_in_block()) {
if (dvar_curr(id)) { if (dvar_curr(id)) {
@ -9562,6 +9565,7 @@ static const struct kw_assoc {
{keyword_END, "END"}, {keyword_END, "END"},
{keyword__LINE__, "__LINE__"}, {keyword__LINE__, "__LINE__"},
{keyword__FILE__, "__FILE__"}, {keyword__FILE__, "__FILE__"},
{keyword__ENCODING__, "__ENCODING__"},
{0, NULL} {0, NULL}
}; };