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 10149 invoked from network); 16 Dec 2022 17:46:49 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 16 Dec 2022 17:46:49 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1671212809; b=iQ1XrEqQIJh/EVjL1eZebLBtbKbmZ/qQk4LbuiW6v/pmmJs/kF/OnEc6qPRA4EcRadTDaFY9Tl sRqjSfBUNJEJU5kifOrq2CEmns7LvGg+KBl8ll3kTuePSHPHlOjb57sTSCS+Y9quNloC2WfQ/f H4RJsjhoNSnu8x/UllwdmKoOdYuIP3l//SOOr8msQUCJDFLm7T7UZlacAnZajofgFE70mgQpeZ VtK3JSkANS+s2QbfnnldJtWCR3zSD5qRjj9B6HHN68xdBwDF0phKbj4ahNNUthIr+s5W6a0tzu yteqGlWC2o8tJNvo4CfD3vZXLfpomNxcGVcMFm6C5PeTNw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (wout2-smtp.messagingengine.com) smtp.remote-ip=64.147.123.25; dkim=pass header.d=daniel.shahaf.name header.s=fm1 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1671212809; bh=KkTfWSkO4Nt0UFjLv2mJ6nD7lxJxO+KIOTZRmkIJ7BA=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:In-Reply-To:Content-Transfer-Encoding:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:DKIM-Signature: DKIM-Signature:DKIM-Signature; b=kmQN+21Fco84hboX63MwSUASNzrh+//7vqw4zoBqLSGU72yQhDoznYKqiMNApMx7c6UpeTrbgB dD09TrJkpAHKAaCBkEBy1+CuYxD5YzDCnUhTMsA8GyNh66IRCHRJrMVR49yFbaVA4y5bkNEAOV 4ypPtnINnDwHrSlpepV3KRGZ6m+vSDGaxz+7XyU844tUIfsrmTOkyudvOOjsaCVFdoKWGRlXGd AVlbMav+q6R8DqbmPfRYzWxjAJbjk3x9GvXBOYAyDpt+IPHVsj1Zj3IDrFlOu8OAFoqEDG7ABc XxKOJmS3jdPMcd8Xt5IHCsktkyRsTYaW0JfHdw83s/V1eg==; 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:In-Reply-To:Content-Transfer-Encoding :Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID; bh=8jEPZnAAS6iYY6e+HzSiSYRYsyj2ULs3FlCqq0tO7LI=; b=mDkiZIDLQzgVx3QOabVjF451jY NzmqMThGKSo7xDP+zDddWQmVf6F8h/ufsY7jRibyWdUq50qRf9v9CBdlKBlDehiDPKe8vmDq6/iaP /JlMdcw5ulGQo+Wlo3CML8l7gmdCwoiC4ouXdNUasLpMnHsyZj+vBpETp6dhqXVPPkbmKkOWKyZg+ AKU9pPVFmlwX+rE7IY2D1RZ7G/PgAyXgKKHxdIxaIm6sQW8K829sy9tsKjLVFc+bYFHl4ppicQGvJ tSrCYcZ3L4DpzR07iRQr0UeIzG8IKaBLCVpXnxnYTKHBGFzhoF/vi0y8+vdRnRCHVhdQEjUPnkfab Fq86wytQ==; Received: by zero.zsh.org with local id 1p6EnH-000FJZ-Om; Fri, 16 Dec 2022 17:46:47 +0000 Authentication-Results: zsh.org; iprev=pass (wout2-smtp.messagingengine.com) smtp.remote-ip=64.147.123.25; dkim=pass header.d=daniel.shahaf.name header.s=fm1 header.a=rsa-sha256; dkim=pass header.d=messagingengine.com header.s=fm2 header.a=rsa-sha256; dmarc=none header.from=daniel.shahaf.name; arc=none Received: from wout2-smtp.messagingengine.com ([64.147.123.25]:35757) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_256_GCM_SHA384:256) id 1p6Emi-000F0M-HV; Fri, 16 Dec 2022 17:46:13 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id BE55C32004AE; Fri, 16 Dec 2022 12:46:09 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 16 Dec 2022 12:46:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= daniel.shahaf.name; h=cc:cc:content-transfer-encoding :content-type:date:date:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to; s=fm1; t=1671212769; x=1671299169; bh=8jEPZnAAS6 iYY6e+HzSiSYRYsyj2ULs3FlCqq0tO7LI=; b=msalHgchoHg70H8bk4UtZa3aRk hJIf+MZCCoD8x8Oft0NuYb3EtKK3cHO/iXxPdaxtWhZEbxmf6LfkJVN+7MKAluU3 4RAQrTg/g8YCEUaTKmyp1FYF92S4vLPd3ZMSieCCmx2t2zn9rMBoYtRe33YFkgvL qfXHzsfKIRi8EkbE8IjwMzed3IpBN5OZ6HUg6Bi+n9+KyQxGh6Ho6nJ01/iV7JZT MNhHlZl4U3OI0w6N25xzOt4BuIqPSMsPESeqgYsPn32se7EFmdiEQlUIHwGxFoPA DJd8RYrh35LcjVnuuIhlzEiJrIMzqSQ2mStHg3ZSRu4H2/YOzP9MTRDOo0YQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1671212769; x= 1671299169; bh=8jEPZnAAS6iYY6e+HzSiSYRYsyj2ULs3FlCqq0tO7LI=; b=i QB4adieeQV38CMjn07Y3/Wc43CWIUbDZtKB8kbkYJo5fA8ywQEujZKoWt8sRb06X wdPJ1WbOyFC7LTQokG0PY/gmPfiYZdhFLchkZmHcp0YyYfGxO/bSEVqJNSeqhVHG 3PYC1GlZoJEBJJ+ewoqqEzbKfW975gZw8aWqNNU/WnDFcYNLzd/FoiHmKaY3L2az vBi65wow4GgcZuWY6yONQkXB40QCYrtpFNoxwrRDnB7jhPPpVv7SrXDR0P23D52j PKMJmmKQiqf6W9IUM2n6wbPjsZ8533TS9f07PTJTUWboUTkreFB08b2TUvpcgkQU K7FaN/Mrmhi66RDHkUzkA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfeejgddutddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggugfgjfgesthektddttderudenucfhrhhomhepffgr nhhivghlucfuhhgrhhgrfhcuoegurdhssegurghnihgvlhdrshhhrghhrghfrdhnrghmvg eqnecuggftrfgrthhtvghrnhepfefhieeutdehgfetudefveeitdegtdejkefgvddugffg tdduheeggfejudetfeeunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomhepugdrshesuggrnhhivghlrdhshhgrhhgrfhdrnhgrmhgv X-ME-Proxy: Feedback-ID: i425e4195:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 16 Dec 2022 12:46:08 -0500 (EST) Received: by tarpaulin.shahaf.local2 (Postfix, from userid 1000) id 4NYc314vW1z4hB; Fri, 16 Dec 2022 17:46:05 +0000 (UTC) Date: Fri, 16 Dec 2022 17:46:05 +0000 From: Daniel Shahaf To: Peter Stephenson Cc: zsh workers Subject: Re: zsh_error_db --- hash-based database of error messages Message-ID: <20221216174605.GE8411@tarpaulin.shahaf.local2> References: <527664940.183302.1671208973242@mail.virginmedia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <527664940.183302.1671208973242@mail.virginmedia.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-Seq: 51225 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: 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 >