Update stuff.

.gitignore

@@ -10,3 +10,4 @@ cabal-dev
 cabal.sandbox.config
 cabal.config
 TAGS
+*.DS_Store

Analyse.hs → Language/Haskell/SourceGraph/Analyse.hs

@@ -27,13 +27,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Analyse Haskell software
  -}
-module Analyse(analyse, sgLegend) where
+module Language.Haskell.SourceGraph.Analyse(analyse, sgLegend) where
 
-import Analyse.Module
-import Analyse.Imports
-import Analyse.Everything
-import Analyse.Colors
-import Parsing.Types
+import Language.Haskell.SourceGraph.Analyse.Module
+import Language.Haskell.SourceGraph.Analyse.Imports
+import Language.Haskell.SourceGraph.Analyse.Everything
+import Language.Haskell.SourceGraph.Analyse.Colors
+import Language.Haskell.SourceGraph.Parsing.Types
 
 import Data.Graph.Analysis hiding (Bold)
 import qualified Data.Graph.Analysis.Reporting as R (DocInline(Bold))

Analyse/Colors.hs → Language/Haskell/SourceGraph/Analyse/Colors.hs

@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Utility functions and types for analysis.
  -}
-module Analyse.Colors where
+module Language.Haskell.SourceGraph.Analyse.Colors where
 
 import Data.GraphViz.Attributes
 

Analyse/Everything.hs → Language/Haskell/SourceGraph/Analyse/Everything.hs

@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Analysis of the entire overall piece of software.
  -}
-module Analyse.Everything(analyseEverything) where
+module Language.Haskell.SourceGraph.Analyse.Everything(analyseEverything,codeToGraph) where
 
-import Parsing.Types
-import Analyse.Utils
-import Analyse.GraphRepr
-import Analyse.Visualise
+import Language.Haskell.SourceGraph.Parsing.Types
+import Language.Haskell.SourceGraph.Analyse.Utils
+import Language.Haskell.SourceGraph.Analyse.GraphRepr
+import Language.Haskell.SourceGraph.Analyse.Visualise
 
 import Data.Graph.Analysis
 

Analyse/GraphRepr.hs → Language/Haskell/SourceGraph/Analyse/GraphRepr.hs

@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Interacting with GraphData from Graphalyze.
  -}
-module Analyse.GraphRepr
+module Language.Haskell.SourceGraph.Analyse.GraphRepr
        ( -- * General stuff
          GData(..)
        , mapData
@@ -62,9 +62,9 @@ module Analyse.GraphRepr
        , ModGraph
        ) where
 
-import Analyse.Colors
-import Analyse.Utils
-import Parsing.Types
+import Language.Haskell.SourceGraph.Analyse.Colors
+import Language.Haskell.SourceGraph.Analyse.Utils
+import Language.Haskell.SourceGraph.Parsing.Types
 
 import Data.Graph.Analysis
 import Data.Graph.Inductive

Analyse/Imports.hs → Language/Haskell/SourceGraph/Analyse/Imports.hs

@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Analysis of Haskell module importing.
  -}
-module Analyse.Imports (analyseImports) where
+module Language.Haskell.SourceGraph.Analyse.Imports (analyseImports) where
 
-import Parsing.Types
-import Analyse.Utils
-import Analyse.GraphRepr
-import Analyse.Visualise
+import Language.Haskell.SourceGraph.Parsing.Types
+import Language.Haskell.SourceGraph.Analyse.Utils
+import Language.Haskell.SourceGraph.Analyse.GraphRepr
+import Language.Haskell.SourceGraph.Analyse.Visualise
 
 import Data.Graph.Analysis
 

Analyse/Module.hs → Language/Haskell/SourceGraph/Analyse/Module.hs

@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Analysis of Haskell modules.
  -}
-module Analyse.Module(analyseModules) where
+module Language.Haskell.SourceGraph.Analyse.Module(analyseModules,moduleToGraph) where
 
-import Parsing.Types
-import Analyse.Utils
-import Analyse.GraphRepr
-import Analyse.Visualise
+import Language.Haskell.SourceGraph.Parsing.Types
+import Language.Haskell.SourceGraph.Analyse.Utils
+import Language.Haskell.SourceGraph.Analyse.GraphRepr
+import Language.Haskell.SourceGraph.Analyse.Visualise
 
 import Data.Graph.Analysis
 

Analyse/Utils.hs → Language/Haskell/SourceGraph/Analyse/Utils.hs

@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Utility functions and types for analysis.
  -}
-module Analyse.Utils where
+module Language.Haskell.SourceGraph.Analyse.Utils where
 
 import Data.Graph.Analysis hiding (Bold)
 

Analyse/Visualise.hs → Language/Haskell/SourceGraph/Analyse/Visualise.hs

@@ -27,12 +27,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Utility functions and types for analysis.
  -}
-module Analyse.Visualise where
+module Language.Haskell.SourceGraph.Analyse.Visualise where
 
-import Analyse.Colors
-import Analyse.GraphRepr
-import Analyse.Utils
-import Parsing.Types
+import Language.Haskell.SourceGraph.Analyse.Colors
+import Language.Haskell.SourceGraph.Analyse.GraphRepr
+import Language.Haskell.SourceGraph.Analyse.Utils
+import Language.Haskell.SourceGraph.Parsing.Types
 
 import Data.Graph.Analysis               hiding (Bold)
 import Data.GraphViz

CabalInfo.hs → Language/Haskell/SourceGraph/CabalInfo.hs

@@ -1,3 +1,8 @@
+{-# LANGUAGE CPP #-}
+#if !defined(MIN_VERSION_Cabal)
+# define MIN_VERSION_Cabal(a,b,c) 0
+#endif
+
 {-
 Copyright (C) 2009 Ivan Lazar Miljenovic <Ivan.Miljenovic@gmail.com>
 
@@ -27,17 +32,21 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
    Used to parse and obtain information from the provided Cabal file.
  -}
-module CabalInfo(parseCabal) where
+module Language.Haskell.SourceGraph.CabalInfo(parseCabal) where
 
 import Distribution.Compiler                         (CompilerInfo)
 import Distribution.ModuleName                       (toFilePath)
 import Distribution.Package
 import Distribution.PackageDescription               hiding (author)
 import Distribution.PackageDescription.Configuration
+#if MIN_VERSION_Cabal(2,0,0)
+import Distribution.PackageDescription.Parsec
+#else
 import Distribution.PackageDescription.Parse
+#endif
 import Distribution.Simple.Compiler                  (compilerInfo)
 import Distribution.Simple.GHC                       (configure)
-import Distribution.Simple.Program                   (defaultProgramConfiguration)
+import Distribution.Simple.Program                   (defaultProgramDb)
 import Distribution.System                           (buildPlatform)
 import Distribution.Verbosity                        (silent)
 
@@ -46,12 +55,26 @@ import Control.Monad     (liftM)
 import Data.List         (nub)
 import Data.Maybe        (fromJust, isJust)
 import System.FilePath   (dropExtension)
+import Distribution.Types.ComponentRequestedSpec (defaultComponentRequestedSpec)
 
 -- -----------------------------------------------------------------------------
 
+emptyFlagAssignment :: FlagAssignment
+#if MIN_VERSION_Cabal(2,0,0)
+emptyFlagAssignment = mkFlagAssignment []
+#else
+emptyFlagAssignment = []
+#endif
+
+#if MIN_VERSION_Cabal(2,0,0)
+readDescription = readGenericPackageDescription
+#else
+readDescription = readPackageDescription
+#endif
+
 ghcID :: IO CompilerInfo
 ghcID = liftM (compilerInfo . getCompiler)
-        $ configure silent Nothing Nothing defaultProgramConfiguration
+        $ configure silent Nothing Nothing defaultProgramDb
   where
     getCompiler (comp,_mplat,_progconfig) = comp
 
@@ -61,19 +84,20 @@ parseCabal fp = do cID <- ghcID
     where
       -- Need to specify the Exception type
       getDesc :: FilePath -> IO (Either SomeException GenericPackageDescription)
-      getDesc = try . readPackageDescription silent
+      getDesc = try . readDescription silent
       parseDesc cID = fmap parse . compactEithers . fmap (unGeneric cID)
       unGeneric cID = fmap fst
-                      . finalizePackageDescription [] -- flags, use later
-                                                   (const True) -- ignore
-                                                                -- deps
-                                                   buildPlatform
-                                                   cID
-                                                   []
+                      . finalizePD emptyFlagAssignment -- flags, use later
+                                   defaultComponentRequestedSpec
+                                   (const True) -- ignore
+                                   -- deps
+                                   buildPlatform
+                                   cID
+                                   []
       parse pd = (nm, exps)
           where
             nm = pName . pkgName $ package pd
-            pName (PackageName nm') = nm'
+            pName nm' = unPackageName nm'
             exes = filter (buildable . buildInfo) $ executables pd
             lib = library pd
             moduleNames = map toFilePath