More scanner tests and tight idents fix

1 files changed, 5 insertions, 1 deletions

diff --git a/pkg/lang/scanner/scanner.go b/pkg/lang/scanner/scanner.go
index fdb313b..08481d8 100644
--- a/pkg/lang/scanner/scanner.go
+++ b/pkg/lang/scanner/scanner.go
@@ -190,7 +190,7 @@ func (s *Scanner) scanIdentifierOrKeyword() (token.Token, error) {
 	var buf strings.Builder
 
 	for {
-		c, eof, err := s.next()
+		c, eof, err := s.peek()
 		if err != nil {
 			return token.Token{}, err
 		}
@@ -199,6 +199,10 @@ func (s *Scanner) scanIdentifierOrKeyword() (token.Token, error) {
 			break
 		}
 
+		if _, _, err = s.next(); err != nil {
+			return token.Token{}, err
+		}
+
 		buf.WriteRune(c)
 	}