mirror of
https://github.com/golang/go
synced 2024-11-23 05:50:05 -07:00
cmd/cgo: fix line number annotations in generated C code
The old version was using go/ast's CommentGroup.Text method, but that method drops leading blank lines from the result, so that if the comment looked like one of // // syntax error import "C" /* syntax error */ import "C" then the line numbers for the syntax error would be off by the number of leading blank lines (1 in each of the above cases). The new text extractor preserves blank lines. Fixes #4019. R=golang-dev, iant CC=golang-dev https://golang.org/cl/7232071
This commit is contained in:
parent
ed9fc7531d
commit
f20e3a1065
@ -78,7 +78,7 @@ func (f *File) ReadGo(name string) {
|
||||
}
|
||||
if cg != nil {
|
||||
f.Preamble += fmt.Sprintf("#line %d %q\n", sourceLine(cg), name)
|
||||
f.Preamble += cg.Text() + "\n"
|
||||
f.Preamble += commentText(cg) + "\n"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -131,6 +131,30 @@ func (f *File) ReadGo(name string) {
|
||||
f.AST = ast2
|
||||
}
|
||||
|
||||
// Like ast.CommentGroup's Text method but preserves
|
||||
// leading blank lines, so that line numbers line up.
|
||||
func commentText(g *ast.CommentGroup) string {
|
||||
if g == nil {
|
||||
return ""
|
||||
}
|
||||
var pieces []string
|
||||
for _, com := range g.List {
|
||||
c := string(com.Text)
|
||||
// Remove comment markers.
|
||||
// The parser has given us exactly the comment text.
|
||||
switch c[1] {
|
||||
case '/':
|
||||
//-style comment (no newline at the end)
|
||||
c = c[2:] + "\n"
|
||||
case '*':
|
||||
/*-style comment */
|
||||
c = c[2 : len(c)-2]
|
||||
}
|
||||
pieces = append(pieces, c)
|
||||
}
|
||||
return strings.Join(pieces, "")
|
||||
}
|
||||
|
||||
// Save references to C.xxx for later processing.
|
||||
func (f *File) saveRef(x interface{}, context string) {
|
||||
n, ok := x.(*ast.Expr)
|
||||
|
Loading…
Reference in New Issue
Block a user