Mess with imports.

bowtie-blueprint/src/Bowtie/Blueprint.hs

@@ -1,22 +1,22 @@
 module Bowtie.Blueprint where
 
 import Bowtie.Lib.Prelude
+import Bowtie.Type.AST (Type, TypeDeclaration)
 
-import qualified Bowtie.Type.AST as Type.AST
-import qualified Bowtie.Type.Parse as Type.Parse
+import qualified Bowtie.Type.Parse as Parse
 import qualified CMark
 import qualified Data.HashMap.Strict as HashMap
 import qualified Data.Text as Text
 import qualified Text.Megaparsec as Mega
 import qualified Text.Megaparsec.Char.Lexer as Lexer
 
 data Blueprint
-  = Blueprint (HashMap Id Type.AST.TypeDeclaration) (HashMap Id Type.AST.Type)
+  = Blueprint (HashMap Id TypeDeclaration) (HashMap Id Type)
   deriving (Eq, Show)
 
 data Item
-  = Decl Id Type.AST.TypeDeclaration
-  | Func Id Type.AST.Type
+  = Decl Id TypeDeclaration
+  | Func Id Type
 
 blueprint :: Text -> Either Text Blueprint
 blueprint src = do
@@ -56,14 +56,14 @@ conv :: [Item] -> Blueprint
 conv items =
   Blueprint decls funcs
   where
-    decls :: HashMap Id Type.AST.TypeDeclaration
+    decls :: HashMap Id TypeDeclaration
     decls =
       let xs = mapMaybe (\a -> case a of
                                  Decl id def -> Just (id, def)
                                  Func {} -> Nothing) items
       in HashMap.fromList xs
 
-    funcs :: HashMap Id Type.AST.Type
+    funcs :: HashMap Id Type
     funcs =
       let xs = mapMaybe (\a -> case a of
                                  Func id def -> Just (id, def)
@@ -72,22 +72,22 @@ conv items =
 
 parseBlueprint :: Text -> Either (Mega.ParseErrorBundle Text Void) Blueprint
 parseBlueprint =
-  fmap conv . Type.Parse.runParser programTypesParser "<input>"
+  fmap conv . Parse.runParser programTypesParser "<input>"
 
-programTypesParser :: Type.Parse.Parser [Item]
+programTypesParser :: Parse.Parser [Item]
 programTypesParser = do
   res <-
     many $ Mega.try $ do
-      _ <- Lexer.indentGuard Type.Parse.spacesOrNewlines EQ Mega.pos1
+      _ <- Lexer.indentGuard Parse.spacesOrNewlines EQ Mega.pos1
       parseOne
-  _ <- Lexer.indentGuard Type.Parse.spacesOrNewlines EQ Mega.pos1
+  _ <- Lexer.indentGuard Parse.spacesOrNewlines EQ Mega.pos1
   pure res
 
-parseOne :: Type.Parse.Parser Item
+parseOne :: Parse.Parser Item
 parseOne =
   Mega.label "parseOne"
-    (   Mega.try (fmap (uncurry Decl) Type.Parse.declEntryParser)
-    <|> Mega.try (fmap (uncurry Func) Type.Parse.defParser)
+    (   Mega.try (fmap (uncurry Decl) Parse.declEntryParser)
+    <|> Mega.try (fmap (uncurry Func) Parse.defParser)
     )
 
 -- * Markdown

bowtie-js/src/Bowtie/JS.hs

@@ -8,15 +8,15 @@ module Bowtie.JS
   , runTextCommand
   ) where
 
-import Bowtie.Core.Expr
-import Bowtie.JS.Imperativize
-import Bowtie.JS.Serialize
+import Bowtie.JS.Imperativize (makeImp)
+import Bowtie.JS.Serialize (serializeTop)
 import Bowtie.Lib.Environment
 import Bowtie.Lib.Prelude
-import Data.String.QQ
+import Data.String.QQ (s)
 import Data.Text.Encoding (decodeUtf8)
 import System.Process.Typed
 
+import qualified Bowtie.Core.Expr as Core
 import qualified Bowtie.Interpret as Interpret
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.Text as Text
@@ -51,7 +51,7 @@ transpile src = do
   (env, coreExpr) <- Interpret.sourcesToCore mempty ("<input>", src)
   pure (transpileCore env coreExpr)
 
-transpileCore :: Environment -> Expr -> Text
+transpileCore :: Environment -> Core.Expr -> Text
 transpileCore env expr =
   let
     jsAST = makeImp env expr

bowtie-js/test/Test.hs

@@ -5,7 +5,7 @@ module Main where
 import Bowtie.Interpret
 import Bowtie.JS
 import Bowtie.Lib.Prelude
-import Data.String.QQ
+import Data.String.QQ (s)
 import System.FilePath ((</>))
 import Test.Hspec
 

bowtie-visualize/src/Bowtie/Visualize.hs

@@ -4,13 +4,12 @@ module Bowtie.Visualize
   ) where
 
 import Bowtie.Infer.Constraints
-import Bowtie.Infer.Solve
+import Bowtie.Infer.Solve (SolveError(..), next, solveConstraint)
 import Bowtie.Lib.Environment
 import Bowtie.Lib.Prelude
 import Bowtie.Surface.AST (AST(astTerms, astTypes))
-import Bowtie.Surface.Infer
-import Bowtie.Type.Kindcheck
-import Bowtie.Visualize.GraphConstraints
+import Bowtie.Type.Kindcheck (kindcheck)
+import Bowtie.Visualize.GraphConstraints (graphConstraints)
 import Control.Monad.Except
 import Control.Monad.State.Class
 import System.Process.Typed
@@ -19,6 +18,7 @@ import qualified Bowtie.Infer.Constraints as Constraints
 import qualified Bowtie.Interpret as Interpret
 import qualified Bowtie.Surface.AST as Surface
 import qualified Bowtie.Surface.Desugar as Surface.Desugar
+import qualified Bowtie.Surface.Infer as Infer
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.List as List
@@ -41,12 +41,12 @@ run libFiles appFile = do
           Surface.Desugar.extractResult (astTerms ast)
 
       let
-        f :: (MonadState Int m, MonadError TypeError m) => m [Constraints]
+        f :: (MonadState Int m, MonadError Infer.TypeError m) => m [Constraints]
         f = do
-          (constraints, _) <- gatherConstraints env dsg
-          mapError SolveError (solutionSteps constraints)
+          (constraints, _) <- Infer.gatherConstraints env dsg
+          mapError Infer.SolveError (solutionSteps constraints)
 
-      case runInfer f of
+      case Infer.runInfer f of
         Left e ->
           throwText (show e)
 

bowtie/src/Bowtie/Surface/AST.hs

@@ -4,7 +4,7 @@ module Bowtie.Surface.AST
   ) where
 
 import Bowtie.Lib.FreeVars
-import Bowtie.Lib.OrderedMap
+import Bowtie.Lib.OrderedMap (OrderedMap)
 import Bowtie.Lib.Prelude
 import Bowtie.Type.AST