top level '|'

src/Sound/Tidal/ParseBP.hs

@@ -403,6 +403,16 @@ pSequence f = do
           try $ symbol ".."
           b <- pPart f
           return $ TPat_EnumFromTo a b
+          <|> try
+            ( do
+                lookAhead
+                  ( char '|'
+                      <|> do
+                        pElongate a <|> pRepeat a
+                        char '|'
+                  )
+                pChoice f a
+            )
           <|> pElongate a
           <|> pRepeat a
           <|> return a
@@ -425,6 +435,18 @@ pSequence f = do
         takeFoot (TPat_Foot : pats'') = ([], pats'')
         takeFoot (pat : pats'') = first (pat :) $ takeFoot pats''
 
+pChoice :: (Parseable a) => MyParser (TPat a) -> TPat a -> MyParser (TPat a)
+pChoice f a = do
+  eor <- option (TPat_Seq []) (pElongate a <|> pRepeat a)
+  cs <- many1 $
+    do
+      char '|'
+      b <- pPart f
+      pElongate b <|> pRepeat b <|> return b
+  seed <- newSeed
+  rest <- option (TPat_Seq []) (pSequence f)
+  return $ TPat_Seq [TPat_CycleChoose seed (eor : (a : cs)), rest]
+
 pRepeat :: TPat a -> MyParser (TPat a)
 pRepeat a = do
   es <- many1 $ do

test/Sound/Tidal/ExceptionsTest.hs

@@ -31,7 +31,14 @@ action `shouldThrow` p = prop "shouldThrow" $
       Left e ->
         -- "threw exception that did not meet expectation")
         Test.Microspec.assert $ p e
-  where
+
+shouldNotThrow :: (Exception e) => IO a -> Selector e -> Microspec ()
+action `shouldNotThrow` p = prop "shouldNotThrow" $
+  monadicIO $ do
+    r <- Test.Microspec.run $ try action
+    case r of
+      Right _ -> Test.Microspec.assert True
+      Left e -> Test.Microspec.assert $ p e
 
 -- a string repsentation of the expected exception's type
 {-

test/Sound/Tidal/ParseTest.hs

@@ -4,7 +4,7 @@ module Sound.Tidal.ParseTest where
 
 import Control.Exception
 import Sound.Tidal.Core
-import Sound.Tidal.ExceptionsTest (anyException, shouldThrow)
+import Sound.Tidal.ExceptionsTest (anyException, shouldThrow, shouldNotThrow)
 import Sound.Tidal.Pattern
 import Sound.Tidal.UI (_degradeBy)
 import Test.Microspec
@@ -336,5 +336,19 @@ run =
           (Arc 0 1)
           ("<-- 2 -- - 8>" :: Pattern String)
           ("<~~ 2 ~~ ~ 8>" :: Pattern String)
+      it "toplevel '|' is the same as in list" $ do
+        compareP
+          (Arc 0 1)
+          ("[a a|b b b|c c c c]" :: Pattern String)
+          ("a a |b b b|c c c c" :: Pattern String)
+      it "'|' in list first" $ do
+        evaluate ("1 2@3|4|-|5!6|[7!8 9] 10 . 11 12*2 13!2 . 1@1" :: Pattern String)
+          `shouldNotThrow` anyException
+      it "'|' in list last" $ do
+        evaluate ("12@1|23@1|12|[1 3!21]" :: Pattern String)
+          `shouldNotThrow` anyException
+      it "toplevel '|'" $ do
+        evaluate ("121|23@1|12|[1 321]" :: Pattern String)
+          `shouldNotThrow` anyException
   where
     degradeByDefault = _degradeBy 0.5