Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
doxverilog
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
doxverilog
Commits
23f7c36f
Commit
23f7c36f
authored
Nov 11, 2013
by
Dimitri van Heesch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:doxygen/doxygen
parents
56051878
84d1195b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
5 deletions
+11
-5
commentcnv.l
src/commentcnv.l
+6
-3
doxygen.cpp
src/doxygen.cpp
+1
-1
scanner.l
src/scanner.l
+4
-1
No files found.
src/commentcnv.l
View file @
23f7c36f
...
...
@@ -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)
{
...
...
src/doxygen.cpp
View file @
23f7c36f
...
...
@@ -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
{
...
...
src/scanner.l
View file @
23f7c36f
...
...
@@ -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; }
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment