From nobody Sat Feb 7 18:17:05 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 4f7fLV1k9rz6RF9Z for ; Sat, 07 Feb 2026 18:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f7fLT74y7z4Qkn for ; Sat, 07 Feb 2026 18:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770488226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3g68Z6M4afmTKEbVp+xiY/cmMI2/mvWDKabm5+dRDJY=; b=aCZOcnhRNnKPZb+ZGv5t3el8aKQ8kkYfSWI5l+Sx9nkfr8s1zdfXvDP0z9U4aZucg2s5Xj F54uQNfF1cjbVYcqKFLthut/SgWkGRcwD0a+sfEqLzA1NYLnMZa9cDDNE76EFTKtx56Mlw mKFOwjJZwJwHGSNa8LU/gJqVlcTATGpmzGBqeOvtsoOWGFmLetMOL6IwE8Asdgzw8vugjt /HBYofn+j4L2YabQJWcdbXVdBgC55gr5vmz/5N4EvFuTsnpGt1LCkzveOy0aPsRKNoc3v/ C6kEWmUYZ8yiJnaehSbf55pfUGQ00CRraZ3622nvHchm5AIkIOo5fy2Ph0h2Ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770488226; a=rsa-sha256; cv=none; b=SuX3JIBwnRulNWUUm4Epeedj4T3nqUbWJJSQmrgUp5MgfzweVk4uEzhwreom0S0yWL993G OJH3kgRa42reBLHVWhZpt+8Hg8uWwIt67tLvk3+lIcFpngJx700FBu6k/OPcOQ3+jmlMi2 z9ytGSJVZRVmkn0PH36mH6ZxIaFOavU4mO3G+EWGwl8WDvYyI8QnXf+aJkHRgCbjhGbh8B Sm2PwCxUp/OJtchhMqNZoqOAKORlFe0GFcK6hKBc6gdVPh1/LcgHoGMRkRnJgMhIy92wf/ 9AHySFe600ueGlzQhh01HQN2vtr6QTXUi+ojKwlSUakgKaTUNour1xrZElWViw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770488226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3g68Z6M4afmTKEbVp+xiY/cmMI2/mvWDKabm5+dRDJY=; b=iQ2djngjPfcFVkNpBPCPtoVygV1LGxCqfBlYIHfK1ES10I5VCbWYmzsoHxc2C+2UQTngwF OULBc2Ve3hiJlKlaAO/0QmkRe3rIQMFS8impNLqOQT00oxfsNmhWz4bEcfnPx/emw9ZQ7/ PPvfQkOxjcQEuT+wk6hQZ1dvCRXzMTT9WN7o/r9arxjNHFxCW0xNwMot+L5o+PBjErbqz4 /SxjwJLpgeH5Wki/0oAX2lcUQ5S3h6pHGxh8dFblTKatuiNNoUFCaOC7gF66RUZHp3Qzf3 HL7O45KHGNS8HGnX3pc4CgfvnjX6jYls9ywReHpXMcY/Ed7JlqHrN/jFtOhouQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f7fLT65hcz1BKh for ; Sat, 07 Feb 2026 18:17:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 317b8 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Feb 2026 18:17:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 25a8168f86a1 - main - m4: Change defn processing order List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25a8168f86a1222388475ce858da405e4d06c1c3 Auto-Submitted: auto-generated Date: Sat, 07 Feb 2026 18:17:05 +0000 Message-Id: <698781a1.317b8.73d4a6fe@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=25a8168f86a1222388475ce858da405e4d06c1c3 commit 25a8168f86a1222388475ce858da405e4d06c1c3 Author: Dag-Erling Smørgrav AuthorDate: 2026-02-07 18:16:21 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-07 18:16:21 +0000 m4: Change defn processing order Currently, defn pushes its arguments on the stack in order, which means they are then processed in reverse order. POSIX does not specify what order they are processed in, which arguably suggests that they should be processed in the order they are listed. Push them in reverse order so they will be processed in their original order. This matches GNU m4. PR: 292937 MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: obiwac, imp Differential Revision: https://reviews.freebsd.org/D55116 --- usr.bin/m4/eval.c | 2 +- usr.bin/m4/tests/Makefile | 2 ++ usr.bin/m4/tests/defn.m4 | 5 +++++ usr.bin/m4/tests/m4_test.sh | 9 +++++++++ usr.bin/m4/tests/regress.defn.out | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/usr.bin/m4/eval.c b/usr.bin/m4/eval.c index 3170d52bfe2a..4e45a71874e1 100644 --- a/usr.bin/m4/eval.c +++ b/usr.bin/m4/eval.c @@ -490,7 +490,7 @@ expand_builtin(const char *argv[], int argc, int td) case DEFNTYPE: if (argc > 2) - for (n = 2; n < argc; n++) + for (n = argc - 1; n >= 2; n--) dodefn(argv[n]); break; diff --git a/usr.bin/m4/tests/Makefile b/usr.bin/m4/tests/Makefile index bbf26d4e42d9..fd7a44cea14c 100644 --- a/usr.bin/m4/tests/Makefile +++ b/usr.bin/m4/tests/Makefile @@ -5,6 +5,7 @@ ATF_TESTS_SH= m4_test ${PACKAGE}FILES+= args.m4 ${PACKAGE}FILES+= args2.m4 ${PACKAGE}FILES+= comments.m4 +${PACKAGE}FILES+= defn.m4 ${PACKAGE}FILES+= esyscmd.m4 ${PACKAGE}FILES+= eval.m4 ${PACKAGE}FILES+= ff_after_dnl.m4.uu @@ -27,6 +28,7 @@ ${PACKAGE}FILES+= translit2.m4 ${PACKAGE}FILES+= regress.args.out ${PACKAGE}FILES+= regress.args2.out ${PACKAGE}FILES+= regress.comments.out +${PACKAGE}FILES+= regress.defn.out ${PACKAGE}FILES+= regress.esyscmd.out ${PACKAGE}FILES+= regress.eval.out ${PACKAGE}FILES+= regress.ff_after_dnl.out diff --git a/usr.bin/m4/tests/defn.m4 b/usr.bin/m4/tests/defn.m4 new file mode 100644 index 000000000000..6599f95a5f20 --- /dev/null +++ b/usr.bin/m4/tests/defn.m4 @@ -0,0 +1,5 @@ +dnl Check that our defn processes its arguments in order. +define(a,1)dnl +define(b,2)dnl +define(c,3)dnl +defn(`a',`b',`c') diff --git a/usr.bin/m4/tests/m4_test.sh b/usr.bin/m4/tests/m4_test.sh index 671f25ff4673..aa9be767d1c9 100644 --- a/usr.bin/m4/tests/m4_test.sh +++ b/usr.bin/m4/tests/m4_test.sh @@ -70,6 +70,14 @@ comments_body() m4_test comments } +defn_head() +{ +} +defn_body() +{ + m4_test defn +} + esyscmd_head() { } @@ -219,6 +227,7 @@ atf_init_test_cases() atf_add_test_case args atf_add_test_case args2 atf_add_test_case comments + atf_add_test_case defn atf_add_test_case esyscmd atf_add_test_case eval atf_add_test_case ff_after_dnl diff --git a/usr.bin/m4/tests/regress.defn.out b/usr.bin/m4/tests/regress.defn.out new file mode 100644 index 000000000000..190a18037c64 --- /dev/null +++ b/usr.bin/m4/tests/regress.defn.out @@ -0,0 +1 @@ +123