diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d3f2663fbc..cd61f71642 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-31  Michael Chastain  <mec.gnu@mindspring.com>
+
+	* gdb.cp/virtfunc.exp: Accept more varieties of ptype output.
+
 2004-07-31  Michael Chastain  <mec.gnu@mindspring.com>
 
 	* gdb.cp/inherit.exp: Accept more varieties of ptype output.
diff --git a/gdb/testsuite/gdb.cp/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp
index bd931a629e..6373d3f5ba 100644
--- a/gdb/testsuite/gdb.cp/virtfunc.exp
+++ b/gdb/testsuite/gdb.cp/virtfunc.exp
@@ -140,7 +140,7 @@ proc test_ptype_of_classes {} {
 	"" "int va;" \
 	"" "" \
 	"VA & operator=\\(VA const ?&\\);${ws}VA\\(VA const ?&\\);${ws}VA\\((void|)\\);" \
-	"VA & operator=\\(VA const ?&\\);${ws}VA\\(VA const ?&\\);${ws}VA\\((void|)\\);" \
+	"(VA & operator=\\(VA const ?&\\);${ws}|)VA\\(VA const ?&\\);${ws}VA\\((void|)\\);" \
 	""
 
     # class VB
@@ -151,7 +151,7 @@ proc test_ptype_of_classes {} {
 	"" "int vb;" \
 	"" "int fvb\\((void|)\\);${ws}virtual int vvb\\((void|)\\);" \
 	"VB & operator=\\(VB const ?&\\);${ws}VB\\(VB const ?&\\);${ws}VB\\((void|)\\);" \
-	"VB & operator=\\(VB const ?&\\);${ws}VB\\(VB const ?&\\);${ws}VB\\((void|)\\);" \
+	"(VB & operator=\\(VB const ?&\\);${ws}|)VB\\(VB const ?&\\);${ws}VB\\((void|)\\);" \
 	""
 
     # class V
@@ -162,7 +162,7 @@ proc test_ptype_of_classes {} {
 	"" "int w;" \
 	"" "int f\\((void|)\\);${ws}virtual int vv\\((void|)\\);" \
 	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
-	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
+	"(V & operator=\\(V const ?&\\);${ws}|)V\\(V const ?&\\);${ws}V\\((void|)\\);" \
 	""
 
     # class A
@@ -173,7 +173,7 @@ proc test_ptype_of_classes {} {
 	"" "int a;" \
 	"public:" "virtual int f\\((void|)\\);" \
 	"A & operator=\\(A const ?&\\);${ws}A\\(int, A const ?&\\);${ws}A\\(int\\);" \
-	"A & operator=\\(A const ?&\\);${ws}A\\(A const ?&\\);${ws}A\\((void|)\\);" \
+	"(A & operator=\\(A const ?&\\);${ws}|)A\\(A const ?&\\);${ws}A\\((void|)\\);" \
 	""
 
     # class B
@@ -184,7 +184,7 @@ proc test_ptype_of_classes {} {
 	"" "int b;" \
 	"public:" "virtual int f\\((void|)\\);" \
 	"B & operator=\\(B const ?&\\);${ws}B\\(int, B const ?&\\);${ws}B\\(int\\);" \
-	"B & operator=\\(B const ?&\\);${ws}B\\(B const ?&\\);${ws}B\\((void|)\\);" \
+	"(B & operator=\\(B const ?&\\);${ws}|)B\\(B const ?&\\);${ws}B\\((void|)\\);" \
 	""
 
     # class C
@@ -195,7 +195,7 @@ proc test_ptype_of_classes {} {
 	"public:" "int c;" \
 	"" "" \
 	"C & operator=\\(C const ?&\\);${ws}C\\(int, C const ?&\\);${ws}C\\(int\\);" \
-	"C & operator=\\(C const ?&\\);${ws}C\\(C const ?&\\);${ws}C\\((void|)\\);" \
+	"(C & operator=\\(C const ?&\\);${ws}|)C\\(C const ?&\\);${ws}C\\((void|)\\);" \
 	""
 
     # class AD
@@ -206,7 +206,7 @@ proc test_ptype_of_classes {} {
 	"" "" \
     	"" "virtual int vg\\((void|)\\);" \
 	"AD & operator=\\(AD const ?&\\);${ws}AD\\(AD const ?&\\);${ws}AD\\((void|)\\);" \
-	"AD & operator=\\(AD const ?&\\);${ws}AD\\(AD const ?&\\);${ws}AD\\((void|)\\);" \
+	"(AD & operator=\\(AD const ?&\\);${ws}|)AD\\(AD const ?&\\);${ws}AD\\((void|)\\);" \
 	""
 
     # class D
@@ -217,7 +217,7 @@ proc test_ptype_of_classes {} {
     	"public:" "int d;" \
 	"" "static void s\\((void|)\\);${ws}virtual int vg\\((void|)\\);${ws}virtual int vd\\((void|)\\);${ws}int fd\\((void|)\\);" \
 	"D & operator=\\(D const ?&\\);${ws}D\\(int, D const ?&\\);${ws}D\\(int\\);" \
-	"D & operator=\\(D const ?&\\);${ws}D\\(D const ?&\\);${ws}D\\((void|)\\);" \
+	"(D & operator=\\(D const ?&\\);${ws}|)D\\(D const ?&\\);${ws}D\\((void|)\\);" \
 	""
 
     # class E
@@ -229,7 +229,7 @@ proc test_ptype_of_classes {} {
 	"public:" "int e;" \
 	"" "virtual int f\\((void|)\\);${ws}virtual int vg\\((void|)\\);${ws}virtual int vv\\((void|)\\);" \
 	"E & operator=\\(E const ?&\\);${ws}E\\(int, E const ?&\\);${ws}E\\(int\\);" \
-	"E & operator=\\(E const ?&\\);${ws}E\\(E const ?&\\);${ws}E\\((void|)\\);" \
+	"(E & operator=\\(E const ?&\\);${ws}|)E\\(E const ?&\\);${ws}E\\((void|)\\);" \
 	""
 
     # An instance of D
@@ -240,7 +240,7 @@ proc test_ptype_of_classes {} {
     	"public:" "int d;" \
 	"" "static void s\\((void|)\\);${ws}virtual int vg\\((void|)\\);${ws}virtual int vd\\((void|)\\);${ws}int fd\\((void|)\\);" \
 	"D & operator=\\(D const ?&\\);${ws}D\\(int, D const ?&\\);${ws}D\\(int\\);" \
-	"D & operator=\\(D const ?&\\);${ws}D\\(D const ?&\\);${ws}D\\((void|)\\);" \
+	"(D & operator=\\(D const ?&\\);${ws}|)D\\(D const ?&\\);${ws}D\\((void|)\\);" \
 	""
 
     # An instance of D *
@@ -251,7 +251,7 @@ proc test_ptype_of_classes {} {
     	"public:" "int d;" \
 	"" "static void s\\((void|)\\);${ws}virtual int vg\\((void|)\\);${ws}virtual int vd\\((void|)\\);${ws}int fd\\((void|)\\);" \
 	"D & operator=\\(D const ?&\\);${ws}D\\(int, D const ?&\\);${ws}D\\(int\\);" \
-	"D & operator=\\(D const ?&\\);${ws}D\\(D const ?&\\);${ws}D\\((void|)\\);" \
+	"(D & operator=\\(D const ?&\\);${ws}|)D\\(D const ?&\\);${ws}D\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of AD *
@@ -263,7 +263,7 @@ proc test_ptype_of_classes {} {
 	"" "" \
     	"" "virtual int vg\\((void|)\\);" \
 	"AD & operator=\\(AD const ?&\\);${ws}AD\\(AD const ?&\\);${ws}AD\\((void|)\\);" \
-	"AD & operator=\\(AD const ?&\\);${ws}AD\\(AD const ?&\\);${ws}AD\\((void|)\\);" \
+	"(AD & operator=\\(AD const ?&\\);${ws}|)AD\\(AD const ?&\\);${ws}AD\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of A
@@ -274,7 +274,7 @@ proc test_ptype_of_classes {} {
 	"" "int a;" \
 	"public:" "virtual int f\\((void|)\\);" \
 	"A & operator=\\(A const ?&\\);${ws}A\\(int, A const ?&\\);${ws}A\\(int\\);" \
-	"A & operator=\\(A const ?&\\);${ws}A\\(A const ?&\\);${ws}A\\((void|)\\);" \
+	"(A & operator=\\(A const ?&\\);${ws}|)A\\(A const ?&\\);${ws}A\\((void|)\\);" \
 	""
 
     # An instance of B
@@ -285,7 +285,7 @@ proc test_ptype_of_classes {} {
 	"" "int b;" \
 	"public:" "virtual int f\\((void|)\\);" \
 	"B & operator=\\(B const ?&\\);${ws}B\\(int, B const ?&\\);${ws}B\\(int\\);" \
-	"B & operator=\\(B const ?&\\);${ws}B\\(B const ?&\\);${ws}B\\((void|)\\);" \
+	"(B & operator=\\(B const ?&\\);${ws}|)B\\(B const ?&\\);${ws}B\\((void|)\\);" \
 	""
 
     # An instance of C
@@ -296,7 +296,7 @@ proc test_ptype_of_classes {} {
 	"public:" "int c;" \
 	"" "" \
 	"C & operator=\\(C const ?&\\);${ws}C\\(int, C const ?&\\);${ws}C\\(int\\);" \
-	"C & operator=\\(C const ?&\\);${ws}C\\(C const ?&\\);${ws}C\\((void|)\\);" \
+	"(C & operator=\\(C const ?&\\);${ws}|)C\\(C const ?&\\);${ws}C\\((void|)\\);" \
 	""
 
     # An instance of D
@@ -307,7 +307,7 @@ proc test_ptype_of_classes {} {
     	"public:" "int d;" \
 	"" "static void s\\((void|)\\);${ws}virtual int vg\\((void|)\\);${ws}virtual int vd\\((void|)\\);${ws}int fd\\((void|)\\);" \
 	"D & operator=\\(D const ?&\\);${ws}D\\(int, D const ?&\\);${ws}D\\(int\\);" \
-	"D & operator=\\(D const ?&\\);${ws}D\\(D const ?&\\);${ws}D\\((void|)\\);" \
+	"(D & operator=\\(D const ?&\\);${ws}|)D\\(D const ?&\\);${ws}D\\((void|)\\);" \
 	""
 
     # An instance of E
@@ -318,7 +318,7 @@ proc test_ptype_of_classes {} {
 	"public:" "int e;" \
 	"" "virtual int f\\((void|)\\);${ws}virtual int vg\\((void|)\\);${ws}virtual int vv\\((void|)\\);" \
 	"E & operator=\\(E const ?&\\);${ws}E\\(int, E const ?&\\);${ws}E\\(int\\);" \
-	"E & operator=\\(E const ?&\\);${ws}E\\(E const ?&\\);${ws}E\\((void|)\\);" \
+	"(E & operator=\\(E const ?&\\);${ws}|)E\\(E const ?&\\);${ws}E\\((void|)\\);" \
 	""
 
     # An instance of V
@@ -329,7 +329,7 @@ proc test_ptype_of_classes {} {
 	"" "int w;" \
 	"" "int f\\((void|)\\);${ws}virtual int vv\\((void|)\\);" \
 	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
-	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
+	"(V & operator=\\(V const ?&\\);${ws}|)V\\(V const ?&\\);${ws}V\\((void|)\\);" \
 	""
 
     # An instance of VB
@@ -340,7 +340,7 @@ proc test_ptype_of_classes {} {
 	"" "int vb;" \
 	"" "int fvb\\((void|)\\);${ws}virtual int vvb\\((void|)\\);" \
 	"VB & operator=\\(VB const ?&\\);${ws}VB\\(VB const ?&\\);${ws}VB\\((void|)\\);" \
-	"VB & operator=\\(VB const ?&\\);${ws}VB\\(VB const ?&\\);${ws}VB\\((void|)\\);" \
+	"(VB & operator=\\(VB const ?&\\);${ws}|)VB\\(VB const ?&\\);${ws}VB\\((void|)\\);" \
 	""
 
     # An instance of A *
@@ -351,7 +351,7 @@ proc test_ptype_of_classes {} {
 	"" "int a;" \
 	"public:" "virtual int f\\((void|)\\);" \
 	"A & operator=\\(A const ?&\\);${ws}A\\(int, A const ?&\\);${ws}A\\(int\\);" \
-	"A & operator=\\(A const ?&\\);${ws}A\\(A const ?&\\);${ws}A\\((void|)\\);" \
+	"(A & operator=\\(A const ?&\\);${ws}|)A\\(A const ?&\\);${ws}A\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of A *
@@ -362,7 +362,7 @@ proc test_ptype_of_classes {} {
 	"" "int a;" \
 	"public:" "virtual int f\\((void|)\\);" \
 	"A & operator=\\(A const ?&\\);${ws}A\\(int, A const ?&\\);${ws}A\\(int\\);" \
-	"A & operator=\\(A const ?&\\);${ws}A\\(A const ?&\\);${ws}A\\((void|)\\);" \
+	"(A & operator=\\(A const ?&\\);${ws}|)A\\(A const ?&\\);${ws}A\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of B *
@@ -373,7 +373,7 @@ proc test_ptype_of_classes {} {
 	"" "int b;" \
 	"public:" "virtual int f\\((void|)\\);" \
 	"B & operator=\\(B const ?&\\);${ws}B\\(int, B const ?&\\);${ws}B\\(int\\);" \
-	"B & operator=\\(B const ?&\\);${ws}B\\(B const ?&\\);${ws}B\\((void|)\\);" \
+	"(B & operator=\\(B const ?&\\);${ws}|)B\\(B const ?&\\);${ws}B\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of D *
@@ -384,7 +384,7 @@ proc test_ptype_of_classes {} {
     	"public:" "int d;" \
 	"" "static void s\\((void|)\\);${ws}virtual int vg\\((void|)\\);${ws}virtual int vd\\((void|)\\);${ws}int fd\\((void|)\\);" \
 	"D & operator=\\(D const ?&\\);${ws}D\\(int, D const ?&\\);${ws}D\\(int\\);" \
-	"D & operator=\\(D const ?&\\);${ws}D\\(D const ?&\\);${ws}D\\((void|)\\);" \
+	"(D & operator=\\(D const ?&\\);${ws}|)D\\(D const ?&\\);${ws}D\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of D *
@@ -395,7 +395,7 @@ proc test_ptype_of_classes {} {
     	"public:" "int d;" \
 	"" "static void s\\((void|)\\);${ws}virtual int vg\\((void|)\\);${ws}virtual int vd\\((void|)\\);${ws}int fd\\((void|)\\);" \
 	"D & operator=\\(D const ?&\\);${ws}D\\(int, D const ?&\\);${ws}D\\(int\\);" \
-	"D & operator=\\(D const ?&\\);${ws}D\\(D const ?&\\);${ws}D\\((void|)\\);" \
+	"(D & operator=\\(D const ?&\\);${ws}|)D\\(D const ?&\\);${ws}D\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of V *
@@ -406,7 +406,7 @@ proc test_ptype_of_classes {} {
 	"" "int w;" \
 	"" "int f\\((void|)\\);${ws}virtual int vv\\((void|)\\);" \
 	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
-	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
+	"(V & operator=\\(V const ?&\\);${ws}|)V\\(V const ?&\\);${ws}V\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of V *
@@ -417,7 +417,7 @@ proc test_ptype_of_classes {} {
 	"" "int w;" \
 	"" "int f\\((void|)\\);${ws}virtual int vv\\((void|)\\);" \
 	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
-	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
+	"(V & operator=\\(V const ?&\\);${ws}|)V\\(V const ?&\\);${ws}V\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of V *
@@ -428,7 +428,7 @@ proc test_ptype_of_classes {} {
 	"" "int w;" \
 	"" "int f\\((void|)\\);${ws}virtual int vv\\((void|)\\);" \
 	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
-	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
+	"(V & operator=\\(V const ?&\\);${ws}|)V\\(V const ?&\\);${ws}V\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of V *
@@ -439,7 +439,7 @@ proc test_ptype_of_classes {} {
 	"" "int w;" \
 	"" "int f\\((void|)\\);${ws}virtual int vv\\((void|)\\);" \
 	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
-	"V & operator=\\(V const ?&\\);${ws}V\\(V const ?&\\);${ws}V\\((void|)\\);" \
+	"(V & operator=\\(V const ?&\\);${ws}|)V\\(V const ?&\\);${ws}V\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of AD *
@@ -450,7 +450,7 @@ proc test_ptype_of_classes {} {
 	"" "" \
     	"" "virtual int vg\\((void|)\\);" \
 	"AD & operator=\\(AD const ?&\\);${ws}AD\\(AD const ?&\\);${ws}AD\\((void|)\\);" \
-	"AD & operator=\\(AD const ?&\\);${ws}AD\\(AD const ?&\\);${ws}AD\\((void|)\\);" \
+	"(AD & operator=\\(AD const ?&\\);${ws}|)AD\\(AD const ?&\\);${ws}AD\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of E *
@@ -461,7 +461,7 @@ proc test_ptype_of_classes {} {
 	"public:" "int e;" \
 	"" "virtual int f\\((void|)\\);${ws}virtual int vg\\((void|)\\);${ws}virtual int vv\\((void|)\\);" \
 	"E & operator=\\(E const ?&\\);${ws}E\\(int, E const ?&\\);${ws}E\\(int\\);" \
-	"E & operator=\\(E const ?&\\);${ws}E\\(E const ?&\\);${ws}E\\((void|)\\);" \
+	"(E & operator=\\(E const ?&\\);${ws}|)E\\(E const ?&\\);${ws}E\\((void|)\\);" \
 	" ?\\*"
 
     # An instance of VB *
@@ -472,7 +472,7 @@ proc test_ptype_of_classes {} {
 	"" "int vb;" \
 	"" "int fvb\\((void|)\\);${ws}virtual int vvb\\((void|)\\);" \
 	"VB & operator=\\(VB const ?&\\);${ws}VB\\(VB const ?&\\);${ws}VB\\((void|)\\);" \
-	"VB & operator=\\(VB const ?&\\);${ws}VB\\(VB const ?&\\);${ws}VB\\((void|)\\);" \
+	"(VB & operator=\\(VB const ?&\\);${ws}|)VB\\(VB const ?&\\);${ws}VB\\((void|)\\);" \
 	" ?\\*"
 }