diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2021-04-27 18:34:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-27 18:34:54 (GMT) |
| commit | a08b52659d024d27deda64e8e2ee10422ed85f2b (patch) | |
| tree | 8837cff0b4b8c774c397163a41d64f66de62b497 /src | |
| parent | 5b47c54ab5870232d702eb4a135b320b0dc9eca7 (diff) | |
| parent | c1aed4fc301add03f2051da8ea8729007026c62e (diff) | |
| download | Doxygen-a08b52659d024d27deda64e8e2ee10422ed85f2b.zip Doxygen-a08b52659d024d27deda64e8e2ee10422ed85f2b.tar.gz Doxygen-a08b52659d024d27deda64e8e2ee10422ed85f2b.tar.bz2 | |
Merge pull request #8519 from albert-github/feature/issue_8518
issue #8518 tag </programlisting> was inserted before </highlight> parsing python file to xml
Diffstat (limited to 'src')
| -rw-r--r-- | src/pycode.l | 2 | ||||
| -rw-r--r-- | src/pyscanner.l | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/pycode.l b/src/pycode.l index 159af1f..6625300 100644 --- a/src/pycode.l +++ b/src/pycode.l @@ -172,7 +172,7 @@ NONEMPTYEXP [^ \t\n:] PARAMNONEMPTY [^ \t\n():] IDENTIFIER ({LETTER}|"_")({LETTER}|{DIGIT}|"_")* SCOPE {IDENTIFIER}("."{IDENTIFIER})* -CALLANY "("[^)]*")" +CALLANY "("[^)\n]*")" BORDER ([^A-Za-z0-9]) POUNDCOMMENT "##" diff --git a/src/pyscanner.l b/src/pyscanner.l index b0ebd41..47e00a3 100644 --- a/src/pyscanner.l +++ b/src/pyscanner.l @@ -331,6 +331,7 @@ STARTDOCSYMS "##" yyextra->stat=TRUE; } "@"{SCOPE}{CALL}? { // decorator + lineCount(yyscanner); } {SCRIPTCOMMENT} { // Unix type script comment if (yyextra->yyLineNr != 1) REJECT; |