public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb/gdb-12-branch] Add Rust parser check for end of expression
@ 2022-03-28 21:36 Tom Tromey
0 siblings, 0 replies; only message in thread
From: Tom Tromey @ 2022-03-28 21:36 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=7685884a38572266216f12069e86f9c7fcdedc14
commit 7685884a38572266216f12069e86f9c7fcdedc14
Author: Tom Tromey <tom@tromey.com>
Date: Thu Mar 17 22:36:12 2022 -0600
Add Rust parser check for end of expression
I noticed that "print 5," passed in Rust -- the parser wasn't checking
that the entire input was used. This patch fixes the problem. This
in turn pointed out another bug in the parser, namely that it didn't
lex the next token after handling a string token. This is also fixed
here.
Diff:
---
gdb/rust-parse.c | 6 +++++-
gdb/testsuite/gdb.rust/expr.exp | 2 ++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/gdb/rust-parse.c b/gdb/rust-parse.c
index 4006df7086b..7d7d882872c 100644
--- a/gdb/rust-parse.c
+++ b/gdb/rust-parse.c
@@ -271,7 +271,10 @@ struct rust_parser
operation_up parse_entry_point ()
{
lex ();
- return parse_expr ();
+ operation_up result = parse_expr ();
+ if (current_token != 0)
+ error (_("Syntax error near '%s'"), pstate->prev_lexptr);
+ return result;
}
operation_up parse_tuple ();
@@ -2020,6 +2023,7 @@ rust_parser::parse_atom (bool required)
case STRING:
result = parse_string ();
+ lex ();
break;
case BYTESTRING:
diff --git a/gdb/testsuite/gdb.rust/expr.exp b/gdb/testsuite/gdb.rust/expr.exp
index 0c445897338..bb0222bed4b 100644
--- a/gdb/testsuite/gdb.rust/expr.exp
+++ b/gdb/testsuite/gdb.rust/expr.exp
@@ -145,3 +145,5 @@ gdb_test "print 0x0 as fn(i64) -> ()" " = \\\(\\*mut fn \\\(i64\\\) -> \\\(\\\)\
gdb_test "print r#" "No symbol 'r' in current context"
gdb_test "printf \"%d %d\\n\", 23+1, 23-1" "24 22"
+
+gdb_test "print 5," "Syntax error near ','"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-03-28 21:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-28 21:36 [binutils-gdb/gdb-12-branch] Add Rust parser check for end of expression Tom Tromey
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).