Parser: work on NAppDef & OperatorInfo related code

.hlint.yaml

@@ -14,6 +14,8 @@
   - "-XTupleSections"
   - "-XTypeApplications"
   - "-XViewPatterns"
+- ignore:
+    name: Use unless
 - ignore:
     name: Use head
 - ignore:
@@ -125,19 +127,19 @@
     note: Applying this hint would mean that some actions that were being executed previously would no longer be executed.
     rhs: orM s
 - hint:
-    lhs: "fmap and (mapM f s)"
+    lhs: "fmap and (traversable f s)"
     note: Applying this hint would mean that some actions that were being executed previously would no longer be executed.
     rhs: allM f s
 - hint:
-    lhs: "and <$> mapM f s"
+    lhs: "and <$> traversable f s"
     note: Applying this hint would mean that some actions that were being executed previously would no longer be executed.
     rhs: allM f s
 - hint:
-    lhs: "fmap or (mapM f s)"
+    lhs: "fmap or (traversable f s)"
     note: Applying this hint would mean that some actions that were being executed previously would no longer be executed.
     rhs: anyM f s
 - hint:
-    lhs: "or <$> mapM f s"
+    lhs: "or <$> traversable f s"
     note: Applying this hint would mean that some actions that were being executed previously would no longer be executed.
     rhs: anyM f s
 - warn:
@@ -180,9 +182,6 @@
     lhs: forever
     note: "'forever' is loosely typed and may hide errors"
     rhs: infinitely
-- warn:
-    lhs: "whenM (not <$> x)"
-    rhs: unlessM x
 - warn:
     lhs: "unlessM (not <$> x)"
     rhs: whenM x
@@ -950,11 +949,6 @@
     name: "Use 'guard' from Relude"
     note: "'guard' is already exported from Relude"
     rhs: guard
-- warn:
-    lhs: Control.Monad.unless
-    name: "Use 'unless' from Relude"
-    note: "'unless' is already exported from Relude"
-    rhs: unless
 - warn:
     lhs: Control.Monad.when
     name: "Use 'when' from Relude"
@@ -1141,15 +1135,14 @@
     note: "'foldl'' is already exported from Relude"
     rhs: "foldl'"
 - warn:
-    lhs: Data.Foldable.forM_
-    name: "Use 'forM_' from Relude"
-    note: "'forM_' is already exported from Relude"
-    rhs: forM_
+    lhs: forM_ b a
+    name: "Use 'traverse_'"
+    rhs: traverse_ a b
 - warn:
-    lhs: Data.Foldable.for_
-    name: "Use 'for_' from Relude"
+    lhs: for_ b a
+    name: "Use 'traverse_'"
     note: "'for_' is already exported from Relude"
-    rhs: for_
+    rhs: traverse a b
 - warn:
     lhs: Data.Foldable.sequenceA_
     name: "Use 'sequenceA_' from Relude"
@@ -1161,15 +1154,9 @@
     note: "'toList' is already exported from Relude"
     rhs: toList
 - warn:
-    lhs: Data.Foldable.traverse_
-    name: "Use 'traverse_' from Relude"
-    note: "'traverse_' is already exported from Relude"
-    rhs: traverse_
-- warn:
-    lhs: Data.Traversable.forM
-    name: "Use 'forM' from Relude"
-    note: "'forM' is already exported from Relude"
-    rhs: forM
+    lhs: forM b a
+    name: "Use 'traverse'"
+    rhs: traverse a b
 - warn:
     lhs: Data.Traversable.mapAccumL
     name: "Use 'mapAccumL' from Relude"
@@ -2747,3 +2734,13 @@
     lhs: "map"
     note: "Use `fmap`"
     rhs: fmap
+
+- hint:
+    lhs: "mapM"
+    note: "Use `traverse`"
+    rhs: traverse
+
+- hint:
+    lhs: "unless b"
+    note: "Use `when not` as it reads intuitively."
+    rhs: when (not b)

ChangeLog.md

@@ -11,6 +11,22 @@
     * [(link)](https://github.com/haskell-nix/hnix/pull/1046/files) Unify builder `mkNV*` and `NV*` patterns by bidirectional synonyms, a lot of builders `mkNV*` are removed, and merged to `NV*`. e.g. instead of builder `mkNVList`, `NVList` should be used.
     * [(link)](https://github.com/haskell-nix/hnix/pull/1046/files) Constraint `NVConstraint f = (Comonad f, Applicative f)` was introduced, in order to unify builder `mkNV*` and `NV*` patterns.
 
+  * `Nix.Parser`:
+    * [(link)](https://github.com/haskell-nix/hnix/pull/1047/files) rm `OperatorInfo`, using `NOperatorDef`. Number of functions changed signatures accordingly:
+    * In `Nix.Pretty`:
+      * `NixDoc ann`
+      * `mkNixDoc`
+      * `selectOp`
+      * `hasAttrOp`
+      * `precedenceWrap`
+      * `wrapPath`
+    * In `Nix.Parser`:
+      * rm `get{App,Unary,Binary,Special}Operator`, currely `NOp` class instances are used instead.
+
+  * `Nix.Pretty`:
+    * [(link)](https://github.com/haskell-nix/hnix/pull/1047/files) rm `appOp`, instead use `appOpDef`.
+    * [(link)](https://github.com/haskell-nix/hnix/pull/1047/files) `precedenceWrap` behaviour is changed (to be literal to the name), the old behaviour is now a `wrap` function.
+
 ## [(diff)](https://github.com/haskell-nix/hnix/compare/0.15.0...0.16.0#files_bucket) 0.16.0
 
 On update problems, please reach out to us. For support refere to: https://github.com/haskell-nix/hnix/issues/984

hnix.cabal

@@ -404,6 +404,7 @@ library
     , deriving-compat >= 0.3 && < 0.7
     , directory >= 1.3.1 && < 1.4
     , exceptions >= 0.10.0 && < 0.11
+    , extra >= 1.7 && < 1.8
     , filepath >= 1.4.2 && < 1.5
     , free >= 5.1 && < 5.2
     , gitrev >= 1.1.0 && < 1.4

main/Repl.hs

@@ -575,16 +575,19 @@ help :: (MonadNix e t f m, MonadIO m)
      -> Repl e t f m ()
 help hs _ = do
   liftIO $ putStrLn "Available commands:\n"
-  for_ hs $ \h ->
-    liftIO .
-      Text.putStrLn .
-        Prettyprinter.renderStrict .
-          Prettyprinter.layoutPretty Prettyprinter.defaultLayoutOptions $
-            ":"
-            <> Prettyprinter.pretty (helpOptionName h) <> space
-            <> helpOptionSyntax h
-            <> Prettyprinter.line
-            <> Prettyprinter.indent 4 (helpOptionDoc h)
+  traverse_
+    (\h ->
+      liftIO .
+        Text.putStrLn .
+          Prettyprinter.renderStrict .
+            Prettyprinter.layoutPretty Prettyprinter.defaultLayoutOptions $
+              ":"
+              <> Prettyprinter.pretty (helpOptionName h) <> space
+              <> helpOptionSyntax h
+              <> Prettyprinter.line
+              <> Prettyprinter.indent 4 (helpOptionDoc h)
+    )
+    hs
 
 options
   :: (MonadNix e t f m, MonadIO m)

src/Nix/Builtins.hs

@@ -357,7 +357,7 @@ absolutePathFromValue =
         let
           path = coerce . toString $ ignoreContext ns
 
-        unless (isAbsolute path) $ throwError $ ErrorCall $ "string " <> show path <> " doesn't represent an absolute path"
+        when (not (isAbsolute path)) $ throwError $ ErrorCall $ "string " <> show path <> " doesn't represent an absolute path"
         pure path
 
     NVPath path -> pure path

src/Nix/Exec.hs

@@ -320,11 +320,11 @@ callFunc fun arg =
 
     fun' <- demand fun
     case fun' of
-      NVClosure _params f -> f arg
       NVBuiltin name f    ->
         do
           span <- askSpan
           withFrame Info ((Calling @m @(NValue t f m)) name span) $ f arg -- Is this cool?
+      NVClosure _params f -> f arg
       (NVSet _ m) | Just f <- M.lookup "__functor" m ->
         (`callFunc` arg) =<< (`callFunc` fun') f
       _x -> throwError $ ErrorCall $ "Attempt to call non-function: " <> show _x

src/Nix/Expr/Shorthands.hs

@@ -215,7 +215,7 @@ mkIf e1 e2 = Fix . NIf e1 e2
 mkFunction :: Params NExpr -> NExpr -> NExpr
 mkFunction params = Fix . NAbs params
 
--- | General dot-reference with optional alternative if the jey does not exist.
+-- | General dot-reference with optional alternative if the key does not exist.
 --  @since 0.15.0
 getRefOrDefault :: Maybe NExpr -> NExpr -> Text -> NExpr
 getRefOrDefault alt obj = Fix . NSelect alt obj . mkSelector

src/Nix/Expr/Types.hs

@@ -594,15 +594,15 @@ data NExprF r
   -- environment variable. For example, @<nixpkgs/pkgs>@.
   --
   -- > NEnvPath "x"                                ~  <x>
+  | NApp !r !r
+  -- ^ Functional application (aka F.A., apply a function to an argument).
+  --
+  -- > NApp f x  ~  f x
   | NUnary !NUnaryOp !r
   -- ^ Application of a unary operator to an expression.
   --
   -- > NUnary NNeg x                               ~  - x
   -- > NUnary NNot x                               ~  ! x
-  | NApp !r !r
-  -- ^ Functional application (aka F.A., apply a function to an argument).
-  --
-  -- > NApp f x  ~  f x
   | NBinary !NBinaryOp !r !r
   -- ^ Application of a binary operator to two expressions.
   --