diff options
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/src/scanner.l b/src/scanner.l index 2a38b43..6f81966 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -474,6 +474,7 @@ TITLE [tT][iI][tT][lL][eE] %x DocBaseClass %x CppQuote %x EndCppQuote +%x AddGroupDocArg1 %x GroupDocArg1 %x GroupDocArg2 %x GroupName @@ -2686,6 +2687,12 @@ TITLE [tT][iI][tT][lL][eE] current->startLine = yyLineNr; BEGIN( GroupDocArg1 ); } +<Doc,JavaDoc>{B}*{CMD}"addtogroup"{B}+ { + current->section = Entry::ADDGRPDOC_SEC; + current->fileName = yyFileName; + current->startLine = yyLineNr; + BEGIN( AddGroupDocArg1 ); + } <Doc,JavaDoc>{B}*{CMD}"namespace"{B}+ { current->section = Entry::NAMESPACEDOC_SEC; current->fileName = yyFileName; @@ -2940,6 +2947,27 @@ TITLE [tT][iI][tT][lL][eE] yyLineNr++; } +<AddGroupDocArg1>{ID} { + current->name = yytext; + lastDefGroup = yytext; + newDocState(); + } +<AddGroupDocArg1>"\n" { + warn(yyFileName,yyLineNr, + "Warning: missing argument after " + "\\addtogroup." + ); + yyLineNr++; + BEGIN( Doc ); + } +<GroupDocArg2>"*/" { + unput('/');unput('*'); + warn(yyFileName,yyLineNr, + "Warning: missing argument after " + "\\addtogroup." + ); + BEGIN( Doc ); + } <GroupDocArg1>{ID}(".html"?) { current->name = yytext; lastDefGroup = yytext; @@ -3213,7 +3241,9 @@ TITLE [tT][iI][tT][lL][eE] BEGIN( GroupName ); } <ClassDoc,Doc,JavaDoc>{CMD}"{" { - if (current->section == Entry::GROUPDOC_SEC) + if (current->section==Entry::GROUPDOC_SEC || + current->section==Entry::ADDGRPDOC_SEC + ) { autoGroupNameStack.push(new QCString(current->name)); } @@ -3636,9 +3666,12 @@ TITLE [tT][iI][tT][lL][eE] unput('/');unput('*'); BEGIN( tmpDocType ); } -<Doc,JavaDoc,ClassDoc,PageDoc,ExampleDoc,ReadFormulaShort,ReadFormulaLong,ClassDocBrief,AfterDoc,AfterDocBrief>^{B}*(("//"{B}*)?)"*"+[ \t]*"-"("#")?{B}+ { +<Doc,JavaDoc,ClassDoc,PageDoc,ExampleDoc,ReadFormulaShort,ReadFormulaLong,AfterDoc>^{B}*(("//"{B}*)?)"*"+[ \t]*"-"("#")?{B}+ { current->doc += yytext; } +<ClassDocBrief,AfterDocBrief>^{B}*(("//"{B}*)?)"*"+[ \t]*"-"("#")?{B}+ { + current->brief += "-"; + } <Doc,JavaDoc,ClassDoc,PageDoc,ExampleDoc,ReadFormulaShort,ReadFormulaLong,ClassDocBrief,AfterDoc,AfterDocBrief>^{B}*(("//"{B}*)?)"*"+/[^/] <Doc,JavaDoc,ClassDoc,PageDoc,ExampleDoc,ReadFormulaShort,ReadFormulaLong,ClassDocBrief,AfterDoc,AfterDocBrief>^{B}*(("//"{B}*)?)"*"+{B}+ { current->doc+=' '; |