diff --git a/opentheory-parser.cabal b/opentheory-parser.cabal --- a/opentheory-parser.cabal +++ b/opentheory-parser.cabal @@ -1,16 +1,16 @@ name: opentheory-parser -version: 1.105 +version: 1.115 category: Parsing -synopsis: Simple stream parsers +synopsis: Stream parsers license: MIT license-file: LICENSE cabal-version: >= 1.8.0.6 build-type: Simple -author: Joe Hurd -maintainer: Joe Hurd +author: Joe Leslie-Hurd +maintainer: Joe Leslie-Hurd description: - Simple stream parsers - Automatically generated from the opentheory package haskell-parser-1.105 + Stream parsers - automatically generated from the opentheory package + haskell-parser-1.115 library build-depends: @@ -18,7 +18,7 @@ random >= 1.0.1.1 && < 2.0, QuickCheck >= 2.4.0.1 && < 3.0, opentheory-primitive >= 1.0 && < 2.0, - opentheory == 1.61 + opentheory >= 1.73 && <= 1.74 hs-source-dirs: src @@ -34,7 +34,7 @@ random >= 1.0.1.1 && < 2.0, QuickCheck >= 2.4.0.1 && < 3.0, opentheory-primitive >= 1.0 && < 2.0, - opentheory == 1.61 + opentheory >= 1.73 && <= 1.74 hs-source-dirs: src, testsrc diff --git a/src/OpenTheory/Parser.hs b/src/OpenTheory/Parser.hs --- a/src/OpenTheory/Parser.hs +++ b/src/OpenTheory/Parser.hs @@ -1,9 +1,9 @@ {- | module: $Header$ -description: Simple stream parsers +description: Stream parsers license: MIT -maintainer: Joe Hurd +maintainer: Joe Leslie-Hurd stability: provisional portability: portable -} diff --git a/src/OpenTheory/Parser/Stream.hs b/src/OpenTheory/Parser/Stream.hs --- a/src/OpenTheory/Parser/Stream.hs +++ b/src/OpenTheory/Parser/Stream.hs @@ -1,9 +1,9 @@ {- | module: $Header$ -description: Simple stream parsers +description: Stream parsers license: MIT -maintainer: Joe Hurd +maintainer: Joe Leslie-Hurd stability: provisional portability: portable -} diff --git a/testsrc/Test.hs b/testsrc/Test.hs --- a/testsrc/Test.hs +++ b/testsrc/Test.hs @@ -1,9 +1,9 @@ {- | module: Main -description: Simple stream parsers - testing +description: Stream parsers - testing license: MIT -maintainer: Joe Hurd +maintainer: Joe Leslie-Hurd stability: provisional portability: portable -} @@ -23,7 +23,7 @@ proposition0 r = let (l, _) = Data.List.Geometric.fromRandom Number.Natural.fromRandom r in - Parser.Stream.size (Parser.Stream.fromList l) == Data.List.size l + Parser.Stream.size (Parser.Stream.fromList l) == Data.List.length' l proposition1 :: Primitive.Random.Random -> Bool proposition1 r = @@ -37,7 +37,7 @@ let (s, _) = Parser.Stream.fromRandom Number.Natural.fromRandom r in case Parser.Stream.toList s of Nothing -> True - Just l -> Data.List.size l == Parser.Stream.size s + Just l -> Data.List.length' l == Parser.Stream.size s proposition3 :: Primitive.Random.Random -> Bool proposition3 r = @@ -45,7 +45,7 @@ Data.List.Geometric.fromRandom Number.Natural.fromRandom r in let (s, _) = Parser.Stream.fromRandom Number.Natural.fromRandom r' in Parser.Stream.size (Parser.Stream.append l s) == - Data.List.size l + Parser.Stream.size s + Data.List.length' l + Parser.Stream.size s proposition4 :: Primitive.Random.Random -> Bool proposition4 r = @@ -60,9 +60,9 @@ main :: IO () main = - do Primitive.Test.check "Proposition 0:\n !r.\n let (l, r') <- H.Geometric.fromRandom H.fromRandom r in\n H.Stream.size (H.Stream.fromList l) = H.size l\n " proposition0 + do Primitive.Test.check "Proposition 0:\n !r.\n let (l, r') <- H.Geometric.fromRandom H.fromRandom r in\n H.Stream.size (H.Stream.fromList l) = H.length' l\n " proposition0 Primitive.Test.check "Proposition 1:\n !r.\n let (l, r') <- H.Geometric.fromRandom H.fromRandom r in\n H.equal (H.equal (=)) (H.Stream.toList (H.Stream.fromList l)) (some l)\n " proposition1 - Primitive.Test.check "Proposition 2:\n !r.\n let (s, r') <- H.Stream.fromRandom H.fromRandom r in\n case H.Stream.toList s of\n none -> T\n | some l -> H.size l = H.Stream.size s\n " proposition2 - Primitive.Test.check "Proposition 3:\n !r.\n let (l, r') <- H.Geometric.fromRandom H.fromRandom r in\n let (s, r'') <- H.Stream.fromRandom H.fromRandom r' in\n H.Stream.size (H.Stream.append l s) = H.size l + H.Stream.size s\n " proposition3 + Primitive.Test.check "Proposition 2:\n !r.\n let (s, r') <- H.Stream.fromRandom H.fromRandom r in\n case H.Stream.toList s of\n none -> T\n | some l -> H.length' l = H.Stream.size s\n " proposition2 + Primitive.Test.check "Proposition 3:\n !r.\n let (l, r') <- H.Geometric.fromRandom H.fromRandom r in\n let (s, r'') <- H.Stream.fromRandom H.fromRandom r' in\n H.Stream.size (H.Stream.append l s) = H.length' l + H.Stream.size s\n " proposition3 Primitive.Test.check "Proposition 4:\n !r.\n let (l, r') <- H.Geometric.fromRandom H.fromRandom r in\n let (s, r'') <- H.Stream.fromRandom H.fromRandom r' in\n H.equal (H.equal (=)) (H.Stream.toList (H.Stream.append l s))\n (case H.Stream.toList s of none -> none | some ls -> some (l @ ls))\n " proposition4 return ()