Merge branch 'doxy/segfault'
* doxy/segfault: Add iterator safety check in DoxygenParser::parse Doxygen comment parsing fix for empty lines in code/verbatim blocks
This commit is contained in:
commit
42f5e2da41
8 changed files with 32 additions and 1 deletions
|
|
@ -57,6 +57,8 @@ void function3(int a, int b)
|
|||
* \warning This may not work as expected
|
||||
* \code
|
||||
* int main() { while(true); }
|
||||
*
|
||||
* // Test blank line in code block
|
||||
* \endcode
|
||||
* \endif
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -55,6 +55,8 @@ void function3(int a, int b)
|
|||
* \warning This may not work as expected
|
||||
* \code
|
||||
* int main() { while(true); }
|
||||
*
|
||||
* // Test blank line in code block
|
||||
* \endcode
|
||||
* \endif
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -54,6 +54,8 @@ public class doxygen_basic_translate_runme {
|
|||
" \n" +
|
||||
" {@code \n" +
|
||||
"int main() { while(true); } \n" +
|
||||
"\n" +
|
||||
"// Test blank line in code block \n" +
|
||||
" }\n" +
|
||||
" }\n" +
|
||||
" \n" +
|
||||
|
|
|
|||
|
|
@ -54,6 +54,8 @@ public class doxygen_basic_translate_style2_runme {
|
|||
" \n" +
|
||||
" {@code \n" +
|
||||
"int main() { while(true); } \n" +
|
||||
"\n" +
|
||||
"// Test blank line in code block \n" +
|
||||
" }\n" +
|
||||
" }\n" +
|
||||
" \n" +
|
||||
|
|
|
|||
|
|
@ -50,6 +50,8 @@ Warning: This may not work as expected
|
|||
.. code-block:: c++
|
||||
|
||||
int main() { while(true); }
|
||||
|
||||
// Test blank line in code block
|
||||
}"""
|
||||
)
|
||||
comment_verifier.check(inspect.getdoc(doxygen_basic_translate.function5),
|
||||
|
|
|
|||
|
|
@ -48,6 +48,8 @@ Warning: This may not work as expected
|
|||
.. code-block:: c++
|
||||
|
||||
int main() { while(true); }
|
||||
|
||||
// Test blank line in code block
|
||||
}"""
|
||||
)
|
||||
comment_verifier.check(inspect.getdoc(doxygen_basic_translate_style2.function5),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue