Give keywords their own token types

src/lexer.rs

@@ -23,7 +23,8 @@ lazy_static! {
     static ref WHITESPACE_REGEX: Regex = Regex::new(r"\s").unwrap();
     static ref MATCHERS: Vec<Matcher> = vec![
         Matcher::new(r#""(.*)""#, TokenType::String),
-        Matcher::new(r#"(SELECT|FROM)"#, TokenType::Keyword),
+        Matcher::new(r#"SELECT"#, TokenType::Select),
+        Matcher::new(r#"FROM"#, TokenType::From),
         Matcher::new(r#"[a-z][a-zA-Z_\-]*"#, TokenType::Identfiier),
         Matcher::new(r#"[0-9]+"#, TokenType::Number),
         Matcher::new(r#"\*"#, TokenType::Star),
@@ -82,7 +83,7 @@ mod tests {
     fn it_scans_a_keyword() {
         assert_eq!(
             scan("SELECT").unwrap(),
-            vec![Token::new(TokenType::Keyword, "SELECT")]
+            vec![Token::new(TokenType::Select, "SELECT")]
         )
     }
 
@@ -91,8 +92,8 @@ mod tests {
         assert_eq!(
             scan("SELECT FROM").unwrap(),
             vec![
-                Token::new(TokenType::Keyword, "SELECT"),
-                Token::new(TokenType::Keyword, "FROM")
+                Token::new(TokenType::Select, "SELECT"),
+                Token::new(TokenType::From, "FROM")
             ]
         )
     }

src/token.rs

@@ -25,9 +25,10 @@ impl std::fmt::Display for Token {
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum TokenType {
+    From,
     Identfiier,
-    Keyword,
     Number,
+    Select,
     Star,
     String,
 }
@@ -39,10 +40,12 @@ impl std::fmt::Display for TokenType {
             "{}",
             match self {
                 TokenType::Identfiier => "Identifier",
-                TokenType::Keyword => "Keyword",
                 TokenType::Number => "Number",
                 TokenType::Star => "Star",
                 TokenType::String => "String",
+
+                TokenType::Select => "SELECT",
+                TokenType::From => "FROM",
             }
         )
     }