diff options
| author | Petr Prikryl <prikryl@atlas.cz> | 2013-09-11 07:55:17 (GMT) |
|---|---|---|
| committer | Petr Prikryl <prikryl@atlas.cz> | 2013-09-11 07:55:17 (GMT) |
| commit | 0f275314f549c0fc3be4f8442573b7f10b999f1d (patch) | |
| tree | 7d69dbbcf6a9e4472e74fc5a28f4736392082059 /src/doctokenizer.l | |
| parent | e31402cb975d0a32c8d41deb593c9cfe289427b7 (diff) | |
| parent | 1e373422387e8c1131f887efb47cf3da6459e2ac (diff) | |
| download | Doxygen-0f275314f549c0fc3be4f8442573b7f10b999f1d.zip Doxygen-0f275314f549c0fc3be4f8442573b7f10b999f1d.tar.gz Doxygen-0f275314f549c0fc3be4f8442573b7f10b999f1d.tar.bz2 | |
Merge branch 'master' of https://github.com/doxygen/doxygen.git
Conflicts:
doc/language.doc
Diffstat (limited to 'src/doctokenizer.l')
| -rw-r--r-- | src/doctokenizer.l | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/doctokenizer.l b/src/doctokenizer.l index 3c924cf..a33985b 100644 --- a/src/doctokenizer.l +++ b/src/doctokenizer.l @@ -355,6 +355,7 @@ INOUT "inout"|"in"|"out"|("in"{BLANK}*","{BLANK}*"out")|("out"{BLANK}*","{BLAN PARAMIO {CMD}param{BLANK}*"["{BLANK}*{INOUT}{BLANK}*"]" TEMPCHAR [a-z_A-Z0-9.,: \t\*\&\(\)\[\]] FUNCCHAR [a-z_A-Z0-9,:\<\> \t\^\*\&\[\]] +FUNCPART {FUNCCHAR}*("("{FUNCCHAR}*")"{FUNCCHAR}*)? SCOPESEP "::"|"#"|"." TEMPLPART "<"{TEMPCHAR}*">" ANONNS "anonymous_namespace{"[^}]*"}" @@ -363,7 +364,7 @@ SCOPEKEYS ":"({ID}":")* SCOPECPP {SCOPEPRE}*(~)?{ID}{TEMPLPART}? SCOPEOBJC {SCOPEPRE}?{ID}{SCOPEKEYS}? SCOPEMASK {SCOPECPP}|{SCOPEOBJC} -FUNCARG "("{FUNCCHAR}*")"({BLANK}*("volatile"|"const"){BLANK})? +FUNCARG "("{FUNCPART}")"({BLANK}*("volatile"|"const"){BLANK})? OPNEW {BLANK}+"new"({BLANK}*"[]")? OPDEL {BLANK}+"delete"({BLANK}*"[]")? OPNORM {OPNEW}|{OPDEL}|"+"|"-"|"*"|"/"|"%"|"^"|"&"|"|"|"~"|"!"|"="|"<"|">"|"+="|"-="|"*="|"/="|"%="|"^="|"&="|"|="|"<<"|">>"|"<<="|">>="|"=="|"!="|"<="|">="|"&&"|"||"|"++"|"--"|","|"->*"|"->"|"[]"|"()" @@ -386,7 +387,7 @@ HTMLKEYU "STRONG"|"CENTER"|"TABLE"|"CAPTION"|"SMALL"|"CODE"|"DFN"|"VAR"|"IMG"|" HTMLKEYW {HTMLKEYL}|{HTMLKEYU} REFWORD2 ("#"|"::")?((({ID}{TEMPLPART}?)|{ANONNS})("."|"#"|"::"|"-"|"/"))*({ID}{TEMPLPART}?(":")?){FUNCARG}? REFWORD3 ({ID}":")*{ID}":"? -REFWORD {LABELID}|{REFWORD2}|{REFWORD3} +REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{LNKWORD2} %option noyywrap %option yylineno |