Rakarake/churf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed unused imports and traces in monom

Browse source
This commit is contained in:
Rakarake 2023-05-08 14:58:04 +02:00
parent 3399023e3e
commit b3b71c0ef7
1 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/Monomorphizer/Monomorphizer.hs
View file

@ -29,14 +29,11 @@ module Monomorphizer.Monomorphizer (monomorphize, morphExp, morphBind) where
import Control.Monad.Reader (MonadReader (ask, local), import Control.Monad.Reader (MonadReader (ask, local),
Reader, asks, runReader) Reader, asks, runReader)
import Control.Monad.State (MonadState (get), import Control.Monad.State (MonadState,
StateT (runStateT), gets, StateT (runStateT), gets,
modify) modify)
import Data.Coerce (coerce)
import qualified Data.Map as Map import qualified Data.Map as Map
import Data.Maybe (catMaybes)
import qualified Data.Set as Set import qualified Data.Set as Set
import Debug.Trace (trace)
import Grammar.Print (printTree) import Grammar.Print (printTree)
import Monomorphizer.DataTypeRemover (removeDataTypes) import Monomorphizer.DataTypeRemover (removeDataTypes)
import qualified Monomorphizer.MonomorphizerIr as O import qualified Monomorphizer.MonomorphizerIr as O
@ -46,15 +43,8 @@ import LambdaLifterIr (Ident (..))
-- import TypeChecker.TypeCheckerIr qualified as T -- import TypeChecker.TypeCheckerIr qualified as T
import qualified LambdaLifterIr as L import qualified LambdaLifterIr as L
import Control.Monad.Reader (MonadReader (ask, local), import Data.Maybe (fromJust, catMaybes)
Reader, asks, runReader)
import Control.Monad.State (MonadState, StateT (runStateT),
gets, modify)
import qualified Data.Map as Map
import Data.Maybe (catMaybes, fromJust)
import qualified Data.Set as Set
import Data.Tuple.Extra (secondM) import Data.Tuple.Extra (secondM)
import Grammar.Print (printTree)
{- | EnvM is the monad containing the read-only state as well as the {- | EnvM is the monad containing the read-only state as well as the
output state containing monomorphized functions and to-be monomorphized output state containing monomorphized functions and to-be monomorphized
@ -238,7 +228,6 @@ appear as expressions in the tree, or as patterns in case-expressions.
-} -}
morphCons :: M.Type -> Ident -> Ident -> EnvM () morphCons :: M.Type -> Ident -> Ident -> EnvM ()
morphCons expectedType ident newIdent = do morphCons expectedType ident newIdent = do
--trace ("Tjofras:" ++ show (newName expectedType ident)) $ return ()
maybeD <- getInputData ident maybeD <- getInputData ident
case maybeD of case maybeD of
-- closures can have unbound variables -- closures can have unbound variables
@ -337,13 +326,9 @@ morphPattern p expectedType = case p of
L.PCatch -> return $ Just ((M.PCatch, expectedType), Set.empty) L.PCatch -> return $ Just ((M.PCatch, expectedType), Set.empty)
L.PEnum ident -> return $ Just ((M.PEnum (newName expectedType ident), expectedType), Set.empty) L.PEnum ident -> return $ Just ((M.PEnum (newName expectedType ident), expectedType), Set.empty)
L.PInj ident pts -> do let newIdent = newName expectedType ident L.PInj ident pts -> do let newIdent = newName expectedType ident
outEnv <- get
trace ("WOW: " ++ show (newName expectedType ident)) $ return ()
trace ("WOW2: " ++ show (outEnv)) $ return ()
isMarked <- isConsMarked newIdent isMarked <- isConsMarked newIdent
if isMarked if isMarked
then do then do
trace ("WOW3") $ return ()
ts' <- mapM (getMonoFromPoly . snd) pts ts' <- mapM (getMonoFromPoly . snd) pts
let pts' = zip (map fst pts) ts' let pts' = zip (map fst pts) ts'
psSets <- mapM (uncurry morphPattern) pts' psSets <- mapM (uncurry morphPattern) pts'