versions 1.0.0 → 1.0.1

raw patch · 3 files changed

+9/−9 lines, 3 files

Files

• Data/Versions.hs +2/−6
• test/Test.hs +4/−2
• versions.cabal +3/−1

@@ -89,16 +89,12 @@   compare (Ideal s)     (Ideal s')    = compare s s'   compare (General v)   (General v')  = compare v v'   compare (Complex m)   (Complex m')  = compare m m'-  compare (Ideal s)     (General v)   = cmpSV s v-  compare (General v)   (Ideal s)     = opposite $ cmpSV s v+  compare (Ideal s)     (General v)   = compare (vFromS s) v+  compare (General v)   (Ideal s)     = opposite $ compare (vFromS s) v   compare (General v)   (Complex m)   = compare (mFromV v) m   compare (Complex m)   (General v)   = opposite $ compare (mFromV v) m   compare (Ideal s)     m@(Complex _) = compare (General $ vFromS s) m   compare m@(Complex _) (Ideal s)     = compare m (General $ vFromS s)--cmpSV :: SemVer -> Version -> Ordering-cmpSV s (Version cs re) = compare (cs' ++ re') $ cs ++ re-  where (Version cs' re') = vFromS s  -- | Convert a `SemVer` to a `Version`. vFromS :: SemVer -> Version

@@ -72,8 +72,9 @@     [ testGroup "Good Versions" $       map (\s -> testCase (unpack s) $ isomorphV s) goodVers     , testGroup "Comparisons" $-      map (\(a,b) -> testCase (unpack $ a <> " < " <> b) $ comp version a b) $-      zip cabalOrd (tail cabalOrd) <> zip versionOrd (tail versionOrd)+      testCase "1.2-5 < 1.2.3-1" (comp version "1.2-5" "1.2.3-1") :+      map (\(a,b) -> testCase (unpack $ a <> " < " <> b) $ comp version a b)+      (zip cabalOrd (tail cabalOrd) <> zip versionOrd (tail versionOrd))     ]   , testGroup "(Complex) Mess"     [ testGroup "Good Versions" $@@ -101,6 +102,7 @@       , testCase "1.2.3-1   < 1.2.4r1-1" $ comp parseV "1.2.3-1" "1.2.4r1-1"       , testCase "1.2.3-1   < 2+0007-1"  $ comp parseV "1.2.3-1" "2+0007-1"       , testCase "1.2.3r1-1 < 2+0007-1"  $ comp parseV "1.2.3r1-1" "2+0007-1"+      , testCase "1.2-5 < 1.2.3-1"       $ comp parseV "1.2-5" "1.2.3-1"       ]     ]   ]

@@ -1,5 +1,5 @@ name:                versions-version:             1.0.0+version:             1.0.1 synopsis:            Types and parsers for software version numbers. description:         A library for parsing and comparing software version numbers.                      .@@ -41,6 +41,8 @@   build-depends:       base >=4.8 && <4.9                      , parsec >=3.1 && <3.2                      , semigroups >= 0.16.2.2+--                     , tasty >= 0.11.0.1+--                     , tasty-hunit >= 0.9.2                      , text >=1.2 && <1.3                      , text-show >= 2   -- hs-source-dirs: