Further tweaks for Bison-1.875.

2003-01-31  Paolo Carlini  <pcarlini@unitus.it>

	Further	tweaks for Bison-1.875.
	* gcc.dg/cpp/assert_trad2.c: Test for "(parse|syntax) error".
	* gcc.dg/cpp/direct2s.c: Likewise.
	* g++.dg/lookup/using2.C: Likewise.
	* g++.dg/parse/angle-bracket.C: Likewise.
	* g++.dg/template/typename3.C: Likewise.

From-SVN: r62176

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8890a6d8ef6855cce0ae80cce0783482398f647a..1f286694df4c58783d32eb70fde9a51c8a53e27d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-31  Paolo Carlini  <pcarlini@unitus.it>
+
+       Further tweaks for Bison-1.875.
+       * gcc.dg/cpp/assert_trad2.c: Test for "(parse|syntax) error".
+       * gcc.dg/cpp/direct2s.c: Likewise.
+       * g++.dg/lookup/using2.C: Likewise.
+       * g++.dg/parse/angle-bracket.C: Likewise.
+       * g++.dg/template/typename3.C: Likewise.
+
 2003-01-28  Nathan Sidwell  <nathan@codesourcery.com>
 
        PR c++/9433

diff --git a/gcc/testsuite/g++.dg/lookup/using2.C b/gcc/testsuite/g++.dg/lookup/using2.C
index 92f134eaf84b719f8ed5c819ae77527161ac7f85..b20ef0377c2dc4d0d8d8c5e01e627c255aab61a3 100644 (file)
--- a/gcc/testsuite/g++.dg/lookup/using2.C
+++ b/gcc/testsuite/g++.dg/lookup/using2.C
@@ -25,7 +25,7 @@ namespace N
   template<int> void f() {}
 }
 
-using N;             // { dg-error "parse error" "" }
+using N;             // { dg-error "(parse|syntax) error" "" }
 using ::N;           // { dg-error "using-declaration" "" }
 using N::f< 0 >;     // { dg-error "using-declaration" "" }
 
@@ -41,6 +41,6 @@ struct B : A {
 
 struct C : A {
   using A::f<double>; // { dg-error "using-declaration" "" }
-  using A::X<int>;    // { dg-error "parse error" "" }
+  using A::X<int>;    // { dg-error "(parse|syntax) error" "" }
 };
 

diff --git a/gcc/testsuite/g++.dg/parse/angle-bracket.C b/gcc/testsuite/g++.dg/parse/angle-bracket.C
index 9c1f2476c71e417e9c68307175029d595afeb27d..5fad51b44f998f75a35f73cd300c17cf2ebfe73e 100644 (file)
--- a/gcc/testsuite/g++.dg/parse/angle-bracket.C
+++ b/gcc/testsuite/g++.dg/parse/angle-bracket.C
@@ -4,6 +4,6 @@
 
 int main()
 {
-  ( int() > int() );            // { dg-bogus "parse" "" { xfail *-*-* } }
+  ( int() > int() );            // { dg-bogus "parse|syntax" "" { xfail *-*-* } }
   return 0;
 }

diff --git a/gcc/testsuite/g++.dg/template/typename3.C b/gcc/testsuite/g++.dg/template/typename3.C
index 1c573baa0df974554d657b817030d90dbafa4f23..a9a914286a94b3ba9ab6c524d348319bf6eabcfc 100644 (file)
--- a/gcc/testsuite/g++.dg/template/typename3.C
+++ b/gcc/testsuite/g++.dg/template/typename3.C
@@ -3,5 +3,5 @@
 
 template <class A>
 struct B {
- typedef A::C::D E;  // { dg-error "no type|parse error" }
+ typedef A::C::D E;  // { dg-error "no type|(parse|syntax) error" }
 };

diff --git a/gcc/testsuite/gcc.dg/cpp/assert_trad2.c b/gcc/testsuite/gcc.dg/cpp/assert_trad2.c
index 2f6963ec9c0789756b505029f5b3b1276cb3ebb6..63863b1bc75fd5556f701a4efeceba56d72048b1 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/assert_trad2.c
+++ b/gcc/testsuite/gcc.dg/cpp/assert_trad2.c
@@ -11,14 +11,14 @@
 #endif
 
 #if #%         /* { dg-error "an identifier" "test punctuation" } */
-#endif         /* { dg-error "parse error" "" { target *-*-* } 13 } */
+#endif         /* { dg-error "(parse|syntax) error" "" { target *-*-* } 13 } */
 
 #if #12                /* { dg-error "an identifier" "test number" } */
-#endif         /* { dg-error "parse error" "" { target *-*-* } 16 } */
+#endif         /* { dg-error "(parse|syntax) error" "" { target *-*-* } 16 } */
 
 #if #abc
 #error         /* { dg-bogus "error" "test w/o answer" } */
 #endif
 
-#if #abc[def]  /* { dg-error "parse error" "bad syntax" } */
+#if #abc[def]  /* { dg-error "(parse|syntax) error" "bad syntax" } */
 #endif

diff --git a/gcc/testsuite/gcc.dg/cpp/direct2s.c b/gcc/testsuite/gcc.dg/cpp/direct2s.c
index 6c98ecc9a127174577d70f96db30c1f6c1fac7fe..9f0750970b430df1cc8e8f2a19c2644b75bc58e3 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/direct2s.c
+++ b/gcc/testsuite/gcc.dg/cpp/direct2s.c
@@ -35,5 +35,5 @@ void f ()
 #define slashstar /##*
 #define starslash *##/
 
-slashstar starslash /* { dg-error "parse error" "not a comment" } */
+slashstar starslash /* { dg-error "(parse|syntax) error" "not a comment" } */
 /* { dg-warning "does not give" "paste warning(s)" { target *-*-* } 38 } */