OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

inclhack.def (endif_label): Add additional selector for more bogus stuff after #endif statements.

Browse Source 
* fixinc/inclhack.def (endif_label): Add additional selector for
        more bogus stuff after #endif statements.
        * fixinc/inclhack.sh, fixinc/fixincl.x: Rebuilt.

From-SVN: r27486
This commit is contained in:
Jeffrey A Law 1999-06-11 02:20:58 +00:00 committed by Jeff Law
parent 53dfe2970a
commit 5cda1ab62a
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
Fri Jun 11 03:17:51 1999 Jeffrey A Law (law@cygnus.com)
* fixinc/inclhack.def (endif_label): Add additional selector for
more bogus stuff after #endif statements.
* fixinc/inclhack.sh, fixinc/fixincl.x: Rebuilt.
Thu Jun 10 20:44:36 1999 Mumit Khan <khan@xraylith.wisc.edu> Thu Jun 10 20:44:36 1999 Mumit Khan <khan@xraylith.wisc.edu>
* i386/cygwin.h (SET_ASM_OP): Define. * i386/cygwin.h (SET_ASM_OP): Define.

2
gcc/fixinc/fixincl.x
View File

@ -742,7 +742,7 @@ tSCC zEndif_LabelName[] =
* content selection pattern - do fix if pattern found * content selection pattern - do fix if pattern found
*/ */
tSCC zEndif_LabelSelect0[] = tSCC zEndif_LabelSelect0[] =
"^[ \t]*#[ \t]*endif[ \t]+[!-.0-z{|}~]"; "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z{|}~]|^[ \t]*#[ \t]*endif[ \t]+/[^*]";
#define ENDIF_LABEL_TEST_CT 1 #define ENDIF_LABEL_TEST_CT 1
#define ENDIF_LABEL_RE_CT 1 #define ENDIF_LABEL_RE_CT 1

8
gcc/fixinc/inclhack.def
View File

@ -421,13 +421,19 @@ fix = {
* match '#endif / * foo * /', but it also wont match * match '#endif / * foo * /', but it also wont match
* '#endif / done' either. * '#endif / done' either.
* *
* We have a second regexp in the selector to detect
* #endif followed by a / followed by anything other
* than a *. For example "#endif / * foo * /" or
* "#endif /% blah %/ which appear on OSF4.0A and AIX4.2
* repsectively.
*
* We use the pattern [!-.0-z{|}~] instead of [^/ \t] to match a noncomment * We use the pattern [!-.0-z{|}~] instead of [^/ \t] to match a noncomment
* following #else or #endif because some buggy egreps think [^/] matches * following #else or #endif because some buggy egreps think [^/] matches
* newline, and they thus think `#else ' matches * newline, and they thus think `#else ' matches
* `#e[ndiflse]*[ \t]+[^/ \t]'. * `#e[ndiflse]*[ \t]+[^/ \t]'.
* [!-.0-~] does not work properly on AIX 4.1. * [!-.0-~] does not work properly on AIX 4.1.
*/ */
select = "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z\{\|\}\~]"; select = "^[ \t]*#[ \t]*endif[ \t]+[!-.0-z\{\|\}\~]|^[ \t]*#[ \t]*endif[ \t]+/[^\*]";
/* /*
* First, join the continued input lines. * First, join the continued input lines.

2
gcc/fixinc/inclhack.sh
View File

@ -841,7 +841,7 @@ s%^\([ ]*#[ ]*else\)[ ]*[^/ ].*%\1%' \
# #
# Fix 21: Endif_Label # Fix 21: Endif_Label
# #
if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]' ${file}`" if ( test -n "`egrep '^[ ]*#[ ]*endif[ ]+[!-.0-z{|}~]|^[ ]*#[ ]*endif[ ]+/[^*]' ${file}`"
) > /dev/null 2>&1 ; then ) > /dev/null 2>&1 ; then
fixlist="${fixlist} fixlist="${fixlist}
endif_label" endif_label"