75830 2012-01-09 00:06:40 -0800 [Refactoring] Use join(", ", @arguments) to build a method argument string in CodeGeneratorJS.pm 2012-01-09 01:38:58 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 72138 1 haraken haraken abarth darin japhet webkit.review.bot oldest_to_newest 532014 0 haraken 2012-01-09 00:06:40 -0800 This is a refactoring for implementing the [Supplemental] IDL for methods (bug 72138). The code in CodeGeneratorJS.pm to build a method argument string is dirty and error-prone. It is concatenating arguments one by one judging whether ", " is necessary or not. Instead, we should refactor the code so that it pushes all arguments into @arguments and then build a method string by join(", ", @arguments). 532015 1 121626 haraken 2012-01-09 00:10:28 -0800 Created attachment 121626 Patch 532044 2 121626 webkit.review.bot 2012-01-09 01:38:54 -0800 Comment on attachment 121626 Patch Clearing flags on attachment: 121626 Committed r104443: <http://trac.webkit.org/changeset/104443> 532045 3 webkit.review.bot 2012-01-09 01:38:58 -0800 All reviewed patches have been landed. Closing bug. 121626 2012-01-09 00:10:28 -0800 2012-01-09 01:38:54 -0800 Patch bug-75830-20120109171027.patch text/plain 6580 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTA0NDMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTRhMjk1ZmJlY2VkYjZi NzlhODkyZDQwMDg1NGZmZDQyMTE2Mzk3Yi4uMjA1NGI4NzAwNWIyYzE2NTk2ZDY3OTJiYmNiMzVh MWNkNzRhNWZkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAxLTA5ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbUmVmYWN0b3Jpbmdd IFVzZSBqb2luKCIsICIsIEBhcmd1bWVudHMpIHRvIGJ1aWxkIGEgbWV0aG9kIGFyZ3VtZW50IHN0 cmluZworICAgICAgICBpbiBDb2RlR2VuZXJhdG9ySlMucG0KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1ODMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGNvZGUgaW4gQ29kZUdlbmVyYXRvckpTLnBt IHRvIGJ1aWxkIGEgbWV0aG9kIGFyZ3VtZW50IHN0cmluZyBpcyBkaXJ0eQorICAgICAgICBhbmQg ZXJyb3ItcHJvbmUuIEl0IGlzIGNvbmNhdGVuYXRpbmcgYXJndW1lbnRzIG9uZSBieSBvbmUganVk Z2luZyB3aGV0aGVyCisgICAgICAgICIsICIgaXMgbmVjZXNzYXJ5IG9yIG5vdC4gVGhpcyBwYXRj aCByZWZhY3RvcnMgdGhlIGNvZGUgc28gdGhhdCBpdCBwdXNoZXMKKyAgICAgICAgYWxsIGFyZ3Vt ZW50cyBpbnRvIEBhcmd1bWVudHMgYW5kIHRoZW4gYnVpbGRzIGEgbWV0aG9kIHN0cmluZyBieQor ICAgICAgICBqb2luKCIsICIsIEBhcmd1bWVudHMpLgorCisgICAgICAgIFRlc3Q6IGJpbmRpbmdz L3NjcmlwdHMvdGVzdC8qCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JKUy5wbToKKyAgICAgICAgKEdlbmVyYXRlSW1wbGVtZW50YXRpb24pOgorICAgICAgICAoR2Vu ZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOgorICAgICAgICAoR2VuZXJhdGVJbXBsZW1lbnRhdGlvbkZ1 bmN0aW9uQ2FsbCk6CisKIDIwMTItMDEtMDggIENoYW5nU2VvayBPaCAgPHNoaXZhbWlkb3dAZ21h aWwuY29tPgogCiAgICAgICAgIE1lbW9yeSBhbGxvY2F0aW9uIG1pc21hdGNoIGJ5IHVzaW5nIGFk b3B0QXJyYXlQdHIgaW4gR3JhcGhpY3NDb250ZXh0M0RPcGVuR0wuY3BwCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbSBiL1NvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCmluZGV4IDE3YTkw Y2U0YWE2OGFmNmNlZTdiYjlkYWY3ODRkODMwOGNmMDM2MzYuLjNjYzY4MmY3ZDFlYTYyOGE5NTdh MDgyY2I5MDZhNjYyZGZlODNiZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCkBAIC0yMTgxLDggKzIxODEsOCBAQCBzdWIgR2Vu ZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVu dCwgR2VuZXJhdGVFdmVudExpc3RlbmVyQ2FsbCgkY2xhc3NOYW1lLCAicmVtb3ZlIikpOwogICAg ICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIG15ICRudW1QYXJhbWV0 ZXJzID0gQHskZnVuY3Rpb24tPnBhcmFtZXRlcnN9OwotICAgICAgICAgICAgICAgICAgICBteSAo JGZ1bmN0aW9uU3RyaW5nLCAkcGFyYW1JbmRleCkgPSBHZW5lcmF0ZVBhcmFtZXRlcnNDaGVjayhc QGltcGxDb250ZW50LCAkZnVuY3Rpb24sICRkYXRhTm9kZSwgJG51bVBhcmFtZXRlcnMsICRpbXBs Q2xhc3NOYW1lLCAkZnVuY3Rpb25JbXBsZW1lbnRhdGlvbk5hbWUsICRzdmdQcm9wZXJ0eVR5cGUs ICRzdmdQcm9wZXJ0eU9yTGlzdFByb3BlcnR5VHlwZSwgJHN2Z0xpc3RQcm9wZXJ0eVR5cGUpOwot ICAgICAgICAgICAgICAgICAgICBHZW5lcmF0ZUltcGxlbWVudGF0aW9uRnVuY3Rpb25DYWxsKCRm dW5jdGlvbiwgJGZ1bmN0aW9uU3RyaW5nLCAkcGFyYW1JbmRleCwgIiAgICAiLCAkc3ZnUHJvcGVy dHlUeXBlLCAkaW1wbENsYXNzTmFtZSk7CisgICAgICAgICAgICAgICAgICAgIG15ICgkZnVuY3Rp b25TdHJpbmcsICRkdW1teSkgPSBHZW5lcmF0ZVBhcmFtZXRlcnNDaGVjayhcQGltcGxDb250ZW50 LCAkZnVuY3Rpb24sICRkYXRhTm9kZSwgJG51bVBhcmFtZXRlcnMsICRpbXBsQ2xhc3NOYW1lLCAk ZnVuY3Rpb25JbXBsZW1lbnRhdGlvbk5hbWUsICRzdmdQcm9wZXJ0eVR5cGUsICRzdmdQcm9wZXJ0 eU9yTGlzdFByb3BlcnR5VHlwZSwgJHN2Z0xpc3RQcm9wZXJ0eVR5cGUpOworICAgICAgICAgICAg ICAgICAgICBHZW5lcmF0ZUltcGxlbWVudGF0aW9uRnVuY3Rpb25DYWxsKCRmdW5jdGlvbiwgJGZ1 bmN0aW9uU3RyaW5nLCAiICAgICIsICRzdmdQcm9wZXJ0eVR5cGUsICRpbXBsQ2xhc3NOYW1lKTsK ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKQEAgLTI0MTksNyArMjQxOSw2IEBA IHN1YiBHZW5lcmF0ZVBhcmFtZXRlcnNDaGVjawogICAgIG15ICRzdmdQcm9wZXJ0eU9yTGlzdFBy b3BlcnR5VHlwZSA9IHNoaWZ0OwogICAgIG15ICRzdmdMaXN0UHJvcGVydHlUeXBlID0gc2hpZnQ7 CiAKLSAgICBteSAkcGFyYW1JbmRleCA9IDA7CiAgICAgbXkgJGFyZ3NJbmRleCA9IDA7CiAgICAg bXkgJGhhc09wdGlvbmFsQXJndW1lbnRzID0gMDsKIApAQCAtMjQzMSw3ICsyNDMwLDggQEAgc3Vi IEdlbmVyYXRlUGFyYW1ldGVyc0NoZWNrCiAgICAgfSBlbHNlIHsKICAgICAgICAgJGZ1bmN0aW9u QmFzZSA9ICJpbXBsLT4iOwogICAgIH0KLSAgICBteSAkZnVuY3Rpb25TdHJpbmcgPSAiJGZ1bmN0 aW9uQmFzZSRmdW5jdGlvbkltcGxlbWVudGF0aW9uTmFtZSgiOworICAgIG15ICRmdW5jdGlvbk5h bWUgPSAiJGZ1bmN0aW9uQmFzZSRmdW5jdGlvbkltcGxlbWVudGF0aW9uTmFtZSI7CisgICAgbXkg QGFyZ3VtZW50czsKIAogICAgIGlmICgkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRy aWJ1dGVzLT57IkN1c3RvbUFyZ3VtZW50SGFuZGxpbmcifSBhbmQgISRmdW5jdGlvbi0+aXNTdGF0 aWMpIHsKICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgIFJlZlB0cjxTY3JpcHRBcmd1 bWVudHM+IHNjcmlwdEFyZ3VtZW50cyhjcmVhdGVTY3JpcHRBcmd1bWVudHMoZXhlYywgJG51bVBh cmFtZXRlcnMpKTtcbiIpOwpAQCAtMjQ1Miw5ICsyNDUyLDcgQEAgc3ViIEdlbmVyYXRlUGFyYW1l dGVyc0NoZWNrCiAgICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgICAgIHJldHVy biBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7XG4iKTsKICAgICAgICAgICAgICRjYWxs V2l0aEFyZyA9ICJzY3JpcHRDb250ZXh0IjsgCiAgICAgICAgIH0KLSAgICAgICAgJGZ1bmN0aW9u U3RyaW5nIC49ICIsICIgaWYgJHBhcmFtSW5kZXg7Ci0gICAgICAgICRmdW5jdGlvblN0cmluZyAu PSAkY2FsbFdpdGhBcmc7Ci0gICAgICAgICRwYXJhbUluZGV4Kys7CisgICAgICAgIHB1c2ggQGFy Z3VtZW50cywgJGNhbGxXaXRoQXJnOwogICAgIH0KIAogICAgICRpbXBsSW5jbHVkZXN7IkV4Y2Vw dGlvbkNvZGUuaCJ9ID0gMTsKQEAgLTI0NzMsNyArMjQ3MSwxNiBAQCBzdWIgR2VuZXJhdGVQYXJh bWV0ZXJzQ2hlY2sKICAgICAgICAgICAgICAgICAkaGFzT3B0aW9uYWxBcmd1bWVudHMgPSAxOwog ICAgICAgICAgICAgfQogICAgICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgIGlmIChh cmdzQ291bnQgPD0gJGFyZ3NJbmRleCkge1xuIik7Ci0gICAgICAgICAgICBHZW5lcmF0ZUltcGxl bWVudGF0aW9uRnVuY3Rpb25DYWxsKCRmdW5jdGlvbiwgJGZ1bmN0aW9uU3RyaW5nLCAkcGFyYW1J bmRleCwgIiAgICAiIHggMiwgJHN2Z1Byb3BlcnR5VHlwZSwgJGltcGxDbGFzc05hbWUpOworCisg ICAgICAgICAgICBteSBAb3B0aW9uYWxDYWxsYmFja0FyZ3VtZW50cyA9IEBhcmd1bWVudHM7Cisg ICAgICAgICAgICBpZiAoJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+ eyJDdXN0b21Bcmd1bWVudEhhbmRsaW5nIn0pIHsKKyAgICAgICAgICAgICAgICBwdXNoIEBvcHRp b25hbENhbGxiYWNrQXJndW1lbnRzLCAic2NyaXB0QXJndW1lbnRzLCBjYWxsU3RhY2siOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgaWYgKEB7JGZ1bmN0aW9uLT5yYWlzZXNFeGNlcHRpb25z fSkgeworICAgICAgICAgICAgICAgIHB1c2ggQG9wdGlvbmFsQ2FsbGJhY2tBcmd1bWVudHMsICJl YyI7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBteSAkZnVuY3Rpb25TdHJpbmcgPSAiJGZ1 bmN0aW9uTmFtZSgiIC4gam9pbigiLCAiLCBAb3B0aW9uYWxDYWxsYmFja0FyZ3VtZW50cykgLiAi KSI7CisgICAgICAgICAgICBHZW5lcmF0ZUltcGxlbWVudGF0aW9uRnVuY3Rpb25DYWxsKCRmdW5j dGlvbiwgJGZ1bmN0aW9uU3RyaW5nLCAiICAgICIgeCAyLCAkc3ZnUHJvcGVydHlUeXBlLCAkaW1w bENsYXNzTmFtZSk7CiAgICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgfVxuXG4i KTsKICAgICAgICAgfQogCkBAIC0yNTU0LDIwICsyNTYxLDIzIEBAIHN1YiBHZW5lcmF0ZVBhcmFt ZXRlcnNDaGVjawogICAgICAgICAgICAgfQogICAgICAgICB9CiAKLSAgICAgICAgJGZ1bmN0aW9u U3RyaW5nIC49ICIsICIgaWYgJHBhcmFtSW5kZXg7Ci0KICAgICAgICAgaWYgKCRhcmdUeXBlIGVx ICJOb2RlRmlsdGVyIikgewotICAgICAgICAgICAgJGZ1bmN0aW9uU3RyaW5nIC49ICIkbmFtZS5n ZXQoKSI7CisgICAgICAgICAgICBwdXNoIEBhcmd1bWVudHMsICIkbmFtZS5nZXQoKSI7CiAgICAg ICAgIH0gZWxzaWYgKCRjb2RlR2VuZXJhdG9yLT5Jc1NWR1R5cGVOZWVkaW5nVGVhck9mZigkYXJn VHlwZSkgYW5kIG5vdCAkaW1wbENsYXNzTmFtZSA9fiAvTGlzdCQvKSB7Ci0gICAgICAgICAgICAk ZnVuY3Rpb25TdHJpbmcgLj0gIiRuYW1lLT5wcm9wZXJ0eVJlZmVyZW5jZSgpIjsKKyAgICAgICAg ICAgIHB1c2ggQGFyZ3VtZW50cywgIiRuYW1lLT5wcm9wZXJ0eVJlZmVyZW5jZSgpIjsKICAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgICRmdW5jdGlvblN0cmluZyAuPSAkbmFtZTsKKyAgICAg ICAgICAgIHB1c2ggQGFyZ3VtZW50cywgJG5hbWU7CiAgICAgICAgIH0KICAgICAgICAgJGFyZ3NJ bmRleCsrOwotICAgICAgICAkcGFyYW1JbmRleCsrOwogICAgIH0KIAotICAgIHJldHVybiAoJGZ1 bmN0aW9uU3RyaW5nLCAkcGFyYW1JbmRleCk7CisgICAgaWYgKCRmdW5jdGlvbi0+c2lnbmF0dXJl LT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tQXJndW1lbnRIYW5kbGluZyJ9KSB7CisgICAg ICAgIHB1c2ggQGFyZ3VtZW50cywgInNjcmlwdEFyZ3VtZW50cywgY2FsbFN0YWNrIjsKKyAgICB9 CisgICAgaWYgKEB7JGZ1bmN0aW9uLT5yYWlzZXNFeGNlcHRpb25zfSkgeworICAgICAgICBwdXNo IEBhcmd1bWVudHMsICJlYyI7CisgICAgfQorICAgIHJldHVybiAoIiRmdW5jdGlvbk5hbWUoIiAu IGpvaW4oIiwgIiwgQGFyZ3VtZW50cykgLiAiKSIsIHNjYWxhciBAYXJndW1lbnRzKTsKIH0KIAog c3ViIEdlbmVyYXRlQ2FsbGJhY2tIZWFkZXIKQEAgLTI3MzIsMjMgKzI3NDIsMTAgQEAgc3ViIEdl bmVyYXRlSW1wbGVtZW50YXRpb25GdW5jdGlvbkNhbGwoKQogewogICAgIG15ICRmdW5jdGlvbiA9 IHNoaWZ0OwogICAgIG15ICRmdW5jdGlvblN0cmluZyA9IHNoaWZ0OwotICAgIG15ICRwYXJhbUlu ZGV4ID0gc2hpZnQ7CiAgICAgbXkgJGluZGVudCA9IHNoaWZ0OwogICAgIG15ICRzdmdQcm9wZXJ0 eVR5cGUgPSBzaGlmdDsKICAgICBteSAkaW1wbENsYXNzTmFtZSA9IHNoaWZ0OwogCi0gICAgaWYg KCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tQXJndW1l bnRIYW5kbGluZyJ9KSB7Ci0gICAgICAgICRmdW5jdGlvblN0cmluZyAuPSAiLCAiIGlmICRwYXJh bUluZGV4OwotICAgICAgICAkcGFyYW1JbmRleCArPSAyOwotICAgICAgICAkZnVuY3Rpb25TdHJp bmcgLj0gInNjcmlwdEFyZ3VtZW50cywgY2FsbFN0YWNrIjsKLSAgICB9Ci0KLSAgICBpZiAoQHsk ZnVuY3Rpb24tPnJhaXNlc0V4Y2VwdGlvbnN9KSB7Ci0gICAgICAgICRmdW5jdGlvblN0cmluZyAu PSAiLCAiIGlmICRwYXJhbUluZGV4OwotICAgICAgICAkZnVuY3Rpb25TdHJpbmcgLj0gImVjIjsK LSAgICB9Ci0gICAgJGZ1bmN0aW9uU3RyaW5nIC49ICIpIjsKLQogICAgIGlmICgkZnVuY3Rpb24t PnNpZ25hdHVyZS0+dHlwZSBlcSAidm9pZCIpIHsKICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICRpbmRlbnQgLiAiJGZ1bmN0aW9uU3RyaW5nO1xuIik7CiAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAkaW5kZW50IC4gInNldERPTUV4Y2VwdGlvbihleGVjLCBlYyk7XG4iKSBpZiBAeyRmdW5j dGlvbi0+cmFpc2VzRXhjZXB0aW9uc307Cg==