summaryrefslogtreecommitdiffstats
path: root/src/pre.l
diff options
context:
space:
mode:
authoralbert-github <albert.tests@gmail.com>2019-06-02 11:46:31 (GMT)
committeralbert-github <albert.tests@gmail.com>2019-06-02 11:46:31 (GMT)
commit047df30104f628bdfbbe71fbc8d11440a5b0494a (patch)
tree2abf2d402a3c6ca71ed1378308a6014b993b715f /src/pre.l
parent7403c9e4f7f05e4660ed6d3a54f3f935958b01fd (diff)
downloadDoxygen-047df30104f628bdfbbe71fbc8d11440a5b0494a.zip
Doxygen-047df30104f628bdfbbe71fbc8d11440a5b0494a.tar.gz
Doxygen-047df30104f628bdfbbe71fbc8d11440a5b0494a.tar.bz2
issue #7021 Warning about missing item in INCLUDE_PATH
Do the `curlyCount` per file and not globally.
Diffstat (limited to 'src/pre.l')
-rw-r--r--src/pre.l6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pre.l b/src/pre.l
index c2954ab..ca2fe2b 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -73,9 +73,10 @@ struct CondCtx
struct FileState
{
- FileState(int size) : lineNr(1), fileBuf(size),
+ FileState(int size) : lineNr(1), curlyCount(0),fileBuf(size),
oldFileBuf(0), oldFileBufPos(0), bufState(0) {}
int lineNr;
+ int curlyCount;
BufStr fileBuf;
BufStr *oldFileBuf;
int oldFileBufPos;
@@ -1606,6 +1607,8 @@ static void readIncludeFile(const QCString &inc)
fs->bufState = YY_CURRENT_BUFFER;
fs->lineNr = oldLineNr;
fs->fileName = oldFileName;
+ fs->curlyCount = g_curlyCount;
+ g_curlyCount = 0;
// push the state on the stack
g_includeStack.push(fs);
// set the scanner to the include file
@@ -2949,6 +2952,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
//preYYin = fs->oldYYin;
g_inputBuf = fs->oldFileBuf;
g_inputBufPos = fs->oldFileBufPos;
+ g_curlyCount = fs->curlyCount;
setFileName(fs->fileName);
DBG_CTX((stderr,"######## FileName %s\n",g_yyFileName.data()));