Replace panic for unimplemented syntax error, closes #33

If token is not implemented show a error. Beside add dates syntax support.
Tablam · Aug 30, 2020 · da75f38 · da75f38
1 parent d73c282
commit da75f38
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/lang/src/ast.rs b/lang/src/ast.rs
@@ -41,6 +41,8 @@ pub enum ErrorLang {
         _0
     )]
     ExpectedBoolOp(Token),
+    #[display(fmt = "Unimplemented syntax. {:?}", _0)]
+    Unimplemented(Token),
     #[display(fmt = "Unexpected EOF.")]
     Eof,
 }

diff --git a/lang/src/lexer.rs b/lang/src/lexer.rs
@@ -127,11 +127,21 @@ pub enum Token {
        #[regex(r#""""[\w\d\s[^\s"{}]]+""""#)]
        Multiline,
     */
+    //Dates
+    #[display(fmt = "DateTime")]
+    #[regex(r#"dt"\d\d\d\d-(0[1-9]|1[012])-([12][0-9]|3[01]|0[1-9])T([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]""#)]
+    DateTime,
+    #[display(fmt = "Date")]
+    #[regex(r#"d"\d\d\d\d-(0[1-9]|1[012])-([12][0-9]|3[01]|0[1-9])""#)]
+    Date,
+    #[display(fmt = "Time")]
+    #[regex(r#"t"[0-1][0-9]|2[0-3]:[0-5][0-9]:[0-5][0-9]""#)]
+    Time,
+
     //Identifiers
     #[display(fmt = "{}", _0)]
     #[regex(r"[[:upper:]]+[_[[:upper:]][[:digit:]]]*", |lex| parse_token_data::<String>(lex))]
     Constant(String),
-    #[display(fmt = "{}", _0)]
     #[regex(r"[[:upper:]](?:[[[:lower:]][[:digit:]]]+[[:upper:]]*)+", |lex| parse_token_data::<String>(lex))]
     Type(String),
     #[display(fmt = "{}", _0)]

diff --git a/lang/src/parser.rs b/lang/src/parser.rs
@@ -172,7 +172,7 @@ impl<'source> Parser<'source> {
                 Column::Alias(Box::new(ColumnAlias::rename_name(&alias.from, &alias.to))).into()
             }
             Token::If => self.parse_if()?,
-            t => panic!("bad token: {:?}", t),
+            token => return Err(ErrorLang::Unimplemented(token.clone())),
         };
         Ok(expr)
     }