trifecta 1.5 → 1.5.1
raw patch · 2 files changed
+14/−14 lines, 2 filesdep ~parsersPVP: major bump suggested
API removals or changes: PVP suggests a major version bump
Dependency ranges changed: parsers
API changes (from Hackage documentation)
- Text.Trifecta.Combinators: instance (MonadPlus m, DeltaParsing m, Monoid w, Show s, Show w) => DeltaParsing (RWST r w s m)
- Text.Trifecta.Combinators: instance (MonadPlus m, DeltaParsing m, Monoid w, Show w) => DeltaParsing (WriterT w m)
- Text.Trifecta.Combinators: instance (MonadPlus m, DeltaParsing m, Show s) => DeltaParsing (StateT s m)
- Text.Trifecta.Combinators: instance (MonadPlus m, MarkParsing d m, Monoid w, Show s, Show w) => MarkParsing d (RWST r w s m)
- Text.Trifecta.Combinators: instance (MonadPlus m, MarkParsing d m, Monoid w, Show w) => MarkParsing d (WriterT w m)
- Text.Trifecta.Combinators: instance (MonadPlus m, MarkParsing d m, Show s) => MarkParsing d (StateT s m)
+ Text.Trifecta.Combinators: instance (MonadPlus m, DeltaParsing m) => DeltaParsing (StateT s m)
+ Text.Trifecta.Combinators: instance (MonadPlus m, DeltaParsing m, Monoid w) => DeltaParsing (RWST r w s m)
+ Text.Trifecta.Combinators: instance (MonadPlus m, DeltaParsing m, Monoid w) => DeltaParsing (WriterT w m)
+ Text.Trifecta.Combinators: instance (MonadPlus m, MarkParsing d m) => MarkParsing d (StateT s m)
+ Text.Trifecta.Combinators: instance (MonadPlus m, MarkParsing d m, Monoid w) => MarkParsing d (RWST r w s m)
+ Text.Trifecta.Combinators: instance (MonadPlus m, MarkParsing d m, Monoid w) => MarkParsing d (WriterT w m)
- Text.Trifecta.Highlight: class HasHighlightDoc t_aruF where docContent = (highlightDoc . go_aruH) where go_aruH _f_aruI (HighlightDoc __docTitle_aruJ __docCss_aruK __docContent'_aruL) = ((\ __docContent_aruM -> HighlightDoc __docTitle_aruJ __docCss_aruK __docContent_aruM) <$> (_f_aruI __docContent'_aruL)) docCss = (highlightDoc . go_aruN) where go_aruN _f_aruO (HighlightDoc __docTitle_aruP __docCss'_aruQ __docContent_aruS) = ((\ __docCss_aruR -> HighlightDoc __docTitle_aruP __docCss_aruR __docContent_aruS) <$> (_f_aruO __docCss'_aruQ)) docTitle = (highlightDoc . go_aruT) where go_aruT _f_aruU (HighlightDoc __docTitle'_aruV __docCss_aruX __docContent_aruY) = ((\ __docTitle_aruW -> HighlightDoc __docTitle_aruW __docCss_aruX __docContent_aruY) <$> (_f_aruU __docTitle'_aruV))
+ Text.Trifecta.Highlight: class HasHighlightDoc t_arwx where docContent = (highlightDoc . go_arwz) where go_arwz _f_arwA (HighlightDoc __docTitle_arwB __docCss_arwC __docContent'_arwD) = ((\ __docContent_arwE -> HighlightDoc __docTitle_arwB __docCss_arwC __docContent_arwE) <$> (_f_arwA __docContent'_arwD)) docCss = (highlightDoc . go_arwF) where go_arwF _f_arwG (HighlightDoc __docTitle_arwH __docCss'_arwI __docContent_arwK) = ((\ __docCss_arwJ -> HighlightDoc __docTitle_arwH __docCss_arwJ __docContent_arwK) <$> (_f_arwG __docCss'_arwI)) docTitle = (highlightDoc . go_arwL) where go_arwL _f_arwM (HighlightDoc __docTitle'_arwN __docCss_arwP __docContent_arwQ) = ((\ __docTitle_arwO -> HighlightDoc __docTitle_arwO __docCss_arwP __docContent_arwQ) <$> (_f_arwM __docTitle'_arwN))
- Text.Trifecta.Highlight: class HasHighlightedRope t_ar4O where ropeContent = (highlightedRope . go_ar4Q) where go_ar4Q _f_ar4R (HighlightedRope __ropeHighlights_ar4S __ropeContent'_ar4T) = ((\ __ropeContent_ar4U -> HighlightedRope __ropeHighlights_ar4S __ropeContent_ar4U) <$> (_f_ar4R __ropeContent'_ar4T)) ropeHighlights = (highlightedRope . go_ar4V) where go_ar4V _f_ar4W (HighlightedRope __ropeHighlights'_ar4X __ropeContent_ar4Z) = ((\ __ropeHighlights_ar4Y -> HighlightedRope __ropeHighlights_ar4Y __ropeContent_ar4Z) <$> (_f_ar4W __ropeHighlights'_ar4X))
+ Text.Trifecta.Highlight: class HasHighlightedRope t_ar5P where ropeContent = (highlightedRope . go_ar5R) where go_ar5R _f_ar5S (HighlightedRope __ropeHighlights_ar5T __ropeContent'_ar5U) = ((\ __ropeContent_ar5V -> HighlightedRope __ropeHighlights_ar5T __ropeContent_ar5V) <$> (_f_ar5S __ropeContent'_ar5U)) ropeHighlights = (highlightedRope . go_ar5W) where go_ar5W _f_ar5X (HighlightedRope __ropeHighlights'_ar5Y __ropeContent_ar60) = ((\ __ropeHighlights_ar5Z -> HighlightedRope __ropeHighlights_ar5Z __ropeContent_ar60) <$> (_f_ar5X __ropeHighlights'_ar5Y))
- Text.Trifecta.Highlight: docContent :: HasHighlightDoc t_aruF => Lens' t_aruF HighlightedRope
+ Text.Trifecta.Highlight: docContent :: HasHighlightDoc t_arwx => Lens' t_arwx HighlightedRope
- Text.Trifecta.Highlight: docCss :: HasHighlightDoc t_aruF => Lens' t_aruF String
+ Text.Trifecta.Highlight: docCss :: HasHighlightDoc t_arwx => Lens' t_arwx String
- Text.Trifecta.Highlight: docTitle :: HasHighlightDoc t_aruF => Lens' t_aruF String
+ Text.Trifecta.Highlight: docTitle :: HasHighlightDoc t_arwx => Lens' t_arwx String
- Text.Trifecta.Highlight: highlightDoc :: HasHighlightDoc t_aruF => Lens' t_aruF HighlightDoc
+ Text.Trifecta.Highlight: highlightDoc :: HasHighlightDoc t_arwx => Lens' t_arwx HighlightDoc
- Text.Trifecta.Highlight: highlightedRope :: HasHighlightedRope t_ar4O => Lens' t_ar4O HighlightedRope
+ Text.Trifecta.Highlight: highlightedRope :: HasHighlightedRope t_ar5P => Lens' t_ar5P HighlightedRope
- Text.Trifecta.Highlight: ropeContent :: HasHighlightedRope t_ar4O => Lens' t_ar4O Rope
+ Text.Trifecta.Highlight: ropeContent :: HasHighlightedRope t_ar5P => Lens' t_ar5P Rope
- Text.Trifecta.Highlight: ropeHighlights :: HasHighlightedRope t_ar4O => Lens' t_ar4O (IntervalMap Delta Highlight)
+ Text.Trifecta.Highlight: ropeHighlights :: HasHighlightedRope t_ar5P => Lens' t_ar5P (IntervalMap Delta Highlight)
- Text.Trifecta.Rendering: class HasFixit t_awjB where fixitReplacement = (fixit . go_awjD) where go_awjD _f_awjE (Fixit __fixitSpan_awjF __fixitReplacement'_awjG) = ((\ __fixitReplacement_awjH -> Fixit __fixitSpan_awjF __fixitReplacement_awjH) <$> (_f_awjE __fixitReplacement'_awjG)) fixitSpan = (fixit . go_awjI) where go_awjI _f_awjJ (Fixit __fixitSpan'_awjK __fixitReplacement_awjM) = ((\ __fixitSpan_awjL -> Fixit __fixitSpan_awjL __fixitReplacement_awjM) <$> (_f_awjJ __fixitSpan'_awjK))
+ Text.Trifecta.Rendering: class HasFixit t_awlG where fixitReplacement = (fixit . go_awlI) where go_awlI _f_awlJ (Fixit __fixitSpan_awlK __fixitReplacement'_awlL) = ((\ __fixitReplacement_awlM -> Fixit __fixitSpan_awlK __fixitReplacement_awlM) <$> (_f_awlJ __fixitReplacement'_awlL)) fixitSpan = (fixit . go_awlN) where go_awlN _f_awlO (Fixit __fixitSpan'_awlP __fixitReplacement_awlR) = ((\ __fixitSpan_awlQ -> Fixit __fixitSpan_awlQ __fixitReplacement_awlR) <$> (_f_awlO __fixitSpan'_awlP))
- Text.Trifecta.Rendering: class HasRendering t_avzB where renderingDelta = (rendering . go_avzD) where go_avzD _f_avzE (Rendering __renderingDelta'_avzF __renderingLineLen_avzH __renderingLineBytes_avzI __renderingLine_avzJ __renderingOverlays_avzK) = ((\ __renderingDelta_avzG -> Rendering __renderingDelta_avzG __renderingLineLen_avzH __renderingLineBytes_avzI __renderingLine_avzJ __renderingOverlays_avzK) <$> (_f_avzE __renderingDelta'_avzF)) renderingLine = (rendering . go_avzL) where go_avzL _f_avzM (Rendering __renderingDelta_avzN __renderingLineLen_avzO __renderingLineBytes_avzP __renderingLine'_avzQ __renderingOverlays_avzS) = ((\ __renderingLine_avzR -> Rendering __renderingDelta_avzN __renderingLineLen_avzO __renderingLineBytes_avzP __renderingLine_avzR __renderingOverlays_avzS) <$> (_f_avzM __renderingLine'_avzQ)) renderingLineBytes = (rendering . go_avzT) where go_avzT _f_avzU (Rendering __renderingDelta_avzV __renderingLineLen_avzW __renderingLineBytes'_avzX __renderingLine_avzZ __renderingOverlays_avA0) = ((\ __renderingLineBytes_avzY -> Rendering __renderingDelta_avzV __renderingLineLen_avzW __renderingLineBytes_avzY __renderingLine_avzZ __renderingOverlays_avA0) <$> (_f_avzU __renderingLineBytes'_avzX)) renderingLineLen = (rendering . go_avA1) where go_avA1 _f_avA2 (Rendering __renderingDelta_avA3 __renderingLineLen'_avA4 __renderingLineBytes_avA6 __renderingLine_avA7 __renderingOverlays_avA8) = ((\ __renderingLineLen_avA5 -> Rendering __renderingDelta_avA3 __renderingLineLen_avA5 __renderingLineBytes_avA6 __renderingLine_avA7 __renderingOverlays_avA8) <$> (_f_avA2 __renderingLineLen'_avA4)) renderingOverlays = (rendering . go_avA9) where go_avA9 _f_avAa (Rendering __renderingDelta_avAb __renderingLineLen_avAc __renderingLineBytes_avAd __renderingLine_avAe __renderingOverlays'_avAf) = ((\ __renderingOverlays_avAg -> Rendering __renderingDelta_avAb __renderingLineLen_avAc __renderingLineBytes_avAd __renderingLine_avAe __renderingOverlays_avAg) <$> (_f_avAa __renderingOverlays'_avAf))
+ Text.Trifecta.Rendering: class HasRendering t_avBy where renderingDelta = (rendering . go_avBA) where go_avBA _f_avBB (Rendering __renderingDelta'_avBC __renderingLineLen_avBE __renderingLineBytes_avBF __renderingLine_avBG __renderingOverlays_avBH) = ((\ __renderingDelta_avBD -> Rendering __renderingDelta_avBD __renderingLineLen_avBE __renderingLineBytes_avBF __renderingLine_avBG __renderingOverlays_avBH) <$> (_f_avBB __renderingDelta'_avBC)) renderingLine = (rendering . go_avBI) where go_avBI _f_avBJ (Rendering __renderingDelta_avBK __renderingLineLen_avBL __renderingLineBytes_avBM __renderingLine'_avBN __renderingOverlays_avBP) = ((\ __renderingLine_avBO -> Rendering __renderingDelta_avBK __renderingLineLen_avBL __renderingLineBytes_avBM __renderingLine_avBO __renderingOverlays_avBP) <$> (_f_avBJ __renderingLine'_avBN)) renderingLineBytes = (rendering . go_avBQ) where go_avBQ _f_avBR (Rendering __renderingDelta_avBS __renderingLineLen_avBT __renderingLineBytes'_avBU __renderingLine_avBW __renderingOverlays_avBX) = ((\ __renderingLineBytes_avBV -> Rendering __renderingDelta_avBS __renderingLineLen_avBT __renderingLineBytes_avBV __renderingLine_avBW __renderingOverlays_avBX) <$> (_f_avBR __renderingLineBytes'_avBU)) renderingLineLen = (rendering . go_avBY) where go_avBY _f_avBZ (Rendering __renderingDelta_avC0 __renderingLineLen'_avC1 __renderingLineBytes_avC3 __renderingLine_avC4 __renderingOverlays_avC5) = ((\ __renderingLineLen_avC2 -> Rendering __renderingDelta_avC0 __renderingLineLen_avC2 __renderingLineBytes_avC3 __renderingLine_avC4 __renderingOverlays_avC5) <$> (_f_avBZ __renderingLineLen'_avC1)) renderingOverlays = (rendering . go_avC6) where go_avC6 _f_avC7 (Rendering __renderingDelta_avC8 __renderingLineLen_avC9 __renderingLineBytes_avCa __renderingLine_avCb __renderingOverlays'_avCc) = ((\ __renderingOverlays_avCd -> Rendering __renderingDelta_avC8 __renderingLineLen_avC9 __renderingLineBytes_avCa __renderingLine_avCb __renderingOverlays_avCd) <$> (_f_avC7 __renderingOverlays'_avCc))
- Text.Trifecta.Rendering: fixit :: HasFixit t_awjB => Lens' t_awjB Fixit
+ Text.Trifecta.Rendering: fixit :: HasFixit t_awlG => Lens' t_awlG Fixit
- Text.Trifecta.Rendering: fixitReplacement :: HasFixit t_awjB => Lens' t_awjB ByteString
+ Text.Trifecta.Rendering: fixitReplacement :: HasFixit t_awlG => Lens' t_awlG ByteString
- Text.Trifecta.Rendering: fixitSpan :: HasFixit t_awjB => Lens' t_awjB Span
+ Text.Trifecta.Rendering: fixitSpan :: HasFixit t_awlG => Lens' t_awlG Span
- Text.Trifecta.Rendering: rendering :: HasRendering t_avzB => Lens' t_avzB Rendering
+ Text.Trifecta.Rendering: rendering :: HasRendering t_avBy => Lens' t_avBy Rendering
- Text.Trifecta.Rendering: renderingDelta :: HasRendering t_avzB => Lens' t_avzB Delta
+ Text.Trifecta.Rendering: renderingDelta :: HasRendering t_avBy => Lens' t_avBy Delta
- Text.Trifecta.Rendering: renderingLine :: HasRendering t_avzB => Lens' t_avzB (Lines -> Lines)
+ Text.Trifecta.Rendering: renderingLine :: HasRendering t_avBy => Lens' t_avBy (Lines -> Lines)
- Text.Trifecta.Rendering: renderingLineBytes :: HasRendering t_avzB => Lens' t_avzB Int64
+ Text.Trifecta.Rendering: renderingLineBytes :: HasRendering t_avBy => Lens' t_avBy Int64
- Text.Trifecta.Rendering: renderingLineLen :: HasRendering t_avzB => Lens' t_avzB Int64
+ Text.Trifecta.Rendering: renderingLineLen :: HasRendering t_avBy => Lens' t_avBy Int64
- Text.Trifecta.Rendering: renderingOverlays :: HasRendering t_avzB => Lens' t_avzB (Delta -> Lines -> Lines)
+ Text.Trifecta.Rendering: renderingOverlays :: HasRendering t_avBy => Lens' t_avBy (Delta -> Lines -> Lines)
- Text.Trifecta.Result: class HasErr t_a14Rl where expected = (err . go_a14Rn) where go_a14Rn _f_a14Ro (Err __reason_a14Rp __footnotes_a14Rq __expected'_a14Rr) = ((\ __expected_a14Rs -> Err __reason_a14Rp __footnotes_a14Rq __expected_a14Rs) <$> (_f_a14Ro __expected'_a14Rr)) footnotes = (err . go_a14Rt) where go_a14Rt _f_a14Ru (Err __reason_a14Rv __footnotes'_a14Rw __expected_a14Ry) = ((\ __footnotes_a14Rx -> Err __reason_a14Rv __footnotes_a14Rx __expected_a14Ry) <$> (_f_a14Ru __footnotes'_a14Rw)) reason = (err . go_a14Rz) where go_a14Rz _f_a14RA (Err __reason'_a14RB __footnotes_a14RD __expected_a14RE) = ((\ __reason_a14RC -> Err __reason_a14RC __footnotes_a14RD __expected_a14RE) <$> (_f_a14RA __reason'_a14RB))
+ Text.Trifecta.Result: class HasErr t_a14M7 where expected = (err . go_a14M9) where go_a14M9 _f_a14Ma (Err __reason_a14Mb __footnotes_a14Mc __expected'_a14Md) = ((\ __expected_a14Me -> Err __reason_a14Mb __footnotes_a14Mc __expected_a14Me) <$> (_f_a14Ma __expected'_a14Md)) footnotes = (err . go_a14Mf) where go_a14Mf _f_a14Mg (Err __reason_a14Mh __footnotes'_a14Mi __expected_a14Mk) = ((\ __footnotes_a14Mj -> Err __reason_a14Mh __footnotes_a14Mj __expected_a14Mk) <$> (_f_a14Mg __footnotes'_a14Mi)) reason = (err . go_a14Ml) where go_a14Ml _f_a14Mm (Err __reason'_a14Mn __footnotes_a14Mp __expected_a14Mq) = ((\ __reason_a14Mo -> Err __reason_a14Mo __footnotes_a14Mp __expected_a14Mq) <$> (_f_a14Mm __reason'_a14Mn))
- Text.Trifecta.Result: err :: HasErr t_a14Rl => Lens' t_a14Rl Err
+ Text.Trifecta.Result: err :: HasErr t_a14M7 => Lens' t_a14M7 Err
- Text.Trifecta.Result: expected :: HasErr t_a14Rl => Lens' t_a14Rl (Set String)
+ Text.Trifecta.Result: expected :: HasErr t_a14M7 => Lens' t_a14M7 (Set String)
- Text.Trifecta.Result: footnotes :: HasErr t_a14Rl => Lens' t_a14Rl [Doc]
+ Text.Trifecta.Result: footnotes :: HasErr t_a14M7 => Lens' t_a14M7 [Doc]
- Text.Trifecta.Result: reason :: HasErr t_a14Rl => Lens' t_a14Rl (Maybe Doc)
+ Text.Trifecta.Result: reason :: HasErr t_a14M7 => Lens' t_a14M7 (Maybe Doc)
Files
- src/Text/Trifecta/Combinators.hs +12/−12
- trifecta.cabal +2/−2
src/Text/Trifecta/Combinators.hs view
@@ -67,7 +67,7 @@ restOfLine = Strict.drop . fromIntegral . columnByte <$> position <*> line {-# INLINE restOfLine #-} -instance (MonadPlus m, DeltaParsing m, Show s) => DeltaParsing (Lazy.StateT s m) where+instance (MonadPlus m, DeltaParsing m) => DeltaParsing (Lazy.StateT s m) where line = lift line {-# INLINE line #-} position = lift position@@ -79,7 +79,7 @@ restOfLine = lift restOfLine {-# INLINE restOfLine #-} -instance (MonadPlus m, DeltaParsing m, Show s) => DeltaParsing (Strict.StateT s m) where+instance (MonadPlus m, DeltaParsing m) => DeltaParsing (Strict.StateT s m) where line = lift line {-# INLINE line #-} position = lift position@@ -103,7 +103,7 @@ restOfLine = lift restOfLine {-# INLINE restOfLine #-} -instance (MonadPlus m, DeltaParsing m, Monoid w, Show w) => DeltaParsing (Strict.WriterT w m) where+instance (MonadPlus m, DeltaParsing m, Monoid w) => DeltaParsing (Strict.WriterT w m) where line = lift line {-# INLINE line #-} position = lift position@@ -115,7 +115,7 @@ restOfLine = lift restOfLine {-# INLINE restOfLine #-} -instance (MonadPlus m, DeltaParsing m, Monoid w, Show w) => DeltaParsing (Lazy.WriterT w m) where+instance (MonadPlus m, DeltaParsing m, Monoid w) => DeltaParsing (Lazy.WriterT w m) where line = lift line {-# INLINE line #-} position = lift position@@ -127,7 +127,7 @@ restOfLine = lift restOfLine {-# INLINE restOfLine #-} -instance (MonadPlus m, DeltaParsing m, Monoid w, Show s, Show w) => DeltaParsing (Lazy.RWST r w s m) where+instance (MonadPlus m, DeltaParsing m, Monoid w) => DeltaParsing (Lazy.RWST r w s m) where line = lift line {-# INLINE line #-} position = lift position@@ -139,7 +139,7 @@ restOfLine = lift restOfLine {-# INLINE restOfLine #-} -instance (MonadPlus m, DeltaParsing m, Monoid w, Show s, Show w) => DeltaParsing (Strict.RWST r w s m) where+instance (MonadPlus m, DeltaParsing m, Monoid w) => DeltaParsing (Strict.RWST r w s m) where line = lift line {-# INLINE line #-} position = lift position@@ -201,13 +201,13 @@ -- | Seek a previously marked location release :: d -> m () -instance (MonadPlus m, MarkParsing d m, Show s) => MarkParsing d (Lazy.StateT s m) where+instance (MonadPlus m, MarkParsing d m) => MarkParsing d (Lazy.StateT s m) where mark = lift mark {-# INLINE mark #-} release = lift . release {-# INLINE release #-} -instance (MonadPlus m, MarkParsing d m, Show s) => MarkParsing d (Strict.StateT s m) where+instance (MonadPlus m, MarkParsing d m) => MarkParsing d (Strict.StateT s m) where mark = lift mark {-# INLINE mark #-} release = lift . release@@ -219,25 +219,25 @@ release = lift . release {-# INLINE release #-} -instance (MonadPlus m, MarkParsing d m, Monoid w, Show w) => MarkParsing d (Strict.WriterT w m) where+instance (MonadPlus m, MarkParsing d m, Monoid w) => MarkParsing d (Strict.WriterT w m) where mark = lift mark {-# INLINE mark #-} release = lift . release {-# INLINE release #-} -instance (MonadPlus m, MarkParsing d m, Monoid w, Show w) => MarkParsing d (Lazy.WriterT w m) where+instance (MonadPlus m, MarkParsing d m, Monoid w) => MarkParsing d (Lazy.WriterT w m) where mark = lift mark {-# INLINE mark #-} release = lift . release {-# INLINE release #-} -instance (MonadPlus m, MarkParsing d m, Monoid w, Show s, Show w) => MarkParsing d (Lazy.RWST r w s m) where+instance (MonadPlus m, MarkParsing d m, Monoid w) => MarkParsing d (Lazy.RWST r w s m) where mark = lift mark {-# INLINE mark #-} release = lift . release {-# INLINE release #-} -instance (MonadPlus m, MarkParsing d m, Monoid w, Show s, Show w) => MarkParsing d (Strict.RWST r w s m) where+instance (MonadPlus m, MarkParsing d m, Monoid w) => MarkParsing d (Strict.RWST r w s m) where mark = lift mark {-# INLINE mark #-} release = lift . release
trifecta.cabal view
@@ -1,6 +1,6 @@ name: trifecta category: Text, Parsing, Diagnostics, Pretty Printer, Logging-version: 1.5+version: 1.5.1 license: BSD3 cabal-version: >= 1.10 license-file: LICENSE@@ -58,7 +58,7 @@ hashable >= 1.2.1 && < 1.3, lens >= 4.0 && < 5, mtl >= 2.0.1 && < 2.3,- parsers >= 0.10 && < 1,+ parsers >= 0.12.1 && < 1, reducers >= 3.10 && < 4, semigroups >= 0.8.3.1 && < 1, transformers >= 0.2 && < 0.5,