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 3500 invoked from network); 4 Oct 2023 04:21:06 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 4 Oct 2023 04:21:06 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1696393266; b=JLWYuHWDHUOdVQsddXuFL8L9CRgjgbPYl4wUGfjZSpiqknwDs8fVmUhKAcrlUtRPOg2oHu69KX 5dEVmBBP8/MwW42e/pF+3+/6NMHSu0HIYV8SNnaGt/br0B1Sd1p2iPgZaPYvBkLyN/l5Ne2TVk qH/FSwYwsoGB40ttGTtLq92L0BKz2eR2X+uVL+Y/vILb3yT/dun8YabtdVLn9WkwzvDcy3v/t+ I3XyhUuvkxibkTNXzRs15HypTqP+HfkvhCnOwYRSeERcOmjzzAsIp+53o3qA7ngS0FijpyB/d7 saruZB74oIeyLrHp79vavwR9k0nXFN/Ks3pXj6rSgZC6rQ==; 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=1696393266; bh=c6cDVbC1yn4Ap38qHqBAUXJQqGAHTSzWSew6AEEh3LM=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Type:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:DKIM-Signature:DKIM-Signature; b=higKlJjw5g0Al2K2IbeEsELfCwN3XmIFMU1BrPd1MoK1fvX7NHJ7Nj3PDuk9imS8qAOeTR6pZz 7uYEumw0v2sEed4HMb8cshdzgyaiGziVliX3NM5OYHXmQEEhUMZSYudPAuvOomug1gjCV45K55 y1r5czWmZnus+wPSKWE1a07Z4GG5Y5fTkC1e/c7/eNMoQppsaXhx18K0cH1WfgnX5z1RVBl+nc F64fZnr6LkAnqm7GiiQjS8jIrxH61p29KE1BQi4tkPVkG6lpPvAcyHDqhhv1aStg2XewBp26qI 2ntWvM56y4E7DMuCj5sti2wLdd6wlHHsxKS6595Dm6jGHA==; 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:In-Reply-To:References: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; bh=71PWTnJGcErSxPum/cWG8RCmUfV5goNyRF4H8HWrEtE=; b=AWyoR4hxhYGuOh7QyPd20rgFHg gngWaGwCQSMWIIqq6hJG2LJJfb/4lu0ADFFU24CFfRkE9I086hb9S4I03YrB0W9bueNECt73vtnuV CDAXSC3GjEWBaUCvhLMa7m6OxsskG8WT6l2aTRrK8P9hzGDGhTNbw7r2EwfAfCQRuad1M0GeynqAZ nOsZtycG989uFyhB930MFVvkVUvhidUq3Xq8/uu41F4Gfng+MXND8O9QALfGMaZVw170s9VR4qbQq VehJST8j+qo3bhdovyH+JDljqmF2nQ+bDJPG3k7yTt3jyPZPpaq69r0Tmzmr67MggbpPzz7EEA52A 8SJwQp+g==; Received: by zero.zsh.org with local id 1qntNh-0005tv-G1; Wed, 04 Oct 2023 04:21:05 +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]:44399) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1qntNH-0005ak-U8; Wed, 04 Oct 2023 04:20:41 +0000 Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-99c136ee106so297369166b.1 for ; Tue, 03 Oct 2023 21:20:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20230601.gappssmtp.com; s=20230601; t=1696393239; x=1696998039; darn=zsh.org; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=71PWTnJGcErSxPum/cWG8RCmUfV5goNyRF4H8HWrEtE=; b=GVs+dxzq8+ib/WfVWjaAT5WbAm79tB6SA5T5/dFcVqT6I1EMvJysFb8i8vpAo1Z9EZ ipeq4bOoxCntOcUHPyj6zGz00bjG+QnmlxEw6oj/dtT9oICSX91pUCMlTSAdV3lXAx1p V724jd7v0aSbEFrp5Bvr7kLfacR2YMpx6WQq5MOeD2XChuCyfUNqmczynpP4A/4ocJDx ILhdQoZ4YTUtuVYOPDl91Yef3mljCNS/jxWamXN77KAVXikzQxJUBIqlCFKdIeo/P+wZ vm4Lq0FPy8nO3/PoylBO6pcoovkEAqZok0nj1+qMVTO7KX/T77EqHV2UbEMlAmxS1V6x vkZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696393239; x=1696998039; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=71PWTnJGcErSxPum/cWG8RCmUfV5goNyRF4H8HWrEtE=; b=govS0zfKjeAnyiC+v1ujZJs/qMPZEiloxM43ntbCfdkUZJqB4fbGtnDT4kRIelkIoV gxygbDq0j4YBDZ84zQsVOTh8KdhnXhhoVzq5f2G2XZ0bGcit4Df0jGSoZnTTouVJvZxU DGXO31vhzbDycFrQ2f2LjFWnaU6O4M+K2a9QCxMPDzt51X+qOYz2sXqZ3DT5RsDZ0hBv /d3JaAfyknxmHcklMjVRSGWAUEbxwGp4wJhD5jPPcQ2obNqCAAI9TviQzam7pCiipszW LjqUAKyZ1rGdMY9E0sE/F7yVyQ1jt2QtGeTGROhkZct4etHLKI30G8viyyEYvYVJpcqR Yclw== X-Gm-Message-State: AOJu0YwDdjNAjea12/P6QMcfNkRUngqpC6UmJm0jXj5u3gYUcz6Ll+1o f2HHRLCwijmQGlpUBmFi5+cUVoKRkYuaVhpgdN3TetEEbz2JU8ZrE1I= X-Google-Smtp-Source: AGHT+IH2aYsROQCCyfIEB1XZKNYeuHSPTKQBvV54VDVPo6W8M5SSRAM4nd9qsecq20OXE3ZNYHCLhiU/JfH20aUEQgk= X-Received: by 2002:a17:906:2929:b0:9b8:df8e:cbde with SMTP id v9-20020a170906292900b009b8df8ecbdemr158242ejd.51.1696393238786; Tue, 03 Oct 2023 21:20:38 -0700 (PDT) MIME-Version: 1.0 References: <20221211175001.u7dqfrnnzylsbjan@chazelas.org> In-Reply-To: From: Bart Schaefer Date: Tue, 3 Oct 2023 21:20:27 -0700 Message-ID: Subject: Re: a='foo"'; echo ${a/foo"/"bar} outputs bar To: Zsh hackers list Content-Type: multipart/mixed; boundary="00000000000065df990606dc5427" X-Seq: 52202 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: --00000000000065df990606dc5427 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Sun, Aug 6, 2023 at 7:36=E2=80=AFPM Bart Schaefer wrote: > > Circling back to this ... ... and again ... > With an increased understanding of lex.c gained by stepping through > variations of ${|...} a thousand times, I think I have identified two > possible ways to address this. Turns out there's a fundamental problem with ${var/pat/repl}, namely that upon reaching paramsubst() the only recognized quoting of the slash character is to precede it with a backslash. Conversely, gettokstr() recognizes '...', "...", and $'...' quoting, and may return STRING tokens containing backslashes that paramsubst() won't be able to deal with. Other things that have never worked are e.g. ${a/${b/c/d}/e}, which gives bad substitution, and ${a/"${b/c/d}"/e} which AFAICT always substitutes ${a} with no replacements, and ${a/"$( /bin/echo d )"/e} which is bad pattern: "$(. Fixing this properly would require doing a full-fledged parse inside paramsubst(), rather than just a search for unquoted backslashes. Several of my attempts so far have caused at least Test/Y01 to fail in comptesteval, so there is evidence for dependency on the existing behavior. > Something similar would have to be done with single quotes I had an idea here that seems to work: while reading single-quoted strings in gettokstr(), recognize when we're in a pattern and replace all / with \/. That only fixes '...' and $'...' at best, though. So, back to workers/51202, my original reply on this thread: handle double-quotes in paramsubst(), leaving single quotes to gettokstr(). This still isn't perfect (see above regarding ${a/${b/c/d}/e}) but it fixes the two Xfail tests in D04parameter and handles most of the straightforward cases, including a=3D'/x/y/z' zsh -fc 'echo "${a/"/y/"/+}"' and even the ${a/"${b/c/d}"/e} example, although it'll break on any more double quotes inside other double quotes. Other existing tests still pass. Let me know what you think. --00000000000065df990606dc5427 Content-Type: text/plain; charset="US-ASCII"; name="subst-pat-quote.txt" Content-Disposition: attachment; filename="subst-pat-quote.txt" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_lnb8nq040 ZGlmZiAtLWdpdCBhL1NyYy9sZXguYyBiL1NyYy9sZXguYwppbmRleCAzM2IxN2NjOTUuLjMxYjEz MGIwNyAxMDA2NDQKLS0tIGEvU3JjL2xleC5jCisrKyBiL1NyYy9sZXguYwpAQCAtOTM4LDcgKzkz OCw3IEBAIGdldHRva3N0cihpbnQgYywgaW50IHN1YikKIHsKICAgICBpbnQgYmN0ID0gMCwgcGN0 ID0gMCwgYnJjdCA9IDAsIHNlZW5fYnJjdCA9IDAsIGZkcGFyID0gMDsKICAgICBpbnQgaW50cG9z ID0gMSwgaW5fYnJhY2VfcGFyYW0gPSAwLCBjbWRzdWJzdCA9IDA7Ci0gICAgaW50IGlucXVvdGUs IHVubWF0Y2hlZCA9IDA7CisgICAgaW50IGlucXVvdGUsIHVubWF0Y2hlZCA9IDAsIGluX3BhdHRl cm4gPSAwOwogICAgIGVudW0gbGV4dG9rIHBlZWs7CiAjaWZkZWYgREVCVUcKICAgICBpbnQgb2Nt ZHNwID0gY21kc3A7CkBAIC0xMTYwLDcgKzExNjAsNyBAQCBnZXR0b2tzdHIoaW50IGMsIGludCBz dWIpCiAJICAgIGlmIChiY3QtLSA9PSBpbl9icmFjZV9wYXJhbSkgewogCQlpZiAoY21kc3Vic3Qp CiAJCSAgICBjbWRwb3AoKTsKLQkJaW5fYnJhY2VfcGFyYW0gPSBjbWRzdWJzdCA9IDA7CisJCWlu X2JyYWNlX3BhcmFtID0gY21kc3Vic3QgPSBpbl9wYXR0ZXJuID0gMDsKIAkgICAgfQogCSAgICBj ID0gT3V0YnJhY2U7CiAJICAgIGJyZWFrOwpAQCAtMTMwOSw3ICsxMzA5LDggQEAgZ2V0dG9rc3Ry KGludCBjLCBpbnQgc3ViKQogCQkJICAgIGxleGJ1Zi5wdHItLSwgbGV4YnVmLmxlbi0tOwogCQkJ ZWxzZQogCQkJICAgIGJyZWFrOwotCQkgICAgfQorCQkgICAgfSBlbHNlIGlmIChpbl9wYXR0ZXJu ICYmIGMgPT0gJy8nKQorCQkJYWRkKEJudWxsKTsKIAkJICAgIGFkZChjKTsKIAkJfQogCQlBTExP V0hJU1QKQEAgLTEzOTcsMjYgKzEzOTgsMzYgQEAgZ2V0dG9rc3RyKGludCBjLCBpbnQgc3ViKQog CSAgICAgKi8KIAkgICAgYyA9IERhc2g7CiAgICAgICAgICAgIGJyZWFrOwotICAgICAgIGNhc2Ug TFgyX0JBTkc6Ci0gICAgICAgICAgIC8qCi0gICAgICAgICAgICAqIFNhbWUgbG9naWMgYXMgRGFz aCwgZm9yICEgdG8gcGVyZm9ybSBuZWdhdGlvbiBpbiByYW5nZS4KLSAgICAgICAgICAgICovCi0g ICAgICAgICAgIGlmIChzZWVuX2JyY3QpCi0gICAgICAgICAgICAgICBjID0gQmFuZzsKLSAgICAg ICAgICAgZWxzZQotICAgICAgICAgICAgICAgYyA9ICchJzsKLSAgICAgICB9Ci0gICAgICAgYWRk KGMpOwotICAgICAgIGMgPSBoZ2V0YygpOwotICAgICAgIGlmIChpbnRwb3MpCisJY2FzZSBMWDJf QkFORzoKKwkgICAgLyoKKwkgICAgICogU2FtZSBsb2dpYyBhcyBEYXNoLCBmb3IgISB0byBwZXJm b3JtIG5lZ2F0aW9uIGluIHJhbmdlLgorCSAgICAgKi8KKwkgICAgaWYgKHNlZW5fYnJjdCkKKwkJ YyA9IEJhbmc7CisJICAgIGVsc2UKKwkJYyA9ICchJzsKKwljYXNlIExYMl9PVEhFUjoKKwkgICAg aWYgKGluX2JyYWNlX3BhcmFtKSB7CisJCWlmIChjID09ICcvJykgeworCQkgICAgaWYgKGluX3Bh dHRlcm4gPT0gMCkKKwkJCWluX3BhdHRlcm4gPSAyOworCQkgICAgZWxzZQorCQkJLS1pbl9wYXR0 ZXJuOworCQl9CisJICAgIH0KKwl9CisJYWRkKGMpOworCWMgPSBoZ2V0YygpOworCWlmIChpbnRw b3MpCiAJICAgIGludHBvcy0tOwotICAgICAgIGlmIChsZXhzdG9wKQorCWlmIChsZXhzdG9wKQog CSAgICBicmVhazsKLSAgICAgICBpZiAoIWNtZHN1YnN0ICYmIGluX2JyYWNlX3BhcmFtICYmIGFj dCA9PSBMWDJfU1RSSU5HICYmCi0JICAgKGMgPT0gJ3wnIHx8IGMgPT0gQmFyIHx8IGluYmxhbmso YykpKSB7Ci0JICAgY21kc3Vic3QgPSBpbl9icmFjZV9wYXJhbTsKLQkgICBjbWRwdXNoKENTX0NV UlNIKTsKLSAgICAgICB9CisJaWYgKCFjbWRzdWJzdCAmJiBpbl9icmFjZV9wYXJhbSAmJiBhY3Qg PT0gTFgyX1NUUklORyAmJgorCSAgICAoYyA9PSAnfCcgfHwgYyA9PSBCYXIgfHwgaW5ibGFuayhj KSkpIHsKKwkgICAgY21kc3Vic3QgPSBpbl9icmFjZV9wYXJhbTsKKwkgICAgY21kcHVzaChDU19D VVJTSCk7CisJfSBlbHNlIGlmIChpbl9wYXR0ZXJuID09IDIgJiYgYyAhPSAnLycpCisJICAgIGlu X3BhdHRlcm4gPSAxOwogICAgIH0KICAgYnJrOgogICAgIGlmIChlcnJmbGFnKSB7CmRpZmYgLS1n aXQgYS9TcmMvc3Vic3QuYyBiL1NyYy9zdWJzdC5jCmluZGV4IGNkYmZjMTM4YS4uNDE5MDY5ZjVh IDEwMDY0NAotLS0gYS9TcmMvc3Vic3QuYworKysgYi9TcmMvc3Vic3QuYwpAQCAtMzA4OCw2ICsz MDg4LDEzIEBAIHBhcmFtc3Vic3QoTGlua0xpc3QgbCwgTGlua05vZGUgbiwgY2hhciAqKnN0ciwg aW50IHF0LCBpbnQgcGZfZmxhZ3MsCiAJCQljaHVjayhwdHIpOwogCQkgICAgZWxzZQogCQkJcHRy Kys7CisJCX0gZWxzZSBpZiAoYyA9PSBEbnVsbCkgeworCQkgICAgY2h1Y2socHRyKTsKKwkJICAg IHdoaWxlICgqcHRyICYmICpwdHIgIT0gYykKKwkJCXB0cisrOworCQkgICAgaWYgKCpwdHIgPT0g RG51bGwpCisJCQljaHVjayhwdHIpOworCQkgICAgcHRyLS07CS8qIE91dGVyIGxvb3AgaXMgYWJv dXQgdG8gaW5jcmVtZW50ICovCiAJCX0KIAkgICAgfQogCSAgICByZXBsc3RyID0gKCpwdHIgJiYg cHRyWzFdKSA/IHB0cisxIDogIiI7CmRpZmYgLS1naXQgYS9UZXN0L0QwNHBhcmFtZXRlci56dHN0 IGIvVGVzdC9EMDRwYXJhbWV0ZXIuenRzdAppbmRleCBjMjAwODU4MmMuLjY5YTRmZDNlYyAxMDA2 NDQKLS0tIGEvVGVzdC9EMDRwYXJhbWV0ZXIuenRzdAorKysgYi9UZXN0L0QwNHBhcmFtZXRlci56 dHN0CkBAIC0yNzYyLDEzICsyNzYyLDEzIEBAIEY6YmVoYXZpb3IsIHNlZSBodHRwOi8vYXVzdGlu Z3JvdXBidWdzLm5ldC92aWV3LnBocD9pZD04ODgKIAogIHNsYXNoPScvJwogIHByaW50IC1yIC0t IHgke3NsYXNoLycvJ315Ci0tRGY6KHVzZXJzLzI4Nzg0KSBzdWJzdGl0dXRpbmcgYSBzaW5nbGUt cXVvdGVkIGJhY2tzbGFzaCwgcGFydCAjMTogc2xhc2gKKzA6KHVzZXJzLzI4Nzg0KSBzdWJzdGl0 dXRpbmcgYSBzaW5nbGUtcXVvdGVkIGJhY2tzbGFzaCwgcGFydCAjMTogc2xhc2gKID54eQogCiAg c2luZ2xlX3F1b3RlPSInIgotIHByaW50IC1yIC0tIHgke3NpbmdsZV9xdW90ZS8nLyd9eQotLURm Oih1c2Vycy8yODc4NCkgc3Vic3RpdHV0aW5nIGEgc2luZ2xlLXF1b3RlZCBiYWNrc2xhc2gsIHBh cnQgIzI6IHNpbmdsZSBxdW90ZQotPngveQorIHByaW50IC1yIC0tIHgke3NpbmdsZV9xdW90ZS8k Jy8nfXkKKzA6KHVzZXJzLzI4Nzg0KSBzdWJzdGl0dXRpbmcgYSBzaW5nbGUtcXVvdGVkIGJhY2tz bGFzaCwgcGFydCAjMjogc2luZ2xlIHF1b3RlCis+eCd5CiAKICBjb250cm9sPSJmb29iYXIiCiAg cHJpbnQgLXIgLS0geCR7Y29udHJvbC8nYmFyJ315Cg== --00000000000065df990606dc5427--