From 72bedb53b4a114ee2a7037d3a71e4934132f8dd7 Mon Sep 17 00:00:00 2001
From: Noah Hellman <noah@hllmn.net>
Date: Sun, 11 Dec 2022 09:37:57 +0100
Subject: [PATCH] fixup! lexer peekable

---
 src/lex.rs | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/lex.rs b/src/lex.rs
index 6061937..2fa5d86 100644
--- a/src/lex.rs
+++ b/src/lex.rs
@@ -101,11 +101,26 @@ impl<'s> Lexer<'s> {
 
     pub fn peek(&mut self) -> Option<&Token> {
         if self.next.is_none() {
-            self.next = self.token();
+            self.next = self.next_token();
         }
         self.next.as_ref()
     }
 
+    fn next_token(&mut self) -> Option<Token> {
+        let mut current = self.token();
+
+        // concatenate text tokens
+        if let Some(Token { kind: Text, len }) = &mut current {
+            self.next = self.token();
+            while let Some(Token { kind: Text, len: l }) = self.next {
+                *len += l;
+                self.next = self.token();
+            }
+        }
+
+        current
+    }
+
     fn peek_char(&mut self) -> char {
         self.chars.clone().next().unwrap_or(EOF)
     }
@@ -246,20 +261,7 @@ impl<'s> Iterator for Lexer<'s> {
     type Item = Token;
 
     fn next(&mut self) -> Option<Self::Item> {
-        self.next.take().or_else(|| {
-            let mut current = self.token();
-
-            // concatenate text tokens
-            if let Some(Token { kind: Text, len }) = &mut current {
-                self.next = self.token();
-                while let Some(Token { kind: Text, len: l }) = self.next {
-                    *len += l;
-                    self.next = self.token();
-                }
-            }
-
-            current
-        })
+        self.next.take().or_else(|| self.next_token())
     }
 }