usa	2008-01-18 20:20:30 +0900 (Fri, 18 Jan 2008)

  New Revision: 15114

  Modified files:
    trunk/ChangeLog
    trunk/parse.y

  Log:
    * parse.y (ripper_initialize): too early to set parser->enc.
    


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=15114&r2=15113&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15114&r2=15113&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15113)
+++ ChangeLog	(revision 15114)
@@ -1,3 +1,7 @@
+Fri Jan 18 20:19:51 2008  NAKAMURA Usaku  <usa@r...>
+
+	* parse.y (ripper_initialize): too early to set parser->enc.
+
 Fri Jan 18 20:03:05 2008  NAKAMURA Usaku  <usa@r...>
 
 	* win32/setup.mak (BASERUBY): nmake cannot execute ruby collectly
Index: parse.y
===================================================================
--- parse.y	(revision 15113)
+++ parse.y	(revision 15114)
@@ -9677,7 +9677,6 @@
     else {
         StringValue(src);
         parser->parser_lex_gets = lex_get_str;
-	parser->enc = rb_enc_get(src);
     }
     parser->parser_lex_input = src;
     parser->eofp = Qfalse;
@@ -9690,6 +9689,9 @@
         rb_str_append(fname2, fname);
     }
     parser_initialize(parser);
+    if (parser->parser_lex_gets == lex_get_str) {
+	parser->enc = rb_enc_get(src);
+    }
 
     parser->parser_ruby_sourcefile_string = fname2;
     parser->parser_ruby_sourcefile = RSTRING_PTR(fname2)+1;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/