From 307568b0976b2e0d0e82956119252e77481f9e1c Mon Sep 17 00:00:00 2001
From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 4 Nov 2004 16:01:39 +0000
Subject: [PATCH] 	* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90064 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/ChangeLog                    | 11 +++++++++++
 gcc/testsuite/gcc.dg/c90-restrict-1.c      |  2 +-
 gcc/testsuite/gcc.dg/c99-arraydecl-2.c     | 12 ++++++------
 gcc/testsuite/gcc.dg/c99-func-2.c          |  2 +-
 gcc/testsuite/gcc.dg/charset/asm2.c        |  4 ++--
 gcc/testsuite/gcc.dg/concat.c              |  8 ++++----
 gcc/testsuite/gcc.dg/cpp/19990413-1.c      |  2 +-
 gcc/testsuite/gcc.dg/cpp/paste4.c          |  2 +-
 gcc/testsuite/gcc.dg/init-desig-obs-1.c    |  4 ++--
 gcc/testsuite/gcc.dg/noncompile/920721-2.c |  2 +-
 gcc/testsuite/gcc.dg/noncompile/930622-2.c |  2 +-
 gcc/testsuite/gcc.dg/noncompile/940112-1.c |  2 +-
 gcc/testsuite/gcc.dg/noncompile/950921-1.c |  4 ++--
 gcc/testsuite/gcc.dg/switch-2.c            |  2 +-
 gcc/testsuite/objc.dg/naming-1.m           |  2 +-
 gcc/testsuite/objc.dg/naming-2.m           |  2 +-
 16 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2e1d71da6e5..fde57d73ec5 100644
--- 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 60d91b830a1..4820831513b 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|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 e2085e1a186..22d6e97be46 100644
--- 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 9dc8b58c673..f3eaaa1fe98 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|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 6726b2da5c9..bfca86c8e96 100644
--- 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 17a80a7e41d..9503368317e 100644
--- 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 22fc5db2218..61d8ad6550d 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|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 4e575c2954e..8ada5674b17 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 "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 4a9df0482b8..52639c86b5b 100644
--- 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 c698b085ea9..b21ff994e61 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|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 3409118f0e2..5e02d8951c4 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|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 953840f6dc8..bb5e0f66c85 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|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 0f6378524ec..f141d510bd7 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|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 29a966d31a7..cedb69f7b99 100644
--- 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 1be7eba664c..3528961bf6d 100644
--- 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 72fc67fc78c..7d8b22e5bd9 100644
--- 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
-- 
2.11.0