summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-09 05:46:35 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-01-09 05:46:35 +0000
commit3f2d1892dfe608722870cec8ee9ef0fda1f315ce (patch)
tree2c2a0aff94ac40c05f1e0e994f0a35258330ddf4
parenta5505ab8334fc6948b5745d3fc21011b67f844eb (diff)
* parse.y (parser_prepare): set parser->enc from lex_input for ripper.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14962 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--parse.y1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c02d85929..1496034e9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 9 14:44:57 2008 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * parse.y (parser_prepare): set parser->enc from lex_input for ripper.
+
Wed Jan 9 13:45:52 2008 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/server.rb (WEBrick::HTTPServer#start):
diff --git a/parse.y b/parse.y
index 75459c354d..9823b56aca 100644
--- a/parse.y
+++ b/parse.y
@@ -5957,6 +5957,7 @@ parser_prepare(struct parser_params *parser)
return;
}
pushback(c);
+ parser->enc = rb_enc_get(lex_input);
}
#define IS_ARG() (lex_state == EXPR_ARG || lex_state == EXPR_CMDARG)