aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Thompson <ken@golang.org>2010-09-15 14:32:09 -0700
committerKen Thompson <ken@golang.org>2010-09-15 14:32:09 -0700
commitabb73a4a867431913e137718288a496cfb959ef3 (patch)
tree1200a9e106496386a917e68453a5746f7b9960b2
parent34706ac974105e12c5127da4e226d85eaa5a1715 (diff)
downloadgo-abb73a4a867431913e137718288a496cfb959ef3.tar.gz
go-abb73a4a867431913e137718288a496cfb959ef3.zip
fix line number printing
with //line directives. R=rsc CC=golang-dev https://golang.org/cl/2224041
-rw-r--r--src/cmd/gc/subr.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/cmd/gc/subr.c b/src/cmd/gc/subr.c
index d938c2d659..97026839f0 100644
--- a/src/cmd/gc/subr.c
+++ b/src/cmd/gc/subr.c
@@ -228,14 +228,15 @@ linehist(char *file, int32 off, int relative)
if(debug['i']) {
if(file != nil) {
if(off < 0)
- print("pragma %s at line %L\n", file, lexlineno);
+ print("pragma %s", file);
else
if(off > 0)
- print("line %s at line %L\n", file, lexlineno);
+ print("line %s", file);
else
- print("import %s at line %L\n", file, lexlineno);
+ print("import %s", file);
} else
- print("end of import at line %L\n", lexlineno);
+ print("end of import");
+ print(" at line %L\n", lexlineno);
}
if(off < 0 && file[0] != '/' && !relative) {
@@ -936,8 +937,8 @@ Lconv(Fmt *fp)
}
if(a[i].line)
fmtprint(fp, "%s:%ld[%s:%ld]",
- a[i].line->name, lno-a[i].ldel,
- a[i].incl->name, lno-a[i].idel);
+ a[i].line->name, lno-a[i].ldel+1,
+ a[i].incl->name, lno-a[i].idel+1);
else
fmtprint(fp, "%s:%ld",
a[i].incl->name, lno-a[i].idel+1);