fixed point nums wip

Author: functora

nix/configuration.nix

@@ -773,16 +773,6 @@ in {
             -file ./SimpleSlots.1.1.pk7
         '';
       }
-      // fj.mkFirejailCustom {
-        pkg = "doom-siren";
-        dir = "doom";
-        exe = ''
-          ${pkgs.gzdoom}/bin/gzdoom \
-            -iwad ./freedoom-0.13.0/freedoom2.wad \
-            -file ./siren.pk3 \
-            -file ./SimpleSlots.1.1.pk7
-        '';
-      }
       // fj.mkFirejailCustom {
         pkg = "doom-ashes1";
         dir = "doom";

pub/functora/src/prelude/Functora/Prelude.hs

@@ -122,10 +122,11 @@ module Functora.Prelude
 
     -- * FixedPoint
     -- $fixedPoint
+    E30,
     Fix (..),
-    FixNonNeg,
+    FixNonNeg (..),
     mkFixNonNeg,
-    E30,
+    inspectFixed,
 
     -- * DerivingVia
     -- $derivingVia
@@ -1200,6 +1201,9 @@ mkFixNonNeg x =
     then FixNonNeg x
     else error $ "Underflow " <> inspect x
 
+inspectFixed :: forall a e. (From String a, HasResolution e) => Fixed e -> a
+inspectFixed = from @String @a . showFixed True
+
 instance Num FixNonNeg where
   lhs + rhs = mkFixNonNeg $ unFixNonNeg lhs + unFixNonNeg rhs
   lhs - rhs = mkFixNonNeg $ unFixNonNeg lhs - unFixNonNeg rhs

pub/functora/src/sql/Functora/SqlOrphan.hs

@@ -112,3 +112,11 @@ deriving newtype instance PersistFieldSql FeeRate
 deriving newtype instance PersistField ProfitRate
 
 deriving newtype instance PersistFieldSql ProfitRate
+
+deriving newtype instance PersistField Fix
+
+deriving newtype instance PersistFieldSql Fix
+
+deriving newtype instance PersistField FixNonNeg
+
+deriving newtype instance PersistFieldSql FixNonNeg

pub/functora/src/test/Functora/PreludeSpec.hs

@@ -48,6 +48,9 @@ spec = do
       `shouldBe` "uid-11111111111111111111111111111111"
     unsafeFrom @(UTF_8 ByteString) @Text (htmlUid $ addUid nilUid nilUid)
       `shouldBe` "uid-HXugtXVfQbdnt1bHDJcE9HU6kDMaPEJSQhN3moaHr6Hp"
+  it "inspectFixed" $ do
+    inspectFixed @Text (unFix 2.5) `shouldBe` "2.5"
+    inspectFixed @Text (unFixNonNeg 2.500) `shouldBe` "2.5"
   it "parseRatio/overflow"
     $ inspect @Text (parseRatio @Text @Word8 @(Either SomeException) "0.333")
     `shouldBe` "Left (ParseException {parseExceptionSource = \"0.333\", parseExceptionSourceType = Text, parseExceptionTargetType = Ratio Word8, parseExceptionFailure = \"Word8 numerator or denominator seems to be out of bounds, expected 333 % 1000 but got 77 % 232\"})"

pub/functora/src/test/Functora/TagsSpec.hs

@@ -9,8 +9,8 @@ import Functora.Tags.TestFgpt ()
 import Functora.Tags.TestSing
 import Test.Hspec
 
-newMoney :: forall tags. Tagged (tags |+| 'Money) Rational
-newMoney = Tagged $ 4 % 5
+newMoney :: forall tags. Tagged (tags |+| 'Money) Natural
+newMoney = Tagged 4
 
 getSymbolTag ::
   forall (tag :: Symbol) tags rep.
@@ -56,17 +56,17 @@ spec = do
       `shouldBe` Gain
   it "inspect" $ do
     inspect @Text (newMoney @NoTags)
-      `shouldBe` "Tagged (4 % 5)"
+      `shouldBe` "Tagged 4"
     inspect @Text (newMoney @(NoTags |+| "BTC" |+| 'Net))
-      `shouldBe` "Tagged (4 % 5)"
+      `shouldBe` "Tagged 4"
     inspect @Text (newMoney @(Tags "BTC" |+| 'Net |+| 'Lose |+| 'Merchant))
-      `shouldBe` "Tagged (4 % 5)"
+      `shouldBe` "Tagged 4"
     inspect @Text (newMoney @(Tags "BTC" |+| 'Net |+| 'Lose))
-      `shouldBe` "Tagged (4 % 5)"
+      `shouldBe` "Tagged 4"
     inspect @Text (newMoney @(Tags "BTC"))
-      `shouldBe` "Tagged (4 % 5)"
+      `shouldBe` "Tagged 4"
     inspect @Text (newMoney @(Tags "BTC" |+| 'Net |+| 'Gain))
-      `shouldBe` "Tagged (4 % 5)"
+      `shouldBe` "Tagged 4"
   it "inspectType" $ do
     inspectType @NoTags @Text
       `shouldBe` "'[] (Mapping * *)"