- (usingExpr', usingArgs) <-
- case groupByClause of
- GroupByNothing usingExpr -> liftM2 (,) (dsLExpr usingExpr) (return [expr])
- GroupBySomething usingExpr byExpr -> do
- usingExpr' <- dsLExpr (either id noLoc usingExpr)
-
- byExpr' <- dsLExpr byExpr
-
- us <- newUniqueSupply
- [fromBindersTuple] <- newSysLocalsDs [fromBindersTupleType]
- let byExprWrapper = mkTupleCase us fromBinders byExpr' fromBindersTuple (Var fromBindersTuple)
-
- return (usingExpr', [Lam fromBindersTuple byExprWrapper, expr])
+ usingExpr' <- dsLExpr (either id noLoc using)
+ usingArgs <- case by of
+ Nothing -> return [expr]
+ Just by_e -> do { by_e' <- dsLExpr by_e
+ ; us <- newUniqueSupply
+ ; [from_tup_id] <- newSysLocalsDs [from_tup_ty]
+ ; let by_wrap = mkTupleCase us fromBinders by_e'
+ from_tup_id (Var from_tup_id)
+ ; return [Lam from_tup_id by_wrap, expr] }