(#801) Fix Expr parser

Author: rexim

src/Bot/Expr.hs

@@ -65,14 +65,16 @@ sepBy element sep = do
   args <- many (sep >> element)
   return (arg : args)
 
+funcallarg :: Parser Expr
+funcallarg = funcall <|> var <|> stringLiteral
+
 funcall :: Parser Expr
 funcall = do
   _ <- charP '%' >> whitespaces
   name <- symbol
   _ <- whitespaces >> charP '(' >> whitespaces
   args <-
-    sepBy (funcall <|> var <|> stringLiteral) (whitespaces >> charP ',') <|>
-    return []
+    sepBy funcallarg (whitespaces >> charP ',' >> whitespaces) <|> return []
   _ <- whitespaces >> charP ')'
   return $ FunCallExpr name args
 

test/Bot/ExprTest.hs

@@ -52,6 +52,7 @@ exprsTest =
             , TextExpr " baz ()"
             ]))
     , ("%f(%x)", Right ("", [FunCallExpr "f" [VarExpr "x"]]))
+    , ("%f(%x, %y)", Right ("", [FunCallExpr "f" [VarExpr "x", VarExpr "y"]]))
     , ( "\"hello %x world\""
       , Right ("", [TextExpr "\"hello ", VarExpr "x", TextExpr " world\""]))
     ]