Doc. system: detect function typedefs

[libucw.git] / build / doc-extract

diff --git a/build/doc-extract b/build/doc-extract
index a5af0e4e35ac52a89e062df3e42f1795f55f8747..2ef86026c50243f7244acf70f7e16b3a6695c62a 100755 (executable)
--- a/build/doc-extract
+++ b/build/doc-extract
@@ -24,19 +24,23 @@ if( defined $defdump ) {
 
 sub detect( $ ) {
         ( $_ ) = @_;
 
 sub detect( $ ) {
         ( $_ ) = @_;

+       return( 'struct', 1, $1, "typedef struct { ... } $1;" ) if /^\s*typedef\s+struct\s*{.*}\s*(\w+)\s*;\s*$/s;
+       return( 'enum', 1, $1, "typedef enum { ... } $1;" ) if /^\s*typedef\s+enum\s*{.*}\s*(\w+)\s*;\s*$/s;

         my $l = length;
         s/\n.*//s;
         my $l = length;
         s/\n.*//s;

-        return( 'struct', 0, $1 ) if( /struct\s+(\w+)\s+{/ );
-        return( 'enum', 0, $1 ) if( /enum\s+(\w+)\s+{/ );
+        return( 'struct', 0, $1, $_ ) if /struct\s+(\w+)\s+{/;
+        return( 'enum', 0, $1, $_ ) if /enum\s+(\w+)\s+{/;

         if( $l > length ) {
                 warn( "Unknown statement $_\n" );
         if( $l > length ) {
                 warn( "Unknown statement $_\n" );

-                return( '', 0, $_ );
+                return( '', 0, $_, $_ );

         }
         }

-        return( 'define', 0, $1 ) if( /#define\s+(\w+)/ );
-        return( 'function', 1, $1 ) if( /(\w+)\(.*\)/ );
-        return( 'variable', 1, $1 ) if( /\s(\w+);/ );
+        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+);/;

         warn( "Unknown statement $_\n" );
         warn( "Unknown statement $_\n" );

-        return( '', 0, $_ );
+        return( '', 0, $_, $_ );

 }
 
 my @deps;
 }
 
 my @deps;


@@ -48,19 +52,18 @@ sub formatNote( $$ ) {
        print OUT "\n";
        print OUT "''''\n";
        chomp $head;
        print OUT "\n";
        print OUT "''''\n";
        chomp $head;

-       print OUT "[[auto_$id]]\n";
-        my( $type, $semicolon, $name ) = detect( $head );
+        my( $type, $semicolon, $name, $oneline ) = detect( $head );
+       $oneline =~ s/\s+$//;
+       $oneline =~ s/;?$/;/ if( $semicolon );

         $head =~ s/;?\s*$/;/ if( $semicolon );
         $head =~ s/;?\s*$/;/ if( $semicolon );

-       if( $type eq 'function' ) {
-               print OUT "!!f!$head!!!\n\n";
-       } else {
-               print OUT "..................\n";
-               print OUT "$head\n";
-               print OUT "..................\n\n";
-       }
+       $head =~ s/(\.\.\.)/\\$1/g;
+       print OUT "[[${type}_$name]]\n";
+       $head = $oneline if $type eq 'fun';#Remove { from inline functions
+       print OUT "..................\n";
+       print OUT "$head\n";
+       print OUT "..................\n\n";

        if( $hasdump ) {
        if( $hasdump ) {

-               $head =~ s/\n.*//s;
-               print DUMP "$outname,$id,$type,$name,$head\n";
+               print DUMP "$outname,${type}_$name,$type,$name,$oneline\n";

                $id ++;
        }
        print OUT "$comment\n\n";
                $id ++;
        }
        print OUT "$comment\n\n";