75531 2012-01-04 01:54:52 -0800 The cpp parser of prepare-ChangeLog cannot detect a change in classes and namespaces 2012-01-24 13:27:38 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 73531 1 haraken haraken darin ddkilzer rniwa tony webkit.review.bot oldest_to_newest 529422 0 haraken 2012-01-04 01:54:52 -0800 The cpp parser of prepare-ChangeLog cannot detect a change outside methods, like this: namespace N { int a; // this change does not appear on ChangeLog. class C { int b; // this change does not appear on ChangeLog. void f() { int c; // this change appears on ChangeLog. } int d; // this change does not appear on ChangeLog. }; int e; // this change does not appear on ChangeLog. }; Current ChangeLog: (N::C::f): Expected ChangeLog: (N): (N::C): (N::C::f): 529424 1 121087 haraken 2012-01-04 02:04:55 -0800 Created attachment 121087 Patch 529596 2 121087 rniwa 2012-01-04 10:22:34 -0800 Comment on attachment 121087 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121087&action=review > Tools/ChangeLog:29 > + (N): Do we really want that? This will increase the number of lines in each change log ebtry considerably. 529610 3 tony 2012-01-04 10:55:04 -0800 (In reply to comment #2) > (From update of attachment 121087 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=121087&action=review > > > Tools/ChangeLog:29 > > + (N): > > Do we really want that? This will increase the number of lines in each change log entry considerably. My understanding from reading the bug description was that (N): would only be added if you added something to the namespace itself (in the bug description, this would be 'int a;'). 529817 4 haraken 2012-01-04 15:19:59 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 121087 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=121087&action=review > > > > > Tools/ChangeLog:29 > > > + (N): > > > > Do we really want that? This will increase the number of lines in each change log entry considerably. > > My understanding from reading the bug description was that (N): would only be added if you added something to the namespace itself (in the bug description, this would be 'int a;'). Right. The line appears only when you add something to the class or namespace. - Python and Java have been also outputing "(N):". - I've sometimes felt inconvenient because prepare-ChangeLog outputs nothing when I added variables to classes. 531714 5 121087 ddkilzer 2012-01-07 22:03:20 -0800 Comment on attachment 121087 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121087&action=review r=me, but please look into the duplicate namespace entry issue. > Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests-expected.txt:311 > + [ > + '299', > + '300', > + 'NameSpace6' > + ], > + [ > + '302', > + '303', > + 'NameSpace5' > ] These NameSpace* entries seem to be duplicate/bogus (as are some other new NameSpace* entries. This doesn't seem to affect the output in the ChangeLog entry (since the duplicate entries are apparently removed), but it seems like something that should be cleaned up if it's easy to do. 531760 6 121087 haraken 2012-01-08 08:35:31 -0800 Comment on attachment 121087 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=121087&action=review >> Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests-expected.txt:311 >> ] > > These NameSpace* entries seem to be duplicate/bogus (as are some other new NameSpace* entries. This doesn't seem to affect the output in the ChangeLog entry (since the duplicate entries are apparently removed), but it seems like something that should be cleaned up if it's easy to do. ddkilzer: Duplicated ChangeLog entries are removed from the output of prepare-ChangeLog, but the duplication in the output of get_function_line_ranges_for_XXXX() is needed. In case of NameSpace5, we need to somehow tell prepare-ChangeLog that the ranges of NameSpace5 are [283, 284] _and_ [302, 303]. (If a modification happens at line 203 but we just tell prepare-ChangeLog that the range of NameSpace5 is [183, 184], then prepare-ChangeLog would output nothing for NameSpace5.) 541566 7 ddkilzer 2012-01-24 12:39:28 -0800 (In reply to comment #6) > (From update of attachment 121087 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=121087&action=review > > >> Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/resources/cpp_unittests-expected.txt:311 > >> ] > > > > These NameSpace* entries seem to be duplicate/bogus (as are some other new NameSpace* entries. This doesn't seem to affect the output in the ChangeLog entry (since the duplicate entries are apparently removed), but it seems like something that should be cleaned up if it's easy to do. > > ddkilzer: Duplicated ChangeLog entries are removed from the output of prepare-ChangeLog, but the duplication in the output of get_function_line_ranges_for_XXXX() is needed. In case of NameSpace5, we need to somehow tell prepare-ChangeLog that the ranges of NameSpace5 are [283, 284] _and_ [302, 303]. (If a modification happens at line 203 but we just tell prepare-ChangeLog that the range of NameSpace5 is [183, 184], then prepare-ChangeLog would output nothing for NameSpace5.) Okay, thanks for the explanation! 541618 8 121087 webkit.review.bot 2012-01-24 13:27:34 -0800 Comment on attachment 121087 Patch Clearing flags on attachment: 121087 Committed r105797: <http://trac.webkit.org/changeset/105797> 541619 9 webkit.review.bot 2012-01-24 13:27:38 -0800 All reviewed patches have been landed. Closing bug. 121087 2012-01-04 02:04:55 -0800 2012-01-24 13:27:34 -0800 Patch bug-75531-20120104190454.patch text/plain 9133 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTAzOTM3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2Y3ZjYzNjc1MWUyNmU0MjkwOWE3OGY0ZDNhMTU1MTQ5 YjNiMjc1ZC4uYzEzNGU4MzRmZWMwN2NmODBkMjM1M2JjZGRjZTY0ZjUzYTcyM2JmMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUy IEBACisyMDEyLTAxLTA0ICBLZW50YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBUaGUgY3BwIHBhcnNlciBvZiBwcmVwYXJlLUNoYW5nZUxvZyBjYW5ub3QgZGV0ZWN0 IGEgY2hhbmdlIGluIGNsYXNzZXMgYW5kIG5hbWVzcGFjZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1NTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUHJldmlvdXNseSwgdGhlIGNwcCBwYXJzZXIgb2Yg cHJlcGFyZS1DaGFuZ2VMb2cgY291bGQgbm90IGRldGVjdCBhIGNoYW5nZQorICAgICAgICBvdXRz aWRlIG1ldGhvZHMuIENvbnNpZGVyIHRoZSBmb2xsb3dpbmcgY3BwIGZpbGUuCisKKyAgICAgICAg ICAgIG5hbWVzcGFjZSBOIHsKKyAgICAgICAgICAgIGludCBhOyAgICAgLy8gdGhpcyBjaGFuZ2Ug ZG9lcyBub3QgYXBwZWFyIG9uIENoYW5nZUxvZy4KKyAgICAgICAgICAgIGNsYXNzIEMgeworICAg ICAgICAgICAgICAgIGludCBiOyAgICAgLy8gdGhpcyBjaGFuZ2UgZG9lcyBub3QgYXBwZWFyIG9u IENoYW5nZUxvZy4KKyAgICAgICAgICAgICAgICB2b2lkIGYoKQorICAgICAgICAgICAgICAgIHsK KyAgICAgICAgICAgICAgICAgICAgaW50IGM7ICAgICAvLyB0aGlzIGNoYW5nZSBhcHBlYXJzIG9u IENoYW5nZUxvZy4KKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgaW50IGQ7ICAg ICAvLyB0aGlzIGNoYW5nZSBkb2VzIG5vdCBhcHBlYXIgb24gQ2hhbmdlTG9nLgorICAgICAgICAg ICAgfTsKKyAgICAgICAgICAgIGludCBlOyAgICAgLy8gdGhpcyBjaGFuZ2UgZG9lcyBub3QgYXBw ZWFyIG9uIENoYW5nZUxvZy4KKyAgICAgICAgICAgIH07CisKKyAgICAgICAgVGhlIHByZXZpb3Vz IHByZXBhcmUtQ2hhbmdlTG9nIG91dHB1dHMganVzdCBtZXRob2RzIGluIHdoaWNoIGEgY2hhbmdl IGlzIGZvdW5kOgorICAgICAgICAgICAgKE46OkM6OmYpOgorCisgICAgICAgIFRoaXMgcGF0Y2gg Zml4ZXMgcHJlcGFyZS1DaGFuZ2VMb2cgc28gdGhhdCBpdCBvdXRwdXRzIG5hbWVzcGFjZXMsIGNs YXNzZXMKKyAgICAgICAgYW5kIG1ldGhvZHMgaW4gd2hpY2ggYSBjaGFuZ2UgaXMgZm91bmQ6Cisg ICAgICAgICAgICAoTik6CisgICAgICAgICAgICAoTjo6Qyk6CisgICAgICAgICAgICAoTjo6Qzo6 Zik6CisKKyAgICAgICAgKiBTY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nOgorICAgICAgICAoZ2V0 X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9jcHApOiBNb2RpZmllZCBhcyBkZXNjcmliZWQgYWJv dmUuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHBlcmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5p dHRlc3QvcmVzb3VyY2VzL2NwcF91bml0dGVzdHMuY3BwOiBBZGRlZCB0ZXN0IGNhc2VzLgorICAg ICAgICAoQ2xhc3MxMDQpOgorICAgICAgICAoQ2xhc3MxMDUpOgorICAgICAgICAoQ2xhc3MxMDYp OgorICAgICAgICAoQ2xhc3MxMDY6OmZ1bmMzMik6CisgICAgICAgIChDbGFzczEwNjo6ZnVuYzMz KToKKyAgICAgICAgKE5hbWVTcGFjZTMpOgorICAgICAgICAoTmFtZVNwYWNlNCk6CisgICAgICAg IChOYW1lU3BhY2U1KToKKyAgICAgICAgKE5hbWVTcGFjZTYpOgorICAgICAgICAoQ2xhc3MxMDcp OgorICAgICAgICAoTmFtZVNwYWNlNTo6TmFtZVNwYWNlNjo6Q2xhc3MxMDc6OmZ1bmMzNCk6Cisg ICAgICAgICogU2NyaXB0cy93ZWJraXRwZXJsL3ByZXBhcmUtQ2hhbmdlTG9nX3VuaXR0ZXN0L3Jl c291cmNlcy9jcHBfdW5pdHRlc3RzLWV4cGVjdGVkLnR4dDoKKwogMjAxMi0wMS0wMyAgVG9yIEFy bmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBD bGVhbiB1cCBkZXRlY3Rpb24gb2YgZm9udGNvbmZpZwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy9wcmVwYXJlLUNoYW5nZUxvZyBiL1Rvb2xzL1NjcmlwdHMvcHJlcGFyZS1DaGFuZ2VMb2cKaW5k ZXggNzEzNmZkZmQ0NDRmODdjMzdjNTRmNDBjNzE4NzkzNmZkZWMzODllNi4uMDJlZWJjZTMzOGMx MWU0ODdkNDBjYzUxNmNjYjc0MDAxNTliYjZlMyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9w cmVwYXJlLUNoYW5nZUxvZworKysgYi9Ub29scy9TY3JpcHRzL3ByZXBhcmUtQ2hhbmdlTG9nCkBA IC02MjAsNiArNjIwLDcgQEAgc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19mb3JfY3BwKCQk KQogICAgIG15ICRpbl9icmFjZXMgPSAwOwogICAgIG15ICRicmFjZV9zdGFydCA9IDA7CiAgICAg bXkgJGJyYWNlX2VuZCA9IDA7CisgICAgbXkgJG5hbWVzcGFjZV9zdGFydCA9IC0xOwogICAgIG15 ICRza2lwX3RpbF9icmFjZV9vcl9zZW1pY29sb24gPSAwOwogCiAgICAgbXkgJHdvcmQgPSAiIjsK QEAgLTY5NSwxMSArNjk2LDExIEBAIHN1YiBnZXRfZnVuY3Rpb25fbGluZV9yYW5nZXNfZm9yX2Nw cCgkJCkKICAgICAgICAgICAgICAgfSBlbHNpZiAoL3svKSB7CiAgICAgICAgICAgICAgICAgICBt eSAkc2VsZWN0b3IgPSBtZXRob2RfZGVjbF90b19zZWxlY3RvciAoJHBvdGVudGlhbF9tZXRob2Rf c3BlYyk7CiAgICAgICAgICAgICAgICAgICAkcG90ZW50aWFsX25hbWUgPSAiJHtwb3RlbnRpYWxf bWV0aG9kX2NoYXJ9XFske2ludGVyZmFjZV9uYW1lfSAke3NlbGVjdG9yfVxdIjsKLSAgICAgICAg ICAgICAgICAgIAorCiAgICAgICAgICAgICAgICAgICAkcG90ZW50aWFsX21ldGhvZF9zcGVjID0g IiI7CiAgICAgICAgICAgICAgICAgICAkcG90ZW50aWFsX21ldGhvZF9jaGFyID0gIiI7CiAgICAg ICAgICAgICAgICAgICAkaW5fbWV0aG9kX2RlY2xhcmF0aW9uID0gMDsKLSAgCisKICAgICAgICAg ICAgICAgICAgICRfID0gJG9yaWdpbmFsOwogICAgICAgICAgICAgICAgICAgcy9eW147e10qLy87 CiAgICAgICAgICAgICAgIH0gZWxzaWYgKC9cQGVuZC8pIHsKQEAgLTcxMSw3ICs3MTIsNyBAQCBz dWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zvcl9jcHAoJCQpCiAgICAgICAgICAgICAgIH0K ICAgICAgICAgfQogCi0gICAgICAgIAorCiAgICAgICAgICMgc3RhcnQgb2YgbWV0aG9kIGRlY2xh cmF0aW9uCiAgICAgICAgIGlmICgobXkgJG1ldGhvZF9jaGFyLCBteSAkbWV0aG9kX3NwZWMpID0g bSZeKFstK10pKFteMC05O11bXjtdKik7PyQmKSB7CiAgICAgICAgICAgICBteSAkb3JpZ2luYWwg PSAkXzsKQEAgLTczMSw3ICs3MzIsNyBAQCBzdWIgZ2V0X2Z1bmN0aW9uX2xpbmVfcmFuZ2VzX2Zv cl9jcHAoJCQpCiAgICAgICAgICAgICBpZiAoL1x7LykgewogICAgICAgICAgICAgICBteSAkc2Vs ZWN0b3IgPSBtZXRob2RfZGVjbF90b19zZWxlY3RvciAoJHBvdGVudGlhbF9tZXRob2Rfc3BlYyk7 CiAgICAgICAgICAgICAgICRwb3RlbnRpYWxfbmFtZSA9ICIke3BvdGVudGlhbF9tZXRob2RfY2hh cn1cWyR7aW50ZXJmYWNlX25hbWV9ICR7c2VsZWN0b3J9XF0iOwotICAgICAgICAgICAgICAKKwog ICAgICAgICAgICAgICAkcG90ZW50aWFsX21ldGhvZF9zcGVjID0gIiI7CiAgICAgICAgICAgICAg ICRwb3RlbnRpYWxfbWV0aG9kX2NoYXIgPSAiIjsKICAgICAgICAgICAgICAgJGluX21ldGhvZF9k ZWNsYXJhdGlvbiA9IDA7CkBAIC03NzcsOSArNzc4LDE1IEBAIHN1YiBnZXRfZnVuY3Rpb25fbGlu ZV9yYW5nZXNfZm9yX2NwcCgkJCkKICAgICAgICAgICAgIGlmICgkMSBlcSAieyIpIHsKICAgICAg ICAgICAgICAgICAkc2tpcF90aWxfYnJhY2Vfb3Jfc2VtaWNvbG9uID0gMDsKIAorICAgICAgICAg ICAgICAgIGlmICgkbmFtZXNwYWNlX3N0YXJ0ID49IDAgYW5kICRuYW1lc3BhY2Vfc3RhcnQgPCAk cG90ZW50aWFsX3N0YXJ0KSB7CisgICAgICAgICAgICAgICAgICAgIHB1c2ggQHJhbmdlcywgWyAk bmFtZXNwYWNlX3N0YXJ0IC4gIiIsICRwb3RlbnRpYWxfc3RhcnQgLSAxLCAkbmFtZSBdOworICAg ICAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgICAgIGlmICgkcG90ZW50aWFsX25hbWVzcGFj ZSkgewogICAgICAgICAgICAgICAgICAgICBwdXNoIEBuYW1lc3BhY2VzLCAkcG90ZW50aWFsX25h bWVzcGFjZTsKICAgICAgICAgICAgICAgICAgICAgJHBvdGVudGlhbF9uYW1lc3BhY2UgPSAiIjsK KyAgICAgICAgICAgICAgICAgICAgJG5hbWUgPSAkbmFtZXNwYWNlc1stMV07CisgICAgICAgICAg ICAgICAgICAgICRuYW1lc3BhY2Vfc3RhcnQgPSAkLiArIDE7CiAgICAgICAgICAgICAgICAgICAg IG5leHQ7CiAgICAgICAgICAgICAgICAgfQogCkBAIC04MDMsNyArODEwLDE4IEBAIHN1YiBnZXRf ZnVuY3Rpb25fbGluZV9yYW5nZXNfZm9yX2NwcCgkJCkKICAgICAgICAgICAgICMgQ2xvc2UgYnJh Y2UuCiAgICAgICAgICAgICBpZiAoJDEgZXEgIn0iKSB7CiAgICAgICAgICAgICAgICAgaWYgKCEk aW5fYnJhY2VzICYmIEBuYW1lc3BhY2VzKSB7CisgICAgICAgICAgICAgICAgICAgIGlmICgkbmFt ZXNwYWNlX3N0YXJ0ID49IDAgYW5kICRuYW1lc3BhY2Vfc3RhcnQgPCAkLikgeworICAgICAgICAg ICAgICAgICAgICAgICAgcHVzaCBAcmFuZ2VzLCBbICRuYW1lc3BhY2Vfc3RhcnQgLiAiIiwgJC4g LSAxLCAkbmFtZSBdOworICAgICAgICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICAg ICAgcG9wIEBuYW1lc3BhY2VzOworICAgICAgICAgICAgICAgICAgICBpZiAoQG5hbWVzcGFjZXMp IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICRuYW1lID0gJG5hbWVzcGFjZXNbLTFdOworICAg ICAgICAgICAgICAgICAgICAgICAgJG5hbWVzcGFjZV9zdGFydCA9ICQuICsgMTsKKyAgICAgICAg ICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICRuYW1lID0gIiI7 CisgICAgICAgICAgICAgICAgICAgICAgICAkbmFtZXNwYWNlX3N0YXJ0ID0gLTE7CisgICAgICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgbmV4dDsKICAgICAgICAgICAgICAg ICB9CiAKQEAgLTgxNCw3ICs4MzIsMTMgQEAgc3ViIGdldF9mdW5jdGlvbl9saW5lX3Jhbmdlc19m b3JfY3BwKCQkKQogICAgICAgICAgICAgICAgICMgVGhpcyBjb3VsZCBiZSBhIGZ1bmN0aW9uIGJv ZHkuCiAgICAgICAgICAgICAgICAgaWYgKCEkaW5fYnJhY2VzIGFuZCAkbmFtZSkgewogICAgICAg ICAgICAgICAgICAgICBwdXNoIEByYW5nZXMsIFsgJHN0YXJ0LCAkLiwgJG5hbWUgXTsKLSAgICAg ICAgICAgICAgICAgICAgJG5hbWUgPSAiIjsKKyAgICAgICAgICAgICAgICAgICAgaWYgKEBuYW1l c3BhY2VzKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAkbmFtZSA9ICRuYW1lc3BhY2VzWy0x XTsKKyAgICAgICAgICAgICAgICAgICAgICAgICRuYW1lc3BhY2Vfc3RhcnQgPSAkLiArIDE7Cisg ICAgICAgICAgICAgICAgICAgIH0gZWxzZSB7CisgICAgICAgICAgICAgICAgICAgICAgICAkbmFt ZSA9ICIiOworICAgICAgICAgICAgICAgICAgICAgICAgJG5hbWVzcGFjZV9zdGFydCA9IC0xOwor ICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAg ICAgJHBvdGVudGlhbF9zdGFydCA9IDA7CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtp dHBlcmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5pdHRlc3QvcmVzb3VyY2VzL2NwcF91bml0dGVzdHMt ZXhwZWN0ZWQudHh0IGIvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL3ByZXBhcmUtQ2hhbmdlTG9n X3VuaXR0ZXN0L3Jlc291cmNlcy9jcHBfdW5pdHRlc3RzLWV4cGVjdGVkLnR4dAppbmRleCBjZTU4 MzVkYTRmNjU1ZTQzZjg5YzliMTRkNGQ2ZDhhY2JjYTcwYmQ0Li4zZDQ0MGIzZGViMTliNGRjNGQw MDg0ZTFlM2QxYmJjZGJmMTNiYTNmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHBl cmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5pdHRlc3QvcmVzb3VyY2VzL2NwcF91bml0dGVzdHMtZXhw ZWN0ZWQudHh0CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cGVybC9wcmVwYXJlLUNoYW5nZUxv Z191bml0dGVzdC9yZXNvdXJjZXMvY3BwX3VuaXR0ZXN0cy1leHBlY3RlZC50eHQKQEAgLTEzNSw2 ICsxMzUsMTEgQEAKICAgICAnQ2xhc3MyOjpmdW5jMjUnCiAgIF0sCiAgIFsKKyAgICAnMTU4JywK KyAgICAnMTU5JywKKyAgICAnQ2xhc3MxJworICBdLAorICBbCiAgICAgJzE2MicsCiAgICAgJzE2 NCcsCiAgICAgJ0NsYXNzMTo6ZnVuYzI2JwpAQCAtMTc1LDYgKzE4MCwxMSBAQAogICAgICdDbGFz czEwMzo6Q2xhc3MxMDMnCiAgIF0sCiAgIFsKKyAgICAnMjA0JywKKyAgICAnMjA1JywKKyAgICAn U3RydWN0MScKKyAgXSwKKyAgWwogICAgICcyMDgnLAogICAgICcyMTAnLAogICAgICdTdHJ1Y3Qx OjpmdW5jMjknCkBAIC0xODUsMTMgKzE5NSwxMTggQEAKICAgICAnU3RydWN0Mjo6ZnVuYzMwJwog ICBdLAogICBbCisgICAgJzIxOScsCisgICAgJzIxOScsCisgICAgJ05hbWVTcGFjZTEnCisgIF0s CisgIFsKICAgICAnMjIwJywKICAgICAnMjIyJywKICAgICAnTmFtZVNwYWNlMTo6ZnVuYzMwJwog ICBdLAogICBbCisgICAgJzIyMycsCisgICAgJzIyMycsCisgICAgJ05hbWVTcGFjZTEnCisgIF0s CisgIFsKKyAgICAnMjI4JywKKyAgICAnMjI4JywKKyAgICAnTmFtZVNwYWNlMicKKyAgXSwKKyAg WwogICAgICcyMjknLAogICAgICcyMzEnLAogICAgICdOYW1lU3BhY2UxOjpOYW1lU3BhY2UyOjpm dW5jMzEnCisgIF0sCisgIFsKKyAgICAnMjMyJywKKyAgICAnMjMyJywKKyAgICAnTmFtZVNwYWNl MicKKyAgXSwKKyAgWworICAgICcyMzcnLAorICAgICcyNDAnLAorICAgICdDbGFzczEwNCcKKyAg XSwKKyAgWworICAgICcyNDQnLAorICAgICcyNDknLAorICAgICdDbGFzczEwNScKKyAgXSwKKyAg WworICAgICcyNTMnLAorICAgICcyNTQnLAorICAgICdDbGFzczEwNicKKyAgXSwKKyAgWworICAg ICcyNTUnLAorICAgICcyNTknLAorICAgICdDbGFzczEwNjo6ZnVuYzMyJworICBdLAorICBbCisg ICAgJzI2MCcsCisgICAgJzI2MScsCisgICAgJ0NsYXNzMTA2JworICBdLAorICBbCisgICAgJzI2 MicsCisgICAgJzI2NicsCisgICAgJ0NsYXNzMTA2OjpmdW5jMzMnCisgIF0sCisgIFsKKyAgICAn MjY3JywKKyAgICAnMjY4JywKKyAgICAnQ2xhc3MxMDYnCisgIF0sCisgIFsKKyAgICAnMjcyJywK KyAgICAnMjczJywKKyAgICAnTmFtZVNwYWNlMycKKyAgXSwKKyAgWworICAgICcyNzUnLAorICAg ICcyNzYnLAorICAgICdOYW1lU3BhY2U0JworICBdLAorICBbCisgICAgJzI3OCcsCisgICAgJzI3 OScsCisgICAgJ05hbWVTcGFjZTMnCisgIF0sCisgIFsKKyAgICAnMjgzJywKKyAgICAnMjg0JywK KyAgICAnTmFtZVNwYWNlNScKKyAgXSwKKyAgWworICAgICcyODYnLAorICAgICcyODcnLAorICAg ICdOYW1lU3BhY2U2JworICBdLAorICBbCisgICAgJzI4OScsCisgICAgJzI5MCcsCisgICAgJ0Ns YXNzMTA3JworICBdLAorICBbCisgICAgJzI5MScsCisgICAgJzI5NScsCisgICAgJ05hbWVTcGFj ZTU6Ok5hbWVTcGFjZTY6OkNsYXNzMTA3OjpmdW5jMzQnCisgIF0sCisgIFsKKyAgICAnMjk2JywK KyAgICAnMjk3JywKKyAgICAnQ2xhc3MxMDcnCisgIF0sCisgIFsKKyAgICAnMjk5JywKKyAgICAn MzAwJywKKyAgICAnTmFtZVNwYWNlNicKKyAgXSwKKyAgWworICAgICczMDInLAorICAgICczMDMn LAorICAgICdOYW1lU3BhY2U1JwogICBdCiBdCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dl YmtpdHBlcmwvcHJlcGFyZS1DaGFuZ2VMb2dfdW5pdHRlc3QvcmVzb3VyY2VzL2NwcF91bml0dGVz dHMuY3BwIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRwZXJsL3ByZXBhcmUtQ2hhbmdlTG9nX3VuaXR0 ZXN0L3Jlc291cmNlcy9jcHBfdW5pdHRlc3RzLmNwcAppbmRleCBiNzlmZWFhN2QyODUxYjVlZTli YWFlYWJmNjQ0MDBjNmZhYTE3NjMyLi42MTgxYzE4OWI3YjIzMWU1ZDMxZGNmMzM3NGZhZjdiM2I5 ZmY4NTg3IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdHBlcmwvcHJlcGFyZS1DaGFu Z2VMb2dfdW5pdHRlc3QvcmVzb3VyY2VzL2NwcF91bml0dGVzdHMuY3BwCisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cGVybC9wcmVwYXJlLUNoYW5nZUxvZ191bml0dGVzdC9yZXNvdXJjZXMvY3Bw X3VuaXR0ZXN0cy5jcHAKQEAgLTIzMiwzICsyMzIsNzMgQEAgdm9pZCBmdW5jMzEoKQogCiB9CiB9 CisKK2NsYXNzIENsYXNzMTA0IHsKKyAgICBpbnQgYTsKKyAgICBpbnQgYjsKKyAgICBpbnQgYzsK KyAgICBpbnQgZDsKK307CisKK2NsYXNzIENsYXNzMTA1IHsKK3B1YmxpYzoKKyAgICBpbnQgYTsK KyAgICBpbnQgYjsKK3ByaXZhdGU6CisgICAgaW50IGM7CisgICAgaW50IGQ7Cit9OworCitjbGFz cyBDbGFzczEwNiB7CisgICAgaW50IGE7CisgICAgaW50IGI7CisgICAgdm9pZCBmdW5jMzIoKQor ICAgIHsKKyAgICAgICAgaW50IGM7CisgICAgICAgIGludCBkOworICAgIH0KKyAgICBpbnQgZTsK KyAgICBpbnQgZjsKKyAgICB2b2lkIGZ1bmMzMygpCisgICAgeworICAgICAgICBpbnQgZzsKKyAg ICAgICAgaW50IGg7CisgICAgfQorICAgIGludCBpOworICAgIGludCBqOworfTsKKworbmFtZXNw YWNlIE5hbWVTcGFjZTMgeworaW50IGE7CitpbnQgYjsKK25hbWVzcGFjZSBOYW1lU3BhY2U0IHsK K2ludCBjOworaW50IGQ7Cit9OworaW50IGU7CitpbnQgZjsKK307CisKK25hbWVzcGFjZSBOYW1l U3BhY2U1IHsKK2ludCBhOworaW50IGI7CituYW1lc3BhY2UgTmFtZVNwYWNlNiB7CitpbnQgYzsK K2ludCBkOworY2xhc3MgQ2xhc3MxMDcgeworICAgIGludCBlOworICAgIGludCBmOworICAgIHZv aWQgZnVuYzM0KCkKKyAgICB7CisgICAgICAgIGludCBnOworICAgICAgICBpbnQgaDsKKyAgICB9 CisgICAgaW50IGk7CisgICAgaW50IGo7Cit9OworaW50IGs7CitpbnQgbGw7Cit9OworaW50IG07 CitpbnQgbjsKK307Cg==