Make line separator customisable #31
Conversation
decode.go
Outdated
| @@ -21,7 +21,8 @@ func Unmarshal(data []byte, v interface{}) error { | |||
|
|
|||
| // A Decoder reads and decodes fixed width data from an input stream. | |||
| type Decoder struct { | |||
| data *bufio.Reader | |||
| scanner *bufio.Scanner | |||
| separator string | |||
There was a problem hiding this comment.
| separator string | |
| lineTerminator []byte |
decode.go
Outdated
| line, err := d.data.ReadString('\n') | ||
| if err != nil && err != io.EOF { | ||
| return err, false | ||
| func (d *Decoder) SetSeparator(separator string) { |
There was a problem hiding this comment.
| func (d *Decoder) SetSeparator(separator string) { | |
| func (d *Decoder) SetLineTerminator(lineTerminator []byte) { |
decode.go
Outdated
| d.separator = separator | ||
| } | ||
|
|
||
| func (d Decoder) Separator() string { |
There was a problem hiding this comment.
I don't see any reason this should be exported. Also is there any reason it is not a pointer receiver e.g. func (d *Decoder)?
decode.go
Outdated
| return "\n" | ||
| } | ||
|
|
||
| func (d *Decoder) Scan(data []byte, atEOF bool) (advance int, token []byte, err error) { |
There was a problem hiding this comment.
Why implement the custom scan function? I think data.ReadString(d.lineTerminator) would work fine.
There was a problem hiding this comment.
@ianlopshire ReadString only takes a single byte as argument: https://golang.org/pkg/bufio/#Reader.ReadString
So in the case of "\r\n" this wouldn't work
LeonB
force-pushed
the
line-separator
branch
2 times, most recently
from
9b59077 to
0998b83
Compare
LeonB
force-pushed
the
line-separator
branch
from
0998b83 to
7c5918c
Compare
|
@ianlopshire I've added your suggestions. The suggestion about using So in the case of I'm happy to edit the implementation but this was the best I could come up with besides a custom implementation of a |
|
@LeonB, thanks for making the changes! merged! |
No description provided.