@@ -169,7 +169,7 @@ moduleToCpp env (Module _ mn imps _ foreigns decls) = do
169169 return (CppComment com fn)
170170 where
171171 ty' | Just t <- ty = Just t
172− | Just (t, _, _) <- M.lookup (mn, ident) (E.names env) = Just t
172+ | Just (t, _, _) <- M.lookup (Qualified (Just mn) ident) (E.names env) = Just t
173173 | otherwise = Nothing
174174 argcnt = maybe 0 countArgs ty'
175175 name = identToCpp ident
@@ -484,7 +484,7 @@ moduleToCpp env (Module _ mn imps _ foreigns decls) = do
484484 return $ foldl (\fn a -> CppApp fn [a]) fn' curriedArgs
485485 where
486486 ty | (_, _, Just t, _) <- ann = Just t
487− | Just (t, _, _) <- M.lookup (mn', ident) (E.names env) = Just t
487+ | Just (t, _, _) <- M.lookup (Qualified (Just mn') ident) (E.names env) = Just t
488488 | otherwise = Nothing
489489 _ ->
490490 flip (foldl (\fn a -> CppApp fn [a])) args' <$> valueToCpp f
@@ -810,8 +810,8 @@ moduleToCpp env (Module _ mn imps _ foreigns decls) = do
810810 go _ = return []
811811
812812 allForeigns :: [(Ident, T.Type)]
813− allForeigns = map (\((_, ident), (ty, _, _)) -> (ident, ty)) .
814− filter (\((mn', _), (_, kind, _)) -> mn' == mn && kind == E.External) .
813+ allForeigns = map (\((Qualified _ ident), (ty, _, _)) -> (ident, ty)) .
814+ filter (\((Qualified mn' _), (_, kind, _)) -> mn' == Just mn && kind == E.External) .
815815 M.toList $ E.names env
816816
817817---------------------------------------------------------------------------------------------------