diff options
| author | Robin Gareus <robin@gareus.org> | 2017-02-14 14:43:29 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-02-14 14:44:22 +0100 |
| commit | 659701c59b76bdcbfcf5c1b8ce8962eb3f6a1ca2 (patch) | |
| tree | df8711de22e8f04b6cae320a58be58cbcc834c85 | |
| parent | 7330357e1c1ee21f72711efbbbac0e0c940a7050 (diff) | |
Fix lua-doc (Null pointer c'tor doc)
| -rw-r--r-- | libs/ardour/luabindings.cc | 1 | ||||
| -rw-r--r-- | libs/lua/LuaBridge/detail/Namespace.h | 2 | ||||
| -rwxr-xr-x | tools/fmt-luadoc.php | 21 |
3 files changed, 21 insertions, 3 deletions
diff --git a/libs/ardour/luabindings.cc b/libs/ardour/luabindings.cc index bab4c06ffd..2f8035549d 100644 --- 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 9a9b3c44cb..adda891b1b 100644 --- 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 ff37585611..8fd89bdaa3 100755 --- 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">ℂ</td><td class="decl">'; + $rv.= ' <tr>'; + if ($f['nil']) { + $rv.= '<td class="def"><abbr title="Nil Pointer Constructor">ℵ</abbr></td>'; + } else { + $rv.= '<td class="def">ℂ</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> |