yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(Ada) Remove printing of array's first index when unneeded

Browse Source 
Consider the following code:

  type Table is array (Character) of Natural;
  My_Table : Table := (others => 4874);

Printing this table in gdb leads to:

  (gdb) p my_table
  $1 = ('["00"]' => 4874 <repeats 256 times>)

In this case, the index of the first element in this array is also
the first element of the index type (character type). Similar to what
we do we enumeration types, we do not need to print the index of the
first element when printing the array.

This patch fixes this issue and changes the output as follow:

  (gdb) p my_table
  $1 = (4874 <repeats 256 times>)

gdb/ChangeLog:

        * ada-valprint.c (print_optional_low_bound): Handle
        character-indexed array printing like boolean-indexed array
        printing.

gdb/testuite/ChangeLog:

        * testsuite/gdb.ada/array_char_idx/pck.ads (Table): New type.
        (My_Table): New global variable.
        * testsuite/gdb.ada/array_char_idx.exp: Add test.

Tested on x86_64-linux.
This commit is contained in:
Xavier Roirand 2018-01-04 23:47:05 -05:00 committed by Joel Brobecker
parent cd385f94a7
commit e3861a0313
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdb/ChangeLog
View File

@ -1,3 +1,9 @@
2018-01-03 Xavier Roirand <roirand@adacore.com>
* ada-valprint.c (print_optional_low_bound): Handle
character-indexed array printing like boolean-indexed array
printing.
2018-01-05 Joel Brobecker <brobecker@adacore.com>
* NEWS: Create a new section for the next release branch.

2
gdb/ada-valprint.c
View File

@ -88,9 +88,11 @@ print_optional_low_bound (struct ui_file *stream, struct type *type,
index_type = TYPE_TARGET_TYPE (index_type);
}
/* Don't print the lower bound if it's the default one. */
switch (TYPE_CODE (index_type))
{
case TYPE_CODE_BOOL:
case TYPE_CODE_CHAR:
if (low_bound == 0)
return 0;
break;

6
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,9 @@
2018-01-05 Xavier Roirand <brobecker@adacore.com>
* testsuite/gdb.ada/array_char_idx/pck.ads (Table): New type.
(My_Table): New global variable.
* testsuite/gdb.ada/array_char_idx.exp: Add test.
2018-01-04 Joel Brobecker <brobecker@adacore.com>
PR gdb/22670

3
gdb/testsuite/gdb.ada/array_char_idx.exp
View File

@ -30,3 +30,6 @@ gdb_test "ptype char_table" \
gdb_test "ptype global_char_table" \
"= array \\(character\\) of natural"
gdb_test "print my_table" "= \\(0 <repeats 256 times>\\)" \
"Display my_table"

3
gdb/testsuite/gdb.ada/array_char_idx/pck.ads
View File

@ -19,5 +19,8 @@ package Pck is
of Natural;
Global_Char_Table : Char_Table := (others => 0);
type Table is array (Character) of Natural;
My_Table : Table := (others => 4874);
procedure Do_Nothing (A : System.Address);
end Pck;