Skip to content
Browse files

Put shuffle files in UHC.Shuffle namespace

  • Loading branch information...
1 parent a9c0e2d commit 97c2ce05e2defe35d8fdbeae067013bc0a34b692 @jbransen jbransen committed Nov 28, 2012
View
18 shuffle.cabal
@@ -15,15 +15,15 @@ Executable shuffle
Hs-Source-Dirs: src
Main-Is: Shuffle.hs
Extensions: RankNTypes, TypeSynonymInstances, FlexibleInstances, FlexibleContexts
- Other-Modules: AspectExpr,
- AspectExprEval,
- Common,
- CDoc,
- CDocCommon,
- CDocSubst,
- CDocInline,
- ChunkParser,
- MainAG
+ Other-Modules: UHC.Shuffle.AspectExpr,
+ UHC.Shuffle.AspectExprEval,
+ UHC.Shuffle.Common,
+ UHC.Shuffle.CDoc,
+ UHC.Shuffle.CDocCommon,
+ UHC.Shuffle.CDocSubst,
+ UHC.Shuffle.CDocInline,
+ UHC.Shuffle.ChunkParser,
+ UHC.Shuffle.MainAG
Build-Depends: base >= 4,
containers >= 0.4,
directory >= 1.2,
View
10 src/Shuffle.hs
@@ -16,11 +16,11 @@ import UHC.Util.ParseUtils
import UHC.Util.DependencyGraph
import UHC.Util.FPath
import UHC.Util.Pretty
-import Common
-import MainAG
-import ChunkParser
-import CDoc
-import CDocSubst
+import UHC.Shuffle.Common
+import UHC.Shuffle.MainAG
+import UHC.Shuffle.ChunkParser
+import UHC.Shuffle.CDoc
+import UHC.Shuffle.CDocSubst
import Data.Char
-------------------------------------------------------------------------
View
2 src/AspectExpr.ag → src/UHC/Shuffle/AspectExpr.ag
@@ -2,7 +2,7 @@
-- AspectExpr AST interface to Haskell
-------------------------------------------------------------------------
-imports
+MODULE {UHC.Shuffle.AspectExpr} {}
{
import System.IO
import qualified Data.Set as Set
View
0 src/AspectExprAbsSyn.ag → src/UHC/Shuffle/AspectExprAbsSyn.ag
File renamed without changes.
View
4 src/AspectExprEval.ag → src/UHC/Shuffle/AspectExprEval.ag
@@ -2,11 +2,11 @@
-- Evaluation of AspectExpr, given a set of AspectRef
-------------------------------------------------------------------------
-MODULE {AspectExprEval} {aspexpIsAccepted}
+MODULE {UHC.Shuffle.AspectExprEval} {aspexpIsAccepted}
{
import qualified Data.Set as Set
import qualified Data.Map as Map
-import AspectExpr
+import UHC.Shuffle.AspectExpr
}
INCLUDE "AspectExprAbsSyn.ag"
View
4 src/CDoc.ag → src/UHC/Shuffle/CDoc.ag
@@ -2,9 +2,9 @@
-- CDoc AST interface to Haskell
-------------------------------------------------------------------------
-imports
+MODULE {UHC.Shuffle.CDoc} {}
{
-import Common
+import UHC.Shuffle.Common
import System.IO
import qualified Data.Map as Map
}
View
0 src/CDocAbsSyn.ag → src/UHC/Shuffle/CDocAbsSyn.ag
File renamed without changes.
View
10 src/CDocCommon.hs → src/UHC/Shuffle/CDocCommon.hs
@@ -2,15 +2,15 @@
-- Common stuff based on CDoc
-------------------------------------------------------------------------
-module CDocCommon
- ( module Common
- , module CDoc
+module UHC.Shuffle.CDocCommon
+ ( module UHC.Shuffle.Common
+ , module UHC.Shuffle.CDoc
, NmChInfo(..), NmChMp
)
where
-import Common
-import CDoc
+import UHC.Shuffle.Common
+import UHC.Shuffle.CDoc
import qualified Data.Map as Map
-------------------------------------------------------------------------
View
0 src/CDocCommonAG.ag → src/UHC/Shuffle/CDocCommonAG.ag
File renamed without changes.
View
6 src/CDocInline.ag → src/UHC/Shuffle/CDocInline.ag
@@ -2,7 +2,7 @@
-- Inlining files on CDoc
-------------------------------------------------------------------------
-MODULE {CDocInline} {cdocInlineCDocIO, InlineCDocSt, InlineCDocIO}
+MODULE {UHC.Shuffle.CDocInline} {cdocInlineCDocIO, InlineCDocSt, InlineCDocIO}
{
import qualified Data.Map as Map
import Network.URI
@@ -11,8 +11,8 @@ import System.Exit
-- import System.Posix.Temp( mkstemp )
import System.Directory( removeFile )
import System.IO
-import CDoc
-import CDocCommon
+import UHC.Shuffle.CDoc
+import UHC.Shuffle.CDocCommon
}
INCLUDE "CDocAbsSyn.ag"
View
6 src/CDocSubst.ag → src/UHC/Shuffle/CDocSubst.ag
@@ -2,12 +2,12 @@
-- Substitution on CDoc
-------------------------------------------------------------------------
-MODULE {CDocSubst} {cdocSubst}
+MODULE {UHC.Shuffle.CDocSubst} {cdocSubst}
{
import qualified Data.Set as Set
import qualified Data.Map as Map
-import CDoc
-import CDocCommon
+import UHC.Shuffle.CDoc
+import UHC.Shuffle.CDocCommon
}
INCLUDE "CDocAbsSyn.ag"
View
0 src/ChunkAbsSyn.ag → src/UHC/Shuffle/ChunkAbsSyn.ag
File renamed without changes.
View
6 src/ChunkParser.hs → src/UHC/Shuffle/ChunkParser.hs
@@ -2,7 +2,7 @@
-- Chunk Parser
-------------------------------------------------------------------------
-module ChunkParser
+module UHC.Shuffle.ChunkParser
where
import qualified Data.Set as Set
@@ -18,8 +18,8 @@ import UHC.Util.ScanUtils
import UHC.Util.ParseUtils
import UHC.Util.Utils
-import Common
-import MainAG
+import UHC.Shuffle.Common
+import UHC.Shuffle.MainAG
-------------------------------------------------------------------------------------------
-- Scanning
View
8 src/Common.hs → src/UHC/Shuffle/Common.hs
@@ -2,13 +2,13 @@
-- Common stuff
-------------------------------------------------------------------------
-module Common
+module UHC.Shuffle.Common
( module Data.Maybe
, module Data.Char
, module UHC.Util.Nm
, module UHC.Util.FPath
, module UHC.Util.Pretty
- , module AspectExpr
+ , module UHC.Shuffle.AspectExpr
, Err(..), ErrM, ppErr, showUndef
@@ -60,8 +60,8 @@ import UHC.Util.Pretty
import UHC.Util.FPath
import UHC.Util.Utils
import UHC.Util.Nm
-import AspectExpr
-import AspectExprEval
+import UHC.Shuffle.AspectExpr
+import UHC.Shuffle.AspectExprEval
-------------------------------------------------------------------------
-- Errors
View
12 src/MainAG.ag → src/UHC/Shuffle/MainAG.ag
@@ -1,16 +1,16 @@
-imports
+MODULE {UHC.Shuffle.MainAG} {}
{
import Network.URI
import System.IO
import Control.Monad
import Data.Array
import Data.List
import qualified Data.Map as Map
-import Common
-import CDoc
-import CDocCommon
-import CDocSubst
-import CDocInline
+import UHC.Shuffle.Common
+import UHC.Shuffle.CDoc
+import UHC.Shuffle.CDocCommon
+import UHC.Shuffle.CDocSubst
+import UHC.Shuffle.CDocInline
import qualified Data.Set as Set
import qualified UHC.Util.FastSeq as Seq
import UHC.Util.Utils(initlast)
View
18 uuagc_options
@@ -1,17 +1,17 @@
-file : "src/AspectExpr.ag"
-options : data, rename, module "AspectExpr"
+file : "src/UHC/Shuffle/AspectExpr.ag"
+options : data, rename, module "UHC.Shuffle.AspectExpr"
-file: "src/AspectExprEval.ag"
+file: "src/UHC/Shuffle/AspectExprEval.ag"
options : catas, semfuns, signatures, pretty, rename
-file : "src/CDoc.ag"
-options : data, rename, module "CDoc"
+file : "src/UHC/Shuffle/CDoc.ag"
+options : data, rename, module "UHC.Shuffle.CDoc"
-file : "src/CDocSubst.ag"
+file : "src/UHC/Shuffle/CDocSubst.ag"
options : catas, semfuns, signatures, pretty, rename
-file : "src/CDocInline.ag"
+file : "src/UHC/Shuffle/CDocInline.ag"
options : catas, semfuns, signatures, pretty, rename
-file : "src/MainAG.ag"
-options : data, catas, semfuns, signatures, pretty, rename, module "MainAG"
+file : "src/UHC/Shuffle/MainAG.ag"
+options : data, catas, semfuns, signatures, pretty, rename, module "UHC.Shuffle.MainAG"

0 comments on commit 97c2ce0

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