Integrate with perlio;

[p5sagit/p5-mst-13.2.git] / ext / Encode / compile

diff --git a/ext/Encode/compile b/ext/Encode/compile
index 8201043..0554f64 100755 (executable)
--- a/ext/Encode/compile
+++ b/ext/Encode/compile
@@ -1,30 +1,22 @@
 #!../../perl -w
 BEGIN {
-    @INC = '../../lib';
+    unshift @INC, '../../lib';
     $ENV{PATH} .= ';../..' if $^O eq 'MSWin32';
 }
 use strict;
 use Getopt::Std;
 my @orig_ARGV = @ARGV;
-my $perforce  = '$Id$';
-
 
 sub encode_U
 {
  # UTF-8 encode long hand - only covers part of perl's range
  my $uv = shift;
- if ($uv < 0x80)
-  {
-   return chr($uv)
-  }
- if ($uv < 0x800)
-  {
-   return chr(($uv >> 6)        | 0xC0).
-          chr(($uv & 0x3F)      | 0x80);
-  }
- return chr(($uv >> 12)         | 0xE0).
-        chr((($uv >> 6) & 0x3F) | 0x80).
-        chr(($uv & 0x3F)        | 0x80);
+ # chr() works in native space so convert value from table
+ # into that space before using chr().
+ my $ch = chr(utf8::unicode_to_native($uv));
+ # Now get core perl to encode that the way it likes.
+ utf8::encode($ch);
+ return $ch;
 }
 
 sub encode_S
@@ -81,7 +73,6 @@ if ($cname =~ /\.(c|xs)$/)
  !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
  This file was autogenerated by:
  $^X $0 $cname @orig_ARGV
- (Repository $perforce)
 */
 END
   }
@@ -94,6 +85,7 @@ END
     print C "#define U8 U8\n";
    }
   print C "#include \"encode.h\"\n";
+
  }
 elsif ($cname =~ /\.enc$/)
  {
@@ -185,12 +177,35 @@ if ($doC)
     my $sym = "${enc}_encoding";
     $sym =~ s/\W+/_/g;
     print H "extern encode_t $sym;\n";
-    print D " Encode_Define(aTHX_ &$sym);\n";
+    print D " Encode_XSEncoding(aTHX_ &$sym);\n";
    }
 
   if ($cname =~ /(\w+)\.xs$/)
    {
     my $mod = $1;
+    print C <<'END';
+
+void
+Encode_XSEncoding(pTHX_ encode_t *enc)
+{
+ dSP;
+ HV *stash = gv_stashpv("Encode::XS", TRUE);
+ SV *sv    = sv_bless(newRV_noinc(newSViv(PTR2IV(enc))),stash);
+ int i = 0;
+ PUSHMARK(sp);
+ XPUSHs(sv);
+ while (enc->name[i])
+  {
+   const char *name = enc->name[i++];
+   XPUSHs(sv_2mortal(newSVpvn(name,strlen(name))));
+  }
+ PUTBACK;
+ call_pv("Encode::define_encoding",G_DISCARD);
+ SvREFCNT_dec(sv);
+}
+
+END
+
     print C "\nMODULE = Encode::$mod\tPACKAGE = Encode::$mod\n\n";
     print C "BOOT:\n{\n";
     print C "#include \"$dname\"\n";
@@ -545,7 +560,8 @@ sub decode_U
 my @uname;
 sub char_names
 {
- my $s = do "unicode/Name.pl";
+ my $s = do "unicore/Name.pl";
+ die "char_names: unicore/Name.pl: $!\n" unless defined $s;
  pos($s) = 0;
  while ($s =~ /\G([0-9a-f]+)\t([0-9a-f]*)\t(.*?)\s*\n/igc)
   {
@@ -598,7 +614,7 @@ sub output_ucm_page
 sub output_ucm
 {
  my ($fh,$name,$h,$rep,$min_el,$max_el) = @_;
- print $fh "# Written $perforce\n# $0 @orig_ARGV\n" unless $opt{'q'};
+ print $fh "# $0 @orig_ARGV\n" unless $opt{'q'};
  print $fh "<code_set_name> \"$name\"\n";
  char_names();
  if (defined $min_el)