java parse.c broken (cvs version 18.4. 10:00 GMT)

[jarausch@igpm.rwth-aachen.de]

Trying to build today's cvs version I get
gmake[3]: Entering directory `/ARC/ZIP/EGCS/egcs-cvs/objdir/gcc/java'
stage1/xgcc -Bstage1/ -B/usr/LOCAL/mips-sgi-irix6.5/bin/ -c  -DIN_GCC    -W -Wall -Wtraditional -O3 -O  -W -Wall    -I. -I.. -I/usr/people/jarausch/ZIP/EGCS/egcs-cvs/gcc/java -I/usr/people/jarausch/ZIP/EGCS/egcs-cvs/gcc/java/.. -I/usr/people/jarausch/ZIP/EGCS/egcs-cvs/gcc/java/../config -I/usr/people/jarausch/ZIP/EGCS/egcs-cvs/gcc/java/../../include /usr/people/jarausch/ZIP/EGCS/egcs-cvs/gcc/java/parse.c
./parse.y:448:68: warning: `YYTRANSLATE' redefined
./parse.y:446:19: warning: this is the location of the previous definition
./parse.y:451:68: warning: `YYTRANSLATE' redefined
./parse.y:448:19: warning: this is the location of the previous definition
./parse.y:34: unterminated `#else' conditional
./parse.y:33: unterminated `#ifndef' conditional
gmake[3]: *** [parse.o] Error 1
gmake[3]: Leaving directory `/ARC/ZIP/EGCS/egcs-cvs/objdir/gcc/java'
gmake[2]: *** [jc1] Error 2
gmake[2]: Leaving directory `/ARC/ZIP/EGCS/egcs-cvs/objdir/gcc'
gmake[1]: *** [bootstrap] Error 2
gmake[1]: Leaving directory `/ARC/ZIP/EGCS/egcs-cvs/objdir/gcc'
gmake: *** [bootstrap] Error 2


Looking at gcc/java/parse.c
it's indeed strange
lines 520 onwards
<<<<<<< parse.c
<<<<<<< parse.c
#define YYTRANSLATE(x) ((unsigned)(x) <= 363 ? yytranslate[x] : 267)
=======
#define YYTRANSLATE(x) ((unsigned)(x) <= 363 ? yytranslate[x] : 272)
>>>>>>> 1.134
=======
#define YYTRANSLATE(x) ((unsigned)(x) <= 364 ? yytranslate[x] : 272)
>>>>>>> 1.137

Thanks for a hint how to fix.

Helmut Jarausch
Lehrstuhl fuer Numerische Mathematik
Institute of Technology, RWTH Aachen
D 52056 Aachen, Germany