diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-12-26 14:40:50 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-26 14:40:50 (GMT) |
| commit | d1e058b9c1f93aa0a986dbc8a754c5eabd747e27 (patch) | |
| tree | 5dadd9d3fae88b0d9e37182ea073e60ebe3197a5 /src/defargs.l | |
| parent | c42c0ae66542e4e154c2646fc725890554208d89 (diff) | |
| parent | a5c98ade388f4f18ec30476ca706760a8129c73f (diff) | |
| download | Doxygen-d1e058b9c1f93aa0a986dbc8a754c5eabd747e27.zip Doxygen-d1e058b9c1f93aa0a986dbc8a754c5eabd747e27.tar.gz Doxygen-d1e058b9c1f93aa0a986dbc8a754c5eabd747e27.tar.bz2 | |
Merge branch 'master' into feature/bug_fenced_code
Diffstat (limited to 'src/defargs.l')
| -rw-r--r-- | src/defargs.l | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/defargs.l b/src/defargs.l index a213688..9745f44 100644 --- a/src/defargs.l +++ b/src/defargs.l @@ -86,6 +86,7 @@ static int g_lastDocContext; static int g_lastDocChar; static int g_lastExtendsContext; static QCString g_delimiter; +static SrcLangExt g_lang; static const char *stateToString(int state); /* ----------------------------------------------------------------- @@ -481,9 +482,16 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" } } <ReadFuncArgType,ReadFuncArgPtr>"extends" { - g_curTypeConstraint.resize(0); - g_lastExtendsContext=YY_START; - BEGIN(ReadTypeConstraint); + if (g_lang!=SrcLangExt_Java) + { + REJECT; + } + else + { + g_curTypeConstraint.resize(0); + g_lastExtendsContext=YY_START; + BEGIN(ReadTypeConstraint); + } } <ReadFuncArgType,ReadFuncArgPtr>"$"?{ID} { QCString name=yytext; //resolveDefines(yytext); @@ -601,7 +609,7 @@ RAWEND ")"[^ \t\(\)\\]{0,16}\" * for complex types are written to */ -void stringToArgumentList(const char *argsString,ArgumentList& al,QCString *extraTypeChars) +void stringToArgumentList(SrcLangExt lang, const char *argsString,ArgumentList& al,QCString *extraTypeChars) { if (argsString==0) return; printlex(yy_flex_debug, TRUE, __FILE__, NULL); @@ -623,6 +631,7 @@ void stringToArgumentList(const char *argsString,ArgumentList& al,QCString *extr g_curArgDefValue.resize(0); g_curArgName.resize(0); g_argList = &al; + g_lang = lang; defargsYYrestart( defargsYYin ); BEGIN( Start ); defargsYYlex(); @@ -635,10 +644,4 @@ void stringToArgumentList(const char *argsString,ArgumentList& al,QCString *extr printlex(yy_flex_debug, FALSE, __FILE__, NULL); } -#if !defined(YY_FLEX_SUBMINOR_VERSION) -extern "C" { // some bogus code to keep the compiler happy - void defargsYYdummy() { yy_flex_realloc(0,0); } -} -#endif - #include "defargs.l.h" |