summaryrefslogtreecommitdiffstats
path: root/src/scanner.l
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2018-11-02 19:04:31 (GMT)
committerJoe George <joe@zeroc.com>2018-11-02 19:04:31 (GMT)
commit1bbf1a37dfc67331a72918df3580818e7f21d0ae (patch)
tree17456c1f92616203975e20de9a6198fb585c07ad /src/scanner.l
parente36d06860e9e1441a402ec8c9a7e03742eb85e9a (diff)
parent1b88f2417deadcd6c25a47bd6f37c524c61abefc (diff)
downloadDoxygen-1bbf1a37dfc67331a72918df3580818e7f21d0ae.zip
Doxygen-1bbf1a37dfc67331a72918df3580818e7f21d0ae.tar.gz
Doxygen-1bbf1a37dfc67331a72918df3580818e7f21d0ae.tar.bz2
Merge remote-tracking branch 'doxygen/master'
Diffstat (limited to 'src/scanner.l')
-rw-r--r--src/scanner.l8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/scanner.l b/src/scanner.l
index 0f681e9..cde0ade 100644
--- a/src/scanner.l
+++ b/src/scanner.l
@@ -602,15 +602,11 @@ static int yyread(char *buf,int max_size)
/* start command character */
CMD ("\\"|"@")
-SECTIONCMD {CMD}("image"|"author"|"internal"|"version"|"date"|"deprecated"|"param"|"exception"|"return"[s]?|"retval"|"bug"|"warning"|"par"|"sa"|"see"|"pre"|"post"|"invariant"|"note"|"remark"[s]?|"todo"|"test"|"xrefitem"|"ingroup"|"callgraph"|"callergraph"|"latexonly"|"htmlonly"|"xmlonly"|"docbookonly"|"manonly"|"{"|"verbatim"|"dotfile"|"dot"|"defgroup"|"addtogroup"|"weakgroup"|"class"|"namespace"|"union"|"struct"|"fn"|"var"|"details"|"typedef"|"def"|"overload")|("<"{PRE}">")
BN [ \t\n\r]
BL [ \t\r]*"\n"
B [ \t]
-BS ^(({B}*"//")?)(({B}*"*"+)?){B}*
ID "$"?[a-z_A-Z\x80-\xFF][a-z_A-Z0-9\x80-\xFF]*
-SCOPEID {ID}({ID}*{BN}*"::"{BN}*)*({ID}?)
SCOPENAME "$"?(({ID}?{BN}*"::"{BN}*)*)(((~|!){BN}*)?{ID})
-PHPSCOPENAME ({ID}"\\")+{ID}
TSCOPE {ID}("<"[a-z_A-Z0-9 \t\*\&,:]*">")?
CSSCOPENAME (({ID}?{BN}*"."{BN}*)*)((~{BN}*)?{ID})
PRE [pP][rR][eE]
@@ -3137,6 +3133,10 @@ OPERATOR "operator"{B}*({ARITHOP}|{ASSIGNOP}|{LOGICOP}|{BITOP})
*pCopyQuotedGString+=*yytext;
BEGIN( lastStringContext );
}
+<CopyGString,CopyPHPGString>"<?php" { // we had an odd number of quotes.
+ *pCopyQuotedGString += yytext;
+ BEGIN( lastStringContext );
+ }
<CopyGString,CopyPHPGString>"/*"|"*/"|"//" {
*pCopyQuotedGString+=yytext;
}