Bug 161165 – check-webkit-style doesn't understand macros containing `else` or labels

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[JF Bastien]

In the following patch: https://bugs.webkit.org/show_bug.cgi?id=160921

check-webkit-style is unhappy with this idiom:

#FOO() \
  if (a) \
    stmt; \
  else \
    stmt

As well as with labels:

#FOO() { \
  label: \
    stmt; \
  }

In both cases, check-webkit-style's regular expressions don't expect a backslash there, making it sad.

[JF Bastien]

Errors were:

ERROR: Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:1214:  Else clause should never be on same line as else (use 2 lines)  [whitespace/newline] [4]
ERROR: Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:1215:  Should be indented on a separate line, with the colon or comma first on that line.  [whitespace/indent]

[JF Bastien]

Created attachment 286995 [details]
patch

Fixed else in a macro. I don't think fixing labels in a macro is as useful (the checker thinks it's looking at initializer lists at that point, and its regexes are already complex).

[Geoffrey Garen]

Comment on attachment 286995 [details]
patch

r=me

[Build Bot]

Comment on attachment 286995 [details]
patch

Attachment 286995 [details] did not pass mac-ews (mac):
Output: http://webkit-queues.webkit.org/results/1941456

New failing tests:
imported/w3c/web-platform-tests/html/dom/interfaces.html

[Build Bot]

Created attachment 287000 [details]
Archive of layout-test-results from ews101 for mac-yosemite

The attached test failures were seen while running run-webkit-tests on the mac-ews.
Bot: ews101  Port: mac-yosemite  Platform: Mac OS X 10.10.5

[JF Bastien]

Because I'm likely to forget: I ran the tests as follows
  PYTHONPATH=./Tools/Scripts/ python ./Tools/Scripts/webkitpy/test/main.py

[WebKit Commit Bot]

Comment on attachment 286995 [details]
patch

Clearing flags on attachment: 286995

Committed r205135: <http://trac.webkit.org/changeset/205135>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.