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

Author: Anton-Latukha

src/Nix/Expr/Types/Annotated.hs

@@ -231,8 +231,8 @@ pattern NHasAttrAnnF ann x p = AnnF ann (NHasAttr x p)
 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)
+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)
@@ -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, NLet_, NIf_, NWith_, NAssert_, NSynHole_ #-}
+{-# complete NConstantAnnF, NStrAnnF, NSymAnnF, NListAnnF, NSetAnnF, NLiteralPathAnnF, NEnvPathAnnF, NUnaryAnnF, NBinaryAnnF, NSelectAnnF, NHasAttrAnnF, NAbsAnnF, NLetAnnF, NIf_, NWith_, NAssert_, NSynHole_ #-}
 
 
 pattern PNConstant :: SrcSpan -> NAtom -> NExprLoc

src/Nix/Reduce.hs

@@ -114,7 +114,7 @@ staticImport pann path = do
               (StaticKey "__cur_file" :| mempty)
               (Fix (NLiteralPathAnnF pann path))
               pos
-          x' = Fix $ NLet_ span [cur] x
+          x' = Fix $ NLetAnnF span [cur] x
         modify $ first $ HM.insert path x'
         local
           (const (pure path, mempty)) $
@@ -260,7 +260,7 @@ reduce (NWith_ ann scope body) =
 
 -- | Reduce a let binds section by pushing lambdas,
 --   constants and strings to the body scope.
-reduce (NLet_ ann binds body) =
+reduce (NLetAnnF ann binds body) =
   do
     binds' <- traverse sequence binds
     body'  <-
@@ -287,7 +287,7 @@ reduce (NLet_ ann binds body) =
     --     NamedVar (StaticKey name _ :| []) _ ->
     --         name `S.member` names
     --     _ -> True
-    pure $ Fix $ NLet_ ann binds' body'
+    pure $ Fix $ NLetAnnF ann binds' body'
     -- where
     --   go m [] = pure m
     --   go m (x:xs) = case x of

tests/ParserTests.hs

@@ -646,7 +646,7 @@ case_simpleLoc =
     in foo
     |]
     (Fix
-      (NLet_
+      (NLetAnnF
         (mkSpan 1 1 4 7)
         [ NamedVar
             (StaticKey "foo" :| [])