From 0702b53d1028fff3c47f3f871c08225f9244c5e8 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 12 Oct 2013 20:10:53 +0000
Subject: [PATCH] Avoid confusing arguments with quialifiers from argsstring.

[SVN r86275]
---
 test/doxygen/autodoc.gold         |  1 +
 test/doxygen/boost/example.hpp    |  1 +
 xsl/doxygen/doxygen2boostbook.xsl | 11 ++++++++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/test/doxygen/autodoc.gold b/test/doxygen/autodoc.gold
index 471ac18..ba63d55 100644
--- a/test/doxygen/autodoc.gold
+++ b/test/doxygen/autodoc.gold
@@ -15,6 +15,7 @@
 <data-member name="static_const_integer" specifiers="static"><type>const int</type></data-member>
 <method-group name="public member functions">
 <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-group>
 <constructor cv="= default"><parameter name=""><paramtype><classname>example</classname> const &amp;</paramtype></parameter></constructor>
diff --git a/test/doxygen/boost/example.hpp b/test/doxygen/boost/example.hpp
index bbbf4e7..4cb9541 100644
--- a/test/doxygen/boost/example.hpp
+++ b/test/doxygen/boost/example.hpp
@@ -35,6 +35,7 @@ namespace example
         example(example const&) = default;
         example& operator=(example const&) = delete;
         virtual int virtual_method();
+        int method_with_default_value(int = default_value);
 
         int integer;
         static int static_integer;
diff --git a/xsl/doxygen/doxygen2boostbook.xsl b/xsl/doxygen/doxygen2boostbook.xsl
index 52a7ec3..cc6ffeb 100644
--- a/xsl/doxygen/doxygen2boostbook.xsl
+++ b/xsl/doxygen/doxygen2boostbook.xsl
@@ -1061,8 +1061,13 @@
 
   <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 -->
-    <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:if test="@const='yes'">
           <xsl:text>const</xsl:text>
@@ -1074,13 +1079,13 @@
           <xsl:text>volatile</xsl:text>
         </xsl:if>
         <!-- 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:text> </xsl:text>
           </xsl:if>
           <xsl:text>= delete</xsl:text>
         </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:text> </xsl:text>
           </xsl:if>