Web Inspector: clean up prefixing of Automation protocol generated files
authorbburg@apple.com <bburg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Aug 2016 16:43:39 +0000 (16:43 +0000)
committerbburg@apple.com <bburg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 8 Aug 2016 16:43:39 +0000 (16:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160635
<rdar://problem/27735327>

Reviewed by Timothy Hatcher.

Introduce different settings for the 'protocol group' name for C++ vs. Objective-C.

Use 'WD' as the prefix for generated Objective-C frontend dispatchers and helpers.
Continue using 'Automation' as the prefix for generated C++ backend dispatchers.

* inspector/scripts/codegen/cpp_generator.py:
(CppGenerator.protocol_name):
* inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py:
(ObjCProtocolTypeConversionsImplementationGenerator.generate_output):
(ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_interface):
(ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_implementation):
Adjust the class name. Generate one category per protocol domain to keep it easy to read.

* inspector/scripts/codegen/models.py:
* inspector/scripts/codegen/objc_generator.py:
(ObjCGenerator.protocol_name):

* inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
* inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
* inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
* inspector/scripts/tests/expected/enum-values.json-result:
* inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
* inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
* inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
* inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
* inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
* inspector/scripts/tests/expected/type-declaration-array-type.json-result:
* inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
* inspector/scripts/tests/expected/type-declaration-object-type.json-result:
* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
Rebaseline test results.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@204255 268f45cc-cd09-0410-ab3c-d52691b4dbfc

18 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py
Source/JavaScriptCore/inspector/scripts/codegen/models.py
Source/JavaScriptCore/inspector/scripts/codegen/objc_generator.py
Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result

index 2c68c92..eef7c36 100644 (file)
@@ -1,3 +1,43 @@
+2016-08-08  Brian Burg  <bburg@apple.com>
+
+        Web Inspector: clean up prefixing of Automation protocol generated files
+        https://bugs.webkit.org/show_bug.cgi?id=160635
+        <rdar://problem/27735327>
+
+        Reviewed by Timothy Hatcher.
+
+        Introduce different settings for the 'protocol group' name for C++ vs. Objective-C.
+
+        Use 'WD' as the prefix for generated Objective-C frontend dispatchers and helpers.
+        Continue using 'Automation' as the prefix for generated C++ backend dispatchers.
+
+        * inspector/scripts/codegen/cpp_generator.py:
+        (CppGenerator.protocol_name):
+        * inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py:
+        (ObjCProtocolTypeConversionsImplementationGenerator.generate_output):
+        (ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_interface):
+        (ObjCProtocolTypeConversionsImplementationGenerator._generate_type_factory_category_implementation):
+        Adjust the class name. Generate one category per protocol domain to keep it easy to read.
+
+        * inspector/scripts/codegen/models.py:
+        * inspector/scripts/codegen/objc_generator.py:
+        (ObjCGenerator.protocol_name):
+
+        * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+        * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+        * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
+        * inspector/scripts/tests/expected/enum-values.json-result:
+        * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
+        * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
+        * inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
+        * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
+        * inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
+        * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
+        * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
+        * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+        * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+        Rebaseline test results.
+
 2016-08-07  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [ES6] Module namespace object should not allow unset IC
index c2779b7..347d0a2 100644 (file)
@@ -48,7 +48,7 @@ class CppGenerator(Generator):
         Generator.__init__(self, model, input_filepath)
 
     def protocol_name(self):
-        return self.model().framework.setting('protocol_group', '')
+        return self.model().framework.setting('cpp_protocol_group', '')
 
     def helpers_namespace(self):
         return '%sHelpers' % self.protocol_name()
index 83a3cf6..9722aa4 100644 (file)
@@ -55,7 +55,7 @@ class ObjCProtocolTypeConversionsImplementationGenerator(ObjCGenerator):
     def generate_output(self):
         secondary_headers = [
             '"%s.h"' % self.protocol_name(),
-            '"%sTypeConversions.h"' % ObjCGenerator.OBJC_SHARED_PREFIX,
+            '"%sTypeParser.h"' % self.protocol_name(),
             Generator.string_for_file_include('%sJSONObjectPrivate.h' % ObjCGenerator.OBJC_STATIC_PREFIX, Frameworks.WebInspector, self.model().framework),
         ]
         secondary_headers.sort()
@@ -76,13 +76,16 @@ class ObjCProtocolTypeConversionsImplementationGenerator(ObjCGenerator):
 
     def _generate_type_factory_category_interface(self, domains):
         lines = []
-        lines.append('@interface ProtocolTypeConversions (%s)' % self.protocol_name())
-        lines.append('')
         for domain in domains:
+            lines.append('@interface %sTypeConversions (%sDomain)' % (self.protocol_name(), domain.domain_name))
+            lines.append('')
+
             for declaration in domain.type_declarations:
                 lines.append(self._generate_type_factory_method_declaration(domain, declaration))
+
             add_newline(lines)
-        lines.append('@end')
+            lines.append('@end')
+
         return '\n'.join(lines)
 
     def _generate_type_factory_method_declaration(self, domain, declaration):
@@ -97,13 +100,14 @@ class ObjCProtocolTypeConversionsImplementationGenerator(ObjCGenerator):
 
     def _generate_type_factory_category_implementation(self, domains):
         lines = []
-        lines.append('@implementation ProtocolTypeConversions (%s)' % self.protocol_name())
-        lines.append('')
         for domain in domains:
+            lines.append('@implementation %sTypeConversions (%sDomain)' % (self.protocol_name(), domain.domain_name))
+            lines.append('')
+
             for declaration in domain.type_declarations:
                 lines.append(self._generate_type_factory_method_implementation(domain, declaration))
                 add_newline(lines)
-        lines.append('@end')
+            lines.append('@end')
         return '\n'.join(lines)
 
     def _generate_type_factory_method_implementation(self, domain, declaration):
index 0437a9e..7144a98 100755 (executable)
@@ -42,21 +42,24 @@ _FRAMEWORK_CONFIG_MAP = {
     "Global": {
     },
     "JavaScriptCore": {
-        "protocol_group": "Inspector",
+        "cpp_protocol_group": "Inspector",
         "export_macro": "JS_EXPORT_PRIVATE",
         "alternate_dispatchers": True,
     },
     "WebKit": {
-        "protocol_group": "Automation",
+        "cpp_protocol_group": "Automation",
+        "objc_protocol_group": "WD",
+        "objc_prefix": "WD",
     },
     "WebInspector": {
-        "protocol_group": "RWI",
+        "objc_protocol_group": "RWI",
         "objc_prefix": "RWI",
     },
     # Used for code generator tests.
     "Test": {
         "alternate_dispatchers": True,
-        "protocol_group": "Test",
+        "cpp_protocol_group": "Test",
+        "objc_protocol_group": "Test",
         "objc_prefix": "Test",
     }
 }
index 9a1aec8..cad872d 100755 (executable)
@@ -94,7 +94,7 @@ class ObjCGenerator(Generator):
 
     # The 'protocol name' is used to prefix filenames for a protocol group (a set of domains generated together).
     def protocol_name(self):
-        protocol_group = self.model().framework.setting('protocol_group', '')
+        protocol_group = self.model().framework.setting('objc_protocol_group', '')
         return '%s%s' % (protocol_group, ObjCGenerator.OBJC_SHARED_PREFIX)
 
     # The 'ObjC prefix' is used to prefix Objective-C class names and enums with a
index 484e268..df3103d 100644 (file)
@@ -1604,13 +1604,13 @@ inline TestProtocolDatabaseExecuteSQLAsyncPrintColor fromProtocolString(const St
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DatabaseDomain)
 
 + (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload;
 + (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload;
@@ -1619,7 +1619,7 @@ using namespace Inspector;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DatabaseDomain)
 
 + (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload
 {
index 9ba71b1..4ad146a 100644 (file)
@@ -1459,13 +1459,13 @@ inline TestProtocolDatabaseExecuteNoOptionalParametersPrintColor fromProtocolStr
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DatabaseDomain)
 
 + (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload;
 + (void)_parsePrimaryColors:(NSNumber **)outValue fromPayload:(id)payload;
@@ -1474,7 +1474,7 @@ using namespace Inspector;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DatabaseDomain)
 
 + (void)_parseDatabaseId:(NSNumber **)outValue fromPayload:(id)payload
 {
index 81e7531..1fc8ee8 100644 (file)
@@ -1310,19 +1310,28 @@ ObjCEnumType fromProtocolString(const String& value);
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (Network1Domain)
+
+@end
+@interface TestProtocolTypeConversions (Network2Domain)
 
 + (void)_parseLoaderId:(NSString **)outValue fromPayload:(id)payload;
 
 @end
+@interface TestProtocolTypeConversions (Network3Domain)
+
+@end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (Network1Domain)
+
+@end
+@implementation TestProtocolTypeConversions (Network2Domain)
 
 + (void)_parseLoaderId:(NSString **)outValue fromPayload:(id)payload
 {
@@ -1331,6 +1340,9 @@ using namespace Inspector;
 }
 
 @end
+@implementation TestProtocolTypeConversions (Network3Domain)
+
+@end
 
 
 ### End File: TestProtocolTypeConversions.mm
index ad4e074..3e44fe1 100644 (file)
@@ -1185,19 +1185,25 @@ inline TestProtocolEventDomainEventWithEnumParameterParameter fromProtocolString
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (TypeDomainDomain)
 
 + (void)_parseTypeDomainEnum:(NSNumber **)outValue fromPayload:(id)payload;
 
 @end
+@interface TestProtocolTypeConversions (CommandDomainDomain)
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@end
+@interface TestProtocolTypeConversions (EventDomainDomain)
+
+@end
+
+@implementation TestProtocolTypeConversions (TypeDomainDomain)
 
 + (void)_parseTypeDomainEnum:(NSNumber **)outValue fromPayload:(id)payload
 {
@@ -1206,6 +1212,12 @@ using namespace Inspector;
 }
 
 @end
+@implementation TestProtocolTypeConversions (CommandDomainDomain)
+
+@end
+@implementation TestProtocolTypeConversions (EventDomainDomain)
+
+@end
 
 
 ### End File: TestProtocolTypeConversions.mm
index c88d298..52a2345 100644 (file)
@@ -1033,13 +1033,13 @@ ObjCEnumType fromProtocolString(const String& value);
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DatabaseDomain)
 
 + (void)_parseDatabaseId:(NSString **)outValue fromPayload:(id)payload;
 + (void)_parsePrimaryColors:(NSString **)outValue fromPayload:(id)payload;
@@ -1048,7 +1048,7 @@ using namespace Inspector;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DatabaseDomain)
 
 + (void)_parseDatabaseId:(NSString **)outValue fromPayload:(id)payload
 {
index 5d440a1..164887e 100644 (file)
@@ -1086,19 +1086,28 @@ ObjCEnumType fromProtocolString(const String& value);
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (Network1Domain)
+
+@end
+@interface TestProtocolTypeConversions (Network2Domain)
 
 + (void)_parseNetworkError:(TestProtocolNetwork2NetworkError **)outValue fromPayload:(id)payload;
 
 @end
+@interface TestProtocolTypeConversions (Network3Domain)
+
+@end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (Network1Domain)
+
+@end
+@implementation TestProtocolTypeConversions (Network2Domain)
 
 + (void)_parseNetworkError:(TestProtocolNetwork2NetworkError **)outValue fromPayload:(id)payload
 {
@@ -1107,6 +1116,9 @@ using namespace Inspector;
 }
 
 @end
+@implementation TestProtocolTypeConversions (Network3Domain)
+
+@end
 
 
 ### End File: TestProtocolTypeConversions.mm
index 55e4db0..37b2e28 100644 (file)
@@ -803,21 +803,24 @@ ObjCEnumType fromProtocolString(const String& value);
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (RuntimeDomain)
 
 + (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload;
 
+@end
+@interface TestProtocolTypeConversions (Runtime2Domain)
+
 + (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (RuntimeDomain)
 
 + (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload
 {
@@ -825,6 +828,9 @@ using namespace Inspector;
     *outValue = (NSString *)payload;
 }
 
+@end
+@implementation TestProtocolTypeConversions (Runtime2Domain)
+
 + (void)_parseRemoteObjectId:(NSString **)outValue fromPayload:(id)payload
 {
     THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSString class]);
index f8c4f05..145a086 100644 (file)
@@ -956,19 +956,19 @@ inline TestProtocolRuntimeKeyPathType fromProtocolString(const String& value)
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (RuntimeDomain)
 
 + (void)_parseKeyPath:(TestProtocolRuntimeKeyPath **)outValue fromPayload:(id)payload;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (RuntimeDomain)
 
 + (void)_parseKeyPath:(TestProtocolRuntimeKeyPath **)outValue fromPayload:(id)payload
 {
index 35025ea..0944457 100644 (file)
@@ -790,19 +790,19 @@ ObjCEnumType fromProtocolString(const String& value);
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (RuntimeDomain)
 
 + (void)_parseRemoteObjectId:(NSNumber **)outValue fromPayload:(id)payload;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (RuntimeDomain)
 
 + (void)_parseRemoteObjectId:(NSNumber **)outValue fromPayload:(id)payload
 {
index b9aeeae..5b254e0 100644 (file)
@@ -905,17 +905,20 @@ inline TestProtocolDebuggerReason fromProtocolString(const String& value)
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DebuggerDomain)
 
 + (void)_parseBreakpointId:(NSNumber **)outValue fromPayload:(id)payload;
 + (void)_parseReason:(NSNumber **)outValue fromPayload:(id)payload;
 
+@end
+@interface TestProtocolTypeConversions (RuntimeDomain)
+
 + (void)_parseObjectId:(NSNumber **)outValue fromPayload:(id)payload;
 + (void)_parseLuckyNumbers:(NSArray/*<NSNumber>*/ **)outValue fromPayload:(id)payload;
 + (void)_parseBabyNames:(NSArray/*<NSString>*/ **)outValue fromPayload:(id)payload;
@@ -925,7 +928,7 @@ using namespace Inspector;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DebuggerDomain)
 
 + (void)_parseBreakpointId:(NSNumber **)outValue fromPayload:(id)payload
 {
@@ -939,6 +942,9 @@ using namespace Inspector;
     *outValue = @(Inspector::fromProtocolString<TestProtocolDebuggerReason>(payload));
 }
 
+@end
+@implementation TestProtocolTypeConversions (RuntimeDomain)
+
 + (void)_parseObjectId:(NSNumber **)outValue fromPayload:(id)payload
 {
     THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSNumber class]);
index 3683fa4..2dbda78 100644 (file)
@@ -958,20 +958,20 @@ inline TestProtocolRuntimeTwoLeggedAnimals fromProtocolString(const String& valu
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (RuntimeDomain)
 
 + (void)_parseFarmAnimals:(NSNumber **)outValue fromPayload:(id)payload;
 + (void)_parseTwoLeggedAnimals:(NSNumber **)outValue fromPayload:(id)payload;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (RuntimeDomain)
 
 + (void)_parseFarmAnimals:(NSNumber **)outValue fromPayload:(id)payload
 {
index 5187c39..0da8837 100644 (file)
@@ -1334,13 +1334,13 @@ ObjCEnumType fromProtocolString(const String& value);
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (DatabaseDomain)
 
 + (void)_parseError:(TestProtocolDatabaseError **)outValue fromPayload:(id)payload;
 + (void)_parseErrorList:(NSArray/*<TestProtocolDatabaseError>*/ **)outValue fromPayload:(id)payload;
@@ -1349,11 +1349,14 @@ using namespace Inspector;
 + (void)_parseObjectWithPropertyNameConflicts:(TestProtocolDatabaseObjectWithPropertyNameConflicts **)outValue fromPayload:(id)payload;
 + (void)_parseDummyObject:(TestProtocolDatabaseDummyObject **)outValue fromPayload:(id)payload;
 
+@end
+@interface TestProtocolTypeConversions (TestDomain)
+
 + (void)_parseParameterBundle:(TestProtocolTestParameterBundle **)outValue fromPayload:(id)payload;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (DatabaseDomain)
 
 + (void)_parseError:(TestProtocolDatabaseError **)outValue fromPayload:(id)payload
 {
@@ -1391,6 +1394,9 @@ using namespace Inspector;
     *outValue = [[TestProtocolDatabaseDummyObject alloc] initWithPayload:payload];
 }
 
+@end
+@implementation TestProtocolTypeConversions (TestDomain)
+
 + (void)_parseParameterBundle:(TestProtocolTestParameterBundle **)outValue fromPayload:(id)payload
 {
     THROW_EXCEPTION_FOR_BAD_TYPE(payload, [NSDictionary class]);
index b4ca509..b904af8 100644 (file)
@@ -1312,13 +1312,13 @@ inline TestProtocolTestCastedAnimals fromProtocolString(const String& value)
 #import "config.h"
 #import "TestProtocolTypeConversions.h"
 
-#import "ProtocolTypeConversions.h"
 #import "TestProtocol.h"
+#import "TestProtocolTypeParser.h"
 #import <WebInspector/RWIProtocolJSONObjectPrivate.h>
 
 using namespace Inspector;
 
-@interface ProtocolTypeConversions (TestProtocol)
+@interface TestProtocolTypeConversions (TestDomain)
 
 + (void)_parseTypeNeedingCast:(TestProtocolTestTypeNeedingCast **)outValue fromPayload:(id)payload;
 + (void)_parseCastedObjectId:(NSNumber **)outValue fromPayload:(id)payload;
@@ -1330,7 +1330,7 @@ using namespace Inspector;
 
 @end
 
-@implementation ProtocolTypeConversions (TestProtocol)
+@implementation TestProtocolTypeConversions (TestDomain)
 
 + (void)_parseTypeNeedingCast:(TestProtocolTestTypeNeedingCast **)outValue fromPayload:(id)payload
 {