2004-08-12 Michael Chastain <mec.gnu@mindspring.com>

	* gdb.cp/classes.exp (test_ptype_class_objects): Call
	cp_test_ptype_class.
	(test_enums): Likewise.

1 files changed, 212 insertions, 545 deletions

diff --git a/gdb/testsuite/gdb.cp/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
index 74f328e..90b1bca 100644
--- a/gdb/testsuite/gdb.cp/classes.exp
+++ b/gdb/testsuite/gdb.cp/classes.exp
@@ -27,6 +27,8 @@ if $tracelevel then {
 
 if { [skip_cplus_tests] } { continue }
 
+load_lib "cp-support.exp"
+
 set testfile "classes"
 set srcfile ${testfile}.cc
 set binfile ${objdir}/${subdir}/${testfile}
@@ -36,610 +38,285 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 }
 
 # Test ptype of class objects.
-#
-# This code accepts the output of gcc v2 and v3, dwarf-2 and stabs+.
-# It could use some expansion with other compilers such as hp-ux ac++.
-#
-# There are lots of variations in the output:
-#
-# . older gcc -gstabs+ emits debug info for implicit member functions:
-#   operator=, copy ctor, ctor.  newer gcc -gstabs+ sometimes emits
-#   this debug info.  gcc -gdwarf-2 also emits this debug info,
-#   but gdb does not print implicit members in ptype output.
-#
-# . gcc with abi version 1 puts the implicit member functions
-#   at the beginning of the member function list; with abi version 2,
-#   the implicit member functions are at the end of the member function
-#   list.  This appears as an output difference with -gstabs+.
-#   gcc 3.3.X defaults to abi version 1, and gcc 3.4 will default
-#   to abi version 2.
-#
-# . gcc v2 shows data members for virtual base pointers.
-#   gcc v3 does not.
-#
-# . ptype can print either "class ... { public:" or "struct ... {".
-#   this depends on the debug info format; on whether the struct/class
-#   has any c++ features such as non-public data members, base classes,
-#   or member functions; and on other factors.  I accept any form that
-#   is semantically the same as the original.
 
 proc test_ptype_class_objects {} {
     global gdb_prompt
-    global ws
-    global nl
 
     # Simple type.
 
-    set re_class "((struct|class) default_public_struct \{${ws}public:|struct default_public_struct \{)"
-
-    gdb_test_multiple "ptype struct default_public_struct" "ptype struct default_public_struct" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype struct default_public_struct"
+    cp_test_ptype_class \
+	"ptype struct default_public_struct" "" "struct" "default_public_struct" \
+	{
+	    { field public "int a;" }
+	    { field public "int b;" }
 	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}default_public_struct ?& ?operator ?=\\(default_public_struct const ?&\\);${ws}default_public_struct\\(default_public_struct const ?&\\);${ws}default_public_struct\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype struct default_public_struct"
-	}
-    }
 
-    # Same test, slightly different type.
+    # Another simple type.
 
-    set re_class "((struct|class) explicit_public_struct \{${ws}public:|struct explicit_public_struct \{)"
-
-    gdb_test_multiple "ptype struct explicit_public_struct" "ptype struct explicit_public_struct" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype struct explicit_public_struct"
+    cp_test_ptype_class \
+	"ptype struct explicit_public_struct" "" "struct" "explicit_public_struct" \
+	{
+	    { field public "int a;" }
+	    { field public "int b;" }
 	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}explicit_public_struct ?& ?operator ?=\\(explicit_public_struct const ?&\\);${ws}explicit_public_struct\\(explicit_public_struct const ?&\\);${ws}explicit_public_struct\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype struct explicit_public_struct"
-	}
-    }
-
-    # Same test, slightly different type.
 
-    set re_class "((struct|class) protected_struct \{${ws}protected:)"
+    # Another simple type.
 
-    gdb_test_multiple "ptype struct protected_struct" "ptype struct protected_struct" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype struct protected_struct"
-	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}public:${ws}protected_struct ?& ?operator ?=\\(protected_struct const ?&\\);${ws}protected_struct\\(protected_struct const ?&\\);${ws}protected_struct\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype struct protected_struct"
+    cp_test_ptype_class \
+	"ptype struct protected_struct" "" "struct" "protected_struct" \
+	{
+	    { field protected "int a;" }
+	    { field protected "int b;" }
 	}
-    }
-
-    # Same test, slightly different type.
 
-    set re_class "((struct|class) private_struct \{${ws}private:|class private_struct \{)"
+    # Another simple type.
 
-    gdb_test_multiple "ptype struct private_struct" "ptype struct private_struct" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype struct private_struct"
+    cp_test_ptype_class \
+	"ptype struct private_struct" "" "struct" "private_struct" \
+	{
+	    { field private "int a;" }
+	    { field private "int b;" }
 	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}public:${ws}private_struct ?& ?operator ?=\\(private_struct const ?&\\);${ws}private_struct\\(private_struct const ?&\\);${ws}private_struct\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype struct private_struct"
-	}
-    }
-
-    # Similar test, bigger type.
 
-    set re_class "((struct|class) mixed_protection_struct \{${ws}public:|struct mixed_protection_struct \{)"
+    # A bigger type.
 
-    gdb_test_multiple "ptype struct mixed_protection_struct" "ptype struct mixed_protection_struct" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}private:${ws}int c;${ws}int d;${ws}protected:${ws}int e;${ws}int f;${ws}public:${ws}int g;${ws}private:${ws}int h;${ws}protected:${ws}int i;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype struct mixed_protection_struct"
-	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}private:${ws}int c;${ws}int d;${ws}protected:${ws}int e;${ws}int f;${ws}public:${ws}int g;${ws}private:${ws}int h;${ws}protected:${ws}int i;${ws}public:${ws}mixed_protection_struct ?& ?operator ?=\\(mixed_protection_struct const ?&\\);${ws}mixed_protection_struct\\(mixed_protection_struct const ?&\\);${ws}mixed_protection_struct\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype struct mixed_protection_struct"
+    cp_test_ptype_class \
+	"ptype struct mixed_protection_struct" "" "struct" "mixed_protection_struct" \
+	{
+	    { field public    "int a;" }
+	    { field public    "int b;" }
+	    { field private   "int c;" }
+	    { field private   "int d;" }
+	    { field protected "int e;" }
+	    { field protected "int f;" }
+	    { field public    "int g;" }
+	    { field private   "int h;" }
+	    { field protected "int i;" }
 	}
-    }
 
     # All that again with "class" instead of "struct".
     # gdb does not care about the difference anyways.
 
-    set re_class "((struct|class) public_class \{${ws}public:|struct public_class \{)"
-
-    gdb_test_multiple "ptype class public_class" "ptype class public_class" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class public_class"
-	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}public_class ?& ?operator ?=\\(public_class const ?&\\);${ws}public_class\\(public_class const ?&\\);${ws}public_class\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class public_class"
+    cp_test_ptype_class \
+	"ptype class public_class" "" "class" "public_class" \
+	{
+	    { field public "int a;" }
+	    { field public "int b;" }
 	}
-    }
-
-    # Same test, slightly different type.
 
-    set re_class "((struct|class) protected_class \{${ws}protected:)"
+    # Another simple type.
 
-    gdb_test_multiple "ptype class protected_class" "ptype class protected_class" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class protected_class"
-	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}public:${ws}protected_class ?& ?operator ?=\\(protected_class const ?&\\);${ws}protected_class\\(protected_class const ?&\\);${ws}protected_class\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class protected_class"
+    cp_test_ptype_class \
+	"ptype class protected_class" "" "class" "protected_class" \
+	{
+	    { field protected "int a;" }
+	    { field protected "int b;" }
 	}
-    }
 
-    # Same test, slightly different type.
+    # Another simple type.
 
-    set re_class "((struct|class) default_private_class \{${ws}private:|class default_private_class \{)"
-
-    gdb_test_multiple "ptype class default_private_class" "ptype class default_private_class" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class default_private_class"
+    cp_test_ptype_class \
+	"ptype class default_private_class" "" "class" "default_private_class" \
+	{
+	    { field private "int a;" }
+	    { field private "int b;" }
 	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}public:${ws}default_private_class ?& ?operator ?=\\(default_private_class const ?&\\);${ws}default_private_class\\(default_private_class const ?&\\);${ws}default_private_class\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class default_private_class"
-	}
-    }
-
-    # Same test, slightly different type.
 
-    set re_class "((struct|class) explicit_private_class \{${ws}private:|class explicit_private_class \{)"
+    # Another simple type.
 
-    gdb_test_multiple "ptype class explicit_private_class" "ptype class explicit_private_class" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class explicit_private_class"
+    cp_test_ptype_class \
+	"ptype class explicit_private_class" "" "class" "explicit_private_class" \
+	{
+	    { field private "int a;" }
+	    { field private "int b;" }
 	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}public:${ws}explicit_private_class ?& ?operator ?=\\(explicit_private_class const ?&\\);${ws}explicit_private_class\\(explicit_private_class const ?&\\);${ws}explicit_private_class\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class explicit_private_class"
-	}
-    }
 
-    # Similar test, bigger type.
+    # A bigger type.
 
-    set re_class "((struct|class) mixed_protection_class \{${ws}public:|struct mixed_protection_class \{)"
+    cp_test_ptype_class \
+	"ptype class mixed_protection_class" "" "class" "mixed_protection_class" \
+	{
 
-    gdb_test_multiple "ptype class mixed_protection_class" "ptype struct mixed_protection_class" {
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}private:${ws}int c;${ws}int d;${ws}protected:${ws}int e;${ws}int f;${ws}public:${ws}int g;${ws}private:${ws}int h;${ws}protected:${ws}int i;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class mixed_protection_class"
-	}
-	-re "type = ${re_class}${ws}int a;${ws}int b;${ws}private:${ws}int c;${ws}int d;${ws}protected:${ws}int e;${ws}int f;${ws}public:${ws}int g;${ws}private:${ws}int h;${ws}protected:${ws}int i;${ws}public:${ws}mixed_protection_class ?& ?operator ?=\\(mixed_protection_class const ?&\\);${ws}mixed_protection_class\\(mixed_protection_class const ?&\\);${ws}mixed_protection_class\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class mixed_protection_class"
+	    { field public    "int a;" }
+	    { field public    "int b;" }
+	    { field private   "int c;" }
+	    { field private   "int d;" }
+	    { field protected "int e;" }
+	    { field protected "int f;" }
+	    { field public    "int g;" }
+	    { field private   "int h;" }
+	    { field protected "int i;" }
 	}
-    }
 
     # Here are some classes with inheritance.
 
     # Base class.
 
-    set re_class "((struct|class) A \{${ws}public:|struct A \{)"
-
-    gdb_test_multiple "ptype class A" "ptype class A" {
-	-re "type = ${re_class}${ws}int a;${ws}int x;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class A"
+    cp_test_ptype_class \
+	"ptype class A" "" "class" "A" \
+	{
+	    { field public "int a;" }
+	    { field public "int x;" }
 	}
-	-re "type = ${re_class}${ws}int a;${ws}int x;${ws}A ?& ?operator ?=\\(A const ?&\\);${ws}A\\(A const ?&\\);${ws}A\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class A"
-	}
-    }
 
     # Derived class.
 
-    set re_class "((struct|class) B : public A \{${ws}public:|struct B : public A \{)"
-
-    gdb_test_multiple "ptype class B" "ptype class B" {
-	-re "type = ${re_class}${ws}int b;${ws}int x;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class B"
+    cp_test_ptype_class \
+	"ptype class B" "" "class" "B" \
+	{
+	    { base         "public A" }
+	    { field public "int b;" }
+	    { field public "int x;" }
 	}
-	-re "type = ${re_class}${ws}int b;${ws}int x;${ws}B ?& ?operator ?=\\(B const ?&\\);${ws}B\\(B const ?&\\);${ws}B\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class B"
-	}
-    }
 
     # Derived class.
 
-    set re_class "((struct|class) C : public A \{${ws}public:|struct C : public A \{)"
-
-    gdb_test_multiple "ptype class C" "ptype class C" {
-	-re "${re_class}${ws}int c;${ws}int x;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class C"
-	}
-	-re "${re_class}${ws}int c;${ws}int x;${ws}C ?& ?operator ?=\\(C const ?&\\);${ws}C\\(C const ?&\\);${ws}C\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class C"
+    cp_test_ptype_class \
+	"ptype class C" "" "class" "C" \
+	{
+	    { base         "public A" }
+	    { field public "int c;" }
+	    { field public "int x;" }
 	}
-    }
 
     # Derived class, multiple inheritance.
 
-    set re_class "((struct|class) D : public B, public C \{${ws}public:|struct D : public B, public C \{)"
-
-    gdb_test_multiple "ptype class D" "ptype class D" {
-	-re "type = ${re_class}${ws}int d;${ws}int x;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class D"
-	}
-	-re "type = ${re_class}${ws}int d;${ws}int x;${ws}D ?& ?operator ?=\\(D const ?&\\);${ws}D\\(D const ?&\\);${ws}D\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class D"
+    cp_test_ptype_class \
+	"ptype class D" "" "class" "D" \
+	{
+	    { base         "public B" }
+	    { base         "public C" }
+	    { field public "int d;" }
+	    { field public "int x;" }
 	}
-    }
 
     # Derived class.
 
-    set re_class "((struct|class) E : public D \{${ws}public:|struct E : public D \{)"
-
-    gdb_test_multiple "ptype class E" "ptype class E" {
-	-re "type = ${re_class}${ws}int e;${ws}int x;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class E"
+    cp_test_ptype_class \
+	"ptype class E" "" "class" "E" \
+	{
+	    { base         "public D" }
+	    { field public "int e;" }
+	    { field public "int x;" }
 	}
-	-re "type = ${re_class}${ws}int e;${ws}int x;${ws}E ?& ?operator ?=\\(E const ?&\\);${ws}E\\(E const ?&\\);${ws}E\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class E"
-	}
-    }
 
     # This is a break from inheritance tests.
     #
     # gcc 2.X with stabs (stabs or stabs+?) used to have a problem with
     # static methods whose name is the same as their argument mangling.
  
-    set re_class "((struct|class) Static \{${ws}public:|struct Static \{)"
-
-    gdb_test_multiple "ptype class Static" "ptype class Static" {
-	-re "type = ${re_class}${ws}static void ii\\(int, int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	      # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	      # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class Static"
-	}
-	-re "type = ${re_class}${ws}Static ?& ?operator ?=\\(Static const ?&\\);${ws}Static\\(Static const ?&\\);${ws}Static\\((void|)\\);${ws}static void ii\\(int, int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    pass "ptype class Static"
+    cp_test_ptype_class \
+	"ptype class Static" "" "class" "Static" \
+	{
+	    { method public "static void ii(int, int);" }
 	}
-	-re "type = ${re_class}${ws}static void ii\\(int, int\\);${ws}Static ?& ?operator ?=\\(Static const ?&\\);${ws}Static\\(Static const ?&\\);${ws}Static\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class Static"
-	}
-    }
 
     # Here are some virtual inheritance tests.
 
-    set re_class "((struct|class) vA \{${ws}public:|struct vA \{)"
+    # A virtual base class.
 
-    gdb_test_multiple "ptype class vA" "ptype class vA" {
-	-re "type = ${re_class}${ws}int va;${ws}int vx;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class vA"
-	}
-	-re "type = ${re_class}${ws}int va;${ws}int vx;${ws}vA ?& ?operator ?=\\(vA const ?&\\);${ws}vA\\(vA const ?&\\);${ws}vA\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class vA"
+    cp_test_ptype_class \
+	"ptype class vA" "" "class" "vA" \
+	{
+	    { field public "int va;" }
+	    { field public "int vx;" }
 	}
-    }
-
-    # With gcc 2, gdb prints the virtual base pointer.
-    # With gcc 3, gdb does not print the virtual base pointer.
-    # drow considers it a gdb bug if gdb prints the vbptr.
 
-    set re_class_private "((struct|class) vB : public virtual vA \{${ws}private:|class vB : public virtual vA \{)"
-    set re_class_public "((struct|class) vB : public virtual vA \{${ws}public:|struct vB : public virtual vA \{)"
+    # A derived class with a virtual base.
 
-    gdb_test_multiple "ptype class vB" "ptype class vB" {
-	-re "type = ${re_class_private}${ws}private:${ws}vA ?\\* ?_vb.2vA;${ws}public:${ws}int vb;${ws}int vx;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # TODO: kfail this
-	    fail "ptype class vB"
-	}
-	-re "type = ${re_class_public}${ws}int vb;${ws}int vx;$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    pass "ptype class vB"
-	}
-	-re "type = ${re_class_private}${ws}vA ?\\* ?_vb.vA;${ws}public:${ws}int vb;${ws}int vx;${ws}vB ?& ?operator ?=\\(vB const ?&\\);${ws}vB\\(int, ?vB const ?&\\);${ws}vB\\(int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # See the hidden "in-charge" ctor parameter!
-	    # TODO: kfail this
-	    setup_xfail "*-*-*"
-	    fail "ptype class vB (FIXME: non-portable virtual table constructs)"
-	}
-	-re "type = ${re_class_public}${ws}int vb;${ws}int vx;${ws}vB ?& ?operator ?=\\(vB const ?&\\);${ws}vB\\(vB const ?&\\);${ws}vB\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class vB"
+    cp_test_ptype_class \
+	"ptype class vB" "" "class" "vB" \
+	{
+	    { base         "public virtual vA" }
+	    { vbase        "vA" }
+	    { field public "int vb;" }
+	    { field public "int vx;" }
 	}
-	-re "type = ${re_class_public}${ws}int vb;${ws}int vx;${ws}vB\\(vB const ?&\\);${ws}vB\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class vB"
-	}
-    }
 
-    # Another class with a virtual base.
+    # Another derived class with a virtual base.
 
-    set re_class_private "((struct|class) vC : public virtual vA \{${ws}private:|class vC : public virtual vA \{)"
-    set re_class_public "((struct|class) vC : public virtual vA \{${ws}public:|struct vC : public virtual vA \{)"
-
-    gdb_test_multiple "ptype class vC" "ptype class vC" {
-	-re "type = ${re_class_private}${ws}private:${ws}vA ?\\* ?_vb.2vA;${ws}public:${ws}int vc;${ws}int vx;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # TODO: kfail this
-	    fail "ptype class vC"
-	}
-	-re "type = ${re_class_public}${ws}int vc;${ws}int vx;$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    pass "ptype class vC"
+    cp_test_ptype_class \
+	"ptype class vC" "" "class" "vC" \
+	{
+	    { base         "public virtual vA" }
+	    { vbase        "vA" }
+	    { field public "int vc;" }
+	    { field public "int vx;" }
 	}
-	-re "type = ${re_class_private}${ws}vA ?\\* ?_vb.vA;${ws}public:${ws}int vc;${ws}int vx;${ws}vC ?& ?operator ?=\\(vC const ?&\\);${ws}vC\\(int, ?vC const ?&\\);${ws}vC\\(int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # See the hidden "in-charge" ctor parameter!
-	    # TODO: kfail this
-	    setup_xfail "*-*-*"
-	    fail "ptype class vC (FIXME: non-portable virtual table constructs)"
-	}
-	-re "type = ${re_class_public}${ws}int vc;${ws}int vx;${ws}vC ?& ?operator ?=\\(vC const ?&\\);${ws}vC\\(vC const ?&\\);${ws}vC\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.4 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class vC"
-	}
-	-re "type = ${re_class_public}${ws}int vc;${ws}int vx;${ws}vC\\(vC const ?&\\);${ws}vC\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class vC"
-	}
-    }
-
-    # The classic diamond inheritance.
 
-    set re_class_private "((struct|class) vD : public virtual vB, public virtual vC \{${ws}private:|class vD : public virtual vB, public virtual vC \{)"
-    set re_class_public "((struct|class) vD : public virtual vB, public virtual vC \{${ws}public:|struct vD : public virtual vB, public virtual vC \{)"
+    # A classic diamond class.
 
-    gdb_test_multiple "ptype class vD" "ptype class vD" {
-	-re "type = ${re_class_private}${ws}vC ?\\* ?_vb.2vC;${ws}vB ?\\* ?_vb.2vB;${ws}public:${ws}int vd;${ws}int vx;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # TODO: kfail
-	    fail "ptype class vD"
-	}
-	-re "type = ${re_class_public}${ws}int vd;${ws}int vx;$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    pass "ptype class vD"
-	}
-	-re "type = ${re_class_private}${ws}vC ?\\* ?_vb.vC;${ws}vB ?\\* ?_vb.vB;${ws}public:${ws}int vd;${ws}int vx;${ws}vD ?& ?operator ?=\\(vD const ?&\\);${ws}vD\\(int, ?vD const ?&\\);${ws}vD\\(int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # See the hidden "in-charge" ctor parameter!
-	    # TODO: kfail
-	    setup_xfail "*-*-*"
-	    fail "ptype class vD (FIXME: non-portable virtual table constructs)"
-	}
-	-re "type = ${re_class_public}${ws}int vd;${ws}int vx;${ws}vD ?& ?operator ?=\\(vD const ?&\\);${ws}vD\\(vD const ?&\\);${ws}vD\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class vD"
-	}
-	-re "type = ${re_class_public}${ws}int vd;${ws}int vx;${ws}vD\\(vD const ?&\\);${ws}vD\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    pass "ptype class vD"
+    cp_test_ptype_class \
+	"ptype class vD" "" "class" "vD" \
+	{
+	    { base         "public virtual vB" }
+	    { base         "public virtual vC" }
+	    { vbase        "vC" }
+	    { vbase        "vB" }
+	    { field public "int vd;" }
+	    { field public "int vx;" }
 	}
-    }
 
-    # One more case of virtual derivation.
+    # A class derived from a diamond class.
 
-    set re_class_private "((struct|class) vE : public virtual vD \{${ws}private:|class vE : public virtual vD \{)"
-    set re_class_public "((struct|class) vE : public virtual vD \{${ws}public:|struct vE : public virtual vD \{)"
-
-    gdb_test_multiple "ptype class vE" "ptype class vE" {
-	-re "type = ${re_class_private}${ws}vD ?\\* ?_vb.2vD;${ws}public:${ws}int ve;${ws}int vx;$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # TODO: kfail
-	    fail "ptype class vE"
-	}
-	-re "type = ${re_class_public}${ws}int ve;${ws}int vx;$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc 3.4.1 -gdwarf-2
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gdwarf-2
-	    pass "ptype class vE"
-	}
-	-re "type = ${re_class_private}${ws}vD ?\\* ?_vb.vD;${ws}public:${ws}int ve;${ws}int vx;${ws}vE ?& ?operator ?=\\(vE const ?&\\);${ws}vE\\(int, ?vE const ?&\\);${ws}vE\\(int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # See the hidden "in-charge" ctor parameter!
-	    # TODO: kfail
-	    setup_xfail "*-*-*"
-	    fail "ptype class vE (FIXME: non-portable virtual table constructs)"
+    cp_test_ptype_class \
+	"ptype class vE" "" "class" "vE" \
+	{
+	    { base         "public virtual vD" }
+	    { vbase        "vD" }
+	    { field public "int ve;" }
+	    { field public "int vx;" }
 	}
-	-re "type = ${re_class_public}${ws}int ve;${ws}int vx;${ws}vE ?& ?operator ?=\\(vE const ?&\\);${ws}vE\\(vE const ?&\\);${ws}vE\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.2 -gstabs+
-	    # gcc 3.4.1 -gstabs+
-	    pass "ptype class vE"
-	}
-	-re "type = ${re_class_public}${ws}int ve;${ws}int vx;${ws}vE\\(vE const ?&\\);${ws}vE\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2004-07-31 00:45:52 UTC -gstabs+
-	    pass "ptype class vE"
-	}
-    }
 
     # Another inheritance series.
 
-    gdb_test_multiple "ptype class Base1" "ptype class Base1" {
-	-re "type = class Base1 \{${ws}public:${ws}int x;${ws}Base1\\(int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gdwarf-2
-	    pass "ptype class Base1"
-	}
-	-re "type = class Base1 \{${ws}public:${ws}int x;${ws}Base1 ?& ?operator ?=\\(Base1 const ?&\\);${ws}Base1\\(Base1 const ?&\\);${ws}Base1\\(int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    pass "ptype class Base1"
-	}
-	-re "type = class Base1 \{${ws}public:${ws}int x;${ws}Base1\\(int\\);${ws}Base1 ?& ?operator ?=\\(Base1 const ?&\\);${ws}Base1\\(Base1 const ?&\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
-	    pass "ptype class Base1"
-	}
-    }
-
-    # The second base class.
-
-    gdb_test_multiple "ptype class Foo" "ptype class Foo" {
-	-re "type = class Foo \{${ws}public:${ws}int x;${ws}int y;${ws}static int st;${ws}Foo\\(int, int\\);${ws}int operator ?!\\((void|)\\);${ws}operator int\\((void|)\\);${ws}int times\\(int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gdwarf-2
-	    pass "ptype class Foo"
-	}
-	-re "type = class Foo \{${ws}public:${ws}int x;${ws}int y;${ws}static int st;${ws}Foo ?& ?operator ?=\\(Foo const ?&\\);${ws}Foo\\(Foo const ?&\\);${ws}Foo\\(int, int\\);${ws}int operator ?!\\((void|)\\);${ws}int operator int\\((void|)\\);${ws}int times\\(int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # TODO: "int operator int()" is a bug
-	    # kfail "gdb/1497" "ptype class Foo"
-	    pass "ptype class Foo"
-	}
-	-re "type = class Foo \{${ws}public:${ws}int x;${ws}int y;${ws}static int st;${ws}Foo ?& ?operator ?=\\(Foo const ?&\\);${ws}Foo\\(Foo const ?&\\);${ws}Foo\\(int, int\\);${ws}int operator ?!\\((void|)\\);${ws}operator int\\((void|)\\);${ws}int times\\(int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 3.3.2 -gstabs+
-	    pass "ptype class Foo"
-	}
-	-re "type = class Foo \{${ws}public:${ws}int x;${ws}int y;${ws}static int st;${ws}Foo\\(int, int\\);${ws}int operator ?!\\((void|)\\);${ws}operator int\\((void|)\\);${ws}int times\\(int\\);${ws}Foo ?& ?operator ?=\\(Foo const ?&\\);${ws}Foo\\(Foo const ?&\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
-	    pass "ptype class Foo"
+    # A base class.
+
+    cp_test_ptype_class \
+	"ptype class Base1" "" "class" "Base1" \
+	{
+	    { field  public "int x;" }
+	    { method public "Base1(int);" }
+	}
+
+    # Another base class.
+
+    cp_test_ptype_class \
+	"ptype class Foo" "" "class" "Foo" \
+	{
+	    { field public "int x;" }
+	    { field public "int y;" }
+	    { field public "static int st;" }
+	    { method public "Foo(int, int);" }
+	    { method public "int operator!();" }
+	    { method public "operator int();" }
+	    { method public "int times(int);" }
+	} \
+	"" \
+	{
+	    {
+		"operator int();"
+		"int operator int();"
+		{ setup_kfail "gdb/1497" "*-*-*" }
+	    }
+	    {
+		"operator int();"
+		"int operator int(void);"
+		{ setup_kfail "gdb/1497" "*-*-*" }
+	    }
 	}
-    }
 
     # A multiple inheritance derived class.
 
-    gdb_test_multiple "ptype class Bar" "ptype class Bar" {
-	-re "type = class Bar : public Base1, public Foo \{${ws}public:${ws}int z;${ws}Bar\\(int, int, int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gdwarf-2
-	    pass "ptype class Bar"
+    cp_test_ptype_class \
+	"ptype class Bar" "" "class" "Bar" \
+	{
+	    { base          "public Base1" }
+	    { base          "public Foo" }
+	    { field  public "int z;" }
+	    { method public "Bar(int, int, int);" }
 	}
-	-re "type = class Bar : public Base1, public Foo \{${ws}public:${ws}int z;${ws}Bar ?& ?operator ?=\\(Bar const ?&\\);${ws}Bar\\(Bar const ?&\\);${ws}Bar\\(int, int, int\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    # gcc 3.3.2 -gstabs+
-	    pass "ptype class Bar"
-	}
-	-re "type = class Bar : public Base1, public Foo \{${ws}public:${ws}int z;${ws}Bar\\(int, int, int\\);${ws}Bar ?& ?operator ?=\\(Bar const ?&\\);${ws}Bar\\(Bar const ?&\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
-	    pass "ptype class Bar"
-	}
-    }
+
 }
 
 # Test simple access to class members.
@@ -775,39 +452,29 @@ proc test_enums {} {
 
     # ptype on the object
 
-    set re_class "((struct|class) ClassWithEnum \{${ws}public:|struct ClassWithEnum \{)"
-
-    gdb_test_multiple "ptype obj_with_enum" "ptype obj_with_enum" {
-	-re "type = ${re_class}${ws}(enum |)ClassWithEnum::PrivEnum priv_enum;${ws}int x;$nl\}$nl$gdb_prompt $" {
-	    pass "ptype obj_with_enum"
-	}
-	-re "type = ${re_class}${ws}(enum |)PrivEnum priv_enum;${ws}int x;$nl\}$nl$gdb_prompt $" {
-	    # NOTE: carlton/2003-02-28: One could certainly argue that
-	    # this output is acceptable: PrivEnum is a member of
-	    # ClassWithEnum, so there's no need to explicitly qualify
-	    # its name with "ClassWithEnum::".  The truth, though, is
-	    # that GDB is simply forgetting that PrivEnum is a member
-	    # of ClassWithEnum, so we do that output for a bad reason
-	    # instead of a good reason.  Under stabs, we probably
-	    # can't get this right; under DWARF-2, we can.
-	    #
-	    # gcc 2.95.3 -gdwarf-2
-	    # gcc 3.3.2 -gdwarf-2
-	    kfail "gdb/57" "ptype obj_with_enum"
-	}
-	-re "type = ${re_class}${ws}(enum |)PrivEnum priv_enum;${ws}int x;${ws}ClassWithEnum ?& ?operator ?=\\(ClassWithEnum const ?&\\);${ws}ClassWithEnum\\(ClassWithEnum const ?&\\);${ws}ClassWithEnum\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # gcc 2.95.3 -gstabs+
-	    kfail "gdb/57" "ptype obj_with_enum"
+    # NOTE: carlton/2003-02-28: One could certainly argue that plain
+    # "PrivEnum"
+    # is acceptable: PrivEnum is a member of ClassWithEnum, so
+    # there's no need to explicitly qualify its name with
+    # "ClassWithEnum::".  The truth, though, is that GDB is simply
+    # forgetting that PrivEnum is a member of ClassWithEnum, so we do
+    # that output for a bad reason instead of a good reason.  Under
+    # stabs, we probably can't get this right; under DWARF-2, we can.
+
+    cp_test_ptype_class \
+	"ptype obj_with_enum" "" "class" "ClassWithEnum" \
+	{
+	    { field public "ClassWithEnum::PrivEnum priv_enum;" }
+	    { field public "int x;" }
+	} \
+	"" \
+	{
+	    {
+		"ClassWithEnum::PrivEnum priv_enum;"
+		"PrivEnum priv_enum;"
+		{ setup_kfail "gdb/57" "*-*-*" }
+	    }
 	}
-	-re "type = ${re_class}${ws}(enum |)ClassWithEnum::PrivEnum priv_enum;${ws}int x;${ws}ClassWithEnum ?& ?operator ?=\\(ClassWithEnum const ?&\\);${ws}ClassWithEnum\\(ClassWithEnum const ?&\\);${ws}ClassWithEnum\\((void|)\\);$nl\}$nl$gdb_prompt $" {
-	    # I think this is a PASS, but only carlton knows for sure.
-	    # -- chastain 2003-12-30
-	    #
-	    # gcc 3.3.2 -gstabs+
-	    # gcc HEAD 2003-12-28 21:08:30 UTC -gstabs+
-	    fail "ptype obj_with_enum"
-	}
-    }
 
     # I'll do this test two different ways, because of a parser bug.
     # See PR gdb/1588.