From 5ca7d423a11337d5c31082f52a287a3dc0986642 Mon Sep 17 00:00:00 2001 From: Craig Thomas Noble Date: Fri, 17 Jan 2014 11:07:05 +0000 Subject: [PATCH] Fix to VHDL scanner. The following code should produce two groups, each containing one page, within the same documentation scope, currently it nests these groups and pages, resulting in incorrect documentation. --! \defgroup group1 Group 1 --! \{ --! @brief Group 1 --! \} --! \ingroup group1 --! \{ --! \page group1_page1 Page 1 --! \verbatim --! Some Page 1 text --! \endverbatim --! \} --! \defgroup group2 Group 2 --! \{ --! @brief Group 2 --! \} --! \ingroup group2 --! \{ --! \page group2_page1 Page 1 --! \verbatim --! Some Page 1 text --! \endverbatim --! \} Similar C code to demonstrate the correct output. //! \defgroup group1 Group 1 //! \{ //! @brief Group 1 //! \} //! \ingroup group1 //! \{ //! \page group1_page1 Page 1 //! \verbatim //! Some Page 1 text //! \endverbatim //! \} //! \defgroup group2 Group 2 //! \{ //! @brief Group 2 //! \} //! \ingroup group2 //! \{ //! \page group2_page1 Page 1 //! \verbatim //! Some Page 1 text //! \endverbatim //! \} --- src/vhdlscanner.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vhdlscanner.l b/src/vhdlscanner.l index e1257ec4be9..a3603c8e237 100644 --- a/src/vhdlscanner.l +++ b/src/vhdlscanner.l @@ -543,7 +543,7 @@ BR [ \t\n\r] . { /* unknown characters */ } -<*>{BR}*"--!"[^{}\n]*[^\n]*\n/{B}*"--!" { // multi line comment +<*>{B}*"--!"[^{}\n]*[^\n]*\n/{B}*"--!" { // multi line comment if (iDocLine==-1) iDocLine=yyLineNr; QCString qc(vhdlscannerYYtext); int len=qc.contains('\n')+yyLineNr-1;