From patchwork Tue Nov 14 09:41:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aktemur, Tankut Baris" X-Patchwork-Id: 79810 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A5D4D385841C for ; Tue, 14 Nov 2023 09:42:06 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by sourceware.org (Postfix) with ESMTPS id 3F2923858425 for ; Tue, 14 Nov 2023 09:41:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3F2923858425 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=intel.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3F2923858425 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=192.55.52.88 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699954912; cv=none; b=Gs2XZYc96lkPslYFxcF9qL5SZJkZFSmW5eGL3YBVwuderAQK1Nxp+mmD9LarOdHD/viOI8dy2jU6csz1VEq5oLaHw2BeexNb03s10na3H1H2pOBR7XHaUyAZtyugdDUNOZHVX3bbBmiaoXCB8tsxNM5m3Xs4C9lY31E6FD5q8EU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699954912; c=relaxed/simple; bh=l7tHL4W+BUh4o58QsNB8nSTguNQAHoidd/6JjPJdy3o=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=wBauNznrmnil85vQ7nm75DctqPESWUImQYgwaVPI6jLrH4JJ57F2wvAS1ayj2d2Jym2Prakdc8dJwn4fB6jGIZ2JIf3yC39kqggbBbOl1m6bd2Gjvn+gNT1X0KwiFock0rdPI8znFueM3D6mAHxtZxnl1NuuCthagtg5FfFMlDE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699954911; x=1731490911; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=l7tHL4W+BUh4o58QsNB8nSTguNQAHoidd/6JjPJdy3o=; b=Wwh/7Tei1ELUaWWwrxYpRaVoDd8mcipm+CXDNj0nVE9AZ6JG/BBu11p0 JZ6/n8Iau19MLhj7Rdj7eHR/pZM59PomvTo5HE+eJuaGkmTE8TyK5PnTi xkklhQdpjFZ3l83tb7dj8wh38f743YOsSgepY2TYKEYvGelqZ3exewheI 223iUTEW5SoJxudDd1nfJtZgvqd/IysVOo8zGUI8XVgsFwN3HFXl6Ep7k 4QPY+IXjHzOrOZqqDKw4GKOvuiSG/+040JvkuDOPaHwOzay9X9nkDZQSB Vbr1TRSKAaRa4zvcUJ70++E6/i/AkQ11lBJvAZT40BC32QRMO1x9jGmXY Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="421719240" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="421719240" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 01:41:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="1096028465" X-IronPort-AV: E=Sophos;i="6.03,301,1694761200"; d="scan'208";a="1096028465" Received: from gkldtt-dev-004.igk.intel.com (HELO localhost) ([10.123.221.202]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2023 01:41:45 -0800 From: Tankut Baris Aktemur To: gdb-patches@sourceware.org Subject: [PATCH 2/3] gdb: refactor make-target-delegates.py's ARGTYPES Date: Tue, 14 Nov 2023 10:41:21 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Refactor the ARGTYPES regular expression in make-target-delegates.py to eliminate '.*' for better control on what is matched. This will be helpful in the next patch where we recognize default argument values. Also, simplify the "E" match group, for which the optional SYMBOL becomes redundant because that case can be matched by the "T" group. After applying this patch, running './make-target-delegates.py' does not change anything in 'target-delegates.c'. --- gdb/make-target-delegates.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gdb/make-target-delegates.py b/gdb/make-target-delegates.py index 5bbe7c0b930..fd5f436a43d 100755 --- a/gdb/make-target-delegates.py +++ b/gdb/make-target-delegates.py @@ -73,17 +73,18 @@ METHOD = re.compile( + METHOD_TRAILER ) +# Space-separated symbols. +CP_SYMBOLS = CP_SYMBOL + r"(\s+" + CP_SYMBOL + r")*" + # Regular expression used to dissect argument types. ARGTYPES = re.compile( "^(" + r"(?Penum\s+" + SYMBOL - + r"\s*)(" - + SYMBOL - + ")?" - + r"|(?P.*(enum\s+)?" - + SYMBOL - + r".*(\s|\*|&))" + + r")" + + r"|(?P" + + CP_SYMBOLS + + r"(\s|\*|&)+)" + SYMBOL + ")$" )