23731 2009-02-04 09:38:11 -0800 Add JSCCustom and V8Custom as extended IDL attributes 2009-02-04 10:11:31 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd oldest_to_newest 108277 0 fishd 2009-02-04 09:38:11 -0800 Add JSCCustom and V8Custom as extended IDL attributes This will help avoid having to add #ifdefs to the IDL files to support the V8 bindings. 108279 1 27316 fishd 2009-02-04 09:40:51 -0800 Created attachment 27316 v1 patch In this patch, I define JSCCustom and make use of it in a few IDL files. I also modify Document.idl to make use of V8Custom, which is known only to the CodeGeneratorV8.pm module (that has yet to be upstreamed). I did not add JSCCustomGetter or JSCCustomSetter since they are not needed. I could add those for completeness, but it seemed better to just focus on what is actually needed. 108281 2 27316 darin 2009-02-04 09:48:21 -0800 Comment on attachment 27316 v1 patch > $numCustomAttributes++ if $attribute->signature->extendedAttributes->{"Custom"}; > $numCustomAttributes++ if $attribute->signature->extendedAttributes->{"CustomGetter"}; > $numCustomAttributes++ if $attribute->signature->extendedAttributes->{"CustomSetter"}; > + $numCustomAttributes++ if $attribute->signature->extendedAttributes->{"JSCCustom"}; This will do the wrong thing if someone includes both "Custom" and "JSCustom" for the same attribute; and it won't report an error. It would be better to use || instead or consider it an error. > $numCustomFunctions++ if $function->signature->extendedAttributes->{"Custom"}; > + $numCustomFunctions++ if $function->signature->extendedAttributes->{"JSCCustom"}; Same comment. r=me 108289 3 fishd 2009-02-04 10:09:25 -0800 Good catch. Thanks! 108291 4 fishd 2009-02-04 10:11:31 -0800 http://trac.webkit.org/changeset/40617 27316 2009-02-04 09:40:51 -0800 2009-02-04 09:48:21 -0800 v1 patch gen_1.diff text/plain 12879 fishd SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDQwNjEz KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMDIt MDQgIERhcmluIEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjM3MzEKKyAgICAgICAgQWRkIEpTQ0N1c3RvbSBhbmQgVjhDdXN0b20g YXMgZXh0ZW5kZWQgSURMIGF0dHJpYnV0ZXMKKworICAgICAgICBUaGlzIGhlbHBzIGF2b2lkIGhh dmluZyB0byBhZGQgI2lmZGVmcyB0byB0aGUgSURMIGZpbGVzIHRvIHN1cHBvcnQgVjggYmluZGlu Z3MuCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbToKKyAg ICAgICAgKiBkb20vRG9jdW1lbnQuaWRsOgorICAgICAgICAqIGRvbS9Ob2RlLmlkbDoKKyAgICAg ICAgKiBzdmcvU1ZHUGF0aFNlZ0xpc3QuaWRsOgorICAgICAgICAqIHN2Zy9TVkdQb2ludExpc3Qu aWRsOgorICAgICAgICAqIHN2Zy9TVkdUcmFuc2Zvcm1MaXN0LmlkbDoKKwogMjAwOS0wMi0wNCAg U2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBRdCBidWlsZCBmaXguCkluZGV4OiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0 b3JKUy5wbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5w bQkocmV2aXNpb24gNDA2MTMpCisrKyBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5w bQkod29ya2luZyBjb3B5KQpAQCAtNTM5LDYgKzUzOSw3IEBAIHN1YiBHZW5lcmF0ZUhlYWRlcgog ICAgICAgICAgICAgJG51bUN1c3RvbUF0dHJpYnV0ZXMrKyBpZiAkYXR0cmlidXRlLT5zaWduYXR1 cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b20ifTsKICAgICAgICAgICAgICRudW1DdXN0 b21BdHRyaWJ1dGVzKysgaWYgJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0 ZXMtPnsiQ3VzdG9tR2V0dGVyIn07CiAgICAgICAgICAgICAkbnVtQ3VzdG9tQXR0cmlidXRlcysr IGlmICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkN1c3RvbVNl dHRlciJ9OworICAgICAgICAgICAgJG51bUN1c3RvbUF0dHJpYnV0ZXMrKyBpZiAkYXR0cmlidXRl LT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b20ifTsKICAgICAgICAg fQogICAgIH0KIApAQCAtNTQ2LDcgKzU0Nyw3IEBAIHN1YiBHZW5lcmF0ZUhlYWRlcgogICAgICAg ICBwdXNoKEBoZWFkZXJDb250ZW50LCAiXG4gICAgLy8gQ3VzdG9tIGF0dHJpYnV0ZXNcbiIpOwog CiAgICAgICAgIGZvcmVhY2ggbXkgJGF0dHJpYnV0ZSAoQHskZGF0YU5vZGUtPmF0dHJpYnV0ZXN9 KSB7Ci0gICAgICAgICAgICBpZiAoJGF0dHJpYnV0ZS0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJp YnV0ZXMtPnsiQ3VzdG9tIn0pIHsKKyAgICAgICAgICAgIGlmICgkYXR0cmlidXRlLT5zaWduYXR1 cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b20ifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1 cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b20ifSkgewogICAgICAgICAgICAgICAg IHB1c2goQGhlYWRlckNvbnRlbnQsICIgICAgSlNDOjpKU1ZhbHVlUHRyICIgLiAkY29kZUdlbmVy YXRvci0+V0tfbGNmaXJzdCgkYXR0cmlidXRlLT5zaWduYXR1cmUtPm5hbWUpIC4gIihKU0M6OkV4 ZWNTdGF0ZSopIGNvbnN0O1xuIik7CiAgICAgICAgICAgICAgICAgaWYgKCRhdHRyaWJ1dGUtPnR5 cGUgIX4gL15yZWFkb25seS8pIHsKICAgICAgICAgICAgICAgICAgICAgcHVzaChAaGVhZGVyQ29u dGVudCwgIiAgICB2b2lkIHNldCIgLiAkY29kZUdlbmVyYXRvci0+V0tfdWNmaXJzdCgkYXR0cmli dXRlLT5zaWduYXR1cmUtPm5hbWUpIC4gIihKU0M6OkV4ZWNTdGF0ZSosIEpTQzo6SlNWYWx1ZVB0 cik7XG4iKTsKQEAgLTU2MywxMiArNTY0LDEzIEBAIHN1YiBHZW5lcmF0ZUhlYWRlcgogCiAgICAg Zm9yZWFjaCBteSAkZnVuY3Rpb24gKEB7JGRhdGFOb2RlLT5mdW5jdGlvbnN9KSB7CiAgICAgICAg ICRudW1DdXN0b21GdW5jdGlvbnMrKyBpZiAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IkN1c3RvbSJ9OworICAgICAgICAkbnVtQ3VzdG9tRnVuY3Rpb25zKysgaWYg JGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b20ifTsK ICAgICB9CiAKICAgICBpZiAoJG51bUN1c3RvbUZ1bmN0aW9ucyA+IDApIHsKICAgICAgICAgcHVz aChAaGVhZGVyQ29udGVudCwgIlxuICAgIC8vIEN1c3RvbSBmdW5jdGlvbnNcbiIpOwogICAgICAg ICBmb3JlYWNoIG15ICRmdW5jdGlvbiAoQHskZGF0YU5vZGUtPmZ1bmN0aW9uc30pIHsKLSAgICAg ICAgICAgIGlmICgkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkN1 c3RvbSJ9KSB7CisgICAgICAgICAgICBpZiAoJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVk QXR0cmlidXRlcy0+eyJDdXN0b20ifSB8fCAkZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRB dHRyaWJ1dGVzLT57IkpTQ0N1c3RvbSJ9KSB7CiAgICAgICAgICAgICAgICAgbXkgJGZ1bmN0aW9u SW1wbGVtZW50YXRpb25OYW1lID0gJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmli dXRlcy0+eyJJbXBsZW1lbnRhdGlvbkZ1bmN0aW9uIn0gfHwgJGNvZGVHZW5lcmF0b3ItPldLX2xj Zmlyc3QoJGZ1bmN0aW9uLT5zaWduYXR1cmUtPm5hbWUpOwogICAgICAgICAgICAgICAgIHB1c2go QGhlYWRlckNvbnRlbnQsICIgICAgSlNDOjpKU1ZhbHVlUHRyICIgLiAkZnVuY3Rpb25JbXBsZW1l bnRhdGlvbk5hbWUgLiAiKEpTQzo6RXhlY1N0YXRlKiwgY29uc3QgSlNDOjpBcmdMaXN0Jik7XG4i KTsKICAgICAgICAgICAgIH0KQEAgLTEwODAsNyArMTA4Miw3IEBAIHN1YiBHZW5lcmF0ZUltcGxl bWVudGF0aW9uCiAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAg ICByZXR1cm4ganNVbmRlZmluZWQoKTtcbiIpOwogICAgICAgICAgICAgICAgIH0KIAotICAgICAg ICAgICAgICAgIGlmICgkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+ eyJDdXN0b20ifSB8fCAkYXR0cmlidXRlLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+ eyJDdXN0b21HZXR0ZXIifSkgeworICAgICAgICAgICAgICAgIGlmICgkYXR0cmlidXRlLT5zaWdu YXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b20ifSB8fCAkYXR0cmlidXRlLT5zaWdu YXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b20ifSB8fCAkYXR0cmlidXRlLT5z aWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRlcy0+eyJDdXN0b21HZXR0ZXIifSkgewogICAgICAg ICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gc3RhdGljX2Nhc3Q8 JGNsYXNzTmFtZSo+KGFzT2JqZWN0KHNsb3Quc2xvdEJhc2UoKSkpLT4kaW1wbEdldHRlckZ1bmN0 aW9uTmFtZShleGVjKTtcbiIpOwogICAgICAgICAgICAgICAgIH0gZWxzaWYgKCRhdHRyaWJ1dGUt PnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkNoZWNrTm9kZVNlY3VyaXR5In0pIHsK ICAgICAgICAgICAgICAgICAgICAgJGltcGxJbmNsdWRlc3siSlNET01CaW5kaW5nLmgifSA9IDE7 CkBAIC0xMjIwLDcgKzEyMjIsNyBAQCBzdWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICByZXR1cm47 XG4iKTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgICAgICAg ICAgaWYgKCRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkN1c3Rv bSJ9IHx8ICRhdHRyaWJ1dGUtPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IkN1c3Rv bVNldHRlciJ9KSB7CisgICAgICAgICAgICAgICAgICAgICAgICBpZiAoJGF0dHJpYnV0ZS0+c2ln bmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tIn0gfHwgJGF0dHJpYnV0ZS0+c2ln bmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiSlNDQ3VzdG9tIn0gfHwgJGF0dHJpYnV0ZS0+ c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tU2V0dGVyIn0pIHsKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBzdGF0aWNfY2Fz dDwkY2xhc3NOYW1lKj4odGhpc09iamVjdCktPnNldCRpbXBsU2V0dGVyRnVuY3Rpb25OYW1lKGV4 ZWMsIHZhbHVlKTtcbiIpOwogICAgICAgICAgICAgICAgICAgICAgICAgfSBlbHNpZiAoJHR5cGUg ZXEgIkV2ZW50TGlzdGVuZXIiKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJGltcGxJ bmNsdWRlc3siSlNFdmVudExpc3RlbmVyLmgifSA9IDE7CkBAIC0xMzMxLDcgKzEzMzMsNyBAQCBz dWIgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbgogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250 ZW50LCAiICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTtcbiIpOwogICAgICAgICAgICAgfQog Ci0gICAgICAgICAgICBpZiAoJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4dGVuZGVkQXR0cmlidXRl cy0+eyJDdXN0b20ifSkgeworICAgICAgICAgICAgaWYgKCRmdW5jdGlvbi0+c2lnbmF0dXJlLT5l eHRlbmRlZEF0dHJpYnV0ZXMtPnsiQ3VzdG9tIn0gfHwgJGZ1bmN0aW9uLT5zaWduYXR1cmUtPmV4 dGVuZGVkQXR0cmlidXRlcy0+eyJKU0NDdXN0b20ifSkgewogICAgICAgICAgICAgICAgIHB1c2go QGltcGxDb250ZW50LCAiICAgIHJldHVybiBjYXN0ZWRUaGlzT2JqLT4iIC4gJGZ1bmN0aW9uSW1w bGVtZW50YXRpb25OYW1lIC4gIihleGVjLCBhcmdzKTtcbiIpOwogICAgICAgICAgICAgfSBlbHNl IHsKICAgICAgICAgICAgICAgICBpZiAoJHBvZFR5cGUpIHsKSW5kZXg6IGRvbS9Eb2N1bWVudC5p ZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gZG9tL0RvY3VtZW50LmlkbAkocmV2aXNpb24gNDA2MTMpCisrKyBk b20vRG9jdW1lbnQuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw3ICszMiw3IEBAIG1vZHVsZSBj b3JlIHsKIAogICAgICAgICAvLyBET00gTGV2ZWwgMSBDb3JlCiAgICAgICAgIHJlYWRvbmx5IGF0 dHJpYnV0ZSBEb2N1bWVudFR5cGUgZG9jdHlwZTsKLSAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRl IERPTUltcGxlbWVudGF0aW9uIGltcGxlbWVudGF0aW9uOworICAgICAgICByZWFkb25seSBhdHRy aWJ1dGUgW1Y4Q3VzdG9tXSBET01JbXBsZW1lbnRhdGlvbiBpbXBsZW1lbnRhdGlvbjsKICAgICAg ICAgcmVhZG9ubHkgYXR0cmlidXRlIEVsZW1lbnQgZG9jdW1lbnRFbGVtZW50OwogCiAgICAgICAg IFtSZXR1cm5zTmV3XSBFbGVtZW50IGNyZWF0ZUVsZW1lbnQoaW4gW0NvbnZlcnROdWxsVG9OdWxs U3RyaW5nXSBET01TdHJpbmcgdGFnTmFtZSkKQEAgLTEyMiwxMSArMTIyLDExIEBAIG1vZHVsZSBj b3JlIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaW4gWFBhdGhOU1Jlc29sdmVyIHJlc29sdmVyKQogICAgICAgICAgICAgcmFpc2VzKERP TUV4Y2VwdGlvbik7CiAgICAgICAgIFhQYXRoTlNSZXNvbHZlciAgICBjcmVhdGVOU1Jlc29sdmVy KGluIE5vZGUgbm9kZVJlc29sdmVyKTsKLSAgICAgICAgW09sZFN0eWxlT2JqQ10gWFBhdGhSZXN1 bHQgZXZhbHVhdGUoaW4gRE9NU3RyaW5nIGV4cHJlc3Npb24sCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGluIE5vZGUgY29udGV4dE5vZGUsCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIFhQYXRoTlNSZXNvbHZlciByZXNv bHZlciwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gdW5z aWduZWQgc2hvcnQgdHlwZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaW4gWFBhdGhSZXN1bHQgaW5SZXN1bHQpCisgICAgICAgIFtPbGRTdHlsZU9iakMsIFY4 Q3VzdG9tXSBYUGF0aFJlc3VsdCBldmFsdWF0ZShpbiBET01TdHJpbmcgZXhwcmVzc2lvbiwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluIE5v ZGUgY29udGV4dE5vZGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBpbiBYUGF0aE5TUmVzb2x2ZXIgcmVzb2x2ZXIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiB1bnNpZ25lZCBzaG9y dCB0eXBlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaW4gWFBhdGhSZXN1bHQgaW5SZXN1bHQpCiAgICAgICAgICAgICByYWlzZXMoRE9NRXhj ZXB0aW9uKTsKICNlbmRpZiAvLyBFTkFCTEVfWFBBVEgKICNlbmRpZiAvLyAhZGVmaW5lZChMQU5H VUFHRV9DT00pCkluZGV4OiBkb20vTm9kZS5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gZG9tL05vZGUuaWRs CShyZXZpc2lvbiA0MDYxMykKKysrIGRvbS9Ob2RlLmlkbAkod29ya2luZyBjb3B5KQpAQCAtNjQs MTUgKzY0LDE1IEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIE5h bWVkTm9kZU1hcCAgICAgYXR0cmlidXRlczsKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERv Y3VtZW50ICAgICAgICAgb3duZXJEb2N1bWVudDsKIAotICAgICAgICBbT2xkU3R5bGVPYmpDLCBD dXN0b21dIE5vZGUgaW5zZXJ0QmVmb3JlKGluIFtSZXR1cm5dIE5vZGUgbmV3Q2hpbGQsIAorICAg ICAgICBbT2xkU3R5bGVPYmpDLCBKU0NDdXN0b21dIE5vZGUgaW5zZXJ0QmVmb3JlKGluIFtSZXR1 cm5dIE5vZGUgbmV3Q2hpbGQsIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGluIE5vZGUgcmVmQ2hpbGQpCiAgICAgICAgICAgICByYWlzZXMoRE9NRXhj ZXB0aW9uKTsKLSAgICAgICAgW09sZFN0eWxlT2JqQywgQ3VzdG9tXSBOb2RlIHJlcGxhY2VDaGls ZChpbiBOb2RlIG5ld0NoaWxkLCAKKyAgICAgICAgW09sZFN0eWxlT2JqQywgSlNDQ3VzdG9tXSBO b2RlIHJlcGxhY2VDaGlsZChpbiBOb2RlIG5ld0NoaWxkLCAKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbiBbUmV0dXJuXSBOb2RlIG9sZENoaWxkKQor ICAgICAgICAgICAgcmFpc2VzKERPTUV4Y2VwdGlvbkpTQyk7CisgICAgICAgIFtKU0NDdXN0b21d IE5vZGUgICAgICAgICAgICAgICByZW1vdmVDaGlsZChpbiBbUmV0dXJuXSBOb2RlIG9sZENoaWxk KQogICAgICAgICAgICAgcmFpc2VzKERPTUV4Y2VwdGlvbik7Ci0gICAgICAgIFtDdXN0b21dIE5v ZGUgICAgICAgICAgICAgICByZW1vdmVDaGlsZChpbiBbUmV0dXJuXSBOb2RlIG9sZENoaWxkKQot ICAgICAgICAgICAgcmFpc2VzKERPTUV4Y2VwdGlvbik7Ci0gICAgICAgIFtDdXN0b21dIE5vZGUg ICAgICAgICAgICAgICBhcHBlbmRDaGlsZChpbiBbUmV0dXJuXSBOb2RlIG5ld0NoaWxkKQorICAg ICAgICBbSlNDQ3VzdG9tXSBOb2RlICAgICAgICAgICAgICAgYXBwZW5kQ2hpbGQoaW4gW1JldHVy bl0gTm9kZSBuZXdDaGlsZCkKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwogCiAg ICAgICAgIGJvb2xlYW4gICAgICAgICAgICBoYXNDaGlsZE5vZGVzKCk7CkluZGV4OiBzdmcvU1ZH UGF0aFNlZ0xpc3QuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN2Zy9TVkdQYXRoU2VnTGlzdC5pZGwJKHJl dmlzaW9uIDQwNjEzKQorKysgc3ZnL1NWR1BhdGhTZWdMaXN0LmlkbAkod29ya2luZyBjb3B5KQpA QCAtMjksMTkgKzI5LDE5IEBAIG1vZHVsZSBzdmcgewogICAgIGludGVyZmFjZSBbQ29uZGl0aW9u YWw9U1ZHXSBTVkdQYXRoU2VnTGlzdCB7CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSB1bnNp Z25lZCBsb25nIG51bWJlck9mSXRlbXM7CiAKLSAgICAgICAgW0N1c3RvbV0gdm9pZCBjbGVhcigp CisgICAgICAgIFtKU0NDdXN0b21dIHZvaWQgY2xlYXIoKQogICAgICAgICAgICAgcmFpc2VzKERP TUV4Y2VwdGlvbik7Ci0gICAgICAgIFtDdXN0b21dIFNWR1BhdGhTZWcgaW5pdGlhbGl6ZShpbiBT VkdQYXRoU2VnIG5ld0l0ZW0pCisgICAgICAgIFtKU0NDdXN0b21dIFNWR1BhdGhTZWcgaW5pdGlh bGl6ZShpbiBTVkdQYXRoU2VnIG5ld0l0ZW0pCiAgICAgICAgICAgICByYWlzZXMoRE9NRXhjZXB0 aW9uLCBTVkdFeGNlcHRpb24pOwotICAgICAgICBbQ3VzdG9tXSBTVkdQYXRoU2VnIGdldEl0ZW0o aW4gdW5zaWduZWQgbG9uZyBpbmRleCkKKyAgICAgICAgW0pTQ0N1c3RvbV0gU1ZHUGF0aFNlZyBn ZXRJdGVtKGluIHVuc2lnbmVkIGxvbmcgaW5kZXgpCiAgICAgICAgICAgICByYWlzZXMoRE9NRXhj ZXB0aW9uKTsKLSAgICAgICAgW0N1c3RvbV0gU1ZHUGF0aFNlZyBpbnNlcnRJdGVtQmVmb3JlKGlu IFNWR1BhdGhTZWcgbmV3SXRlbSwgaW4gdW5zaWduZWQgbG9uZyBpbmRleCkKKyAgICAgICAgW0pT Q0N1c3RvbV0gU1ZHUGF0aFNlZyBpbnNlcnRJdGVtQmVmb3JlKGluIFNWR1BhdGhTZWcgbmV3SXRl bSwgaW4gdW5zaWduZWQgbG9uZyBpbmRleCkKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRp b24sIFNWR0V4Y2VwdGlvbik7Ci0gICAgICAgIFtDdXN0b21dIFNWR1BhdGhTZWcgcmVwbGFjZUl0 ZW0oaW4gU1ZHUGF0aFNlZyBuZXdJdGVtLCBpbiB1bnNpZ25lZCBsb25nIGluZGV4KQorICAgICAg ICBbSlNDQ3VzdG9tXSBTVkdQYXRoU2VnIHJlcGxhY2VJdGVtKGluIFNWR1BhdGhTZWcgbmV3SXRl bSwgaW4gdW5zaWduZWQgbG9uZyBpbmRleCkKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRp b24sIFNWR0V4Y2VwdGlvbik7Ci0gICAgICAgIFtDdXN0b21dIFNWR1BhdGhTZWcgcmVtb3ZlSXRl bShpbiB1bnNpZ25lZCBsb25nIGluZGV4KQorICAgICAgICBbSlNDQ3VzdG9tXSBTVkdQYXRoU2Vn IHJlbW92ZUl0ZW0oaW4gdW5zaWduZWQgbG9uZyBpbmRleCkKICAgICAgICAgICAgIHJhaXNlcyhE T01FeGNlcHRpb24pOwotICAgICAgICBbQ3VzdG9tXSBTVkdQYXRoU2VnIGFwcGVuZEl0ZW0oaW4g U1ZHUGF0aFNlZyBuZXdJdGVtKQorICAgICAgICBbSlNDQ3VzdG9tXSBTVkdQYXRoU2VnIGFwcGVu ZEl0ZW0oaW4gU1ZHUGF0aFNlZyBuZXdJdGVtKQogICAgICAgICAgICAgcmFpc2VzKERPTUV4Y2Vw dGlvbiwgU1ZHRXhjZXB0aW9uKTsKICAgICB9OwogCkluZGV4OiBzdmcvU1ZHUG9pbnRMaXN0Lmlk bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBzdmcvU1ZHUG9pbnRMaXN0LmlkbAkocmV2aXNpb24gNDA2MTMpCisr KyBzdmcvU1ZHUG9pbnRMaXN0LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMjgsMTkgKzI4LDE5IEBA IG1vZHVsZSBzdmcgewogICAgIGludGVyZmFjZSBbQ29uZGl0aW9uYWw9U1ZHXSBTVkdQb2ludExp c3QgewogICAgICAgICByZWFkb25seSBhdHRyaWJ1dGUgdW5zaWduZWQgbG9uZyBudW1iZXJPZkl0 ZW1zOwogCi0gICAgICAgIFtDdXN0b21dIHZvaWQgY2xlYXIoKQorICAgICAgICBbSlNDQ3VzdG9t XSB2b2lkIGNsZWFyKCkKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwotICAgICAg ICBbQ3VzdG9tXSBTVkdQb2ludCBpbml0aWFsaXplKGluIFNWR1BvaW50IGl0ZW0pCisgICAgICAg IFtKU0NDdXN0b21dIFNWR1BvaW50IGluaXRpYWxpemUoaW4gU1ZHUG9pbnQgaXRlbSkKICAgICAg ICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24sIFNWR0V4Y2VwdGlvbik7CiAgICAgICAgIFtDdXN0 b21dIFNWR1BvaW50IGdldEl0ZW0oaW4gdW5zaWduZWQgbG9uZyBpbmRleCkKICAgICAgICAgICAg IHJhaXNlcyhET01FeGNlcHRpb24pOwotICAgICAgICBbQ3VzdG9tXSBTVkdQb2ludCBpbnNlcnRJ dGVtQmVmb3JlKGluIFNWR1BvaW50IGl0ZW0sIGluIHVuc2lnbmVkIGxvbmcgaW5kZXgpCisgICAg ICAgIFtKU0NDdXN0b21dIFNWR1BvaW50IGluc2VydEl0ZW1CZWZvcmUoaW4gU1ZHUG9pbnQgaXRl bSwgaW4gdW5zaWduZWQgbG9uZyBpbmRleCkKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRp b24sIFNWR0V4Y2VwdGlvbik7Ci0gICAgICAgIFtDdXN0b21dIFNWR1BvaW50IHJlcGxhY2VJdGVt KGluIFNWR1BvaW50IGl0ZW0sIGluIHVuc2lnbmVkIGxvbmcgaW5kZXgpCisgICAgICAgIFtKU0ND dXN0b21dIFNWR1BvaW50IHJlcGxhY2VJdGVtKGluIFNWR1BvaW50IGl0ZW0sIGluIHVuc2lnbmVk IGxvbmcgaW5kZXgpCiAgICAgICAgICAgICByYWlzZXMoRE9NRXhjZXB0aW9uLCBTVkdFeGNlcHRp b24pOwotICAgICAgICBbQ3VzdG9tXSBTVkdQb2ludCByZW1vdmVJdGVtKGluIHVuc2lnbmVkIGxv bmcgaW5kZXgpCisgICAgICAgIFtKU0NDdXN0b21dIFNWR1BvaW50IHJlbW92ZUl0ZW0oaW4gdW5z aWduZWQgbG9uZyBpbmRleCkKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24pOwotICAg ICAgICBbQ3VzdG9tXSBTVkdQb2ludCBhcHBlbmRJdGVtKGluIFNWR1BvaW50IGl0ZW0pCisgICAg ICAgIFtKU0NDdXN0b21dIFNWR1BvaW50IGFwcGVuZEl0ZW0oaW4gU1ZHUG9pbnQgaXRlbSkKICAg ICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24sIFNWR0V4Y2VwdGlvbik7CiAgICAgfTsKIApJ bmRleDogc3ZnL1NWR1RyYW5zZm9ybUxpc3QuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHN2Zy9TVkdUcmFu c2Zvcm1MaXN0LmlkbAkocmV2aXNpb24gNDA2MTMpCisrKyBzdmcvU1ZHVHJhbnNmb3JtTGlzdC5p ZGwJKHdvcmtpbmcgY29weSkKQEAgLTI5LDE5ICsyOSwxOSBAQCBtb2R1bGUgc3ZnIHsKICAgICBp bnRlcmZhY2UgW0NvbmRpdGlvbmFsPVNWR10gU1ZHVHJhbnNmb3JtTGlzdCB7CiAgICAgICAgIHJl YWRvbmx5IGF0dHJpYnV0ZSB1bnNpZ25lZCBsb25nIG51bWJlck9mSXRlbXM7CiAKLSAgICAgICAg W0N1c3RvbV0gdm9pZCBjbGVhcigpCisgICAgICAgIFtKU0NDdXN0b21dIHZvaWQgY2xlYXIoKQog ICAgICAgICAgICAgcmFpc2VzKERPTUV4Y2VwdGlvbik7Ci0gICAgICAgIFtDdXN0b21dIFNWR1Ry YW5zZm9ybSBpbml0aWFsaXplKGluIFNWR1RyYW5zZm9ybSBpdGVtKQorICAgICAgICBbSlNDQ3Vz dG9tXSBTVkdUcmFuc2Zvcm0gaW5pdGlhbGl6ZShpbiBTVkdUcmFuc2Zvcm0gaXRlbSkKICAgICAg ICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24sIFNWR0V4Y2VwdGlvbik7Ci0gICAgICAgIFtDdXN0 b21dIFNWR1RyYW5zZm9ybSBnZXRJdGVtKGluIHVuc2lnbmVkIGxvbmcgaW5kZXgpCisgICAgICAg IFtKU0NDdXN0b21dIFNWR1RyYW5zZm9ybSBnZXRJdGVtKGluIHVuc2lnbmVkIGxvbmcgaW5kZXgp CiAgICAgICAgICAgICByYWlzZXMoRE9NRXhjZXB0aW9uKTsKLSAgICAgICAgW0N1c3RvbV0gU1ZH VHJhbnNmb3JtIGluc2VydEl0ZW1CZWZvcmUoaW4gU1ZHVHJhbnNmb3JtIGl0ZW0sIGluIHVuc2ln bmVkIGxvbmcgaW5kZXgpCisgICAgICAgIFtKU0NDdXN0b21dIFNWR1RyYW5zZm9ybSBpbnNlcnRJ dGVtQmVmb3JlKGluIFNWR1RyYW5zZm9ybSBpdGVtLCBpbiB1bnNpZ25lZCBsb25nIGluZGV4KQog ICAgICAgICAgICAgcmFpc2VzKERPTUV4Y2VwdGlvbiwgU1ZHRXhjZXB0aW9uKTsKLSAgICAgICAg W0N1c3RvbV0gU1ZHVHJhbnNmb3JtIHJlcGxhY2VJdGVtKGluIFNWR1RyYW5zZm9ybSBpdGVtLCBp biB1bnNpZ25lZCBsb25nIGluZGV4KQorICAgICAgICBbSlNDQ3VzdG9tXSBTVkdUcmFuc2Zvcm0g cmVwbGFjZUl0ZW0oaW4gU1ZHVHJhbnNmb3JtIGl0ZW0sIGluIHVuc2lnbmVkIGxvbmcgaW5kZXgp CiAgICAgICAgICAgICByYWlzZXMoRE9NRXhjZXB0aW9uLCBTVkdFeGNlcHRpb24pOwotICAgICAg ICBbQ3VzdG9tXSBTVkdUcmFuc2Zvcm0gcmVtb3ZlSXRlbShpbiB1bnNpZ25lZCBsb25nIGluZGV4 KQorICAgICAgICBbSlNDQ3VzdG9tXSBTVkdUcmFuc2Zvcm0gcmVtb3ZlSXRlbShpbiB1bnNpZ25l ZCBsb25nIGluZGV4KQogICAgICAgICAgICAgcmFpc2VzKERPTUV4Y2VwdGlvbik7Ci0gICAgICAg IFtDdXN0b21dIFNWR1RyYW5zZm9ybSBhcHBlbmRJdGVtKGluIFNWR1RyYW5zZm9ybSBpdGVtKQor ICAgICAgICBbSlNDQ3VzdG9tXSBTVkdUcmFuc2Zvcm0gYXBwZW5kSXRlbShpbiBTVkdUcmFuc2Zv cm0gaXRlbSkKICAgICAgICAgICAgIHJhaXNlcyhET01FeGNlcHRpb24sIFNWR0V4Y2VwdGlvbik7 CiAgICAgICAgIFNWR1RyYW5zZm9ybSBjcmVhdGVTVkdUcmFuc2Zvcm1Gcm9tTWF0cml4KGluIFNW R01hdHJpeCBtYXRyaXgpOwogICAgICAgICBTVkdUcmFuc2Zvcm0gY29uc29saWRhdGUoKTsK