String: NixString: rename accessors

Author: Anton-Latukha

src/Nix/Builtins.hs

@@ -1068,7 +1068,7 @@ replaceStringsNix tfrom tto ts =
           updatedCtx     = ctx <> replacementCtx
 
           replacement    = Builder.fromText $ ignoreContext replacementNS
-          replacementCtx = getContext replacementNS
+          replacementCtx = getStringContext replacementNS
 
           -- The bug modifies the content => bug demands `pass` to be a real function =>
           -- `go` calls `pass` function && `pass` calls `go` function
@@ -1079,7 +1079,7 @@ replaceStringsNix tfrom tto ts =
               (\(c, i) -> go updatedCtx i $ output <> Builder.singleton c) -- If there are chars - pass one char & continue
               (Text.uncons input)  -- chip first char
 
-    toValue $ go (getContext string) (ignoreContext string) mempty
+    toValue $ go (getStringContext string) (ignoreContext string) mempty
 
 removeAttrsNix
   :: forall e t f m
@@ -1702,7 +1702,7 @@ getContextNix
 getContextNix =
   \case
     (NVStr ns) ->
-      mkNVSet mempty <$> traverseToValue (getNixLikeContext $ toNixLikeContext $ getContext ns)
+      mkNVSet mempty <$> traverseToValue (getNixLikeContext $ toNixLikeContext $ getStringContext ns)
     x -> throwError $ ErrorCall $ "Invalid type for builtins.getContext: " <> show x
   <=< demand
 
@@ -1769,7 +1769,7 @@ appendContextNix tx ty =
                       newContextValues
                       $ getNixLikeContext $
                           toNixLikeContext $
-                            getContext ns
+                            getStringContext ns
                 )
                 $ ignoreContext ns
 

src/Nix/String.hs

@@ -2,7 +2,7 @@
 
 module Nix.String
   ( NixString
-  , getContext
+  , getStringContext
   , mkNixString
   , StringContext(..)
   , ContextFlavor(..)
@@ -103,11 +103,10 @@ type WithStringContext = WithStringContextT Identity
 
 -- ** NixString
 
---  2021-07-18: NOTE: It should be Context -> Contents.
 data NixString =
   NixString
-    { nsContext :: !(S.HashSet StringContext)
-    , nsContents :: !Text
+    { getStringContext :: !(S.HashSet StringContext)
+    , getStringContent :: !Text
     }
   deriving (Eq, Ord, Show, Generic)
 
@@ -148,9 +147,6 @@ hasContext (NixString c _) = not $ null c
 
 -- ** Getters
 
-getContext :: NixString -> S.HashSet StringContext
-getContext = nsContext
-
 fromNixLikeContext :: NixLikeContext -> S.HashSet StringContext
 fromNixLikeContext =
   S.fromList . (uncurry toStringContexts <=< M.toList . getNixLikeContext)
@@ -258,18 +254,9 @@ intercalateNixString :: NixString -> [NixString] -> NixString
 intercalateNixString _   []   = mempty
 intercalateNixString _   [ns] = ns
 intercalateNixString sep nss  =
-  uncurry NixString $ mapPair intertwine unpackNss
- where
-
-  intertwine :: ([HashSet StringContext] -> HashSet StringContext, [Text] -> Text)
-  intertwine =
-    ( S.unions . (:)   (nsContext  sep)
-    , Text.intercalate (nsContents sep)
-    )
-
-  unpackNss :: ([HashSet StringContext], [Text])
-  unpackNss = (fnss nsContext, fnss nsContents)
-   where
-    fnss :: (NixString -> b) -> [b]
-    fnss = (`fmap` nss) -- do once
-
+  uncurry NixString $
+    mapPair
+      (S.unions . (one (getStringContext  sep) <>) . (getStringContext <$>)
+      , Text.intercalate (getStringContent sep) . (getStringContent <$>)
+      )
+      $ dup nss