From c00cdf53b7d2b81239ba389cc9b86fbb55caaa7c Mon Sep 17 00:00:00 2001
From: Deukhoofd <Deukhoofd@gmail.com>
Date: Sat, 5 Jun 2021 20:50:15 +0200
Subject: [PATCH] Updates parser to take LexTokens instead of TokenType

---
 src/logger/messages.rs             |  1 +
 src/parsing/parser/mod.rs          | 40 +++++++++++++++++++-----------
 src/parsing/parser/parser_tests.rs | 18 +++++++++++---
 3 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/logger/messages.rs b/src/logger/messages.rs
index f566bb3..c3e9537 100644
--- a/src/logger/messages.rs
+++ b/src/logger/messages.rs
@@ -3,4 +3,5 @@ pub enum Message {
     UnexpectedCharacter(char),
     InvalidCharacter { found: char, expected: char },
     UnclosedStringLiteral,
+    UnexpectedToken(),
 }
diff --git a/src/parsing/parser/mod.rs b/src/parsing/parser/mod.rs
index cbd4bad..ff402f5 100644
--- a/src/parsing/parser/mod.rs
+++ b/src/parsing/parser/mod.rs
@@ -2,36 +2,46 @@ pub mod parsed_statement;
 #[cfg(test)]
 mod parser_tests;
 
-use super::lexer::lex_tokens::TokenType;
+use super::lexer::lex_tokens::{LexToken, TokenType};
 use crate::parsing::parser::parsed_statement::ParsedStatement;
 use itertools::{Itertools, MultiPeek};
 
 struct ParseReader<'a> {
-    tokens: MultiPeek<core::slice::Iter<'a, TokenType>>,
+    tokens: MultiPeek<core::slice::Iter<'a, LexToken>>,
 }
 
 impl<'a> ParseReader<'a> {
-    pub fn peek(&mut self) -> &TokenType {
+    pub fn peek(&mut self) -> &LexToken {
         let t = self.tokens.peek();
         match t {
-            None => &TokenType::EndOfFile,
-            Some(TokenType::WhiteSpace) => self.peek(),
-            Some(v) => v,
+            None => self.tokens.by_ref().last().unwrap(),
+            Some(v) => {
+                if v.token_type == TokenType::WhiteSpace {
+                    self.peek()
+                } else {
+                    v
+                }
+            }
         }
     }
 
-    pub fn next(&mut self) -> &TokenType {
+    pub fn next(&mut self) -> &LexToken {
         let t = self.tokens.next();
         match t {
-            None => &TokenType::EndOfFile,
-            Some(TokenType::WhiteSpace) => self.next(),
-            Some(v) => v,
+            None => self.tokens.by_ref().last().unwrap(),
+            Some(v) => {
+                if v.token_type == TokenType::WhiteSpace {
+                    self.next()
+                } else {
+                    v
+                }
+            }
         }
     }
 
-    pub fn consume(&mut self, token: TokenType) -> &TokenType {
+    pub fn consume(&mut self, token: TokenType) -> &LexToken {
         let n = self.next();
-        if n != &token {
+        if n.token_type != token {
             // TODO: log error
             unimplemented!()
         }
@@ -44,7 +54,7 @@ impl<'a> ParseReader<'a> {
     }
 }
 
-pub fn parse(tokens: Vec<TokenType>) -> Box<ParsedStatement> {
+pub fn parse(tokens: Vec<LexToken>) -> Box<ParsedStatement> {
     let mut reader = ParseReader {
         tokens: tokens.iter().multipeek(),
     };
@@ -55,7 +65,7 @@ fn parse_script(reader: &mut ParseReader) -> Box<ParsedStatement> {
     let mut vec: Vec<Box<ParsedStatement>> = Vec::new();
     loop {
         let n = reader.peek();
-        match n {
+        match n.token_type {
             TokenType::NamespaceKeyword => {
                 vec.push(parse_namespace(reader));
             }
@@ -73,7 +83,7 @@ fn parse_namespace(reader: &mut ParseReader) -> Box<ParsedStatement> {
     reader.next(); // Consume namespace
     let identifier_token = reader.next();
     let s: String;
-    match identifier_token {
+    match &identifier_token.token_type {
         TokenType::Identifier(i) => {
             s = i.to_string();
         }
diff --git a/src/parsing/parser/parser_tests.rs b/src/parsing/parser/parser_tests.rs
index df4c022..f4d0a3c 100644
--- a/src/parsing/parser/parser_tests.rs
+++ b/src/parsing/parser/parser_tests.rs
@@ -1,10 +1,22 @@
 use super::parse;
 use super::parsed_statement::ParsedStatement;
-use crate::parsing::lexer::lex_tokens::TokenType;
+use crate::parsing::lexer::lex_tokens::{LexToken, TokenType};
+use crate::span::Span;
+
+fn create_tokens(types: Vec<TokenType>) -> Vec<LexToken> {
+    let mut v = Vec::with_capacity(types.len());
+    for t in types {
+        v.push(LexToken {
+            token_type: t,
+            span: Span::new(0, 0),
+        });
+    }
+    v
+}
 
 #[test]
 fn test_empty_namespace() {
-    let script = parse(vec![
+    let script = parse(create_tokens(vec![
         TokenType::NamespaceKeyword,
         TokenType::WhiteSpace,
         TokenType::Identifier("foo".to_string()),
@@ -12,7 +24,7 @@ fn test_empty_namespace() {
         TokenType::OpenCurlyBracket,
         TokenType::CloseCurlyBracket,
         TokenType::EndOfFile,
-    ]);
+    ]));
     if let ParsedStatement::Script(inner) = script.as_ref() {
         assert_eq!(1, inner.len());
         if let ParsedStatement::Namespace(identifier, inner_script) = inner[0].as_ref() {