123528 2013-10-30 13:47:35 -0700 Teach the style checker about ENUM_CLASS 2013-10-30 21:09:23 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap aestes commit-queue glenn mitz oldest_to_newest 945166 0 ap 2013-10-30 13:47:35 -0700 Complaints in <https://bugs.webkit.org/show_bug.cgi?id=123462#c4> were wrong. 945219 1 215570 ap 2013-10-30 16:25:22 -0700 Created attachment 215570 proposed patch 945246 2 215570 aestes 2013-10-30 17:01:44 -0700 Comment on attachment 215570 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=215570&action=review r=me > Tools/Scripts/webkitpy/style/checkers/cpp.py:1196 > + expr_enum_start = r'\s*(?:enum(?:\s+[a-zA-Z0-9]+)?|ENUM_CLASS\s*\([a-zA-Z0-9]+\))\s*\{?\s*' Does the ([a-zA-Z0-9]+\) need to be non-capturing? Not sure it matters since only named groups are used. 945303 3 ap 2013-10-30 19:24:56 -0700 It's not a group - the parentheses are escaped :) 945336 4 aestes 2013-10-30 20:34:55 -0700 (In reply to comment #3) > It's not a group - the parentheses are escaped :) Indeed :/ 945356 5 215570 commit-queue 2013-10-30 21:09:20 -0700 Comment on attachment 215570 proposed patch Clearing flags on attachment: 215570 Committed r158342: <http://trac.webkit.org/changeset/158342> 945357 6 commit-queue 2013-10-30 21:09:23 -0700 All reviewed patches have been landed. Closing bug. 215570 2013-10-30 16:25:22 -0700 2013-10-30 21:09:19 -0700 proposed patch enum_class.txt text/plain 6438 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE1ODMyNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDEzLTEwLTMwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIFRlYWNoIHRoZSBzdHlsZSBjaGVja2VyIGFib3V0IEVOVU1fQ0xBU1MKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMzUyOAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHk6CisgICAgICAgIChfRW51bVN0YXRlLnByb2Nl c3NfY2xlYW5fbGluZSk6IE1ha2UgY29udGVudCBvZiBhbiBFTlVNX0NMQVNTIGRlY2xhcmF0aW9u CisgICAgICAgIGVxdWl2YWxlbnQgdG8gZW51bSBjb250ZW50IGZvciBjaGVja2luZy4KKyAgICAg ICAgKGNoZWNrX2JyYWNlcyk6IEFsbG93IHNlbWljb2xvbiBhdCB0aGUgZW5kLgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHk6CisgICAg ICAgIChOb05vblZpcnR1YWxEZXN0cnVjdG9yc1Rlc3QudGVzdF9lbnVtX2Nhc2luZyk6CisgICAg ICAgIChOb05vblZpcnR1YWxEZXN0cnVjdG9yc1Rlc3QudGVzdF9lbnVtX3RyYWlsaW5nX3NlbWlj b2xvbik6CisgICAgICAgIChXZWJLaXRTdHlsZVRlc3QudGVzdF9icmFjZXMpOgorICAgICAgICBU ZXN0IGl0LgorCiAyMDEzLTEwLTMwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CiAKICAgICAgICAgVHJ5IHRvIGZpeCB0aGUgMzItYml0IGJ1aWxkLgpJbmRleDogVG9vbHMv U2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHAucHkJKHJldmlzaW9uIDE1ODMx MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5CSh3b3Jr aW5nIGNvcHkpCkBAIC0xMTkzLDcgKzExOTMsNyBAQCBjbGFzcyBfRW51bVN0YXRlKG9iamVjdCk6 CiAgICAgICAgIGV4cHJfYWxsX3VwcGVyY2FzZSA9IHInXHMqW0EtWjAtOV9dK1xzKig/Oj1ccypb YS16QS1aMC05XStccyopPyw/XHMqJCcKICAgICAgICAgZXhwcl9zdGFydHNfbG93ZXJjYXNlID0g cidccypbYS16XScKICAgICAgICAgZXhwcl9lbnVtX2VuZCA9IHInfVxzKig/OlthLXpBLVowLTld K1xzKig/Oj1ccypbYS16QS1aMC05XSspPyk/XHMqO1xzKicKLSAgICAgICAgZXhwcl9lbnVtX3N0 YXJ0ID0gcidccyplbnVtKD86XHMrW2EtekEtWjAtOV0rKT9ccypcez9ccyonCisgICAgICAgIGV4 cHJfZW51bV9zdGFydCA9IHInXHMqKD86ZW51bSg/OlxzK1thLXpBLVowLTldKyk/fEVOVU1fQ0xB U1NccypcKFthLXpBLVowLTldK1wpKVxzKlx7P1xzKicKICAgICAgICAgaWYgc2VsZi5pbl9lbnVt X2RlY2w6CiAgICAgICAgICAgICBpZiBtYXRjaChyJ1xzKicgKyBleHByX2VudW1fZW5kICsgcick JywgbGluZSk6CiAgICAgICAgICAgICAgICAgc2VsZi5pbl9lbnVtX2RlY2wgPSBGYWxzZQpAQCAt MjI5MSwxMyArMjI5MSwxMyBAQCBkZWYgY2hlY2tfYnJhY2VzKGNsZWFuX2xpbmVzLCBsaW5lX251 bWJlCiAgICAgICAgICMgV2UgYWxzbyBhbGxvdyAnIycgZm9yICNlbmRpZiBhbmQgJz0nIGZvciBh cnJheSBpbml0aWFsaXphdGlvbi4KICAgICAgICAgcHJldmlvdXNfbGluZSA9IGdldF9wcmV2aW91 c19ub25fYmxhbmtfbGluZShjbGVhbl9saW5lcywgbGluZV9udW1iZXIpWzBdCiAgICAgICAgIGlm ICgobm90IHNlYXJjaChyJ1s7On17KT1dXHMqJHxcKVxzKigoY29uc3R8T1ZFUlJJREUpXHMqKSpc cyokJywgcHJldmlvdXNfbGluZSkKLSAgICAgICAgICAgICBvciBzZWFyY2gocidcYihpZnxmb3J8 Zm9yZWFjaHx3aGlsZXxzd2l0Y2h8ZWxzZXxOU19FTlVNKVxiJywgcHJldmlvdXNfbGluZSkpCisg ICAgICAgICAgICAgb3Igc2VhcmNoKHInXGIoaWZ8Zm9yfGZvcmVhY2h8d2hpbGV8c3dpdGNofGVs c2V8TlNfRU5VTXxFTlVNX0NMQVNTKVxiJywgcHJldmlvdXNfbGluZSkpCiAgICAgICAgICAgICBh bmQgcHJldmlvdXNfbGluZS5maW5kKCcjJykgPCAwKToKICAgICAgICAgICAgIGVycm9yKGxpbmVf bnVtYmVyLCAnd2hpdGVzcGFjZS9icmFjZXMnLCA0LAogICAgICAgICAgICAgICAgICAgJ1RoaXMg eyBzaG91bGQgYmUgYXQgdGhlIGVuZCBvZiB0aGUgcHJldmlvdXMgbGluZScpCiAgICAgZWxpZiAo c2VhcmNoKHInXClccyooKChjb25zdHxPVkVSUklERSlccyopKlxzKik/e1xzKiQnLCBsaW5lKQog ICAgICAgICAgIGFuZCBsaW5lLmNvdW50KCcoJykgPT0gbGluZS5jb3VudCgnKScpCi0gICAgICAg ICAgYW5kIG5vdCBzZWFyY2gocidcYihpZnxmb3J8Zm9yZWFjaHx3aGlsZXxzd2l0Y2h8TlNfRU5V TSlcYicsIGxpbmUpCisgICAgICAgICAgYW5kIG5vdCBzZWFyY2gocidcYihpZnxmb3J8Zm9yZWFj aHx3aGlsZXxzd2l0Y2h8TlNfRU5VTXxFTlVNX0NMQVNTKVxiJywgbGluZSkKICAgICAgICAgICBh bmQgbm90IG1hdGNoKHInXHMrW0EtWl9dW0EtWl8wLTldK1xiJywgbGluZSkpOgogICAgICAgICBl cnJvcihsaW5lX251bWJlciwgJ3doaXRlc3BhY2UvYnJhY2VzJywgNCwKICAgICAgICAgICAgICAg J1BsYWNlIGJyYWNlIG9uIGl0cyBvd24gbGluZSBmb3IgZnVuY3Rpb24gZGVmaW5pdGlvbnMuJykK QEAgLTIzNDEsNyArMjM0MSw3IEBAIGRlZiBjaGVja19icmFjZXMoY2xlYW5fbGluZXMsIGxpbmVf bnVtYmUKICAgICAgICAgICAgIGJyZWFrCiAgICAgaWYgKHNlYXJjaChyJ3suKn1ccyo7JywgbGlu ZSkKICAgICAgICAgYW5kIGxpbmUuY291bnQoJ3snKSA9PSBsaW5lLmNvdW50KCd9JykKLSAgICAg ICAgYW5kIG5vdCBzZWFyY2gocidzdHJ1Y3R8Y2xhc3N8ZW51bXxccyo9XHMqeycsIGxpbmUpKToK KyAgICAgICAgYW5kIG5vdCBzZWFyY2gocidzdHJ1Y3R8Y2xhc3N8ZW51bXxFTlVNX0NMQVNTfFxz Kj1ccyp7JywgbGluZSkpOgogICAgICAgICBlcnJvcihsaW5lX251bWJlciwgJ3JlYWRhYmlsaXR5 L2JyYWNlcycsIDQsCiAgICAgICAgICAgICAgICJZb3UgZG9uJ3QgbmVlZCBhIDsgYWZ0ZXIgYSB9 IikKIApJbmRleDogVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVja2Vycy9jcHBfdW5p dHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9jaGVj a2Vycy9jcHBfdW5pdHRlc3QucHkJKHJldmlzaW9uIDE1ODMxMCkKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBA IC0zMjc3LDYgKzMyNzcsMzkgQEAgY2xhc3MgTm9Ob25WaXJ0dWFsRGVzdHJ1Y3RvcnNUZXN0KENw cFN0eQogCiAgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xpbmVfbGludCgKICAgICAgICAgICAg ICcnJ1wKKyAgICAgICAgICAgICAgICBFTlVNX0NMQVNTKEZvbykgeworICAgICAgICAgICAgICAg ICAgICBGT09fT05FID0gMSwKKyAgICAgICAgICAgICAgICAgICAgRk9PX1RXTworICAgICAgICAg ICAgICAgIH07CisgICAgICAgICAgICAgICAgRU5VTV9DTEFTUyhGb28pIHsgRk9PX09ORSB9Owor ICAgICAgICAgICAgICAgIEVOVU1fQ0xBU1MoRm9vKSB7Rm9vT25lLCBmb29Ud299OworICAgICAg ICAgICAgICAgIEVOVU1fQ0xBU1MoRm9vKSB7CisgICAgICAgICAgICAgICAgICAgIEZPT19PTkUK KyAgICAgICAgICAgICAgICB9OycnJywKKyAgICAgICAgICAgIFsnZW51bSBtZW1iZXJzIHNob3Vs ZCB1c2UgSW50ZXJDYXBzIHdpdGggYW4gaW5pdGlhbCBjYXBpdGFsIGxldHRlci4gIFtyZWFkYWJp bGl0eS9lbnVtX2Nhc2luZ10gWzRdJ10gKiA1KQorCisgICAgICAgIHNlbGYuYXNzZXJ0X211bHRp X2xpbmVfbGludCgKKyAgICAgICAgICAgICcnJ1wKKyAgICAgICAgICAgICAgICBFTlVNX0NMQVNT KEZvbykgeworICAgICAgICAgICAgICAgICAgICBmb29PbmUgPSAxLAorICAgICAgICAgICAgICAg ICAgICBGb29Ud28gPSAyCisgICAgICAgICAgICAgICAgfTsnJycsCisgICAgICAgICAgICAnZW51 bSBtZW1iZXJzIHNob3VsZCB1c2UgSW50ZXJDYXBzIHdpdGggYW4gaW5pdGlhbCBjYXBpdGFsIGxl dHRlci4gIFtyZWFkYWJpbGl0eS9lbnVtX2Nhc2luZ10gWzRdJykKKworICAgICAgICBzZWxmLmFz c2VydF9tdWx0aV9saW5lX2xpbnQoCisgICAgICAgICAgICAnJydcCisgICAgICAgICAgICAgICAg RU5VTV9DTEFTUyhGb28pIHsKKyAgICAgICAgICAgICAgICAgICAgRm9vT25lID0gMSwKKyAgICAg ICAgICAgICAgICAgICAgRm9vVHdvCisgICAgICAgICAgICAgICAgfSBmb29WYXIgPSBGb29PbmU7 CisgICAgICAgICAgICAgICAgRU5VTV9DTEFTUyhFbnVtMTIzKSB7CisgICAgICAgICAgICAgICAg ICAgIEZvb09uZSwKKyAgICAgICAgICAgICAgICAgICAgRm9vVHdvID0gRm9vT25lLAorICAgICAg ICAgICAgICAgIH07JycnLAorICAgICAgICAgICAgJycpCisKKyAgICAgICAgc2VsZi5hc3NlcnRf bXVsdGlfbGluZV9saW50KAorICAgICAgICAgICAgJycnXAogICAgICAgICAgICAgICAgIC8vIFdl YklETCBlbnVtCiAgICAgICAgICAgICAgICAgZW51bSBGb28gewogICAgICAgICAgICAgICAgICAg ICBGT09fT05FID0gMSwKQEAgLTMyOTAsNiArMzMyMywyNiBAQCBjbGFzcyBOb05vblZpcnR1YWxE ZXN0cnVjdG9yc1Rlc3QoQ3BwU3R5CiAgICAgICAgICAgICAgICAgZW51bSBGb28geyBGT09fT05F LCBGT09fVFdPIH07JycnLAogICAgICAgICAgICAgJycpCiAKKyAgICBkZWYgdGVzdF9lbnVtX3Ry YWlsaW5nX3NlbWljb2xvbihzZWxmKToKKyAgICAgICAgc2VsZi5hc3NlcnRfbGludCgKKyAgICAg ICAgICAgICdlbnVtIE15RW51bSB7IFZhbHVlMSwgVmFsdWUyIH07JywKKyAgICAgICAgICAgICcn KQorICAgICAgICBzZWxmLmFzc2VydF9saW50KAorICAgICAgICAgICAgJ2VudW0gTXlFbnVtIHtc bicKKyAgICAgICAgICAgICcgICAgVmFsdWUxLFxuJworICAgICAgICAgICAgJyAgICBWYWx1ZTJc bicKKyAgICAgICAgICAgICd9OycsCisgICAgICAgICAgICAnJykKKyAgICAgICAgc2VsZi5hc3Nl cnRfbGludCgKKyAgICAgICAgICAgICdFTlVNX0NMQVNTKENQUDExRW51bUNsYXNzKSB7IFZhbHVl MSwgVmFsdWUyIH07JywKKyAgICAgICAgICAgICcnKQorICAgICAgICBzZWxmLmFzc2VydF9saW50 KAorICAgICAgICAgICAgJ0VOVU1fQ0xBU1MoTXlFbnVtKSB7XG4nCisgICAgICAgICAgICAnICAg IFZhbHVlMSxcbicKKyAgICAgICAgICAgICcgICAgVmFsdWUyXG4nCisgICAgICAgICAgICAnfTsn LAorICAgICAgICAgICAgJycpCisKICAgICBkZWYgdGVzdF9kZXN0cnVjdG9yX25vbl92aXJ0dWFs X3doZW5fdmlydHVhbF9uZWVkZWQoc2VsZik6CiAgICAgICAgIHNlbGYuYXNzZXJ0X211bHRpX2xp bmVfbGludF9yZSgKICAgICAgICAgICAgICcnJ1wKQEAgLTQyMTMsNiArNDI2NiwxOCBAQCBjbGFz cyBXZWJLaXRTdHlsZVRlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAgICAgICAgICAnICAgIDAs XG4nCiAgICAgICAgICAgICAnICAgIDFcbicKICAgICAgICAgICAgICd9OycsICcnKQorICAgICAg ICBzZWxmLmFzc2VydF9tdWx0aV9saW5lX2xpbnQoCisgICAgICAgICAgICAnRU5VTV9DTEFTUyhD UFAxMUVudW1DbGFzcylcbicKKyAgICAgICAgICAgICd7XG4nCisgICAgICAgICAgICAnICAgIFZh bHVlMSxcbicKKyAgICAgICAgICAgICcgICAgVmFsdWUyXG4nCisgICAgICAgICAgICAnfTsnLAor ICAgICAgICAgICAgJ1RoaXMgeyBzaG91bGQgYmUgYXQgdGhlIGVuZCBvZiB0aGUgcHJldmlvdXMg bGluZSAgW3doaXRlc3BhY2UvYnJhY2VzXSBbNF0nKQorICAgICAgICBzZWxmLmFzc2VydF9tdWx0 aV9saW5lX2xpbnQoCisgICAgICAgICAgICAnRU5VTV9DTEFTUyhDUFAxMUVudW1DbGFzcykge1xu JworICAgICAgICAgICAgJyAgICBWYWx1ZTEsXG4nCisgICAgICAgICAgICAnICAgIFZhbHVlMlxu JworICAgICAgICAgICAgJ307JywgJycpCiAKICAgICAgICAgIyAzLiBPbmUtbGluZSBjb250cm9s IGNsYXVzZXMgc2hvdWxkIG5vdCB1c2UgYnJhY2VzIHVubGVzcwogICAgICAgICAjICAgIGNvbW1l bnRzIGFyZSBpbmNsdWRlZCBvciBhIHNpbmdsZSBzdGF0ZW1lbnQgc3BhbnMgbXVsdGlwbGUK