gcc/cp/parse.y & gcc/cp/decl.h: Conflict on TYPENAME

Akim Demaille akim@epita.fr
Mon Jun 10 07:38:00 GMT 2002

The parser declares token TYPENAME and decl.h declares an enum
including TYPENAME.  Several files include both, what results in a
dangerous clash.

Given the risks, I suggest that the parser slowly moves to using the
`tFOO' convention, so, amongst the various possible changes, I
preferred this one: instead of token TYPENAME, using token tTYPENAME.
If you have another preference, please tell me, I'll adjust the patch

I do have tried to check-g++, but I have this bizarre result:

| src/gcc/gcc % make check-g++                                     nostromo Err 2
| (rootme=`${PWDCMD-pwd}`; export rootme; \
| srcdir=`cd .; ${PWDCMD-pwd}` ; export srcdir ; \
| cd testsuite; \
| EXPECT=`if [ -f ${rootme}/../expect/expect ] ; then echo ${rootme}/../expect/expect ; else echo expect ; fi` ; export EXPECT ; \
| if [ -f ${rootme}/../expect/expect ] ; then  \
|    TCL_LIBRARY=`cd .. ; cd ./../tcl/library ; ${PWDCMD-pwd}` ; \
|     export TCL_LIBRARY ; fi ; \
| `if [ -f ${srcdir}/../dejagnu/runtest ] ; then echo ${srcdir}/../dejagnu/runtest ; else echo runtest; fi` --tool g++ )
| Test Run By akim on Mon Jun 10 16:33:41 2002
| Native configuration is i686-pc-linux-gnu
|                 === g++ tests ===
| Schedule of variations:
|     unix
| Running target unix
| Using /usr/share/dejagnu/baseboards/unix.exp as board description file for target.
| Using /usr/share/dejagnu/config/unix.exp as generic interface file for target.
| Using /home/akim/src/gcc/gcc/testsuite/config/default.exp as tool-and-target-specific interface file.
| Running /home/akim/src/gcc/gcc/testsuite/g++.dg/bprob/bprob.exp ...
| /home/akim/src/gcc/libstdc++-v3/testsuite_flags: /home/akim/src/gcc/libstdc++-v3/testsuite_flags: No such file or directory
|     while executing
| "exec sh ${odir_v3}/testsuite_flags --build-includes"
|     (procedure "g++_include_flags" line 21)
|     invoked from within
| [...........]
| make: [check-g++] Error 1 (ignored)

I don't know what I did wrong.  Someone should definitely either give
me an hint on how to run the test suite, or to run the test suite.

Note: I have my editor systematically remove the trailing spaces, and
there appears to be many in these files.  So the patch comes in two
``flavors'': the firs one is `diff -w' so that you can see the real
content of the patch, but the real patch, which includes the trailing
blank (automated) removal, is below.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: diffs.patch
Type: text/x-patch
Size: 7699 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20020610/f57b149e/attachment.bin>
-------------- next part --------------

Now the real patch, including trailing spaces nuking.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: fix-TYPENAME-conflict.patch
Type: text/x-patch
Size: 44025 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20020610/f57b149e/attachment-0001.bin>

More information about the Gcc-patches mailing list