From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id IGb7FFD36GSRhgAAG6o9tA:P1 (envelope-from ) for ; Fri, 25 Aug 2023 20:47:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id IGb7FFD36GSRhgAAG6o9tA (envelope-from ) for ; Fri, 25 Aug 2023 20:47:44 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BB1F23F15D for ; Fri, 25 Aug 2023 20:47:43 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=vodafonemail.de header.s=vfde-mb-mr2-21dec header.b=ST4FDZlg; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=quarantine) header.from=vodafonemail.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692989264; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=GM7aUfLF+VrBU8I7ffc/j918REXu4Rjyho6TGuzOOjI=; b=sdkCdNJAOWtfFeLRGKLMl6Q/hMMllr4Y7CCqvhsdCBRJe5unJrM6AUiaR/qCQ+Ev9LzdZq X9Ej2EIr/TwvnQoT/Pb++lDRcmO1Y/IHklET9iCmBN5CPbxM29YTNnNel8uAH7ui1LHg1x Q5b2HQYLRcu4OytVaMBFNKr1HIpHXSksCWMXNcN3QJhENtlSNReJRT1pO0h/zMNkIUZYRF OXcaFiICYIUGKeODnEjZ17k2DshzwpxJx5Fa9++LAeo14hw88CTwSrCpTYevqUeBWwel09 /5kbvn6S0ZEJtDhP21P30ypNe2x+jDi667rRPzZJU+wMYJHQs2832sA2yncIIQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692989264; a=rsa-sha256; cv=none; b=FQrLGAlNO094gEuOz9jK2FH1U81RNwwzErXO40rDaJmqSZFLUtrMoZS6YpeveuUwi+sYqY b4tHUOPvxxA/LX7Jkr3o71P68muel96Y2yiw9JjVmRgNOm5Vg92ZigOvA6k2DF/8rRD6hZ in7weWEocb3/oIxzRJJ1I/45jIvPOuR9FgxCrFhdhkWpr+EYCb6pOg54l1mdC/bLEqGdim x5MyQqgzgSm6s1fhH061T95f0lL2D0GK9fQjBxLc3aUzUx7QqHptIEP660THiTGRTeFgFu cotobawf7f0GkIyVOg/fUM8kirxwkj16KXLpLqIK+916Sr39dI1Uvg6QfIKsbw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=vodafonemail.de header.s=vfde-mb-mr2-21dec header.b=ST4FDZlg; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=quarantine) header.from=vodafonemail.de Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZbpZ-0007Al-Bv; Fri, 25 Aug 2023 14:46:51 -0400 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 1qZbpR-0007AQ-EZ for emacs-orgmode@gnu.org; Fri, 25 Aug 2023 14:46:41 -0400 Received: from mr4.vodafonemail.de ([145.253.228.164]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qZbpM-0001cS-HP for emacs-orgmode@gnu.org; Fri, 25 Aug 2023 14:46:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vodafonemail.de; s=vfde-mb-mr2-21dec; t=1692989193; bh=GM7aUfLF+VrBU8I7ffc/j918REXu4Rjyho6TGuzOOjI=; h=Content-Type:Message-ID:Date:User-Agent:Subject:Content-Language: From:To:References:In-Reply-To:From; b=ST4FDZlgjsDAq6XT4Ke+zP3fe4q6uw84srRMbxB3ocx95mX10tB93B9Oec35FmIMY CAnvrk66SMjrxkxEopAqVi86W2cLC7TIdv6qdV8B9ZJkd3MnAu3SdbOL56j/iNkxGJ BGahmy7gH05PjOo4Kp4VQLp904+crYbv9NQjvhL4= Received: from smtp.vodafone.de (unknown [10.0.0.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by mr4.vodafonemail.de (Postfix) with ESMTPS id 4RXTST1TfMz1xyS; Fri, 25 Aug 2023 18:46:33 +0000 (UTC) Received: from [192.168.0.138] (unknown [86.33.87.7]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp.vodafone.de (Postfix) with ESMTPSA id 4RXTSF5J79z9s62; Fri, 25 Aug 2023 18:46:18 +0000 (UTC) Content-Type: multipart/mixed; boundary="------------C0tif4V1IhStZXFQ0LoQ8ybQ" Message-ID: Date: Fri, 25 Aug 2023 20:46:17 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: [RFC] Quoting property names in tag/property matches [Was: [BUG?] Matching tags: & operator no more implicit between tags and special property] Content-Language: de-DE-frami, en-US From: Jens Schmidt To: Ihor Radchenko Cc: Samuel Loury , emacs-orgmode@gnu.org References: <87h6oq2nu1.fsf@gmail.com> <877cpm6oe3.fsf@localhost> <811c9bda-cea4-c0d6-30b4-53ebdb432ab6@vodafonemail.de> <748acab1-eaf4-fdd3-13a6-26e6229de613@vodafonemail.de> <87o7iw7v4q.fsf@localhost> <98f4101b-7281-2793-ca30-7086c4f10c5d@vodafonemail.de> In-Reply-To: <98f4101b-7281-2793-ca30-7086c4f10c5d@vodafonemail.de> X-purgate-type: clean X-purgate: clean X-purgate-size: 13406 X-purgate-ID: 155817::1692989189-E17F97FF-E313166B/0/0 Received-SPF: pass client-ip=145.253.228.164; envelope-from=jschmidt4gnu@vodafonemail.de; helo=mr4.vodafonemail.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-1.57, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -9.71 X-Spam-Score: -9.71 X-Migadu-Queue-Id: BB1F23F15D X-Migadu-Scanner: mx1.migadu.com X-TUID: efEDMn3GS73S This is a multi-part message in MIME format. --------------C0tif4V1IhStZXFQ0LoQ8ybQ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 2023-08-24 10:52, Jens Schmidt wrote: > On 2023-08-24 09:32, Ihor Radchenko wrote: >> I prefer (B). And we will need to allow escaping of the "\" itself. Like >> \\. > > OK. Since backslash is not used yet in the rest of the regexp, (B) > should be rather edge-case-free. So the corresponding subre to match > property names would look like > > \(?5:\(?:[[:alnum:]]+\|\\[^[:space:]]\)+\) > > IOW, backslash quotes everything except whitespace, which by definition > cannot be part of a property name. > > Will start on this, but with tests and documentation this might take > some time. Here comes a first patch ... please check. --------------C0tif4V1IhStZXFQ0LoQ8ybQ Content-Type: text/x-patch; charset=UTF-8; name="0001-org-make-tags-matcher-Re-add-quoting-of-property-nam.patch" Content-Disposition: attachment; filename*0="0001-org-make-tags-matcher-Re-add-quoting-of-property-nam.pa"; filename*1="tch" Content-Transfer-Encoding: base64 RnJvbSA4MzA3NTBiZmExMGI1MmFjNzdhYmU4YWYxZjI3ODkwNTdmOTEwMWMxIE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKZW5zIFNjaG1pZHQgPGpzY2htaWR0NGdudUB2b2Rh Zm9uZW1haWwuZGU+CkRhdGU6IFRodSwgMjQgQXVnIDIwMjMgMjI6Mzg6MDIgKzAyMDAKU3Vi amVjdDogW1BBVENIXSBvcmctbWFrZS10YWdzLW1hdGNoZXI6IFJlLWFkZCBxdW90aW5nIG9m IHByb3BlcnR5IG5hbWVzCgoqIGxpc3Avb3JnLmVsIChvcmctbWFrZS10YWdzLW1hdGNoZXIp OgoqIHRlc3RpbmcvbGlzcC90ZXN0LW9yZy5lbCAodGVzdC1vcmcvbWFwLWVudHJpZXMpOiBN b3ZlIHNwZWNpYWwgY2FzZWQKaGFuZGxpbmcgb2YgTEVWRUwgcHJvcGVydGllcy4gIEFkZCB0 ZXN0cyBmb3Igb3RoZXIgc3BlY2lhbCBjYXNlZApwcm9wZXJ0aWVzIFRPRE8gYW5kIENBVEVH T1JZLgoKKiBsaXNwL29yZy5lbCAob3JnLW1ha2UtdGFncy1tYXRjaGVyKToKKiBkb2Mvb3Jn LW1hbnVhbC5vcmcgKE1hdGNoaW5nIHRhZ3MgYW5kIHByb3BlcnRpZXMpOgoqIHRlc3Rpbmcv bGlzcC90ZXN0LW9yZy5lbCAodGVzdC1vcmcvbWFwLWVudHJpZXMpOiBSZS1hZGQgYW5kIGV4 dGVuZApxdW90aW5nIG9mIHByb3BlcnR5IG5hbWVzIGluIHNlYXJjaCBzdHJpbmdzLgoKTGlu azogaHR0cHM6Ly9vcmdtb2RlLm9yZy9saXN0Lzg3aDZvcTJudTEuZnNmQGdtYWlsLmNvbQot LS0KIGRvYy9vcmctbWFudWFsLm9yZyAgICAgICB8IDIwICsrKysrKystLS0tLS0tLQogbGlz cC9vcmcuZWwgICAgICAgICAgICAgIHwgNTUgKysrKysrKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLQogdGVzdGluZy9saXNwL3Rlc3Qtb3JnLmVsIHwgMzQgKysrKysrKysr KysrKysrKystLS0tLS0tLQogMyBmaWxlcyBjaGFuZ2VkLCA2NiBpbnNlcnRpb25zKCspLCA0 MyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kb2Mvb3JnLW1hbnVhbC5vcmcgYi9kb2Mv b3JnLW1hbnVhbC5vcmcKaW5kZXggMTdiMjVmZWY0Li4xMGEwM2IzNDQgMTAwNjQ0Ci0tLSBh L2RvYy9vcmctbWFudWFsLm9yZworKysgYi9kb2Mvb3JnLW1hbnVhbC5vcmcKQEAgLTkzMjAs MjEgKzkzMjAsMTkgQEAgV2l0aCB0aGUgcmVndWxhciA9PD0gb3BlcmF0b3IsIHRoZSBzZWFy Y2ggd291bGQgaGFuZGxlIGVudHJpZXMgd2l0aG91dAogYW4gPUVGRk9SVD0gcHJvcGVydHkg YXMgaGF2aW5nIGEgemVybyBlZmZvcnQgYW5kIHdvdWxkIGluY2x1ZGUgdGhlbSBpbgogdGhl IHJlc3VsdCBhcyB3ZWxsLgogCi1DdXJyZW50bHksIHlvdSBjYW4gdXNlIG9ubHkgcHJvcGVy dHkgbmFtZXMgaW5jbHVkaW5nIGFscGhhbnVtZXJpYwotY2hhcmFjdGVycywgdW5kZXJzY29y ZXMsIGFuZCBtaW51cyBjaGFyYWN0ZXJzIGluIHNlYXJjaCBzdHJpbmdzLiAgSW4KLWFkZGl0 aW9uLCBpZiB5b3Ugd2FudCB0byBzZWFyY2ggZm9yIGEgcHJvcGVydHkgd2hvc2UgbmFtZSBz dGFydHMgd2l0aAotYSBtaW51cyBjaGFyYWN0ZXIsIHlvdSBoYXZlIHRvICJxdW90ZSIgdGhh dCBsZWFkaW5nIG1pbnVzIGNoYXJhY3Rlcgotd2l0aCBhbiBleHBsaWNpdCBwb3NpdGl2ZSBz ZWxlY3Rpb24gcGx1cyBjaGFyYWN0ZXIsIGxpa2UgdGhpczoKK1lvdSBjYW4gdXNlIGFsbCBj aGFyYWN0ZXJzIHZhbGlkIGluIHByb3BlcnR5IG5hbWVzIHdoZW4gbWF0Y2hpbmcKK3Byb3Bl cnRpZXMuICBIb3dldmVyLCB5b3UgaGF2ZSB0byBxdW90ZSBzb21lIGNoYXJhY3RlcnMgaW4g cHJvcGVydHkKK25hbWVzIHdpdGggYmFja3NsYXNoZXMgd2hlbiB1c2luZyB0aGVtIGluIHNl YXJjaCBzdHJpbmdzLCBuYW1lbHkgYWxsCitjaGFyYWN0ZXJzIGRpZmZlcmVudCBmcm9tIGFs cGhhbnVtZXJpY3MgYW5kIHVuZGVyc2NvcmVzW2ZuOjogSWYgeW91CitxdW90ZSBhbHBoYW51 bWVyaWMgY2hhcmFjdGVycyBvciB1bmRlcnNjb3JlcyB3aXRoIGEgYmFja3NsYXNoLCB0aGF0 CitiYWNrc2xhc2ggaXMgaWdub3JlZC5dLiAgRm9yIGV4YW1wbGUsIHRvIHNlYXJjaCBmb3Ig YWxsIGVudHJpZXMgaGF2aW5nCithIHByb3BlcnR5ID0tbG9uZ+KAiz1hbmRcdHdpc3RlZDpw cm9wZXJ0eS5uYW1lKj0gd2l0aCB2YWx1ZSA9Zm9vPSwgdXNlCitzZWFyY2ggc3RyaW5nCiAK ICMrYmVnaW5fZXhhbXBsZQotKy1sb25nLWFuZC10d2lzdGVkLXByb3BlcnR5LW5hbWUtPSJm b28iCitcLWxvbmdcPWFuZFxcdHdpc3RlZFw6cHJvcGVydHlcLm5hbWVcKj0iZm9vIgogIytl bmRfZXhhbXBsZQogCi0jK3RleGluZm86IEBub2luZGVudAotV2l0aG91dCB0aGF0IGV4dHJh IHBsdXMgY2hhcmFjdGVyLCB0aGUgbWludXMgY2hhcmFjdGVyIHdvdWxkIGJlIHRha2VuCi10 byBpbmRpY2F0ZSBhIG5lZ2F0aXZlIHNlbGVjdGlvbiBvbiBzZWFyY2ggdGVybQotPWxvbmct YW5kLXR3aXN0ZWQtcHJvcGVydHktbmFtZS3igIs9ImZvbyI9LgotCiBZb3UgY2FuIGNvbmZp Z3VyZSBPcmcgbW9kZSB0byB1c2UgcHJvcGVydHkgaW5oZXJpdGFuY2UgZHVyaW5nCiBhIHNl YXJjaCwgYnV0IGJld2FyZSB0aGF0IHRoaXMgY2FuIHNsb3cgZG93biBzZWFyY2hlcyBjb25z aWRlcmFibHkuCiBTZWUgW1sqUHJvcGVydHkgSW5oZXJpdGFuY2VdXSwgZm9yIGRldGFpbHMu CmRpZmYgLS1naXQgYS9saXNwL29yZy5lbCBiL2xpc3Avb3JnLmVsCmluZGV4IDUwZGYxYjJk OS4uNzhmOGViMmU5IDEwMDY0NAotLS0gYS9saXNwL29yZy5lbAorKysgYi9saXNwL29yZy5l bApAQCAtMTEzMjgsMTUgKzExMzI4LDE0IEBAIFNlZSBhbHNvIGBvcmctc2Nhbi10YWdzJy4i CiAgICAgICAgICAgICAgICJcXCg/MjoiCiAgICAgICAgICAgICAgICAgICA7OyB0YWcgcmVn ZXhwIG1hdGNoCiAgICAgICAgICAgICAgICAgICAie1tefV0rfVxcfCIKLSAgICAgICAgICAg ICAgICAgIDs7IExFVkVMIHByb3BlcnR5IG1hdGNoLiAgRm9yIHNha2Ugb2YgY29uc2lzdGVu Y3ksCi0gICAgICAgICAgICAgICAgICA7OyByZWNvZ25pemUgc3RhcnJlZCBvcGVyYXRvcnMg aGVyZSBhcyB3ZWxsLiAgV2UgZG8KLSAgICAgICAgICAgICAgICAgIDs7IG5vdCBuZWVkIHRv IHByb2Nlc3MgdGhlbSBiZWxvdywgaG93ZXZlciwgc2luY2UKLSAgICAgICAgICAgICAgICAg IDs7IHRoZSBMRVZFTCBwcm9wZXJ0eSBpcyBhbHdheXMgcHJlc2VudC4KLSAgICAgICAgICAg ICAgICAgICJMRVZFTFxcKD8zOiIgb3ByZSAiXFwpXFwqP1xcKD80OlswLTldK1xcKVxcfCIK LSAgICAgICAgICAgICAgICAgIDs7IHJlZ3VsYXIgcHJvcGVydHkgbWF0Y2gKKyAgICAgICAg ICAgICAgICAgIDs7IHByb3BlcnR5IG1hdGNoLiAgVHJ5IHRvIGtlZXAgdGhpcyBzdWJyZSBn ZW5lcmljCisgICAgICAgICAgICAgICAgICA7OyBhbmQgcmF0aGVyIGhhbmRsZSBzcGVjaWFs IHByb3BlcnRpZXMgbGlrZSBMRVZFTAorICAgICAgICAgICAgICAgICAgOzsgYW5kIENBVEVH T1JZIGZ1cnRoZXIgYmVsb3cuICBUaGlzIGVuc3VyZXMgdGhhdAorICAgICAgICAgICAgICAg ICAgOzsgdGhlIHNhbWUgcXVvdGluZyBtZWNoYW5pY3MgY2FuIGJlIHVzZWQgZm9yIGFsbAor ICAgICAgICAgICAgICAgICAgOzsgcHJvcGVydHkgbmFtZXMuCiAgICAgICAgICAgICAgICAg ICAiXFwoPzoiCiAgICAgICAgICAgICAgICAgICAgICAgOzsgcHJvcGVydHkgbmFtZSBbMV0K LSAgICAgICAgICAgICAgICAgICAgICAiXFwoPzU6W1s6YWxudW06XV8tXStcXCkiCisgICAg ICAgICAgICAgICAgICAgICAgIlxcKD81OlxcKD86W1s6YWxudW06XV9dK1xcfFxcXFxbXls6 c3BhY2U6XV1cXCkrXFwpIgogICAgICAgICAgICAgICAgICAgICAgIDs7IG9wZXJhdG9yLCBv cHRpb25hbGx5IHN0YXJyZWQKICAgICAgICAgICAgICAgICAgICAgICAiXFwoPzY6IiBvcHJl ICJcXClcXCg/NzpcXCpcXCk/IgogICAgICAgICAgICAgICAgICAgICAgIDs7IG9wZXJhbmQg KHJlZ2V4cCwgZG91YmxlLXF1b3RlZCBzdHJpbmcsCkBAIC0xMTM1MywxMyArMTEzNTIsMTkg QEAgU2VlIGFsc28gYG9yZy1zY2FuLXRhZ3MnLiIKICAgICAgICAgIChzdGFydCAwKQogICAg ICAgICAgdGFnc21hdGNoIHRvZG9tYXRjaCB0YWdzbWF0Y2hlciB0b2RvbWF0Y2hlcikKIAot ICAgIDs7IFsxXSBUaGUgbWludXMgY2hhcmFjdGVycyBpbiBwcm9wZXJ0eSBuYW1lcyBkbyAq bm90KiBjb25mbGljdAotICAgIDs7IHdpdGggdGhlIGV4Y2x1c2lvbiBvcGVyYXRvciBhYm92 ZSwgc2luY2UgdGhlIG1hbmRhdG9yeQotICAgIDs7IGZvbGxvd2luZyBvcGVyYXRvciBkaXN0 aW5ndWlzaGVzIHRoZXNlIGJvdGggY2FzZXMuCi0gICAgOzsgQWNjb3JkaW5nbHksIG1pbnVz IGNoYXJhY3RlcnMgZG8gbm90IG5lZWQgYW55IHNwZWNpYWwgcXVvdGluZywKLSAgICA7OyBl dmVuIGlmIGh0dHBzOi8vb3JnbW9kZS5vcmcvbGlzdC84N2p6djY3azNwLmZzZkBsb2NhbGhv c3QgYW5kCi0gICAgOzsgY29tbWl0IDE5YjBlMDNmMzJjNjAzMmE2MDE1MGZjNmNiMDdjNmY3 NjZjYjNmNmMgc3VnZ2VzdAotICAgIDs7IG90aGVyd2lzZS4KKyAgICA7OyBbMV0gVGhlIGhp c3Rvcnkgb2YgdGhpcyBwYXJ0aWN1bGFyIHN1YnJlOgorICAgIDs7IC0gXFwoW1s6YWxudW06 XV9dK1xcKSBbcHJlLTE5YjBlMDNdCisgICAgOzsgICBEb2VzIG5vdCBhbGxvdyBmb3IgbWlu dXMgY2hhcmFjdGVycyBpbiBwcm9wZXJ0eSBuYW1lcy4KKyAgICA7OyAtICJcXChcXCg/Oltb OmFsbnVtOl1fXStcXCg/OlxcXFwtXFwpKlxcKStcXCkiIFsxOWIwZTAzXQorICAgIDs7ICAg SW5jb21wbGV0ZSBmaXggb2YgYWJvdmUgaXNzdWUsIHN0aWxsIHJlc3VsdGluZyBpbiwgZS5n LiwKKyAgICA7OyAgIGh0dHBzOi8vb3JnbW9kZS5vcmcvbGlzdC84N2p6djY3azNwLmZzZkBs b2NhbGhvc3QuCisgICAgOzsgLSAiXFwoPzU6W1s6YWxudW06XV8tXStcXCkiIFtmNjg5ZWI0 XQorICAgIDs7ICAgQWxsb3dzIGZvciB1bnF1b3RlZCBtaW51cyBjaGFyYWN0ZXJzIGluIHBy b3BlcnR5IG5hbWVzLCBidXQKKyAgICA7OyAgIGNvbmZsaWN0cyB3aXRoIHNlYXJjaGVzIGxp a2UgLVRBRy1QUk9QPSJWQUxVRSIuICBTZWUKKyAgICA7OyAgIGh0dHBzOi8vb3JnbW9kZS5v cmcvbGlzdC84N2g2b3EybnUxLmZzZkBnbWFpbC5jb20uCisgICAgOzsgLSBjdXJyZW50IHN1 YnJlCisgICAgOzsgICBMaWtlIHNlY29uZCBzb2x1dGlvbiwgYnV0IHdpdGggcHJvcGVyIHVu cXVvdGluZyBhbmQgYWxsb3dpbmcKKyAgICA7OyAgIGZvciBhbGwgcG9zc2libGUgY2hhcmFj dGVycyBpbiBwcm9wZXJ0eSBuYW1lcyB0byBiZSBxdW90ZWQuCiAKICAgICA7OyBFeHBhbmQg Z3JvdXAgdGFncy4KICAgICAoc2V0cSBtYXRjaCAob3JnLXRhZ3MtZXhwYW5kIG1hdGNoKSkK QEAgLTExNDA0LDIyICsxMTQwOSwyOCBAQCBTZWUgYWxzbyBgb3JnLXNjYW4tdGFncycuIgog CQkgICA7OyBleGFjdCB0YWcgbWF0Y2ggaW4gWzNdLgogCQkgICAodGFnIChtYXRjaC1zdHJp bmcgMiB0ZXJtKSkKIAkJICAgKHJlZ2V4cCAoZXEgKHN0cmluZy10by1jaGFyIHRhZykgP3sp KQotCQkgICAobGV2ZWxwIChtYXRjaC1lbmQgNCkpCiAJCSAgIChwcm9wcCAobWF0Y2gtZW5k IDUpKQogCQkgICAobW0KIAkJICAgIChjb25kCiAJCSAgICAgKHJlZ2V4cAkJCTsgWzJdCiAg ICAgICAgICAgICAgICAgICAgICAgYCh3aXRoLXN5bnRheC10YWJsZSBvcmctbW9kZS10YWdz LXN5bnRheC10YWJsZQogICAgICAgICAgICAgICAgICAgICAgICAgIChvcmctbWF0Y2gtYW55 LXAgLChzdWJzdHJpbmcgdGFnIDEgLTEpIHRhZ3MtbGlzdCkpKQotCQkgICAgIChsZXZlbHAK LQkJICAgICAgYCgsKG9yZy1vcC10by1mdW5jdGlvbiAobWF0Y2gtc3RyaW5nIDMgdGVybSkp Ci0JCQlsZXZlbAotCQkJLChzdHJpbmctdG8tbnVtYmVyIChtYXRjaC1zdHJpbmcgNCB0ZXJt KSkpKQogCQkgICAgIChwcm9wcAotCQkgICAgICAobGV0KiAoOzsgQ29udmVydCBwcm9wZXJ0 eSBuYW1lIHRvIGFuIEVsaXNwCisJCSAgICAgIChsZXQqICg7OyBEZXRlcm1pbmUgcHJvcGVy dHkgbmFtZS4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKHBuICh1cGNhc2UKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAoc2F2ZS1tYXRjaC1kYXRhCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocmVwbGFjZS1yZWdleHAtaW4tc3Ry aW5nCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIlxcXFxcXCguXFwp IiAiXFwxIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChtYXRjaC1z dHJpbmcgNSB0ZXJtKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHQg bmlsKSkpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBDb252ZXJ0IHByb3Bl cnR5IG5hbWUgdG8gYW4gRWxpc3AKIAkJCSAgICAgOzsgYWNjZXNzb3IgZm9yIHRoYXQgcHJv cGVydHkgKGFrYS4gYXMKLQkJCSAgICAgOzsgZ2V0dGVyIHZhbHVlKS4KLQkJCSAgICAgKGd2 IChwY2FzZSAodXBjYXNlIChtYXRjaC1zdHJpbmcgNSB0ZXJtKSkKKwkJCSAgICAgOzsgZ2V0 dGVyIHZhbHVlKS4gIFN5bWJvbHMgTEVWRUwgYW5kIFRPRE8KKwkJCSAgICAgOzsgcmVmZXJl bmNlZCBiZWxvdyBnZXQgYm91bmQgYnkgdGhlCisJCQkgICAgIDs7IG1hdGNoZXIgdGhhdCB0 aGlzIGZ1bmN0aW9uIHJldHVybnMuCisJCQkgICAgIChndiAocGNhc2UgcG4KKwkJCQkgICAo IkxFVkVMIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJyhudW1iZXIt dG8tc3RyaW5nIGxldmVsKSkKIAkJCQkgICAoIkNBVEVHT1JZIgogCQkJCSAgICAnKG9yZy1n ZXQtY2F0ZWdvcnkgKHBvaW50KSkpCiAJCQkJICAgKCJUT0RPIiAndG9kbykKZGlmZiAtLWdp dCBhL3Rlc3RpbmcvbGlzcC90ZXN0LW9yZy5lbCBiL3Rlc3RpbmcvbGlzcC90ZXN0LW9yZy5l bAppbmRleCBlMzNmNTAwYTMuLjgzNTVlMmQ3NyAxMDA2NDQKLS0tIGEvdGVzdGluZy9saXNw L3Rlc3Qtb3JnLmVsCisrKyBiL3Rlc3RpbmcvbGlzcC90ZXN0LW9yZy5lbApAQCAtMjg2Miwx MSArMjg2MiwyNCBAQCB0ZXN0IDxwb2ludD4KICAgICAgKGVxdWFsICcoMTEpCiAJICAgIChv cmctdGVzdC13aXRoLXRlbXAtdGV4dCAiKiBMZXZlbCAxXG4qKiBMZXZlbCAyIgogCSAgICAg IChsZXQgKG9yZy1vZGQtbGV2ZWxzLW9ubHkpIChvcmctbWFwLWVudHJpZXMgIydwb2ludCAi TEVWRUw+MSIpKSkpKQotICAgIDs7IExldmVsIG1hdGNoIHdpdGggKGlnbm9yZWQpIHN0YXJy ZWQgb3BlcmF0b3IuCisgICAgOzsgQ2F0ZWdvcnkgbWF0Y2guCiAgICAgKHNob3VsZAotICAg ICAoZXF1YWwgJygxMSkKLQkgICAgKG9yZy10ZXN0LXdpdGgtdGVtcC10ZXh0ICIqIExldmVs IDFcbioqIExldmVsIDIiCi0JICAgICAgKGxldCAob3JnLW9kZC1sZXZlbHMtb25seSkgKG9y Zy1tYXAtZW50cmllcyAjJ3BvaW50ICJMRVZFTD4qMSIpKSkpKQorICAgICAoZXF1YWwgJyg1 OSkKKwkgICAgKG9yZy10ZXN0LXdpdGgtdGVtcC10ZXh0ICIKKyMrQ0FURUdPUlk6IGZvbwor CisqIEgxCis6UFJPUEVSVElFUzoKKzpDQVRFR09SWTogYmFyCis6RU5EOgorCisqIEgyIgor CSAgICAgIChvcmctbWFwLWVudHJpZXMgIydwb2ludCAiQ0FURUdPUlk9XCJmb29cIiIpKSkp CisgICAgOzsgVG9kbyBtYXRjaC4KKyAgICAoc2hvdWxkCisgICAgIChlcXVhbCAnKDYpCisJ ICAgIChvcmctdGVzdC13aXRoLXRlbXAtdGV4dCAiKiBIMVxuKiBUT0RPIEgyXG4qIERPTkUg SDMiCisJICAgICAgKG9yZy1tYXAtZW50cmllcyAjJ3BvaW50ICJUT0RPPVwiVE9ET1wiIikp KSkKICAgICA7OyBUYWcgbWF0Y2guCiAgICAgKHNob3VsZAogICAgICAoZXF1YWwgJygxMSkK QEAgLTI5NDgsNyArMjk2MSw3IEBAIFNDSEVEVUxFRDogPDIwMTQtMDMtMDQgdHVlLj4iCiA6 RU5EOgogKiBIMyIKIAkgICAgICAob3JnLW1hcC1lbnRyaWVzICMncG9pbnQgIlRFU1QhPSox IikpKSkKLSAgICA7OyBQcm9wZXJ0eSBtYXRjaGVzIG9uIG5hbWVzIGluY2x1ZGluZyBtaW51 cyBjaGFyYWN0ZXJzLgorICAgIDs7IFByb3BlcnR5IG1hdGNoZXMgb24gbmFtZXMgY29udGFp bmluZyBxdW90ZWQgY2hhcmFjdGVycy4KICAgICAob3JnLXRlc3Qtd2l0aC10ZW1wLXRleHQK ICAgICAgIgogKiBIMSA6QkFSOgpAQCAtMjk2NywxMSArMjk4MCwxMiBAQCBTQ0hFRFVMRUQ6 IDwyMDE0LTAzLTA0IHR1ZS4+IgogOlBST1BFUlRJRVM6CiA6LUZPTzogMgogOkVORDoKLSog SDUiCi0gICAgIChzaG91bGQgKGVxdWFsICcoMikgKG9yZy1tYXAtZW50cmllcyAjJ3BvaW50 ICJURVNULUZPTyE9KjAtRk9PIikpKQotICAgICAoc2hvdWxkIChlcXVhbCAnKDIpIChvcmct bWFwLWVudHJpZXMgIydwb2ludCAiLUZPTytURVNULUZPTyE9KjAiKSkpCi0gICAgIChzaG91 bGQgKGVxdWFsICcoODgpIChvcmctbWFwLWVudHJpZXMgIydwb2ludCAiKy1GT08hPSowLUZP TyIpKSkKLSAgICAgKHNob3VsZCAoZXF1YWwgJyg4OCkgKG9yZy1tYXAtZW50cmllcyAjJ3Bv aW50ICItRk9PKy1GT08hPSowIikpKSkKKyogSDUgOlRFU1Q6IgorICAgICAoc2hvdWxkIChl cXVhbCAnKDIpIChvcmctbWFwLWVudHJpZXMgIydwb2ludCAiVEVTVFxcLUZPTyE9KjAtRk9P IikpKQorICAgICAoc2hvdWxkIChlcXVhbCAnKDIpIChvcmctbWFwLWVudHJpZXMgIydwb2lu dCAiLUZPTytURVNUXFwtRk9PIT0qMCIpKSkKKyAgICAgKHNob3VsZCAoZXF1YWwgJyg4OCkg KG9yZy1tYXAtZW50cmllcyAjJ3BvaW50ICJcXC1GT08hPSowLUZPTyIpKSkKKyAgICAgKHNo b3VsZCAoZXF1YWwgJyg4OCkgKG9yZy1tYXAtZW50cmllcyAjJ3BvaW50ICItRk9PK1xcLUZP TyE9KjAiKSkpCisgICAgIChzaG91bGQgKGVxdWFsICcoODgpIChvcmctbWFwLWVudHJpZXMg Iydwb2ludCAiLVRFU1QtRk9PLVRFU1RcXC1GT089MSIpKSkpCiAgICAgOzsgTXVsdGlwbGUg Y3JpdGVyaWEuCiAgICAgKHNob3VsZAogICAgICAoZXF1YWwgJygyMykKLS0gCjIuMzAuMgoK --------------C0tif4V1IhStZXFQ0LoQ8ybQ--