gdb/

	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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 196f899..78dcf55 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 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>
+
        Fix modification of cplus_struct_default.
        * dwarf2read.c (dwarf2_add_member_fn) <no DW_AT_vtable_elem_location>:
        Call ALLOCATE_CPLUS_STRUCT_TYPE.

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index 4db4103..030554c 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -2553,7 +2553,7 @@ yylex (void)
     {
       token_and_value cc;
       memset (&cc, 0, sizeof (token_and_value));
-      if (first_was_coloncolon)
+      if (first_was_coloncolon && first_iter)
        {
          yylval = cc.value;
          return COLONCOLON;

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e187d04..05a5131 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 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>
+
        * gdb.cp/virtbase.cc (class RTTI_base, class RTTI_data)
        (main) <rtti_data>: New.
        * gdb.cp/virtbase.exp (print rtti_data): New.

diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
index 97521a1..95038fd 100644 (file)
--- a/gdb/testsuite/gdb.cp/namespace.exp
+++ b/gdb/testsuite/gdb.cp/namespace.exp
@@ -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 ::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\}"
-setup_kfail "gdb/1448" "*-*-*"
 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::NestedClass" "No type \"CClass\" within class or namespace \"C::C\"."