summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-15 14:36:33 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-15 14:36:33 +0000
commit42331241b36827595bda2013da0071e786a521a8 (patch)
treec832a7ab6936f369a2d44f43c69b42c7b880648e
parentcb03781df4a60072c9b649a3ad642b25eb5181fb (diff)
downloadruby-42331241b36827595bda2013da0071e786a521a8.tar.gz
ruby-42331241b36827595bda2013da0071e786a521a8.tar.xz
ruby-42331241b36827595bda2013da0071e786a521a8.zip
* parse.y (struct parser_params): common members in the parser and
ripper must be placed at each same location. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bccf408a4..8469e3241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 15 23:36:31 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * parse.y (struct parser_params): common members in the parser and
+ ripper must be placed at each same location.
+
Sat Sep 15 18:25:15 2007 Kouhei Sutou <kou@cozmixng.org>
* string.c (rb_str_rstrip_bang): fixed too much rstrip. [ruby-dev:31786]
diff --git a/parse.y b/parse.y
index 5171fb474..86f0a78c8 100644
--- a/parse.y
+++ b/parse.y
@@ -236,6 +236,7 @@ struct parser_params {
int line_count;
int has_shebang;
int parser_ruby_sourceline; /* current line no. */
+ rb_encoding *enc;
#ifndef RIPPER
/* Ruby core only */
@@ -257,8 +258,6 @@ struct parser_params {
VALUE parsing_thread;
int toplevel_p;
#endif
-
- rb_encoding *enc;
};
#define STR_NEW(p,n) rb_enc_str_new((p),(n),parser->enc)