{Expr.Types.Annotated, Eval}: m use Ann{F,E}

Author: Anton-Latukha

src/Nix/Eval.hs

@@ -562,7 +562,7 @@ framedEvalExprLoc =
 -- | Takes annotated expression. Strip from annotation. Evaluate.
 evalContent
   :: MonadNixEval v m
-  => Compose (Ann ann) NExprF (m v)
+  => AnnF ann NExprF (m v)
   -> m v
 evalContent = eval . annotated . getCompose
 

src/Nix/Expr/Types/Annotated.hs

@@ -140,7 +140,7 @@ instance Binary NExprLoc
 -- * Other
 
 stripAnnotation :: Functor f => Fix (AnnF ann f) -> Fix f
-stripAnnotation = unfoldFix (annotated . getCompose . unFix)
+stripAnnotation = unfoldFix (stripAnn . unFix)
 
 stripAnn :: AnnF ann f r -> f r
 stripAnn = annotated . getCompose
@@ -181,7 +181,7 @@ deltaInfo :: SourcePos -> (Text, Int, Int)
 deltaInfo (SourcePos fp l c) = (toText fp, unPos l, unPos c)
 
 nNull :: NExprLoc
-nNull = Fix $ Compose $ Ann nullSpan $ NConstant NNull
+nNull = AnnE nullSpan $ NConstant NNull
 {-# inline nNull #-}
 
 nullSpan :: SrcSpan