diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/doxygen.cpp | 4 | ||||
| -rw-r--r-- | src/doxygen.h | 1 | ||||
| -rw-r--r-- | src/pycode.l | 8 | ||||
| -rw-r--r-- | src/pyscanner.l | 10 |
4 files changed, 18 insertions, 5 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 3850448..f003e8b 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -152,7 +152,6 @@ bool Doxygen::parseSourcesNeeded = FALSE; SearchIndexIntf *Doxygen::searchIndex=0; SymbolMap<Definition> Doxygen::symbolMap; ClangUsrMap *Doxygen::clangUsrMap = 0; -bool Doxygen::outputToWizard=FALSE; Cache<std::string,LookupInfo> *Doxygen::lookupCache; DirLinkedMap *Doxygen::dirLinkedMap; DirRelationLinkedMap Doxygen::dirRelations; @@ -10137,7 +10136,7 @@ static void devUsage() { msg("Developer parameters:\n"); msg(" -m dump symbol map\n"); - msg(" -b output to wizard\n"); + msg(" -b making messages output unbuffered\n"); msg(" -T activates output generation via Django like template\n"); msg(" -d <level> enable a debug level, such as (multiple invocations of -d are possible):\n"); Debug::printFlags(); @@ -10668,7 +10667,6 @@ void readConfiguration(int argc, char **argv) break; case 'b': setvbuf(stdout,NULL,_IONBF,0); - Doxygen::outputToWizard=TRUE; break; case 'T': msg("Warning: this option activates output generation via Django like template files. " diff --git a/src/doxygen.h b/src/doxygen.h index 3cc6934..f090f1f 100644 --- a/src/doxygen.h +++ b/src/doxygen.h @@ -105,7 +105,6 @@ class Doxygen static SearchIndexIntf *searchIndex; static SymbolMap<Definition> symbolMap; static ClangUsrMap *clangUsrMap; - static bool outputToWizard; static Cache<std::string,LookupInfo> *lookupCache; static DirLinkedMap *dirLinkedMap; static DirRelationLinkedMap dirRelations; diff --git a/src/pycode.l b/src/pycode.l index 6625300..6acf333 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -190,7 +190,7 @@ SHORTSTRINGITEM ({SHORTSTRINGCHAR}|{ESCAPESEQ}) SHORTSTRINGCHAR [^\\\n"] STRINGLITERAL {STRINGPREFIX}?( {SHORTSTRING} | {LONGSTRING}) STRINGPREFIX ("r"|"u"|"ur"|"R"|"U"|"UR"|"Ur"|"uR") -KEYWORD ("lambda"|"import"|"class"|"assert"|"with"|"as"|"from"|"global"|"def"|"True"|"False") +KEYWORD ("lambda"|"import"|"class"|"assert"|"with"|"as"|"from"|"global"|"async"|"def"|"True"|"False") FLOWKW ("or"|"and"|"is"|"not"|"print"|"for"|"in"|"if"|"try"|"except"|"yield"|"raise"|"break"|"continue"|"pass"|"if"|"return"|"while"|"elif"|"else"|"finally") QUOTES ("\""[^"]*"\"") SINGLEQUOTES ("'"[^']*"'") @@ -302,6 +302,12 @@ TARGET ({IDENTIFIER}|"("{TARGET_LIST}")"|"["{TARGET_LIST}"]"|{ATTRIBU endFontClass(yyscanner); BEGIN( FunctionDec ); } + "async"{BB}"def"{BB} { + startFontClass(yyscanner,"keyword"); + codify(yyscanner,yytext); + endFontClass(yyscanner); + BEGIN( FunctionDec ); + } "class"{BB} { startFontClass(yyscanner,"keyword"); diff --git a/src/pyscanner.l b/src/pyscanner.l index 47e00a3..4f331c9 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -254,10 +254,20 @@ STARTDOCSYMS "##" searchFoundDef(yyscanner); BEGIN( FunctionDec ); } + ^{B}"async"{BB}"def"{BB} { // start of an async function/method definition with indent + DBG_CTX((stderr,"Found async def at %d\n",yyextra->yyLineNr)); + yyextra->indent=computeIndent(yytext); + searchFoundDef(yyscanner); + BEGIN( FunctionDec ); + } "def"{BB} { // start of a function/method definition searchFoundDef(yyscanner); BEGIN( FunctionDec ); } + "async"{BB}"def"{BB} { // start of a function/method definition + searchFoundDef(yyscanner); + BEGIN( FunctionDec ); + } ^{B}"class"{BB} { // start of a class definition with indent DBG_CTX((stderr,"Found class at %d\n",yyextra->yyLineNr)); |