[ fix #391 ] Add imports for Haskell.* modules (other than Prelude)

Author: jespercockx

Diff for: src/Agda2Hs/Compile.hs

@@ -120,7 +120,7 @@ verifyOutput ::
 verifyOutput _ _ _ m ls = do
   reportSDoc "agda2hs.compile" 5 $ text "Checking generated output before rendering: " <+> prettyTCM m
   ensureUniqueConstructors
-  ensureNoOutputFromPrimModules
+  ensureNoOutputFromHsModules
   where
     ensureUniqueConstructors = do
       let allCons = do
@@ -136,17 +136,15 @@ verifyOutput _ _ _ m ls = do
       when (length duplicateCons > 0) $
         genericDocError =<< vcat (map (\x -> text $ "Cannot generate multiple constructors with the same identifier: " <> Hs.prettyPrint (headWithDefault __IMPOSSIBLE__ x)) duplicateCons)
 
-    ensureNoOutputFromPrimModules = unless (null $ concat $ map fst ls) $ do
+    ensureNoOutputFromHsModules = unless (null $ concat $ map fst ls) $ do
       let hsModName = hsTopLevelModuleName m
-      when (isPrimModule hsModName) $ do
-        reportSDoc "agda2hs.compile" 10 $ text "Primitive module" <+> prettyTCM m <+> text "has non-null output."
-        if isHsModule hsModName
-        then genericDocError =<< hsep
+      when (isHsModule hsModName) $ do
+        reportSDoc "agda2hs.compile" 10 $ text "Haskell module" <+> prettyTCM m <+> text "has non-null output."
+        genericDocError =<< hsep
           (  pwords "The `Haskell.` namespace are reserved for binding existing Haskell modules, so the module"
           ++ [text "`" <> prettyTCM m <> text "`"]
           ++ pwords "should not contain any"
           ++ [text "`{-# COMPILE AGDA2HS ... #-}`"]
           ++ pwords "pragmas that produce Haskell code."
           )
-        else do
-          __IMPOSSIBLE_VERBOSE__ "Primitive Agda module should not have any COMPILE AGDA2HS pragmas!"
+      when (isPrimModule hsModName) __IMPOSSIBLE__

Diff for: src/Agda2Hs/Compile/Name.hs

@@ -66,8 +66,6 @@ toNameImport x (Just mod) =
 defaultSpecialRules :: SpecialRules
 defaultSpecialRules = Map.fromList
   [ "Agda.Builtin.Nat.Nat"          `to` "Natural"      `importing` Just "Numeric.Natural"
-  , "Haskell.Control.Monad.guard"   `to` "guard"        `importing` Just "Control.Monad"
-  , "Haskell.Control.Exception.assert" `to` "assert"    `importing` Just "Control.Exception"
   , "Haskell.Prelude.coerce"        `to` "unsafeCoerce" `importing` Just "Unsafe.Coerce"
   , "Agda.Builtin.Int.Int"          `to` "Integer"      `importing` Nothing
   , "Agda.Builtin.Word.Word64"      `to` "Word"         `importing` Nothing
@@ -116,6 +114,7 @@ compileQName f
     existsInHaskell <- orM
       [ pure $ isJust special
       , pure $ isPrimModule mod
+      , pure $ isHsModule mod
       , hasCompilePragma f
       , isClassFunction f
       , isWhereFunction f

Diff for: src/Agda2Hs/Compile/Utils.hs

@@ -57,7 +57,8 @@ import Agda.Utils.Impossible ( __IMPOSSIBLE__ )
 primModules =
   [ "Agda.Builtin"
   , "Agda.Primitive"
-  , "Haskell"
+  , "Haskell.Prim"
+  , "Haskell.Prelude"
   ]
 
 isPrimModule :: Hs.ModuleName () -> Bool