X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=utf8.c;h=23562557f6722568e3bd73795117e4fc1abd83f2;hb=06705523e0517b0027174c49916c620f6946316f;hp=bb8a67c852144b86810983bddc5c0f189b096a5b;hpb=660a461690361c615b3b45ef731dd3d6f0d55d01;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/utf8.c b/utf8.c
index bb8a67c..2356255 100644
--- a/utf8.c
+++ b/utf8.c
@@ -1626,11 +1626,18 @@ Perl_swash_init(pTHX_ const char* pkg, const char* name, SV *listsv, I32 minbits
  * the lower-level routine, and it is similarly broken for returning
  * multiple values.  --jhi */
 /* Now SWASHGET is recasted into S_swash_get in this file. */
+
+/* Note:
+ * Returns the value of property/mapping C<swash> for the first character
+ * of the string C<ptr>. If C<do_utf8> is true, the string C<ptr> is
+ * assumed to be in utf8. If C<do_utf8> is false, the string C<ptr> is
+ * assumed to be in native 8-bit encoding. Caches the swatch in C<swash>.
+ */
 UV
-Perl_swash_fetch(pTHX_ SV *sv, const U8 *ptr, bool do_utf8)
+Perl_swash_fetch(pTHX_ SV *swash, const U8 *ptr, bool do_utf8)
 {
     dVAR;
-    HV* const hv = (HV*)SvRV(sv);
+    HV* const hv = (HV*)SvRV(swash);
     U32 klen;
     U32 off;
     STRLEN slen;
@@ -1696,7 +1703,7 @@ Perl_swash_fetch(pTHX_ SV *sv, const U8 *ptr, bool do_utf8)
 	    const UV code_point = utf8n_to_uvuni(ptr, UTF8_MAXBYTES, 0,
 					   ckWARN(WARN_UTF8) ?
 					   0 : UTF8_ALLOW_ANY);
-	    swatch = swash_get(sv,
+	    swatch = swash_get(swash,
 		    /* On EBCDIC & ~(0xA0-1) isn't a useful thing to do */
 				(klen) ? (code_point & ~(needents - 1)) : 0,
 				needents);
@@ -1752,17 +1759,17 @@ S_swash_get(pTHX_ SV* swash, UV start, UV span)
     STRLEN lcur, xcur, scur;
 
     HV* const hv = (HV*)SvRV(swash);
-    SV** listsvp = hv_fetch(hv, "LIST", 4, FALSE);
-    SV** typesvp = hv_fetch(hv, "TYPE", 4, FALSE);
-    SV** bitssvp = hv_fetch(hv, "BITS", 4, FALSE);
-    SV** nonesvp = hv_fetch(hv, "NONE", 4, FALSE);
-    SV** extssvp = hv_fetch(hv, "EXTRAS", 6, FALSE);
-    U8*  typestr = (U8*)SvPV_nolen(*typesvp);
-    int  typeto  = typestr[0] == 'T' && typestr[1] == 'o';
-    STRLEN bits  = SvUV(*bitssvp);
-    STRLEN octets = bits >> 3; /* if bits == 1, then octets == 0 */
-    UV     none  = SvUV(*nonesvp);
-    UV     end   = start + span;
+    SV** const listsvp = hv_fetch(hv, "LIST", 4, FALSE);
+    SV** const typesvp = hv_fetch(hv, "TYPE", 4, FALSE);
+    SV** const bitssvp = hv_fetch(hv, "BITS", 4, FALSE);
+    SV** const nonesvp = hv_fetch(hv, "NONE", 4, FALSE);
+    SV** const extssvp = hv_fetch(hv, "EXTRAS", 6, FALSE);
+    const U8* const typestr = (U8*)SvPV_nolen(*typesvp);
+    const int  typeto  = typestr[0] == 'T' && typestr[1] == 'o';
+    const STRLEN bits  = SvUV(*bitssvp);
+    const STRLEN octets = bits >> 3; /* if bits == 1, then octets == 0 */
+    const UV     none  = SvUV(*nonesvp);
+    const UV     end   = start + span;
 
     if (bits != 1 && bits != 8 && bits != 16 && bits != 32) {
 	Perl_croak(aTHX_ "panic: swash_get doesn't expect bits %"UVuf,
@@ -1775,7 +1782,7 @@ S_swash_get(pTHX_ SV* swash, UV start, UV span)
     SvGROW(swatch, scur + 1);
     s = (U8*)SvPVX(swatch);
     if (octets && none) {
-	const U8* e = s + scur;
+	const U8* const e = s + scur;
 	while (s < e) {
 	    if (bits == 8)
 		*s++ = (U8)(none & 0xff);
@@ -1806,7 +1813,7 @@ S_swash_get(pTHX_ SV* swash, UV start, UV span)
 	STRLEN numlen;
 	I32 flags = PERL_SCAN_SILENT_ILLDIGIT | PERL_SCAN_DISALLOW_PREFIX;
 
-	U8* nl = (U8*)memchr(l, '\n', lend - l);
+	U8* const nl = (U8*)memchr(l, '\n', lend - l);
 
 	numlen = lend - l;
 	min = grok_hex((char *)l, &numlen, &flags, NULL);
@@ -1908,7 +1915,7 @@ S_swash_get(pTHX_ SV* swash, UV start, UV span)
 	    if (min < start)
 		min = start;
 	    for (key = min; key <= max; key++) {
-		STRLEN offset = (STRLEN)(key - start);
+		const STRLEN offset = (STRLEN)(key - start);
 		if (key >= end)
 		    goto go_out_list;
 		s[offset >> 3] |= 1 << (offset & 7);
@@ -2144,7 +2151,7 @@ Perl_pv_uni_display(pTHX_ SV *dsv, const U8 *spv, STRLEN len, STRLEN pvlim, UV f
 	 u = utf8_to_uvchr((U8*)s, 0);
 	 if (u < 256) {
 	     const unsigned char c = (unsigned char)u & 0xFF;
-	     if (!ok && (flags & UNI_DISPLAY_BACKSLASH)) {
+	     if (flags & UNI_DISPLAY_BACKSLASH) {
 	         switch (c) {
 		 case '\n':
 		     ok = 'n'; break;