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

Fixed wrong name bug -- samuel

Browse source
This commit is contained in:
Rakarake 2023-05-05 11:44:08 +02:00
parent fe25f18eb7
commit 010ca29ced
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Monomorphizer/Monomorphizer.hs
View file

@ -193,16 +193,16 @@ getInputData ident = do
{- | Monomorphize a constructor using it's global name. Constructors may {- | Monomorphize a constructor using it's global name. Constructors may
appear as expressions in the tree, or as patterns in case-expressions. appear as expressions in the tree, or as patterns in case-expressions.
'newIdent' has a unique name while 'ident' has a general name.
-} -}
morphCons :: M.Type -> Ident -> EnvM () morphCons :: M.Type -> Ident -> Ident -> EnvM ()
morphCons expectedType ident = do morphCons expectedType ident newIdent = do
--trace ("Tjofras:" ++ show (newName expectedType ident)) $ return () --trace ("Tjofras:" ++ show (newName expectedType ident)) $ return ()
let ident' = newName expectedType ident
maybeD <- getInputData ident maybeD <- getInputData ident
case maybeD of case maybeD of
Nothing -> error $ "identifier '" ++ show ident ++ "' not found" Nothing -> error $ "identifier '" ++ show ident ++ "' not found"
Just d -> do Just d -> do
modify (\output -> Map.insert ident' (Data expectedType d) output) modify (\output -> Map.insert newIdent (Data expectedType d) output)
-- | Converts literals from input to output tree. -- | Converts literals from input to output tree.
convertLit :: T.Lit -> M.Lit convertLit :: T.Lit -> M.Lit
@ -215,8 +215,9 @@ morphExp expectedType exp = case exp of
T.ELit lit -> return $ M.ELit (convertLit lit) T.ELit lit -> return $ M.ELit (convertLit lit)
-- Constructor -- Constructor
T.EInj ident -> do T.EInj ident -> do
morphCons expectedType ident let ident' = newName expectedType ident
return $ M.EVar ident morphCons expectedType ident ident'
return $ M.EVar ident'
T.EApp (e1, _t1) (e2, t2) -> do T.EApp (e1, _t1) (e2, t2) -> do
t2' <- getMonoFromPoly t2 t2' <- getMonoFromPoly t2
e2' <- morphExp t2' e2 e2' <- morphExp t2' e2
@ -248,8 +249,9 @@ morphExp expectedType exp = case exp of
case bind of case bind of
Nothing -> do Nothing -> do
-- This is a constructor -- This is a constructor
morphCons expectedType ident let ident' = newName expectedType ident
return $ M.EVar ident morphCons expectedType ident ident'
return $ M.EVar ident'
Just bind' -> do Just bind' -> do
-- New bind to process -- New bind to process
newBindName <- morphBind expectedType bind' newBindName <- morphBind expectedType bind'