gofmt: simplify flags

-tabs replaces -tabindent
-spaces has been removed

R=golang-dev, adg, rsc
CC=golang-dev
https://golang.org/cl/5487066

diff --git a/src/cmd/gofmt/doc.go b/src/cmd/gofmt/doc.go
index 3a20c21e0ef656114a704787e4fe9bf57ec53db7..65842a3b15bb81d7f5883dd5b0e98d991efe16a8 100644 (file)
--- a/src/cmd/gofmt/doc.go
+++ b/src/cmd/gofmt/doc.go
@@ -36,10 +36,8 @@ The flags are:
 Formatting control flags:
        -comments=true
                Print comments; if false, all comments are elided from the output.
-       -spaces
-               Align with spaces instead of tabs.
-       -tabindent
-               Indent with tabs independent of -spaces.
+       -tabs=true
+               Indent with tabs; if false, spaces are used instead.
        -tabwidth=8
                Tab width in spaces.
 

diff --git a/src/cmd/gofmt/gofmt.go b/src/cmd/gofmt/gofmt.go
index b9042271ab9310e424b541b9f5f49a2f8a73c23f..0023e2f218a75a507f4f9268cffa3f072b92ab22 100644 (file)
--- a/src/cmd/gofmt/gofmt.go
+++ b/src/cmd/gofmt/gofmt.go
@@ -34,8 +34,7 @@ var (
        // layout control
        comments  = flag.Bool("comments", true, "print comments")
        tabWidth  = flag.Int("tabwidth", 8, "tab width")
-       tabIndent = flag.Bool("tabindent", true, "indent with tabs independent of -spaces")
-       useSpaces = flag.Bool("spaces", true, "align with spaces instead of tabs")
+       tabIndent = flag.Bool("tabs", true, "indent with tabs")
 
        // debugging
        cpuprofile = flag.String("cpuprofile", "", "write cpu profile to this file")
@@ -71,13 +70,10 @@ func initParserMode() {
 }
 
 func initPrinterMode() {
-       printerMode = uint(0)
+       printerMode = printer.UseSpaces
        if *tabIndent {
                printerMode |= printer.TabIndent
        }
-       if *useSpaces {
-               printerMode |= printer.UseSpaces
-       }
 }
 
 func isGoFile(f os.FileInfo) bool {