Allow . and * in identifiers

src/lexer.rs

@@ -25,11 +25,10 @@ lazy_static! {
         Matcher::new(r#"^"(.*)""#, TokenType::String),
         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#"^[a-z][a-zA-Z_\-.*]*"#, TokenType::Identfiier),
         Matcher::new(r#"^[0-9]+"#, TokenType::Number),
         Matcher::new(r#"^\*"#, TokenType::Star),
         Matcher::new(r#"^,"#, TokenType::Comma),
-        Matcher::new(r#"^\."#, TokenType::Dot),
     ];
 }
 
@@ -136,8 +135,19 @@ mod tests {
     }
 
     #[test]
-    fn it_scans_a_dot() {
-        assert_eq!(scan(".").unwrap(), vec![Token::new(TokenType::Dot, ".")])
+    fn it_allows_dots_in_identifiers() {
+        assert_eq!(
+            scan("foo.bar").unwrap(),
+            vec![Token::new(TokenType::Identfiier, "foo.bar")]
+        )
+    }
+
+    #[test]
+    fn it_allows_stars_in_identifiers() {
+        assert_eq!(
+            scan("foo.*").unwrap(),
+            vec![Token::new(TokenType::Identfiier, "foo.*")]
+        )
     }
 
     #[test]

src/token.rs

@@ -26,7 +26,6 @@ impl std::fmt::Display for Token {
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum TokenType {
     Comma,
-    Dot,
     From,
     Identfiier,
     Number,
@@ -42,7 +41,6 @@ impl std::fmt::Display for TokenType {
             "{}",
             match self {
                 TokenType::Comma => "Comma",
-                TokenType::Dot => "Dot",
                 TokenType::Identfiier => "Identifier",
                 TokenType::Number => "Number",
                 TokenType::Star => "Star",