From 6232b6c4c5a609ba7b2ee713ce563cf83e67835c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 26 Feb 1994 03:22:26 +0000 Subject: [PATCH] * 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. --- ld/ChangeLog | 7 +++++++ ld/ldgram.y | 5 +---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index abcef5c8923..b6667f4144a 100644 --- 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 91875791273..c4b83b3274d 100644 --- 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: -- 2.30.2