godzil/ack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a problem with the ifdef-stack

Browse Source
This commit is contained in:
ceriel
1987-08-20 18:12:31 +00:00
parent 831cdc7580
commit 754f9ce45d
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
util/cpp/domacro.c
View File

@@ -30,6 +30,10 @@ PRIVATE char ifstack[IFDEPTH]; /* if-stack: the content of an entry is */
/* 1 if a corresponding ELSE has been */
/* encountered. */
int nestlevel = -1;
int svnestlevel[30] = {-1};
int nestcount;
PRIVATE char *
GetIdentifier()
{
@@ -261,7 +265,7 @@ do_include()
}
else {
WorkingDir = getwdir(result);
nestlevel = -1;
svnestlevel[++nestcount] = nestlevel;
FileName = result;
LineNumber = 1;
}
@@ -331,7 +335,7 @@ push_if()
PRIVATE
do_elif()
{
if (nestlevel < 0 || (ifstack[nestlevel])) {
if (nestlevel <= svnestlevel[nestcount] || (ifstack[nestlevel])) {
error("#elif without corresponding #if");
PushBack();
skipline();
@@ -348,7 +352,7 @@ do_else()
{
PushBack();
skipline();
if (nestlevel < 0 || (ifstack[nestlevel]))
if (nestlevel <= svnestlevel[nestcount] || (ifstack[nestlevel]))
error("#else without corresponding #if");
else { /* mark this level as else-d */
++(ifstack[nestlevel]);
@@ -361,7 +365,7 @@ do_endif()
{
PushBack();
skipline();
if (nestlevel-- < 0)
if (nestlevel-- <= svnestlevel[nestcount])
error("#endif without corresponding #if");
}