mirror of
https://github.com/golang/go
synced 2024-11-23 17:50:06 -07:00
cmd/go: add $GOLINE to generate
Also use os.Expand for variable substitution so ${x}y works. Fixes #9960. Change-Id: Ic8239b2e737d1f41910dde8ee9524ac48907cb03 Reviewed-on: https://go-review.googlesource.com/9007 Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
parent
13cb62c764
commit
9c3bf097c8
@ -276,6 +276,8 @@ Go generate sets several variables when it runs the generator:
|
|||||||
The execution operating system (linux, windows, etc.)
|
The execution operating system (linux, windows, etc.)
|
||||||
$GOFILE
|
$GOFILE
|
||||||
The base name of the file.
|
The base name of the file.
|
||||||
|
$GOLINE
|
||||||
|
The line number of the directive in the source file.
|
||||||
$GOPACKAGE
|
$GOPACKAGE
|
||||||
The name of the package of the file containing the directive.
|
The name of the package of the file containing the directive.
|
||||||
$DOLLAR
|
$DOLLAR
|
||||||
|
@ -18,7 +18,6 @@ import (
|
|||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"unicode"
|
"unicode"
|
||||||
"unicode/utf8"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var cmdGenerate = &Command{
|
var cmdGenerate = &Command{
|
||||||
@ -63,6 +62,8 @@ Go generate sets several variables when it runs the generator:
|
|||||||
The execution operating system (linux, windows, etc.)
|
The execution operating system (linux, windows, etc.)
|
||||||
$GOFILE
|
$GOFILE
|
||||||
The base name of the file.
|
The base name of the file.
|
||||||
|
$GOLINE
|
||||||
|
The line number of the directive in the source file.
|
||||||
$GOPACKAGE
|
$GOPACKAGE
|
||||||
The name of the package of the file containing the directive.
|
The name of the package of the file containing the directive.
|
||||||
$DOLLAR
|
$DOLLAR
|
||||||
@ -177,7 +178,7 @@ type Generator struct {
|
|||||||
file string // base name of file.
|
file string // base name of file.
|
||||||
pkg string
|
pkg string
|
||||||
commands map[string][]string
|
commands map[string][]string
|
||||||
lineNum int
|
lineNum int // current line number.
|
||||||
}
|
}
|
||||||
|
|
||||||
// run runs the generators in the current file.
|
// run runs the generators in the current file.
|
||||||
@ -325,7 +326,7 @@ Words:
|
|||||||
}
|
}
|
||||||
// Substitute environment variables.
|
// Substitute environment variables.
|
||||||
for i, word := range words {
|
for i, word := range words {
|
||||||
words[i] = g.expandEnv(word)
|
words[i] = os.Expand(word, g.expandVar)
|
||||||
}
|
}
|
||||||
return words
|
return words
|
||||||
}
|
}
|
||||||
@ -341,40 +342,25 @@ func (g *Generator) errorf(format string, args ...interface{}) {
|
|||||||
panic(stop)
|
panic(stop)
|
||||||
}
|
}
|
||||||
|
|
||||||
// expandEnv expands any $XXX invocations in word.
|
// expandVar expands the $XXX invocation in word. It is called
|
||||||
func (g *Generator) expandEnv(word string) string {
|
// by os.Expand.
|
||||||
if !strings.ContainsRune(word, '$') {
|
func (g *Generator) expandVar(word string) string {
|
||||||
return word
|
switch word {
|
||||||
}
|
|
||||||
var buf bytes.Buffer
|
|
||||||
var w int
|
|
||||||
var r rune
|
|
||||||
for i := 0; i < len(word); i += w {
|
|
||||||
r, w = utf8.DecodeRuneInString(word[i:])
|
|
||||||
if r != '$' {
|
|
||||||
buf.WriteRune(r)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
w += g.identLength(word[i+w:])
|
|
||||||
envVar := word[i+1 : i+w]
|
|
||||||
var sub string
|
|
||||||
switch envVar {
|
|
||||||
case "GOARCH":
|
case "GOARCH":
|
||||||
sub = runtime.GOARCH
|
return runtime.GOARCH
|
||||||
case "GOOS":
|
case "GOOS":
|
||||||
sub = runtime.GOOS
|
return runtime.GOOS
|
||||||
case "GOFILE":
|
case "GOFILE":
|
||||||
sub = g.file
|
return g.file
|
||||||
|
case "GOLINE":
|
||||||
|
return fmt.Sprint(g.lineNum)
|
||||||
case "GOPACKAGE":
|
case "GOPACKAGE":
|
||||||
sub = g.pkg
|
return g.pkg
|
||||||
case "DOLLAR":
|
case "DOLLAR":
|
||||||
sub = "$"
|
return "$"
|
||||||
default:
|
default:
|
||||||
sub = os.Getenv(envVar)
|
return os.Getenv(word)
|
||||||
}
|
}
|
||||||
buf.WriteString(sub)
|
|
||||||
}
|
|
||||||
return buf.String()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// identLength returns the length of the identifier beginning the string.
|
// identLength returns the length of the identifier beginning the string.
|
||||||
|
@ -1089,20 +1089,20 @@ TEST 'go generate variable substitution'
|
|||||||
if ! ./testgo generate ./testdata/generate/test3.go > testdata/std.out; then
|
if ! ./testgo generate ./testdata/generate/test3.go > testdata/std.out; then
|
||||||
echo "go generate ./testdata/generate/test3.go failed to run"
|
echo "go generate ./testdata/generate/test3.go failed to run"
|
||||||
ok=false
|
ok=false
|
||||||
elif ! grep "$GOARCH test3.go p xyzp/test3.go/123" testdata/std.out > /dev/null; then
|
elif ! grep "$GOARCH test3.go:7 pabc xyzp/test3.go/123" testdata/std.out > /dev/null; then
|
||||||
echo "go generate ./testdata/generate/test3.go generated wrong output"
|
echo "go generate ./testdata/generate/test3.go generated wrong output"
|
||||||
ok=false
|
ok=false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
TEST 'go generate run flag'
|
TEST 'go generate run flag'
|
||||||
if ! ./testgo generate -run y.s ./testdata/generate/test4.go > testdata/std.out; then
|
if ! ./testgo generate -run y.s ./testdata/generate/test4.go > testdata/std.out; then
|
||||||
echo "go test -run y.s ./testdata/generate/test4.go failed to run"
|
echo "go test -run yes ./testdata/generate/test4.go failed to run"
|
||||||
ok=false
|
ok=false
|
||||||
elif ! grep "yes" testdata/std.out > /dev/null; then
|
elif ! grep "yes" testdata/std.out > /dev/null; then
|
||||||
echo "go generate -run y.s ./testdata/generate/test4.go did not select yes"
|
echo "go generate -run yes ./testdata/generate/test4.go did not select yes"
|
||||||
ok=false
|
ok=false
|
||||||
elif grep "no" testdata/std.out > /dev/null; then
|
elif grep "no" testdata/std.out > /dev/null; then
|
||||||
echo "go generate -run y.s ./testdata/generate/test4.go selected no"
|
echo "go generate -run yes ./testdata/generate/test4.go selected no"
|
||||||
ok=false
|
ok=false
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
2
src/cmd/go/testdata/generate/test3.go
vendored
2
src/cmd/go/testdata/generate/test3.go
vendored
@ -4,6 +4,6 @@
|
|||||||
|
|
||||||
// Test go generate variable substitution.
|
// Test go generate variable substitution.
|
||||||
|
|
||||||
//go:generate echo $GOARCH $GOFILE $GOPACKAGE xyz$GOPACKAGE/$GOFILE/123
|
//go:generate echo $GOARCH $GOFILE:$GOLINE ${GOPACKAGE}abc xyz$GOPACKAGE/$GOFILE/123
|
||||||
|
|
||||||
package p
|
package p
|
||||||
|
Loading…
Reference in New Issue
Block a user