Doc. system: detect function typedefs

things like
typedef function(void)
were considered functions, not types.

diff --git a/build/doc-extract b/build/doc-extract
index dd01f4c42b7735c16709b224ee36f54bdb480e1e..2ef86026c50243f7244acf70f7e16b3a6695c62a 100755 (executable)
--- a/build/doc-extract
+++ b/build/doc-extract
@@ -35,6 +35,7 @@ sub detect( $ ) {
                 return( '', 0, $_, $_ );
         }
         return( 'def', 0, $1, $_ ) if /#define\s+(\w+)/;
+       return( 'type', 1, $2, $_ ) if /^\s*typedef[^()]+?(\(\s*?\*\s*?)?(\w+)(\s*\))?\s*\(.*\)/;
         return( 'fun', 1, $2, $1 ) if /^(.*?(\w+)\([^{]*\)[^{]*)/;
        return( 'type', 1, $1, $_ ) if /^\s*typedef.*?(\w+);/;
         return( 'var', 1, $1, $_ ) if /\s(\w+);/;

diff --git a/ucw/doc/def_index.txt b/ucw/doc/def_index.txt
index 43e8bbac016c18a42487b8275f30cdeec76ce279..786c1efe66b3f2e016aef885b0d47e19fca69ce5 100644 (file)
--- a/ucw/doc/def_index.txt
+++ b/ucw/doc/def_index.txt
@@ -1,8 +1,9 @@
 All definitions in libucw
 =========================
 
-- <<enum,Enums>>
-- <<struct,Structs>>
+- <<enum,Enumerations>>
+- <<struct,Structures>>
+- <<type,Types>>
 - <<fun,Functions>>
 - <<var,Variables>>
 - <<def,Preprocessor definitions>>