diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-21 17:52:23 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-21 17:52:23 (GMT) |
commit | 5c9d812083af06c9e683c9ff2e32f5839066863c (patch) | |
tree | 7ff5bacf7b93c6c6e37d164534784470481bcae7 /src/scanner.l | |
parent | ebefc53b60276e38270fe19251045b46b285e23d (diff) | |
parent | faafe83a69d2f3c27daca0974c9a063bdb81ecdc (diff) | |
download | Doxygen-5c9d812083af06c9e683c9ff2e32f5839066863c.zip Doxygen-5c9d812083af06c9e683c9ff2e32f5839066863c.tar.gz Doxygen-5c9d812083af06c9e683c9ff2e32f5839066863c.tar.bz2 |
Merge pull request #6957 from cfriedt/feature/cfriedt/6955/allow-javadoc-style-comment-blocks-with-a-doxyfile-variable
Allow Javadoc-style comment blocks with a Doxyfile variable
Diffstat (limited to 'src/scanner.l')
-rw-r--r-- | src/scanner.l | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l index 5395e49..f94e4f8 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -6254,6 +6254,43 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) startCommentBlock(FALSE); BEGIN( DocBlock ); } +<FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>"/**"[*]+{BL} { + + static bool javadocBanner = Config_getBool(JAVADOC_BANNER); + + if( javadocBanner ) { + lastDocContext = YY_START; + + //printf("Found comment banner at %s:%d\n",yyFileName,yyLineNr); + if (current_root->section & Entry::SCOPE_MASK) + { + current->inside = current_root->name+"::"; + } + current->docLine = yyLineNr; + current->docFile = yyFileName; + docBlockContext = YY_START; + docBlockInBody = YY_START==SkipCurly; + static bool javadocAutoBrief = Config_getBool(JAVADOC_AUTOBRIEF); + docBlockAutoBrief = javadocAutoBrief; + + QCString indent; + indent.fill(' ',computeIndent(yytext,g_column)); + docBlock=indent; + + if (docBlockAutoBrief) + { + current->briefLine = yyLineNr; + current->briefFile = yyFileName; + } + startCommentBlock(FALSE); + BEGIN( DocBlock ); + } else { + current->program += yytext ; + lastContext = YY_START ; + BEGIN( Comment ) ; + } + + } <FindMembers,FindFields,MemberSpec,FuncQual,SkipCurly,Operator,ClassVar,SkipInits,Bases,OldStyleArgs>("//"{B}*)?"/**"/[^/*] { removeSlashes=(yytext[1]=='/'); lastDocContext = YY_START; |