Expr: Types: Annotated: pattern NAbs(_->AnnF)

Author: Anton-Latukha

src/Nix/Exec.hs

@@ -276,7 +276,7 @@ instance MonadNix e t f m => MonadEval (NValue t f m) m where
     span  <- currentPos
     pure $
       nvClosureP
-        (Provenance scope $ NAbs_ span (Nothing <$ p) Nothing)
+        (Provenance scope $ NAbsAnnF span (Nothing <$ p) Nothing)
         (void p)
         (\arg -> snd <$> k (pure arg) (\_ b -> ((), ) <$> b))
 

src/Nix/Expr/Types/Annotated.hs

@@ -228,8 +228,8 @@ pattern NSelectAnnF ann v x p = AnnF ann (NSelect v x p)
 pattern NHasAttrAnnF :: SrcSpan -> r -> NAttrPath r -> NExprLocF r
 pattern NHasAttrAnnF ann x p = AnnF ann (NHasAttr x p)
 
-pattern NAbs_ :: SrcSpan -> Params r-> r -> NExprLocF r
-pattern NAbs_ ann x b = AnnF ann (NAbs x b)
+pattern NAbsAnnF :: SrcSpan -> Params r-> r -> NExprLocF r
+pattern NAbsAnnF ann x b = AnnF ann (NAbs x b)
 
 pattern NLet_ :: SrcSpan -> [Binding r] -> r -> NExprLocF r
 pattern NLet_ ann x b = AnnF ann (NLet x b)
@@ -245,7 +245,7 @@ pattern NAssert_ ann x y = AnnF ann (NAssert x y)
 
 pattern NSynHole_ :: SrcSpan -> VarName -> NExprLocF r
 pattern NSynHole_ ann x = AnnF ann (NSynHole x)
-{-# complete NConstantAnnF, NStrAnnF, NSymAnnF, NListAnnF, NSetAnnF, NLiteralPathAnnF, NEnvPathAnnF, NUnaryAnnF, NBinaryAnnF, NSelectAnnF, NHasAttrAnnF, NAbs_, NLet_, NIf_, NWith_, NAssert_, NSynHole_ #-}
+{-# complete NConstantAnnF, NStrAnnF, NSymAnnF, NListAnnF, NSetAnnF, NLiteralPathAnnF, NEnvPathAnnF, NUnaryAnnF, NBinaryAnnF, NSelectAnnF, NHasAttrAnnF, NAbsAnnF, NLet_, NIf_, NWith_, NAssert_, NSynHole_ #-}
 
 
 pattern PNConstant :: SrcSpan -> NAtom -> NExprLoc

src/Nix/Reduce.hs

@@ -178,7 +178,7 @@ reduce (NBinaryAnnF bann NApp fun arg) = fun >>= \case
       v -> pure $ Fix $ NBinaryAnnF bann NApp f v
     ) =<< arg
 
-  Fix (NAbs_ _ (Param name) body) ->
+  Fix (NAbsAnnF _ (Param name) body) ->
     do
       x <- arg
       pushScope
@@ -271,7 +271,7 @@ reduce (NLet_ ann binds body) =
               let
                 defcase =
                   \case
-                    d@(Fix NAbs_     {}) -> pure (name, d)
+                    d@(Fix NAbsAnnF     {}) -> pure (name, d)
                     d@(Fix NConstantAnnF{}) -> pure (name, d)
                     d@(Fix NStrAnnF     {}) -> pure (name, d)
                     _                    -> Nothing
@@ -312,7 +312,7 @@ reduce e@(NAssert_ _ b body) =
     _ -> Fix <$> sequence e
   ) =<< b
 
-reduce (NAbs_ ann params body) = do
+reduce (NAbsAnnF ann params body) = do
   params' <- sequence params
   -- Make sure that variable definitions in scope do not override function
   -- arguments.
@@ -322,7 +322,7 @@ reduce (NAbs_ ann params body) = do
         Param    name     -> one (name, Fix $ NSymAnnF ann name)
         ParamSet _ _ pset ->
           HM.fromList $ (\(k, _) -> (k, Fix $ NSymAnnF ann k)) <$> pset
-  Fix . NAbs_ ann params' <$> pushScope scope body
+  Fix . NAbsAnnF ann params' <$> pushScope scope body
 
 reduce v = Fix <$> sequence v