diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-04-29 16:45:52 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2021-04-29 16:45:52 (GMT) |
| commit | eddb82debca2d1fbfc7f76643f66304939f95250 (patch) | |
| tree | 45038ddc9f45ea1eb1540b12021d5b4e05ff6801 /src | |
| parent | b68bd0c88bed213f185437a4308bbb0bcbb346a8 (diff) | |
| parent | 37d962f59a3ea4a376a829e7369b9caa26190344 (diff) | |
| download | Doxygen-eddb82debca2d1fbfc7f76643f66304939f95250.zip Doxygen-eddb82debca2d1fbfc7f76643f66304939f95250.tar.gz Doxygen-eddb82debca2d1fbfc7f76643f66304939f95250.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/code.l | 8 | ||||
| -rw-r--r-- | src/doctokenizer.l | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -1287,14 +1287,14 @@ ENDQopt ("const"|"volatile"|"sealed"|"override")({BN}+("const"|"volatile"|"seale { if (!generateClassMemberLink(yyscanner,*yyextra->code,yyextra->theCallContext.getScope().globalDef(),yytext)) { - yyextra->code->codify(yytext); + codifyLines(yyscanner,yytext); addToSearchIndex(yyscanner,yytext); } yyextra->name.resize(0); } else { - yyextra->code->codify(yytext); + codifyLines(yyscanner,yytext); addToSearchIndex(yyscanner,yytext); yyextra->name.resize(0); } @@ -1314,7 +1314,7 @@ ENDQopt ("const"|"volatile"|"sealed"|"override")({BN}+("const"|"volatile"|"seale DBG_CTX((stderr,"yyextra->theCallContext.getClass()=%p\n",(void*)yyextra->theCallContext.getScope().globalDef())); if (!generateClassMemberLink(yyscanner,*yyextra->code,yyextra->theCallContext.getScope().globalDef(),yytext)) { - yyextra->code->codify(yytext); + codifyLines(yyscanner,yytext); addToSearchIndex(yyscanner,yytext); } yyextra->name.resize(0); @@ -1322,7 +1322,7 @@ ENDQopt ("const"|"volatile"|"sealed"|"override")({BN}+("const"|"volatile"|"seale else { DBG_CTX((stderr,"no class context!\n")); - yyextra->code->codify(yytext); + codifyLines(yyscanner,yytext); addToSearchIndex(yyscanner,yytext); yyextra->name.resize(0); } diff --git a/src/doctokenizer.l b/src/doctokenizer.l index b29afcb..bfbc345 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -610,7 +610,7 @@ RCSID "$"("Author"|"Date"|"Header"|"Id"|"Locker"|"Log"|"Name"|"RCSfile"|"Revisio g_token->indent = computeIndent(text.data(),dotPos); return TK_ENDLIST; } -<St_Para>"{"{BLANK}*"@link"/{BLANK}+ { +<St_Para>"{"{BLANK}*"@link"/{WS}+ { g_token->name = "javalink"; return TK_COMMAND_AT; } |