reiver
/
go-utf8
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utf.RuneReader & utf8.RuneScanner

master
Charles Iliya Krempeaux 2022-07-18 21:04:30 -07:00
parent 1c5ab89cc7
commit 35ae548cd2
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -37,7 +37,7 @@ var reader io.Reader
// ... // ...
runeReader := utf8.NewRuneReader(reader) runeReader := utf8.RuneReaderWrap(reader)
// ... // ...
@ -49,7 +49,7 @@ var reader io.Reader
// ... // ...
runeScanner := utf8.NewRuneScanner(reader) runeScanner := utf8.RuneScannerWrap(reader)
// ... // ...

4
doc.go
View File

@ -30,7 +30,7 @@ Example
// ... // ...
runeReader := utf8.NewRuneReader(reader) runeReader := utf8.RuneReaderWrap(reader)
// .. // ..
@ -43,7 +43,7 @@ Example
// ... // ...
runeScanner := utf8.NewRuneScanner(reader) runeScanner := utf8.RuneScannerWrap(reader)
// ... // ...

4
runereader.go
View File

@ -9,8 +9,8 @@ type RuneReader struct {
reader io.Reader reader io.Reader
} }
func NewRuneReader(reader io.Reader) *RuneReader { func RuneReaderWrap(reader io.Reader) RuneReader {
return &RuneReader{ return RuneReader{
reader: reader, reader: reader,
} }
} }

4
runereader_test.go
View File

@ -295,7 +295,7 @@ func TestRuneReader(t *testing.T) {
for testNumber, test := range tests { for testNumber, test := range tests {
runeReader := NewRuneReader(test.Reader) runeReader := RuneReaderWrap(test.Reader)
actualRune, actualInt, err := runeReader.ReadRune() actualRune, actualInt, err := runeReader.ReadRune()
if nil != err { if nil != err {
@ -563,7 +563,7 @@ func TestRuneReaders(t *testing.T) {
var runeNumber int var runeNumber int
for { for {
runeReader := NewRuneReader(test.Reader) runeReader := RuneReaderWrap(test.Reader)
actualRune, actualInt, err := runeReader.ReadRune() actualRune, actualInt, err := runeReader.ReadRune()
if nil != err && io.EOF != err { if nil != err && io.EOF != err {

4
runescanner.go
View File

@ -15,8 +15,8 @@ type RuneScanner struct {
peeked bool peeked bool
} }
func NewRuneScanner(reader io.Reader) *RuneScanner { func RuneScannerWrap(reader io.Reader) RuneScanner {
return &RuneScanner{ return RuneScanner{
reader: reader, reader: reader,
} }
} }

6
runescanner_test.go
View File

@ -295,7 +295,7 @@ func TestRuneScanner(t *testing.T) {
for testNumber, test := range tests { for testNumber, test := range tests {
runeReader := NewRuneScanner(test.Reader) runeReader := RuneScannerWrap(test.Reader)
actualRune, actualInt, err := runeReader.ReadRune() actualRune, actualInt, err := runeReader.ReadRune()
if nil != err { if nil != err {
@ -563,7 +563,7 @@ func TestRuneScanners(t *testing.T) {
var runeNumber int var runeNumber int
for { for {
runeReader := NewRuneScanner(test.Reader) runeReader := RuneScannerWrap(test.Reader)
actualRune, actualInt, err := runeReader.ReadRune() actualRune, actualInt, err := runeReader.ReadRune()
if nil != err && io.EOF != err { if nil != err && io.EOF != err {
@ -616,7 +616,7 @@ func TestRuneScannerUnread(t *testing.T) {
TestLoop: for testNumber, test := range tests { TestLoop: for testNumber, test := range tests {
runeScanner := NewRuneScanner(test.Reader) runeScanner := RuneScannerWrap(test.Reader)
var readCount int var readCount int
for instructionNumber, instruction := range test.Instructions { for instructionNumber, instruction := range test.Instructions {