99798 2012-10-18 19:46:02 -0700 Clean up RegExpKey 2012-10-19 10:10:05 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 745916 0 andersca 2012-10-18 19:46:02 -0700 Clean up RegExpKey 745919 1 169538 andersca 2012-10-18 19:50:58 -0700 Created attachment 169538 Patch 745944 2 169538 darin 2012-10-18 20:57:05 -0700 Comment on attachment 169538 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=169538&action=review > Source/JavaScriptCore/ChangeLog:10 > + RegExpHash doesn't need to be a class template specialization when the class template is specialized > + for JSC::RegExpKey only. Make it a nested class of RegExp instead. Also, make operator== a friend function > + and move it inside the class. Making friend function seems good to me. Moving inside the class does not seem good to me. I find class definitions easier to read when they don’t have long function definitions inside them. 746402 3 andersca 2012-10-19 10:10:05 -0700 Committed r131913: <http://trac.webkit.org/changeset/131913> 169538 2012-10-18 19:50:58 -0700 2012-10-18 20:57:05 -0700 Patch bug-99798-20121018194943.patch text/plain 2974 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxODQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 NzA3OGJlNGM5MjdmMDRhNzg3ZWIyYTk4MTIwOWQ4ODNiN2VlZTI2Li45NDk1MzQ1ZWNlYTA5ZGRl NjVjMWM2M2NjMGM2MzA5ZDYyMTI4YTcyIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMiBAQAorMjAxMi0xMC0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgorCisgICAgICAgIENsZWFuIHVwIFJlZ0V4cEtleQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk3OTgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZWdFeHBIYXNoIGRvZXNuJ3QgbmVlZCB0byBiZSBh IGNsYXNzIHRlbXBsYXRlIHNwZWNpYWxpemF0aW9uIHdoZW4gdGhlIGNsYXNzIHRlbXBsYXRlIGlz IHNwZWNpYWxpemVkCisgICAgICAgIGZvciBKU0M6OlJlZ0V4cEtleSBvbmx5LiBNYWtlIGl0IGEg bmVzdGVkIGNsYXNzIG9mIFJlZ0V4cCBpbnN0ZWFkLiBBbHNvLCBtYWtlIG9wZXJhdG9yPT0gYSBm cmllbmQgZnVuY3Rpb24KKyAgICAgICAgYW5kIG1vdmUgaXQgaW5zaWRlIHRoZSBjbGFzcy4KKwor ICAgICAgICAqIHJ1bnRpbWUvUmVnRXhwS2V5Lmg6CisgICAgICAgIChKU0M6OlJlZ0V4cEtleTo6 UmVnRXhwS2V5KToKKyAgICAgICAgKEpTQzo6UmVnRXhwS2V5OjpvcGVyYXRvcj09KToKKyAgICAg ICAgKFJlZ0V4cEtleSk6CisgICAgICAgIChKU0M6OlJlZ0V4cEtleTo6SGFzaDo6aGFzaCk6Cisg ICAgICAgIChKU0M6OlJlZ0V4cEtleTo6SGFzaDo6ZXF1YWwpOgorICAgICAgICAoSGFzaCk6CisK IDIwMTItMTAtMTggIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAg ICAgY29udmVydFVURjhUb1VURjE2KCkgU2hvdWxkIENoZWNrIGZvciBBU0NJSSBJbnB1dApkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvUmVnRXhwS2V5LmggYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBLZXkuaAppbmRleCBmOTNmYmJjMWQ5MGQx NDYzMTQ4ZjE4NDgxYWZlMWFkMDlkYTRiMWVjLi5kYTA0ODM3OWM4MjFlYTJjOTUxZTBmMWRkYWYw MjMwNTkxZWZmYjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9S ZWdFeHBLZXkuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9SZWdFeHBLZXku aApAQCAtNzMsMzMgKzczLDMyIEBAIHN0cnVjdCBSZWdFeHBLZXkgewogICAgICAgICAsIHBhdHRl cm4ocGF0dGVybikKICAgICB7CiAgICAgfQotfTsKIAotaW5saW5lIGJvb2wgb3BlcmF0b3I9PShj b25zdCBSZWdFeHBLZXkmIGEsIGNvbnN0IFJlZ0V4cEtleSYgYikgCi17Ci0gICAgaWYgKGEuZmxh Z3NWYWx1ZSAhPSBiLmZsYWdzVmFsdWUpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAo IWEucGF0dGVybikKLSAgICAgICAgcmV0dXJuICFiLnBhdHRlcm47Ci0gICAgaWYgKCFiLnBhdHRl cm4pCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1cm4gZXF1YWwoYS5wYXR0ZXJuLmdl dCgpLCBiLnBhdHRlcm4uZ2V0KCkpOwotfQorICAgIGZyaWVuZCBpbmxpbmUgYm9vbCBvcGVyYXRv cj09KGNvbnN0IFJlZ0V4cEtleSYgYSwgY29uc3QgUmVnRXhwS2V5JiBiKQorICAgIHsKKyAgICAg ICAgaWYgKGEuZmxhZ3NWYWx1ZSAhPSBiLmZsYWdzVmFsdWUpCisgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CisgICAgICAgIGlmICghYS5wYXR0ZXJuKQorICAgICAgICAgICAgcmV0dXJuICFiLnBh dHRlcm47CisgICAgICAgIGlmICghYi5wYXR0ZXJuKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICByZXR1cm4gZXF1YWwoYS5wYXR0ZXJuLmdldCgpLCBiLnBhdHRlcm4uZ2V0KCkp OworICAgIH0KKworICAgIHN0cnVjdCBIYXNoIHsKKyAgICAgICAgc3RhdGljIHVuc2lnbmVkIGhh c2goY29uc3QgUmVnRXhwS2V5JiBrZXkpIHsgcmV0dXJuIGtleS5wYXR0ZXJuLT5oYXNoKCk7IH0K KyAgICAgICAgc3RhdGljIGJvb2wgZXF1YWwoY29uc3QgUmVnRXhwS2V5JiBhLCBjb25zdCBSZWdF eHBLZXkmIGIpIHsgcmV0dXJuIGEgPT0gYjsgfQorICAgICAgICBzdGF0aWMgY29uc3QgYm9vbCBz YWZlVG9Db21wYXJlVG9FbXB0eU9yRGVsZXRlZCA9IGZhbHNlOworICAgIH07Cit9OwogCiB9IC8v IG5hbWVzcGFjZSBKU0MKIAogbmFtZXNwYWNlIFdURiB7CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBz dHJ1Y3QgRGVmYXVsdEhhc2g7Ci10ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdHJ1Y3QgUmVnRXhwSGFz aDsKLQotdGVtcGxhdGU8PiBzdHJ1Y3QgUmVnRXhwSGFzaDxKU0M6OlJlZ0V4cEtleT4gewotICAg IHN0YXRpYyB1bnNpZ25lZCBoYXNoKGNvbnN0IEpTQzo6UmVnRXhwS2V5JiBrZXkpIHsgcmV0dXJu IGtleS5wYXR0ZXJuLT5oYXNoKCk7IH0KLSAgICBzdGF0aWMgYm9vbCBlcXVhbChjb25zdCBKU0M6 OlJlZ0V4cEtleSYgYSwgY29uc3QgSlNDOjpSZWdFeHBLZXkmIGIpIHsgcmV0dXJuIGEgPT0gYjsg fQotICAgIHN0YXRpYyBjb25zdCBib29sIHNhZmVUb0NvbXBhcmVUb0VtcHR5T3JEZWxldGVkID0g ZmFsc2U7Ci19OwogCiB0ZW1wbGF0ZTw+IHN0cnVjdCBEZWZhdWx0SGFzaDxKU0M6OlJlZ0V4cEtl eT4gewotICAgIHR5cGVkZWYgUmVnRXhwSGFzaDxKU0M6OlJlZ0V4cEtleT4gSGFzaDsKKyAgICB0 eXBlZGVmIEpTQzo6UmVnRXhwS2V5OjpIYXNoIEhhc2g7CiB9OwogCiB0ZW1wbGF0ZTw+IHN0cnVj dCBIYXNoVHJhaXRzPEpTQzo6UmVnRXhwS2V5PiA6IEdlbmVyaWNIYXNoVHJhaXRzPEpTQzo6UmVn RXhwS2V5PiB7Cg==