From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id F015B3858418; Tue, 23 May 2023 20:18:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F015B3858418 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1684873116; bh=SD/BO9dPb8YxQXAaVnKcKTx57v1DybLaGldBABc1bJo=; h=From:To:Subject:Date:From; b=wfdubJgUonIvtqbFW0owUvF9Mrt5IC70XTO7vhFqv1DmPmH7LODGfOSzhGMMYXQyd /vHcpLHNlkM2o279QhKnZgmZXd2yYgdzexj+lI2gX0Dhsatqo921V+MWeLlZA7gQ4Q Fddvp3E6X6LH9nS9UAhlwKD9mxG1KFwXUVcXOi3s= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Rearrange parser_state X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 9095bf3b9db51eb471fbd760aef242a10603e54d X-Git-Newrev: 78655a10f7718f2596c0ae2a9a401e2597c5041f Message-Id: <20230523201836.F015B3858418@sourceware.org> Date: Tue, 23 May 2023 20:18:36 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D78655a10f771= 8f2596c0ae2a9a401e2597c5041f commit 78655a10f7718f2596c0ae2a9a401e2597c5041f Author: Tom Tromey Date: Fri Apr 28 08:25:00 2023 -0600 Rearrange parser_state =20 This patch mildly rearranges parser_state, moving all the bool fields together. Diff: --- 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) !=3D 0), lexptr (input), - parse_completion (completion), block_tracker (tracker), + comma_terminates ((flags & PARSER_COMMA_TERMINATES) !=3D 0), + parse_completion (completion), void_context_p ((flags & PARSER_VOID_CONTEXT) !=3D 0) { } @@ -275,10 +275,6 @@ struct parser_state : public expr_builder point. */ const CORE_ADDR expression_context_pc; =20 - /* 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. */ =20 @@ -292,15 +288,18 @@ struct parser_state : public expr_builder =20 int arglist_len =3D 0; =20 - /* True if parsing an expression to attempt completion. */ - bool parse_completion; - /* Completion state is updated here. */ std::unique_ptr m_completion_state; =20 /* The innermost block tracker. */ innermost_block_tracker *block_tracker; =20 + /* 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;