From patchwork Thu May 4 14:21:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 68762 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 1D13E3854165 for ; Thu, 4 May 2023 14:23:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1D13E3854165 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683210198; bh=X7qRer9ZdJ1qKyPgQ78smPb1j9eXLLQ0uj1bgQTKMyc=; h=Date:Subject:References:In-Reply-To:To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=sTCwOuZaaRFWYNB2qr75OZ/m0fmSnS3VctCDX1gP10GzkuYNVa2iOOyE7wcRbu4NY Ak5Kpv5lvMrbYmJ8Cn1HYwKh7n4LsV5pPGDRioXFZ2wV37R77KMspLrslH9fOpVGLU XcFl1umCT3XFnQzDnMtyWwHN5ScpIGn+J/Z/15eY= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd36.google.com (mail-io1-xd36.google.com [IPv6:2607:f8b0:4864:20::d36]) by sourceware.org (Postfix) with ESMTPS id 70D53385734F for ; Thu, 4 May 2023 14:21:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 70D53385734F Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-76640f8c456so10789239f.0 for ; Thu, 04 May 2023 07:21:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683210088; x=1685802088; 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=X7qRer9ZdJ1qKyPgQ78smPb1j9eXLLQ0uj1bgQTKMyc=; b=gID2aPxFERJULEj6uR87sO1h8SJA7JxVJZjrFw5xj8sbwpH7JkKT8dw2VoEGjydMTl Xz1AnYSNpNrdw83nxW4IOIRoSlIlTJ9evfcqYrPeCZxXtMC9RLCjwGtkCyQxDXKdL3HX wlCsJyDQn4O9C7NraJpoN8uIhlRO190rlmKC7LHfUyNFEdMS+Jcc3vIwSUSmH6kF0oz9 qkPMKsTkZjxxwNYEWMG2qkU/k+QN1lPApf2POIYRGKX26e2FpdM07ZlWGJ7lQ6ijXx7N YKMs93BEutGqPii97TCzSe8D9vIxCIkrDpa8QZKzWpxWQsJBQQOt98atFi05Loi80nEa BYMA== X-Gm-Message-State: AC+VfDzAa1KyJbV71GxeSj0MstjSBRVZhs+EuXoxSQmo64FKTMR796l0 PtZkqUgIPBn4evLdEzV4tHm60BVxcScbkQ5oWp6nYA== X-Google-Smtp-Source: ACHHUZ5oF2BFpTDSJ3zwSFSm9ymxKYLIE72E+LCLILyN2jFypxTrb8bptmxb0jQ2d76bHtSfYKAAhQ== X-Received: by 2002:a6b:d90f:0:b0:75c:6dba:111c with SMTP id r15-20020a6bd90f000000b0075c6dba111cmr17974843ioc.16.1683210087713; Thu, 04 May 2023 07:21:27 -0700 (PDT) Received: from localhost.localdomain (71-211-191-82.hlrn.qwest.net. [71.211.191.82]) by smtp.gmail.com with ESMTPSA id r16-20020a6b4410000000b00760a07e4e09sm9983384ioa.5.2023.05.04.07.21.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 May 2023 07:21:27 -0700 (PDT) Date: Thu, 04 May 2023 08:21:27 -0600 Subject: [PATCH 06/11] Rearrange parser_state MIME-Version: 1.0 Message-Id: <20230504-frameless-v1-6-4191201740b0@adacore.com> References: <20230504-frameless-v1-0-4191201740b0@adacore.com> In-Reply-To: <20230504-frameless-v1-0-4191201740b0@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.2 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Tom Tromey via Gdb-patches From: Tom Tromey Reply-To: Tom Tromey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" This patch mildly rearranges parser_state, moving all the bool fields together. --- gdb/parser-defs.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/gdb/parser-defs.h b/gdb/parser-defs.h index e92b4804f47..39046d04c8d 100644 --- a/gdb/parser-defs.h +++ b/gdb/parser-defs.h @@ -153,10 +153,10 @@ struct parser_state : public expr_builder : expr_builder (lang, gdbarch), expression_context_block (context_block), expression_context_pc (context_pc), - comma_terminates ((flags & PARSER_COMMA_TERMINATES) != 0), lexptr (input), - parse_completion (completion), block_tracker (tracker), + comma_terminates ((flags & PARSER_COMMA_TERMINATES) != 0), + parse_completion (completion), void_context_p ((flags & PARSER_VOID_CONTEXT) != 0) { } @@ -275,10 +275,6 @@ struct parser_state : public expr_builder point. */ const CORE_ADDR expression_context_pc; - /* Nonzero means stop parsing on first comma (if not within parentheses). */ - - bool comma_terminates; - /* During parsing of a C expression, the pointer to the next character is in this variable. */ @@ -292,15 +288,18 @@ struct parser_state : public expr_builder int arglist_len = 0; - /* True if parsing an expression to attempt completion. */ - bool parse_completion; - /* Completion state is updated here. */ std::unique_ptr m_completion_state; /* The innermost block tracker. */ innermost_block_tracker *block_tracker; + /* Nonzero means stop parsing on first comma (if not within parentheses). */ + bool comma_terminates; + + /* True if parsing an expression to attempt completion. */ + bool parse_completion; + /* True if no value is expected from the expression. */ bool void_context_p;