use of package uhc-util (split off, on hackage) instead of builtin EH…

….Util
UU-ComputerScience · Nov 27, 2012 · 20b7123 · 20b7123
1 parent cd6113b
commit 20b7123
Show file tree

Hide file tree

Showing 229 changed files with 354 additions and 354 deletions.
diff --git a/EHC/configure b/EHC/configure
@@ -3691,7 +3691,7 @@ HSC2HS_CMD=$hsc2hsCmd
 
 
 ### now we know we have ghc, check for some libraries using ghc-pkg
-ghcLibsRequired="fgl syb uulib network binary hashable uuagc-cabal"
+ghcLibsRequired="fgl syb uulib network binary hashable uhc-util"
 if test x$ghcExists = xyes
 then
   if test -x "$ghcCmd" -a -x "$ghcPkgCmd"
@@ -3777,7 +3777,7 @@ HADDOCK_VERSION=$haddockVersion
 
 
 # GHC version dependencies: packages passed as option, cabal packages
-cabal_base_lib_depends="base mtl fgl directory hashable old-time"
+cabal_base_lib_depends="base mtl fgl directory hashable old-time uhc-util"
 if test x$enableClr = "xyes"
 then
   cabal_base_lib_depends="$cabal_base_lib_depends language-cil"

diff --git a/EHC/configure.ac b/EHC/configure.ac
@@ -368,7 +368,7 @@ AC_PATH_PROG(hsc2hsCmd,hsc2hs)
 AC_SUBST(HSC2HS_CMD,$hsc2hsCmd)
 
 ### now we know we have ghc, check for some libraries using ghc-pkg
-ghcLibsRequired="fgl syb uulib network binary hashable"
+ghcLibsRequired="fgl syb uulib network binary hashable uhc-util"
 if test x$ghcExists = xyes
 then
   if test -x "$ghcCmd" -a -x "$ghcPkgCmd"
@@ -409,7 +409,7 @@ AC_SUBST(HADDOCK_CMD,$haddockCmd)
 AC_SUBST(HADDOCK_VERSION, $haddockVersion)
 
 # GHC version dependencies: packages passed as option, cabal packages
-cabal_base_lib_depends="base mtl fgl directory hashable old-time"
+cabal_base_lib_depends="base mtl fgl directory hashable old-time uhc-util"
 if test x$enableClr = "xyes"
 then
   cabal_base_lib_depends="$cabal_base_lib_depends language-cil"

diff --git a/EHC/ehclib/uhcbase/UHC/Run.chs b/EHC/ehclib/uhcbase/UHC/Run.chs
@@ -34,8 +34,6 @@ ehcRunMain m = m
 
 #else
 
-foreign import prim primCallInfoKindIsVisible :: Int -> Bool
-
 -- Wrapper around 'main', invoked as 'ehcRunMain main'
 ehcRunMain :: IO a -> IO a
 ehcRunMain m =
@@ -73,6 +71,8 @@ ehcRunMain m =
 
 
 #if ! defined(__UHC_TARGET_JS__)
+foreign import prim primCallInfoKindIsVisible :: Int -> Bool
+
 -- try to flush stdout/stderr, but don't worry if we fail
 -- (these handles might have errors, and we don't want to go into
 -- an infinite loop).

diff --git a/EHC/mk/shared.mk.in b/EHC/mk/shared.mk.in
@@ -362,7 +362,7 @@ FUN_EHC_GCC_LD_OPTS							= -L$(call FUN_INSTALLABS_VARIANT_LIB_SHARED_PREFIX,$(
 # GHC options
 GHC_OPTS_GENERAL						:= @GHC_GEN_OPTIONS@
 GHC_OPTS_WHEN_EHC						:= $(GHC_OPTS_GENERAL) @GHC_EHC_OPTIONS@
-GHC_OPTS								:= -fglasgow-exts $(OPT_GHC_STANDARD_PACKAGES) -package uulib $(GHC_OPTS_GENERAL)
+GHC_OPTS								:= -fglasgow-exts $(OPT_GHC_STANDARD_PACKAGES) -package uulib -package uhc-util $(GHC_OPTS_GENERAL)
 GHC_OPTS_OPTIM							:= -O2
 
 # HADDOCK options

diff --git a/EHC/src/ehc/AbstractCore.chs b/EHC/src/ehc/AbstractCore.chs
@@ -8,7 +8,7 @@
 %%[(8 codegen) import({%{EH}Base.Builtin},{%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Opts.Base},{%{EH}Ty})
 %%]
 
-%%[(8 codegen) import(EH.Util.Pretty,EH.Util.Utils)
+%%[(8 codegen) import(UHC.Util.Pretty,UHC.Util.Utils)
 %%]
 
 %%[(8 codegen) import(Data.List, Data.Maybe, qualified Data.Map as Map, qualified Data.Set as Set, Control.Applicative((<|>),(<$>)))

diff --git a/EHC/src/ehc/AbstractCore/Utils.chs b/EHC/src/ehc/AbstractCore/Utils.chs
@@ -17,11 +17,11 @@
 %%[(8 codegen) import(Data.List, qualified Data.Map as Map, qualified Data.Set as Set, Data.Maybe)
 %%]
 
-%%[(8 codegen) import(EH.Util.Utils)
+%%[(8 codegen) import(UHC.Util.Utils)
 %%]
 
 -- debug
-%%[(8 codegen) import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 codegen) import({%{EH}Base.Debug},UHC.Util.Pretty)
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/AnaDomain.cag b/EHC/src/ehc/AnaDomain.cag
@@ -18,7 +18,7 @@ Analysis domains
 %%]
 %%[(8 codegen) hs import(Control.Monad.State hiding (join), Control.Applicative)
 %%]
-%%[(8 codegen) hs import(EH.Util.Utils)
+%%[(8 codegen) hs import(UHC.Util.Utils)
 %%]
 
 %%[(8 codegen) hs export(QualAGItf(..), TyAGItf(..), CoeAGItf(..)) 
@@ -43,7 +43,7 @@ DERIVING *
 %%]
 
 -- debug only
-%%[(8 codegen) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 codegen) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/AnaDomain/Pretty.cag b/EHC/src/ehc/AnaDomain/Pretty.cag
@@ -7,7 +7,7 @@
 %%% AnaDomain Pretty Printer
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%[(8 codegen) hs module {%{EH}AnaDomain.Pretty} import(EH.Util.Pretty,{%{EH}AnaDomain})
+%%[(8 codegen) hs module {%{EH}AnaDomain.Pretty} import(UHC.Util.Pretty,{%{EH}AnaDomain})
 %%]
 
 %%[(8 codegen) hs import({%{EH}Base.Common})

diff --git a/EHC/src/ehc/AnaDomain/Trf/Subst.cag b/EHC/src/ehc/AnaDomain/Trf/Subst.cag
@@ -14,7 +14,7 @@ Substitution for AnaDomain.
 %%[(8 codegen) hs module {%{EH}AnaDomain.Trf.Subst} import({%{EH}Base.Common},{%{EH}AnaDomain},{%{EH}VarMp})
 %%]
 
-%%[(8 codegen) hs import(EH.Util.Utils)
+%%[(8 codegen) hs import(UHC.Util.Utils)
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/AnaDomain/Utils.chs b/EHC/src/ehc/AnaDomain/Utils.chs
@@ -19,14 +19,14 @@
 %%[(8 codegen) hs import(qualified Data.Map as Map,qualified Data.Set as Set, Data.Array, Data.Maybe, Data.List)
 %%]
 
-%%[(8 codegen) hs import(EH.Util.Utils)
+%%[(8 codegen) hs import(UHC.Util.Utils)
 %%]
 
 %%[(8 codegen) hs import(Control.Monad.State hiding (join), Control.Applicative)
 %%]
 
 -- debug only
-%%[(8 codegen) hs import({%{EH}Base.Debug},EH.Util.Pretty,{%{EH}AnaDomain.Pretty})
+%%[(8 codegen) hs import({%{EH}Base.Debug},UHC.Util.Pretty,{%{EH}AnaDomain.Pretty})
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/Base/AssocL.chs b/EHC/src/ehc/Base/AssocL.chs
@@ -10,7 +10,7 @@
 %%[1 module {%{EH}Base.AssocL}
 %%]
 
-%%[1 import(EH.Util.Pretty, EH.Util.Utils)
+%%[1 import(UHC.Util.Pretty, UHC.Util.Utils)
 %%]
 %%[1 import(Data.List)
 %%]

diff --git a/EHC/src/ehc/Base/BasicAnnot.chs b/EHC/src/ehc/Base/BasicAnnot.chs
@@ -8,7 +8,7 @@
 %%[(8 codegen) hs import(qualified Data.Map as Map,Data.Bits, Data.List)
 %%]
 
-%%[(8 codegen) hs import(EH.Util.Pretty, EH.Util.Utils)
+%%[(8 codegen) hs import(UHC.Util.Pretty, UHC.Util.Utils)
 %%]
 
 %%[(8 codegen) hs import(qualified {%{EH}Config} as Cfg, {%{EH}Base.Bits})

diff --git a/EHC/src/ehc/Base/Binary.chs b/EHC/src/ehc/Base/Binary.chs
@@ -5,7 +5,7 @@
 %%[50 hs module {%{EH}Base.Binary}
 %%]
 
-%%[50 import(EH.Util.Binary) export (module EH.Util.Binary)
+%%[50 import(UHC.Util.Binary) export (module UHC.Util.Binary)
 %%]
 %%[50 import(Data.Typeable(Typeable,Typeable1), Data.Generics.Aliases) export(module Data.Typeable)
 %%]

diff --git a/EHC/src/ehc/Base/Bits.chs b/EHC/src/ehc/Base/Bits.chs
@@ -7,7 +7,7 @@
 
 %%[(8 codegen) import(Data.Word,Data.Int,Data.Bits,Data.Char)
 %%]
-%%[(8 codegen) import(qualified EH.Util.FastSeq as Seq) export(Seq.empty)
+%%[(8 codegen) import(qualified UHC.Util.FastSeq as Seq) export(Seq.empty)
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/Base/Builtin.chs b/EHC/src/ehc/Base/Builtin.chs
@@ -5,7 +5,7 @@
 %%[1 module {%{EH}Base.Builtin} import({%{EH}Base.HsName}, Data.Maybe)
 %%]
 
-%%[1 import(EH.Util.Utils)
+%%[1 import(UHC.Util.Utils)
 %%]
 
 %%[1 export(hsnWild, hsnArrow, strProd, hsnProd, hsnProdArity, hsnUnknown, hsnIsArrow, hsnIsProd, hsnInt, hsnChar)

diff --git a/EHC/src/ehc/Base/CfgPP.chs b/EHC/src/ehc/Base/CfgPP.chs
@@ -26,7 +26,7 @@ As class variations on PP
 %%[8 import(Data.Char,qualified Data.Set as Set)
 %%]
 
-%%[8 import(EH.Util.Pretty)
+%%[8 import(UHC.Util.Pretty)
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/Base/Common.chs b/EHC/src/ehc/Base/Common.chs
@@ -7,7 +7,7 @@
 %%% Common
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%[1 module {%{EH}Base.Common} import(UU.Scanner.Position,EH.Util.Utils,{%{EH}Base.HsName},{%{EH}Base.Builtin}) export(module {%{EH}Base.HsName})
+%%[1 module {%{EH}Base.Common} import(UU.Scanner.Position,UHC.Util.Utils,{%{EH}Base.HsName},{%{EH}Base.Builtin}) export(module {%{EH}Base.HsName})
 %%]
 
 %%[1 import({%{EH}Base.UID}) export(module {%{EH}Base.UID})
@@ -16,7 +16,7 @@
 %%[1 import({%{EH}Base.AssocL}) export(module {%{EH}Base.AssocL})
 %%]
 
-%%[1 import(EH.Util.Pretty, Data.List) export(ppSpaced, ppCon, ppCmt)
+%%[1 import(UHC.Util.Pretty, Data.List) export(ppSpaced, ppCon, ppCmt)
 %%]
 
 %%[1 import(Control.Applicative((<|>)))
@@ -34,7 +34,7 @@
 %%[1 export(NmLev,nmLevAbsent, nmLevBuiltin, nmLevOutside, nmLevModule)
 %%]
 
-%%[1 import(EH.Util.ScanUtils) export(tokMkQName,tokMkQNames,tokMkInt,tokMkStr)
+%%[1 import(UHC.Util.ScanUtils) export(tokMkQName,tokMkQNames,tokMkInt,tokMkStr)
 %%]
 
 %%[1.Token hs import(UU.Scanner.Token)
@@ -64,7 +64,7 @@
 %%[7 export(uidHNm, uidQualHNm)
 %%]
 
-%%[8 import (EH.Util.FPath,System.IO,System.Environment,System.Exit,Data.Char,Data.Maybe,Numeric)
+%%[8 import (UHC.Util.FPath,System.IO,System.Environment,System.Exit,Data.Char,Data.Maybe,Numeric)
 %%]
 
 %%[8 export(putCompileMsg)

diff --git a/EHC/src/ehc/Base/Debug.chs b/EHC/src/ehc/Base/Debug.chs
@@ -7,7 +7,7 @@
 %%% Tracing
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%[1 module {%{EH}Base.Debug} import(Debug.Trace,EH.Util.Pretty) export(tr,trm,trPP)
+%%[1 module {%{EH}Base.Debug} import(Debug.Trace,UHC.Util.Pretty) export(tr,trm,trPP)
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/Base/FileSearchLocation.chs b/EHC/src/ehc/Base/FileSearchLocation.chs
@@ -14,10 +14,10 @@ In principle such files reside in directories or packages.
 %%]
 
 -- parsing
-%%[99 import(UU.Parsing, EH.Util.ParseUtils)
+%%[99 import(UU.Parsing, UHC.Util.ParseUtils)
 %%]
 -- scanning
-%%[99 import(EH.Util.ScanUtils, {%{EH}Base.HsName})
+%%[99 import(UHC.Util.ScanUtils, {%{EH}Base.HsName})
 %%]
 
 

diff --git a/EHC/src/ehc/Base/GenC.chs b/EHC/src/ehc/Base/GenC.chs
@@ -12,7 +12,7 @@ Various C code generation snippets.
 %%[(8 codegen) hs import(qualified Data.Map as Map,Data.Bits, Data.List)
 %%]
 
-%%[(8 codegen) hs import(EH.Util.Pretty)
+%%[(8 codegen) hs import(UHC.Util.Pretty)
 %%]
 
 %%[(8 codegen) hs import({%{EH}Base.BasicAnnot})

diff --git a/EHC/src/ehc/Base/GenJavaLike.chs b/EHC/src/ehc/Base/GenJavaLike.chs
@@ -15,7 +15,7 @@ Various Java like code generation utility snippets.
 %%[(8 jazy || javascript) hs import({%{EH}Base.Builtin},{%{EH}Base.Builtin2},{%{EH}BuiltinPrims})
 %%]
 
-%%[(8 jazy || javascript) hs import(EH.Util.Pretty, EH.Util.Utils, qualified EH.Util.FastSeq as Seq)
+%%[(8 jazy || javascript) hs import(UHC.Util.Pretty, UHC.Util.Utils, qualified UHC.Util.FastSeq as Seq)
 %%]
 
 %%[(8 jazy || javascript) hs import({%{EH}Opts.Base},{%{EH}Base.HsName},{%{EH}Base.Common},{%{EH}Base.BasicAnnot})

diff --git a/EHC/src/ehc/Base/HsName.chs b/EHC/src/ehc/Base/HsName.chs
@@ -16,7 +16,7 @@ is the responsibility of the compiler part using a particular
 HsNameUniqifier to guarantee such an invariant.
 %%]
 
-%%[1 module {%{EH}Base.HsName} import(EH.Util.Utils,EH.Util.Pretty, Data.List)
+%%[1 module {%{EH}Base.HsName} import(UHC.Util.Utils,UHC.Util.Pretty, Data.List)
 %%]
 
 %%[1 import({%{EH}Base.UID})
@@ -34,7 +34,7 @@ HsNameUniqifier to guarantee such an invariant.
 %%[7 import(qualified Data.Map as Map)
 %%]
 
-%%[8 import(EH.Util.FPath,Data.Char)
+%%[8 import(UHC.Util.FPath,Data.Char)
 %%]
 
 %%[8 export(OrigName(..))

diff --git a/EHC/src/ehc/Base/HtmlCommon.chs b/EHC/src/ehc/Base/HtmlCommon.chs
@@ -3,7 +3,7 @@ Utility functions for HTML generation
 %%[1 hs module {%{EH}Base.HtmlCommon}
 %%]
 
-%%[7_2 hs import({%{EH}Base.Common}, EH.Util.ParseUtils,  {%{EH}Ty}, {%{EH}EH}, qualified Data.Map as Map, Data.Map(Map), Data.Maybe, qualified Data.Set as Set, Data.Set(Set), EH.Util.Pretty, Data.List(sortBy))
+%%[7_2 hs import({%{EH}Base.Common}, UHC.Util.ParseUtils,  {%{EH}Ty}, {%{EH}EH}, qualified Data.Map as Map, Data.Map(Map), Data.Maybe, qualified Data.Set as Set, Data.Set(Set), UHC.Util.Pretty, Data.List(sortBy))
 %%]
 
 %%[7_2 hs

diff --git a/EHC/src/ehc/Base/LaTeX.chs b/EHC/src/ehc/Base/LaTeX.chs
@@ -2,7 +2,7 @@
 %%% LaTeX + lhs2TeX generation utilities
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%[1 module {%{EH}Base.LaTeX} import(EH.Util.Utils,EH.Util.Pretty, Data.List)
+%%[1 module {%{EH}Base.LaTeX} import(UHC.Util.Utils,UHC.Util.Pretty, Data.List)
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/Base/Optimize.chs b/EHC/src/ehc/Base/Optimize.chs
@@ -9,7 +9,7 @@
 %%]
 %%[(8 codegen) import({%{EH}Base.AssocL})
 %%]
-%%[(8 codegen) import(EH.Util.Pretty,EH.Util.Utils)
+%%[(8 codegen) import(UHC.Util.Pretty,UHC.Util.Utils)
 %%]
 %%[(50 codegen) import({%{EH}Base.Binary}, {%{EH}Base.Serialize} )
 %%]

diff --git a/EHC/src/ehc/Base/PackageDatabase.chs b/EHC/src/ehc/Base/PackageDatabase.chs
@@ -24,22 +24,22 @@ packages.
 %%]
 
 -- parsing
-%%[99 import(UU.Parsing, EH.Util.ParseUtils, {%{EH}Base.Parser2})
+%%[99 import(UU.Parsing, UHC.Util.ParseUtils, {%{EH}Base.Parser2})
 %%]
 -- scanning
-%%[99 import(EH.Util.ScanUtils, {%{EH}Scanner.Common}, {%{EH}Base.HsName}, {%{EH}Base.ParseUtils})
+%%[99 import(UHC.Util.ScanUtils, {%{EH}Scanner.Common}, {%{EH}Base.HsName}, {%{EH}Base.ParseUtils})
 %%]
 
 -- general imports
 %%[99 import(qualified Data.Map as Map, qualified Data.Set as Set, Data.Version, Data.List, Data.Maybe, Data.Char)
 %%]
 %%[99 import(System.Environment, System.Directory, Control.Monad)
 %%]
-%%[99 import(System.IO,System.Exit,System.Environment,EH.Util.FPath,EH.Util.Utils)
+%%[99 import(System.IO,System.Exit,System.Environment,UHC.Util.FPath,UHC.Util.Utils)
 %%]
 
 -- debug
-%%[99 import(EH.Util.Debug)
+%%[99 import(UHC.Util.Debug)
 %%]
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/EHC/src/ehc/Base/ParseUtils.chs b/EHC/src/ehc/Base/ParseUtils.chs
@@ -15,10 +15,10 @@ depend on UHC specific stuff.
 %%]
 
 -- parsing
-%%[8 import(UU.Parsing, EH.Util.ParseUtils)
+%%[8 import(UU.Parsing, UHC.Util.ParseUtils)
 %%]
 -- scanning
-%%[8 import(EH.Util.ScanUtils, {%{EH}Scanner.Common}, {%{EH}Base.HsName})
+%%[8 import(UHC.Util.ScanUtils, {%{EH}Scanner.Common}, {%{EH}Base.HsName})
 %%]
 
 

diff --git a/EHC/src/ehc/Base/Parser.chs b/EHC/src/ehc/Base/Parser.chs
@@ -7,13 +7,13 @@
 %%% Basic/shared parsers
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-%%[8 module {%{EH}Base.Parser} import(UU.Parsing, EH.Util.ParseUtils, EH.Util.ScanUtils, {%{EH}Base.Builtin},{%{EH}Base.Common}, {%{EH}Scanner.Common}, {%{EH}Scanner.Scanner}, {%{EH}Base.ParseUtils})
+%%[8 module {%{EH}Base.Parser} import(UU.Parsing, UHC.Util.ParseUtils, UHC.Util.ScanUtils, {%{EH}Base.Builtin},{%{EH}Base.Common}, {%{EH}Scanner.Common}, {%{EH}Scanner.Scanner}, {%{EH}Base.ParseUtils})
 %%]
 
 %%[8 import({%{EH}Base.ParseUtils}) export(module {%{EH}Base.ParseUtils})
 %%]
 
-%%[50 import(qualified Data.Set as Set,qualified EH.Util.Rel as Rel)
+%%[50 import(qualified Data.Set as Set,qualified UHC.Util.Rel as Rel)
 %%]
 
 %%[(5020 hmtyinfer) import(qualified {%{EH}Pred} as Pr)

diff --git a/EHC/src/ehc/Base/Parser2.chs b/EHC/src/ehc/Base/Parser2.chs
@@ -18,7 +18,7 @@ This should be in Base.Parser, but because of module circularities in an additio
 %%[8 import({%{EH}Base.Parser})
 %%]
 
-%%[8 import(UU.Parsing, EH.Util.ParseUtils, EH.Util.ScanUtils)
+%%[8 import(UU.Parsing, UHC.Util.ParseUtils, UHC.Util.ScanUtils)
 %%]
 
 %%[8 import({%{EH}Base.FileSearchLocation})
@@ -27,7 +27,7 @@ This should be in Base.Parser, but because of module circularities in an additio
 %%[50 import({%{EH}Module})
 %%]
 
-%%[50 import(qualified Data.Set as Set,qualified EH.Util.Rel as Rel)
+%%[50 import(qualified Data.Set as Set,qualified UHC.Util.Rel as Rel)
 %%]
 
 %%[99 import(Data.Version)

diff --git a/EHC/src/ehc/Base/Pragma.chs b/EHC/src/ehc/Base/Pragma.chs
@@ -7,7 +7,7 @@
 
 %%[99 import(qualified Data.Map as Map,Data.List)
 %%]
-%%[99 import(EH.Util.Pretty,EH.Util.Utils)
+%%[99 import(UHC.Util.Pretty,UHC.Util.Utils)
 %%]
 %%[99 import({%{EH}Base.HsName},{%{EH}Base.Target})
 %%]