unicode: add maketables to build, fix build
R=r
CC=golang-dev
https://golang.org/cl/4073046
diff --git a/src/pkg/unicode/maketables.go b/src/pkg/unicode/maketables.go
index 081e1a1..28809b3 100644
--- a/src/pkg/unicode/maketables.go
+++ b/src/pkg/unicode/maketables.go
@@ -50,8 +50,8 @@
false,
"test existing tables; can be used to compare web data with package data")
-var scriptRe = regexp.MustCompile(`([0-9A-F]+)(\.\.[0-9A-F]+)? *; ([A-Za-z_]+)`)
-var die = log.New(os.Stderr, nil, "", log.Lexit|log.Lshortfile)
+var scriptRe = regexp.MustCompile(`^([0-9A-F]+)(\.\.[0-9A-F]+)? *; ([A-Za-z_]+)$`)
+var logger = log.New(os.Stderr, "", log.Lshortfile)
var category = map[string]bool{"letter": true} // Nd Lu etc. letter is a special case
@@ -141,11 +141,11 @@
func parseCategory(line string) (state State) {
field := strings.Split(line, ";", -1)
if len(field) != NumField {
- die.Logf("%5s: %d fields (expected %d)\n", line, len(field), NumField)
+ logger.Exitf("%5s: %d fields (expected %d)\n", line, len(field), NumField)
}
point, err := strconv.Btoui64(field[FCodePoint], 16)
if err != nil {
- die.Log("%.5s...:", err)
+ logger.Exitf("%.5s...: %s", line, err)
}
lastChar = uint32(point)
if point == 0 {
@@ -157,7 +157,7 @@
char := &chars[point]
char.field = field
if char.codePoint != 0 {
- die.Logf("point %U reused\n")
+ logger.Exitf("point %U reused", point)
}
char.codePoint = lastChar
char.category = field[FGeneralCategory]
@@ -167,7 +167,7 @@
// Decimal digit
_, err := strconv.Atoi(field[FNumericValue])
if err != nil {
- die.Log("%U: bad numeric field: %s", point, err)
+ logger.Exitf("%U: bad numeric field: %s", point, err)
}
case "Lu":
char.letter(field[FCodePoint], field[FSimpleLowercaseMapping], field[FSimpleTitlecaseMapping])
@@ -208,7 +208,7 @@
v, err := strconv.Btoui64(s, 16)
if err != nil {
char.dump(cas)
- die.Logf("%U: bad letter(%s): %s", char.codePoint, s, err)
+ logger.Exitf("%U: bad letter(%s): %s", char.codePoint, s, err)
}
return int(v)
}
@@ -242,7 +242,7 @@
return f
}
}
- die.Log("unknown version")
+ logger.Exit("unknown version")
return "Unknown"
}
@@ -260,10 +260,10 @@
}
resp, _, err := http.Get(*dataURL)
if err != nil {
- die.Log(err)
+ logger.Exit(err)
}
if resp.StatusCode != 200 {
- die.Log("bad GET status for UnicodeData.txt", resp.Status)
+ logger.Exit("bad GET status for UnicodeData.txt", resp.Status)
}
input := bufio.NewReader(resp.Body)
var first uint32 = 0
@@ -273,21 +273,21 @@
if err == os.EOF {
break
}
- die.Log(err)
+ logger.Exit(err)
}
switch parseCategory(line[0 : len(line)-1]) {
case SNormal:
if first != 0 {
- die.Logf("bad state normal at U+%04X", lastChar)
+ logger.Exitf("bad state normal at U+%04X", lastChar)
}
case SFirst:
if first != 0 {
- die.Logf("bad state first at U+%04X", lastChar)
+ logger.Exitf("bad state first at U+%04X", lastChar)
}
first = lastChar
case SLast:
if first == 0 {
- die.Logf("bad state last at U+%04X", lastChar)
+ logger.Exitf("bad state last at U+%04X", lastChar)
}
for i := first + 1; i <= lastChar; i++ {
chars[i] = chars[first]
@@ -336,7 +336,7 @@
ndecl := 0
for _, name := range list {
if _, ok := category[name]; !ok {
- die.Log("unknown category", name)
+ logger.Exit("unknown category", name)
}
// We generate an UpperCase name to serve as concise documentation and an _UnderScored
// name to store the data. This stops godoc dumping all the tables but keeps them
@@ -437,11 +437,11 @@
func fullCategoryTest(list []string) {
for _, name := range list {
if _, ok := category[name]; !ok {
- die.Log("unknown category", name)
+ logger.Exit("unknown category", name)
}
r, ok := unicode.Categories[name]
if !ok {
- die.Log("unknown table", name)
+ logger.Exit("unknown table", name)
}
if name == "letter" {
verifyRange(name, letterOp, r)
@@ -475,21 +475,21 @@
}
field := strings.Split(line, ";", -1)
if len(field) != 2 {
- die.Logf("%s: %d fields (expected 2)\n", line, len(field))
+ logger.Exitf("%s: %d fields (expected 2)\n", line, len(field))
}
- matches := scriptRe.MatchStrings(line)
+ matches := scriptRe.FindStringSubmatch(line)
if len(matches) != 4 {
- die.Logf("%s: %d matches (expected 3)\n", line, len(matches))
+ logger.Exitf("%s: %d matches (expected 3)\n", line, len(matches))
}
lo, err := strconv.Btoui64(matches[1], 16)
if err != nil {
- die.Log("%.5s...:", err)
+ logger.Exitf("%.5s...: %s", line, err)
}
hi := lo
if len(matches[2]) > 2 { // ignore leading ..
hi, err = strconv.Btoui64(matches[2][2:], 16)
if err != nil {
- die.Log("%.5s...:", err)
+ logger.Exitf("%.5s...: %s", line, err)
}
}
name := matches[3]
@@ -515,11 +515,11 @@
func fullScriptTest(list []string, installed map[string][]unicode.Range, scripts map[string][]Script) {
for _, name := range list {
if _, ok := scripts[name]; !ok {
- die.Log("unknown script", name)
+ logger.Exit("unknown script", name)
}
_, ok := installed[name]
if !ok {
- die.Log("unknown table", name)
+ logger.Exit("unknown table", name)
}
for _, script := range scripts[name] {
for r := script.lo; r <= script.hi; r++ {
@@ -551,10 +551,10 @@
var err os.Error
resp, _, err := http.Get(*url + file)
if err != nil {
- die.Log(err)
+ logger.Exit(err)
}
if resp.StatusCode != 200 {
- die.Log("bad GET status for ", file, ":", resp.Status)
+ logger.Exit("bad GET status for ", file, ":", resp.Status)
}
input := bufio.NewReader(resp.Body)
for {
@@ -563,7 +563,7 @@
if err == os.EOF {
break
}
- die.Log(err)
+ logger.Exit(err)
}
parseScript(line[0:len(line)-1], table)
}
@@ -808,7 +808,7 @@
fmt.Printf("\tCaseRange{0x%04X, 0x%04X, d{UpperLower, UpperLower, UpperLower}},\n",
lo.point, hi.point)
case hi.point > lo.point && lo.isLowerUpper():
- die.Log("LowerUpper sequence: should not happen: U+%04X. If it's real, need to fix To()", lo.point)
+ logger.Exitf("LowerUpper sequence: should not happen: U+%04X. If it's real, need to fix To()", lo.point)
fmt.Printf("\tCaseRange{0x%04X, 0x%04X, d{LowerUpper, LowerUpper, LowerUpper}},\n",
lo.point, hi.point)
default:
