Updated for Data.Foldable version of foldr.

Author: joneshf

src/Text/Parsing/Parser.purs.hs

@@ -2,7 +2,6 @@ module Text.Parsing.Parser where
 
 import Prelude
 import Control.Monad
-import Data.Array
 import Data.Either
 import Data.Maybe
 
@@ -11,7 +10,7 @@ data ParseError = ParseError
   }
 
 parseError :: String -> ParseError
-parseError message = ParseError 
+parseError message = ParseError
   { message: message
   }
 
@@ -58,4 +57,4 @@ fail :: forall s a. String -> Parser s a
 fail message = Parser $ \s -> failureResult s false (parseError message)
 
 
-  
+

src/Text/Parsing/Parser/Expr.purs.hs

@@ -1,8 +1,11 @@
 module Text.Parsing.Parser.Expr where
 
 import Prelude
+
 import Data.Array
 import Data.Either
+import Data.Foldable
+
 import Text.Parsing.Parser
 import Text.Parsing.Parser.Combinators
 
@@ -11,34 +14,43 @@ data Assoc = AssocNone | AssocLeft | AssocRight
 data Operator s a = Infix   (Parser s (a -> a -> a)) Assoc |
                     Prefix  (Parser s (a -> a)) |
                     Postfix (Parser s (a -> a))
-                    
+
 type OperatorTable s a = [[Operator s a]]
 
-type SplitAccum s a = { rassoc :: [Parser s (a -> a -> a)], lassoc :: [Parser s (a -> a -> a)], nassoc :: [Parser s (a -> a -> a)], prefix :: [Parser s (a -> a)], postfix :: [Parser s (a -> a)] }
+type SplitAccum s a = { rassoc :: [Parser s (a -> a -> a)]
+                      , lassoc :: [Parser s (a -> a -> a)]
+                      , nassoc :: [Parser s (a -> a -> a)]
+                      , prefix :: [Parser s (a -> a)]
+                      , postfix :: [Parser s (a -> a)] }
 
-splitOp :: forall s a. SplitAccum s a -> Operator s a -> SplitAccum s a
-splitOp accum (Infix op AssocNone)  = accum { nassoc = op:accum.nassoc }
-splitOp accum (Infix op AssocLeft)  = accum { lassoc = op:accum.lassoc }
-splitOp accum (Infix op AssocRight) = accum { rassoc = op:accum.rassoc }            
-splitOp accum (Prefix  op) = accum { prefix = op:accum.prefix }
-splitOp accum (Postfix op) = accum { postfix = op:accum.postfix }
+splitOp :: forall s a. Operator s a -> SplitAccum s a -> SplitAccum s a
+splitOp (Infix op AssocNone)  accum = accum { nassoc  = op:accum.nassoc }
+splitOp (Infix op AssocLeft)  accum = accum { lassoc  = op:accum.lassoc }
+splitOp (Infix op AssocRight) accum = accum { rassoc  = op:accum.rassoc }
+splitOp (Prefix  op)          accum = accum { prefix  = op:accum.prefix }
+splitOp (Postfix op)          accum = accum { postfix = op:accum.postfix }
 
+rassocP :: forall a b c s. a -> Parser s (a -> a -> a) -> Parser s (b -> c) -> Parser s b -> Parser s (c -> a) -> Parser s a
 rassocP x rassocOp prefixP term postfixP = do
   f <- rassocOp
-  y <- do 
+  y <- do
     z <- termP prefixP term postfixP
     rassocP1 z rassocOp prefixP term postfixP
   return (f x y)
 
+rassocP1 :: forall a b c s. a -> Parser s (a -> a -> a) -> Parser s (b -> c) -> Parser s b -> Parser s (c -> a) -> Parser s a
 rassocP1 x rassocOp prefixP term postfixP = rassocP x rassocOp prefixP term postfixP <|> return x
 
+lassocP :: forall a b c s. a -> Parser s (a -> a -> a) -> Parser s (b -> c) -> Parser s b -> Parser s (c -> a) -> Parser s a
 lassocP x lassocOp prefixP term postfixP = do
   f <- lassocOp
   y <- termP prefixP term postfixP
   lassocP1 (f x y) lassocOp prefixP term postfixP
 
+lassocP1 :: forall a b c s. a -> Parser s (a -> a -> a) -> Parser s (b -> c) -> Parser s b -> Parser s (c -> a) -> Parser s a
 lassocP1 x lassocOp prefixP term postfixP = lassocP x lassocOp prefixP term postfixP <|> return x
 
+nassocP :: forall a b c d e s. a -> Parser s (a -> d -> e) -> Parser s (b -> c) -> Parser s b -> Parser s (c -> d) -> Parser s e
 nassocP x nassocOp prefixP term postfixP = do
   f <- nassocOp
   y <- termP prefixP term postfixP
@@ -52,10 +64,10 @@ termP prefixP term postfixP = do
   return (post (pre x))
 
 buildExprParser :: forall s a. OperatorTable s a -> Parser s a -> Parser s a
-buildExprParser operators simpleExpr = 
+buildExprParser operators simpleExpr =
   let makeParser term ops =
       let accum     = foldr splitOp { rassoc: [], lassoc: [], nassoc: [], prefix: [], postfix: [] } ops in
-      
+
       let rassocOp  = choice accum.rassoc in
       let lassocOp  = choice accum.lassoc in
       let nassocOp  = choice accum.nassoc in
@@ -64,13 +76,13 @@ buildExprParser operators simpleExpr =
 
       let postfixP = postfixOp <|> return id in
       let prefixP = prefixOp <|> return id in
-      
-      do 
+
+      do
         x <- termP prefixP term postfixP
         rassocP x rassocOp prefixP term postfixP
           <|> lassocP x lassocOp prefixP term postfixP
           <|> nassocP x nassocOp prefixP term postfixP
-          <|> return x 
+          <|> return x
           <?> "operator"
-    
+
   in foldl (makeParser) simpleExpr operators