From patchwork Thu Mar 21 19:03:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87473 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 90A1F385841C for ; Thu, 21 Mar 2024 19:05:01 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2b.google.com (mail-io1-xd2b.google.com [IPv6:2607:f8b0:4864:20::d2b]) by sourceware.org (Postfix) with ESMTPS id 4282E3858C32 for ; Thu, 21 Mar 2024 19:03:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4282E3858C32 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 4282E3858C32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047816; cv=none; b=w/A4fjoZO3twqydqqejbrxEbRZ0jYxf+C2RgkrzCxUXB6CDf1KSM5el4+ok6G4LOo/fOdtOYWOy/i4dUALbeJQgYWl05r2Y5ZzCjXe9jaPeoND2gyDNvelqQR25AzXUxUk/db4+q2BmP/RYCaky7sq2070f1eTqAPtBuWx7trTg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047816; c=relaxed/simple; bh=Vs+0pl04h9yPge7XMYphniBgoRTNk2bW9PBbPj2PSo0=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=Cnu0MDsPz3or9ICGnf+kE+7g9owc1YAmGrfYfWZqbP3oo5VWxgshjGFsri7eZCwsm5dWQ1qlV380hdbHSID+iIoqTfJCc6raLeVgwUC+6/31zvCI+Vm8+qMSGWn0SCy13htrLtAK37I11XvixBYWXzTHQLQOKl/nf4ZUoPfl0II= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2b.google.com with SMTP id ca18e2360f4ac-7cde3cbf03aso63082739f.1 for ; Thu, 21 Mar 2024 12:03:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1711047812; x=1711652612; 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=m+qaCVzs6MnJVY4UpyOlLPG+RwpJOP59MJp+5IeBNiQ=; b=b+OYxBKoVFqJKDLXXdisKPZcWy3F1/eVRJcHzboV6CaF9dLxkUDnKrQlY1qelIFD/H apCrY5O/m0SCv5PlkjH5NiXs/mlHgS9az/Uw1xslqdmYPKwjVgHKMN5rB61dsB4mhDBy Rr7wCNd3IS0QILfvL4MS0N4Eap/5dLG4fk0plDurnvZ7paLqpvyVLYXx2Kk/Z5LhCN5x YDWJTdmLNWjqaoRzsl/qt1HME55jpNbfWHaPAj8rAhZpH7KACYUY5QnHcxU8W10GleEV oNKYKMxpVu0OOOEY1RfL+CLB4EO1pEiX9+4sy5H6IU+OafWRtrJku4Xn+tcnNfSEX9Xh G9BA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711047812; x=1711652612; 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=m+qaCVzs6MnJVY4UpyOlLPG+RwpJOP59MJp+5IeBNiQ=; b=qJwadFUYMuIk7y2OSGBAis9HjDku7NSIh1S1fqg1BT8NrVrG48zroEp3EvIsqRpJms 981j1SpGFV7Z0WPakRjFt0gFxSZpYqgv4b1nxbBqsmHg0LTYuQraxv0NRsmrP5EK1Hae bMaeMEfp2kjcGFDguzdAdUkHwJnvcG6fn8w4bJS90yzrLWWIP+/prFrKqT4zDSe3fzbY E4+TWjZLXvh7FPdDz6mnjW50e8BVbxSvArsB1gbvvnoWfKyhwDGFRYZF3udM9Kj0nXhz oyDeZhO5mqRE9lBoHcc9F4Qxt32Vm7ksEpFOF408MBBuntQJArBPW6j42pLilt9j35t8 1gXA== X-Gm-Message-State: AOJu0YyUPOI9AWWeW5CizOaa7A9jYrbcaDvfOASI1yGmjxqnImpkJiML J+tJo38B01WTK565RUm7fAP/dhZ920ou2McsRpnvljGZyZuzfzoIo2s5HwDnqAFYGQFrMciy6dc = X-Google-Smtp-Source: AGHT+IEmXt32rxY7scNZwCHZfJOPvnNO4cTgPv4Gxg8rZ/wRX5Gn31wopHDGEmek9mc1cm1ibaRtYA== X-Received: by 2002:a6b:ed01:0:b0:7cc:32f:7f6e with SMTP id n1-20020a6bed01000000b007cc032f7f6emr354325iog.5.1711047812519; Thu, 21 Mar 2024 12:03:32 -0700 (PDT) Received: from localhost.localdomain (97-122-82-115.hlrn.qwest.net. [97.122.82.115]) by smtp.gmail.com with ESMTPSA id dp10-20020a0566381c8a00b00476f2bfc3f8sm53358jab.87.2024.03.21.12.03.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 12:03:32 -0700 (PDT) From: Tom Tromey Date: Thu, 21 Mar 2024 13:03:35 -0600 Subject: [PATCH 07/12] Move "iterated_associations" into ada_parse_state MIME-Version: 1.0 Message-Id: <20240321-ada-iterated-assign-v1-7-925cdd4f1f4a@adacore.com> References: <20240321-ada-iterated-assign-v1-0-925cdd4f1f4a@adacore.com> In-Reply-To: <20240321-ada-iterated-assign-v1-0-925cdd4f1f4a@adacore.com> To: gdb-patches@sourceware.org X-Mailer: b4 0.12.4 X-Spam-Status: No, score=-11.2 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 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 This patch moves the "iterated_associations" global into ada_parse_state. --- gdb/ada-exp.y | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 1c5ffff3290..615b74d14d8 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -97,6 +97,10 @@ struct ada_parse_state to implement '@', the target name symbol. */ std::vector assignments; + /* Track currently active iterated assignment names. */ + std::unordered_map> + iterated_associations; + private: /* We don't have a good way to manage non-POD data in Yacc, so store @@ -444,10 +448,6 @@ make_tick_completer (struct stoken tok) (new ada_tick_completer (std::string (tok.ptr, tok.length)))); } -/* Track currently active iterated assignment names. */ -static std::unordered_map> - iterated_associations; - %} %union @@ -1128,12 +1128,12 @@ component_group : { std::string name = copy_name ($2); - auto iter = iterated_associations.find (name); - if (iter != iterated_associations.end ()) + auto iter = ada_parser->iterated_associations.find (name); + if (iter != ada_parser->iterated_associations.end ()) error (_("Nested use of index parameter '%s'"), name.c_str ()); - iterated_associations[name] = {}; + ada_parser->iterated_associations[name] = {}; } component_associations { @@ -1142,12 +1142,12 @@ component_group : ada_choices_component *choices = choice_component (); choices->set_associations (pop_associations ($5)); - auto iter = iterated_associations.find (name); - gdb_assert (iter != iterated_associations.end ()); + auto iter = ada_parser->iterated_associations.find (name); + gdb_assert (iter != ada_parser->iterated_associations.end ()); for (ada_index_var_operation *var : iter->second) var->set_choices (choices); - iterated_associations.erase (name); + ada_parser->iterated_associations.erase (name); choices->set_name (std::move (name)); } @@ -1257,7 +1257,6 @@ ada_parse (struct parser_state *par_state) lexer_init (yyin); /* (Re-)initialize lexer. */ obstack_free (&temp_parse_space, NULL); obstack_init (&temp_parse_space); - iterated_associations.clear (); int result = yyparse (); if (!result) @@ -1707,8 +1706,8 @@ write_var_or_type (struct parser_state *par_state, if (block == nullptr) { - auto iter = iterated_associations.find (name_storage); - if (iter != iterated_associations.end ()) + auto iter = ada_parser->iterated_associations.find (name_storage); + if (iter != ada_parser->iterated_associations.end ()) { auto op = std::make_unique (); iter->second.push_back (op.get ());