Changeset 238577 in webkit

Timestamp:

Nov 27, 2018 2:12:53 PM (5 years ago)

Author:

Keith Rollin

Message:

Better parsing of comments in generate-message*.py
​https://bugs.webkit.org/show_bug.cgi?id=191866
<rdar://problem/46189563>

Reviewed by Chris Dumez.

The script parsing the *.messages.in files would treat a line starting
with '#' as a comment, but not a line starting with '<whitespace>#'.
This means that jamming a '#' right in front of the first character of
a message definition (as opposed to the beginning of a line) will have
no effect and the line will get treated just the same as a
non-commented line. Fix this by trimming all white space from the
beginning and ending of the line before processing it.

• Scripts/webkit/parser.py:

(parse):

• Scripts/webkit/test-messages.in:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkit/parser.py (modified) (2 diffs)
• Scripts/webkit/test-messages.in (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-27  Keith Rollin  <krollin@apple.com>
+
+        Better parsing of comments in generate-message*.py
+        https://bugs.webkit.org/show_bug.cgi?id=191866
+        <rdar://problem/46189563>
+
+        Reviewed by Chris Dumez.
+
+        The script parsing the *.messages.in files would treat a line starting
+        with '#' as a comment, but not a line starting with '<whitespace>#'.
+        This means that jamming a '#' right in front of the first character of
+        a message definition (as opposed to the beginning of a line) will have
+        no effect and the line will get treated just the same as a
+        non-commented line. Fix this by trimming all white space from the
+        beginning and ending of the line before processing it.
+
+        * Scripts/webkit/parser.py:
+        (parse):
+        * Scripts/webkit/test-messages.in:
+
 2018-11-27  Thibault Saunier  <tsaunier@igalia.com>
 

trunk/Source/WebKit/Scripts/webkit/parser.py

@@ -51 +51 @@
     superclass = []
     for line in file:
+        line = line.strip()
         match = re.search(r'messages -> (?P<destination>[A-Za-z_0-9]+) \s*(?::\s*(?P<superclass>.*?) \s*)?(?:(?P<attributes>.*?)\s+)?{', line)
         if match:
@@ -62 +63 @@
             continue
         if line.startswith('#'):
-            trimmed = line.rstrip()
             if line.startswith('#if '):
-                conditions.append(trimmed[4:])
+                conditions.append(line[4:])
             elif line.startswith('#endif') and conditions:
                 conditions.pop()
             elif line.startswith('#else') or line.startswith('#elif'):
-                raise Exception("ERROR: '%s' is not supported in the *.in files" % trimmed)
+                raise Exception("ERROR: '%s' is not supported in the *.in files" % line)
             continue
         match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\))?(?:\s+(.*))?', line)

trunk/Source/WebKit/Scripts/webkit/test-messages.in

@@ -23 +23 @@
 #if ENABLE(WEBKIT2)
 #if NESTED_MASTER_CONDITION || MASTER_OR && MASTER_AND
+
+
+# The parser should treat all of these as comments
+#FakeLoadURLA(String url)
+# FakeLoadURLB(String url)
+    #FakeLoadURLC(String url)
+    # FakeLoadURLD(String url)
 
 messages -> WebPage {