hackworthltd · georgefst · Aug 18, 2022 · Aug 18, 2022
diff --git a/primer-rel8/test/TestUtils.hs b/primer-rel8/test/TestUtils.hs
@@ -44,7 +44,6 @@ import Primer.App (
   defaultProg,
   mkApp,
  )
-import Primer.Builtins (builtinModule)
 import Primer.Core (
   baseName,
   mkSimpleModuleName,
@@ -63,8 +62,9 @@ import Primer.Module (
     moduleName,
     moduleTypes
   ),
+  builtinModule,
+  primitiveModule,
  )
-import Primer.Primitives (primitiveModule)
 import Rel8 (
   Expr,
   Insert (Insert, into, onConflict, returning, rows),

diff --git a/primer/gen/Primer/Gen/App.hs b/primer/gen/Primer/Gen/App.hs
@@ -10,11 +10,11 @@ module Primer.Gen.App (
 ) where
 
 import Primer.App (Prog (Prog, progImports, progLog, progModules, progSelection, progSmartHoles), defaultLog)
-import Primer.Core (ASTDef (ASTDef), Def (DefAST), GlobalName (baseName), Kind (KType), ModuleName (ModuleName), qualifyName)
+import Primer.Core (GlobalName (baseName), Kind (KType), ModuleName (ModuleName), qualifyName)
 import Primer.Core.Utils (forgetTypeMetadata, generateIDs, generateTypeIDs)
+import Primer.Def (ASTDef (ASTDef), Def (DefAST), defType)
 import Primer.Module (Module (Module, moduleDefs, moduleName, moduleTypes), moduleDefsQualified, moduleTypesQualified)
 import Primer.Name (Name, unsafeMkName)
-import Primer.Primitives (defType)
 import Primer.Typecheck (Cxt, SmartHoles, extendGlobalCxt, extendTypeDefCxt)
 
 import Primer.Gen.Core.Typed (WT, freshNameForCxt, genChk, genTypeDefGroup, genWTType)

diff --git a/primer/gen/Primer/Gen/Core/Typed.hs b/primer/gen/Primer/Gen/Core/Typed.hs
@@ -42,7 +42,6 @@ import Hedgehog.Gen qualified as Gen
 import Hedgehog.Internal.Property (forAllT)
 import Hedgehog.Range qualified as Range
 import Primer.Core (
-  ASTTypeDef (..),
   Bind' (Bind),
   CaseBranch' (CaseBranch),
   Expr' (..),
@@ -58,21 +57,23 @@ import Primer.Core (
   TyConName,
   TyVarName,
   Type' (..),
-  TypeDef (..),
-  ValCon (..),
   ValConName,
   qualifyName,
-  typeDefKind,
-  typeDefParameters,
-  valConName,
-  valConType,
  )
 import Primer.Core.Utils (freeVarsTy)
 import Primer.Gen.Core.Raw (genLVarName, genModuleName, genName, genTyVarName)
 import Primer.Module (Module (..))
 import Primer.Name (Name, NameCounter, freshName, unName, unsafeMkName)
 import Primer.Refine (Inst (InstAPP, InstApp, InstUnconstrainedAPP), refine)
 import Primer.Subst (substTy, substTys)
+import Primer.TypeDef (
+  ASTTypeDef (..),
+  TypeDef (..),
+  ValCon (..),
+  typeDefKind,
+  typeDefParameters,
+  valConType,
+ )
 import Primer.Typecheck (
   Cxt (),
   SmartHoles (NoSmartHoles),

diff --git a/primer/primer.cabal b/primer/primer.cabal
@@ -26,6 +26,8 @@ library
     Primer.Core.Transform
     Primer.Core.Utils
     Primer.Database
+    Primer.Def
+    Primer.Def.Utils
     Primer.Eval
     Primer.EvalFull
     Primer.Examples
@@ -42,6 +44,7 @@ library
     Primer.Refine
     Primer.Subst
     Primer.Typecheck
+    Primer.TypeDef
     Primer.Unification
     Primer.Zipper
     Primer.ZipperCxt

diff --git a/primer/src/Primer/API.hs b/primer/src/Primer/API.hs
@@ -89,7 +89,6 @@ import Primer.App (
  )
 import Primer.App qualified as App
 import Primer.Core (
-  ASTDef (..),
   Bind' (..),
   CaseBranch' (..),
   Expr,
@@ -107,13 +106,11 @@ import Primer.Core (
   TyVarName,
   Type,
   Type' (..),
-  defAST,
   moduleNamePretty,
   unLocalName,
   _typeMeta,
   _typeMetaLens,
  )
-import Primer.Core qualified as Core
 import Primer.Database (
   OffsetLimit,
   Page,
@@ -142,6 +139,11 @@ import Primer.Database qualified as Database (
     Success
   ),
  )
+import Primer.Def (
+  ASTDef (..),
+  defAST,
+ )
+import Primer.Def qualified as Def
 import Primer.JSON (
   CustomJSON (..),
   PrimerJSON,
@@ -490,8 +492,8 @@ viewProg p =
                   , term = viewTreeExpr . astDefExpr <$> defAST d
                   , type_ =
                       case d of
-                        Core.DefAST d' -> viewTreeType $ astDefType d'
-                        Core.DefPrim d' -> viewTreeType' $ labelNodes $ primDefType d'
+                        Def.DefAST d' -> viewTreeType $ astDefType d'
+                        Def.DefPrim d' -> viewTreeType' $ labelNodes $ primDefType d'
                           where
                             labelNodes =
                               flip evalState (0 :: Int) . traverseOf _typeMeta \() -> do

diff --git a/primer/src/Primer/Action.hs b/primer/src/Primer/Action.hs
@@ -31,10 +31,6 @@ import Data.Set qualified as Set
 import Data.Text qualified as T
 import Optics (set, (%), (?~))
 import Primer.Core (
-  ASTDef (..),
-  ASTTypeDef (..),
-  Def (..),
-  DefMap,
   Expr,
   Expr' (..),
   GVarName,
@@ -50,17 +46,13 @@ import Primer.Core (
   Type' (..),
   TypeCache (..),
   TypeCacheBoth (..),
-  TypeDef (..),
   ValConName,
   baseName,
   bindName,
   getID,
   qualifiedModule,
   unsafeMkGlobalName,
   unsafeMkLocalName,
-  valConArgs,
-  valConName,
-  valConType,
  )
 import Primer.Core qualified as C
 import Primer.Core.DSL (
@@ -86,6 +78,11 @@ import Primer.Core.DSL (
  )
 import Primer.Core.Transform (renameLocalVar, renameTyVar, renameTyVarExpr)
 import Primer.Core.Utils (forgetTypeMetadata, generateTypeIDs)
+import Primer.Def (
+  ASTDef (..),
+  Def (..),
+  DefMap,
+ )
 import Primer.JSON
 import Primer.Module (Module, insertDef)
 import Primer.Name (Name, NameCounter, unName, unsafeMkName)
@@ -97,6 +94,7 @@ import Primer.Name.Fresh (
  )
 import Primer.Questions (Question, uniquify)
 import Primer.Refine (Inst (InstAPP, InstApp, InstUnconstrainedAPP), refine)
+import Primer.TypeDef (ASTTypeDef (..), TypeDef (..), ValCon (..), valConType)
 import Primer.Typecheck (
   CheckEverythingRequest (CheckEverything, toCheck, trusted),
   SmartHoles,

diff --git a/primer/src/Primer/Action/Available.hs b/primer/src/Primer/Action/Available.hs
@@ -34,9 +34,7 @@ import Primer.Action (
 import Primer.Action.Priorities qualified as P
 import Primer.App (globalInUse)
 import Primer.Core (
-  ASTDef (..),
   Bind' (..),
-  DefMap,
   Expr,
   Expr' (..),
   ExprMeta,
@@ -48,7 +46,6 @@ import Primer.Core (
   Type,
   Type' (..),
   TypeCache (..),
-  defAST,
   getID,
   _bindMeta,
   _chkedAt,
@@ -60,6 +57,11 @@ import Primer.Core (
  )
 import Primer.Core.Transform (unfoldFun)
 import Primer.Core.Utils (forgetTypeMetadata)
+import Primer.Def (
+  ASTDef (..),
+  DefMap,
+  defAST,
+ )
 import Primer.Name (unName)
 import Primer.Questions (Question (..))
 import Primer.Zipper (

diff --git a/primer/src/Primer/App.hs b/primer/src/Primer/App.hs
@@ -99,15 +99,10 @@ import Primer.Action (
   applyActionsToBody,
   applyActionsToTypeSig,
  )
-import Primer.Builtins (builtinModule)
 import Primer.Core (
-  ASTDef (..),
-  ASTTypeDef (..),
   Bind' (Bind),
   CaseBranch,
   CaseBranch' (CaseBranch),
-  Def (..),
-  DefMap,
   Expr,
   Expr' (Case, Con, EmptyHole, Hole, Var),
   ExprMeta,
@@ -122,17 +117,11 @@ import Primer.Core (
   TyVarName,
   Type,
   Type' (..),
-  TypeDef (..),
-  TypeDefMap,
   TypeMeta,
-  ValCon (..),
   ValConName,
-  defAST,
-  defPrim,
   getID,
   mkSimpleModuleName,
   qualifyName,
-  typeDefAST,
   typesInExpr,
   unModuleName,
   unsafeMkGlobalName,
@@ -144,30 +133,45 @@ import Primer.Core.DSL (create, emptyHole, tEmptyHole)
 import Primer.Core.DSL qualified as DSL
 import Primer.Core.Transform (foldApp, renameVar, unfoldAPP, unfoldApp, unfoldTApp)
 import Primer.Core.Utils (freeGlobalVars, freeVars, regenerateExprIDs, regenerateTypeIDs, _freeTmVars, _freeTyVars, _freeVarsTy)
+import Primer.Def (
+  ASTDef (..),
+  Def (..),
+  DefMap,
+  defAST,
+  defPrim,
+ )
 import Primer.Eval (EvalDetail, EvalError)
 import Primer.Eval qualified as Eval
 import Primer.EvalFull (Dir, EvalFullError (TimedOut), TerminationBound, evalFull)
 import Primer.JSON
 import Primer.Module (
   Module (Module, moduleDefs, moduleName, moduleTypes),
+  builtinModule,
   deleteDef,
   insertDef,
   moduleDefsQualified,
   moduleTypesQualified,
   nextModuleID,
+  primitiveModule,
   qualifyDefName,
   renameModule,
   renameModule',
  )
 import Primer.Name (Name (unName), NameCounter, freshName, unsafeMkName)
-import Primer.Primitives (primitiveModule)
 import Primer.Questions (
   Question (..),
   generateNameExpr,
   generateNameTy,
   variablesInScopeExpr,
   variablesInScopeTy,
  )
+import Primer.TypeDef (
+  ASTTypeDef (..),
+  TypeDef (..),
+  TypeDefMap,
+  ValCon (..),
+  typeDefAST,
+ )
 import Primer.Typecheck (
   CheckEverythingRequest (CheckEverything, toCheck, trusted),
   Cxt,

diff --git a/primer/src/Primer/Builtins.hs b/primer/src/Primer/Builtins.hs
@@ -3,7 +3,6 @@
 --   for the fact that some of the primitive functions (see "Primer.Primitives")
 --   refer to these types.
 module Primer.Builtins (
-  builtinModule,
   tBool,
   cTrue,
   cFalse,
@@ -27,54 +26,28 @@ module Primer.Builtins (
   cLeft,
   cRight,
   eitherDef,
+  builtinModuleName,
 ) where
 
-import Foreword
-
-import Data.Map qualified as Map
 import Primer.Core (
-  ASTTypeDef (
-    ASTTypeDef,
-    astTypeDefConstructors,
-    astTypeDefNameHints,
-    astTypeDefParameters
-  ),
-  GlobalName (baseName),
+  GlobalName,
   Kind (KType),
   ModuleName,
   TyConName,
   Type' (TApp, TCon, TVar),
-  TypeDef (TypeDefAST),
-  ValCon (ValCon),
   ValConName,
   mkSimpleModuleName,
   qualifyName,
  )
-import Primer.Module (Module (Module, moduleDefs, moduleName, moduleTypes))
 import Primer.Name (Name)
+import Primer.TypeDef (ASTTypeDef (..), ValCon (ValCon))
 
 builtinModuleName :: ModuleName
 builtinModuleName = mkSimpleModuleName "Builtins"
 
 builtin :: Name -> GlobalName k
 builtin = qualifyName builtinModuleName
 
-builtinModule :: Module
-builtinModule =
-  Module
-    { moduleName = builtinModuleName
-    , moduleTypes =
-        Map.fromList
-          [ (baseName tBool, TypeDefAST boolDef)
-          , (baseName tNat, TypeDefAST natDef)
-          , (baseName tList, TypeDefAST listDef)
-          , (baseName tMaybe, TypeDefAST maybeDef)
-          , (baseName tPair, TypeDefAST pairDef)
-          , (baseName tEither, TypeDefAST eitherDef)
-          ]
-    , moduleDefs = mempty
-    }
-
 tBool :: TyConName
 tBool = builtin "Bool"
 cTrue, cFalse :: ValConName