(#801) Update exprs syntax

Author: rexim

src/Bot/Expr.hs

@@ -69,7 +69,7 @@ funcallarg = funcall <|> var <|> stringLiteral
 
 funcall :: Parser Expr
 funcall = do
-  _ <- charP '%' >> whitespaces
+  _ <- charP '%'
   name <- symbol
   _ <- whitespaces >> charP '(' >> whitespaces
   args <-
@@ -103,7 +103,7 @@ whitespaces :: Parser T.Text
 whitespaces = takeWhileP isSpace
 
 var :: Parser Expr
-var = charP '%' >> whitespaces >> (VarExpr <$> symbol)
+var = charP '%' *> (VarExpr <$> symbol) <* charP '%'
 
 textBlock :: Parser Expr
 textBlock =

src/FuzzyMain.hs

@@ -65,7 +65,7 @@ unparseFunCallArgs = T.concat . intersperse "," . map unparseFunCallArg
 
 unparseExpr :: Expr -> T.Text
 unparseExpr (TextExpr text) = text
-unparseExpr (VarExpr name) = "%" <> name
+unparseExpr (VarExpr name) = "%" <> name <> "%"
 unparseExpr (FunCallExpr name args) =
   "%" <> name <> "(" <> unparseFunCallArgs args <> ")"