Integrate perlio:

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

diff --git a/ext/Encode/Encode.xs b/ext/Encode/Encode.xs
index 0d8f80e..79b2833 100644 (file)
--- a/ext/Encode/Encode.xs
+++ b/ext/Encode/Encode.xs
@@ -1,5 +1,5 @@
 /*
- $Id: Encode.xs,v 1.30 2002/04/20 09:58:23 dankogai Exp dankogai $
+ $Id: Encode.xs,v 1.43 2002/05/01 05:41:06 dankogai Exp dankogai $
  */
 
 #define PERL_NO_GET_CONTEXT
@@ -9,6 +9,9 @@
 #define U8 U8
 #include "encode.h"
 
+# define PERLIO_MODNAME  "PerlIO::encoding"
+# define PERLIO_FILENAME "PerlIO/encoding.pm"
+
 /* set 1 or more to profile.  t/encoding.t dumps core because of
    Perl_warner and PerlIO don't work well */
 #define ENCODE_XS_PROFILE 0
@@ -22,8 +25,9 @@
                         return (y)0; /* fool picky compilers */ \
                          }
 /**/
-UNIMPLEMENTED(_encoded_utf8_to_bytes, I32);
-UNIMPLEMENTED(_encoded_bytes_to_utf8, I32);
+
+UNIMPLEMENTED(_encoded_utf8_to_bytes, I32)
+UNIMPLEMENTED(_encoded_bytes_to_utf8, I32)
 
 void
 Encode_XSEncoding(pTHX_ encode_t * enc)
@@ -126,57 +130,73 @@ encode_method(pTHX_ encode_t * enc, encpage_t * dir, SV * src,
                                   &clen, UTF8_ALLOW_ANY|UTF8_CHECK_ONLY);
                if (check & ENCODE_DIE_ON_ERR) {
                    Perl_croak(
-                       aTHX_ "\"\\N{U+%" UVxf "}\" does not map to %s, %d",
-                       ch, enc->name[0], __LINE__);
-               }else{
-                   if (check & ENCODE_RETURN_ON_ERR){
-                       if (check & ENCODE_WARN_ON_ERR){
-                           Perl_warner(
-                               aTHX_ packWARN(WARN_UTF8),
-                               "\"\\N{U+%" UVxf "}\" does not map to %s",
-                               ch,enc->name[0]);
-                       }
-                               goto ENCODE_SET_SRC;
-                   }else if (check & ENCODE_PERLQQ){
-                       SV* perlqq =
-                           sv_2mortal(newSVpvf("\\x{%04x}", ch));
-                       sdone += slen + clen;
-                       ddone += dlen + SvCUR(perlqq);
-                       sv_catsv(dst, perlqq);
-                   } else {
-                       /* fallback char */
-                       sdone += slen + clen;
-                       ddone += dlen + enc->replen;
-                       sv_catpvn(dst, (char*)enc->rep, enc->replen);
-                   }                   
+                       aTHX_ "\"\\x{%04" UVxf "}\" does not map to %s",
+                       (UV)ch, enc->name[0]);
+                   return &PL_sv_undef; /* never reaches but be safe */
+               }
+               if (check & ENCODE_WARN_ON_ERR){
+                   Perl_warner(aTHX_ packWARN(WARN_UTF8),
+                               "\"\\x{%" UVxf "}\" does not map to %s",
+                               (UV)ch, enc->name[0]);
+               }
+               if (check & ENCODE_RETURN_ON_ERR){
+                   goto ENCODE_SET_SRC;
+               }
+               if (check & ENCODE_PERLQQ){
+                   SV* perlqq = 
+                       sv_2mortal(newSVpvf("\\x{%04"UVxf"}", (UV)ch));
+                   sdone += slen + clen;
+                   ddone += dlen + SvCUR(perlqq);
+                   sv_catsv(dst, perlqq);
+               }else if (check & ENCODE_HTMLCREF){
+                   SV* htmlcref = 
+                       sv_2mortal(newSVpvf("&#%" UVuf ";", (UV)ch));
+                   sdone += slen + clen;
+                   ddone += dlen + SvCUR(htmlcref);
+                   sv_catsv(dst, htmlcref);
+               }else if (check & ENCODE_XMLCREF){
+                   SV* xmlcref = 
+                       sv_2mortal(newSVpvf("&#x%" UVxf ";", (UV)ch));
+                   sdone += slen + clen;
+                   ddone += dlen + SvCUR(xmlcref);
+                   sv_catsv(dst, xmlcref);
+               } else {
+                   /* fallback char */
+                   sdone += slen + clen;
+                   ddone += dlen + enc->replen;
+                   sv_catpvn(dst, (char*)enc->rep, enc->replen);
                }
            }
            /* decoding */
            else {
                if (check & ENCODE_DIE_ON_ERR){
                    Perl_croak(
-                       aTHX_ "%s \"\\x%02X\" does not map to Unicode (%d)",
-                       enc->name[0], (U8) s[slen], code);
-               }else{
-                   if (check & ENCODE_RETURN_ON_ERR){
-                       if (check & ENCODE_WARN_ON_ERR){
-                           Perl_warner(
-                               aTHX_ packWARN(WARN_UTF8),
-                               "%s \"\\x%02X\" does not map to Unicode (%d)",
-                               enc->name[0], (U8) s[slen], code);
-                       }
-                       goto ENCODE_SET_SRC;
-                   }else if (check & ENCODE_PERLQQ){
-                       SV* perlqq =
-                           sv_2mortal(newSVpvf("\\x%02X", s[slen]));
-                       sdone += slen + 1;
-                       ddone += dlen + SvCUR(perlqq);
-                       sv_catsv(dst, perlqq);
-                   } else {
-                       sdone += slen + 1;
-                       ddone += dlen + strlen(FBCHAR_UTF8);
-                       sv_catpv(dst, FBCHAR_UTF8);
-                   }
+                       aTHX_ "%s \"\\x%02" UVXf 
+                       "\" does not map to Unicode (%d)",
+                       (UV)enc->name[0], (U8)s[slen], code);
+                   return &PL_sv_undef; /* never reaches but be safe */
+               }
+               if (check & ENCODE_WARN_ON_ERR){
+                   Perl_warner(
+                       aTHX_ packWARN(WARN_UTF8),
+                       "%s \"\\x%02" UVXf
+                       "\" does not map to Unicode (%d)",
+                       (UV)enc->name[0], (U8)s[slen], code);
+               }
+               if (check & ENCODE_RETURN_ON_ERR){
+                   goto ENCODE_SET_SRC;
+               }
+               if (check &
+                   (ENCODE_PERLQQ|ENCODE_HTMLCREF|ENCODE_XMLCREF)){
+                   SV* perlqq = 
+                       sv_2mortal(newSVpvf("\\x%02" UVXf, (UV)s[slen]));
+                   sdone += slen + 1;
+                   ddone += dlen + SvCUR(perlqq);
+                   sv_catsv(dst, perlqq);
+               } else {
+                   sdone += slen + 1;
+                   ddone += dlen + strlen(FBCHAR_UTF8);
+                   sv_catpv(dst, FBCHAR_UTF8);
                }
            }
            /* settle variables when fallback */
@@ -202,9 +222,6 @@ encode_method(pTHX_ encode_t * enc, encpage_t * dir, SV * src,
        SvCUR_set(src, sdone);
     }
     /* warn("check = 0x%X, code = 0x%d\n", check, code); */
-    if (code && !(check & ENCODE_RETURN_ON_ERR)) {
-       return &PL_sv_undef;
-    }
 
     SvCUR_set(dst, dlen+ddone);
     SvPOK_only(dst);
@@ -263,6 +280,34 @@ CODE:
     XSRETURN(1);
 }
 
+void
+Method_needs_lines(obj)
+SV *   obj
+CODE:
+{
+    encode_t *enc = INT2PTR(encode_t *, SvIV(SvRV(obj)));
+    ST(0) = &PL_sv_no;
+    XSRETURN(1);
+}
+
+void
+Method_perlio_ok(obj)
+SV *   obj
+CODE:
+{
+    encode_t *enc = INT2PTR(encode_t *, SvIV(SvRV(obj)));
+    /* require_pv(PERLIO_FILENAME); */
+
+    eval_pv("require PerlIO::encoding", 0);
+
+    if (SvTRUE(get_sv("@", 0))) {
+       ST(0) = &PL_sv_no;
+    }else{
+       ST(0) = &PL_sv_yes;
+    }
+    XSRETURN(1);
+}
+
 MODULE = Encode         PACKAGE = Encode
 
 PROTOTYPES: ENABLE
@@ -412,9 +457,6 @@ CODE:
 OUTPUT:
     RETVAL
 
-PROTOTYPES: DISABLE
-
-
 int
 DIE_ON_ERR()
 CODE:
@@ -451,6 +493,20 @@ OUTPUT:
     RETVAL
 
 int
+HTMLCREF()
+CODE:
+    RETVAL = ENCODE_HTMLCREF;
+OUTPUT:
+    RETVAL
+
+int
+XMLCREF()
+CODE:
+    RETVAL = ENCODE_XMLCREF;
+OUTPUT:
+    RETVAL
+
+int
 FB_DEFAULT()
 CODE:
     RETVAL = ENCODE_FB_DEFAULT;
@@ -485,6 +541,20 @@ CODE:
 OUTPUT:
     RETVAL
 
+int
+FB_HTMLCREF()
+CODE:
+    RETVAL = ENCODE_FB_HTMLCREF;
+OUTPUT:
+    RETVAL
+
+int
+FB_XMLCREF()
+CODE:
+    RETVAL = ENCODE_FB_XMLCREF;
+OUTPUT:
+    RETVAL
+
 BOOT:
 {
 #include "def_t.h"