X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=build%2Fdoc-extract;h=e20e7a941ce3c9b3088764a5950341c88b4885c6;hb=ca1e06ed14e04fe2bcff4dca15cdea1e65a5ab65;hp=2ef86026c50243f7244acf70f7e16b3a6695c62a;hpb=403227fe2c782c1b675852ca88db3ea8be5db996;p=libucw.git

diff --git a/build/doc-extract b/build/doc-extract
index 2ef86026..e20e7a94 100755
--- a/build/doc-extract
+++ b/build/doc-extract
@@ -23,24 +23,23 @@ if( defined $defdump ) {
 }
 
 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;
-        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( 'def', 0, $1, $_ ) if /#define\s+(\w+)/;
+	( $_ ) = @_;
+	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( '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, $_, $_ );
+	return( 'var', 1, $1, $_ ) if /\s\**(\w+);/;
+	warn( "Unknown statement $_\n" );
+	return( '', 0, $_, $_ );
 }
 
 my @deps;
@@ -52,10 +51,10 @@ sub formatNote( $$ ) {
 	print OUT "\n";
 	print OUT "''''\n";
 	chomp $head;
-        my( $type, $semicolon, $name, $oneline ) = 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 );
 	$head =~ s/(\.\.\.)/\\$1/g;
 	print OUT "[[${type}_$name]]\n";
 	$head = $oneline if $type eq 'fun';#Remove { from inline functions
@@ -78,9 +77,18 @@ sub process( $ ) {
 	my $buff;
 	my $head;
 	my $struct;
+	my $def;
 	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 );
@@ -105,7 +113,10 @@ sub process( $ ) {
 			}
 		} 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/\/\/.*//;
@@ -124,7 +135,7 @@ sub process( $ ) {
 			} 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 );