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

Author: Anton-Latukha

src/Nix/Exec.hs

@@ -217,7 +217,7 @@ instance MonadNix e t f m => MonadEval (NValue t f m) m where
   evalEnvPath p = do
     scope <- currentScopes
     span  <- currentPos
-    nvPathP (Provenance scope $ NEnvPath_ span p) <$>
+    nvPathP (Provenance scope $ NEnvPathAnnF span p) <$>
       findEnvPath @t @f @m (coerce p)
 
   evalUnary op arg = do

src/Nix/Expr/Types/Annotated.hs

@@ -213,8 +213,8 @@ pattern NSetAnnF ann recur x = AnnF ann (NSet recur 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)
+pattern NEnvPathAnnF :: SrcSpan -> Path -> NExprLocF r
+pattern NEnvPathAnnF ann x = AnnF ann (NEnvPath x)
 
 pattern NUnary_ :: SrcSpan -> NUnaryOp -> r -> NExprLocF r
 pattern NUnary_ ann op x = AnnF ann (NUnary op 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, NLiteralPathAnnF, NEnvPath_, NUnary_, NBinary_, NSelect_, NHasAttr_, NAbs_, NLet_, NIf_, NWith_, NAssert_, NSynHole_ #-}
+{-# complete NConstantAnnF, NStrAnnF, NSymAnnF, NListAnnF, NSetAnnF, NLiteralPathAnnF, NEnvPathAnnF, NUnary_, NBinary_, NSelect_, NHasAttr_, NAbs_, NLet_, NIf_, NWith_, NAssert_, NSynHole_ #-}
 
 
 pattern PNConstant :: SrcSpan -> NAtom -> NExprLoc

src/Nix/Reduce.hs

@@ -173,7 +173,7 @@ reduce (NUnary_ uann op arg) =
 reduce (NBinary_ bann NApp fun arg) = fun >>= \case
   f@(Fix (NSymAnnF _ "import")) ->
     (\case
-        -- Fix (NEnvPath_     pann origPath) -> staticImport pann origPath
+        -- Fix (NEnvPathAnnF     pann origPath) -> staticImport pann origPath
       Fix (NLiteralPathAnnF pann origPath) -> staticImport pann origPath
       v -> pure $ Fix $ NBinary_ bann NApp f v
     ) =<< arg