diff options
Diffstat (limited to 'src/docparser.cpp')
| -rw-r--r-- | src/docparser.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/docparser.cpp b/src/docparser.cpp index 6397bb8..1c8479b 100644 --- a/src/docparser.cpp +++ b/src/docparser.cpp @@ -113,7 +113,7 @@ static QCString g_includeFileText; static uint g_includeFileOffset; static uint g_includeFileLength; static uint g_includeFileLine; -static bool g_includeFileLineNo; +static bool g_includeFileShowLineNo; /** Parser's context to store all global variables. @@ -195,7 +195,7 @@ static void docParserPushContext(bool saveParamInfo=TRUE) ctx->includeFileOffset = g_includeFileOffset; ctx->includeFileLength = g_includeFileLength; ctx->includeFileLine = g_includeFileLine; - ctx->includeFileLineNo = g_includeFileLineNo; + ctx->includeFileLineNo = g_includeFileShowLineNo; ctx->token = g_token; g_token = new TokenInfo; @@ -235,7 +235,7 @@ static void docParserPopContext(bool keepParamInfo=FALSE) g_includeFileOffset = ctx->includeFileOffset; g_includeFileLength = ctx->includeFileLength; g_includeFileLine = ctx->includeFileLine; - g_includeFileLineNo = ctx->includeFileLineNo; + g_includeFileShowLineNo = ctx->includeFileLineNo; delete g_token; g_token = ctx->token; @@ -2025,7 +2025,7 @@ void DocInclude::parse() g_includeFileOffset = 0; g_includeFileLength = m_text.length(); g_includeFileLine = 0; - g_includeFileLineNo = (m_type == DontIncWithLines || m_type == IncWithLines); + g_includeFileShowLineNo = (m_type == DontIncWithLines || m_type == IncWithLines); //printf("g_includeFile=<<%s>>\n",g_includeFileText.data()); break; case VerbInclude: @@ -2060,6 +2060,13 @@ void DocInclude::parse() void DocIncOperator::parse() { + if (g_includeFileName.isEmpty()) + { + warn_doc_error(g_fileName,doctokenizerYYlineno, + "No previous '\\include' or \\dontinclude' command for '\\%s' present", + typeAsString()); + } + m_includeFileName = g_includeFileName; const char *p = g_includeFileText; uint l = g_includeFileLength; @@ -2093,7 +2100,7 @@ void DocIncOperator::parse() DBG(("DocIncOperator::parse() Line: %s\n",qPrint(m_text))); } g_includeFileOffset = QMIN(l,o+1); // set pointer to start of new line - m_lineno = g_includeFileLineNo; + m_showLineNo = g_includeFileShowLineNo; break; case SkipLine: while (o<l) @@ -2124,7 +2131,7 @@ void DocIncOperator::parse() o++; // skip new line } g_includeFileOffset = QMIN(l,o+1); // set pointer to start of new line - m_lineno = g_includeFileLineNo; + m_showLineNo = g_includeFileShowLineNo; break; case Skip: while (o<l) @@ -2152,7 +2159,7 @@ void DocIncOperator::parse() o++; // skip new line } g_includeFileOffset = so; // set pointer to start of new line - m_lineno = g_includeFileLineNo; + m_showLineNo = g_includeFileShowLineNo; break; case Until: bo=o; @@ -2184,7 +2191,7 @@ void DocIncOperator::parse() o++; // skip new line } g_includeFileOffset = QMIN(l,o+1); // set pointer to start of new line - m_lineno = g_includeFileLineNo; + m_showLineNo = g_includeFileShowLineNo; break; } } |