summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/commentcnv.l9
-rw-r--r--src/doxygen.cpp2
-rw-r--r--src/scanner.l5
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; }