diff --git a/CHANGELOG.md b/CHANGELOG.md index aaf5998..03266bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## 1.1.3.6 -- 30th January, 2018 -* Fix compatability with GHC-8.4/base-4.11 (by Herbert Valerio Riedel). +* Fix compatibility with GHC-8.4/base-4.11 (by Herbert Valerio Riedel). * Add in benchmarking framework (by Alfredo Di Napoli). ## 1.1.3.5 -- 1st February, 2017 @@ -36,7 +36,7 @@ ## 1.1.2.0 -- 25th December, 2014 * Merge in prettyclass package -- new Text.PrettyPrint.HughesPHClass. -* Add in 'maybe\*' variants of various bracket functins. +* Add in 'maybe\*' variants of various bracket functions. * Add Generic instances for appropriate data types. * Fix compilation under GHC 7.10 diff --git a/docs/new-pretty.md b/docs/new-pretty.md index 819525e..98e0f7b 100644 --- a/docs/new-pretty.md +++ b/docs/new-pretty.md @@ -33,7 +33,7 @@ dcoutts e.g. using the Text builder or the new bytestring builder davidt_ dcoutts: So far it seems as fast but I need to do more testing, hence I haven't pushed anything yet -davidt_ dcoutts: Yes adding PStr back in is one option but I also need to change LItString in GHC then to be backed by a bytestring which is a decent amount of work on a area thats already very boring +davidt_ dcoutts: Yes adding PStr back in is one option but I also need to change LItString in GHC then to be backed by a bytestring which is a decent amount of work on a area that's already very boring davidt_ dcoutts: as long as speed isn't lost I still feel a type class is better, you can generate different outputs yes but a fixed TextDetails still fixes the storage which isn't as nice as a type class imho diff --git a/src/Text/PrettyPrint/Annotated/HughesPJ.hs b/src/Text/PrettyPrint/Annotated/HughesPJ.hs index 58248e2..e680a46 100644 --- a/src/Text/PrettyPrint/Annotated/HughesPJ.hs +++ b/src/Text/PrettyPrint/Annotated/HughesPJ.hs @@ -633,7 +633,7 @@ above (Above p g1 q1) g2 q2 = above p g1 (above q1 g2 q2) above p@(Beside{}) g q = aboveNest (reduceDoc p) g 0 (reduceDoc q) above p g q = aboveNest p g 0 (reduceDoc q) --- Specfication: aboveNest p g k q = p $g$ (nest k q) +-- Specification: aboveNest p g k q = p $g$ (nest k q) aboveNest :: RDoc a -> Bool -> Int -> RDoc a -> RDoc a aboveNest _ _ k _ | k `seq` False = undefined aboveNest NoDoc _ _ _ = NoDoc @@ -1196,7 +1196,7 @@ renderDecoratedM startAnn endAnn txt docEnd = finalize (m,_) = m --- | Accepte a document with unit annotations and convert it to a document +-- | Accept a document with unit annotations and convert it to a document -- of an arbitrary annotated type. Removes any existing annotations. unitDocToAnnotatedDoc :: Doc () -> Doc a unitDocToAnnotatedDoc (TextBeside AnnotStart d) diff --git a/src/Text/PrettyPrint/Annotated/HughesPJClass.hs b/src/Text/PrettyPrint/Annotated/HughesPJClass.hs index c38e730..6b3fb01 100644 --- a/src/Text/PrettyPrint/Annotated/HughesPJClass.hs +++ b/src/Text/PrettyPrint/Annotated/HughesPJClass.hs @@ -12,7 +12,7 @@ -- Stability : stable -- Portability : portable -- --- Pretty printing class, simlar to 'Show' but nicer looking. +-- Pretty printing class, similar to 'Show' but nicer looking. -- -- Note that the precedence level is a 'Rational' so there is an unlimited -- number of levels. This module re-exports diff --git a/src/Text/PrettyPrint/HughesPJClass.hs b/src/Text/PrettyPrint/HughesPJClass.hs index 66e681a..cd95814 100644 --- a/src/Text/PrettyPrint/HughesPJClass.hs +++ b/src/Text/PrettyPrint/HughesPJClass.hs @@ -12,7 +12,7 @@ -- Stability : stable -- Portability : portable -- --- Pretty printing class, simlar to 'Show' but nicer looking. +-- Pretty printing class, similar to 'Show' but nicer looking. -- -- Note that the precedence level is a 'Rational' so there is an unlimited -- number of levels. This module re-exports 'Text.PrettyPrint.HughesPJ'. diff --git a/tests/Test.hs b/tests/Test.hs index 365fda6..f0777aa 100644 --- a/tests/Test.hs +++ b/tests/Test.hs @@ -655,7 +655,7 @@ check_invariants = do ==> layout1 <> (line1 $$ nest k2' lineK) When k1 - k2' < 0, we need to layout lineK with negative indentation - Here is a quick check property to ducment this. + Here is a quick check property to document this. -} prop_negative_indent :: CDoc -> Property prop_negative_indent cdoc = noNegNest cdoc ==> noNegSpaces (buildDoc cdoc) @@ -759,7 +759,7 @@ punctuateDef p ps = let (dsInit,dLast) = (init ps, last ps) in map (\d -> d <> p) dsInit ++ [dLast] --- (4) QuickChecking improvments and bug fixes +-- (4) QuickChecking improvements and bug fixes -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {-