From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 14914 invoked from network); 14 Feb 2023 02:32:45 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 14 Feb 2023 02:32:45 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1676341965; b=ddgWl+z6NPHtTRNuq9Ap4tRYTUgraHXjKCtQBLr9abZ7jk6He/RHRHKrWaX6LibLnzYyF4BMHS yECPuzUo3iWodMAPnljrBO1HMx2e30naXsg0hjPzJxrBA47R5SNnS2bjJ9JpkVJJKHmRH6QGC+ jvmjO/yFI/amarliHR2aJaYO3WCQyECamF5dswoFwsT7NEVMvEFYHQ1Lzk7ycfuiZIOD+NIzfd bBdvUWGh+jXND6TlG4GQx2q/U1x9c6drmOvWcnVeBF5xSprk3wNVnmwXaXtjDLmelRtUWlruq+ hVEwfD0In+KkfwfIDWf0x9NJG0UpBfu1ftJoSgjOLHTlHA==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f53.google.com) smtp.remote-ip=209.85.218.53; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1676341965; bh=aeSd9MgsaHoCHfeIOkZ6YVNIp9rHhRo2baKC8K8eq7A=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:To:Subject:Message-ID:Date:From:MIME-Version: DKIM-Signature:DKIM-Signature; b=G1sBbFqMq6HSPkLiEcagyWRhfMvLu6MkDZMf2ciEVqZTs8w9vdherCrXrCno0X21WYlks++jMB cNMwq10amXGQaHF6xlzKu0FFOcwdZaKDRsRt7AQ/N3B4YJ51RQVlpzs45XH6dbi0bw/73COtQt zufEsa6RmGuOs3VmUu/B/cI00bYFJGf9qvJjUqZtmKDUSq/wKuhz4uSopoLB/xjx6RiMXT+iwO FBfLJRUoVWV4d8YpleVZvCe2K0kCeJJpf5pIbDL0L7RsAWVZg9+daaT9dz4mW+UqRAWNVJ0/sI +D34CzkghPCPyIx5IsdYoCL7ukl9hR6z/LEExg+qPOzjuw==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Type:To:Subject:Message-ID: Date:From:MIME-Version:Reply-To:Cc:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References; bh=HHco8S3+qpXA+4Bwl+TMZNN7hsxDJSp3NzxrXhuoKlg=; b=lptPQiW+8mB/J3kp8Qa41rRqGd AGtECv5lkYY0dpFr36+P8/dBtAaVEkWIJaV+ibKEfaZuiIbvn7PF7kntpbGcbWG1YlQ/M6rhUnaGU EVl9tkKQSEUHx9KjC+lTI1gqZ6XknHOQVJt2Y+d+4H2XsEydhqv0D1t88nz9fpWAfF7DwWz/u8hR0 obUWUCqGxhzPYxxfGlb4hZm4J7He3E1FqdHQUTCRHMDcZgu/AaOChJfDxuKqoTTyTr4SMZdxJAgPs 3r3psla0V52zY9Nq8Omu4UhYhk7i7aP3kWrbR6qF5CJC29Nu5i/8INTwcBk9qtyRfiFbuElLhiUgv NuRZbf5A==; Received: by zero.zsh.org with local id 1pRl7d-000DXA-5y; Tue, 14 Feb 2023 02:32:45 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f53.google.com) smtp.remote-ip=209.85.218.53; dkim=pass header.d=brasslantern-com.20210112.gappssmtp.com header.s=20210112 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-ej1-f53.google.com ([209.85.218.53]:34617) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1pRl7L-000DE4-N2; Tue, 14 Feb 2023 02:32:28 +0000 Received: by mail-ej1-f53.google.com with SMTP id qb15so34654300ejc.1 for ; Mon, 13 Feb 2023 18:32:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20210112.gappssmtp.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=HHco8S3+qpXA+4Bwl+TMZNN7hsxDJSp3NzxrXhuoKlg=; b=YLtFJZEnmx4TG4z5TeNZdAIcPX1ehvBFA2BTjKz9ke2RR4Ytf12ITKUAIR4cBsroEb dNEtsEmoz90XvayPnevLL827tUVOUdvI2GmEuNhrS2Ov+MxdnjL3IdpKX8Z1ePPVGRH8 EYYXjv6OnRLcya2WdG25YTthIiToS8BX7uS4MI24JQUUFdSifBxeWxLU8WD+5vftMfoY r7PyfKhWKJpJnosgYjJM8wNbz4IUCur0C07fua9OP/lk7hb+Lrig/KNuDV3+eywESbjH YdHx3isAzyjQIqIwg5v1w2gH3nsjYxa6ZESdPT+b1OkZJkf5nCcwtxzIQxfUjvwq/9di n8xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=HHco8S3+qpXA+4Bwl+TMZNN7hsxDJSp3NzxrXhuoKlg=; b=CCCgihvuobq0rCG8aPwmXR0MQVg4W9I5nCS4iBzvJcNN+UKXB7ECDDvO1D69aXWZM+ Zwcn5oNH74iKDSjxH5lHadHMfynz/sU6KANqVMejB1HnCLxKLQos2KyfHPeheCtnUqmD HZKJPKXyWafYmEuSLWzeV8R89ssGy3Bkm3QlFELq6aMvmaAqecWKpSTMnph3zUN6i+eH 8gYhMwLkQ+vbQZA8VeuXsG5siQ6ZsCTUCn+nJs/03Q966duLsMLg+Ra/WS6THX8MitwA 9vXFMgf3dAZ3AkbhoevAYoatkC3nqLXRG9bRn3Zo+sEmTaxuYJsj245G1eA4/TTiggAG by+A== X-Gm-Message-State: AO0yUKVm5wgWvM9SWIfuNm7AvAwZVEde2u5yMEe5kTCkyqa2nLyXdWzJ 0d467ZwVfTY6105h22IVItoXGuIMmlcIFSHaxspYY80/ALDVhQ+V X-Google-Smtp-Source: AK7set+nbTGvKYv2xVLUNfhQ6wkspuAQJh07bCfpq3mTSiWGbasaWIatK9uKQbVn5IOG8j+Xv7bEfZrZ3BtRSXvu+Q0= X-Received: by 2002:a17:907:8a19:b0:88d:ba79:4317 with SMTP id sc25-20020a1709078a1900b0088dba794317mr6828714ejc.7.1676341947353; Mon, 13 Feb 2023 18:32:27 -0800 (PST) MIME-Version: 1.0 From: Bart Schaefer Date: Mon, 13 Feb 2023 18:32:16 -0800 Message-ID: Subject: [PATCH] Fix long-standing issue with "typeset -p" To: Zsh hackers list Content-Type: multipart/mixed; boundary="0000000000004b70a805f49fc6d7" X-Seq: 51431 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: , List-Subscribe: , List-Unsubscribe: , List-Post: List-Owner: List-Archive: --0000000000004b70a805f49fc6d7 Content-Type: text/plain; charset="UTF-8" During test of the preceding named references patch I noticed that the output of (for example) typeset -pam \* was not restricted to just array parameters. Other flags than -a produced even stranger results. It turns out that combining -p and -m with other flags would actually apply changes to the types of some parameters, e.g., converting things to/from arrays or adding integer or float attributes. This has been the case for a very long time (possibly since inception). Attached patch attempts to impose sanity on this. It should be applied after 51430 but I'll wait a bit to push it since the use case plainly isn't a common one. --0000000000004b70a805f49fc6d7 Content-Type: text/plain; charset="US-ASCII"; name="typeset-p-m.txt" Content-Disposition: attachment; filename="typeset-p-m.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_le3mo3z90 ZGlmZiAtLWdpdCBhL1NyYy9idWlsdGluLmMgYi9TcmMvYnVpbHRpbi5jCmluZGV4IDQ3YjMzN2Vk Yy4uMTFjMWFiM2E0IDEwMDY0NAotLS0gYS9TcmMvYnVpbHRpbi5jCisrKyBiL1NyYy9idWlsdGlu LmMKQEAgLTIxMDYsMTUgKzIxMDYsMjcgQEAgdHlwZXNldF9zaW5nbGUoY2hhciAqY25hbWUsIGNo YXIgKnBuYW1lLCBQYXJhbSBwbSwgaW50IGZ1bmMsCiAJICAgIHJldHVybiBOVUxMOwogCX0KIAl0 YyA9IDE7Ci0JdXNlcG0gPSAwOworCWlmIChPUFRfTUlOVVMob3BzLCdwJykpCisJICAgIHVzZXBt ID0gKG9uICYgcG0tPm5vZGUuZmxhZ3MpOworCWVsc2UgaWYgKE9QVF9QTFVTKG9wcywncCcpKQor CSAgICB1c2VwbSA9IChvZmYgJiBwbS0+bm9kZS5mbGFncyk7CisJZWxzZQorCSAgICB1c2VwbSA9 IDA7CiAgICAgfQogICAgIGVsc2UgaWYgKHVzZXBtIHx8IG5ld3NwZWNpYWwgIT0gTlNfTk9ORSkg ewogCWludCBjaGZsYWdzID0gKChvZmYgJiBwbS0+bm9kZS5mbGFncykgfCAob24gJiB+cG0tPm5v ZGUuZmxhZ3MpKSAmCiAJICAgIChQTV9JTlRFR0VSfFBNX0VGTE9BVHxQTV9GRkxPQVR8UE1fSEFT SEVEfAogCSAgICAgUE1fQVJSQVl8UE1fVElFRHxQTV9BVVRPTE9BRCk7CiAJLyoga2VlcCB0aGUg cGFyYW1ldGVyIGlmIGp1c3Qgc3dpdGNoaW5nIGJldHdlZW4gZmxvYXRpbmcgdHlwZXMgKi8KLQlp ZiAoKHRjID0gY2hmbGFncyAmJiBjaGZsYWdzICE9IChQTV9FRkxPQVR8UE1fRkZMT0FUKSkpCi0J ICAgIHVzZXBtID0gMDsKKwlpZiAoKHRjID0gY2hmbGFncyAmJiBjaGZsYWdzICE9IChQTV9FRkxP QVR8UE1fRkZMT0FUKSkpIHsKKwkgICAgaWYgKE9QVF9NSU5VUyhvcHMsJ3AnKSkKKwkJdXNlcG0g PSAob24gJiBwbS0+bm9kZS5mbGFncyk7CisJICAgIGVsc2UgaWYgKE9QVF9QTFVTKG9wcywncCcp KQorCQl1c2VwbSA9IChvZmYgJiBwbS0+bm9kZS5mbGFncyk7CisJICAgIGVsc2UKKwkJdXNlcG0g PSAwOworCX0KKwogICAgIH0KIAogICAgIC8qCkBAIC0yMTY2LDEzICsyMTc4LDE2IEBAIHR5cGVz ZXRfc2luZ2xlKGNoYXIgKmNuYW1lLCBjaGFyICpwbmFtZSwgUGFyYW0gcG0sIGludCBmdW5jLAog CSAgICB9CiAJICAgIGlmIChlcnIpCiAJICAgIHsKLQkJemVycm5hbShjbmFtZSwgIiVzOiBjYW4n dCBjaGFuZ2UgdHlwZSBvZiBhIHNwZWNpYWwgcGFyYW1ldGVyIiwKLQkJCXBuYW1lKTsKKwkJaWYg KCFPUFRfSVNTRVQob3BzLCdwJykpCisJCSAgICB6ZXJybmFtKGNuYW1lLAorCQkJICAgICIlczog Y2FuJ3QgY2hhbmdlIHR5cGUgb2YgYSBzcGVjaWFsIHBhcmFtZXRlciIsCisJCQkgICAgcG5hbWUp OwogCQlyZXR1cm4gTlVMTDsKIAkgICAgfQogCX0gZWxzZSBpZiAocG0tPm5vZGUuZmxhZ3MgJiBQ TV9BVVRPTE9BRCkgewotCSAgICB6ZXJybmFtKGNuYW1lLCAiJXM6IGNhbid0IGNoYW5nZSB0eXBl IG9mIGF1dG9sb2FkZWQgcGFyYW1ldGVyIiwKLQkJICAgIHBuYW1lKTsKKwkgICAgaWYgKCFPUFRf SVNTRVQob3BzLCdwJykpCisJCXplcnJuYW0oY25hbWUsICIlczogY2FuJ3QgY2hhbmdlIHR5cGUg b2YgYXV0b2xvYWRlZCBwYXJhbWV0ZXIiLAorCQkJcG5hbWUpOwogCSAgICByZXR1cm4gTlVMTDsK IAl9CiAgICAgfQpAQCAtMjIwOCw2ICsyMjIzLDEwIEBAIHR5cGVzZXRfc2luZ2xlKGNoYXIgKmNu YW1lLCBjaGFyICpwbmFtZSwgUGFyYW0gcG0sIGludCBmdW5jLAogICAgICAqICAgaWkuIHdlIGFy ZSBjcmVhdGluZyBhIG5ldyBsb2NhbCBwYXJhbWV0ZXIKICAgICAgKi8KICAgICBpZiAodXNlcG0p IHsKKwlpZiAoT1BUX01JTlVTKG9wcywncCcpICYmIG9uICYmICEob24gJiBwbS0+bm9kZS5mbGFn cykpCisJICAgIHJldHVybiBOVUxMOworCWVsc2UgaWYgKE9QVF9QTFVTKG9wcywncCcpICYmIG9m ZiAmJiAhKG9mZiAmIHBtLT5ub2RlLmZsYWdzKSkKKwkgICAgcmV0dXJuIE5VTEw7CiAJaWYgKChh c2ctPmZsYWdzICYgQVNHX0FSUkFZKSA/CiAJICAgICEoUE1fVFlQRShwbS0+bm9kZS5mbGFncykg JiAoUE1fQVJSQVl8UE1fSEFTSEVEKSkgOgogCSAgICAoYXNnLT52YWx1ZS5zY2FsYXIgJiYgKFBN X1RZUEUocG0tPm5vZGUuZmxhZ3MgJgpAQCAtMjI1NCw2ICsyMjczLDEwIEBAIHR5cGVzZXRfc2lu Z2xlKGNoYXIgKmNuYW1lLCBjaGFyICpwbmFtZSwgUGFyYW0gcG0sIGludCBmdW5jLAogCQkgICAg YXJyZml4ZW52KHBtLT5ub2RlLm5hbSwgeCk7CiAJICAgIH0KIAl9CisJaWYgKE9QVF9JU1NFVChv cHMsJ3AnKSkgeworCSAgICBwYXJhbXRhYi0+cHJpbnRub2RlKCZwbS0+bm9kZSwgUFJJTlRfVFlQ RVNFVCk7CisJICAgIHJldHVybiBwbTsKKwl9CiAJaWYgKHVzZXBtID09IDIpCQkvKiBkbyBub3Qg Y2hhbmdlIHRoZSBQTV9VTlNFVCBmbGFnICovCiAJICAgIHBtLT5ub2RlLmZsYWdzID0gKHBtLT5u b2RlLmZsYWdzIHwgKG9uICYgflBNX1JFQURPTkxZKSkgJiB+b2ZmOwogCWVsc2UgewpAQCAtMjI2 Miw5ICsyMjg1LDggQEAgdHlwZXNldF9zaW5nbGUoY2hhciAqY25hbWUsIGNoYXIgKnBuYW1lLCBQ YXJhbSBwbSwgaW50IGZ1bmMsCiAJICAgICAqLwogCSAgICBpZiAoIShvbiAmIFBNX1JFQURPTkxZ KSB8fCAhaXNzZXQoUE9TSVhCVUlMVElOUykpCiAJCW9mZiB8PSBQTV9VTlNFVDsKLQkgICAgaWYg KCFPUFRfSVNTRVQob3BzLCAncCcpKQotCQlwbS0+bm9kZS5mbGFncyA9IChwbS0+bm9kZS5mbGFn cyB8Ci0JCQkJICAob24gJiB+UE1fUkVBRE9OTFkpKSAmIH5vZmY7CisJICAgIHBtLT5ub2RlLmZs YWdzID0gKHBtLT5ub2RlLmZsYWdzIHwKKwkJCSAgICAgIChvbiAmIH5QTV9SRUFET05MWSkpICYg fm9mZjsKIAl9CiAJaWYgKG9uICYgKFBNX0xFRlQgfCBQTV9SSUdIVF9CIHwgUE1fUklHSFRfWikp IHsKIAkgICAgaWYgKHR5cGVzZXRfc2V0d2lkdGgoY25hbWUsIHBtLCBvcHMsIG9uLCAwKSkKQEAg LTIzMTAsOCArMjMzMiw2IEBAIHR5cGVzZXRfc2luZ2xlKGNoYXIgKmNuYW1lLCBjaGFyICpwbmFt ZSwgUGFyYW0gcG0sIGludCBmdW5jLAogCWlmIChlcnJmbGFnKQogCSAgICByZXR1cm4gTlVMTDsK IAlwbS0+bm9kZS5mbGFncyB8PSAob24gJiBQTV9SRUFET05MWSk7Ci0JaWYgKE9QVF9JU1NFVChv cHMsJ3AnKSkKLQkgICAgcGFyYW10YWItPnByaW50bm9kZSgmcG0tPm5vZGUsIFBSSU5UX1RZUEVT RVQpOwogCXJldHVybiBwbTsKICAgICB9CiAKQEAgLTIzMjgsNyArMjM0OCw3IEBAIHR5cGVzZXRf c2luZ2xlKGNoYXIgKmNuYW1lLCBjaGFyICpwbmFtZSwgUGFyYW0gcG0sIGludCBmdW5jLAogICAg ICAqIG9yIHdlJ3JlIGNvbnZlcnRpbmcgdGhlIHR5cGUgb2YgYSBwYXJhbWV0ZXIuICBJbiB0aGUK ICAgICAgKiBsYXN0IGNhc2Ugb25seSwgd2UgbmVlZCB0byBkZWxldGUgdGhlIG9sZCBwYXJhbWV0 ZXIuCiAgICAgICovCi0gICAgaWYgKHRjKSB7CisgICAgaWYgKHRjICYmICFPUFRfSVNTRVQob3Bz LCdwJykpIHsKIAkvKiBNYWludGFpbiBleGlzdGluZyByZWFkb25seS9leHBvcnRlZCBzdGF0dXMu Li4gKi8KIAlvbiB8PSB+b2ZmICYgKFBNX1JFQURPTkxZfFBNX0VYUE9SVEVEKSAmIHBtLT5ub2Rl LmZsYWdzOwogCS8qIC4uLmJ1dCB0dXJuIG9mZiBleGlzdGluZyByZWFkb25seSBzbyB3ZSBjYW4g ZGVsZXRlIGl0ICovCg== --0000000000004b70a805f49fc6d7--