diff --git a/data/main.ui b/data/main.ui --- a/data/main.ui +++ b/data/main.ui @@ -330,7 +330,7 @@ utility window ghc-vis - http://felsin9.de/nnis/ghc-vis + https://dennis.felsing.org/ghc-vis Dennis Felsing Joachim Breitner image-missing diff --git a/ghc-vis.cabal b/ghc-vis.cabal --- a/ghc-vis.cabal +++ b/ghc-vis.cabal @@ -1,13 +1,13 @@ cabal-version: 2.2 name: ghc-vis -version: 0.9.3 +version: 0.9.3.1 license: BSD-3-Clause license-file: LICENSE category: GHC, Debug, Development build-type: Custom author: Dennis Felsing, Joachim Breitner, Contributors -maintainer: Dennis Felsing -homepage: http://felsin9.de/nnis/ghc-vis +maintainer: Dennis Felsing +homepage: https://dennis.felsing.org/ghc-vis copyright: Dennis Felsing 2012-2018 synopsis: Live visualization of data structures in GHCi description: Visualize live data structures in GHCi. Evaluation is not @@ -15,12 +15,12 @@ structures. This allows seeing Haskell's lazy evaluation and sharing in action. . - See for the + See for the basic usage of ghc-vis or watch a short video demonstrating how it can be used with GHCi's debugger: - + -tested-with: GHC == 7.4.1, GHC == 7.4.2, GHC == 7.6.1, GHC == 7.6.2, GHC == 7.6.3, GHC == 7.8.3, GHC == 7.8.4, GHC == 7.10.1, GHC == 7.10.2, GHC == 7.10.3, GHC == 8.0.2 +tested-with: GHC == 9.8.1, GHC == 9.6.3, GHC == 9.4.7, GHC == 8.8.4, GHC == 8.6.5 data-files: ghci data/main.ui data/welcome.svg data/legend_graph.svg data/legend_list.svg data/icon_collapse.svg data/icon_evaluate.svg data/hover_collapse.svg data/hover_evaluate.svg Extra-source-files: nonghci-test.hs @@ -37,7 +37,7 @@ -- Description: "SDL window" custom-setup - setup-depends: base >= 4, Cabal >= 1.24, filepath + setup-depends: base >= 4 && < 5, Cabal >= 1.24 && < 4, filepath Library Exposed-modules: GHC.Vis @@ -54,7 +54,7 @@ gtk3 >= 0.12, svgcairo >= 0.12, cairo >= 0.12, - ghc-heap-view >= 0.5 + ghc-heap-view >= 0.6 Hs-source-dirs: src/ Ghc-options: -Wall -fno-warn-unused-do-bind diff --git a/src/GHC/Vis.hs b/src/GHC/Vis.hs --- a/src/GHC/Vis.hs +++ b/src/GHC/Vis.hs @@ -3,7 +3,7 @@ Module : GHC.Vis Copyright : (c) Dennis Felsing License : 3-Clause BSD-style - Maintainer : dennis@felsin9.de + Maintainer : dennis@felsing.org Although ghc-vis is meant to be used in GHCi it can also be used as a library in regular Haskell programs which are run or compiled by GHC. You can run those diff --git a/src/GHC/Vis/Internal.hs b/src/GHC/Vis/Internal.hs --- a/src/GHC/Vis/Internal.hs +++ b/src/GHC/Vis/Internal.hs @@ -4,7 +4,7 @@ Module : GHC.Vis.Internal Copyright : (c) Dennis Felsing License : 3-Clause BSD-style - Maintainer : dennis@felsin9.de + Maintainer : dennis@felsing.org -} module GHC.Vis.Internal ( @@ -22,7 +22,7 @@ import GHC.HeapView hiding (pkg, modl, fun, arrWords) import Control.Monad -import Control.Monad.State.Strict hiding (State, fix) +import Control.Monad.State.Strict (put, get, gets) import Data.Char import Data.List hiding (insert) @@ -142,7 +142,7 @@ parseInternal _ (DoubleClosure _ val) = return [Unnamed $ printf "D# %0.5f" val] -parseInternal _ (AddrClosure _ val) = return [Unnamed $ printf "Addr# %p" val] +parseInternal _ (AddrClosure _ val) = return [Unnamed $ "Addr# " ++ show val] parseInternal _ (ConstrClosure (StgInfoTable _ 1 3 _ _ _) _ [_,0,0] _ "Data.ByteString.Internal" "PS") = return [Unnamed "ByteString 0 0"] @@ -351,7 +351,7 @@ showClosureFields (DoubleClosure _ val) = [printf "D# %0.5f" val] -showClosureFields (AddrClosure _ val) = [printf "Addr# %p" val] +showClosureFields (AddrClosure _ val) = ["Addr# " ++ show val] showClosureFields (ConstrClosure (StgInfoTable _ 1 3 _ 0 _) _ [_,0,0] _ "Data.ByteString.Internal" "PS") = ["ByteString","0","0"] diff --git a/src/GHC/Vis/Types.hs b/src/GHC/Vis/Types.hs --- a/src/GHC/Vis/Types.hs +++ b/src/GHC/Vis/Types.hs @@ -3,7 +3,7 @@ Module : GHC.Vis.Types Copyright : (c) Dennis Felsing License : 3-Clause BSD-style - Maintainer : dennis@felsin9.de + Maintainer : dennis@felsing.org -} module GHC.Vis.Types ( diff --git a/src/GHC/Vis/View/Common.hs b/src/GHC/Vis/View/Common.hs --- a/src/GHC/Vis/View/Common.hs +++ b/src/GHC/Vis/View/Common.hs @@ -3,7 +3,7 @@ Module : GHC.Vis.View.Common Copyright : (c) Dennis Felsing License : 3-Clause BSD-style - Maintainer : dennis@felsin9.de + Maintainer : dennis@felsing.org -} module GHC.Vis.View.Common ( @@ -28,8 +28,8 @@ import Control.Concurrent import Control.DeepSeq import Control.Exception hiding (evaluate) - -import Control.Monad.State.Strict hiding (State, fix) +import Control.Monad +import Control.Monad.State.Strict (evalState, runState) import qualified Data.IntMap as M diff --git a/src/GHC/Vis/View/Graph.hs b/src/GHC/Vis/View/Graph.hs --- a/src/GHC/Vis/View/Graph.hs +++ b/src/GHC/Vis/View/Graph.hs @@ -3,7 +3,7 @@ Module : GHC.Vis.View.Graph Copyright : (c) Dennis Felsing License : 3-Clause BSD-style - Maintainer : dennis@felsin9.de + Maintainer : dennis@felsing.org -} module GHC.Vis.View.Graph ( diff --git a/src/GHC/Vis/View/Graph/Parser.hs b/src/GHC/Vis/View/Graph/Parser.hs --- a/src/GHC/Vis/View/Graph/Parser.hs +++ b/src/GHC/Vis/View/Graph/Parser.hs @@ -4,7 +4,7 @@ Module : GHC.Vis.View.Graph.Parser Copyright : (c) Dennis Felsing License : 3-Clause BSD-style - Maintainer : dennis@felsin9.de + Maintainer : dennis@felsing.org -} module GHC.Vis.View.Graph.Parser ( diff --git a/src/GHC/Vis/View/List.hs b/src/GHC/Vis/View/List.hs --- a/src/GHC/Vis/View/List.hs +++ b/src/GHC/Vis/View/List.hs @@ -3,7 +3,7 @@ Module : GHC.Vis.View.List Copyright : (c) Dennis Felsing License : 3-Clause BSD-style - Maintainer : dennis@felsin9.de + Maintainer : dennis@felsing.org -} module GHC.Vis.View.List (