diff --git a/changelog b/changelog new file mode 100644 --- /dev/null +++ b/changelog @@ -0,0 +1,5 @@ +0.22.0.2 + + * updates for new Rainbow API + + * test with GHC 7.8.2 diff --git a/current-versions.txt b/current-versions.txt --- a/current-versions.txt +++ b/current-versions.txt @@ -1,47 +1,49 @@ This package was tested to work with these dependency versions and compiler version. These are the default versions fetched by cabal install. -Tested as of: 2014-03-02 01:48:34.516774 UTC -Path to compiler: ghc-7.6.3 -Compiler description: 7.6.3 +Tested as of: 2014-04-13 22:50:48.223408 UTC +Path to compiler: ghc-7.8.2 +Compiler description: 7.8.2 -/opt/ghc-7.6.3/lib/ghc-7.6.3/package.conf.d: - Cabal-1.16.0 - array-0.4.0.1 - base-4.6.0.1 +/opt/ghc/7.8.2/lib/ghc-7.8.2/package.conf.d: + Cabal-1.18.1.3 + array-0.5.0.0 + base-4.7.0.0 bin-package-db-0.0.0.0 - binary-0.5.1.1 - bytestring-0.10.0.2 - containers-0.5.0.0 - deepseq-1.3.0.1 - directory-1.2.0.1 - filepath-1.3.0.1 - (ghc-7.6.3) - ghc-prim-0.3.0.0 - (haskell2010-1.1.1.0) - (haskell98-2.0.0.2) - hoopl-3.9.0.0 - hpc-0.6.0.0 - integer-gmp-0.5.0.0 - old-locale-1.0.0.5 - old-time-1.1.0.1 - pretty-1.1.1.0 - process-1.1.0.2 + binary-0.7.1.0 rts-1.0 - template-haskell-2.8.0.0 - time-1.4.0.1 - unix-2.6.0.1 + bytestring-0.10.4.0 + containers-0.5.5.1 + deepseq-1.3.0.2 + directory-1.2.1.0 + filepath-1.3.0.2 + (ghc-7.8.2) + ghc-prim-0.3.1.0 + (haskell2010-1.1.2.0) + (haskell98-2.0.0.3) + hoopl-3.10.0.1 + hpc-0.6.0.1 + integer-gmp-0.5.1.0 + old-locale-1.0.0.6 + old-time-1.1.0.2 + pretty-1.1.1.1 + process-1.2.0.0 + template-haskell-2.9.0.0 + time-1.4.2 + transformers-0.3.0.0 + unix-2.7.0.1 -/home/massysett/prednote/sunlight-20181/db: - QuickCheck-2.6 +/home/massysett/prednote/sunlight-22866/db: + QuickCheck-2.7.3 contravariant-0.4.4 - prednote-0.22.0.0 - rainbow-0.6.0.4 + prednote-0.22.0.2 + primitive-0.5.2.1 + rainbow-0.14.0.0 random-1.0.1.1 split-0.2.2 - tagged-0.7 + tagged-0.7.1 terminfo-0.4.0.0 - text-1.1.0.0 - transformers-0.3.0.0 + text-1.1.0.1 + tf-random-0.5 transformers-compat-0.1.1.1 diff --git a/lib/Data/Prednote/Expressions/RPN.hs b/lib/Data/Prednote/Expressions/RPN.hs --- a/lib/Data/Prednote/Expressions/RPN.hs +++ b/lib/Data/Prednote/Expressions/RPN.hs @@ -78,6 +78,7 @@ xs -> Left $ "bad expression: multiple operands left on the stack:\n" <> ( X.concat + . concat . map C.text . concatMap (P.showPredbox 4 0) $ xs ) diff --git a/lib/Data/Prednote/Predbox.hs b/lib/Data/Prednote/Predbox.hs --- a/lib/Data/Prednote/Predbox.hs +++ b/lib/Data/Prednote/Predbox.hs @@ -268,7 +268,7 @@ -- | Creates a plain Chunk from a Text. plain :: Text -> R.Chunk -plain = R.Chunk mempty +plain = R.Chunk mempty . (:[]) -- | Shows a Predbox tree without evaluating it. showPredbox :: IndentAmt -> Level -> Predbox a -> [R.Chunk] @@ -284,6 +284,7 @@ instance Show (Predbox a) where show = X.unpack . X.concat + . concat . map R.text . showPredbox 2 0 @@ -308,7 +309,7 @@ close = "]" blank = plain (X.replicate blankLen " ") blankLen = X.length "discard" - - X.length (R.text trueFalse) + 1 + - (sum . map X.length . R.text $ trueFalse) + 1 txt = plain t type ShowAll = Bool diff --git a/lib/Data/Prednote/Test.hs b/lib/Data/Prednote/Test.hs --- a/lib/Data/Prednote/Test.hs +++ b/lib/Data/Prednote/Test.hs @@ -113,7 +113,7 @@ -- | Creates a plain Chunk from a Text. plain :: X.Text -> R.Chunk -plain = R.Chunk mempty +plain = R.Chunk mempty . (:[]) showTestTitle :: Name -> Pass -> [R.Chunk] showTestTitle n p = [open, passFail, close, blank, txt, nl] diff --git a/minimum-versions.txt b/minimum-versions.txt --- a/minimum-versions.txt +++ b/minimum-versions.txt @@ -1,7 +1,7 @@ This package was tested to work with these dependency versions and compiler version. These are the minimum versions given in the .cabal file. -Tested as of: 2014-03-02 01:48:34.516774 UTC +Tested as of: 2014-04-13 22:50:48.223408 UTC Path to compiler: ghc-7.4.1 Compiler description: 7.4.1 @@ -33,11 +33,11 @@ time-1.4 unix-2.5.1.0 -/home/massysett/prednote/sunlight-20181/db: +/home/massysett/prednote/sunlight-22866/db: QuickCheck-2.6 contravariant-0.2.0.1 - prednote-0.22.0.0 - rainbow-0.6.0.4 + prednote-0.22.0.2 + rainbow-0.14.0.0 random-1.0.1.1 split-0.2.2 terminfo-0.4.0.0 diff --git a/prednote.cabal b/prednote.cabal --- a/prednote.cabal +++ b/prednote.cabal @@ -1,5 +1,5 @@ name: prednote -version: 0.22.0.0 +version: 0.22.0.2 synopsis: Build and evaluate trees of predicates description: Build and evaluate trees of predicates. For example, you might build @@ -22,9 +22,9 @@ cabal-version: >=1.8 extra-source-files: README.md, minimum-versions.txt, current-versions.txt, - sunlight-test.hs + sunlight-test.hs, changelog -tested-with: GHC ==7.4.1, GHC ==7.6.3 +tested-with: GHC ==7.4.1, GHC ==7.6.3, GHC ==7.8.2 source-repository head type: git @@ -43,7 +43,7 @@ build-depends: base >= 4.5.0.0 && < 5 , contravariant >= 0.2.0.1 - , rainbow >=0.6.0.4 + , rainbow >=0.14.0.0 && < 0.15 , split >=0.2.2 , text >= 0.11.2.0 @@ -59,6 +59,6 @@ base >=4.5.0.0 && < 5 , contravariant >= 0.2.0.1 , QuickCheck >=2.6 - , rainbow >=0.6.0.4 + , rainbow >=0.14.0.0 && < 0.15 , text >= 0.11.2.0 diff --git a/sunlight-test.hs b/sunlight-test.hs --- a/sunlight-test.hs +++ b/sunlight-test.hs @@ -7,7 +7,8 @@ , tiCabal = "cabal" , tiLowest = ("7.4.1", "ghc-7.4.1", "ghc-pkg-7.4.1") , tiDefault = [ ("7.4.1", "ghc-7.4.1", "ghc-pkg-7.4.1") - , ("7.6.3", "ghc-7.6.3", "ghc-pkg-7.6.3") ] + , ("7.6.3", "ghc-7.6.3", "ghc-pkg-7.6.3") + , ("7.8.2", "ghc-7.8.2", "ghc-pkg-7.8.2") ] , tiTest = [("dist/build/prednote-test/prednote-test", [])] }