Changeset 160161 in webkit

Timestamp:

Dec 4, 2013, 11:41:26 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Report error when #else is used in message receiver generator's input.
​https://bugs.webkit.org/show_bug.cgi?id=124147

Patch by Gergo Balogh <​geryxyz@inf.u-szeged.hu> on 2013-12-04
Reviewed by Csaba Osztrogonác.

• Scripts/webkit2/messages_unittest.py:

(UnsupportedPrecompilerDirectiveTest):
(UnsupportedPrecompilerDirectiveTest.test_error_at_else):
(UnsupportedPrecompilerDirectiveTest.test_error_at_elif):

• Scripts/webkit2/parser.py:

(parse):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkit2/messages_unittest.py (modified) (1 diff)
• Scripts/webkit2/parser.py (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-04  Gergo Balogh  <geryxyz@inf.u-szeged.hu>
+
+        Report error when #else is used in message receiver generator's input.
+        https://bugs.webkit.org/show_bug.cgi?id=124147
+
+        Reviewed by Csaba Osztrogonác.
+
+        * Scripts/webkit2/messages_unittest.py:
+        (UnsupportedPrecompilerDirectiveTest):
+        (UnsupportedPrecompilerDirectiveTest.test_error_at_else):
+        (UnsupportedPrecompilerDirectiveTest.test_error_at_elif):
+        * Scripts/webkit2/parser.py:
+        (parse):
+
 2013-12-04  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/Scripts/webkit2/messages_unittest.py

@@ -1127 +1127 @@
 
 
+class UnsupportedPrecompilerDirectiveTest(unittest.TestCase):
+    def test_error_at_else(self):
+        with self.assertRaisesRegexp(Exception, r"ERROR: '#else.*' is not supported in the \*\.in files"):
+            messages.generate_message_handler(StringIO("asd\n#else bla\nfoo"))
+
+    def test_error_at_elif(self):
+        with self.assertRaisesRegexp(Exception, r"ERROR: '#elif.*' is not supported in the \*\.in files"):
+            messages.generate_message_handler(StringIO("asd\n#elif bla\nfoo"))
+
+
 if __name__ == '__main__':
     unittest.main()

trunk/Source/WebKit2/Scripts/webkit2/parser.py

@@ -60 +60 @@
             continue
         if line.startswith('#'):
+            trimmed = line.rstrip()
             if line.startswith('#if '):
-                conditions.append(line.rstrip()[4:])
+                conditions.append(trimmed[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)
             continue
         match = re.search(r'([A-Za-z_0-9]+)\((.*?)\)(?:(?:\s+->\s+)\((.*?)\))?(?:\s+(.*))?', line)