parse.h: Undefine DELAY if it's defined.

Tue Sep  7 15:59:56 1999  Dave Brolley  <brolley@cygnus.com>

	* parse.h: Undefine DELAY if it's defined.
	(PACK,NOPACK,POS): Remove erroneous comments regarding these tokens.
	Also, move them to their proper place alphabetically.

From-SVN: r29175

diff --git a/gcc/ch/ChangeLog b/gcc/ch/ChangeLog
index cff41364970fbc11338119b642e59f17465f1d99..7e4582f81d91263af678c5810c448fa1de67a49d 100644 (file)
--- a/gcc/ch/ChangeLog
+++ b/gcc/ch/ChangeLog
@@ -1,3 +1,9 @@
+Tue Sep  7 15:59:56 1999  Dave Brolley  <brolley@cygnus.com>
+
+       * parse.h: Undefine DELAY if it's defined.
+       (PACK,NOPACK,POS): Remove erroneous comments regarding these tokens.
+       Also, move them to their proper place alphabetically.
+
 1999-09-04  Mark Mitchell  <mark@codesourcery.com>
 
        * Make-lang.in (cc1chill): Depend on ggc-callbacks.o.

diff --git a/gcc/ch/parse.h b/gcc/ch/parse.h
index 6b6b159c498206e831fd29f0b63605f2d97977e3..142b33b3be618a2d49050bb7dfb2bd6d72a8b1e5 100644 (file)
--- a/gcc/ch/parse.h
+++ b/gcc/ch/parse.h
@@ -7,6 +7,12 @@ typedef union {
 } YYSTYPE;
 extern YYSTYPE yylval;
 
+/* DELAY is defined in the standard headers on some platforms like
+   SunOS 4.1.4.  */
+#ifdef DELAY
+#undef DELAY
+#endif
+
 enum terminal
 {
   /*EOF = 0,*/
@@ -29,9 +35,9 @@ enum terminal
   IF, IGNORED_DIRECTIVE, IN, INIT, INOUT, INLINE,
   LC, LOC, LPC, LPRN, LT, LTE,
   MOD, MODULE, MUL, 
-  NAME, NE, NEW, NEWMODE, NONREF, NOT, NUMBER,
+  NAME, NE, NEW, NEWMODE, NONREF, NOPACK, NOT, NUMBER,
   OD, OF, ON, OR, ORIF,
-  PARAMATTR, PERVASIVE, PLUS, POWERSET,
+  PACK, PARAMATTR, PERVASIVE, PLUS, POS, POWERSET,
   PREFIXED, PRIORITY, PROC, PROCESS,
   RANGE, RC, READ, READTEXT, RECEIVE, RECURSIVE, REF, REGION, REM,
   RESULT, RETURN, RETURNS, ROUND, ROW, RPC, RPRN, RPRN_COLON,
@@ -54,18 +60,6 @@ enum terminal
   /* These tokens are recognized, and reported as errors, by the lexer. */
   CONTEXT, REMOTE,
 
-  /* These tokens are recognized in the lexer, and completely
-     ignored. They represent unimplemented features in the
-     current version of GNU CHILL. */
-  NOPACK, PACK,
-
-/* These tokens are recognized in the lexer, and returned
-   as reserved tokens, to prevent users from using them
-   accidently (they'll cause a parser syntax error).  They
-   represent unimplemented features in the current version
-   of GNU CHILL. */
-  POS, /*STEP, ROW,*/
-
 /* This token is passed back to the parser when an the main 
    input file (not a seize file) has  reached end-of-file. */
   END_PASS_1,