diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2018-11-11 13:39:12 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2018-11-11 13:39:12 (GMT) |
| commit | 933a6e3d74f9109ad6ec921aded645d87111585b (patch) | |
| tree | aa4591ab712fa5a37f973119f6b3a7fb1d10435e /src | |
| parent | ea68219eb2c41f509723e2b89f4db6ea7fbb40bf (diff) | |
| parent | dc3aa117751718ab391be094243e9c966c126440 (diff) | |
| download | Doxygen-933a6e3d74f9109ad6ec921aded645d87111585b.zip Doxygen-933a6e3d74f9109ad6ec921aded645d87111585b.tar.gz Doxygen-933a6e3d74f9109ad6ec921aded645d87111585b.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/defgen.cpp | 2 | ||||
| -rw-r--r-- | src/doctokenizer.l | 2 | ||||
| -rw-r--r-- | src/perlmodgen.cpp | 2 | ||||
| -rw-r--r-- | src/sqlite3gen.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/defgen.cpp b/src/defgen.cpp index cd69ab2..3ab311c 100644 --- a/src/defgen.cpp +++ b/src/defgen.cpp @@ -146,7 +146,7 @@ void generateDEFForMember(MemberDef *md, stringToArgumentList(md->argsString(),declAl); QCString fcnPrefix = " " + memPrefix + "param-"; - if (declAl->count()>0) + if (defAl && declAl->count()>0) { ArgumentListIterator declAli(*declAl); ArgumentListIterator defAli(*defAl); diff --git a/src/doctokenizer.l b/src/doctokenizer.l index fac09ba..0a3c0cf 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -1074,7 +1074,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} <St_IntRef>{BLANK}+"\"" { BEGIN(St_Ref2); } -<St_SetScope>({SCOPEMASK}|{ANONNS}){BLANK} { +<St_SetScope>({SCOPEMASK}|{ANONNS}){BLANK}|{FILEMASK} { g_token->name = yytext; g_token->name = g_token->name.stripWhiteSpace(); return TK_WORD; diff --git a/src/perlmodgen.cpp b/src/perlmodgen.cpp index 27c2fa8..bd52810 100644 --- a/src/perlmodgen.cpp +++ b/src/perlmodgen.cpp @@ -1616,7 +1616,7 @@ void PerlModGenerator::generatePerlModForMember(MemberDef *md,Definition *) m_output.openList("parameters"); ArgumentList *declAl = md->declArgumentList(); ArgumentList *defAl = md->argumentList(); - if (declAl && declAl->count()>0) + if (declAl && defAl && declAl->count()>0) { ArgumentListIterator declAli(*declAl); ArgumentListIterator defAli(*defAl); diff --git a/src/sqlite3gen.cpp b/src/sqlite3gen.cpp index a7d7f21..a7b8dbb 100644 --- a/src/sqlite3gen.cpp +++ b/src/sqlite3gen.cpp @@ -1017,7 +1017,7 @@ static void insertMemberFunctionParams(int memberdef_id, const MemberDef *md, co { ArgumentList *declAl = md->declArgumentList(); ArgumentList *defAl = md->argumentList(); - if (declAl!=0 && declAl->count()>0) + if (declAl!=0 && defAl!=0 && declAl->count()>0) { ArgumentListIterator declAli(*declAl); ArgumentListIterator defAli(*defAl); |