ehmry
/
syndicate-nim
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move relays out of top module, clean exports there

This commit is contained in:
Emery Hemingway 2023-10-05 18:01:23 +01:00
parent b2994b6d05
commit 552e51899c
5 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/syndicate.nim
View File

@ -11,16 +11,7 @@ export fromPreserve, toPreserve
import ./syndicate/[actors, dataspaces, durings, patterns] import ./syndicate/[actors, dataspaces, durings, patterns]
import ./syndicate/protocols/dataspace import ./syndicate/protocols/dataspace
when defined(posix): export actors, dataspaces, patterns
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
proc `!`*(typ: static typedesc): Pattern {.inline.} = proc `!`*(typ: static typedesc): Pattern {.inline.} =
patterns.dropType(typ) patterns.dropType(typ)

2
src/syndicate/actors/timers.nim
View File

@ -3,7 +3,7 @@
import std/[asyncdispatch, monotimes, times] import std/[asyncdispatch, monotimes, times]
import preserves import preserves
import syndicate, syndicate/actors import syndicate
import ../protocols/timer import ../protocols/timer
from syndicate/protocols/dataspace import Observe from syndicate/protocols/dataspace import Observe

7
src/syndicate/relays.nim
View File

@ -3,7 +3,7 @@
import std/[asyncdispatch, options, streams, tables] import std/[asyncdispatch, options, streams, tables]
import preserves import preserves
import ./actors, ./durings, ./membranes, ./protocols/[protocol, sturdy, transportAddress] import ../syndicate, ./durings, ./membranes, ./protocols/[gatekeeper, protocol, sturdy, transportAddress]
when defined(traceSyndicate): when defined(traceSyndicate):
when defined(posix): when defined(posix):
@ -21,8 +21,7 @@ type
Value = Preserve[void] Value = Preserve[void]
Assertion = Preserve[Cap] Assertion = Preserve[Cap]
WireRef = sturdy.WireRef[void] WireRef = sturdy.WireRef[void]
Turn = syndicate.Turn
Turn = actors.Turn
type type
PacketWriter = proc (pkt: sink Packet): Future[void] {.gcsafe.} PacketWriter = proc (pkt: sink Packet): Future[void] {.gcsafe.}
@ -285,8 +284,6 @@ when defined(posix):
import std/asyncnet import std/asyncnet
from std/nativesockets import AF_INET, AF_UNIX, IPPROTO_TCP, SOCK_STREAM, Protocol from std/nativesockets import AF_INET, AF_UNIX, IPPROTO_TCP, SOCK_STREAM, Protocol
import protocols/gatekeeper
type ShutdownEntity* = ref object of Entity type ShutdownEntity* = ref object of Entity
method retract(e: ShutdownEntity; turn: var Turn; h: Handle) = method retract(e: ShutdownEntity; turn: var Turn; h: Handle) =

2
src/syndicate/skeletons.nim
View File

@ -3,7 +3,7 @@
## https://git.syndicate-lang.org/syndicate-lang/syndicate-rkt/src/commit/90c4c60699069b496491b81ee63b5a45ffd638cb/syndicate/HOWITWORKS.md ## 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 preserves
import ./actors, ./bags, ./patterns import ./actors, ./bags, ./patterns
import ./protocols/dataspacePatterns import ./protocols/dataspacePatterns

2
syndicate.nimble
View File

@ -1,6 +1,6 @@
# Package # Package
version = "20230825" version = "20231005"
author = "Emery Hemingway" author = "Emery Hemingway"
description = "Syndicated actors for conversational concurrency" description = "Syndicated actors for conversational concurrency"
license = "Unlicense" license = "Unlicense"