Fix PR c++/11703 and PR gdb/1448.
	* c-exp.y (yylex) <last_was_coloncolon && first_was_coloncolon>: Add
	FIRST_ITER check.

gdb/testsuite/
	Test PR c++/11703 and PR gdb/1448.
	* gdb.cp/namespace.exp (ptype ::C::NestedClass): Remove KFAIL for
	gdb/1448.
This commit is contained in:
Jan Kratochvil 2010-06-28 20:18:27 +00:00
parent 9655fd1aec
commit af53d23161
4 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2010-06-28 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix PR c++/11703 and PR gdb/1448.
* c-exp.y (yylex) <last_was_coloncolon && first_was_coloncolon>: Add
FIRST_ITER check.
2010-06-28 Jan Kratochvil <jan.kratochvil@redhat.com> 2010-06-28 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix modification of cplus_struct_default. Fix modification of cplus_struct_default.

View File

@ -2553,7 +2553,7 @@ yylex (void)
{ {
token_and_value cc; token_and_value cc;
memset (&cc, 0, sizeof (token_and_value)); memset (&cc, 0, sizeof (token_and_value));
if (first_was_coloncolon) if (first_was_coloncolon && first_iter)
{ {
yylval = cc.value; yylval = cc.value;
return COLONCOLON; return COLONCOLON;

View File

@ -1,3 +1,9 @@
2010-06-28 Jan Kratochvil <jan.kratochvil@redhat.com>
Test PR c++/11703 and PR gdb/1448.
* gdb.cp/namespace.exp (ptype ::C::NestedClass): Remove KFAIL for
gdb/1448.
2010-06-28 Jan Kratochvil <jan.kratochvil@redhat.com> 2010-06-28 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.cp/virtbase.cc (class RTTI_base, class RTTI_data) * gdb.cp/virtbase.cc (class RTTI_base, class RTTI_data)

View File

@ -192,7 +192,6 @@ gdb_test "ptype CClass::NestedClass" "type = (class C::CClass::NestedClass \{\r\
gdb_test "ptype NestedClass" "No symbol \"NestedClass\" in current context." gdb_test "ptype NestedClass" "No symbol \"NestedClass\" in current context."
gdb_test "ptype ::C::CClass" "type = class C::CClass \{\r\n public:\r\n int x;\r\n\}" gdb_test "ptype ::C::CClass" "type = class C::CClass \{\r\n public:\r\n int x;\r\n\}"
gdb_test "ptype ::C::CClass::NestedClass" "type = class C::CClass::NestedClass \{\r\n public:\r\n int y;\r\n\}" gdb_test "ptype ::C::CClass::NestedClass" "type = class C::CClass::NestedClass \{\r\n public:\r\n int y;\r\n\}"
setup_kfail "gdb/1448" "*-*-*"
gdb_test "ptype ::C::NestedClass" "No symbol \"NestedClass\" in namespace \"C\"." gdb_test "ptype ::C::NestedClass" "No symbol \"NestedClass\" in namespace \"C\"."
gdb_test "ptype C::CClass" "No symbol \"CClass\" in namespace \"C::C\"." gdb_test "ptype C::CClass" "No symbol \"CClass\" in namespace \"C::C\"."
gdb_test "ptype C::CClass::NestedClass" "No type \"CClass\" within class or namespace \"C::C\"." gdb_test "ptype C::CClass::NestedClass" "No type \"CClass\" within class or namespace \"C::C\"."