* ldgram.y: Move include of ldlex.h back with other includes.

	* ldlex.h (input_type): Don't initialize enum constants to
	particular values.
	* ldlex.l: Use a switch to return the right token based on
	input_type, rather than knowing that input_type has a value based
	on a token type.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index abcef5c89234cc998b69807ab178e3d8fbfd4d64..b6667f4144a744e14d6875b8688572e80b04896f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,12 @@
 Fri Feb 25 19:12:03 1994  Ian Lance Taylor  (ian@cygnus.com)
 
+       * ldgram.y: Move include of ldlex.h back with other includes.
+       * ldlex.h (input_type): Don't initialize enum constants to
+       particular values.
+       * ldlex.l: Use a switch to return the right token based on
+       input_type, rather than knowing that input_type has a value based
+       on a token type.
+
        * ldgram.y (dirlist_ptr): Removed; not used.
        * lexsup.c: Include ldver.h.
        * Makefile.in: Rebuilt dependencies.

diff --git a/ld/ldgram.y b/ld/ldgram.y
index 91875791273ce923815e35ed147eb7a1115cfee8..c4b83b3274daaeb8110b0f8f5303ced32897e49e 100644 (file)
--- a/ld/ldgram.y
+++ b/ld/ldgram.y
@@ -37,6 +37,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "ldmisc.h"
 #include "ldmain.h"
 #include "mri.h"
+#include "ldlex.h"
 
 #define YYDEBUG 1
 
@@ -111,10 +112,6 @@ static int error_index;
 %token FORMAT PUBLIC DEFSYMEND BASE ALIAS TRUNCATE REL
 %token INPUT_SCRIPT INPUT_MRI_SCRIPT INPUT_DEFSYM
 
-%{
-/* For byacc, this has to come after INPUT_SCRIPT et al. are defined.  */
-#include "ldlex.h"
-%}
 %%
 
 file: