From b5156094d20532b06c77bdc72484069b8e38ca07 Mon Sep 17 00:00:00 2001
From: Venus Xeon-Blonde <venusflameblonde@gmail.com>
Date: Wed, 13 Mar 2024 01:05:28 -0400
Subject: [PATCH] Add new token types and make some lexer fns pub

---
 wright/src/parser/lexer.rs       | 15 +++++++--------
 wright/src/parser/lexer/token.rs |  7 +++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/wright/src/parser/lexer.rs b/wright/src/parser/lexer.rs
index dd5ddf1c..2e13436d 100644
--- a/wright/src/parser/lexer.rs
+++ b/wright/src/parser/lexer.rs
@@ -68,9 +68,8 @@ impl<'src> Lexer<'src> {
     }
 
     /// "Fork" this lexer, creating a new [`Lexer`] at the same position as this one that can be used for
-    /// failable parsing. This can be compared to the original lexer it was forked from using [Lexer::offset_from]
-    /// on the underlying `remaining` fragments.
-    fn fork(&self) -> Self {
+    /// failable parsing. This can be compared to the original lexer it was forked from using [Lexer::offset_from].
+    pub fn fork(&self) -> Self {
         *self
     }
 
@@ -82,12 +81,12 @@ impl<'src> Lexer<'src> {
     /// - Generally the best way to avoid panics is to only call this function on
     ///     [Lexer]s created using [Lexer::fork] on the `origin` lexer.
     #[inline]
-    fn offset_from(&self, origin: &Self) -> usize {
+    pub fn offset_from(&self, origin: &Self) -> usize {
         self.remaining.offset_from(&origin.remaining)
     }
 
-    /// Remove and ignore any whitespace at the start of the remaining fragment.
-    fn ignore_whitespace(&mut self) {
+    /// Remove and ignore any whitespace at the start of the [Lexer::remaining] [Fragment].
+    pub fn ignore_whitespace(&mut self) {
         // Get a reference to the slice of the string past any whitespace at the start.
         let without_whitespace: &str = self.remaining.inner.trim_start();
 
@@ -97,8 +96,8 @@ impl<'src> Lexer<'src> {
         }
     }
 
-    /// Check if a pattern matches at the start of the remaining fragment, and if so return the number of bytes.
-    fn matches(&self, pattern: &str) -> bool {
+    /// Check if a pattern matches at the start of the [Lexer::remaining] [Fragment].
+    pub fn matches(&self, pattern: &str) -> bool {
         self.remaining.inner.starts_with(pattern)
     }
 
diff --git a/wright/src/parser/lexer/token.rs b/wright/src/parser/lexer/token.rs
index f6a9f9e8..6749aa84 100644
--- a/wright/src/parser/lexer/token.rs
+++ b/wright/src/parser/lexer/token.rs
@@ -55,6 +55,8 @@ pub enum TokenTy {
     InnerDocComment, InnerBlockDocComment,
     
     /// Indicates a block style comment without termination. 
+    /// Separate from [TokenTy::InnerDocComment] and [TokenTy::OuterDocComment] to indicate that 
+    /// unterminated comments will be handled differently (produce errors eventually). 
     UnterminatedBlockComment,
 
     KwRecord,
@@ -82,8 +84,9 @@ pub enum TokenTy {
     KwWhere,
 
     IntegerLiteral,
-    StringLiteral, 
-    CharLiteral,
+    StringLiteral { terminated: bool }, 
+    FormatStringLiteral { terminated: bool },
+    CharLiteral { terminated: bool },
 
     /// Unknown character in lexer fragment. 
     Unknown