msyds/rlp
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

rc #13

Merged
crumbtoo merged 196 commits from dev into main 2024-02-13 13:22:23 -07:00
Conversation 0 Commits 196 Files Changed 55 +12 -9
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e80acbcd28 - Show all commits

21
src/Core/HindleyMilner.hs
View File

@@ -7,6 +7,7 @@ module Core.HindleyMilner
( Context' ( Context'
, infer , infer
, check , check
, checkProg
, TypeError(..) , TypeError(..)
, HMError , HMError
) )
@@ -20,6 +21,7 @@ import Data.HashMap.Strict qualified as H
import Data.Foldable (traverse_) import Data.Foldable (traverse_)
import Compiler.RLPC import Compiler.RLPC
import Control.Monad (foldM, void) import Control.Monad (foldM, void)
import Control.Monad.Errorful (Errorful, addFatal)
import Control.Monad.State import Control.Monad.State
import Control.Monad.Utils (mapAccumLM) import Control.Monad.Utils (mapAccumLM)
import Core.Syntax import Core.Syntax
@@ -45,8 +47,9 @@ data TypeError
| TyErrMissingTypeSig Name | TyErrMissingTypeSig Name
deriving (Show, Eq) deriving (Show, Eq)
-- | Synonym for @Either TypeError@ -- | Synonym for @Errorful [TypeError]@. This means an @HMError@ action may
type HMError = Either TypeError -- throw any number of fatal or nonfatal errors. Run with @runErrorful@.
type HMError = Errorful TypeError
-- TODO: better errors. Errorful-esque, with cummulative errors instead of -- TODO: better errors. Errorful-esque, with cummulative errors instead of
-- instantly dying. -- instantly dying.
@@ -76,7 +79,7 @@ checkProg p = scDefs
k :: ScDef' -> HMError () k :: ScDef' -> HMError ()
k sc = case lookup scname g of k sc = case lookup scname g of
Just t -> check g t (sc ^. _rhs) Just t -> check g t (sc ^. _rhs)
Nothing -> Left (TyErrMissingTypeSig $ scname) Nothing -> addFatal $ TyErrMissingTypeSig scname
where scname = sc ^. _lhs._1 where scname = sc ^. _lhs._1
checkRlpcProg :: Program' -> RLPC TypeError () checkRlpcProg :: Program' -> RLPC TypeError ()
@@ -118,8 +121,8 @@ gather = \g e -> runStateT (go g e) ([],0) <&> \ (t,(cs,_)) -> (t,cs) where
go :: Context' -> Expr' -> StateT ([Constraint], Int) HMError Type go :: Context' -> Expr' -> StateT ([Constraint], Int) HMError Type
go g = \case go g = \case
Lit (IntL _) -> pure TyInt Lit (IntL _) -> pure TyInt
Var k -> lift $ maybe e Right $ lookup k g Var k -> lift $ maybe e pure $ lookup k g
where e = Left (TyErrUntypedVariable k) where e = addFatal $ TyErrUntypedVariable k
App f x -> do App f x -> do
tf <- go g f tf <- go g f
tx <- go g x tx <- go g x
@@ -158,7 +161,7 @@ unify = go mempty where
go :: Context' -> [Constraint] -> HMError Context' go :: Context' -> [Constraint] -> HMError Context'
-- nothing left! return accumulated context -- nothing left! return accumulated context
go g [] = Right g go g [] = pure g
go g (c:cs) = case c of go g (c:cs) = case c of
-- primitives may of course unify with themselves -- primitives may of course unify with themselves
@@ -176,10 +179,10 @@ unify = go mempty where
(a :-> b, x :-> y) -> go g $ (a,x) : (b,y) : cs (a :-> b, x :-> y) -> go g $ (a,x) : (b,y) : cs
-- anything else is a failure :( -- anything else is a failure :(
(t,u) -> Left $ TyErrCouldNotUnify t u (t,u) -> addFatal $ TyErrCouldNotUnify t u
unifyTV :: Context' -> Name -> Type -> [Constraint] -> Either TypeError Context' unifyTV :: Context' -> Name -> Type -> [Constraint] -> HMError Context'
unifyTV g x t cs | occurs t = Left $ TyErrRecursiveType x t unifyTV g x t cs | occurs t = addFatal $ TyErrRecursiveType x t
| otherwise = go g' substed | otherwise = go g' substed
where where
g' = (x,t) : g g' = (x,t) : g