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,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 9500 invoked from network); 4 Apr 2022 18:53:13 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 4 Apr 2022 18:53:13 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1649098393; b=XYNJ9P1f0wSwSlkXRlyW9tMVUTDrkpblLw8ZHKiLt3zy9rw+ahQ7hZK7DIiIfM3AcHeZycx1Vt Y5xJ62Qq1y4TXuft4BUGogF5KKeqIpkkwz3wpXTKE6i0Yy4rNNbiC6eah1mBprbIWO3k84W2eO tLtFrIMsZKSM106OoYcf3CGQZ56mtSeh+CIjvkOVgeErbmaGkBCTBtquWZaFaJ4lEkXSr+Dv0i JHyymn64WcDTSw4fYkAqmMROQEOqZsm7mO3VZxLeE1ZYVqh0MbVRXCyOpI2BTeUIkwVrg//+Lp SnlAkHbuDLm1HQtJidpRtuujX+BfgKp1qY7A2sUxWXaDfQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-ej1-f45.google.com) smtp.remote-ip=209.85.218.45; 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=1649098393; bh=NmAvP//8vUXxeaVA88wef7NqavM9PhcXE9UntQwS7vQ=; 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=NPI5HnXvXjuV3tGWhwp//FOhQ7v8OS5WVPTVe8C/BUUFr5t+6f3Ga8AiBp8aYs2OhHVV1iCXZT 3IqlqS9ubT2vIENIIunBu6AkWDINdqtgN0iCAl1ZePXQFWFQKIVpJZbtQZIgYn9k0zlK2ADuUV sGO1KTKcsZDG3JMGKUPY7jB9kaIwYN4x5fEMLIgDVBGAyLslBRl1qvpYTNrqd/DTC7z1awEidP WH0XQpLhBNWWU5L3heC+a3FYXjDYM9wbDXlxmNtzb6NCAXe2Aa+OAPE3eZCWu3Jtw0vjQa3Opv 7istCGWhtGz50PqgiqbI72cYQ3huayg/Vp6d2AF4A+kt4w==; 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=KbZvk1JwAq+FX9vbvvooSZR+enty5HR+EvDlb5fH8tk=; b=ileQfLbXGckHJo76/OqDvI8MT9 lCEj7DUjO13ngZikcrEU7Y1Q0/S1/SP4xeo6p8qCpf8FJTlSl1dhrMGO2muurNf+yjRxB5ACIGw6d R28dohUc6TQegUP50h3wpVFFm79x5cmAxrQ9IXIGXO/EoyVAieeX5iWpykuxqjPS82hO5MlXAGd5+ NAUJs1aZRWtvtYXxC9nTeCououO4kxNEOzRTdMTsQp+g9ngvmOtdVz/GVKTRteSlSmCYyUQ6GHRPG LneS4kGn88KGfjbOQt0Ec29P+NaF/OBx+EfYsBu77gpjBDP86x2M4CQY5a2eFVMy1+DtLcBvsp5Ld mkZJGenA==; Received: from authenticated user by zero.zsh.org with local id 1nbRpA-000DPU-GU; Mon, 04 Apr 2022 18:53:12 +0000 Authentication-Results: zsh.org; iprev=pass (mail-ej1-f45.google.com) smtp.remote-ip=209.85.218.45; 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-f45.google.com ([209.85.218.45]:44547) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1nbRoT-000D4Y-K1; Mon, 04 Apr 2022 18:52:30 +0000 Received: by mail-ej1-f45.google.com with SMTP id qh7so11872175ejb.11 for ; Mon, 04 Apr 2022 11:52:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brasslantern-com.20210112.gappssmtp.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=KbZvk1JwAq+FX9vbvvooSZR+enty5HR+EvDlb5fH8tk=; b=L1XwDRKgTaiaITus1jmP3IRbaMD5vLMJMNw4zBtGib3RFNQa7pwXgztgEOlR7QK2cM L8A9Q+bZWKIm8offPSBA9Y5rEavHc1TCdmhxKZIkm8qQtoOXCWEFAS0M4qqIId0+Koke IbV29Mu1AdliI7LzvK9cLizI9mJ6MPxP1IM015qk3KB0J7wbNzB0teMVUFXA5w65VxKc kPgEUPkHr8USRb4K2xd6B0t3T+AG99dZIUAC2kZnGFG4Nz1sAjklxro+XsNK/CdwVGlE sshLl6k6CvlCzh46STE2837nvIDxEF+ttwyJpaLzW39t9z9kIeUWgKDTh1fzofbE2x6N 1t4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=KbZvk1JwAq+FX9vbvvooSZR+enty5HR+EvDlb5fH8tk=; b=AfrJKuwp+mx7z8wBtKMNU3F2nQt0FvhDhc5zjg/eRnhKtKePSO4JMPvkE9OXFGPT82 55pOH4OOCWJHUyBjFBA3QZ0XvwnHxpU7wTVZz8gZV31DH8Xw3QoxPA8rVi7Dq8scGHOg VA151yQL7ZXO7F7FNmd+doIhtdqrRHnHOLgaApk1PFy4R7lUWozsJ2E6s+r4WT7SycwN K8pQoNj50eFUJvQHpV/X5AZRsXW8ZlI/7eEhRrTU0qFX3+nlTuQQqj6m+yldXMq6A1uR 4Zn1Tg6QWG6d39Ei48Os7sVfyluv0VQxYTG530epDXDLeIgVhx59gZD1PHaobIRE8Ce4 RnHw== X-Gm-Message-State: AOAM532YIS1lYIWGCGjq7Liu+5RvK9bUS2puREDjQPq5+JefDkX0zRGZ atf4fBh1sDSFjumylykQ8e9mT4WyRS/MS93DD97eTnXLbIbXoLOp X-Google-Smtp-Source: ABdhPJzYN7np+l32LaiE+ynM2J8WdOxAYOmIUcAGTFHclb/eZkgnntN2mUSvX8W39M+f1MJolsOY1CaL0Tq5jg4yJo8= X-Received: by 2002:a17:907:6e20:b0:6e1:4979:bcf3 with SMTP id sd32-20020a1709076e2000b006e14979bcf3mr1482880ejc.69.1649098348860; Mon, 04 Apr 2022 11:52:28 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Bart Schaefer Date: Mon, 4 Apr 2022 11:52:17 -0700 Message-ID: Subject: Re: Lots of test failures when --disable-multibyte To: Zsh hackers list Content-Type: text/plain; charset="UTF-8" X-Seq: 49990 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: On Sun, Apr 3, 2022 at 7:03 PM Bart Schaefer wrote: > > ./D01prompt.ztst: starting. > --- /tmp/zsh.ztst.159862/ztst.out 2022-04-03 18:48:45.714786786 -0700 > +++ /tmp/zsh.ztst.159862/ztst.tout 2022-04-03 18:48:45.718786838 -0700 > @@ -1 +1 @@ > - > +V > Test ./D01prompt.ztst failed: output differs from expected as shown above for: > print ${(%U)Y-%(v} > Was testing: Regression test for test on empty psvar > ./D01prompt.ztst: test failed. Here's a patch for that one, bringing it in line with the multibyte branch. diff --git a/Src/hist.c b/Src/hist.c index d4557d424..f9440dba7 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -2252,6 +2252,7 @@ casemodify(char *str, int how) #endif while (*str) { int c; + int mod = 0; if (*str == Meta) { c = str[1] ^ 32; str += 2; @@ -2259,13 +2260,17 @@ casemodify(char *str, int how) c = *str++; switch (how) { case CASMOD_LOWER: - if (isupper(c)) + if (isupper(c)) { c = tolower(c); + mod = 1; + } break; case CASMOD_UPPER: - if (islower(c)) + if (islower(c)) { c = toupper(c); + mod = 1; + } break; case CASMOD_CAPS: @@ -2273,14 +2278,18 @@ casemodify(char *str, int how) if (!ialnum(c)) nextupper = 1; else if (nextupper) { - if (islower(c)) + if (islower(c)) { c = toupper(c); + mod = 1; + } nextupper = 0; - } else if (isupper(c)) + } else if (isupper(c)) { c = tolower(c); + mod = 1; + } break; } - if (imeta(c)) { + if (mod && imeta(c)) { *ptr2++ = Meta; *ptr2++ = c ^ 32; } else