Ignore whitespace

src/lexer.rs

@@ -45,9 +45,10 @@ impl Matcher {
 }
 
 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"#, TokenType::Keyword),
+        Matcher::new(r#"(SELECT|FROM)"#, TokenType::Keyword),
         Matcher::new(r#"[a-z][a-zA-Z_]*"#, TokenType::Identfiier),
         Matcher::new(r#"[0-9]+"#, TokenType::Number)
     ];
@@ -58,6 +59,10 @@ pub fn scan(input: &str) -> Result<Vec<Token>, LexerError> {
     let mut position = 0;
 
     while position < input.len() {
+        while WHITESPACE_REGEX.is_match(&input[position..position + 1]) {
+            position += 1;
+        }
+
         for matcher in MATCHERS.iter() {
             if matcher.regex.is_match(&input[position..]) {
                 dbg!(&input[position..]);
@@ -106,6 +111,17 @@ mod tests {
         )
     }
 
+    #[test]
+    fn it_scans_two_keywords() {
+        assert_eq!(
+            scan("SELECT FROM").unwrap(),
+            vec![
+                Token::new(TokenType::Keyword, "SELECT"),
+                Token::new(TokenType::Keyword, "FROM")
+            ]
+        )
+    }
+
     #[test]
     fn it_scans_an_identifier() {
         assert_eq!(