Restructure directories

hcc.cabal

@@ -12,7 +12,7 @@ homepage:           github.com/danr/contracts
 executable          hcc
     ghc-options:    -O2 -package ghc -Wall -auto-all
     hs-source-dirs: src halo/src
-    main-is:        Main.hs
+    main-is:        Contracts/Main.hs
 
     build-depends:
         -- Shared

src/Main.hs → src/Contracts/Main.hs

@@ -89,7 +89,7 @@ import Halo.Subtheory
 import Halo.Trim
 import Halo.Util
 
-import Models.Pipe
+import Contracts.Models.Pipe
 
 import Contracts.Axioms
 import Contracts.Collect

src/Models/Model.hs → src/Contracts/Models/Model.hs

@@ -4,7 +4,7 @@
     A prover-agnostic representation of the different components of a model
 
 -}
-module Models.Model where
+module Contracts.Models.Model where
 
 -- | We call everything that is deemed a function in FOL a Symbol here
 data Symbol

src/Models/ParadoxParser.hs → src/Contracts/Models/ParadoxParser.hs

@@ -110,7 +110,7 @@ p_1_Cons(!4) = !1
 +++ END MODEL
 
 -}
-module Models.ParadoxParser (parseParadoxModel) where
+module Contracts.Models.ParadoxParser (parseParadoxModel) where
 
 import Control.Arrow
 
@@ -119,7 +119,7 @@ import Data.List
 import Data.List.Split -- split
 
 
-import Models.Model
+import Contracts.Models.Model
 
 parseParadoxModel :: String -> Model
 parseParadoxModel xs = Model

src/Models/Pipe.hs → src/Contracts/Models/Pipe.hs

@@ -4,13 +4,13 @@
     "Pipe" a problem to paradox with some timeout and print the result
 
 -}
-module Models.Pipe where
+module Contracts.Models.Pipe where
 
 import Type
 
-import Models.Show
-import Models.TypeType ()
-import Models.ParadoxParser
+import Contracts.Models.Show
+import Contracts.Models.TypeType ()
+import Contracts.Models.ParadoxParser
 
 import Contracts.Params
 

src/Models/ProtoType.hs → src/Contracts/Models/ProtoType.hs

@@ -3,10 +3,10 @@
     A prototype type, for debugging
 
 -}
-module Models.ProtoType where
+module Contracts.Models.ProtoType where
 
-import Models.Show (Typelike(..))
-import Models.Model
+import Contracts.Models.Show (Typelike(..))
+import Contracts.Models.Model
 
 import Data.Maybe
 import Control.Arrow (first)

src/Models/Show.hs → src/Contracts/Models/Show.hs

@@ -154,10 +154,10 @@ the function is not min, then don't write this case)
 
 
 -}
-module Models.Show where
+module Contracts.Models.Show where
 
-import Models.Model
-import Models.Spin
+import Contracts.Models.Model
+import Contracts.Models.Spin
 
 
 import qualified Data.Map as M

src/Models/Spin.hs → src/Contracts/Models/Spin.hs

@@ -10,12 +10,12 @@
     memo it with a Map over the domain.
 
 -}
-module Models.Spin where
+module Contracts.Models.Spin where
 
 import Control.Monad
 import Control.Applicative
 
-import Models.Model
+import Contracts.Models.Model
 
 -- | Gives the domain of a given size
 domain :: DomSize -> [Elt]

src/Models/Test.hs → src/Contracts/Models/Test.hs

@@ -4,12 +4,12 @@
     ProtoType instance for Typelike.
 
 -}
-module Models.Test where
+module Contracts.Models.Test where
 
-import Models.Model
-import Models.Show
-import Models.ProtoType
-import Models.ParadoxParser
+import Contracts.Models.Model
+import Contracts.Models.Show
+import Contracts.Models.ProtoType
+import Contracts.Models.ParadoxParser
 
 import System.Environment
 

src/Models/TypeType.hs → src/Contracts/Models/TypeType.hs

@@ -5,15 +5,15 @@
     The Typelike instance for GHC's Type.
 
 -}
-module Models.TypeType where
+module Contracts.Models.TypeType where
 
 import Type
 import Unify
 import Outputable
 import TysPrim
 
-import Models.Show (Typelike(..))
-import Models.Model
+import Contracts.Models.Show (Typelike(..))
+import Contracts.Models.Model
 
 import Halo.Shared