rpms/doxygen
6
0
Fork 0
Code Issues Pull Requests Releases Activity

backport to fix behavior of @ref const matching (#776988)

Browse Source
This commit is contained in:
Than Ngo 2017-03-13 16:45:30 +01:00
parent a772aabeb5
commit 127e038077
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
doxygen-1.8.13-#776988.patch Normal file
View File

@ -0,0 +1,38 @@
diff --git a/src/doctokenizer.l b/src/doctokenizer.l
index a89570e..7545cba 100644
--- a/src/doctokenizer.l
+++ b/src/doctokenizer.l
@@ -395,10 +395,14 @@ HTMLTAG "<"(("/")?){ID}({WS}+{ATTRIB})*{WS}*(("/")?)">"
HTMLKEYL "strong"|"center"|"table"|"caption"|"small"|"code"|"dfn"|"var"|"img"|"pre"|"sub"|"sup"|"tr"|"td"|"th"|"ol"|"ul"|"li"|"tt"|"kbd"|"em"|"hr"|"dl"|"dt"|"dd"|"br"|"i"|"a"|"b"|"p"
HTMLKEYU "STRONG"|"CENTER"|"TABLE"|"CAPTION"|"SMALL"|"CODE"|"DFN"|"VAR"|"IMG"|"PRE"|"SUB"|"SUP"|"TR"|"TD"|"TH"|"OL"|"UL"|"LI"|"TT"|"KBD"|"EM"|"HR"|"DL"|"DT"|"DD"|"BR"|"I"|"A"|"B"|"P"
HTMLKEYW {HTMLKEYL}|{HTMLKEYU}
-REFWORD2 ("#"|"::")?((({ID}{TEMPLPART}?)|{ANONNS})("."|"#"|"::"|"-"|"/"))*({ID}{TEMPLPART}?(":")?){FUNCARG2}?
-REFWORD3 ({ID}":")*{ID}":"?
-REFWORD4 (({SCOPEPRE}*"operator"{OPMASKOP2})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOP2})){CVSPEC}?
-REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
+REFWORD2_PRE ("#"|"::")?((({ID}{TEMPLPART}?)|{ANONNS})("."|"#"|"::"|"-"|"/"))*({ID}{TEMPLPART}?(":")?)
+REFWORD2 {REFWORD2_PRE}{FUNCARG2}?
+REFWORD2_NOCV {REFWORD2_PRE}("("{FUNCPART}")")?
+REFWORD3 ({ID}":")*{ID}":"?
+REFWORD4_NOCV (({SCOPEPRE}*"operator"{OPMASKOP2})|(("::"|"#"){SCOPEPRE}*"operator"{OPMASKOP2}))
+REFWORD4 {REFWORD4_NOCV}{CVSPEC}?
+REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
+REFWORD_NOCV {LABELID}|{REFWORD2_NOCV}|{REFWORD3}|{REFWORD4_NOCV}
%option noyywrap
%option yylineno
@@ -1011,6 +1015,14 @@ REFWORD {LABELID}|{REFWORD2}|{REFWORD3}|{REFWORD4}
unput(*yytext);
return 0;
}
+<St_Ref>{REFWORD_NOCV}/{BLANK}("const")[a-z_A-Z0-9] { // see bug776988
+ g_token->name=yytext;
+ return TK_WORD;
+ }
+<St_Ref>{REFWORD_NOCV}/{BLANK}("volatile")[a-z_A-Z0-9] { // see bug776988
+ g_token->name=yytext;
+ return TK_WORD;
+ }
<St_Ref>{REFWORD} { // label to refer to
g_token->name=yytext;
return TK_WORD;

6
doxygen.spec
View File

@ -2,7 +2,7 @@ Summary: A documentation system for C/C++
Name: doxygen
Epoch: 1
Version: 1.8.13
Release: 4%{?dist}
Release: 5%{?dist}
# No version is specified.
License: GPL+
@ -15,6 +15,7 @@ Source2: doxywizard.desktop
# upstream patches
Patch100: https://github.com/doxygen/doxygen/pull/555.patch#/doxygen-xmlgen-regression.patch
Patch101: doxygen-1.8.13-#775493.patch
Patch102: doxygen-1.8.13-#776988.patch
BuildRequires: perl
BuildRequires: tex(dvips)
@ -134,6 +135,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
# intentionally left blank
%changelog
* Mon Mar 13 2017 Than Ngo <than@redhat.com> - 1:1.8.13-5
- backport to fix behavior of @ref const matching (#776988)
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.8.13-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild