diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-27 19:42:57 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-05-27 19:42:57 (GMT) |
commit | 94a8f6cd0ae9b1faa8bab29f6611b2223230f39f (patch) | |
tree | 4d64e337eaf5ffea71b9b3ae41823d1d23a78ca9 /src/scanner.l | |
parent | 8625ec5da0a505caf2dcfd16a5a8c1e668633ca8 (diff) | |
parent | e2cdb52fc2a906cffdd6223736892dcfb0b5da6f (diff) | |
download | Doxygen-94a8f6cd0ae9b1faa8bab29f6611b2223230f39f.zip Doxygen-94a8f6cd0ae9b1faa8bab29f6611b2223230f39f.tar.gz Doxygen-94a8f6cd0ae9b1faa8bab29f6611b2223230f39f.tar.bz2 |
Merge branch 'master' of github.com:doxygen/doxygen
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; |