Skip to content
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.

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

Fixes #5293: Generate IsAbility constraint for ability sets #5300

Merged
merged 2 commits into from
Sep 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion parser-typechecker/src/Unison/KindInference/Generate.hs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ typeConstraintTree resultVar [email protected] {annotation, out} = do
restConstraints <- typeConstraintTree resultVar b
pure $ Node [effConstraints, restConstraints]
Type.Effects effs -> do
Node <$> for effs \eff -> do
ParentConstraint (IsAbility resultVar (Provenance EffectsList annotation)) . Node <$> for effs \eff -> do
effKind <- freshVar eff
effConstraints <- typeConstraintTree effKind eff
pure $ ParentConstraint (IsAbility effKind (Provenance EffectsList $ ABT.annotation eff)) effConstraints
Expand Down
1 change: 1 addition & 0 deletions unison-src/tests/type-application.u
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ structural ability Foo where
foo : {Foo} Nat

structural type Wrap a = Wrap Nat
structural type C = C (Wrap {}) -- constrain Wrap kind

blah : Wrap {Foo} -> Nat
blah = cases
Expand Down
3 changes: 3 additions & 0 deletions unison-src/transcripts/fix3196.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ structural type W es = W
unique ability Zoot where
zoot : ()

-- here only to put a kind constraint on W
structural type C = C (W {})

woot : W {g} -> '{g, Zoot} a ->{Zoot} a
woot w a = todo ()

Expand Down
6 changes: 5 additions & 1 deletion unison-src/transcripts/fix3196.output.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ structural type W es = W
unique ability Zoot where
zoot : ()

-- here only to put a kind constraint on W
structural type C = C (W {})

woot : W {g} -> '{g, Zoot} a ->{Zoot} a
woot w a = todo ()

Expand All @@ -36,6 +39,7 @@ w2 = cases W -> W

⍟ These new definitions are ok to `add`:

structural type C
structural type W es
ability Zoot
ex : '{Zoot} r
Expand All @@ -46,7 +50,7 @@ w2 = cases W -> W
Now evaluating any watch expressions (lines starting with
`>`)... Ctrl+C cancels.

19 | > w2 w1
22 | > w2 w1
W

Expand Down
Loading