diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/ada-lex.l | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp | 42 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/attr_ref_and_charlit/foo.adb | 24 |
5 files changed, 77 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b510cbc..a9092cc 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-08-20 Pierre-Marie de Rodat <derodat@adacore.com> + + * ada-lex.l: Reset the start condition to INITIAL in the rule that + matches attributes. + 2015-08-19 Kevin Buettner <kevinb@redhat.com> * dwarf2read.c (dwarf2_string_attr): New function. diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l index 7ef6efb..1a93a5c 100644 --- a/gdb/ada-lex.l +++ b/gdb/ada-lex.l @@ -205,7 +205,7 @@ false { return FALSEKEYWORD; } /* ATTRIBUTES */ -{TICK}[a-zA-Z][a-zA-Z]+ { return processAttribute (yytext+1); } +{TICK}[a-zA-Z][a-zA-Z]+ { BEGIN INITIAL; return processAttribute (yytext+1); } /* PUNCTUATION */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 955c9f7..2fecd36 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2015-08-20 Pierre-Marie de Rodat <derodat@adacore.com> + + * gdb.ada/attr_ref_and_charlit.exp: New testcase. + * gdb.ada/attr_ref_and_charlit/foo.adb: New file. + 2015-08-19 Kevin Buettner <kevinb@redhat.com> * gdb.dwarf2/dw2-bad-mips-linkage-name.c: New file. diff --git a/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp b/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp new file mode 100644 index 0000000..2c8bbfb --- /dev/null +++ b/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp @@ -0,0 +1,42 @@ +# Copyright 2015 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/>. + +load_lib "ada.exp" + +standard_ada_testfile "foo" + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { + return -1 +} + +clean_restart ${testfile} +set bp_location [gdb_get_line_number "BREAK" "${testdir}/foo.adb"] + +# Check with the same array at two different points in the execution that using +# both an attribute reference and a character literal in the same expression +# work as expected. They used to yield syntax error. + +runto "foo.adb:$bp_location" +gdb_test "print s'first" " = 2" +gdb_test "print s'last" " = 3" +gdb_test "print s(s'first) = 'a'" " = true" +gdb_test "print s(s'last) /= 'b'" " = false" + +gdb_test "continue" \ + ".*Breakpoint \[0-9\]+, foo\\.p \\(s=.*\\) at .*foo.adb:\[0-9\]+.*" \ +gdb_test "print s'first" " = 4" +gdb_test "print s'last" " = 5" +gdb_test "print s(s'first) = 'c'" " = true" +gdb_test "print s(s'last) /= 'd'" " = false" diff --git a/gdb/testsuite/gdb.ada/attr_ref_and_charlit/foo.adb b/gdb/testsuite/gdb.ada/attr_ref_and_charlit/foo.adb new file mode 100644 index 0000000..10421fa --- /dev/null +++ b/gdb/testsuite/gdb.ada/attr_ref_and_charlit/foo.adb @@ -0,0 +1,24 @@ +-- Copyright 2015 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/>. + +procedure Foo is + procedure P (S : String) is + begin + null; -- BREAK + end P; +begin + P ((2 => 'a', 3 => 'b')); + P ((4 => 'c', 5 => 'd')); +end Foo; |