From nobody Thu May 25 18:16:50 2023 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 4QRx8f3Kczz4WWp1; Thu, 25 May 2023 18:16:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QRx8f2jGFz3x6Z; Thu, 25 May 2023 18:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685038610; 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=Vbysc1HIkr7xFHYElBefLvC248SFRiN2A6fohI5wGEA=; b=C/RKFUnW+cxhKP1kSXeC1aVELR1OwhRdmJ3Vn4PuLd1sY0q8mT5DqaOGO6hC+NmTIghTAC MlVez4taey2SfNmG6xsrAGaJdKanupoyE0TygVGgiAzyyDBKXG9AV/ZhFrriT4ztUpIAC+ 9kJNRCNrm/4MSno0On5NHSAy77o2b7oJkJQ/PxPfD+H/kCoB0quVt/zFcmtWcTyxbh+Mcl WJJlNlzYa/4mWGaVvFx1rfMeaaKEG2y+z/ZmYKDtWMtspBjVVOWgrtwJGLyOfXLPGT5Yge g8qFEtpYzt8f5Z5rbEw8nEH0UtWWgAjYojDXiSukqAWQ5m0QCkCPAiAI4rcm0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685038610; 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=Vbysc1HIkr7xFHYElBefLvC248SFRiN2A6fohI5wGEA=; b=PRDr2PSAsq3FJT9HbSCAZ01cxvchGXCXth17rBo+PzLmYDxml8SEMc5ms0qy+wXzOD1H8p gxmP2gw8ofbLJlglt70GziL1R8OjGyXecP9ITnNzd99VS2YssfRr+jfrM9eBt8Gh8GZCSX APiD+5TLTyczBu8v7X+x9j4ITEYTlgnOyrFwzxGgOOLN91TkwCzQBlzKPj0CLZ2kAEQqgt YIYREEelzPtVxZtnuc0w7E2CsfdoAp/Uyicjtlodk5geiXorDP7dPygAMaMRpU+V7Yt09J y+MkdjX2GrBoaZdUO5jrplmdTpWBbDtIW+7/of1ZNJccWwZUpq3RVxT74kMsDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685038610; a=rsa-sha256; cv=none; b=TDstuN9teAuVqr0i4IOZHomqJoZKxrBxGnBYv4qEBxzKplkRTiTHSFLjfvsC/NPKBcRYC2 GSFpYrGrqWwvHoh/tY2JU7fRKYYK2yF+pXWKUJ9ZfRcxZ3N6td51+3/6NEBo3xOnd7kek6 L+vIWhYTH7yApFdzeJorrqQdZ203/RCPmzjeaMvm9T3lVEBatcxbvfB0YACSB1935bAhtV EbB66t2+MWmCiNg7P4dO2xrLFnO+ZsZFMzlV0p3W3BTOoyLdtBXfrdo9keQHYcQeMArmxc uUZtUk4YnUqGFiG3090X4iECBuI5ZeXHhQuG2zyBAAFI6uASToEoTMXCsbjhJg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QRx8f1nRXzbMs; Thu, 25 May 2023 18:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34PIGoek044100; Thu, 25 May 2023 18:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34PIGomk044099; Thu, 25 May 2023 18:16:50 GMT (envelope-from git) Date: Thu, 25 May 2023 18:16:50 GMT Message-Id: <202305251816.34PIGomk044099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: 9f35eb8f96a5 - main - ctags: Recognize __attribute__ in function declarations. 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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: 9f35eb8f96a55aac92fc0c7d08f4b6ab0ae9bc39 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=9f35eb8f96a55aac92fc0c7d08f4b6ab0ae9bc39 commit 9f35eb8f96a55aac92fc0c7d08f4b6ab0ae9bc39 Author: Dag-Erling Smørgrav AuthorDate: 2023-05-25 17:07:25 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-25 18:02:24 +0000 ctags: Recognize __attribute__ in function declarations. MFC after: 1 week Obtained from: NetBSD Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D40264 --- usr.bin/ctags/C.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/usr.bin/ctags/C.c b/usr.bin/ctags/C.c index aca50c67226b..80b6c42a7a5c 100644 --- a/usr.bin/ctags/C.c +++ b/usr.bin/ctags/C.c @@ -39,6 +39,7 @@ static char sccsid[] = "@(#)C.c 8.4 (Berkeley) 4/2/94"; __FBSDID("$FreeBSD$"); #include +#include #include #include @@ -261,6 +262,9 @@ func_entry(void) { int c; /* current character */ int level = 0; /* for matching '()' */ + static char attribute[] = "__attribute__"; + char maybe_attribute[sizeof attribute + 1], + *anext; /* * Find the end of the assumed function declaration. @@ -298,10 +302,37 @@ fnd: * is a token character if it's a function and a non-token * character if it's a declaration. Comments don't count... */ - for (;;) { + for (anext = maybe_attribute;;) { while (GETC(!=, EOF) && iswhite(c)) if (c == '\n') SETLINE; + if (c == EOF) + return NO; + /* + * Recognize the gnu __attribute__ extension, which would + * otherwise make the heuristic test DTWT + */ + if (anext == maybe_attribute) { + if (intoken(c)) { + *anext++ = c; + continue; + } + } else { + if (intoken(c)) { + if (anext - maybe_attribute + < (ptrdiff_t)(sizeof attribute - 1)) + *anext++ = c; + else break; + continue; + } else { + *anext++ = '\0'; + if (strcmp(maybe_attribute, attribute) == 0) { + (void)ungetc(c, inf); + return NO; + } + break; + } + } if (intoken(c) || c == '{') break; if (c == '/' && (GETC(==, '*') || c == '/'))