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

Author: Anton-Latukha

src/Nix/Exec.hs

@@ -233,7 +233,7 @@ instance MonadNix e t f m => MonadEval (NValue t f m) m where
   evalWith c b = do
     scope <- currentScopes
     span  <- currentPos
-    let f = join $ addProvenance . Provenance scope . NWith_ span Nothing . pure
+    let f = join $ addProvenance . Provenance scope . NWithAnnF span Nothing . pure
     f <$> evalWithAttrSet c b
 
   evalIf c t f = do

src/Nix/Expr/Types/Annotated.hs

@@ -237,15 +237,15 @@ pattern NLetAnnF ann x b = AnnF ann (NLet x b)
 pattern NIfAnnF :: SrcSpan -> r -> r -> r -> NExprLocF r
 pattern NIfAnnF ann c t e = AnnF ann (NIf c t e)
 
-pattern NWith_ :: SrcSpan -> r -> r -> NExprLocF r
-pattern NWith_ ann x y = AnnF ann (NWith x y)
+pattern NWithAnnF :: SrcSpan -> r -> r -> NExprLocF r
+pattern NWithAnnF ann x y = AnnF ann (NWith x y)
 
 pattern NAssert_ :: SrcSpan -> r -> r -> NExprLocF r
 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, NAbsAnnF, NLetAnnF, NIfAnnF, NWith_, NAssert_, NSynHole_ #-}
+{-# complete NConstantAnnF, NStrAnnF, NSymAnnF, NListAnnF, NSetAnnF, NLiteralPathAnnF, NEnvPathAnnF, NUnaryAnnF, NBinaryAnnF, NSelectAnnF, NHasAttrAnnF, NAbsAnnF, NLetAnnF, NIfAnnF, NWithAnnF, NAssert_, NSynHole_ #-}
 
 
 pattern PNConstant :: SrcSpan -> NAtom -> NExprLoc

src/Nix/Reduce.hs

@@ -255,8 +255,8 @@ reduce (NSetAnnF ann Recursive binds) =
 
 -- Encountering a 'with' construction eliminates any hope of inlining
 -- definitions.
-reduce (NWith_ ann scope body) =
-  clearScopes @NExprLoc $ Fix <$> liftA2 (NWith_ ann) scope body
+reduce (NWithAnnF ann scope body) =
+  clearScopes @NExprLoc $ Fix <$> liftA2 (NWithAnnF ann) scope body
 
 -- | Reduce a let binds section by pushing lambdas,
 --   constants and strings to the body scope.