Skip to content

Commit f4c82ba

Browse files
committed
Expr: Types: Annotated: m org
1 parent 965a5e0 commit f4c82ba

File tree

2 files changed

+46
-46
lines changed

2 files changed

+46
-46
lines changed

src/Nix/Expr/Types/Annotated.hs

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ data SrcSpan = SrcSpan
4848
{ spanBegin :: SourcePos
4949
, spanEnd :: SourcePos
5050
}
51-
deriving (Ord, Eq, Generic, Typeable, Data, Show, NFData, Hashable)
51+
deriving (Ord, Eq, Generic, Typeable, Data, Show, NFData, Hashable)
5252

5353
-- ** Instances
5454

@@ -247,54 +247,54 @@ pattern NSynHoleAnnF ann x = AnnF ann (NSynHole x)
247247
{-# complete NConstantAnnF, NStrAnnF, NSymAnnF, NListAnnF, NSetAnnF, NLiteralPathAnnF, NEnvPathAnnF, NUnaryAnnF, NBinaryAnnF, NSelectAnnF, NHasAttrAnnF, NAbsAnnF, NLetAnnF, NIfAnnF, NWithAnnF, NAssertAnnF, NSynHoleAnnF #-}
248248

249249

250-
pattern NConstantAnn :: SrcSpan -> NAtom -> NExprLoc
251-
pattern NConstantAnn ann x = Ann ann (NConstant x)
250+
pattern NConstantAnn :: SrcSpan -> NAtom -> NExprLoc
251+
pattern NConstantAnn ann x = Ann ann (NConstant x)
252252

253-
pattern NStrAnn :: SrcSpan -> NString NExprLoc -> NExprLoc
254-
pattern NStrAnn ann x = Ann ann (NStr x)
253+
pattern NStrAnn :: SrcSpan -> NString NExprLoc -> NExprLoc
254+
pattern NStrAnn ann x = Ann ann (NStr x)
255255

256-
pattern NSymAnn :: SrcSpan -> VarName -> NExprLoc
257-
pattern NSymAnn ann x = Ann ann (NSym x)
256+
pattern NSymAnn :: SrcSpan -> VarName -> NExprLoc
257+
pattern NSymAnn ann x = Ann ann (NSym x)
258258

259-
pattern NListAnn :: SrcSpan -> [NExprLoc] -> NExprLoc
260-
pattern NListAnn ann x = Ann ann (NList x)
259+
pattern NListAnn :: SrcSpan -> [NExprLoc] -> NExprLoc
260+
pattern NListAnn ann x = Ann ann (NList x)
261261

262-
pattern NSetAnn :: SrcSpan -> Recursivity -> [Binding NExprLoc] -> NExprLoc
263-
pattern NSetAnn ann recur x = Ann ann (NSet recur x)
262+
pattern NSetAnn :: SrcSpan -> Recursivity -> [Binding NExprLoc] -> NExprLoc
263+
pattern NSetAnn ann rec x = Ann ann (NSet rec x)
264264

265265
pattern NLiteralPathAnn :: SrcSpan -> Path -> NExprLoc
266-
pattern NLiteralPathAnn ann x = Ann ann (NLiteralPath x)
266+
pattern NLiteralPathAnn ann x = Ann ann (NLiteralPath x)
267267

268-
pattern NEnvPathAnn :: SrcSpan -> Path -> NExprLoc
269-
pattern NEnvPathAnn ann x = Ann ann (NEnvPath x)
268+
pattern NEnvPathAnn :: SrcSpan -> Path -> NExprLoc
269+
pattern NEnvPathAnn ann x = Ann ann (NEnvPath x)
270270

271-
pattern NUnaryAnn :: SrcSpan -> NUnaryOp -> NExprLoc -> NExprLoc
272-
pattern NUnaryAnn ann op x = Ann ann (NUnary op x)
271+
pattern NUnaryAnn :: SrcSpan -> NUnaryOp -> NExprLoc -> NExprLoc
272+
pattern NUnaryAnn ann op x = Ann ann (NUnary op x)
273273

274-
pattern NBinaryAnn :: SrcSpan -> NBinaryOp -> NExprLoc -> NExprLoc -> NExprLoc
275-
pattern NBinaryAnn ann op x y = Ann ann (NBinary op x y)
274+
pattern NBinaryAnn :: SrcSpan -> NBinaryOp -> NExprLoc -> NExprLoc -> NExprLoc
275+
pattern NBinaryAnn ann op x y = Ann ann (NBinary op x y)
276276

277-
pattern NSelectAnn :: SrcSpan -> Maybe NExprLoc -> NExprLoc -> NAttrPath NExprLoc -> NExprLoc
278-
pattern NSelectAnn ann v x p = Ann ann (NSelect v x p)
277+
pattern NSelectAnn :: SrcSpan -> Maybe NExprLoc -> NExprLoc -> NAttrPath NExprLoc -> NExprLoc
278+
pattern NSelectAnn ann v x p = Ann ann (NSelect v x p)
279279

280-
pattern NHasAttrAnn :: SrcSpan -> NExprLoc -> NAttrPath NExprLoc -> NExprLoc
281-
pattern NHasAttrAnn ann x p = Ann ann (NHasAttr x p)
280+
pattern NHasAttrAnn :: SrcSpan -> NExprLoc -> NAttrPath NExprLoc -> NExprLoc
281+
pattern NHasAttrAnn ann x p = Ann ann (NHasAttr x p)
282282

283-
pattern NAbsAnn :: SrcSpan -> Params NExprLoc -> NExprLoc -> NExprLoc
284-
pattern NAbsAnn ann x b = Ann ann (NAbs x b)
283+
pattern NAbsAnn :: SrcSpan -> Params NExprLoc -> NExprLoc -> NExprLoc
284+
pattern NAbsAnn ann x b = Ann ann (NAbs x b)
285285

286-
pattern NLetAnn :: SrcSpan -> [Binding NExprLoc] -> NExprLoc -> NExprLoc
287-
pattern NLetAnn ann x b = Ann ann (NLet x b)
286+
pattern NLetAnn :: SrcSpan -> [Binding NExprLoc] -> NExprLoc -> NExprLoc
287+
pattern NLetAnn ann x b = Ann ann (NLet x b)
288288

289-
pattern NIfAnn :: SrcSpan -> NExprLoc -> NExprLoc -> NExprLoc -> NExprLoc
290-
pattern NIfAnn ann c t e = Ann ann (NIf c t e)
289+
pattern NIfAnn :: SrcSpan -> NExprLoc -> NExprLoc -> NExprLoc -> NExprLoc
290+
pattern NIfAnn ann c t e = Ann ann (NIf c t e)
291291

292-
pattern NWithAnn :: SrcSpan -> NExprLoc -> NExprLoc -> NExprLoc
293-
pattern NWithAnn ann x y = Ann ann (NWith x y)
292+
pattern NWithAnn :: SrcSpan -> NExprLoc -> NExprLoc -> NExprLoc
293+
pattern NWithAnn ann x y = Ann ann (NWith x y)
294294

295-
pattern NAssertAnn :: SrcSpan -> NExprLoc -> NExprLoc -> NExprLoc
296-
pattern NAssertAnn ann x y = Ann ann (NAssert x y)
295+
pattern NAssertAnn :: SrcSpan -> NExprLoc -> NExprLoc -> NExprLoc
296+
pattern NAssertAnn ann x y = Ann ann (NAssert x y)
297297

298-
pattern NSynHoleAnn :: SrcSpan -> VarName -> NExprLoc
299-
pattern NSynHoleAnn ann x = Ann ann (NSynHole x)
298+
pattern NSynHoleAnn :: SrcSpan -> VarName -> NExprLoc
299+
pattern NSynHoleAnn ann x = Ann ann (NSynHole x)
300300
{-# complete NConstantAnn, NStrAnn, NSymAnn, NListAnn, NSetAnn, NLiteralPathAnn, NEnvPathAnn, NUnaryAnn, NBinaryAnn, NSelectAnn, NHasAttrAnn, NAbsAnn, NLetAnn, NIfAnn, NWithAnn, NAssertAnn, NSynHoleAnn #-}

src/Nix/Value.hs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ pattern NVBuiltin name f <- Free (NVBuiltin' name f)
693693
-- * @TStringContext@
694694

695695
data TStringContext = NoContext | HasContext
696-
deriving Show
696+
deriving Show
697697

698698
instance Semigroup TStringContext where
699699
(<>) NoContext NoContext = NoContext
@@ -706,17 +706,17 @@ instance Monoid TStringContext where
706706
-- * @ValueType@
707707

708708
data ValueType
709-
= TInt
710-
| TFloat
711-
| TBool
712-
| TNull
713-
| TString TStringContext
714-
| TList
715-
| TSet
716-
| TClosure
717-
| TPath
718-
| TBuiltin
719-
deriving Show
709+
= TInt
710+
| TFloat
711+
| TBool
712+
| TNull
713+
| TString TStringContext
714+
| TList
715+
| TSet
716+
| TClosure
717+
| TPath
718+
| TBuiltin
719+
deriving Show
720720

721721

722722
-- | Determine type of a value

0 commit comments

Comments
 (0)