diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-03-29 18:56:22 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2021-03-29 18:56:22 (GMT) |
| commit | 1bcf44dfd9a80d320d12bd952124e4ff4023b3a1 (patch) | |
| tree | be49b83f2ca228093b2802a7ebd0e302f7b8358c | |
| parent | 90ae39c5d66718ecc0068af1c265f526642f66e6 (diff) | |
| parent | e1e7e08d72d8d59def650fe3ad2a1c0e7e851354 (diff) | |
| download | Doxygen-1bcf44dfd9a80d320d12bd952124e4ff4023b3a1.zip Doxygen-1bcf44dfd9a80d320d12bd952124e4ff4023b3a1.tar.gz Doxygen-1bcf44dfd9a80d320d12bd952124e4ff4023b3a1.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | libxml/xml.l | 9 | ||||
| -rw-r--r-- | src/configimpl.l | 9 | ||||
| -rw-r--r-- | src/scanner.l | 8 |
3 files changed, 20 insertions, 6 deletions
diff --git a/libxml/xml.l b/libxml/xml.l index ac58882..13ff219 100644 --- a/libxml/xml.l +++ b/libxml/xml.l @@ -440,12 +440,13 @@ void XMLParser::parse(const char *fileName,const char *inputStr, bool debugEnabl FILE *output = 0; const char *enter_txt = 0; const char *finished_txt = 0; - if (yy_flex_debug) { output=stderr; enter_txt="entering"; finished_txt="finished"; } - else if (debugEnabled) { output=stdout; enter_txt="Entering"; finished_txt="Finished"; } + const char *pre_txt = 0; + if (yy_flex_debug) { output=stderr; pre_txt="--"; enter_txt="entering"; finished_txt="finished"; } + else if (debugEnabled) { output=stdout; pre_txt=""; enter_txt="Entering"; finished_txt="Finished"; } if (output) { - fprintf(output,"--%s lexical analyzer: %s (for: %s)\n",enter_txt, __FILE__, fileName); + fprintf(output,"%s%s lexical analyzer: %s (for: %s)\n",pre_txt,enter_txt, __FILE__, fileName); } BEGIN(Initial); @@ -475,7 +476,7 @@ void XMLParser::parse(const char *fileName,const char *inputStr, bool debugEnabl if (output) { - fprintf(output,"--%s lexical analyzer: %s (for: %s)\n",finished_txt, __FILE__, fileName); + fprintf(output,"%s%s lexical analyzer: %s (for: %s)\n",pre_txt,finished_txt, __FILE__, fileName); } } diff --git a/src/configimpl.l b/src/configimpl.l index bde2290..cae157b 100644 --- a/src/configimpl.l +++ b/src/configimpl.l @@ -2076,7 +2076,14 @@ void Config::compareDoxyfile(TextStream &t) bool Config::parse(const char *fileName,bool update) { - return ConfigImpl::instance()->parse(fileName,update); + bool parseRes = ConfigImpl::instance()->parse(fileName,update); + if (!parseRes) return parseRes; + + // Internally we use the default format UTF-8 and + // when updating etc. the output is in this format as well and not in the read format + ConfigString *option = (ConfigString*)g_config->get("DOXYFILE_ENCODING"); + option->init(); + return parseRes; } void Config::postProcess(bool clearHeaderAndFooter, bool compare) diff --git a/src/scanner.l b/src/scanner.l index 38c8169..78afdab 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -1914,7 +1914,8 @@ NONLopt [^\n]* lineCount(yyscanner); yyextra->current->name+='>'; // *yyextra->currentTemplateSpec+='>'; - if (yyextra->roundCount==0 && --yyextra->sharpCount<=0) + --yyextra->sharpCount; + if (yyextra->roundCount==0 && yyextra->sharpCount<=0) { yyextra->current->bodyLine = yyextra->yyLineNr; yyextra->current->bodyColumn = yyextra->yyColNr; @@ -1925,6 +1926,11 @@ NONLopt [^\n]* //printf("Found %s\n",yyextra->current->name.data()); BEGIN( ReadFuncArgType ) ; } + else if (yyextra->sharpCount<=0) + { + yyextra->current->name+="("; + yyextra->roundCount++; + } } <EndTemplate>">"{BNopt}/"("({BN}*{ID}{BN}*"::")*({BN}*"*"{BN}*)+ { // function pointer returning a template instance lineCount(yyscanner); |