diff options
| author | Robert Griesemer <gri@golang.org> | 2016-11-30 23:28:40 -0800 |
|---|---|---|
| committer | Robert Griesemer <gri@golang.org> | 2016-12-09 00:43:04 +0000 |
| commit | 32bf2829a17a90bdbd472335707639ba35776da6 (patch) | |
| tree | d40b974e80f953388fee9320a53fcde833e6e2fb /src/cmd/compile/internal/syntax/parser.go | |
| parent | 8d20b25779d4ce32e8eaeb52374fba1e74f7df57 (diff) | |
| download | go-32bf2829a17a90bdbd472335707639ba35776da6.tar.xz | |
[dev.inline] cmd/compile/internal/syntax: process //line pragmas in scanner
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>
Diffstat (limited to 'src/cmd/compile/internal/syntax/parser.go')
| -rw-r--r-- | src/cmd/compile/internal/syntax/parser.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/syntax/parser.go b/src/cmd/compile/internal/syntax/parser.go index dddf32f6c2..22799d429b 100644 --- a/src/cmd/compile/internal/syntax/parser.go +++ b/src/cmd/compile/internal/syntax/parser.go @@ -26,8 +26,8 @@ type parser struct { indent []byte // tracing support } -func (p *parser) init(src io.Reader, errh ErrorHandler, pragh PragmaHandler) { - p.scanner.init(src, errh, pragh) +func (p *parser) init(filename string, src io.Reader, errh ErrorHandler, pragh PragmaHandler) { + p.scanner.init(filename, src, errh, pragh) p.fnest = 0 p.xnest = 0 |