Merge branch 'master' of github.com:doxygen/doxygen

doxygen · Apr 2, 2024 · 035622d · 035622d
2 parents 5e48988 + 2717489
commit 035622d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/doc/lists.dox b/doc/lists.dox
@@ -29,7 +29,7 @@ Here is an example:
    *    - keyboard events
    *         1. key down event
    *         2. key up event
-   *    - checbox list
+   *    - checkbox list
    *         - [ ] unchecked
    *         - [x] checked
    *
@@ -47,7 +47,7 @@ Here is an example:
        - keyboard events
             1. key down event
             2. key up event
-       - checbox list
+       - checkbox list
             - [ ] unchecked
             - [x] checked
 

diff --git a/src/code.l b/src/code.l
@@ -953,6 +953,7 @@ ENDQopt ("const"|"volatile"|"sealed"|"override")({BN}+("const"|"volatile"|"seale
                                         }
 <Body>"module"/{B}*[:;]?                { // 'module X' or 'module : private' or 'module;'
                                           if (yyextra->lang!=SrcLangExt::Cpp) REJECT;
+                                          if (!yyextra->type.isEmpty() || !yyextra->name.isEmpty()) REJECT;
                                           startFontClass(yyscanner,"keyword");
                                           codifyLines(yyscanner,yytext);
                                           endFontClass(yyscanner);

diff --git a/src/scanner.l b/src/scanner.l
@@ -1084,6 +1084,7 @@ NONLopt [^\n]*
                                         }
 <FindMembers>{B}*"module"{BN}*";"       { // global module section
                                           if (!yyextra->insideCpp) REJECT;
+                                          if (!yyextra->current->type.isEmpty() || !yyextra->current->name.isEmpty()) REJECT;
                                           //printf("Implementation module unit\n");
                                           lineCount(yyscanner);
                                           BEGIN( FindMembers );