From 1ee5c6a1510dbeea08b545934de6cf9490aaae3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Hatcher?= <nicolas@theuniverse.today>
Date: Wed, 14 Feb 2024 09:53:05 +0100
Subject: [PATCH] FIX: Remove more unused code

---
 base/src/expressions/lexer/mod.rs  |  6 ++++--
 base/src/expressions/lexer/util.rs |  3 ---
 base/src/expressions/token.rs      | 32 ------------------------------
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/base/src/expressions/lexer/mod.rs b/base/src/expressions/lexer/mod.rs
index 6783140..fae74f6 100644
--- a/base/src/expressions/lexer/mod.rs
+++ b/base/src/expressions/lexer/mod.rs
@@ -42,6 +42,8 @@
 //! assert!(matches!(lexer.next_token(), TokenType::Reference { .. }));
 //! ```
 
+use std::mem;
+
 use serde::{Deserialize, Serialize};
 
 use crate::expressions::token::{OpCompare, OpProduct, OpSum};
@@ -49,7 +51,7 @@ use crate::expressions::token::{OpCompare, OpProduct, OpSum};
 use crate::language::Language;
 use crate::locale::Locale;
 
-use super::token::{index, Error, TokenType};
+use super::token::{Error, TokenType};
 use super::types::*;
 use super::utils;
 
@@ -139,7 +141,7 @@ impl Lexer {
     /// Returns an error if the token is not the expected one.
     pub fn expect(&mut self, tk: TokenType) -> Result<()> {
         let nt = self.next_token();
-        if index(&nt) != index(&tk) {
+        if mem::discriminant(&nt) != mem::discriminant(&tk) {
             return Err(self.set_error(&format!("Error, expected {:?}", tk), self.position));
         }
         Ok(())
diff --git a/base/src/expressions/lexer/util.rs b/base/src/expressions/lexer/util.rs
index 167eda8..d1f4de6 100644
--- a/base/src/expressions/lexer/util.rs
+++ b/base/src/expressions/lexer/util.rs
@@ -1,5 +1,3 @@
-use std::fmt;
-
 use serde::{Deserialize, Serialize};
 
 use crate::expressions::token;
@@ -79,4 +77,3 @@ pub fn get_tokens(formula: &str) -> Vec<MarkedToken> {
     }
     tokens
 }
-
diff --git a/base/src/expressions/token.rs b/base/src/expressions/token.rs
index 30a7112..ef6abe6 100644
--- a/base/src/expressions/token.rs
+++ b/base/src/expressions/token.rs
@@ -259,35 +259,3 @@ pub enum TokenType {
         table_reference: Option<TableReference>,
     },
 }
-
-pub fn index(token: &TokenType) -> u32 {
-    use self::TokenType::*;
-    match token {
-        Illegal(..) => 1,
-        EOF => 2,
-        Ident(..) => 3,
-        String(..) => 4,
-        Number(..) => 6,
-        Boolean(..) => 7,
-        Error(..) => 8,
-        Addition(..) => 9,
-        Product(..) => 10,
-        Power => 14,
-        LeftParenthesis => 15,
-        RightParenthesis => 16,
-        Colon => 17,
-        Semicolon => 18,
-        LeftBracket => 19,
-        RightBracket => 20,
-        LeftBrace => 21,
-        RightBrace => 22,
-        Comma => 23,
-        Bang => 24,
-        Percent => 30,
-        And => 31,
-        Reference { .. } => 34,
-        Range { .. } => 35,
-        Compare(..) => 37,
-        StructuredReference { .. } => 40,
-    }
-}