30538 2009-10-19 14:40:38 -0700 Replace boolean operator indentation example with an if statement. 2010-06-10 19:21:35 -0700 1 1 1 Unclassified WebKit WebKit Website 528+ (Nightly build) All All UNCONFIRMED P2 Normal --- 0 scherkus webkit-unassigned commit-queue darin eric levin oldest_to_newest 155915 0 scherkus 2009-10-19 14:40:38 -0700 As Dave Levin pointed out in https://bugs.webkit.org/show_bug.cgi?id=30529 my || should have been on the next line. The style guide gives an example using a "return" statement, however there are many instances in WebKit today that contradicts that rule and place the operators at the end of the line. If "if" statements are not an exception, then I'd suggest replacing the example to use an if statement. You're more likely to write if statements than return statements so this example should prevent further style violations from happening. 155917 1 41453 scherkus 2009-10-19 14:42:12 -0700 Created attachment 41453 Round 1 155927 2 41453 eric 2009-10-19 14:57:12 -0700 Comment on attachment 41453 Round 1 OK. :shrug: 155934 3 41453 commit-queue 2009-10-19 15:10:46 -0700 Comment on attachment 41453 Round 1 Clearing flags on attachment: 41453 Committed r49816: <http://trac.webkit.org/changeset/49816> 155935 4 commit-queue 2009-10-19 15:10:50 -0700 All reviewed patches have been landed. Closing bug. 155993 5 darin 2009-10-19 17:17:53 -0700 I specifically chose a return statement rather than an if statement, because of the problem where the boolean operator lines end up lined up with the statement in the body of the if. In the past we have discussed indenting one additional level to avoid that problem, but this was contentious enough that I wanted to leave it out until we discussed it. I am *not* sure that what you checked in here represents our style recommendation, and I wish we had some discussion of it before it was landed! I would write: if (a || b) return; Not: if (a || b) return; 155995 6 eric 2009-10-19 17:23:10 -0700 Happy to revert it. We can also make an additional checkin which makes specific all of these cases. 155996 7 scherkus 2009-10-19 17:23:57 -0700 Eeek -- sorry :( I'm fine reverting -- I was just confused at what the proper style should be and grepping the code base didn't give any consistent answers. How about we start the discussion on webkit-dev? 41453 2009-10-19 14:42:12 -0700 2010-06-10 19:21:35 -0700 Round 1 boolean_style.patch text/plain 1552 scherkus ZGlmZiAtLWdpdCBhL1dlYktpdFNpdGUvQ2hhbmdlTG9nIGIvV2ViS2l0U2l0ZS9DaGFuZ2VMb2cK aW5kZXggYjFmNjg4MC4uMTgzMDIyOCAxMDA2NDQKLS0tIGEvV2ViS2l0U2l0ZS9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0U2l0ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAwOS0xMC0xOSAg QW5kcmV3IFNjaGVya3VzICA8c2NoZXJrdXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgYm9vbGVhbiBvcGVyYXRv ciBpbmRlbnRhdGlvbiBleGFtcGxlIHdpdGggYW4gaWYgc3RhdGVtZW50LgorCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMDUzOAorCisgICAgICAgICog Y29kaW5nL2NvZGluZy1zdHlsZS5odG1sOiBSZXBsYWNlIGJvb2xlYW4gaW5kZW50aW5nIGV4YW1w bGUgdG8gdXNlICJpZiIKKwogMjAwOS0xMC0xNiAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5j b20+CiAKICAgICAgICAgKiBjb2RpbmcvUmVmUHRyLmh0bWw6IE1pbm9yIHJldmlzaW9uLCB1cGRh dGluZyBhIGxpbmsgYW5kIHR3ZWFraW5nCmRpZmYgLS1naXQgYS9XZWJLaXRTaXRlL2NvZGluZy9j b2Rpbmctc3R5bGUuaHRtbCBiL1dlYktpdFNpdGUvY29kaW5nL2NvZGluZy1zdHlsZS5odG1sCmlu ZGV4IDI2OThlYTguLjA5ZTJmM2MgMTAwNjQ0Ci0tLSBhL1dlYktpdFNpdGUvY29kaW5nL2NvZGlu Zy1zdHlsZS5odG1sCisrKyBiL1dlYktpdFNpdGUvY29kaW5nL2NvZGluZy1zdHlsZS5odG1sCkBA IC0xMjAsMTYgKzEyMCwxOCBAQCBoYXZlIHRoZWlyIG9wZXJhdG9ycyBvbiB0aGUgbGVmdCBzaWRl IG9mIHRoZSBsaW5lIGluc3RlYWQgb2YgdGhlIHJpZ2h0IHNpZGUuCiAKIDxoNCBjbGFzcz0icmln aHQiPlJpZ2h0OjwvaDQ+CiA8cHJlIGNsYXNzPSJjb2RlIj4KLXJldHVybiBhdHRyLT5uYW1lKCkg PT0gc3JjQXR0cgoraWYgKGF0dHItPm5hbWUoKSA9PSBzcmNBdHRyCiAgICAgfHwgYXR0ci0+bmFt ZSgpID09IGxvd3NyY0F0dHIKLSAgICB8fCAoYXR0ci0+bmFtZSgpID09IHVzZW1hcEF0dHIgJiYg YXR0ci0+dmFsdWUoKS5kb21TdHJpbmcoKVswXSAhPSAnIycpOworICAgIHx8IChhdHRyLT5uYW1l KCkgPT0gdXNlbWFwQXR0ciAmJiBhdHRyLT52YWx1ZSgpLmRvbVN0cmluZygpWzBdICE9ICcjJykp CisgICAgcmV0dXJuOwogPC9wcmU+CiAKIDxoNCBjbGFzcz0id3JvbmciPldyb25nOjwvaDQ+CiA8 cHJlIGNsYXNzPSJjb2RlIj4KLXJldHVybiBhdHRyLT5uYW1lKCkgPT0gc3JjQXR0ciB8fAoraWYg KGF0dHItPm5hbWUoKSA9PSBzcmNBdHRyIHx8CiAgICAgYXR0ci0+bmFtZSgpID09IGxvd3NyY0F0 dHIgfHwKLSAgICAoYXR0ci0+bmFtZSgpID09IHVzZW1hcEF0dHIgJiYgYXR0ci0+dmFsdWUoKS5k b21TdHJpbmcoKVswXSAhPSAnIycpOworICAgIChhdHRyLT5uYW1lKCkgPT0gdXNlbWFwQXR0ciAm JiBhdHRyLT52YWx1ZSgpLmRvbVN0cmluZygpWzBdICE9ICcjJykpCisgICAgcmV0dXJuOwogPC9w cmU+CiA8L2xpPgogCg==