make variant 8 compile, bit of cleanup

UU-ComputerScience · Jan 1, 2016 · b2789c7 · b2789c7
1 parent b0b996f
commit b2789c7
Show file tree

Hide file tree

Showing 18 changed files with 31 additions and 28 deletions.
diff --git a/EHC/src/ehc/Base/Common.chs b/EHC/src/ehc/Base/Common.chs
@@ -20,7 +20,10 @@
 %%[1 import(UHC.Util.Hashable) export (module UHC.Util.Hashable)
 %%]
 
-%%[8 import(GHC.Generics(Generic))
+%%[1 import(Data.Typeable(Typeable)) export(module Data.Typeable)
+%%]
+
+%%[1 import(GHC.Generics(Generic)) export(module GHC.Generics)
 %%]
 
 %%[1 import({%{EH}Base.HsName},{%{EH}Base.HsName.Builtin}) export(module {%{EH}Base.HsName})
@@ -35,9 +38,6 @@
 %%[1 import(UHC.Util.AssocL) export(module UHC.Util.AssocL)
 %%]
 
-%%[1 import(Data.Typeable(Typeable), Data.Generics(Data)) export(module Data.Typeable, module Data.Generics)
-%%]
-
 %%[1 import(UHC.Util.Pretty, Data.List)
 %%]
 

diff --git a/EHC/src/ehc/Base/FileSearchLocation.chs b/EHC/src/ehc/Base/FileSearchLocation.chs
@@ -34,7 +34,7 @@ In principle such files reside in directories or packages.
 %%[99 import(UHC.Util.Hashable)
 %%]
 
-%%[99 import(GHC.Generics)
+%%[9999 import(GHC.Generics)
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/Base/HsName.chs b/EHC/src/ehc/Base/HsName.chs
@@ -19,10 +19,7 @@ HsNameUniqifier to guarantee such an invariant.
 %%[1 module {%{EH}Base.HsName} import(UHC.Util.Utils,UHC.Util.Pretty, Data.List)
 %%]
 
-%%[1 import(Data.Typeable(Typeable), Data.Generics(Data))
-%%]
-
-%%[1 import(GHC.Generics)
+%%[1 import(Data.Typeable(Typeable), GHC.Generics(Generic))
 %%]
 
 %%[1 import({%{EH}Base.UID})

diff --git a/EHC/src/ehc/Base/Optimize.chs b/EHC/src/ehc/Base/Optimize.chs
@@ -5,7 +5,7 @@
 %%[8 module {%{EH}Base.Optimize}
 %%]
 
-%%[8 import(GHC.Generics)
+%%[8888 import(GHC.Generics)
 %%]
 
 %%[8 import({%{EH}Base.Common})

diff --git a/EHC/src/ehc/Base/Trace.chs b/EHC/src/ehc/Base/Trace.chs
@@ -8,7 +8,7 @@
 %%[1 import(UHC.Util.Pretty, UHC.Util.Utils)
 %%]
 
-%%[1 import(GHC.Generics(Generic), Data.Typeable)
+%%[1111 import(GHC.Generics(Generic), Data.Typeable)
 %%]
 
 %%[1 import(Control.Monad, Control.Monad.IO.Class)

diff --git a/EHC/src/ehc/Base/UID.chs b/EHC/src/ehc/Base/UID.chs
@@ -21,15 +21,12 @@
 %%[7 export(mkNewLevUIDL,mkInfNewLevUIDL)
 %%]
 
-%%[1 import(Data.Typeable(Typeable), Data.Generics(Data))
+%%[1 import(Data.Typeable(Typeable), GHC.Generics(Generic))
 %%]
 
 %%[50 import(Control.Monad, UHC.Util.Binary as B, UHC.Util.Serialize)
 %%]
 
-%%[1 import(GHC.Generics)
-%%]
-
 %%[9999 import({%{EH}Base.ForceEval})
 %%]
 

diff --git a/EHC/src/ehc/Base/UnderDev.chs b/EHC/src/ehc/Base/UnderDev.chs
@@ -8,7 +8,7 @@
 %%[1 import(UHC.Util.Utils)
 %%]
 
-%%[1 import(GHC.Generics(Generic), Data.Typeable)
+%%[1111 import(GHC.Generics(Generic), Data.Typeable)
 %%]
 
 %%[8888 import(Control.Monad, Control.Monad.IO.Class)

diff --git a/EHC/src/ehc/CodeGen/BasicAnnot.chs b/EHC/src/ehc/CodeGen/BasicAnnot.chs
@@ -5,6 +5,9 @@
 %%[(8 codegen) hs module {%{EH}CodeGen.BasicAnnot}
 %%]
 
+%%[(8 codegen) hs import({%{EH}Base.Common})
+%%]
+
 %%[(8 codegen) hs import(qualified Data.Map as Map,Data.Bits, Data.List)
 %%]
 

diff --git a/EHC/src/ehc/CodeGen/CEnv.chs b/EHC/src/ehc/CodeGen/CEnv.chs
@@ -13,7 +13,7 @@ Environmental info required during code generation
 %%[8 hs module {%{EH}CodeGen.CEnv}
 %%]
 
-%%[8 hs import(Data.Typeable)
+%%[8 hs import({%{EH}Base.Common})
 %%]
 %%[8 hs import(UHC.Util.Lens)
 %%]

diff --git a/EHC/src/ehc/EHC/ASTHandler.chs b/EHC/src/ehc/EHC/ASTHandler.chs
@@ -17,7 +17,7 @@ Abstraction for dealing with AST formats
 %%[8 import ({%{EH}EHC.Common}, {%{EH}EHC.CompileUnit}, {%{EH}EHC.CompileRun.Base})
 %%]
 
-%%[8 import (Data.Typeable, GHC.Generics)
+%%[8888 import (Data.Typeable, GHC.Generics)
 %%]
 
 %%[8 import (qualified Data.Map as Map)

diff --git a/EHC/src/ehc/EHC/ASTHandler/Instances.chs b/EHC/src/ehc/EHC/ASTHandler/Instances.chs
@@ -40,7 +40,10 @@
 %%[8 import (qualified UHC.Util.RelMap as Rel)
 %%]
 
-%%[8 import (Data.Typeable, GHC.Generics)
+%%[8 import (Data.Typeable)
+%%]
+
+%%[8888 import (GHC.Generics)
 %%]
 
 %%[8 import({%{EH}Base.ParseUtils})

diff --git a/EHC/src/ehc/EHC/ASTPipeline.chs b/EHC/src/ehc/EHC/ASTPipeline.chs
@@ -20,7 +20,7 @@ Used by all compiler driver code
 %%[8 import(Data.Monoid)
 %%]
 
-%%[8 import(GHC.Generics)
+%%[8888 import(GHC.Generics)
 %%]
 
 %%[8 import(UHC.Util.Pretty, UHC.Util.FPath, UHC.Util.Utils)

diff --git a/EHC/src/ehc/EHC/ASTTypes.chs b/EHC/src/ehc/EHC/ASTTypes.chs
@@ -16,7 +16,7 @@
 %%[8 import ({%{EH}Base.Common})
 %%]
 
-%%[8 import (Data.Typeable, GHC.Generics)
+%%[8888 import (Data.Typeable, GHC.Generics)
 %%]
 
 -- Language syntax: HS, EH, Core, TyCore, Grin, ...

diff --git a/EHC/src/ehc/EHC/Common.chs b/EHC/src/ehc/EHC/Common.chs
@@ -18,7 +18,7 @@ Used by all compiler driver code
 %%]
 %%[1 import({%{EH}Error},{%{EH}Error.Pretty}) export(module {%{EH}Error},module {%{EH}Error.Pretty})
 %%]
-%%[8 import(GHC.Generics)
+%%[8888 import(GHC.Generics)
 %%]
 
 %%[8 import({%{EH}EHC.ASTPipeline}) export(module {%{EH}EHC.ASTPipeline})

diff --git a/EHC/src/ehc/EHC/CompileRun/Base.chs b/EHC/src/ehc/EHC/CompileRun/Base.chs
@@ -14,9 +14,9 @@ An EHC compile run maintains info for one compilation invocation
 -- general imports
 %%[8 import(qualified Data.Map as Map,qualified Data.Set as Set, qualified Data.IntMap as IMap, Data.Maybe)
 %%]
-%%[8 import (Data.Typeable)
+%%[8888 import (Data.Typeable)
 %%]
-%%[8 import(GHC.Generics(Generic))
+%%[8888 import(GHC.Generics(Generic))
 %%]
 %%[8 import(qualified UHC.Util.RelMap as Rel, UHC.Util.Hashable)
 %%]

diff --git a/EHC/src/ehc/EHC/CompileUnit.chs b/EHC/src/ehc/EHC/CompileUnit.chs
@@ -20,7 +20,7 @@ An EHC compile unit maintains info for one unit of compilation, a Haskell (HS) m
 %%[8 import(UHC.Util.Lens)
 %%]
 
-%%[8 import(Data.Typeable)
+%%[8888 import(Data.Typeable)
 %%]
 
 -- Language syntax: HS, EH

diff --git a/EHC/src/ehc/Opts/Base.chs b/EHC/src/ehc/Opts/Base.chs
@@ -17,7 +17,10 @@
 %%[1 import(UHC.Util.Utils)
 %%]
 
-%%[1 import(Data.Typeable, Data.Maybe, qualified Data.Map as Map)
+%%[1111 import(Data.Typeable)
+%%]
+
+%%[1 import(Data.Maybe, qualified Data.Map as Map)
 %%]
 
 %%[1 import({%{EH}Base.UnderDev})
@@ -29,7 +32,7 @@
 %%[7 import(qualified Data.Set as Set)
 %%]
 
-%%[8 import(GHC.Generics(Generic))
+%%[8888 import(GHC.Generics(Generic))
 %%]
 
 %%[8 import(Data.List,Data.Char,{%{EH}Base.HsName.Builtin})

diff --git a/EHC/src/ehc/Opts/CommandLine.chs b/EHC/src/ehc/Opts/CommandLine.chs
@@ -13,7 +13,7 @@
 %%[8 import(Data.List)
 %%]
 
-%%[8 import(Data.Typeable(Typeable), Data.Generics(Data))
+%%[8 import(Data.Typeable(Typeable))
 %%]
 
 %%[50 import(UHC.Util.Binary, UHC.Util.Serialize)