Clean up file structure

src/Mima/Asm/Phase1.hs

@@ -1,8 +1,7 @@
 module Mima.Asm.Phase1
-  ( AsmToken
-  , Phase1
-  , parsePhase1
-  , formatPhase1
+  ( module Mima.Asm.Phase1.Types
+  , module Mima.Asm.Phase1.Parse
+  , module Mima.Asm.Phase1.Format
   ) where
 
 import           Mima.Asm.Phase1.Format

src/Mima/Asm/Phase1/Types.hs

@@ -150,6 +150,7 @@ instance Onion Directive where
   peel (MetaStart a _ _ _) = a
   peel (MetaStop  a _ _)   = a
 
+-- | A single token. The @s@ type parameter is the type of location annotations.
 data AsmToken a
   = TokenLabel (Name a)
   | TokenInstruction (Instruction a)
@@ -165,4 +166,6 @@ instance Onion AsmToken where
   peel (TokenDirective a)   = peel a
   peel (TokenComment a _ _) = a
 
+-- | Representation of an assembly file in phase 1. The @s@ type parameter is
+-- the type of location annotations.
 type Phase1 s = [AsmToken s]

src/Mima/Asm/Phase2.hs

@@ -1,10 +1,10 @@
 module Mima.Asm.Phase2
-  ( phase2
+  ( phase1To2
   ) where
 
 import qualified Mima.Asm.Phase1 as P1
 import           Mima.Asm.Weed
 import qualified Mima.Vm.State   as Vm
 
-phase2 :: P1.Phase1 s -> Weed (WeedError s) Vm.MimaState
-phase2 = error "to be implemented"
+phase1To2 :: P1.Phase1 s -> Weed (WeedError s) Vm.MimaState
+phase1To2 = error "to be implemented"

src/Mima/Asm/Phase2/Subphase1.hs

@@ -11,7 +11,7 @@ import           Data.Foldable
 import qualified Data.Map.Strict           as Map
 import qualified Data.Text                 as T
 
-import qualified Mima.Asm.Phase1.Types     as P1
+import qualified Mima.Asm.Phase1           as P1
 import           Mima.Asm.Phase2.Types
 import           Mima.Asm.Phase2.Util
 import           Mima.Asm.Types