Changeset 212157 in webkit

Timestamp:

Feb 10, 2017 3:47:02 PM (7 years ago)

Author:

BJ Burg

Message:

[Cocoa] Web Inspector: payload initializers for ObjC protocol types handles special-cased property names incorrectly
​https://bugs.webkit.org/show_bug.cgi?id=168141

Reviewed by Joseph Pecoraro.

The generated code erroneously uses the ObjC variable name as the payload key,
rather than the raw type member name. For example, 'identifier' would be used instead of 'id'.

• inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:

(ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload):

• inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result:

Rebaseline an affected test.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/scripts/codegen/generate_objc_protocol_types_implementation.py (modified) (1 diff)
• inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-02-10  Brian Burg  <bburg@apple.com>
+
+        [Cocoa] Web Inspector: payload initializers for ObjC protocol types handles special-cased property names incorrectly
+        https://bugs.webkit.org/show_bug.cgi?id=168141
+
+        Reviewed by Joseph Pecoraro.
+
+        The generated code erroneously uses the ObjC variable name as the payload key,
+        rather than the raw type member name. For example, 'identifier' would be used instead of 'id'.
+
+        * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
+        (ObjCProtocolTypesImplementationGenerator._generate_init_method_for_payload):
+
+        * inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result:
+        Rebaseline an affected test.
+
 2017-02-10  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py

@@ -129 +129 @@
 
         for member in declaration.type_members:
-            var_name = ObjCGenerator.identifier_to_objc_identifier(member.member_name)
+            member_name = member.member_name
+            conversion_expression = self.payload_to_objc_expression_for_member(declaration, member)
+
             if not member.is_optional:
-                lines.append('    THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"%s"], @"%s");' % (var_name, var_name))
-            conversion_expression = self.payload_to_objc_expression_for_member(declaration, member)
+                lines.append('    THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"%s"], @"%s");' % (member_name, member_name))
+
+            var_name = ObjCGenerator.identifier_to_objc_identifier(member_name)
             lines.append('    self.%s = %s;' % (var_name, conversion_expression))
             lines.append('')

trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result

@@ -1464 +1464 @@
     self.animals = fromProtocolString<TestProtocolTestCastedAnimals>(payload[@"animals"]);
 
-    THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"identifier"], @"identifier");
+    THROW_EXCEPTION_FOR_REQUIRED_PROPERTY(payload[@"id"], @"id");
     self.identifier = [payload[@"id"] integerValue];