diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-11-11 20:10:19 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-11-11 20:10:19 (GMT) |
| commit | 23f7c36f38ca76f4233c92f661514dd4bba39158 (patch) | |
| tree | 6aadae9dde88c7248a9875e8ddbbab7258c6a0af | |
| parent | 56051878cd710e3a7304447c33b5e612a925a628 (diff) | |
| parent | 84d1195bc2be1e3fb2819500fc296b8739afd524 (diff) | |
| download | Doxygen-23f7c36f38ca76f4233c92f661514dd4bba39158.zip Doxygen-23f7c36f38ca76f4233c92f661514dd4bba39158.tar.gz Doxygen-23f7c36f38ca76f4233c92f661514dd4bba39158.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/commentcnv.l | 9 | ||||
| -rw-r--r-- | src/doxygen.cpp | 2 | ||||
| -rw-r--r-- | src/scanner.l | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/src/commentcnv.l b/src/commentcnv.l index aad369e..60d025e 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/doxygen.cpp b/src/doxygen.cpp index b27dcd7..9d820cb 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -9143,7 +9143,7 @@ static void copyExtraFiles(const QCString& filesOption,const QCString &outputOpt QFileInfo fi(fileName); if (!fi.exists()) { - err("Extra file '%s' specified in" + filesOption + " does not exist!\n", fileName.data()); + err("Extra file '%s' specified in " + filesOption + " does not exist!\n", fileName.data()); } else { 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; } |