Skip to content
Snippets Groups Projects
Commit 55467099 authored by Ross Paterson's avatar Ross Paterson Committed by Ian Lynagh
Browse files

Fix #5045 properly

In arrow commands, the function position in an application (HsApp)
is a command, not an expression.
parent 40e4d4b2
No related branches found
No related tags found
No related merge requests found
...@@ -364,20 +364,6 @@ addTickHsExpr (HsWrap w e) = ...@@ -364,20 +364,6 @@ addTickHsExpr (HsWrap w e) =
(return w) (return w)
(addTickHsExpr e) -- explicitly no tick on inside (addTickHsExpr e) -- explicitly no tick on inside
addTickHsExpr (HsArrApp e1 e2 ty1 arr_ty lr) =
liftM5 HsArrApp
(addTickLHsExpr e1)
(addTickLHsExpr e2)
(return ty1)
(return arr_ty)
(return lr)
addTickHsExpr (HsArrForm e fix cmdtop) =
liftM3 HsArrForm
(addTickLHsExpr e)
(return fix)
(mapM (liftL (addTickHsCmdTop)) cmdtop)
addTickHsExpr e@(HsType _) = return e addTickHsExpr e@(HsType _) = return e
-- Others dhould never happen in expression content. -- Others dhould never happen in expression content.
...@@ -544,8 +530,8 @@ addTickLHsCmd (L pos c0) = do ...@@ -544,8 +530,8 @@ addTickLHsCmd (L pos c0) = do
addTickHsCmd :: HsCmd Id -> TM (HsCmd Id) addTickHsCmd :: HsCmd Id -> TM (HsCmd Id)
addTickHsCmd (HsLam matchgroup) = addTickHsCmd (HsLam matchgroup) =
liftM HsLam (addTickCmdMatchGroup matchgroup) liftM HsLam (addTickCmdMatchGroup matchgroup)
addTickHsCmd (HsApp e1 e2) = addTickHsCmd (HsApp c e) =
liftM2 HsApp (addTickLHsExprNever e1) (addTickLHsExpr e2) liftM2 HsApp (addTickLHsCmd c) (addTickLHsExpr e)
addTickHsCmd (OpApp e1 c2 fix c3) = addTickHsCmd (OpApp e1 c2 fix c3) =
liftM4 OpApp liftM4 OpApp
(addTickLHsExpr e1) (addTickLHsExpr e1)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment