Skip to content

Commit a8f3a2d

Browse files
committed
updated for ghc 8.4.2; released source code as a library
1 parent 89d5b0c commit a8f3a2d

17 files changed

Lines changed: 572 additions & 463 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ cabal-dev
1010
cabal.sandbox.config
1111
cabal.config
1212
TAGS
13+
*.DS_Store

Parsing.hs

Lines changed: 0 additions & 75 deletions
This file was deleted.

SourceGraph.cabal

Lines changed: 50 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Name: SourceGraph
2-
Version: 0.7.0.7
2+
Version: 0.7.0.8
33
Synopsis: Static code analysis using graph-theoretic techniques.
44
Description: {
55
Statically analyse Haskell source code using graph-theoretic
@@ -42,30 +42,58 @@ Build-Type: Simple
4242
Extra-Source-Files: TODO
4343
ChangeLog
4444

45-
Tested-With: GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4,
46-
GHC == 7.10.2, GHC == 7.11.*
45+
Tested-With: GHC == 8.4.2
4746

4847
Source-Repository head
4948
Type: git
5049
Location: https://github.com/ivan-m/SourceGraph
5150

51+
Library
52+
exposed-modules:
53+
SourceGraph.Analyse.Colors
54+
SourceGraph.Analyse.Everything
55+
SourceGraph.Analyse.GraphRepr
56+
SourceGraph.Analyse.Imports
57+
SourceGraph.Analyse.Module
58+
SourceGraph.Analyse.Utils
59+
SourceGraph.Analyse.Visualise
60+
SourceGraph.Parsing.ParseModule
61+
SourceGraph.Parsing.State
62+
SourceGraph.Parsing.Types
63+
SourceGraph.Analyse
64+
SourceGraph.Parsing
65+
Hs-source-dirs: .
66+
Other-Modules:
67+
Paths_SourceGraph
68+
Build-Depends: base == 4.*,
69+
containers,
70+
multiset,
71+
filepath,
72+
random,
73+
directory,
74+
mtl,
75+
fgl == 5.6.*,
76+
Graphalyze >= 0.15,
77+
graphviz >= 2999.20 && < 2999.21,
78+
Cabal == 2.2.*,
79+
haskell-src-exts == 1.20.*
5280

5381
Executable SourceGraph {
5482

55-
Main-Is: Main.hs
56-
Other-Modules: CabalInfo,
57-
Parsing,
58-
Parsing.ParseModule,
59-
Parsing.State,
60-
Parsing.Types,
61-
Analyse,
62-
Analyse.Utils,
63-
Analyse.Colors,
64-
Analyse.GraphRepr,
65-
Analyse.Visualise,
66-
Analyse.Module,
67-
Analyse.Imports,
68-
Analyse.Everything,
83+
Main-Is: SourceGraph/Main.hs
84+
Other-Modules: SourceGraph.CabalInfo,
85+
SourceGraph.Parsing,
86+
SourceGraph.Parsing.ParseModule,
87+
SourceGraph.Parsing.State,
88+
SourceGraph.Parsing.Types,
89+
SourceGraph.Analyse,
90+
SourceGraph.Analyse.Utils,
91+
SourceGraph.Analyse.Colors,
92+
SourceGraph.Analyse.GraphRepr,
93+
SourceGraph.Analyse.Visualise,
94+
SourceGraph.Analyse.Module,
95+
SourceGraph.Analyse.Imports,
96+
SourceGraph.Analyse.Everything,
6997
Paths_SourceGraph
7098
Ghc-Options: -Wall
7199
Ghc-Prof-Options: -prof
@@ -77,9 +105,9 @@ Executable SourceGraph {
77105
random,
78106
directory,
79107
mtl,
80-
fgl == 5.5.*,
81-
Graphalyze >= 0.14.1.0 && < 0.15,
82-
graphviz >= 2999.15.0.0 && < 2999.19,
83-
Cabal == 1.22.*,
84-
haskell-src-exts == 1.16.*
108+
fgl == 5.6.*,
109+
Graphalyze >= 0.15,
110+
graphviz >= 2999.20 && < 2999.21,
111+
Cabal == 2.2.*,
112+
haskell-src-exts == 1.20.*
85113
}

Analyse.hs renamed to SourceGraph/Analyse.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2727
2828
Analyse Haskell software
2929
-}
30-
module Analyse(analyse, sgLegend) where
30+
module SourceGraph.Analyse(analyse, sgLegend) where
3131

32-
import Analyse.Module
33-
import Analyse.Imports
34-
import Analyse.Everything
35-
import Analyse.Colors
36-
import Parsing.Types
32+
import SourceGraph.Analyse.Module
33+
import SourceGraph.Analyse.Imports
34+
import SourceGraph.Analyse.Everything
35+
import SourceGraph.Analyse.Colors
36+
import SourceGraph.Parsing.Types
3737

3838
import Data.Graph.Analysis hiding (Bold)
3939
import qualified Data.Graph.Analysis.Reporting as R (DocInline(Bold))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2727
2828
Utility functions and types for analysis.
2929
-}
30-
module Analyse.Colors where
30+
module SourceGraph.Analyse.Colors where
3131

3232
import Data.GraphViz.Attributes
3333

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2727
2828
Analysis of the entire overall piece of software.
2929
-}
30-
module Analyse.Everything(analyseEverything) where
30+
module SourceGraph.Analyse.Everything(analyseEverything) where
3131

32-
import Parsing.Types
33-
import Analyse.Utils
34-
import Analyse.GraphRepr
35-
import Analyse.Visualise
32+
import SourceGraph.Parsing.Types
33+
import SourceGraph.Analyse.Utils
34+
import SourceGraph.Analyse.GraphRepr
35+
import SourceGraph.Analyse.Visualise
3636

3737
import Data.Graph.Analysis
3838

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2929
3030
Interacting with GraphData from Graphalyze.
3131
-}
32-
module Analyse.GraphRepr
32+
module SourceGraph.Analyse.GraphRepr
3333
( -- * General stuff
3434
GData(..)
3535
, mapData
@@ -62,9 +62,9 @@ module Analyse.GraphRepr
6262
, ModGraph
6363
) where
6464

65-
import Analyse.Colors
66-
import Analyse.Utils
67-
import Parsing.Types
65+
import SourceGraph.Analyse.Colors
66+
import SourceGraph.Analyse.Utils
67+
import SourceGraph.Parsing.Types
6868

6969
import Data.Graph.Analysis
7070
import Data.Graph.Inductive
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2727
2828
Analysis of Haskell module importing.
2929
-}
30-
module Analyse.Imports (analyseImports) where
30+
module SourceGraph.Analyse.Imports (analyseImports) where
3131

32-
import Parsing.Types
33-
import Analyse.Utils
34-
import Analyse.GraphRepr
35-
import Analyse.Visualise
32+
import SourceGraph.Parsing.Types
33+
import SourceGraph.Analyse.Utils
34+
import SourceGraph.Analyse.GraphRepr
35+
import SourceGraph.Analyse.Visualise
3636

3737
import Data.Graph.Analysis
3838

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2727
2828
Analysis of Haskell modules.
2929
-}
30-
module Analyse.Module(analyseModules) where
30+
module SourceGraph.Analyse.Module(analyseModules) where
3131

32-
import Parsing.Types
33-
import Analyse.Utils
34-
import Analyse.GraphRepr
35-
import Analyse.Visualise
32+
import SourceGraph.Parsing.Types
33+
import SourceGraph.Analyse.Utils
34+
import SourceGraph.Analyse.GraphRepr
35+
import SourceGraph.Analyse.Visualise
3636

3737
import Data.Graph.Analysis
3838

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
2727
2828
Utility functions and types for analysis.
2929
-}
30-
module Analyse.Utils where
30+
module SourceGraph.Analyse.Utils where
3131

3232
import Data.Graph.Analysis hiding (Bold)
3333

0 commit comments

Comments
 (0)