summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-09 05:57:29 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-09 05:57:29 +0000
commit319e0dc2965334b3ca62bfbba26fe861abeefbe5 (patch)
treea77c5ad9e3686bf07e1e93ba6da0a1d5d6069bf7
parent4f05bf1a4b2cb9cdc7951f4c9a329870c2d15340 (diff)
downloadruby-319e0dc2965334b3ca62bfbba26fe861abeefbe5.tar.gz
ruby-319e0dc2965334b3ca62bfbba26fe861abeefbe5.tar.xz
ruby-319e0dc2965334b3ca62bfbba26fe861abeefbe5.zip
* parse.y (yycompile0): remove setting parser->enc because it is set
in parser_prepare() by previous change of parser_prepare(). git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14964 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a7e0c3d87..b962f4fae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 9 14:55:36 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * parse.y (yycompile0): remove setting parser->enc because it is set
+ in parser_prepare() by previous change of parser_prepare().
+
Wed Jan 9 14:52:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_enc_cr_str_buf_cat, rb_str_buf_append): deal with self
diff --git a/parse.y b/parse.y
index 9823b56ac..cf522789d 100644
--- a/parse.y
+++ b/parse.y
@@ -4675,7 +4675,6 @@ yycompile0(VALUE arg, int tracing)
}
}
- parser->enc = rb_enc_get(lex_input);
parser_prepare(parser);
n = yyparse((void*)parser);
ruby_debug_lines = 0;