internal/language/compact: implement parent generation

mpvl · mpvl · commit 8c34f848e18c · 2018-03-15T13:04:13.000Z
by modifying code copied earlier Change-Id: I53a83ebc235675238973cfa93faba0d57260e846 Reviewed-on: https://go-review.googlesource.com/98437 Run-TryBot: Marcel van Lohuizen <mpvl@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Ross Light <light@google.com>
diff --git a/internal/language/compact/compact.go b/internal/language/compact/compact.go
@@ -37,6 +37,11 @@ func getCoreIndex(t language.Tag) (id ID, ok bool) {
 	return ID(i), true
 }
 
+// Parent returns the ID of the parent or the root ID if id is already the root.
+func (id ID) Parent() ID {
+	return parents[id]
+}
+
 // Tag converts id to an internal language Tag.
 func (id ID) Tag() language.Tag {
 	if int(id) >= len(coreTags) {
diff --git a/internal/language/compact/gen_parents.go b/internal/language/compact/gen_parents.go
@@ -10,7 +10,8 @@ import (
 	"log"
 
 	"golang.org/x/text/internal/gen"
-	"golang.org/x/text/language"
+	"golang.org/x/text/internal/language"
+	"golang.org/x/text/internal/language/compact"
 	"golang.org/x/text/unicode/cldr"
 )
 
@@ -25,28 +26,29 @@ func main() {
 	}
 
 	w := gen.NewCodeWriter()
-	defer w.WriteGoFile("tables.go", "internal")
+	defer w.WriteGoFile("parents.go", "compact")
 
 	// Create parents table.
-	parents := make([]uint16, language.NumCompactTags)
+	type ID uint16
+	parents := make([]ID, compact.NumCompactTags)
 	for _, loc := range data.Locales() {
 		tag := language.MustParse(loc)
-		index, ok := language.CompactIndex(tag)
+		index, ok := compact.FromTag(tag)
 		if !ok {
 			continue
 		}
-		parentIndex := 0 // und
+		parentIndex := compact.ID(0) // und
 		for p := tag.Parent(); p != language.Und; p = p.Parent() {
-			if x, ok := language.CompactIndex(p); ok {
+			if x, ok := compact.FromTag(p); ok {
 				parentIndex = x
 				break
 			}
 		}
-		parents[index] = uint16(parentIndex)
+		parents[index] = ID(parentIndex)
 	}
 
 	w.WriteComment(`
-	Parent maps a compact index of a tag to the compact index of the parent of
+	parents maps a compact index of a tag to the compact index of the parent of
 	this tag.`)
-	w.WriteVar("Parent", parents)
+	w.WriteVar("parents", parents)
 }
diff --git a/internal/language/compact/gen_test.go b/internal/language/compact/gen_test.go
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package compact_test
+package compact
 
 import (
 	"testing"
 
-	"golang.org/x/text/internal/language/compact"
-	"golang.org/x/text/language"
+	"golang.org/x/text/internal/language"
 )
 
 func TestParents(t *testing.T) {
@@ -24,15 +23,15 @@ func TestParents(t *testing.T) {
 		{"ca-ES-valencia", "ca-ES"},
 	}
 	for _, tc := range testCases {
-		tag, ok := language.CompactIndex(language.MustParse(tc.tag))
+		tag, ok := LanguageID(Make(language.MustParse(tc.tag)))
 		if !ok {
 			t.Fatalf("Could not get index of flag %s", tc.tag)
 		}
-		want, ok := language.CompactIndex(language.MustParse(tc.parent))
+		want, ok := LanguageID(Make(language.MustParse(tc.parent)))
 		if !ok {
 			t.Fatalf("Could not get index of parent %s of tag %s", tc.parent, tc.tag)
 		}
-		if got := int(compact.Parent[tag]); got != want {
+		if got := parents[tag]; got != want {
 			t.Errorf("Parent[%s] = %d; want %d (%s)", tc.tag, got, want, tc.parent)
 		}
 	}
diff --git a/internal/language/compact/language.go b/internal/language/compact/language.go
@@ -3,6 +3,7 @@
 // license that can be found in the LICENSE file.
 
 //go:generate go run gen.go gen_index.go -output tables.go
+//go:generate go run gen_parents.go
 
 package compact
 
diff --git a/internal/language/compact/parents.go b/internal/language/compact/parents.go

Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,12 @@`
`2`	`2`	`// Use of this source code is governed by a BSD-style`
`3`	`3`	`// license that can be found in the LICENSE file.`
`4`	`4`
`5`		`-package compact_test`
	`5`	`+package compact`
`6`	`6`
`7`	`7`	`import (`
`8`	`8`	`"testing"`
`9`	`9`
`10`		`- "golang.org/x/text/internal/language/compact"`
`11`		`- "golang.org/x/text/language"`
	`10`	`+ "golang.org/x/text/internal/language"`
`12`	`11`	`)`
`13`	`12`
`14`	`13`	`func TestParents(t *testing.T) {`
`@@ -24,15 +23,15 @@ func TestParents(t *testing.T) {`
`24`	`23`	`{"ca-ES-valencia", "ca-ES"},`
`25`	`24`	`}`
`26`	`25`	`for _, tc := range testCases {`
`27`		`- tag, ok := language.CompactIndex(language.MustParse(tc.tag))`
	`26`	`+ tag, ok := LanguageID(Make(language.MustParse(tc.tag)))`
`28`	`27`	`if !ok {`
`29`	`28`	`t.Fatalf("Could not get index of flag %s", tc.tag)`
`30`	`29`	`}`
`31`		`- want, ok := language.CompactIndex(language.MustParse(tc.parent))`
	`30`	`+ want, ok := LanguageID(Make(language.MustParse(tc.parent)))`
`32`	`31`	`if !ok {`
`33`	`32`	`t.Fatalf("Could not get index of parent %s of tag %s", tc.parent, tc.tag)`
`34`	`33`	`}`
`35`		`- if got := int(compact.Parent[tag]); got != want {`
	`34`	`+ if got := parents[tag]; got != want {`
`36`	`35`	`t.Errorf("Parent[%s] = %d; want %d (%s)", tc.tag, got, want, tc.parent)`
`37`	`36`	`}`
`38`	`37`	`}`