Skip to content

Commit

Permalink
text/scanner: use correct token position in example
Browse files Browse the repository at this point in the history
While at it, unindent source text so column values are easier
to read, remove unnecessary text in output, and simplify the
loop.

Fixes #20346.

Change-Id: I0fde02b9e4242383da427f4cf4c6c13dd0ab3b47
Reviewed-on: https://go-review.googlesource.com/43450
Run-TryBot: Robert Griesemer <gri@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
  • Loading branch information
griesemer committed May 12, 2017
1 parent 380aa88 commit 8f06e21
Showing 1 changed file with 16 additions and 19 deletions.
35 changes: 16 additions & 19 deletions src/text/scanner/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,28 +12,25 @@ import (

func Example() {
const src = `
// This is scanned code.
if a > 10 {
someParsable = text
}`
// This is scanned code.
if a > 10 {
someParsable = text
}`
var s scanner.Scanner
s.Filename = "example"
s.Init(strings.NewReader(src))
var tok rune
for tok != scanner.EOF {
tok = s.Scan()
fmt.Println("At position", s.Pos(), ":", s.TokenText())
s.Filename = "example"
for tok := s.Scan(); tok != scanner.EOF; tok = s.Scan() {
fmt.Printf("%s: %s\n", s.Position, s.TokenText())
}

// Output:
// At position example:3:4 : if
// At position example:3:6 : a
// At position example:3:8 : >
// At position example:3:11 : 10
// At position example:3:13 : {
// At position example:4:15 : someParsable
// At position example:4:17 : =
// At position example:4:22 : text
// At position example:5:3 : }
// At position example:5:3 :
// example:3:1: if
// example:3:4: a
// example:3:6: >
// example:3:8: 10
// example:3:11: {
// example:4:2: someParsable
// example:4:15: =
// example:4:17: text
// example:5:1: }
}

0 comments on commit 8f06e21

Please sign in to comment.