diff --git a/ipc/ipdl/test/ipdl/error/Nullable.ipdl b/ipc/ipdl/test/ipdl/error/Nullable.ipdl index 93dfe1b46100..e1dd6fd55e6a 100644 --- a/ipc/ipdl/test/ipdl/error/Nullable.ipdl +++ b/ipc/ipdl/test/ipdl/error/Nullable.ipdl @@ -1,6 +1,6 @@ //error: `nullable' qualifier for type `int' makes no sense -protocol Nullable { +protocol PNullable { child: async Msg(nullable int i); }; diff --git a/ipc/ipdl/test/ipdl/error/PasyncMessageListed.ipdl b/ipc/ipdl/test/ipdl/error/PasyncMessageListed.ipdl new file mode 100644 index 000000000000..6a3cdad0eef3 --- /dev/null +++ b/ipc/ipdl/test/ipdl/error/PasyncMessageListed.ipdl @@ -0,0 +1,6 @@ +//error: IPC message PasyncMessageListed::Msg is async, can be delisted + +protocol PasyncMessageListed { +parent: + async Msg(); +}; diff --git a/ipc/ipdl/test/ipdl/error/asyncMessageListed.ipdl b/ipc/ipdl/test/ipdl/error/asyncMessageListed.ipdl deleted file mode 100644 index de22ad51b9c6..000000000000 --- a/ipc/ipdl/test/ipdl/error/asyncMessageListed.ipdl +++ /dev/null @@ -1,6 +0,0 @@ -//error: IPC message asyncMessageListed::Msg is async, can be delisted - -protocol asyncMessageListed { -parent: - async Msg(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/Delete.ipdl b/ipc/ipdl/test/ipdl/ok/Delete.ipdl deleted file mode 100644 index 311d82537629..000000000000 --- a/ipc/ipdl/test/ipdl/ok/Delete.ipdl +++ /dev/null @@ -1,8 +0,0 @@ -include protocol DeleteSub; - -sync protocol Delete { - manages DeleteSub; - -child: - async DeleteSub(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/DeleteSub.ipdl b/ipc/ipdl/test/ipdl/ok/DeleteSub.ipdl deleted file mode 100644 index 67a64c554357..000000000000 --- a/ipc/ipdl/test/ipdl/ok/DeleteSub.ipdl +++ /dev/null @@ -1,10 +0,0 @@ -include protocol Delete; - -sync protocol DeleteSub { - manager Delete; - -parent: - sync __delete__(int x) returns (double d); - -}; - diff --git a/ipc/ipdl/test/ipdl/ok/EndpointDecl.ipdl b/ipc/ipdl/test/ipdl/ok/EndpointDecl.ipdl deleted file mode 100644 index 4a0a8f6bc1fb..000000000000 --- a/ipc/ipdl/test/ipdl/ok/EndpointDecl.ipdl +++ /dev/null @@ -1,18 +0,0 @@ - -// Basic test that Endpoint types are declared for protocols, within -// that protocol. - -struct Whatever { - Endpoint par; - Endpoint chi; -}; - -namespace mozilla { - -protocol EndpointDecl { - child: - async Message(Endpoint aEndpointParent, - Endpoint aEndpointChild); -}; - -} diff --git a/ipc/ipdl/test/ipdl/ok/EndpointUse.ipdl b/ipc/ipdl/test/ipdl/ok/EndpointUse.ipdl deleted file mode 100644 index bea2282d5293..000000000000 --- a/ipc/ipdl/test/ipdl/ok/EndpointUse.ipdl +++ /dev/null @@ -1,9 +0,0 @@ -include protocol EndpointDecl; - -// Basic test that Endpoint types are declared for included protocols. - -protocol EndpointUse { - child: - async Message(Endpoint aEndpointParent, - Endpoint aEndpointChild); -}; diff --git a/ipc/ipdl/test/ipdl/ok/Nullable.ipdl b/ipc/ipdl/test/ipdl/ok/Nullable.ipdl deleted file mode 100644 index 6a81e125d969..000000000000 --- a/ipc/ipdl/test/ipdl/ok/Nullable.ipdl +++ /dev/null @@ -1,11 +0,0 @@ -union Union { - nullable Nullable; - nullable Nullable[]; -}; - -protocol Nullable { -child: - async Msg(nullable Nullable n); - async Msg2(nullable Nullable[] N); - async Msg3(Union u); -}; diff --git a/ipc/ipdl/test/ipdl/ok/AsyncReturn.ipdl b/ipc/ipdl/test/ipdl/ok/PAsyncReturn.ipdl similarity index 87% rename from ipc/ipdl/test/ipdl/ok/AsyncReturn.ipdl rename to ipc/ipdl/test/ipdl/ok/PAsyncReturn.ipdl index 0343496bb950..89c2a7c6473d 100644 --- a/ipc/ipdl/test/ipdl/ok/AsyncReturn.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PAsyncReturn.ipdl @@ -2,7 +2,7 @@ //error: asynchronous message `Msg' declares return values -protocol AsyncReturn { +protocol PAsyncReturn { child: async Msg() returns(int32_t aNumber); }; diff --git a/ipc/ipdl/test/ipdl/ok/PDelete.ipdl b/ipc/ipdl/test/ipdl/ok/PDelete.ipdl new file mode 100644 index 000000000000..f2f85fd7faaa --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PDelete.ipdl @@ -0,0 +1,8 @@ +include protocol PDeleteSub; + +sync protocol PDelete { + manages PDeleteSub; + +child: + async PDeleteSub(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/PDeleteSub.ipdl b/ipc/ipdl/test/ipdl/ok/PDeleteSub.ipdl new file mode 100644 index 000000000000..12b4c677eb32 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PDeleteSub.ipdl @@ -0,0 +1,10 @@ +include protocol PDelete; + +sync protocol PDeleteSub { + manager PDelete; + +parent: + sync __delete__(int x) returns (double d); + +}; + diff --git a/ipc/ipdl/test/ipdl/ok/PEndpointDecl.ipdl b/ipc/ipdl/test/ipdl/ok/PEndpointDecl.ipdl new file mode 100644 index 000000000000..25f58f3f6354 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PEndpointDecl.ipdl @@ -0,0 +1,18 @@ + +// Basic test that Endpoint types are declared for protocols, within +// that protocol. + +struct Whatever { + Endpoint par; + Endpoint chi; +}; + +namespace mozilla { + +protocol PEndpointDecl { + child: + async Message(Endpoint aEndpointParent, + Endpoint aEndpointChild); +}; + +} diff --git a/ipc/ipdl/test/ipdl/ok/PEndpointUse.ipdl b/ipc/ipdl/test/ipdl/ok/PEndpointUse.ipdl new file mode 100644 index 000000000000..0c776b359ccb --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PEndpointUse.ipdl @@ -0,0 +1,9 @@ +include protocol PEndpointDecl; + +// Basic test that Endpoint types are declared for included protocols. + +protocol PEndpointUse { + child: + async Message(Endpoint aEndpointParent, + Endpoint aEndpointChild); +}; diff --git a/ipc/ipdl/test/ipdl/ok/PNullable.ipdl b/ipc/ipdl/test/ipdl/ok/PNullable.ipdl new file mode 100644 index 000000000000..bd83c0c43635 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PNullable.ipdl @@ -0,0 +1,11 @@ +union Union { + nullable PNullable; + nullable PNullable[]; +}; + +protocol PNullable { +child: + async Msg(nullable PNullable n); + async Msg2(nullable PNullable[] N); + async Msg3(Union u); +}; diff --git a/ipc/ipdl/test/ipdl/ok/Struct.ipdl b/ipc/ipdl/test/ipdl/ok/PStruct.ipdl similarity index 82% rename from ipc/ipdl/test/ipdl/ok/Struct.ipdl rename to ipc/ipdl/test/ipdl/ok/PStruct.ipdl index da3ca055a9e5..c670a83b0b6c 100644 --- a/ipc/ipdl/test/ipdl/ok/Struct.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PStruct.ipdl @@ -3,7 +3,7 @@ struct S { double d; }; -sync protocol Struct { +sync protocol PStruct { parent: sync test(S s) returns (S ss); async __delete__(); diff --git a/ipc/ipdl/test/ipdl/ok/PSyncSyncManagee.ipdl b/ipc/ipdl/test/ipdl/ok/PSyncSyncManagee.ipdl new file mode 100644 index 000000000000..458f0c83c074 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PSyncSyncManagee.ipdl @@ -0,0 +1,7 @@ +include protocol PSyncSyncManager; + +sync protocol PSyncSyncManagee { + manager PSyncSyncManager; +child: + async __delete__(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/SyncSyncManager.ipdl b/ipc/ipdl/test/ipdl/ok/PSyncSyncManager.ipdl similarity index 54% rename from ipc/ipdl/test/ipdl/ok/SyncSyncManager.ipdl rename to ipc/ipdl/test/ipdl/ok/PSyncSyncManager.ipdl index dc95808fe430..40ed425a361e 100644 --- a/ipc/ipdl/test/ipdl/ok/SyncSyncManager.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PSyncSyncManager.ipdl @@ -1,11 +1,11 @@ -include protocol SyncSyncManagee; +include protocol PSyncSyncManagee; /* The main reason for this test is that it would have caught a bug * in the Rust IPDL parser that was treating "sync" like "async" in the * nested case. */ -nested(upto not) sync protocol SyncSyncManager { - manages SyncSyncManagee; +nested(upto not) sync protocol PSyncSyncManager { + manages PSyncSyncManagee; parent: - async SyncSyncManagee(); + async PSyncSyncManagee(); }; diff --git a/ipc/ipdl/test/ipdl/ok/Pactorparam.ipdl b/ipc/ipdl/test/ipdl/ok/Pactorparam.ipdl new file mode 100644 index 000000000000..0cba299cf563 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/Pactorparam.ipdl @@ -0,0 +1,5 @@ +protocol Pactorparam { + +child: async Msg(Pactorparam p); + +}; diff --git a/ipc/ipdl/test/ipdl/ok/Pactorreturn.ipdl b/ipc/ipdl/test/ipdl/ok/Pactorreturn.ipdl new file mode 100644 index 000000000000..99d0d3622570 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/Pactorreturn.ipdl @@ -0,0 +1,6 @@ +sync protocol Pactorreturn { + +parent: + sync Msg(Pactorreturn p) returns (Pactorreturn r); + +}; diff --git a/ipc/ipdl/test/ipdl/ok/array_Basic.ipdl b/ipc/ipdl/test/ipdl/ok/Parray_Basic.ipdl similarity index 61% rename from ipc/ipdl/test/ipdl/ok/array_Basic.ipdl rename to ipc/ipdl/test/ipdl/ok/Parray_Basic.ipdl index 391917708a83..811c01f32403 100644 --- a/ipc/ipdl/test/ipdl/ok/array_Basic.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Parray_Basic.ipdl @@ -1,4 +1,4 @@ -protocol array_Basic { +protocol Parray_Basic { child: async Msg(int[] array); }; diff --git a/ipc/ipdl/test/ipdl/ok/Parray_OfActors.ipdl b/ipc/ipdl/test/ipdl/ok/Parray_OfActors.ipdl new file mode 100644 index 000000000000..b084c2c46483 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/Parray_OfActors.ipdl @@ -0,0 +1,10 @@ +include protocol Parray_OfActorsSub; + +protocol Parray_OfActors { + manages Parray_OfActorsSub; + +child: + async Msg(Parray_OfActorsSub[] p); + + async Parray_OfActorsSub(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/Parray_OfActorsSub.ipdl b/ipc/ipdl/test/ipdl/ok/Parray_OfActorsSub.ipdl new file mode 100644 index 000000000000..6769e98abb75 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/Parray_OfActorsSub.ipdl @@ -0,0 +1,7 @@ +include protocol Parray_OfActors; + +protocol Parray_OfActorsSub { + manager Parray_OfActors; + +child: async __delete__(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/array_Union.ipdl b/ipc/ipdl/test/ipdl/ok/Parray_Union.ipdl similarity index 79% rename from ipc/ipdl/test/ipdl/ok/array_Union.ipdl rename to ipc/ipdl/test/ipdl/ok/Parray_Union.ipdl index 64d8adbd7bf3..33c94e7ae533 100644 --- a/ipc/ipdl/test/ipdl/ok/array_Union.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Parray_Union.ipdl @@ -4,7 +4,7 @@ union Union { double; }; -sync protocol array_Union { +sync protocol Parray_Union { parent: sync Msg(Union u, Union[] au) returns (Union r); }; diff --git a/ipc/ipdl/test/ipdl/ok/basicUsing.ipdl b/ipc/ipdl/test/ipdl/ok/PbasicUsing.ipdl similarity index 95% rename from ipc/ipdl/test/ipdl/ok/basicUsing.ipdl rename to ipc/ipdl/test/ipdl/ok/PbasicUsing.ipdl index 4c6d77106784..54bf7b3424f8 100644 --- a/ipc/ipdl/test/ipdl/ok/basicUsing.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PbasicUsing.ipdl @@ -16,7 +16,7 @@ union SomeUnion SomeRefcountedStruct; }; -protocol basicUsing { +protocol PbasicUsing { child: async Msg(SomeUnion foo); }; diff --git a/ipc/ipdl/test/ipdl/ok/builtins.ipdl b/ipc/ipdl/test/ipdl/ok/Pbuiltins.ipdl similarity index 94% rename from ipc/ipdl/test/ipdl/ok/builtins.ipdl rename to ipc/ipdl/test/ipdl/ok/Pbuiltins.ipdl index d0e6fcebf572..4085dc6d95a2 100644 --- a/ipc/ipdl/test/ipdl/ok/builtins.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pbuiltins.ipdl @@ -1,4 +1,4 @@ -protocol builtins { +protocol Pbuiltins { // sanity-check that "essential" builtins are being declared diff --git a/ipc/ipdl/test/ipdl/ok/bytebuf.ipdl b/ipc/ipdl/test/ipdl/ok/Pbytebuf.ipdl similarity index 90% rename from ipc/ipdl/test/ipdl/ok/bytebuf.ipdl rename to ipc/ipdl/test/ipdl/ok/Pbytebuf.ipdl index cb1c4a392310..1e7dd49f8db9 100644 --- a/ipc/ipdl/test/ipdl/ok/bytebuf.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pbytebuf.ipdl @@ -3,7 +3,7 @@ union Foo { ByteBuf; }; -intr protocol bytebuf { +intr protocol Pbytebuf { parent: async Msg(ByteBuf s, Foo f); sync SyncMsg(ByteBuf s, Foo f) diff --git a/ipc/ipdl/test/ipdl/ok/empty.ipdl b/ipc/ipdl/test/ipdl/ok/Pempty.ipdl similarity index 56% rename from ipc/ipdl/test/ipdl/ok/empty.ipdl rename to ipc/ipdl/test/ipdl/ok/Pempty.ipdl index 61d395576acc..61b511bec6ca 100644 --- a/ipc/ipdl/test/ipdl/ok/empty.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pempty.ipdl @@ -1,3 +1,3 @@ -protocol empty { +protocol Pempty { child: async Msg(); }; diff --git a/ipc/ipdl/test/ipdl/ok/PemptyStruct.ipdl b/ipc/ipdl/test/ipdl/ok/PemptyStruct.ipdl new file mode 100644 index 000000000000..a067bf71da53 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PemptyStruct.ipdl @@ -0,0 +1,3 @@ +struct empty { }; + +protocol PemptyStruct { child: async __delete__(); }; diff --git a/ipc/ipdl/test/ipdl/ok/headerProto.ipdl b/ipc/ipdl/test/ipdl/ok/PheaderProto.ipdl similarity index 81% rename from ipc/ipdl/test/ipdl/ok/headerProto.ipdl rename to ipc/ipdl/test/ipdl/ok/PheaderProto.ipdl index 0bccc38344b4..7ae285042eff 100644 --- a/ipc/ipdl/test/ipdl/ok/headerProto.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PheaderProto.ipdl @@ -2,7 +2,7 @@ include header; namespace c { -protocol headerProto { +protocol PheaderProto { child: async __delete__(foo a, baz b, Inner1 c, Inner2 d, X x); }; diff --git a/ipc/ipdl/test/ipdl/ok/intrProtocol.ipdl b/ipc/ipdl/test/ipdl/ok/PintrProtocol.ipdl similarity index 85% rename from ipc/ipdl/test/ipdl/ok/intrProtocol.ipdl rename to ipc/ipdl/test/ipdl/ok/PintrProtocol.ipdl index 1c9327f013fd..190d30abf51c 100644 --- a/ipc/ipdl/test/ipdl/ok/intrProtocol.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PintrProtocol.ipdl @@ -1,4 +1,4 @@ -intr protocol intrProtocol { +intr protocol PintrProtocol { // sanity check of Interrupt protocols child: diff --git a/ipc/ipdl/test/ipdl/ok/plugin.ipdl b/ipc/ipdl/test/ipdl/ok/Pjetpack.ipdl similarity index 58% rename from ipc/ipdl/test/ipdl/ok/plugin.ipdl rename to ipc/ipdl/test/ipdl/ok/Pjetpack.ipdl index 75649e3ed616..190732485dc8 100644 --- a/ipc/ipdl/test/ipdl/ok/plugin.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pjetpack.ipdl @@ -1,4 +1,4 @@ -intr protocol plugin { +sync protocol Pjetpack { child: async __delete__(); diff --git a/ipc/ipdl/test/ipdl/ok/PmanageSelf.ipdl b/ipc/ipdl/test/ipdl/ok/PmanageSelf.ipdl new file mode 100644 index 000000000000..992f374a58a0 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PmanageSelf.ipdl @@ -0,0 +1,10 @@ +include protocol PmanageSelf_Toplevel; + +protocol PmanageSelf { + manager PmanageSelf_Toplevel or PmanageSelf; + manages PmanageSelf; + +child: + async PmanageSelf(); + async __delete__(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/PmanageSelf_Toplevel.ipdl b/ipc/ipdl/test/ipdl/ok/PmanageSelf_Toplevel.ipdl new file mode 100644 index 000000000000..70b5fe8a9b78 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PmanageSelf_Toplevel.ipdl @@ -0,0 +1,9 @@ +include protocol PmanageSelf; + +protocol PmanageSelf_Toplevel { + manages PmanageSelf; + +child: + async PmanageSelf(); + async __delete__(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/PmanagedProtocol.ipdl b/ipc/ipdl/test/ipdl/ok/PmanagedProtocol.ipdl new file mode 100644 index 000000000000..cab07d06e7ff --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PmanagedProtocol.ipdl @@ -0,0 +1,8 @@ +include protocol PmanagerProtocol; + +protocol PmanagedProtocol { + manager PmanagerProtocol; + +child: + async __delete__(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/PmanagerProtocol.ipdl b/ipc/ipdl/test/ipdl/ok/PmanagerProtocol.ipdl new file mode 100644 index 000000000000..40d1de31b01e --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PmanagerProtocol.ipdl @@ -0,0 +1,11 @@ +include protocol PmanagedProtocol; + +// sanity check of managed/manager protocols + +protocol PmanagerProtocol { + manages PmanagedProtocol; + +parent: + async PmanagedProtocol(int i); + +}; diff --git a/ipc/ipdl/test/ipdl/ok/maybe_Basic.ipdl b/ipc/ipdl/test/ipdl/ok/Pmaybe_Basic.ipdl similarity index 60% rename from ipc/ipdl/test/ipdl/ok/maybe_Basic.ipdl rename to ipc/ipdl/test/ipdl/ok/Pmaybe_Basic.ipdl index 20e0529dd31c..a0bbccd87448 100644 --- a/ipc/ipdl/test/ipdl/ok/maybe_Basic.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pmaybe_Basic.ipdl @@ -1,4 +1,4 @@ -protocol maybe_Basic { +protocol Pmaybe_Basic { child: async Msg(int? maybe); }; diff --git a/ipc/ipdl/test/ipdl/ok/Pmaybe_OfActors.ipdl b/ipc/ipdl/test/ipdl/ok/Pmaybe_OfActors.ipdl new file mode 100644 index 000000000000..430faa9ae76b --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/Pmaybe_OfActors.ipdl @@ -0,0 +1,10 @@ +include protocol Pmaybe_OfActorsSub; + +protocol Pmaybe_OfActors { + manages Pmaybe_OfActorsSub; + +child: + async Msg(Pmaybe_OfActorsSub? p); + + async Pmaybe_OfActorsSub(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/Pmaybe_OfActorsSub.ipdl b/ipc/ipdl/test/ipdl/ok/Pmaybe_OfActorsSub.ipdl new file mode 100644 index 000000000000..6a4759953f84 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/Pmaybe_OfActorsSub.ipdl @@ -0,0 +1,7 @@ +include protocol Pmaybe_OfActors; + +protocol Pmaybe_OfActorsSub { + manager Pmaybe_OfActors; + +child: async __delete__(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/maybe_Union.ipdl b/ipc/ipdl/test/ipdl/ok/Pmaybe_Union.ipdl similarity index 82% rename from ipc/ipdl/test/ipdl/ok/maybe_Union.ipdl rename to ipc/ipdl/test/ipdl/ok/Pmaybe_Union.ipdl index 93757ce38a7e..67f24cb794aa 100644 --- a/ipc/ipdl/test/ipdl/ok/maybe_Union.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pmaybe_Union.ipdl @@ -4,7 +4,7 @@ union MaybeUnion { double; }; -sync protocol maybe_Union { +sync protocol Pmaybe_Union { parent: async Msg(MaybeUnion u, MaybeUnion? au) returns (MaybeUnion r); }; diff --git a/ipc/ipdl/test/ipdl/ok/media.ipdl b/ipc/ipdl/test/ipdl/ok/Pmedia.ipdl similarity index 60% rename from ipc/ipdl/test/ipdl/ok/media.ipdl rename to ipc/ipdl/test/ipdl/ok/Pmedia.ipdl index b321ab7109e2..0a8076a43307 100644 --- a/ipc/ipdl/test/ipdl/ok/media.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pmedia.ipdl @@ -1,4 +1,4 @@ -sync protocol media { +sync protocol Pmedia { child: async __delete__(); diff --git a/ipc/ipdl/test/ipdl/ok/messageCompress.ipdl b/ipc/ipdl/test/ipdl/ok/PmessageCompress.ipdl similarity index 52% rename from ipc/ipdl/test/ipdl/ok/messageCompress.ipdl rename to ipc/ipdl/test/ipdl/ok/PmessageCompress.ipdl index dd563fa3bc3e..d74c5626bd26 100644 --- a/ipc/ipdl/test/ipdl/ok/messageCompress.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PmessageCompress.ipdl @@ -1,4 +1,4 @@ -intr protocol messageCompress { +intr protocol PmessageCompress { child: async foo() compress; }; diff --git a/ipc/ipdl/test/ipdl/ok/messageVerify.ipdl b/ipc/ipdl/test/ipdl/ok/PmessageVerify.ipdl similarity index 71% rename from ipc/ipdl/test/ipdl/ok/messageVerify.ipdl rename to ipc/ipdl/test/ipdl/ok/PmessageVerify.ipdl index 0de9ef4ad9b3..ee7adfe8d02a 100644 --- a/ipc/ipdl/test/ipdl/ok/messageVerify.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PmessageVerify.ipdl @@ -1,7 +1,7 @@ -include protocol messageVerifyTopLevel; +include protocol PmessageVerifyTopLevel; -intr protocol messageVerify { - manager messageVerifyTopLevel; +intr protocol PmessageVerify { + manager PmessageVerifyTopLevel; parent: sync __delete__(uint32_t x) returns (double rv1) verify; diff --git a/ipc/ipdl/test/ipdl/ok/PmessageVerifyTopLevel.ipdl b/ipc/ipdl/test/ipdl/ok/PmessageVerifyTopLevel.ipdl new file mode 100644 index 000000000000..72115a033883 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PmessageVerifyTopLevel.ipdl @@ -0,0 +1,7 @@ +include protocol PmessageVerify; + +intr protocol PmessageVerifyTopLevel{ + manages PmessageVerify; + parent: + sync PmessageVerify(uint32_t aParam1) returns (double rv1) verify; +}; diff --git a/ipc/ipdl/test/ipdl/ok/PmultiManaged.ipdl b/ipc/ipdl/test/ipdl/ok/PmultiManaged.ipdl new file mode 100644 index 000000000000..d8c47fc9e3fb --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PmultiManaged.ipdl @@ -0,0 +1,9 @@ +include protocol PmultiManager1; +include protocol PmultiManager2; + +protocol PmultiManaged { + manager PmultiManager1 or PmultiManager2; + +child: + async __delete__(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/PmultiManager1.ipdl b/ipc/ipdl/test/ipdl/ok/PmultiManager1.ipdl new file mode 100644 index 000000000000..b0654a8c4f50 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PmultiManager1.ipdl @@ -0,0 +1,8 @@ +include protocol PmultiManaged; + +protocol PmultiManager1 { + manages PmultiManaged; + +child: + async PmultiManaged(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/PmultiManager2.ipdl b/ipc/ipdl/test/ipdl/ok/PmultiManager2.ipdl new file mode 100644 index 000000000000..c03f05a17360 --- /dev/null +++ b/ipc/ipdl/test/ipdl/ok/PmultiManager2.ipdl @@ -0,0 +1,8 @@ +include protocol PmultiManaged; + +protocol PmultiManager2 { + manages PmultiManaged; + +child: + async PmultiManaged(); +}; diff --git a/ipc/ipdl/test/ipdl/ok/multipleUsingCxxTypes.ipdl b/ipc/ipdl/test/ipdl/ok/PmultipleUsingCxxTypes.ipdl similarity index 82% rename from ipc/ipdl/test/ipdl/ok/multipleUsingCxxTypes.ipdl rename to ipc/ipdl/test/ipdl/ok/PmultipleUsingCxxTypes.ipdl index 045d3fa6e390..93850f190f5c 100644 --- a/ipc/ipdl/test/ipdl/ok/multipleUsingCxxTypes.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PmultipleUsingCxxTypes.ipdl @@ -1,7 +1,7 @@ using struct mozilla::void_t from "ipc/IPCMessageUtils.h"; using struct mozilla::void_t from "ipc/IPCMessageUtils.h"; -protocol multipleUsingCxxTypes { +protocol PmultipleUsingCxxTypes { child: async Msg(void_t foo); }; diff --git a/ipc/ipdl/test/ipdl/ok/mutualRecStructUnion.ipdl b/ipc/ipdl/test/ipdl/ok/PmutualRecStructUnion.ipdl similarity index 84% rename from ipc/ipdl/test/ipdl/ok/mutualRecStructUnion.ipdl rename to ipc/ipdl/test/ipdl/ok/PmutualRecStructUnion.ipdl index 0891d3e78e0e..0fe5501a09c9 100644 --- a/ipc/ipdl/test/ipdl/ok/mutualRecStructUnion.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PmutualRecStructUnion.ipdl @@ -14,7 +14,7 @@ struct Z { Y y; }; -protocol mutualRecStructUnion { +protocol PmutualRecStructUnion { child: async Test(X x, Y y, Z z); async __delete__(); diff --git a/ipc/ipdl/test/ipdl/ok/mutualRecUnion.ipdl b/ipc/ipdl/test/ipdl/ok/PmutualRecUnion.ipdl similarity index 86% rename from ipc/ipdl/test/ipdl/ok/mutualRecUnion.ipdl rename to ipc/ipdl/test/ipdl/ok/PmutualRecUnion.ipdl index 9142f8c835ce..304847e003d1 100644 --- a/ipc/ipdl/test/ipdl/ok/mutualRecUnion.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PmutualRecUnion.ipdl @@ -14,7 +14,7 @@ union Z { X; }; -protocol mutualRecUnion { +protocol PmutualRecUnion { child: async Test(X x, Y y, Z z); async __delete__(); diff --git a/ipc/ipdl/test/ipdl/ok/namespace_Basic.ipdl b/ipc/ipdl/test/ipdl/ok/Pnamespace_Basic.ipdl similarity index 79% rename from ipc/ipdl/test/ipdl/ok/namespace_Basic.ipdl rename to ipc/ipdl/test/ipdl/ok/Pnamespace_Basic.ipdl index 4eee5ffd148a..4f996d974471 100644 --- a/ipc/ipdl/test/ipdl/ok/namespace_Basic.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pnamespace_Basic.ipdl @@ -2,7 +2,7 @@ namespace basic { // sanity check of namespaced protocols -protocol namespace_Basic { +protocol Pnamespace_Basic { child: async Msg(); diff --git a/ipc/ipdl/test/ipdl/ok/noRedeclCrossMessage.ipdl b/ipc/ipdl/test/ipdl/ok/PnoRedeclCrossMessage.ipdl similarity index 78% rename from ipc/ipdl/test/ipdl/ok/noRedeclCrossMessage.ipdl rename to ipc/ipdl/test/ipdl/ok/PnoRedeclCrossMessage.ipdl index 578ac82d8c09..d353a8c07ceb 100644 --- a/ipc/ipdl/test/ipdl/ok/noRedeclCrossMessage.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PnoRedeclCrossMessage.ipdl @@ -1,4 +1,4 @@ -protocol noRedeclCrossMessage { +protocol PnoRedeclCrossMessage { // each message has its own scope for param/return names diff --git a/ipc/ipdl/test/ipdl/ok/jetpack.ipdl b/ipc/ipdl/test/ipdl/ok/Pplugin.ipdl similarity index 59% rename from ipc/ipdl/test/ipdl/ok/jetpack.ipdl rename to ipc/ipdl/test/ipdl/ok/Pplugin.ipdl index dc119ea8c838..29c001e67b10 100644 --- a/ipc/ipdl/test/ipdl/ok/jetpack.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pplugin.ipdl @@ -1,4 +1,4 @@ -sync protocol jetpack { +intr protocol Pplugin { child: async __delete__(); diff --git a/ipc/ipdl/test/ipdl/ok/selfRecUnion.ipdl b/ipc/ipdl/test/ipdl/ok/PselfRecUnion.ipdl similarity index 79% rename from ipc/ipdl/test/ipdl/ok/selfRecUnion.ipdl rename to ipc/ipdl/test/ipdl/ok/PselfRecUnion.ipdl index 70f04602c01c..7d76c34542f4 100644 --- a/ipc/ipdl/test/ipdl/ok/selfRecUnion.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PselfRecUnion.ipdl @@ -4,7 +4,7 @@ union R { R; }; -protocol selfRecUnion { +protocol PselfRecUnion { child: async Test(R r); async __delete__(); diff --git a/ipc/ipdl/test/ipdl/ok/shmem.ipdl b/ipc/ipdl/test/ipdl/ok/Pshmem.ipdl similarity index 90% rename from ipc/ipdl/test/ipdl/ok/shmem.ipdl rename to ipc/ipdl/test/ipdl/ok/Pshmem.ipdl index 8bc44010b96b..326fb60c978b 100644 --- a/ipc/ipdl/test/ipdl/ok/shmem.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Pshmem.ipdl @@ -3,7 +3,7 @@ union Foo { Shmem; }; -intr protocol shmem { +intr protocol Pshmem { parent: async Msg(Shmem s, Foo f); sync SyncMsg(Shmem s, Foo f) diff --git a/ipc/ipdl/test/ipdl/ok/syncProtocol.ipdl b/ipc/ipdl/test/ipdl/ok/PsyncProtocol.ipdl similarity index 79% rename from ipc/ipdl/test/ipdl/ok/syncProtocol.ipdl rename to ipc/ipdl/test/ipdl/ok/PsyncProtocol.ipdl index cfe7760e6308..377671b2d62f 100644 --- a/ipc/ipdl/test/ipdl/ok/syncProtocol.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PsyncProtocol.ipdl @@ -1,4 +1,4 @@ -sync protocol syncProtocol { +sync protocol PsyncProtocol { // sanity check of sync protocols diff --git a/ipc/ipdl/test/ipdl/ok/threeDirections.ipdl b/ipc/ipdl/test/ipdl/ok/PthreeDirections.ipdl similarity index 85% rename from ipc/ipdl/test/ipdl/ok/threeDirections.ipdl rename to ipc/ipdl/test/ipdl/ok/PthreeDirections.ipdl index c06f9d56f082..81c8cf604124 100644 --- a/ipc/ipdl/test/ipdl/ok/threeDirections.ipdl +++ b/ipc/ipdl/test/ipdl/ok/PthreeDirections.ipdl @@ -1,4 +1,4 @@ -protocol threeDirections { +protocol PthreeDirections { // sanity check that the three direction specifiers are being accepted child: diff --git a/ipc/ipdl/test/ipdl/ok/union_Basic.ipdl b/ipc/ipdl/test/ipdl/ok/Punion_Basic.ipdl similarity index 76% rename from ipc/ipdl/test/ipdl/ok/union_Basic.ipdl rename to ipc/ipdl/test/ipdl/ok/Punion_Basic.ipdl index ef5b1cbfe18f..697b86e088ac 100644 --- a/ipc/ipdl/test/ipdl/ok/union_Basic.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Punion_Basic.ipdl @@ -3,7 +3,7 @@ union Basic { double; }; -sync protocol union_Basic { +sync protocol Punion_Basic { parent: sync Msg(Basic p) returns (Basic r); diff --git a/ipc/ipdl/test/ipdl/ok/union_Namespaced.ipdl b/ipc/ipdl/test/ipdl/ok/Punion_Namespaced.ipdl similarity index 84% rename from ipc/ipdl/test/ipdl/ok/union_Namespaced.ipdl rename to ipc/ipdl/test/ipdl/ok/Punion_Namespaced.ipdl index 02f86f9ded88..9453a561c8cd 100644 --- a/ipc/ipdl/test/ipdl/ok/union_Namespaced.ipdl +++ b/ipc/ipdl/test/ipdl/ok/Punion_Namespaced.ipdl @@ -10,7 +10,7 @@ union Socks { namespace puppies { -protocol union_Namespaced { +protocol Punion_Namespaced { child: async Msg(Socks s); }; diff --git a/ipc/ipdl/test/ipdl/ok/SyncSyncManagee.ipdl b/ipc/ipdl/test/ipdl/ok/SyncSyncManagee.ipdl deleted file mode 100644 index 25c6df59613e..000000000000 --- a/ipc/ipdl/test/ipdl/ok/SyncSyncManagee.ipdl +++ /dev/null @@ -1,7 +0,0 @@ -include protocol SyncSyncManager; - -sync protocol SyncSyncManagee { - manager SyncSyncManager; -child: - async __delete__(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/actorparam.ipdl b/ipc/ipdl/test/ipdl/ok/actorparam.ipdl deleted file mode 100644 index 66813cad13dc..000000000000 --- a/ipc/ipdl/test/ipdl/ok/actorparam.ipdl +++ /dev/null @@ -1,5 +0,0 @@ -protocol actorparam { - -child: async Msg(actorparam p); - -}; diff --git a/ipc/ipdl/test/ipdl/ok/actorreturn.ipdl b/ipc/ipdl/test/ipdl/ok/actorreturn.ipdl deleted file mode 100644 index 9642ca854df1..000000000000 --- a/ipc/ipdl/test/ipdl/ok/actorreturn.ipdl +++ /dev/null @@ -1,6 +0,0 @@ -sync protocol actorreturn { - -parent: - sync Msg(actorreturn p) returns (actorreturn r); - -}; diff --git a/ipc/ipdl/test/ipdl/ok/array_OfActors.ipdl b/ipc/ipdl/test/ipdl/ok/array_OfActors.ipdl deleted file mode 100644 index 005de27cc4ec..000000000000 --- a/ipc/ipdl/test/ipdl/ok/array_OfActors.ipdl +++ /dev/null @@ -1,10 +0,0 @@ -include protocol array_OfActorsSub; - -protocol array_OfActors { - manages array_OfActorsSub; - -child: - async Msg(array_OfActorsSub[] p); - - async array_OfActorsSub(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/array_OfActorsSub.ipdl b/ipc/ipdl/test/ipdl/ok/array_OfActorsSub.ipdl deleted file mode 100644 index a01c2eeab26c..000000000000 --- a/ipc/ipdl/test/ipdl/ok/array_OfActorsSub.ipdl +++ /dev/null @@ -1,7 +0,0 @@ -include protocol array_OfActors; - -protocol array_OfActorsSub { - manager array_OfActors; - -child: async __delete__(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/emptyStruct.ipdl b/ipc/ipdl/test/ipdl/ok/emptyStruct.ipdl deleted file mode 100644 index 64a9688ed542..000000000000 --- a/ipc/ipdl/test/ipdl/ok/emptyStruct.ipdl +++ /dev/null @@ -1,3 +0,0 @@ -struct empty { }; - -protocol emptyStruct { child: async __delete__(); }; diff --git a/ipc/ipdl/test/ipdl/ok/manageSelf.ipdl b/ipc/ipdl/test/ipdl/ok/manageSelf.ipdl deleted file mode 100644 index 475a63015481..000000000000 --- a/ipc/ipdl/test/ipdl/ok/manageSelf.ipdl +++ /dev/null @@ -1,10 +0,0 @@ -include protocol manageSelf_Toplevel; - -protocol manageSelf { - manager manageSelf_Toplevel or manageSelf; - manages manageSelf; - -child: - async manageSelf(); - async __delete__(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/manageSelf_Toplevel.ipdl b/ipc/ipdl/test/ipdl/ok/manageSelf_Toplevel.ipdl deleted file mode 100644 index 61f59e1a17cc..000000000000 --- a/ipc/ipdl/test/ipdl/ok/manageSelf_Toplevel.ipdl +++ /dev/null @@ -1,9 +0,0 @@ -include protocol manageSelf; - -protocol manageSelf_Toplevel { - manages manageSelf; - -child: - async manageSelf(); - async __delete__(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/managedProtocol.ipdl b/ipc/ipdl/test/ipdl/ok/managedProtocol.ipdl deleted file mode 100644 index f59ab6651b2b..000000000000 --- a/ipc/ipdl/test/ipdl/ok/managedProtocol.ipdl +++ /dev/null @@ -1,8 +0,0 @@ -include protocol managerProtocol; - -protocol managedProtocol { - manager managerProtocol; - -child: - async __delete__(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/managerProtocol.ipdl b/ipc/ipdl/test/ipdl/ok/managerProtocol.ipdl deleted file mode 100644 index 9cbf8b9c9f55..000000000000 --- a/ipc/ipdl/test/ipdl/ok/managerProtocol.ipdl +++ /dev/null @@ -1,11 +0,0 @@ -include protocol managedProtocol; - -// sanity check of managed/manager protocols - -protocol managerProtocol { - manages managedProtocol; - -parent: - async managedProtocol(int i); - -}; diff --git a/ipc/ipdl/test/ipdl/ok/maybe_OfActors.ipdl b/ipc/ipdl/test/ipdl/ok/maybe_OfActors.ipdl deleted file mode 100644 index 9daa2c3b7bf9..000000000000 --- a/ipc/ipdl/test/ipdl/ok/maybe_OfActors.ipdl +++ /dev/null @@ -1,10 +0,0 @@ -include protocol maybe_OfActorsSub; - -protocol maybe_OfActors { - manages maybe_OfActorsSub; - -child: - async Msg(maybe_OfActorsSub? p); - - async maybe_OfActorsSub(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/maybe_OfActorsSub.ipdl b/ipc/ipdl/test/ipdl/ok/maybe_OfActorsSub.ipdl deleted file mode 100644 index d903aa0a38f5..000000000000 --- a/ipc/ipdl/test/ipdl/ok/maybe_OfActorsSub.ipdl +++ /dev/null @@ -1,7 +0,0 @@ -include protocol maybe_OfActors; - -protocol maybe_OfActorsSub { - manager maybe_OfActors; - -child: async __delete__(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/messageVerifyTopLevel.ipdl b/ipc/ipdl/test/ipdl/ok/messageVerifyTopLevel.ipdl deleted file mode 100644 index 14ff22111f05..000000000000 --- a/ipc/ipdl/test/ipdl/ok/messageVerifyTopLevel.ipdl +++ /dev/null @@ -1,7 +0,0 @@ -include protocol messageVerify; - -intr protocol messageVerifyTopLevel{ - manages messageVerify; - parent: - sync messageVerify(uint32_t aParam1) returns (double rv1) verify; -}; diff --git a/ipc/ipdl/test/ipdl/ok/multiManaged.ipdl b/ipc/ipdl/test/ipdl/ok/multiManaged.ipdl deleted file mode 100644 index c845d5086988..000000000000 --- a/ipc/ipdl/test/ipdl/ok/multiManaged.ipdl +++ /dev/null @@ -1,9 +0,0 @@ -include protocol multiManager1; -include protocol multiManager2; - -protocol multiManaged { - manager multiManager1 or multiManager2; - -child: - async __delete__(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/multiManager1.ipdl b/ipc/ipdl/test/ipdl/ok/multiManager1.ipdl deleted file mode 100644 index 39d1cd053e1c..000000000000 --- a/ipc/ipdl/test/ipdl/ok/multiManager1.ipdl +++ /dev/null @@ -1,8 +0,0 @@ -include protocol multiManaged; - -protocol multiManager1 { - manages multiManaged; - -child: - async multiManaged(); -}; diff --git a/ipc/ipdl/test/ipdl/ok/multiManager2.ipdl b/ipc/ipdl/test/ipdl/ok/multiManager2.ipdl deleted file mode 100644 index 44d69b456382..000000000000 --- a/ipc/ipdl/test/ipdl/ok/multiManager2.ipdl +++ /dev/null @@ -1,8 +0,0 @@ -include protocol multiManaged; - -protocol multiManager2 { - manages multiManaged; - -child: - async multiManaged(); -}; diff --git a/ipc/ipdl/test/ipdl/sync-messages.ini b/ipc/ipdl/test/ipdl/sync-messages.ini index 08012f06fea5..f4048ee618bb 100644 --- a/ipc/ipdl/test/ipdl/sync-messages.ini +++ b/ipc/ipdl/test/ipdl/sync-messages.ini @@ -1,24 +1,24 @@ -[actorreturn::Msg] -[array_Union::Msg] -[union_Basic::Msg] -[Struct::test] -[intrProtocol::SyncMsg] -[intrProtocol::InterruptMsg] -[shmem::SyncMsg] -[shmem::InterruptMsg] -[bytebuf::SyncMsg] -[bytebuf::InterruptMsg] -[syncProtocol::SyncMsg] -[messageVerify::__delete__] -[messageVerify::msg3] -[messageVerify::msg4] -[messageVerifyTopLevel::messageVerify] -[DeleteSub::__delete__] -[intrMessageCompress::foo] -[intrMessageCompress::bar] -[syncMessageCompress::foo] -[syncParentToChild::Msg] -[tooWeakIntrSync::Msg] -[tooWeakSyncAsync::Msg] -[undeclReturnType::Msg] -[asyncMessageListed::Msg] +[Pactorreturn::Msg] +[Parray_Union::Msg] +[Punion_Basic::Msg] +[PStruct::test] +[PintrProtocol::SyncMsg] +[PintrProtocol::InterruptMsg] +[Pshmem::SyncMsg] +[Pshmem::InterruptMsg] +[Pbytebuf::SyncMsg] +[Pbytebuf::InterruptMsg] +[PsyncProtocol::SyncMsg] +[PmessageVerify::__delete__] +[PmessageVerify::msg3] +[PmessageVerify::msg4] +[PmessageVerifyTopLevel::PmessageVerify] +[PDeleteSub::__delete__] +[PintrMessageCompress::foo] +[PintrMessageCompress::bar] +[PsyncMessageCompress::foo] +[PsyncParentToChild::Msg] +[PtooWeakIntrSync::Msg] +[PtooWeakSyncAsync::Msg] +[PundeclReturnType::Msg] +[PasyncMessageListed::Msg]