From patchwork Thu Mar 21 19:03:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87478 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 41C133858287 for ; Thu, 21 Mar 2024 19:06:02 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) by sourceware.org (Postfix) with ESMTPS id 0740E3858C31 for ; Thu, 21 Mar 2024 19:03:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0740E3858C31 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 0740E3858C31 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d2f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047816; cv=none; b=omnaIAo5sxu7NLNvYBtKnO1SMQ+hdo3wItsMb0Ygi70NhWgRgIqiHpPNUON3axqTtdy/tLuLbdcQC+9wWdkc50IEZSlIKgvEr2U6RCjcqFJ1X32py/MSSNxETpXd1yzfpKWAtvvoP7APKETEFxml2fq8a09ij/5Cwfv3Y9yaV9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047816; c=relaxed/simple; bh=2/N9RF6ZdojHSJrfA/7+ZOQ0MUIQgcPitpH9w8NNjUk=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=VY7iE4/Zxoq8YK74SldAd6nQkzNmls15Gi7NhfXU1lCtj4Iisi4KPPX48pl9Ga0ac4w4ULCDa8prdLyfLyzvdtx08QbtLYsu3728m6qGPt85qQmhMb+ruySqBp/foM2SBtZaYnqKReOuAlsKCHDWMauQrrP0mOmirlPtsbFBSCA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-7c7476a11e0so63716439f.3 for ; Thu, 21 Mar 2024 12:03:32 -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=ZhWRbzlIP46epc8EGTupLrldHq0Y0Ovu3HxyE70xmSg=; b=ULikgyR6wsRh9a41B0AnhtZ2LXv2jbbW+oMho+a4f9SRO9WEO0BmT9gwHVHRZR5ox9 DNm+sGVm3Op+WxKHp/OOsmNRxPr5mYv+LYqfcl1pUKDCCwdMrXJzoNumO44AliaPfwWK 8wB2bnDhkKofTdZVMOhFo27tLZCj0pa2X5aKG7UcFKmd32AbUhYgj5sSoSkxZuVnRRgE m5dDyMYb8OeLHinPiIG8OvCQt3UvjKV/D4/WBogKuYiStz8hyA7qYTgmU7vda6a4+9y+ IrV9aG5UW+AW4XFuF1pWvAqVelW3oNlQJjVPaMTabQz/dzUh+izhpixuCHNBbn9/KKXX Snlw== 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=ZhWRbzlIP46epc8EGTupLrldHq0Y0Ovu3HxyE70xmSg=; b=Z740H1bfDer42rDw/CRoBSaZqSRp4kG2yBnOVcfxkrS7hH43Uc9zODU3zB4mjNSMC3 XA4TuuLPZ9OJ/+V91zRJugpMqVrSJSP0U6lCQ1TVcaz95Es433CSUzc8a58iwqZU2aF6 tDPldkN0EwXDcEcwYxLkBUNGCFCYwx//dLTWU7QW4sOgR/lIyh3GwjTYd1RizJNCr9N3 K/+zzkE42fk7jQQh2S/M7uksLI6q4iJ/Wct78JPKN1kr2GoxsgvYGulieu5Sz17LWoSv a25u90T3tE5KquJABtMTs1ZHS43vLVrrDTe8TGwddQQCf1MuNARcTHp4HrtiuXKjt4Vg TOEA== X-Gm-Message-State: AOJu0YxSS4QHmh8lT0hQ+yK8Qj+MOFWYwDZHzhYz8/vvGmB00SBGiTgw sHlpftTwrTBGQ8Jqvg0Tj8at7i0ZGlW1bX79XXX3DoYupfdzqhov1jAZNeGvgKcx4pG+OOngSA0 = X-Google-Smtp-Source: AGHT+IE0Gqsm1yHr6g9QIAwL5tgyKfVpoiR5JZrQdIQDFzKFVk4FEcMZsMQ/wmEpkPROD7Y9B5eCHQ== X-Received: by 2002:a6b:f416:0:b0:7d0:2834:a3c5 with SMTP id i22-20020a6bf416000000b007d02834a3c5mr353752iog.18.1711047812153; 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.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 12:03:31 -0700 (PDT) From: Tom Tromey Date: Thu, 21 Mar 2024 13:03:34 -0600 Subject: [PATCH 06/12] Move "assignments" global into ada_parse_state MIME-Version: 1.0 Message-Id: <20240321-ada-iterated-assign-v1-6-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 "assignments" 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 25809b6aa24..1c5ffff3290 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -67,6 +67,9 @@ static struct parser_state *pstate = NULL; using namespace expr; +/* A convenience typedef. */ +typedef std::unique_ptr ada_assign_up; + /* Data that must be held for the duration of a parse. */ struct ada_parse_state @@ -90,6 +93,10 @@ struct ada_parse_state /* The associations being constructed during this parse. */ std::vector associations; + /* The stack of currently active assignment expressions. This is used + to implement '@', the target name symbol. */ + std::vector assignments; + private: /* We don't have a good way to manage non-POD data in Yacc, so store @@ -437,13 +444,6 @@ make_tick_completer (struct stoken tok) (new ada_tick_completer (std::string (tok.ptr, tok.length)))); } -/* A convenience typedef. */ -typedef std::unique_ptr ada_assign_up; - -/* The stack of currently active assignment expressions. This is used - to implement '@', the target name symbol. */ -static std::vector assignments; - /* Track currently active iterated assignment names. */ static std::unordered_map> iterated_associations; @@ -528,14 +528,14 @@ exp1 : exp { ada_wrap2 (BINOP_COMMA); } | primary ASSIGN { - assignments.emplace_back + ada_parser->assignments.emplace_back (new ada_assign_operation (ada_pop (), nullptr)); } exp /* Extension for convenience */ { ada_assign_up assign - = std::move (assignments.back ()); - assignments.pop_back (); + = std::move (ada_parser->assignments.back ()); + ada_parser->assignments.pop_back (); value *lhs_val = (assign->eval_for_resolution (pstate->expout.get ())); @@ -646,11 +646,11 @@ primary : aggregate primary : '@' { - if (assignments.empty ()) + if (ada_parser->assignments.empty ()) error (_("the target name symbol ('@') may only " "appear in an assignment context")); ada_assign_operation *current - = assignments.back ().get (); + = ada_parser->assignments.back ().get (); pstate->push_new (current); } ; @@ -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); - assignments.clear (); iterated_associations.clear (); int result = yyparse ();