Switch from ansi-wl-pprint to prettyprinter package.

.github/workflows/ci-matrix.yml

@@ -34,8 +34,8 @@ jobs:
       with:
         submodules: 'true'
 
-    - uses: actions/setup-haskell@v1.1
-      id: setup-haskell-cabal
+    - uses: actions/setup-haskell@v1
+      id: setup-haskell
       name: Setup Haskell
       with:
         ghc-version: ${{ matrix.ghc }}

asl-translator.cabal

@@ -41,9 +41,9 @@ common shared-properties
                        mtl,
                        transformers,
                        lens,
-                       ansi-wl-pprint,
                        parameterized-utils >= 2.1.1,
                        pretty,
+                       prettyprinter >= 1.7.0,
                        crucible,
                        what4,
                        asl-parser,

lib/Language/ASL.hs

@@ -73,8 +73,9 @@ import qualified Language.ASL.Signature as AS
 import qualified Language.ASL.Types as AT
 import qualified Language.ASL.Globals as G
 
+import qualified Prettyprinter as LPP
+import qualified Prettyprinter.Render.String as LPP
 import qualified Text.PrettyPrint.HughesPJClass as PP
-import qualified Text.PrettyPrint.ANSI.Leijen as LPP
 
 data SimulatorConfig scope =
   SimulatorConfig { simOutputHandle :: IO.Handle
@@ -413,8 +414,9 @@ instance Show SimulationException where
   show e = PP.render (PP.pPrint e)
 
 showExpr :: S.Expr t ret -> PP.Doc
-showExpr e = PP.text (LPP.displayS (LPP.renderPretty 0.4 80 (WI.printSymExpr e)) "")
-
+showExpr e = PP.text (LPP.renderString (LPP.layoutPretty opts (WI.printSymExpr e)))
+  where opts = LPP.LayoutOptions (LPP.AvailablePerLine 80 0.4)
+
 showAbortedResult :: CS.AbortedResult c d -> T.Text
 showAbortedResult ar = case ar of
   CS.AbortedExec reason _ -> T.pack $ show reason

lib/Language/ASL/Crucible/Extension.hs

@@ -39,7 +39,7 @@ import qualified Lang.Crucible.Simulator.Evaluation as CSE
 import qualified Lang.Crucible.Simulator.GlobalState as CSG
 import qualified Lang.Crucible.Simulator.RegValue as CSR
 import qualified Lang.Crucible.Types as CT
-import qualified Text.PrettyPrint.ANSI.Leijen as PP
+import qualified Prettyprinter as PP
 import qualified What4.BaseTypes as WT
 import qualified What4.Interface as WI
 import qualified What4.Symbol as WS
@@ -240,12 +240,12 @@ instance CCExt.PrettyApp (ASLStmt arch) where
   ppApp pp a =
     case a of
       GetRegState _reps regs ->
-        PP.hsep [ PP.text "GetRegState"
-                , PP.brackets (PP.cat (PP.punctuate PP.comma (FC.toListFC (PP.text . showF) regs)))
+        PP.hsep [ PP.pretty "GetRegState"
+                , PP.brackets (PP.cat (PP.punctuate PP.comma (FC.toListFC (PP.pretty . showF) regs)))
                 ]
       SetRegState gvs vs ->
-        PP.hsep [ PP.text "SetRegState"
-                , PP.brackets (PP.cat (PP.punctuate PP.comma (FC.toListFC (PP.text . showF) gvs)))
+        PP.hsep [ PP.pretty "SetRegState"
+                , PP.brackets (PP.cat (PP.punctuate PP.comma (FC.toListFC (PP.pretty . showF) gvs)))
                 , PP.comma
                 , PP.brackets (pp vs)
                 ]
@@ -283,20 +283,20 @@ instance CCExt.PrettyApp ASLApp where
   ppApp pp a =
     case a of
       UF name fresh trep argReps vals ->
-        PP.hsep [ PP.text (T.unpack name)
-               , PP.text (show fresh)
-               , PP.text (show trep)
-               , PP.brackets (PP.cat (PP.punctuate PP.comma (FC.toListFC (PP.text . showF) argReps)))
+        PP.hsep [ PP.pretty name
+               , PP.viaShow fresh
+               , PP.viaShow trep
+               , PP.brackets (PP.cat (PP.punctuate PP.comma (FC.toListFC (PP.pretty . showF) argReps)))
                , PP.brackets (PP.cat (PP.punctuate PP.comma (FC.toListFC pp vals)))
                ]
       GetBaseStruct _r i t ->
-        PP.hsep [ PP.text "GetBaseStruct"
-                , PP.text (showF i)
+        PP.hsep [ PP.pretty "GetBaseStruct"
+                , PP.pretty (showF i)
                 , pp t
                 ]
       MkBaseStruct _r _mems ->
-        PP.hsep [ PP.text "MkBaseStruct"
-                , PP.text "PP UNIMPLEMENTED"
+        PP.hsep [ PP.pretty "MkBaseStruct"
+                , PP.pretty "PP UNIMPLEMENTED"
                 ]
 
 instance FC.TestEqualityFC ASLApp where

lib/Language/ASL/Translation/Driver.hs

@@ -121,8 +121,9 @@ import           What4.ProblemFeatures
 
 import qualified What4.Serialize.Normalize as WN
 
+import qualified Prettyprinter as LPP
+import qualified Prettyprinter.Render.String as LPP
 import qualified Text.PrettyPrint.HughesPJClass as PP
-import qualified Text.PrettyPrint.ANSI.Leijen as LPP
 
 import           What4.Utils.Log ( HasLogCfg, LogCfg, withLogCfg )
 import qualified What4.Utils.Log as Log
@@ -620,7 +621,8 @@ prettySymFnBody symFn = case B.symFnInfo symFn of
   _ -> PP.text "[[uninterpreted]]"
 
 showExpr :: B.Expr t ret -> PP.Doc
-showExpr e = PP.text (LPP.displayS (LPP.renderPretty 0.4 80 (WI.printSymExpr e)) "")
+showExpr e = PP.text (LPP.renderString (LPP.layoutPretty opts (WI.printSymExpr e)))
+  where opts = LPP.LayoutOptions (LPP.AvailablePerLine 80 0.4)
 
 doSimulation :: TranslatorOptions
              -> CFH.HandleAllocator