Moved modules into a proper folder structure.

src/Renamer.hs

@@ -1,98 +0,0 @@
-{-# LANGUAGE LambdaCase #-}
-
-module Renamer (module Renamer) where
-
-import           Auxiliary           (mapAccumM)
-import           Control.Monad       (foldM)
-import           Control.Monad.State (MonadState, State, evalState, gets,
-                                      modify)
-import           Data.Map            (Map)
-import qualified Data.Map            as Map
-import           Data.Maybe          (fromMaybe)
-import           Data.Tuple.Extra    (dupe)
-import           Grammar.Abs
-
-
--- | Rename all variables and local binds
-rename :: Program -> Program
-rename (Program bs) = Program $ evalState (runRn $ mapM (renameSc initNames) bs) 0
-  where
-    initNames = Map.fromList $ map (\(Bind name _ _ _ _) -> dupe name) bs
-    renameSc :: Names -> Bind -> Rn Bind
-    renameSc old_names (Bind name t _ parms rhs) = do
-        (new_names, parms') <- newNames old_names parms
-        rhs'                <- snd <$> renameExp new_names rhs
-        pure $ Bind name t name parms' rhs'
-
-
--- | Rename monad. State holds the number of renamed names.
-newtype Rn a = Rn { runRn :: State Int a }
-  deriving (Functor, Applicative, Monad, MonadState Int)
-
--- | Maps old to new name
-type Names = Map Ident Ident
-
-renameLocalBind :: Names -> Bind -> Rn (Names, Bind)
-renameLocalBind old_names (Bind name t _ parms rhs) = do
-    (new_names, name')   <- newName old_names name
-    (new_names', parms') <- newNames new_names parms
-    (new_names'', rhs')  <- renameExp new_names' rhs
-    pure (new_names'', Bind name' t name' parms' rhs')
-
-renameExp :: Names -> Exp -> Rn (Names, Exp)
-renameExp old_names = \case
-    EId  n     -> pure (old_names, EId . fromMaybe n $ Map.lookup n old_names)
-
-    EInt i1    -> pure (old_names, EInt i1)
-
-    EApp e1 e2 -> do
-        (env1, e1') <- renameExp old_names e1
-        (env2, e2') <- renameExp old_names e2
-        pure (Map.union env1 env2, EApp e1' e2')
-
-    EAdd e1 e2 -> do
-        (env1, e1') <- renameExp old_names e1
-        (env2, e2') <- renameExp old_names e2
-        pure (Map.union env1 env2, EAdd e1' e2')
-
-    ESub e1 e2 -> do
-        (env1, e1') <- renameExp old_names e1
-        (env2, e2') <- renameExp old_names e2
-        pure (Map.union env1 env2, ESub e1' e2')
-
-    ELet b e  -> do
-        (new_names, b)   <- renameLocalBind old_names b
-        (new_names', e') <- renameExp new_names e
-        pure (new_names', ELet b e')
-
-    EAbs par t e  -> do
-        (new_names, par') <- newName old_names par
-        (new_names', e')  <- renameExp new_names e
-        pure (new_names', EAbs par' t e')
-
-    EAnn e t -> do
-        (new_names, e') <- renameExp old_names e
-        pure (new_names, EAnn e' t)
-
-    ECase e cs t -> do
-        (new_names, e') <- renameExp old_names e
-        (new_names', cs') <- foldM (\(names, stack) (CaseMatch c exp) -> do
-            (nm,exp') <- renameExp names exp
-            pure (nm,CaseMatch c exp' : stack)
-            ) (new_names, []) cs
-        pure (new_names', ECase e' cs' t)
-
--- | Create a new name and add it to name environment.
-newName :: Names -> Ident -> Rn (Names, Ident)
-newName env old_name = do
-    new_name <- makeName old_name
-    pure (Map.insert old_name new_name env, new_name)
-
--- | Create multiple names and add them to the name environment
-newNames :: Names -> [Ident] -> Rn (Names, [Ident])
-newNames = mapAccumM newName
-
--- | Annotate name with number and increment the number @prefix ⇒ prefix_number@.
-makeName :: Ident -> Rn Ident
-makeName (Ident prefix) = gets (\i -> Ident $ prefix ++ "_" ++ show i) <* modify succ
-