nobu	2007-09-24 17:56:24 +0900 (Mon, 24 Sep 2007)

  New Revision: 13506

  Modified files:
    trunk/ChangeLog
    trunk/ext/strscan/strscan.c

  Log:
    * ext/strscan/strscan.c (strscan_initialize, strscan_getch): use the
      encoding of the target string instead of setting to StringScanner
      instance.  [ruby-dev:31831]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13506&r2=13505
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/strscan/strscan.c?r1=13506&r2=13505

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13505)
+++ ChangeLog	(revision 13506)
@@ -1,3 +1,9 @@
+Mon Sep 24 17:56:21 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/strscan/strscan.c (strscan_initialize, strscan_getch): use the
+	  encoding of the target string instead of setting to StringScanner
+	  instance.  [ruby-dev:31831]
+
 Mon Sep 24 16:52:11 2007  Urabe Shyouhei  <shyouhei@r...>
 
 	* lib/net/http.rb: fix typo.
Index: ext/strscan/strscan.c
===================================================================
--- ext/strscan/strscan.c	(revision 13505)
+++ ext/strscan/strscan.c	(revision 13506)
@@ -190,7 +190,6 @@
     rb_scan_args(argc, argv, "11", &str, &need_dup);
     StringValue(str);
     p->str = str;
-    rb_enc_associate(self, rb_enc_get(str));
 
     return self;
 }
@@ -654,14 +653,13 @@
 {
     struct strscanner *p;
     long len;
-    rb_encoding *enc = rb_enc_get(self);
 
     GET_SCANNER(self, p);
     CLEAR_MATCH_STATUS(p);
     if (EOS_P(p))
         return Qnil;
 
-    len = rb_enc_mbclen(CURPTR(p), S_PEND(p), enc);
+    len = rb_enc_mbclen(CURPTR(p), S_PEND(p), rb_enc_get(p->str));
     if (p->curr + len > S_LEN(p)) {
         len = S_LEN(p) - p->curr;
     }

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