aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--parse.y1
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a7e0c3d87e..b962f4faef 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 9823b56aca..cf522789dd 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;