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
b4d5ef17
Commit
b4d5ef17
authored
Feb 03, 2014
by
Dimitri van Heesch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 723314 - Doxygen crashes on incorrect end group /**< @} */
parent
0eaf1cd5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
2 deletions
+14
-2
scanner.l
src/scanner.l
+14
-2
No files found.
src/scanner.l
View file @
b4d5ef17
...
@@ -5023,6 +5023,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
...
@@ -5023,6 +5023,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
tempEntry = current; // temporarily switch to the previous entry
tempEntry = current; // temporarily switch to the previous entry
current = previous;
current = previous;
previous = 0;
docBlockContext = SkipCurlyEndDoc;
docBlockContext = SkipCurlyEndDoc;
docBlockInBody = FALSE;
docBlockInBody = FALSE;
...
@@ -5062,7 +5063,11 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
...
@@ -5062,7 +5063,11 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
}
}
<SkipCurlyEndDoc>"}" {
<SkipCurlyEndDoc>"}" {
//addToBody("}");
//addToBody("}");
current = tempEntry;
if (tempEntry) // we can only switch back to current if no new item was created
{
current = tempEntry;
tempEntry = 0;
}
BEGIN( lastCurlyContext );
BEGIN( lastCurlyContext );
}
}
<SkipCurly>\" {
<SkipCurly>\" {
...
@@ -6515,7 +6520,14 @@ static void startCommentBlock(bool brief)
...
@@ -6515,7 +6520,14 @@ static void startCommentBlock(bool brief)
static void newEntry()
static void newEntry()
{
{
current_root->addSubEntry(current);
if (tempEntry==0) // if temp entry is not 0, it holds current,
// and current is actually replaced by previous which was
// already added to current_root, so we should not add it again
// (see bug723314)
{
current_root->addSubEntry(current);
}
tempEntry = 0;
previous = current;
previous = current;
current = new Entry ;
current = new Entry ;
initEntry();
initEntry();
...
...
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