projects / ardour.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7330357)
Fix lua-doc (Null pointer c'tor doc)
authorRobin Gareus <robin@gareus.org>
Tue, 14 Feb 2017 13:43:29 +0000 (14:43 +0100)
committerRobin Gareus <robin@gareus.org>
Tue, 14 Feb 2017 13:44:22 +0000 (14:44 +0100)
libs/ardour/luabindings.cc patch | blob | history
libs/lua/LuaBridge/detail/Namespace.h patch | blob | history
tools/fmt-luadoc.php patch | blob | history

diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc
index bab4c06ffd041daf126a97c10f0e575fe1d94ed3..2f8035549dcd37061c04efb7e43635baba402d7f 100644 (file)
--- a/libs/ardour/luabindings.cc
+++ b/libs/ardour/luabindings.cc
@@ -56,6 +56,7 @@
 #include "ardour/plugin.h"
 #include "ardour/plugin_insert.h"
 #include "ardour/port_manager.h"
+#include "ardour/progress.h"
 #include "ardour/runtime_functions.h"
 #include "ardour/region.h"
 #include "ardour/region_factory.h"
diff --git a/libs/lua/LuaBridge/detail/Namespace.h b/libs/lua/LuaBridge/detail/Namespace.h
index 9a9b3c44cb006fadf2caf6d7b4ca6ca0b266029e..adda891b1ba3f5f96380bcefecb12671eec995ac 100644 (file)
--- a/libs/lua/LuaBridge/detail/Namespace.h
+++ b/libs/lua/LuaBridge/detail/Namespace.h
@@ -1289,7 +1289,7 @@ private:
 
     WSPtrClass <T>& addNilPtrConstructor ()
     {
-      FUNDOC ("Weak/Shared Pointer Constructor", "", MemFn)
+      FUNDOC ("Weak/Shared Pointer NIL Constructor", "", void (*) ())
       set_shared_class ();
       lua_pushcclosure (L,
           &shared. template ctorNilPtrPlacementProxy <boost::shared_ptr<T> >, 0);
diff --git a/tools/fmt-luadoc.php b/tools/fmt-luadoc.php
index ff375856116c258802b3876871c3f55cc932b8b3..8fd89bdaa388fecac8cbfd704e4015d64e7aa384 100755 (executable)
--- a/tools/fmt-luadoc.php
+++ b/tools/fmt-luadoc.php
@@ -270,7 +270,17 @@ foreach ($doc as $b) {
                $classlist[luafn2class ($b['lua'])]['ctor'][] = array (
                        'name' => luafn2class ($b['lua']),
                        'args' => decl2args ($b['ldec']),
-                       'cand' => canonical_ctor ($b)
+                       'cand' => canonical_ctor ($b),
+                       'nil' => false
+               );
+               break;
+       case "Weak/Shared Pointer NIL Constructor":
+               checkclass ($b);
+               $classlist[luafn2class ($b['lua'])]['ctor'][] = array (
+                       'name' => luafn2class ($b['lua']),
+                       'args' => decl2args ($b['ldec']),
+                       'cand' => canonical_ctor ($b),
+                       'nil' => true
                );
                break;
        case "Property":
@@ -642,7 +652,13 @@ function format_class_members ($ns, $cl, &$dups) {
                usort ($cl['ctor'], 'name_sort_cb');
                $rv.= ' <tr><th colspan="3">Constructor</th></tr>'.NL;
                foreach ($cl['ctor'] as $f) {
-                       $rv.= ' <tr><td class="def">&Copf;</td><td class="decl">';
+                       $rv.= ' <tr>';
+                       if ($f['nil']) {
+                               $rv.= '<td class="def"><abbr title="Nil Pointer Constructor">&alefsym;</abbr></td>';
+                       } else {
+                               $rv.= '<td class="def">&Copf;</td>';
+                       }
+                       $rv.= '<td class="decl">';
                        $rv.= '<span class="functionname">'.ctorname ($f['name']).'</span>';
                        $rv.= format_args ($f['args']);
                        $rv.= '</td><td class="fill"></td></tr>'.NL;
@@ -790,6 +806,7 @@ div.luafooter      { text-align:center; font-size:80%; color: #888; margin: 2em
 #luaref table.classmembers td.fill { width: 99%; }
 #luaref table.classmembers span.em { font-style: italic; }
 #luaref span.functionname abbr     { text-decoration:none; cursor:default; }
+#luaref table.classmembers td.def abbr { text-decoration:none; cursor:default; }
 </style>
 </head>
 <body>
Unnamed repository; edit this file 'description' to name the repository.