From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-il1-x134.google.com (mail-il1-x134.google.com [IPv6:2607:f8b0:4864:20::134]) by sourceware.org (Postfix) with ESMTPS id 8F4B43809BE2 for ; Thu, 6 Jun 2024 14:45:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8F4B43809BE2 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8F4B43809BE2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::134 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717685152; cv=none; b=mWwq2rIHRsPauAVXxr8VFrQ7IeKj6WC7V7HIbnDcr2bnGSJ510y6RZ6kCwa1hnxgHBVna+BPzv6b0xB3H5e/6Qci/qJDaqTfamuj+3zIqgPgSwXXUuewvMLozgje5ZlUqYmxDPAQHrc3dmeRw22tk25eB7xlZ9RJ4KUaIl4c7QQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717685152; c=relaxed/simple; bh=AhCFKzNLjO9bNW9ohwXVpZv53lzOhXHYAxDCw098Qz4=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=HrUNY7yKiKkItcgy7Y3Q76eqcMGzRwfhs4I95nxrp7VEU81zniJLLh2Kmu+X+2sjh9iAxdk2ScQqG9AQPBou4+QUklMUVw2aGP102YKxFHzyShPDdHfkUCaZFJ1tYy9n4WAyp9sZB3im85zSNpki4QICF1T8va2pRwLwIOHZbGM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x134.google.com with SMTP id e9e14a558f8ab-3749a160512so3487595ab.0 for ; Thu, 06 Jun 2024 07:45:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1717685148; x=1718289948; darn=sourceware.org; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=tAQWkoHw2VXk1nAl9sspq8I+4rjwl4aVnRLRCDx0FWY=; b=ANlDuFw+skyi25fqbq38F99AfmYC+JJ+whxwjJJyZB6PySe3RP1ZGtzRXsYA4CdpSz WigICCQ8mxdgkjhFKAHXJZGMQlbtqtMijsJpGk2aoDa0M6JE6lYwLvOslaxHh8KGmsck z5twJB0cQ/oRRALSVtHYb4IpIBQzwHPCHnRthsbNFXQZg6Mga49CXW6JGJq9ajSLilw/ NP4UXGwG9USTnJhAoQRkQVzugz6oZNjKCSXmKk9261o9PtQWcB3+xsBbxQex1Z08pDTt 12SiefkeZlh0KfnmV+M3GSR5CgV57R6OJAeVJ2NOclbur4bC/6hG0lFB79Vs1C9X1mPF GRjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717685148; x=1718289948; h=to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tAQWkoHw2VXk1nAl9sspq8I+4rjwl4aVnRLRCDx0FWY=; b=diegLC+8nmBLbBw7kEL5jESTtCeeU2rtmDder5iK/mfnxND/qQw7BKFTYWAk0TPW8w xZLHJ5t1VqFr90ORy7G2/wC5d2dyJV3kaokyHXkFlG1MlcBlSGx1vl1Qioz+xbSU5atc HdT8PQw6/9CKFBxcYZdjeH2EaiJVmqPCLNPQVUjWA6EQ/5Az+1pZxOiGOp9HtU56QY6g oqIUHtkxCG9lMArZRZwk0xx8+ZKgRFaCqFgI4M9lDb1l3a4x/2joTxFKgmJqCCtehyds tvbY+8spRiexsZ+yUgSUWpWz2djtQKJoB+8j+j0VYVZwG4jMfyCJftSX/IiV+SmTZMNX CY7g== X-Gm-Message-State: AOJu0YwX7BUA+BwxZk5DSKhDI7DBT69SDjw0GvrThiBDYcduOmyo87Ec T1JcSjcvrxQw+cr3uDPljpF/LQC1tIbFBb3AndFGy1JX2EXpG9pnrFtBWjlBp6V2SKqXIGZKnEA = X-Google-Smtp-Source: AGHT+IEQo8MF1+ultmxwNnYIwmA7Ck2BiU/FjmVRPHyssj2EtKqP25hLZLOgheTQlxBa65k2vIbkyg== X-Received: by 2002:a05:6e02:194e:b0:36c:4ca4:2871 with SMTP id e9e14a558f8ab-374b968bcc5mr18881045ab.4.1717685148442; Thu, 06 Jun 2024 07:45:48 -0700 (PDT) Received: from localhost.localdomain (75-166-134-4.hlrn.qwest.net. [75.166.134.4]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4b7a2244ea1sm360426173.47.2024.06.06.07.45.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 07:45:48 -0700 (PDT) From: Tom Tromey Date: Thu, 06 Jun 2024 08:45:48 -0600 Subject: [PATCH 5/6] Remove LS_TOKEN_KEYWORD macro MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240606-linespec-no-macros-v1-5-a748ab917e12@adacore.com> References: <20240606-linespec-no-macros-v1-0-a748ab917e12@adacore.com> In-Reply-To: <20240606-linespec-no-macros-v1-0-a748ab917e12@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.13.0 X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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 List-Id: This removes the LS_TOKEN_KEYWORD macro from linespec.c. --- gdb/linespec.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gdb/linespec.c b/gdb/linespec.c index b85d57c13c2..3db00300a58 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -276,7 +276,6 @@ struct linespec_token }; #define LS_TOKEN_STOKEN(TOK) (TOK).data.string -#define LS_TOKEN_KEYWORD(TOK) (TOK).data.keyword /* An instance of the linespec parser. */ @@ -572,7 +571,7 @@ copy_token_string (linespec_token token) const char *str, *s; if (token.type == LSTOKEN_KEYWORD) - return make_unique_xstrdup (LS_TOKEN_KEYWORD (token)); + return make_unique_xstrdup (token.data.keyword); str = LS_TOKEN_STOKEN (token).ptr; s = remove_trailing_whitespace (str, str + LS_TOKEN_STOKEN (token).length); @@ -905,7 +904,7 @@ linespec_lexer_lex_one (linespec_parser *parser) if (keyword != NULL) { parser->lexer.current.type = LSTOKEN_KEYWORD; - LS_TOKEN_KEYWORD (parser->lexer.current) = keyword; + parser->lexer.current.data.keyword = keyword; /* We do not advance the stream here intentionally: we would like lexing to stop when a keyword is seen. -- 2.44.0