From 0bdcf415e4eff83ad8e35c1d41c8a28e0bbd5da1 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Tue, 28 Sep 2021 21:17:53 -0700 Subject: Switch from pretty-simple to pretty-show for native output. Update tests. Reason: it turns out that the native output generated by pretty-simple isn't always readable by the native reader. According to https://github.com/cdepillabout/pretty-simple/issues/99 it is not a design goal of the library that the rendered values be readable using 'read'. This makes it unsuitable for our purposes. pretty-show is a bit slower and it uses 4-space indents (non-configurable), but it doesn't have this serious drawback. --- test/lhs-test-markdown.native | 244 ++++++++++++++++++++---------------------- 1 file changed, 119 insertions(+), 125 deletions(-) (limited to 'test/lhs-test-markdown.native') diff --git a/test/lhs-test-markdown.native b/test/lhs-test-markdown.native index db2acd318..42a32697b 100644 --- a/test/lhs-test-markdown.native +++ b/test/lhs-test-markdown.native @@ -1,130 +1,124 @@ -[ Header 1 - ( "lhs-test", [], [] ) - [ Str "lhs", Space, Str "test" ] +[ Header + 1 + ( "lhs-test" , [] , [] ) + [ Str "lhs" , Space , Str "test" ] , Para - [ Code - ( "", [], [] ) "unsplit" - , Space - , Str "is" - , Space - , Str "an" - , Space - , Str "arrow" - , Space - , Str "that" - , Space - , Str "takes" - , Space - , Str "a" - , Space - , Str "pair" - , Space - , Str "of" - , Space - , Str "values" - , Space - , Str "and" - , Space - , Str "combines" - , Space - , Str "them" - , Space - , Str "to" - , SoftBreak - , Str "return" - , Space - , Str "a" - , Space - , Str "single" - , Space - , Str "value:" - ] + [ Code ( "" , [] , [] ) "unsplit" + , Space + , Str "is" + , Space + , Str "an" + , Space + , Str "arrow" + , Space + , Str "that" + , Space + , Str "takes" + , Space + , Str "a" + , Space + , Str "pair" + , Space + , Str "of" + , Space + , Str "values" + , Space + , Str "and" + , Space + , Str "combines" + , Space + , Str "them" + , Space + , Str "to" + , SoftBreak + , Str "return" + , Space + , Str "a" + , Space + , Str "single" + , Space + , Str "value:" + ] , CodeBlock - ( "" - , - [ "haskell", "literate" ] - , [] - ) "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n -- arr (\\op (x,y) -> x `op` y)" + ( "" , [ "haskell" , "literate" ] , [] ) + "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry\n -- arr (\\op (x,y) -> x `op` y)" , Para - [ Code - ( "", [], [] ) "(***)" - , Space - , Str "combines" - , Space - , Str "two" - , Space - , Str "arrows" - , Space - , Str "into" - , Space - , Str "a" - , Space - , Str "new" - , Space - , Str "arrow" - , Space - , Str "by" - , Space - , Str "running" - , Space - , Str "the" - , Space - , Str "two" - , Space - , Str "arrows" - , Space - , Str "on" - , Space - , Str "a" - , SoftBreak - , Str "pair" - , Space - , Str "of" - , Space - , Str "values" - , Space - , Str "(one" - , Space - , Str "arrow" - , Space - , Str "on" - , Space - , Str "the" - , Space - , Str "first" - , Space - , Str "item" - , Space - , Str "of" - , Space - , Str "the" - , Space - , Str "pair" - , Space - , Str "and" - , Space - , Str "one" - , Space - , Str "arrow" - , Space - , Str "on" - , Space - , Str "the" - , SoftBreak - , Str "second" - , Space - , Str "item" - , Space - , Str "of" - , Space - , Str "the" - , Space - , Str "pair)." - ] + [ Code ( "" , [] , [] ) "(***)" + , Space + , Str "combines" + , Space + , Str "two" + , Space + , Str "arrows" + , Space + , Str "into" + , Space + , Str "a" + , Space + , Str "new" + , Space + , Str "arrow" + , Space + , Str "by" + , Space + , Str "running" + , Space + , Str "the" + , Space + , Str "two" + , Space + , Str "arrows" + , Space + , Str "on" + , Space + , Str "a" + , SoftBreak + , Str "pair" + , Space + , Str "of" + , Space + , Str "values" + , Space + , Str "(one" + , Space + , Str "arrow" + , Space + , Str "on" + , Space + , Str "the" + , Space + , Str "first" + , Space + , Str "item" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "pair" + , Space + , Str "and" + , Space + , Str "one" + , Space + , Str "arrow" + , Space + , Str "on" + , Space + , Str "the" + , SoftBreak + , Str "second" + , Space + , Str "item" + , Space + , Str "of" + , Space + , Str "the" + , Space + , Str "pair)." + ] , CodeBlock - ( "", [], [] ) "f *** g = first f >>> second g" -, Para - [ Str "Block", Space, Str "quote:" ] -, BlockQuote - [ Para [ Str "foo", Space, Str "bar" ] ] + ( "" , [] , [] ) "f *** g = first f >>> second g" +, Para [ Str "Block" , Space , Str "quote:" ] +, BlockQuote [ Para [ Str "foo" , Space , Str "bar" ] ] ] -- cgit v1.2.3