Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

….Util
  • Loading branch information...
commit 20b7123c99ff0778cfa4390d317a6e418824870f 1 parent cd6113b
@atzedijkstra atzedijkstra authored
Showing with 354 additions and 354 deletions.
  1. +2 −2 EHC/configure
  2. +2 −2 EHC/configure.ac
  3. +2 −2 EHC/ehclib/uhcbase/UHC/Run.chs
  4. +1 −1  EHC/mk/shared.mk.in
  5. +1 −1  EHC/src/ehc/AbstractCore.chs
  6. +2 −2 EHC/src/ehc/AbstractCore/Utils.chs
  7. +2 −2 EHC/src/ehc/AnaDomain.cag
  8. +1 −1  EHC/src/ehc/AnaDomain/Pretty.cag
  9. +1 −1  EHC/src/ehc/AnaDomain/Trf/Subst.cag
  10. +2 −2 EHC/src/ehc/AnaDomain/Utils.chs
  11. +1 −1  EHC/src/ehc/Base/AssocL.chs
  12. +1 −1  EHC/src/ehc/Base/BasicAnnot.chs
  13. +1 −1  EHC/src/ehc/Base/Binary.chs
  14. +1 −1  EHC/src/ehc/Base/Bits.chs
  15. +1 −1  EHC/src/ehc/Base/Builtin.chs
  16. +1 −1  EHC/src/ehc/Base/CfgPP.chs
  17. +4 −4 EHC/src/ehc/Base/Common.chs
  18. +1 −1  EHC/src/ehc/Base/Debug.chs
  19. +2 −2 EHC/src/ehc/Base/FileSearchLocation.chs
  20. +1 −1  EHC/src/ehc/Base/GenC.chs
  21. +1 −1  EHC/src/ehc/Base/GenJavaLike.chs
  22. +2 −2 EHC/src/ehc/Base/HsName.chs
  23. +1 −1  EHC/src/ehc/Base/HtmlCommon.chs
  24. +1 −1  EHC/src/ehc/Base/LaTeX.chs
  25. +1 −1  EHC/src/ehc/Base/Optimize.chs
  26. +4 −4 EHC/src/ehc/Base/PackageDatabase.chs
  27. +2 −2 EHC/src/ehc/Base/ParseUtils.chs
  28. +2 −2 EHC/src/ehc/Base/Parser.chs
  29. +2 −2 EHC/src/ehc/Base/Parser2.chs
  30. +1 −1  EHC/src/ehc/Base/Pragma.chs
  31. +1 −1  EHC/src/ehc/Base/Serialize.chs
  32. +1 −1  EHC/src/ehc/Base/Target.chs
  33. +1 −1  EHC/src/ehc/Base/TermLike.chs
  34. +3 −3 EHC/src/ehc/Base/TreeTrie.chs
  35. +1 −1  EHC/src/ehc/Base/UID.chs
  36. +1 −1  EHC/src/ehc/BuiltinPrims.chs
  37. +1 −1  EHC/src/ehc/CHR.chs
  38. +1 −1  EHC/src/ehc/CHR/Constraint.chs
  39. +1 −1  EHC/src/ehc/CHR/Key.chs
  40. +2 −2 EHC/src/ehc/CHR/Solve.chs
  41. +2 −2 EHC/src/ehc/Cmm.cag
  42. +2 −2 EHC/src/ehc/Cmm/ToC.cag
  43. +1 −1  EHC/src/ehc/Config.chs.in
  44. +1 −1  EHC/src/ehc/Core.cag
  45. +1 −1  EHC/src/ehc/Core/FFI.chs
  46. +1 −1  EHC/src/ehc/Core/ModAsMap.cag
  47. +1 −1  EHC/src/ehc/Core/Parser.chs
  48. +1 −1  EHC/src/ehc/Core/Pretty.cag
  49. +1 −1  EHC/src/ehc/Core/Subst.cag
  50. +2 −2 EHC/src/ehc/Core/SysF/AsTy.chs
  51. +2 −2 EHC/src/ehc/Core/SysF/Check.cag
  52. +1 −1  EHC/src/ehc/Core/ToGrin.cag
  53. +2 −2 EHC/src/ehc/Core/ToJavaScript.cag
  54. +2 −2 EHC/src/ehc/Core/ToJazy.cag
  55. +1 −1  EHC/src/ehc/Core/Trf/ANormal.cag
  56. +2 −2 EHC/src/ehc/Core/Trf/AnaRelevance.cag
  57. +3 −3 EHC/src/ehc/Core/Trf/CAFGlobalAsArg.cag
  58. +1 −1  EHC/src/ehc/Core/Trf/ElimTrivApp.cag
  59. +2 −2 EHC/src/ehc/Core/Trf/FindNullaries.cag
  60. +2 −2 EHC/src/ehc/Core/Trf/FixDictFields.cag
  61. +2 −2 EHC/src/ehc/Core/Trf/FloatToGlobal.cag
  62. +1 −1  EHC/src/ehc/Core/Trf/InlineLetAlias.cag
  63. +2 −2 EHC/src/ehc/Core/Trf/LamGlobalAsArg.cag
  64. +1 −1  EHC/src/ehc/Core/Trf/LetDefBeforeUse.cag
  65. +1 −1  EHC/src/ehc/Core/Trf/LetFlattenStrict.cag
  66. +1 −1  EHC/src/ehc/Core/Trf/LetUnrec.cag
  67. +1 −1  EHC/src/ehc/Core/Trf/OptimizeStrictness.cag
  68. +2 −2 EHC/src/ehc/Core/Trf/RenUniq.cag
  69. +3 −3 EHC/src/ehc/Core/Utils.chs
  70. +1 −1  EHC/src/ehc/DerivationTree.chs
  71. +1 −1  EHC/src/ehc/Deriving.chs
  72. +3 −3 EHC/src/ehc/EH/MainAG.cag
  73. +1 −1  EHC/src/ehc/EH/Parser.chs
  74. +1 −1  EHC/src/ehc/EHC.chs
  75. +1 −1  EHC/src/ehc/EHC/Common.chs
  76. +2 −2 EHC/src/ehc/EHC/CompilePhase/FlowBetweenPhase.chs
  77. +1 −1  EHC/src/ehc/EHC/CompilePhase/Module.chs
  78. +1 −1  EHC/src/ehc/EHC/CompilePhase/Output.chs
  79. +2 −2 EHC/src/ehc/EHC/CompilePhase/Parsers.chs
  80. +2 −2 EHC/src/ehc/EHC/CompilePhase/Semantics.chs
  81. +1 −1  EHC/src/ehc/EHC/CompilePhase/Translations.chs
  82. +1 −1  EHC/src/ehc/EHC/CompileRun.chs
  83. +1 −1  EHC/src/ehc/EHC/CompileUnit.chs
  84. +1 −1  EHC/src/ehc/EHC/Environment.chs
  85. +1 −1  EHC/src/ehc/EHC/GrinCompilerDriver.chs
  86. +2 −2 EHC/src/ehc/Error.cag
  87. +3 −3 EHC/src/ehc/Error/Pretty.cag
  88. +1 −1  EHC/src/ehc/FinalEnv.chs
  89. +1 −1  EHC/src/ehc/Foreign.cag
  90. +1 −1  EHC/src/ehc/Foreign/Parser.chs
  91. +1 −1  EHC/src/ehc/Foreign/Pretty.cag
  92. +2 −2 EHC/src/ehc/Gam.chs
  93. +1 −1  EHC/src/ehc/Gam/Base.chs
  94. +1 −1  EHC/src/ehc/Gam/ClGam.chs
  95. +2 −2 EHC/src/ehc/Gam/DataGam.chs
  96. +1 −1  EHC/src/ehc/Gam/FixityGam.chs
  97. +1 −1  EHC/src/ehc/Gam/KiGam.chs
  98. +1 −1  EHC/src/ehc/Gam/PolGam.chs
  99. +2 −2 EHC/src/ehc/Gam/ScopeMapGam.chs
  100. +1 −1  EHC/src/ehc/Gam/TyGam.chs
  101. +1 −1  EHC/src/ehc/Gam/TyKiGam.chs
  102. +1 −1  EHC/src/ehc/Gam/ValGam.chs
  103. +1 −1  EHC/src/ehc/Generics.chs
  104. +1 −1  EHC/src/ehc/GrinByteCode.cag
  105. +3 −3 EHC/src/ehc/GrinByteCode/ToC.cag
  106. +1 −1  EHC/src/ehc/GrinCode.cag
  107. +1 −1  EHC/src/ehc/GrinCode/Parser.chs
  108. +1 −1  EHC/src/ehc/GrinCode/Pretty.cag
  109. +1 −1  EHC/src/ehc/GrinCode/ToCil.cag
  110. +1 −1  EHC/src/ehc/GrinCode/ToGrinByteCode.cag
  111. +1 −1  EHC/src/ehc/GrinCode/ToSilly.cag
  112. +1 −1  EHC/src/ehc/GrinCode/Trf/DropUnreachableBindings.cag
  113. +1 −1  EHC/src/ehc/GrinCode/Trf/EvalElim.cag
  114. +1 −1  EHC/src/ehc/GrinCode/Trf/FlattenSeq.cag
  115. +3 −3 EHC/src/ehc/GrinCode/Trf/Inline.cag
  116. +1 −1  EHC/src/ehc/GrinCode/Trf/UnusedMetaInfoElim.cag
  117. +2 −2 EHC/src/ehc/HI.chs
  118. +1 −1  EHC/src/ehc/HS.cag
  119. +3 −3 EHC/src/ehc/HS/MainAG.cag
  120. +2 −2 EHC/src/ehc/HS/ModImpExp.cag
  121. +3 −3 EHC/src/ehc/HS/Parser.chs
  122. +1 −1  EHC/src/ehc/JVMClass.cag
  123. +1 −1  EHC/src/ehc/JVMClass/ToBinary.cag
  124. +1 −1  EHC/src/ehc/JavaScript/Pretty.cag
  125. +1 −1  EHC/src/ehc/LLVM/Pretty.cag
  126. +2 −2 EHC/src/ehc/LamInfo.chs
  127. +1 −1  EHC/src/ehc/Module.chs
  128. +2 −2 EHC/src/ehc/NameAspect.chs
  129. +3 −3 EHC/src/ehc/Opts.chs
  130. +3 −3 EHC/src/ehc/Opts/Base.chs
  131. +2 −2 EHC/src/ehc/Pred.chs
  132. +1 −1  EHC/src/ehc/Pred/CHR.chs
  133. +1 −1  EHC/src/ehc/Pred/CommonCHR.chs
  134. +1 −1  EHC/src/ehc/Pred/Evidence.chs
  135. +2 −2 EHC/src/ehc/Pred/EvidenceToCore.chs
  136. +2 −2 EHC/src/ehc/Pred/EvidenceToTyCore.chs
  137. +1 −1  EHC/src/ehc/Pred/Heuristics.chs
  138. +2 −2 EHC/src/ehc/Pred/RedGraph.chs
  139. +1 −1  EHC/src/ehc/Pred/ToCHR.chs
  140. +3 −3 EHC/src/ehc/Scanner/Common.chs
  141. +2 −2 EHC/src/ehc/Scanner/Machine.chs
  142. +1 −1  EHC/src/ehc/Silly/Pretty.cag
  143. +2 −2 EHC/src/ehc/Silly/PrettyC.cag
  144. +1 −1  EHC/src/ehc/Substitutable.chs
  145. +2 −2 EHC/src/ehc/Ty.cag
  146. +1 −1  EHC/src/ehc/Ty/AppSpineGam.chs
  147. +2 −2 EHC/src/ehc/Ty/FIEnv.chs
  148. +3 −3 EHC/src/ehc/Ty/FitsIn.chs
  149. +2 −2 EHC/src/ehc/Ty/FitsInCommon.chs
  150. +1 −1  EHC/src/ehc/Ty/FitsInCommon2.chs
  151. +1 −1  EHC/src/ehc/Ty/Parser.chs
  152. +1 −1  EHC/src/ehc/Ty/Pretty.cag
  153. +1 −1  EHC/src/ehc/Ty/PrettyHTML.cag
  154. +1 −1  EHC/src/ehc/Ty/ToSysfTy.cag
  155. +1 −1  EHC/src/ehc/Ty/ToTyCore.cag
  156. +1 −1  EHC/src/ehc/Ty/TreeTrieKey.cag
  157. +1 −1  EHC/src/ehc/Ty/Trf/BetaReduce.chs
  158. +2 −2 EHC/src/ehc/Ty/Trf/Canonic.cag
  159. +2 −2 EHC/src/ehc/Ty/Trf/ElimAlts.cag
  160. +1 −1  EHC/src/ehc/Ty/Trf/Instantiate.cag
  161. +2 −2 EHC/src/ehc/Ty/Trf/MergePreds.cag
  162. +3 −3 EHC/src/ehc/Ty/Trf/Quantify.cag
  163. +2 −2 EHC/src/ehc/Ty/Trf/Subst.cag
  164. +1 −1  EHC/src/ehc/Ty/Utils1.chs
  165. +1 −1  EHC/src/ehc/TyCore.cag
  166. +1 −1  EHC/src/ehc/TyCore/Base.chs
  167. +1 −1  EHC/src/ehc/TyCore/Check.cag
  168. +1 −1  EHC/src/ehc/TyCore/Coercion.chs
  169. +1 −1  EHC/src/ehc/TyCore/Pretty.cag
  170. +1 −1  EHC/src/ehc/TyCore/PrettyAST.cag
  171. +1 −1  EHC/src/ehc/TyCore/Subst.chs
  172. +1 −1  EHC/src/ehc/TyCore/SubstApply.cag
  173. +2 −2 EHC/src/ehc/TyCore/ToCore.cag
  174. +1 −1  EHC/src/ehc/TyCore/Trf/DefinitionSiteArityRaise1of2.cag
  175. +1 −1  EHC/src/ehc/TyCore/Trf/DefinitionSiteArityRaise2of2.cag
  176. +1 −1  EHC/src/ehc/TyCore/Trf/OptimizeStrictness1of2.cag
  177. +1 −1  EHC/src/ehc/TyCore/Trf/OptimizeStrictness2of2.cag
  178. +2 −2 EHC/src/ehc/TyCore/Utils2.chs
  179. +2 −2 EHC/src/ehc/VarMp.chs
  180. +1 −1  EHC/src/gen/RtsGBCallC.chs
  181. +1 −1  EHC/src/ruler2/ARule/ElimCopyRule.cag
  182. +1 −1  EHC/src/ruler2/ARule/PrettyPrint.cag
  183. +2 −2 EHC/src/ruler2/ARule/RwSubst.cag
  184. +1 −1  EHC/src/ruler2/ARule/Utils.chs
  185. +1 −1  EHC/src/ruler2/Admin.chs
  186. +1 −1  EHC/src/ruler2/AttrProps.chs
  187. +7 −7 EHC/src/ruler2/Common.chs
  188. +3 −3 EHC/src/ruler2/Err.chs
  189. +1 −1  EHC/src/ruler2/Expr/LaTeX.cag
  190. +1 −1  EHC/src/ruler2/FmGam.chs
  191. +2 −2 EHC/src/ruler2/Gam.chs
  192. +1 −1  EHC/src/ruler2/JdShpGam.chs
  193. +1 −1  EHC/src/ruler2/KeywParser.chs
  194. +1 −1  EHC/src/ruler2/LaTeXFmtUtils.chs
  195. +2 −2 EHC/src/ruler2/Main1AG.cag
  196. +2 −2 EHC/src/ruler2/Main2AG.cag
  197. +1 −1  EHC/src/ruler2/MkAdmin.chs
  198. +1 −1  EHC/src/ruler2/NmParser.chs
  199. +1 −1  EHC/src/ruler2/Opts.chs
  200. +1 −1  EHC/src/ruler2/Parser.chs
  201. +2 −2 EHC/src/ruler2/Ruler.chs
  202. +1 −1  EHC/src/ruler2/Scanner.chs
  203. +1 −1  EHC/src/ruler2/ScannerMachine.chs
  204. +1 −1  EHC/src/ruler2/SelParser.chs
  205. +2 −2 EHC/src/ruler2/TrfAS2/GenARule.cag
  206. +2 −2 EHC/src/ruler2/TrfAS2/GenLaTeX.cag
  207. +1 −1  EHC/src/ruler2/Ty/PrettyPrint.cag
  208. +1 −1  EHC/src/ruler2/ViewSel/NmS.cag
  209. +1 −1  EHC/src/ruler2/ViewSel/Parser.chs
  210. +1 −1  EHC/src/ruler2/ViewSel/PrettyPrint.cag
  211. +1 −1  EHC/src/ruler2/ViewSel/RlIsSel.cag
  212. +1 −1  EHC/src/ruler2/ViewSel/RlRnm.cag
  213. +1 −1  EHC/src/ruler2/ViewSel/Self.cag
  214. +1 −1  EHC/src/ruler2/ViewSel/ViewSel.cag
  215. +1 −1  EHC/src/ruler2/WrKindGam.chs
  216. +3 −3 EHC/src/shuffle/ChunkParser.hs
  217. +7 −7 EHC/src/shuffle/Common.hs
  218. +4 −4 EHC/src/shuffle/MainAG.ag
  219. +4 −4 EHC/src/shuffle/Shuffle.hs
  220. +1 −1  EHC/src/text2text/Common.hs
  221. +1 −1  EHC/src/text2text/Plugin.hs
  222. +1 −1  EHC/src/text2text/Text.ag
  223. +5 −5 EHC/src/text2text/Text/Parser/Common.hs
  224. +2 −2 EHC/src/text2text/Text/Parser/DocLaTeX.hs
  225. +2 −2 EHC/src/text2text/Text/To/DocLaTeX.ag
  226. +3 −3 EHC/src/text2text/Text/To/Html.ag
  227. +3 −3 EHC/src/text2text/Text/To/TWiki.ag
  228. +2 −2 EHC/src/text2text/Text/Trf/UniformContent.ag
  229. +1 −1  EHC/src/text2text/Text2Text.hs
View
4 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"
View
4 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"
View
4 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).
View
2  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
View
2  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((<|>),(<$>)))
View
4 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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
4 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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  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})
View
2  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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
4 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})
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  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)
%%]
View
2  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})
View
2  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)
%%]
View
2  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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  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)
View
2  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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
8 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)
View
2  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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
4 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})
%%]
View
2  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})
View
2  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})
View
4 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(..))
View
2  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
View
2  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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  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} )
%%]
View
8 EHC/src/ehc/Base/PackageDatabase.chs
@@ -24,10 +24,10 @@ 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
@@ -35,11 +35,11 @@ packages.
%%]
%%[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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
4 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})
%%]
View
4 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)
View
4 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)
View
2  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})
%%]
View
2  EHC/src/ehc/Base/Serialize.chs
@@ -80,7 +80,7 @@ instance Serialize Foo where
%%[50 import(qualified Data.ByteString.Lazy as L, System.IO, System.IO(openBinaryFile))
%%]
-%%[50 import(EH.Util.Utils)
+%%[50 import(UHC.Util.Utils)
%%]
%%[50 import(Data.Typeable)
View
2  EHC/src/ehc/Base/Target.chs
@@ -7,7 +7,7 @@
%%[(8 codegen) import(qualified Data.Map as Map,Data.List)
%%]
-%%[(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})
%%]
View
2  EHC/src/ehc/Base/TermLike.chs
@@ -7,7 +7,7 @@
%%% Common
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[1 module {%{EH}Base.TermLike} import(UU.Scanner.Position,EH.Util.Utils,{%{EH}Base.Common},{%{EH}Base.HsName},{%{EH}Base.Builtin})
+%%[1 module {%{EH}Base.TermLike} import(UU.Scanner.Position,UHC.Util.Utils,{%{EH}Base.Common},{%{EH}Base.HsName},{%{EH}Base.Builtin})
%%]
%%[1 import(Control.Applicative((<|>)), Control.Monad, Data.Maybe)
View
6 EHC/src/ehc/Base/TreeTrie.chs
@@ -29,13 +29,13 @@ candidates is returned.
%%[9 import(Prelude hiding (lookup,null))
%%]
-%%[9 import(qualified EH.Util.FastSeq as Seq,qualified Data.List as List)
+%%[9 import(qualified UHC.Util.FastSeq as Seq,qualified Data.List as List)
%%]
-%%[9 import(EH.Util.Utils)
+%%[9 import(UHC.Util.Utils)
%%]
-%%[9 import(EH.Util.Pretty hiding (empty), qualified EH.Util.Pretty as PP)
+%%[9 import(UHC.Util.Pretty hiding (empty), qualified UHC.Util.Pretty as PP)
%%]
%%[50 import(Data.Typeable(Typeable,Typeable1), Data.Generics(Data))
View
2  EHC/src/ehc/Base/UID.chs
@@ -8,7 +8,7 @@
%%[1 export(mkNewLevUID, mkNewLevUID2, mkNewLevUID3, mkNewLevUID4, mkNewLevUID5, mkNewLevUID6, mkNewLevUID7, mkNewLevUID8, uidNext, mkNewUID, mkNewUIDL, uidNull, uidChild, mkInfNewUIDL)
%%]
-%%[1 import(EH.Util.Pretty)
+%%[1 import(UHC.Util.Pretty)
%%]
%%[1 import(qualified Data.Set as Set, Data.List)
View
2  EHC/src/ehc/BuiltinPrims.chs
@@ -14,7 +14,7 @@ Ideally, these tables should be merged.
%%[(8 codegen) import({%{EH}Base.HsName},{%{EH}Base.Common},{%{EH}Opts},{%{EH}Base.BasicAnnot},{%{EH}Base.Builtin},{%{EH}GrinByteCode})
%%]
-%%[(8 codegen) import(qualified Data.Map as Map, qualified EH.Util.FastSeq as Seq, EH.Util.Pretty, EH.Util.Utils)
+%%[(8 codegen) import(qualified Data.Map as Map, qualified UHC.Util.FastSeq as Seq, UHC.Util.Pretty, UHC.Util.Utils)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  EHC/src/ehc/CHR.chs
@@ -13,7 +13,7 @@ to avoid explosion of search space during resolution.
%%[(9 hmtyinfer || hmtyast) import(Data.Monoid,qualified Data.Set as Set)
%%]
-%%[(9 hmtyinfer || hmtyast) import(EH.Util.Pretty)
+%%[(9 hmtyinfer || hmtyast) import(UHC.Util.Pretty)
%%]
%%[(9 hmtyinfer || hmtyast) import({%{EH}CHR.Key}) export(module {%{EH}CHR.Key})
View
2  EHC/src/ehc/CHR/Constraint.chs
@@ -5,7 +5,7 @@
%%[(9 hmtyinfer || hmtyast) module {%{EH}CHR.Constraint} import({%{EH}Base.Common},{%{EH}Ty},{%{EH}CHR},{%{EH}CHR.Key},{%{EH}Base.TreeTrie},{%{EH}Substitutable})
%%]
-%%[(9 hmtyinfer || hmtyast) import(EH.Util.Pretty as PP, EH.Util.Utils)
+%%[(9 hmtyinfer || hmtyast) import(UHC.Util.Pretty as PP, UHC.Util.Utils)
%%]
%%[(9 hmtyinfer || hmtyast) import(qualified Data.Set as Set,qualified Data.Map as Map)
View
2  EHC/src/ehc/CHR/Key.chs
@@ -5,7 +5,7 @@
%%[9 module {%{EH}CHR.Key} import({%{EH}Base.Common},{%{EH}Base.TreeTrie})
%%]
-%%[9 import(EH.Util.Pretty, EH.Util.Utils)
+%%[9 import(UHC.Util.Pretty, UHC.Util.Utils)
%%]
%%[(9 hmtyinfer || hmtyast) import({%{EH}Ty},{%{EH}Ty.Pretty})
View
4 EHC/src/ehc/CHR/Solve.chs
@@ -20,7 +20,7 @@ Assumptions (to be documented further)
%%[(9 hmtyinfer || hmtyast) import(qualified Data.Set as Set,qualified Data.Map as Map,Data.List as List,Data.Maybe)
%%]
-%%[(9 hmtyinfer || hmtyast) import(EH.Util.Pretty as Pretty)
+%%[(9 hmtyinfer || hmtyast) import(UHC.Util.Pretty as Pretty)
%%]
%%[50 import(Data.Typeable(Typeable,Typeable1), Data.Generics(Data))
@@ -34,7 +34,7 @@ Assumptions (to be documented further)
%%]
-- For debug
-%%[(9 hmtyinfer || hmtyast) import(EH.Util.Utils)
+%%[(9 hmtyinfer || hmtyast) import(UHC.Util.Utils)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
4 EHC/src/ehc/Cmm.cag
@@ -14,7 +14,7 @@ C subset, modelled after C--
%%[(8 codegen cmm) hs module {%{EH}Cmm} import({%{EH}Base.Common} hiding (Range))
%%]
-%%[(8 codegen cmm) hs import(EH.Util.Utils)
+%%[(8 codegen cmm) hs import(UHC.Util.Utils)
%%]
%%[(8 codegen cmm) hs import(qualified Data.Map as Map)
@@ -61,7 +61,7 @@ DERIVING *
%%]
-- debug only
-%%[(8888 codegen cmm) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8888 codegen cmm) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
4 EHC/src/ehc/Cmm/ToC.cag
@@ -8,10 +8,10 @@
%%[(8 codegen cmm) hs import({%{EH}Base.Builtin},{%{EH}Cmm},{%{EH}Base.Common} hiding (Range),{%{EH}Opts},qualified {%{EH}Config} as Cfg)
%%]
-%%[(8 codegen cmm) hs import(EH.Util.Pretty,{%{EH}Base.GenC})
+%%[(8 codegen cmm) hs import(UHC.Util.Pretty,{%{EH}Base.GenC})
%%]
-%%[(8 codegen cmm) hs import(Data.Maybe,Data.Char,qualified Data.Bits as B,EH.Util.Utils,qualified Data.Map as Map)
+%%[(8 codegen cmm) hs import(Data.Maybe,Data.Char,qualified Data.Bits as B,UHC.Util.Utils,qualified Data.Map as Map)
%%]
%%[(8 codegen cmm) import({Cmm/AbsSyn})
View
2  EHC/src/ehc/Config.chs.in
@@ -8,7 +8,7 @@
%%[1 import({%{EH}ConfigInstall}) export(module {%{EH}ConfigInstall})
%%]
-%%[8 import(Data.Maybe,Data.List,EH.Util.Utils,EH.Util.FPath)
+%%[8 import(Data.Maybe,Data.List,UHC.Util.Utils,UHC.Util.FPath)
%%]
%%[8 import(qualified Data.Map as Map)
View
2  EHC/src/ehc/Core.cag
@@ -25,7 +25,7 @@ Datatype LamInfo holds the implementation info to be exported from a module.
%%[(8 codegen) hs import ({%{EH}Base.Target}(FFIWay(..),TargetFlavor(..))) export(module {%{EH}Base.Target})
%%]
-%%[(8 codegen) hs import(Data.Maybe,Data.Char,Data.List,EH.Util.Pretty,EH.Util.Utils,Control.Applicative((<|>)))
+%%[(8 codegen) hs import(Data.Maybe,Data.Char,Data.List,UHC.Util.Pretty,UHC.Util.Utils,Control.Applicative((<|>)))
%%]
%%[(8 codegen) hs export(CodeAGItf(..), CModule(..), CExpr(..), MbCExpr, CBind(..), CBound(..), CMetaVal(..), CMetaBind(..), CMetas, CBindL, CBoundL, CPatRest(..), CAlt(..), CAltL, CPat(..), CPatFld(..), CPatFldL)
View
2  EHC/src/ehc/Core/FFI.chs
@@ -26,7 +26,7 @@
%%]
-- debug
-%%[(8888 codegen) import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8888 codegen) import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  EHC/src/ehc/Core/ModAsMap.cag
@@ -13,7 +13,7 @@
%%[(50 codegen) hs import(qualified Data.Set as Set,qualified Data.Map as Map, Data.Array)
%%]
-%%[(50 codegen) hs import(qualified EH.Util.FastSeq as Seq)
+%%[(50 codegen) hs import(qualified UHC.Util.FastSeq as Seq)
%%]
%%[(50 codegen) hs import({%{EH}Base.Common},{%{EH}Core},{%{EH}Ty})
View
2  EHC/src/ehc/Core/Parser.chs
@@ -7,7 +7,7 @@
%%% Core parser
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[(8 codegen) module {%{EH}Core.Parser} import(UU.Parsing as P, EH.Util.ParseUtils, EH.Util.ScanUtils, {%{EH}Base.Common}, {%{EH}Scanner.Common}, {%{EH}Scanner.Scanner}, {%{EH}Base.Parser}, {%{EH}Ty.Parser(pTy)}, {%{EH}Core})
+%%[(8 codegen) module {%{EH}Core.Parser} import(UU.Parsing as P, UHC.Util.ParseUtils, UHC.Util.ScanUtils, {%{EH}Base.Common}, {%{EH}Scanner.Common}, {%{EH}Scanner.Scanner}, {%{EH}Base.Parser}, {%{EH}Ty.Parser(pTy)}, {%{EH}Core})
%%]
%%[(8 codegen) import(Data.Maybe)
%%]
View
2  EHC/src/ehc/Core/Pretty.cag
@@ -11,7 +11,7 @@ Note (20120525): lamMp use removed because of cyclic module import
%%% Core Pretty Printer
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[(8 codegen) hs module {%{EH}Core.Pretty} import(EH.Util.Pretty,{%{EH}Base.Builtin},{%{EH}Base.CfgPP},{%{EH}Opts.Base},{%{EH}Base.Common},{%{EH}Ty},{%{EH}Ty.Pretty},{%{EH}Core},{%{EH}Scanner.Common(coreScanOpts)}) export(ppCModule)
+%%[(8 codegen) hs module {%{EH}Core.Pretty} import(UHC.Util.Pretty,{%{EH}Base.Builtin},{%{EH}Base.CfgPP},{%{EH}Opts.Base},{%{EH}Base.Common},{%{EH}Ty},{%{EH}Ty.Pretty},{%{EH}Core},{%{EH}Scanner.Common(coreScanOpts)}) export(ppCModule)
%%]
%%[(8 codegen) hs import({%{EH}AnaDomain.Pretty})
View
2  EHC/src/ehc/Core/Subst.cag
@@ -7,7 +7,7 @@
%%% Substituting holes
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[(8 codegen) hs module {%{EH}Core.Subst} import(Data.Maybe,qualified Data.Set as Set,qualified Data.Map as Map,EH.Util.Pretty,EH.Util.Utils,{%{EH}Opts.Base},{%{EH}Base.Common},{%{EH}Ty},{%{EH}Core},{%{EH}VarMp},{%{EH}Core.Pretty},{%{EH}Core.FvS})
+%%[(8 codegen) hs module {%{EH}Core.Subst} import(Data.Maybe,qualified Data.Set as Set,qualified Data.Map as Map,UHC.Util.Pretty,UHC.Util.Utils,{%{EH}Opts.Base},{%{EH}Base.Common},{%{EH}Ty},{%{EH}Core},{%{EH}VarMp},{%{EH}Core.Pretty},{%{EH}Core.FvS})
%%]
%%[(8 codegen) hs import({%{EH}AbstractCore})
View
4 EHC/src/ehc/Core/SysF/AsTy.chs
@@ -8,7 +8,7 @@
%%[(8 codegen) hs import(qualified {%{EH}Core} as C, qualified {%{EH}Ty} as T)
%%]
-%%[(8 codegen) hs import(EH.Util.Pretty,{%{EH}Core.Pretty},{%{EH}Error.Pretty})
+%%[(8 codegen) hs import(UHC.Util.Pretty,{%{EH}Core.Pretty},{%{EH}Error.Pretty})
%%]
%%[(8 codegen) hs import({%{EH}AbstractCore})
@@ -29,7 +29,7 @@
%%[(8 codegen) hs import(qualified Data.Map as Map,Data.Maybe)
%%]
-%%[(8 codegen) hs import(qualified EH.Util.FastSeq as Seq)
+%%[(8 codegen) hs import(qualified UHC.Util.FastSeq as Seq)
%%]
%%[doesWhat doclatex
View
4 EHC/src/ehc/Core/SysF/Check.cag
@@ -20,13 +20,13 @@
%%[(8 codegen coresysf) hs import({%{EH}Core.BindExtract},qualified {%{EH}Core.SysF.AsTy} as SysF)
%%]
-%%[(8 codegen coresysf) hs import(qualified EH.Util.FastSeq as Seq)
+%%[(8 codegen coresysf) hs import(qualified UHC.Util.FastSeq as Seq)
%%]
%%[(8 codegen coresysf) hs import(Data.Maybe, qualified Data.Map as Map, Control.Applicative)
%%]
-%%[(8 codegen coresysf) hs import(EH.Util.Pretty)
+%%[(8 codegen coresysf) hs import(UHC.Util.Pretty)
%%]
%%[(8 codegen coresysf).WRAPPER ag import({Core/AbsSyn},{Core/CommonBindNm},{Core/CommonMetaLev})
View
2  EHC/src/ehc/Core/ToGrin.cag
@@ -11,7 +11,7 @@
%%]
%%[(8 codegen grin) hs import(Data.Char, Data.Maybe, Data.List, qualified Data.Set as Set, qualified Data.Map as Map)
%%]
-%%[(8 codegen grin) hs import(EH.Util.Utils, EH.Util.Pretty)
+%%[(8 codegen grin) hs import(UHC.Util.Utils, UHC.Util.Pretty)
%%]
%%[(8 codegen grin) hs import({%{EH}Base.Common}, {%{EH}Base.TermLike}, {%{EH}Opts}, qualified {%{EH}Config} as Cfg, {%{EH}Base.Builtin},{%{EH}Base.Builtin2})
%%]
View
4 EHC/src/ehc/Core/ToJavaScript.cag
@@ -12,7 +12,7 @@
%%[(8 javascript) hs import(Data.Maybe, qualified Data.Map as Map, qualified Data.Set as Set, Data.Char, Data.Maybe, Data.List)
%%]
-%%[(8 javascript) hs import(EH.Util.Utils, qualified EH.Util.FastSeq as Seq)
+%%[(8 javascript) hs import(UHC.Util.Utils, qualified UHC.Util.FastSeq as Seq)
%%]
%%[(8 javascript) hs import({%{EH}Base.Builtin},{%{EH}Base.Builtin2},{%{EH}BuiltinPrims},{%{EH}Base.BasicAnnot},{%{EH}Base.GenJavaLike})
@@ -28,7 +28,7 @@
%%]
-- debug
-%%[(8 javascript) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 javascript) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
4 EHC/src/ehc/Core/ToJazy.cag
@@ -12,7 +12,7 @@
%%[(8 jazy) hs import(Data.Maybe, qualified Data.Map as Map, Data.Char)
%%]
-%%[(8 jazy) hs import(EH.Util.Utils, qualified EH.Util.FastSeq as Seq)
+%%[(8 jazy) hs import(UHC.Util.Utils, qualified UHC.Util.FastSeq as Seq)
%%]
%%[(8 jazy) hs import({%{EH}Base.Builtin},{%{EH}Base.Builtin2},{%{EH}BuiltinPrims},{%{EH}Base.BasicAnnot},{%{EH}Base.GenJavaLike})
@@ -25,7 +25,7 @@
%%]
-- debug
-%%[(8 jazy) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 jazy) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  EHC/src/ehc/Core/Trf/ANormal.cag
@@ -18,7 +18,7 @@ For that to work, all arguments of an application closure must themselves be bou
%%[(8 codegen) hs import(Data.Maybe,qualified Data.Set as Set, Data.List as List, qualified Data.Map as Map)
%%]
-%%[(8 codegen) hs import(qualified EH.Util.FastSeq as Seq)
+%%[(8 codegen) hs import(qualified UHC.Util.FastSeq as Seq)
%%]
%%[(8 codegen) hs import({%{EH}AbstractCore},{%{EH}Core})
View
4 EHC/src/ehc/Core/Trf/AnaRelevance.cag
@@ -19,7 +19,7 @@ Analyse Core, using relevance analysis, to relate properties (like relevance) of
%%[(8 codegen) hs import(Data.Maybe, qualified Data.Map as Map, qualified Data.Set as Set, Control.Applicative)
%%]
-%%[(8 codegen) hs import(EH.Util.Utils)
+%%[(8 codegen) hs import(UHC.Util.Utils)
%%]
%%[(8 codegen) hs import({%{EH}Foreign.Extract})
@@ -40,7 +40,7 @@ Analyse Core, using relevance analysis, to relate properties (like relevance) of
%%]
-- 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})
%%]
%%[(8 codegen).WRAPPER ag import({Core/AbsSyn},{Core/CommonLev},{Core/CommonFFI},{Core/CommonBindNm},{Core/Trf/CommonStructureInfo},{Core/CommonCtxtPred},{Core/Trf/CommonFv},{Core/CommonLamInfo},{Core/CommonGathLamInfo})
View
6 EHC/src/ehc/Core/Trf/CAFGlobalAsArg.cag
@@ -12,7 +12,7 @@ Similar to Trf/LamGlobalAsArg, but for CAFs.
Assumes:
- lambdas are already treated by Trf/LamGlobalAsArg, so no free vars of lambdas need to be taken care of.
-%%[(8 codegen) hs module {%{EH}Core.Trf.CAFGlobalAsArg} import(EH.Util.Utils,Data.Maybe,qualified Data.Set as Set,Data.List,qualified Data.Map as Map,{%{EH}Base.Common},{%{EH}Core},{%{EH}Ty}) export(cmodTrfCAFGlobalAsArg)
+%%[(8 codegen) hs module {%{EH}Core.Trf.CAFGlobalAsArg} import(UHC.Util.Utils,Data.Maybe,qualified Data.Set as Set,Data.List,qualified Data.Map as Map,{%{EH}Base.Common},{%{EH}Core},{%{EH}Ty}) export(cmodTrfCAFGlobalAsArg)
%%]
%%[(8 codegen) hs import({%{EH}Base.Builtin},{%{EH}Core.Utils})
@@ -22,11 +22,11 @@ Assumes:
%%]
-%%[(8 codegen) hs import(qualified EH.Util.FastSeq as Seq)
+%%[(8 codegen) hs import(qualified UHC.Util.FastSeq as Seq)
%%]
-- for debug
-%%[(8 codegen) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 codegen) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%[(8 codegen) hs import(Debug.Trace)
%%]
View
2  EHC/src/ehc/Core/Trf/ElimTrivApp.cag
@@ -17,7 +17,7 @@ This is done for Prelude functions:
%%[(8 codegen) hs import({%{EH}Base.Common},{%{EH}Base.Builtin},{%{EH}Opts},{%{EH}Core},{%{EH}Ty})
%%]
-%%[(8 codegen) hs import(EH.Util.Utils)
+%%[(8 codegen) hs import(UHC.Util.Utils)
%%]
%%[(8 codegen).WRAPPER ag import({Core/AbsSyn},{Core/CommonLev},{Core/CommonCtxtPred},{Core/Trf/CommonFv},{Core/Trf/CommonStructureInfo},{Core/CommonBindNm})
View
4 EHC/src/ehc/Core/Trf/FindNullaries.cag
@@ -8,13 +8,13 @@
%%]
%%[(8 codegen wholeprogAnal) hs import(Data.Maybe, qualified Data.Set as Set, qualified Data.Map as Map)
%%]
-%%[(8 codegen wholeprogAnal) hs import(EH.Util.Utils,qualified EH.Util.FastSeq as Seq,{%{EH}Base.Common},{%{EH}Core},{%{EH}Ty})
+%%[(8 codegen wholeprogAnal) hs import(UHC.Util.Utils,qualified UHC.Util.FastSeq as Seq,{%{EH}Base.Common},{%{EH}Core},{%{EH}Ty})
%%]
%%[(8 codegen wholeprogAnal) hs import({%{EH}AbstractCore})
%%]
-- for debug
-%%[(8 codegen wholeprogAnal) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 codegen wholeprogAnal) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%[(8 codegen wholeprogAnal) hs import(Debug.Trace)
%%]
View
4 EHC/src/ehc/Core/Trf/FixDictFields.cag
@@ -12,13 +12,13 @@
%%]
%%[(9 codegen wholeprogAnal) hs import(Data.Maybe, qualified Data.Set as Set, qualified Data.Map as Map)
%%]
-%%[(9 codegen wholeprogAnal) hs import(EH.Util.Utils,qualified EH.Util.FastSeq as Seq,{%{EH}Base.Common},{%{EH}Core},{%{EH}Ty})
+%%[(9 codegen wholeprogAnal) hs import(UHC.Util.Utils,qualified UHC.Util.FastSeq as Seq,{%{EH}Base.Common},{%{EH}Core},{%{EH}Ty})
%%]
%%[(9 codegen wholeprogAnal) hs import({%{EH}AbstractCore})
%%]
-- for debug
-%%[(9 codegen wholeprogAnal) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(9 codegen wholeprogAnal) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%[(9 codegen wholeprogAnal) hs import(Debug.Trace)
%%]
View
4 EHC/src/ehc/Core/Trf/FloatToGlobal.cag
@@ -26,7 +26,7 @@ The following invariants are and must be maintained:
%%% Float lambdas to global level
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[(8 codegen) hs module {%{EH}Core.Trf.FloatToGlobal} import(EH.Util.Utils,qualified EH.Util.FastSeq as Seq)
+%%[(8 codegen) hs module {%{EH}Core.Trf.FloatToGlobal} import(UHC.Util.Utils,qualified UHC.Util.FastSeq as Seq)
%%]
%%[(8 codegen) hs import({%{EH}Base.Builtin},{%{EH}Base.Common},{%{EH}Core},{%{EH}Ty})
@@ -39,7 +39,7 @@ The following invariants are and must be maintained:
%%]
-- for debug
-%%[(8 codegen) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 codegen) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%[(8 codegen) hs import(Debug.Trace)
%%]
View
2  EHC/src/ehc/Core/Trf/InlineLetAlias.cag
@@ -17,7 +17,7 @@
WRAPPER CodeAGItf
%%]
-%%[(8 codegen) hs import(EH.Util.Utils)
+%%[(8 codegen) hs import(UHC.Util.Utils)
%%]
%%[(9 codegen) hs import(qualified Data.Set as Set)
%%]
View
4 EHC/src/ehc/Core/Trf/LamGlobalAsArg.cag
@@ -28,7 +28,7 @@ in ...f g...
%%% Globals as args
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[(8 codegen) hs module {%{EH}Core.Trf.LamGlobalAsArg} import(EH.Util.Utils,Data.Maybe,qualified Data.Set as Set,Data.List,qualified Data.Map as Map)
+%%[(8 codegen) hs module {%{EH}Core.Trf.LamGlobalAsArg} import(UHC.Util.Utils,Data.Maybe,qualified Data.Set as Set,Data.List,qualified Data.Map as Map)
%%]
%%[(8 codegen) hs import({%{EH}Base.Builtin},{%{EH}Base.Common},{%{EH}Core},{%{EH}Ty})
@@ -41,7 +41,7 @@ in ...f g...
%%]
-- for debug
-%%[(8 codegen) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 codegen) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%[(8 codegen) hs import(Debug.Trace)
%%]
View
2  EHC/src/ehc/Core/Trf/LetDefBeforeUse.cag
@@ -37,7 +37,7 @@ Assumptions:
%%[(8 codegen) hs import({%{EH}Base.Debug},{%{EH}Base.Builtin})
%%]
-%%[(8 codegen) hs import(EH.Util.Utils(scc))
+%%[(8 codegen) hs import(UHC.Util.Utils(scc))
%%]
%%[(8 codegen).WRAPPER ag import({Core/AbsSyn},{Core/CommonBindNm},{Core/CommonLev},{Core/CommonLevLet},{Core/Trf/CommonFv})
View
2  EHC/src/ehc/Core/Trf/LetFlattenStrict.cag
@@ -36,7 +36,7 @@ Limitation: only works for 1 CBound_Bind, if more aspects are defined the transf
%%[(8 codegen) hs import({%{EH}AbstractCore})
%%]
-%%[(8 codegen) hs import(Data.Maybe,qualified EH.Util.FastSeq as Seq)
+%%[(8 codegen) hs import(Data.Maybe,qualified UHC.Util.FastSeq as Seq)
%%]
%%[(8 codegen).WRAPPER ag import({Core/AbsSyn})
View
2  EHC/src/ehc/Core/Trf/LetUnrec.cag
@@ -13,7 +13,7 @@
%%[(8 codegen) hs import({%{EH}AbstractCore})
%%]
-%%[(8 codegen) hs import({%{EH}Base.Debug},EH.Util.Utils(scc))
+%%[(8 codegen) hs import({%{EH}Base.Debug},UHC.Util.Utils(scc))
%%]
%%[(8 codegen) hs import(Data.Maybe,qualified Data.Map as Map, qualified Data.Set as Set)
View
2  EHC/src/ehc/Core/Trf/OptimizeStrictness.cag
@@ -28,7 +28,7 @@ Specific transformations:
%%[(8 codegen) hs import(qualified Data.Map as Map,qualified Data.Set as Set, Data.List, Data.Maybe)
%%]
-%%[(8 codegen) hs import(EH.Util.Utils)
+%%[(8 codegen) hs import(UHC.Util.Utils)
%%]
%%[(8 codegen) hs import({%{EH}LamInfo})
View
4 EHC/src/ehc/Core/Trf/RenUniq.cag
@@ -10,7 +10,7 @@
%%[(8 codegen) hs module {%{EH}Core.Trf.RenUniq} import(Data.Maybe,Data.Char,Control.Monad(liftM),qualified Data.Map as Map)
%%]
-%%[(8 codegen) hs import(EH.Util.Utils)
+%%[(8 codegen) hs import(UHC.Util.Utils)
%%]
%%[(8 codegen) hs import({%{EH}Base.Common},{%{EH}Base.Builtin},{%{EH}Core},{%{EH}Ty})
%%]
@@ -26,7 +26,7 @@ PRAGMA strictcase
%%]
-- debug
-%%[(8 codegen) hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 codegen) hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
6 EHC/src/ehc/Core/Utils.chs
@@ -22,12 +22,12 @@
%%]
%%[(8 codegen) import({%{EH}VarMp},{%{EH}Substitutable})
%%]
-%%[(8 codegen) import(Data.List,Data.Maybe,qualified Data.Set as Set,Data.List,qualified Data.Map as Map,EH.Util.Utils)
+%%[(8 codegen) import(Data.List,Data.Maybe,qualified Data.Set as Set,Data.List,qualified Data.Map as Map,UHC.Util.Utils)
%%]
%%[(50 codegen) import(Control.Monad.State, Data.Array)
%%]
-%%[(50 codegen) import(qualified EH.Util.FastSeq as Seq)
+%%[(50 codegen) import(qualified UHC.Util.FastSeq as Seq)
%%]
%%[(50 codegen) import({%{EH}Core.FvS}, {%{EH}Core.ModAsMap})
%%]
@@ -35,7 +35,7 @@
%%]
-- debug
-%%[(8 codegen) import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 codegen) import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  EHC/src/ehc/DerivationTree.chs
@@ -13,7 +13,7 @@
%%[(99 hmtyinfer tyderivtree) hs import({%{EH}Ty},{%{EH}Ty.Ftv},{%{EH}VarMp},{%{EH}Base.LaTeX},{%{EH}Substitutable},{%{EH}Gam.Full})
%%]
-%%[(99 hmtyinfer tyderivtree) hs import(EH.Util.Pretty,{%{EH}Ty.Pretty})
+%%[(99 hmtyinfer tyderivtree) hs import(UHC.Util.Pretty,{%{EH}Ty.Pretty})
%%]
%%[(99 hmtyinfer tyderivtree) hs import(qualified Data.Map as Map)
View
2  EHC/src/ehc/Deriving.chs
@@ -11,7 +11,7 @@
%%[(91 codegen) import({%{EH}AbstractCore})
%%]
-%%[(91 codegen) import(qualified Data.Map as Map,Data.List,EH.Util.Utils)
+%%[(91 codegen) import(qualified Data.Map as Map,Data.List,UHC.Util.Utils)
%%]
%%[(91 codegen hmtyinfer) import({%{EH}Ty.FitsInCommon2}, {%{EH}Ty.Trf.Canonic})
View
6 EHC/src/ehc/EH/MainAG.cag
@@ -7,7 +7,7 @@
%%% Haskell interface to AG generated code for compiler
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[1 hs module {%{EH}EH.MainAG} import(Data.Char,Data.List as List,EH.Util.Pretty,{%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Base.Builtin},{%{EH}Opts}, {%{EH}Gam.Full},{%{EH}Error},{%{EH}Error.Pretty}, {%{EH}EH})
+%%[1 hs module {%{EH}EH.MainAG} import(Data.Char,Data.List as List,UHC.Util.Pretty,{%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Base.Builtin},{%{EH}Opts}, {%{EH}Gam.Full},{%{EH}Error},{%{EH}Error.Pretty}, {%{EH}EH})
%%]
%%[(1 hmtyinfer || hmtyast).Ty hs import({%{EH}Ty})
@@ -22,7 +22,7 @@
%%[(1 hmtyinfer) hs import({%{EH}Ty.FitsInCommon},{%{EH}Ty.FitsIn})
%%]
-%%[1 hs import(qualified EH.Util.FastSeq as Seq,EH.Util.Utils)
+%%[1 hs import(qualified UHC.Util.FastSeq as Seq,UHC.Util.Utils)
%%]
%%[(2 hmtyinfer) hs import({%{EH}VarMp},{%{EH}Substitutable},Data.Maybe,{%{EH}Ty.Utils1})
@@ -53,7 +53,7 @@
%%[(7 hmtyinfer) hs import({%{EH}Ty.Trf.FreshVar},{%{EH}Ty.Ftv})
%%]
-%%[8 hs import(EH.Util.Utils(groupSortOn))
+%%[8 hs import(UHC.Util.Utils(groupSortOn))
%%]
%%[8 hs import(Control.Applicative((<|>)))
View
2  EHC/src/ehc/EH/Parser.chs
@@ -7,7 +7,7 @@
%%% Main
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[1 module {%{EH}EH.Parser} import(System.IO, UU.Parsing, UU.Parsing.Offside, EH.Util.ParseUtils, UU.Scanner.GenToken, {%{EH}Base.Builtin},{%{EH}Base.Common}, {%{EH}Base.TermLike}, {%{EH}Scanner.Common}, {%{EH}EH})
+%%[1 module {%{EH}EH.Parser} import(System.IO, UU.Parsing, UU.Parsing.Offside, UHC.Util.ParseUtils, UU.Scanner.GenToken, {%{EH}Base.Builtin},{%{EH}Base.Common}, {%{EH}Base.TermLike}, {%{EH}Scanner.Common}, {%{EH}EH})
%%]
%%[1 export(pAGItf)
View
2  EHC/src/ehc/EHC.chs
@@ -12,7 +12,7 @@
%%[1 import(System.Console.GetOpt, System.IO, System.Exit, System.Process, System.Environment)
%%]
-%%[1.fastseq import(qualified EH.Util.FastSeq as Seq)
+%%[1.fastseq import(qualified UHC.Util.FastSeq as Seq)
%%]
%%[1 import(qualified {%{EH}Config} as Cfg)
%%]
View
2  EHC/src/ehc/EHC/Common.chs
@@ -12,7 +12,7 @@ Used by all compiler driver code
%%]
%%[1 import(Control.Monad.State, System.IO) export(module System.IO, module Control.Monad.State)
%%]
-%%[1 import(EH.Util.CompileRun, EH.Util.Pretty, EH.Util.FPath, EH.Util.Utils) export(module EH.Util.CompileRun, module EH.Util.Pretty, module EH.Util.FPath, module EH.Util.Utils)
+%%[1 import(UHC.Util.CompileRun, UHC.Util.Pretty, UHC.Util.FPath, UHC.Util.Utils) export(module UHC.Util.CompileRun, module UHC.Util.Pretty, module UHC.Util.FPath, module UHC.Util.Utils)
%%]
%%[1 import({%{EH}Base.Common}, {%{EH}Base.Builtin}, {%{EH}Opts}) export(module {%{EH}Base.Common}, module {%{EH}Base.Builtin}, module {%{EH}Opts})
%%]
View
4 EHC/src/ehc/EHC/CompilePhase/FlowBetweenPhase.chs
@@ -10,7 +10,7 @@ XXX
-- general imports
%%[8 import(qualified Data.Map as Map,qualified Data.Set as Set)
%%]
-%%[92 import(qualified EH.Util.FastSeq as Seq)
+%%[92 import(qualified UHC.Util.FastSeq as Seq)
%%]
%%[8 import({%{EH}EHC.Common})
@@ -57,7 +57,7 @@ XXX
%%]
-- for debug
-%%[50 hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[50 hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  EHC/src/ehc/EHC/CompilePhase/Module.chs
@@ -10,7 +10,7 @@ Module analysis
-- general imports
%%[50 import(qualified Data.Map as Map, qualified Data.Set as Set)
%%]
-%%[50 import(qualified EH.Util.Rel as Rel)
+%%[50 import(qualified UHC.Util.Rel as Rel)
%%]
%%[50 import(System.Time, System.Directory)
%%]
View
2  EHC/src/ehc/EHC/CompilePhase/Output.chs
@@ -8,7 +8,7 @@ Output generation, on stdout or file
%%]
-- general imports
-%%[8 import(qualified EH.Util.FastSeq as Seq)
+%%[8 import(qualified UHC.Util.FastSeq as Seq)
%%]
%%[8 import(qualified Data.Map as Map, qualified Data.Set as Set)
%%]
View
4 EHC/src/ehc/EHC/CompilePhase/Parsers.chs
@@ -9,9 +9,9 @@ CompilePhase building blocks: parsers
%%[8 import(UU.Parsing, UU.Parsing.Offside)
%%]
-%%[8 import(qualified EH.Util.ScanUtils as ScanUtils, {%{EH}Scanner.Common})
+%%[8 import(qualified UHC.Util.ScanUtils as ScanUtils, {%{EH}Scanner.Common})
%%]
-%%[8 import(EH.Util.ParseUtils)
+%%[8 import(UHC.Util.ParseUtils)
%%]
%%[99 import(Control.Exception as CE)
%%]
View
4 EHC/src/ehc/EHC/CompilePhase/Semantics.chs
@@ -38,7 +38,7 @@ Folding over AST to compute semantics
%%]
-- Module
-%%[50 import(qualified EH.Util.Rel as Rel)
+%%[50 import(qualified UHC.Util.Rel as Rel)
%%]
%%[50 import({%{EH}Module})
%%]
@@ -46,7 +46,7 @@ Folding over AST to compute semantics
%%]
-- for debug
-%%[50 hs import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[50 hs import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  EHC/src/ehc/EHC/CompilePhase/Translations.chs
@@ -8,7 +8,7 @@ Translation to another AST
%%]
-- general imports
-%%[8 import(qualified Data.Map as Map, qualified Data.Set as Set, qualified EH.Util.FastSeq as Seq)
+%%[8 import(qualified Data.Map as Map, qualified Data.Set as Set, qualified UHC.Util.FastSeq as Seq)
%%]
%%[(50 codegen) import({%{EH}Base.Optimize})
View
2  EHC/src/ehc/EHC/CompileRun.chs
@@ -18,7 +18,7 @@ An EHC compile run maintains info for one compilation invocation
%%]
%%[99 import(Control.Exception as CE)
%%]
-%%[99 import(EH.Util.FPath)
+%%[99 import(UHC.Util.FPath)
%%]
%%[99 import({%{EH}Base.PackageDatabase})
%%]
View
2  EHC/src/ehc/EHC/CompileUnit.chs
@@ -73,7 +73,7 @@ noTimeDiff = toEnum 0
%%]
-- debug
-%%[99 import(EH.Util.Debug)
+%%[99 import(UHC.Util.Debug)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  EHC/src/ehc/EHC/Environment.chs
@@ -16,7 +16,7 @@ Currently:
-- general imports
%%[8 import(System.Environment, System.Directory)
%%]
-%%[8 import(System.IO,EH.Util.FPath)
+%%[8 import(System.IO,UHC.Util.FPath)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
View
2  EHC/src/ehc/EHC/GrinCompilerDriver.chs
@@ -11,7 +11,7 @@
%%]
%%[(8 codegen grin wholeprogAnal) import(UU.Parsing)
%%]
-%%[(8 codegen grin wholeprogAnal) import(EH.Util.Pretty, EH.Util.CompileRun, EH.Util.FPath)
+%%[(8 codegen grin wholeprogAnal) import(UHC.Util.Pretty, UHC.Util.CompileRun, UHC.Util.FPath)
%%]
%%[(8 codegen grin wholeprogAnal) import({%{EH}Base.Common}, {%{EH}Base.Target}, {%{EH}Base.Builtin}, {%{EH}Opts}, {%{EH}Scanner.Scanner}, {%{EH}Scanner.Common(grinScanOpts)})
%%]
View
4 EHC/src/ehc/Error.cag
@@ -13,7 +13,7 @@
%%[(1 hmtyinfer || hmtyast) hs import({%{EH}Ty})
%%]
-%%[1 hs import(EH.Util.Pretty,qualified EH.Util.FastSeq as Seq)
+%%[1 hs import(UHC.Util.Pretty,qualified UHC.Util.FastSeq as Seq)
%%]
%%[1 ag import({Error/AbsSyn})
@@ -21,7 +21,7 @@
%%[(8 codegen) hs import ({%{EH}Base.Target}(FFIWay)) export(module {%{EH}Base.Target})
%%]
-%%[8 hs import (EH.Util.FPath)
+%%[8 hs import (UHC.Util.FPath)
%%]
%%[(9999 codegen) hs import({%{EH}Core})
View
6 EHC/src/ehc/Error/Pretty.cag
@@ -7,15 +7,15 @@
%%% Haskell importable interface to Error pretty print
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[1 hs module {%{EH}Error.Pretty} import(Data.List, Data.Char, Data.Maybe,EH.Util.Pretty, EH.Util.Utils, {%{EH}Base.Common}, {%{EH}Error}) export(ppErr, ppErrs,ppErrL)
+%%[1 hs module {%{EH}Error.Pretty} import(Data.List, Data.Char, Data.Maybe,UHC.Util.Pretty, UHC.Util.Utils, {%{EH}Base.Common}, {%{EH}Error}) export(ppErr, ppErrs,ppErrL)
%%]
%%[(1 hmtyinfer || hmtyast) hs import({%{EH}Ty}, {%{EH}Ty.Pretty})
%%]
-%%[8 hs import(EH.Util.ParseErrPrettyPrint hiding (ppErr)) export(mkPPErr)
+%%[8 hs import(UHC.Util.ParseErrPrettyPrint hiding (ppErr)) export(mkPPErr)
%%]
-%%[8 hs import (EH.Util.FPath)
+%%[8 hs import (UHC.Util.FPath)
%%]
%%[(9 codegen) hs import({%{EH}Core},{%{EH}Core.Pretty})
View
2  EHC/src/ehc/FinalEnv.chs
@@ -12,7 +12,7 @@
%%]
%%[(9 codegen) hs import ({%{EH}Gam.ClGam})
%%]
-%%[(8888 codegen) hs import(EH.Util.Utils,{%{EH}Base.Builtin},{%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Opts.Base})
+%%[(8888 codegen) hs import(UHC.Util.Utils,{%{EH}Base.Builtin},{%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Opts.Base})
%%]
%%[(8888 codegen) hs import({%{EH}Ty} as T, qualified {%{EH}Core} as C, {%{EH}AbstractCore})
%%]
View
2  EHC/src/ehc/Foreign.cag
@@ -22,7 +22,7 @@
%%[90 hs import(qualified Data.Map as Map, qualified Data.Set as Set)
%%]
-%%[90 hs import(EH.Util.Utils)
+%%[90 hs import(UHC.Util.Utils)
%%]
%%[9090 hs import({%{EH}BuiltinPrims})
View
2  EHC/src/ehc/Foreign/Parser.chs
@@ -27,7 +27,7 @@ foreign import ccall unsafe "string.h" memcpy :: Ptr a -> Ptr a -> CSize -> IO
%%[90 module {%{EH}Foreign.Parser} import(UU.Scanner.GenToken, {%{EH}Base.Builtin},{%{EH}Base.Common}, {%{EH}Scanner.Common}, {%{EH}Foreign})
%%]
-%%[90 import(EH.Util.ParseUtils, UU.Parsing, EH.Util.Utils)
+%%[90 import(UHC.Util.ParseUtils, UU.Parsing, UHC.Util.Utils)
%%]
%%[90 import({%{EH}Error},{%{EH}Error.Pretty})
View
2  EHC/src/ehc/Foreign/Pretty.cag
@@ -7,7 +7,7 @@
%%% Haskell importable interface to Foreign pretty print
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[90 hs module {%{EH}Foreign.Pretty} import(EH.Util.Pretty,{%{EH}Base.Common},{%{EH}Foreign})
+%%[90 hs module {%{EH}Foreign.Pretty} import(UHC.Util.Pretty,{%{EH}Base.Common},{%{EH}Foreign})
%%]
%%[90.WRAPPER ag import({Foreign/AbsSyn})
View
4 EHC/src/ehc/Gam.chs
@@ -10,7 +10,7 @@
%%[1 module {%{EH}Gam} import({%{EH}Gam.Base}) export(module {%{EH}Gam.Base})
%%]
-%%[1 module {%{EH}Gam} import(Data.List,EH.Util.Utils,{%{EH}Base.Builtin},{%{EH}Base.Common},{%{EH}NameAspect})
+%%[1 module {%{EH}Gam} import(Data.List,UHC.Util.Utils,{%{EH}Base.Builtin},{%{EH}Base.Common},{%{EH}NameAspect})
%%]
%%[(1 hmtyinfer || hmtyast).Ty import({%{EH}Ty})
@@ -22,7 +22,7 @@
%%[1 import({%{EH}Error})
%%]
-%%[1 import(EH.Util.Pretty) export(ppGam,ppGamDup)
+%%[1 import(UHC.Util.Pretty) export(ppGam,ppGamDup)
%%]
%%[(1 hmtyinfer || hmtyast) import({%{EH}Ty.Pretty})
View
2  EHC/src/ehc/Gam/Base.chs
@@ -7,7 +7,7 @@
%%% Gamma (aka Assumptions, Environment)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[1 module {%{EH}Gam.Base} import(Data.List,EH.Util.Utils,{%{EH}Base.Builtin},{%{EH}Base.Common},{%{EH}NameAspect}) export(emptyGam,gamMap,gamLookup,gamLookupDup, gamPushNew, gamPop, gamTop, gamAddGam, gamAdd, gamPushGam, gamToAssocL, gamToAssocDupL, assocLToGam, assocDupLToGam,gamKeys)
+%%[1 module {%{EH}Gam.Base} import(Data.List,UHC.Util.Utils,{%{EH}Base.Builtin},{%{EH}Base.Common},{%{EH}NameAspect}) export(emptyGam,gamMap,gamLookup,gamLookupDup, gamPushNew, gamPop, gamTop, gamAddGam, gamAdd, gamPushGam, gamToAssocL, gamToAssocDupL, assocLToGam, assocDupLToGam,gamKeys)
%%]
%%[1 export(gamSingleton,gamInsert,gamUnion,gamUnions,gamFromAssocL)
View
2  EHC/src/ehc/Gam/ClGam.chs
@@ -5,7 +5,7 @@
%%[9 module {%{EH}Gam.ClGam}
%%]
-%%[9 import(EH.Util.Pretty,EH.Util.Utils)
+%%[9 import(UHC.Util.Pretty,UHC.Util.Utils)
%%]
%%[9 hs import ({%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Base.Builtin})
View
4 EHC/src/ehc/Gam/DataGam.chs
@@ -5,7 +5,7 @@
%%[7 module {%{EH}Gam.DataGam}
%%]
-%%[7 import(EH.Util.Pretty,EH.Util.Utils)
+%%[7 import(UHC.Util.Pretty,UHC.Util.Utils)
%%]
%%[7 hs import ({%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Base.Builtin})
@@ -34,7 +34,7 @@
%%]
-- debug
-%%[(8 codegen) import({%{EH}Base.Debug},EH.Util.Pretty)
+%%[(8 codegen) import({%{EH}Base.Debug},UHC.Util.Pretty)
%%]
%%[9999 import({%{EH}Base.ForceEval})
View
2  EHC/src/ehc/Gam/FixityGam.chs
@@ -5,7 +5,7 @@
%%[1 module {%{EH}Gam.FixityGam}
%%]
-%%[1 import(EH.Util.Pretty,EH.Util.Utils)
+%%[1 import(UHC.Util.Pretty,UHC.Util.Utils)
%%]
%%[1 hs import ({%{EH}Base.Common},{%{EH}Base.Builtin})
View
2  EHC/src/ehc/Gam/KiGam.chs
@@ -5,7 +5,7 @@
%%[6 module {%{EH}Gam.KiGam}
%%]
-%%[6 import(EH.Util.Pretty,EH.Util.Utils)
+%%[6 import(UHC.Util.Pretty,UHC.Util.Utils)
%%]
%%[6 hs import ({%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Base.Builtin})
View
2  EHC/src/ehc/Gam/PolGam.chs
@@ -5,7 +5,7 @@
%%[6 module {%{EH}Gam.PolGam}
%%]
-%%[6 import(EH.Util.Pretty,EH.Util.Utils)
+%%[6 import(UHC.Util.Pretty,UHC.Util.Utils)
%%]
%%[6 hs import ({%{EH}Base.Common},{%{EH}Base.TermLike},{%{EH}Base.Builtin})
View
4 EHC/src/ehc/Gam/ScopeMapGam.chs
@@ -32,7 +32,7 @@ Conceptually thus the invariant is that no entry is in the map which is not in s
%%]
%%[8 import({%{EH}VarMp})
%%]
-%%[8 import(EH.Util.Utils)
+%%[8 import(UHC.Util.Utils)
%%]
%%[8 import({%{EH}Base.Common})
@@ -50,7 +50,7 @@ Conceptually thus the invariant is that no entry is in the map which is not in s
%%% Debug
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%[9999 import(EH.Util.Debug)
+%%[9999 import(UHC.Util.Debug)
%%]
%%[9
View
2  EHC/src/ehc/Gam/TyGam.chs
@@ -5,7 +5,7 @@
%%[1 module {%{EH}Gam.TyGam}
%%]
-%%[1 import(EH.Util.Pretty,EH.Util.Utils)
+%%[1 import(UHC.Util.Pretty,UHC.Util.Utils)