carp-lang/Carp
1
1
Fork 0
mirror of https://github.com/carp-lang/Carp.git synced 2024-10-05 17:47:30 +03:00
Code Issues Projects Releases Wiki Activity

fix: use StaticLifetimeTy to avoid duplicate function types (solves #1318)

Browse Source
This commit is contained in:
Erik Svedäng 2021-10-12 15:35:52 +02:00
parent 998948ec6b
commit a2731eaecc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/GenerateConstraints.hs
View File

@ -246,7 +246,7 @@ genConstraints _ root rootSig = fmap sort (gen root)
retConstraint = Constraint xobjTy' retTy xobj func xobj OrdFuncAppRet
in pure (retConstraint : funcConstraints ++ argConstraints ++ variablesConstraints)
funcVarTy@(VarTy _) ->
let fabricatedFunctionType = FuncTy (List.map forceTy args) (forceTy xobj) (VarTy "what?!")
let fabricatedFunctionType = FuncTy (List.map forceTy args) (forceTy xobj) StaticLifetimeTy
expected = XObj (Sym (SymPath [] ("Calling '" ++ getName func ++ "'")) Symbol) (xobjInfo func) Nothing
wholeTypeConstraint = Constraint funcVarTy fabricatedFunctionType func expected xobj OrdFuncAppVarTy
in pure (wholeTypeConstraint : funcConstraints ++ variablesConstraints)
@ -321,7 +321,7 @@ genConstraintsForCaseMatcher matchMode = gen
retConstraint = Constraint xobjTy' retTy xobj caseName xobj OrdFuncAppRet
in pure (retConstraint : caseNameConstraints ++ argConstraints ++ variablesConstraints)
funcVarTy@(VarTy _) ->
let fabricatedFunctionType = FuncTy (List.map forceTy variables) (forceTy xobj) (VarTy "what?!") -- TODO: Fix
let fabricatedFunctionType = FuncTy (List.map forceTy variables) (forceTy xobj) StaticLifetimeTy
expected = XObj (Sym (SymPath [] ("Matchin on '" ++ getName caseName ++ "'")) Symbol) (xobjInfo caseName) Nothing
wholeTypeConstraint = Constraint funcVarTy fabricatedFunctionType caseName expected xobj OrdFuncAppVarTy
in pure (wholeTypeConstraint : caseNameConstraints ++ variablesConstraints)