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

Author: Anton-Latukha

src/Nix/Exec.hs

@@ -211,7 +211,7 @@ instance MonadNix e t f m => MonadEval (NValue t f m) m where
   evalLiteralPath p = do
     scope <- currentScopes
     span  <- currentPos
-    nvPathP (Provenance scope $ NLiteralPath_ span p) <$>
+    nvPathP (Provenance scope $ NLiteralPathAnnF span p) <$>
       makeAbsolutePath @t @f @m p
 
   evalEnvPath p = do

src/Nix/Expr/Types/Annotated.hs

@@ -210,8 +210,8 @@ pattern NListAnnF ann x = AnnF ann (NList x)
 pattern NSetAnnF :: SrcSpan -> Recursivity -> [Binding r] -> NExprLocF r
 pattern NSetAnnF ann recur x = AnnF ann (NSet recur x)
 
-pattern NLiteralPath_ :: SrcSpan -> Path -> NExprLocF r
-pattern NLiteralPath_ ann x = AnnF ann (NLiteralPath x)
+pattern NLiteralPathAnnF :: SrcSpan -> Path -> NExprLocF r
+pattern NLiteralPathAnnF ann x = AnnF ann (NLiteralPath x)
 
 pattern NEnvPath_ :: SrcSpan -> Path -> NExprLocF r
 pattern NEnvPath_ ann x = AnnF ann (NEnvPath x)
@@ -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, NLiteralPath_, NEnvPath_, NUnary_, NBinary_, NSelect_, NHasAttr_, NAbs_, NLet_, NIf_, NWith_, NAssert_, NSynHole_ #-}
+{-# complete NConstantAnnF, NStrAnnF, NSymAnnF, NListAnnF, NSetAnnF, NLiteralPathAnnF, NEnvPath_, NUnary_, NBinary_, NSelect_, NHasAttr_, NAbs_, NLet_, NIf_, NWith_, NAssert_, NSynHole_ #-}
 
 
 pattern PNConstant :: SrcSpan -> NAtom -> NExprLoc

src/Nix/Reduce.hs

@@ -112,7 +112,7 @@ staticImport pann path = do
           cur  =
             NamedVar
               (StaticKey "__cur_file" :| mempty)
-              (Fix (NLiteralPath_ pann path))
+              (Fix (NLiteralPathAnnF pann path))
               pos
           x' = Fix $ NLet_ span [cur] x
         modify $ first $ HM.insert path x'
@@ -174,7 +174,7 @@ reduce (NBinary_ bann NApp fun arg) = fun >>= \case
   f@(Fix (NSymAnnF _ "import")) ->
     (\case
         -- Fix (NEnvPath_     pann origPath) -> staticImport pann origPath
-      Fix (NLiteralPath_ pann origPath) -> staticImport pann origPath
+      Fix (NLiteralPathAnnF pann origPath) -> staticImport pann origPath
       v -> pure $ Fix $ NBinary_ bann NApp f v
     ) =<< arg