diff options
| -rw-r--r-- | src/comp/IConv.hs | 5 | ||||
| -rw-r--r-- | src/comp/Libs/HO.hs | 22 |
2 files changed, 3 insertions, 24 deletions
diff --git a/src/comp/IConv.hs b/src/comp/IConv.hs index e7b4fcb4..1f162dca 100644 --- a/src/comp/IConv.hs +++ b/src/comp/IConv.hs @@ -10,7 +10,6 @@ import qualified Data.Set as S import qualified Data.List as List import Util(fromJustOrErr) -import HO(uncurry3) import qualified SCC(tsort,Graph) --import Util(findDup,traces) --import Util(trace_answer) @@ -401,6 +400,9 @@ iAddWhen errh flags r env pvs qs ite = (i, t, e') -> (i, t, underLAM t e' [] $ \ t e -> iAps icPrimWhen [t] [p, bindFn e]) +uncurry3 :: (a -> b -> c -> d) -> (a, b, c) -> d +uncurry3 f ~(x, y, z) = f x y z + -- external interface for converting expressions iConvExpr :: ErrorHandle -> Flags -> SymTab -> Env a -> CExpr -> IExpr a iConvExpr errh flags r env ce = iConvE errh flags r env (map IVar tmpVarIds) ce @@ -761,4 +763,3 @@ buildUndefNoMatchPos flags r env (e, t_e) t = IAps bu [t] [IAps gp [t_e] [e], iuNoMatchExpr] where bu = iConvVar flags r env idBuildUndef gp = ICon idPrimGetEvalPosition (ICPrim itPrimGetPosition PrimGetEvalPosition) - diff --git a/src/comp/Libs/HO.hs b/src/comp/Libs/HO.hs deleted file mode 100644 index e7ef8370..00000000 --- a/src/comp/Libs/HO.hs +++ /dev/null @@ -1,22 +0,0 @@ --- Copyright (c) 1982-1999 Lennart Augustsson, Thomas Johnsson --- See LICENSE for the full license. --- -module HO where - --- @@ Some useful combinators. - -lift op f g = \ x -> f x `op` g x - -cross f g = \ x -> (f x, g x) - -apFst f (x, y) = (f x, y) - -apSnd f (x, y) = (x, f y) - -curry3 f x y z = f (x,y,z) - -uncurry3 f ~(x,y,z) = f x y z - -curry4 f x y z w = f (x,y,z,w) - -uncurry4 f ~(x,y,z,w) = f x y z w |