boost_mirror/boostbook
1
0
Fork 0
mirror of https://github.com/boostorg/boostbook.git synced 2025-05-09 15:03:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid confusing arguments with quialifiers from argsstring.

Browse Source 
[SVN r86275]
This commit is contained in:
Daniel James 2013-10-12 20:10:53 +00:00
parent 807c6f0c71
commit 0702b53d10
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/doxygen/autodoc.gold
View File

@ -15,6 +15,7 @@
<data-member name="static_const_integer" specifiers="static"><type>const int</type></data-member> <data-member name="static_const_integer" specifiers="static"><type>const int</type></data-member>
<method-group name="public member functions"> <method-group name="public member functions">
<method name="virtual_method"><type>virtual int</type></method> <method name="virtual_method"><type>virtual int</type></method>
<method name="method_with_default_value"><type>int</type><parameter name=""><paramtype>int</paramtype><default>default_value</default></parameter></method>
<method name="conversion-operator" specifiers="explicit"><type>int</type></method> <method name="conversion-operator" specifiers="explicit"><type>int</type></method>
</method-group> </method-group>
<constructor cv="= default"><parameter name=""><paramtype><classname>example</classname> const &amp;</paramtype></parameter></constructor> <constructor cv="= default"><parameter name=""><paramtype><classname>example</classname> const &amp;</paramtype></parameter></constructor>

1
test/doxygen/boost/example.hpp
View File

@ -35,6 +35,7 @@ namespace example
example(example const&) = default; example(example const&) = default;
example& operator=(example const&) = delete; example& operator=(example const&) = delete;
virtual int virtual_method(); virtual int virtual_method();
int method_with_default_value(int = default_value);
int integer; int integer;
static int static_integer; static int static_integer;

11
xsl/doxygen/doxygen2boostbook.xsl
View File

@ -1061,8 +1061,13 @@
<xsl:template name="function.attributes"> <xsl:template name="function.attributes">
<!-- argsstring = '(arguments) [= delete] [= default] [constexpt]' -->
<xsl:variable name="extra-qualifiers" select="concat(' ',
normalize-space(substring-after(argsstring/text(), ')')),
' ')" />
<!-- CV Qualifiers --> <!-- CV Qualifiers -->
<xsl:if test="@const='yes' or @volatile='yes' or contains(argsstring/text(),'=delete') or contains(argsstring/text(),'=default')"> <xsl:if test="@const='yes' or @volatile='yes' or contains($extra-qualifiers,' =delete ') or contains($extra-qualifiers,' =default ')">
<xsl:attribute name="cv"> <xsl:attribute name="cv">
<xsl:if test="@const='yes'"> <xsl:if test="@const='yes'">
<xsl:text>const</xsl:text> <xsl:text>const</xsl:text>
@ -1074,13 +1079,13 @@
<xsl:text>volatile</xsl:text> <xsl:text>volatile</xsl:text>
</xsl:if> </xsl:if>
<!-- Cheat and add deleted and defaulted function markers to the CV qualifiers --> <!-- Cheat and add deleted and defaulted function markers to the CV qualifiers -->
<xsl:if test="contains(argsstring/text(),'=delete')"> <xsl:if test="contains($extra-qualifiers,' =delete ')">
<xsl:if test="@const='yes' or @volatile='yes'"> <xsl:if test="@const='yes' or @volatile='yes'">
<xsl:text> </xsl:text> <xsl:text> </xsl:text>
</xsl:if> </xsl:if>
<xsl:text>= delete</xsl:text> <xsl:text>= delete</xsl:text>
</xsl:if> </xsl:if>
<xsl:if test="contains(argsstring/text(),'=default')"> <xsl:if test="contains($extra-qualifiers,' =default ')">
<xsl:if test="@const='yes' or @volatile='yes'"> <xsl:if test="@const='yes' or @volatile='yes'">
<xsl:text> </xsl:text> <xsl:text> </xsl:text>
</xsl:if> </xsl:if>