From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#69684: Functionality of Fbare_symbol has been lost. Date: Mon, 11 Mar 2024 00:38:39 -0700 Organization: UCLA Computer Science Department Message-ID: <36c94f0a-3a1a-407d-9cef-40a5e8cc35af@cs.ucla.edu> References: <86r0giwrw9.fsf@gnu.org> <867ciawetg.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------xamcxm4ThUiyTfB0kKoaitwD" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20299"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird Cc: 69684@debbugs.gnu.org To: Eli Zaretskii , Alan Mackenzie Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Mar 11 08:40:05 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rjaGS-00052s-SI for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 11 Mar 2024 08:40:05 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rjaFy-0006G7-TP; Mon, 11 Mar 2024 03:39:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rjaFu-0006Fr-1Y for bug-gnu-emacs@gnu.org; Mon, 11 Mar 2024 03:39:31 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rjaFs-0005Xy-V0 for bug-gnu-emacs@gnu.org; Mon, 11 Mar 2024 03:39:29 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rjaGQ-00051Z-8s for bug-gnu-emacs@gnu.org; Mon, 11 Mar 2024 03:40:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Mar 2024 07:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69684 X-GNU-PR-Package: emacs Original-Received: via spool by 69684-submit@debbugs.gnu.org id=B69684.171014276419266 (code B ref 69684); Mon, 11 Mar 2024 07:40:02 +0000 Original-Received: (at 69684) by debbugs.gnu.org; 11 Mar 2024 07:39:24 +0000 Original-Received: from localhost ([127.0.0.1]:38583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjaFn-00050e-4a for submit@debbugs.gnu.org; Mon, 11 Mar 2024 03:39:23 -0400 Original-Received: from mail.cs.ucla.edu ([131.179.128.66]:35810) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rjaFk-00050Q-ML for 69684@debbugs.gnu.org; Mon, 11 Mar 2024 03:39:21 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 58CD93C00E409; Mon, 11 Mar 2024 00:38:41 -0700 (PDT) Original-Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10032) with ESMTP id qaRF8ziryClV; Mon, 11 Mar 2024 00:38:40 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by mail.cs.ucla.edu (Postfix) with ESMTP id 9C6DC3C00E40A; Mon, 11 Mar 2024 00:38:40 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.cs.ucla.edu 9C6DC3C00E40A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.ucla.edu; s=9D0B346E-2AEB-11ED-9476-E14B719DCE6C; t=1710142720; bh=sZgchyjbV49kjTFcxnHfkWLrAuIIdU1PBr9H1n754LY=; h=Message-ID:Date:MIME-Version:To:From; b=UsjQLzDMSXqoU1cqSD5FF64YqT1h5vgIuhFK2F5MxaF5yeb9IgOg91BC2A8XdGgT2 Ty7JEz/4jDCmLnImBk5A3NpncdDMsUUp/8UC41Jo0I942GwQksd8MsOvwuvJea4S8G S1IKfuJemvrlDpa13sUXN8JDHtt0Pl5ck/iZN5iFlh5evtwaKXMPF30xgLFZKCUVqm mXOklTgxfsTbTkDEeUGS0icLJpF+bwEfrPuDrIUHJ56lO1rfAU0cmvkGfer1QmSySd vQYkPbsHoV33fpFnuqXW1NNh+f3W+w6MIkiaWli9MJoptRKlTpwGf5jl8dAZ2ERvle cwQ+tdppxVi7g== X-Virus-Scanned: amavis at mail.cs.ucla.edu Original-Received: from mail.cs.ucla.edu ([127.0.0.1]) by localhost (mail.cs.ucla.edu [127.0.0.1]) (amavis, port 10026) with ESMTP id 5NjJ7GfGuBNe; Mon, 11 Mar 2024 00:38:40 -0700 (PDT) Original-Received: from [192.168.254.12] (unknown [47.148.192.211]) by mail.cs.ucla.edu (Postfix) with ESMTPSA id 73BE93C00E409; Mon, 11 Mar 2024 00:38:40 -0700 (PDT) Content-Language: en-US In-Reply-To: <867ciawetg.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:281456 Archived-At: This is a multi-part message in MIME format. --------------xamcxm4ThUiyTfB0kKoaitwD Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2024-03-10 03:39, Eli Zaretskii wrote: > OK, so let's wait for Paul to chime in. The problem was that I mistakenly believed the documentation when it said that a symbol with position behaves like its bare symbol when symbols-with-position-enabled is t. Unfortunately it appears that this part of the doc wasn't intended to apply to bare-symbol, so when I fixed something else involving bare-symbol I got the semantics wrong. As penance I installed the attached, which makes a simple code change along the lines that you suggested and adds a regression test to help prevent this bug from happening again. The hardest part of writing this patch was adjusting the documentation to match what I think was the intent of the behavior. Alan, if you find mistakes in that please let me know. A couple of other things. Currently (position-symbol 'x -1) creates a symbol with position where the position is negative; is that intended? The documentation says positions are nonnegative. Also, more test cases of the symbols with position primitives would not go amiss. I'm not a good person to write them, though, as I easily get confused by symbols with position. --------------xamcxm4ThUiyTfB0kKoaitwD Content-Type: text/x-patch; charset=UTF-8; name="0001-Change-bare-symbol-back-to-match-intent.patch" Content-Disposition: attachment; filename="0001-Change-bare-symbol-back-to-match-intent.patch" Content-Transfer-Encoding: base64 RnJvbSAyZDYxZWJiNTA1OTc3YWY0ZjlmZDkwZjkyYTc3NjU5OWE3M2Y4NTAxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEVnZ2VydCA8ZWdnZXJ0QGNzLnVjbGEuZWR1 PgpEYXRlOiBNb24sIDExIE1hciAyMDI0IDAwOjAzOjM5IC0wNzAwClN1YmplY3Q6IFtQQVRD SF0gQ2hhbmdlIGJhcmUtc3ltYm9sIGJhY2sgdG8gbWF0Y2ggaW50ZW50CgpBbHNvLCBhdHRl bXB0IHRvIGRvY3VtZW50IHRoZSBpbnRlbnQgYmV0dGVyLgpQcm9ibGVtIHJlcG9ydGVkIGJ5 IEFsYW4gTWFja2VuemllIChCdWcjNjk2ODQpLgoqIHNyYy9kYXRhLmMgKEZiYXJlX3N5bWJv bCk6IERvIG5vdCBzaWduYWwgaWYgdGhlIFNZTSBpcyBhIHN5bWJvbAp3aXRoIHBvc2l0aW9u IGFuZCBzeW1ib2xzLXdpdGgtcG9zLWVuYWJsZWQgaXMgbmlsLiAgSW5zdGVhZCwKaWdub3Jl IHN5bWJvbHMtd2l0aC1wb3MtZW5hYmxlZCwgYXMgdGhhdCB3YXMgdGhlIGludGVudC4KKiB0 ZXN0L3NyYy9kYXRhLXRlc3RzLmVsIChkYXRhLXRlc3RzLWJhcmUtc3ltYm9sKToKTmV3IHRl c3QsIHRvIGhlbHAgcHJldmVudCB0aGlzIGJ1ZyBmcm9tIHJlb2NjdXJyaW5nLgotLS0KIGRv Yy9saXNwcmVmL29iamVjdHMudGV4aSB8ICA2ICsrLS0KIGRvYy9saXNwcmVmL3N5bWJvbHMu dGV4aSB8IDc4ICsrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0KIHNy Yy9kYXRhLmMgICAgICAgICAgICAgICB8IDM1ICsrKysrKysrKysrLS0tLS0tLQogdGVzdC9z cmMvZGF0YS10ZXN0cy5lbCAgIHwgIDUgKysrCiA0IGZpbGVzIGNoYW5nZWQsIDczIGluc2Vy dGlvbnMoKyksIDUxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RvYy9saXNwcmVmL29i amVjdHMudGV4aSBiL2RvYy9saXNwcmVmL29iamVjdHMudGV4aQppbmRleCA0MTE3MWJjYWFm Yy4uMjc5ZjQ0OWE5OTQgMTAwNjQ0Ci0tLSBhL2RvYy9saXNwcmVmL29iamVjdHMudGV4aQor KysgYi9kb2MvbGlzcHJlZi9vYmplY3RzLnRleGkKQEAgLTIzOTksMTAgKzIzOTksMTAgQEAg RXF1YWxpdHkgUHJlZGljYXRlcwogaWYgdGhleSBhcmUgaW50ZWdlcnMsIHN0cmluZ3MsIG1h cmtlcnMsIHZlY3RvcnMsIGJvb2wtdmVjdG9ycywKIGJ5dGUtY29kZSBmdW5jdGlvbiBvYmpl Y3RzLCBjaGFyLXRhYmxlcywgcmVjb3Jkcywgb3IgZm9udCBvYmplY3RzLgogCi1JZiBAdmFy e29iamVjdDF9IG9yIEB2YXJ7b2JqZWN0Mn0gaXMgYSBzeW1ib2wgd2l0aCBwb3NpdGlvbiwK LUBjb2Rle2VxdWFsfSByZWdhcmRzIGl0IGFzIGl0cyBiYXJlIHN5bWJvbCB3aGVuCitJZiBA dmFye29iamVjdDF9IG9yIEB2YXJ7b2JqZWN0Mn0gY29udGFpbnMgc3ltYm9scyB3aXRoIHBv c2l0aW9uLAorQGNvZGV7ZXF1YWx9IHRyZWF0cyB0aGVtIGFzIGlmIHRoZXkgd2VyZSB0aGVp ciBiYXJlIHN5bWJvbHMgd2hlbgogQGNvZGV7c3ltYm9scy13aXRoLXBvcy1lbmFibGVkfSBp cyBub24tQGNvZGV7bmlsfS4gIE90aGVyd2lzZQotQGNvZGV7ZXF1YWx9IGNvbXBhcmVzIHR3 byBzeW1ib2xzIHdpdGggcG9zaXRpb24gYnkgcmVjdXJzaXZlbHkKK0Bjb2Rle2VxdWFsfSBj b21wYXJlcyB0d28gc3ltYm9scyB3aXRoIHBvc2l0aW9uIGJ5CiBjb21wYXJpbmcgdGhlaXIg Y29tcG9uZW50cy4gIEB4cmVme1N5bWJvbHMgd2l0aCBQb3NpdGlvbn0uCiAKIE90aGVyIG9i amVjdHMgYXJlIGNvbnNpZGVyZWQgQGNvZGV7ZXF1YWx9IG9ubHkgaWYgdGhleSBhcmUgQGNv ZGV7ZXF9LgpkaWZmIC0tZ2l0IGEvZG9jL2xpc3ByZWYvc3ltYm9scy50ZXhpIGIvZG9jL2xp c3ByZWYvc3ltYm9scy50ZXhpCmluZGV4IDZmOWIxZWYwZWM3Li5jNzZiZjNkMzgyMCAxMDA2 NDQKLS0tIGEvZG9jL2xpc3ByZWYvc3ltYm9scy50ZXhpCisrKyBiL2RvYy9saXNwcmVmL3N5 bWJvbHMudGV4aQpAQCAtNzgwLDEzICs3ODAsMTYgQEAgU3ltYm9scyB3aXRoIFBvc2l0aW9u CiBAY2luZGV4IHN5bWJvbCB3aXRoIHBvc2l0aW9uCiAKIEBjaW5kZXggYmFyZSBzeW1ib2wK LUEgQGRmbntzeW1ib2wgd2l0aCBwb3NpdGlvbn0gaXMgYSBzeW1ib2wsIHRoZSBAZGZue2Jh cmUgc3ltYm9sfSwKLXRvZ2V0aGVyIHdpdGggYW4gdW5zaWduZWQgaW50ZWdlciBjYWxsZWQg dGhlIEBkZm57cG9zaXRpb259LiAgU3ltYm9scwotd2l0aCBwb3NpdGlvbiBkb24ndCB0aGVt c2VsdmVzIGhhdmUgZW50cmllcyBpbiB0aGUgb2JhcnJheSAodGhvdWdoCi10aGVpciBiYXJl IHN5bWJvbHMgZG87IEBweHJlZntDcmVhdGluZyBTeW1ib2xzfSkuCi0KLVN5bWJvbHMgd2l0 aCBwb3NpdGlvbiBhcmUgZm9yIHRoZSB1c2Ugb2YgdGhlIGJ5dGUgY29tcGlsZXIsIHdoaWNo Ci1yZWNvcmRzIGluIHRoZW0gdGhlIHBvc2l0aW9uIG9mIGVhY2ggc3ltYm9sIG9jY3VycmVu Y2UgYW5kIHVzZXMgdGhvc2UKK0EgQGRmbntzeW1ib2wgd2l0aCBwb3NpdGlvbn0gaXMgYSBz eW1ib2wsIGNhbGxlZCB0aGUgQGRmbntiYXJlIHN5bWJvbH0sCit0b2dldGhlciB3aXRoIGEg bm9ubmVnYXRpdmUgZml4bnVtIGNhbGxlZCB0aGUgQGRmbntwb3NpdGlvbn0uCitFdmVuIHRo b3VnaCBhIHN5bWJvbCB3aXRoIHBvc2l0aW9uIG9mdGVuIGFjdHMgbGlrZSBpdHMgYmFyZSBz eW1ib2wsCitpdCBpcyBub3QgYSBzeW1ib2w6IGluc3RlYWQsIGl0IGlzIGFuIG9iamVjdCB0 aGF0IGhhcyBib3RoIGEgYmFyZSBzeW1ib2wKK2FuZCBhIHBvc2l0aW9uLiAgQmVjYXVzZSBz eW1ib2xzIHdpdGggcG9zaXRpb24gYXJlIG5vdCBzeW1ib2xzLAordGhleSBkb24ndCBoYXZl IGVudHJpZXMgaW4gdGhlIG9iYXJyYXksIHRob3VnaCB0aGVpciBiYXJlIHN5bWJvbHMKK3R5 cGljYWxseSBkbyAoQHB4cmVme0NyZWF0aW5nIFN5bWJvbHN9KS4KKworVGhlIGJ5dGUgY29t cGlsZXIgdXNlcyBzeW1ib2xzIHdpdGggcG9zaXRpb24sCityZWNvcmRzIGluIHRoZW0gdGhl IHBvc2l0aW9uIG9mIGVhY2ggc3ltYm9sIG9jY3VycmVuY2UsIGFuZCB1c2VzIHRob3NlCiBw b3NpdGlvbnMgaW4gd2FybmluZyBhbmQgZXJyb3IgbWVzc2FnZXMuICBUaGV5IHNob3VsZG4n dCBub3JtYWxseSBiZQogdXNlZCBvdGhlcndpc2UuICBEb2luZyBzbyBjYW4gY2F1c2UgdW5l eHBlY3RlZCByZXN1bHRzIHdpdGggYmFzaWMKIEVtYWNzIGZ1bmN0aW9ucyBzdWNoIGFzIEBj b2Rle2VxfSBhbmQgQGNvZGV7ZXF1YWx9LgpAQCAtNzk5LDIyICs4MDIsMTkgQEAgU3ltYm9s cyB3aXRoIFBvc2l0aW9uCiBvcGVyYXRpb24uICBUaGUgYnl0ZSBjb21waWxlciBkb2VzIHRo aXMgYmVmb3JlIHdyaXRpbmcgaXRzIG91dHB1dCB0bwogdGhlIGNvbXBpbGVkIExpc3AgZmls ZS4KIAotRm9yIG1vc3QgcHVycG9zZXMsIHdoZW4gdGhlIGZsYWcgdmFyaWFibGUKLUBjb2Rl e3N5bWJvbHMtd2l0aC1wb3MtZW5hYmxlZH0gaXMgbm9uLUBjb2Rle25pbH0sIHN5bWJvbHMg d2l0aAotcG9zaXRpb25zIGJlaGF2ZSBqdXN0IGFzIHRoZWlyIGJhcmUgc3ltYm9scyB3b3Vs ZC4gIEZvciBleGFtcGxlLAotQHNhbXB7KGVxICM8c3ltYm9sIGZvbyBhdCAxMjM0NT4gZm9v KX0gaGFzIGEgdmFsdWUgQGNvZGV7dH0gd2hlbiB0aGUKLXZhcmlhYmxlIGlzIHNldDsgbGlr ZXdpc2UsIEBjb2Rle2VxdWFsfSB3aWxsIHRyZWF0IGEgc3ltYm9sIHdpdGgKLXBvc2l0aW9u IGFyZ3VtZW50IGFzIGl0cyBiYXJlIHN5bWJvbC4KK1doZW4gdGhlIGZsYWcgdmFyaWFibGUg QGNvZGV7c3ltYm9scy13aXRoLXBvcy1lbmFibGVkfSBpcyBub24tQGNvZGV7bmlsfSwKK2Eg c3ltYm9sIHdpdGggcG9zaXRpb24gb3JkaW5hcmlseSBiZWhhdmVzIGxpa2UgaXRzIGJhcmUg c3ltYm9sLgorRm9yIGV4YW1wbGUsIEBzYW1weyhlcSAocG9zaXRpb24tc3ltYm9sICdmb28g MTIzNDUpICdmb28pfSB5aWVsZHMgQGNvZGV7dH0sCithbmQgQGNvZGV7ZXF1YWx9IGxpa2V3 aXNlIHRyZWF0cyBhIHN5bWJvbCB3aXRoIHBvc2l0aW9uIGFzIGl0cyBiYXJlIHN5bWJvbC4K IAotV2hlbiBAY29kZXtzeW1ib2xzLXdpdGgtcG9zLWVuYWJsZWR9IGlzIEBjb2Rle25pbH0s IGFueSBzeW1ib2xzIHdpdGgKLXBvc2l0aW9uIGNvbnRpbnVlIHRvIGV4aXN0LCBidXQgZG8g bm90IGJlaGF2ZSBhcyBzeW1ib2xzLCBvciBoYXZlIHRoZQotb3RoZXIgdXNlZnVsIHByb3Bl cnRpZXMgb3V0bGluZWQgaW4gdGhlIHByZXZpb3VzIHBhcmFncmFwaC4gIEBjb2Rle2VxfQot cmV0dXJucyBAY29kZXt0fSB3aGVuIGdpdmVuIGlkZW50aWNhbCBhcmd1bWVudHMsIGFuZCBA Y29kZXtlcXVhbH0KLXJldHVybnMgQGNvZGV7dH0gd2hlbiBnaXZlbiBhcmd1bWVudHMgd2l0 aCBAY29kZXtlcXVhbH0gY29tcG9uZW50cy4KK1doZW4gQGNvZGV7c3ltYm9scy13aXRoLXBv cy1lbmFibGVkfSBpcyBAY29kZXtuaWx9LCBzeW1ib2xzIHdpdGgKK3Bvc2l0aW9uIGJlaGF2 ZSBhcyB0aGVtc2VsdmVzLCBub3QgYXMgc3ltYm9scy4gIEZvciBleGFtcGxlLCBAc2FtcHso ZXEKKyhwb3NpdGlvbi1zeW1ib2wgJ2ZvbyAxMjM0NSkgJ2Zvbyl9IHlpZWxkcyBAY29kZXtu aWx9LCBhbmQgQGNvZGV7ZXF1YWx9CitsaWtld2lzZSB0cmVhdHMgYSBzeW1ib2wgd2l0aCBw b3NpdGlvbiBhcyBub3QgZXF1YWwgdG8gaXRzIGJhcmUgc3ltYm9sLgogCiBNb3N0IG9mIHRo ZSB0aW1lIGluIEVtYWNzIEBjb2Rle3N5bWJvbHMtd2l0aC1wb3MtZW5hYmxlZH0gaXMKIEBj b2Rle25pbH0sIGJ1dCB0aGUgYnl0ZSBjb21waWxlciBhbmQgdGhlIG5hdGl2ZSBjb21waWxl ciBiaW5kIGl0IHRvCi1AY29kZXt0fSB3aGVuIHRoZXkgcnVuLgorQGNvZGV7dH0gd2hlbiB0 aGV5IHJ1biBhbmQgRW1hY3MgcnVucyBhIGxpdHRsZSBtb3JlIHNsb3dseSBpbiB0aGlzIGNh c2UuCiAKIFR5cGljYWxseSwgc3ltYm9scyB3aXRoIHBvc2l0aW9uIGFyZSBjcmVhdGVkIGJ5 IHRoZSBieXRlIGNvbXBpbGVyCiBjYWxsaW5nIHRoZSByZWFkZXIgZnVuY3Rpb24gQGNvZGV7 cmVhZC1wb3NpdGlvbmluZy1zeW1ib2xzfQpAQCAtODIyLDM2ICs4MjIsNDQgQEAgU3ltYm9s cyB3aXRoIFBvc2l0aW9uCiBAY29kZXtwb3NpdGlvbi1zeW1ib2x9LgogCiBAZGVmdmFyIHN5 bWJvbHMtd2l0aC1wb3MtZW5hYmxlZAotV2hlbiB0aGlzIHZhcmlhYmxlIGlzIG5vbi1AY29k ZXtuaWx9LCBhIHN5bWJvbCB3aXRoIHBvc2l0aW9uIGJlaGF2ZXMKLWxpa2UgdGhlIGNvbnRh aW5lZCBiYXJlIHN5bWJvbC4gIEVtYWNzIHJ1bnMgYSBsaXR0bGUgbW9yZSBzbG93bHkgaW4K LXRoaXMgY2FzZS4KK1RoaXMgdmFyaWFibGUgYWZmZWN0cyB0aGUgYmVoYXZpb3Igb2Ygc3lt Ym9scyB3aXRoIHBvc2l0aW9uIHdoZW4gdGhleQorYXJlIG5vdCBiZWluZyBwcmludGVkIGFu ZCBhcmUgbm90IGFyZ3VtZW50cyB0byBvbmUgb2YgdGhlIGZ1bmN0aW9ucworZGVmaW5lZCBs YXRlciBpbiB0aGlzIHNlY3Rpb24uICBXaGVuIHRoaXMgdmFyaWFibGUgaXMgbm9uLUBjb2Rl e25pbH0sCitzdWNoIGEgc3ltYm9sIHdpdGggcG9zaXRpb24gYmVoYXZlcyBsaWtlIGl0cyBi YXJlIHN5bWJvbDsgb3RoZXJ3aXNlIGl0CitiZWhhdmVzIGFzIGl0c2VsZiwgbm90IGFzIGEg c3ltYm9sLgogQGVuZCBkZWZ2YXIKIAogQGRlZnZhciBwcmludC1zeW1ib2xzLWJhcmUKIFdo ZW4gYm91bmQgdG8gbm9uLUBjb2Rle25pbH0sIHRoZSBMaXNwIHByaW50ZXIgcHJpbnRzIG9u bHkgdGhlIGJhcmUKIHN5bWJvbCBvZiBhIHN5bWJvbCB3aXRoIHBvc2l0aW9uLCBpZ25vcmlu ZyB0aGUgcG9zaXRpb24uCitPdGhlcndpc2UgYSBzeW1ib2wgd2l0aCBwb3NpdGlvbiBwcmlu dHMgYXMgaXRzZWxmLCBub3QgYXMgYSBzeW1ib2wuCiBAZW5kIGRlZnZhcgogCi1AZGVmdW4g c3ltYm9sLXdpdGgtcG9zLXAgc3ltYm9sCi1UaGlzIGZ1bmN0aW9uIHJldHVybnMgQGNvZGV7 dH0gaWYgQHZhcntzeW1ib2x9IGlzIGEgc3ltYm9sIHdpdGgKK0BkZWZ1biBzeW1ib2wtd2l0 aC1wb3MtcCBvYmplY3QKK1RoaXMgZnVuY3Rpb24gcmV0dXJucyBAY29kZXt0fSBpZiBAdmFy e29iamVjdH0gaXMgYSBzeW1ib2wgd2l0aAogcG9zaXRpb24sIEBjb2Rle25pbH0gb3RoZXJ3 aXNlLgorVW5saWtlIEBjb2Rle3N5bWJvbHB9LCB0aGlzIGZ1bmN0aW9uIGlnbm9yZXMgQGNv ZGV7c3ltYm9scy13aXRoLXBvcy1lbmFibGVkfS4KIEBlbmQgZGVmdW4KIAotQGRlZnVuIGJh cmUtc3ltYm9sIHN5bWJvbAotVGhpcyBmdW5jdGlvbiByZXR1cm5zIHRoZSBiYXJlIHN5bWJv bCBjb250YWluZWQgaW4gQHZhcntzeW1ib2x9LCBvcgotQHZhcntzeW1ib2x9IGl0c2VsZiBp ZiBpdCBpcyBhbHJlYWR5IGEgYmFyZSBzeW1ib2wuICBGb3IgYW55IG90aGVyCi10eXBlIG9m IG9iamVjdCwgaXQgc2lnbmFscyBhbiBlcnJvci4KK0BkZWZ1biBiYXJlLXN5bWJvbCBzeW0K K1RoaXMgZnVuY3Rpb24gcmV0dXJucyB0aGUgYmFyZSBzeW1ib2wgb2YgdGhlIHN5bWJvbCB3 aXRoCitwb3NpdGlvbiBAdmFye3N5bX0sIG9yIEB2YXJ7c3ltfSBpdHNlbGYgaWYgaXQgaXMg YWxyZWFkeSBhIHN5bWJvbC4KK0ZvciBhbnkgb3RoZXIgdHlwZSBvZiBvYmplY3QsIGl0IHNp Z25hbHMgYW4gZXJyb3IuCitUaGlzIGZ1bmN0aW9uIGlnbm9yZXMgQGNvZGV7c3ltYm9scy13 aXRoLXBvcy1lbmFibGVkfS4KIEBlbmQgZGVmdW4KIAotQGRlZnVuIHN5bWJvbC13aXRoLXBv cy1wb3Mgc3ltYm9sCi1UaGlzIGZ1bmN0aW9uIHJldHVybnMgdGhlIHBvc2l0aW9uLCBhIG51 bWJlciwgZnJvbSBhIHN5bWJvbCB3aXRoCi1wb3NpdGlvbi4gIEZvciBhbnkgb3RoZXIgdHlw ZSBvZiBvYmplY3QsIGl0IHNpZ25hbHMgYW4gZXJyb3IuCitAZGVmdW4gc3ltYm9sLXdpdGgt cG9zLXBvcyBzeW1wb3MKK1RoaXMgZnVuY3Rpb24gcmV0dXJucyB0aGUgcG9zaXRpb24sIGEg bm9ubmVnYXRpdmUgZml4bnVtLCBmcm9tIHRoZSBzeW1ib2wgd2l0aAorcG9zaXRpb24gQHZh cntzeW1wb3N9LiAgRm9yIGFueSBvdGhlciB0eXBlIG9mIG9iamVjdCwgaXQgc2lnbmFscyBh biBlcnJvci4KK1RoaXMgZnVuY3Rpb24gaWdub3JlcyBAY29kZXtzeW1ib2xzLXdpdGgtcG9z LWVuYWJsZWR9LgogQGVuZCBkZWZ1bgogCiBAZGVmdW4gcG9zaXRpb24tc3ltYm9sIHN5bSBw b3MKLU1ha2UgYSBuZXcgc3ltYm9sIHdpdGggcG9zaXRpb24uICBAdmFye3N5bX0gaXMgZWl0 aGVyIGEgYmFyZSBzeW1ib2wgb3IKLWEgc3ltYm9sIHdpdGggcG9zaXRpb24sIGFuZCBzdXBw bGllcyB0aGUgc3ltYm9sIHBhcnQgb2YgdGhlIG5ldwotb2JqZWN0LiAgQHZhcntwb3N9IGlz IGVpdGhlciBhbiBpbnRlZ2VyIHdoaWNoIGJlY29tZXMgdGhlIG51bWJlciBwYXJ0Ci1vZiB0 aGUgbmV3IG9iamVjdCwgb3IgYSBzeW1ib2wgd2l0aCBwb3NpdGlvbiB3aG9zZSBwb3NpdGlv biBpcyB1c2VkLgorTWFrZSBhIG5ldyBzeW1ib2wgd2l0aCBwb3NpdGlvbi4gIFRoZSBuZXcg b2JqZWN0J3MgYmFyZSBzeW1ib2wgaXMgdGFrZW4KK2Zyb20gQHZhcntzeW19LCB3aGljaCBp cyBlaXRoZXIgYSBzeW1ib2wsIG9yIGEgc3ltYm9sIHdpdGggcG9zaXRpb24KK3dob3NlIGJh cmUgc3ltYm9sIGlzIHVzZWQuICBUaGUgbmV3IG9iamVjdCdzIHBvc2l0aW9uIGlzIHRha2Vu IGZyb20KK0B2YXJ7cG9zfSwgd2hpY2ggaXMgZWl0aGVyIGEgbm9ubmVnYXRpdmUgZml4bnVt LCBvciBhIHN5bWJvbCB3aXRoCitwb3NpdGlvbiB3aG9zZSBwb3NpdGlvbiBpcyB1c2VkLgog RW1hY3Mgc2lnbmFscyBhbiBlcnJvciBpZiBlaXRoZXIgYXJndW1lbnQgaXMgaW52YWxpZC4K K1RoaXMgZnVuY3Rpb24gaWdub3JlcyBAY29kZXtzeW1ib2xzLXdpdGgtcG9zLWVuYWJsZWR9 LgogQGVuZCBkZWZ1bgpkaWZmIC0tZ2l0IGEvc3JjL2RhdGEuYyBiL3NyYy9kYXRhLmMKaW5k ZXggZGYwOGVhZjgxMDIuLjM1ZjRjODJjNjhmIDEwMDY0NAotLS0gYS9zcmMvZGF0YS5jCisr KyBiL3NyYy9kYXRhLmMKQEAgLTMzOSw3ICszMzksOCBAQCBERUZVTiAoImJhcmUtc3ltYm9s LXAiLCBGYmFyZV9zeW1ib2xfcCwgU2JhcmVfc3ltYm9sX3AsIDEsIDEsIDAsCiB9CiAKIERF RlVOICgic3ltYm9sLXdpdGgtcG9zLXAiLCBGc3ltYm9sX3dpdGhfcG9zX3AsIFNzeW1ib2xf d2l0aF9wb3NfcCwgMSwgMSwgMCwKLSAgICAgICBkb2M6IC8qIFJldHVybiB0IGlmIE9CSkVD VCBpcyBhIHN5bWJvbCB0b2dldGhlciB3aXRoIHBvc2l0aW9uLiAgKi8KKyAgICAgICBkb2M6 IC8qIFJldHVybiB0IGlmIE9CSkVDVCBpcyBhIHN5bWJvbCB0b2dldGhlciB3aXRoIHBvc2l0 aW9uLgorSWdub3JlIGBzeW1ib2xzLXdpdGgtcG9zLWVuYWJsZWQnLiAgKi8KICAgICAgICBh dHRyaWJ1dGVzOiBjb25zdCkKICAgKExpc3BfT2JqZWN0IG9iamVjdCkKIHsKQEAgLTc4OSwy NSArNzkwLDMyIEBAIERFRlVOICgic3ltYm9sLW5hbWUiLCBGc3ltYm9sX25hbWUsIFNzeW1i b2xfbmFtZSwgMSwgMSwgMCwKIH0KIAogREVGVU4gKCJiYXJlLXN5bWJvbCIsIEZiYXJlX3N5 bWJvbCwgU2JhcmVfc3ltYm9sLCAxLCAxLCAwLAotICAgICAgIGRvYzogLyogRXh0cmFjdCwg aWYgbmVlZCBiZSwgdGhlIGJhcmUgc3ltYm9sIGZyb20gU1lNLCBhIHN5bWJvbC4gICovKQor ICAgICAgIGRvYzogLyogRXh0cmFjdCwgaWYgbmVlZCBiZSwgdGhlIGJhcmUgc3ltYm9sIGZy b20gU1lNLgorU1lNIGlzIGVpdGhlciBhIHN5bWJvbCBvciBhIHN5bWJvbCB3aXRoIHBvc2l0 aW9uLgorSWdub3JlIGBzeW1ib2xzLXdpdGgtcG9zLWVuYWJsZWQnLiAgKi8pCiAgIChyZWdp c3RlciBMaXNwX09iamVjdCBzeW0pCiB7Ci0gIENIRUNLX1NZTUJPTCAoc3ltKTsKLSAgcmV0 dXJuIEJBUkVfU1lNQk9MX1AgKHN5bSkgPyBzeW0gOiBYU1lNQk9MX1dJVEhfUE9TX1NZTSAo c3ltKTsKKyAgaWYgKEJBUkVfU1lNQk9MX1AgKHN5bSkpCisgICAgcmV0dXJuIHN5bTsKKyAg aWYgKFNZTUJPTF9XSVRIX1BPU19QIChzeW0pKQorICAgIHJldHVybiBYU1lNQk9MX1dJVEhf UE9TX1NZTSAoc3ltKTsKKyAgeHNpZ25hbDIgKFF3cm9uZ190eXBlX2FyZ3VtZW50LCBsaXN0 MiAoUXN5bWJvbHAsIFFzeW1ib2xfd2l0aF9wb3NfcCksIHN5bSk7CiB9CiAKIERFRlVOICgi c3ltYm9sLXdpdGgtcG9zLXBvcyIsIEZzeW1ib2xfd2l0aF9wb3NfcG9zLCBTc3ltYm9sX3dp dGhfcG9zX3BvcywgMSwgMSwgMCwKLSAgICAgICBkb2M6IC8qIEV4dHJhY3QgdGhlIHBvc2l0 aW9uIGZyb20gYSBzeW1ib2wgd2l0aCBwb3NpdGlvbi4gICovKQotICAocmVnaXN0ZXIgTGlz cF9PYmplY3QgbHMpCisgICAgICAgZG9jOiAvKiBFeHRyYWN0IHRoZSBwb3NpdGlvbiBmcm9t IHRoZSBzeW1ib2wgd2l0aCBwb3NpdGlvbiBTWU1QT1MuCitJZ25vcmUgYHN5bWJvbHMtd2l0 aC1wb3MtZW5hYmxlZCcuICAqLykKKyAgKHJlZ2lzdGVyIExpc3BfT2JqZWN0IHN5bXBvcykK IHsKLSAgQ0hFQ0tfVFlQRSAoU1lNQk9MX1dJVEhfUE9TX1AgKGxzKSwgUXN5bWJvbF93aXRo X3Bvc19wLCBscyk7Ci0gIHJldHVybiBYU1lNQk9MX1dJVEhfUE9TX1BPUyAobHMpOworICBD SEVDS19UWVBFIChTWU1CT0xfV0lUSF9QT1NfUCAoc3ltcG9zKSwgUXN5bWJvbF93aXRoX3Bv c19wLCBzeW1wb3MpOworICByZXR1cm4gWFNZTUJPTF9XSVRIX1BPU19QT1MgKHN5bXBvcyk7 CiB9CiAKIERFRlVOICgicmVtb3ZlLXBvcy1mcm9tLXN5bWJvbCIsIEZyZW1vdmVfcG9zX2Zy b21fc3ltYm9sLAogICAgICAgIFNyZW1vdmVfcG9zX2Zyb21fc3ltYm9sLCAxLCAxLCAwLAog ICAgICAgIGRvYzogLyogSWYgQVJHIGlzIGEgc3ltYm9sIHdpdGggcG9zaXRpb24sIHJldHVy biBpdCB3aXRob3V0IHRoZSBwb3NpdGlvbi4KLU90aGVyd2lzZSwgcmV0dXJuIEFSRyB1bmNo YW5nZWQuICBDb21wYXJlIHdpdGggYGJhcmUtc3ltYm9sJy4gICovKQorT3RoZXJ3aXNlLCBy ZXR1cm4gQVJHIHVuY2hhbmdlZC4gIElnbm9yZSBgc3ltYm9scy13aXRoLXBvcy1lbmFibGVk Jy4KK0NvbXBhcmUgd2l0aCBgYmFyZS1zeW1ib2wnLiAgKi8pCiAgIChyZWdpc3RlciBMaXNw X09iamVjdCBhcmcpCiB7CiAgIGlmIChTWU1CT0xfV0lUSF9QT1NfUCAoYXJnKSkKQEAgLTgx NiwxMCArODI0LDExIEBAIERFRlVOICgicmVtb3ZlLXBvcy1mcm9tLXN5bWJvbCIsIEZyZW1v dmVfcG9zX2Zyb21fc3ltYm9sLAogfQogCiBERUZVTiAoInBvc2l0aW9uLXN5bWJvbCIsIEZw b3NpdGlvbl9zeW1ib2wsIFNwb3NpdGlvbl9zeW1ib2wsIDIsIDIsIDAsCi0gICAgICAgZG9j OiAvKiBDcmVhdGUgYSBuZXcgc3ltYm9sIHdpdGggcG9zaXRpb24uCisgICAgICAgZG9jOiAv KiBNYWtlIGEgbmV3IHN5bWJvbCB3aXRoIHBvc2l0aW9uLgogU1lNIGlzIGEgc3ltYm9sLCB3 aXRoIG9yIHdpdGhvdXQgcG9zaXRpb24sIHRoZSBzeW1ib2wgdG8gcG9zaXRpb24uCi1QT1Ms IHRoZSBwb3NpdGlvbiwgaXMgZWl0aGVyIGEgZml4bnVtIG9yIGEgc3ltYm9sIHdpdGggcG9z aXRpb24gZnJvbSB3aGljaAotdGhlIHBvc2l0aW9uIHdpbGwgYmUgdGFrZW4uICAqLykKK1BP UywgdGhlIHBvc2l0aW9uLCBpcyBlaXRoZXIgYSBub25uZWdhdGl2ZSBmaXhudW0sCitvciBh IHN5bWJvbCB3aXRoIHBvc2l0aW9uIGZyb20gd2hpY2ggdGhlIHBvc2l0aW9uIHdpbGwgYmUg dGFrZW4uCitJZ25vcmUgYHN5bWJvbHMtd2l0aC1wb3MtZW5hYmxlZCcuICAqLykKICAgICAg KHJlZ2lzdGVyIExpc3BfT2JqZWN0IHN5bSwgcmVnaXN0ZXIgTGlzcF9PYmplY3QgcG9zKQog ewogICBMaXNwX09iamVjdCBiYXJlID0gRmJhcmVfc3ltYm9sIChzeW0pOwpAQCAtNDM3NCw3 ICs0MzgzLDcgQEAgI2RlZmluZSBQVVRfRVJST1Ioc3ltLCB0YWlsLCBtc2cpCQkJXAogCiAg IERFRlNZTSAoUXN5bWJvbHNfd2l0aF9wb3NfZW5hYmxlZCwgInN5bWJvbHMtd2l0aC1wb3Mt ZW5hYmxlZCIpOwogICBERUZWQVJfQk9PTCAoInN5bWJvbHMtd2l0aC1wb3MtZW5hYmxlZCIs IHN5bWJvbHNfd2l0aF9wb3NfZW5hYmxlZCwKLSAgICAgICAgICAgICAgIGRvYzogLyogTm9u LW5pbCB3aGVuICJzeW1ib2xzIHdpdGggcG9zaXRpb24iIGNhbiBiZSB1c2VkIGFzIHN5bWJv bHMuCisgICAgICAgICAgICAgICBkb2M6IC8qIElmIG5vbi1uaWwsIGEgc3ltYm9sIHdpdGgg cG9zaXRpb24gb3JkaW5hcmlseSBiZWhhdmVzIGFzIGl0cyBiYXJlIHN5bWJvbC4KIEJpbmQg dGhpcyB0byBub24tbmlsIGluIGFwcGxpY2F0aW9ucyBzdWNoIGFzIHRoZSBieXRlIGNvbXBp bGVyLiAgKi8pOwogICBzeW1ib2xzX3dpdGhfcG9zX2VuYWJsZWQgPSBmYWxzZTsKIApkaWZm IC0tZ2l0IGEvdGVzdC9zcmMvZGF0YS10ZXN0cy5lbCBiL3Rlc3Qvc3JjL2RhdGEtdGVzdHMu ZWwKaW5kZXggOGFmN2U5MDIxMDkuLmFkM2IyMDcxMjU0IDEwMDY0NAotLS0gYS90ZXN0L3Ny Yy9kYXRhLXRlc3RzLmVsCisrKyBiL3Rlc3Qvc3JjL2RhdGEtdGVzdHMuZWwKQEAgLTgzMyw0 ICs4MzMsOSBAQCBkYXRhLXRlc3RzLWRlZmFsaWFzCiAgIChzaG91bGQtZXJyb3IgKGRlZmFs aWFzICdkYXRhLXRlc3RzLS1kYS1jICdkYXRhLXRlc3RzLS1kYS1kKQogICAgICAgICAgICAg ICAgIDp0eXBlICdjeWNsaWMtZnVuY3Rpb24taW5kaXJlY3Rpb24pKQogCisoZXJ0LWRlZnRl c3QgZGF0YS10ZXN0cy1iYXJlLXN5bWJvbCAoKQorICAoZG9saXN0IChzeW1ib2xzLXdpdGgt cG9zLWVuYWJsZWQgJyhuaWwgdCkpCisgICAgKGRvbGlzdCAoc3ltIChsaXN0IG5pbCB0ICd4 eXp6eSAobWFrZS1zeW1ib2wgIiIpKSkKKyAgICAgIChzaG91bGQgKGVxIHN5bSAoYmFyZS1z eW1ib2wgKHBvc2l0aW9uLXN5bWJvbCBzeW0gMCkpKSkpKSkKKwogOzs7IGRhdGEtdGVzdHMu ZWwgZW5kcyBoZXJlCi0tIAoyLjQwLjEKCg== --------------xamcxm4ThUiyTfB0kKoaitwD--