carp-lang/Carp
1
1
Fork 0
mirror of https://github.com/carp-lang/Carp.git synced 2024-09-17 16:38:14 +03:00
Code Issues Projects Releases Wiki Activity

InitialTypes: Add DefDynamic typing; make match exhaustive

Browse Source 
Our initial type setting function didn't assign the Dynamic type to
DefDynamic forms; after this commit, it will. It also wasn't an
exhaustive match, leading to ugly non-exhaustive pattern match errors in
rare cases. This commit adds a clause to prevent that.
This commit is contained in:
scottolsen 2020-11-17 12:11:44 -05:00
parent d5c56f8285
commit 5b0b18c2c2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/InitialTypes.hs
View File

@ -86,6 +86,7 @@ initialTypes typeEnv rootEnv root = evalState (visit rootEnv root) 0
(InterfaceSym _) -> visitInterfaceSym env xobj
e@(Defn _) -> return (Left (InvalidObj e xobj))
Def -> return (Left (InvalidObj Def xobj))
DefDynamic -> return (Left (InvalidObj DefDynamic xobj))
e@(Fn _ _) -> return (Left (InvalidObj e xobj))
Let -> return (Left (InvalidObj Let xobj))
If -> return (Left (InvalidObj If xobj))
@ -106,6 +107,8 @@ initialTypes typeEnv rootEnv root = evalState (visit rootEnv root) 0
Ref -> return (Left (InvalidObj Ref xobj))
Deref -> return (Left (InvalidObj Deref xobj))
With -> return (Left (InvalidObj With xobj))
-- catchall case for exhaustive patterns
unknown -> return (Left (InvalidObj unknown xobj))
visitSymbol :: Env -> XObj -> SymPath -> State Integer (Either TypeError XObj)
visitSymbol _ xobj@(XObj (Sym _ LookupRecursive) _ _) _ =
@ -218,6 +221,11 @@ initialTypes typeEnv rootEnv root = evalState (visit rootEnv root) 0
XObj Def _ _ : _ -> return (Left (InvalidObj Def xobj))
-- DefDynamic
[def@(XObj DefDynamic _ _), nameSymbol, expression] ->
return $ return (XObj (Lst [def, nameSymbol, expression]) i (Just DynamicTy))
XObj DefDynamic _ _ : _ -> return (Left (InvalidObj Def xobj))
-- Let binding
[letExpr@(XObj Let _ _), XObj (Arr bindings) bindi bindt, body] ->
do wholeExprType <- genVarTy
@ -237,7 +245,6 @@ initialTypes typeEnv rootEnv root = evalState (visit rootEnv root) 0
getDuplicate names (o@(XObj (Sym (SymPath _ x) _) _ _):y:xs) =
if x `elem` names then Just o else getDuplicate (x:names) xs
[XObj Let _ _, XObj (Arr _) _ _] ->
return (Left (NoFormsInBody xobj))
XObj Let _ _ : XObj (Arr _) _ _ : _ ->