wgaffa/budget - Change DORURVCGBXEF3DMKG6PFOKVPCO6I7ZZKUGRQP5VO5MBAG6GEE4MAC

Big changes to Rules and SomeBudget

Created by wgaffa on June 8, 2023

DORURVCGBXEF3DMKG6PFOKVPCO6I7ZZKUGRQP5VO5MBAG6GEE4MAC

Dependencies

In channels

main

Change contents

Insertion in lib/Rule.hs at line 2 [3.32]

[3.60]

{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}

Insertion in lib/Rule.hs at line 5 [3.32]

[3.83]

{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE PolyKinds #-}
{-# LANGUAGE RankNTypes #-}

Deletion in lib/Rule.hs at line 11 [3.32]

B:BD[3.154] → [2.0:114]

{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FunctionalDependencies #-}

Insertion in lib/Rule.hs at line 25 [3.32]

[3.249]

[3.267]

    toSNats,
    -- * Utility
    withKnownRule,

Insertion in lib/Rule.hs at line 33 [3.32]

[3.295]

import Unsafe.Coerce (unsafeCoerce)
import GHC.Exts (withDict)

Replacement in lib/Rule.hs at line 41 [3.32]

B:BD[3.429] → [3.429:559]

        forall a b c proxy.
        (KnownNat a, KnownNat b, KnownNat c) =>
        proxy a
        -> proxy b
        -> proxy c

[3.429]

[3.559]

        forall a b c.
        -- (KnownNat a, KnownNat b, KnownNat c) =>
        SNat a
        -> SNat b
        -> SNat c

Replacement in lib/Rule.hs at line 66 [3.32]

B:BD[3.959] → [3.959:1016]

fromRule (MkRule a b c) = (natVal a, natVal b, natVal c)

[3.959]

[3.1016]

fromRule (MkRule a b c) = (fromSNat a, fromSNat b, fromSNat c)

Replacement in lib/Rule.hs at line 69 [3.32]

B:BD[3.1051] → [3.1051:1108]

defaultRule = MkRule (Proxy @50) (Proxy @30) (Proxy @20)

[3.1051]

defaultRule = MkRule (SNat @50) (SNat @30) (SNat @20)
fromKnownNats :: forall n w s. (KnownNat n, KnownNat w, KnownNat s) => Rule '(n, w, s)
fromKnownNats = MkRule (SNat @n) (SNat @w) (SNat @s)
fromSTuple :: forall n w s. SNat n -> SNat w -> SNat s -> Rule '(n, w, s)
fromSTuple n w s = withKnownNat n $ withKnownNat w $ withKnownNat s $ fromKnownNats
toSNats :: forall n w s. Rule '(n, w, s) -> (SNat n, SNat w, SNat s)
toSNats (MkRule n w s) = (n, w, s)
toProxy :: forall n w s. Rule '(n, w, s) -> Proxy '(n, w, s)
toProxy _ = Proxy @'(n, w, s)

Replacement in lib/PrettyPrint.hs at line 1 [4.39]

B:BD[4.39] → [4.40:111]

{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE ScopedTypeVariables #-}

[4.39]

[4.111]

{-# LANGUAGE AllowAmbiguousTypes #-}

Replacement in lib/PrettyPrint.hs at line 3 [4.39]

B:BD[4.138] → [4.138:173]

{-# LANGUAGE OverloadedStrings #-}

[4.138]

[4.173]

{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTs #-}

Replacement in lib/PrettyPrint.hs at line 6 [4.39]

B:BD[4.205] → [5.0:35]

{-# LANGUAGE FlexibleInstances #-}

[4.205]

{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeApplications #-}

Replacement in lib/PrettyPrint.hs at line 10 [4.39]
B:BD[4.206] → [4.206:225]
B:BD[4.225] → [2.268:286]
∅:D[2.286] → [4.265:277]
B:BD[4.265] → [4.265:277]
```
module PrettyPrint
    ( Pretty (..)
    ) where
```
[4.206]
[4.277]
```
module PrettyPrint (
    Pretty (..),
    printBudget,
) where
```

Replacement in lib/PrettyPrint.hs at line 22 [4.39]

B:BD[4.375] → [2.287:346]

∅:D[5.92] → [4.398:446]

∅:D[2.346] → [4.398:446]

B:BD[4.398] → [4.398:446]

import Budget (Budget, Category (..), Rule, IntoRule (..))
import qualified Budget (needs, wants, savings)

[4.375]

[4.446]

import Budget (Budget, Category (..), IntoRule (..), Rule (MkRule), SomeBudget (..))
import qualified Budget (needs, savings, wants, withKnownRule)

Replacement in lib/PrettyPrint.hs at line 29 [4.39]

B:BD[5.171] → [2.347:446]

instance (KnownSymbol c, KnownNat x, KnownNat y, KnownNat z) => Pretty (Budget c '(x, y, z)) where

[5.171]

[2.446]

instance forall c x z y. (KnownSymbol c, KnownNat x, KnownNat y, KnownNat z) => Pretty (Budget c '(x, y, z)) where

Replacement in lib/PrettyPrint.hs at line 41 [4.39]
B:BD[5.446] → [5.446:482]
```
        value = unP. unPosMoney $ x
```
[5.446]
[5.482]
```
        value = unP . unPosMoney $ x
```

Insertion in lib/PrettyPrint.hs at line 46 [4.39]

[4.962]

printBudget :: SomeBudget -> Doc ()
printBudget (SomeBudget ss (MkRule n w s) budget) = withKnownNat n $ withKnownNat w $ withKnownNat s $ withKnownSymbol ss (pretty budget)

Insertion in lib/Budget.hs at line 2 [6.198]
[3.3250]
[3.3250]
```
{-# LANGUAGE FlexibleInstances #-}
```
Insertion in lib/Budget.hs at line 5 [6.198]
[3.3376]
[3.3376]
```
{-# LANGUAGE MultiParamTypeClasses #-}
```
Insertion in lib/Budget.hs at line 7 [6.198]
[3.3403]
[7.236]
```
{-# LANGUAGE RankNTypes #-}
```

Deletion in lib/Budget.hs at line 10 [6.198]

B:BD[7.307] → [2.781:855]

{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-}

Insertion in lib/Budget.hs at line 15 [6.198]
[5.1025]
[7.324]
```
    SomeBudget (..),
```
Insertion in lib/Budget.hs at line 19 [6.198]
[6.244]
[3.3405]
```
    calculateSomeBudget,
```

Insertion in lib/Budget.hs at line 49 [6.198]

[6.405]

[6.616]


data SomeBudget where
    SomeBudget :: SSymbol c -> Rule '(n, w, s) -> Budget c '(n, w, s) -> SomeBudget

Replacement in lib/Budget.hs at line 54 [6.198]

B:BD[2.953] → [2.953:1008]

    toRule _ = MkRule (Proxy @x) (Proxy @y) (Proxy @z)

[2.953]

[2.1008]

    toRule _ = MkRule (SNat @x) (SNat @y) (SNat @z)

Insertion in lib/Budget.hs at line 59 [6.198]

[5.1082]


fromBudget :: SSymbol c -> Rule '(n, w, s) -> Budget c '(n, w, s) -> SomeBudget
fromBudget = SomeBudget

Insertion in lib/Budget.hs at line 63 [6.198]

[5.1083]

[3.3876]

fromKnownBudget :: forall c n w s. (KnownSymbol c, KnownNat n, KnownNat w, KnownNat s) => Budget c '(n, w, s) -> SomeBudget
fromKnownBudget = SomeBudget symbolSing rule
  where
    rule = MkRule (SNat @n) (SNat @w) (SNat @s)

Insertion in lib/Budget.hs at line 75 [6.198]

[3.4234]

[8.332]


calculateSomeBudget ::
    forall c n w s.
    (KnownSymbol c, KnownNat n, KnownNat w, KnownNat s) =>
    Rule '(n, w, s)
    -> Income c
    -> SomeBudget
calculateSomeBudget rule x = SomeBudget symbolSing rule (calculate rule x)

Insertion in app/Main.hs at line 17 [6.2303]
[9.182]
[6.2357]
```
import GHC.TypeLits
```

Replacement in app/Main.hs at line 40 [6.2303]

B:BD[9.438] → [9.438:479]

B:BD[9.479] → [2.1010:1063]

        budget <- calculateBudget income
        liftIO . print . PrettyPrint.pretty $ budget

[9.438]

[3.4582]

        currency <- readInput "Currency: " Right
        budget <- calculateBudget income currency
        liftIO . print . PrettyPrint.printBudget $ budget

Replacement in app/Main.hs at line 44 [6.2303]

B:BD[3.4583] → [9.510:569]

∅:D[9.569] → [10.491:514]

B:BD[10.491] → [10.491:514]

calculateBudget :: Int -> App (Budget "USD" '(50, 30, 20))
calculateBudget x = do

[3.4583]

[10.514]

calculateBudget :: Int -> String -> App SomeBudget
calculateBudget x curr = do

Replacement in app/Main.hs at line 48 [6.2303]

B:BD[10.566] → [10.566:605]

        budget = calculate rule income

[10.566]

[10.605]

        budget = calculateSomeBudget rule income