close_issue_1
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

go.tool/cmd/cover: use a struct instead of multiple variables 

We are going to need one more piece of data, so rather than create
a third variable let's just put it all in one struct. The interface gets
easier too.

R=adonovan
CC=golang-dev
https://golang.org/cl/10271044
This commit is contained in:
Rob Pike 2013-06-13 12:50:30 -07:00
parent 341a07a3aa
commit e330494adc
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/cover/cover.go
View File

@ -29,9 +29,8 @@ import (
) )
var ( var (
mode = flag.String("mode", "set", "coverage mode: set, count, atomic") mode = flag.String("mode", "set", "coverage mode: set, count, atomic")
countVar = flag.String("count", "GoCoverCount", "name of coverage count array variable") varVar = flag.String("var", "GoCover", "name of generated coverage variable")
posVar = flag.String("pos", "GoCoverPos", "name of coverage position array variable")
output = flag.String("o", "", "file for output; standard output by default") output = flag.String("o", "", "file for output; standard output by default")
) )
@ -278,7 +277,10 @@ func atomicCounterStmt(f *File, counter ast.Expr) ast.Stmt {
// newCounter creates a new counter expression of the appropriate form. // newCounter creates a new counter expression of the appropriate form.
func (f *File) newCounter(start, end token.Pos) ast.Stmt { func (f *File) newCounter(start, end token.Pos) ast.Stmt {
counter := &ast.IndexExpr{ counter := &ast.IndexExpr{
X: ast.NewIdent(*countVar), X: &ast.SelectorExpr{
X: ast.NewIdent(*varVar),
Sel: ast.NewIdent("Count"),
},
Index: f.index(), Index: f.index(),
} }
stmt := counterStmt(f, counter) stmt := counterStmt(f, counter)
@ -446,23 +448,28 @@ func (f *File) addVariables(w io.Writer) {
} }
} }
// Declare the coverage array as a package-level variable. // Declare the coverage struct as a package-level variable.
// Everything else will be local to init. fmt.Fprintf(w, "\nvar %s = struct {\n", *varVar)
fmt.Fprintf(w, "\nvar %s [%d]uint32\n\n", *countVar, len(f.blocks)) fmt.Fprintf(w, "\tCount [%d]uint32\n", len(f.blocks))
fmt.Fprintf(w, "\tPos [3*%d]uint32\n", len(f.blocks))
fmt.Fprintf(w, "} {\n")
// Declare the position array as a package-level variable. // Initialize the position array field.
fmt.Fprintf(w, "var %s = [3*%d]uint32{\n", *posVar, len(f.blocks)) fmt.Fprintf(w, "\tPos: [3*%d]uint32{\n", len(f.blocks))
// Here's a nice long list of positions. Each position is encoded as follows to reduce size: // A nice long list of positions. Each position is encoded as follows to reduce size:
// - 32-bit starting line number // - 32-bit starting line number
// - 32-bit ending line number // - 32-bit ending line number
// - (16 bit ending column number << 16) | (16-bit starting column number). // - (16 bit ending column number << 16) | (16-bit starting column number).
for _, block := range f.blocks { for _, block := range f.blocks {
start := f.fset.Position(block.startByte) start := f.fset.Position(block.startByte)
end := f.fset.Position(block.endByte) end := f.fset.Position(block.endByte)
fmt.Fprintf(w, "\t%d, %d, %#x,\n", start.Line, end.Line, (end.Column&0xFFFF)<<16|(start.Column&0xFFFF)) fmt.Fprintf(w, "\t\t%d, %d, %#x,\n", start.Line, end.Line, (end.Column&0xFFFF)<<16|(start.Column&0xFFFF))
} }
// Close the declaration. // Close the position array.
fmt.Fprintf(w, "\t},\n")
// Close the struct initialization.
fmt.Fprintf(w, "}\n") fmt.Fprintf(w, "}\n")
} }