Changeset 6283 for lang/perl/Encode

Timestamp:

02/06/08 14:51:24 (5 years ago)

Author:

tomi-ru

Message:

lang/perl/Encode: add 2 args idea: encoding->name, (encode|decode)

Location:

lang/perl/Encode/branches/callback-args

Files:

• Encode.xs (modified) (4 diffs)
• t/fallback.t (modified) (2 diffs)

lang/perl/Encode/branches/callback-args/Encode.xs

@@ -65 +65 @@
 
 static SV *
-do_fallback_cb(pTHX_ UV ch, SV *fallback_cb)
+do_fallback_cb(pTHX_ UV ch, SV *fallback_cb, const encode_t * enc, const method)
 {
     dSP;
@@ -74 +74 @@
     PUSHMARK(sp);
     XPUSHs(sv_2mortal(newSVnv((UV)ch)));
+    XPUSHs(sv_2mortal(newSVpv(enc->name[0], 0)));
+    XPUSHs(sv_2mortal(newSVpv(method, 0)));
     PUTBACK;
     argc = call_sv(fallback_cb, G_SCALAR);
@@ -196 +198 @@
             SV* subchar = 
             (fallback_cb != &PL_sv_undef)
-                ? do_fallback_cb(aTHX_ ch, fallback_cb)
+                ? do_fallback_cb(aTHX_ ch, fallback_cb, enc, "encode")
                 : newSVpvf(check & ENCODE_PERLQQ ? "\\x{%04"UVxf"}" :
                  check & ENCODE_HTMLCREF ? "&#%" UVuf ";" :
@@ -231 +233 @@
             SV* subchar = 
             (fallback_cb != &PL_sv_undef)
-                ? do_fallback_cb(aTHX_ (UV)s[slen], fallback_cb) 
+                ? do_fallback_cb(aTHX_ (UV)s[slen], fallback_cb, enc, "decode") 
                 : newSVpvf("\\x%02" UVXf, (UV)s[slen]);
             sdone += slen + 1;

lang/perl/Encode/branches/callback-args/t/fallback.t

@@ -18 +18 @@
 use strict;
 #use Test::More qw(no_plan);
-use Test::More tests => 48;
+use Test::More tests => 50;
 use Encode q(:all);
 
@@ -176 +176 @@
 $dst = decode("ascii", (pack "C*", 0xFF), sub{ $_[0] });
 is $dst, 0xFF."", qq{decode("ascii", (pack "C*", 0xFF), sub{ \$_[0] })};
+
+$src = "\x{3000}";
+$dst = $ascii->encode($src, sub{ join "-", @_ });
+is $dst, 0x3000."-ascii-encode", "encode fallback with encoding name";
+
+$src = pack "C*", 0xFF;
+$dst = $ascii->decode($src, sub{ join "-", @_ });
+is $dst, 0xFF."-ascii-decode", "decode fallback with encoding name";