diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2013-11-11 20:09:34 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-11-11 20:09:34 (GMT) |
commit | 82496bb75b32f09469a0524935db56e9c36870f0 (patch) | |
tree | de71381977421df4df62525a92130884b0dc9b5f | |
parent | 7cda115a6830bf816a094e37c498e5a50ce1b29c (diff) | |
parent | 057f260bfdc3a91a71e83dd5843564225a4bf1aa (diff) | |
download | Doxygen-82496bb75b32f09469a0524935db56e9c36870f0.zip Doxygen-82496bb75b32f09469a0524935db56e9c36870f0.tar.gz Doxygen-82496bb75b32f09469a0524935db56e9c36870f0.tar.bz2 |
Merge pull request #53 from albert-github/feature/bug_711787
Bug 711787 - Long initialization line in C stops doxygen
-rw-r--r-- | src/commentcnv.l | 9 | ||||
-rw-r--r-- | src/scanner.l | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l index 948d6e2..45d94dc 100644 --- a/src/commentcnv.l +++ b/src/commentcnv.l @@ -241,9 +241,12 @@ void replaceComment(int offset); %% -<Scan>[^"'!\/\n\\#\\-]* { /* eat anything that is not " / or \n */ - copyToOutput(yytext,(int)yyleng); - } +<Scan>[^"'!\/\n\\#\\-\\,]* { /* eat anything that is not " / , or \n */ + copyToOutput(yytext,(int)yyleng); + } +<Scan>[\\,] { /* eat , so we have a nice separator in long initialization lines */ + copyToOutput(yytext,(int)yyleng); + } <Scan>"\"\"\""! { /* start of python long comment */ if (g_lang!=SrcLangExt_Python) { diff --git a/src/scanner.l b/src/scanner.l index f0067b0..0df0a8a 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -3252,7 +3252,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) *pCopyCurlyGString+=yytext; } } -<GCopyCurly>[^"'{}\/\n]+ { +<GCopyCurly>[^"'{}\/\n,]+ { + *pCopyCurlyGString+=yytext; + } +<GCopyCurly>[,]+ { *pCopyCurlyGString+=yytext; } <GCopyCurly>"/" { *pCopyCurlyGString+=yytext; } |