From d734cf81ad07668ba353eb6afc57b4e52d525f9a Mon Sep 17 00:00:00 2001 From: Steve Coffman Date: Fri, 8 Sep 2023 09:30:07 -0400 Subject: [PATCH] Adjust lexer to return gqlerror where it does not break tests (#279) Signed-off-by: Steve Coffman --- lexer/lexer.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lexer/lexer.go b/lexer/lexer.go index cc85f22c..3fd6b4c0 100644 --- a/lexer/lexer.go +++ b/lexer/lexer.go @@ -55,7 +55,7 @@ func (s *Lexer) makeValueToken(kind Type, value string) (Token, error) { }, nil } -func (s *Lexer) makeError(format string, args ...interface{}) (Token, error) { +func (s *Lexer) makeError(format string, args ...interface{}) (Token, *gqlerror.Error) { column := s.endRunes - s.lineStartRunes + 1 return Token{ Kind: Invalid, @@ -74,8 +74,7 @@ func (s *Lexer) makeError(format string, args ...interface{}) (Token, error) { // This skips over whitespace and comments until it finds the next lexable // token, then lexes punctuators immediately or calls the appropriate helper // function for more complicated tokens. -func (s *Lexer) ReadToken() (token Token, err error) { - +func (s *Lexer) ReadToken() (Token, error) { s.ws() s.start = s.end s.startRunes = s.endRunes