diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/commentscan.l | 2 | ||||
| -rw-r--r-- | src/scanner.l | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index 23fd34a..54adbd8 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -3114,7 +3114,7 @@ void closeGroup(Entry *e,const char *fileName,int,bool foundInline) g_memberGroupId=DOX_NOGROUP; g_memberGroupRelates.resize(0); g_memberGroupDocs.resize(0); - e->mGrpId=DOX_NOGROUP; + if (!foundInline) e->mGrpId=DOX_NOGROUP; //printf("new group id=%d\n",g_memberGroupId); } else if (!g_autoGroupStack.isEmpty()) // end of auto group diff --git a/src/scanner.l b/src/scanner.l index b11d777..9529c34 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -2805,7 +2805,8 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) } } <FindMembers,FindFields,ReadInitializer>"//"([!/]?){B}*{CMD}"}".*|"/*"([!*]?){B}*{CMD}"}"[^*]*"*/" { - closeGroup(current,yyFileName,yyLineNr); + bool insideEnum = YY_START==FindFields || (YY_START==ReadInitializer && lastInitializerContext==FindFields); // see bug746226 + closeGroup(current,yyFileName,yyLineNr,insideEnum); } <FindMembers>"=" { // in PHP code this could also be due to "<?=" current->bodyLine = yyLineNr; |