27377 2009-07-17 10:12:35 -0700 Assorted cpplint improvements 2009-07-17 13:14:54 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 manyoso webkit-unassigned oldest_to_newest 132612 0 manyoso 2009-07-17 10:12:35 -0700 The following patches are for assorted improvements in cpplint. The ChangeLog describes them. 132617 1 32953 manyoso 2009-07-17 10:27:34 -0700 Created attachment 32953 Adds new cpplint check for webkit rule violation 132619 2 32954 manyoso 2009-07-17 10:28:10 -0700 Created attachment 32954 Turn off erroneous filters preventing valid checks 132620 3 32955 manyoso 2009-07-17 10:28:34 -0700 Created attachment 32955 Move comment to where it belongs 132659 4 32954 levin 2009-07-17 12:09:52 -0700 Comment on attachment 32954 Turn off erroneous filters preventing valid checks > diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog > index 7b66d46..80f3a75 100644 > --- a/WebKitTools/ChangeLog > +++ b/WebKitTools/ChangeLog > @@ -3,6 +3,29 @@ > Reviewed by NOBODY (OOPS!). > > https://bugs.webkit.org/show_bug.cgi?id=27377 > + Don't filter whitespace at the end of the line. This is not > + explicitly a rule of webkit coding style, but there is no reason > + not to warn of this common style problem. > + > + Don't filter whitespace newline. This prevents cpplint of complaining > + about the following situation: I was confused when I read this because it sounded like removing the filtering prevented the complaining. Here's an idea for an alternate wording: Don't filter whitespace newline. Now, cpplint will complain about the following situation: > + > + if (true) { > + doSomething(); > + doSomethingAgain(); > + } > + else > + doSomething(); > + > + Which is a webkit coding style rule violation. > + > + * Scripts/modules/cpplint.py: > + > +2009-07-17 Adam Treat <adam.treat@torchmobile.com> > + > + Reviewed by NOBODY (OOPS!). > + > + https://bugs.webkit.org/show_bug.cgi?id=27377 > This makes cpplint complain about this for instance: > > if (true) > diff --git a/WebKitTools/Scripts/modules/cpplint.py b/WebKitTools/Scripts/modules/cpplint.py > index 2ef4e3a..cf22e3d 100644 > --- a/WebKitTools/Scripts/modules/cpplint.py > +++ b/WebKitTools/Scripts/modules/cpplint.py > @@ -2786,10 +2786,8 @@ def use_webkit_styles(): > # modify the implementation and enable them. > global _DEFAULT_FILTERS > _DEFAULT_FILTERS = [ > - '-whitespace/end_of_line', > '-whitespace/comments', > '-whitespace/blank_line', > - '-whitespace/newline', # '\r' > '-runtime/explicit', # explicit > '-runtime/virtual', # virtual dtor > '-runtime/printf', 132662 5 32953 levin 2009-07-17 12:30:38 -0700 Comment on attachment 32953 Adds new cpplint check for webkit rule violation > + or search(r'\b(if|for|while|switch)\b', previous_line)) Please add "else" and a test case using else. 132673 6 manyoso 2009-07-17 13:14:54 -0700 Landed with r46051, r46052, and r46053. 32953 2009-07-17 10:27:34 -0700 2009-07-17 12:30:38 -0700 Adds new cpplint check for webkit rule violation 27377_A.patch text/plain 3472 manyoso ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCAxZGMzYTI1Li43YjY2ZDQ2IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMDktMDct MTcgIEFkYW0gVHJlYXQgIDxhZGFtLnRyZWF0QHRvcmNobW9iaWxlLmNvbT4KIAorICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjczNzcKKyAgICAgICAgVGhpcyBtYWtlcyBjcHBsaW50IGNv bXBsYWluIGFib3V0IHRoaXMgZm9yIGluc3RhbmNlOgorCisgICAgICAgICAgICBpZiAodHJ1ZSkK KyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBpbnQgZm9vOworICAgICAgICAgICAgfQor CisgICAgICAgIEFkZCB0aGUgYXBwcm9wcmlhdGUgdW5pdCB0ZXN0cy4KKworICAgICAgICAqIFNj cmlwdHMvbW9kdWxlcy9jcHBsaW50LnB5OgorICAgICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jcHBs aW50X3VuaXR0ZXN0LnB5OgorCisyMDA5LTA3LTE3ICBBZGFtIFRyZWF0ICA8YWRhbS50cmVhdEB0 b3JjaG1vYmlsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCiAK ICAgICAgICAgU29tZXRoaW5nIGFib3V0IGhhdmluZyBhIHNpbmdsZSBUQUIgaW4gYSBzdHlsZSBj aGVja2luZyB0b29sIGxpa2UgdGhpcwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL2NwcGxpbnQucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludC5w eQppbmRleCAxM2ZlZjgwLi4yZWY0ZTNhIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRz L21vZHVsZXMvY3BwbGludC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3Bw bGludC5weQpAQCAtMTY3NCwxMCArMTY3NCwxMSBAQCBkZWYgY2hlY2tfYnJhY2VzKGZpbGVuYW1l LCBjbGVhbl9saW5lcywgbGluZV9udW1iZXIsIGVycm9yKToKICAgICAgICAgIyB0aGUgbGlmZXRp bWUgb2Ygc3RhY2stYWxsb2NhdGVkIHZhcmlhYmxlcy4gIFdlIGRvbid0IGRldGVjdCB0aGlzCiAg ICAgICAgICMgcGVyZmVjdGx5OiB3ZSBqdXN0IGRvbid0IGNvbXBsYWluIGlmIHRoZSBsYXN0IG5v bi13aGl0ZXNwYWNlCiAgICAgICAgICMgY2hhcmFjdGVyIG9uIHRoZSBwcmV2aW91cyBub24tYmxh bmsgbGluZSBpcyAnOycsICc6JywgJ3snLCAnfScsCi0gICAgICAgICMgJyknLCBvciAnKSBjb25z dCcuICBXZSBhbHNvIGFsbG93ICcjJyBmb3IgI2VuZGlmIGFuZCAnPScgZm9yCi0gICAgICAgICMg YXJyYXkgaW5pdGlhbGl6YXRpb24uCisgICAgICAgICMgJyknLCBvciAnKSBjb25zdCcgYW5kIGRv ZXNuJ3QgYmVnaW4gd2l0aCAnaWZ8Zm9yfHdoaWxlfHN3aXRjaCcuCisgICAgICAgICMgV2UgYWxz byBhbGxvdyAnIycgZm9yICNlbmRpZiBhbmQgJz0nIGZvciBhcnJheSBpbml0aWFsaXphdGlvbi4K ICAgICAgICAgcHJldmlvdXNfbGluZSA9IGdldF9wcmV2aW91c19ub25fYmxhbmtfbGluZShjbGVh bl9saW5lcywgbGluZV9udW1iZXIpWzBdCi0gICAgICAgIGlmIChub3Qgc2VhcmNoKHInWzs6fXsp PV1ccyokfFwpXHMqY29uc3RccyokJywgcHJldmlvdXNfbGluZSkKKyAgICAgICAgaWYgKChub3Qg c2VhcmNoKHInWzs6fXspPV1ccyokfFwpXHMqY29uc3RccyokJywgcHJldmlvdXNfbGluZSkKKyAg ICAgICAgICAgICBvciBzZWFyY2gocidcYihpZnxmb3J8d2hpbGV8c3dpdGNoKVxiJywgcHJldmlv dXNfbGluZSkpCiAgICAgICAgICAgICBhbmQgcHJldmlvdXNfbGluZS5maW5kKCcjJykgPCAwKToK ICAgICAgICAgICAgIGVycm9yKGZpbGVuYW1lLCBsaW5lX251bWJlciwgJ3doaXRlc3BhY2UvYnJh Y2VzJywgNCwKICAgICAgICAgICAgICAgICAgICdUaGlzIHsgc2hvdWxkIGJlIGF0IHRoZSBlbmQg b2YgdGhlIHByZXZpb3VzIGxpbmUnKQpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9t b2R1bGVzL2NwcGxpbnRfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMv Y3BwbGludF91bml0dGVzdC5weQppbmRleCA3ZDJiYzMxLi43NTI3ZTY5IDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQorKysgYi9XZWJL aXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQpAQCAtMjg3Miw2ICsy ODcyLDMwIEBAIGNsYXNzIFdlYktpdFN0eWxlVGVzdChDcHBsaW50VGVzdEJhc2UpOgogICAgICAg ICAgICAgJyAgICBpbnQgZm9vO1xuJwogICAgICAgICAgICAgJ307XG4nLAogICAgICAgICAgICAg J1RoaXMgeyBzaG91bGQgYmUgYXQgdGhlIGVuZCBvZiB0aGUgcHJldmlvdXMgbGluZSAgW3doaXRl c3BhY2UvYnJhY2VzXSBbNF0nKQorICAgICAgICBzZWxmLmFzc2VydF9tdWx0aV9saW5lX2xpbnQo CisgICAgICAgICAgICAnaWYgKGNvbmRpdGlvbilcbicKKyAgICAgICAgICAgICd7XG4nCisgICAg ICAgICAgICAnICAgIGludCBmb287XG4nCisgICAgICAgICAgICAnfVxuJywKKyAgICAgICAgICAg ICdUaGlzIHsgc2hvdWxkIGJlIGF0IHRoZSBlbmQgb2YgdGhlIHByZXZpb3VzIGxpbmUgIFt3aGl0 ZXNwYWNlL2JyYWNlc10gWzRdJykKKyAgICAgICAgc2VsZi5hc3NlcnRfbXVsdGlfbGluZV9saW50 KAorICAgICAgICAgICAgJ2ZvciAoaW50IGkgPSAwOyBpIDwgMTA7IGkrKylcbicKKyAgICAgICAg ICAgICd7XG4nCisgICAgICAgICAgICAnICAgIGludCBmb287XG4nCisgICAgICAgICAgICAnfVxu JywKKyAgICAgICAgICAgICdUaGlzIHsgc2hvdWxkIGJlIGF0IHRoZSBlbmQgb2YgdGhlIHByZXZp b3VzIGxpbmUgIFt3aGl0ZXNwYWNlL2JyYWNlc10gWzRdJykKKyAgICAgICAgc2VsZi5hc3NlcnRf bXVsdGlfbGluZV9saW50KAorICAgICAgICAgICAgJ3doaWxlICh0cnVlKVxuJworICAgICAgICAg ICAgJ3tcbicKKyAgICAgICAgICAgICcgICAgaW50IGZvbztcbicKKyAgICAgICAgICAgICd9XG4n LAorICAgICAgICAgICAgJ1RoaXMgeyBzaG91bGQgYmUgYXQgdGhlIGVuZCBvZiB0aGUgcHJldmlv dXMgbGluZSAgW3doaXRlc3BhY2UvYnJhY2VzXSBbNF0nKQorICAgICAgICBzZWxmLmFzc2VydF9t dWx0aV9saW5lX2xpbnQoCisgICAgICAgICAgICAnc3dpdGNoICh0eXBlKVxuJworICAgICAgICAg ICAgJ3tcbicKKyAgICAgICAgICAgICdjYXNlIGZvbzogcmV0dXJuO1xuJworICAgICAgICAgICAg J31cbicsCisgICAgICAgICAgICAnVGhpcyB7IHNob3VsZCBiZSBhdCB0aGUgZW5kIG9mIHRoZSBw cmV2aW91cyBsaW5lICBbd2hpdGVzcGFjZS9icmFjZXNdIFs0XScpCiAKICAgICAgICAgc2VsZi5h c3NlcnRfbXVsdGlfbGluZV9saW50KAogICAgICAgICAgICAgJ2lmICh0cnVlKSB7XG4nCg== 32954 2009-07-17 10:28:10 -0700 2009-07-17 12:09:52 -0700 Turn off erroneous filters preventing valid checks 27377_B.patch text/plain 1704 manyoso ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA3YjY2ZDQ2Li44MGYzYTc1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0zLDYgKzMsMjkgQEAKICAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI3Mzc3CisgICAgICAgIERvbid0IGZpbHRlciB3aGl0ZXNw YWNlIGF0IHRoZSBlbmQgb2YgdGhlIGxpbmUuICBUaGlzIGlzIG5vdAorICAgICAgICBleHBsaWNp dGx5IGEgcnVsZSBvZiB3ZWJraXQgY29kaW5nIHN0eWxlLCBidXQgdGhlcmUgaXMgbm8gcmVhc29u CisgICAgICAgIG5vdCB0byB3YXJuIG9mIHRoaXMgY29tbW9uIHN0eWxlIHByb2JsZW0uCisKKyAg ICAgICAgRG9uJ3QgZmlsdGVyIHdoaXRlc3BhY2UgbmV3bGluZS4gIFRoaXMgcHJldmVudHMgY3Bw bGludCBvZiBjb21wbGFpbmluZworICAgICAgICBhYm91dCB0aGUgZm9sbG93aW5nIHNpdHVhdGlv bjoKKworICAgICAgICAgICAgaWYgKHRydWUpIHsKKyAgICAgICAgICAgICAgICBkb1NvbWV0aGlu ZygpOworICAgICAgICAgICAgICAgIGRvU29tZXRoaW5nQWdhaW4oKTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBkb1NvbWV0aGluZygpOworCisgICAg ICAgIFdoaWNoIGlzIGEgd2Via2l0IGNvZGluZyBzdHlsZSBydWxlIHZpb2xhdGlvbi4KKworICAg ICAgICAqIFNjcmlwdHMvbW9kdWxlcy9jcHBsaW50LnB5OgorCisyMDA5LTA3LTE3ICBBZGFtIFRy ZWF0ICA8YWRhbS50cmVhdEB0b3JjaG1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTI3Mzc3CiAgICAgICAgIFRoaXMgbWFrZXMgY3BwbGludCBjb21wbGFpbiBhYm91 dCB0aGlzIGZvciBpbnN0YW5jZToKIAogICAgICAgICAgICAgaWYgKHRydWUpCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludC5weSBiL1dlYktpdFRvb2xzL1Nj cmlwdHMvbW9kdWxlcy9jcHBsaW50LnB5CmluZGV4IDJlZjRlM2EuLmNmMjJlM2QgMTAwNjQ0Ci0t LSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBsaW50LnB5CisrKyBiL1dlYktpdFRv b2xzL1NjcmlwdHMvbW9kdWxlcy9jcHBsaW50LnB5CkBAIC0yNzg2LDEwICsyNzg2LDggQEAgZGVm IHVzZV93ZWJraXRfc3R5bGVzKCk6CiAgICAgIyAgICAgICAgbW9kaWZ5IHRoZSBpbXBsZW1lbnRh dGlvbiBhbmQgZW5hYmxlIHRoZW0uCiAgICAgZ2xvYmFsIF9ERUZBVUxUX0ZJTFRFUlMKICAgICBf REVGQVVMVF9GSUxURVJTID0gWwotICAgICAgICAnLXdoaXRlc3BhY2UvZW5kX29mX2xpbmUnLAog ICAgICAgICAnLXdoaXRlc3BhY2UvY29tbWVudHMnLAogICAgICAgICAnLXdoaXRlc3BhY2UvYmxh bmtfbGluZScsCi0gICAgICAgICctd2hpdGVzcGFjZS9uZXdsaW5lJywgICMgJ1xyJwogICAgICAg ICAnLXJ1bnRpbWUvZXhwbGljaXQnLCAgIyBleHBsaWNpdAogICAgICAgICAnLXJ1bnRpbWUvdmly dHVhbCcsICAjIHZpcnR1YWwgZHRvcgogICAgICAgICAnLXJ1bnRpbWUvcHJpbnRmJywK 32955 2009-07-17 10:28:34 -0700 2009-07-17 11:12:22 -0700 Move comment to where it belongs 27377_C.patch text/plain 1863 manyoso ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCA4MGYzYTc1Li5jMjgyZmExIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VM b2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0zLDYgKzMsMTUgQEAKICAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTI3Mzc3CisgICAgICAgIE1vdmUgdGhpcyBjb21tZW50IHRv IHdoZXJlIGl0IGJlbG9uZ3MuCisKKyAgICAgICAgKiBTY3JpcHRzL21vZHVsZXMvY3BwbGludF91 bml0dGVzdC5weToKKworMjAwOS0wNy0xNyAgQWRhbSBUcmVhdCAgPGFkYW0udHJlYXRAdG9yY2ht b2JpbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yNzM3NwogICAgICAg ICBEb24ndCBmaWx0ZXIgd2hpdGVzcGFjZSBhdCB0aGUgZW5kIG9mIHRoZSBsaW5lLiAgVGhpcyBp cyBub3QKICAgICAgICAgZXhwbGljaXRseSBhIHJ1bGUgb2Ygd2Via2l0IGNvZGluZyBzdHlsZSwg YnV0IHRoZXJlIGlzIG5vIHJlYXNvbgogICAgICAgICBub3QgdG8gd2FybiBvZiB0aGlzIGNvbW1v biBzdHlsZSBwcm9ibGVtLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy9tb2R1bGVz L2NwcGxpbnRfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGlu dF91bml0dGVzdC5weQppbmRleCA3NTI3ZTY5Li43MjdlMmI4IDEwMDY0NAotLS0gYS9XZWJLaXRU b29scy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29s cy9TY3JpcHRzL21vZHVsZXMvY3BwbGludF91bml0dGVzdC5weQpAQCAtMjg5Nyw2ICsyODk3LDkg QEAgY2xhc3MgV2ViS2l0U3R5bGVUZXN0KENwcGxpbnRUZXN0QmFzZSk6CiAgICAgICAgICAgICAn fVxuJywKICAgICAgICAgICAgICdUaGlzIHsgc2hvdWxkIGJlIGF0IHRoZSBlbmQgb2YgdGhlIHBy ZXZpb3VzIGxpbmUgIFt3aGl0ZXNwYWNlL2JyYWNlc10gWzRdJykKIAorICAgICAgICAjIDMuIE9u ZS1saW5lIGNvbnRyb2wgY2xhdXNlcyBzaG91bGQgbm90IHVzZSBicmFjZXMgdW5sZXNzCisgICAg ICAgICMgICAgY29tbWVudHMgYXJlIGluY2x1ZGVkIG9yIGEgc2luZ2xlIHN0YXRlbWVudCBzcGFu cyBtdWx0aXBsZQorICAgICAgICAjICAgIGxpbmVzLgogICAgICAgICBzZWxmLmFzc2VydF9tdWx0 aV9saW5lX2xpbnQoCiAgICAgICAgICAgICAnaWYgKHRydWUpIHtcbicKICAgICAgICAgICAgICcg ICAgaW50IGZvbztcbicKQEAgLTI5MzcsMTEgKzI5NDAsNiBAQCBjbGFzcyBXZWJLaXRTdHlsZVRl c3QoQ3BwbGludFRlc3RCYXNlKToKICAgICAgICAgICAgICd9XG4nLAogICAgICAgICAgICAgJycp CiAKLSAgICAgICAgIyAzLiBPbmUtbGluZSBjb250cm9sIGNsYXVzZXMgc2hvdWxkIG5vdCB1c2Ug YnJhY2VzIHVubGVzcwotICAgICAgICAjICAgIGNvbW1lbnRzIGFyZSBpbmNsdWRlZCBvciBhIHNp bmdsZSBzdGF0ZW1lbnQgc3BhbnMgbXVsdGlwbGUKLSAgICAgICAgIyAgICBsaW5lcy4KLSAgICAg ICAgIyBGSVhNRTogTm8gdGVzdHMgZm9yIHRoaXMgcnVsZS4KLQogICAgICAgICAjIDQuIENvbnRy b2wgY2xhdXNlcyB3aXRob3V0IGEgYm9keSBzaG91bGQgdXNlIGVtcHR5IGJyYWNlcy4KICAgICAg ICAgc2VsZi5hc3NlcnRfbXVsdGlfbGluZV9saW50KAogICAgICAgICAgICAgJ2ZvciAoIDsgY3Vy cmVudDsgY3VycmVudCA9IGN1cnJlbnQtPm5leHQpIHsgfVxuJywK