Upgrade to Encode 2.11, plus a patch to PerlIO::encoding

[p5sagit/p5-mst-13.2.git] / ext / PerlIO / encoding / encoding.pm

diff --git a/ext/PerlIO/encoding/encoding.pm b/ext/PerlIO/encoding/encoding.pm
index 1d9c73f..f0d419b 100644 (file)
--- a/ext/PerlIO/encoding/encoding.pm
+++ b/ext/PerlIO/encoding/encoding.pm
@@ -1,9 +1,20 @@
 package PerlIO::encoding;
-our $VERSION = '0.03';
+use strict;
+our $VERSION = '0.09';
+our $DEBUG = 0;
+$DEBUG and warn __PACKAGE__, " called by ", join(", ", caller), "\n";
+
+#
+# Equivalent of this is done in encoding.xs - do not uncomment.
+#
+# use Encode ();
+
 use XSLoader ();
-use Encode (); # Load but do not import anything.
-our $check;
-XSLoader::load 'PerlIO::encoding';
+XSLoader::load(__PACKAGE__, $VERSION);
+
+our $fallback =
+    Encode::PERLQQ()|Encode::WARN_ON_ERR()|Encode::STOP_AT_PARTIAL();
+
 1;
 __END__
 
@@ -16,8 +27,8 @@ PerlIO::encoding - encoding layer
   open($f, "<:encoding(foo)", "infoo");
   open($f, ">:encoding(bar)", "outbar");
 
-  use Encode;
-  $PerlIO::encoding::check = Encode::FB_PERLQQ();
+  use Encode qw(:fallbacks);
+  $PerlIO::encoding::fallback = FB_PERLQQ;
 
 =head1 DESCRIPTION
 
@@ -28,7 +39,7 @@ character set and encoding to Perl string data (Unicode and
 Perl's internal Unicode encoding, UTF-8).  On output, convert
 Perl string data into the specified character set and encoding.
 
-When the layer is pushed the current value of C<$PerlIO::encoding::check>
+When the layer is pushed the current value of C<$PerlIO::encoding::fallback>
 is saved and used as the check argument when calling the Encodings
 encode and decode.
 
@@ -38,4 +49,3 @@ L<open>, L<Encode>, L<perlfunc/binmode>, L<perluniintro>
 
 =cut
 
-