* Makefile.in (C_AND_OBJC_OBJS): Remove c-iterate.o.

	(c-iterate.o): Remove target.
	* gcc/c-common.h (enum rid): Remove RID_ITERATOR.
	* gcc/c-decl.c (init_decl_processing): Remove call to init_iterators.
	(finish_decl): Don't handle iterators.
	(grokdeclarator): Likewise.
	* gcc/c-parse.gperf: Remove __iterator and __iterator__ keywords.
	* gcc/c-gperf.h: Regenerated.
	* gcc/c-iterate.c: Removed.
	* gcc/c-lex.c (init_lex): Don't handle iterators.
	* gcc/c-parse.in (primary): Remove pop_iterator_stack call.
	(compstmt_primary_start): Remove push_iterator_stack call.
	(stmt): Don't allow iterator statements.  Replace iterator_expand
	with expand_expr_stmt.
	(all_iter_stmt): Remove.
	(all_iter_stmt_simple): Likewise.
	(all_iter_stmt_with_decl): Likewise.
	* gcc/c-tree.h (ITERATOR_P): Remove.
	(ITERATOR_BOUND_P): Likewise.
	(init_iterators): Remove declaration.
	(iterator_expand): Likewise.
	(iterator_for_loop_start): Likewise.
	(iterator_for_loop_end): Likewise.
	(iterator_for_loop_record): Likewise.
	(push_iterator_stack): Likewise.
	(pop_iterator_stack): Likewise.
	* gcc/c-typeck.c (decl_constant_value): Don't check ITERATOR_P.
	(readonly_warning): Likewise.
	* gcc/tree.h (ITERATOR_BOUND_P): Don't mention it.

	* Make-lang.in (cc1chill): Don't depend on c-iterate.o.

	* gcc.dg/noncompile/930622-2.c: Adjust error message.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@35967 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 136 insertions, 126 deletions

diff --git a/gcc/c-gperf.h b/gcc/c-gperf.h
index 9062af53851..a864d2e30ce 100644
--- a/gcc/c-gperf.h
+++ b/gcc/c-gperf.h
@@ -1,5 +1,5 @@
 /* C code produced by gperf version 2.7.1 (19981006 egcs) */
-/* Command-line: gperf -L C -F , 0, 0 -p -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,$ /work/src/gcc/gcc/c-parse.gperf  */
+/* Command-line: gperf -L C -F , 0, 0 -p -j1 -i 1 -g -o -t -G -N is_reserved_word -k1,3,$ ../../gcc/c-parse.gperf  */
 /* Command-line: gperf -L C -F ', 0, 0' -p -j1 -i 1 -g -o -t -N is_reserved_word -k1,3,$ c-parse.gperf  */ 
 struct resword { const char *name; short token; enum rid rid; };
 #ifdef __GNUC__
@@ -11,12 +11,12 @@ __inline
 #endif
 struct resword *is_reserved_word PARAMS ((const char *, unsigned int));
 
-#define TOTAL_KEYWORDS 94
+#define TOTAL_KEYWORDS 92
 #define MIN_WORD_LENGTH 2
 #define MAX_WORD_LENGTH 20
-#define MIN_HASH_VALUE 4
-#define MAX_HASH_VALUE 249
-/* maximum key range = 246, duplicates = 0 */
+#define MIN_HASH_VALUE 17
+#define MAX_HASH_VALUE 301
+/* maximum key range = 285, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -26,34 +26,34 @@ hash (str, len)
      register const char *str;
      register unsigned int len;
 {
-  static unsigned char asso_values[] =
+  static unsigned short asso_values[] =
     {
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250,  11, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250,   1, 250,  78,  38,  61,
-        1,  37,  47,  70,   1,  13, 250,   4,  94,  37,
-       81,   1, 100, 250,  19,   8,  25,   4,  50,   1,
-        2,   1,   2, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250, 250, 250, 250, 250,
-      250, 250, 250, 250, 250, 250
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 113, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302,   1, 302,  78,  52, 111,
+       34,   9,  46,  59,   1,  20, 302,   1, 118,  17,
+       18,  39,  58, 302,   7,   6,  33,  70,  21,   2,
+        5,   1,   1, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302, 302, 302, 302, 302,
+      302, 302, 302, 302, 302, 302
     };
   register int hval = len;
 
@@ -72,150 +72,160 @@ hash (str, len)
 
 static struct resword wordlist[] =
   {
-    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"do", DO, NORID},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"", 0, 0}, {"", 0, 0},
-    {"id", OBJECTNAME, RID_ID},
-    {"__unbounded", TYPE_QUAL, RID_UNBOUNDED},
-    {"__signed", TYPESPEC, RID_SIGNED},
-    {"__unbounded__", TYPE_QUAL, RID_UNBOUNDED},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"__real__", REALPART, NORID},
     {"__signed__", TYPESPEC, RID_SIGNED},
-    {"unsigned", TYPESPEC, RID_UNSIGNED},
+    {"", 0, 0}, {"", 0, 0},
+    {"__restrict__", TYPE_QUAL, RID_RESTRICT},
+    {"", 0, 0}, {"", 0, 0},
+    {"__extension__", EXTENSION, NORID},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"else", ELSE, NORID},
     {"", 0, 0},
     {"__imag__", IMAGPART, NORID},
     {"", 0, 0},
     {"__inline__", SCSPEC, RID_INLINE},
-    {"", 0, 0},
-    {"__iterator__", SCSPEC, RID_ITERATOR},
     {"switch", SWITCH, NORID},
-    {"__real__", REALPART, NORID},
-    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"__restrict__", TYPE_QUAL, RID_RESTRICT},
-    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"__typeof__", TYPEOF, NORID},
     {"", 0, 0},
-    {"short", TYPESPEC, RID_SHORT},
-    {"@compatibility_alias", ALIAS, NORID},
-    {"@protected", PROTECTED, NORID},
+    {"__volatile__", TYPE_QUAL, RID_VOLATILE},
+    {"while", WHILE, NORID},
     {"", 0, 0},
-    {"__iterator", SCSPEC, RID_ITERATOR},
-    {"inout", TYPE_QUAL, RID_INOUT},
-    {"oneway", TYPE_QUAL, RID_ONEWAY},
-    {"", 0, 0}, {"", 0, 0},
-    {"double", TYPESPEC, RID_DOUBLE},
-    {"__bounded", TYPE_QUAL, RID_BOUNDED},
+    {"__inline", SCSPEC, RID_INLINE},
     {"", 0, 0},
-    {"__bounded__", TYPE_QUAL, RID_BOUNDED},
-    {"__extension__", EXTENSION, NORID},
+    {"in", TYPE_QUAL, RID_IN},
+    {"__volatile", TYPE_QUAL, RID_VOLATILE},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"__typeof__", TYPEOF, NORID},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"__signed", TYPESPEC, RID_SIGNED},
     {"", 0, 0},
-    {"out", TYPE_QUAL, RID_OUT},
     {"__restrict", TYPE_QUAL, RID_RESTRICT},
-    {"while", WHILE, NORID},
-    {"", 0, 0},
     {"struct", STRUCT, NORID},
-    {"__inline", SCSPEC, RID_INLINE},
+    {"", 0, 0},
     {"restrict", TYPE_QUAL, RID_RESTRICT},
-    {"@defs", DEFS, NORID},
-    {"if", IF, NORID},
+    {"oneway", TYPE_QUAL, RID_ONEWAY},
+    {"id", OBJECTNAME, RID_ID},
+    {"", 0, 0}, {"", 0, 0},
     {"sizeof", SIZEOF, NORID},
-    {"__volatile__", TYPE_QUAL, RID_VOLATILE},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"for", FOR, NORID},
+    {"return", RETURN, NORID},
+    {"__bounded__", TYPE_QUAL, RID_BOUNDED},
+    {"extern", SCSPEC, RID_EXTERN},
+    {"break", BREAK, NORID},
+    {"if", IF, NORID},
+    {"", 0, 0}, {"", 0, 0},
+    {"__ptrbase__", PTR_BASE, NORID},
+    {"__ptrvalue__", PTR_VALUE, NORID},
+    {"__ptrextent__", PTR_EXTENT, NORID},
     {"", 0, 0},
-    {"int", TYPESPEC, RID_INT},
+    {"do", DO, NORID},
     {"", 0, 0},
+    {"__ptrbase", PTR_BASE, NORID},
+    {"__ptrvalue", PTR_VALUE, NORID},
     {"void", TYPESPEC, RID_VOID},
-    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"__const__", TYPE_QUAL, RID_CONST},
-    {"__complex", TYPESPEC, RID_COMPLEX},
-    {"__complex__", TYPESPEC, RID_COMPLEX},
-    {"@private", PRIVATE, NORID},
-    {"@selector", SELECTOR, NORID},
     {"", 0, 0},
-    {"float", TYPESPEC, RID_FLOAT},
+    {"register", SCSPEC, RID_REGISTER},
     {"", 0, 0},
-    {"default", DEFAULT, NORID},
-    {"__typeof", TYPEOF, NORID},
-    {"enum", ENUM, NORID},
-    {"@public", PUBLIC, NORID},
-    {"break", BREAK, NORID},
-    {"signed", TYPESPEC, RID_SIGNED},
-    {"else", ELSE, NORID},
-    {"__asm__", ASM_KEYWORD, NORID},
-    {"for", FOR, NORID},
+    {"short", TYPESPEC, RID_SHORT},
     {"", 0, 0},
+    {"__unbounded__", TYPE_QUAL, RID_UNBOUNDED},
     {"__imag", IMAGPART, NORID},
+    {"__asm__", ASM_KEYWORD, NORID},
+    {"__typeof", TYPEOF, NORID},
+    {"int", TYPESPEC, RID_INT},
+    {"", 0, 0},
     {"__alignof__", ALIGNOF, NORID},
     {"", 0, 0},
     {"__attribute__", ATTRIBUTE, NORID},
-    {"__const", TYPE_QUAL, RID_CONST},
+    {"", 0, 0}, {"", 0, 0},
+    {"__bounded", TYPE_QUAL, RID_BOUNDED},
+    {"inout", TYPE_QUAL, RID_INOUT},
     {"", 0, 0},
-    {"in", TYPE_QUAL, RID_IN},
-    {"@end", END, NORID},
-    {"__volatile", TYPE_QUAL, RID_VOLATILE},
+    {"__attribute", ATTRIBUTE, NORID},
+    {"enum", ENUM, NORID},
+    {"__asm", ASM_KEYWORD, NORID},
     {"", 0, 0},
-    {"goto", GOTO, NORID},
-    {"", 0, 0}, {"", 0, 0},
-    {"union", UNION, NORID},
+    {"__ptrextent", PTR_EXTENT, NORID},
     {"", 0, 0},
-    {"__label__", LABEL, NORID},
-    {"bycopy", TYPE_QUAL, RID_BYCOPY},
+    {"signed", TYPESPEC, RID_SIGNED},
+    {"", 0, 0}, {"", 0, 0},
+    {"out", TYPE_QUAL, RID_OUT},
     {"", 0, 0},
-    {"auto", SCSPEC, RID_AUTO},
     {"byref", TYPE_QUAL, RID_BYREF},
-    {"case", CASE, NORID},
-    {"", 0, 0}, {"", 0, 0},
-    {"__ptrbase__", PTR_BASE, NORID},
-    {"__ptrvalue__", PTR_VALUE, NORID},
-    {"__ptrextent__", PTR_EXTENT, NORID},
-    {"register", SCSPEC, RID_REGISTER},
     {"", 0, 0}, {"", 0, 0},
-    {"@class", CLASS, NORID},
-    {"__real", REALPART, NORID},
-    {"__asm", ASM_KEYWORD, NORID},
-    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"__builtin_va_arg", VA_ARG, NORID},
+    {"union", UNION, NORID},
     {"", 0, 0},
-    {"__attribute", ATTRIBUTE, NORID},
-    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"return", RETURN, NORID},
+    {"asm", ASM_KEYWORD, NORID},
+    {"__unbounded", TYPE_QUAL, RID_UNBOUNDED},
     {"", 0, 0},
-    {"@protocol", PROTOCOL, NORID},
+    {"unsigned", TYPESPEC, RID_UNSIGNED},
+    {"double", TYPESPEC, RID_DOUBLE},
+    {"default", DEFAULT, NORID},
+    {"", 0, 0},
+    {"__const__", TYPE_QUAL, RID_CONST},
+    {"float", TYPESPEC, RID_FLOAT},
+    {"__complex__", TYPESPEC, RID_COMPLEX},
+    {"", 0, 0},
+    {"__complex", TYPESPEC, RID_COMPLEX},
+    {"", 0, 0},
+    {"__builtin_va_arg", VA_ARG, NORID},
+    {"__label__", LABEL, NORID},
+    {"case", CASE, NORID},
     {"", 0, 0},
+    {"__real", REALPART, NORID},
+    {"@defs", DEFS, NORID},
     {"__alignof", ALIGNOF, NORID},
-    {"@encode", ENCODE, NORID},
-    {"__ptrextent", PTR_EXTENT, NORID},
+    {"goto", GOTO, NORID},
     {"", 0, 0},
-    {"@interface", INTERFACE, NORID},
+    {"@private", PRIVATE, NORID},
+    {"@selector", SELECTOR, NORID},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"@implementation", IMPLEMENTATION, NORID},
+    {"typeof", TYPEOF, NORID},
+    {"typedef", SCSPEC, RID_TYPEDEF},
+    {"", 0, 0},
+    {"continue", CONTINUE, NORID},
+    {"@encode", ENCODE, NORID},
     {"", 0, 0}, {"", 0, 0},
-    {"__ptrbase", PTR_BASE, NORID},
-    {"__ptrvalue", PTR_VALUE, NORID},
-    {"extern", SCSPEC, RID_EXTERN},
+    {"@interface", INTERFACE, NORID},
+    {"", 0, 0},
+    {"__const", TYPE_QUAL, RID_CONST},
     {"inline", SCSPEC, RID_INLINE},
-    {"", 0, 0}, {"", 0, 0},
-    {"static", SCSPEC, RID_STATIC},
+    {"auto", SCSPEC, RID_AUTO},
     {"", 0, 0},
-    {"asm", ASM_KEYWORD, NORID},
+    {"volatile", TYPE_QUAL, RID_VOLATILE},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"char", TYPESPEC, RID_CHAR},
-    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"@implementation", IMPLEMENTATION, NORID},
+    {"@protected", PROTECTED, NORID},
+    {"", 0, 0}, {"", 0, 0},
     {"const", TYPE_QUAL, RID_CONST},
-    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"typeof", TYPEOF, NORID},
-    {"typedef", SCSPEC, RID_TYPEDEF},
-    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"continue", CONTINUE, NORID},
     {"", 0, 0},
-    {"volatile", TYPE_QUAL, RID_VOLATILE},
+    {"@end", END, NORID},
+    {"bycopy", TYPE_QUAL, RID_BYCOPY},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"@compatibility_alias", ALIAS, NORID},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"", 0, 0}, {"", 0, 0},
+    {"long", TYPESPEC, RID_LONG},
+    {"char", TYPESPEC, RID_CHAR},
+    {"static", SCSPEC, RID_STATIC},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
     {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
-    {"long", TYPESPEC, RID_LONG}
+    {"@class", CLASS, NORID},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"@protocol", PROTOCOL, NORID},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0}, {"", 0, 0},
+    {"@public", PUBLIC, NORID}
   };
 
 #ifdef __GNUC__