mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-28 04:25:10 +08:00
12df5c002d
I learned recently that empty struct expressions, like "X{}", have been promoted from experimental to stable in Rust. This patch changes the Rust expression parser to allow this case. New test case included. Built and regtested on x86-64 Fedora 23, using Rust 1.11 beta. 2016-07-21 Tom Tromey <tom@tromey.com> * rust-lang.c (rust_tuple_struct_type_p): Return false for empty structs. * rust-exp.y (struct_expr_list): Allow empty elements. 2016-07-21 Tom Tromey <tom@tromey.com> * gdb.rust/simple.rs (main): Use empty struct expression. * gdb.rust/simple.exp: Add tests for empty struct expression.
223 lines
7.3 KiB
Plaintext
223 lines
7.3 KiB
Plaintext
# Copyright (C) 2016 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
# Test expression parsing and evaluation that requires Rust compiler.
|
|
|
|
load_lib rust-support.exp
|
|
if {[skip_rust_tests]} {
|
|
continue
|
|
}
|
|
|
|
standard_testfile .rs
|
|
if {[prepare_for_testing ${testfile}.exp $testfile $srcfile {debug rust}]} {
|
|
return -1
|
|
}
|
|
|
|
set line [gdb_get_line_number "set breakpoint here"]
|
|
if {![runto ${srcfile}:$line]} {
|
|
untested $testfile
|
|
return -1
|
|
}
|
|
|
|
gdb_test "print a" " = \\(\\)"
|
|
gdb_test "ptype a" " = \\(\\)"
|
|
|
|
gdb_test "print b" " = \\\[\\\]"
|
|
gdb_test "ptype b" " = \\\[i32; 0\\\]"
|
|
gdb_test "print *(&b as *const \[i32; 0\])" " = \\\[\\\]"
|
|
gdb_test "print *(&b as *const \[i32; 0_0\])" " = \\\[\\\]"
|
|
|
|
gdb_test "print c" " = 99"
|
|
gdb_test "ptype c" " = i32"
|
|
|
|
gdb_test "print c = 87" " = \\(\\)"
|
|
gdb_test "print c" " = 87"
|
|
gdb_test "print c += 3" " = \\(\\)"
|
|
gdb_test "print c" " = 90"
|
|
gdb_test "print c -= 90" " = \\(\\)"
|
|
gdb_test "print c" " = 0"
|
|
gdb_test "print *&c" " = 0"
|
|
gdb_test "print *(&c as &i32)" " = 0"
|
|
gdb_test "print *(&c as *const i32)" " = 0"
|
|
gdb_test "print *(&c as *mut i32)" " = 0"
|
|
|
|
gdb_test "print j" " = simple::Unit"
|
|
gdb_test "ptype j" " = struct simple::Unit"
|
|
gdb_test "print j2" " = simple::Unit"
|
|
gdb_test "ptype j2" " = struct simple::Unit"
|
|
gdb_test "print simple::Unit" " = simple::Unit"
|
|
gdb_test "print simple::Unit{}" " = simple::Unit"
|
|
|
|
gdb_test "print g" " = \\(u8 \\(\\*\\)\\\[6\\\]\\) $hex b\"hi bob\""
|
|
gdb_test "ptype g" " = u8 \\(\\*\\)\\\[6\\\]"
|
|
|
|
gdb_test "print v" " = simple::Something::Three"
|
|
gdb_test_sequence "ptype v" "" {
|
|
" = enum simple::Something \\{"
|
|
" One,"
|
|
" Two,"
|
|
" Three,"
|
|
"\\}"
|
|
}
|
|
|
|
gdb_test "print w" " = \\\[1, 2, 3, 4\\\]"
|
|
gdb_test "ptype w" " = \\\[i32; 4\\\]"
|
|
gdb_test "print w\[2\]" " = 3"
|
|
gdb_test "print w\[2\] @ 2" " = \\\[3, 4\\\]"
|
|
gdb_test "print w_ptr\[2\]" " = 3"
|
|
gdb_test "print fromslice" " = 3"
|
|
gdb_test "print slice\[0\]" " = 3"
|
|
gdb_test "print slice as &\[i32\]\[0\]" " = 3"
|
|
|
|
gdb_test "print x" " = \\(23, 25\\.5\\)"
|
|
gdb_test "ptype x" " = \\(i32, f64\\)"
|
|
gdb_test "print x as (i32,f64)" " = \\(23, 25\\.5\\)"
|
|
|
|
gdb_test "print y" " = simple::HiBob \\{field1: 7, field2: 8\\}"
|
|
gdb_test_sequence "ptype y" "" {
|
|
" = struct simple::HiBob \\{"
|
|
" field1: i32,"
|
|
" field2: u64,"
|
|
"\\}"
|
|
}
|
|
gdb_test "print y.field2" " = 8"
|
|
|
|
gdb_test "print z" " = simple::ByeBob \\(7, 8\\)"
|
|
gdb_test_sequence "ptype z" "" {
|
|
" = struct simple::ByeBob \\("
|
|
" i32,"
|
|
" u64,"
|
|
"\\)"
|
|
}
|
|
gdb_test "print z.1" " = 8"
|
|
|
|
gdb_test_sequence "ptype simple::ByeBob" "" {
|
|
" = struct simple::ByeBob \\("
|
|
" i32,"
|
|
" u64,"
|
|
"\\)"
|
|
}
|
|
gdb_test "print simple::ByeBob(0xff, 5)" \
|
|
" = simple::ByeBob \\(255, 5\\)"
|
|
gdb_test "print simple::ByeBob\{field1: 0xff, field2:5\}" \
|
|
"Struct expression applied to non-struct type"
|
|
|
|
gdb_test "print simple::HiBob(0xff, 5)" \
|
|
"Type simple::HiBob is not a tuple struct"
|
|
gdb_test "print nosuchsymbol" \
|
|
"No symbol 'nosuchsymbol' in current context"
|
|
|
|
gdb_test "print e" " = simple::MoreComplicated::Two\\(73\\)"
|
|
gdb_test "print e2" \
|
|
" = simple::MoreComplicated::Four\\{this: true, is: 8, a: 109 'm', struct_: 100, variant: 10\\}"
|
|
|
|
gdb_test_sequence "ptype e" "" {
|
|
" = enum simple::MoreComplicated \\{"
|
|
" One,"
|
|
" Two\\(i32\\),"
|
|
" Three\\(simple::HiBob\\),"
|
|
" Four\\{this: bool, is: u8, a: char, struct_: u64, variant: u32\\},"
|
|
"\\}"
|
|
}
|
|
|
|
gdb_test "print e.0" " = 73"
|
|
gdb_test "print e.1" \
|
|
"Cannot access field 1 of variant simple::MoreComplicated::Two, there are only 1 fields"
|
|
gdb_test "print e.foo" \
|
|
"Attempting to access named field foo of tuple variant simple::MoreComplicated::Two, which has only anonymous fields"
|
|
|
|
gdb_test "print e2.variant" " = 10"
|
|
gdb_test "print e2.notexist" \
|
|
"Could not find field notexist of struct variant simple::MoreComplicated::Four"
|
|
gdb_test "print e2.0" \
|
|
"Variant simple::MoreComplicated::Four is not a tuple variant"
|
|
|
|
gdb_test "print k" " = simple::SpaceSaver::Nothing"
|
|
gdb_test "print l" " = simple::SpaceSaver::Thebox\\(9, $hex\\)"
|
|
gdb_test "print *l.1" " = 1729"
|
|
|
|
gdb_test "print diff2(3, 7)" " = -4"
|
|
gdb_test "print self::diff2(8, 9)" " = -1"
|
|
gdb_test "print ::diff2(23, -23)" " = 46"
|
|
|
|
gdb_test "ptype diff2" "fn \\(i32, i32\\) -> i32"
|
|
gdb_test "ptype empty" "fn \\(\\)"
|
|
|
|
gdb_test "print (diff2 as fn(i32, i32) -> i32)(19, -2)" " = 21"
|
|
|
|
# We need the ".*" because currently we don't extract the length and
|
|
# use it to intelligently print the string data.
|
|
gdb_test "print \"hello rust\"" \
|
|
" = &str \\{data_ptr: $hex \"hello rust.*\", length: 10\\}"
|
|
gdb_test "print \"hello" "Unexpected EOF in string"
|
|
gdb_test "print r##\"hello \" rust\"##" \
|
|
" = &str \\{data_ptr: $hex \"hello \\\\\" rust.*\", length: 12\\}"
|
|
gdb_test "print r\"hello" "Unexpected EOF in string"
|
|
gdb_test "print r###\"###hello\"" "Unexpected EOF in string"
|
|
gdb_test "print r###\"###hello\"##" "Unexpected EOF in string"
|
|
gdb_test "print r###\"hello###" "Unexpected EOF in string"
|
|
|
|
gdb_test "print 0..5" " = .*::ops::Range.* \\{start: 0, end: 5\\}"
|
|
gdb_test "print ..5" " = .*::ops::RangeTo.* \\{end: 5\\}"
|
|
gdb_test "print 5.." " = .*::ops::RangeFrom.* \\{start: 5\\}"
|
|
gdb_test "print .." " = .*::ops::RangeFull"
|
|
|
|
gdb_test "print str_some" \
|
|
" = core::option::Option<collections::string::String>::Some\\(collections::string::String .*"
|
|
gdb_test "print str_none" " = core::option::Option<collections::string::String>::None"
|
|
gdb_test "print int_some" " = core::option::Option::Some\\(1\\)"
|
|
gdb_test "print int_none" " = core::option::Option::None"
|
|
gdb_test "print box_some" " = core::option::Option<Box<u8>>::Some\\(.*\\)"
|
|
gdb_test "print box_none" " = core::option::Option<Box<u8>>::None"
|
|
gdb_test "print custom_some" \
|
|
" = simple::NonZeroOptimized::Value\\(collections::string::String .*"
|
|
gdb_test "print custom_none" " = simple::NonZeroOptimized::Empty"
|
|
|
|
proc test_one_slice {svar length base range} {
|
|
global hex
|
|
|
|
set result " = &\\\[.*\\\] \\{data_ptr: $hex, length: $length\\}"
|
|
|
|
gdb_test "print $svar" $result
|
|
gdb_test "print &${base}\[${range}\]" $result
|
|
}
|
|
|
|
test_one_slice slice 1 w 2..3
|
|
test_one_slice slice2 1 slice 0..1
|
|
|
|
test_one_slice all1 4 w ..
|
|
test_one_slice all2 1 slice ..
|
|
|
|
test_one_slice from1 3 w 1..
|
|
test_one_slice from2 0 slice 1..
|
|
|
|
test_one_slice to1 3 w ..3
|
|
test_one_slice to2 1 slice ..1
|
|
|
|
gdb_test "print w\[2..3\]" "Can't take slice of array without '&'"
|
|
|
|
|
|
gdb_test_sequence "complete print y.f" "" \
|
|
{"print y.field1" "print y.field2"}
|
|
gdb_test_sequence "complete print y." "" \
|
|
{"print y.field1" "print y.field2"}
|
|
|
|
# Unimplemented, but we can at least test the parser productions.
|
|
gdb_test "print (1,2,3)" "Tuple expressions not supported yet"
|
|
gdb_test "print (1,)" "Tuple expressions not supported yet"
|
|
gdb_test "print (1)" " = 1"
|
|
|
|
gdb_test "print 23..97.0" "Range expression with different types"
|