X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Ffmt-luadoc.php;h=38221c7f1419f533b605fe91c7841c3dcfe82fba;hb=52b6ad1b962f104ebd5ad050587a0d6325e57ce4;hp=ce13fd5caddc9e66b8de0aada962463288d0b3ba;hpb=5c44ae8dd7033795a85569f01dcad65813fbb009;p=ardour.git

diff --git a/tools/fmt-luadoc.php b/tools/fmt-luadoc.php
index ce13fd5cad..38221c7f14 100755
--- a/tools/fmt-luadoc.php
+++ b/tools/fmt-luadoc.php
@@ -91,7 +91,7 @@ function arg2lua ($argtype, $flags = 0) {
 	$arg = preg_replace ('/ $/', '', $arg);
 
 	# filter out basic types
-	$builtin = array ('float', 'double', 'bool', 'std::string', 'int', 'long', 'unsigned long', 'unsigned int', 'unsigned char', 'char', 'void', 'char*', 'unsigned char*', 'void*');
+	$builtin = array ('float', 'double', 'bool', 'std::string', 'int', 'short', 'long', 'unsigned int', 'unsigned short', 'unsigned long', 'unsigned char', 'char', 'void', 'char*', 'unsigned char*', 'void*');
 	if (in_array ($arg, $builtin)) {
 		return array ($arg => $flags);
 	}
@@ -261,6 +261,13 @@ foreach ($doc as $b) {
 			'cand' => canonical_ctor ($b)
 		);
 		break;
+	case "Property":
+		checkclass ($b);
+		$classlist[luafn2class ($b['lua'])]['props'][] = array (
+			'name' => $b['lua'],
+			'ret'  => arg2lua (datatype ($b['ldec']))
+		);
+		break;
 	case "Data Member":
 		checkclass ($b);
 		$classlist[luafn2class ($b['lua'])]['data'][] = array (
@@ -384,6 +391,7 @@ foreach ($doc as $b) {
 			'cand' => canonical_decl ($b)
 		);
 		break;
+	case "Cast":
 	case "Weak/Shared Pointer Cast":
 		checkclass ($b);
 		$classlist[luafn2class ($b['lua'])]['cast'][] = array (
@@ -414,6 +422,7 @@ foreach ($doc as $b) {
 foreach ($classlist as $ns => $cl) {
 	if (strpos ($cl['type'], ' Array') !== false) {
 		$classlist[$ns]['arr'] = true;
+		$classlist[$ns]['cdecl'] = $cl['decl'];
 		continue;
 	}
 	foreach ($classes as $c) {
@@ -684,6 +693,17 @@ function format_class_members ($ns, $cl, &$dups) {
 		}
 	}
 
+	# print properties - if any
+	if (isset ($cl['props'])) {
+		usort ($cl['props'], 'name_sort_cb');
+		$rv.= ' <tr><th colspan="3">Properties</th></tr>'.NL;
+		foreach ($cl['props'] as $f) {
+			$rv.= ' <tr><td class="def">'.typelink (array_keys ($f['ret'])[0], false, 'em').'</td><td class="decl">';
+			$rv.= '<span class="functionname">'.stripclass ($ns, $f['name']).'</span>';
+			$rv.= '</td><td class="fill"></td></tr>'.NL;
+		}
+	}
+
 	# print data members - if any
 	if (isset ($cl['data'])) {
 		usort ($cl['data'], 'name_sort_cb');
@@ -942,7 +962,7 @@ foreach ($classlist as $ns => $cl) {
 	}
 
 	# show original C++ declaration
-	if (isset ($cl['decl'])) {
+	if (isset ($cl['cdecl'])) {
 		echo '<p class="cdecl"><em>C&#8225;</em>: '.htmlentities ($cl['cdecl']).'</p>'.NL;
 	}