From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Subject: [PATCH 10/10] Add spaceship operator to cp-name-parser.y
Date: Sun, 21 Apr 2024 11:00:10 -0600 [thread overview]
Message-ID: <20240421-canon-fixes-v1-10-4dc4791d270d@tromey.com> (raw)
In-Reply-To: <20240421-canon-fixes-v1-0-4dc4791d270d@tromey.com>
While debugging gdb, I saw this:
During symbol reading: unexpected demangled name 'operator<=><std::chrono::_V2::system_clock, std::chrono::duration<long int>, std::chrono::duration<long int> >'
This happens because cp-name-parser.y does not handle the spaceship
operator. This patch implements this.
---
gdb/cp-name-parser.y | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y
index e820faa2db9..db5c349d212 100644
--- a/gdb/cp-name-parser.y
+++ b/gdb/cp-name-parser.y
@@ -297,7 +297,7 @@ static void yyerror (cpname_state *, const char *);
%left '^'
%left '&'
%left EQUAL NOTEQUAL
-%left '<' '>' LEQ GEQ
+%left '<' '>' LEQ GEQ SPACESHIP
%left LSH RSH
%left '@'
%left '+' '-'
@@ -451,6 +451,8 @@ oper : OPERATOR NEW
{ $$ = state->make_operator ("<=", 2); }
| OPERATOR GEQ
{ $$ = state->make_operator (">=", 2); }
+ | OPERATOR SPACESHIP
+ { $$ = state->make_operator ("<=>", 2); }
| OPERATOR ANDAND
{ $$ = state->make_operator ("&&", 2); }
| OPERATOR OROR
@@ -1077,6 +1079,10 @@ exp : exp GEQ exp
{ $$ = state->d_binary (">=", $1, $3); }
;
+exp : exp SPACESHIP exp
+ { $$ = state->d_binary ("<=>", $1, $3); }
+ ;
+
exp : exp '<' exp
{ $$ = state->d_binary ("<", $1, $3); }
;
@@ -1783,6 +1789,7 @@ yylex (YYSTYPE *lvalp, cpname_state *state)
return c;
case '<':
HANDLE_TOKEN3 ("<<=", ASSIGN_MODIFY);
+ HANDLE_TOKEN3 ("<=>", SPACESHIP);
HANDLE_TOKEN2 ("<=", LEQ);
HANDLE_TOKEN2 ("<<", LSH);
state->lexptr++;
@@ -2052,6 +2059,14 @@ should_be_the_same (const char *one, const char *two)
SELF_CHECK (strcmp (one, two) == 0);
}
+static void
+should_parse (const char *name)
+{
+ std::string err;
+ auto parsed = cp_demangled_name_to_comp (name, &err);
+ SELF_CHECK (parsed != nullptr);
+}
+
static void
canonicalize_tests ()
{
@@ -2070,6 +2085,8 @@ canonicalize_tests ()
should_be_the_same ("something<void ()>", "something< void() >");
should_be_the_same ("something<void ()>", "something<void (void)>");
+
+ should_parse ("void whatever::operator<=><int, int>");
}
#endif
--
2.44.0
next prev parent reply other threads:[~2024-04-21 17:00 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-21 17:00 [PATCH 00/10] Fix some C++ name canonicalizer problems Tom Tromey
2024-04-21 17:00 ` [PATCH 01/10] Remove test code from cp-name-parser.y Tom Tromey
2024-04-22 17:11 ` John Baldwin
2024-04-21 17:00 ` [PATCH 02/10] Allow initialization functions in .y files Tom Tromey
2024-04-21 17:00 ` [PATCH 03/10] Clean up demangle_parse_info Tom Tromey
2024-04-22 17:12 ` John Baldwin
2024-04-21 17:00 ` [PATCH 04/10] Change storage of demangle_component Tom Tromey
2024-04-22 17:17 ` John Baldwin
2024-04-21 17:00 ` [PATCH 05/10] Fix C++ name canonicalizations of character literals Tom Tromey
2024-04-22 17:19 ` John Baldwin
2024-04-21 17:00 ` [PATCH 06/10] Remove some unnecessary allocations from cpname_state::parse_number Tom Tromey
2024-04-22 17:20 ` John Baldwin
2024-04-21 17:00 ` [PATCH 07/10] Fix C++ canonicalization of hex literals Tom Tromey
2024-04-22 17:22 ` John Baldwin
2024-04-21 17:00 ` [PATCH 08/10] Implement C++14 numeric separators Tom Tromey
2024-04-22 17:29 ` John Baldwin
2024-04-24 21:42 ` Tom Tromey
2024-04-30 16:33 ` John Baldwin
2024-04-21 17:00 ` [PATCH 09/10] Allow function types as template parameters in name canonicalizer Tom Tromey
2024-04-22 17:30 ` John Baldwin
2024-04-21 17:00 ` Tom Tromey [this message]
2024-04-22 17:31 ` [PATCH 10/10] Add spaceship operator to cp-name-parser.y John Baldwin
2024-05-14 19:29 ` [PATCH 00/10] Fix some C++ name canonicalizer problems Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240421-canon-fixes-v1-10-4dc4791d270d@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).