fixed: Parser errors for new rest symbol #1091

src/Sound/Tidal/ParseBP.hs

@@ -221,10 +221,21 @@ parseBP_E s = toE parsed
     toE (Right tp) = toPat tp
 
 parseTPat :: Parseable a => String -> Either ParseError (TPat a)
-parseTPat = runParser (pSequence f' Prelude.<* eof) (0 :: Int) ""
-  where f' = do tPatParser
-             <|> do oneOf "~-" <?> "rest"
-                    return TPat_Silence
+parseTPat = runParser (pSequence parseRest Prelude.<* eof) (0 :: Int) ""
+
+-- | a '-' is a negative sign if followed anything but another dash
+-- otherwise, it's treated as rest
+parseRest :: Parseable a => MyParser (TPat a)
+parseRest = 
+  try (do 
+        lookAhead $ do
+          char '-'
+          spaces
+          noneOf "-"
+        tPatParser)
+  <|> char '-' Prelude.*> pure TPat_Silence
+  <|> tPatParser
+  <|> char '~' Prelude.*> pure TPat_Silence
 
 cP :: (Enumerable a, Parseable a) => String -> Pattern a
 cP s = innerJoin $ parseBP_E <$> _cX_ getS s
@@ -335,10 +346,10 @@ lexer :: P.GenTokenParser String u Data.Functor.Identity.Identity
 lexer   = P.makeTokenParser haskellDef
 
 braces, brackets, parens, angles:: MyParser a -> MyParser a
-braces  = P.braces lexer
-brackets = P.brackets lexer
-parens = P.parens lexer
-angles = P.angles lexer
+braces p = char '{' Prelude.*> p Prelude.<* char '}'
+brackets p = char '[' Prelude.*> p Prelude.<* char ']'
+parens p = char '(' Prelude.*> p Prelude.<* char ')'
+angles p = char '<' Prelude.*> p Prelude.<* char '>'
 
 symbol :: String -> MyParser String
 symbol  = P.symbol lexer

test/Sound/Tidal/ParseTest.hs

@@ -251,4 +251,28 @@ run =
         compareP (Arc 0 1)
           ("t*2t t" :: Pattern Bool)
           ("1*2%3 1" :: Pattern Bool)
+      it "does the same for '-' and '~' in simple patterns" $ do
+        compareP (Arc 0 1)
+          ("- 2" :: Pattern String)
+          ("~ 2" :: Pattern String)
+      it "does the same for '-' and '~' in complex patterns parsed as Rational" $ do
+        compareP (Arc 0 1)
+          ("[-- 2 <-- 2@7 3> 4%2 3? 4 9|8 -- [-- <2 9q> -]] 2!4" :: Pattern Rational)
+          ("[~~ 2 <~~ 2@7 3> 4%2 3? 4 9|8 ~~ [~~ <2 9q> ~]] 2!4" :: Pattern Rational)
+      it "does the same for '-' and '~' in complex patterns" $ do
+        compareP (Arc 0 1)
+          ("[-- 2 <-- 2@7 3> 1*4%2 3? 4 9|8 -- [-- <2 9q> -]] 2!4" :: Pattern String)
+          ("[~~ 2 <~~ 2@7 3> 1*4%2 3? 4 9|8 ~~ [~~ <2 9q> ~]] 2!4" :: Pattern String)
+      it "does the same for '-' and '~' using rational numbers" $ do
+        compareP (Arc 0 1)
+          ("- 2q -3.999-9" :: Pattern String)
+          ("~ 2q -3.999-9" :: Pattern String)
+      it "does the same for '-' and '~' in list patterns" $ do
+        compareP (Arc 0 1)
+          ("[-- 2 -- -]" :: Pattern String)
+          ("[~~ 2 ~~ ~]" :: Pattern String)
+      it "does the same for '-' and '~' alternating patterns" $ do
+        compareP (Arc 0 1)
+          ("<-- 2 -- - 8>" :: Pattern String)
+          ("<~~ 2 ~~ ~ 8>" :: Pattern String)
     where degradeByDefault = _degradeBy 0.5