ruby-changes:2953
From: ko1@a...
Date: 22 Dec 2007 05:11:48 +0900
Subject: [ruby-changes:2953] usa - Ruby:r14444 (trunk): * parse.y (parser_str_new, rb_intern3): rb_default_encoding() renamed.
usa 2007-12-22 05:11:17 +0900 (Sat, 22 Dec 2007) New Revision: 14444 Modified files: trunk/ChangeLog trunk/ext/nkf/nkf.c trunk/parse.y Log: * parse.y (parser_str_new, rb_intern3): rb_default_encoding() renamed. * ext/nkf/nkf.c (rb_nkf_putchar): ditto. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/parse.y?r1=14444&r2=14443 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14444&r2=14443 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/nkf/nkf.c?r1=14444&r2=14443 Index: ChangeLog =================================================================== --- ChangeLog (revision 14443) +++ ChangeLog (revision 14444) @@ -1,3 +1,9 @@ +Sat Dec 22 05:09:43 2007 NAKAMURA Usaku <usa@r...> + + * parse.y (parser_str_new, rb_intern3): rb_default_encoding() renamed. + + * ext/nkf/nkf.c (rb_nkf_putchar): ditto. + Sat Dec 22 03:54:18 2007 Yukihiro Matsumoto <matz@r...> * encoding.c (rb_ascii_encoding): renamed from previous Index: parse.y =================================================================== --- parse.y (revision 14443) +++ parse.y (revision 14444) @@ -4844,7 +4844,7 @@ if (!(func & STR_FUNC_REGEXP) && rb_enc_asciicompat(enc) && rb_enc_str_coderange(str) == ENC_CODERANGE_7BIT) { - rb_enc_associate(str, rb_default_encoding()); + rb_enc_associate(str, rb_ascii_encoding()); } return str; @@ -8969,7 +8969,7 @@ } } if (m - name < len) id = ID_JUNK; - if (enc != rb_default_encoding()) { + if (enc != rb_ascii_encoding()) { /* * this clause makes sense only when called from other than * rb_intern_str() taking care of code-range. @@ -8978,7 +8978,7 @@ for (; m <= name + len; ++m) { if (!ISASCII(*m)) goto mbstr; } - enc = rb_default_encoding(); + enc = rb_ascii_encoding(); } mbstr:; } Index: ext/nkf/nkf.c =================================================================== --- ext/nkf/nkf.c (revision 14443) +++ ext/nkf/nkf.c (revision 14444) @@ -64,7 +64,7 @@ rb_encoding* rb_nkf_enc_get(const char *name) { int idx = rb_enc_find_index(name); - if (idx < 0) idx = rb_enc_replicate(name, rb_default_encoding()); + if (idx < 0) idx = rb_enc_replicate(name, rb_ascii_encoding()); return rb_enc_from_index(idx); } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml