diff --git a/src/syndicate.nim b/src/syndicate.nim index 233af12..794cd96 100644 --- a/src/syndicate.nim +++ b/src/syndicate.nim @@ -11,7 +11,7 @@ export fromPreserves, toPreserves import ./syndicate/[actors, dataspaces, durings, patterns] import ./syndicate/protocols/dataspace -export actors, dataspaces, patterns +export actors, dataspace, dataspaces, patterns type Assertion* {.deprecated: "Assertion and Preserve[void] replaced by Value".} = Value @@ -34,7 +34,6 @@ proc `??`*(pat: Pattern; bindings: openArray[(int, Pattern)]): Pattern {.inline. patterns.inject(pat, bindings) type - Observe* = dataspace.Observe PublishProc = proc (turn: var Turn; v: Value; h: Handle) {.closure, gcsafe.} RetractProc = proc (turn: var Turn; h: Handle) {.closure, gcsafe.} MessageProc = proc (turn: var Turn; v: Value) {.closure, gcsafe.} diff --git a/src/syndicate/durings.nim b/src/syndicate/durings.nim index 0444326..577b3df 100644 --- a/src/syndicate/durings.nim +++ b/src/syndicate/durings.nim @@ -5,12 +5,6 @@ import std/[hashes, tables] import preserves import ./actors, ./patterns, ./protocols/dataspace -from ./protocols/protocol import Handle - -type - Observe = dataspace.Observe - Turn = actors.Turn - type DuringProc* = proc (turn: var Turn; a: Value; h: Handle): TurnAction {.gcsafe.} DuringActionKind = enum null, dead, act diff --git a/syndicate.nimble b/syndicate.nimble index 9353ef9..37fb88a 100644 --- a/syndicate.nimble +++ b/syndicate.nimble @@ -1,6 +1,6 @@ # Package -version = "20240101" +version = "20240106" author = "Emery Hemingway" description = "Syndicated actors for conversational concurrency" license = "Unlicense" diff --git a/tests/test_patterns.nim b/tests/test_patterns.nim index 32037a8..aa8cc0c 100644 --- a/tests/test_patterns.nim +++ b/tests/test_patterns.nim @@ -89,3 +89,8 @@ suite "later-than": test $patB: checkpoint $obsA check patB.matches obsA + +suite "Observe": + let pat = ?:Observe + const text = """> >]>""" + check $pat == text