From: Bart Schaefer <schaefer@brasslantern.com>
To: Zsh hackers list <zsh-workers@zsh.org>
Subject: Re: Lots of test failures when --disable-multibyte
Date: Mon, 4 Apr 2022 14:45:00 -0700 [thread overview]
Message-ID: <CAH+w=7bWU2MNHN2cv6P3gj+T-o1E6hX7TeB272-4cuqsmnVyKw@mail.gmail.com> (raw)
In-Reply-To: <CAH+w=7Z2VaxNct0y2acbvSv=D5rbnQYpOYwgiBoTc-UpnCxOWw@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 821 bytes --]
On Mon, Apr 4, 2022 at 2:10 PM Bart Schaefer <schaefer@brasslantern.com> wrote:
>
> On Mon, Apr 4, 2022 at 8:31 AM Bart Schaefer <schaefer@brasslantern.com> wrote:
> >
> > Remaining are that ${(V)...} doesn't output the same format in
> > single-byte mode, and that {$'\\0'..$'\\C-?'} doesn't expand to a
> > range.
>
> Here's a patch for the {a..z} discrepancy. nicechar() now prefers the
> ^C format to \C-C, in line with multibyte. I left a comment behind to
> note a branch that seemingly never occurs in single-byte?
I should have looked at ${(V)...} first. Following patch discards the
single-byte-only implementation of nicechar() in favor of the
"fallback" implementation from multibyte, which fixes ${(V)...} and
supersedes the utils.c hunk of the previous patch. (I've nevertheless
done them in sequence.)
[-- Attachment #2: nicechar.txt --]
[-- Type: text/plain, Size: 1621 bytes --]
diff --git a/Src/utils.c b/Src/utils.c
index 66cb2a63a..ffa59eff8 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -438,7 +438,6 @@ putshout(int c)
return 0;
}
-#ifdef MULTIBYTE_SUPPORT
/*
* Turn a character into a visible representation thereof. The visible
* string is put together in a static buffer, and this function returns
@@ -524,67 +523,6 @@ nicechar(int c)
return nicechar_sel(c, 0);
}
-#else /* MULTIBYTE_SUPPORT */
-
-/**/
-mod_export char *
-nicechar(int c)
-{
- static char buf[10];
- char *s = buf;
- c &= 0xff;
- if (ZISPRINT(c))
- goto done;
- if (c & 0x80) {
- if (isset(PRINTEIGHTBIT))
- goto done;
- *s++ = '\\';
- *s++ = 'M';
- *s++ = '-';
- c &= 0x7f;
- if(ZISPRINT(c))
- goto done;
- }
- if (c == 0x7f) {
- *s++ = '\\';
- *s++ = 'C';
- *s++ = '-';
- c = '?';
- } else if (c == '\n') {
- *s++ = '\\';
- c = 'n';
- } else if (c == '\t') {
- *s++ = '\\';
- c = 't';
- } else if (c < 0x20) {
- /*
- if (quotable) {
- *s++ = '\\';
- *s++ = 'C';
- *s++ = '-';
- } else
- */
- *s++ = '^';
- c += 0x40;
- }
- done:
- /*
- * The resulting string is still metafied, so check if
- * we are returning a character in the range that needs metafication.
- * This can't happen if the character is printed "nicely", so
- * this results in a maximum of two bytes total (plus the null).
- */
- if (imeta(c)) {
- *s++ = Meta;
- *s++ = c ^ 32;
- } else
- *s++ = c;
- *s = 0;
- return buf;
-}
-
-#endif /* MULTIBYTE_SUPPORT */
-
/*
* Return 1 if nicechar() would reformat this character.
*/
next prev parent reply other threads:[~2022-04-04 21:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 2:03 Bart Schaefer
2022-04-04 14:43 ` Peter Stephenson
2022-04-04 15:31 ` Bart Schaefer
2022-04-04 16:23 ` Peter Stephenson
2022-04-04 21:10 ` Bart Schaefer
2022-04-04 21:45 ` Bart Schaefer [this message]
2022-04-04 22:00 ` Bart Schaefer
2022-04-05 16:00 ` Bart Schaefer
2022-04-05 16:15 ` Mikael Magnusson
2022-04-05 20:29 ` Peter Stephenson
2022-04-06 3:48 ` Bart Schaefer
2022-04-06 5:32 ` ZTST_continue (was Re: Lots of test failures when --disable-multibyte) Jun T
2022-04-06 13:37 ` Peter Stephenson
2022-04-07 12:33 ` Jun T
2022-04-07 12:34 ` Jun T
2022-04-04 18:52 ` Lots of test failures when --disable-multibyte Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAH+w=7bWU2MNHN2cv6P3gj+T-o1E6hX7TeB272-4cuqsmnVyKw@mail.gmail.com' \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).