From f2063997eccbafc63ca6ae34cec3a82305be1b0d Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 25 Jun 2021 09:45:38 +0200 Subject: [PATCH] Update schemas to match new identifier restrictions. --- syndicate/dataspace.rkt | 8 ++++---- syndicate/drivers/racket-event.rkt | 6 +++--- syndicate/drivers/tcp.rkt | 2 +- syndicate/drivers/timer.rkt | 2 +- syndicate/pattern.rkt | 4 ++-- syndicate/schema-compiler.rkt | 6 +++--- syndicate/schemas/dataspace.prs | 2 +- .../{dataspace-patterns.prs => dataspacePatterns.prs} | 0 syndicate/schemas/{racket-event.prs => racketEvent.prs} | 0 .../{secure-chat-protocol.prs => secureChatProtocol.prs} | 0 syndicate/schemas/service.prs | 4 ++-- .../{simple-chat-protocol.prs => simpleChatProtocol.prs} | 0 syndicate/skeleton.rkt | 4 ++-- syndicate/smart-pattern.rkt | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) rename syndicate/schemas/{dataspace-patterns.prs => dataspacePatterns.prs} (100%) rename syndicate/schemas/{racket-event.prs => racketEvent.prs} (100%) rename syndicate/schemas/{secure-chat-protocol.prs => secureChatProtocol.prs} (100%) rename syndicate/schemas/{simple-chat-protocol.prs => simpleChatProtocol.prs} (100%) diff --git a/syndicate/dataspace.rkt b/syndicate/dataspace.rkt index 914e960..e13d3f1 100644 --- a/syndicate/dataspace.rkt +++ b/syndicate/dataspace.rkt @@ -3,8 +3,8 @@ ;;; SPDX-FileCopyrightText: Copyright © 2021 Tony Garnock-Jones (provide (all-from-out "schemas/gen/dataspace.rkt") - (all-from-out "schemas/gen/dataspace-patterns.rkt") - (all-from-out "schemas/gen/dataspace-patterns.meta.rkt") + (all-from-out "schemas/gen/dataspacePatterns.rkt") + (all-from-out "schemas/gen/dataspacePatterns.meta.rkt") dataspace actor-system/dataspace) @@ -24,8 +24,8 @@ (require "skeleton.rkt") (require "schemas/gen/dataspace.rkt") -(require "schemas/gen/dataspace-patterns.rkt") -(require "schemas/gen/dataspace-patterns.meta.rkt") +(require "schemas/gen/dataspacePatterns.rkt") +(require "schemas/gen/dataspacePatterns.meta.rkt") (define-logger syndicate/dataspace) diff --git a/syndicate/drivers/racket-event.rkt b/syndicate/drivers/racket-event.rkt index c3d7be5..cc5f8bf 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/racket-event)) +(provide (all-from-out syndicate/schemas/gen/racketEvent)) (require syndicate/driver-support) -(require syndicate/schemas/gen/racket-event) -(require syndicate/schemas/gen/dataspace-patterns) +(require syndicate/schemas/gen/racketEvent) +(require syndicate/schemas/gen/dataspacePatterns) (define-logger syndicate/drivers/racket-event) diff --git a/syndicate/drivers/tcp.rkt b/syndicate/drivers/tcp.rkt index 7032a9e..976cae5 100644 --- a/syndicate/drivers/tcp.rkt +++ b/syndicate/drivers/tcp.rkt @@ -13,7 +13,7 @@ (require syndicate/pattern) (require syndicate/drivers/stream) (require syndicate/schemas/gen/tcp) -(require syndicate/schemas/gen/dataspace-patterns) +(require syndicate/schemas/gen/dataspacePatterns) (require (for-syntax racket/base)) diff --git a/syndicate/drivers/timer.rkt b/syndicate/drivers/timer.rkt index 9622292..74dd286 100644 --- a/syndicate/drivers/timer.rkt +++ b/syndicate/drivers/timer.rkt @@ -8,7 +8,7 @@ (require syndicate/driver-support) (require syndicate/engine) (require syndicate/schemas/gen/timer) -(require syndicate/schemas/gen/dataspace-patterns) +(require syndicate/schemas/gen/dataspacePatterns) (require data/heap) (define-logger syndicate/drivers/timer) diff --git a/syndicate/pattern.rkt b/syndicate/pattern.rkt index 06f7707..949ee54 100644 --- a/syndicate/pattern.rkt +++ b/syndicate/pattern.rkt @@ -22,7 +22,7 @@ !dump-registered-preserves-patterns! - (all-from-out "schemas/gen/dataspace-patterns.rkt")) + (all-from-out "schemas/gen/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/dataspace-patterns.rkt") +(require "schemas/gen/dataspacePatterns.rkt") ;;--------------------------------------------------------------------------- diff --git a/syndicate/schema-compiler.rkt b/syndicate/schema-compiler.rkt index a27da07..e731020 100644 --- a/syndicate/schema-compiler.rkt +++ b/syndicate/schema-compiler.rkt @@ -27,8 +27,8 @@ paths) options) (define ds-path (match (schema-compiler-plugin-mode) - ['normal 'syndicate/schemas/gen/dataspace-patterns] - ['meta (lookup-module-path '(dataspace-patterns))])) + ['normal 'syndicate/schemas/gen/dataspacePatterns] + ['meta (lookup-module-path '(dataspacePatterns))])) (define meta? (match (schema-compiler-plugin-mode) ['normal #f] @@ -98,7 +98,7 @@ (p (in-list pats))] (define s (pat-pattern p)) (if (equal? s discard) `() `(,i ,p))))))] - [(CompoundPattern-tuple* fixed-pats variable-pat) + [(CompoundPattern-tuplePrefix fixed-pats variable-pat) `#,(raise-syntax-error ',name "Variable-length array cannot be used as a pattern")] [(CompoundPattern-dict entries) `(:pat:make-dict-pattern diff --git a/syndicate/schemas/dataspace.prs b/syndicate/schemas/dataspace.prs index b9f26ea..55866c5 100644 --- a/syndicate/schemas/dataspace.prs +++ b/syndicate/schemas/dataspace.prs @@ -1,4 +1,4 @@ version 1 . embeddedType EntityRef.Ref . -Observe = . +Observe = . diff --git a/syndicate/schemas/dataspace-patterns.prs b/syndicate/schemas/dataspacePatterns.prs similarity index 100% rename from syndicate/schemas/dataspace-patterns.prs rename to syndicate/schemas/dataspacePatterns.prs diff --git a/syndicate/schemas/racket-event.prs b/syndicate/schemas/racketEvent.prs similarity index 100% rename from syndicate/schemas/racket-event.prs rename to syndicate/schemas/racketEvent.prs diff --git a/syndicate/schemas/secure-chat-protocol.prs b/syndicate/schemas/secureChatProtocol.prs similarity index 100% rename from syndicate/schemas/secure-chat-protocol.prs rename to syndicate/schemas/secureChatProtocol.prs diff --git a/syndicate/schemas/service.prs b/syndicate/schemas/service.prs index 49b1af6..11ac336 100644 --- a/syndicate/schemas/service.prs +++ b/syndicate/schemas/service.prs @@ -1,5 +1,5 @@ version 1 . embeddedType EntityRef.Ref . -RequireService = . -ServiceRunning = . +RequireService = . +ServiceRunning = . diff --git a/syndicate/schemas/simple-chat-protocol.prs b/syndicate/schemas/simpleChatProtocol.prs similarity index 100% rename from syndicate/schemas/simple-chat-protocol.prs rename to syndicate/schemas/simpleChatProtocol.prs diff --git a/syndicate/skeleton.rkt b/syndicate/skeleton.rkt index c44ca7c..02908d6 100644 --- a/syndicate/skeleton.rkt +++ b/syndicate/skeleton.rkt @@ -37,13 +37,13 @@ ;; A `ConstructorSpec` specifies a record label with arity, or a list ;; arity, or a dictionary. ;; -;; ConstructorSpec = (U CRec CArr CDict) ;; from dataspace-patterns.prs +;; ConstructorSpec = (U CRec CArr CDict) ;; from dataspacePatterns.prs ;; (struct skeleton-node (continuation [edges #:mutable]) #:transparent) (struct skeleton-selector (pop-count key) #:transparent) ;; ;; A `Pattern` is a pattern over assertions, following the schema of -;; the same name in schemas/dataspace-patterns.prs. Instances of +;; the same name in schemas/dataspacePatterns.prs. Instances of ;; `Pattern` are usually produced by the `:pattern` macro and related ;; tooling. ;; diff --git a/syndicate/smart-pattern.rkt b/syndicate/smart-pattern.rkt index 14c76c3..630c109 100644 --- a/syndicate/smart-pattern.rkt +++ b/syndicate/smart-pattern.rkt @@ -13,7 +13,7 @@ (require racket/match) (require preserves) -(require syndicate/schemas/gen/dataspace-patterns) +(require syndicate/schemas/gen/dataspacePatterns) (define (rec label arity pats) (Pattern-DCompound (DCompound-rec (CRec label arity) pats)))