diff options
| author | Marvin Stenger <marvin.stenger94@gmail.com> | 2015-09-21 00:45:21 +0200 |
|---|---|---|
| committer | Andrew Gerrand <adg@golang.org> | 2015-09-21 01:55:52 +0000 |
| commit | fcf8143d638dbc34fdd418f45f8e8b45de802916 (patch) | |
| tree | 2e56a1b364f303e2874aa6f55e41083b89226715 /src/encoding/json/stream.go | |
| parent | 6d0178359f59f6481ed3c3a41d2ddde93bb3556e (diff) | |
| download | go-fcf8143d638dbc34fdd418f45f8e8b45de802916.tar.xz | |
encoding/json: scanner: use byte, more consistent
The fields step and redoState of struct scanner are now defined as
`func(s *scanner, c byte) int` instead of
`func(s *scanner, c int) int`, since bytes are sufficient.
Further changes improve the consistency in the scanner.go file.
Change-Id: Ifb85f2130d728d2b936d79914d87a1f0b5c6ee7d
Reviewed-on: https://go-review.googlesource.com/14801
Reviewed-by: Andrew Gerrand <adg@golang.org>
Run-TryBot: Andrew Gerrand <adg@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'src/encoding/json/stream.go')
| -rw-r--r-- | src/encoding/json/stream.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/encoding/json/stream.go b/src/encoding/json/stream.go index dc53bceff8..8ddcf4d279 100644 --- a/src/encoding/json/stream.go +++ b/src/encoding/json/stream.go @@ -90,7 +90,7 @@ Input: // Look in the buffer for a new value. for i, c := range dec.buf[scanp:] { dec.scan.bytes++ - v := dec.scan.step(&dec.scan, int(c)) + v := dec.scan.step(&dec.scan, c) if v == scanEnd { scanp += i break Input @@ -157,7 +157,7 @@ func (dec *Decoder) refill() error { func nonSpace(b []byte) bool { for _, c := range b { - if !isSpace(rune(c)) { + if !isSpace(c) { return true } } @@ -433,7 +433,7 @@ func (dec *Decoder) tokenError(c byte) (Token, error) { case tokenObjectComma: context = " after object key:value pair" } - return nil, &SyntaxError{"invalid character " + quoteChar(int(c)) + " " + context, 0} + return nil, &SyntaxError{"invalid character " + quoteChar(c) + " " + context, 0} } // More reports whether there is another element in the @@ -448,7 +448,7 @@ func (dec *Decoder) peek() (byte, error) { for { for i := dec.scanp; i < len(dec.buf); i++ { c := dec.buf[i] - if isSpace(rune(c)) { + if isSpace(c) { continue } dec.scanp = i |