142840 2015-03-18 14:38:57 -0700 ES6 Classes: Extends should accept an expression without parenthesis 2015-03-18 20:29:07 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 140491 1 joepeck joepeck ggaren joepeck rniwa oldest_to_newest 1078308 0 joepeck 2015-03-18 14:38:57 -0700 * TEST: var namespace = {}; namespace.A = class A { constructor() { console.log("a"); } }; namespace.B = class B extends namespace.A { constructor() { super(); console.log("b"); } }; new namespace.B(); * EXPECTED Logs for "a" and "b" * ACTUAL SyntaxError: Unexpected token '.'. Expected opening '{' at the start of a class body. * NOTES - Workaround: "class B extends (namespace.A) { ... }" - Works in Chrome 43. I don't know how to test Firefox with Classes. 1078309 1 joepeck 2015-03-18 14:40:33 -0700 I'll take a quick look. The spec says AssignmentExpression and the Parser is doing a PrimaryExpression. 1078317 2 joepeck 2015-03-18 14:57:32 -0700 Actually, this is a LeftHandSideExpression, according to the latest spec: ClassHeritage[Yield] : extends LeftHandSideExpression[?Yield] 1078323 3 248972 joepeck 2015-03-18 15:21:38 -0700 Created attachment 248972 [PATCH] Proposed Fix Reference: https://people.mozilla.org/~jorendorff/es6-draft.html#sec-class-definitions 1078324 4 248972 joepeck 2015-03-18 15:22:38 -0700 Comment on attachment 248972 [PATCH] Proposed Fix Oops, I forgot to include expected results. 1078325 5 248973 joepeck 2015-03-18 15:24:36 -0700 Created attachment 248973 [PATCH] Proposed Fix 1078340 6 248973 rniwa 2015-03-18 15:59:36 -0700 Comment on attachment 248973 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=248973&action=review > LayoutTests/js/script-tests/class-syntax-extends.js:42 > +shouldThrow('x = 1; c = class extends ++x { };'); Could you add an empty constructor here and the rest of test cases so that this test doesn't depend on the support for default constructor? 1078435 7 joepeck 2015-03-18 20:29:00 -0700 (In reply to comment #6) > Comment on attachment 248973 [details] > [PATCH] Proposed Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=248973&action=review > > > LayoutTests/js/script-tests/class-syntax-extends.js:42 > > +shouldThrow('x = 1; c = class extends ++x { };'); > > Could you add an empty constructor here and the rest of test cases so that > this test doesn't depend on the support for default constructor? I did this for all the tests, and added a few that had the default constructor as well, to test all cases. 1078436 8 joepeck 2015-03-18 20:29:07 -0700 http://trac.webkit.org/changeset/181724 248972 2015-03-18 15:21:38 -0700 2015-03-18 15:24:36 -0700 [PATCH] Proposed Fix proposed-fix.patch text/plain 5011 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhMDRkOWUzLi4yZDIxOTM5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMDMt MTggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBFUzYg Q2xhc3NlczogRXh0ZW5kcyBzaG91bGQgYWNjZXB0IGFuIGV4cHJlc3Npb24gd2l0aG91dCBwYXJl bnRoZXNpcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQyODQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBqcy9zY3JpcHQtdGVzdHMvY2xhc3Mtc3ludGF4LWV4dGVuZHMuanM6CisgICAgICAgIEV4dGVu ZCB0aGUgdGVzdCB0byB0ZXN0IGNhc2VzIG9mIGV4dGVuZHMgd2l0aCBkaWZmZXJlbnQgdHlwZXMg b2YgZXhwcmVzc2lvbnMuCisKIDIwMTUtMDMtMTggIE1hcmNvcyBDaGF2YXJyw61hIFRlaWplaXJv ICA8Y2hhdmFycmlhMTk5MUBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBHVEsgR2Fy ZGVuaW5nIDE4dGggTWFyY2gKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2pzL3NjcmlwdC10ZXN0 cy9jbGFzcy1zeW50YXgtZXh0ZW5kcy5qcyBiL0xheW91dFRlc3RzL2pzL3NjcmlwdC10ZXN0cy9j bGFzcy1zeW50YXgtZXh0ZW5kcy5qcwppbmRleCAzOTRlNzcyLi5jNzVhMWIxIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9qcy9zY3JpcHQtdGVzdHMvY2xhc3Mtc3ludGF4LWV4dGVuZHMuanMKKysr IGIvTGF5b3V0VGVzdHMvanMvc2NyaXB0LXRlc3RzL2NsYXNzLXN5bnRheC1leHRlbmRzLmpzCkBA IC0zOSw0ICszOSwyNiBAQCBzaG91bGROb3RUaHJvdygnYmFzZVdpdGhCYWRQcm90b3R5cGUucHJv dG90eXBlID0gImFiYyInKTsKIHNob3VsZFRocm93KCd4ID0gY2xhc3MgZXh0ZW5kcyBiYXNlV2l0 aEJhZFByb3RvdHlwZSB7IGNvbnN0cnVjdG9yKCkgeyB9IH0nLCAnIlR5cGVFcnJvcjogVGhlIHN1 cGVyY2xhc3NcJ3MgcHJvdG90eXBlIGlzIG5vdCBhbiBvYmplY3QuIicpOwogc2hvdWxkTm90VGhy b3coJ2Jhc2VXaXRoQmFkUHJvdG90eXBlLnByb3RvdHlwZSA9IG51bGw7IHggPSBjbGFzcyBleHRl bmRzIGJhc2VXaXRoQmFkUHJvdG90eXBlIHsgY29uc3RydWN0b3IoKSB7IH0gfScpOwogCitzaG91 bGRUaHJvdygneCA9IDE7IGMgPSBjbGFzcyBleHRlbmRzICsreCB7IH07Jyk7CitzaG91bGRUaHJv dygneCA9IDE7IGMgPSBjbGFzcyBleHRlbmRzIHgrKyB7IH07Jyk7CitzaG91bGRUaHJvdygneCA9 IDE7IGMgPSBjbGFzcyBleHRlbmRzICgrK3gpIHsgfTsnKTsKK3Nob3VsZFRocm93KCd4ID0gMTsg YyA9IGNsYXNzIGV4dGVuZHMgKHgrKykgeyB9OycpOworc2hvdWxkQmUoJ3ggPSAxOyB0cnkgeyBj ID0gY2xhc3MgZXh0ZW5kcyAoKyt4KSB7IH0gfSBjYXRjaCAoZSkgeyB9OyB4JywgJzInKTsKK3No b3VsZEJlKCd4ID0gMTsgdHJ5IHsgYyA9IGNsYXNzIGV4dGVuZHMgKHgrKykgeyB9IH0gY2F0Y2gg KGUpIHsgfTsgeCcsICcyJyk7CisKK3Nob3VsZE5vdFRocm93KCduYW1lc3BhY2UgPSB7fTsgbmFt ZXNwYWNlLkEgPSBjbGFzcyB7IH07IG5hbWVzcGFjZS5CID0gY2xhc3MgZXh0ZW5kcyBuYW1lc3Bh Y2UuQSB7IH0nKTsKK3Nob3VsZE5vdFRocm93KCduYW1lc3BhY2UgPSB7fTsgbmFtZXNwYWNlLkEg PSBjbGFzcyBBIHsgfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBCIGV4dGVuZHMgbmFtZXNwYWNlLkEg eyB9Jyk7CitzaG91bGROb3RUaHJvdygnbmFtZXNwYWNlID0ge307IG5hbWVzcGFjZS5BID0gY2xh c3MgeyB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVuZHMgKG5hbWVzcGFjZS5BKSB7IH0nKTsK K3Nob3VsZE5vdFRocm93KCduYW1lc3BhY2UgPSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07 IG5hbWVzcGFjZS5CID0gY2xhc3MgZXh0ZW5kcyBuYW1lc3BhY2VbIkEiXSB7IH0nKTsKK3Nob3Vs ZE5vdFRocm93KCduYW1lc3BhY2UgPSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IGZ1bmN0 aW9uIGdldENsYXNzQSgpIHsgcmV0dXJuIG5hbWVzcGFjZS5BIH07IG5hbWVzcGFjZS5CID0gY2xh c3MgZXh0ZW5kcyBnZXRDbGFzc0EoKSB7IH0nKTsKK3Nob3VsZE5vdFRocm93KCduYW1lc3BhY2Ug PSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IGZ1bmN0aW9uIGdldENsYXNzKHByb3ApIHsg cmV0dXJuIG5hbWVzcGFjZVtwcm9wXSB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVuZHMgZ2V0 Q2xhc3MoIkEiKSB7IH0nKTsKK3Nob3VsZE5vdFRocm93KCduYW1lc3BhY2UgPSB7fTsgbmFtZXNw YWNlLkEgPSBjbGFzcyB7IH07IG5hbWVzcGFjZS5CID0gY2xhc3MgZXh0ZW5kcyAoZmFsc2V8fG51 bGx8fG5hbWVzcGFjZS5BKSB7IH0nKTsKK3Nob3VsZFRocm93KCduYW1lc3BhY2UgPSB7fTsgbmFt ZXNwYWNlLkEgPSBjbGFzcyB7IH07IG5hbWVzcGFjZS5CID0gY2xhc3MgZXh0ZW5kcyBmYWxzZXx8 bnVsbHx8bmFtZXNwYWNlLkEgeyB9Jyk7CitzaG91bGROb3RUaHJvdygneCA9IDE7IG5hbWVzcGFj ZSA9IHt9OyBuYW1lc3BhY2UuQSA9IGNsYXNzIHsgfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBleHRl bmRzICh4KyssIG5hbWVzcGFjZS5BKSB7IH07Jyk7CitzaG91bGRUaHJvdygneCA9IDE7IG5hbWVz cGFjZSA9IHt9OyBuYW1lc3BhY2UuQSA9IGNsYXNzIHsgfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBl eHRlbmRzIChuYW1lc3BhY2UuQSwgeCsrKSB7IH07Jyk7CitzaG91bGRUaHJvdygnbmFtZXNwYWNl ID0ge307IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVu ZHMgbmV3IG5hbWVzcGFjZS5BIHsgfScpOworc2hvdWxkVGhyb3coJ25hbWVzcGFjZSA9IHt9OyBu YW1lc3BhY2UuQSA9IGNsYXNzIHsgfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBleHRlbmRzIG5ldyBu YW1lc3BhY2UuQSgpIHsgfScpOworc2hvdWxkQmUoJ3ggPSAxOyBuYW1lc3BhY2UgPSB7fTsgbmFt ZXNwYWNlLkEgPSBjbGFzcyB7IH07IHRyeSB7IG5hbWVzcGFjZS5CID0gY2xhc3MgZXh0ZW5kcyAo eCsrLCBuYW1lc3BhY2UuQSkgeyB9IH0gY2F0Y2ggKGUpIHsgfSB4JywgJzInKTsKK3Nob3VsZEJl KCd4ID0gMTsgbmFtZXNwYWNlID0ge307IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyB0cnkgeyBu YW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVuZHMgKG5hbWVzcGFjZS5BLCB4KyspIHsgfSB9IGNhdGNo IChlKSB7IH0geCcsICcyJyk7CisKIHZhciBzdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggOTk5NWM1Ny4uNDRkMTY2ZSAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTUtMDMtMTggIEpvc2VwaCBQZWNvcmFybyAg PHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBFUzYgQ2xhc3NlczogRXh0ZW5kcyBzaG91 bGQgYWNjZXB0IGFuIGV4cHJlc3Npb24gd2l0aG91dCBwYXJlbnRoZXNpcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyODQwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwYXJzZXIvUGFyc2VyLmNwcDoK KyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlQ2xhc3MpOgorICAgICAgICAi ZXh0ZW5kcyIgYWxsb3dzIGEgTGVmdEhhbmRFeHByZXNzaW9uIChuZXcgZXhwcmVzc2lvbiAvIGNh bGwgZXhwcmVzc2lvbiwKKyAgICAgICAgd2hpY2ggaW5jbHVkZXMgYSBtZW1iZXIgZXhwcmVzc2lv biksIG5vdCBhIHByaW1hcnkgZXhwcmVzc2lvbi4gT3VyCisgICAgICAgIHBhcnNlTWVtYmVyRXhw cmVzc2lvbiBkb2VzIGFsbCBvZiB0aGVzZS4KKworMjAxNS0wMy0xOCAgSm9zZXBoIFBlY29yYXJv ICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IERlYnVnZ2Vy IFBvcG92ZXJzIGFuZCBQcm9iZXMgc2hvdWxkIHVzZSBGb3JtYXR0ZWRWYWx1ZS9PYmplY3RUcmVl VmlldyBpbnN0ZWFkIG9mIEN1c3RvbS9PYmplY3RQcm9wZXJ0aWVzU2VjdGlvbgogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQyODMwCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcAppbmRleCAyMjg4ZGVkLi42YmEzODMxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCkBAIC0xNDg1LDcgKzE0ODUsNyBA QCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVDbGFzc0V4cHJlc3Npb24gUGFyc2Vy PExleGVyVHlwZT46OnBhcnNlQ2xhc3MoVAogCiAgICAgVHJlZUV4cHJlc3Npb24gcGFyZW50Q2xh c3MgPSAwOwogICAgIGlmIChjb25zdW1lKEVYVEVORFMpKSB7Ci0gICAgICAgIHBhcmVudENsYXNz ID0gcGFyc2VQcmltYXJ5RXhwcmVzc2lvbihjb250ZXh0KTsKKyAgICAgICAgcGFyZW50Q2xhc3Mg PSBwYXJzZU1lbWJlckV4cHJlc3Npb24oY29udGV4dCk7CiAgICAgICAgIGZhaWxJZkZhbHNlKHBh cmVudENsYXNzLCAiQ2Fubm90IHBhcnNlIHRoZSBwYXJlbnQgY2xhc3MgbmFtZSIpOwogICAgIH0K ICAgICBjb25zdCBDb25zdHJ1Y3RvcktpbmQgY29uc3RydWN0b3JLaW5kID0gcGFyZW50Q2xhc3Mg PyBDb25zdHJ1Y3RvcktpbmQ6OkRlcml2ZWQgOiBDb25zdHJ1Y3RvcktpbmQ6OkJhc2U7Cg== 248973 2015-03-18 15:24:36 -0700 2015-03-18 16:09:38 -0700 [PATCH] Proposed Fix class-fix.patch text/plain 8435 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBhMDRkOWUzLi4wZWIyZDE4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTUtMDMt MTggIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKworICAgICAgICBFUzYg Q2xhc3NlczogRXh0ZW5kcyBzaG91bGQgYWNjZXB0IGFuIGV4cHJlc3Npb24gd2l0aG91dCBwYXJl bnRoZXNpcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQyODQwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBqcy9jbGFzcy1zeW50YXgtZXh0ZW5kcy1leHBlY3RlZC50eHQ6CisgICAgICAgICoganMvc2Ny aXB0LXRlc3RzL2NsYXNzLXN5bnRheC1leHRlbmRzLmpzOgorICAgICAgICBFeHRlbmQgdGhlIHRl c3QgdG8gdGVzdCBjYXNlcyBvZiBleHRlbmRzIHdpdGggZGlmZmVyZW50IHR5cGVzIG9mIGV4cHJl c3Npb25zLgorCiAyMDE1LTAzLTE4ICBNYXJjb3MgQ2hhdmFycsOtYSBUZWlqZWlybyAgPGNoYXZh cnJpYTE5OTFAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgR1RLIEdhcmRlbmluZyAx OHRoIE1hcmNoCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9qcy9jbGFzcy1zeW50YXgtZXh0ZW5k cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9qcy9jbGFzcy1zeW50YXgtZXh0ZW5kcy1leHBl Y3RlZC50eHQKaW5kZXggYzMzNmQ2MS4uOGEzY2E5MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv anMvY2xhc3Mtc3ludGF4LWV4dGVuZHMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2pz L2NsYXNzLXN5bnRheC1leHRlbmRzLWV4cGVjdGVkLnR4dApAQCAtMjUsNiArMjUsMjYgQEAgUEFT UyB4ID0gY2xhc3MgZXh0ZW5kcyBiYXNlV2l0aEJhZFByb3RvdHlwZSB7IGNvbnN0cnVjdG9yKCkg eyB9IH0gdGhyZXcgZXhjZXB0aW8KIFBBU1MgYmFzZVdpdGhCYWRQcm90b3R5cGUucHJvdG90eXBl ID0gImFiYyIgZGlkIG5vdCB0aHJvdyBleGNlcHRpb24uCiBQQVNTIHggPSBjbGFzcyBleHRlbmRz IGJhc2VXaXRoQmFkUHJvdG90eXBlIHsgY29uc3RydWN0b3IoKSB7IH0gfSB0aHJldyBleGNlcHRp b24gVHlwZUVycm9yOiBUaGUgc3VwZXJjbGFzcydzIHByb3RvdHlwZSBpcyBub3QgYW4gb2JqZWN0 Li4KIFBBU1MgYmFzZVdpdGhCYWRQcm90b3R5cGUucHJvdG90eXBlID0gbnVsbDsgeCA9IGNsYXNz IGV4dGVuZHMgYmFzZVdpdGhCYWRQcm90b3R5cGUgeyBjb25zdHJ1Y3RvcigpIHsgfSB9IGRpZCBu b3QgdGhyb3cgZXhjZXB0aW9uLgorUEFTUyB4ID0gMTsgYyA9IGNsYXNzIGV4dGVuZHMgKyt4IHsg fTsgdGhyZXcgZXhjZXB0aW9uIFN5bnRheEVycm9yOiBVbmV4cGVjdGVkIHRva2VuICcrKycuCitQ QVNTIHggPSAxOyBjID0gY2xhc3MgZXh0ZW5kcyB4KysgeyB9OyB0aHJldyBleGNlcHRpb24gU3lu dGF4RXJyb3I6IFVuZXhwZWN0ZWQgdG9rZW4gJysrJy4gRXhwZWN0ZWQgb3BlbmluZyAneycgYXQg dGhlIHN0YXJ0IG9mIGEgY2xhc3MgYm9keS4uCitQQVNTIHggPSAxOyBjID0gY2xhc3MgZXh0ZW5k cyAoKyt4KSB7IH07IHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFRoZSBzdXBlcmNsYXNzIGlz IG5vdCBhbiBvYmplY3QuLgorUEFTUyB4ID0gMTsgYyA9IGNsYXNzIGV4dGVuZHMgKHgrKykgeyB9 OyB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBUaGUgc3VwZXJjbGFzcyBpcyBub3QgYW4gb2Jq ZWN0Li4KK1BBU1MgeCA9IDE7IHRyeSB7IGMgPSBjbGFzcyBleHRlbmRzICgrK3gpIHsgfSB9IGNh dGNoIChlKSB7IH07IHggaXMgMgorUEFTUyB4ID0gMTsgdHJ5IHsgYyA9IGNsYXNzIGV4dGVuZHMg KHgrKykgeyB9IH0gY2F0Y2ggKGUpIHsgfTsgeCBpcyAyCitQQVNTIG5hbWVzcGFjZSA9IHt9OyBu YW1lc3BhY2UuQSA9IGNsYXNzIHsgfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBleHRlbmRzIG5hbWVz cGFjZS5BIHsgfSBkaWQgbm90IHRocm93IGV4Y2VwdGlvbi4KK1BBU1MgbmFtZXNwYWNlID0ge307 IG5hbWVzcGFjZS5BID0gY2xhc3MgQSB7IH07IG5hbWVzcGFjZS5CID0gY2xhc3MgQiBleHRlbmRz IG5hbWVzcGFjZS5BIHsgfSBkaWQgbm90IHRocm93IGV4Y2VwdGlvbi4KK1BBU1MgbmFtZXNwYWNl ID0ge307IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVu ZHMgKG5hbWVzcGFjZS5BKSB7IH0gZGlkIG5vdCB0aHJvdyBleGNlcHRpb24uCitQQVNTIG5hbWVz cGFjZSA9IHt9OyBuYW1lc3BhY2UuQSA9IGNsYXNzIHsgfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBl eHRlbmRzIG5hbWVzcGFjZVsiQSJdIHsgfSBkaWQgbm90IHRocm93IGV4Y2VwdGlvbi4KK1BBU1Mg bmFtZXNwYWNlID0ge307IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyBmdW5jdGlvbiBnZXRDbGFz c0EoKSB7IHJldHVybiBuYW1lc3BhY2UuQSB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVuZHMg Z2V0Q2xhc3NBKCkgeyB9IGRpZCBub3QgdGhyb3cgZXhjZXB0aW9uLgorUEFTUyBuYW1lc3BhY2Ug PSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IGZ1bmN0aW9uIGdldENsYXNzKHByb3ApIHsg cmV0dXJuIG5hbWVzcGFjZVtwcm9wXSB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVuZHMgZ2V0 Q2xhc3MoIkEiKSB7IH0gZGlkIG5vdCB0aHJvdyBleGNlcHRpb24uCitQQVNTIG5hbWVzcGFjZSA9 IHt9OyBuYW1lc3BhY2UuQSA9IGNsYXNzIHsgfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBleHRlbmRz IChmYWxzZXx8bnVsbHx8bmFtZXNwYWNlLkEpIHsgfSBkaWQgbm90IHRocm93IGV4Y2VwdGlvbi4K K1BBU1MgbmFtZXNwYWNlID0ge307IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyBuYW1lc3BhY2Uu QiA9IGNsYXNzIGV4dGVuZHMgZmFsc2V8fG51bGx8fG5hbWVzcGFjZS5BIHsgfSB0aHJldyBleGNl cHRpb24gU3ludGF4RXJyb3I6IFVuZXhwZWN0ZWQgdG9rZW4gJ3x8Jy4gRXhwZWN0ZWQgb3Blbmlu ZyAneycgYXQgdGhlIHN0YXJ0IG9mIGEgY2xhc3MgYm9keS4uCitQQVNTIHggPSAxOyBuYW1lc3Bh Y2UgPSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IG5hbWVzcGFjZS5CID0gY2xhc3MgZXh0 ZW5kcyAoeCsrLCBuYW1lc3BhY2UuQSkgeyB9OyBkaWQgbm90IHRocm93IGV4Y2VwdGlvbi4KK1BB U1MgeCA9IDE7IG5hbWVzcGFjZSA9IHt9OyBuYW1lc3BhY2UuQSA9IGNsYXNzIHsgfTsgbmFtZXNw YWNlLkIgPSBjbGFzcyBleHRlbmRzIChuYW1lc3BhY2UuQSwgeCsrKSB7IH07IHRocmV3IGV4Y2Vw dGlvbiBUeXBlRXJyb3I6IFRoZSBzdXBlcmNsYXNzIGlzIG5vdCBhbiBvYmplY3QuLgorUEFTUyBu YW1lc3BhY2UgPSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IG5hbWVzcGFjZS5CID0gY2xh c3MgZXh0ZW5kcyBuZXcgbmFtZXNwYWNlLkEgeyB9IHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6 IFRoZSBzdXBlcmNsYXNzJ3MgcHJvdG90eXBlIGlzIG5vdCBhbiBvYmplY3QuLgorUEFTUyBuYW1l c3BhY2UgPSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IG5hbWVzcGFjZS5CID0gY2xhc3Mg ZXh0ZW5kcyBuZXcgbmFtZXNwYWNlLkEoKSB7IH0gdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjog VGhlIHN1cGVyY2xhc3MncyBwcm90b3R5cGUgaXMgbm90IGFuIG9iamVjdC4uCitQQVNTIHggPSAx OyBuYW1lc3BhY2UgPSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IHRyeSB7IG5hbWVzcGFj ZS5CID0gY2xhc3MgZXh0ZW5kcyAoeCsrLCBuYW1lc3BhY2UuQSkgeyB9IH0gY2F0Y2ggKGUpIHsg fSB4IGlzIDIKK1BBU1MgeCA9IDE7IG5hbWVzcGFjZSA9IHt9OyBuYW1lc3BhY2UuQSA9IGNsYXNz IHsgfTsgdHJ5IHsgbmFtZXNwYWNlLkIgPSBjbGFzcyBleHRlbmRzIChuYW1lc3BhY2UuQSwgeCsr KSB7IH0gfSBjYXRjaCAoZSkgeyB9IHggaXMgMgogUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMg dHJ1ZQogCiBURVNUIENPTVBMRVRFCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9qcy9zY3JpcHQt dGVzdHMvY2xhc3Mtc3ludGF4LWV4dGVuZHMuanMgYi9MYXlvdXRUZXN0cy9qcy9zY3JpcHQtdGVz dHMvY2xhc3Mtc3ludGF4LWV4dGVuZHMuanMKaW5kZXggMzk0ZTc3Mi4uYzc1YTFiMSAxMDA2NDQK LS0tIGEvTGF5b3V0VGVzdHMvanMvc2NyaXB0LXRlc3RzL2NsYXNzLXN5bnRheC1leHRlbmRzLmpz CisrKyBiL0xheW91dFRlc3RzL2pzL3NjcmlwdC10ZXN0cy9jbGFzcy1zeW50YXgtZXh0ZW5kcy5q cwpAQCAtMzksNCArMzksMjYgQEAgc2hvdWxkTm90VGhyb3coJ2Jhc2VXaXRoQmFkUHJvdG90eXBl LnByb3RvdHlwZSA9ICJhYmMiJyk7CiBzaG91bGRUaHJvdygneCA9IGNsYXNzIGV4dGVuZHMgYmFz ZVdpdGhCYWRQcm90b3R5cGUgeyBjb25zdHJ1Y3RvcigpIHsgfSB9JywgJyJUeXBlRXJyb3I6IFRo ZSBzdXBlcmNsYXNzXCdzIHByb3RvdHlwZSBpcyBub3QgYW4gb2JqZWN0LiInKTsKIHNob3VsZE5v dFRocm93KCdiYXNlV2l0aEJhZFByb3RvdHlwZS5wcm90b3R5cGUgPSBudWxsOyB4ID0gY2xhc3Mg ZXh0ZW5kcyBiYXNlV2l0aEJhZFByb3RvdHlwZSB7IGNvbnN0cnVjdG9yKCkgeyB9IH0nKTsKIAor c2hvdWxkVGhyb3coJ3ggPSAxOyBjID0gY2xhc3MgZXh0ZW5kcyArK3ggeyB9OycpOworc2hvdWxk VGhyb3coJ3ggPSAxOyBjID0gY2xhc3MgZXh0ZW5kcyB4KysgeyB9OycpOworc2hvdWxkVGhyb3co J3ggPSAxOyBjID0gY2xhc3MgZXh0ZW5kcyAoKyt4KSB7IH07Jyk7CitzaG91bGRUaHJvdygneCA9 IDE7IGMgPSBjbGFzcyBleHRlbmRzICh4KyspIHsgfTsnKTsKK3Nob3VsZEJlKCd4ID0gMTsgdHJ5 IHsgYyA9IGNsYXNzIGV4dGVuZHMgKCsreCkgeyB9IH0gY2F0Y2ggKGUpIHsgfTsgeCcsICcyJyk7 CitzaG91bGRCZSgneCA9IDE7IHRyeSB7IGMgPSBjbGFzcyBleHRlbmRzICh4KyspIHsgfSB9IGNh dGNoIChlKSB7IH07IHgnLCAnMicpOworCitzaG91bGROb3RUaHJvdygnbmFtZXNwYWNlID0ge307 IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVuZHMgbmFt ZXNwYWNlLkEgeyB9Jyk7CitzaG91bGROb3RUaHJvdygnbmFtZXNwYWNlID0ge307IG5hbWVzcGFj ZS5BID0gY2xhc3MgQSB7IH07IG5hbWVzcGFjZS5CID0gY2xhc3MgQiBleHRlbmRzIG5hbWVzcGFj ZS5BIHsgfScpOworc2hvdWxkTm90VGhyb3coJ25hbWVzcGFjZSA9IHt9OyBuYW1lc3BhY2UuQSA9 IGNsYXNzIHsgfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBleHRlbmRzIChuYW1lc3BhY2UuQSkgeyB9 Jyk7CitzaG91bGROb3RUaHJvdygnbmFtZXNwYWNlID0ge307IG5hbWVzcGFjZS5BID0gY2xhc3Mg eyB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVuZHMgbmFtZXNwYWNlWyJBIl0geyB9Jyk7Citz aG91bGROb3RUaHJvdygnbmFtZXNwYWNlID0ge307IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyBm dW5jdGlvbiBnZXRDbGFzc0EoKSB7IHJldHVybiBuYW1lc3BhY2UuQSB9OyBuYW1lc3BhY2UuQiA9 IGNsYXNzIGV4dGVuZHMgZ2V0Q2xhc3NBKCkgeyB9Jyk7CitzaG91bGROb3RUaHJvdygnbmFtZXNw YWNlID0ge307IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyBmdW5jdGlvbiBnZXRDbGFzcyhwcm9w KSB7IHJldHVybiBuYW1lc3BhY2VbcHJvcF0gfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBleHRlbmRz IGdldENsYXNzKCJBIikgeyB9Jyk7CitzaG91bGROb3RUaHJvdygnbmFtZXNwYWNlID0ge307IG5h bWVzcGFjZS5BID0gY2xhc3MgeyB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVuZHMgKGZhbHNl fHxudWxsfHxuYW1lc3BhY2UuQSkgeyB9Jyk7CitzaG91bGRUaHJvdygnbmFtZXNwYWNlID0ge307 IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVuZHMgZmFs c2V8fG51bGx8fG5hbWVzcGFjZS5BIHsgfScpOworc2hvdWxkTm90VGhyb3coJ3ggPSAxOyBuYW1l c3BhY2UgPSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IG5hbWVzcGFjZS5CID0gY2xhc3Mg ZXh0ZW5kcyAoeCsrLCBuYW1lc3BhY2UuQSkgeyB9OycpOworc2hvdWxkVGhyb3coJ3ggPSAxOyBu YW1lc3BhY2UgPSB7fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IG5hbWVzcGFjZS5CID0gY2xh c3MgZXh0ZW5kcyAobmFtZXNwYWNlLkEsIHgrKykgeyB9OycpOworc2hvdWxkVGhyb3coJ25hbWVz cGFjZSA9IHt9OyBuYW1lc3BhY2UuQSA9IGNsYXNzIHsgfTsgbmFtZXNwYWNlLkIgPSBjbGFzcyBl eHRlbmRzIG5ldyBuYW1lc3BhY2UuQSB7IH0nKTsKK3Nob3VsZFRocm93KCduYW1lc3BhY2UgPSB7 fTsgbmFtZXNwYWNlLkEgPSBjbGFzcyB7IH07IG5hbWVzcGFjZS5CID0gY2xhc3MgZXh0ZW5kcyBu ZXcgbmFtZXNwYWNlLkEoKSB7IH0nKTsKK3Nob3VsZEJlKCd4ID0gMTsgbmFtZXNwYWNlID0ge307 IG5hbWVzcGFjZS5BID0gY2xhc3MgeyB9OyB0cnkgeyBuYW1lc3BhY2UuQiA9IGNsYXNzIGV4dGVu ZHMgKHgrKywgbmFtZXNwYWNlLkEpIHsgfSB9IGNhdGNoIChlKSB7IH0geCcsICcyJyk7CitzaG91 bGRCZSgneCA9IDE7IG5hbWVzcGFjZSA9IHt9OyBuYW1lc3BhY2UuQSA9IGNsYXNzIHsgfTsgdHJ5 IHsgbmFtZXNwYWNlLkIgPSBjbGFzcyBleHRlbmRzIChuYW1lc3BhY2UuQSwgeCsrKSB7IH0gfSBj YXRjaCAoZSkgeyB9IHgnLCAnMicpOworCiB2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDk5OTVjNTcuLjQ0ZDE2NmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDE1LTAzLTE4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgRVM2IENsYXNzZXM6IEV4dGVuZHMg c2hvdWxkIGFjY2VwdCBhbiBleHByZXNzaW9uIHdpdGhvdXQgcGFyZW50aGVzaXMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0Mjg0MAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGFyc2VyL1BhcnNlci5j cHA6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZUNsYXNzKToKKyAgICAg ICAgImV4dGVuZHMiIGFsbG93cyBhIExlZnRIYW5kRXhwcmVzc2lvbiAobmV3IGV4cHJlc3Npb24g LyBjYWxsIGV4cHJlc3Npb24sCisgICAgICAgIHdoaWNoIGluY2x1ZGVzIGEgbWVtYmVyIGV4cHJl c3Npb24pLCBub3QgYSBwcmltYXJ5IGV4cHJlc3Npb24uIE91cgorICAgICAgICBwYXJzZU1lbWJl ckV4cHJlc3Npb24gZG9lcyBhbGwgb2YgdGhlc2UuCisKKzIwMTUtMDMtMTggIEpvc2VwaCBQZWNv cmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEZWJ1 Z2dlciBQb3BvdmVycyBhbmQgUHJvYmVzIHNob3VsZCB1c2UgRm9ybWF0dGVkVmFsdWUvT2JqZWN0 VHJlZVZpZXcgaW5zdGVhZCBvZiBDdXN0b20vT2JqZWN0UHJvcGVydGllc1NlY3Rpb24KICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjgzMAogCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKaW5kZXggMjI4OGRlZC4uNmJhMzgzMSAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcApAQCAtMTQ4NSw3ICsxNDg1 LDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVlQ2xhc3NFeHByZXNzaW9uIFBh cnNlcjxMZXhlclR5cGU+OjpwYXJzZUNsYXNzKFQKIAogICAgIFRyZWVFeHByZXNzaW9uIHBhcmVu dENsYXNzID0gMDsKICAgICBpZiAoY29uc3VtZShFWFRFTkRTKSkgewotICAgICAgICBwYXJlbnRD bGFzcyA9IHBhcnNlUHJpbWFyeUV4cHJlc3Npb24oY29udGV4dCk7CisgICAgICAgIHBhcmVudENs YXNzID0gcGFyc2VNZW1iZXJFeHByZXNzaW9uKGNvbnRleHQpOwogICAgICAgICBmYWlsSWZGYWxz ZShwYXJlbnRDbGFzcywgIkNhbm5vdCBwYXJzZSB0aGUgcGFyZW50IGNsYXNzIG5hbWUiKTsKICAg ICB9CiAgICAgY29uc3QgQ29uc3RydWN0b3JLaW5kIGNvbnN0cnVjdG9yS2luZCA9IHBhcmVudENs YXNzID8gQ29uc3RydWN0b3JLaW5kOjpEZXJpdmVkIDogQ29uc3RydWN0b3JLaW5kOjpCYXNlOwo=