From 2c23ce87411ae7cb09664690529e0a5e961f194e Mon Sep 17 00:00:00 2001 From: albert-github Date: Tue, 20 Apr 2021 18:42:28 +0200 Subject: issue #8511 Java: linebreak after @link can cause wrong parsing of subsequent doc Allowing also a `\n` after the @link. --- src/doctokenizer.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 70f2bd1..7c28907 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,dotPos); return TK_ENDLIST; } -"{"{BLANK}*"@link"/{BLANK}+ { +"{"{BLANK}*"@link"/{WS}+ { g_token->name = "javalink"; return TK_COMMAND_AT; } -- cgit v0.12 From 731bace4167532bddeec19d9d936d6911dcb30f0 Mon Sep 17 00:00:00 2001 From: albert-github Date: Thu, 29 Apr 2021 14:45:54 +0200 Subject: issue #8518 tag was inserted before parsing cpp file to xml The possible `\n` was not taken into account when codifying the line(s). --- src/code.l | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/code.l b/src/code.l index ed94853..2b48c47 100644 --- a/src/code.l +++ b/src/code.l @@ -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); } -- cgit v0.12 are'>inactive/h5ocompare