unicode: move scripts from FoldCategories to FoldScripts

Copy-and-paste bug was putting scripts in the categories map.

Fixes #18186.

Change-Id: Ife9d9bdd346fe24e578dbb2a0aac7ef6e889ae68
Reviewed-on: https://go-review.googlesource.com/45830
Run-TryBot: Russ Cox <rsc@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/unicode/maketables.go b/src/unicode/maketables.go
index e52d9c24725a1a30b746a5223bd3d9226013f401..42864b4a8e9b28fc74f0659b15123d48f5a54b9b 100644 (file)
--- a/src/unicode/maketables.go
+++ b/src/unicode/maketables.go
@@ -1201,7 +1201,7 @@ func printCasefold() {
        scr := make(map[string]map[rune]bool)
        for name := range scripts {
                if x := foldExceptions(inScript(name)); len(x) > 0 {
-                       cat[name] = x
+                       scr[name] = x
                }
        }
 

diff --git a/src/unicode/tables.go b/src/unicode/tables.go
index 548a7d594be049dcd3c670ce9d850f286f7c6e70..90323367d55c9505e241f39cc469daa26c6f921c 100644 (file)
--- a/src/unicode/tables.go
+++ b/src/unicode/tables.go
@@ -7311,34 +7311,12 @@ var caseOrbit = []foldPair{
 // simple case folding to code points inside the category.
 // If there is no entry for a category name, there are no such points.
 var FoldCategory = map[string]*RangeTable{
-       "Common":    foldCommon,
-       "Greek":     foldGreek,
-       "Inherited": foldInherited,
-       "L":         foldL,
-       "Ll":        foldLl,
-       "Lt":        foldLt,
-       "Lu":        foldLu,
-       "M":         foldM,
-       "Mn":        foldMn,
-}
-
-var foldCommon = &RangeTable{
-       R16: []Range16{
-               {0x039c, 0x03bc, 32},
-       },
-}
-
-var foldGreek = &RangeTable{
-       R16: []Range16{
-               {0x00b5, 0x0345, 656},
-       },
-}
-
-var foldInherited = &RangeTable{
-       R16: []Range16{
-               {0x0399, 0x03b9, 32},
-               {0x1fbe, 0x1fbe, 1},
-       },
+       "L":  foldL,
+       "Ll": foldLl,
+       "Lt": foldLt,
+       "Lu": foldLu,
+       "M":  foldM,
+       "Mn": foldMn,
 }
 
 var foldL = &RangeTable{
@@ -7609,7 +7587,30 @@ var foldMn = &RangeTable{
 // code points outside the script that are equivalent under
 // simple case folding to code points inside the script.
 // If there is no entry for a script name, there are no such points.
-var FoldScript = map[string]*RangeTable{}
+var FoldScript = map[string]*RangeTable{
+       "Common":    foldCommon,
+       "Greek":     foldGreek,
+       "Inherited": foldInherited,
+}
+
+var foldCommon = &RangeTable{
+       R16: []Range16{
+               {0x039c, 0x03bc, 32},
+       },
+}
+
+var foldGreek = &RangeTable{
+       R16: []Range16{
+               {0x00b5, 0x0345, 656},
+       },
+}
+
+var foldInherited = &RangeTable{
+       R16: []Range16{
+               {0x0399, 0x03b9, 32},
+               {0x1fbe, 0x1fbe, 1},
+       },
+}
 
 // Range entries: 3576 16-bit, 1454 32-bit, 5030 total.
 // Range bytes: 21456 16-bit, 17448 32-bit, 38904 total.