* gdb.ada/arrayidx/p.adb: New file.

        * gdb.ada/arrayidx.exp: New testcase

3 files changed, 198 insertions, 1 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8e04def..6bc1934 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,4 +1,9 @@
-2005-10-07  Joel Brobecker  <brobecker@adacore.com>
+2005-10-09  Joel Brobecker  <brobecker@adacore.com>
+
+	* gdb.ada/arrayidx/p.adb: New file.
+	* gdb.ada/arrayidx.exp: New testcase
+
+2005-10-09  Joel Brobecker  <brobecker@adacore.com>
 
 	* gdb.ada/array_return/pck.ads: New file.
 	* gdb.ada/array_return/pck.adb: New file.
diff --git a/gdb/testsuite/gdb.ada/arrayidx.exp b/gdb/testsuite/gdb.ada/arrayidx.exp
new file mode 100644
index 0000000..051937f
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/arrayidx.exp
@@ -0,0 +1,136 @@
+# Copyright 2005 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 2 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, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
+
+if $tracelevel then {
+    strace $tracelevel
+}
+
+load_lib "ada.exp"
+
+set testdir "arrayidx"
+set testfile "${testdir}/p"
+set srcfile ${srcdir}/${subdir}/${testfile}.adb
+set binfile ${objdir}/${subdir}/${testfile}
+
+file mkdir ${objdir}/${subdir}/${testdir}
+if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } {
+  return -1
+}
+
+gdb_exit
+gdb_start
+gdb_reinitialize_dir $srcdir/$subdir
+gdb_load ${binfile}
+
+set bp_location [gdb_get_line_number "START" ${testdir}/p.adb]
+runto "p.adb:$bp_location"
+
+# First, print all the arrays without indexes
+
+gdb_test "set print array-indexes off" \
+         ""  \
+         "set print array-indexes to off"
+
+gdb_test "print one_two_three" \
+         "\\(1, 2, 3\\)" \
+         "print one_two_three, indexes off"
+
+# There is a bug somewhere that causes the debugger to think that
+# this array is indexed by an integer subrange, which it is actually
+# indexed by an enumerated type. As a consequence, indexes for this
+# array will be printed using their underlying integer value instead
+# of their names. Also, even when printing this array without indexes,
+# because the underlying value of the first enumeration is zero, the
+# debugger ends up printing this index even when "array-indexes" are
+# off, just because the index of the first element is not an enumerated
+# type, and its value is not one.
+setup_kfail "*-*-*" gdb/2018
+gdb_test "print e_one_two_three" \
+         "\\(1, 2, 3\\)" \
+         "print e_one_two_three, indexes off"
+
+# Same as when printing e_one_two_three above.
+setup_kfail "*-*-*" gdb/2018
+gdb_test "print r_two_three" \
+         "\\(two => 2, 3\\)" \
+         "print r_two_three, indexes off"
+
+gdb_test "print u_one_two_three" \
+         "\\(1, 2, 3\\)" \
+         "print u_one_two_three, indexes off"
+
+gdb_test "print p_one_two_three" \
+         "\\(0 => false, true, true\\)" \
+         "print p_one_two_three, indexes off"
+
+gdb_test "print few_reps" \
+         "\\(1, 2, 3, 3, 3, 3, 3, 4, 5\\)" \
+         "print few_reps, indexes off"
+
+gdb_test "print many_reps" \
+         "\\(1, 2, 3 <repeats 12 times>, 4, 5\\)" \
+         "print many_reps, indexes off"
+
+gdb_test "print empty" \
+         "\\(\\)" \
+         "print empty, indexes off"
+
+# Next, print all the arrays with the indexes
+
+gdb_test "set print array-indexes on" \
+         ""  \
+         "set print array-indexes to on"
+
+gdb_test "print one_two_three" \
+         "\\(1 => 1, 2 => 2, 3 => 3\\)" \
+         "print one_two_three"
+
+# Same as first attempt at printing this array, we currently fail.
+# See details above.
+setup_kfail "*-*-*" gdb/2018
+gdb_test "print e_one_two_three" \
+         "\\(one => 1, two => 2, three => 3\\)" \
+         "print e_one_two_three"
+
+# Same as first attempt at printing this array, we currently fail.
+# See details above.
+setup_kfail "*-*-*" gdb/2018
+gdb_test "print r_two_three" \
+         "\\(two => 2, three => 3\\)" \
+         "print r_two_three"
+
+gdb_test "print u_one_two_three" \
+         "\\(1 => 1, 2 => 2, 3 => 3\\)" \
+         "print u_one_two_three"
+
+gdb_test "print p_one_two_three" \
+         "\\(0 => false, 1 => true, 2 => true\\)" \
+         "print p_one_two_three"
+
+gdb_test "print few_reps" \
+         "\\(1 => 1, 2 => 2, 3 => 3, 4 => 3, 5 => 3, 6 => 3, 7 => 3, 8 => 4, 9 => 5\\)" \
+         "print few_reps"
+
+gdb_test "print many_reps" \
+         "\\(1 => 1, 2 => 2, 3 => 3 <repeats 12 times>, 15 => 4, 16 => 5\\)" \
+         "print many_reps"
+
+gdb_test "print empty" \
+         "\\(\\)" \
+         "print empty"
+
+
diff --git a/gdb/testsuite/gdb.ada/arrayidx/p.adb b/gdb/testsuite/gdb.ada/arrayidx/p.adb
new file mode 100644
index 0000000..398e34d
--- /dev/null
+++ b/gdb/testsuite/gdb.ada/arrayidx/p.adb
@@ -0,0 +1,56 @@
+--  Copyright 2005 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 2 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, write to the Free Software
+--  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+--  MA 02110-1301, USA
+
+procedure P is
+   type Index is (One, Two, Three);
+
+   type Table is array (Integer range 1 .. 3) of Integer;
+   type ETable is array (Index) of Integer;
+   type RTable is array (Index range Two .. Three) of Integer;
+   type UTable is array (Positive range <>) of Integer;
+
+   type PTable is array (Index) of Boolean;
+   pragma Pack (PTable);
+
+   function Get_UTable (I : Integer) return UTable is
+   begin
+      return Utable'(1 => I, 2 => 2, 3 => 3);
+   end Get_UTable;
+
+   One_Two_Three : Table := (1, 2, 3);
+   E_One_Two_Three : ETable := (1, 2, 3);
+   R_Two_Three : RTable := (2, 3);
+   U_One_Two_Three : UTable := Get_UTable (1);
+   P_One_Two_Three : PTable := (False, True, True);
+
+   Few_Reps : UTable := (1, 2, 3, 3, 3, 3, 3, 4, 5);
+   Many_Reps : UTable := (1, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 5);
+
+   Empty : array (1 .. 0) of Integer := (others => 0);
+
+begin
+   One_Two_Three (1) := 4;  --  START
+   E_One_Two_Three (One) := 4;
+   R_Two_Three (Two) := 4;
+   U_One_Two_Three (U_One_Two_Three'First) := 4;
+   P_One_Two_Three (One) := True;
+
+   Few_Reps (Few_Reps'First) := 2;
+   Many_Reps (Many_Reps'First) := 2;
+
+   Empty := (others => 1);
+end P;