Update the hardware models a bit.

[matthijs/master-project/cλash.git] / HsTools.hs

diff --git a/HsTools.hs b/HsTools.hs
index a058c84e1e065468d7065349ec1091457407e426..967db1880f4d634b657c1931ac9bca3ee3e8890d 100644 (file)
--- a/HsTools.hs
+++ b/HsTools.hs
@@ -66,8 +66,12 @@ import CoreShow
 --    (==) = Prelude.(==) Int $dInt 
 --  in 
 --    \x = (==) x 1
-toCore :: HsSyn.HsExpr RdrName.RdrName -> GHC.Ghc CoreSyn.CoreExpr
-toCore expr = do
+toCore :: 
+  [Module.ModuleName] -- ^ The modules that need to be imported before translating
+                      --   this expression.
+  -> HsSyn.HsExpr RdrName.RdrName -- ^ The expression to translate to Core.
+  -> GHC.Ghc CoreSyn.CoreExpr -- ^ The resulting core expression.
+toCore modules expr = do
   env <- GHC.getSession
   let icontext = HscTypes.hsc_IC env
   
@@ -75,6 +79,7 @@ toCore expr = do
     -- Translage the TcRn (typecheck-rename) monad into an IO monad
     TcRnMonad.initTcPrintErrors env PrelNames.iNTERACTIVE $ do
       (tc_expr, insts) <- TcRnMonad.getLIE $ do
+        mapM importModule modules
         -- Rename the expression, resulting in a HsExpr Name
         (rn_expr, freevars) <- RnExpr.rnExpr expr
         -- Typecheck the expression, resulting in a HsExpr Id and a list of
@@ -148,22 +153,6 @@ execCore expr = do
         let res = Unsafe.Coerce.unsafeCoerce hval :: Int
         return $ Unsafe.Coerce.unsafeCoerce hval
 
--- | Evaluate a core Type representing type level int from the TypeLevel
--- library to a real int.
-eval_type_level_int :: Type.Type -> Int
-eval_type_level_int ty =
-  unsafeRunGhc $ do
-    -- Automatically import modules for any fully qualified identifiers
-    setDynFlag DynFlags.Opt_ImplicitImportQualified
-
-    let to_int_name = mkRdrName "Data.TypeLevel.Num.Sets" "toInt"
-    let to_int = SrcLoc.noLoc $ HsExpr.HsVar to_int_name
-    let undef = hsTypedUndef $ coreToHsType ty
-    let app = HsExpr.HsApp (to_int) (undef)
-
-    core <- toCore app
-    execCore core 
-
 -- These functions build (parts of) a LHSExpr RdrName.
 
 -- | A reference to the Prelude.undefined function.