Changeset 248320 in webkit

Timestamp:

Aug 6, 2019, 3:20:31 PM (7 years ago)

Author:

Devin Rousso

Message:

Web Inspector: allow comments in protocol JSON
​https://bugs.webkit.org/show_bug.cgi?id=200104

Reviewed by Brian Burg.

• inspector/scripts/generate-inspector-protocol-bindings.py:

(generate_from_specification.load_specification):

• inspector/scripts/tests/generic/should-strip-comments.json: Added.
• inspector/scripts/tests/generic/expected/should-strip-comments.json-result: Added.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/scripts/generate-inspector-protocol-bindings.py (modified) (1 diff)
• inspector/scripts/tests/generic/expected/should-strip-comments.json-result (added)
• inspector/scripts/tests/generic/should-strip-comments.json (added)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-08-06  Devin Rousso  <drousso@apple.com>
+
+        Web Inspector: allow comments in protocol JSON
+        https://bugs.webkit.org/show_bug.cgi?id=200104
+
+        Reviewed by Brian Burg.
+
+        * inspector/scripts/generate-inspector-protocol-bindings.py:
+        (generate_from_specification.load_specification):
+
+        * inspector/scripts/tests/generic/should-strip-comments.json: Added.
+        * inspector/scripts/tests/generic/expected/should-strip-comments.json-result: Added.
+
 2019-08-06  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

@@ -125 +125 @@
         try:
             with open(filepath, "r") as input_file:
-                parsed_json = json.load(input_file)
+                parsed_json = json.loads(re.sub(r"/\*.+?\*/", "", input_file.read()))
                 protocol.parse_specification(parsed_json, isSupplemental)
         except ValueError as e: