More cabal and tidying goodness

Ignore-this: 64b05b0e8f3b9e44372a800252fdc97f darcs-hash:20111020150650-e29d1-b9c3aa5b5323d641381e75212d4009e77991572a.gz
adamgundry · Oct 20, 2011 · 9995220 · 9995220
1 parent 72f5e9d
commit 9995220
Show file tree

Hide file tree

Showing 22 changed files with 203 additions and 410 deletions.
diff --git a/Inch/Num.lhs b/Inch/Num.lhs
diff --git a/Inch/PrettyContext.lhs b/Inch/PrettyContext.lhs
diff --git a/inch.cabal b/inch.cabal
@@ -17,38 +17,50 @@ Copyright:           Copyright (c) 2011, Adam Gundry
 Category:            Language
 Build-type:          Simple
 Extra-source-files:  examples/*.hs
-Cabal-version:       >=1.6
+Cabal-version:       >=1.9.2
 
 Executable inch
-  Main-is:           Inch/Main.lhs
-  Build-depends:     IndentParser == 0.2.*,
-                        parsec == 3.1.*,
-                        presburger == 0.3.*
-  Other-modules:     Inch.BwdFwd,
-                        Inch.Check,
-                        Inch.Context
-                        Inch.Erase
-                        Inch.Error
-                        Inch.KindCheck
-                        Inch.Kind
-                        Inch.Kit
-                        Inch.Main
-                        Inch.Num
-                        Inch.Parser
-                        Inch.PrettyContext
-                        Inch.PrettyPrinter
-                        Inch.ProgramCheck
-                        Inch.Solver
-                        Inch.Syntax
-                        Inch.Test
-                        Inch.TyNum
-                        Inch.TypeCheck
-                        Inch.Type
-                        Inch.Unify
-
-  -- Extra tools (e.g. alex, hsc2hs, ...) needed to build the source.
-  -- Build-tools:         
+  ghc-options:       -Wall -fno-warn-missing-signatures
+                         -fno-warn-unused-matches -fno-warn-name-shadowing
+  hs-source-dirs:    src
+  Main-is:           Language/Inch/Main.lhs
+  Build-depends:     base == 4.3.*,
+                         IndentParser == 0.2.*,
+                         parsec == 3.1.*,
+                         presburger == 0.3.*,
+                         pretty == 1.0.*,
+                         mtl == 2.0.*,
+                         containers == 0.4.*
+  Other-modules:     Language.Inch.BwdFwd,
+                         Language.Inch.Check,
+                         Language.Inch.Context
+                         Language.Inch.Erase
+                         Language.Inch.Error
+                         Language.Inch.KindCheck
+                         Language.Inch.Kind
+                         Language.Inch.Kit
+                         Language.Inch.Parser
+                         Language.Inch.PrettyPrinter
+                         Language.Inch.ProgramCheck
+                         Language.Inch.Solver
+                         Language.Inch.Syntax
+                         Language.Inch.TyNum
+                         Language.Inch.TypeCheck
+                         Language.Inch.Type
+                         Language.Inch.Unify         
 
+Test-Suite test-inch
+    type:            exitcode-stdio-1.0
+    hs-source-dirs:  src tests
+    main-is:         Main.lhs
+    build-depends:   base == 4.3.*,
+                         IndentParser == 0.2.*,
+                         parsec == 3.1.*,
+                         presburger == 0.3.*,
+                         pretty == 1.0.*,
+                         mtl == 2.0.*,
+                         containers == 0.4.*,
+                         directory == 1.1.*
 
 source-repository head
   type:     darcs

diff --git a/Inch/BwdFwd.lhs → src/Language/Inch/BwdFwd.lhs b/Inch/BwdFwd.lhs → src/Language/Inch/BwdFwd.lhs
@@ -1,6 +1,6 @@
 > {-# LANGUAGE DeriveFunctor, DeriveFoldable #-}
 
-> module BwdFwd where
+> module Language.Inch.BwdFwd where
 
 > import Data.Foldable
 > import Data.Monoid

diff --git a/Inch/Check.lhs → src/Language/Inch/Check.lhs b/Inch/Check.lhs → src/Language/Inch/Check.lhs
@@ -1,22 +1,21 @@
 > {-# LANGUAGE FlexibleContexts #-}
 
-> module Check where
+> module Language.Inch.Check where
 
 > import Prelude hiding (all)
 > import Control.Applicative
 > import Control.Monad
 > import Data.Monoid
 > import Data.Foldable
 
-> import BwdFwd
-> import Context
-> import Error
-> import Kit
-> import Kind hiding (All)
-> import Type
-> import PrettyPrinter
-> import PrettyContext ()
-> import Syntax
+> import Language.Inch.BwdFwd
+> import Language.Inch.Context
+> import Language.Inch.Error
+> import Language.Inch.Kit
+> import Language.Inch.Kind hiding (All)
+> import Language.Inch.Type
+> import Language.Inch.PrettyPrinter
+> import Language.Inch.Syntax
 
 
 > traceContext s = getContext >>= \ g -> mtrace (s ++ "\n" ++ renderMe g)