From cdde3dfbdafeee2a2da88fa1da0628ced7f68709 Mon Sep 17 00:00:00 2001 From: Jerome Guitton Date: Thu, 29 Nov 2012 16:30:45 +0000 Subject: [PATCH] New testcase for interface type printing. gdb/testsuite/ChangeLog: * gdb.ada/iwide: New testcase. --- gdb/testsuite/ChangeLog | 4 ++ gdb/testsuite/gdb.ada/iwide.exp | 42 ++++++++++++++++++ gdb/testsuite/gdb.ada/iwide/classes.adb | 23 ++++++++++ gdb/testsuite/gdb.ada/iwide/classes.ads | 59 +++++++++++++++++++++++++ gdb/testsuite/gdb.ada/iwide/p.adb | 25 +++++++++++ 5 files changed, 153 insertions(+) create mode 100644 gdb/testsuite/gdb.ada/iwide.exp create mode 100644 gdb/testsuite/gdb.ada/iwide/classes.adb create mode 100644 gdb/testsuite/gdb.ada/iwide/classes.ads create mode 100644 gdb/testsuite/gdb.ada/iwide/p.adb diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7c79f605ab2..6b9d2cae5a4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2012-11-29 Jerome Guitton + + * gdb.ada/iwide: New testcase. + 2012-11-29 Jerome Guitton * gdb.ada/ptype_tagged_param.exp: Adjust expected output in diff --git a/gdb/testsuite/gdb.ada/iwide.exp b/gdb/testsuite/gdb.ada/iwide.exp new file mode 100644 index 00000000000..836b551d8bb --- /dev/null +++ b/gdb/testsuite/gdb.ada/iwide.exp @@ -0,0 +1,42 @@ +# Copyright 2012 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 . + +load_lib "ada.exp" + +standard_ada_testfile p + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "BREAK" ${testdir}/p.adb] +runto "p.adb:$bp_location" + +gdb_test "print My_Drawable" \ + "= \\(center => \\(x => 1, y => 2\\), radius => 3\\)" + +gdb_test "print s_access.all" \ + "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" + +gdb_test "print sp_access.all" \ + "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" + +gdb_test "print d_access.all" \ + "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" + +gdb_test "print dp_access.all" \ + "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" diff --git a/gdb/testsuite/gdb.ada/iwide/classes.adb b/gdb/testsuite/gdb.ada/iwide/classes.adb new file mode 100644 index 00000000000..5af1114b21d --- /dev/null +++ b/gdb/testsuite/gdb.ada/iwide/classes.adb @@ -0,0 +1,23 @@ +-- Copyright 2012 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 . + +package body Classes is + + procedure Draw (R : Circle) is + begin + null; + end Draw; + +end Classes; diff --git a/gdb/testsuite/gdb.ada/iwide/classes.ads b/gdb/testsuite/gdb.ada/iwide/classes.ads new file mode 100644 index 00000000000..f305ed2bb3b --- /dev/null +++ b/gdb/testsuite/gdb.ada/iwide/classes.ads @@ -0,0 +1,59 @@ +-- Copyright 2012 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 . + +package Classes is + + type Point is record + X : Integer; + Y : Integer; + end record; + + type Shape is abstract tagged null record; + + type Shape_Access is access all Shape'Class; + + type Drawable is interface; + + type Drawable_Access is access all Drawable'Class; + + procedure Draw (D : Drawable) is abstract; + + type Circle is new Shape and Drawable with record + Center : Point; + Radius : Natural; + end record; + + procedure Draw (R : Circle); + + My_Circle : Circle := ((1, 2), 3); + My_Shape : Shape'Class := Shape'Class (My_Circle); + My_Drawable : Drawable'Class := Drawable'Class (My_Circle); + + S_Access : Shape_Access := new Circle'(My_Circle); + D_Access : Drawable_Access := new Circle'(My_Circle); + + type R (MS : Shape_Access; MD : Drawable_Access) is record + E : Integer; + end record; + + MR : R := (MS => S_Access, MD => D_Access, E => 42); + + type Shape_Array is array (1 .. 4) of Shape_Access; + type Drawable_Array is array (1 .. 4) of Drawable_Access; + + S_Array : Shape_Array := (others => S_Access); + D_Array : Drawable_Array := (others => D_Access); + +end Classes; diff --git a/gdb/testsuite/gdb.ada/iwide/p.adb b/gdb/testsuite/gdb.ada/iwide/p.adb new file mode 100644 index 00000000000..a4f2a5a0758 --- /dev/null +++ b/gdb/testsuite/gdb.ada/iwide/p.adb @@ -0,0 +1,25 @@ +-- Copyright 2012 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 . + +With Classes; use Classes; + +procedure P is + SP_Access : Shape_Access := new Circle'(My_Circle); + DP_Access : Drawable_Access := new Circle'(My_Circle); + SP_Array : Shape_Array := (others => S_Access); + DP_Array : Drawable_Array := (others => D_Access); +begin + null; -- BREAK +end P; -- 2.30.2