c90-restrict-1.c, [...]: Adjust expected messages for new parser.

	* gcc.dg/c90-restrict-1.c, gcc.dg/c99-arraydecl-2.c,
	gcc.dg/c99-func-2.c, gcc.dg/charset/asm2.c, gcc.dg/concat.c,
	gcc.dg/cpp/19990413-1.c, gcc.dg/cpp/paste4.c,
	gcc.dg/init-desig-obs-1.c, gcc.dg/noncompile/920721-2.c,
	gcc.dg/noncompile/930622-2.c, gcc.dg/noncompile/940112-1.c,
	gcc.dg/noncompile/950921-1.c, gcc.dg/switch-2.c,
	objc.dg/naming-1.m, objc.dg/naming-2.m: Adjust expected messages
	for new parser.

From-SVN: r90064

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2e1d71da6e567294ce56ca6f3ed47d462358052d..fde57d73ec569271e91f85b5c57a70059c77f5e2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2004-11-04  Joseph S. Myers  <joseph@codesourcery.com>
+
+       * gcc.dg/c90-restrict-1.c, gcc.dg/c99-arraydecl-2.c,
+       gcc.dg/c99-func-2.c, gcc.dg/charset/asm2.c, gcc.dg/concat.c,
+       gcc.dg/cpp/19990413-1.c, gcc.dg/cpp/paste4.c,
+       gcc.dg/init-desig-obs-1.c, gcc.dg/noncompile/920721-2.c,
+       gcc.dg/noncompile/930622-2.c, gcc.dg/noncompile/940112-1.c,
+       gcc.dg/noncompile/950921-1.c, gcc.dg/switch-2.c,
+       objc.dg/naming-1.m, objc.dg/naming-2.m: Adjust expected messages
+       for new parser.
+
 2004-11-04  Richard Sandiford  <rsandifo@redhat.com>
 
        PR target/15342

diff --git a/gcc/testsuite/gcc.dg/c90-restrict-1.c b/gcc/testsuite/gcc.dg/c90-restrict-1.c
index 60d91b830a10e40c1db5c3d744876bb300c9fea6..4820831513b4f0599e287b0d206ccf44fdc458af 100644 (file)
--- 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|syntax) error|no type" "restrict not in C90" { target *-*-* } 6 } */
+/* { dg-error "parse error|syntax error|expected|no type" "restrict not in C90" { target *-*-* } 6 } */

diff --git a/gcc/testsuite/gcc.dg/c99-arraydecl-2.c b/gcc/testsuite/gcc.dg/c99-arraydecl-2.c
index e2085e1a186310cf631484df5595d1a961646096..22d6e97be46fd6bab2b50c41b9944017d3d7ebf6 100644 (file)
--- a/gcc/testsuite/gcc.dg/c99-arraydecl-2.c
+++ b/gcc/testsuite/gcc.dg/c99-arraydecl-2.c
@@ -7,10 +7,10 @@
 void
 foo (void)
 {
-  int a[2, 3]; /* { dg-error "parse|syntax" "bad array declarator" } */
-  void b(int x[2, 3]); /* { dg-error "parse|syntax" "bad array declarator" } */
-  void c(int [2, 3]); /* { dg-error "parse|syntax" "bad array declarator" } */
-  void d(int *x[restrict 2, 3]); /* { dg-error "parse|syntax" "bad array declarator" } */
-  void e(int *x[static restrict 2, 3]); /* { dg-error "parse|syntax" "bad array declarator" } */
-  void f(int *x[restrict static 2, 3]); /* { dg-error "parse|syntax" "bad array declarator" } */
+  int a[2, 3]; /* { dg-error "parse|syntax|expected" "bad array declarator" } */
+  void b(int x[2, 3]); /* { dg-error "parse|syntax|expected" "bad array declarator" } */
+  void c(int [2, 3]); /* { dg-error "parse|syntax|expected" "bad array declarator" } */
+  void d(int *x[restrict 2, 3]); /* { dg-error "parse|syntax|expected" "bad array declarator" } */
+  void e(int *x[static restrict 2, 3]); /* { dg-error "parse|syntax|expected" "bad array declarator" } */
+  void f(int *x[restrict static 2, 3]); /* { dg-error "parse|syntax|expected" "bad array declarator" } */
 }

diff --git a/gcc/testsuite/gcc.dg/c99-func-2.c b/gcc/testsuite/gcc.dg/c99-func-2.c
index 9dc8b58c6739ddefd234080d2a500ea061f5e1f6..f3eaaa1fe98880e465f6350890b9bb0ce2013849 100644 (file)
--- 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|syntax) error" "before string constant" } */
+  __func__ "foo"; /* { dg-error "parse error|syntax error|expected" "before string constant" } */
 }

diff --git a/gcc/testsuite/gcc.dg/charset/asm2.c b/gcc/testsuite/gcc.dg/charset/asm2.c
index 6726b2da5c969b9954aa8141db5f01e0f5709d30..bfca86c8e96d57c0203d80c04e3e7ad540d99a66 100644 (file)
--- a/gcc/testsuite/gcc.dg/charset/asm2.c
+++ b/gcc/testsuite/gcc.dg/charset/asm2.c
@@ -3,13 +3,13 @@
    the string "foobar" should be translated.  */
 /* { dg-do compile } */
 /* { dg-require-iconv "IBM-1047" } */
-asm (not_a_string); /* { dg-error "(parse|syntax) error before" "not_a_string" } */
+asm (not_a_string); /* { dg-error "(parse error|syntax error|expected string literal) before" "not_a_string" } */
 char x[] = "foobar";
 
 void foo (void)
 {
   char *y;
-  asm (not_a_string2); /* { dg-error "(parse|syntax) error before" "not_a_string" } */
+  asm (not_a_string2); /* { dg-error "(parse error|syntax error|expected string literal) before" "not_a_string" } */
 
 #define FOO "walrus"
   y = FOO;

diff --git a/gcc/testsuite/gcc.dg/concat.c b/gcc/testsuite/gcc.dg/concat.c
index 17a80a7e41dbefd9173948a8b6412522bfadda24..9503368317ed394c2f089ce8b752ac9f98f251e3 100644 (file)
--- a/gcc/testsuite/gcc.dg/concat.c
+++ b/gcc/testsuite/gcc.dg/concat.c
@@ -8,9 +8,9 @@
 
 void foo ()
 {
-  char s1[] = __FUNCTION__".";      /* { dg-error "(parse|syntax|invalid)" } */
-  char s2[] = __PRETTY_FUNCTION__".";/* { dg-error "(parse|syntax|invalid)" } */
-  char s3[] = "."__FUNCTION__;      /* { dg-error "(parse|syntax|invalid)" } */
-  char s4[] = "."__PRETTY_FUNCTION__;/* { dg-error "(parse|syntax|invalid)" } */
+  char s1[] = __FUNCTION__".";      /* { dg-error "(parse|syntax|expected|invalid)" } */
+  char s2[] = __PRETTY_FUNCTION__".";/* { dg-error "(parse|syntax|expected|invalid)" } */
+  char s3[] = "."__FUNCTION__;      /* { dg-error "(parse|syntax|expected|invalid)" } */
+  char s4[] = "."__PRETTY_FUNCTION__;/* { dg-error "(parse|syntax|expected|invalid)" } */
   char s5[] = "."".";                /* No error.  */
 }

diff --git a/gcc/testsuite/gcc.dg/cpp/19990413-1.c b/gcc/testsuite/gcc.dg/cpp/19990413-1.c
index 22fc5db22189352b563287395dfe06a9cc6421e6..61d8ad6550d5482c5346eba1b592a1cc6c556419 100644 (file)
--- 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|syntax) error" "error on this line" { target *-*-* } { 12 } } */ 
+  else;  /* { dg-error "parse error|syntax error|expected" "error on this line" { target *-*-* } { 12 } } */ 
 }

diff --git a/gcc/testsuite/gcc.dg/cpp/paste4.c b/gcc/testsuite/gcc.dg/cpp/paste4.c
index 4e575c2954e823375e2667c5e92d1b1f75a41d3f..8ada5674b17f1d96b17a3d0c24e334c07c387c9f 100644 (file)
--- 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 "exponent|(parse|syntax) error" } */
+  double d = glue (1.0e, +1); /* { dg-error "exponent|parse error|syntax error|expected" } */
   return 0;
 }

diff --git a/gcc/testsuite/gcc.dg/init-desig-obs-1.c b/gcc/testsuite/gcc.dg/init-desig-obs-1.c
index 4a9df0482b8cc59f57db16a9df0dfb47b575cf95..52639c86b5be17b2f1b5cb884cf939a5c5446f78 100644 (file)
--- a/gcc/testsuite/gcc.dg/init-desig-obs-1.c
+++ b/gcc/testsuite/gcc.dg/init-desig-obs-1.c
@@ -12,8 +12,8 @@ int x0[] = { [0] = 1 };
 int x1[] = { [0] 1 };
 
 /* Invalid syntax: multiple designators without "=".  */
-int x2[2][2] = { [0][0] 1 }; /* { dg-error "(syntax|parse) error" } */
+int x2[2][2] = { [0][0] 1 }; /* { dg-error "syntax error|parse error|expected" } */
 
 
 /* Invalid syntax: C99-style structure designator without "=".  */
-struct s s2 = { .a 1 }; /* { dg-error "(syntax|parse) error" } */
+struct s s2 = { .a 1 }; /* { dg-error "syntax error|parse error|expected" } */

diff --git a/gcc/testsuite/gcc.dg/noncompile/920721-2.c b/gcc/testsuite/gcc.dg/noncompile/920721-2.c
index c698b085ea98205951f0267deee1a9344b3fe341..b21ff994e615f27c35e95e0e5804526e7b590f20 100644 (file)
--- 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|syntax) error" } */
+  s==5?1 n=1;          /* { dg-error "parse error|syntax error|expected" } */
 }

diff --git a/gcc/testsuite/gcc.dg/noncompile/930622-2.c b/gcc/testsuite/gcc.dg/noncompile/930622-2.c
index 3409118f0e2b991ae447e5f0c7d545054dbf5425..5e02d8951c4c379ca79a7e24849a5c78b9845f36 100644 (file)
--- 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|syntax" } */
+  for (i--)    /* { dg-error "parse|syntax|expected" } */
     ;
 }

diff --git a/gcc/testsuite/gcc.dg/noncompile/940112-1.c b/gcc/testsuite/gcc.dg/noncompile/940112-1.c
index 953840f6dc81cdddfe9c3ff2e103172f4e47c6ba..bb5e0f66c85c571e135d99a799eb5c3c49eaeddc 100644 (file)
--- 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|syntax) error" } */
+}      /* { dg-error "parse error|syntax error|expected" } */

diff --git a/gcc/testsuite/gcc.dg/noncompile/950921-1.c b/gcc/testsuite/gcc.dg/noncompile/950921-1.c
index 0f6378524ec4a8271694675d0d011a94613cf0fd..f141d510bd783c63a412c03c5aeab63b65afe835 100644 (file)
--- 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|syntax) error" } */
+  a = (X) 0,   /* { dg-error "undeclared|not integer|parse error|syntax error|expected" } */
   b
 } c;
 
 typedef enum
 {
-  d = (X) 0    /* { dg-error "undeclared|not integer|(parse|syntax) error" } */
+  d = (X) 0    /* { dg-error "undeclared|not integer|parse error|syntax error|expected" } */
 } e;

diff --git a/gcc/testsuite/gcc.dg/switch-2.c b/gcc/testsuite/gcc.dg/switch-2.c
index 29a966d31a7d91c42d8a37ce5531c4a7d3ac9e77..cedb69f7b996b4dc92c43c644ef296176a26551c 100644 (file)
--- a/gcc/testsuite/gcc.dg/switch-2.c
+++ b/gcc/testsuite/gcc.dg/switch-2.c
@@ -7,4 +7,4 @@ int foo(int i)
   switch (i)
     case 3:
       return 1,
-}  /* { dg-error "(parse|syntax) error" } */
+}  /* { dg-error "parse error|syntax error|expected" } */

diff --git a/gcc/testsuite/objc.dg/naming-1.m b/gcc/testsuite/objc.dg/naming-1.m
index 1be7eba664c6df6bfbd81a49621eefb0d932e9b6..3528961bf6d591bfcdbcd2d5885e110a3a43d7cc 100644 (file)
--- a/gcc/testsuite/objc.dg/naming-1.m
+++ b/gcc/testsuite/objc.dg/naming-1.m
@@ -15,5 +15,5 @@ void foo(void)
 void bar(void)
 {
        View *view;     /* ok */
-       View = 1;       /* { dg-error "(parse|syntax) error" } */
+       View = 1;       /* { dg-error "parse error|syntax error|expected" } */
 }

diff --git a/gcc/testsuite/objc.dg/naming-2.m b/gcc/testsuite/objc.dg/naming-2.m
index 72fc67fc78cb80b1bc19a5a7bcac4045f0e04d9e..7d8b22e5bd9e91daf8d31ba7eb4ce21c705d553d 100644 (file)
--- a/gcc/testsuite/objc.dg/naming-2.m
+++ b/gcc/testsuite/objc.dg/naming-2.m
@@ -4,7 +4,7 @@
 
 @interface Foo
 @end
-float Foo;  /* { dg-error "(parse|syntax) error" } */
+float Foo;  /* { dg-error "parse error|syntax error|expected" } */
 
 double Bar;
 @interface Bar