Skip to content

Fixed the wrap case in the type checker #169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
effectfully merged 1 commit into from
Oct 3, 2018
Merged

Fixed the wrap case in the type checker #169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions language-plutus-core/src/Language/PlutusCore/TypeSynthesis.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,11 @@ typeOf (TyInst x body ty) = do
nBodyTy@(NormalizedType bodyTy) <- typeOf body
case bodyTy of
TyForall _ n k absTy -> do
nTy <- tyReduce $ void ty
k' <- kindOf ty
typeCheckStep
if k == k'
then tyReduceBinder n (void $ NormalizedType ty) absTy
then tyReduceBinder n nTy absTy
else throwError (KindMismatch x (void ty) k k')
_ -> throwError (TypeMismatch x (void body) (TyForall () dummyTyName dummyKind dummyType) nBodyTy)
typeOf (Unwrap x body) = do
Expand All @@ -274,14 +275,18 @@ typeOf (Unwrap x body) = do
TyFix _ n fixTy ->
tyReduceBinder n nBodyTy fixTy
_ -> throwError (TypeMismatch x (void body) (TyFix () dummyTyName dummyType) nBodyTy)
typeOf (Wrap x n ty body) = do
nBodyTy <- typeOf body
tyEnvAssign (extractUnique n) (NormalizedType $ TyFix () (void n) (void ty))
typeOf (Wrap x n ty term) = do
-- G |- term : nTermTy, ty ~>* nTy, [fix n nTy / n] nTy ~>* nTermTy', nTermTy ~ nTermTy'
-- -------------------------------------------------------------------------------------
-- G |- wrap n ty term : fix n nTy

NormalizedType nTy <- tyReduce $ void ty
nTermTy <- typeOf term
typeCheckStep
red <- tyReduce (void ty) <* tyEnvDelete (extractUnique n)
if red == nBodyTy
then pure $ NormalizedType (TyFix () (void n) (void ty))
else throwError (TypeMismatch x (void body) (getNormalizedType red) nBodyTy)
nTermTy' <- tyReduceBinder (void n) (NormalizedType $ TyFix () (void n) nTy) nTy
if nTermTy == nTermTy'
then pure $ NormalizedType (TyFix () (void n) nTy)
else throwError (TypeMismatch x (void term) (getNormalizedType nTermTy') nTermTy)

tyReduceBinder :: TyNameWithKind () -> NormalizedType TyNameWithKind () -> Type TyNameWithKind () -> TypeCheckM a (NormalizedType TyNameWithKind ())
tyReduceBinder n ty ty' = do
Expand Down
4 changes: 2 additions & 2 deletions language-plutus-core/test/Spec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import Test.Tasty
import Test.Tasty.Golden
import Test.Tasty.Hedgehog
import Test.Tasty.HUnit
-- import TypeSynthesis.Spec (test_typecheck)
import TypeSynthesis.Spec (test_typecheck)

main :: IO ()
main = do
Expand Down Expand Up @@ -93,7 +93,7 @@ allTests plcFiles rwFiles typeFiles typeNormalizeFiles typeErrorFiles = testGrou
, testsNormalizeType typeNormalizeFiles
, testsType typeErrorFiles
, test_PrettyReadable
-- , test_typecheck
, test_typecheck
, test_constantApplication
, test_evaluateCk
, Quotation.tests
Expand Down