From a63e1d1d81ee1c2813d798a7e95aa4727bc27653 Mon Sep 17 00:00:00 2001 From: PHO Date: Fri, 2 Oct 2009 12:42:50 +0900 Subject: [PATCH] code cleanup --- Main.hs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Main.hs b/Main.hs index 13bc948..c7d4980 100644 --- a/Main.hs +++ b/Main.hs @@ -58,7 +58,7 @@ scanPkgs runQuery = mapM_ scanPkg name = extractPkgName distname ver = extractPkgVersion distname pkgId = PackageIdentifier name ver - query = Id (sameName pkgId) :& Id (newerVers pkgId) + query = Id ((`isNewerThan` pkgId) . package) in case runQuery query of [] -> putStrLn (distname ++ ": is the LATEST") @@ -69,11 +69,10 @@ scanPkgs runQuery = mapM_ scanPkg putStrLn (distname ++ ": has a newer version " ++ showVersion lVer) _ -> return () - sameName :: PackageIdentifier -> PackageIdentifier -> Bool - sameName a b = pkgName a == pkgName b - - newerVers :: PackageIdentifier -> PackageIdentifier -> Bool - newerVers a b = pkgVersion a < pkgVersion b + isNewerThan :: PackageIdentifier -> PackageIdentifier -> Bool + isNewerThan a b + = pkgName a == pkgName b && + pkgVersion a > pkgVersion b cmpVers :: PackageDescription -> PackageDescription -> Ordering cmpVers a b = (pkgVersion . package) a `compare` (pkgVersion . package) b -- 2.40.0