diff --git a/README.md b/README.md index cdf9e20..c12a581 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Prospect: A Networked, Concurrent, Functional Programming Language +# Syndicate: A Networked, Concurrent, Functional Programming Language -Prospect is an actor-based concurrent language able to express +Syndicate is an actor-based concurrent language able to express communication, enforce isolation, and manage resources. Network-inspired extensions to a functional core represent imperative actions as values, giving side-effects locality and enabling @@ -11,7 +11,7 @@ virtual machines) to scope their interactions. Conversations between actors are multi-party (using a publish/subscribe medium), and actors can easily participate in many such conversations at once. -Prospect makes *presence* notifications an integral part of pub/sub +Syndicate makes *presence* notifications an integral part of pub/sub through its *shared dataspaces*, akin to [tuplespaces](https://en.wikipedia.org/wiki/Tuple_space). Each shared dataspace doubles as the pub/sub subscription table for its network. @@ -27,18 +27,18 @@ their containing network take on those burdens. ## The code This repository contains a [Racket](http://racket-lang.org/) package, -`prospect`, which includes +`syndicate`, which includes - - the implementation of the `#lang prospect` language, in the - [`prospect` directory](https://github.com/tonyg/prospect/tree/master/prospect/). + - the implementation of the `#lang syndicate` language, in the + [`syndicate` directory](https://github.com/tonyg/syndicate/tree/master/syndicate/). - a TCP echo server example, which listens for connections on port 5999 by default, in - [`prospect/examples/echo.rkt`](https://github.com/tonyg/prospect/tree/master/prospect/examples/echo.rkt). + [`syndicate/examples/echo.rkt`](https://github.com/tonyg/syndicate/tree/master/syndicate/examples/echo.rkt). Connect to it using, for example, `telnet localhost 5999`. - a handful of other examples, in - [`prospect/examples/`](https://github.com/tonyg/prospect/tree/master/prospect/examples/). + [`syndicate/examples/`](https://github.com/tonyg/syndicate/tree/master/syndicate/examples/). ## Compiling and running the code @@ -46,7 +46,7 @@ You will need Racket version 6.3 or later. Once you have Racket installed, run - raco pkg install prospect + raco pkg install syndicate to install the package from the Racket package repository, or @@ -54,11 +54,11 @@ to install the package from the Racket package repository, or from the root directory of the Git checkout to install the package from a local snapshot. (Alternatively, `make link` does the same thing.) -This will make `#lang prospect` available to programs. +This will make `#lang syndicate` available to programs. At this point, you may load and run any of the example `*.rkt` files in the -[`prospect/examples/`](https://github.com/tonyg/prospect/tree/master/prospect/examples/) +[`syndicate/examples/`](https://github.com/tonyg/syndicate/tree/master/syndicate/examples/) directory. ## Copyright diff --git a/examples/netstack/arp.rkt b/examples/netstack/arp.rkt index 50e0bc1..f092adf 100644 --- a/examples/netstack/arp.rkt +++ b/examples/netstack/arp.rkt @@ -9,9 +9,9 @@ (require racket/set) (require racket/match) -(require prospect-monolithic) -(require prospect-monolithic/drivers/timer) -(require prospect-monolithic/demand-matcher) +(require syndicate-monolithic) +(require syndicate-monolithic/drivers/timer) +(require syndicate-monolithic/demand-matcher) (require bitsyntax) (require "dump-bytes.rkt") diff --git a/examples/netstack/demo-config.rkt b/examples/netstack/demo-config.rkt index 1fe0ff7..faaf221 100644 --- a/examples/netstack/demo-config.rkt +++ b/examples/netstack/demo-config.rkt @@ -2,7 +2,7 @@ ;; Demonstration stack configuration for various hosts. (require racket/match) -(require prospect-monolithic) +(require syndicate-monolithic) (require (only-in mzlib/os gethostname)) (require "configuration.rkt") diff --git a/examples/netstack/ethernet.rkt b/examples/netstack/ethernet.rkt index d985eb4..d913ba8 100644 --- a/examples/netstack/ethernet.rkt +++ b/examples/netstack/ethernet.rkt @@ -13,8 +13,8 @@ (require racket/match) (require racket/async-channel) -(require prospect-monolithic) -(require prospect-monolithic/demand-matcher) +(require syndicate-monolithic) +(require syndicate-monolithic/demand-matcher) (require packet-socket) (require bitsyntax) diff --git a/examples/netstack/fetchurl.rkt b/examples/netstack/fetchurl.rkt index a6a62b5..aeaabc8 100644 --- a/examples/netstack/fetchurl.rkt +++ b/examples/netstack/fetchurl.rkt @@ -1,7 +1,7 @@ -#lang prospect-monolithic +#lang syndicate-monolithic -(require prospect-monolithic/demand-matcher) -(require prospect-monolithic/drivers/timer) +(require syndicate-monolithic/demand-matcher) +(require syndicate-monolithic/drivers/timer) (require "demo-config.rkt") (require "ethernet.rkt") (require "arp.rkt") diff --git a/examples/netstack/ip.rkt b/examples/netstack/ip.rkt index fca7183..3191649 100644 --- a/examples/netstack/ip.rkt +++ b/examples/netstack/ip.rkt @@ -13,9 +13,9 @@ (require racket/set) (require racket/match) (require (only-in racket/string string-split)) -(require prospect-monolithic) -(require prospect-monolithic/drivers/timer) -(require prospect-monolithic/demand-matcher) +(require syndicate-monolithic) +(require syndicate-monolithic/drivers/timer) +(require syndicate-monolithic/demand-matcher) (require bitsyntax) (require "dump-bytes.rkt") diff --git a/examples/netstack/main.rkt b/examples/netstack/main.rkt index 0317f2c..bd45c8b 100644 --- a/examples/netstack/main.rkt +++ b/examples/netstack/main.rkt @@ -1,7 +1,7 @@ -#lang prospect-monolithic +#lang syndicate-monolithic -(require prospect-monolithic/demand-matcher) -(require prospect-monolithic/drivers/timer) +(require syndicate-monolithic/demand-matcher) +(require syndicate-monolithic/drivers/timer) (require "demo-config.rkt") (require "ethernet.rkt") (require "arp.rkt") @@ -91,9 +91,9 @@ (string->bytes/utf-8 (format (string-append "HTTP/1.0 200 OK\r\n\r\n" - "

Hello world from prospect-monolithic-netstack!

\n" - "

This is running on prospect-monolithic's own\n" - "\n" + "

Hello world from syndicate-monolithic-netstack!

\n" + "

This is running on syndicate-monolithic's own\n" + "\n" "TCP/IP stack.

\n" "

There have been ~a requests prior to this one.

") counter))) diff --git a/examples/netstack/port-allocator.rkt b/examples/netstack/port-allocator.rkt index e0fe75c..10daec5 100644 --- a/examples/netstack/port-allocator.rkt +++ b/examples/netstack/port-allocator.rkt @@ -6,7 +6,7 @@ (require racket/set) (require racket/match) -(require prospect-monolithic) +(require syndicate-monolithic) (require "ip.rkt") (struct port-allocation-request (type k) #:prefab) diff --git a/examples/netstack/tcp.rkt b/examples/netstack/tcp.rkt index 3f3c044..b82a942 100644 --- a/examples/netstack/tcp.rkt +++ b/examples/netstack/tcp.rkt @@ -8,9 +8,9 @@ (require racket/set) (require racket/match) -(require prospect-monolithic) -(require prospect-monolithic/drivers/timer) -(require prospect-monolithic/demand-matcher) +(require syndicate-monolithic) +(require syndicate-monolithic/drivers/timer) +(require syndicate-monolithic/demand-matcher) (require bitsyntax) (require "dump-bytes.rkt") diff --git a/examples/netstack/udp.rkt b/examples/netstack/udp.rkt index ad3648c..7c5c3f0 100644 --- a/examples/netstack/udp.rkt +++ b/examples/netstack/udp.rkt @@ -10,8 +10,8 @@ (require racket/set) (require racket/match) -(require prospect-monolithic) -(require prospect-monolithic/demand-matcher) +(require syndicate-monolithic) +(require syndicate-monolithic/demand-matcher) (require bitsyntax) (require "dump-bytes.rkt") diff --git a/examples/platformer/info.rkt b/examples/platformer/info.rkt index d86883b..5f79ba5 100644 --- a/examples/platformer/info.rkt +++ b/examples/platformer/info.rkt @@ -1,6 +1,5 @@ #lang setup/infotab -(define deps '("git://github.com/tonyg/prospect-gl" - "prospect" +(define deps '("syndicate" "base" "htdp-lib" )) diff --git a/examples/platformer/main.rkt b/examples/platformer/main.rkt index bd586d0..7836459 100644 --- a/examples/platformer/main.rkt +++ b/examples/platformer/main.rkt @@ -8,15 +8,15 @@ (require racket/promise) (require plot/utils) ;; for vector utilities -(require prospect) -(require prospect/drivers/timer) -(require prospect-gl/2d) +(require syndicate) +(require syndicate/drivers/timer) +(require syndicate-gl/2d) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Layers: ;; ;; - External I/O -;; as arranged by prospect-gl/2d +;; as arranged by syndicate-gl/2d ;; including keyboard events, interface to rendering, and frame timing ;; ;; - Ground diff --git a/racket/FAQ.md b/racket/FAQ.md index 1eb7a5b..456f2bf 100644 --- a/racket/FAQ.md +++ b/racket/FAQ.md @@ -1,12 +1,12 @@ # FAQ -* How do I run a prospect program? - - `#lang prospect` collects actions (`spawn`s) from module toplevel and +* How do I run a syndicate program? + - `#lang syndicate` collects actions (`spawn`s) from module toplevel and uses them as boot actions for a ground-level network. The alternative is to use a different #lang, and to call `run-ground` yourself; see an - example in prospect/examples/example-plain.rkt. + example in syndicate/examples/example-plain.rkt. -* How do I debug a prospect program? +* How do I debug a syndicate program? - You can view a colored trace of a program's execution on stderr by setting the MINIMART_TRACE environment variable, e.g. ``` @@ -220,7 +220,7 @@ ``` - use `spawn-network`: ```racket - #lang prospect + #lang syndicate (spawn-network ...) (spawn-network ... (spawn-network ...)) @@ -269,8 +269,8 @@ process is killed - the spawning process is not signalled. More thought required. -* Can I split a prospect program across multiple files? - - Only one module with `#lang prospect` can be used at a time. +* Can I split a syndicate program across multiple files? + - Only one module with `#lang syndicate` can be used at a time. * Why does `#f` keep getting sent as an event? - When a behavior returns something besides `#f` in response to an event, it is diff --git a/racket/Makefile b/racket/Makefile index e1ec982..b073420 100644 --- a/racket/Makefile +++ b/racket/Makefile @@ -1,5 +1,5 @@ -PACKAGENAME=prospect -COLLECTS=prospect prospect-monolithic +PACKAGENAME=syndicate +COLLECTS=syndicate syndicate-monolithic syndicate-gl all: setup diff --git a/racket/doc/chat-client.rkt.txt b/racket/doc/chat-client.rkt.txt index 45a55bb..f5324e2 100644 --- a/racket/doc/chat-client.rkt.txt +++ b/racket/doc/chat-client.rkt.txt @@ -1,4 +1,4 @@ -#lang prospect ;; -*- racket -*- +#lang syndicate ;; -*- racket -*- (require (only-in racket/port read-bytes-line-evt)) (require "../drivers/tcp.rkt") diff --git a/racket/doc/chat.rkt.txt b/racket/doc/chat.rkt.txt index 59e1b4a..c2dbe07 100644 --- a/racket/doc/chat.rkt.txt +++ b/racket/doc/chat.rkt.txt @@ -1,4 +1,4 @@ -#lang prospect ;; -*- racket -*- +#lang syndicate ;; -*- racket -*- (require (only-in racket/string string-trim)) (require "../drivers/tcp.rkt") diff --git a/racket/doc/echo.rkt.txt b/racket/doc/echo.rkt.txt index 19899e9..2ec3a74 100644 --- a/racket/doc/echo.rkt.txt +++ b/racket/doc/echo.rkt.txt @@ -1,4 +1,4 @@ -#lang prospect ;; -*- racket -*- +#lang syndicate ;; -*- racket -*- (require "../drivers/tcp.rkt") (require "../demand-matcher.rkt") diff --git a/racket/doc/forward-chaining-hll.rkt.txt b/racket/doc/forward-chaining-hll.rkt.txt index a295b20..0f68972 100644 --- a/racket/doc/forward-chaining-hll.rkt.txt +++ b/racket/doc/forward-chaining-hll.rkt.txt @@ -1,4 +1,4 @@ -#lang prospect/hll ;; -*- racket -*- +#lang syndicate/hll ;; -*- racket -*- (actor (forever #:collect [(count 0)] (assert `(parent-count ,count)) diff --git a/racket/doc/forward-chaining-hll2.rkt.txt b/racket/doc/forward-chaining-hll2.rkt.txt index 3472b4e..5ac787d 100644 --- a/racket/doc/forward-chaining-hll2.rkt.txt +++ b/racket/doc/forward-chaining-hll2.rkt.txt @@ -1,4 +1,4 @@ -#lang prospect/hll ;; -*- racket -*- +#lang syndicate/hll ;; -*- racket -*- (actor (forever #:collect [(count 0)] (assert `(parent-count ,count)) diff --git a/racket/doc/forward-chaining-hll3.rkt.txt b/racket/doc/forward-chaining-hll3.rkt.txt index 91e0e34..8e2284f 100644 --- a/racket/doc/forward-chaining-hll3.rkt.txt +++ b/racket/doc/forward-chaining-hll3.rkt.txt @@ -1,4 +1,4 @@ -#lang prospect/hll ;; -*- racket -*- +#lang syndicate/hll ;; -*- racket -*- (actor (forever (assert `(parent john douglas)))) (actor (forever (assert `(parent bob john)))) diff --git a/racket/doc/forward-chaining-hll4.rkt.txt b/racket/doc/forward-chaining-hll4.rkt.txt index 40fb8ab..7ff5dfb 100644 --- a/racket/doc/forward-chaining-hll4.rkt.txt +++ b/racket/doc/forward-chaining-hll4.rkt.txt @@ -1,4 +1,4 @@ -#lang prospect/hll ;; -*- racket -*- +#lang syndicate/hll ;; -*- racket -*- (actor (forever (assert `(parent john douglas)))) (actor (forever (assert `(parent bob john)))) diff --git a/racket/doc/notes-on-hll.md b/racket/doc/notes-on-hll.md index 64fdb25..60d1c39 100644 --- a/racket/doc/notes-on-hll.md +++ b/racket/doc/notes-on-hll.md @@ -114,7 +114,7 @@ with their values at the time the `until` is started. ## Examples ```racket -#lang prospect/actor +#lang syndicate/actor ;; Simple mutable box and count-to-infinity box client. (struct set-box (new-value) #:transparent) diff --git a/racket/prospect-gl/2d.rkt b/racket/syndicate-gl/2d.rkt similarity index 99% rename from racket/prospect-gl/2d.rkt rename to racket/syndicate-gl/2d.rkt index ce3d661..e8b1081 100644 --- a/racket/prospect-gl/2d.rkt +++ b/racket/syndicate-gl/2d.rkt @@ -23,9 +23,9 @@ (require (prefix-in image: 2htdp/image)) (require (prefix-in pict: pict)) -(require prospect) -(require prospect/trie) -(require prospect/ground) +(require syndicate) +(require syndicate/trie) +(require syndicate/ground) (require "texture.rkt") @@ -394,7 +394,7 @@ (collect-garbage 'major) (define frame (new frame% [style '(fullscreen-button)] - [label "prospect-gl"] + [label "syndicate-gl"] [width (or width 640)] [height (or height 480)])) (define c (new network-canvas% diff --git a/racket/prospect-gl/TODO.md b/racket/syndicate-gl/TODO.md similarity index 100% rename from racket/prospect-gl/TODO.md rename to racket/syndicate-gl/TODO.md diff --git a/racket/prospect-gl/examples/basic.rkt b/racket/syndicate-gl/examples/basic.rkt similarity index 99% rename from racket/prospect-gl/examples/basic.rkt rename to racket/syndicate-gl/examples/basic.rkt index 6251183..30124dd 100644 --- a/racket/prospect-gl/examples/basic.rkt +++ b/racket/syndicate-gl/examples/basic.rkt @@ -1,6 +1,6 @@ #lang racket -(require prospect) +(require syndicate) (require 2htdp/image) (require "../2d.rkt") diff --git a/racket/prospect-gl/texture.rkt b/racket/syndicate-gl/texture.rkt similarity index 100% rename from racket/prospect-gl/texture.rkt rename to racket/syndicate-gl/texture.rkt diff --git a/racket/prospect-monolithic/README.md b/racket/syndicate-monolithic/README.md similarity index 78% rename from racket/prospect-monolithic/README.md rename to racket/syndicate-monolithic/README.md index 861ef84..d404340 100644 --- a/racket/prospect-monolithic/README.md +++ b/racket/syndicate-monolithic/README.md @@ -1,4 +1,4 @@ -# prospect-monolithic +# syndicate-monolithic This is an implementation of the monolithic semantics, without any use of patches. diff --git a/racket/prospect-monolithic/core.rkt b/racket/syndicate-monolithic/core.rkt similarity index 97% rename from racket/prospect-monolithic/core.rkt rename to racket/syndicate-monolithic/core.rkt index 24774ef..ac17424 100644 --- a/racket/prospect-monolithic/core.rkt +++ b/racket/syndicate-monolithic/core.rkt @@ -66,12 +66,12 @@ (require racket/set) (require racket/match) (require (only-in racket/list flatten)) -(require "../prospect/functional-queue.rkt") -(require "../prospect/trie.rkt") +(require "../syndicate/functional-queue.rkt") +(require "../syndicate/trie.rkt") (require "scn.rkt") -(require "../prospect/trace.rkt") +(require "../syndicate/trace.rkt") (require "mux.rkt") -(require "../prospect/pretty.rkt") +(require "../syndicate/pretty.rkt") (module+ test (require rackunit)) ;; Events = SCNs ∪ Messages @@ -111,8 +111,8 @@ states ;; (HashTable PID Any) ) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print w [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print w [p (current-output-port)]) (pretty-print-network w p))]) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -439,12 +439,12 @@ (fprintf p " - ~a runnable pids ~a\n" (set-count runnable) (set->list runnable)) (fprintf p " - ~a live processes\n" (hash-count states)) (fprintf p " - ") - (display (indented-port-output 3 (lambda (p) (prospect-pretty-print mux p)) #:first-line? #f) p) + (display (indented-port-output 3 (lambda (p) (syndicate-pretty-print mux p)) #:first-line? #f) p) (newline p) (for ([pid (set-union (hash-keys (mux-interest-table mux)) (hash-keys states))]) (fprintf p " ---- process ~a, behavior ~v, STATE:\n" pid (hash-ref behaviors pid #f)) (define state (hash-ref states pid #f)) - (display (indented-port-output 6 (lambda (p) (prospect-pretty-print state p))) p) + (display (indented-port-output 6 (lambda (p) (syndicate-pretty-print state p))) p) (newline p) (fprintf p " process ~a, behavior ~v, CLAIMS:\n" pid (hash-ref behaviors pid #f)) (display (indented-port-output 6 (lambda (p) diff --git a/racket/prospect-monolithic/demand-matcher.rkt b/racket/syndicate-monolithic/demand-matcher.rkt similarity index 98% rename from racket/prospect-monolithic/demand-matcher.rkt rename to racket/syndicate-monolithic/demand-matcher.rkt index cbd6f0e..1dafd16 100644 --- a/racket/prospect-monolithic/demand-matcher.rkt +++ b/racket/syndicate-monolithic/demand-matcher.rkt @@ -5,7 +5,7 @@ (require racket/match) (require "core.rkt") (require "drivers/timer.rkt") -(require "../prospect/pretty.rkt") +(require "../syndicate/pretty.rkt") (provide (except-out (struct-out demand-matcher) demand-matcher) (rename-out [make-demand-matcher demand-matcher]) @@ -27,8 +27,8 @@ current-demand ;; (Setof (Listof Any)) current-supply) ;; (Setof (Listof Any)) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print s [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print s [p (current-output-port)]) (pretty-print-demand-matcher s p))]) ;; A ChangeHandler is a ((Constreeof Action) Any* -> (Constreeof Action)). diff --git a/racket/prospect-monolithic/drivers/tcp.rkt b/racket/syndicate-monolithic/drivers/tcp.rkt similarity index 100% rename from racket/prospect-monolithic/drivers/tcp.rkt rename to racket/syndicate-monolithic/drivers/tcp.rkt diff --git a/racket/prospect-monolithic/drivers/timer.rkt b/racket/syndicate-monolithic/drivers/timer.rkt similarity index 100% rename from racket/prospect-monolithic/drivers/timer.rkt rename to racket/syndicate-monolithic/drivers/timer.rkt diff --git a/racket/prospect-monolithic/drivers/udp.rkt b/racket/syndicate-monolithic/drivers/udp.rkt similarity index 100% rename from racket/prospect-monolithic/drivers/udp.rkt rename to racket/syndicate-monolithic/drivers/udp.rkt diff --git a/racket/prospect-monolithic/drivers/websocket.rkt b/racket/syndicate-monolithic/drivers/websocket.rkt similarity index 100% rename from racket/prospect-monolithic/drivers/websocket.rkt rename to racket/syndicate-monolithic/drivers/websocket.rkt diff --git a/racket/prospect-monolithic/examples/.gitignore b/racket/syndicate-monolithic/examples/.gitignore similarity index 100% rename from racket/prospect-monolithic/examples/.gitignore rename to racket/syndicate-monolithic/examples/.gitignore diff --git a/racket/prospect-monolithic/examples/Makefile b/racket/syndicate-monolithic/examples/Makefile similarity index 100% rename from racket/prospect-monolithic/examples/Makefile rename to racket/syndicate-monolithic/examples/Makefile diff --git a/racket/prospect-monolithic/examples/bank-account.rkt b/racket/syndicate-monolithic/examples/bank-account.rkt similarity index 96% rename from racket/prospect-monolithic/examples/bank-account.rkt rename to racket/syndicate-monolithic/examples/bank-account.rkt index 339274f..0e0d967 100644 --- a/racket/prospect-monolithic/examples/bank-account.rkt +++ b/racket/syndicate-monolithic/examples/bank-account.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic ;; Hello-worldish "bank account" example. (struct account (balance) #:prefab) diff --git a/racket/prospect-monolithic/examples/box-and-client.rkt b/racket/syndicate-monolithic/examples/box-and-client.rkt similarity index 97% rename from racket/prospect-monolithic/examples/box-and-client.rkt rename to racket/syndicate-monolithic/examples/box-and-client.rkt index 1c08fe4..17f861a 100644 --- a/racket/prospect-monolithic/examples/box-and-client.rkt +++ b/racket/syndicate-monolithic/examples/box-and-client.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic ;; Simple mutable box and count-to-infinity box client. (struct set-box (new-value) #:transparent) diff --git a/racket/prospect-monolithic/examples/chat-client.rkt b/racket/syndicate-monolithic/examples/chat-client.rkt similarity index 97% rename from racket/prospect-monolithic/examples/chat-client.rkt rename to racket/syndicate-monolithic/examples/chat-client.rkt index 160dfeb..d1bd7c0 100644 --- a/racket/prospect-monolithic/examples/chat-client.rkt +++ b/racket/syndicate-monolithic/examples/chat-client.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic (require (only-in racket/port read-bytes-line-evt)) (require "../drivers/tcp.rkt") diff --git a/racket/prospect-monolithic/examples/chat-no-quit-world-no-nesting.rkt b/racket/syndicate-monolithic/examples/chat-no-quit-world-no-nesting.rkt similarity index 98% rename from racket/prospect-monolithic/examples/chat-no-quit-world-no-nesting.rkt rename to racket/syndicate-monolithic/examples/chat-no-quit-world-no-nesting.rkt index 4dde7a9..b2aeb1e 100644 --- a/racket/prospect-monolithic/examples/chat-no-quit-world-no-nesting.rkt +++ b/racket/syndicate-monolithic/examples/chat-no-quit-world-no-nesting.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic (require racket/set) (require (only-in racket/string string-trim)) diff --git a/racket/prospect-monolithic/examples/echo.rkt b/racket/syndicate-monolithic/examples/echo.rkt similarity index 97% rename from racket/prospect-monolithic/examples/echo.rkt rename to racket/syndicate-monolithic/examples/echo.rkt index 32b464a..01e65b1 100644 --- a/racket/prospect-monolithic/examples/echo.rkt +++ b/racket/syndicate-monolithic/examples/echo.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic (require "../drivers/tcp.rkt") (require "../demand-matcher.rkt") diff --git a/racket/prospect-monolithic/examples/example-lang.rkt b/racket/syndicate-monolithic/examples/example-lang.rkt similarity index 98% rename from racket/prospect-monolithic/examples/example-lang.rkt rename to racket/syndicate-monolithic/examples/example-lang.rkt index 8c4c4e8..5f30cb3 100644 --- a/racket/prospect-monolithic/examples/example-lang.rkt +++ b/racket/syndicate-monolithic/examples/example-lang.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic (require (only-in racket/port read-line-evt)) (require "../drivers/timer.rkt") diff --git a/racket/prospect-monolithic/examples/example-layer.rkt b/racket/syndicate-monolithic/examples/example-layer.rkt similarity index 97% rename from racket/prospect-monolithic/examples/example-layer.rkt rename to racket/syndicate-monolithic/examples/example-layer.rkt index 9927cc5..97d878a 100644 --- a/racket/prospect-monolithic/examples/example-layer.rkt +++ b/racket/syndicate-monolithic/examples/example-layer.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic ;; Check that nested-world assertions are properly retracted. ;; Should print two "Got SCN:" tries - one nonempty, and one empty. diff --git a/racket/prospect-monolithic/examples/example-meta-echo.rkt b/racket/syndicate-monolithic/examples/example-meta-echo.rkt similarity index 91% rename from racket/prospect-monolithic/examples/example-meta-echo.rkt rename to racket/syndicate-monolithic/examples/example-meta-echo.rkt index 4527254..4646758 100644 --- a/racket/prospect-monolithic/examples/example-meta-echo.rkt +++ b/racket/syndicate-monolithic/examples/example-meta-echo.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic ;; Test case for a historical bug in Syndicate. ;; ;; When the bug existed, this program receiveed four SCN events in @@ -13,13 +13,13 @@ ;; The fix was to adjust the implementation of state change ;; notifications to cancel the echo for metaassertions. -(require prospect/pretty) +(require syndicate/pretty) (spawn-network (spawn (lambda (e counter) (and e (let ((new-counter (+ counter 1))) - (printf "Received event ~a:\n~a\n" new-counter (prospect-pretty-print->string e)) + (printf "Received event ~a:\n~a\n" new-counter (syndicate-pretty-print->string e)) (transition (+ counter 1) '())))) 0 (list (scn/union (assertion (at-meta 'x)) diff --git a/racket/prospect-monolithic/examples/example-meta-echo2.rkt b/racket/syndicate-monolithic/examples/example-meta-echo2.rkt similarity index 82% rename from racket/prospect-monolithic/examples/example-meta-echo2.rkt rename to racket/syndicate-monolithic/examples/example-meta-echo2.rkt index ba4bfea..2cb77e0 100644 --- a/racket/prospect-monolithic/examples/example-meta-echo2.rkt +++ b/racket/syndicate-monolithic/examples/example-meta-echo2.rkt @@ -1,13 +1,13 @@ -#lang prospect-monolithic +#lang syndicate-monolithic ;; The actor should receive a single event adding the (at-meta x) assertion. -(require prospect/pretty) +(require syndicate/pretty) (spawn-network (spawn (lambda (e counter) (and e (let ((new-counter (+ counter 1))) - (printf "Received event ~a:\n~a\n" new-counter (prospect-pretty-print->string e)) + (printf "Received event ~a:\n~a\n" new-counter (syndicate-pretty-print->string e)) (transition (+ counter 1) '())))) 0 (list (scn/union (assertion (at-meta 'x)) diff --git a/racket/prospect-monolithic/examples/example-plain.rkt b/racket/syndicate-monolithic/examples/example-plain.rkt similarity index 100% rename from racket/prospect-monolithic/examples/example-plain.rkt rename to racket/syndicate-monolithic/examples/example-plain.rkt diff --git a/racket/prospect-monolithic/examples/example-quit-world.rkt b/racket/syndicate-monolithic/examples/example-quit-world.rkt similarity index 97% rename from racket/prospect-monolithic/examples/example-quit-world.rkt rename to racket/syndicate-monolithic/examples/example-quit-world.rkt index e216916..9fce14f 100644 --- a/racket/prospect-monolithic/examples/example-quit-world.rkt +++ b/racket/syndicate-monolithic/examples/example-quit-world.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic ;; Demonstrates quit-network. (require (only-in racket/port read-bytes-line-evt)) diff --git a/racket/prospect-monolithic/examples/mini-echo.rkt b/racket/syndicate-monolithic/examples/mini-echo.rkt similarity index 95% rename from racket/prospect-monolithic/examples/mini-echo.rkt rename to racket/syndicate-monolithic/examples/mini-echo.rkt index 30f9010..b685e73 100644 --- a/racket/prospect-monolithic/examples/mini-echo.rkt +++ b/racket/syndicate-monolithic/examples/mini-echo.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic (struct echo-req (body) #:prefab) (struct echo-resp (body) #:prefab) diff --git a/racket/prospect-monolithic/examples/tcp-hello.rkt b/racket/syndicate-monolithic/examples/tcp-hello.rkt similarity index 98% rename from racket/prospect-monolithic/examples/tcp-hello.rkt rename to racket/syndicate-monolithic/examples/tcp-hello.rkt index 9634887..1dcb9fc 100644 --- a/racket/prospect-monolithic/examples/tcp-hello.rkt +++ b/racket/syndicate-monolithic/examples/tcp-hello.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic (require "../drivers/tcp.rkt") (require "../demand-matcher.rkt") diff --git a/racket/prospect-monolithic/examples/udp-hello-plain.rkt b/racket/syndicate-monolithic/examples/udp-hello-plain.rkt similarity index 95% rename from racket/prospect-monolithic/examples/udp-hello-plain.rkt rename to racket/syndicate-monolithic/examples/udp-hello-plain.rkt index a7fe3e6..d1cc0a2 100644 --- a/racket/prospect-monolithic/examples/udp-hello-plain.rkt +++ b/racket/syndicate-monolithic/examples/udp-hello-plain.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic (require "../drivers/udp.rkt") diff --git a/racket/prospect-monolithic/examples/ws-hello-ssl.rkt b/racket/syndicate-monolithic/examples/ws-hello-ssl.rkt similarity index 97% rename from racket/prospect-monolithic/examples/ws-hello-ssl.rkt rename to racket/syndicate-monolithic/examples/ws-hello-ssl.rkt index 6161d86..25228de 100644 --- a/racket/prospect-monolithic/examples/ws-hello-ssl.rkt +++ b/racket/syndicate-monolithic/examples/ws-hello-ssl.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic (require "../drivers/websocket.rkt") (require "../demand-matcher.rkt") diff --git a/racket/prospect-monolithic/examples/ws-hello.rkt b/racket/syndicate-monolithic/examples/ws-hello.rkt similarity index 97% rename from racket/prospect-monolithic/examples/ws-hello.rkt rename to racket/syndicate-monolithic/examples/ws-hello.rkt index 3bc8946..95fcbed 100644 --- a/racket/prospect-monolithic/examples/ws-hello.rkt +++ b/racket/syndicate-monolithic/examples/ws-hello.rkt @@ -1,4 +1,4 @@ -#lang prospect-monolithic +#lang syndicate-monolithic (require "../drivers/websocket.rkt") (require "../demand-matcher.rkt") diff --git a/racket/prospect-monolithic/ground.rkt b/racket/syndicate-monolithic/ground.rkt similarity index 98% rename from racket/prospect-monolithic/ground.rkt rename to racket/syndicate-monolithic/ground.rkt index 8eef690..cfb368e 100644 --- a/racket/prospect-monolithic/ground.rkt +++ b/racket/syndicate-monolithic/ground.rkt @@ -6,9 +6,9 @@ (require racket/match) (require racket/list) (require "core.rkt") -(require "../prospect/trace.rkt") +(require "../syndicate/trace.rkt") (require "trace/stderr.rkt") -(require "../prospect/tset.rkt") +(require "../syndicate/tset.rkt") (provide (struct-out external-event) send-ground-message diff --git a/racket/prospect-monolithic/lang.rkt b/racket/syndicate-monolithic/lang.rkt similarity index 100% rename from racket/prospect-monolithic/lang.rkt rename to racket/syndicate-monolithic/lang.rkt diff --git a/racket/prospect-monolithic/lang/reader.rkt b/racket/syndicate-monolithic/lang/reader.rkt similarity index 55% rename from racket/prospect-monolithic/lang/reader.rkt rename to racket/syndicate-monolithic/lang/reader.rkt index 590baac..e4dce7f 100644 --- a/racket/prospect-monolithic/lang/reader.rkt +++ b/racket/syndicate-monolithic/lang/reader.rkt @@ -1,2 +1,2 @@ #lang s-exp syntax/module-reader -prospect-monolithic/lang +syndicate-monolithic/lang diff --git a/racket/prospect-monolithic/main.rkt b/racket/syndicate-monolithic/main.rkt similarity index 100% rename from racket/prospect-monolithic/main.rkt rename to racket/syndicate-monolithic/main.rkt diff --git a/racket/prospect-monolithic/mux.rkt b/racket/syndicate-monolithic/mux.rkt similarity index 94% rename from racket/prospect-monolithic/mux.rkt rename to racket/syndicate-monolithic/mux.rkt index 808c169..5c8d2da 100644 --- a/racket/prospect-monolithic/mux.rkt +++ b/racket/syndicate-monolithic/mux.rkt @@ -16,11 +16,11 @@ (require racket/set) (require racket/match) -(require "../prospect/trie.rkt") +(require "../syndicate/trie.rkt") (require "scn.rkt") -(require "../prospect/trace.rkt") -(require "../prospect/tset.rkt") -(require "../prospect/pretty.rkt") +(require "../syndicate/trace.rkt") +(require "../syndicate/tset.rkt") +(require "../syndicate/pretty.rkt") ;; A PID is a Nat. ;; A Label is a PID or 'meta. @@ -30,8 +30,8 @@ interest-table ;; (HashTable Label Matcher) ) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print m [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print m [p (current-output-port)]) (pretty-print-mux m p))]) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/racket/prospect-monolithic/scn.rkt b/racket/syndicate-monolithic/scn.rkt similarity index 89% rename from racket/prospect-monolithic/scn.rkt rename to racket/syndicate-monolithic/scn.rkt index 1bbc554..267b444 100644 --- a/racket/prospect-monolithic/scn.rkt +++ b/racket/syndicate-monolithic/scn.rkt @@ -17,17 +17,17 @@ (require racket/set) (require racket/match) -(require "../prospect/trie.rkt") -(require "../prospect/tset.rkt") -(require "../prospect/pretty.rkt") +(require "../syndicate/trie.rkt") +(require "../syndicate/tset.rkt") +(require "../syndicate/pretty.rkt") (module+ test (require rackunit)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; State Change Notifications (struct scn (trie) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print d [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print d [p (current-output-port)]) (pretty-print-trie (scn-trie d) p))]) ;; Claims, Interests, Locations, and Advertisements diff --git a/racket/prospect-monolithic/trace/stderr.rkt b/racket/syndicate-monolithic/trace/stderr.rkt similarity index 95% rename from racket/prospect-monolithic/trace/stderr.rkt rename to racket/syndicate-monolithic/trace/stderr.rkt index b57626b..08f1cfc 100644 --- a/racket/prospect-monolithic/trace/stderr.rkt +++ b/racket/syndicate-monolithic/trace/stderr.rkt @@ -8,9 +8,9 @@ (require racket/exn) (require (only-in racket/string string-join)) (require "../core.rkt") -(require "../../prospect/trace.rkt") +(require "../../syndicate/trace.rkt") (require "../mux.rkt") -(require "../../prospect/pretty.rkt") +(require "../../syndicate/pretty.rkt") (define (env-aref varname default alist) (define key (or (getenv varname) default)) @@ -118,7 +118,7 @@ (when (not (boring-state? st)) (with-color YELLOW (output "~a's state just before the event:\n" pidstr) - (prospect-pretty-print st (current-error-port)))))] + (syndicate-pretty-print st (current-error-port)))))] [('process-step-result (list pids e beh st exn t)) (define pidstr (format-pids pids)) (define relevant-exn? (and show-exceptions? exn)) @@ -143,7 +143,7 @@ (when (exn-and-not (and show-process-states-pre? (not (boring-state? st)))) (with-color YELLOW (output "~a's state just before the event:\n" pidstr) - (prospect-pretty-print st (current-error-port)))) + (syndicate-pretty-print st (current-error-port)))) (when relevant-exn? (with-color WHITE-ON-RED (output "Process ~a ~v died with exception:\n~a\n" @@ -159,7 +159,7 @@ (when (not (equal? st (transition-state t))) (with-color YELLOW (output "~a's state just after the event:\n" pidstr) - (prospect-pretty-print (transition-state t) (current-error-port)))))))] + (syndicate-pretty-print (transition-state t) (current-error-port)))))))] [('internal-action (list pids a old-w)) (define pidstr (format-pids pids)) (define oldcount (hash-count (network-behaviors old-w))) @@ -209,7 +209,7 @@ newcount)) (unless (boring-state? state) (output "~a's initial state:\n" newpidstr) - (prospect-pretty-print state (current-error-port))) + (syndicate-pretty-print state (current-error-port))) (unless (trie-empty? interests) (output "~a's initial interests:\n" newpidstr) (pretty-print-trie interests (current-error-port))))] diff --git a/racket/prospect/actor.rkt b/racket/syndicate/actor.rkt similarity index 98% rename from racket/prospect/actor.rkt rename to racket/syndicate/actor.rkt index 59b9bad..b53cd30 100644 --- a/racket/prospect/actor.rkt +++ b/racket/syndicate/actor.rkt @@ -122,8 +122,8 @@ mux ;; Mux ) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print s [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print s [p (current-output-port)]) (pretty-print-actor-state s p))]) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -853,7 +853,7 @@ (fprintf p " - variables:\n") (for ((v variables)) (fprintf p " - ") - (display (indented-port-output 6 (lambda (p) (prospect-pretty-print v p)) #:first-line? #f) p) + (display (indented-port-output 6 (lambda (p) (syndicate-pretty-print v p)) #:first-line? #f) p) (newline p)) (fprintf p " - aggregates:\n") (for (((index a) (in-hash aggregates))) @@ -861,14 +861,14 @@ (fprintf p "~a" leader) (display (indented-port-output #:first-line? #f (string-length leader) - (lambda (p) (prospect-pretty-print a p))) + (lambda (p) (syndicate-pretty-print a p))) p) (newline p)) (fprintf p " - pending-patch:\n") - (display (indented-port-output 3 (lambda (p) (prospect-pretty-print pending-patch p))) p) + (display (indented-port-output 3 (lambda (p) (syndicate-pretty-print pending-patch p))) p) (newline p) (fprintf p " - ") - (display (indented-port-output 3 (lambda (p) (prospect-pretty-print mux p)) #:first-line? #f) p) + (display (indented-port-output 3 (lambda (p) (syndicate-pretty-print mux p)) #:first-line? #f) p) (newline p)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/racket/prospect/big-bang.rkt b/racket/syndicate/big-bang.rkt similarity index 98% rename from racket/prospect/big-bang.rkt rename to racket/syndicate/big-bang.rkt index 0b2316a..662ccef 100644 --- a/racket/prospect/big-bang.rkt +++ b/racket/syndicate/big-bang.rkt @@ -169,7 +169,7 @@ #:height [height #f] #:register [ip LOCALHOST] #:port [port-number SQPORT] - #:name [world-name (gensym 'prospect)] + #:name [world-name (gensym 'syndicate)] . boot-actions) (big-bang-network** width height boot-actions (on-receive (lambda (b sexps) diff --git a/racket/prospect/canonicalize.rkt b/racket/syndicate/canonicalize.rkt similarity index 100% rename from racket/prospect/canonicalize.rkt rename to racket/syndicate/canonicalize.rkt diff --git a/racket/prospect/comprehensions.rkt b/racket/syndicate/comprehensions.rkt similarity index 100% rename from racket/prospect/comprehensions.rkt rename to racket/syndicate/comprehensions.rkt diff --git a/racket/prospect/core.rkt b/racket/syndicate/core.rkt similarity index 98% rename from racket/prospect/core.rkt rename to racket/syndicate/core.rkt index cce2eb3..de1e3ed 100644 --- a/racket/prospect/core.rkt +++ b/racket/syndicate/core.rkt @@ -111,8 +111,8 @@ states ;; (HashTable PID Any) ) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print w [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print w [p (current-output-port)]) (pretty-print-network w p))]) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -435,12 +435,12 @@ (fprintf p " - ~a runnable pids ~a\n" (set-count runnable) (set->list runnable)) (fprintf p " - ~a live processes\n" (hash-count states)) (fprintf p " - ") - (display (indented-port-output 3 (lambda (p) (prospect-pretty-print mux p)) #:first-line? #f) p) + (display (indented-port-output 3 (lambda (p) (syndicate-pretty-print mux p)) #:first-line? #f) p) (newline p) (for ([pid (set-union (hash-keys (mux-interest-table mux)) (hash-keys states))]) (fprintf p " ---- process ~a, behavior ~v, STATE:\n" pid (hash-ref behaviors pid #f)) (define state (hash-ref states pid #f)) - (display (indented-port-output 6 (lambda (p) (prospect-pretty-print state p))) p) + (display (indented-port-output 6 (lambda (p) (syndicate-pretty-print state p))) p) (newline p) (fprintf p " process ~a, behavior ~v, CLAIMS:\n" pid (hash-ref behaviors pid #f)) (display (indented-port-output 6 (lambda (p) diff --git a/racket/prospect/demand-matcher.rkt b/racket/syndicate/demand-matcher.rkt similarity index 98% rename from racket/prospect/demand-matcher.rkt rename to racket/syndicate/demand-matcher.rkt index b4debc4..2f212c5 100644 --- a/racket/prospect/demand-matcher.rkt +++ b/racket/syndicate/demand-matcher.rkt @@ -27,8 +27,8 @@ current-demand ;; (Setof (Listof Any)) current-supply) ;; (Setof (Listof Any)) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print s [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print s [p (current-output-port)]) (pretty-print-demand-matcher s p))]) ;; A ChangeHandler is a ((Constreeof Action) Any* -> (Constreeof Action)). diff --git a/racket/prospect/drivers/tcp.rkt b/racket/syndicate/drivers/tcp.rkt similarity index 100% rename from racket/prospect/drivers/tcp.rkt rename to racket/syndicate/drivers/tcp.rkt diff --git a/racket/prospect/drivers/timer.rkt b/racket/syndicate/drivers/timer.rkt similarity index 100% rename from racket/prospect/drivers/timer.rkt rename to racket/syndicate/drivers/timer.rkt diff --git a/racket/prospect/drivers/udp.rkt b/racket/syndicate/drivers/udp.rkt similarity index 100% rename from racket/prospect/drivers/udp.rkt rename to racket/syndicate/drivers/udp.rkt diff --git a/racket/prospect/drivers/websocket.rkt b/racket/syndicate/drivers/websocket.rkt similarity index 100% rename from racket/prospect/drivers/websocket.rkt rename to racket/syndicate/drivers/websocket.rkt diff --git a/racket/prospect/endpoint.rkt b/racket/syndicate/endpoint.rkt similarity index 97% rename from racket/prospect/endpoint.rkt rename to racket/syndicate/endpoint.rkt index b96b5d9..0f6ac00 100644 --- a/racket/prospect/endpoint.rkt +++ b/racket/syndicate/endpoint.rkt @@ -30,8 +30,8 @@ state ;; Any ) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print g [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print g [p (current-output-port)]) (pretty-print-endpoint-group g p))]) ;; A Endpoint is a (Event State -> Transition) @@ -172,7 +172,7 @@ (match-define (endpoint-group m endpoints state) g) (fprintf p "ENDPOINT GROUP:\n") (fprintf p " ---- STATE:\n") - (display (indented-port-output 6 (lambda (p) (prospect-pretty-print state p))) p) + (display (indented-port-output 6 (lambda (p) (syndicate-pretty-print state p))) p) (newline p) (fprintf p " - ~a endpoints\n" (hash-count endpoints)) (fprintf p " - next eid: ~a\n" (mux-next-pid mux)) diff --git a/racket/prospect/examples/.gitignore b/racket/syndicate/examples/.gitignore similarity index 100% rename from racket/prospect/examples/.gitignore rename to racket/syndicate/examples/.gitignore diff --git a/racket/prospect/examples/Makefile b/racket/syndicate/examples/Makefile similarity index 100% rename from racket/prospect/examples/Makefile rename to racket/syndicate/examples/Makefile diff --git a/racket/prospect/examples/actor/bank-account.rkt b/racket/syndicate/examples/actor/bank-account.rkt similarity index 92% rename from racket/prospect/examples/actor/bank-account.rkt rename to racket/syndicate/examples/actor/bank-account.rkt index 9b52787..407828f 100644 --- a/racket/prospect/examples/actor/bank-account.rkt +++ b/racket/syndicate/examples/actor/bank-account.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate ;; Hello-worldish "bank account" example. -(require prospect/actor) +(require syndicate/actor) (struct account (balance) #:prefab) (struct deposit (amount) #:prefab) diff --git a/racket/prospect/examples/actor/box-and-client.rkt b/racket/syndicate/examples/actor/box-and-client.rkt similarity index 93% rename from racket/prospect/examples/actor/box-and-client.rkt rename to racket/syndicate/examples/actor/box-and-client.rkt index 8f71293..5f5a504 100644 --- a/racket/prospect/examples/actor/box-and-client.rkt +++ b/racket/syndicate/examples/actor/box-and-client.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate ;; Simple mutable box and count-to-infinity box client. -(require prospect/actor) +(require syndicate/actor) (struct set-box (new-value) #:transparent) (struct box-state (value) #:transparent) diff --git a/racket/prospect/examples/actor/chain.rkt b/racket/syndicate/examples/actor/chain.rkt similarity index 83% rename from racket/prospect/examples/actor/chain.rkt rename to racket/syndicate/examples/actor/chain.rkt index be7ebcb..eefc362 100644 --- a/racket/prospect/examples/actor/chain.rkt +++ b/racket/syndicate/examples/actor/chain.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate -(require prospect/actor) -(require prospect/drivers/timer) +(require syndicate/actor) +(require syndicate/drivers/timer) (spawn-timer-driver) diff --git a/racket/prospect/examples/actor/chat-client.rkt b/racket/syndicate/examples/actor/chat-client.rkt similarity index 90% rename from racket/prospect/examples/actor/chat-client.rkt rename to racket/syndicate/examples/actor/chat-client.rkt index d18e166..e8ac33b 100644 --- a/racket/prospect/examples/actor/chat-client.rkt +++ b/racket/syndicate/examples/actor/chat-client.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate -(require prospect/actor) -(require prospect/drivers/tcp) +(require syndicate/actor) +(require syndicate/drivers/tcp) (require (only-in racket/port read-bytes-line-evt)) (define local-handle (tcp-handle 'chat)) diff --git a/racket/prospect/examples/actor/chat-no-quit-world-no-nesting.rkt b/racket/syndicate/examples/actor/chat-no-quit-world-no-nesting.rkt similarity index 94% rename from racket/prospect/examples/actor/chat-no-quit-world-no-nesting.rkt rename to racket/syndicate/examples/actor/chat-no-quit-world-no-nesting.rkt index 1c51daa..9d3b7f9 100644 --- a/racket/prospect/examples/actor/chat-no-quit-world-no-nesting.rkt +++ b/racket/syndicate/examples/actor/chat-no-quit-world-no-nesting.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate -(require prospect/actor) -(require prospect/drivers/tcp) +(require syndicate/actor) +(require syndicate/drivers/tcp) (require (only-in racket/string string-trim)) (struct says (who what) #:prefab) diff --git a/racket/prospect/examples/actor/chat-no-quit-world.rkt b/racket/syndicate/examples/actor/chat-no-quit-world.rkt similarity index 94% rename from racket/prospect/examples/actor/chat-no-quit-world.rkt rename to racket/syndicate/examples/actor/chat-no-quit-world.rkt index 4970c44..1f5e3df 100644 --- a/racket/prospect/examples/actor/chat-no-quit-world.rkt +++ b/racket/syndicate/examples/actor/chat-no-quit-world.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate -(require prospect/actor) -(require prospect/drivers/tcp) +(require syndicate/actor) +(require syndicate/drivers/tcp) (require (only-in racket/string string-trim)) (struct says (who what) #:prefab) diff --git a/racket/prospect/examples/actor/chat-simplified-internals.rkt b/racket/syndicate/examples/actor/chat-simplified-internals.rkt similarity index 96% rename from racket/prospect/examples/actor/chat-simplified-internals.rkt rename to racket/syndicate/examples/actor/chat-simplified-internals.rkt index 9e0845d..499f389 100644 --- a/racket/prospect/examples/actor/chat-simplified-internals.rkt +++ b/racket/syndicate/examples/actor/chat-simplified-internals.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate -(require prospect/actor) -(require prospect/drivers/tcp) +(require syndicate/actor) +(require syndicate/drivers/tcp) (require (only-in racket/string string-trim)) (struct tcp-remote-open (id) #:prefab) diff --git a/racket/prospect/examples/actor/chat.rkt b/racket/syndicate/examples/actor/chat.rkt similarity index 95% rename from racket/prospect/examples/actor/chat.rkt rename to racket/syndicate/examples/actor/chat.rkt index 7ce3b40..d419c32 100644 --- a/racket/prospect/examples/actor/chat.rkt +++ b/racket/syndicate/examples/actor/chat.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate -(require prospect/actor) -(require prospect/drivers/tcp) +(require syndicate/actor) +(require syndicate/drivers/tcp) (require (only-in racket/string string-trim)) (struct says (who what) #:prefab) diff --git a/racket/prospect/examples/actor/echo.rkt b/racket/syndicate/examples/actor/echo.rkt similarity index 89% rename from racket/prospect/examples/actor/echo.rkt rename to racket/syndicate/examples/actor/echo.rkt index 0707faa..8e92628 100644 --- a/racket/prospect/examples/actor/echo.rkt +++ b/racket/syndicate/examples/actor/echo.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate -(require prospect/actor) -(require prospect/drivers/tcp) +(require syndicate/actor) +(require syndicate/drivers/tcp) (spawn-tcp-driver) diff --git a/racket/prospect/examples/actor/file-system-during.rkt b/racket/syndicate/examples/actor/file-system-during.rkt similarity index 94% rename from racket/prospect/examples/actor/file-system-during.rkt rename to racket/syndicate/examples/actor/file-system-during.rkt index 4130fb5..368d37f 100644 --- a/racket/prospect/examples/actor/file-system-during.rkt +++ b/racket/syndicate/examples/actor/file-system-during.rkt @@ -1,9 +1,9 @@ -#lang prospect +#lang syndicate ;; Toy file system, based on the example in the ESOP2016 submission. -;; prospect/actor implementation, using "during" instead of "on asserted/until retracted". +;; syndicate/actor implementation, using "during" instead of "on asserted/until retracted". -(require prospect/actor) -(require prospect/drivers/timer) +(require syndicate/actor) +(require syndicate/drivers/timer) (require (only-in racket/port read-bytes-line-evt)) (require (only-in racket/string string-trim string-split)) diff --git a/racket/prospect/examples/actor/file-system-lll.rkt b/racket/syndicate/examples/actor/file-system-lll.rkt similarity index 97% rename from racket/prospect/examples/actor/file-system-lll.rkt rename to racket/syndicate/examples/actor/file-system-lll.rkt index 471de5a..1425077 100644 --- a/racket/prospect/examples/actor/file-system-lll.rkt +++ b/racket/syndicate/examples/actor/file-system-lll.rkt @@ -1,10 +1,10 @@ -#lang prospect +#lang syndicate ;; Toy file system, based on the example in the ESOP2016 submission. ;; Low-level implementation. -(require (only-in prospect [assert core:assert])) -(require prospect/actor) -(require prospect/drivers/timer) +(require (only-in syndicate [assert core:assert])) +(require syndicate/actor) +(require syndicate/drivers/timer) (require (only-in racket/port read-bytes-line-evt)) (require (only-in racket/string string-trim string-split)) (require racket/set) diff --git a/racket/prospect/examples/actor/file-system-lll2.rkt b/racket/syndicate/examples/actor/file-system-lll2.rkt similarity index 97% rename from racket/prospect/examples/actor/file-system-lll2.rkt rename to racket/syndicate/examples/actor/file-system-lll2.rkt index 8987081..df1a4d7 100644 --- a/racket/prospect/examples/actor/file-system-lll2.rkt +++ b/racket/syndicate/examples/actor/file-system-lll2.rkt @@ -1,10 +1,10 @@ -#lang prospect +#lang syndicate ;; Toy file system, based on the example in the ESOP2016 submission. ;; Low-level implementation, without subconversation. -(require (only-in prospect [assert core:assert])) -(require prospect/actor) -(require prospect/drivers/timer) +(require (only-in syndicate [assert core:assert])) +(require syndicate/actor) +(require syndicate/drivers/timer) (require (only-in racket/port read-bytes-line-evt)) (require (only-in racket/string string-trim string-split)) (require racket/set) diff --git a/racket/prospect/examples/actor/file-system-script b/racket/syndicate/examples/actor/file-system-script similarity index 100% rename from racket/prospect/examples/actor/file-system-script rename to racket/syndicate/examples/actor/file-system-script diff --git a/racket/prospect/examples/actor/file-system.rkt b/racket/syndicate/examples/actor/file-system.rkt similarity index 96% rename from racket/prospect/examples/actor/file-system.rkt rename to racket/syndicate/examples/actor/file-system.rkt index 0249651..2c51a5d 100644 --- a/racket/prospect/examples/actor/file-system.rkt +++ b/racket/syndicate/examples/actor/file-system.rkt @@ -1,9 +1,9 @@ -#lang prospect +#lang syndicate ;; Toy file system, based on the example in the ESOP2016 submission. -;; prospect/actor implementation. +;; syndicate/actor implementation. -(require prospect/actor) -(require prospect/drivers/timer) +(require syndicate/actor) +(require syndicate/drivers/timer) (require (only-in racket/port read-bytes-line-evt)) (require (only-in racket/string string-trim string-split)) diff --git a/racket/prospect/examples/actor/file-system2.rkt b/racket/syndicate/examples/actor/file-system2.rkt similarity index 96% rename from racket/prospect/examples/actor/file-system2.rkt rename to racket/syndicate/examples/actor/file-system2.rkt index 59726e7..b672201 100644 --- a/racket/prospect/examples/actor/file-system2.rkt +++ b/racket/syndicate/examples/actor/file-system2.rkt @@ -1,9 +1,9 @@ -#lang prospect +#lang syndicate ;; Toy file system, based on the example in the ESOP2016 submission. -;; prospect/actor implementation, without subconversation. +;; syndicate/actor implementation, without subconversation. -(require prospect/actor) -(require prospect/drivers/timer) +(require syndicate/actor) +(require syndicate/drivers/timer) (require (only-in racket/port read-bytes-line-evt)) (require (only-in racket/string string-trim string-split)) (require racket/set) diff --git a/racket/prospect/examples/actor/mini-echo.rkt b/racket/syndicate/examples/actor/mini-echo.rkt similarity index 92% rename from racket/prospect/examples/actor/mini-echo.rkt rename to racket/syndicate/examples/actor/mini-echo.rkt index b75c70a..8f3c53c 100644 --- a/racket/prospect/examples/actor/mini-echo.rkt +++ b/racket/syndicate/examples/actor/mini-echo.rkt @@ -1,6 +1,6 @@ -#lang prospect +#lang syndicate -(require prospect/actor) +(require syndicate/actor) (struct echo-req (body) #:prefab) (struct echo-resp (body) #:prefab) diff --git a/racket/prospect/examples/actor/spreadsheet-script b/racket/syndicate/examples/actor/spreadsheet-script similarity index 100% rename from racket/prospect/examples/actor/spreadsheet-script rename to racket/syndicate/examples/actor/spreadsheet-script diff --git a/racket/prospect/examples/actor/spreadsheet.rkt b/racket/syndicate/examples/actor/spreadsheet.rkt similarity index 98% rename from racket/prospect/examples/actor/spreadsheet.rkt rename to racket/syndicate/examples/actor/spreadsheet.rkt index 2dd3425..8d8bfa6 100644 --- a/racket/prospect/examples/actor/spreadsheet.rkt +++ b/racket/syndicate/examples/actor/spreadsheet.rkt @@ -1,7 +1,7 @@ -#lang prospect +#lang syndicate ;; A toy spreadsheet model. -(require prospect/actor) +(require syndicate/actor) (require racket/match) (require racket/set) diff --git a/racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rb b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rb similarity index 100% rename from racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rb rename to racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rb diff --git a/racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt similarity index 97% rename from racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt rename to racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt index 7e0fbb0..9819289 100644 --- a/racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt +++ b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate ;; After Figure 1 in "Logic and lattices for distributed programming", ;; Conway et. al, UCB tech report, 2012 ;; @@ -6,7 +6,7 @@ ;; input. (require racket/set) -(require prospect/actor) +(require syndicate/actor) (struct link (from to cost) #:prefab) (struct path (from to cost) #:prefab) diff --git a/racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rb b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rb similarity index 100% rename from racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rb rename to racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rb diff --git a/racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt similarity index 98% rename from racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt rename to racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt index d620fdb..641f4cf 100644 --- a/racket/prospect/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt +++ b/racket/syndicate/examples/all-pairs-shortest-paths/all-pairs-shortest-paths2.rkt @@ -1,11 +1,11 @@ -#lang prospect +#lang syndicate ;; After Figure 1 in "Logic and lattices for distributed programming", ;; Conway et. al, UCB tech report, 2012 ;; ;; Added path-seen set to ensure termination on input cycles. (require racket/set) -(require prospect/actor) +(require syndicate/actor) (struct link (from to cost) #:prefab) (struct path (from to seen cost) #:prefab) diff --git a/racket/prospect/examples/bank-account.rkt b/racket/syndicate/examples/bank-account.rkt similarity index 98% rename from racket/prospect/examples/bank-account.rkt rename to racket/syndicate/examples/bank-account.rkt index 51f82c0..5305151 100644 --- a/racket/prospect/examples/bank-account.rkt +++ b/racket/syndicate/examples/bank-account.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate ;; Hello-worldish "bank account" example. (struct account (balance) #:prefab) diff --git a/racket/prospect/examples/big-bang.rkt b/racket/syndicate/examples/big-bang.rkt similarity index 100% rename from racket/prospect/examples/big-bang.rkt rename to racket/syndicate/examples/big-bang.rkt diff --git a/racket/prospect/examples/box-and-client.rkt b/racket/syndicate/examples/box-and-client.rkt similarity index 98% rename from racket/prospect/examples/box-and-client.rkt rename to racket/syndicate/examples/box-and-client.rkt index 855b3c5..c3b9aba 100644 --- a/racket/prospect/examples/box-and-client.rkt +++ b/racket/syndicate/examples/box-and-client.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate ;; Simple mutable box and count-to-infinity box client. (struct set-box (new-value) #:transparent) diff --git a/racket/prospect/examples/chat-client.rkt b/racket/syndicate/examples/chat-client.rkt similarity index 98% rename from racket/prospect/examples/chat-client.rkt rename to racket/syndicate/examples/chat-client.rkt index 7549fdd..d8f3b35 100644 --- a/racket/prospect/examples/chat-client.rkt +++ b/racket/syndicate/examples/chat-client.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require (only-in racket/port read-bytes-line-evt)) (require "../drivers/tcp.rkt") diff --git a/racket/prospect/examples/chat-no-quit-world-no-nesting.rkt b/racket/syndicate/examples/chat-no-quit-world-no-nesting.rkt similarity index 99% rename from racket/prospect/examples/chat-no-quit-world-no-nesting.rkt rename to racket/syndicate/examples/chat-no-quit-world-no-nesting.rkt index ed7c0b6..b2c0fed 100644 --- a/racket/prospect/examples/chat-no-quit-world-no-nesting.rkt +++ b/racket/syndicate/examples/chat-no-quit-world-no-nesting.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require (only-in racket/string string-trim)) (require "../drivers/tcp.rkt") diff --git a/racket/prospect/examples/chat-no-quit-world.rkt b/racket/syndicate/examples/chat-no-quit-world.rkt similarity index 99% rename from racket/prospect/examples/chat-no-quit-world.rkt rename to racket/syndicate/examples/chat-no-quit-world.rkt index acba332..e756b64 100644 --- a/racket/prospect/examples/chat-no-quit-world.rkt +++ b/racket/syndicate/examples/chat-no-quit-world.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require (only-in racket/string string-trim)) (require "../drivers/tcp.rkt") diff --git a/racket/prospect/examples/chat-simplified-internals.rkt b/racket/syndicate/examples/chat-simplified-internals.rkt similarity index 99% rename from racket/prospect/examples/chat-simplified-internals.rkt rename to racket/syndicate/examples/chat-simplified-internals.rkt index cd30953..f8beedc 100644 --- a/racket/prospect/examples/chat-simplified-internals.rkt +++ b/racket/syndicate/examples/chat-simplified-internals.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate ;; The chat server, using a proxy abstracting over details of the TCP ;; driver's protocol. diff --git a/racket/prospect/examples/chat.rkt b/racket/syndicate/examples/chat.rkt similarity index 99% rename from racket/prospect/examples/chat.rkt rename to racket/syndicate/examples/chat.rkt index 858f5f9..5b5f294 100644 --- a/racket/prospect/examples/chat.rkt +++ b/racket/syndicate/examples/chat.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require (only-in racket/string string-trim)) (require "../drivers/tcp.rkt") diff --git a/racket/prospect/examples/durable-key-value-store.rkt b/racket/syndicate/examples/durable-key-value-store.rkt similarity index 99% rename from racket/prospect/examples/durable-key-value-store.rkt rename to racket/syndicate/examples/durable-key-value-store.rkt index 8852ac4..5bb6213 100644 --- a/racket/prospect/examples/durable-key-value-store.rkt +++ b/racket/syndicate/examples/durable-key-value-store.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require racket/set) (require racket/file) diff --git a/racket/prospect/examples/echo.rkt b/racket/syndicate/examples/echo.rkt similarity index 98% rename from racket/prospect/examples/echo.rkt rename to racket/syndicate/examples/echo.rkt index 01fc72a..a0158ee 100644 --- a/racket/prospect/examples/echo.rkt +++ b/racket/syndicate/examples/echo.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require "../drivers/tcp.rkt") (require "../demand-matcher.rkt") diff --git a/racket/prospect/examples/endpoint-example.rkt b/racket/syndicate/examples/endpoint-example.rkt similarity index 99% rename from racket/prospect/examples/endpoint-example.rkt rename to racket/syndicate/examples/endpoint-example.rkt index d3f3213..a0841f6 100644 --- a/racket/prospect/examples/endpoint-example.rkt +++ b/racket/syndicate/examples/endpoint-example.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require "../endpoint.rkt") (require "../drivers/timer.rkt") diff --git a/racket/prospect/examples/example-lang.rkt b/racket/syndicate/examples/example-lang.rkt similarity index 99% rename from racket/prospect/examples/example-lang.rkt rename to racket/syndicate/examples/example-lang.rkt index e7eeeea..6504183 100644 --- a/racket/prospect/examples/example-lang.rkt +++ b/racket/syndicate/examples/example-lang.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require (only-in racket/port read-line-evt)) (require "../drivers/timer.rkt") diff --git a/racket/prospect/examples/example-layer.rkt b/racket/syndicate/examples/example-layer.rkt similarity index 98% rename from racket/prospect/examples/example-layer.rkt rename to racket/syndicate/examples/example-layer.rkt index 637b66f..3db879a 100644 --- a/racket/prospect/examples/example-layer.rkt +++ b/racket/syndicate/examples/example-layer.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate ;; Check that nested-world assertions are properly retracted. ;; Should print two "Got SCN:" patches - one adding, and one removing (observe 'die). diff --git a/racket/prospect/examples/example-meta-drop.rkt b/racket/syndicate/examples/example-meta-drop.rkt similarity index 96% rename from racket/prospect/examples/example-meta-drop.rkt rename to racket/syndicate/examples/example-meta-drop.rkt index 7a5701d..171ff5c 100644 --- a/racket/prospect/examples/example-meta-drop.rkt +++ b/racket/syndicate/examples/example-meta-drop.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate ;; Analogous to nc-incremental-meta-drop.rkt in the Redex model. ;; Demonstrates (hopefully) correct processing of meta-interests when dropping a patch. diff --git a/racket/prospect/examples/example-meta-echo.rkt b/racket/syndicate/examples/example-meta-echo.rkt similarity index 92% rename from racket/prospect/examples/example-meta-echo.rkt rename to racket/syndicate/examples/example-meta-echo.rkt index 0532b52..0006061 100644 --- a/racket/prospect/examples/example-meta-echo.rkt +++ b/racket/syndicate/examples/example-meta-echo.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate ;; Test case for a historical bug in Syndicate. ;; ;; When the bug existed, this program received four SCN events in @@ -13,13 +13,13 @@ ;; The fix was to adjust the implementation of state change ;; notifications to cancel the echo for metaassertions. -(require prospect/pretty) +(require syndicate/pretty) (spawn-network (spawn (lambda (e counter) (and e (let ((new-counter (+ counter 1))) - (printf "Received event ~a:\n~a\n" new-counter (prospect-pretty-print->string e)) + (printf "Received event ~a:\n~a\n" new-counter (syndicate-pretty-print->string e)) (transition (+ counter 1) '())))) 0 (list (patch-seq (assert (at-meta 'x)) diff --git a/racket/prospect/examples/example-meta-echo2.rkt b/racket/syndicate/examples/example-meta-echo2.rkt similarity index 83% rename from racket/prospect/examples/example-meta-echo2.rkt rename to racket/syndicate/examples/example-meta-echo2.rkt index 85d3e51..182d37d 100644 --- a/racket/prospect/examples/example-meta-echo2.rkt +++ b/racket/syndicate/examples/example-meta-echo2.rkt @@ -1,13 +1,13 @@ -#lang prospect +#lang syndicate ;; The actor should receive a single event adding the (at-meta x) assertion. -(require prospect/pretty) +(require syndicate/pretty) (spawn-network (spawn (lambda (e counter) (and e (let ((new-counter (+ counter 1))) - (printf "Received event ~a:\n~a\n" new-counter (prospect-pretty-print->string e)) + (printf "Received event ~a:\n~a\n" new-counter (syndicate-pretty-print->string e)) (transition (+ counter 1) '())))) 0 (list (patch-seq (sub 'x #:meta-level 1) diff --git a/racket/prospect/examples/example-plain.rkt b/racket/syndicate/examples/example-plain.rkt similarity index 100% rename from racket/prospect/examples/example-plain.rkt rename to racket/syndicate/examples/example-plain.rkt diff --git a/racket/prospect/examples/example-quit-world.rkt b/racket/syndicate/examples/example-quit-world.rkt similarity index 98% rename from racket/prospect/examples/example-quit-world.rkt rename to racket/syndicate/examples/example-quit-world.rkt index d4134f4..69e82f4 100644 --- a/racket/prospect/examples/example-quit-world.rkt +++ b/racket/syndicate/examples/example-quit-world.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate ;; Demonstrates quit-network. (require (only-in racket/port read-bytes-line-evt)) diff --git a/racket/prospect/examples/example-swap-int-and-claim.rkt b/racket/syndicate/examples/example-swap-int-and-claim.rkt similarity index 98% rename from racket/prospect/examples/example-swap-int-and-claim.rkt rename to racket/syndicate/examples/example-swap-int-and-claim.rkt index 31375ba..ba5c0a9 100644 --- a/racket/prospect/examples/example-swap-int-and-claim.rkt +++ b/racket/syndicate/examples/example-swap-int-and-claim.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate ;; Analogous to nc-incremental-swap-int-and-claim.rkt in the Redex model. ;; Demonstrates (hopefully) correct processing of feedback at interest switches. diff --git a/racket/prospect/examples/example-wildcard-assertion-1.rkt b/racket/syndicate/examples/example-wildcard-assertion-1.rkt similarity index 80% rename from racket/prospect/examples/example-wildcard-assertion-1.rkt rename to racket/syndicate/examples/example-wildcard-assertion-1.rkt index 1bd3bf1..c712db8 100644 --- a/racket/prospect/examples/example-wildcard-assertion-1.rkt +++ b/racket/syndicate/examples/example-wildcard-assertion-1.rkt @@ -1,15 +1,15 @@ -#lang prospect +#lang syndicate ;; Demonstrate wildcard assertions. ;; One actor asserts everything except at-meta assertions (which break ;; the ground VM). It therefore *subscribes* to everything too. -(require prospect/pretty) +(require syndicate/pretty) (spawn (lambda (e s) (printf "Subscriber - Aggregate\n") - (prospect-pretty-print s) + (syndicate-pretty-print s) (printf "Subscriber - Patch\n") - (prospect-pretty-print e) + (syndicate-pretty-print e) (newline) (if (patch? e) (transition (update-interests s e) '()) diff --git a/racket/prospect/examples/example-wildcard-assertion-2.rkt b/racket/syndicate/examples/example-wildcard-assertion-2.rkt similarity index 83% rename from racket/prospect/examples/example-wildcard-assertion-2.rkt rename to racket/syndicate/examples/example-wildcard-assertion-2.rkt index fbaae20..022ef14 100644 --- a/racket/prospect/examples/example-wildcard-assertion-2.rkt +++ b/racket/syndicate/examples/example-wildcard-assertion-2.rkt @@ -1,17 +1,17 @@ -#lang prospect +#lang syndicate ;; Demonstrate almost-wildcard assertions. ;; One actor subscribes to everything - and so initially sees itself. ;; The other advertises everything except subscriptions and at-meta assertions. ;; The first actor's aggregate view of the network then includes everything ;; except at-meta assertions. -(require prospect/pretty) +(require syndicate/pretty) (spawn (lambda (e s) (printf "Subscriber - Aggregate\n") - (prospect-pretty-print s) + (syndicate-pretty-print s) (printf "Subscriber - Patch\n") - (prospect-pretty-print e) + (syndicate-pretty-print e) (newline) (if (patch? e) (transition (update-interests s e) '()) @@ -21,7 +21,7 @@ (spawn (lambda (e s) (printf "Asserter\n") - (prospect-pretty-print e) + (syndicate-pretty-print e) (newline) #f) (void) diff --git a/racket/prospect/examples/forward-chaining.rkt b/racket/syndicate/examples/forward-chaining.rkt similarity index 99% rename from racket/prospect/examples/forward-chaining.rkt rename to racket/syndicate/examples/forward-chaining.rkt index 17e70b4..3178ce9 100644 --- a/racket/prospect/examples/forward-chaining.rkt +++ b/racket/syndicate/examples/forward-chaining.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require racket/set) (require "../trie.rkt") diff --git a/racket/prospect/examples/key-value-store.rkt b/racket/syndicate/examples/key-value-store.rkt similarity index 99% rename from racket/prospect/examples/key-value-store.rkt rename to racket/syndicate/examples/key-value-store.rkt index af8657f..a641d53 100644 --- a/racket/prospect/examples/key-value-store.rkt +++ b/racket/syndicate/examples/key-value-store.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require racket/set) diff --git a/racket/prospect/examples/mini-echo.rkt b/racket/syndicate/examples/mini-echo.rkt similarity index 97% rename from racket/prospect/examples/mini-echo.rkt rename to racket/syndicate/examples/mini-echo.rkt index 9638fd6..49bafe3 100644 --- a/racket/prospect/examples/mini-echo.rkt +++ b/racket/syndicate/examples/mini-echo.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (struct echo-req (body) #:prefab) (struct echo-resp (body) #:prefab) diff --git a/racket/prospect/examples/tcp-hello.rkt b/racket/syndicate/examples/tcp-hello.rkt similarity index 98% rename from racket/prospect/examples/tcp-hello.rkt rename to racket/syndicate/examples/tcp-hello.rkt index 9ff0323..b3c62ba 100644 --- a/racket/prospect/examples/tcp-hello.rkt +++ b/racket/syndicate/examples/tcp-hello.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require "../drivers/tcp.rkt") (require "../demand-matcher.rkt") diff --git a/racket/prospect/examples/udp-hello-plain.rkt b/racket/syndicate/examples/udp-hello-plain.rkt similarity index 97% rename from racket/prospect/examples/udp-hello-plain.rkt rename to racket/syndicate/examples/udp-hello-plain.rkt index 0be375a..f7b582a 100644 --- a/racket/prospect/examples/udp-hello-plain.rkt +++ b/racket/syndicate/examples/udp-hello-plain.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require "../drivers/udp.rkt") diff --git a/racket/prospect/examples/ws-hello-ssl.rkt b/racket/syndicate/examples/ws-hello-ssl.rkt similarity index 98% rename from racket/prospect/examples/ws-hello-ssl.rkt rename to racket/syndicate/examples/ws-hello-ssl.rkt index 106db75..8b71178 100644 --- a/racket/prospect/examples/ws-hello-ssl.rkt +++ b/racket/syndicate/examples/ws-hello-ssl.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require "../drivers/websocket.rkt") (require "../demand-matcher.rkt") diff --git a/racket/prospect/examples/ws-hello.rkt b/racket/syndicate/examples/ws-hello.rkt similarity index 98% rename from racket/prospect/examples/ws-hello.rkt rename to racket/syndicate/examples/ws-hello.rkt index 6654e5b..d8c54de 100644 --- a/racket/prospect/examples/ws-hello.rkt +++ b/racket/syndicate/examples/ws-hello.rkt @@ -1,4 +1,4 @@ -#lang prospect +#lang syndicate (require "../drivers/websocket.rkt") (require "../demand-matcher.rkt") diff --git a/racket/prospect/functional-queue.rkt b/racket/syndicate/functional-queue.rkt similarity index 100% rename from racket/prospect/functional-queue.rkt rename to racket/syndicate/functional-queue.rkt diff --git a/racket/prospect/ground.rkt b/racket/syndicate/ground.rkt similarity index 100% rename from racket/prospect/ground.rkt rename to racket/syndicate/ground.rkt diff --git a/racket/prospect/hash-order.rkt b/racket/syndicate/hash-order.rkt similarity index 100% rename from racket/prospect/hash-order.rkt rename to racket/syndicate/hash-order.rkt diff --git a/racket/prospect/info.rkt b/racket/syndicate/info.rkt similarity index 100% rename from racket/prospect/info.rkt rename to racket/syndicate/info.rkt diff --git a/racket/prospect/lang.rkt b/racket/syndicate/lang.rkt similarity index 100% rename from racket/prospect/lang.rkt rename to racket/syndicate/lang.rkt diff --git a/racket/prospect/lang/reader.rkt b/racket/syndicate/lang/reader.rkt similarity index 68% rename from racket/prospect/lang/reader.rkt rename to racket/syndicate/lang/reader.rkt index c8863ef..2df4638 100644 --- a/racket/prospect/lang/reader.rkt +++ b/racket/syndicate/lang/reader.rkt @@ -1,2 +1,2 @@ #lang s-exp syntax/module-reader -prospect/lang +syndicate/lang diff --git a/racket/prospect/main.rkt b/racket/syndicate/main.rkt similarity index 100% rename from racket/prospect/main.rkt rename to racket/syndicate/main.rkt diff --git a/racket/prospect/mux.rkt b/racket/syndicate/mux.rkt similarity index 98% rename from racket/prospect/mux.rkt rename to racket/syndicate/mux.rkt index a4802e2..d337304 100644 --- a/racket/prospect/mux.rkt +++ b/racket/syndicate/mux.rkt @@ -29,8 +29,8 @@ interest-table ;; (HashTable Label Matcher) ) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print m [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print m [p (current-output-port)]) (pretty-print-mux m p))]) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/racket/prospect/patch.rkt b/racket/syndicate/patch.rkt similarity index 99% rename from racket/prospect/patch.rkt rename to racket/syndicate/patch.rkt index e5e5e7b..4605d10 100644 --- a/racket/prospect/patch.rkt +++ b/racket/syndicate/patch.rkt @@ -51,8 +51,8 @@ ;; Patches (struct patch (added removed) #:transparent - #:methods gen:prospect-pretty-printable - [(define (prospect-pretty-print d [p (current-output-port)]) + #:methods gen:syndicate-pretty-printable + [(define (syndicate-pretty-print d [p (current-output-port)]) (pretty-print-patch d p))]) ;; Claims, Interests, Locations, and Advertisements diff --git a/racket/prospect/pretty.rkt b/racket/syndicate/pretty.rkt similarity index 68% rename from racket/prospect/pretty.rkt rename to racket/syndicate/pretty.rkt index ada715d..27fd29c 100644 --- a/racket/prospect/pretty.rkt +++ b/racket/syndicate/pretty.rkt @@ -1,9 +1,9 @@ #lang racket/base -(provide gen:prospect-pretty-printable - prospect-pretty-print +(provide gen:syndicate-pretty-printable + syndicate-pretty-print - prospect-pretty-print->string + syndicate-pretty-print->string exn->string ;; required from racket/exn string-indent @@ -15,18 +15,18 @@ (require (only-in racket/string string-join string-split)) (require "trie.rkt") -(define-generics prospect-pretty-printable - (prospect-pretty-print prospect-pretty-printable [port]) +(define-generics syndicate-pretty-printable + (syndicate-pretty-print syndicate-pretty-printable [port]) #:defaults ([(lambda (x) (and (not (eq? x #f)) (trie? x))) - (define (prospect-pretty-print m [p (current-output-port)]) + (define (syndicate-pretty-print m [p (current-output-port)]) (pretty-print-trie m p))] [(lambda (x) #t) - (define (prospect-pretty-print v [p (current-output-port)]) + (define (syndicate-pretty-print v [p (current-output-port)]) (pretty-write v p))])) -(define (prospect-pretty-print->string v) +(define (syndicate-pretty-print->string v) (define p (open-output-string)) - (prospect-pretty-print v p) + (syndicate-pretty-print v p) (get-output-string p)) (define (string-indent amount s) diff --git a/racket/prospect/random-test.rkt b/racket/syndicate/random-test.rkt similarity index 100% rename from racket/prospect/random-test.rkt rename to racket/syndicate/random-test.rkt diff --git a/racket/prospect/scribblings/highlevelref.scrbl b/racket/syndicate/scribblings/highlevelref.scrbl similarity index 99% rename from racket/prospect/scribblings/highlevelref.scrbl rename to racket/syndicate/scribblings/highlevelref.scrbl index d89cf2f..d5a2bd5 100644 --- a/racket/prospect/scribblings/highlevelref.scrbl +++ b/racket/syndicate/scribblings/highlevelref.scrbl @@ -1,12 +1,12 @@ #lang scribble/manual @(require (for-label racket - prospect/actor)) + syndicate/actor)) @title{High Level Syntax for Syndicate} -@defmodule[prospect/actor] +@defmodule[syndicate/actor] @section{Insantaneous Actions (I)} diff --git a/racket/prospect/support/dsl.rkt b/racket/syndicate/support/dsl.rkt similarity index 100% rename from racket/prospect/support/dsl.rkt rename to racket/syndicate/support/dsl.rkt diff --git a/racket/prospect/trace.rkt b/racket/syndicate/trace.rkt similarity index 100% rename from racket/prospect/trace.rkt rename to racket/syndicate/trace.rkt diff --git a/racket/prospect/trace/stderr.rkt b/racket/syndicate/trace/stderr.rkt similarity index 96% rename from racket/prospect/trace/stderr.rkt rename to racket/syndicate/trace/stderr.rkt index 8011e63..23f5339 100644 --- a/racket/prospect/trace/stderr.rkt +++ b/racket/syndicate/trace/stderr.rkt @@ -119,7 +119,7 @@ (when (not (boring-state? st)) (with-color YELLOW (output "~a's state just before the event:\n" pidstr) - (prospect-pretty-print st (current-error-port)))))] + (syndicate-pretty-print st (current-error-port)))))] [('process-step-result (list pids e beh st exn t)) (define pidstr (format-pids pids)) (define relevant-exn? (and show-exceptions? exn)) @@ -144,7 +144,7 @@ (when (exn-and-not (and show-process-states-pre? (not (boring-state? st)))) (with-color YELLOW (output "~a's state just before the event:\n" pidstr) - (prospect-pretty-print st (current-error-port)))) + (syndicate-pretty-print st (current-error-port)))) (when relevant-exn? (with-color WHITE-ON-RED (output "Process ~a ~v died with exception:\n~a\n" @@ -160,7 +160,7 @@ (when (not (equal? st (transition-state t))) (with-color YELLOW (output "~a's state just after the event:\n" pidstr) - (prospect-pretty-print (transition-state t) (current-error-port)))))))] + (syndicate-pretty-print (transition-state t) (current-error-port)))))))] [('internal-action (list pids a old-w)) (define pidstr (format-pids pids)) (define oldcount (hash-count (network-behaviors old-w))) @@ -210,7 +210,7 @@ newcount)) (unless (boring-state? state) (output "~a's initial state:\n" newpidstr) - (prospect-pretty-print state (current-error-port))) + (syndicate-pretty-print state (current-error-port))) (unless (trie-empty? interests) (output "~a's initial interests:\n" newpidstr) (pretty-print-trie interests (current-error-port))))] diff --git a/racket/prospect/treap.rkt b/racket/syndicate/treap.rkt similarity index 100% rename from racket/prospect/treap.rkt rename to racket/syndicate/treap.rkt diff --git a/racket/prospect/trie.rkt b/racket/syndicate/trie.rkt similarity index 100% rename from racket/prospect/trie.rkt rename to racket/syndicate/trie.rkt diff --git a/racket/prospect/tset.rkt b/racket/syndicate/tset.rkt similarity index 100% rename from racket/prospect/tset.rkt rename to racket/syndicate/tset.rkt