Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[dev.inline] cmd/compile/internal/syntax: process //line pragmas in scanner

Browse source 
Reviewed in and cherry-picked from https://go-review.googlesource.com/#/c/33764/.

Minor adjustment in noder.go to make merge compile again.

Change-Id: Ib5029b52b59944f207b0f2438c8a5aa576eb25b8
Reviewed-on: https://go-review.googlesource.com/34233
Run-TryBot: Robert Griesemer <gri@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Robert Griesemer 2016-11-30 23:28:40 -08:00
parent 8d20b25779
commit 32bf2829a1
8 changed files with 89 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/cmd/compile/internal/syntax/pos.go
View file

@ -103,13 +103,15 @@ func NewLinePragmaBase(pos Pos, filename string, line uint) *PosBase {
return &PosBase{pos, filename, line - 1}
}
var noPos Pos
// Pos returns the position at which base is located.
// If b == nil, the result is the empty position.
func (b *PosBase) Pos() Pos {
func (b *PosBase) Pos() *Pos {
if b != nil {
return b.pos
return &b.pos
}
return Pos{}
return &noPos
}
// Filename returns the filename recorded with the base.
@ -136,13 +138,13 @@ func (b *PosBase) Line() uint {
// A lico is a compact encoding of a LIne and COlumn number.
type lico uint32
// Layout constants: 23 bits for line, 9 bits for column.
// Layout constants: 24 bits for line, 8 bits for column.
// (If this is too tight, we can either make lico 64b wide,
// or we can introduce a tiered encoding where we remove column
// information as line numbers grow bigger; similar to what gcc
// does.)
const (
lineW, lineM = 23, 1<<lineW - 1
lineW, lineM = 24, 1<<lineW - 1
colW, colM = 32 - lineW, 1<<colW - 1
)