diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000..41fa43d --- /dev/null +++ b/cabal.project @@ -0,0 +1,7 @@ +-- Needed to get a working version of llvm-hs-pretty +-- The one on hackage is broken with this version of GHC +source-repository-package + type: git + location: https://github.com/rumkeller/llvm-hs-pretty.git + +packages: ./windows12.cabal diff --git a/src/Main.hs b/src/Main.hs index 3be7626..af31a6d 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -3,7 +3,7 @@ module Main where import qualified Data.Text.IO as T -import Prettyprinter +import Data.Text.Prettyprint.Doc (pretty) import Text.Megaparsec (parse) import Windows12.Parser (programP) diff --git a/src/Windows12/Ast.hs b/src/Windows12/Ast.hs index ad64f53..09dcd10 100644 --- a/src/Windows12/Ast.hs +++ b/src/Windows12/Ast.hs @@ -3,7 +3,7 @@ module Windows12.Ast where import Data.Text (Text) -import Prettyprinter +import Data.Text.Prettyprint.Doc data BinOp = Add diff --git a/windows12.cabal b/windows12.cabal index d365b80..4dcb859 100644 --- a/windows12.cabal +++ b/windows12.cabal @@ -76,10 +76,11 @@ executable windows12 build-depends: base >= 4.15.1 && < 4.16, llvm-hs-pure >= 9.0.0 && < 9.1, + llvm-hs-pretty >= 0.9.0 && < 0.10, megaparsec >= 9.6.1 && < 9.7, text >= 1.2.5 && < 1.3, parser-combinators >= 1.3.0 && < 1.4, - prettyprinter >= 1.7.1 && < 1.8, + prettyprinter >= 1.5.1 && < 1.6, -- Directories containing source files. hs-source-dirs: src