From: Benny Siegert <bsiegert@gmail.com>
Date: Mon, 9 Apr 2012 19:04:59 +0000 (-0400)
Subject: cmd/yacc: spring cleaning for units.y
X-Git-Tag: go1.1rc2~3419
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f6d582db6123e3b199fa34334505f952e554312d;p=gostls13.git

cmd/yacc: spring cleaning for units.y

* sort imports
* use runtime.GOROOT
* fix some typos

R=golang-dev, dave, rsc
CC=golang-dev
https://golang.org/cl/5987054
---

diff --git a/src/cmd/yacc/units.y b/src/cmd/yacc/units.y
index 7258e3e597..eaa3fb18a4 100644
--- a/src/cmd/yacc/units.y
+++ b/src/cmd/yacc/units.y
@@ -26,11 +26,13 @@
 package main
 
 import (
+	"bufio"
 	"flag"
 	"fmt"
-	"bufio"
-	"os"
 	"math"
+	"runtime"
+	"os"
+	"path/filepath"
 	"strconv"
 	"unicode/utf8"
 )
@@ -287,13 +289,11 @@ func main() {
 
 	flag.Parse()
 
-	if dir := os.Getenv("GOROOT"); dir != "" {
-		file = dir + "/src/cmd/yacc/units.txt"
-	}
+	file = filepath.Join(runtime.GOROOT(), "src/cmd/yacc/units.txt")
 	if flag.NArg() > 0 {
 		file = flag.Arg(0)
 	} else if file == "" {
-		fmt.Fprintf(os.Stderr, "can not find data file units.txt; provide it as argument or set $GOROOT\n")
+		fmt.Fprintf(os.Stderr, "cannot find data file units.txt; provide it as argument or set $GOROOT\n")
 		os.Exit(1)
 	}
 
@@ -308,7 +308,7 @@ func main() {
 
 	/*
 	 * read the 'units' file to
-	 * develope a database
+	 * develop a database
 	 */
 	lineno = 0
 	for {