From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#60186: 29.0.60; ruby-mode indentation of multi-line expressions Date: Wed, 28 Dec 2022 23:24:06 +0200 Message-ID: <118143a7-0703-2538-9853-7009064e7bca@yandex.ru> References: <60e207e0-7378-ad9f-3ef0-99df1c139939@yandex.ru> <902440c7-706a-20e1-55af-4e12e8cdda2c@yandex.ru> <688159e9-f6bc-f233-08c4-9834bc00c455@yandex.ru> <74f977f6-d9ba-04bd-fba0-0dce4729cf0d@yandex.ru> <8d554fc2-7da5-cfe1-c865-023d56d222e3@yandex.ru> <95adedfa-7644-c78b-8853-fde8ec38f621@yandex.ru> <44ccf2d5-789f-f122-34f9-25871fdf1283@yandex.ru> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------N8VyiyMKWpRHeE3EBtUfggWL" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24012"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Cc: 60186@debbugs.gnu.org To: Aaron Jensen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 28 22:25:12 2022 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 1pAdvD-00063f-Vf for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 28 Dec 2022 22:25:12 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pAdv6-0006t6-0z; Wed, 28 Dec 2022 16:25:04 -0500 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 1pAdv5-0006su-2e for bug-gnu-emacs@gnu.org; Wed, 28 Dec 2022 16:25:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pAdv4-00058J-PZ for bug-gnu-emacs@gnu.org; Wed, 28 Dec 2022 16:25:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pAdv4-0006bh-1i for bug-gnu-emacs@gnu.org; Wed, 28 Dec 2022 16:25:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 28 Dec 2022 21:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60186 X-GNU-PR-Package: emacs Original-Received: via spool by 60186-submit@debbugs.gnu.org id=B60186.167226265825317 (code B ref 60186); Wed, 28 Dec 2022 21:25:02 +0000 Original-Received: (at 60186) by debbugs.gnu.org; 28 Dec 2022 21:24:18 +0000 Original-Received: from localhost ([127.0.0.1]:58816 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAduL-0006aC-Lx for submit@debbugs.gnu.org; Wed, 28 Dec 2022 16:24:18 -0500 Original-Received: from mail-ej1-f54.google.com ([209.85.218.54]:42827) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pAduI-0006Zw-6S for 60186@debbugs.gnu.org; Wed, 28 Dec 2022 16:24:15 -0500 Original-Received: by mail-ej1-f54.google.com with SMTP id tz12so40947290ejc.9 for <60186@debbugs.gnu.org>; Wed, 28 Dec 2022 13:24:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:references:cc:to:from:content-language:subject :user-agent:mime-version:date:message-id:sender:from:to:cc:subject :date:message-id:reply-to; bh=BVmWm87v/4uBp2GSt8kaiAtc7RBmpV7JtGQ20QxDVGk=; b=IRHF5GDAjwLY/CMVdFLJfYRKrv4nnazhe/znQAEuPyk5ETymhodNgW6gZoRAUw6M/o pTL0XA9+SHpmbqclSVCDJ0a1RtFUp9wItCXCpo3KJ2SMtyeoAdBjJsyRhhZBPKjDVYtC mm721m+bFi4cGdjYZbIKugIZ94O2ylPnxcdE72/Tb85GQFCgEJ1L2S7iqOGwR7Ku5Sb+ rJE9vRoHKIf0DNbyDJlaqqfwrnes4QI0ilNYTr5dJtYBkWJeWbKJZEFYSMKRPSdKeT6o 6JLTKXNazSBMECY4Z1SXVlZUu7beSLY521i8dC9Rt3kykA1o7NQZm34nIj+D0sDngdeD Hf6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:references:cc:to:from:content-language:subject :user-agent:mime-version:date:message-id:sender:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=BVmWm87v/4uBp2GSt8kaiAtc7RBmpV7JtGQ20QxDVGk=; b=EQhm2CPL7LP1fW/YNOc2sLgAE8U2cqrfJ6nEwfw98vlXr5T/zA6vGXvrMp0IS0Bitm RA0ogDz5jXPPHdBCtzqE7PwXZ+/v6GLid7WZX2NvH12Pqy9feTD55TqHzirHOJ6oXAf3 /9jLPt68U6AchEPR+FEapc0V9cuE+5NGO1lxSPaCbF5m5/zwv4yxx2JgXveVQQSQkZ07 cVVsKnPmoM2Jzu7lQ6oS/1iYtt0hjNwJP5K40Wb4EUkJP+wYNT67BNDDpK7StCsnwpYA TQX516RSm/7XTHDQxmkto3TWrIZcTrXc3g/5wSBWDnvkV9ZJpP1wM7nSL5bheQAJj0Lj UvHg== X-Gm-Message-State: AFqh2koU7mA76Mu9fz/Ob218zGuWLz6uW3Eosvt4EFkRGcyHvpLGPmbG yG/3rUd+TTmG/vxDUfSSBtQ= X-Google-Smtp-Source: AMrXdXu6MnOMveQxLHFEO6WLW/4TYadgrywQJChw0uIkwkBygE2u1gnCTVLxgcUk0q2TcUwgkNH4Xw== X-Received: by 2002:a17:907:cbc7:b0:846:ccf3:d901 with SMTP id vk7-20020a170907cbc700b00846ccf3d901mr25556117ejc.52.1672262648249; Wed, 28 Dec 2022 13:24:08 -0800 (PST) Original-Received: from [192.168.0.2] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id ky14-20020a170907778e00b007c4f8bc322asm7771705ejc.196.2022.12.28.13.24.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 28 Dec 2022 13:24:07 -0800 (PST) Content-Language: en-US In-Reply-To: <44ccf2d5-789f-f122-34f9-25871fdf1283@yandex.ru> 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:252001 Archived-At: This is a multi-part message in MIME format. --------------N8VyiyMKWpRHeE3EBtUfggWL Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 28/12/2022 14:47, Dmitry Gutov wrote: > I guess that particular trend started with ruby-method-params-indent, > where I haven't managed to choose better names for the var, or the values. Semantics aside (I suppose we could go back and revise the naming a little later), could you test this new revision of the patch? I think I got the implementation simple enough now. The number of options has grown, though: (setq ruby-after-operator-indent nil ruby-block-indent nil ruby-method-call-indent nil ruby-parenless-call-arguments-indent nil) --------------N8VyiyMKWpRHeE3EBtUfggWL Content-Type: text/x-patch; charset=UTF-8; name="ruby-simplified-indent-v6.diff" Content-Disposition: attachment; filename="ruby-simplified-indent-v6.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS5lbCBiL2xpc3AvcHJvZ21v ZGVzL3J1YnktbW9kZS5lbAppbmRleCBhNGFhNjE5MDVlNC4uMDIxZGRhMWEzZTEgMTAwNjQ0 Ci0tLSBhL2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS5lbAorKysgYi9saXNwL3Byb2dtb2Rl cy9ydWJ5LW1vZGUuZWwKQEAgLTI4NSw2ICsyODUsOTIgQEAgcnVieS1tZXRob2QtcGFyYW1z LWluZGVudAogICA6c2FmZSAobGFtYmRhICh2YWwpIChvciAobWVtcSB2YWwgJyh0IG5pbCkp IChudW1iZXJwIHZhbCkpKQogICA6dmVyc2lvbiAiMjkuMSIpCiAKKyhkZWZjdXN0b20gcnVi eS1ibG9jay1pbmRlbnQgdAorICAiTm9uLW5pbCB0byBhbGlnbiB0aGUgYm9keSBvZiBhIGJs b2NrIHRvIHRoZSBzdGF0ZW1lbnQncyBzdGFydC4KKworVGhlIGJvZHkgYW5kIHRoZSBjbG9z ZXIgd2lsbCBiZSBhbGlnbmVkIHRvIHRoZSBjb2x1bW4gd2hlcmUgdGhlCitzdGF0ZW1lbnQg Y29udGFpbmluZyB0aGUgYmxvY2sgc3RhcnRzLiBFeGFtcGxlOgorCisgIGZvby5iYXIKKyAg ICAuZWFjaCBkbworICAgIGJhegorICBlbmQKKworSWYgbmlsLCBpdCB3aWxsIGJlIGFsaWdu ZWQgaW5zdGVhZCB0byB0aGUgYmVnaW5uaW5nIG9mIHRoZSBsaW5lCitjb250YWluaW5nIHRo ZSBibG9jaydzIG9wZW5lcjoKKworICBmb28uYmFyCisgICAgLmVhY2ggZG8KKyAgICAgIGJh egorICAgIGVuZAorCitPbmx5IGhhcyBlZmZlY3Qgd2hlbiBgcnVieS11c2Utc21pZScgaXMg dC4iCisgIDp0eXBlICdib29sZWFuCisgIDpzYWZlICdib29sZWFucCkKKworKGRlZmN1c3Rv bSBydWJ5LWFmdGVyLW9wZXJhdG9yLWluZGVudCB0CisgICJOb24tbmlsIHRvIHVzZSBzdHJ1 Y3R1cmFsIGluZGVudGF0aW9uIGFmdGVyIGJpbmFyeSBvcGVyYXRvcnMuCisKK1RoZSBjb2Rl IHdpbGwgYmUgYWxpZ25lZCB0byB0aGUgaW1wbGljaXQgcGFyZW50IGV4cHJlc3Npb24sCith Y2NvcmRpbmcgdG8gdGhlIG9wZXJhdG9yIHByZWNlZGVuY2U6CisKKyAgcXV4ID0gNCArIDUg KgorICAgICAgICAgICAgNiArCisgICAgICAgIDcKKworU2V0IGl0IHRvIG5pbCB0byBhbGln biB0byB0aGUgYmVnaW5uaW5nIG9mIHRoZSBzdGF0ZW1lbnQ6CisKKyAgcXV4ID0gNCArIDUg KgorICAgIDYgKworICAgIDcKKworT25seSBoYXMgZWZmZWN0IHdoZW4gYHJ1YnktdXNlLXNt aWUnIGlzIHQuIgorICA6dHlwZSAnYm9vbGVhbgorICA6c2FmZSAnYm9vbGVhbnApCisKKyhk ZWZjdXN0b20gcnVieS1tZXRob2QtY2FsbC1pbmRlbnQgdAorICAiTm9uLW5pbCB0byB1c2Ug dGhlIHN0cnVjdHVyYWwgaW5kZW50YXRpb24gYWxnb3JpdGhtLgorCitUaGUgbWV0aG9kIGNh bGwgd2lsbCBiZSBhbGlnbmVkIHRvIHRoZSBpbXBsaWNpdCBwYXJlbnQKK2V4cHJlc3Npb24s IGFjY29yZGluZyB0byB0aGUgb3BlcmF0b3IgcHJlY2VkZW5jZToKKworICBmb28gPSBzdWJq ZWN0CisgICAgICAgICAgLnVwZGF0ZSgKKyAgICAgICAgICAgIDEKKyAgICAgICAgICApCisK K1NldCBpdCB0byBuaWwgdG8gYWxpZ24gdG8gdGhlIGJlZ2lubmluZyBvZiB0aGUgc3RhdGVt ZW50OgorCisgIGZvbyA9IHN1YmplY3QKKyAgICAudXBkYXRlKAorICAgICAgMQorICAgICkK KworT25seSBoYXMgZWZmZWN0IHdoZW4gYHJ1YnktdXNlLXNtaWUnIGlzIHQuIgorICA6dHlw ZSAnYm9vbGVhbgorICA6c2FmZSAnYm9vbGVhbnApCisKKyhkZWZjdXN0b20gcnVieS1wYXJl bmxlc3MtY2FsbC1hcmd1bWVudHMtaW5kZW50IHQKKyAgIk5vbi1uaWwgdG8gYWxpZ24gYXJn dW1lbnRzIGluIGEgcGFyZW5sZXNzIGNhbGwgdmVydGljYWxseS4KKworRXhhbXBsZToKKwor ICBxdXggOissCisgICAgICBiYXIsCisgICAgICA6W109LAorICAgICAgYmFyCisKK1NldCBp dCB0byBuaWwgdG8gYWxpZ24gdG8gdGhlIGJlZ2lubmluZyBvZiB0aGUgc3RhdGVtZW50Ogor CisgIHF1eCA6KywKKyAgICBiYXIsCisgICAgOltdPSwKKyAgICBiYXIKKworT25seSBoYXMg ZWZmZWN0IHdoZW4gYHJ1YnktdXNlLXNtaWUnIGlzIHQuIgorICA6dHlwZSAnYm9vbGVhbgor ICA6c2FmZSAnYm9vbGVhbnApCisKIChkZWZjdXN0b20gcnVieS1kZWVwLWFyZ2xpc3QgdAog ICAiRGVlcCBpbmRlbnQgbGlzdHMgaW4gcGFyZW50aGVzaXMgd2hlbiBub24tbmlsLgogQWxz byBpZ25vcmVzIHNwYWNlcyBhZnRlciBwYXJlbnRoZXNpcyB3aGVuIGBzcGFjZScuCkBAIC00 MTYsNiArNTAyLDcgQEAgcnVieS1zbWllLWdyYW1tYXIKICAgICAgJygocmlnaHQgIj0iKQog ICAgICAgIChyaWdodCAiKz0iICItPSIgIio9IiAiLz0iICIlPSIgIioqPSIgIiY9IiAifD0i ICJePSIKICAgICAgICAgICAgICAgIjw8PSIgIj4+PSIgIiYmPSIgInx8PSIpCisgICAgICAg KHJpZ2h0ICI/IikKICAgICAgICAobm9uYXNzb2MgIi4uIiAiLi4uIikKICAgICAgICAobGVm dCAiJiYiICJ8fCIpCiAgICAgICAgKG5vbmFzc29jICI8PT4iKQpAQCAtNjA4LDEwICs2OTUs MTAgQEAgcnVieS1zbWllLS1iYWNrd2FyZC10b2tlbgogICAgICAgICAgICJkZWY9IikKICAg ICAgICAgICh0IHRvaykpKSkpKSkKIAotKGRlZnVuIHJ1Ynktc21pZS0taW5kZW50LXRvLXN0 bXQgKCkKKyhkZWZ1biBydWJ5LXNtaWUtLWluZGVudC10by1zdG10ICgmb3B0aW9uYWwgb2Zm c2V0KQogICAoc2F2ZS1leGN1cnNpb24KICAgICAoc21pZS1iYWNrd2FyZC1zZXhwICI7IikK LSAgICAoY29ucyAnY29sdW1uIChzbWllLWluZGVudC12aXJ0dWFsKSkpKQorICAgIChjb25z ICdjb2x1bW4gKCsgKHNtaWUtaW5kZW50LXZpcnR1YWwpIChvciBvZmZzZXQgMCkpKSkpCiAK IChkZWZ1biBydWJ5LXNtaWUtLWluZGVudC10by1zdG10LXAgKGtleXdvcmQpCiAgIChvciAo ZXEgdCBydWJ5LWFsaWduLXRvLXN0bXQta2V5d29yZHMpCkBAIC02NDIsNyArNzI5LDkgQEAg cnVieS1zbWllLXJ1bGVzCiAgICAgICAgICAgICAgIChmb3J3YXJkLWNvbW1lbnQgLTEpCiAg ICAgICAgICAgICAgIChub3QgKGVxIChwcmVjZWRpbmctY2hhcikgPzopKSkpCiAgICAgICAg OzsgQ3VybHkgYmxvY2sgb3BlbmVyLgotICAgICAgIChydWJ5LXNtaWUtLWluZGVudC10by1z dG10KSkKKyAgICAgICAoaWYgcnVieS1ibG9jay1pbmRlbnQKKyAgICAgICAgICAgKHJ1Ynkt c21pZS0taW5kZW50LXRvLXN0bXQpCisgICAgICAgICAoY29ucyAnY29sdW1uIChjdXJyZW50 LWluZGVudGF0aW9uKSkpKQogICAgICAgKChzbWllLXJ1bGUtaGFuZ2luZy1wKQogICAgICAg IDs7IFRyZWF0IHB1cmVseSBzeW50YWN0aWMgYmxvY2stY29uc3RydWN0cyBhcyBiZWluZyBw YXJ0IG9mIHRoZWlyIHBhcmVudCwKICAgICAgICA7OyB3aGVuIHRoZSBvcGVuaW5nIHRva2Vu IGlzIGhhbmdpbmcgYW5kIHRoZSBwYXJlbnQgaXMgbm90IGFuCkBAIC02NzcsMTMgKzc2Niwy MCBAQCBydWJ5LXNtaWUtcnVsZXMKICAgICAgICAodW5sZXNzIChvciAoZW9scCkgKGZvcndh cmQtY29tbWVudCAxKSkKICAgICAgICAgIChjb25zICdjb2x1bW4gKGN1cnJlbnQtY29sdW1u KSkpKSkKICAgICAoJyg6YmVmb3JlIC4gIiBAICIpCi0gICAgIChpZiAob3IgKGVxIHJ1Ynkt bWV0aG9kLXBhcmFtcy1pbmRlbnQgdCkKLSAgICAgICAgICAgICAobm90IChzbWllLXJ1bGUt cGFyZW50LXAgImRlZiIgImRlZj0iKSkpCi0gICAgICAgICAoc2F2ZS1leGN1cnNpb24KLSAg ICAgICAgICAgKHNraXAtY2hhcnMtZm9yd2FyZCAiIFx0IikKLSAgICAgICAgICAgKGNvbnMg J2NvbHVtbiAoY3VycmVudC1jb2x1bW4pKSkKLSAgICAgICAoc21pZS1ydWxlLXBhcmVudCAo b3IgcnVieS1tZXRob2QtcGFyYW1zLWluZGVudCAwKSkpKQotICAgICgnKDpiZWZvcmUgLiAi ZG8iKSAocnVieS1zbWllLS1pbmRlbnQtdG8tc3RtdCkpCisgICAgIChjb25kCisgICAgICAo KGFuZCAobm90IHJ1YnktcGFyZW5sZXNzLWNhbGwtYXJndW1lbnRzLWluZGVudCkKKyAgICAg ICAgICAgIChub3QgKHNtaWUtcnVsZS1wYXJlbnQtcCAiZGVmIiAiZGVmPSIpKSkKKyAgICAg ICAocnVieS1zbWllLS1pbmRlbnQtdG8tc3RtdCBydWJ5LWluZGVudC1sZXZlbCkpCisgICAg ICAoKG9yIChlcSBydWJ5LW1ldGhvZC1wYXJhbXMtaW5kZW50IHQpCisgICAgICAgICAgIChu b3QgKHNtaWUtcnVsZS1wYXJlbnQtcCAiZGVmIiAiZGVmPSIpKSkKKyAgICAgICAoc2F2ZS1l eGN1cnNpb24KKyAgICAgICAgIChza2lwLWNoYXJzLWZvcndhcmQgIiBcdCIpCisgICAgICAg ICAoY29ucyAnY29sdW1uIChjdXJyZW50LWNvbHVtbikpKSkKKyAgICAgICh0IChzbWllLXJ1 bGUtcGFyZW50IChvciBydWJ5LW1ldGhvZC1wYXJhbXMtaW5kZW50IDApKSkpKQorICAgICgn KDpiZWZvcmUgLiAiZG8iKQorICAgICAoaWYgcnVieS1ibG9jay1pbmRlbnQKKyAgICAgICAg IChydWJ5LXNtaWUtLWluZGVudC10by1zdG10KQorICAgICAgIChjb25zICdjb2x1bW4gKGN1 cnJlbnQtaW5kZW50YXRpb24pKSkpCiAgICAgKCcoOmJlZm9yZSAuICIuIikKICAgICAgKGlm IChzbWllLXJ1bGUtc2libGluZy1wKQogICAgICAgICAgKHdoZW4gcnVieS1hbGlnbi1jaGFp bmVkLWNhbGxzCkBAIC02OTYsOCArNzkyLDEwIEBAIHJ1Ynktc21pZS1ydWxlcwogICAgICAg ICAgICAgICAgICAgIChub3QgKHNtaWUtcnVsZS1ib2xwKSkpKSkKICAgICAgICAgICAgKGNv bnMgJ2NvbHVtbiAoY3VycmVudC1jb2x1bW4pKSkKICAgICAgICAoc21pZS1iYWNrd2FyZC1z ZXhwICIuIikKLSAgICAgICAoY29ucyAnY29sdW1uICgrIChjdXJyZW50LWNvbHVtbikKLSAg ICAgICAgICAgICAgICAgICAgICAgIHJ1YnktaW5kZW50LWxldmVsKSkpKQorICAgICAgIChp ZiBydWJ5LW1ldGhvZC1jYWxsLWluZGVudAorICAgICAgICAgICAoY29ucyAnY29sdW1uICgr IChjdXJyZW50LWNvbHVtbikKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBydWJ5LWlu ZGVudC1sZXZlbCkpCisgICAgICAgICAocnVieS1zbWllLS1pbmRlbnQtdG8tc3RtdCBydWJ5 LWluZGVudC1sZXZlbCkpKSkKICAgICAoYCg6YmVmb3JlIC4gLChvciAiZWxzZSIgInRoZW4i ICJlbHNpZiIgInJlc2N1ZSIgImVuc3VyZSIpKQogICAgICAoc21pZS1ydWxlLXBhcmVudCkp CiAgICAgKGAoOmJlZm9yZSAuICwob3IgIndoZW4iICJpbiIpKQpAQCAtNzA4LDE2ICs4MDYs MjIgQEAgcnVieS1zbWllLXJ1bGVzCiAgICAgICAgICAgICAgICAgICAgICAiPD0+IiAiPiIg IjwiICI+PSIgIjw9IiAiPT0iICI9PT0iICIhPSIgIjw8IiAiPj4iCiAgICAgICAgICAgICAg ICAgICAgICAiKz0iICItPSIgIio9IiAiLz0iICIlPSIgIioqPSIgIiY9IiAifD0iICJePSIg InwiCiAgICAgICAgICAgICAgICAgICAgICAiPDw9IiAiPj49IiAiJiY9IiAifHw9IiAiYW5k IiAib3IiKSkKLSAgICAgKGFuZCAoc21pZS1ydWxlLXBhcmVudC1wICI7IiBuaWwpCi0gICAg ICAgICAgKHNtaWUtaW5kZW50LS1oYW5naW5nLXApCi0gICAgICAgICAgcnVieS1pbmRlbnQt bGV2ZWwpKQorICAgICAoY29uZAorICAgICAgKChub3QgcnVieS1hZnRlci1vcGVyYXRvci1p bmRlbnQpCisgICAgICAgKHJ1Ynktc21pZS0taW5kZW50LXRvLXN0bXQgcnVieS1pbmRlbnQt bGV2ZWwpKQorICAgICAgKChhbmQgKHNtaWUtcnVsZS1wYXJlbnQtcCAiOyIgbmlsKQorICAg ICAgICAgICAgKHNtaWUtaW5kZW50LS1oYW5naW5nLXApKQorICAgICAgIHJ1YnktaW5kZW50 LWxldmVsKSkpCiAgICAgKGAoOmJlZm9yZSAuICI9IikKICAgICAgKHNhdmUtZXhjdXJzaW9u CiAgICAgICAoYW5kIChzbWllLXJ1bGUtcGFyZW50LXAgIiBAICIpCiAgICAgICAgICAgIChn b3RvLWNoYXIgKG50aCAxIChzbWllLWluZGVudC0tcGFyZW50KSkpCiAgICAgICAgICAgIChz bWllLXJ1bGUtcHJldi1wICJkZWY9IikKICAgICAgICAgICAgKGNvbnMgJ2NvbHVtbiAoKyAo Y3VycmVudC1jb2x1bW4pIHJ1YnktaW5kZW50LWxldmVsIC0zKSkpKSkKLSAgICAoYCg6YWZ0 ZXIgLiAsKG9yICI/IiAiOiIpKSBydWJ5LWluZGVudC1sZXZlbCkKKyAgICAoYCg6YWZ0ZXIg LiAsKG9yICI/IiAiOiIpKQorICAgICAoaWYgcnVieS1hZnRlci1vcGVyYXRvci1pbmRlbnQK KyAgICAgICAgIHJ1YnktaW5kZW50LWxldmVsCisgICAgICAgKHJ1Ynktc21pZS0taW5kZW50 LXRvLXN0bXQgcnVieS1pbmRlbnQtbGV2ZWwpKSkKICAgICAoYCg6YmVmb3JlIC4gLChndWFy ZCAobWVtcSAoaW50ZXJuLXNvZnQgdG9rZW4pIHJ1YnktYWxpZ25hYmxlLWtleXdvcmRzKSkp CiAgICAgICh3aGVuIChub3QgKHJ1YnktLWF0LWluZGVudGF0aW9uLXApKQogICAgICAgIChp ZiAocnVieS1zbWllLS1pbmRlbnQtdG8tc3RtdC1wIHRva2VuKQpAQCAtNzI1LDcgKzgyOSwx MCBAQCBydWJ5LXNtaWUtcnVsZXMKICAgICAgICAgIChjb25zICdjb2x1bW4gKGN1cnJlbnQt Y29sdW1uKSkpKSkKICAgICAoJyg6YmVmb3JlIC4gIml1d3UtbW9kIikKICAgICAgKHNtaWUt cnVsZS1wYXJlbnQgcnVieS1pbmRlbnQtbGV2ZWwpKQotICAgICkpCisgICAgKGAoOmJlZm9y ZSAuICIsIikKKyAgICAgKGFuZCAobm90IHJ1YnktcGFyZW5sZXNzLWNhbGwtYXJndW1lbnRz LWluZGVudCkKKyAgICAgICAgICAoc21pZS1ydWxlLXBhcmVudC1wICIgQCAiKQorICAgICAg ICAgIChydWJ5LXNtaWUtLWluZGVudC10by1zdG10IHJ1YnktaW5kZW50LWxldmVsKSkpKSkK IAogKGRlZnVuIHJ1YnktLWF0LWluZGVudGF0aW9uLXAgKCZvcHRpb25hbCBwb2ludCkKICAg KHNhdmUtZXhjdXJzaW9uCmRpZmYgLS1naXQgYS90ZXN0L2xpc3AvcHJvZ21vZGVzL3J1Ynkt bW9kZS1yZXNvdXJjZXMvcnVieS1hZnRlci1vcGVyYXRvci1pbmRlbnQucmIgYi90ZXN0L2xp c3AvcHJvZ21vZGVzL3J1YnktbW9kZS1yZXNvdXJjZXMvcnVieS1hZnRlci1vcGVyYXRvci1p bmRlbnQucmIKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLjI1Y2Q4 NzM2Zjk3Ci0tLSAvZGV2L251bGwKKysrIGIvdGVzdC9saXNwL3Byb2dtb2Rlcy9ydWJ5LW1v ZGUtcmVzb3VyY2VzL3J1YnktYWZ0ZXItb3BlcmF0b3ItaW5kZW50LnJiCkBAIC0wLDAgKzEs MjkgQEAKKzQgKworICA1ICsKKyAgNiArCisgIDcKKworcXV4ID0gNCArIDUgKgorICA2ICsK KyAgNworCitmb28gPSBvYmouYmFyIHsgfG18IHRlZShtKSB9ICsKKyAgb2JqLnF1eCB7IHxt fCBodW0obSkgfQorCitmb28uCisgIGJhcgorICAuYmF6CisKK3F1eCA9IGZvby5mZWUgPwor ICBiYXIgOgorICB0ZWUKKworIyBFbmRsZXNzIG1ldGhvZHMuCitjbGFzcyBCYXIKKyAgZGVm IGZvbyhhYmMpID0gYmFyICsKKyAgICBiYXoKK2VuZAorCisjIExvY2FsIFZhcmlhYmxlczoK KyMgcnVieS1hZnRlci1vcGVyYXRvci1pbmRlbnQ6IG5pbAorIyBFbmQ6CmRpZmYgLS1naXQg YS90ZXN0L2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS1yZXNvdXJjZXMvcnVieS1ibG9jay1p bmRlbnQucmIgYi90ZXN0L2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS1yZXNvdXJjZXMvcnVi eS1ibG9jay1pbmRlbnQucmIKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAuLjMyODgyODE0YjdlCi0tLSAvZGV2L251bGwKKysrIGIvdGVzdC9saXNwL3Byb2dtb2Rl cy9ydWJ5LW1vZGUtcmVzb3VyY2VzL3J1YnktYmxvY2staW5kZW50LnJiCkBAIC0wLDAgKzEs MzMgQEAKK2ZvbworICAuYXNkYXNkCisgIC5wcm9jIGRvIHwqKmFyZ3N8CisgICAgcCgqKmFy Z3MpCisgIGVuZAorCitmb28KKyAgLmFzZGFzZAorICAucHJvYyB7IHwqKmFyZ3N8CisgICAg cCgqKmFyZ3MpCisgIH0KKworYmFyLmZvbyBkbworICBiYXIKK2VuZAorCitiYXIuZm9vKHRl ZSkgZG8KKyAgYmFyCitlbmQKKworYmFyLmZvbyh0ZWUpIHsKKyAgYmFyCit9CisKK3guZm9v IGRvCisgIGZvbworZW5kLmJhciBkbworICBiYXIKK2VuZAorCisjIExvY2FsIFZhcmlhYmxl czoKKyMgcnVieS1ibG9jay1pbmRlbnQ6IG5pbAorIyBFbmQ6CmRpZmYgLS1naXQgYS90ZXN0 L2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS1yZXNvdXJjZXMvcnVieS1tZXRob2QtY2FsbC1p bmRlbnQucmIgYi90ZXN0L2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS1yZXNvdXJjZXMvcnVi eS1tZXRob2QtY2FsbC1pbmRlbnQucmIKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAuLjFhODI4NWVlOTE5Ci0tLSAvZGV2L251bGwKKysrIGIvdGVzdC9saXNwL3By b2dtb2Rlcy9ydWJ5LW1vZGUtcmVzb3VyY2VzL3J1YnktbWV0aG9kLWNhbGwtaW5kZW50LnJi CkBAIC0wLDAgKzEsMTUgQEAKK2ZvbzIgPQorICBzdWJqZWN0LgorICB1cGRhdGUoCisgICAg MgorICApCisKK2ZvbzMgPQorICBzdWJqZWN0CisgIC51cGRhdGUoCisgICAgMgorICApCisK KyMgTG9jYWwgVmFyaWFibGVzOgorIyBydWJ5LW1ldGhvZC1jYWxsLWluZGVudDogbmlsCisj IEVuZDoKZGlmZiAtLWdpdCBhL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcnVieS1tb2RlLXJlc291 cmNlcy9ydWJ5LXBhcmVubGVzcy1jYWxsLWFyZ3VtZW50cy1pbmRlbnQucmIgYi90ZXN0L2xp c3AvcHJvZ21vZGVzL3J1YnktbW9kZS1yZXNvdXJjZXMvcnVieS1wYXJlbmxlc3MtY2FsbC1h cmd1bWVudHMtaW5kZW50LnJiCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwLi41OGUwODgxMGM0YwotLS0gL2Rldi9udWxsCisrKyBiL3Rlc3QvbGlzcC9wcm9nbW9k ZXMvcnVieS1tb2RlLXJlc291cmNlcy9ydWJ5LXBhcmVubGVzcy1jYWxsLWFyZ3VtZW50cy1p bmRlbnQucmIKQEAgLTAsMCArMSwyMyBAQAorbWV0aG9kIGFyZzEsCisgIG1ldGhvZDIgYXJn MiwKKyAgYXJnMywgWworICAgIGFyZzQsCisgICAgYXJnNQorICBdCisKK3p6eiA9IG1ldGhv ZCAoYSArIGIpLAorICBjLCA6ZCA9PiA6ZSwKKyAgZjogZworCityZXR1cm4gcmVuZGVyIGpz b246IHsKKyAgICBlcnJvcnM6IHsgYmFzZTogW21lc3NhZ2VdIH0sCisgICAgY29weWluZzog Y29weWluZworICB9LAorICBzdGF0dXM6IDQwMAorCitmb28oYSwKKyAgICBiKQorCisjIExv Y2FsIFZhcmlhYmxlczoKKyMgcnVieS1wYXJlbmxlc3MtY2FsbC1hcmd1bWVudHMtaW5kZW50 OiBuaWwKKyMgRW5kOgpkaWZmIC0tZ2l0IGEvdGVzdC9saXNwL3Byb2dtb2Rlcy9ydWJ5LW1v ZGUtcmVzb3VyY2VzL3J1YnkucmIgYi90ZXN0L2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS1y ZXNvdXJjZXMvcnVieS5yYgppbmRleCA2YTY5ZDlkYjc4YS4uYmZhZTk0OGIyNTkgMTAwNjQ0 Ci0tLSBhL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcnVieS1tb2RlLXJlc291cmNlcy9ydWJ5LnJi CisrKyBiL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcnVieS1tb2RlLXJlc291cmNlcy9ydWJ5LnJi CkBAIC0yMjYsNiArMjI2LDcgQEAgZGVmIGJlZ2luCiAKIGZvby4KICAgYmFyCisgIC5iYXoK IAogIyBodHRwczovL2dpdGh1Yi5jb20vcmFpbHMvcmFpbHMvYmxvYi8xN2Y1ZDhlMDYyOTA5 ZjFmY2FlMjUzNTE4MzRkOGU4OTk2N2I2NDVlL2FjdGl2ZXN1cHBvcnQvbGliL2FjdGl2ZV9z dXBwb3J0L3RpbWVfd2l0aF96b25lLnJiI0wyMDYKIGZvbyAjIGNvbW1lbnQgaW50ZW5kZWQg dG8gY29uZnVzZSB0aGUgdG9rZW5pemVyCkBAIC0zODAsNiArMzgxLDE4IEBAIGRlZiBiYXIK ICAgaSArIDEKIGVuZAogCittMSA9IGZvbworICAgICAgIC5hc2Rhc2QKKyAgICAgICAucHJv YyBkbyB8KiphcmdzfAorICBwKCoqYXJncykKK2VuZAorCittMiA9IGZvbworICAgICAgIC5h c2Rhc2QKKyAgICAgICAucHJvYyB7IHwqKmFyZ3N8CisgIHAoKiphcmdzKQorfQorCiBiYXIu Zm9vIGRvCiAgIGJhcgogZW5kCkBAIC0zOTgsNiArNDExLDEyIEBAIGRlZiBiYXIKICAgZW5k CiBlbmQKIAoreC5mb28gZG8KKyAgZm9vCitlbmQuYmFyIGRvCisgIGJhcgorZW5kCisKIGZv byB8CiAgIGJhcgogCkBAIC01NDAsNSArNTU5LDkgQEAgZGVmIGJhei5mdWxsX25hbWUgPSAi I3tiYXJ9IDMiCiBlbmQKIAogIyBMb2NhbCBWYXJpYWJsZXM6CisjIHJ1YnktYWZ0ZXItb3Bl cmF0b3ItaW5kZW50OiB0CisjIHJ1YnktYmxvY2staW5kZW50OiB0CisjIHJ1YnktbWV0aG9k LWNhbGwtaW5kZW50OiB0CiAjIHJ1YnktbWV0aG9kLXBhcmFtcy1pbmRlbnQ6IHQKKyMgcnVi eS1wYXJlbmxlc3MtY2FsbC1hcmd1bWVudHMtaW5kZW50OiB0CiAjIEVuZDoKZGlmZiAtLWdp dCBhL3Rlc3QvbGlzcC9wcm9nbW9kZXMvcnVieS1tb2RlLXRlc3RzLmVsIGIvdGVzdC9saXNw L3Byb2dtb2Rlcy9ydWJ5LW1vZGUtdGVzdHMuZWwKaW5kZXggNTYwZjc4MDI4NWEuLjVjODFj YzMxY2MxIDEwMDY0NAotLS0gYS90ZXN0L2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS10ZXN0 cy5lbAorKysgYi90ZXN0L2xpc3AvcHJvZ21vZGVzL3J1YnktbW9kZS10ZXN0cy5lbApAQCAt OTU2LDcgKzk1NiwxMSBAQCBydWJ5LWRlZnRlc3QtaW5kZW50CiAgICAgICAgICAoa2lsbC1i dWZmZXIgYnVmKSkpKSkKIAogKHJ1YnktZGVmdGVzdC1pbmRlbnQgInJ1YnkucmIiKQorKHJ1 YnktZGVmdGVzdC1pbmRlbnQgInJ1YnktYWZ0ZXItb3BlcmF0b3ItaW5kZW50LnJiIikKKyhy dWJ5LWRlZnRlc3QtaW5kZW50ICJydWJ5LWJsb2NrLWluZGVudC5yYiIpCisocnVieS1kZWZ0 ZXN0LWluZGVudCAicnVieS1tZXRob2QtY2FsbC1pbmRlbnQucmIiKQogKHJ1YnktZGVmdGVz dC1pbmRlbnQgInJ1YnktbWV0aG9kLXBhcmFtcy1pbmRlbnQucmIiKQorKHJ1YnktZGVmdGVz dC1pbmRlbnQgInJ1YnktcGFyZW5sZXNzLWNhbGwtYXJndW1lbnRzLWluZGVudC5yYiIpCiAK IChlcnQtZGVmdGVzdCBydWJ5LS10ZXN0LWNoYWluZWQtaW5kZW50YXRpb24gKCkKICAgKHdp dGgtdGVtcC1idWZmZXIK --------------N8VyiyMKWpRHeE3EBtUfggWL--