From: Paolo Carlini <pcarlini@unitus.it>
Date: Sat, 25 Jan 2003 15:36:33 +0000 (+0100)
Subject: Tweaks for Bison-1.875.
X-Git-Tag: releases/gcc-3.2.2~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ceab2d4df6cdb284da3b806229f4d92ae8c4af20;p=thirdparty%2Fgcc.git

Tweaks for Bison-1.875.

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

	Tweaks for Bison-1.875. From the NEWS file:
 	"- `parse error' -> `syntax error'
	Bison now uniformly uses the term `syntax error'"
	* gcc.dg/cpp/19990413-1.c: Test for "(parse|syntax) error".
	* gcc.dg/cpp/digraph2.c: Likewise.
	* gcc.dg/cpp/direct2.c: Likewise.
	* gcc.dg/cpp/paste4.c: Likewise.
	* gcc.dg/c90-restrict-1.c: Likewise.
	* gcc.dg/c99-func-2.c: Likewise.
	* gcc.dg/noncompile/920721-2.c: Likewise.
	* gcc.dg/noncompile/930622-2.c: Likewise.
	* gcc.dg/noncompile/940112-1.c: Likewise.
	* gcc.dg/noncompile/950921-1.c: Likewise.
	* gcc.dg/noncompile/951123-1.c: Likewise.
	* gcc.dg/noncompile/971104-1.c: Likewise.
	* gcc.dg/noncompile/990416-1.c: Likewise.

From-SVN: r61775
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d837136964f5..02dcd76dd57e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2003-01-25  Paolo Carlini  <pcarlini@unitus.it>
+
+	Tweaks for Bison-1.875. From the NEWS file:
+ 	"- `parse error' -> `syntax error'
+	Bison now uniformly uses the term `syntax error'"
+	* gcc.dg/cpp/19990413-1.c: Test for "(parse|syntax) error".
+	* gcc.dg/cpp/digraph2.c: Likewise.
+	* gcc.dg/cpp/direct2.c: Likewise.
+	* gcc.dg/cpp/paste4.c: Likewise.
+	* gcc.dg/c90-restrict-1.c: Likewise.
+	* gcc.dg/c99-func-2.c: Likewise.
+	* gcc.dg/noncompile/920721-2.c: Likewise.
+	* gcc.dg/noncompile/930622-2.c: Likewise.
+	* gcc.dg/noncompile/940112-1.c: Likewise.
+	* gcc.dg/noncompile/950921-1.c: Likewise.
+	* gcc.dg/noncompile/951123-1.c: Likewise.
+	* gcc.dg/noncompile/971104-1.c: Likewise.
+	* gcc.dg/noncompile/990416-1.c: Likewise.
+
 2003-01-22  Mark Mitchell  <mark@codesourcery.com>
 
 	PR c++/9328
diff --git a/gcc/testsuite/gcc.dg/c90-restrict-1.c b/gcc/testsuite/gcc.dg/c90-restrict-1.c
index 17af58b4b588..60d91b830a10 100644
--- a/gcc/testsuite/gcc.dg/c90-restrict-1.c
+++ b/gcc/testsuite/gcc.dg/c90-restrict-1.c
@@ -4,4 +4,4 @@
 /* { dg-options "-std=iso9899:1990 -pedantic-errors" } */
 
 char *restrict foo; /* { dg-bogus "warning" "warning in place of error" } */
-/* { dg-error "parse error|no type" "restrict not in C90" { target *-*-* } 6 } */
+/* { dg-error "(parse|syntax) error|no type" "restrict not in C90" { target *-*-* } 6 } */
diff --git a/gcc/testsuite/gcc.dg/c99-func-2.c b/gcc/testsuite/gcc.dg/c99-func-2.c
index d6a6f243f912..9dc8b58c6739 100644
--- a/gcc/testsuite/gcc.dg/c99-func-2.c
+++ b/gcc/testsuite/gcc.dg/c99-func-2.c
@@ -6,5 +6,5 @@
 void
 foo (void)
 {
-  __func__ "foo"; /* { dg-error "parse error" "before string constant" } */
+  __func__ "foo"; /* { dg-error "(parse|syntax) error" "before string constant" } */
 }
diff --git a/gcc/testsuite/gcc.dg/cpp/19990413-1.c b/gcc/testsuite/gcc.dg/cpp/19990413-1.c
index 9abddb942fd3..22fc5db22189 100644
--- a/gcc/testsuite/gcc.dg/cpp/19990413-1.c
+++ b/gcc/testsuite/gcc.dg/cpp/19990413-1.c
@@ -9,5 +9,5 @@ func(void)
 {
   FOO(i
       = 4)
-  else;  /* { dg-error "parse error" "error on this line" { target *-*-* } { 12 } } */ 
+  else;  /* { dg-error "(parse|syntax) error" "error on this line" { target *-*-* } { 12 } } */ 
 }
diff --git a/gcc/testsuite/gcc.dg/cpp/digraph2.c b/gcc/testsuite/gcc.dg/cpp/digraph2.c
index e67ec53878b4..cac4e256b0a8 100644
--- a/gcc/testsuite/gcc.dg/cpp/digraph2.c
+++ b/gcc/testsuite/gcc.dg/cpp/digraph2.c
@@ -9,7 +9,7 @@
 int main (int argc, char *argv[])
 {
   return 0;
-%>				/* { dg-error "parse error" } */
+%>				/* { dg-error "(parse|syntax) error" } */
 
 /* Place this after main () so we get to test both the compiler above
    and the preprocessor below.  */
diff --git a/gcc/testsuite/gcc.dg/cpp/direct2.c b/gcc/testsuite/gcc.dg/cpp/direct2.c
index d6dc1088c374..52d1e31f45f6 100644
--- a/gcc/testsuite/gcc.dg/cpp/direct2.c
+++ b/gcc/testsuite/gcc.dg/cpp/direct2.c
@@ -33,5 +33,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 *-*-* } 36 } */
diff --git a/gcc/testsuite/gcc.dg/cpp/paste4.c b/gcc/testsuite/gcc.dg/cpp/paste4.c
index 6f9d9d1253a0..a291dea666f6 100644
--- a/gcc/testsuite/gcc.dg/cpp/paste4.c
+++ b/gcc/testsuite/gcc.dg/cpp/paste4.c
@@ -11,6 +11,6 @@
 
 int main ()
 {
-  double d = glue (1.0e, +1); /* { dg-error "floating const|parse error" } */
+  double d = glue (1.0e, +1); /* { dg-error "floating const|(parse|syntax) error" } */
   return 0;
 }
diff --git a/gcc/testsuite/gcc.dg/noncompile/920721-2.c b/gcc/testsuite/gcc.dg/noncompile/920721-2.c
index 9ec223c3af46..c698b085ea98 100644
--- a/gcc/testsuite/gcc.dg/noncompile/920721-2.c
+++ b/gcc/testsuite/gcc.dg/noncompile/920721-2.c
@@ -2,5 +2,5 @@ void f(int n)
 {
 int s;
 for(s=0;s<n;s++)
-  s==5?1 n=1;		/* { dg-error "parse error" } */
+  s==5?1 n=1;		/* { dg-error "(parse|syntax) error" } */
 }
diff --git a/gcc/testsuite/gcc.dg/noncompile/930622-2.c b/gcc/testsuite/gcc.dg/noncompile/930622-2.c
index a1450afbf1fc..3409118f0e2b 100644
--- a/gcc/testsuite/gcc.dg/noncompile/930622-2.c
+++ b/gcc/testsuite/gcc.dg/noncompile/930622-2.c
@@ -1,6 +1,6 @@
 f ()
 {
   int i;
-  for (i--)	/* { dg-error "parse" } */
+  for (i--)	/* { dg-error "parse|syntax" } */
     ;
 }
diff --git a/gcc/testsuite/gcc.dg/noncompile/940112-1.c b/gcc/testsuite/gcc.dg/noncompile/940112-1.c
index 24780df554e3..953840f6dc81 100644
--- a/gcc/testsuite/gcc.dg/noncompile/940112-1.c
+++ b/gcc/testsuite/gcc.dg/noncompile/940112-1.c
@@ -4,4 +4,4 @@ f (int x)
   double e = 1;
   e = 1;
   return (e)
-}	/* { dg-error "parse error" } */
+}	/* { dg-error "(parse|syntax) error" } */
diff --git a/gcc/testsuite/gcc.dg/noncompile/950921-1.c b/gcc/testsuite/gcc.dg/noncompile/950921-1.c
index ed44338fcd1a..0f6378524ec4 100644
--- a/gcc/testsuite/gcc.dg/noncompile/950921-1.c
+++ b/gcc/testsuite/gcc.dg/noncompile/950921-1.c
@@ -1,10 +1,10 @@
 typedef enum
 {
-  a = (X) 0,	/* { dg-error "undeclared|not integer|parse error" } */
+  a = (X) 0,	/* { dg-error "undeclared|not integer|(parse|syntax) error" } */
   b
 } c;
 
 typedef enum
 {
-  d = (X) 0	/* { dg-error "undeclared|not integer|parse error" } */
+  d = (X) 0	/* { dg-error "undeclared|not integer|(parse|syntax) error" } */
 } e;
diff --git a/gcc/testsuite/gcc.dg/noncompile/951123-1.c b/gcc/testsuite/gcc.dg/noncompile/951123-1.c
index 9a5a3215ed6e..787cf1e94fad 100644
--- a/gcc/testsuite/gcc.dg/noncompile/951123-1.c
+++ b/gcc/testsuite/gcc.dg/noncompile/951123-1.c
@@ -1,2 +1,2 @@
 struct S { int a; int b[2]; };
-struct S x = { 0, [0]; };    /* { dg-error "array index|near|parse" } */
+struct S x = { 0, [0]; };    /* { dg-error "array index|near|(parse|syntax)" } */
diff --git a/gcc/testsuite/gcc.dg/noncompile/971104-1.c b/gcc/testsuite/gcc.dg/noncompile/971104-1.c
index a20b17add586..ed7cb523c3b2 100644
--- a/gcc/testsuite/gcc.dg/noncompile/971104-1.c
+++ b/gcc/testsuite/gcc.dg/noncompile/971104-1.c
@@ -23,6 +23,6 @@ static void up(int sem){
     printf("%s had processes sleeping on it!\n",
     ({ "MUTEX     ", "BARB_SEM 1", "BARB_SEM 2", "CUST_SEM 1",
        "CUST_SEM 2", "WAIT_SEM 1", "WAIT_SEM 2", "WAIT_SEM 3",
-       "WAIT_SEM 4"}	 /* { dg-error "parse error" } */
+       "WAIT_SEM 4"}	 /* { dg-error "(parse|syntax) error" } */
 	[( sb.sem_num )]) );
 }
diff --git a/gcc/testsuite/gcc.dg/noncompile/990416-1.c b/gcc/testsuite/gcc.dg/noncompile/990416-1.c
index 1e874871de2b..6b69ead2fe16 100644
--- a/gcc/testsuite/gcc.dg/noncompile/990416-1.c
+++ b/gcc/testsuite/gcc.dg/noncompile/990416-1.c
@@ -1,7 +1,7 @@
 typedef int word_type;
    
 static void
-copy_reg (unsigned int reg, frame_state *udata,	/* { dg-error "parse" } */
+copy_reg (unsigned int reg, frame_state *udata,	/* { dg-error "parse|syntax" } */
 	  frame_state *target_udata)
 {  
   word_type *preg = get_reg_addr (reg, udata, 0);	/* { dg-error "undeclared|function|without a cast" } */