Skip to content

Use actual var annotations in case-match bindings #5695

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

Draft
ChrisPenner wants to merge 1 commit into
base: trunk
Choose a base branch
from
Draft

Use actual var annotations in case-match bindings #5695

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
4 changes: 2 additions & 2 deletions parser-typechecker/src/Unison/Syntax/TermParser.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ matchCases = sepBy semi matchCase <&> \cases_ -> [(n, c) | (n, cs) <- cases_, c
matchCase :: (Monad m, Var v) => P v m (Int, [Term.MatchCase Ann (Term v Ann)])
matchCase = do
pats <- sepBy1 (label "\",\"" $ reserved ",") (parsePattern >>= bindConstructorsInPattern)
let boundVars' = [v | (_, vs) <- pats, (_ann, v) <- vs]
let boundVars' = [(ann, v) | (_, vs) <- pats, (ann, v) <- vs]
pat = case fst <$> pats of
[p] -> p
pats -> foldr pair (unit (ann . last $ pats)) pats
Expand All @@ -241,7 +241,7 @@ matchCase = do
pure (Nothing, t)
-- a pattern's RHS is either one or more guards, or a single unguarded block.
guardsAndBlocks <- guardedBlocks <|> (pure @[] <$> unguardedBlock)
let absChain vs t = foldr (\v t -> ABT.abs' (ann t) v t) t vs
let absChain vs t = foldr (\(vAnn, v) t -> ABT.abs' vAnn v t) t vs
let mk (guard, t) = Term.MatchCase pat (fmap (absChain boundVars') guard) (absChain boundVars' t)
pure $ (length pats, mk <$> guardsAndBlocks)

Expand Down
Loading