refactor(tazjin/rlox): Thread through scanner errors r/1956

... and show them to users, very crudely.

Change-Id: If4491b14db1124313f6ab7e5fbfdce9fea501d11
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2193
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI

1 files changed, 10 insertions, 5 deletions

diff --git a/users/tazjin/rlox/src/scanner.rs b/users/tazjin/rlox/src/scanner.rs
index e0b04981b4..2eed89bd6b 100644
--- a/users/tazjin/rlox/src/scanner.rs
+++ b/users/tazjin/rlox/src/scanner.rs
@@ -254,19 +254,18 @@ impl<'a> Scanner<'a> {
         self.add_token(token_kind);
     }
 
-    fn scan_tokens(mut self) -> Vec<Token<'a>> {
+    fn scan_tokens(&mut self) {
         while !self.is_at_end() {
             self.start = self.current;
             self.scan_token();
         }
 
         self.add_token(TokenKind::Eof);
-        return self.tokens;
     }
 }
 
-pub fn scan<'a>(input: &'a [char]) -> Vec<Token<'a>> {
-    let scanner = Scanner {
+pub fn scan<'a>(input: &'a [char]) -> Result<Vec<Token<'a>>, Vec<Error>> {
+    let mut scanner = Scanner {
         source: &input,
         tokens: vec![],
         errors: vec![],
@@ -275,5 +274,11 @@ pub fn scan<'a>(input: &'a [char]) -> Vec<Token<'a>> {
         line: 0,
     };
 
-    return scanner.scan_tokens();
+    scanner.scan_tokens();
+
+    if !scanner.errors.is_empty() {
+        return Err(scanner.errors);
+    }
+
+    return Ok(scanner.tokens);
 }