diff --git a/src/syndicate.nim b/src/syndicate.nim index 5396b75..31c8e6a 100644 --- a/src/syndicate.nim +++ b/src/syndicate.nim @@ -11,16 +11,7 @@ export fromPreserve, toPreserve import ./syndicate/[actors, dataspaces, durings, patterns] import ./syndicate/protocols/dataspace -when defined(posix): - from ./syndicate/relays import Tcp, Unix, connect, connectStdio - export Tcp, Unix, connect, connectStdio - -export patterns - -export Actor, Assertion, Facet, Handle, Cap, Ref, Symbol, Turn, TurnAction, - `$`, addCallback, analyse, asyncCheck, bootDataspace, - facet, future, inFacet, message, newDataspace, onStop, publish, - retract, replace, run, spawn, stop, stopActor, unembed, unpackLiterals +export actors, dataspaces, patterns proc `!`*(typ: static typedesc): Pattern {.inline.} = patterns.dropType(typ) diff --git a/src/syndicate/actors/timers.nim b/src/syndicate/actors/timers.nim index 324e273..720de15 100644 --- a/src/syndicate/actors/timers.nim +++ b/src/syndicate/actors/timers.nim @@ -3,7 +3,7 @@ import std/[asyncdispatch, monotimes, times] import preserves -import syndicate, syndicate/actors +import syndicate import ../protocols/timer from syndicate/protocols/dataspace import Observe diff --git a/src/syndicate/relays.nim b/src/syndicate/relays.nim index bbfec7c..e84362f 100644 --- a/src/syndicate/relays.nim +++ b/src/syndicate/relays.nim @@ -3,7 +3,7 @@ import std/[asyncdispatch, options, streams, tables] import preserves -import ./actors, ./durings, ./membranes, ./protocols/[protocol, sturdy, transportAddress] +import ../syndicate, ./durings, ./membranes, ./protocols/[gatekeeper, protocol, sturdy, transportAddress] when defined(traceSyndicate): when defined(posix): @@ -21,8 +21,7 @@ type Value = Preserve[void] Assertion = Preserve[Cap] WireRef = sturdy.WireRef[void] - - Turn = actors.Turn + Turn = syndicate.Turn type PacketWriter = proc (pkt: sink Packet): Future[void] {.gcsafe.} @@ -285,8 +284,6 @@ when defined(posix): import std/asyncnet from std/nativesockets import AF_INET, AF_UNIX, IPPROTO_TCP, SOCK_STREAM, Protocol -import protocols/gatekeeper - type ShutdownEntity* = ref object of Entity method retract(e: ShutdownEntity; turn: var Turn; h: Handle) = diff --git a/src/syndicate/skeletons.nim b/src/syndicate/skeletons.nim index a497436..09fe5c4 100644 --- a/src/syndicate/skeletons.nim +++ b/src/syndicate/skeletons.nim @@ -3,7 +3,7 @@ ## https://git.syndicate-lang.org/syndicate-lang/syndicate-rkt/src/commit/90c4c60699069b496491b81ee63b5a45ffd638cb/syndicate/HOWITWORKS.md -import std/[hashes, lists, options, sets, tables] +import std/[hashes, options, sets, tables] import preserves import ./actors, ./bags, ./patterns import ./protocols/dataspacePatterns diff --git a/syndicate.nimble b/syndicate.nimble index 5aa2d31..e82f07c 100644 --- a/syndicate.nimble +++ b/syndicate.nimble @@ -1,6 +1,6 @@ # Package -version = "20230825" +version = "20231005" author = "Emery Hemingway" description = "Syndicated actors for conversational concurrency" license = "Unlicense"