Merge 8.7

1 files changed, 38 insertions, 19 deletions

diff --git a/tests/utf.test b/tests/utf.test
index 88469d7..09599b6 100644
--- a/tests/utf.test
+++ b/tests/utf.test
@@ -84,6 +84,25 @@ test utf-1.13.0 {Tcl_UniCharToUtf: Invalid surrogate} {Uesc ucs2} {
 test utf-1.13.1 {Tcl_UniCharToUtf: Invalid surrogate} {fullutf testbytestring} {
     expr {"\UD842" eq [testbytestring \xEF\xBF\xBD]}
 } 1
+test utf-1.14 {Tcl_UniCharToUtf: surrogate pairs from concat} {
+    set lo \uDE02
+    return \uD83D$lo
+} \uD83D\uDE02
+test utf-1.15 {Tcl_UniCharToUtf: surrogate pairs from concat} {
+    set hi \uD83D
+    return $hi\uDE02
+} \uD83D\uDE02
+test utf-1.16 {Tcl_UniCharToUtf: \xC0 + \x80} testbytestring {
+    set lo [testbytestring \x80]
+    string length [testbytestring \xC0]$lo
+} 2
+test utf-1.17 {Tcl_UniCharToUtf: \xC0 + \x80} testbytestring {
+    set hi [testbytestring \xC0]
+    string length $hi[testbytestring \x80]
+} 2
+test utf-1.18 {Tcl_UniCharToUtf: surrogate pairs from concat} {
+    string cat \uD83D \uDE02
+} \uD83D\uDE02
 
 test utf-2.1 {Tcl_UtfToUniChar: low ascii} {
     string length "abc"
@@ -204,7 +223,7 @@ test utf-6.3 {Tcl_UtfNext} testutfnext {
     testutfnext AA
 } 1
 test utf-6.4 {Tcl_UtfNext} {testutfnext testbytestring} {
-    testutfnext A[testbytestring \xA0]
+    testutfnext [testbytestring A\xA0]
 } 1
 test utf-6.5 {Tcl_UtfNext} {testutfnext testbytestring} {
     testutfnext A[testbytestring \xD0]
@@ -390,7 +409,7 @@ test utf-6.62 {Tcl_UtfNext} testutfnext {
     testutfnext 蠠G
 } 3
 test utf-6.63 {Tcl_UtfNext} {testutfnext testbytestring} {
-    testutfnext 蠠[testbytestring \xA0]
+    testutfnext [testbytestring \xE8\xA0\xA0\xA0]
 } 3
 test utf-6.64 {Tcl_UtfNext} {testutfnext testbytestring} {
     testutfnext 蠠[testbytestring \xD0]
@@ -565,7 +584,7 @@ test utf-7.6 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xE8]
 } 1
 test utf-7.6.1 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A蠠[testbytestring \xA0] 2
+    testutfprev A[testbytestring \xE8\xA0\xA0\xA0] 2
 } 1
 test utf-7.6.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xE8\xF8\xA0\xA0] 2
@@ -580,13 +599,13 @@ test utf-7.7.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xD0\xF8\xA0\xA0] 2
 } 1
 test utf-7.8 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0]
+    testutfprev [testbytestring A\xA0]
 } 1
 test utf-7.8.1 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0\xA0\xA0\xA0] 2
+    testutfprev [testbytestring A\xA0\xA0\xA0\xA0] 2
 } 1
 test utf-7.8.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0\xF8\xA0\xA0] 2
+    testutfprev [testbytestring A\xA0\xF8\xA0\xA0] 2
 } 1
 test utf-7.9 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xF8\xA0]
@@ -619,7 +638,7 @@ test utf-7.11 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xE8\xA0]
 } 1
 test utf-7.11.1 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A蠠[testbytestring \xA0] 3
+    testutfprev A[testbytestring \xE8\xA0\xA0\xA0] 3
 } 1
 test utf-7.11.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xE8\xA0\xF8\xA0] 3
@@ -637,13 +656,13 @@ test utf-7.12.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xD0\xA0\xF8\xA0] 3
 } 1
 test utf-7.13 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0\xA0]
+    testutfprev [testbytestring A\xA0\xA0]
 } 2
 test utf-7.13.1 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0\xA0\xA0\xA0] 3
+    testutfprev [testbytestring A\xA0\xA0\xA0\xA0] 3
 } 2
 test utf-7.13.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0\xA0\xF8\xA0] 3
+    testutfprev [testbytestring A\xA0\xA0\xF8\xA0] 3
 } 2
 test utf-7.14 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xF8\xA0\xA0]
@@ -676,7 +695,7 @@ test utf-7.16 {Tcl_UtfPrev} testutfprev {
     testutfprev A蠠
 } 1
 test utf-7.16.1 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A蠠[testbytestring \xA0] 4
+    testutfprev A[testbytestring \xE8\xA0\xA0\xA0] 4
 } 1
 test utf-7.16.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A蠠[testbytestring \xF8] 4
@@ -691,31 +710,31 @@ test utf-7.17.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xD0\xA0\xA0\xF8] 4
 } 3
 test utf-7.18.0 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0\xA0\xA0]
+    testutfprev [testbytestring A\xA0\xA0\xA0]
 } 3
 test utf-7.18.1 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0\xA0\xA0\xA0] 4
+    testutfprev [testbytestring A\xA0\xA0\xA0\xA0] 4
 } 3
 test utf-7.18.2 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0\xA0\xA0\xF8] 4
+    testutfprev [testbytestring A\xA0\xA0\xA0\xF8] 4
 } 3
 test utf-7.19 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xF8\xA0\xA0\xA0]
+    testutfprev [testbytestring A\xF8\xA0\xA0\xA0]
 } 4
 test utf-7.20.0 {Tcl_UtfPrev} {testutfprev testbytestring ucs2} {
-    testutfprev A[testbytestring \xF2\xA0\xA0\xA0]
+    testutfprev [testbytestring A\xF2\xA0\xA0\xA0]
 } 4
 test utf-7.20.1 {Tcl_UtfPrev} {testutfprev testbytestring fullutf} {
-    testutfprev A[testbytestring \xF2\xA0\xA0\xA0]
+    testutfprev [testbytestring A\xF2\xA0\xA0\xA0]
 } 1
 test utf-7.21 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A蠠[testbytestring \xA0]
+    testutfprev A[testbytestring \xE8\xA0\xA0\xA0]
 } 4
 test utf-7.22 {Tcl_UtfPrev} {testutfprev testbytestring} {
     testutfprev A[testbytestring \xD0\xA0\xA0\xA0]
 } 4
 test utf-7.23 {Tcl_UtfPrev} {testutfprev testbytestring} {
-    testutfprev A[testbytestring \xA0\xA0\xA0\xA0]
+    testutfprev [testbytestring A\xA0\xA0\xA0\xA0]
 } 4
 test utf-7.24 {Tcl_UtfPrev -- overlong sequence}  {testutfprev testbytestring} {
     testutfprev A[testbytestring \xC0\x81]