Eval: add fun evalContent

Author: Anton-Latukha

ChangeLog.md

@@ -1,6 +1,14 @@
 
 # ChangeLog
 
+## [(diff)](https://github.com/haskell-nix/hnix/compare/0.13.1...master#files_bucket) WIP
+
+* Additional:
+
+  * `Nix.Eval`:
+    * added fun
+      * `evalContent`
+
 ### [(diff)](https://github.com/haskell-nix/hnix/compare/0.13.0.1...0.13.1#files_bucket) 0.13.1 (2021-05-22)
   * [(link)](https://github.com/haskell-nix/hnix/pull/936/files) `Nix.Parser`: `annotateLocation`: Fix source location preservation.
   * [(link)](https://github.com/haskell-nix/hnix/pull/934/files) Require Cabal dependency `relude` `>= 1.0`: since imports & Cabal file got cleaned-up & that clean-up depends on `relude` reimports introduced in aforementioned version.

main/Main.hs

@@ -188,10 +188,10 @@ main =
                               ((k, ) <$> forceEntry path nv)
                               descend
                     )
-                    (\ v -> pure (k, pure (Free v)))
+                    (\ v -> pure (k, pure $ Free v))
                     nv
                 )
-                (sortWith fst (M.toList s))
+                (sortWith fst $ M.toList s)
             traverse_
               (\ (k, mv) ->
                 do
@@ -256,7 +256,7 @@ main =
         Nix.withNixContext
           mp
           (Nix.reducingEvalExpr
-            (Eval.eval . annotated . getCompose)
+            Eval.evalContent
             mp
             x
           )
@@ -272,7 +272,7 @@ main =
       liftIO $
         do
           putStrLn $ "Wrote winnowed expression tree to " <> path
-          writeFile path $ show $ prettyNix (stripAnnotation expr')
+          writeFile path $ show $ prettyNix $ stripAnnotation expr'
       either
         throwM
         pure

src/Nix.hs

@@ -81,7 +81,7 @@ nixEvalExprLoc mpath =
   nixEval
     mpath
     (Eval.addStackFrames . Eval.addSourcePositions)
-    (Eval.eval . annotated . getCompose)
+    Eval.evalContent
 
 -- | Evaluate a nix expression with tracing in the default context. Note that
 --   this function doesn't do any tracing itself, but 'evalExprLoc' will be

src/Nix/Eval.hs

@@ -556,4 +556,11 @@ framedEvalExprLoc
   => NExprLoc
   -> m v
 framedEvalExprLoc =
-  adi (eval . annotated . getCompose) $ addStackFrames @v . addSourcePositions
+  adi evalContent $ addStackFrames @v . addSourcePositions
+
+-- | Takes annotated expression. Strip from annotation. Evaluate.
+evalContent
+  :: MonadNixEval v m
+  => Compose (Ann ann) NExprF (m v)
+  -> m v
+evalContent = eval . annotated . getCompose

src/Nix/Exec.hs

@@ -526,18 +526,16 @@ evalExprLoc expr =
     let
       pTracedAdi =
         bool
-          (adi phi addMetaInfo)
+          (adi Eval.evalContent addMetaInfo)
           (join . (`runReaderT` (0 :: Int)) .
             adi
-              (addTracing phi)
+              (addTracing Eval.evalContent)
               (raise addMetaInfo)
           )
           (tracing opts)
     pTracedAdi expr
 
  where
-  phi = Eval.eval . annotated . getCompose
-
   addMetaInfo :: (Fix NExprLocF -> m a) -> Fix NExprLocF -> m a
   addMetaInfo = addStackFrames @(NValue t f m) . addSourcePositions
 

src/Nix/Lint.hs

@@ -485,7 +485,7 @@ lint opts expr =
       pushScopes
         basis
         (adi
-          (Eval.eval . annotated . getCompose)
+          Eval.evalContent
           Eval.addSourcePositions
           expr
         )