From: Gurusamy Sarathy <gsar@cpan.org>
Date: Mon, 7 Feb 2000 06:26:30 +0000 (+0000)
Subject: allow 64-bit utf8-encoded integers (from Ilya Zakharevich)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=3c77ea2bace63b1ad27d15a6366cb938bdd158cb;p=p5sagit%2Fp5-mst-13.2.git

allow 64-bit utf8-encoded integers (from Ilya Zakharevich)

p4raw-id: //depot/perl@5011
---

diff --git a/utf8.c b/utf8.c
index 3d9caf9..b14fafe 100644
--- a/utf8.c
+++ b/utf8.c
@@ -84,6 +84,11 @@ Perl_uv_to_utf8(pTHX_ U8 *d, UV uv)
 #ifdef HAS_QUAD
     {
 	*d++ =                        0xff;	/* Can't match U+FFFE! */
+	*d++ =                        0x80;	/* 6 Reserved bits */
+	*d++ = (((uv >> 60) & 0x0f) | 0x80);	/* 2 Reserved bits */
+	*d++ = (((uv >> 54) & 0x3f) | 0x80);
+	*d++ = (((uv >> 48) & 0x3f) | 0x80);
+	*d++ = (((uv >> 42) & 0x3f) | 0x80);
 	*d++ = (((uv >> 36) & 0x3f) | 0x80);
 	*d++ = (((uv >> 30) & 0x3f) | 0x80);
 	*d++ = (((uv >> 24) & 0x3f) | 0x80);
@@ -120,8 +125,8 @@ Perl_utf8_to_uv(pTHX_ U8* s, I32* retlen)
     else if (!(uv & 0x08))	{ len = 4; uv &= 0x07; }
     else if (!(uv & 0x04))	{ len = 5; uv &= 0x03; }
     else if (!(uv & 0x02))	{ len = 6; uv &= 0x01; }
-    else if (!(uv & 0x01))	{ len = 7; uv &= 0x00; }
-    else 			  len = 8;	/* whoa! */
+    else if (!(uv & 0x01))	{ len = 7;  uv = 0; }
+    else 			{ len = 13; uv = 0; } /* whoa! */
 
     if (retlen)
 	*retlen = len;
diff --git a/utf8.h b/utf8.h
index e864316..8f69fef 100644
--- a/utf8.h
+++ b/utf8.h
@@ -18,7 +18,8 @@ EXTCONST unsigned char PL_utf8skip[] = {
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* bogus */
 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, /* bogus */
 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, /* scripts */
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,7,8, /* cjk etc. */
+3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,5,5,5,5,6,6,	 /* cjk etc. */
+7,13, /* Perl extended (not UTF-8).  Up to 72bit allowed (64-bit + reserved). */
 };
 #else
 EXTCONST unsigned char PL_utf8skip[];