Parser tests pass!

Author: Cypher1

takolib/src/interpreter.rs

@@ -271,7 +271,6 @@ impl Ctx<'_> {
             | Symbol::LogicalOrAssign
             | Symbol::ModuloAssign => todo!("Support assignment"),
             Symbol::Group => todo!("Support Group"),
-            Symbol::Escape => panic!("Support Escape"), // TODO: Nah
             Symbol::Comma => panic!("Support Comma"),   // TODO: Nah
             Symbol::Ident => panic!("Support Ident"),   // TODO: Nah
             _ => panic!("Others????"),                  // TODO: Nah

takolib/src/parser/lexer.rs

@@ -675,7 +675,6 @@ mod tests {
                     | Symbol::MultiCommentOpen
                     | Symbol::MultiCommentClose
                     | Symbol::Group
-                    | Symbol::Escape
             ) {
                 // Special case
                 continue;

takolib/src/parser/mod.rs

@@ -267,7 +267,7 @@ fn make_tables() -> Result<ParserConfigTable, ()> {
         rules: config,
         precedences: vec![
             Comma, Sequence, Assign, Arrow,
-            DoubleArrow, Add, Sub, Div, Mul, Exp, HasType,
+            DoubleArrow, Add, Sub, Div, Mul, Exp, Sub /*Neg*/, HasType,
             Eqs, NotEqs, Lt, LtEqs, Gt, GtEqs,
             Sigma, Lambda, Forall, Pi, Exists,
             CloseParen, // TODO: Add all

takolib/src/parser/tokens.rs

@@ -93,7 +93,6 @@ pub enum Symbol {
     Spread,
 
     // Ignore symbols
-    Escape,
     Group,
     Shebang, // TODO: Consider using direct comparisons? = senum!("/*"),
     Comment,
@@ -206,7 +205,7 @@ pub fn classify_char(ch: char) -> CharacterType {
         '}' => CloseCurly,
         '[' => OpenBracket,
         ']' => CloseBracket,
-        '\\' => Escape, // Escape?
+        '\\' => Group, // Escape?
         'λ' => Lambda,
         'Π' => Pi,
         'Σ' => Sigma,
@@ -326,6 +325,15 @@ impl std::str::FromStr for Symbol {
             "}" => CloseCurly,
             "[" => OpenBracket,
             "]" => CloseBracket,
+            "\\" => Group,
+            "," => Comma,
+            "an identifier" => Ident,
+            "a number" => NumberLit,
+            "a color" => ColorLit,
+            "a string literal" => StringLit,
+            "the start of a format string literal" => FmtStringLitStart,
+            "the middle of a format string literal" => FmtStringLitMid,
+            "the end of a format string literal" => FmtStringLitEnd,
             _ => return Err(()),
         };
         Ok(t)
@@ -409,8 +417,7 @@ impl From<&Symbol> for &str {
             Symbol::CloseCurly => "}",
             Symbol::OpenBracket => "[",
             Symbol::CloseBracket => "]",
-            Symbol::Escape => "\\",
-            Symbol::Group => " ", // Group is not a expressable character.
+            Symbol::Group => "\\",
         }
     }
 }