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

Author: Anton-Latukha

src/Nix/Exec.hs

@@ -242,7 +242,7 @@ instance MonadNix e t f m => MonadEval (NValue t f m) m where
     b <- fromValue c
 
     let
-      fun x y z = addProvenance (Provenance scope $ NIf_ span (pure c) x y) z
+      fun x y z = addProvenance (Provenance scope $ NIfAnnF span (pure c) x y) z
       -- Note: join acts as \ f x -> f x x
       false = join (fun Nothing . pure) <$> f
       true = join (flip fun Nothing . pure) <$> t

src/Nix/Expr/Types/Annotated.hs

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

src/Nix/Reduce.hs

@@ -298,7 +298,7 @@ reduce (NLetAnnF ann binds body) =
 
 -- | Reduce an if to the relevant path if
 --   the condition is a boolean constant.
-reduce e@(NIf_ _ b t f) =
+reduce e@(NIfAnnF _ b t f) =
   (\case
     Fix (NConstantAnnF _ (NBool b')) -> if b' then t else f
     _                             -> Fix <$> sequence e