Fixed a typo in configuration example.

[libucw.git] / build / doc-extract

diff --git a/build/doc-extract b/build/doc-extract
index e3f052ce346a89d957ff1f840e55e638785a24b8..e20e7a941ce3c9b3088764a5950341c88b4885c6 100755 (executable)
--- a/build/doc-extract
+++ b/build/doc-extract
@@ -18,25 +18,28 @@ if( defined $outname ) {
 }
 my $hasdump;
 if( defined $defdump ) {
 }
 my $hasdump;
 if( defined $defdump ) {

-       open DUMP, ">>$defdump" or die "Could not write definition dump $defdump ($!)\n";
+       open DUMP, ">$defdump" or die "Could not write definition dump $defdump ($!)\n";

        $hasdump = 1;
 }
 
 sub detect( $ ) {
        $hasdump = 1;
 }
 
 sub detect( $ ) {

-        ( $_ ) = @_;
-        my $l = length;
-        s/\n.*//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" );
-                return( '', 0, $_ );
-        }
-        return( 'define', 0, $1 ) if( /#define\s+(\w+)/ );
-        return( 'function', 1, $1 ) if( /(\w+)\(.*\)/ );
-        return( 'variable', 1, $1 ) if( /\s(\w+);/ );
-        warn( "Unknown statement $_\n" );
-        return( '', 0, $_ );
+       ( $_ ) = @_;
+       return( $1, 1, $2, "typedef $1 { ... } $2;" ) if /^\s*typedef\s+(struct|enum)\s*{.*}\s*(\w+)\s*;\s*$/s;
+       return( $1, 1, $2, $_ ) if /^\s*(struct|enum)\s+(\w+)\s*;\s*$/s;
+       my $l = length;
+       s/\n.*//s;
+       return( $1, 0, $2, $_ ) if /(struct|enum)\s+(\w+)\s+{/;
+       return( 'def', 0, $1, $_ ) if /#define\s+(\w+)/;
+       if( $l > length ) {
+               warn( "Unknown multiline statement $_\n" );
+               return( '', 0, $_, $_ );
+       }
+       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" );
+       return( '', 0, $_, $_ );

 }
 
 my @deps;
 }
 
 my @deps;


@@ -48,19 +51,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 );
-        $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";
-       }
+       my( $type, $semicolon, $name, $oneline ) = detect( $head );
+       $oneline =~ s/\s+$//;
+       $oneline =~ s/;?$/;/ if( $semicolon );
+       $head =~ s/;?\s*$/;/ if( $semicolon );
+       $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";


@@ -75,9 +77,18 @@ sub process( $ ) {
        my $buff;
        my $head;
        my $struct;
        my $buff;
        my $head;
        my $struct;

+       my $def;

        while( defined( $line = <FILE> ) ) {
                chomp $line;
        while( defined( $line = <FILE> ) ) {
                chomp $line;

-               if( $struct ) {
+               if( $def ) {
+                       $head .= "\n".$line;
+                       $line =~ s/(\/\*.*?\*\/|\/\/.*)//g;
+                       if( $line !~ /\\\s*$/ ) {
+                               formatNote( $head, $buff );
+                               $def = 0;
+                               $buff = $head = undef;
+                       }
+               } elsif( $struct ) {

                        $head .= "\n".$line;
                        if( $line =~ /}/ ) {
                                formatNote( $head, $buff );
                        $head .= "\n".$line;
                        if( $line =~ /}/ ) {
                                formatNote( $head, $buff );


@@ -102,7 +113,10 @@ sub process( $ ) {
                        }
                } else {
                        if( ( $line =~ /\S/ ) && ( defined $buff ) ) {
                        }
                } else {
                        if( ( $line =~ /\S/ ) && ( defined $buff ) ) {

-                               if( $line =~ /\(/ || $line !~ /{/ ) {
+                               if( $line =~ /^\s*#define.*\\(\s*(\/\/.*|\/\*.*?\*\/|))*/ ) {
+                                       $head = $line;
+                                       $def = 1;
+                               } elsif( $line =~ /\(/ || $line !~ /{/ || $line =~ /^\s*#define/ ) {

                                        $_ = $line;
                                        s/^\s*\s?//;
                                        s/\/\/.*//;
                                        $_ = $line;
                                        s/^\s*\s?//;
                                        s/\/\/.*//;


@@ -121,7 +135,7 @@ sub process( $ ) {
                        } elsif( ( $head, $buff ) = ( $line =~ /^(.*)\/\*\*(.*)\*\*\// ) ) {
                                $buff =~ s/^\s*//;
                                $buff =~ s/\s*$//;
                        } elsif( ( $head, $buff ) = ( $line =~ /^(.*)\/\*\*(.*)\*\*\// ) ) {
                                $buff =~ s/^\s*//;
                                $buff =~ s/\s*$//;

-                               if( $head =~ /\(/ || $head !~ /{/ ) {
+                               if( $head =~ /\(/ || $head !~ /{/ || $head =~/}/ ) {

                                        $head =~ s/^\s*//;
                                        $head =~ s/\/\*.*?\*\///gs;
                                        formatNote( $head, $buff );
                                        $head =~ s/^\s*//;
                                        $head =~ s/\/\*.*?\*\///gs;
                                        formatNote( $head, $buff );