Doc. system: export type and name do deflists

[libucw.git] / build / doc-extract

diff --git a/build/doc-extract b/build/doc-extract
index 5373a5a2898eba9e8d8966ec0a55a134a7589d92..85c3ba299e6e99b26f1e6e333a85fc9e7983f2a9 100755 (executable)
--- a/build/doc-extract
+++ b/build/doc-extract
@@ -50,7 +50,7 @@ sub formatNote( $$ ) {
        chomp $head;
        print OUT "[[auto_$id]]\n";
         my( $type, $semicolon, $name ) = detect( $head );
-        $head =~ s/;?\s+$/;/ if( $semicolon );
+        $head =~ s/;?\s*$/;/ if( $semicolon );
        if( $type eq 'function' ) {
                print OUT "!!f!$head!!!\n\n";
        } else {
@@ -60,7 +60,7 @@ sub formatNote( $$ ) {
        }
        if( $hasdump ) {
                $head =~ s/\n.*//s;
-               print DUMP "$outname,$id,$head\n";
+               print DUMP "$outname,$id,$type,$name,$head\n";
                $id ++;
        }
        print OUT "$comment\n\n";
@@ -107,8 +107,6 @@ sub process( $ ) {
                                        s/^\s*\s?//;
                                        s/\/\/.*//;
                                        s/\/\*.*?\*\///gs;
-                                       s/([;{]).*/";"x length( $1 )/e;
-                                       s/\)\s*;$/);/;
                                        formatNote( $_, $buff );
                                        $head = undef;
                                        $buff = undef;
@@ -126,8 +124,6 @@ sub process( $ ) {
                                if( $head =~ /\(/ || $head !~ /{/ ) {
                                        $head =~ s/^\s*//;
                                        $head =~ s/\/\*.*?\*\///gs;
-                                       $head =~ s/([;{]).*/";"x length( $1 )/e;
-                                       $head =~ s/\)\s*;$/);/;
                                        formatNote( $head, $buff );
                                        $head = undef;
                                        $buff = undef;