Permalink
Browse files

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

….Util
  • Loading branch information...
atzedijkstra committed Nov 27, 2012
1 parent cd6113b commit 20b7123c99ff0778cfa4390d317a6e418824870f
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
@@ -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
@@ -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"
@@ -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
@@ -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
@@ -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((<|>),(<$>)))
@@ -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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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})
@@ -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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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})
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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)
%%]
@@ -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})
@@ -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)
%%]
@@ -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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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)
@@ -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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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)
@@ -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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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})
%%]
@@ -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})
@@ -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})
@@ -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(..))
@@ -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
@@ -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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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} )
%%]
@@ -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)
%%]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -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})
%%]
@@ -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)
@@ -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)
@@ -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})
%%]
Oops, something went wrong.

0 comments on commit 20b7123

Please sign in to comment.