diff --git a/syndicate/schemas/dataspace.prs b/protocols/schemas/dataspace.prs similarity index 100% rename from syndicate/schemas/dataspace.prs rename to protocols/schemas/dataspace.prs diff --git a/syndicate/schemas/dataspacePatterns.prs b/protocols/schemas/dataspacePatterns.prs similarity index 100% rename from syndicate/schemas/dataspacePatterns.prs rename to protocols/schemas/dataspacePatterns.prs diff --git a/syndicate/schemas/gatekeeper.prs b/protocols/schemas/gatekeeper.prs similarity index 100% rename from syndicate/schemas/gatekeeper.prs rename to protocols/schemas/gatekeeper.prs diff --git a/syndicate/schemas/protocol.prs b/protocols/schemas/protocol.prs similarity index 100% rename from syndicate/schemas/protocol.prs rename to protocols/schemas/protocol.prs diff --git a/syndicate/schemas/racketEvent.prs b/protocols/schemas/racketEvent.prs similarity index 100% rename from syndicate/schemas/racketEvent.prs rename to protocols/schemas/racketEvent.prs diff --git a/syndicate/schemas/secureChatProtocol.prs b/protocols/schemas/secureChatProtocol.prs similarity index 100% rename from syndicate/schemas/secureChatProtocol.prs rename to protocols/schemas/secureChatProtocol.prs diff --git a/syndicate/schemas/service.prs b/protocols/schemas/service.prs similarity index 100% rename from syndicate/schemas/service.prs rename to protocols/schemas/service.prs diff --git a/syndicate/schemas/simpleChatProtocol.prs b/protocols/schemas/simpleChatProtocol.prs similarity index 100% rename from syndicate/schemas/simpleChatProtocol.prs rename to protocols/schemas/simpleChatProtocol.prs diff --git a/syndicate/schemas/stream.prs b/protocols/schemas/stream.prs similarity index 100% rename from syndicate/schemas/stream.prs rename to protocols/schemas/stream.prs diff --git a/syndicate/schemas/sturdy.prs b/protocols/schemas/sturdy.prs similarity index 100% rename from syndicate/schemas/sturdy.prs rename to protocols/schemas/sturdy.prs diff --git a/syndicate/schemas/tcp.prs b/protocols/schemas/tcp.prs similarity index 100% rename from syndicate/schemas/tcp.prs rename to protocols/schemas/tcp.prs diff --git a/syndicate/schemas/timer.prs b/protocols/schemas/timer.prs similarity index 100% rename from syndicate/schemas/timer.prs rename to protocols/schemas/timer.prs diff --git a/syndicate/schemas/worker.prs b/protocols/schemas/worker.prs similarity index 100% rename from syndicate/schemas/worker.prs rename to protocols/schemas/worker.prs diff --git a/syndicate/.gitignore b/syndicate/.gitignore new file mode 100644 index 0000000..c75f615 --- /dev/null +++ b/syndicate/.gitignore @@ -0,0 +1 @@ +schemas/ diff --git a/syndicate/dataspace.rkt b/syndicate/dataspace.rkt index e13d3f1..bfdce18 100644 --- a/syndicate/dataspace.rkt +++ b/syndicate/dataspace.rkt @@ -2,9 +2,9 @@ ;;; SPDX-License-Identifier: LGPL-3.0-or-later ;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones -(provide (all-from-out "schemas/gen/dataspace.rkt") - (all-from-out "schemas/gen/dataspacePatterns.rkt") - (all-from-out "schemas/gen/dataspacePatterns.meta.rkt") +(provide (all-from-out "schemas/dataspace.rkt") + (all-from-out "schemas/dataspacePatterns.rkt") + (all-from-out "schemas/dataspacePatterns.meta.rkt") dataspace actor-system/dataspace) @@ -23,9 +23,9 @@ (require "syntax-classes.rkt") (require "skeleton.rkt") -(require "schemas/gen/dataspace.rkt") -(require "schemas/gen/dataspacePatterns.rkt") -(require "schemas/gen/dataspacePatterns.meta.rkt") +(require "schemas/dataspace.rkt") +(require "schemas/dataspacePatterns.rkt") +(require "schemas/dataspacePatterns.meta.rkt") (define-logger syndicate/dataspace) diff --git a/syndicate/distributed/tcp-server.rkt b/syndicate/distributed/tcp-server.rkt index eec8b5b..c2d7abb 100644 --- a/syndicate/distributed/tcp-server.rkt +++ b/syndicate/distributed/tcp-server.rkt @@ -9,7 +9,7 @@ (require syndicate/relay) (require syndicate/rewrite) (require syndicate/sturdy) -(require syndicate/schemas/gen/gatekeeper) +(require syndicate/schemas/gatekeeper) (require syndicate/sturdy) (require syndicate/drivers/tcp) diff --git a/syndicate/drivers/racket-event.rkt b/syndicate/drivers/racket-event.rkt index cc5f8bf..dcdab4c 100644 --- a/syndicate/drivers/racket-event.rkt +++ b/syndicate/drivers/racket-event.rkt @@ -4,11 +4,11 @@ ;; Generic Racket events. -(provide (all-from-out syndicate/schemas/gen/racketEvent)) +(provide (all-from-out syndicate/schemas/racketEvent)) (require syndicate/driver-support) -(require syndicate/schemas/gen/racketEvent) -(require syndicate/schemas/gen/dataspacePatterns) +(require syndicate/schemas/racketEvent) +(require syndicate/schemas/dataspacePatterns) (define-logger syndicate/drivers/racket-event) diff --git a/syndicate/drivers/stream.rkt b/syndicate/drivers/stream.rkt index 5f2f6af..c62fe25 100644 --- a/syndicate/drivers/stream.rkt +++ b/syndicate/drivers/stream.rkt @@ -2,7 +2,7 @@ ;;; SPDX-License-Identifier: LGPL-3.0-or-later ;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones -(provide (all-from-out syndicate/schemas/gen/stream) +(provide (all-from-out syndicate/schemas/stream) port-source port-sink @@ -34,7 +34,7 @@ (require syndicate/pattern) (require syndicate/driver-support) -(require syndicate/schemas/gen/stream) +(require syndicate/schemas/stream) (define-logger syndicate/drivers/stream) diff --git a/syndicate/drivers/tcp.rkt b/syndicate/drivers/tcp.rkt index 976cae5..409329b 100644 --- a/syndicate/drivers/tcp.rkt +++ b/syndicate/drivers/tcp.rkt @@ -3,7 +3,7 @@ ;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones (provide (all-from-out syndicate/drivers/stream) - (all-from-out syndicate/schemas/gen/tcp)) + (all-from-out syndicate/schemas/tcp)) (require racket/async-channel) (require racket/tcp) @@ -12,8 +12,8 @@ (require syndicate/functional-queue) (require syndicate/pattern) (require syndicate/drivers/stream) -(require syndicate/schemas/gen/tcp) -(require syndicate/schemas/gen/dataspacePatterns) +(require syndicate/schemas/tcp) +(require syndicate/schemas/dataspacePatterns) (require (for-syntax racket/base)) diff --git a/syndicate/drivers/timer.rkt b/syndicate/drivers/timer.rkt index 74dd286..68b6b1f 100644 --- a/syndicate/drivers/timer.rkt +++ b/syndicate/drivers/timer.rkt @@ -2,13 +2,13 @@ ;;; SPDX-License-Identifier: LGPL-3.0-or-later ;;; SPDX-FileCopyrightText: Copyright © 2018-2021 Tony Garnock-Jones -(provide (all-from-out syndicate/schemas/gen/timer) +(provide (all-from-out syndicate/schemas/timer) timeout) (require syndicate/driver-support) (require syndicate/engine) -(require syndicate/schemas/gen/timer) -(require syndicate/schemas/gen/dataspacePatterns) +(require syndicate/schemas/timer) +(require syndicate/schemas/dataspacePatterns) (require data/heap) (define-logger syndicate/drivers/timer) diff --git a/syndicate/pattern.rkt b/syndicate/pattern.rkt index 949ee54..753c2c0 100644 --- a/syndicate/pattern.rkt +++ b/syndicate/pattern.rkt @@ -22,7 +22,7 @@ !dump-registered-preserves-patterns! - (all-from-out "schemas/gen/dataspacePatterns.rkt")) + (all-from-out "schemas/dataspacePatterns.rkt")) (require (for-syntax racket/base)) (require (for-syntax racket/match)) @@ -38,7 +38,7 @@ (require racket/list) (require "pattern-expander.rkt") (require "smart-pattern.rkt") -(require "schemas/gen/dataspacePatterns.rkt") +(require "schemas/dataspacePatterns.rkt") ;;--------------------------------------------------------------------------- diff --git a/syndicate/private/install.rkt b/syndicate/private/install.rkt index 3c96b60..7685c1b 100644 --- a/syndicate/private/install.rkt +++ b/syndicate/private/install.rkt @@ -13,10 +13,10 @@ schema-compiler-plugin-mode)) (define (pre-installer _collects-path syndicate-path) - (define output-directory (build-path syndicate-path "schemas/gen")) + (define output-directory (build-path syndicate-path "schemas")) (delete-directory/files output-directory #:must-exist? #f) (parameterize ((schema-compiler-plugin-mode 'meta)) - (batch-compile #:inputs (list (build-path syndicate-path "schemas/**.prs")) + (batch-compile #:inputs (list (build-path syndicate-path "../protocols/schemas/**.prs")) #:additional-modules (hash '(EntityRef) 'syndicate/entity-ref) #:output-directory output-directory #:plugins (list schema-compiler-plugin)))) diff --git a/syndicate/query.rkt b/syndicate/query.rkt index 7d69596..a2bbac5 100644 --- a/syndicate/query.rkt +++ b/syndicate/query.rkt @@ -29,7 +29,7 @@ (require "syntax.rkt") (require "bag.rkt") -(require "schemas/gen/dataspace.rkt") +(require "schemas/dataspace.rkt") (begin-for-syntax (define-splicing-syntax-class on-add diff --git a/syndicate/relay.rkt b/syndicate/relay.rkt index c4e3919..5304c99 100644 --- a/syndicate/relay.rkt +++ b/syndicate/relay.rkt @@ -13,8 +13,8 @@ (require (only-in "actor.rkt" current-turn)) (require "engine.rkt") (require "rewrite.rkt") -(require "schemas/gen/protocol.rkt") -(require (prefix-in sturdy: "schemas/gen/sturdy.rkt")) +(require "schemas/protocol.rkt") +(require (prefix-in sturdy: "schemas/sturdy.rkt")) (define-logger syndicate/relay) diff --git a/syndicate/rewrite.rkt b/syndicate/rewrite.rkt index 98a570a..64f1d0b 100644 --- a/syndicate/rewrite.rkt +++ b/syndicate/rewrite.rkt @@ -10,7 +10,7 @@ (require preserves) (require "entity-ref.rkt") -(require "schemas/gen/sturdy.rkt") +(require "schemas/sturdy.rkt") (define (match-Pattern p v) (define bindings (make-hasheq)) diff --git a/syndicate/schema-compiler.rkt b/syndicate/schema-compiler.rkt index b0b33fa..2073df6 100644 --- a/syndicate/schema-compiler.rkt +++ b/syndicate/schema-compiler.rkt @@ -27,7 +27,7 @@ paths) options) (define ds-path (match (schema-compiler-plugin-mode) - ['normal 'syndicate/schemas/gen/dataspacePatterns] + ['normal 'syndicate/schemas/dataspacePatterns] ['meta (lookup-module-path '(dataspacePatterns))])) (define meta? (match (schema-compiler-plugin-mode) diff --git a/syndicate/schemas/.gitignore b/syndicate/schemas/.gitignore deleted file mode 100644 index e8e450b..0000000 --- a/syndicate/schemas/.gitignore +++ /dev/null @@ -1 +0,0 @@ -gen/ diff --git a/syndicate/service.rkt b/syndicate/service.rkt index d0099eb..ee3f210 100644 --- a/syndicate/service.rkt +++ b/syndicate/service.rkt @@ -2,7 +2,7 @@ ;;; SPDX-License-Identifier: LGPL-3.0-or-later ;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones -(provide (all-from-out syndicate/schemas/gen/service) +(provide (all-from-out syndicate/schemas/service) with-services provide-service @@ -16,7 +16,7 @@ (require syndicate/syntax) (require syndicate/pattern) (require syndicate/dataspace) -(require syndicate/schemas/gen/service) +(require syndicate/schemas/service) (define-logger syndicate/service) diff --git a/syndicate/smart-pattern.rkt b/syndicate/smart-pattern.rkt index 630c109..4998e8c 100644 --- a/syndicate/smart-pattern.rkt +++ b/syndicate/smart-pattern.rkt @@ -13,7 +13,7 @@ (require racket/match) (require preserves) -(require syndicate/schemas/gen/dataspacePatterns) +(require syndicate/schemas/dataspacePatterns) (define (rec label arity pats) (Pattern-DCompound (DCompound-rec (CRec label arity) pats))) diff --git a/syndicate/sturdy.rkt b/syndicate/sturdy.rkt index 6682714..3120d0c 100644 --- a/syndicate/sturdy.rkt +++ b/syndicate/sturdy.rkt @@ -18,14 +18,14 @@ attenuate-sturdy SturdyRef-valid? validate - (all-from-out "schemas/gen/sturdy.rkt")) + (all-from-out "schemas/sturdy.rkt")) (require racket/match) (require (only-in sha hmac-sha256)) (require (only-in racket/random crypto-random-bytes)) (require preserves) (require preserves-schema) -(require "schemas/gen/sturdy.rkt") +(require "schemas/sturdy.rkt") (define KEY_LENGTH 16) ;; 128 bits diff --git a/syndicate/syntax.rkt b/syndicate/syntax.rkt index d328064..ebdb693 100644 --- a/syndicate/syntax.rkt +++ b/syndicate/syntax.rkt @@ -327,7 +327,7 @@ (define-syntax-rule (stop-on event expr ...) (on event (stop-current-facet expr ...))) -(require "schemas/gen/dataspace.rkt") +(require "schemas/dataspace.rkt") (define-syntax on (lambda (stx)