From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 Received: from zero.zsh.org (zero.zsh.org [IPv6:2a02:898:31:0:48:4558:7a:7368]) by inbox.vuxu.org (Postfix) with ESMTP id 100D7291DA for ; Sun, 10 Mar 2024 06:54:46 +0100 (CET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1710050086; b=SMpDaxNgupqgm6hAr13dcRBPQw+7O/wmlKsNtBFOzPxdpldVikdLMnWTLP2nygV9jIiaJqt/XY uxpgH4d7aVGugDXi0imOyVeZ3NJ/o0kexqoIK5QvMi5tEAALnMVAOgC5VWHB/6slzPOlk9Rln4 voRbABbcdivZkTl63hroMNB4l6IqmUQolNKM0CsLberPFvj55O/tDjJPgI80MIm/VEKyjbHF+a P95RgMlbLPVlBh7Lp1NPZAlOIAnFLxy+SnrSI2DzvbIneXkS4b0hhxJQeVxk178JwtzASDfS6n foWETp43odbm1YdIlTg4MuZ3USbcQ9Y8EF3JXgfyMw8YYg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f50.google.com) smtp.remote-ip=209.85.218.50; dkim=pass header.d=brasslantern-com.20230601.gappssmtp.com header.s=20230601 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=1710050086; bh=xtp1GzUNquzgqNxQ6YAqRXkWJKCUH61pJqh522OQp4o=; 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=rcAicpVFQeXPdzWIy5GLlmFKMeNxoGtZRwKIBJO6+CT4UXEZX3aGar7zrDEyde81eQCFaskS9h 0oM4a4o+JXZJVTSBpZe3oUtN2zQdYZ0yDBnELJVyTQ3ycV5cARhpP9DJqQpCNOZdUBBuzzc2u+ KQ5J/FLwItQO3oP/IQcfYbErd7zk/Xz7nQQCjFncum6PohtRqQQ+1dOv0Xmlb7SKIMLkL5kSKq 35MnXmNJr2QR/hYtI8wUl8voFFJmIvRfCbYDZVyvf3MuFP+/f74CtTGI2UjSVIkIplWqdceAwi Nng7DWBavZ9MMP9VWB9mRBe0tQmWklGjLk1lEd5mVbTS4g==; 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=YyRrnQMh1oPE64CLvCrvjkSC8eSR3bKBnMxZiQz9hB4=; b=IJBxipDgTMdG+z/2fnSKL7tcBM S/Xe6s8Ou14OoOhMjpO4U4kREyPKpe+UOcGKs8Pa8/wHv26XVJCFWgnW435Ss5GDlFMbnxpZ+hXaZ 96pOshhtGVhS20NETs3+BMj1QrdsHfLQnZOIHiGSfTWdqnLzRaWWkgEfzuM2kgie5rw9o9irmUA4z iXxawpzvra6HLrvbxXR+CLxIe5mJxnB2TLL7/IxV+Ynx/tXk47D2IdDTevvJYOAILfTZhr4MYwYlW jiDAQSInSutEc/jAvO9XvT+FkOB6Ulyazs5JJma/B+/BpNKsGDb51t6ySR+brJyELqBhiFMhHJy1V IqRiwOAw==; Received: by zero.zsh.org with local id 1rjC8y-000B1C-MH; Sun, 10 Mar 2024 05:54:44 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f50.google.com) smtp.remote-ip=209.85.218.50; dkim=pass header.d=brasslantern-com.20230601.gappssmtp.com header.s=20230601 header.a=rsa-sha256; dmarc=none header.from=brasslantern.com; arc=none Received: from mail-ej1-f50.google.com ([209.85.218.50]:54423) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1rjC8N-000AgH-JH; Sun, 10 Mar 2024 05:54:08 +0000 Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-a44628725e3so372604966b.0 for ; Sat, 09 Mar 2024 21:54:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20230601.gappssmtp.com; s=20230601; t=1710050047; x=1710654847; darn=zsh.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=YyRrnQMh1oPE64CLvCrvjkSC8eSR3bKBnMxZiQz9hB4=; b=DWSRRSl/qPDEDCvrrYTgb4URIB+Cv/8ys78nhYYpA8TfMjP8L8CZwNJmFA6L/wWbSN 0dSkdtiFf2sFKoEqE2cWxvYjJNxIPKUnP/PXBzR+Goc4PD/oAe2wo8DPtthlZFE+RWAG OfBXRcAeQKvvTILELf97UrOXaP2QoQlea5MTYoDkA3IpPnd8gxz9hgvjdFHlMC9+EATr wXjtEUKTPXwCyiLIw0NaHD8iRY+M35CQ612VaZRlANR42XJDGXsMK5i9Uz6N6e+kx/lj sk0xZlcIOD0amA3w4jiKEGmL/g4ks43BwqsgI7FPd5TgBg4sSx8Rq41Hp+ZLxbmX7PcZ EnHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710050047; x=1710654847; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=YyRrnQMh1oPE64CLvCrvjkSC8eSR3bKBnMxZiQz9hB4=; b=Ld9ogzrtdvHeO1odYVtJd6sAwIKaxsdEnZ9yqrRSUijt1Q24lYFJENaZeXrpZnhCLY WVdutIxKcgDVjfs45MQ7PE16jChPscv0LuFLXIMUG90k4X23k6Wr4F/tFZC4smOtDFmS k5djj6tBL6voVGpHUcT3OAJDEirPMEwyNft2mAINZ29PVIJKSjuIEaNVzRPdQm343f2O 7ySW/iRsvSXtEKImNIOmovwPScT5arqe6CXOG/ZV2oNRy0yR6NOeIMnBkB2d6HbgbS89 c7X6ecMKqaLqcwN/6YelPps/q43Dr2UOpkzmtEDJfnGzhYIsjNcaOdyFTCCK9vNgcWLh gY5g== X-Gm-Message-State: AOJu0YwGQdux72fTf4rc5TAviDo40KjL9wQfzGZGYTcyN3KuI9ogmPaK S3NNz8NfK0j11yK0hNmbvwut26Rk93/rPPTJjS2nG0ztYMkdG4Z+7VfafgA+48yMU8z83Jmfyt+ 8aL8L6vIMdVLJCyjYFeR7KcRoBbZ6cc/RJN9d7J7T6Z/8vjeYWg== X-Google-Smtp-Source: AGHT+IE6Rf9Sk3ngMrFsulZKvVmFirQSjn+A/UsSfBhLlVoy55ew0EE6h4PFOJy7qbWbt7DgC0ykZ/R2DNX6M5sWtf0= X-Received: by 2002:a17:906:3390:b0:a45:b1e7:df8b with SMTP id v16-20020a170906339000b00a45b1e7df8bmr1522390eja.64.1710050046648; Sat, 09 Mar 2024 21:54:06 -0800 (PST) MIME-Version: 1.0 From: Bart Schaefer Date: Sat, 9 Mar 2024 21:53:53 -0800 Message-ID: Subject: Fix up zsh/ksh93 for named reference changes To: Zsh hackers list Content-Type: multipart/mixed; boundary="0000000000009452140613480d66" X-Seq: 52725 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: --0000000000009452140613480d66 Content-Type: text/plain; charset="UTF-8" Several recent changes to named references, particularly the fixing of reference targets at the scope of declaration, have made it impossible to use the module PARAMDEF() macro to create named references at module load that refer to locals at expansion time. The attached patch removes the global partab namerefs affected by this, and instead explicitly creates them as locals in the ksh93_wrapper() callback, so that they come and go in the appropriate scopes. This is mildly unsatisfying because it leaves a couple of specials at global scope, mostly for ease of instantiation, that really should also be locals. Might revisit that later. --0000000000009452140613480d66 Content-Type: text/plain; charset="US-ASCII"; name="repair-ksh93.txt" Content-Disposition: attachment; filename="repair-ksh93.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ltl3mblk0 ZGlmZiAtLWdpdCBhL1NyYy9Nb2R1bGVzL2tzaDkzLmMgYi9TcmMvTW9kdWxlcy9rc2g5My5jCmlu ZGV4IDY3NjBjYmNhMC4uOGQxMDMxN2RjIDEwMDY0NAotLS0gYS9TcmMvTW9kdWxlcy9rc2g5My5j CisrKyBiL1NyYy9Nb2R1bGVzL2tzaDkzLmMKQEAgLTExMywxOCArMTEzLDE3IEBAIHN0YXRpYyBj aGFyIHNoX2VkbW9kZVsyXTsKICAqIG9idmlvdXNseSBpbmNsdWRlcyB0aG9zZSBjb21tZW50ZWQg b3V0IGhlcmUuCiAgKi8KIHN0YXRpYyBzdHJ1Y3QgcGFyYW1kZWYgcGFydGFiW10gPSB7Ci0gICAg UEFSQU1ERUYoIi5zaC5jb21tYW5kIiwgUE1fTkFNRVJFRnxQTV9SRUFET05MWSwgIlpTSF9ERUJV R19DTUQiLCAmY29uc3RhbnRfZ3N1KSwKLSAgICBQQVJBTURFRigiLnNoLmVkY2hhciIsIFBNX1ND QUxBUnxQTV9TUEVDSUFMLCAmc2hfZWRjaGFyLCAmc2hfZWRjaGFyX2dzdSksCi0gICAgUEFSQU1E RUYoIi5zaC5lZGNvbCIsIFBNX05BTUVSRUZ8UE1fUkVBRE9OTFksICJDVVJTT1IiLCAmY29uc3Rh bnRfZ3N1KSwKLSAgICBQQVJBTURFRigiLnNoLmVkbW9kZSIsIFBNX1NDQUxBUnxQTV9SRUFET05M WXxQTV9TUEVDSUFMLCAmc2hfZWRtb2RlLCAmc2hfZWRtb2RlX2dzdSksCi0gICAgUEFSQU1ERUYo Ii5zaC5lZHRleHQiLCBQTV9OQU1FUkVGfFBNX1JFQURPTkxZLCAiQlVGRkVSIiwgJmNvbnN0YW50 X2dzdSksCisgICAgUEFSQU1ERUYoIi5zaC5lZGNoYXIiLCBQTV9TQ0FMQVJ8UE1fU1BFQ0lBTCwK KwkgICAgICZzaF9lZGNoYXIsICZzaF9lZGNoYXJfZ3N1KSwKKyAgICBQQVJBTURFRigiLnNoLmVk bW9kZSIsIFBNX1NDQUxBUnxQTV9SRUFET05MWXxQTV9TUEVDSUFMLAorCSAgICAgJnNoX2VkbW9k ZSwgJnNoX2VkbW9kZV9nc3UpLAogICAgIFBBUkFNREVGKCIuc2guZmlsZSIsIFBNX05BTUVSRUZ8 UE1fUkVBRE9OTFksICJaU0hfU0NSSVBUIiwgJmNvbnN0YW50X2dzdSksCi0gICAgLyogUEFSQU1E RUYoIi5zaC5mdW4iLCBQTV9TQ0FMQVJ8UE1fVU5TRVQsIE5VTEwsICZjb25zdGFudF9nc3UpLCAq LwotICAgIC8qIFBBUkFNREVGKCIuc2gubGV2ZWwiLCBQTV9JTlRFR0VSfFBNX1VOU0VULCBOVUxM LCAmY29uc3RhbnRfZ3N1KSwgKi8KICAgICBQQVJBTURFRigiLnNoLmxpbmVubyIsIFBNX05BTUVS RUZ8UE1fUkVBRE9OTFksICJMSU5FTk8iLCAmY29uc3RhbnRfZ3N1KSwKICAgICBQQVJBTURFRigi LnNoLm1hdGNoIiwgUE1fQVJSQVl8UE1fUkVBRE9OTFksIE5VTEwsICZzaF9tYXRjaF9nc3UpLAot ICAgIFBBUkFNREVGKCIuc2gubmFtZSIsIFBNX1NDQUxBUnxQTV9SRUFET05MWXxQTV9TUEVDSUFM LCAmc2hfbmFtZSwgJnNoX25hbWVfZ3N1KSwKLSAgICBQQVJBTURFRigiLnNoLnN1YnNjcmlwdCIs IFBNX1NDQUxBUnxQTV9SRUFET05MWXxQTV9TUEVDSUFMLCAmc2hfc3Vic2NyaXB0LCAmc2hfc3Vi c2NyaXB0X2dzdSksCisgICAgUEFSQU1ERUYoIi5zaC5uYW1lIiwgUE1fU0NBTEFSfFBNX1JFQURP TkxZfFBNX1NQRUNJQUwsCisJICAgICAmc2hfbmFtZSwgJnNoX25hbWVfZ3N1KSwKKyAgICBQQVJB TURFRigiLnNoLnN1YnNjcmlwdCIsIFBNX1NDQUxBUnxQTV9SRUFET05MWXxQTV9TUEVDSUFMLAor CSAgICAgJnNoX3N1YnNjcmlwdCwgJnNoX3N1YnNjcmlwdF9nc3UpLAogICAgIFBBUkFNREVGKCIu c2guc3Vic2hlbGwiLCBQTV9OQU1FUkVGfFBNX1JFQURPTkxZLCAiWlNIX1NVQlNIRUxMIiwgJmNv bnN0YW50X2dzdSksCiAgICAgLyogU1BFQ0lBTFBNREVGKCIuc2gudmFsdWUiLCAwLCBOVUxMLCBO VUxMLCBOVUxMKSwgKi8KICAgICBQQVJBTURFRigiLnNoLnZlcnNpb24iLCBQTV9OQU1FUkVGfFBN X1JFQURPTkxZLCAiWlNIX1BBVENITEVWRUwiLCAmY29uc3RhbnRfZ3N1KQpAQCAtMTU2LDE1ICsx NTUsMzUgQEAga3NoOTNfd3JhcHBlcihFcHJvZyBwcm9nLCBGdW5jV3JhcCB3LCBjaGFyICpuYW1l KQogCiAgICAgcXVldWVfc2lnbmFscygpOwogICAgICsrbG9jYWxsZXZlbDsJCS8qIE1ha2UgdGhl c2UgbG9jYWwgKi8KLSAgICBpZiAoKHBtID0gY3JlYXRlcGFyYW0oIi5zaC5sZXZlbCIsIFBNX0xP Q0FMfFBNX1VOU0VUKSkpIHsKKyNkZWZpbmUgTE9DQUxfTkFNRVJFRiAoUE1fTE9DQUx8UE1fVU5T RVR8UE1fTkFNRVJFRikKKyAgICBpZiAoKHBtID0gY3JlYXRlcGFyYW0oIi5zaC5jb21tYW5kIiwg TE9DQUxfTkFNRVJFRikpKSB7CiAJcG0tPmxldmVsID0gbG9jYWxsZXZlbDsJLyogV2h5IGlzIHRo aXMgbmVjZXNzYXJ5PyAqLwotCXNldGlwYXJhbSgiLnNoLmxldmVsIiwgbnVtKTsKKwkvKiBGb3Jj ZSBzY29waW5nIGJ5IGFzc2lnbmVudCBoYWNrICovCisJc2V0bG9vcHZhcigiLnNoLmNvbW1hbmQi LCAiWlNIX0RFQlVHX0NNRCIpOworCXBtLT5ub2RlLmZsYWdzIHw9IFBNX1JFQURPTkxZOwogICAg IH0KKyAgICAvKiAuc2guZWRjaGFyIGlzIGluIHBhcnRhYiBhbmQgYmVsb3cgKi8KKyAgICBpZiAo emxlYWN0aXZlICYmIChwbSA9IGNyZWF0ZXBhcmFtKCIuc2guZWRjb2wiLCBMT0NBTF9OQU1FUkVG KSkpIHsKKwlwbS0+bGV2ZWwgPSBsb2NhbGxldmVsOworCXNldGxvb3B2YXIoIi5zaC5lZGNvbCIs ICJDVVJTT1IiKTsKKwlwbS0+bm9kZS5mbGFncyB8PSAoUE1fTkFNRVJFRnxQTV9SRUFET05MWSk7 CisgICAgfQorICAgIC8qIC5zaC5lZG1vZGUgaXMgaW4gcGFydGFiIGFuZCBiZWxvdyAqLworICAg IGlmICh6bGVhY3RpdmUgJiYgKHBtID0gY3JlYXRlcGFyYW0oIi5zaC5lZHRleHQiLCBMT0NBTF9O QU1FUkVGKSkpIHsKKwlwbS0+bGV2ZWwgPSBsb2NhbGxldmVsOworCXNldGxvb3B2YXIoIi5zaC5l ZHRleHQiLCAiQlVGRkVSIik7CisJcG0tPm5vZGUuZmxhZ3MgfD0gUE1fUkVBRE9OTFk7CisgICAg fQorCiAgICAgaWYgKChwbSA9IGNyZWF0ZXBhcmFtKCIuc2guZnVuIiwgUE1fTE9DQUx8UE1fVU5T RVQpKSkgewogCXBtLT5sZXZlbCA9IGxvY2FsbGV2ZWw7CiAJc2V0c3BhcmFtKCIuc2guZnVuIiwg enRyZHVwKG5hbWUpKTsKIAlwbS0+bm9kZS5mbGFncyB8PSBQTV9SRUFET05MWTsKICAgICB9Cisg ICAgaWYgKChwbSA9IGNyZWF0ZXBhcmFtKCIuc2gubGV2ZWwiLCBQTV9MT0NBTHxQTV9VTlNFVCkp KSB7CisJcG0tPmxldmVsID0gbG9jYWxsZXZlbDsKKwlzZXRpcGFyYW0oIi5zaC5sZXZlbCIsIG51 bSk7CisgICAgfQogICAgIGlmICh6bGVhY3RpdmUpIHsKIAlleHRlcm4gbW9kX2ltcG9ydF92YXJp YWJsZSBjaGFyICpjdXJrZXltYXBuYW1lOwkvKiBYWFggKi8KIAlleHRlcm4gbW9kX2ltcG9ydF92 YXJpYWJsZSBjaGFyICp2YXJlZGFyZzsJLyogWFhYICovCkBAIC0xODYsOSArMjA1LDEwIEBAIGtz aDkzX3dyYXBwZXIoRXByb2cgcHJvZywgRnVuY1dyYXAgdywgY2hhciAqbmFtZSkKIAkJKi0taWUg PSAnXDAnOwogCSAgICB9IGVsc2UKIAkJc2hfc3Vic2NyaXB0ID0gTlVMTDsKLQkgICAgaWYgKChw bSA9IGNyZWF0ZXBhcmFtKCIuc2gudmFsdWUiLCBQTV9MT0NBTHxQTV9OQU1FUkVGfFBNX1VOU0VU KSkpIHsKKwkgICAgaWYgKChwbSA9IGNyZWF0ZXBhcmFtKCIuc2gudmFsdWUiLCBMT0NBTF9OQU1F UkVGKSkpIHsKIAkJcG0tPmxldmVsID0gbG9jYWxsZXZlbDsKIAkJc2V0bG9vcHZhcigiLnNoLnZh bHVlIiwgIkJVRkZFUiIpOwkvKiBIYWNrICovCisJCXBtLT5ub2RlLmZsYWdzIHw9IFBNX1JFQURP TkxZOwogCSAgICB9CiAJfSBlbHNlCiAJICAgIHNoX25hbWUgPSBzaF9zdWJzY3JpcHQgPSBOVUxM Owo= --0000000000009452140613480d66--