49427 2010-11-11 22:52:10 -0800 check-webkit-style function detection doesn't handle templates with spaces. 2010-11-11 23:40:18 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 49394 1 levin levin hamaji oldest_to_newest 308390 0 levin 2010-11-11 22:52:10 -0800 See summary. 308393 1 73702 levin 2010-11-11 22:58:16 -0800 Created attachment 73702 Patch 308394 2 73702 hamaji 2010-11-11 23:07:43 -0800 Comment on attachment 73702 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=73702&action=review > WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py:2452 > + ('my_namespace::my_other_namespace::MyVeryLongTypeName<Type1, Type5>*\n' As now we can handle something like MyVeryLongTypeName<Type1, Type5<Type6, Type7> > , it's worth having such test case? 308398 3 73702 levin 2010-11-11 23:26:11 -0800 Comment on attachment 73702 Patch I'll change the test and commit. 308400 4 levin 2010-11-11 23:33:40 -0800 PS It found a bug. I had to change line_with_no_templates = iteratively_replace_matches_with_char(r'<[^>]*>', line, "_") to line_with_no_templates = iteratively_replace_matches_with_char(r'<[^<>]*>', line, "_") in order not cover two templates at once (like this "< < >" which is what it was doing before). 308403 5 hamaji 2010-11-11 23:38:56 -0800 (In reply to comment #4) > PS It found a bug. > > I had to change > line_with_no_templates = iteratively_replace_matches_with_char(r'<[^>]*>', line, "_") > to > line_with_no_templates = iteratively_replace_matches_with_char(r'<[^<>]*>', line, "_") > in order not cover two templates at once (like this "< < >" which is what it was doing before). Ah, nice catch! 308404 6 levin 2010-11-11 23:40:18 -0800 Committed as http://trac.webkit.org/changeset/71896 73702 2010-11-11 22:58:16 -0800 2010-11-11 23:26:11 -0800 Patch bug-49427-20101111225815.patch text/plain 5037 levin ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxv ZwppbmRleCBmMzQwNWNhMGQwOWEyMTg1YmNkMzkyZTNkNGFlMDhlMzVkZjU3NjdiLi5jZWJmMzJh MWU3ODIxNmQ4ODdmM2FkZDcyZTEyOGZjOTE5NTg2MmM1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29s cy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAK IDIwMTAtMTEtMTEgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgogCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNoZWNrLXdlYmtpdC1zdHls ZSBmdW5jdGlvbiBkZXRlY3Rpb24gZG9lc24ndCBoYW5kbGUgdGVtcGxhdGVzIHdpdGggc3BhY2Vz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDk0MjcK KworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwLnB5OiBTdHJp cHBlZCBvdXQgdGVtcGxhdGVzIHdoZW4KKyAgICAgICAgICBmaW5kaW5nIHRoZSBmdW5jdGlvbiBu YW1lLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3BwX3VuaXR0 ZXN0LnB5OiBNYWRlIHRoZSB0ZXN0IGhhdmUgYQorICAgICAgICAgIHRlbXBsYXRlIHdpdGggYSBz cGFjZS4KKworMjAxMC0xMS0xMSAgRGF2aWQgTGV2aW4gIDxsZXZpbkBjaHJvbWl1bS5vcmc+CisK ICAgICAgICAgUmV2aWV3ZWQgYnkgU2hpbmljaGlybyBIYW1hamkuCiAKICAgICAgICAgY2hlY2st d2Via2l0LXN0eWxlIGZ1bmN0aW9uIGRldGVjdGlvbiBkb2Vzbid0IHdvcmsgZm9yIHRlbXBsYXRl cyBhbmQgZGVzdHJ1Y3RvcnMuCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5weSBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv c3R5bGUvY2hlY2tlcnMvY3BwLnB5CmluZGV4IDkxZTJjMWUxZDkzMWUzYTA1NDdiMDIxMmZiNjk2 NGU0MWEyODgxY2UuLjRiZWRiNzY4ODQ3YWE2NzFiOGRiMGUyNTdiNzEzOTM5ZmRlN2IyOTkgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3Bw LnB5CisrKyBiL1dlYktpdFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcnMvY3Bw LnB5CkBAIC0xNTIsNiArMTUyLDM3IEBAIGRlZiBzdWJuKHBhdHRlcm4sIHJlcGxhY2VtZW50LCBz KToKICAgICByZXR1cm4gX3JlZ2V4cF9jb21waWxlX2NhY2hlW3BhdHRlcm5dLnN1Ym4ocmVwbGFj ZW1lbnQsIHMpCiAKIAorZGVmIGl0ZXJhdGl2ZWx5X3JlcGxhY2VfbWF0Y2hlc193aXRoX2NoYXIo cGF0dGVybiwgcywgY2hhcik6CisgICAgIiIiUmV0dXJucyB0aGUgc3RyaW5nIHdpdGggcmVwbGFj ZW1lbnRzLgorCisgICAgRXZlcnkgY2hhcmFjdGVyIGluIHRoZSBtYXRjaCBpcyByZXBsYWNlZCB3 aXRoIGNoYXIuCisgICAgRHVlIHRvIHRoZSBpdGVyYXRpdmUgbmF0dXJlLCBwYXR0ZXJuIHNob3Vs ZCBub3QgbWF0Y2ggY2hhciBvcgorICAgIHRoZXJlIHdpbGwgYmUgYW4gaW5maW5pdGUgbG9vcC4K KworICAgIEV4YW1wbGU6CisgICAgICBwYXR0ZXJuID0gcic8W14+XT4nICMgdGVtcGxhdGUgcGFy YW1ldGVycworICAgICAgcyA9ICAgICAnQTxCPEMsIEQ+PicKKyAgICAgIGNoYXIgPSAgJ18nCisg ICAgICBSZXR1cm5zICdBX19fX19fX19fJworCisgICAgQXJnczoKKyAgICAgIHBhdHRlcm46IHRo ZSByZWdleCB0byBtYXRjaAorICAgICAgczogdGhlIHN0cmluZyBvbiB3aGljaCB0byBkbyB0aGUg cmVwbGFjZW1lbnRzLgorICAgICAgY2hhcjogdGhlIGNoYXJhY3RlciB0byBwdXQgaW4gdGhlIHBs YWNlIG9mIHRoZSBtYXRjaAorCisgICAgUmV0dXJuczoKKyAgICAgIFRydWUsIGlmIHRoZSBnaXZl biBsaW5lIGlzIGJsYW5rLgorICAgICIiIgorICAgIHdoaWxlIFRydWU6CisgICAgICAgIG1hdGNo ZWQgPSBzZWFyY2gocGF0dGVybiwgcykKKyAgICAgICAgaWYgbm90IG1hdGNoZWQ6CisgICAgICAg ICAgICByZXR1cm4gcworICAgICAgICBzdGFydF9tYXRjaF9pbmRleCA9IG1hdGNoZWQuc3RhcnQo MCkKKyAgICAgICAgZW5kX21hdGNoX2luZGV4ID0gbWF0Y2hlZC5lbmQoMCkKKyAgICAgICAgbWF0 Y2hfbGVuZ3RoID0gZW5kX21hdGNoX2luZGV4IC0gc3RhcnRfbWF0Y2hfaW5kZXgKKyAgICAgICAg cyA9IHNbOnN0YXJ0X21hdGNoX2luZGV4XSArIGNoYXIgKiBtYXRjaF9sZW5ndGggKyBzW2VuZF9t YXRjaF9pbmRleDpdCisKKwogZGVmIHVwX3RvX3VubWF0Y2hlZF9jbG9zaW5nX3BhcmVuKHMpOgog ICAgICIiIlNwbGl0cyBhIHN0cmluZyBpbnRvIHR3byBwYXJ0cyB1cCB0byBmaXJzdCB1bm1hdGNo ZWQgJyknLgogCkBAIC0xMTU2LDcgKzExODcsMTUgQEAgZGVmIGNoZWNrX2Zvcl9mdW5jdGlvbl9s ZW5ndGhzKGNsZWFuX2xpbmVzLCBsaW5lX251bWJlciwgZnVuY3Rpb25fc3RhdGUsIGVycm9yKToK ICAgICAgICAgICAgICAgICBicmVhayAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICMgLi4u IGlnbm9yZQogICAgICAgICAgICAgaWYgc2VhcmNoKHIneycsIHN0YXJ0X2xpbmUpOgogICAgICAg ICAgICAgICAgIGJvZHlfZm91bmQgPSBUcnVlCi0gICAgICAgICAgICAgICAgZnVuY3Rpb24gPSBz ZWFyY2gocicoKFx3fDp8PHw+fCx8fikqKVwoJywgbGluZSkuZ3JvdXAoMSkKKyAgICAgICAgICAg ICAgICAjIFJlcGxhY2UgdGVtcGxhdGUgY29uc3RydWN0cyB3aXRoIF8gc28gdGhhdCBubyBzcGFj ZXMgcmVtYWluIGluIHRoZSBmdW5jdGlvbiBuYW1lLAorICAgICAgICAgICAgICAgICMgd2hpbGUg a2VlcGluZyB0aGUgY29sdW1uIG51bWJlcnMgb2Ygb3RoZXIgY2hhcmFjdGVycyB0aGUgc2FtZSBh cyAibGluZSIuCisgICAgICAgICAgICAgICAgbGluZV93aXRoX25vX3RlbXBsYXRlcyA9IGl0ZXJh dGl2ZWx5X3JlcGxhY2VfbWF0Y2hlc193aXRoX2NoYXIocic8W14+XSo+JywgbGluZSwgIl8iKQor ICAgICAgICAgICAgICAgIG1hdGNoX2Z1bmN0aW9uID0gc2VhcmNoKHInKChcd3w6fDx8PnwsfH4p KilcKCcsIGxpbmVfd2l0aF9ub190ZW1wbGF0ZXMpCisKKyAgICAgICAgICAgICAgICAjIFVzZSB0 aGUgY29sdW1uIG51bWJlcnMgZnJvbSB0aGUgbW9kaWZpZWQgbGluZSB0byBmaW5kIHRoZQorICAg ICAgICAgICAgICAgICMgZnVuY3Rpb24gbmFtZSBpbiB0aGUgb3JpZ2luYWwgbGluZS4KKyAgICAg ICAgICAgICAgICBmdW5jdGlvbiA9IGxpbmVbbWF0Y2hfZnVuY3Rpb24uc3RhcnQoMSk6bWF0Y2hf ZnVuY3Rpb24uZW5kKDEpXQorCiAgICAgICAgICAgICAgICAgaWYgbWF0Y2gocidURVNUJywgZnVu Y3Rpb24pOiAgICAjIEhhbmRsZSBURVNULi4uIG1hY3JvcwogICAgICAgICAgICAgICAgICAgICBw YXJhbWV0ZXJfcmVnZXhwID0gc2VhcmNoKHInKFwoLipcKSknLCBqb2luZWRfbGluZSkKICAgICAg ICAgICAgICAgICAgICAgaWYgcGFyYW1ldGVyX3JlZ2V4cDogICAgICAgICAgICAgIyBJZ25vcmUg YmFkIHN5bnRheApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHls ZS9jaGVja2Vycy9jcHBfdW5pdHRlc3QucHkgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQppbmRleCA2YjQyZmZhNDIyMzA4YjRkODI3 ZDQ4ZjcxN2Y2YzVjNjQ2Y2E2MGJlLi5lOTIyN2Q2NTQ0YzExNzQwYjFhYzE3ZTZhZTI3ZGIyNDMw MTBlMDhmIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2No ZWNrZXJzL2NwcF91bml0dGVzdC5weQorKysgYi9XZWJLaXRUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXJzL2NwcF91bml0dGVzdC5weQpAQCAtMjQ0OCwxMyArMjQ0OCwxMiBAQCBj bGFzcyBDaGVja0ZvckZ1bmN0aW9uTGVuZ3Roc1Rlc3QoQ3BwU3R5bGVUZXN0QmFzZSk6CiAgICAg ICAgIGVycm9yX2xldmVsID0gMQogICAgICAgICBlcnJvcl9saW5lcyA9IHNlbGYudHJpZ2dlcl9s aW5lcyhlcnJvcl9sZXZlbCkgKyAxCiAgICAgICAgIHRyaWdnZXJfbGV2ZWwgPSBzZWxmLnRyaWdn ZXJfbGluZXMoc2VsZi5taW5fY29uZmlkZW5jZSkKLSAgICAgICAgIyBGSVhNRTogaGFuZGxlIHNw YWNlcyBpbiB0aGUgdGVtcGxhdGUgcGFyYW1ldGVycwogICAgICAgICBzZWxmLmFzc2VydF9mdW5j dGlvbl9sZW5ndGhzX2NoZWNrKAotICAgICAgICAgICAgKCdteV9uYW1lc3BhY2U6Om15X290aGVy X25hbWVzcGFjZTo6TXlWZXJ5TG9uZ1R5cGVOYW1lPFR5cGUxPipcbicKLSAgICAgICAgICAgICAn bXlfbmFtZXNwYWNlOjpteV9vdGhlcl9uYW1lc3BhY2U8VHlwZTIsVHlwZTM+Ojp+TXlGdW5jdGlv bjxUeXBlND4oaW50IGFyZzEsIGNoYXIqIGFyZzIpJworICAgICAgICAgICAgKCdteV9uYW1lc3Bh Y2U6Om15X290aGVyX25hbWVzcGFjZTo6TXlWZXJ5TG9uZ1R5cGVOYW1lPFR5cGUxLCBUeXBlNT4q XG4nCisgICAgICAgICAgICAgJ215X25hbWVzcGFjZTo6bXlfb3RoZXJfbmFtZXNwYWNlPFR5cGUy LCBUeXBlMz46On5NeUZ1bmN0aW9uPFR5cGU0PihpbnQgYXJnMSwgY2hhciogYXJnMiknCiAgICAg ICAgICAgICAgKyBzZWxmLmZ1bmN0aW9uX2JvZHkoZXJyb3JfbGluZXMpKSwKICAgICAgICAgICAg ICgnU21hbGwgYW5kIGZvY3VzZWQgZnVuY3Rpb25zIGFyZSBwcmVmZXJyZWQ6ICcKLSAgICAgICAg ICAgICAnbXlfbmFtZXNwYWNlOjpteV9vdGhlcl9uYW1lc3BhY2U8VHlwZTIsVHlwZTM+Ojp+TXlG dW5jdGlvbjxUeXBlND4oKScKKyAgICAgICAgICAgICAnbXlfbmFtZXNwYWNlOjpteV9vdGhlcl9u YW1lc3BhY2U8VHlwZTIsIFR5cGUzPjo6fk15RnVuY3Rpb248VHlwZTQ+KCknCiAgICAgICAgICAg ICAgJyBoYXMgJWQgbm9uLWNvbW1lbnQgbGluZXMgJwogICAgICAgICAgICAgICcoZXJyb3IgdHJp Z2dlcmVkIGJ5IGV4Y2VlZGluZyAlZCBsaW5lcykuJwogICAgICAgICAgICAgICcgIFtyZWFkYWJp bGl0eS9mbl9zaXplXSBbJWRdJykK