diff options
author | Tom Smeding <tom@tomsmeding.com> | 2025-05-13 19:58:12 +0200 |
---|---|---|
committer | Tom Smeding <tom@tomsmeding.com> | 2025-05-13 19:58:12 +0200 |
commit | bda0d3e9c1752d35488665ec19d39904f0dc4b49 (patch) | |
tree | 9c7035ccfe18a45a789060371606cad045603618 /src/Data/Array/Mixed | |
parent | 0c993d875a7cb9bace8aea1ef6def200de6b7d51 (diff) |
Revert some stylistic changes
https://x.com/comerijn/status/1257804634833420292
Diffstat (limited to 'src/Data/Array/Mixed')
-rw-r--r-- | src/Data/Array/Mixed/Lemmas.hs | 2 | ||||
-rw-r--r-- | src/Data/Array/Mixed/Shape.hs | 6 | ||||
-rw-r--r-- | src/Data/Array/Mixed/Types.hs | 2 | ||||
-rw-r--r-- | src/Data/Array/Mixed/XArray.hs | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/Data/Array/Mixed/Lemmas.hs b/src/Data/Array/Mixed/Lemmas.hs index ec7e7bd..560f762 100644 --- a/src/Data/Array/Mixed/Lemmas.hs +++ b/src/Data/Array/Mixed/Lemmas.hs @@ -30,7 +30,7 @@ subst2 Refl = Refl -- ** Nat -lemLeqSuccSucc :: (k + 1 <= n) => Proxy k -> Proxy n -> (k <=? n - 1) :~: True +lemLeqSuccSucc :: k + 1 <= n => Proxy k -> Proxy n -> (k <=? n - 1) :~: True lemLeqSuccSucc _ _ = unsafeCoerceRefl lemLeqPlus :: n <= m => Proxy n -> Proxy m -> Proxy k -> (n <=? (m + k)) :~: 'True diff --git a/src/Data/Array/Mixed/Shape.hs b/src/Data/Array/Mixed/Shape.hs index 3f1f58e..eb8434f 100644 --- a/src/Data/Array/Mixed/Shape.hs +++ b/src/Data/Array/Mixed/Shape.hs @@ -22,14 +22,14 @@ {-# OPTIONS_GHC -fplugin GHC.TypeLits.KnownNat.Solver #-} module Data.Array.Mixed.Shape where -import Control.DeepSeq (NFData (..)) +import Control.DeepSeq (NFData(..)) import Data.Bifunctor (first) import Data.Coerce import Data.Foldable qualified as Foldable import Data.Functor.Const import Data.Functor.Product import Data.Kind (Constraint, Type) -import Data.Monoid (Sum (..)) +import Data.Monoid (Sum(..)) import Data.Proxy import Data.Type.Equality import GHC.Exts (withDict) @@ -557,7 +557,7 @@ instance (KnownNat n, KnownShX sh) => KnownShX (Just n : sh) where knownShX = SK instance KnownShX sh => KnownShX (Nothing : sh) where knownShX = SUnknown () :!% knownShX withKnownShX :: forall sh r. StaticShX sh -> (KnownShX sh => r) -> r -withKnownShX = withDict @(KnownShX sh) +withKnownShX k = withDict @(KnownShX sh) k -- * Flattening diff --git a/src/Data/Array/Mixed/Types.hs b/src/Data/Array/Mixed/Types.hs index e97690f..3f5b1e7 100644 --- a/src/Data/Array/Mixed/Types.hs +++ b/src/Data/Array/Mixed/Types.hs @@ -54,7 +54,7 @@ sameNat' :: SNat n -> SNat m -> Maybe (n :~: m) sameNat' n@SNat m@SNat = sameNat n m pattern SZ :: () => (n ~ 0) => SNat n -pattern SZ <- (\sn -> testEquality sn (SNat @0) -> Just Refl) +pattern SZ <- ((\sn -> testEquality sn (SNat @0)) -> Just Refl) where SZ = SNat pattern SS :: forall np1. () => forall n. (n + 1 ~ np1) => SNat n -> SNat np1 diff --git a/src/Data/Array/Mixed/XArray.hs b/src/Data/Array/Mixed/XArray.hs index 681b8db..cb790e1 100644 --- a/src/Data/Array/Mixed/XArray.hs +++ b/src/Data/Array/Mixed/XArray.hs @@ -168,7 +168,7 @@ rerank :: forall sh sh1 sh2 a b. rerank ssh ssh1 ssh2 f xarr@(XArray arr) | Dict <- lemKnownNatRankSSX (ssxAppend ssh ssh2) = let (sh, _) = shxSplitApp (Proxy @sh1) ssh (shape (ssxAppend ssh ssh1) xarr) - in if elem 0 (shxToList sh) + in if 0 `elem` shxToList sh then XArray (S.fromList (shxToList (shxAppend sh (shxCompleteZeros ssh2))) []) else case () of () | Dict <- lemKnownNatRankSSX ssh @@ -195,7 +195,7 @@ rerank2 :: forall sh sh1 sh2 a b c. rerank2 ssh ssh1 ssh2 f xarr1@(XArray arr1) (XArray arr2) | Dict <- lemKnownNatRankSSX (ssxAppend ssh ssh2) = let (sh, _) = shxSplitApp (Proxy @sh1) ssh (shape (ssxAppend ssh ssh1) xarr1) - in if elem 0 (shxToList sh) + in if 0 `elem` shxToList sh then XArray (S.fromList (shxToList (shxAppend sh (shxCompleteZeros ssh2))) []) else case () of () | Dict <- lemKnownNatRankSSX ssh @@ -269,7 +269,7 @@ sumInner ssh ssh' arr in go $ transpose2 ssh'F ssh $ reshapePartial ssh' ssh sh'F $ - transpose2 ssh ssh' + transpose2 ssh ssh' $ arr sumOuter :: forall sh sh' a. (Storable a, NumElt a) @@ -280,7 +280,7 @@ sumOuter ssh ssh' arr shF = shxFlatten sh :$% ZSX in sumInner ssh' (ssxFromShape shF) $ transpose2 (ssxFromShape shF) ssh' $ - reshapePartial ssh ssh' shF + reshapePartial ssh ssh' shF $ arr fromListOuter :: forall n sh a. Storable a |