aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2022-12-06 07:41:52 -0700
committerTom Tromey <tromey@adacore.com>2022-12-06 07:41:52 -0700
commite03698c1227bc18835cc2e4a9146a8369635e119 (patch)
treeee736b40573cf42d8379f677776ca385af74f553
parent83f18e5ebe627163f744215d3760a8eaacee6ec1 (diff)
downloadgdb-e03698c1227bc18835cc2e4a9146a8369635e119.zip
gdb-e03698c1227bc18835cc2e4a9146a8369635e119.tar.gz
gdb-e03698c1227bc18835cc2e4a9146a8369635e119.tar.bz2
Fix operator precedence bug in Rust parser
PR rust/29859 points out an operator precedence bug in the Rust parser. This patch fixes it and adds a regression test.
-rw-r--r--gdb/rust-parse.c2
-rw-r--r--gdb/testsuite/gdb.rust/simple.exp4
2 files changed, 5 insertions, 1 deletions
diff --git a/gdb/rust-parse.c b/gdb/rust-parse.c
index f5eb63e..3379272 100644
--- a/gdb/rust-parse.c
+++ b/gdb/rust-parse.c
@@ -1398,7 +1398,7 @@ rust_parser::parse_binop (bool required)
break;
}
- while (precedence < operator_stack.back ().precedence
+ while (precedence <= operator_stack.back ().precedence
&& operator_stack.size () > 1)
{
rustop_item rhs = std::move (operator_stack.back ());
diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp
index 252c47b..3a010f3 100644
--- a/gdb/testsuite/gdb.rust/simple.exp
+++ b/gdb/testsuite/gdb.rust/simple.exp
@@ -412,3 +412,7 @@ if {[lindex $v 0] >= 8} {
gdb_test "python print(gdb.lookup_type('simple::MoreComplicated').dynamic)" \
"True"
}
+
+# The new parser introduced an operator precedence bug.
+gdb_test "print 5 * 7 / 5" " = 7"
+gdb_test "print 4 - 3 - 1" " = 0"