From a2849b18c9531ef0d7d7bd9d9de9133e8b3ba42b Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Thu, 8 Feb 2024 15:25:31 +0000
Subject: [PATCH] Preserves: floats merged into doubles

---
 src/syndicate/actors.nim                      | 1 -
 src/syndicate/patterns.nim                    | 2 +-
 src/syndicate/protocols/dataspacePatterns.nim | 7 ++-----
 src/syndicate/protocols/sturdy.nim            | 3 +--
 src/syndicate/protocols/timer.nim             | 6 +++---
 src/syndicate/protocols/trace.nim             | 6 +++---
 syndicate.nimble                              | 4 ++--
 7 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/syndicate/actors.nim b/src/syndicate/actors.nim
index ccd4868..bdd0211 100644
--- a/src/syndicate/actors.nim
+++ b/src/syndicate/actors.nim
@@ -171,7 +171,6 @@ proc match(bindings: var Bindings; p: Pattern; v: Value): bool =
   of PatternKind.Patom:
     result = case p.patom
       of PAtom.Boolean: v.isBoolean
-      of PAtom.Float: v.isFloat
       of PAtom.Double: v.isDouble
       of PAtom.Signedinteger: v.isInteger
       of PAtom.String: v.isString
diff --git a/src/syndicate/patterns.nim b/src/syndicate/patterns.nim
index cc5ca99..9acc9b9 100644
--- a/src/syndicate/patterns.nim
+++ b/src/syndicate/patterns.nim
@@ -70,7 +70,7 @@ proc grab*(pr: Value): Pattern =
   of pkBoolean:
     AnyAtom(orKind: AnyAtomKind.`bool`, bool: pr.bool).toPattern
   of pkFloat:
-    AnyAtom(orKind: AnyAtomKind.`float`, float: pr.float).toPattern
+    AnyAtom(orKind: AnyAtomKind.`double`, double: pr.float).toPattern
   of pkRegister:
     AnyAtom(orKind: AnyAtomKind.`int`, int: pr.register).toPattern
   of pkString:
diff --git a/src/syndicate/protocols/dataspacePatterns.nim b/src/syndicate/protocols/dataspacePatterns.nim
index 1156e75..9c8a94b 100644
--- a/src/syndicate/protocols/dataspacePatterns.nim
+++ b/src/syndicate/protocols/dataspacePatterns.nim
@@ -4,17 +4,14 @@ import
 
 type
   AnyAtomKind* {.pure.} = enum
-    `bool`, `float`, `double`, `int`, `string`, `bytes`, `symbol`, `embedded`
+    `bool`, `double`, `int`, `string`, `bytes`, `symbol`, `embedded`
   `AnyAtom`* {.preservesOr.} = object
     case orKind*: AnyAtomKind
     of AnyAtomKind.`bool`:
         `bool`*: bool
 
-    of AnyAtomKind.`float`:
-        `float`*: BiggestFloat
-
     of AnyAtomKind.`double`:
-        `double`*: BiggestFloat
+        `double`*: float
 
     of AnyAtomKind.`int`:
         `int`*: BiggestInt
diff --git a/src/syndicate/protocols/sturdy.nim b/src/syndicate/protocols/sturdy.nim
index f9934fa..7a66d85 100644
--- a/src/syndicate/protocols/sturdy.nim
+++ b/src/syndicate/protocols/sturdy.nim
@@ -107,8 +107,7 @@ type
   
   SturdyPathStepDetail* = Parameters
   `PAtom`* {.preservesOr, pure.} = enum
-    `Boolean`, `Float`, `Double`, `SignedInteger`, `String`, `ByteString`,
-    `Symbol`
+    `Boolean`, `Double`, `SignedInteger`, `String`, `ByteString`, `Symbol`
   PDiscard* {.preservesRecord: "_".} = object
   
   TemplateKind* {.pure.} = enum
diff --git a/src/syndicate/protocols/timer.nim b/src/syndicate/protocols/timer.nim
index e112070..5f2b9a0 100644
--- a/src/syndicate/protocols/timer.nim
+++ b/src/syndicate/protocols/timer.nim
@@ -5,17 +5,17 @@ import
 type
   TimerExpired* {.preservesRecord: "timer-expired".} = object
     `label`*: Value
-    `seconds`*: BiggestFloat
+    `seconds`*: float
 
   SetTimer* {.preservesRecord: "set-timer".} = object
     `label`*: Value
-    `seconds`*: BiggestFloat
+    `seconds`*: float
     `kind`*: TimerKind
 
   `TimerKind`* {.preservesOr, pure.} = enum
     `relative`, `absolute`, `clear`
   LaterThan* {.preservesRecord: "later-than".} = object
-    `seconds`*: BiggestFloat
+    `seconds`*: float
 
 proc `$`*(x: TimerExpired | SetTimer | LaterThan): string =
   `$`(toPreserves(x))
diff --git a/src/syndicate/protocols/trace.nim b/src/syndicate/protocols/trace.nim
index 922c579..5669651 100644
--- a/src/syndicate/protocols/trace.nim
+++ b/src/syndicate/protocols/trace.nim
@@ -86,11 +86,11 @@ type
     `reason`*: LinkedTaskReleaseReason
 
   TurnCausePeriodicActivation* {.preservesRecord: "periodic-activation".} = object
-    `period`*: BiggestFloat
+    `period`*: float
 
   TurnCauseDelay* {.preservesRecord: "delay".} = object
     `causingTurn`*: TurnId
-    `amount`*: BiggestFloat
+    `amount`*: float
 
   TurnCauseExternal* {.preservesRecord: "external".} = object
     `description`*: Value
@@ -170,7 +170,7 @@ type
 
   
   TraceEntry* {.preservesRecord: "trace".} = object
-    `timestamp`*: BiggestFloat
+    `timestamp`*: float
     `actor`*: ActorId
     `item`*: ActorActivation
 
diff --git a/syndicate.nimble b/syndicate.nimble
index 6fdc82e..9fcfb3d 100644
--- a/syndicate.nimble
+++ b/syndicate.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version = "20240206"
+version = "20240208"
 author        = "Emery Hemingway"
 description   = "Syndicated actors for conversational concurrency"
 license       = "Unlicense"
@@ -9,4 +9,4 @@ srcDir        = "src"
 
 # Dependencies
 
-requires "https://github.com/ehmry/hashlib.git#f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac", "nim >= 2.0.0", "https://git.syndicate-lang.org/ehmry/preserves-nim.git >= 20240206"
+requires "https://github.com/ehmry/hashlib.git#f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac", "nim >= 2.0.0", "https://git.syndicate-lang.org/ehmry/preserves-nim.git >= 20240208"