Initialize scanner in Lexer constructor

Author: tonyghita

internal/common/lexer.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"fmt"
+	"strings"
 	"text/scanner"
 
 	"github.com/graph-gophers/graphql-go/errors"
@@ -20,7 +21,12 @@ type Ident struct {
 	Loc  errors.Location
 }
 
-func NewLexer(sc *scanner.Scanner) *Lexer {
+func NewLexer(s string) *Lexer {
+	sc := &scanner.Scanner{
+		Mode: scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats | scanner.ScanStrings,
+	}
+	sc.Init(strings.NewReader(s))
+
 	return &Lexer{sc: sc}
 }
 

internal/common/lexer_test.go

@@ -1,9 +1,7 @@
 package common_test
 
 import (
-	"strings"
 	"testing"
-	"text/scanner"
 
 	"github.com/graph-gophers/graphql-go/internal/common"
 )
@@ -27,21 +25,14 @@ world: String!
 }}
 
 func TestConsume(t *testing.T) {
-	setup := func(t *testing.T, def string) *common.Lexer {
-		t.Helper()
-
-		sc := &scanner.Scanner{
-			Mode: scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats | scanner.ScanStrings,
-		}
-		sc.Init(strings.NewReader(def))
-		return common.NewLexer(sc)
-	}
-
 	for _, test := range consumeTests {
 		t.Run(test.description, func(t *testing.T) {
-			lex := setup(t, test.definition)
+			lex := common.NewLexer(test.definition)
 
-			lex.Consume()
+			err := lex.CatchSyntaxError(lex.Consume)
+			if err != nil {
+				t.Fatal(err)
+			}
 
 			if test.expected != lex.DescComment() {
 				t.Errorf("wanted: %q\ngot: %q", test.expected, lex.DescComment())

internal/query/query.go

@@ -2,7 +2,6 @@ package query
 
 import (
 	"fmt"
-	"strings"
 	"text/scanner"
 
 	"github.com/graph-gophers/graphql-go/errors"
@@ -95,16 +94,10 @@ func (InlineFragment) isSelection() {}
 func (FragmentSpread) isSelection() {}
 
 func Parse(queryString string) (*Document, *errors.QueryError) {
-	sc := &scanner.Scanner{
-		Mode: scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats | scanner.ScanStrings,
-	}
-	sc.Init(strings.NewReader(queryString))
+	l := common.NewLexer(queryString)
 
-	l := common.NewLexer(sc)
 	var doc *Document
-	err := l.CatchSyntaxError(func() {
-		doc = parseDocument(l)
-	})
+	err := l.CatchSyntaxError(func() { doc = parseDocument(l) })
 	if err != nil {
 		return nil, err
 	}

internal/schema/schema.go

@@ -2,7 +2,6 @@ package schema
 
 import (
 	"fmt"
-	"strings"
 	"text/scanner"
 
 	"github.com/graph-gophers/graphql-go/errors"
@@ -248,15 +247,9 @@ func New() *Schema {
 
 // Parse the schema string.
 func (s *Schema) Parse(schemaString string) error {
-	sc := &scanner.Scanner{
-		Mode: scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats | scanner.ScanStrings,
-	}
-	sc.Init(strings.NewReader(schemaString))
+	l := common.NewLexer(schemaString)
 
-	l := common.NewLexer(sc)
-	err := l.CatchSyntaxError(func() {
-		parseSchema(s, l)
-	})
+	err := l.CatchSyntaxError(func() { parseSchema(s, l) })
 	if err != nil {
 		return err
 	}

internal/schema/schema_internal_test.go

@@ -1,9 +1,7 @@
 package schema
 
 import (
-	"strings"
 	"testing"
-	"text/scanner"
 
 	"github.com/graph-gophers/graphql-go/errors"
 	"github.com/graph-gophers/graphql-go/internal/common"
@@ -160,12 +158,7 @@ func compareObjects(t *testing.T, expected, actual *Object) {
 func setup(t *testing.T, def string) *common.Lexer {
 	t.Helper()
 
-	sc := &scanner.Scanner{
-		Mode: scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats | scanner.ScanStrings,
-	}
-	sc.Init(strings.NewReader(def))
-
-	lex := common.NewLexer(sc)
+	lex := common.NewLexer(def)
 	lex.Consume()
 
 	return lex