Skip to content
Browse files

Moved all modules to supermodule Magic

  • Loading branch information...
1 parent 406df1a commit a0bb01be881fdcbaa6dfa343c9ed87cf1e129741 @MedeaMelana committed Nov 8, 2012
View
28 Magic.cabal
@@ -1,17 +1,27 @@
-name: Magic
-version: 0.1
+name: Magic
+version: 0.1
-- synopsis:
-- description:
-- license:
-license-file: LICENSE
-author: Martijn van Steenbergen
-maintainer: martijn@van.steenbergen.nl
+license-file: LICENSE
+author: Martijn van Steenbergen
+maintainer: martijn@van.steenbergen.nl
-- copyright:
-category: Game
-build-type: Simple
-cabal-version: >=1.8
+category: Game
+build-type: Simple
+cabal-version: >=1.8
library
- exposed-modules: BasicLands, Core, Engine, Events, IdList, Labels, M12, Predicates, TargetList, Types, Utils
+ exposed-modules: Magic.BasicLands,
+ Magic.Core,
+ Magic.Engine,
+ Magic.Events,
+ Magic.IdList,
+ Magic.Labels,
+ Magic.M12,
+ Magic.ObjectTypes,
+ Magic.Predicates,
+ Magic.Types,
+ Magic.Utils
-- other-modules:
build-depends: base ==4.5.*, fclabels ==1.1.*, operational ==0.2.*, mtl ==2.1.*, MonadRandom ==0.1.*, random-shuffle ==0.0.*, containers ==0.4.*, text ==0.11.*
View
16 BasicLands.hs → Magic/BasicLands.hs
@@ -1,13 +1,13 @@
{-# LANGUAGE OverloadedStrings #-}
-module BasicLands where
-
-import Core
-import Labels
-import ObjectTypes
-import Predicates
-import Utils
-import Types
+module Magic.BasicLands where
+
+import Magic.Core
+import Magic.Labels
+import Magic.ObjectTypes
+import Magic.Predicates
+import Magic.Utils
+import Magic.Types
import Control.Applicative
import Data.Label.PureM
View
10 Core.hs → Magic/Core.hs
@@ -1,17 +1,17 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeOperators #-}
-module Core
+module Magic.Core
--( compileZoneRef
--, evaluateTargetList, singleTarget, (<?>), askMagicTargets, allTargets, allObjects
--, module Types
--)
where
-import IdList (IdList)
-import qualified IdList
-import Labels
-import Types
+import Magic.IdList (IdList)
+import qualified Magic.IdList as IdList
+import Magic.Labels
+import Magic.Types
import Control.Applicative
import qualified Control.Monad.Operational as Operational
View
22 Engine.hs → Magic/Engine.hs
@@ -1,16 +1,16 @@
{-# LANGUAGE TypeOperators #-}
-module Engine where
-
-import Core
-import Events
-import IdList (Id)
-import qualified IdList
-import Labels
-import ObjectTypes
-import Predicates
-import Types
-import Utils hiding (object)
+module Magic.Engine where
+
+import Magic.Core
+import Magic.Events
+import Magic.IdList (Id)
+import qualified Magic.IdList as IdList
+import Magic.Labels
+import Magic.ObjectTypes
+import Magic.Predicates
+import Magic.Types
+import Magic.Utils hiding (object)
import Control.Applicative ((<$>))
import Control.Monad (forever, forM_, replicateM_, when)
View
12 Events.hs → Magic/Events.hs
@@ -1,4 +1,4 @@
-module Events (
+module Magic.Events (
-- * Types
Event(..), OneShotEffect(..), SimpleOneShotEffect(..),
@@ -9,11 +9,11 @@ module Events (
untapPermanent, drawCard, moveObject, moveAllObjects, shuffleLibrary, tick
) where
-import Core
-import IdList (Id)
-import qualified IdList
-import Labels
-import Types
+import Magic.Core
+import Magic.IdList (Id)
+import qualified Magic.IdList as IdList
+import Magic.Labels
+import Magic.Types
import Control.Applicative ((<$>))
import Control.Monad (forM_,)
View
2 IdList.hs → Magic/IdList.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE TypeOperators #-}
-module IdList (
+module Magic.IdList (
-- * Types
Id, IdList,
View
6 Labels.hs → Magic/Labels.hs
@@ -1,9 +1,9 @@
{-# LANGUAGE TypeOperators #-}
-module Labels where
+module Magic.Labels where
-import IdList (Id, IdList)
-import qualified IdList
+import Magic.IdList (Id, IdList)
+import qualified Magic.IdList as IdList
import Prelude hiding ((.), id)
import Control.Category (Category(..), (>>>))
View
10 M12.hs → Magic/M12.hs
@@ -1,11 +1,11 @@
{-# LANGUAGE OverloadedStrings #-}
-module M12 where
+module Magic.M12 where
-import Core
-import Types
-import ObjectTypes
-import Utils
+import Magic.Core
+import Magic.Types
+import Magic.ObjectTypes
+import Magic.Utils
import Control.Applicative
import Data.Label.PureM ((=:))
View
4 ObjectTypes.hs → Magic/ObjectTypes.hs
@@ -1,6 +1,6 @@
{-# LANGUAGE TypeOperators #-}
-module ObjectTypes (
+module Magic.ObjectTypes (
-- * Convenient type sets
basicType, legendaryType,
artifactType, creatureType, enchantmentType, instantType, landType,
@@ -10,7 +10,7 @@ module ObjectTypes (
ObjectType(..), objectType, hasTypes,
) where
-import Types
+import Magic.Types
import Data.Label.Pure (set, (:->))
import Data.Monoid (mempty)
View
4 Predicates.hs → Magic/Predicates.hs
@@ -1,6 +1,6 @@
-module Predicates where
+module Magic.Predicates where
-import Types
+import Magic.Types
import Data.Label
import qualified Data.Set as Set
View
4 Types.hs → Magic/Types.hs
@@ -6,7 +6,7 @@
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE ScopedTypeVariables #-}
-module Types (
+module Magic.Types (
-- * Data structures
Bag,
@@ -63,7 +63,7 @@ module Types (
Ask(..)
) where
-import IdList (Id, IdList)
+import Magic.IdList (Id, IdList)
import Control.Applicative
import Control.Monad.Identity
View
8 Utils.hs → Magic/Utils.hs
@@ -1,10 +1,10 @@
{-# LANGUAGE TypeOperators #-}
-module Utils where
+module Magic.Utils where
-import IdList (Id)
-import qualified IdList
-import Types
+import Magic.IdList (Id)
+import qualified Magic.IdList as IdList
+import Magic.Types
import Control.Monad.State (State, execState)
import Data.Label.Pure
View
7 Makefile
@@ -1,7 +1,10 @@
run:
- ghci -Wall Engine M12 BasicLands
+ ghci -Wall Magic.Engine Magic.M12 Magic.BasicLands
-docs:
+configure:
+ cabal configure
+
+docs: configure
cabal haddock
opendocs: docs

0 comments on commit a0bb01b

Please sign in to comment.
Something went wrong with that request. Please try again.