Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp675694pxf; Thu, 25 Mar 2021 11:18:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7RuqY+m4khwMhC2eLILRwuQDlPWiuWdV/aBLpNXbBsQY0E8SnQnPKcgdDW9x+4SszhTZz X-Received: by 2002:a17:906:edca:: with SMTP id sb10mr10683374ejb.398.1616696308508; Thu, 25 Mar 2021 11:18:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616696308; cv=none; d=google.com; s=arc-20160816; b=S6IeACjpgp118R7S8x3TqpjY0JboKAmgTt6jEc1iGN//GTYW1n3kRhgtbOCnr4t5sm KXMwQuS+BA8+XzOTxSLbr4dNetKmpeWCbOJFZhhjDl6FWbj2qhQhsVws/UbMog4dkH4Y MV/2NykmUYnqFKcNU52ZjmSW0RZSFE6Bul+TeJ6umDvFxQG0bOoH7KFPqQPxvHej3dSd BcYX5UZl+bMyI08JiD/kwr7oaqh9JCGqdHHpW3SzlUfilTeHi0zlAHh853Vk7bs3y3Bu Bxn20aA3FuY3Gmwq3t8m9ny+9uzzM3TA4Wd3jPhIACjjbJJUH5oh3O6VZ+5kxwkb2HA8 Ae6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/hDsE8bSQGcguEzcIWq/GTNj0Fu4/8KEdUx791eeJnI=; b=GgvzFd7p9dvzUhDYwqsEoMa9wHnLitnkYmUh4oTSniZesjWnL7RVO4x+ZMzHgvR7N5 /S2DDi6G2CNvJev0JXozFwz1FCiDKMNfAVdauiJodyfxhAeE8v4W4qqpmqKjlfhKJhAp qKVjvegzQnSRuWNd4UIaDiy4WjPHWNoEFXZ+mgjbacoSjp7PJar1M+o0z09wcJ0dJ9Me 8ZgtprhlH3p78l4VtGKPvYZcnfKNAhh8vckCG78x6tIj5m51uIY1cjCIy9PytczfxGh/ tGyONMG3WltlZtzeVaD6zTOg2moKnyhQ6hPqNTtR8080oXKhUZa7Hk0UO9yLS1plFOEE /L0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FRraQm2S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id cd8si5065524ejb.26.2021.03.25.11.18.04; Thu, 25 Mar 2021 11:18:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FRraQm2S; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230057AbhCYSOn (ORCPT + 99 others); Thu, 25 Mar 2021 14:14:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:56042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230064AbhCYSOa (ORCPT ); Thu, 25 Mar 2021 14:14:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9A1DE619C7; Thu, 25 Mar 2021 18:14:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616696069; bh=oxyM+N+so0rFYRGrbRnF6PmgegUrTBmyPivCzy2qhoI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FRraQm2SjMUDhaq5XyG9CMJTuPSJw/fWskuBxk9m9iAmXMjrCJYyUDb/tKQ3b9PZW Uks0ZD/gH/P3SED7fzVhX5XSF7TkFvkS7XQYYqgSMCVNVbEIDM25jw62US23YHw5oD Mr6KJt+x05RWz6CoRoDFVUvHSHELYcHfeAqrylbPg62shPAhv+Hbz6dvGl+zBr03Qd xfM8pfMMz6pLOCJAkmHTIxq2hIhvAD1DWlyLi9f+yofUs3E56CxggCZ8THJyLh6MRR LsBZk2YsG8ugfuIjShtfz0zEqg1MQp/i/JzvoZNwY2S1FFJNoUKZU7mUe/WR0ho6Cd /5kaN9sBYZlyQ== Received: by mail.kernel.org with local (Exim 4.94) (envelope-from ) id 1lPUV1-001MlA-AO; Thu, 25 Mar 2021 19:14:27 +0100 From: Mauro Carvalho Chehab To: "Jonathan Corbet" , Linux Doc Mailing List Cc: Mauro Carvalho Chehab , "Rob Herring" , linux-kernel@vger.kernel.org Subject: [PATCH] kernel-doc: better handle '::' sequences Date: Thu, 25 Mar 2021 19:14:25 +0100 Message-Id: <2cf44cf1fa42588632735d4fbc8e84304bdc235f.1616696051.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210325184615.08526aed@coco.lan> References: <20210325184615.08526aed@coco.lan> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Mauro Carvalho Chehab Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Right now, if one of the following headers end with a '::', the kernel-doc script will do the wrong thing: description|context|returns?|notes?|examples? The real issue is with examples, as people could try to write something like: example:: /* Some C code */ and this won't be properly evaluated. So, improve the regex to not catch '\w+::' regex for the above identifiers. Signed-off-by: Mauro Carvalho Chehab --- scripts/kernel-doc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kernel-doc b/scripts/kernel-doc index cb92d0e1e932..0ecd71477a16 100755 --- a/scripts/kernel-doc +++ b/scripts/kernel-doc @@ -392,7 +392,7 @@ my $doc_com_body = '\s*\* ?'; my $doc_decl = $doc_com . '(\w+)'; # @params and a strictly limited set of supported section names my $doc_sect = $doc_com . - '\s*(\@[.\w]+|\@\.\.\.|description|context|returns?|notes?|examples?)\s*:(.*)'; + '\s*(\@[.\w]+|\@\.\.\.|description|context|returns?|notes?|examples?)\s*:([^:]*)$'; my $doc_content = $doc_com_body . '(.*)'; my $doc_block = $doc_com . 'DOC:\s*(.*)?'; my $doc_inline_start = '^\s*/\*\*\s*$'; -- 2.30.2