From e47a37e3f0622e3f4acbb3a9ce984f65666771e9 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 27 May 2021 10:36:35 +0200 Subject: [PATCH 01/19] First steps to an actual novy implementation --- .gitignore | 1 + box-protocol.prs | 9 +++++++++ dataspace.prs | 9 +++++++++ gatekeeper.prs | 5 +++++ protocol.prs | 14 +++++++++++++ secure-chat-protocol.prs | 14 +++++++++++++ simple-chat-protocol.prs | 5 +++++ sturdy.prs | 43 ++++++++++++++++++++++++++++++++++++++++ worker.prs | 4 ++++ 9 files changed, 104 insertions(+) create mode 100644 .gitignore create mode 100644 box-protocol.prs create mode 100644 dataspace.prs create mode 100644 gatekeeper.prs create mode 100644 protocol.prs create mode 100644 secure-chat-protocol.prs create mode 100644 simple-chat-protocol.prs create mode 100644 sturdy.prs create mode 100644 worker.prs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e8e450b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +gen/ diff --git a/box-protocol.prs b/box-protocol.prs new file mode 100644 index 0000000..d200d54 --- /dev/null +++ b/box-protocol.prs @@ -0,0 +1,9 @@ +version 1 . +embeddedType Actor.Ref . + +BoxState = . +SetBox = . + +; BoxCap = BoxState / . +; ClientCap = SetBox / . +. diff --git a/dataspace.prs b/dataspace.prs new file mode 100644 index 0000000..eadbd9a --- /dev/null +++ b/dataspace.prs @@ -0,0 +1,9 @@ +version 1 . +embeddedType Actor.Ref . + +;As implemented +Observe = . + +; ;As will be implemented soon +; Observe = . +. diff --git a/gatekeeper.prs b/gatekeeper.prs new file mode 100644 index 0000000..7673518 --- /dev/null +++ b/gatekeeper.prs @@ -0,0 +1,5 @@ +version 1 . +embeddedType Actor.Ref . + +Resolve = . +Bind = . diff --git a/protocol.prs b/protocol.prs new file mode 100644 index 0000000..1fe9c20 --- /dev/null +++ b/protocol.prs @@ -0,0 +1,14 @@ +version 1 . +embeddedType sturdy.WireRef . + +Assertion = any . +Handle = int . +Event = Assert / Retract / Message / Sync . +Oid = int . +Turn = [TurnEvent ...]. +TurnEvent = [@oid Oid @event Event]. + +Assert = . +Retract = . +Message = . +Sync = . diff --git a/secure-chat-protocol.prs b/secure-chat-protocol.prs new file mode 100644 index 0000000..951e950 --- /dev/null +++ b/secure-chat-protocol.prs @@ -0,0 +1,14 @@ +version 1 . +embeddedType Actor.Ref . + +UserId = int . + +Join = . + +NickClaim = . + +UserInfo = . + +Says = . + +NickConflict = . diff --git a/simple-chat-protocol.prs b/simple-chat-protocol.prs new file mode 100644 index 0000000..987c1f4 --- /dev/null +++ b/simple-chat-protocol.prs @@ -0,0 +1,5 @@ +version 1 . +embeddedType Actor.Ref . + +Present = . +Says = . diff --git a/sturdy.prs b/sturdy.prs new file mode 100644 index 0000000..630f395 --- /dev/null +++ b/sturdy.prs @@ -0,0 +1,43 @@ +version 1 . + +; Each Attenuation is a stage. The sequence of Attenuations is run RIGHT-TO-LEFT. +; That is, the newest Attenuations are at the right. +SturdyRef = . + +; An individual Attenuation is run RIGHT-TO-LEFT. +; That is, the newest Caveats are at the right. +Attenuation = [Caveat ...]. + +; embodies 1st-party caveats over assertion structure, but nothing else +; can add 3rd-party caveats and richer predicates later +Caveat = Rewrite / Alts . +Rewrite = . +Alts = . + +Oid = int . +WireRef = @mine [0 @oid Oid] / @yours [1 @oid Oid @attenuation Caveat ...]. + +;--------------------------------------------------------------------------- + +ConstructorSpec = CRec / CArr / CDict . +CRec = . +CArr = . +CDict = . + +Lit = . + +Pattern = PDiscard / PAtom / PEmbedded / PBind / PAnd / PNot / Lit / PCompound . +PDiscard = <_>. +PAtom = =Boolean / =Float / =Double / =SignedInteger / =String / =ByteString / =Symbol . +PEmbedded = =Embedded . +PBind = . +PAnd = . +PNot = . +PCompound = . +PCompoundMembers = { any: Pattern ...:... }. + +Template = TRef / Lit / TCompound . +TRef = . +TCompound = . +TCompoundMembers = { any: Template ...:... }. + diff --git a/worker.prs b/worker.prs new file mode 100644 index 0000000..e35abd9 --- /dev/null +++ b/worker.prs @@ -0,0 +1,4 @@ +version 1 . +embeddedType Actor.Ref . + +Instance = . From 3412eabcff7ab452ffe0afc72f6fb2da5d6e02f0 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 2 Jun 2021 06:57:48 +0200 Subject: [PATCH 02/19] Update schemas for new embedded syntax; steps toward pattern support --- dataspace-patterns.prs | 11 +++++++++++ dataspace.prs | 7 +------ gatekeeper.prs | 4 ++-- protocol.prs | 2 +- secure-chat-protocol.prs | 11 +++++++++-- 5 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 dataspace-patterns.prs diff --git a/dataspace-patterns.prs b/dataspace-patterns.prs new file mode 100644 index 0000000..2740763 --- /dev/null +++ b/dataspace-patterns.prs @@ -0,0 +1,11 @@ +version 1 . + +; Dataspace patterns: a sublanguage of attenuation patterns. +Pattern = DDiscard / DBind / DLit / DCompound . + +DDiscard = <_>. +DBind = . +DLit = . +DCompound = @rec @members { int: Pattern ...:... }> + / @arr @members { int: Pattern ...:... }> + / @dict @members { any: Pattern ...:... }> . diff --git a/dataspace.prs b/dataspace.prs index eadbd9a..3160df1 100644 --- a/dataspace.prs +++ b/dataspace.prs @@ -1,9 +1,4 @@ version 1 . embeddedType Actor.Ref . -;As implemented -Observe = . - -; ;As will be implemented soon -; Observe = . -. +Observe = . diff --git a/gatekeeper.prs b/gatekeeper.prs index 7673518..d8be377 100644 --- a/gatekeeper.prs +++ b/gatekeeper.prs @@ -1,5 +1,5 @@ version 1 . embeddedType Actor.Ref . -Resolve = . -Bind = . +Resolve = . +Bind = . diff --git a/protocol.prs b/protocol.prs index 1fe9c20..b86a66d 100644 --- a/protocol.prs +++ b/protocol.prs @@ -11,4 +11,4 @@ TurnEvent = [@oid Oid @event Event]. Assert = . Retract = . Message = . -Sync = . +Sync = . diff --git a/secure-chat-protocol.prs b/secure-chat-protocol.prs index 951e950..c20c8e0 100644 --- a/secure-chat-protocol.prs +++ b/secure-chat-protocol.prs @@ -3,9 +3,16 @@ embeddedType Actor.Ref . UserId = int . -Join = . +Join = . -NickClaim = . +Session = @observeUsers + / @observeSpeech + / NickClaim + / Says +. + +NickClaim = . +NickClaimResponse = #t / NickConflict . UserInfo = . From a932fa1428ddcb26cf684aa50e7d124936bacd9f Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 3 Jun 2021 15:58:48 +0200 Subject: [PATCH 03/19] Pattern decomposition --- dataspace-patterns.prs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dataspace-patterns.prs b/dataspace-patterns.prs index 2740763..bfba3ad 100644 --- a/dataspace-patterns.prs +++ b/dataspace-patterns.prs @@ -6,6 +6,10 @@ Pattern = DDiscard / DBind / DLit / DCompound . DDiscard = <_>. DBind = . DLit = . -DCompound = @rec @members { int: Pattern ...:... }> - / @arr @members { int: Pattern ...:... }> - / @dict @members { any: Pattern ...:... }> . +DCompound = @rec + / @arr + / @dict . + +CRec = . +CArr = . +CDict = . From 930f7eda00d9e23771a7a0dea7d829bad7f628fa Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 3 Jun 2021 23:22:46 +0200 Subject: [PATCH 04/19] Move box-protocol to a #lang preserves-schema module --- box-protocol.prs | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 box-protocol.prs diff --git a/box-protocol.prs b/box-protocol.prs deleted file mode 100644 index d200d54..0000000 --- a/box-protocol.prs +++ /dev/null @@ -1,9 +0,0 @@ -version 1 . -embeddedType Actor.Ref . - -BoxState = . -SetBox = . - -; BoxCap = BoxState / . -; ClientCap = SetBox / . -. From 8cbe2475e3bb09c8e9cb1622cdd4130b27723737 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 9 Jun 2021 15:06:58 +0200 Subject: [PATCH 05/19] TAttenuate --- dataspace.prs | 2 +- gatekeeper.prs | 2 +- secure-chat-protocol.prs | 2 +- simple-chat-protocol.prs | 2 +- sturdy.prs | 3 ++- worker.prs | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dataspace.prs b/dataspace.prs index 3160df1..b9f26ea 100644 --- a/dataspace.prs +++ b/dataspace.prs @@ -1,4 +1,4 @@ version 1 . -embeddedType Actor.Ref . +embeddedType EntityRef.Ref . Observe = . diff --git a/gatekeeper.prs b/gatekeeper.prs index d8be377..a25d6c3 100644 --- a/gatekeeper.prs +++ b/gatekeeper.prs @@ -1,5 +1,5 @@ version 1 . -embeddedType Actor.Ref . +embeddedType EntityRef.Ref . Resolve = . Bind = . diff --git a/secure-chat-protocol.prs b/secure-chat-protocol.prs index c20c8e0..09e9e7e 100644 --- a/secure-chat-protocol.prs +++ b/secure-chat-protocol.prs @@ -1,5 +1,5 @@ version 1 . -embeddedType Actor.Ref . +embeddedType EntityRef.Ref . UserId = int . diff --git a/simple-chat-protocol.prs b/simple-chat-protocol.prs index 987c1f4..33804eb 100644 --- a/simple-chat-protocol.prs +++ b/simple-chat-protocol.prs @@ -1,5 +1,5 @@ version 1 . -embeddedType Actor.Ref . +embeddedType EntityRef.Ref . Present = . Says = . diff --git a/sturdy.prs b/sturdy.prs index 630f395..f82dd4e 100644 --- a/sturdy.prs +++ b/sturdy.prs @@ -36,7 +36,8 @@ PNot = . PCompound = . PCompoundMembers = { any: Pattern ...:... }. -Template = TRef / Lit / TCompound . +Template = TAttenuate / TRef / Lit / TCompound . +TAttenuate = . TRef = . TCompound = . TCompoundMembers = { any: Template ...:... }. diff --git a/worker.prs b/worker.prs index e35abd9..25783b5 100644 --- a/worker.prs +++ b/worker.prs @@ -1,4 +1,4 @@ version 1 . -embeddedType Actor.Ref . +embeddedType EntityRef.Ref . Instance = . From 201f5433e1978108c550d902a9aad8825be4720b Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 9 Jun 2021 23:08:06 +0200 Subject: [PATCH 06/19] Port timer driver from older syndicate/rkt implementation --- timer.prs | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 timer.prs diff --git a/timer.prs b/timer.prs new file mode 100644 index 0000000..30ea166 --- /dev/null +++ b/timer.prs @@ -0,0 +1,7 @@ +version 1 . + +SetTimer = . +TimerExpired = . +TimerKind = =relative / =absolute / =clear . + +LaterThan = . From 8b5e74048e35673cbd26b00e278e296186d2aeb8 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 10 Jun 2021 10:00:43 +0200 Subject: [PATCH 07/19] Beginnings of a TCP driver --- tcp.prs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 tcp.prs diff --git a/tcp.prs b/tcp.prs new file mode 100644 index 0000000..952c4f3 --- /dev/null +++ b/tcp.prs @@ -0,0 +1,17 @@ +version 1 . +embeddedType EntityRef.Ref . + +Connection = . +ConnectionPeer = . + +TcpOutbound = . +TcpInbound = . + +ActiveSocket = + / + / + / Socket +. + +; TODO: +Socket = . From 21d09f81e546e9c73c08dd48d4fa0638d0223f23 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 10 Jun 2021 13:33:16 +0200 Subject: [PATCH 08/19] ActiveSocket-close now gets a string, not an embedded exn --- tcp.prs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcp.prs b/tcp.prs index 952c4f3..d41eaed 100644 --- a/tcp.prs +++ b/tcp.prs @@ -9,7 +9,7 @@ TcpInbound = . ActiveSocket = / - / + / / Socket . From b0d0eb3a11df4206ffa2351d11aebde5c413e9d1 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 10 Jun 2021 13:34:18 +0200 Subject: [PATCH 09/19] drivers/racket-event.rkt --- racket-event.prs | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 racket-event.prs diff --git a/racket-event.prs b/racket-event.prs new file mode 100644 index 0000000..36985a7 --- /dev/null +++ b/racket-event.prs @@ -0,0 +1,3 @@ +version 1 . + +RacketEvent = . From 5850c5b06dff53caf7edc8ac42515e7556f0631a Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 11 Jun 2021 14:18:53 +0200 Subject: [PATCH 10/19] Credit-based flow control on tcp driver; line mode --- tcp.prs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/tcp.prs b/tcp.prs index d41eaed..c0bbd24 100644 --- a/tcp.prs +++ b/tcp.prs @@ -13,5 +13,15 @@ ActiveSocket = / Socket . -; TODO: -Socket = . +Socket = + / Credit + / + / + / +. + +LineMode = =lf / =crlf . + +Credit = . +CreditMode = =bytes / @lines LineMode . +CreditAmount = @count int / @unbounded =unbounded . From afe36c630d22dfd2e68250ebc6a74fd38a530a9d Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 11 Jun 2021 15:29:12 +0200 Subject: [PATCH 11/19] Refactor/repair tcp.prs and tcp.rkt --- tcp.prs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tcp.prs b/tcp.prs index c0bbd24..ad854f8 100644 --- a/tcp.prs +++ b/tcp.prs @@ -14,14 +14,12 @@ ActiveSocket = . Socket = - / Credit - / - / + / + / / . -LineMode = =lf / =crlf . - -Credit = . -CreditMode = =bytes / @lines LineMode . CreditAmount = @count int / @unbounded =unbounded . + +Mode = =bytes / @lines LineMode . +LineMode = =lf / =crlf . From f6cb595709ce1b690402b2af38bedd0df5d952d4 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Tue, 15 Jun 2021 12:36:25 +0200 Subject: [PATCH 12/19] Add ConnectionPeer assertions; rename TcpOutbound -> TcpRemote and TcpInbound -> TcpLocal --- tcp.prs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcp.prs b/tcp.prs index ad854f8..02714a0 100644 --- a/tcp.prs +++ b/tcp.prs @@ -4,8 +4,8 @@ embeddedType EntityRef.Ref . Connection = . ConnectionPeer = . -TcpOutbound = . -TcpInbound = . +TcpRemote = . +TcpLocal = . ActiveSocket = / From a73b6a9f4ad12613675dcb929ada5156dcb1fa84 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Tue, 15 Jun 2021 12:46:09 +0200 Subject: [PATCH 13/19] Whole-packet flow credit --- tcp.prs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcp.prs b/tcp.prs index 02714a0..9239133 100644 --- a/tcp.prs +++ b/tcp.prs @@ -21,5 +21,5 @@ Socket = CreditAmount = @count int / @unbounded =unbounded . -Mode = =bytes / @lines LineMode . +Mode = =bytes / @lines LineMode / . LineMode = =lf / =crlf . From b6bc816daff0525f365bac30c4559c983d53ce38 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Wed, 16 Jun 2021 21:41:53 +0200 Subject: [PATCH 14/19] Split out experimental "stream" protocols; make tcp.rkt use them; more inertness checks Also, a few other important changes: - Better printing of entity-ref structs - Inertness checks on assertion retraction (!) and preventer-disarm - Correct selection of active facet during dataflow recomputations - Repair silly omission in turn-assert/dataflow! --- stream.prs | 43 +++++++++++++++++++++++++++++++++++++++++++ tcp.prs | 24 +++--------------------- 2 files changed, 46 insertions(+), 21 deletions(-) create mode 100644 stream.prs diff --git a/stream.prs b/stream.prs new file mode 100644 index 0000000..918c8f9 --- /dev/null +++ b/stream.prs @@ -0,0 +1,43 @@ +version 1 . +embeddedType EntityRef.Ref . + +StreamConnection = . + +; Assertion +StreamListener = . + +; Assertion +StreamConnect = . + +; Assertion +ConnectionHandler = + / @connected + / @rejected +. + +; Assertion +StreamError = . + +Source = + ; Assertions: + / + / StreamError + + ; Messages: + / +. + +Sink = + ; Assertions: + / + / StreamError + + ; Messages: + / + / +. + +CreditAmount = @count int / @unbounded =unbounded . + +Mode = =bytes / @lines LineMode / / . +LineMode = =lf / =crlf . diff --git a/tcp.prs b/tcp.prs index 9239133..7a6d5e1 100644 --- a/tcp.prs +++ b/tcp.prs @@ -1,25 +1,7 @@ version 1 . embeddedType EntityRef.Ref . -Connection = . -ConnectionPeer = . +TcpRemote = . +TcpLocal = . -TcpRemote = . -TcpLocal = . - -ActiveSocket = - / - / - / Socket -. - -Socket = - / - / - / -. - -CreditAmount = @count int / @unbounded =unbounded . - -Mode = =bytes / @lines LineMode / . -LineMode = =lf / =crlf . +TcpPeerInfo = . From 6cfe8c2ba4fe220eae00cc706a5be3deccaa6be0 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 17 Jun 2021 13:38:30 +0200 Subject: [PATCH 15/19] `when` -> `on`; StreamConnection API; better `this-target`; tcp-listen errors - spec-generic StreamConnection translators, for simple TCP API - `when` -> `on`, better use for event-expanders - Removal of special processing of `at`, making `this-target` properly lexically scopeable - TcpListenError and handling of tcp-listen errors - SYNDICATE_COLUMNS for pretty-printing of dataspace traces - Repair driver-support.rkt thread shutdown turn-taking - Refinements to stream protocols and implementation - Improvements to syntax location preservation in syntax.rkt --- stream.prs | 3 +++ tcp.prs | 2 ++ 2 files changed, 5 insertions(+) diff --git a/stream.prs b/stream.prs index 918c8f9..a565087 100644 --- a/stream.prs +++ b/stream.prs @@ -1,7 +1,10 @@ version 1 . embeddedType EntityRef.Ref . +; Assertions StreamConnection = . +StreamSpecListenable = . +StreamSpecConnectable = . ; Assertion StreamListener = . diff --git a/tcp.prs b/tcp.prs index 7a6d5e1..b00df01 100644 --- a/tcp.prs +++ b/tcp.prs @@ -5,3 +5,5 @@ TcpRemote = . TcpLocal = . TcpPeerInfo = . + +TcpListenError = . From cf93327ed654f705c3715e8a52177ad99da594c5 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 17 Jun 2021 14:57:06 +0200 Subject: [PATCH 16/19] Services and service activation --- service.prs | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 service.prs diff --git a/service.prs b/service.prs new file mode 100644 index 0000000..49b1af6 --- /dev/null +++ b/service.prs @@ -0,0 +1,5 @@ +version 1 . +embeddedType EntityRef.Ref . + +RequireService = . +ServiceRunning = . From 824b078eaccf3e26c8416e5f0f044f1c0eb23e10 Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 18 Jun 2021 13:48:12 +0200 Subject: [PATCH 17/19] Simpler stream connection protocol. --- stream.prs | 22 +++++++--------------- tcp.prs | 2 -- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/stream.prs b/stream.prs index a565087..a8c7ecc 100644 --- a/stream.prs +++ b/stream.prs @@ -1,24 +1,14 @@ version 1 . embeddedType EntityRef.Ref . -; Assertions +; Assertion: StreamConnection = . -StreamSpecListenable = . -StreamSpecConnectable = . -; Assertion -StreamListener = . +; Assertions: +StreamListenerReady = . +StreamListenerError = . -; Assertion -StreamConnect = . - -; Assertion -ConnectionHandler = - / @connected - / @rejected -. - -; Assertion +; Assertion: StreamError = . Source = @@ -40,7 +30,9 @@ Sink = / . +; Value: CreditAmount = @count int / @unbounded =unbounded . +; Value: Mode = =bytes / @lines LineMode / / . LineMode = =lf / =crlf . diff --git a/tcp.prs b/tcp.prs index b00df01..7a6d5e1 100644 --- a/tcp.prs +++ b/tcp.prs @@ -5,5 +5,3 @@ TcpRemote = . TcpLocal = . TcpPeerInfo = . - -TcpListenError = . From e034486aaa96d08ecd85461904b1559564464e5a Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Fri, 25 Jun 2021 09:45:38 +0200 Subject: [PATCH 18/19] Update schemas to match new identifier restrictions. --- dataspace.prs | 2 +- dataspace-patterns.prs => dataspacePatterns.prs | 0 racket-event.prs => racketEvent.prs | 0 secure-chat-protocol.prs => secureChatProtocol.prs | 0 service.prs | 4 ++-- simple-chat-protocol.prs => simpleChatProtocol.prs | 0 6 files changed, 3 insertions(+), 3 deletions(-) rename dataspace-patterns.prs => dataspacePatterns.prs (100%) rename racket-event.prs => racketEvent.prs (100%) rename secure-chat-protocol.prs => secureChatProtocol.prs (100%) rename simple-chat-protocol.prs => simpleChatProtocol.prs (100%) diff --git a/dataspace.prs b/dataspace.prs index b9f26ea..55866c5 100644 --- a/dataspace.prs +++ b/dataspace.prs @@ -1,4 +1,4 @@ version 1 . embeddedType EntityRef.Ref . -Observe = . +Observe = . diff --git a/dataspace-patterns.prs b/dataspacePatterns.prs similarity index 100% rename from dataspace-patterns.prs rename to dataspacePatterns.prs diff --git a/racket-event.prs b/racketEvent.prs similarity index 100% rename from racket-event.prs rename to racketEvent.prs diff --git a/secure-chat-protocol.prs b/secureChatProtocol.prs similarity index 100% rename from secure-chat-protocol.prs rename to secureChatProtocol.prs diff --git a/service.prs b/service.prs index 49b1af6..11ac336 100644 --- a/service.prs +++ b/service.prs @@ -1,5 +1,5 @@ version 1 . embeddedType EntityRef.Ref . -RequireService = . -ServiceRunning = . +RequireService = . +ServiceRunning = . diff --git a/simple-chat-protocol.prs b/simpleChatProtocol.prs similarity index 100% rename from simple-chat-protocol.prs rename to simpleChatProtocol.prs From 93c196acaaf85e406f579a94489af5f1ade04ebd Mon Sep 17 00:00:00 2001 From: Tony Garnock-Jones Date: Thu, 1 Jul 2021 09:51:53 +0200 Subject: [PATCH 19/19] Move schemas into subdirectory after subtree split --- .gitignore | 1 - dataspace.prs => schemas/dataspace.prs | 0 dataspacePatterns.prs => schemas/dataspacePatterns.prs | 0 gatekeeper.prs => schemas/gatekeeper.prs | 0 protocol.prs => schemas/protocol.prs | 0 racketEvent.prs => schemas/racketEvent.prs | 0 secureChatProtocol.prs => schemas/secureChatProtocol.prs | 0 service.prs => schemas/service.prs | 0 simpleChatProtocol.prs => schemas/simpleChatProtocol.prs | 0 stream.prs => schemas/stream.prs | 0 sturdy.prs => schemas/sturdy.prs | 0 tcp.prs => schemas/tcp.prs | 0 timer.prs => schemas/timer.prs | 0 worker.prs => schemas/worker.prs | 0 14 files changed, 1 deletion(-) delete mode 100644 .gitignore rename dataspace.prs => schemas/dataspace.prs (100%) rename dataspacePatterns.prs => schemas/dataspacePatterns.prs (100%) rename gatekeeper.prs => schemas/gatekeeper.prs (100%) rename protocol.prs => schemas/protocol.prs (100%) rename racketEvent.prs => schemas/racketEvent.prs (100%) rename secureChatProtocol.prs => schemas/secureChatProtocol.prs (100%) rename service.prs => schemas/service.prs (100%) rename simpleChatProtocol.prs => schemas/simpleChatProtocol.prs (100%) rename stream.prs => schemas/stream.prs (100%) rename sturdy.prs => schemas/sturdy.prs (100%) rename tcp.prs => schemas/tcp.prs (100%) rename timer.prs => schemas/timer.prs (100%) rename worker.prs => schemas/worker.prs (100%) diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e8e450b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -gen/ diff --git a/dataspace.prs b/schemas/dataspace.prs similarity index 100% rename from dataspace.prs rename to schemas/dataspace.prs diff --git a/dataspacePatterns.prs b/schemas/dataspacePatterns.prs similarity index 100% rename from dataspacePatterns.prs rename to schemas/dataspacePatterns.prs diff --git a/gatekeeper.prs b/schemas/gatekeeper.prs similarity index 100% rename from gatekeeper.prs rename to schemas/gatekeeper.prs diff --git a/protocol.prs b/schemas/protocol.prs similarity index 100% rename from protocol.prs rename to schemas/protocol.prs diff --git a/racketEvent.prs b/schemas/racketEvent.prs similarity index 100% rename from racketEvent.prs rename to schemas/racketEvent.prs diff --git a/secureChatProtocol.prs b/schemas/secureChatProtocol.prs similarity index 100% rename from secureChatProtocol.prs rename to schemas/secureChatProtocol.prs diff --git a/service.prs b/schemas/service.prs similarity index 100% rename from service.prs rename to schemas/service.prs diff --git a/simpleChatProtocol.prs b/schemas/simpleChatProtocol.prs similarity index 100% rename from simpleChatProtocol.prs rename to schemas/simpleChatProtocol.prs diff --git a/stream.prs b/schemas/stream.prs similarity index 100% rename from stream.prs rename to schemas/stream.prs diff --git a/sturdy.prs b/schemas/sturdy.prs similarity index 100% rename from sturdy.prs rename to schemas/sturdy.prs diff --git a/tcp.prs b/schemas/tcp.prs similarity index 100% rename from tcp.prs rename to schemas/tcp.prs diff --git a/timer.prs b/schemas/timer.prs similarity index 100% rename from timer.prs rename to schemas/timer.prs diff --git a/worker.prs b/schemas/worker.prs similarity index 100% rename from worker.prs rename to schemas/worker.prs