From patchwork Thu Mar 21 19:03:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 87469 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 87F9B38582AE for ; Thu, 21 Mar 2024 19:04:08 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) by sourceware.org (Postfix) with ESMTPS id E48C93858C55 for ; Thu, 21 Mar 2024 19:03:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E48C93858C55 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 E48C93858C55 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::12b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047813; cv=none; b=lxazvJV6gQkYUXIcVv6farEAPNcLY2U+MJXl6MgT7KVThIE6E1OY+255iq3L3tuEziYa7223sWBSFncCqAYfqKWozRLgXdrtt316MJ8NGx0dqXjESBcNKqz6e9YuqsvZO2E6GNxGGq74SUEMp+YtO6LyuqmsfFD00NVAPQ30sgQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711047813; c=relaxed/simple; bh=0YrwjcOlAFKQlqEk0Nvb2x7fjog5fjYH2dwUKWY3UJY=; h=DKIM-Signature:From:Date:Subject:MIME-Version:Message-Id:To; b=h8U05a/O4BfOSI0+NCdiat5ASawy7r8oD3ooohlRpTzQX6a8naKdHHUAzN/qh6PC0HilBIQ8e2moOTlti3WBDcs03WTGODKRhtwdLyJW92cpYe9mYt6cMbSiYKEvBwskWXlALyJ0nwqtU3vsbJecpIkLpU0V8vYbvqQHbTUBPNI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-il1-x12b.google.com with SMTP id e9e14a558f8ab-368506aa460so5442415ab.0 for ; Thu, 21 Mar 2024 12:03:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1711047811; x=1711652611; 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=GZmogxvUvyfhknqMx9NGd5AhIRSTJ16rNxx2aGK1pVQ=; b=gPIo/SstGBxGJcP+Y35aZH89xks7j842PJmMarAhw6yPhcpB2OGbY2shTEsN4+Ku80 Rcw3vWQbA2nMRCshRSMHE2nlRHL0Op3KEOvj3wm+I+oeBn8RvJOEwlG7wW/055ierANX TEhCzRMCeKMwinyi2KnU9S5R3pOmiF79QGGl7ue3tEyyLMBtMcicYYnIVag8uQw66R1U SaJhnYGDFXPRzaujHPYQP5wpAgv7yPXAJmkmZgaol2TSl+basXbGtZ2LN5lk9jZgvbpR SNXmWdFRM9M4oBntITgRT3mT03hyCU+L0JrdL1MLHfZp0RVkhMSSFktqwUJm1wpK+Rk1 HpwQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711047811; x=1711652611; 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=GZmogxvUvyfhknqMx9NGd5AhIRSTJ16rNxx2aGK1pVQ=; b=DKZvtGMA4AKrY86ZPUOvM6+IGHJTac2kxyNtMSOlFurucbYdMUyp/fiTtqXeTNObo+ oFB1hqTfiYXyir67bX5sn1Wy0a6TAXTIeDMKosYHigIIHrxDdUW3O/2DWZFmbPHp2KP5 1jSP59iwRPPEPzhrFAm7auQy/INDrvW937GWWXJB2rvhfiP/rgbajuSY4uTQF1L4/cC/ G0Ee9reSVZmuh9yUUvUIkXoXNcnTcl9wrOYPPRZCvRDB+yl0SuBPEvuzMSQQ/n3oXZyu 4nNdhExxYUSgBhBGE14WW3cd6gigmzp7PR4VyIHBc3afG71/7gtxNUV33CMEOG3+BOj4 0zPQ== X-Gm-Message-State: AOJu0YxZP9W5vLCzDxeWY4KqAUncKQzkRU9v2hHGmW77oSR3aSzSghhV bbkTTjhSH9o9jLgBf1G1r+G12Ua5ybLWDCFcjfOzQ58hrigI/aA3Z0nMlYcYUzFM4wNaYooU0Ms = X-Google-Smtp-Source: AGHT+IFdtIUiIZ3Ke66vW+V34grwNp8iteU2771KQJiZjLhIBNORVlW3s7MY0Dp0DPzMlw9qR85APw== X-Received: by 2002:a05:6e02:1c2b:b0:366:a4f3:7916 with SMTP id m11-20020a056e021c2b00b00366a4f37916mr649329ilh.0.1711047811024; Thu, 21 Mar 2024 12:03:31 -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.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 12:03:30 -0700 (PDT) From: Tom Tromey Date: Thu, 21 Mar 2024 13:03:31 -0600 Subject: [PATCH 03/12] Introduce ada_parse_state MIME-Version: 1.0 Message-Id: <20240321-ada-iterated-assign-v1-3-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 introduces the ada_parse_state class and the ada_parser global. It also changes find_completion_bounds to be a method of this new type. Note that find_completion_bounds never used its parameter; and because it is generally fine to use the 'pstate' global throughout the parser, this patch removes the parameter entirely. --- gdb/ada-exp.y | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-) diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index c0a5b0534a6..9452e63ab60 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -65,8 +65,26 @@ struct name_info { static struct parser_state *pstate = NULL; -/* The original expression string. */ -static const char *original_expr; +/* Data that must be held for the duration of a parse. */ + +struct ada_parse_state +{ + explicit ada_parse_state (const char *expr) + : m_original_expr (expr) + { + } + + std::string find_completion_bounds (); + +private: + + /* The original expression string. */ + const char *m_original_expr; +}; + +/* The current Ada parser object. */ + +static ada_parse_state *ada_parser; /* We don't have a good way to manage non-POD data in Yacc, so store values here. The storage here is only valid for the duration of @@ -102,8 +120,6 @@ static struct type *type_for_char (struct parser_state *, ULONGEST); static struct type *type_system_address (struct parser_state *); -static std::string find_completion_bounds (struct parser_state *); - using namespace expr; /* Handle Ada type resolution for OP. DEPROCEDURE_P and CONTEXT_TYPE @@ -549,7 +565,7 @@ primary : primary DOT_COMPLETE ada_structop_operation *str_op = (new ada_structop_operation (std::move (arg), copy_name ($2))); - str_op->set_prefix (find_completion_bounds (pstate)); + str_op->set_prefix (ada_parser->find_completion_bounds ()); pstate->push (operation_up (str_op)); pstate->mark_struct_expression (str_op); } @@ -1223,10 +1239,11 @@ int ada_parse (struct parser_state *par_state) { /* Setting up the parser state. */ - scoped_restore pstate_restore = make_scoped_restore (&pstate); + scoped_restore pstate_restore = make_scoped_restore (&pstate, par_state); gdb_assert (par_state != NULL); - pstate = par_state; - original_expr = par_state->lexptr; + + ada_parse_state parser (par_state->lexptr); + scoped_restore parser_restore = make_scoped_restore (&ada_parser, &parser); scoped_restore restore_yydebug = make_scoped_restore (&yydebug, par_state->debug); @@ -1849,13 +1866,13 @@ write_var_or_type (struct parser_state *par_state, Without this, an attempt like "complete print abc.d" will give a result like "print def" rather than "print abc.def". */ -static std::string -find_completion_bounds (struct parser_state *par_state) +std::string +ada_parse_state::find_completion_bounds () { const char *end = pstate->lexptr; /* First the end of the prefix. Here we stop at the token start or at '.' or space. */ - for (; end > original_expr && end[-1] != '.' && !isspace (end[-1]); --end) + for (; end > m_original_expr && end[-1] != '.' && !isspace (end[-1]); --end) { /* Nothing. */ } @@ -1863,11 +1880,11 @@ find_completion_bounds (struct parser_state *par_state) const char *ptr = end; /* Here we allow '.'. */ for (; - ptr > original_expr && (ptr[-1] == '.' - || ptr[-1] == '_' - || (ptr[-1] >= 'a' && ptr[-1] <= 'z') - || (ptr[-1] >= 'A' && ptr[-1] <= 'Z') - || (ptr[-1] & 0xff) >= 0x80); + ptr > m_original_expr && (ptr[-1] == '.' + || ptr[-1] == '_' + || (ptr[-1] >= 'a' && ptr[-1] <= 'z') + || (ptr[-1] >= 'A' && ptr[-1] <= 'Z') + || (ptr[-1] & 0xff) >= 0x80); --ptr) { /* Nothing. */ @@ -1903,7 +1920,7 @@ write_var_or_type_completion (struct parser_state *par_state, ada_structop_operation *op = write_selectors (par_state, name0.ptr + tail_index); - op->set_prefix (find_completion_bounds (par_state)); + op->set_prefix (ada_parser->find_completion_bounds ()); par_state->mark_struct_expression (op); return nullptr; }