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

Author: Anton-Latukha

src/Nix/Exec.hs

@@ -260,7 +260,7 @@ instance MonadNix e t f m => MonadEval (NValue t f m) m where
         (nverr $ Assertion span c)
         (do
           scope <- currentScopes
-          let f = join (addProvenance . Provenance scope . NAssert_ span (pure c) . pure)
+          let f = join (addProvenance . Provenance scope . NAssertAnnF span (pure c) . pure)
           f <$> body
         )
         b

src/Nix/Expr/Types/Annotated.hs

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

src/Nix/Reduce.hs

@@ -306,7 +306,7 @@ reduce e@(NIfAnnF _ b t f) =
 
 -- | Reduce an assert atom to its encapsulated
 --   symbol if the assertion is a boolean constant.
-reduce e@(NAssert_ _ b body) =
+reduce e@(NAssertAnnF _ b body) =
   (\case
     Fix (NConstantAnnF _ (NBool b')) | b' -> body
     _ -> Fix <$> sequence e