From nobody Thu Nov 19 23:06:27 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jVvGt0Bd5z71XMQ; Thu, 19 Nov 2026 23:06:30 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVvGs6jMGz4FDr; Thu, 19 Nov 2026 23:06:29 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795129589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eheBGe1OQ7GXwgb1hzgZVU9KJKKyamkYl3F5TOSLI88=; b=FjAEe5O/bBMwySrx5RkpdXN1ivsl2rI+oIQe0wd9/S/PN4I0H9J7i3h37W6QkmqkouTGVS 5fbUa4TxdNn2CXZTfpoA5NNW4+Nwg29+0lCMRYnYYIF7/HhtpLD35qEYzhk5lP+237GEHz ipE4X0JYM5pITqe+FMmZrEbgZn2LCcmapiVh+ESXLgT6nz51FbobK+Sn4WxoDErzPyQrtT YzIVEBIHvQMfc8YUPRQ7mt6j/tg0R37xGvgRTI3NP9wjgZy51LaWZWsZrS0WWWyxmfhj1R zgUEauyobbPj7VdiGHfpnYY2dv4q7Qz17PBKtxhwz0hlEYKWV+G7GKTe+2lbQQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795129589; b=NC4Vc+9dyKJ32kUi7GW932KsrE6WD06ZKf1QUV1oY6VTHfK252Cq2U8UE5HVbtPuKmlRLB ks1bh0pnDslEFx+Mn56gXwBBi1DmzgMadWwmuw8RKBxdhad3B8zTpCyRCzytdUyajDMbcx mi5odgiYJWF4DyIZi6iytCDjIJz2vdrSgiWrUcI3hji08Iax8OgqdaA0QlAvUvzG6cMJC6 XrP4xz65ufcUgIMgbeB7DKy5P4bk2ECDrPQ0j8d2539SdTXcbCdYci5UsC8X7cq7HAF//g C0ckiBb9W5HijoyUAgJj+BmsNG08PLUaz94VWVgYApT1KCd4D0qfT+IVpgQZuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795129589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=eheBGe1OQ7GXwgb1hzgZVU9KJKKyamkYl3F5TOSLI88=; b=cEMAgg0Up8m5PmZzfHBIAGmqyv5y25GBnHyocGfKh5TXlBhpWjsve5tSx44xSjdt1N++LF 4tjxZsIfewlW7we3S8L8yNqbOan8gHnLjo0arqlkiVrnvDgQ/wALVUc1eHw/T2JSYUG1MW D8mKtTQEn/hyb/xjoAsALiab2fZvn0fRUdyeGCNXYD+e+Zzr0WFDWTJHAgBVrkEmX6KnJ3 OhLeufFKu7tI89vTOT4jJg8y1MjTGX0j6RUrW/1idtmRpZg/ALb12p7uEM+u5gD8ATaZWx ArFB9i3iJj+5Bu/V6hX49ttro9tAGbOvpTcWq+PcRfOSvkwspuucp6TM44L42Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from cell.glebi.us (glebi.us [162.251.186.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4jVvGs1km6zh1R; Thu, 19 Nov 2026 23:06:29 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Thu, 19 Nov 2026 15:06:27 -0800 From: Gleb Smirnoff To: Jessica Clarke Cc: Dag-Erling =?iso-8859-1?Q?Sm=F8rgrav?= , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" , FreeBSD Release Engineering Team Subject: Re: git: 8b197806dcdf - main - libsysdecode: Teach mktables to handle enums Message-ID: References: <6a4c058d.3ff3a.44bb1175@gitrepo.freebsd.org> <1EE0178B-840A-448B-A666-A95A45139CC9@freebsd.org> <92F04590-94A9-4FD8-B288-536C0F6D4126@freebsd.org> <66090801-7FFE-4ACF-87AD-4C503429230E@freebsd.org> List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <66090801-7FFE-4ACF-87AD-4C503429230E@freebsd.org> On Thu, Nov 19, 2026 at 10:22:21PM +0000, Jessica Clarke wrote: J> The more adventurous alternative would be something like: J> J> diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables J> index bb784c853e48..61dc089a42c4 100644 J> --- a/lib/libsysdecode/mktables J> +++ b/lib/libsysdecode/mktables J> @@ -64,7 +64,7 @@ _EOF_ J> sed -nE ${excl:+-e "/${excl}/d"} \ J> -e "/^#[[:space:]]*define[[:space:]]+${grep}/p" \ J> "${include_dir}/${file}" | \ J> - sed -Ee 's/.*define[[:space:]]+([^[:space:]]+)\>.*/TABLE_ENTRY(\1)/' J> + sed -Ee 's/.*define[[:space:]]+([_[:alpha:]][_[:alnum:]]*).*/TABLE_ENTRY(\1)/' J> fi J> cat <<_EOF_ J> TABLE_END J> @@ -95,7 +95,7 @@ _EOF_ J> awk '/^(typedef[[:space:]]*)?enum([[:space:]].*)?\{/, J> /^\}([[:space:]].*)?;/' | J> # pick out the constants we want J> - sed -Ene 's/^[[:space:]]*('"${grep}"')\>.*/TABLE_ENTRY(\1)/p' J> + sed -Ene 's/^[[:space:]]*('"${grep}"')([^_[:alnum:]].*|$)/TABLE_ENTRY(\1)/p' J> fi J> cat <<_EOF_ J> TABLE_END J> J> J> Tested only that the build produces a plausible tables.h on macOS, but J> I believe that in theory it only uses standard POSIX ERE features. Jessica, can you please draw back your revertion request, since you got fix in the works? I really don't want to see enum changes reverted. -- Gleb Smirnoff