matz	2008-01-18 09:23:18 +0900 (Fri, 18 Jan 2008)

  New Revision: 15099

  Modified files:
    trunk/ChangeLog
    trunk/encoding.c
    trunk/parse.y

  Log:
    * parse.y (parser_initialize): explicitly call rb_ascii8bit_encoding().
    
    * parse.y (parser_prepare): lex_input may not be have encoding (e.g. IO).
    
    * parse.y (rb_parser_compile_string): set encoding from input string. 
    
    * encoding.c (rb_enc_find_index): use ASCII-8BIT if loading known
      encoding failed.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=15099&r2=15098&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15099&r2=15098&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/encoding.c?r1=15099&r2=15098&diff_format=u

Index: encoding.c
===================================================================
--- encoding.c	(revision 15098)
+++ encoding.c	(revision 15099)
@@ -498,6 +498,12 @@
 	}
 	else {
 	    i = load_encoding(name);
+	    enc = rb_enc_from_index(i);
+	    if (!enc->precise_mbc_enc_len) {
+		rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
+			name);
+		return 0;
+	    }
 	}
     }
     return i;
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15098)
+++ ChangeLog	(revision 15099)
@@ -1,3 +1,14 @@
+Fri Jan 18 09:22:07 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* parse.y (parser_initialize): explicitly call rb_ascii8bit_encoding().
+
+	* parse.y (parser_prepare): lex_input may not be have encoding (e.g. IO).
+
+	* parse.y (rb_parser_compile_string): set encoding from input string. 
+
+	* encoding.c (rb_enc_find_index): use ASCII-8BIT if loading known
+	  encoding failed.
+
 Fri Jan 18 07:06:25 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* io.c (Init_IO): stdin/stdout may not be duplex.
Index: parse.y
===================================================================
--- parse.y	(revision 15098)
+++ parse.y	(revision 15099)
@@ -4764,6 +4764,7 @@
     lex_gets = lex_get_str;
     lex_gets_ptr = 0;
     lex_input = s;
+    parser->enc = rb_enc_get(s);
     lex_pbeg = lex_p = lex_pend = 0;
     compile_for_eval = rb_parse_in_eval();
 
@@ -5956,7 +5957,6 @@
 	return;
     }
     pushback(c);
-    parser->enc = rb_enc_get(lex_input);
 }
 
 #define IS_ARG() (lex_state == EXPR_ARG || lex_state == EXPR_CMDARG)
@@ -9192,7 +9192,7 @@
 #ifdef YYMALLOC
     parser->heap = NULL;
 #endif
-    parser->enc = rb_enc_from_index(0);
+    parser->enc = rb_ascii8bit_encoding();
 }
 
 extern void rb_mark_source_filename(char *);

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