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

Author: Anton-Latukha

src/Nix/Exec.hs

@@ -268,7 +268,7 @@ instance MonadNix e t f m => MonadEval (NValue t f m) m where
   evalApp f x = do
     scope <- currentScopes
     span  <- currentPos
-    addProvenance (Provenance scope $ NBinary_ span NApp (pure f) Nothing) <$>
+    addProvenance (Provenance scope $ NBinaryAnnF span NApp (pure f) Nothing) <$>
       (callFunc f =<< defer x)
 
   evalAbs p k = do
@@ -376,7 +376,7 @@ execBinaryOp scope span op lval rarg =
   toBoolOp r b =
     pure $
       nvConstantP
-        (Provenance scope $ NBinary_ span op (pure lval) r)
+        (Provenance scope $ NBinaryAnnF span op (pure lval) r)
         (NBool b)
 
 execBinaryOpForced
@@ -444,7 +444,7 @@ execBinaryOpForced scope span op lval rval = case op of
 
  where
   prov :: Provenance m (NValue t f m)
-  prov = Provenance scope $ NBinary_ span op (pure lval) (pure rval)
+  prov = Provenance scope $ NBinaryAnnF span op (pure lval) (pure rval)
 
   toBool = pure . nvConstantP prov . NBool
   compare :: (forall a. Ord a => a -> a -> Bool) -> m (NValue t f m)

src/Nix/Expr/Types/Annotated.hs

@@ -219,8 +219,8 @@ pattern NEnvPathAnnF ann x = AnnF ann (NEnvPath x)
 pattern NUnaryAnnF :: SrcSpan -> NUnaryOp -> r -> NExprLocF r
 pattern NUnaryAnnF ann op x = AnnF ann (NUnary op x)
 
-pattern NBinary_ :: SrcSpan -> NBinaryOp -> r -> r -> NExprLocF r
-pattern NBinary_ ann op x y = AnnF ann (NBinary op x y)
+pattern NBinaryAnnF :: SrcSpan -> NBinaryOp -> r -> r -> NExprLocF r
+pattern NBinaryAnnF ann op x y = AnnF ann (NBinary op x y)
 
 pattern NSelect_ :: SrcSpan ->  Maybe r -> r -> NAttrPath r -> NExprLocF r
 pattern NSelect_ ann v x p = AnnF ann (NSelect v x p)
@@ -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, NEnvPathAnnF, NUnaryAnnF, NBinary_, NSelect_, NHasAttr_, NAbs_, NLet_, NIf_, NWith_, NAssert_, NSynHole_ #-}
+{-# complete NConstantAnnF, NStrAnnF, NSymAnnF, NListAnnF, NSetAnnF, NLiteralPathAnnF, NEnvPathAnnF, NUnaryAnnF, NBinaryAnnF, NSelect_, NHasAttr_, NAbs_, NLet_, NIf_, NWith_, NAssert_, NSynHole_ #-}
 
 
 pattern PNConstant :: SrcSpan -> NAtom -> NExprLoc

src/Nix/Reduce.hs

@@ -170,12 +170,12 @@ reduce (NUnaryAnnF uann op arg) =
 --
 --     * Reduce a lambda function by adding its name to the local
 --       scope and recursively reducing its body.
-reduce (NBinary_ bann NApp fun arg) = fun >>= \case
+reduce (NBinaryAnnF bann NApp fun arg) = fun >>= \case
   f@(Fix (NSymAnnF _ "import")) ->
     (\case
         -- Fix (NEnvPathAnnF     pann origPath) -> staticImport pann origPath
       Fix (NLiteralPathAnnF pann origPath) -> staticImport pann origPath
-      v -> pure $ Fix $ NBinary_ bann NApp f v
+      v -> pure $ Fix $ NBinaryAnnF bann NApp f v
     ) =<< arg
 
   Fix (NAbs_ _ (Param name) body) ->
@@ -185,17 +185,17 @@ reduce (NBinary_ bann NApp fun arg) = fun >>= \case
         (coerce $ HM.singleton name x)
         (foldFix reduce body)
 
-  f -> Fix . NBinary_ bann NApp f <$> arg
+  f -> Fix . NBinaryAnnF bann NApp f <$> arg
 
 -- | Reduce an integer addition to its result.
-reduce (NBinary_ bann op larg rarg) =
+reduce (NBinaryAnnF bann op larg rarg) =
   do
     lval <- larg
     rval <- rarg
     pure $ Fix $
       case (op, lval, rval) of
         (NPlus, Fix (NConstantAnnF ann (NInt x)), Fix (NConstantAnnF _ (NInt y))) -> NConstantAnnF ann  $ NInt $ x + y
-        _                                                                   -> NBinary_   bann op lval rval
+        _                                                                   -> NBinaryAnnF   bann op lval rval
 
 -- | Reduce a select on a Set by substituting the set to the selected value.
 --

tests/ParserTests.hs

@@ -651,11 +651,11 @@ case_simpleLoc =
         [ NamedVar
             (StaticKey "foo" :| [])
             (Fix
-              (NBinary_
+              (NBinaryAnnF
                 (mkSpan 2 7 3 15)
                 NApp
                 (Fix
-                  (NBinary_
+                  (NBinaryAnnF
                     (mkSpan 2 7 3 9)
                     NApp
                     (Fix (NSymAnnF (mkSpan 2 7 2 10) "bar"))