From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: Peter Stephenson <p.w.stephenson@ntlworld.com>
Cc: zsh workers <zsh-workers@zsh.org>
Subject: Re: zsh_error_db --- hash-based database of error messages
Date: Fri, 16 Dec 2022 17:46:05 +0000 [thread overview]
Message-ID: <20221216174605.GE8411@tarpaulin.shahaf.local2> (raw)
In-Reply-To: <527664940.183302.1671208973242@mail.virginmedia.com>
Peter Stephenson wrote on Fri, Dec 16, 2022 at 16:42:53 +0000:
> Following on from the retread of the discussion on error messages,
> here's a very simply proof of concept for a hash-based database of
> error messages. Even if it's adopted I don't intend the C code
> to get much larger as the point is to allow it to be able to do
> everything in shell code.
>
So, tl;dr:
- Every error message would get an E42 identifier in the source string.
- The "E42" will be looked up as a string key in a well-known assoc,
where the value will be a more elaborate error message.
- The more elaborate message, if there is one, will be used instead of
the default message.
Code review below.
> +++ b/Src/utils.c
> @@ -119,6 +119,93 @@ set_widearray(char *mb_array, Widechar_array wca)
> +/* Attempt to use hash zsh_error_db to update message */
> +/**/
> +static const char *
> +zerrmsg_from_hash(const char *msg)
> +{
> + Param errdb, msgpm;
> + HashTable errtab;
> + const char *postcode = msg, *sigmsg, *sigvar, *imsg;
> + char *errcode, *newmsg;
> +
> + if (*postcode++ != 'E')
> + return msg;
> + while (idigit(*postcode))
> + ++postcode;
> + if (postcode == msg || *postcode != ':')
> + return msg;
The first disjunct can't be true at this point, due to the earlier
«*postcode++». Maybe you meant «postcode == msg + 1», to catch the case
"E:foo" with no digits?
> +
> + imsg = postcode+1;
> + errdb = (Param)paramtab->getnode(paramtab, "zsh_error_db");
> + if (!errdb || !(errdb->node.flags & PM_HASHED)) {
> + return imsg;
> + }
> +
> + errcode = dupstrpfx(msg, postcode-msg);
> + errtab = errdb->gsu.h->getfn(errdb);
> + if (!errtab)
> + return imsg;
> + msgpm = (Param)errtab->getnode(errtab, errcode);
> + if (PM_TYPE(msgpm->node.flags)) {
> + /* Not a plain string, bail out (safety) */
> + return imsg;
> + }
> + newmsg = msgpm->gsu.s->getfn(msgpm);
> +
> + if (!newmsg || !*newmsg)
> + return imsg;
> +
> + /* Check the %-signature matches */
> + sigmsg = imsg;
> + sigvar = newmsg;
> +
> + for (;;) {
> + while (*sigmsg && *sigmsg != '%')
> + sigmsg++;
> + if (!*sigmsg)
> + break;
That's just reinventing strchr(), isn't it?
> + ++sigmsg;
> + if (*sigmsg == '%') {
> + ++sigmsg;
> + continue;
> + }
> + while (*sigvar) {
> + if (*sigvar++ == '%')
> + {
> + if (*sigvar != '%')
> + break;
> + ++sigvar;
> + }
> + }
> + if (!*sigvar || *sigvar != *sigmsg)
> + return zerrmsg_bad_signature(errcode, imsg);
> + ++sigvar;
> + ++sigmsg;
> + }
> + while (*sigvar)
> + {
> + if (*sigvar++ == '%')
> + {
> + if (*sigvar != '%')
> + return zerrmsg_bad_signature(errcode, imsg);
> + ++sigvar;
> + }
> + }
> +
> + return newmsg;
> +}
> +
>
> /* Print an error
>
next prev parent reply other threads:[~2022-12-16 17:46 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-16 16:42 Peter Stephenson
2022-12-16 17:46 ` Daniel Shahaf [this message]
2022-12-16 18:05 ` Peter Stephenson
2022-12-16 20:05 ` Daniel Shahaf
2022-12-17 21:33 ` Oliver Kiddle
2022-12-19 9:19 ` Peter Stephenson
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=20221216174605.GE8411@tarpaulin.shahaf.local2 \
--to=d.s@daniel.shahaf.name \
--cc=p.w.stephenson@ntlworld.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).