瀏覽代碼

Do not export the scanner type

It is an internal specific to parse list responses.
Julien Laffaye 8 年之前
父節點
當前提交
602886c6b8
共有 3 個文件被更改,包括 11 次插入11 次删除
  1. 1 1
      parse.go
  2. 8 8
      scanner.go
  3. 2 2
      scanner_test.go

+ 1 - 1
parse.go

@@ -72,7 +72,7 @@ func parseLsListLine(line string) (*Entry, error) {
 		return nil, errUnsupportedListLine
 	}
 
-	scanner := NewScanner(line)
+	scanner := newScanner(line)
 	fields := scanner.NextFields(6)
 
 	if len(fields) < 6 {

+ 8 - 8
scanner.go

@@ -1,20 +1,20 @@
 package ftp
 
-// A Scanner for fields delimited by one or more whitespace characters
-type Scanner struct {
+// A scanner for fields delimited by one or more whitespace characters
+type scanner struct {
 	bytes    []byte
 	position int
 }
 
-// NewScanner creates a new Scanner
-func NewScanner(str string) *Scanner {
-	return &Scanner{
+// newScanner creates a new scanner
+func newScanner(str string) *scanner {
+	return &scanner{
 		bytes: []byte(str),
 	}
 }
 
 // NextFields returns the next `count` fields
-func (s *Scanner) NextFields(count int) []string {
+func (s *scanner) NextFields(count int) []string {
 	fields := make([]string, 0, count)
 	for i := 0; i < count; i++ {
 		if field := s.Next(); field != "" {
@@ -27,7 +27,7 @@ func (s *Scanner) NextFields(count int) []string {
 }
 
 // Next returns the next field
-func (s *Scanner) Next() string {
+func (s *scanner) Next() string {
 	sLen := len(s.bytes)
 
 	// skip trailing whitespace
@@ -53,6 +53,6 @@ func (s *Scanner) Next() string {
 }
 
 // Remaining returns the remaining string
-func (s *Scanner) Remaining() string {
+func (s *scanner) Remaining() string {
 	return string(s.bytes[s.position:len(s.bytes)])
 }

+ 2 - 2
scanner_test.go

@@ -6,7 +6,7 @@ import "github.com/stretchr/testify/assert"
 func TestScanner(t *testing.T) {
 	assert := assert.New(t)
 
-	s := NewScanner("foo  bar x  y")
+	s := newScanner("foo  bar x  y")
 	assert.Equal("foo", s.Next())
 	assert.Equal(" bar x  y", s.Remaining())
 	assert.Equal("bar", s.Next())
@@ -21,7 +21,7 @@ func TestScanner(t *testing.T) {
 func TestScannerEmpty(t *testing.T) {
 	assert := assert.New(t)
 
-	s := NewScanner("")
+	s := newScanner("")
 	assert.Equal("", s.Next())
 	assert.Equal("", s.Next())
 	assert.Equal("", s.Remaining())