125085 2013-12-02 11:37:15 -0800 [WK2] Improve readability of 'generate_message_handler' function 2013-12-02 15:01:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 nick.diego nick.diego commit-queue sam oldest_to_newest 955486 0 nick.diego 2013-12-02 11:37:15 -0800 [WK2] Improve readability of 'generate_message_handler' function 955489 1 218201 nick.diego 2013-12-02 11:39:12 -0800 Created attachment 218201 Patch 955534 2 nick.diego 2013-12-02 13:09:53 -0800 'generate_message_handler' function uses a local dictionary to store "conditions" for the header files that should be included in the message handler generated cpp file. When trying to understand that code, I've had some difficult to understand what that variable was storing or why it is called 'headers' when in fact it stores "conditions" for each "header". So in this patch I propose a better name for that variable and for the variable used to iterate through its keys. 955617 3 218201 commit-queue 2013-12-02 15:01:06 -0800 Comment on attachment 218201 Patch Clearing flags on attachment: 218201 Committed r159972: <http://trac.webkit.org/changeset/159972> 955618 4 commit-queue 2013-12-02 15:01:09 -0800 All reviewed patches have been landed. Closing bug. 218201 2013-12-02 11:39:12 -0800 2013-12-02 15:01:06 -0800 Patch bug-125085-20131202155102.patch text/plain 4757 nick.diego U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5OTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODhmYWEwYmEyNWIxNDU4 MTE5ZjVlYzg1YTcyMjM3ZDYyNGQwOTUwNi4uMWVjYzc5NDcyYWQ2NTRmYjUzOWMyZDEyZmQ5NjQz NDJhYzM4OWRlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTEyLTAyICBOaWNr IERpZWdvIFlhbWFuZSAgPG5pY2sueWFtYW5lQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1dL Ml0gSW1wcm92ZSByZWFkYWJpbGl0eSBvZiAnZ2VuZXJhdGVfbWVzc2FnZV9oYW5kbGVyJyBmdW5j dGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1 MDg1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHk6CisgICAgICAgIChnZW5lcmF0ZV9tZXNzYWdlX2hh bmRsZXIpOgorCiAyMDEzLTEyLTAxICBDaGFuZ1Nlb2sgT2ggIDxjaGFuZ3Nlb2sub2hAY29sbGFi b3JhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIEd0ayBwb3J0IEJ1aWxkIGZpeCBhZnRlciBy MTU5OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2Fn ZXMucHkgYi9Tb3VyY2UvV2ViS2l0Mi9TY3JpcHRzL3dlYmtpdDIvbWVzc2FnZXMucHkKaW5kZXgg ZGUyYmI2NmUwNjkwMjQ4NzczODcwZTgyYzM0ZDM0MTY4OTQ4ZjBiZC4uZjZkMjNlNzFmZTg3NzQ3 MTY1YzBlM2Y0MTg4N2YyY2MwZTJhZWQwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2Ny aXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5CisrKyBiL1NvdXJjZS9XZWJLaXQyL1NjcmlwdHMvd2Vi a2l0Mi9tZXNzYWdlcy5weQpAQCAtNDYxLDcgKzQ2MSw3IEBAIGRlZiBoZWFkZXJzX2Zvcl90eXBl KHR5cGUpOgogCiBkZWYgZ2VuZXJhdGVfbWVzc2FnZV9oYW5kbGVyKGZpbGUpOgogICAgIHJlY2Vp dmVyID0gcGFyc2VyLnBhcnNlKGZpbGUpCi0gICAgaGVhZGVycyA9IHsKKyAgICBoZWFkZXJfY29u ZGl0aW9ucyA9IHsKICAgICAgICAgJyIlcyInICUgbWVzc2FnZXNfaGVhZGVyX2ZpbGVuYW1lKHJl Y2VpdmVyKTogW05vbmVdLAogICAgICAgICAnIkhhbmRsZU1lc3NhZ2UuaCInOiBbTm9uZV0sCiAg ICAgICAgICciTWVzc2FnZURlY29kZXIuaCInOiBbTm9uZV0sCkBAIC00ODIsMTUgKzQ4MiwxNSBA QCBkZWYgZ2VuZXJhdGVfbWVzc2FnZV9oYW5kbGVyKGZpbGUpOgogICAgICAgICBhcmd1bWVudF9l bmNvZGVyX2hlYWRlcnMgPSBhcmd1bWVudF9jb2Rlcl9oZWFkZXJzX2Zvcl90eXBlKHR5cGUpCiAg ICAgICAgIGlmIGFyZ3VtZW50X2VuY29kZXJfaGVhZGVyczoKICAgICAgICAgICAgIGZvciBoZWFk ZXIgaW4gYXJndW1lbnRfZW5jb2Rlcl9oZWFkZXJzOgotICAgICAgICAgICAgICAgIGlmIGhlYWRl ciBub3QgaW4gaGVhZGVyczoKLSAgICAgICAgICAgICAgICAgICAgaGVhZGVyc1toZWFkZXJdID0g W10KLSAgICAgICAgICAgICAgICBoZWFkZXJzW2hlYWRlcl0uZXh0ZW5kKGNvbmRpdGlvbnMpCisg ICAgICAgICAgICAgICAgaWYgaGVhZGVyIG5vdCBpbiBoZWFkZXJfY29uZGl0aW9uczoKKyAgICAg ICAgICAgICAgICAgICAgaGVhZGVyX2NvbmRpdGlvbnNbaGVhZGVyXSA9IFtdCisgICAgICAgICAg ICAgICAgaGVhZGVyX2NvbmRpdGlvbnNbaGVhZGVyXS5leHRlbmQoY29uZGl0aW9ucykKIAogICAg ICAgICB0eXBlX2hlYWRlcnMgPSBoZWFkZXJzX2Zvcl90eXBlKHR5cGUpCiAgICAgICAgIGZvciBo ZWFkZXIgaW4gdHlwZV9oZWFkZXJzOgotICAgICAgICAgICAgaWYgaGVhZGVyIG5vdCBpbiBoZWFk ZXJzOgotICAgICAgICAgICAgICAgIGhlYWRlcnNbaGVhZGVyXSA9IFtdCi0gICAgICAgICAgICBo ZWFkZXJzW2hlYWRlcl0uZXh0ZW5kKGNvbmRpdGlvbnMpCisgICAgICAgICAgICBpZiBoZWFkZXIg bm90IGluIGhlYWRlcl9jb25kaXRpb25zOgorICAgICAgICAgICAgICAgIGhlYWRlcl9jb25kaXRp b25zW2hlYWRlcl0gPSBbXQorICAgICAgICAgICAgaGVhZGVyX2NvbmRpdGlvbnNbaGVhZGVyXS5l eHRlbmQoY29uZGl0aW9ucykKIAogICAgIGZvciBtZXNzYWdlIGluIHJlY2VpdmVyLm1lc3NhZ2Vz OgogICAgICAgICBpZiBtZXNzYWdlLnJlcGx5X3BhcmFtZXRlcnMgaXMgbm90IE5vbmU6CkBAIC00 OTksMTUgKzQ5OSwxNSBAQCBkZWYgZ2VuZXJhdGVfbWVzc2FnZV9oYW5kbGVyKGZpbGUpOgogICAg ICAgICAgICAgICAgIGFyZ3VtZW50X2VuY29kZXJfaGVhZGVycyA9IGFyZ3VtZW50X2NvZGVyX2hl YWRlcnNfZm9yX3R5cGUodHlwZSkKICAgICAgICAgICAgICAgICBpZiBhcmd1bWVudF9lbmNvZGVy X2hlYWRlcnM6CiAgICAgICAgICAgICAgICAgICAgIGZvciBoZWFkZXIgaW4gYXJndW1lbnRfZW5j b2Rlcl9oZWFkZXJzOgotICAgICAgICAgICAgICAgICAgICAgICAgaWYgaGVhZGVyIG5vdCBpbiBo ZWFkZXJzOgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGhlYWRlcnNbaGVhZGVyXSA9IFtd Ci0gICAgICAgICAgICAgICAgICAgICAgICBoZWFkZXJzW2hlYWRlcl0uYXBwZW5kKG1lc3NhZ2Uu Y29uZGl0aW9uKQorICAgICAgICAgICAgICAgICAgICAgICAgaWYgaGVhZGVyIG5vdCBpbiBoZWFk ZXJfY29uZGl0aW9uczoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBoZWFkZXJfY29uZGl0 aW9uc1toZWFkZXJdID0gW10KKyAgICAgICAgICAgICAgICAgICAgICAgIGhlYWRlcl9jb25kaXRp b25zW2hlYWRlcl0uYXBwZW5kKG1lc3NhZ2UuY29uZGl0aW9uKQogCiAgICAgICAgICAgICAgICAg dHlwZV9oZWFkZXJzID0gaGVhZGVyc19mb3JfdHlwZSh0eXBlKQogICAgICAgICAgICAgICAgIGZv ciBoZWFkZXIgaW4gdHlwZV9oZWFkZXJzOgotICAgICAgICAgICAgICAgICAgICBpZiBoZWFkZXIg bm90IGluIGhlYWRlcnM6Ci0gICAgICAgICAgICAgICAgICAgICAgICBoZWFkZXJzW2hlYWRlcl0g PSBbXQotICAgICAgICAgICAgICAgICAgICBoZWFkZXJzW2hlYWRlcl0uYXBwZW5kKG1lc3NhZ2Uu Y29uZGl0aW9uKQorICAgICAgICAgICAgICAgICAgICBpZiBoZWFkZXIgbm90IGluIGhlYWRlcl9j b25kaXRpb25zOgorICAgICAgICAgICAgICAgICAgICAgICAgaGVhZGVyX2NvbmRpdGlvbnNbaGVh ZGVyXSA9IFtdCisgICAgICAgICAgICAgICAgICAgIGhlYWRlcl9jb25kaXRpb25zW2hlYWRlcl0u YXBwZW5kKG1lc3NhZ2UuY29uZGl0aW9uKQogCiAKICAgICByZXN1bHQgPSBbXQpAQCAtNTIwLDEz ICs1MjAsMTMgQEAgZGVmIGdlbmVyYXRlX21lc3NhZ2VfaGFuZGxlcihmaWxlKToKICAgICAgICAg cmVzdWx0LmFwcGVuZCgnI2lmICVzXG5cbicgJSByZWNlaXZlci5jb25kaXRpb24pCiAKICAgICBy ZXN1bHQuYXBwZW5kKCcjaW5jbHVkZSAiJXMuaCJcblxuJyAlIHJlY2VpdmVyLm5hbWUpCi0gICAg Zm9yIGhlYWRlcmNvbmRpdGlvbiBpbiBzb3J0ZWQoaGVhZGVycyk6Ci0gICAgICAgIGlmIGhlYWRl cnNbaGVhZGVyY29uZGl0aW9uXSBhbmQgbm90IE5vbmUgaW4gaGVhZGVyc1toZWFkZXJjb25kaXRp b25dOgotICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgnI2lmICVzXG4nICUgJyB8fCAnLmpvaW4o c2V0KGhlYWRlcnNbaGVhZGVyY29uZGl0aW9uXSkpKQotICAgICAgICAgICAgcmVzdWx0ICs9IFsn I2luY2x1ZGUgJXNcbicgJSBoZWFkZXJjb25kaXRpb25dCisgICAgZm9yIGhlYWRlciBpbiBzb3J0 ZWQoaGVhZGVyX2NvbmRpdGlvbnMpOgorICAgICAgICBpZiBoZWFkZXJfY29uZGl0aW9uc1toZWFk ZXJdIGFuZCBub3QgTm9uZSBpbiBoZWFkZXJfY29uZGl0aW9uc1toZWFkZXJdOgorICAgICAgICAg ICAgcmVzdWx0LmFwcGVuZCgnI2lmICVzXG4nICUgJyB8fCAnLmpvaW4oc2V0KGhlYWRlcl9jb25k aXRpb25zW2hlYWRlcl0pKSkKKyAgICAgICAgICAgIHJlc3VsdCArPSBbJyNpbmNsdWRlICVzXG4n ICUgaGVhZGVyXQogICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgnI2VuZGlmXG4nKQogICAgICAg ICBlbHNlOgotICAgICAgICAgICAgcmVzdWx0ICs9IFsnI2luY2x1ZGUgJXNcbicgJSBoZWFkZXJj b25kaXRpb25dCisgICAgICAgICAgICByZXN1bHQgKz0gWycjaW5jbHVkZSAlc1xuJyAlIGhlYWRl cl0KICAgICByZXN1bHQuYXBwZW5kKCdcbicpCiAKICAgICBzeW5jX2RlbGF5ZWRfbWVzc2FnZXMg PSBbXQpAQCAtNTQyLDcgKzU0Miw3IEBAIGRlZiBnZW5lcmF0ZV9tZXNzYWdlX2hhbmRsZXIoZmls ZSk6CiAKICAgICAgICAgICAgIGlmIG1lc3NhZ2UuY29uZGl0aW9uOgogICAgICAgICAgICAgICAg IHJlc3VsdC5hcHBlbmQoJyNpZiAlc1xuXG4nICUgbWVzc2FnZS5jb25kaXRpb24pCi0gICAgICAg ICAgICAKKwogICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCgnJXM6OkRlbGF5ZWRSZXBseTo6RGVs YXllZFJlcGx5KFBhc3NSZWZQdHI8Q29yZUlQQzo6Q29ubmVjdGlvbj4gY29ubmVjdGlvbiwgc3Rk Ojp1bmlxdWVfcHRyPENvcmVJUEM6Ok1lc3NhZ2VFbmNvZGVyPiBlbmNvZGVyKVxuJyAlIG1lc3Nh Z2UubmFtZSkKICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoJyAgICA6IG1fY29ubmVjdGlvbihj b25uZWN0aW9uKVxuJykKICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoJyAgICAsIG1fZW5jb2Rl cihzdGQ6Om1vdmUoZW5jb2RlcikpXG4nKQo=