@@ -120,10 +120,26 @@ toTuple _ = error "Not a value declaration"
120120makeCaseDeclaration :: (Functor m, Applicative m, MonadSupply m, MonadError MultipleErrors m) => Ident -> [([Binder], Either [(Guard, Expr)] Expr)] -> m Declaration
121121makeCaseDeclaration ident alternatives = do
122122 let argPattern = length . fst . head $ alternatives
123− args <- map Ident <$> replicateM argPattern freshName
123+ args <- mapM argName (foldl1 (zipWith resolveIdents) namedArgs)
124124 let
125125 vars = map (Var . Qualified Nothing) args
126126 binders = [ CaseAlternative bs result | (bs, result) <- alternatives ]
127127 value = foldr (Abs . Left) (Case vars binders) args
128128 return $ ValueDeclaration ident Value [] (Right value)
129−
129+ where
130+ namedArgs = findNames . fst <$> alternatives
131+ findNames names = findName <$> names
132+ findName (VarBinder name) = Just name
133+ findName _ = Nothing
134+
135+ argName (Just name) = return name
136+ argName Nothing = do
137+ name <- freshName
138+ return (Ident name)
139+
140+ resolveIdents (Just a) (Just b)
141+ | a == b = Just a
142+ | otherwise = Nothing
143+ resolveIdents Nothing Nothing = Nothing
144+ resolveIdents (Just a) Nothing = Just a
145+ resolveIdents Nothing (Just b) = Just b