allow for && to indicate conjunction

ixmatus · Sep 7, 2016 · 4d99eee · 4d99eee
1 parent 65ffa7e
commit 4d99eee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/Data/SemVer/Parser.hs b/src/Data/SemVer/Parser.hs
@@ -182,8 +182,10 @@ pJoinedSemVerRange :: Parser SemVerRange
 pJoinedSemVerRange = do
   first <- pSemVerRangeSingle
   option first $ do
-    lookAhead (sstring "||" <|> map singleton anyChar) >>= \case
+    let next = choice [sstring "||", sstring "&&", map singleton anyChar]
+    lookAhead next >>= \case
       "||" -> Or first <$> (sstring "||" *> pJoinedSemVerRange)
+      "&&" -> And first <$> (sstring "&&" *> pJoinedSemVerRange)
       _ -> And first <$> pJoinedSemVerRange
 
 -- | Parses a hyphenated range.

diff --git a/tests/Unit.hs b/tests/Unit.hs
@@ -141,6 +141,10 @@ main = hspec $ do
         `shouldBeR` Geq (semver'' 1 2 3 ["pre"] ["asdf"])
                      `And` Lt (semver'' 2 4 3 ["pre"] ["asdf"])
 
+    it "should parse semvers with && instead of spaces" $ do
+      let expected = Geq (semver 2 0 0) `And` Leq (semver 2 15 0)
+      parseSemVerRange ">= 2 && <= 2.14" `shouldBeR` expected
+
     it "should fail when it's wrong" $ do
       shouldBeL (parseSemVerRange "xyz")