Bug 541131: Include IPDL headers as |include protocol PFoo;|. r=cjones

2010-04-26 20:11:46 -05:00 · 2010-04-26 20:11:46 -05:00 · 724a5a9e20
--- a/dom/plugins/PBrowserStream.ipdl
+++ b/dom/plugins/PBrowserStream.ipdl
@ -35,7 +35,7 @@
 *
 * ***** END LICENSE BLOCK ***** */

-include protocol "PPluginInstance.ipdl";
+include protocol PPluginInstance;

 include "mozilla/plugins/PluginMessageUtils.h";

--- a/dom/plugins/PPluginIdentifier.ipdl
+++ b/dom/plugins/PPluginIdentifier.ipdl
@ -36,7 +36,7 @@
 *
 * ***** END LICENSE BLOCK ***** */

-include protocol "PPluginModule.ipdl";
+include protocol PPluginModule;

 namespace mozilla {
 namespace plugins {
--- a/dom/plugins/PPluginInstance.ipdl
+++ b/dom/plugins/PPluginInstance.ipdl
@ -37,11 +37,11 @@
 *
 * ***** END LICENSE BLOCK ***** */

-include protocol "PPluginModule.ipdl";
-include protocol "PPluginScriptableObject.ipdl";
-include protocol "PBrowserStream.ipdl";
-include protocol "PPluginStream.ipdl";
-include protocol "PStreamNotify.ipdl";
+include protocol PPluginModule;
+include protocol PPluginScriptableObject;
+include protocol PBrowserStream;
+include protocol PPluginStream;
+include protocol PStreamNotify;

 include "mozilla/plugins/PluginMessageUtils.h";

--- a/dom/plugins/PPluginModule.ipdl
+++ b/dom/plugins/PPluginModule.ipdl
@ -37,8 +37,8 @@
 *
 * ***** END LICENSE BLOCK ***** */

-include protocol "PPluginIdentifier.ipdl";
-include protocol "PPluginInstance.ipdl";
+include protocol PPluginIdentifier;
+include protocol PPluginInstance;

 include "npapi.h";
 include "mozilla/plugins/PluginMessageUtils.h";
--- a/dom/plugins/PPluginScriptableObject.ipdl
+++ b/dom/plugins/PPluginScriptableObject.ipdl
@ -37,8 +37,8 @@
 *
 * ***** END LICENSE BLOCK ***** */

-include protocol "PPluginInstance.ipdl";
-include protocol "PPluginIdentifier.ipdl";
+include protocol PPluginInstance;
+include protocol PPluginIdentifier;

 include "npapi.h";
 include "npruntime.h";
--- a/dom/plugins/PPluginStream.ipdl
+++ b/dom/plugins/PPluginStream.ipdl
@ -35,7 +35,7 @@
 *
 * ***** END LICENSE BLOCK ***** */

-include protocol "PPluginInstance.ipdl";
+include protocol PPluginInstance;

 include "mozilla/plugins/PluginMessageUtils.h";

--- a/dom/plugins/PStreamNotify.ipdl
+++ b/dom/plugins/PStreamNotify.ipdl
@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 8 -*- */

-include protocol "PPluginInstance.ipdl";
+include protocol PPluginInstance;

 include "npapi.h";

--- a/ipc/ipdl/ipdl/ast.py
+++ b/ipc/ipdl/ipdl/ast.py
@ -177,9 +177,9 @@ class CxxInclude(Node):
        self.file = cxxFile

 class ProtocolInclude(Node):
-    def __init__(self, loc, protocolFile):
+    def __init__(self, loc, protocolName):
        Node.__init__(self, loc)
-        self.file = protocolFile
+        self.file = "%s.ipdl" % protocolName

 class UsingStmt(Node):
    def __init__(self, loc, cxxTypeSpec):
--- a/ipc/ipdl/ipdl/parser.py
+++ b/ipc/ipdl/ipdl/parser.py
@ -249,8 +249,13 @@ def p_CxxIncludeStmt(p):
    p[0] = CxxInclude(locFromTok(p, 1), p[2])

 def p_ProtocolIncludeStmt(p):
-    """ProtocolIncludeStmt : INCLUDE PROTOCOL STRING"""
+    """ProtocolIncludeStmt : INCLUDE PROTOCOL ID
+                           | INCLUDE PROTOCOL STRING"""
    loc = locFromTok(p, 1)
+    
+    if 0 <= p[3].rfind('.ipdl'):
+        _error(loc, "`include protocol \"P.ipdl\"' syntax is obsolete.  Use `include protocol P' instead.")
+    
    Parser.current.loc = loc
    inc = ProtocolInclude(loc, p[3])

--- a/ipc/ipdl/test/cxx/PTestArrays.ipdl
+++ b/ipc/ipdl/test/cxx/PTestArrays.ipdl
@ -1,4 +1,4 @@
-include protocol "PTestArraysSub.ipdl";
+include protocol PTestArraysSub;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestArraysSub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestArraysSub.ipdl
@ -1,4 +1,4 @@
-include protocol "PTestArrays.ipdl";
+include protocol PTestArrays;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestDesc.ipdl
+++ b/ipc/ipdl/test/cxx/PTestDesc.ipdl
@ -1,5 +1,5 @@
-include protocol "PTestDescSub.ipdl";
-include protocol "PTestDescSubsub.ipdl";
+include protocol PTestDescSub;
+include protocol PTestDescSubsub;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestDescSub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestDescSub.ipdl
@ -1,5 +1,5 @@
-include protocol "PTestDesc.ipdl";
-include protocol "PTestDescSubsub.ipdl";
+include protocol PTestDesc;
+include protocol PTestDescSubsub;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestDescSubsub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestDescSubsub.ipdl
@ -1,5 +1,5 @@

-include protocol "PTestDescSub.ipdl";
+include protocol PTestDescSub;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestManyChildAllocs.ipdl
+++ b/ipc/ipdl/test/cxx/PTestManyChildAllocs.ipdl
@ -1,4 +1,4 @@
-include protocol "PTestManyChildAllocsSub.ipdl";
+include protocol PTestManyChildAllocsSub;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestManyChildAllocsSub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestManyChildAllocsSub.ipdl
@ -1,4 +1,4 @@
-include protocol "PTestManyChildAllocs.ipdl";
+include protocol PTestManyChildAllocs;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestMultiMgrs.ipdl
+++ b/ipc/ipdl/test/cxx/PTestMultiMgrs.ipdl
@ -1,5 +1,5 @@
-include protocol "PTestMultiMgrsLeft.ipdl";
-include protocol "PTestMultiMgrsRight.ipdl";
+include protocol PTestMultiMgrsLeft;
+include protocol PTestMultiMgrsRight;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestMultiMgrsBottom.ipdl
+++ b/ipc/ipdl/test/cxx/PTestMultiMgrsBottom.ipdl
@ -1,5 +1,5 @@
-include protocol "PTestMultiMgrsLeft.ipdl";
-include protocol "PTestMultiMgrsRight.ipdl";
+include protocol PTestMultiMgrsLeft;
+include protocol PTestMultiMgrsRight;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestMultiMgrsLeft.ipdl
+++ b/ipc/ipdl/test/cxx/PTestMultiMgrsLeft.ipdl
@ -1,5 +1,5 @@
-include protocol "PTestMultiMgrs.ipdl";
-include protocol "PTestMultiMgrsBottom.ipdl";
+include protocol PTestMultiMgrs;
+include protocol PTestMultiMgrsBottom;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestMultiMgrsRight.ipdl
+++ b/ipc/ipdl/test/cxx/PTestMultiMgrsRight.ipdl
@ -1,5 +1,5 @@
-include protocol "PTestMultiMgrs.ipdl";
-include protocol "PTestMultiMgrsBottom.ipdl";
+include protocol PTestMultiMgrs;
+include protocol PTestMultiMgrsBottom;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestShutdown.ipdl
+++ b/ipc/ipdl/test/cxx/PTestShutdown.ipdl
@ -1,4 +1,4 @@
-include protocol "PTestShutdownSub.ipdl";
+include protocol PTestShutdownSub;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestShutdownSub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestShutdownSub.ipdl
@ -1,5 +1,5 @@
-include protocol "PTestShutdown.ipdl";
-include protocol "PTestShutdownSubsub.ipdl";
+include protocol PTestShutdown;
+include protocol PTestShutdownSubsub;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/cxx/PTestShutdownSubsub.ipdl
+++ b/ipc/ipdl/test/cxx/PTestShutdownSubsub.ipdl
@ -1,4 +1,4 @@
-include protocol "PTestShutdownSub.ipdl";
+include protocol PTestShutdownSub;

 namespace mozilla {
 namespace _ipdltest {
--- a/ipc/ipdl/test/ipdl/error/badProtocolInclude.ipdl
+++ b/ipc/ipdl/test/ipdl/error/badProtocolInclude.ipdl
@ -1,4 +1,4 @@
-include protocol "I.DONT.EXIST.ipdl";
+include protocol IDONTEXIST;

 // error: nonexistent protocol ^^^

--- a/ipc/ipdl/test/ipdl/error/managedNoCtor.ipdl
+++ b/ipc/ipdl/test/ipdl/error/managedNoCtor.ipdl
@ -1,4 +1,4 @@
-include protocol "managerNoCtor.ipdl";
+include protocol managerNoCtor;

 protocol managedNoCtor {
    manager managerNoCtor;
--- a/ipc/ipdl/test/ipdl/error/managedNoDtor.ipdl
+++ b/ipc/ipdl/test/ipdl/error/managedNoDtor.ipdl
@ -1,4 +1,4 @@
-include protocol "managerNoDtor.ipdl";
+include protocol managerNoDtor;

 protocol managedNoDtor {
    manager managerNoDtor;
--- a/ipc/ipdl/test/ipdl/error/managerNoCtor.ipdl
+++ b/ipc/ipdl/test/ipdl/error/managerNoCtor.ipdl
@ -1,4 +1,4 @@
-include protocol "managedNoCtor.ipdl";
+include protocol managedNoCtor;

 protocol managerNoCtor {
    manages managedNoCtor;
--- a/ipc/ipdl/test/ipdl/error/managerNoDtor.ipdl
+++ b/ipc/ipdl/test/ipdl/error/managerNoDtor.ipdl
@ -1,4 +1,4 @@
-include protocol "managedNoDtor.ipdl";
+include protocol managedNoDtor;

 protocol managerNoDtor {
    manages managedNoDtor;
--- a/ipc/ipdl/test/ipdl/error/multimanDupMgrs.ipdl
+++ b/ipc/ipdl/test/ipdl/error/multimanDupMgrs.ipdl
@ -1,4 +1,4 @@
-include protocol "multimanDupMgrsMgr.ipdl";
+include protocol multimanDupMgrsMgr;

 protocol multimanDupMgrs {
    manager multimanDupMgrsMgr or multimanDupMgrsMgr;
--- a/ipc/ipdl/test/ipdl/error/multimanDupMgrsMgr.ipdl
+++ b/ipc/ipdl/test/ipdl/error/multimanDupMgrsMgr.ipdl
@ -1,4 +1,4 @@
-include protocol "multimanDupMgrs.ipdl";
+include protocol multimanDupMgrs;

 protocol multimanDupMgrsMgr {
    manages multimanDupMgrs;
--- a/ipc/ipdl/test/ipdl/error/oldIncludeSyntax.ipdl
+++ b/ipc/ipdl/test/ipdl/error/oldIncludeSyntax.ipdl
@ -0,0 +1,5 @@
+include protocol "Foo.ipdl";
+
+protocol oldIncludeSyntax {
+
+};
--- a/ipc/ipdl/test/ipdl/ok/Delete.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/Delete.ipdl
@ -1,4 +1,4 @@
-include protocol "DeleteSub.ipdl";
+include protocol DeleteSub;

 sync protocol Delete {
    manages DeleteSub;
--- a/ipc/ipdl/test/ipdl/ok/DeleteSub.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/DeleteSub.ipdl
@ -1,4 +1,4 @@
-include protocol "Delete.ipdl";
+include protocol Delete;

 sync protocol DeleteSub {
    manager Delete;
--- a/ipc/ipdl/test/ipdl/ok/array_OfActors.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/array_OfActors.ipdl
@ -1,4 +1,4 @@
-include protocol "array_OfActorsSub.ipdl";
+include protocol array_OfActorsSub;

 protocol array_OfActors {
    manages array_OfActorsSub;
--- a/ipc/ipdl/test/ipdl/ok/array_OfActorsSub.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/array_OfActorsSub.ipdl
@ -1,4 +1,4 @@
-include protocol "array_OfActors.ipdl";
+include protocol array_OfActors;

 protocol array_OfActorsSub {
    manager array_OfActors;
--- a/ipc/ipdl/test/ipdl/ok/managedProtocol.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/managedProtocol.ipdl
@ -1,4 +1,4 @@
-include protocol "managerProtocol.ipdl";
+include protocol managerProtocol;

 protocol managedProtocol {
    manager managerProtocol;
--- a/ipc/ipdl/test/ipdl/ok/managerProtocol.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/managerProtocol.ipdl
@ -1,4 +1,4 @@
-include protocol "managedProtocol.ipdl";
+include protocol managedProtocol;

 // sanity check of managed/manager protocols

--- a/ipc/ipdl/test/ipdl/ok/multiManaged.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/multiManaged.ipdl
@ -1,5 +1,5 @@
-include protocol "multiManager1.ipdl";
-include protocol "multiManager2.ipdl";
+include protocol multiManager1;
+include protocol multiManager2;

 protocol multiManaged {
    manager multiManager1 or multiManager2;
--- a/ipc/ipdl/test/ipdl/ok/multiManager1.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/multiManager1.ipdl
@ -1,4 +1,4 @@
-include protocol "multiManaged.ipdl";
+include protocol multiManaged;

 protocol multiManager1 {
    manages multiManaged;
--- a/ipc/ipdl/test/ipdl/ok/multiManager2.ipdl
+++ b/ipc/ipdl/test/ipdl/ok/multiManager2.ipdl
@ -1,4 +1,4 @@
-include protocol "multiManaged.ipdl";
+include protocol multiManaged;

 protocol multiManager2 {
    manages multiManaged;