[ID 20020220.002] Perl 5.7.2 porting patches for POSIX 1003.1-2001 hosts
[p5sagit/p5-mst-13.2.git] / utf8.c
diff --git a/utf8.c b/utf8.c
index 314bbff..7dbb71f 100644 (file)
--- a/utf8.c
+++ b/utf8.c
@@ -1270,107 +1270,107 @@ The "ustrp" is a pointer to the character buffer to put the
 conversion result to.  The "lenp" is a pointer to the length
 of the result.
 
-The "swash" is a pointer to the swash to use.
+The "swashp" is a pointer to the swash to use.
 
-The "normal" is a string like "ToLower" which means the swash
-$utf8::ToLower, which is stored in lib/unicore/To/Lower.pl,
-and loaded by SWASHGET, using lib/utf8_heavy.pl.
+Both the special and normal mappings are stored lib/unicore/To/Foo.pl,
+and loaded by SWASHGET, using lib/utf8_heavy.pl.  The special (usually,
+but not always, a multicharacter mapping), is tried first.
 
-The "special" is a string like "utf8::ToSpecLower", which means
-the hash %utf8::ToSpecLower, which is stored in the same file,
-lib/unicore/To/Lower.pl, and also loaded by SWASHGET.  The access
-to the hash is by Perl_to_utf8_case().
+The "special" is a string like "utf8::ToSpecLower", which means the
+hash %utf8::ToSpecLower.  The access to the hash is through
+Perl_to_utf8_case().
 
-=cut
- */
+The "normal" is a string like "ToLower" which means the swash
+%utf8::ToLower.
+
+=cut */
 
 UV
 Perl_to_utf8_case(pTHX_ U8 *p, U8* ustrp, STRLEN *lenp, SV **swashp, char *normal, char *special)
 {
-    UV uv0, uv1, uv2;
+    UV uv0, uv1;
     U8 tmpbuf[UTF8_MAXLEN_FOLD+1];
-    STRLEN len;
+    STRLEN len = 0;
 
-    if (!*swashp)
-        *swashp = swash_init("utf8", normal, &PL_sv_undef, 4, 0);
     uv0 = utf8_to_uvchr(p, 0);
     /* The NATIVE_TO_UNI() and UNI_TO_NATIVE() mappings
      * are necessary in EBCDIC, they are redundant no-ops
      * in ASCII-ish platforms, and hopefully optimized away. */
     uv1 = NATIVE_TO_UNI(uv0);
     uvuni_to_utf8(tmpbuf, uv1);
-    uv2 = swash_fetch(*swashp, tmpbuf, TRUE);
-    if (uv2) {
-        /* It was "normal" (single character mapping). */
-         UV uv3 = UNI_TO_NATIVE(uv2);
 
-         len = uvchr_to_utf8(ustrp, uv3) - ustrp;
-         if (lenp)
-              *lenp = len;
+    if (!*swashp) /* load on-demand */
+         *swashp = swash_init("utf8", normal, &PL_sv_undef, 4, 0);
 
-         return uv3;
-    }
-    else {
+    if (special) {
+         /* It might be "special" (sometimes, but not always,
+         * a multicharacter mapping) */
         HV *hv;
         SV *keysv;
         HE *he;
-
+        SV *val;
+       
         if ((hv    = get_hv(special, FALSE)) &&
             (keysv = sv_2mortal(Perl_newSVpvf(aTHX_ "%04"UVXf, uv1))) &&
-            (he    = hv_fetch_ent(hv, keysv, FALSE, 0))) {
-             SV *val = HeVAL(he);
-             char *s = SvPV(val, len);
-
-             if (len > 1) {
-                  Copy(s, ustrp, len, U8);
+            (he    = hv_fetch_ent(hv, keysv, FALSE, 0)) &&
+            (val   = HeVAL(he))) {
+            char *s;
+
+             s = SvPV(val, len);
+             if (len == 1)
+                  len = uvuni_to_utf8(ustrp, NATIVE_TO_UNI(*(U8*)s)) - ustrp;
+             else {
 #ifdef EBCDIC
-                  {
-                       /* If we have EBCDIC we need to remap the
-                        * characters coming in from the "special"
-                        * (usually, but not always multicharacter)
-                        * mapping, since any characters in the low 256
-                        * are in Unicode code points, not EBCDIC.
-                        * --jhi */
-                       U8 *d = tmpbuf;
-                       U8 *t, *tend;
+                  /* If we have EBCDIC we need to remap the characters
+                   * since any characters in the low 256 are Unicode
+                   * code points, not EBCDIC. */
+                  U8 *t = (U8*)s, *tend = t + len, *d;
+               
+                  d = tmpbuf;
+                  if (SvUTF8(val)) {
+                       STRLEN tlen = 0;
                        
-                       if (SvUTF8(val)) {
-                            STRLEN tlen = 0;
-
-                            for (t = ustrp, tend = t + len;
-                                 t < tend; t += tlen) {
-                                 UV c = utf8_to_uvchr(t, &tlen);
-                                 
-                                 if (tlen > 0)
-                                      d = uvchr_to_utf8(d, UNI_TO_NATIVE(c));
-                                 else
-                                      break;
+                       while (t < tend) {
+                            UV c = utf8_to_uvchr(t, &tlen);
+                            if (tlen > 0) {
+                                 d = uvchr_to_utf8(d, UNI_TO_NATIVE(c));
+                                 t += tlen;
                             }
-                       } else {
-                            for (t = ustrp, tend = t + len;
-                                 t < tend; t++)
-                                 d = uvchr_to_utf8(d, UNI_TO_NATIVE(*t));
+                            else
+                                 break;
                        }
-                       len = d - tmpbuf; 
-                       Copy(tmpbuf, ustrp, len, U8);
                   }
+                  else {
+                       while (t < tend)
+                            d = uvchr_to_utf8(d, UNI_TO_NATIVE(*t++));
+                  }
+                  len = d - tmpbuf;
+                  Copy(tmpbuf, ustrp, len, U8);
+#else
+                  Copy(s, ustrp, len, U8);
 #endif
              }
-             else 
-                  len = uvchr_to_utf8(ustrp, UNI_TO_NATIVE(*(U8*)s)) - ustrp;
-             if (lenp)
-                  *lenp = len;
+        }
+    }
 
-             return utf8_to_uvchr(ustrp, 0);
+    if (!len && *swashp) {
+        UV uv2 = swash_fetch(*swashp, tmpbuf, TRUE);
+        
+        if (uv2) {
+             /* It was "normal" (a single character mapping). */
+             UV uv3 = UNI_TO_NATIVE(uv2);
+             
+             len = uvchr_to_utf8(ustrp, uv3) - ustrp;
         }
+    }
 
-        /* So it was not "special": just copy it. */
+    if (!len) /* Neither: just copy. */
         len = uvchr_to_utf8(ustrp, uv0) - ustrp;
-        if (lenp)
-             *lenp = len;
 
-        return uv0;
-    }
+    if (lenp)
+        *lenp = len;
+
+    return len ? utf8_to_uvchr(ustrp, 0) : 0;
 }
 
 /*