Changeset 199219 in webkit
- Timestamp:
- Apr 8, 2016 12:13:28 AM (8 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r199214 r199219 1 2016-04-08 Brian Burg <bburg@apple.com> 2 3 Web Inspector: protocol generator should emit an error when 'type' is used instead of '$ref' 4 https://bugs.webkit.org/show_bug.cgi?id=156275 5 <rdar://problem/25569331> 6 7 Reviewed by Darin Adler. 8 9 * inspector/protocol/Heap.json: Fix a mistake that's now caught by the protocol generator. 10 11 * inspector/scripts/codegen/models.py: 12 (TypeReference.__init__): Check here if type_kind is on a whitelist of primitive types. 13 (TypeReference.referenced_name): Update comment. 14 15 Add a new test specifically for the case when the type would otherwise be resolved. Rebaseline. 16 17 * inspector/scripts/tests/expected/fail-on-type-reference-as-primitive-type.json-error: Added. 18 * inspector/scripts/tests/expected/fail-on-unknown-type-reference-in-type-declaration.json-error: 19 * inspector/scripts/tests/fail-on-type-reference-as-primitive-type.json: Added. 20 1 21 2016-04-07 Joseph Pecoraro <pecoraro@apple.com> 2 22 -
trunk/Source/JavaScriptCore/inspector/protocol/Heap.json
r197926 r199219 77 77 "description": "Information about the garbage collection.", 78 78 "parameters": [ 79 { "name": "collection", " type": "GarbageCollection" }79 { "name": "collection", "$ref": "GarbageCollection" } 80 80 ] 81 81 }, -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py
r198752 r199219 120 120 raise ParseException("Type reference cannot have both 'type' and '$ref' keys.") 121 121 122 all_primitive_types = ["integer", "number", "string", "boolean", "enum", "object", "array", "any"] 123 if type_kind is not None and type_kind not in all_primitive_types: 124 raise ParseException("Type reference '%s' is not a primitive type. Allowed values: %s" % (type_kind, ', '.join(all_primitive_types))) 125 122 126 if type_kind == "array" and array_items is None: 123 127 raise ParseException("Type reference with type 'array' must have key 'items' to define array element type.") … … 130 134 return self.referenced_type_name 131 135 else: 132 return self.type_kind # integer, string, number, boolean, enum, object, array136 return self.type_kind # one of all_primitive_types 133 137 134 138 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/fail-on-unknown-type-reference-in-type-declaration.json-error
r172655 r199219 1 ERROR: Lookup failed for type reference: dragon (referenced from domain: Runtime)1 ERROR: Type reference 'dragon' is not a primitive type. Allowed values: integer, number, string, boolean, enum, object, array, any
Note: See TracChangeset
for help on using the changeset viewer.