diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-01-31 19:04:17 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-01-31 19:04:17 (GMT) |
| commit | 14554037b9ac2b44bd187276ad528ba592f1c0eb (patch) | |
| tree | 7689709d3ca6aeaa4e1050363182edf289c2d0cc | |
| parent | 6a83ef3ea19d4ace00dc96e34b056b7c8d30a2f4 (diff) | |
| parent | 6009d380def9591a6747151a461ffcc3590fefb2 (diff) | |
| download | Doxygen-14554037b9ac2b44bd187276ad528ba592f1c0eb.zip Doxygen-14554037b9ac2b44bd187276ad528ba592f1c0eb.tar.gz Doxygen-14554037b9ac2b44bd187276ad528ba592f1c0eb.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
| -rw-r--r-- | src/commentscan.l | 4 | ||||
| -rw-r--r-- | src/doctokenizer.l | 2 | ||||
| -rw-r--r-- | src/scanner.l | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index c656c9e..0ca293c 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -1181,7 +1181,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" addOutput(yytext); } } -<Comment>{B}*("\\\\"|"@@")"f"[$\[{] { // escaped formula command +<Comment>{B}*({CMD}{CMD})"f"[$\[{] { // escaped formula command addOutput(yytext); } <Comment>{B}*{CMD}"~"[a-z_A-Z-]* { // language switch command @@ -1805,7 +1805,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" g_sectionTitle+=yytext; addOutput(yytext); } -<SectionTitle>("\\\\"|"@@"){ID} { // unescape escaped command +<SectionTitle>({CMD}{CMD}){ID} { // unescape escaped command g_sectionTitle+=&yytext[1]; addOutput(yytext); } diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 90f9846..5cf5f02 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -1227,7 +1227,7 @@ REFWORD_NOCV {FILEMASK}|{LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV} /* State for the pass used to find the anchors and sections */ <St_Sections>[^\n@\\<]+ -<St_Sections>"@@"|"\\\\"|"@<"|"\\<" +<St_Sections>{CMD}("<"|{CMD}) <St_Sections>"<"{CAPTION}({WS}+{ATTRIB})*">" { QCString tag=yytext; int s=tag.find("id="); diff --git a/src/scanner.l b/src/scanner.l index cc497e3..d2c7072 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -6542,7 +6542,7 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP}) // middle of a comment block docBlock+=yytext; } -<DocBlock>("@@"|"\\\\"){ID}/[^a-z_A-Z0-9] { // escaped command +<DocBlock>({CMD}{CMD}){ID}/[^a-z_A-Z0-9] { // escaped command docBlock+=yytext; } <DocBlock>{CMD}("f$"|"f["|"f{") { |