ref: 6979f0df47831451685f13662ac60b82d4f03f9c
parent: 0bbf3b980b36941b018b7becc3427fe2e6315393
author: Lennart Augustsson <lennart.augustsson@epicgames.com>
date: Tue Sep 19 13:28:15 EDT 2023
Rename ExportSpec to ExportItem
--- a/src/MicroHs/Expr.hs
+++ b/src/MicroHs/Expr.hs
@@ -1,7 +1,7 @@
module MicroHs.Expr(
IdentModule,
EModule(..),
- ExportSpec(..),
+ ExportItem(..),
ImportSpec(..),
EDef(..), showEDefs,
Expr(..), showExpr,
@@ -40,10 +40,10 @@
----------------------
-data EModule = EModule IdentModule [ExportSpec] [EDef]
+data EModule = EModule IdentModule [ExportItem] [EDef]
--Xderiving (Show, Eq)
-data ExportSpec
+data ExportItem
= ExpModule IdentModule
| ExpTypeCon Ident
| ExpType Ident
@@ -321,12 +321,12 @@
showEModule am =
case am of
EModule i es ds -> "module " ++ i ++ "(\n" ++
- unlines (intersperse "," (map showExportSpec es)) ++
+ unlines (intersperse "," (map showExportItem es)) ++
"\n) where\n" ++
showEDefs ds
-showExportSpec :: ExportSpec -> String
-showExportSpec ae =
+showExportItem :: ExportItem -> String
+showExportItem ae =
case ae of
ExpModule i -> "module " ++ i
ExpTypeCon i -> i ++ "(..)"
--- a/src/MicroHs/Parse.hs
+++ b/src/MicroHs/Parse.hs
@@ -38,7 +38,7 @@
pModule :: P EModule
pModule = EModule <$> (pKeyword "module" *> pUQIdentA) <*>
- (pSpec '(' *> esepEndBy pExportSpec (pSpec ',') <* pSpec ')') <*>+ (pSpec '(' *> esepEndBy pExportItem (pSpec ',') <* pSpec ')') <*>(pKeyword "where" *> pBlock pDef)
pQIdent :: P Ident
@@ -201,8 +201,8 @@
---------------
-pExportSpec :: P ExportSpec
-pExportSpec =
+pExportItem :: P ExportItem
+pExportItem =
ExpModule <$> (pKeyword "module" *> pUQIdent)
<|< ExpTypeCon <$> (pUQIdentSym <* pSpec '(' <* pSymbol ".." <* pSpec ')')<|< ExpType <$> pUQIdentSym
--- a/src/MicroHs/TypeCheck.hs
+++ b/src/MicroHs/TypeCheck.hs
@@ -62,7 +62,7 @@
in TModule mn (concat fexps) (concat texps) (concat sexps) (concat vexps) tds
-- Type and value exports
-getTVExps :: forall a . M.Map (TModule a) -> TypeTable -> SynTable -> ValueTable -> ExportSpec ->
+getTVExps :: forall a . M.Map (TModule a) -> TypeTable -> SynTable -> ValueTable -> ExportItem ->
([TypeExport], [SynDef], [ValueExport])
getTVExps impMap _ _ _ (ExpModule m) =
case M.lookup m impMap of
--
⑨