From: Vladimír Vondruš <mosra@centrum.cz>
Date: Mon, 29 Jan 2018 20:15:01 +0000 (+0100)
Subject: doxygen: more flexible function argument array parsing.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?a=commitdiff_plain;h=c4713753d8d0dd552e9a715520f398011adcfe90;p=blog.git

doxygen: more flexible function argument array parsing.
---

diff --git a/doxygen/dox2html5.py b/doxygen/dox2html5.py
index 5407fbd1..91c17db4 100755
--- a/doxygen/dox2html5.py
+++ b/doxygen/dox2html5.py
@@ -1072,8 +1072,10 @@ def parse_func(state: State, element: ET.Element):
         array = p.find('array')
         if array is not None:
             if name is not None:
-                assert param.type.endswith(')')
-                param.type = param.type[:-1] + name.text + ')' + array.text
+                if param.type.endswith(')'):
+                    param.type = param.type[:-1] + name.text + ')' + array.text
+                else:
+                    param.type = param.type + ' ' + name.text + array.text
             else:
                 param.type += array.text
         elif name is not None:
diff --git a/doxygen/test/compound_detailed/File.h b/doxygen/test/compound_detailed/File.h
index 655125b3..3d3d39d7 100644
--- a/doxygen/test/compound_detailed/File.h
+++ b/doxygen/test/compound_detailed/File.h
@@ -99,11 +99,12 @@ namespace Foo {
 @param a        That's a for you
 @param b        Well, a string
 @param things   And an array!
+@param stuff    Another array
 @return It returns!
 
 Ooooh, more text!
 */
-template<class T> int foo(int a, std::string b, char(&things)[5], bool, char(&)[42]);
+template<class T> int foo(int a, std::string b, char(&things)[5], bool, char(&)[42], int stuff[], double[1337]);
 
 /**
 @brief Input and output
diff --git a/doxygen/test/compound_detailed/namespaceFoo.html b/doxygen/test/compound_detailed/namespaceFoo.html
index 0b58c1ae..7bc6775f 100644
--- a/doxygen/test/compound_detailed/namespaceFoo.html
+++ b/doxygen/test/compound_detailed/namespaceFoo.html
@@ -36,11 +36,13 @@
           <dl class="m-dox">
             <dt>
               <div class="m-dox-template">template&lt;class T&gt;</div>
-              <span class="m-dox-wrap-bumper">auto <a href="#ae88691fe7f08f83578b05daa67e78887" class="m-dox">foo</a>(</span><span class="m-dox-wrap">int a,
+              <span class="m-dox-wrap-bumper">auto <a href="#a438de3b4c677344081baef1ec352f691" class="m-dox">foo</a>(</span><span class="m-dox-wrap">int a,
               std::string b,
               char(&amp;things)[5],
               bool,
-              char(&amp;)[42]) -&gt; int</span>
+              char(&amp;)[42],
+              int stuff[],
+              double[1337]) -&gt; int</span>
             </dt>
             <dd>Function with <em>everything</em></dd>
             <dt>
@@ -63,16 +65,18 @@
         </section>
         <section>
           <h2>Function documentation</h2>
-          <section class="m-dox-details" id="ae88691fe7f08f83578b05daa67e78887"><div>
+          <section class="m-dox-details" id="a438de3b4c677344081baef1ec352f691"><div>
             <h3>
               <div class="m-dox-template">
                 template&lt;class T&gt;
               </div>
-              <span class="m-dox-wrap-bumper">int Foo::<wbr /></span><span class="m-dox-wrap"><span class="m-dox-wrap-bumper"><a href="#ae88691fe7f08f83578b05daa67e78887" class="m-dox-self">foo</a>(</span><span class="m-dox-wrap">int a,
+              <span class="m-dox-wrap-bumper">int Foo::<wbr /></span><span class="m-dox-wrap"><span class="m-dox-wrap-bumper"><a href="#a438de3b4c677344081baef1ec352f691" class="m-dox-self">foo</a>(</span><span class="m-dox-wrap">int a,
               std::string b,
               char(&amp;things)[5],
               bool,
-              char(&amp;)[42])</span></span>
+              char(&amp;)[42],
+              int stuff[],
+              double[1337])</span></span>
             </h3>
             <p>Function with <em>everything</em></p>
             <table class="m-table m-fullwidth m-flat">
@@ -101,6 +105,10 @@
                   <td>things</td>
                   <td>And an array!</td>
                 </tr>
+                <tr>
+                  <td>stuff</td>
+                  <td>Another array</td>
+                </tr>
               </tbody>
               <tfoot>
                 <tr>